Request 285 (accepted)

Overview

Request 285 (accepted)

bump version 0.7.60

Created by marguerite over 11 years ago
In state accepted

Submit libmediainfo

Submit package home:margueri...s:Multimedia / libmediainfo to package Multimedia / libmediainfo

libmediainfo.changes Changed

@@ -1,3 +1,22 @@
+Thu Oct  4 00:17:53 UTC 2012 - i@marguerite.su
+
+- update to 0.7.60
+  * MPEG-TS/PS: improved detection of buggy time stamps
+  * DPX: color primaries and transfer characteristics
+  * MPEG-TS: Added support of scrambled streams without transport_scrambling_control bit set (e.g. PlayReady)
+  * MPEG-TS: Name of some scrambling algorithms
+  * MPEG-TS: detection of CBR/VBR at container level
+  * MPEG Video: better detection of variable GOP
+  * MPEG-TS: average, minimum, maximum PCR distance (hidden by default and you must parse the whole file with --ParseSpeed=1 option)
+  * Matroska: some streams were wrongly detected sa VFR
+  * #3538378, XML output: invalid characters, now if there is an invalid character, data is transported in base64
+  * LXF: wrong video bit rate with some files
+  * AC-3/E-AC-3: hang up with some Little Endian streams
+  * AAC: wrong min and max bit rate in case of partial (default) parsing, disabling it
+  * AVC: crash or hang up with some malformed/scrambled streams
+  * Opus: wrong duration in case of non-48kHz stream
+  * MOV: 25 fps + drop frame time codes were not handled correctly
+
 -------------------------------------------------------------------
 Sat May 19 16:26:50 UTC 2012 - seife+obs@b1-systems.com
 
@@ -141,4 +160,3 @@
 - install *-config files manually
 - added devel-subpackages
 - split off from MediaInfo package
-

libmediainfo.spec Changed

libmediainfo_0.7.34.tar.bz2/Contrib/ActiveX/Release/MediaInfoActiveX.dll Deleted

libmediainfo_0.7.34.tar.bz2/Project/MSCS Deleted

libmediainfo_0.7.34.tar.bz2/Project/MSCS/Example Deleted

libmediainfo_0.7.34.tar.bz2/Project/MSCS/Example/AssemblyInfo.cs Deleted

@@ -1,58 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-//
-// Les informations générales relatives à un assembly dépendent de 
-// l'ensemble d'attributs suivant. Pour modifier les informations
-// associées à un assembly, changez les valeurs de ces attributs.
-//
-[assembly: AssemblyTitle("")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]		
-
-//
-// Les informations de version pour un assembly se composent des quatre valeurs suivantes :
-//
-//      Version principale
-//      Version secondaire 
-//      Numéro de build
-//      Révision
-//
-// Vous pouvez spécifier toutes les valeurs ou indiquer des numéros de révision et de build par défaut 
-// en utilisant '*', comme ci-dessous :
-
-[assembly: AssemblyVersion("1.0.*")]
-
-//
-// Pour signer votre assembly, vous devez spécifier la clé à utiliser. Consultez 
-// la documentation Microsoft .NET Framework pour plus d'informations sur la signature d'un assembly.
-//
-// Utilisez les attributs ci-dessous pour contrôler la clé utilisée lors de la signature. 
-//
-// Remarques : 
-//   (*) Si aucune clé n'est spécifiée, l'assembly n'est pas signé.
-//   (*) KeyName fait référence à une clé installée dans le fournisseur de
-//       services cryptographiques (CSP) de votre ordinateur. KeyFile fait référence à un fichier qui contient
-//       une clé.
-//   (*) Si les valeurs de KeyFile et de KeyName sont spécifiées, le 
-//       traitement suivant se produit :
-//       (1) Si KeyName se trouve dans le CSP, la clé est utilisée.
-//       (2) Si KeyName n'existe pas mais que KeyFile existe, la clé 
-//           de KeyFile est installée dans le CSP et utilisée.
-//   (*) Pour créer KeyFile, vous pouvez utiliser l'utilitaire sn.exe (Strong Name, Nom fort).
-//        Lors de la spécification de KeyFile, son emplacement doit être
-//        relatif au répertoire de sortie du projet qui est
-//       %Project Directory%\obj\<configuration>. Par exemple, si votre KeyFile se trouve
-//       dans le répertoire du projet, vous devez spécifier l'attribut 
-//       AssemblyKeyFile sous la forme [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
-//   (*) DelaySign (signature différée) est une option avancée. Pour plus d'informations, consultez la
-//       documentation Microsoft .NET Framework.
-//
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile("")]
-[assembly: AssemblyKeyName("")]

libmediainfo_0.7.34.tar.bz2/Project/MSCS/Example/HowToUse_Dll.cs Deleted

@@ -1,233 +0,0 @@
-// MediaInfoDLL - All info about media files
-// This software is provided 'as-is', without any express or implied
-// warranty.  In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-//    claim that you wrote the original software. If you use this software
-//    in a product, an acknowledgment in the product documentation would be
-//    appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//    misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//
-// Microsoft Visual C# example
-//
-// To make this example working, you must put MediaInfo.Dll and Example.ogg
-// in the "./Bin/__ConfigurationName__" folder
-// and add MediaInfoDll.cs to your project
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-using System;
-using System.Drawing;
-using System.Collections;
-using System.ComponentModel;
-using System.Windows.Forms;
-using System.Data;
-using System.Text;
-using System.IO;
-using MediaInfoLib;
-
-namespace MediaInfoLib_MSCS
-{
-	/// <summary>
-	/// Summary description for Form1.
-	/// </summary>
-	public class Form1 : System.Windows.Forms.Form
-	{
-		private System.Windows.Forms.RichTextBox richTextBox1;
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.Container components = null;
-
-		public Form1()
-		{
-			//
-			// Required for Windows Form Designer support
-			//
-			InitializeComponent();
-
-			//
-			// TODO: Add any constructor code after InitializeComponent call
-			//
-		}
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		protected override void Dispose( bool disposing )
-		{
-			if( disposing )
-			{
-				if (components != null) 
-				{
-					components.Dispose();
-				}
-			}
-			base.Dispose( disposing );
-		}
-
-		#region Windows Form Designer generated code
-		/// <summary>
-		/// Méthode requise pour la prise en charge du concepteur - ne modifiez pas
-		/// le contenu de cette méthode avec l'éditeur de code.
-		/// </summary>
-		private void InitializeComponent()
-		{
-            this.richTextBox1 = new System.Windows.Forms.RichTextBox();
-            this.SuspendLayout();
-            // 
-            // richTextBox1
-            // 
-            this.richTextBox1.Location = new System.Drawing.Point(0, 0);
-            this.richTextBox1.Name = "richTextBox1";
-            this.richTextBox1.Size = new System.Drawing.Size(768, 512);
-            this.richTextBox1.TabIndex = 0;
-            this.richTextBox1.Text = "";
-            // 
-            // Form1
-            // 
-            this.ClientSize = new System.Drawing.Size(770, 514);
-            this.Controls.Add(this.richTextBox1);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
-            this.Name = "Form1";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "How to use MediaInfo.Dll";
-            this.Load += new System.EventHandler(this.Form1_Load);
-            this.ResumeLayout(false);
-
-		}
-		#endregion
-
-		/// <summary>
-		/// The main entry point for the application.
-		/// </summary>
-
-
-		[STAThread]
-		static void Main() 
-		{
-			Application.Run(new Form1());
-		}
-
-		private void Form1_Load(object sender, System.EventArgs e)
-		{
-			//Test if version of DLL is compatible : 3rd argument is "version of DLL tested;Your application name;Your application version"
-            String ToDisplay;
-            MediaInfo MI = new MediaInfo();
-
-            ToDisplay = MI.Option("Info_Version", "0.7.0.0;MediaInfoDLL_Example_CS;0.7.0.0");
-			if (ToDisplay.Length == 0)
-			{
-                richTextBox1.Text = "MediaInfo.Dll: this version of the DLL is not compatible";
-				return;
-			}
-
-			//Information about MediaInfo
-			ToDisplay += "\r\n\r\nInfo_Parameters\r\n";
-			ToDisplay += MI.Option("Info_Parameters");
-
-			ToDisplay += "\r\n\r\nInfo_Capacities\r\n";
-            ToDisplay += MI.Option("Info_Capacities");
-
-			ToDisplay += "\r\n\r\nInfo_Codecs\r\n";
-            ToDisplay += MI.Option("Info_Codecs");
-
-			//An example of how to use the library
-			ToDisplay += "\r\n\r\nOpen\r\n";
-			MI.Open("Example.ogg");
-
-			ToDisplay += "\r\n\r\nInform with Complete=false\r\n";
-			MI.Option("Complete");
-			ToDisplay += MI.Inform();
-
-            ToDisplay += "\r\n\r\nInform with Complete=true\r\n";
-			MI.Option("Complete", "1");
-			ToDisplay += MI.Inform();
-
-            ToDisplay += "\r\n\r\nCustom Inform\r\n";
-            MI.Option("Inform", "General;File size is %FileSize% bytes");
-            ToDisplay += MI.Inform();
-
-            ToDisplay += "\r\n\r\nGet with Stream=General and Parameter='FileSize'\r\n";
-            ToDisplay += MI.Get(0, 0, "FileSize");
-
-            ToDisplay += "\r\n\r\nGet with Stream=General and Parameter=46\r\n";
-            ToDisplay += MI.Get(0, 0, 46);
-
-            ToDisplay += "\r\n\r\nCount_Get with StreamKind=Stream_Audio\r\n";
-            ToDisplay += MI.Count_Get(StreamKind.Audio);
-
-            ToDisplay += "\r\n\r\nGet with Stream=General and Parameter='AudioCount'\r\n";
-            ToDisplay += MI.Get(StreamKind.General, 0, "AudioCount");
-
-            ToDisplay += "\r\n\r\nGet with Stream=Audio and Parameter='StreamCount'\r\n";
-            ToDisplay += MI.Get(StreamKind.Audio, 0, "StreamCount");
-
-            ToDisplay += "\r\n\r\nClose\r\n";
-            MI.Close();
-
-			//Example with a stream
-            //ToDisplay+="\r\n"+ExampleWithStream()+"\r\n";
-
-            //Displaying the text
-			richTextBox1.Text = ToDisplay;
-		}
-
-        String ExampleWithStream()
-        {
-            //Initilaizing MediaInfo
-            MediaInfo MI = new MediaInfo();
-
-            //From: preparing an example file for reading
-            FileStream From = new FileStream("Example.ogg", FileMode.Open, FileAccess.Read);
-
-            //From: preparing a memory buffer for reading
-            byte[] From_Buffer = new byte[64*1024];
-            int    From_Buffer_Size; //The size of the read file buffer
-
-            //Preparing to fill MediaInfo with a buffer
-            MI.Open_Buffer_Init(From.Length, 0);
-
-            //The parsing loop
-            do
-            {
-                //Reading data somewhere, do what you want for this.
-                From_Buffer_Size=From.Read(From_Buffer, 0, 64*1024);
-
-                //Sending the buffer to MediaInfo
-                System.Runtime.InteropServices.GCHandle GC = System.Runtime.InteropServices.GCHandle.Alloc(From_Buffer, System.Runtime.InteropServices.GCHandleType.Pinned);
-                IntPtr From_Buffer_IntPtr = GC.AddrOfPinnedObject();
-                if (MI.Open_Buffer_Continue(From_Buffer_IntPtr, (IntPtr)From_Buffer_Size) == 0) //Note: How to provide a buffer[]?
-                {
-                    GC.Free();
-                    break;
-                }
-                GC.Free();
-
-                //Testing if MediaInfo request to go elsewhere
-                if (MI.Open_Buffer_Continue_GoTo_Get()!=-1)
-                {
-                    Int64 Position=From.Seek(MI.Open_Buffer_Continue_GoTo_Get(), SeekOrigin.Begin); //Position the file
-                    MI.Open_Buffer_Init(From.Length, Position); //Informing MediaInfo we have seek
-                }
-            }
-            while (From_Buffer_Size>0);
-
-            //Finalizing
-            MI.Open_Buffer_Finalize(); //This is the end of the stream, MediaInfo must finnish some work
-
-            //Get() example
-            return MI.Get(StreamKind.General, 0, "Format");
-        }
-	}
-}

libmediainfo_0.7.34.tar.bz2/Project/MSCS/Example/MediaInfoDLL.cs Deleted

@@ -1,291 +0,0 @@
-// MediaInfoDLL - All info about media files, for DLL
-// Copyright (C) 2002-2009 Jerome Martinez, Zen@MediaArea.net
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// MediaInfoDLL - All info about media files, for DLL
-// Copyright (C) 2002-2009 Jerome Martinez, Zen@MediaArea.net
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//
-// Microsoft Visual C# wrapper for MediaInfo Library
-// See MediaInfo.h for help
-//
-// To make it working, you must put MediaInfo.Dll
-// in the executable folder
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-using System;
-using System.Runtime.InteropServices;
-
-namespace MediaInfoLib
-{
-    public enum StreamKind
-    {
-        General,
-        Video,
-        Audio,
-        Text,
-        Chapters,
-        Image
-    }
-
-    public enum InfoKind
-    {
-        Name,
-        Text,
-        Measure,
-        Options,
-        NameText,
-        MeasureText,
-        Info,
-        HowTo
-    }
-
-    public enum InfoOptions
-    {
-        ShowInInform,
-        Support,
-        ShowInSupported,
-        TypeOfValue
-    }
-
-    public enum InfoFileOptions
-    {
-        FileOption_Nothing      = 0x00,
-        FileOption_Recursive    = 0x01,
-        FileOption_CloseAll     = 0x02,
-        FileOption_Max          = 0x04
-    };
-
-
-    public class MediaInfo
-    {
-        //Import of DLL functions. DO NOT USE until you know what you do (MediaInfo DLL do NOT use CoTaskMemAlloc to allocate memory)  
-        [DllImport("MediaInfo.dll")]
-        private static extern IntPtr MediaInfo_New();
-        [DllImport("MediaInfo.dll")]
-        private static extern void   MediaInfo_Delete(IntPtr Handle);
-        [DllImport("MediaInfo.dll")]
-        private static extern IntPtr MediaInfo_Open(IntPtr Handle, [MarshalAs(UnmanagedType.LPWStr)] string FileName);
-        [DllImport("MediaInfo.dll")]
-        private static extern IntPtr MediaInfoA_Open(IntPtr Handle, IntPtr FileName);
-        [DllImport("MediaInfo.dll")]
-        private static extern IntPtr MediaInfo_Open_Buffer_Init(IntPtr Handle, Int64 File_Size, Int64 File_Offset);
-        [DllImport("MediaInfo.dll")]
-        private static extern IntPtr MediaInfoA_Open(IntPtr Handle, Int64 File_Size, Int64 File_Offset);
-        [DllImport("MediaInfo.dll")]
-        private static extern IntPtr MediaInfo_Open_Buffer_Continue(IntPtr Handle, IntPtr Buffer, IntPtr Buffer_Size);
-        [DllImport("MediaInfo.dll")]
-        private static extern IntPtr MediaInfoA_Open_Buffer_Continue(IntPtr Handle, Int64 File_Size, byte[] Buffer, IntPtr Buffer_Size);
-        [DllImport("MediaInfo.dll")]
-        private static extern Int64  MediaInfo_Open_Buffer_Continue_GoTo_Get(IntPtr Handle);
-        [DllImport("MediaInfo.dll")]
-        private static extern Int64  MediaInfoA_Open_Buffer_Continue_GoTo_Get(IntPtr Handle);
-        [DllImport("MediaInfo.dll")]
-        private static extern IntPtr MediaInfo_Open_Buffer_Finalize(IntPtr Handle);
-        [DllImport("MediaInfo.dll")]
-        private static extern IntPtr MediaInfoA_Open_Buffer_Finalize(IntPtr Handle);
-        [DllImport("MediaInfo.dll")]
-        private static extern void   MediaInfo_Close(IntPtr Handle);
-        [DllImport("MediaInfo.dll")]
-        private static extern IntPtr MediaInfo_Inform(IntPtr Handle, IntPtr Reserved);
-        [DllImport("MediaInfo.dll")]
-        private static extern IntPtr MediaInfoA_Inform(IntPtr Handle, IntPtr Reserved);
-        [DllImport("MediaInfo.dll")]
-        private static extern IntPtr MediaInfo_GetI(IntPtr Handle, IntPtr StreamKind, IntPtr StreamNumber, IntPtr Parameter, IntPtr KindOfInfo);
-        [DllImport("MediaInfo.dll")]
-        private static extern IntPtr MediaInfoA_GetI(IntPtr Handle, IntPtr StreamKind, IntPtr StreamNumber, IntPtr Parameter, IntPtr KindOfInfo);
-        [DllImport("MediaInfo.dll")]
-        private static extern IntPtr MediaInfo_Get(IntPtr Handle, IntPtr StreamKind, IntPtr StreamNumber, [MarshalAs(UnmanagedType.LPWStr)] string Parameter, IntPtr KindOfInfo, IntPtr KindOfSearch);
-        [DllImport("MediaInfo.dll")]
-        private static extern IntPtr MediaInfoA_Get(IntPtr Handle, IntPtr StreamKind, IntPtr StreamNumber, IntPtr Parameter, IntPtr KindOfInfo, IntPtr KindOfSearch);
-        [DllImport("MediaInfo.dll")]
-        private static extern IntPtr MediaInfo_Option(IntPtr Handle, [MarshalAs(UnmanagedType.LPWStr)] string Option, [MarshalAs(UnmanagedType.LPWStr)] string Value);
-        [DllImport("MediaInfo.dll")]
-        private static extern IntPtr MediaInfoA_Option(IntPtr Handle, IntPtr Option,  IntPtr Value);
-        [DllImport("MediaInfo.dll")]
-        private static extern IntPtr MediaInfo_State_Get(IntPtr Handle);
-        [DllImport("MediaInfo.dll")]
-        private static extern IntPtr MediaInfo_Count_Get(IntPtr Handle, IntPtr StreamKind, IntPtr StreamNumber);
-
-        //MediaInfo class
-        public MediaInfo()
-        {
-            Handle = MediaInfo_New();
-            if (Environment.OSVersion.ToString().IndexOf("Windows")==-1)
-                MustUseAnsi=true;
-            else
-                MustUseAnsi=false;
-        }
-        ~MediaInfo() { MediaInfo_Delete(Handle); }
-        public int Open(String FileName)
-        {
-            if (MustUseAnsi)
-            {
-                IntPtr FileName_Ptr = Marshal.StringToHGlobalAnsi(FileName);
-                int ToReturn = (int)MediaInfoA_Open(Handle, FileName_Ptr);
-                Marshal.FreeHGlobal(FileName_Ptr);
-                return ToReturn;
-            }
-            else
-                return (int)MediaInfo_Open(Handle, FileName);
-        }
-        public int Open_Buffer_Init(Int64 File_Size, Int64 File_Offset)
-        {
-            return (int)MediaInfo_Open_Buffer_Init(Handle, File_Size, File_Offset);
-        }
-        public int Open_Buffer_Continue(IntPtr Buffer, IntPtr Buffer_Size)
-        {
-            return (int)MediaInfo_Open_Buffer_Continue(Handle, Buffer, Buffer_Size);
-        }
-        public Int64 Open_Buffer_Continue_GoTo_Get()
-        {
-            return (int)MediaInfo_Open_Buffer_Continue_GoTo_Get(Handle);
-        }
-        public int Open_Buffer_Finalize()
-        {
-            return (int)MediaInfo_Open_Buffer_Finalize(Handle);
-        }
-        public void Close() { MediaInfo_Close(Handle); }
-        public String Inform()
-        {
-            if (MustUseAnsi)
-                return Marshal.PtrToStringAnsi(MediaInfoA_Inform(Handle, (IntPtr)0));
-            else
-                return Marshal.PtrToStringUni(MediaInfo_Inform(Handle, (IntPtr)0));
-        }
-        public String Get(StreamKind StreamKind, int StreamNumber, String Parameter, InfoKind KindOfInfo, InfoKind KindOfSearch)
-        {
-            if (MustUseAnsi)
-            {
-                IntPtr Parameter_Ptr=Marshal.StringToHGlobalAnsi(Parameter);
-                String ToReturn=Marshal.PtrToStringAnsi(MediaInfoA_Get(Handle, (IntPtr)StreamKind, (IntPtr)StreamNumber, Parameter_Ptr, (IntPtr)KindOfInfo, (IntPtr)KindOfSearch));
-                Marshal.FreeHGlobal(Parameter_Ptr);
-                return ToReturn;
-            }
-            else
-                return Marshal.PtrToStringUni(MediaInfo_Get(Handle, (IntPtr)StreamKind, (IntPtr)StreamNumber, Parameter, (IntPtr)KindOfInfo, (IntPtr)KindOfSearch));
-        }
-        public String Get(StreamKind StreamKind, int StreamNumber, int Parameter, InfoKind KindOfInfo)
-        {
-            if (MustUseAnsi)
-                return Marshal.PtrToStringAnsi(MediaInfoA_GetI(Handle, (IntPtr)StreamKind, (IntPtr)StreamNumber, (IntPtr)Parameter, (IntPtr)KindOfInfo));
-            else
-                return Marshal.PtrToStringUni(MediaInfo_GetI(Handle, (IntPtr)StreamKind, (IntPtr)StreamNumber, (IntPtr)Parameter, (IntPtr)KindOfInfo));
-        }
-        public String Option(String Option, String Value)
-        {
-            if (MustUseAnsi)
-            {
-                IntPtr Option_Ptr=Marshal.StringToHGlobalAnsi(Option);
-                IntPtr Value_Ptr=Marshal.StringToHGlobalAnsi(Value);
-                String ToReturn=Marshal.PtrToStringAnsi(MediaInfoA_Option(Handle, Option_Ptr, Value_Ptr));
-                Marshal.FreeHGlobal(Option_Ptr);
-                Marshal.FreeHGlobal(Value_Ptr);
-                return ToReturn;
-            }
-            else
-                return Marshal.PtrToStringUni(MediaInfo_Option(Handle, Option, Value));
-        }
-        public int State_Get() { return (int)MediaInfo_State_Get(Handle); }
-        public int Count_Get(StreamKind StreamKind, int StreamNumber) { return (int)MediaInfo_Count_Get(Handle, (IntPtr)StreamKind, (IntPtr)StreamNumber); }
-        private IntPtr Handle;
-        private bool MustUseAnsi;
-
-        //Default values, if you know how to set default values in C#, say me
-        public String Get(StreamKind StreamKind, int StreamNumber, String Parameter, InfoKind KindOfInfo) { return Get(StreamKind, StreamNumber, Parameter, KindOfInfo, InfoKind.Name); }
-        public String Get(StreamKind StreamKind, int StreamNumber, String Parameter) { return Get(StreamKind, StreamNumber, Parameter, InfoKind.Text, InfoKind.Name); }
-        public String Get(StreamKind StreamKind, int StreamNumber, int Parameter) { return Get(StreamKind, StreamNumber, Parameter, InfoKind.Text); }
-        public String Option(String Option_) { return Option(Option_, ""); }
-        public int Count_Get(StreamKind StreamKind) { return Count_Get(StreamKind, -1); }
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    public class MediaInfoList
-    {
-        //Import of DLL functions. DO NOT USE until you know what you do (MediaInfo DLL do NOT use CoTaskMemAlloc to allocate memory)  
-        [DllImport("MediaInfo.dll")]
-        private static extern IntPtr MediaInfoList_New();
-        [DllImport("MediaInfo.dll")]
-        private static extern void MediaInfoList_Delete(IntPtr Handle);
-        [DllImport("MediaInfo.dll")]
-        private static extern IntPtr MediaInfoList_Open(IntPtr Handle, [MarshalAs(UnmanagedType.LPWStr)] string FileName, IntPtr Options);
-        [DllImport("MediaInfo.dll")]
-        private static extern void MediaInfoList_Close(IntPtr Handle, IntPtr FilePos);
-        [DllImport("MediaInfo.dll")]
-        private static extern IntPtr MediaInfoList_Inform(IntPtr Handle, IntPtr FilePos, IntPtr Reserved);
-        [DllImport("MediaInfo.dll")]
-        private static extern IntPtr MediaInfoList_GetI(IntPtr Handle, IntPtr FilePos, IntPtr StreamKind, IntPtr StreamNumber, IntPtr Parameter, IntPtr KindOfInfo);
-        [DllImport("MediaInfo.dll")]
-        private static extern IntPtr MediaInfoList_Get(IntPtr Handle, IntPtr FilePos, IntPtr StreamKind, IntPtr StreamNumber, [MarshalAs(UnmanagedType.LPWStr)] string Parameter, IntPtr KindOfInfo, IntPtr KindOfSearch);
-        [DllImport("MediaInfo.dll")]
-        private static extern IntPtr MediaInfoList_Option(IntPtr Handle, [MarshalAs(UnmanagedType.LPWStr)] string Option, [MarshalAs(UnmanagedType.LPWStr)] string Value);
-        [DllImport("MediaInfo.dll")]
-        private static extern IntPtr MediaInfoList_State_Get(IntPtr Handle);
-        [DllImport("MediaInfo.dll")]
-        private static extern IntPtr MediaInfoList_Count_Get(IntPtr Handle, IntPtr FilePos, IntPtr StreamKind, IntPtr StreamNumber);
-
-        //MediaInfo class
-        public MediaInfoList() { Handle = MediaInfoList_New(); }
-        ~MediaInfoList() { MediaInfoList_Delete(Handle); }
-        public int Open(String FileName, InfoFileOptions Options) { return (int)MediaInfoList_Open(Handle, FileName, (IntPtr)Options); }
-        public void Close(int FilePos) { MediaInfoList_Close(Handle, (IntPtr)FilePos); }
-        public String Inform(int FilePos) { return Marshal.PtrToStringUni(MediaInfoList_Inform(Handle, (IntPtr)FilePos, (IntPtr)0)); }
-        public String Get(int FilePos, StreamKind StreamKind, int StreamNumber, String Parameter, InfoKind KindOfInfo, InfoKind KindOfSearch) { return Marshal.PtrToStringUni(MediaInfoList_Get(Handle, (IntPtr)FilePos, (IntPtr)StreamKind, (IntPtr)StreamNumber, Parameter, (IntPtr)KindOfInfo, (IntPtr)KindOfSearch)); }
-        public String Get(int FilePos, StreamKind StreamKind, int StreamNumber, int Parameter, InfoKind KindOfInfo) { return Marshal.PtrToStringUni(MediaInfoList_GetI(Handle, (IntPtr)FilePos, (IntPtr)StreamKind, (IntPtr)StreamNumber, (IntPtr)Parameter, (IntPtr)KindOfInfo)); }
-        public String Option(String Option, String Value) { return Marshal.PtrToStringUni(MediaInfoList_Option(Handle, Option, Value)); }
-        public int State_Get() { return (int)MediaInfoList_State_Get(Handle); }
-        public int Count_Get(int FilePos, StreamKind StreamKind, int StreamNumber) { return (int)MediaInfoList_Count_Get(Handle, (IntPtr)FilePos, (IntPtr)StreamKind, (IntPtr)StreamNumber); }
-        private IntPtr Handle;
-
-        //Default values, if you know how to set default values in C#, say me
-        public void Open(String FileName) { Open(FileName, 0); }
-        public void Close() { Close(-1); }
-        public String Get(int FilePos, StreamKind StreamKind, int StreamNumber, String Parameter, InfoKind KindOfInfo) { return Get(FilePos, StreamKind, StreamNumber, Parameter, KindOfInfo, InfoKind.Name); }
-        public String Get(int FilePos, StreamKind StreamKind, int StreamNumber, String Parameter) { return Get(FilePos, StreamKind, StreamNumber, Parameter, InfoKind.Text, InfoKind.Name); }
-        public String Get(int FilePos, StreamKind StreamKind, int StreamNumber, int Parameter) { return Get(FilePos, StreamKind, StreamNumber, Parameter, InfoKind.Text); }
-        public String Option(String Option_) { return Option(Option_, ""); }
-        public int Count_Get(int FilePos, StreamKind StreamKind) { return Count_Get(FilePos, StreamKind, -1); }
-    }
-
-} //NameSpace

libmediainfo_0.7.34.tar.bz2/Project/MSCS/asp_net_web_application Deleted

libmediainfo_0.7.34.tar.bz2/Project/MSCS/asp_net_web_application/Default.aspx.designer.cs Deleted

libmediainfo_0.7.34.tar.bz2/Project/MSCS/asp_net_web_application/MediaInfoDLL.cs Deleted

libmediainfo_0.7.34.tar.bz2/Project/MSCS/asp_net_web_application/Properties Deleted

libmediainfo_0.7.34.tar.bz2/Project/MSCS/asp_net_web_application/Properties/AssemblyInfo.cs Deleted

@@ -1,35 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("asp_net_web_application")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Zenitram")]
-[assembly: AssemblyProduct("asp_net_web_application")]
-[assembly: AssemblyCopyright("Copyright © Zenitram 2009")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("3d5900ae-111a-45be-96b3-d9e4606ca793")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

libmediainfo_0.7.34.tar.bz2/Project/MSVC2010/MpegTs_TimeStamps Deleted

libmediainfo_0.7.34.tar.bz2/Project/MSVC2010/MpegTs_TimeStamps/MpegTs_TimeStamps.vcxproj Deleted

@@ -1,346 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="DebugA|Win32">
-      <Configuration>DebugA</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="DebugA|x64">
-      <Configuration>DebugA</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseA|Win32">
-      <Configuration>ReleaseA</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="ReleaseA|x64">
-      <Configuration>ReleaseA</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{E3C0D84E-0714-4002-8070-356AD1DB30EB}</ProjectGuid>
-    <RootNamespace>MpegTs_TimeStamps</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'">$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'">$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'">$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'">$(Platform)\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'">$(Platform)\$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'">$(Platform)\$(Configuration)\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MediaInfo_DCA</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'">MediaInfo_DCA</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'">MediaInfo_DCA</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MediaInfo_DCA</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'">MediaInfo_DCA</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MediaInfo_DCA</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'">MediaInfo_DCA</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MediaInfo_DCA</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../../Source;../../../../ZenLib/Source;../../../../ZLib;../../../../Shared/Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>MediaInfo.lib;ZenLib.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\MediaInfoLib\Project\MSVC\Library\$(Platform)\$(Configuration);..\..\..\..\ZenLib\Project\MSVC\Library\$(Platform)\$(Configuration);..\..\..\..\zlib\projects\MSVC\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <OutputFile>$(OutDir)\MediaInfo_DCA.exe</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-      <OutputFile>$(OutDir)\MediaInfo_DCA.exe</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>../../../Source;../../../../ZenLib/Source;../../../../ZLib;../../../../Shared/Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>MediaInfo.lib;ZenLib.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\..\MediaInfoLib\Project\MSVC\Library\$(Platform)\$(Configuration);..\..\..\..\ZenLib\Project\MSVC\Library\$(Platform)\$(Configuration);..\..\..\..\zlib\projects\MSVC\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <OutputFile>$(OutDir)\MediaInfo_DCA.exe</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX64</TargetMachine>
-      <OutputFile>$(OutDir)\MediaInfo_DCA.exe</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <OutputFile>$(OutDir)\MediaInfo_DCA.exe</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <WarningLevel>Level4</WarningLevel>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)\MediaInfo_DCA.exe</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-    </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <TargetMachine>MachineX86</TargetMachine>
-      <OutputFile>$(OutDir)\MediaInfo_DCA.exe</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <WarningLevel>Level4</WarningLevel>
-    </ClCompile>
-    <Link>
-      <OutputFile>$(OutDir)\MediaInfo_DCA.exe</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\Source\MediaInfoDLL\MediaInfoDLL.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\Source\MediaInfoDLL\MediaInfoDLL.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Dll\MediaInfoDll.vcxproj">
-      <Project>{be6d3ef8-2f82-4f1e-956a-890c3614a2d5}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Source\Example\MpegTs_TimeStamps.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file

libmediainfo_0.7.34.tar.bz2/Project/MSVC2010/MpegTs_TimeStamps/MpegTs_TimeStamps.vcxproj.filters Deleted

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Source\Example\MpegTs_TimeStamps.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\Source\MediaInfoDLL\MediaInfoDLL.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\..\Source\MediaInfoDLL\MediaInfoDLL.def">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-</Project>
\ No newline at end of file

libmediainfo_0.7.34.tar.bz2/Project/MSVC2010/MpegTs_TimeStamps/Win32 Deleted

libmediainfo_0.7.34.tar.bz2/Project/MSVC2010/MpegTs_TimeStamps/Win32/Debug Deleted

libmediainfo_0.7.34.tar.bz2/Project/MSVC2010/MpegTs_TimeStamps/Win32/Debug/MediaInfo_DCA_manifest.rc Deleted

libmediainfo_0.7.34.tar.bz2/Project/MSVC2010/ShellExtension/Win32 Deleted

libmediainfo_0.7.34.tar.bz2/Project/MSVC2010/ShellExtension/Win32/Debug Deleted

libmediainfo_0.7.34.tar.bz2/Project/MSVC2010/ShellExtension/Win32/Debug/Intermediate Deleted

libmediainfo_0.7.34.tar.bz2/Project/MSVC2010/ShellExtension/Win32/Debug/Intermediate/MediaInfoShellExt_manifest.rc Deleted

libmediainfo_0.7.34.tar.bz2/Project/MSVC2010/ShellExtension/Win32/Debug/Intermediate/MediaInfo_InfoTip.dll_manifest.rc Deleted

libmediainfo_0.7.34.tar.bz2/Project/MSVC2010/ShellExtension/Win32/Debug/Intermediate/MediaInfo_InfoTip_manifest.rc Deleted

libmediainfo_0.7.34.tar.bz2/Project/MSVC2010/ShellExtension/x64 Deleted

libmediainfo_0.7.34.tar.bz2/Project/MSVC2010/ShellExtension/x64/Debug Deleted

libmediainfo_0.7.34.tar.bz2/Project/MSVC2010/ShellExtension/x64/Debug/Intermediate Deleted

libmediainfo_0.7.34.tar.bz2/Project/MSVC2010/ShellExtension/x64/Debug/Intermediate/MediaInfo_InfoTip_manifest.rc Deleted

libmediainfo_0.7.34.tar.bz2/Source/Example/DCA_Demux.c Deleted

@@ -1,321 +0,0 @@
-#include "stdio.h"
-#include "windows.h"
-#include "MediaInfoDLL/MediaInfoDLL.h"
-#include "MediaInfo/MediaInfo_Events.h"
-
-/***************************************************************************/
-/* Example of demuxing                                                     */
-/***************************************************************************/
-
-/*You can define your own structure*/
-struct UserHandle_struct
-{
-    void* MI;
-    const char* FileName;
-
-    /*Global File handler in order not to open them every time */
-    struct filehandlerfromids
-    {
-        #define StreamIDs_Max 100 //Arbitrary count of maximum stream IDs
-        MediaInfo_int64u StreamIDs[StreamIDs_Max]; 
-        HANDLE FileHandler; 
-    };
-    #define FileHandlerFromIDs_Max 100 //Arbitrary count of maximum outputs
-    struct filehandlerfromids FileHandlerFromIDs[FileHandlerFromIDs_Max];
-};
-
-
-void Global_Demux_0 (struct MediaInfo_Event_Global_Demux_0* Event, struct UserHandle_struct* UserHandler)
-{
-    /***********************************************************************/
-    /* This is only an example, do wat you want with the buffer            */
-    /***********************************************************************/
-
-    size_t FileHandlerFromIDs_Pos;
-    DWORD Content_Size_Written;
-    unsigned char ParserID;
-
-    /*Getting the parser identifier, if you want to know at wich demux level you are*/
-    ParserID    =(unsigned char) ((Event->EventCode&0xFF000000)>>24);
-    /*if (ParserID!=MediaInfo_Parser_MpegPs)*/ /*Example to test you are at the PES level*/
-    /*    return;*/
-    
-    /*Testing if we already open the file*/
-    for (FileHandlerFromIDs_Pos=0; FileHandlerFromIDs_Pos<FileHandlerFromIDs_Max; FileHandlerFromIDs_Pos++)
-    {
-        int IsFound=1;
-        int IsEmpty=1;
-        size_t StreamIDs_Pos;
-        for (StreamIDs_Pos=0; StreamIDs_Pos<Event->StreamIDs_Size; StreamIDs_Pos++)
-        {
-            if (UserHandler->FileHandlerFromIDs[FileHandlerFromIDs_Pos].StreamIDs[StreamIDs_Pos]!=Event->StreamIDs[StreamIDs_Pos])
-                IsFound=0;
-            if (UserHandler->FileHandlerFromIDs[FileHandlerFromIDs_Pos].StreamIDs[StreamIDs_Pos]!=(MediaInfo_int64u)-1)
-                IsEmpty=0;
-        }
-
-        if (IsEmpty!=0)
-        {
-            /*There is no already open file, creating one*/
-            size_t FileName_Size=strlen(UserHandler->FileName);
-            size_t StreamIDs_Pos=0;
-            char FileName[10000]; /*need some place, arbitrary size*/
-            if (FileName_Size>10000-100)
-                return;
-            strcpy(FileName, UserHandler->FileName);
-            for (StreamIDs_Pos=0; StreamIDs_Pos<Event->StreamIDs_Size; StreamIDs_Pos++)
-            {
-                MediaInfo_int8u Pos=0;
-                FileName[FileName_Size]='.';
-                FileName_Size++;
-                for (Pos=0; Pos<Event->StreamIDs_Width[StreamIDs_Pos]; Pos++)
-                {
-                    /*Adding StreamID, in Hexa*/
-                    MediaInfo_int8u StreamID_1Byte=(MediaInfo_int8u)((Event->StreamIDs[StreamIDs_Pos]>>((Event->StreamIDs_Width[StreamIDs_Pos]-1-Pos)*4))&0xFF);
-                    char ToAdd=((StreamID_1Byte&0x0F)>=0xA)?('A'+(StreamID_1Byte&0x0F)-10):('0'+(StreamID_1Byte&0x0F));
-                    FileName[FileName_Size]=ToAdd;
-                    FileName_Size++;
-
-                    /*Registering the ID*/
-                    UserHandler->FileHandlerFromIDs[FileHandlerFromIDs_Pos].StreamIDs[StreamIDs_Pos]=Event->StreamIDs[StreamIDs_Pos];
-                }
-            }
-            FileName[FileName_Size]='\0';
-
-            UserHandler->FileHandlerFromIDs[FileHandlerFromIDs_Pos].FileHandler=CreateFile(FileName, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL);
-            if (UserHandler->FileHandlerFromIDs[FileHandlerFromIDs_Pos].FileHandler==INVALID_HANDLE_VALUE)
-            {
-                printf("Can not open output file %s\n, FileName");
-                return;
-            }
-            break;
-        }
-
-        if (IsFound!=0)
-        {
-            break;
-        }
-    }
-
-    /*Writing file*/
-    WriteFile(UserHandler->FileHandlerFromIDs[FileHandlerFromIDs_Pos].FileHandler, Event->Content, Event->Content_Size, &Content_Size_Written, NULL);
-}
-
-/***************************************************************************/
-/* The callback function                                                   */
-/***************************************************************************/
-
-void __stdcall Event_CallBackFunction(unsigned char* Data_Content, size_t Data_Size, void* UserHandler_Void)
-{
-    /*Retrieving UserHandler*/
-    struct UserHandle_struct*           UserHandler=(struct UserHandle_struct*)UserHandler_Void;
-    struct MediaInfo_Event_Generic*     Event_Generic=(struct MediaInfo_Event_Generic*) Data_Content;
-    unsigned char                       ParserID;
-    unsigned short                      EventID;
-    unsigned char                       EventVersion;
-
-    /*integrity tests*/
-    if (Data_Size<4)
-        return; //There is a problem
-
-    /*Do what you need with the event, here is only an example*/
-    /*Retrieving EventID*/
-    ParserID    =(unsigned char) ((Event_Generic->EventCode&0xFF000000)>>24);
-    EventID     =(unsigned short)((Event_Generic->EventCode&0x00FFFF00)>>8 );
-    EventVersion=(unsigned char) ( Event_Generic->EventCode&0x000000FF     );
-
-    /*Global to all parsers*/
-    switch (EventID)
-    {
-        case MediaInfo_Event_Global_Demux                                           : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Global_Demux_0)) Global_Demux_0((struct MediaInfo_Event_Global_Demux_0*)Data_Content, UserHandler); break;
-        default                                                                     : ;
-    }
-}
-
-/***************************************************************************/
-/* Parsing the file, example with the stream interface                     */
-/***************************************************************************/
-
-int MI_Parse (void* MI, const char* FileName)
-{
-    /*Note: You can use basicly the analyze by FileName too, the code her is to demonstrate the usage of buffers, useful if you capture a stream*/
-    HANDLE From;
-    unsigned char* From_Buffer;
-    DWORD From_Buffer_Size;
-    DWORD From_Size_Low; 
-    DWORD From_Size_High;
-    unsigned long long From_Size;
-
-    /***********************************************************************/
-    /* Preparing input file                                                */
-    /***********************************************************************/
-
-    /*From: preparing an example file for reading*/
-    From=CreateFile(FileName, FILE_READ_DATA, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
-    if (From==INVALID_HANDLE_VALUE)
-    {
-        printf("Can not open input file\n");
-        return 1;
-    }
-    From_Size_Low=GetFileSize(From, &From_Size_High);
-    if (From_Size_Low==INVALID_FILE_SIZE && GetLastError()!=NO_ERROR)
-    {
-        printf("Can not get input file size\n");
-        return 1;
-    }
-    From_Size=0x100000000ULL*From_Size_High+From_Size_Low;
-
-    /*From: preparing a memory buffer for reading*/
-    From_Buffer=(unsigned char*)malloc(1500*188); //Note: you can do your own buffer
-
-    /*Preparing to fill MediaInfo with a buffer*/
-    MediaInfo_Open_Buffer_Init(MI, From_Size, 0);
-
-    /***********************************************************************/
-    /* Parsing                                                             */
-    /***********************************************************************/
-
-    /*The parsing loop*/
-    do
-    {
-        /*Reading data somewhere, do what you want for this.*/
-        if (!ReadFile(From, From_Buffer, 1500*188, &From_Buffer_Size, NULL))
-        {
-            /*Clean up*/
-            free(From_Buffer);
-
-            printf("Can not read input file\n");
-            return 1;
-        }
-
-        /*Sending the buffer to MediaInfo*/
-        MediaInfo_Open_Buffer_Continue(MI, From_Buffer, From_Buffer_Size);
-
-        /*Managing seek requests*/
-        if (MediaInfo_Open_Buffer_Continue_GoTo_Get(MI)!=(MediaInfo_int64u)-1)
-        {
-            LARGE_INTEGER GoTo; GoTo.QuadPart=MediaInfo_Open_Buffer_Continue_GoTo_Get(MI);
-            GoTo.LowPart=SetFilePointer(From, GoTo.LowPart, &GoTo.HighPart, FILE_BEGIN);
-            if (GoTo.LowPart==INVALID_SET_FILE_POINTER && GetLastError()!=NO_ERROR)
-            {
-                /*Clean up*/
-                free(From_Buffer);
-
-                printf("Error during input file seek\n");
-                return 1;
-            }
-            MediaInfo_Open_Buffer_Init(MI, From_Size, GoTo.QuadPart);
-        }
-    }
-    while (From_Buffer_Size>0);
-    MediaInfo_Open_Buffer_Finalize(MI);
-
-    /*Clean up*/
-    free(From_Buffer);
-
-    return 0;
-}
-
-/***************************************************************************/
-/* Main                                                                    */
-/***************************************************************************/
-
-int main (int argc, char *argv[])
-{
-    void* MI;
-    char Event_CallBackFunction_Text[1000];
-    const char* MI_Result;
-    const char* FileName=NULL;
-    int argv_Problem=0;
-    struct UserHandle_struct UserHandle;
-    size_t FileHandlerFromIDs_Pos;
-
-    /***********************************************************************/
-    /* Init                                                                */
-    /***********************************************************************/
-
-    for (FileHandlerFromIDs_Pos=0; FileHandlerFromIDs_Pos<FileHandlerFromIDs_Max; FileHandlerFromIDs_Pos++)
-    {
-        size_t StreamIDs_Pos;
-        for (StreamIDs_Pos=0; StreamIDs_Pos<StreamIDs_Max; StreamIDs_Pos++)
-            UserHandle.FileHandlerFromIDs[FileHandlerFromIDs_Pos].StreamIDs[StreamIDs_Pos]=(MediaInfo_int64u)-1;
-    }
-
-    /***********************************************************************/
-    /* Options handling                                                    */
-    /***********************************************************************/
-
-    /*Input*/
-    if (argc!=2)
-    {
-        printf("Usage: MediaInfo_Demux_DCA FileName\n");
-        return 1;
-    }
-    FileName=argv[1];
-    UserHandle.FileName=FileName;
-    
-    /***********************************************************************/
-    /* MediaInfo library init                                              */
-    /***********************************************************************/
-
-    /*Initializing MediaInfo*/
-    if (MediaInfoDLL_Load()!=1)
-    {
-        printf("MediaInfo error: MediaInfo.dll not found\n");
-        return 1;
-    }
-
-    /***********************************************************************/
-    /* Parsing, with events                                                */
-    /***********************************************************************/
-
-    /*Init*/
-    MI=MediaInfo_New();
-    if (MI==NULL)
-    {
-        printf("MediaInfo error: impossible to create a new MediaInfo handler\n");
-        return 1;
-    }
-
-    /*CallBack configuration*/
-    /*MediaInfo need pointer as text, for compatibility with older version) + 64-bit OS handling*/
-    /*form is "CallBack=memory://handlerInDecimal;UserHandler=memory://handlerInDecimal"*/
-    /*UserHandler is a unique value wich will be provided to the callback function, in order to know which MediaInfo instance send the event*/
-    UserHandle.MI=MI;
-    strcpy(Event_CallBackFunction_Text, "CallBack=memory://");
-    _ui64toa_s((unsigned __int64)Event_CallBackFunction, Event_CallBackFunction_Text+strlen(Event_CallBackFunction_Text), 1000-strlen(Event_CallBackFunction_Text), 10);
-    strcpy(Event_CallBackFunction_Text+strlen(Event_CallBackFunction_Text), ";UserHandler=memory://");
-    _ui64toa_s((unsigned __int64)&UserHandle, Event_CallBackFunction_Text+strlen(Event_CallBackFunction_Text), 1000-strlen(Event_CallBackFunction_Text), 10);
-    MI_Result=MediaInfo_Option(MI, "File_Event_CallBackFunction", Event_CallBackFunction_Text);
-    if (strlen(MI_Result))
-    {
-        printf("MediaInfo error: %s\r\n", MI_Result);
-        return 1;
-    }
-
-    /*We want all the stream, not only the beginning*/
-    MI_Result=MediaInfo_Option(MI, "ParseSpeed", "1.0");
-    if (strlen(MI_Result))
-    {
-        printf("MediaInfo error: %s\n", MI_Result);
-        return 1;
-    }
-    
-    /*We want to demux*/
-    MI_Result=MediaInfo_Option(MI, "Demux", "all");
-    if (strlen(MI_Result))
-    {
-        printf("MediaInfo error: %s\n", MI_Result);
-        return 1;
-    }
-    
-    /*Parsing*/
-    /*if (MI_Parse (MI, FileName))*/ /*"By buffer" parsing is not adapted for SSIF files, using "File" parsing, if you need "By buffer" parsing with SSIF, let me know*/
-    if (MediaInfo_Open(MI, FileName)==0)
-        return 1;
-
-    /*Clean up*/
-    MediaInfo_Delete(MI);
-
-    return 0;
-}

libmediainfo_0.7.34.tar.bz2/Source/Example/DCA_Events.c Deleted

@@ -1,2253 +0,0 @@
-#include "stdio.h"
-#include "windows.h"
-#include "MediaInfoDLL/MediaInfoDLL.h"
-#include "MediaInfo/MediaInfo_Events.h"
-#include <stdarg.h>
-#ifdef MEDIAINFO_REGRESSION_TEST
-    FILE* F;
-    const char* F_FileName;
-    #define echo0(_format) fprintf(F, _format)
-    #define echo1(_format, Arg1) fprintf(F, _format, Arg1)
-    #define echo2(_format, Arg1, Arg2) fprintf(F, _format, Arg1, Arg2)
-    #define wecho0(_format) //wfprintf(F, _format)
-    #define wecho1(_format, Arg1) //wfprintf(F, _format, Arg1)
-#else //MEDIAINFO_REGRESSION_TEST
-    #define echo0(_format) printf(_format)
-    #define echo1(_format, Arg1) printf(_format, Arg1)
-    #define echo2(_format, Arg1, Arg2) printf(_format, Arg1, Arg2)
-    #define wecho0(_format) wprintf(_format)
-    #define wecho1(_format, Arg1) wprintf(_format, Arg1)
-#endif //MEDIAINFO_REGRESSION_TEST
-
-/*
-int echo1(char* format, ...)
-{
-    size_t Count=0;
-    char* Pos=format;
-    const char* Vars[3];
-    va_list Args;
-    size_t i;
-
-    //Count how many vars
-    while (Pos=strchr(Pos+(Pos==format?0:1), '%'))
-        Count++;
-
-    //Retrieving data
-    if (Count>3)
-        return 0;    
-    va_start(Args, Count);
-    for (i=0; i<Count; i++)
-        Vars[i]=va_arg(Args, const char*);
-    va_end(Args);
-    
-    #if MEDIAINFO_REGRESSION_TEST
-        switch (Count)
-        {
-            case 0 : return fprintf(F, format);
-            case 1 : return fprintf(F, format, Vars[0]);
-            case 2 : return fprintf(F, format, Vars[0], Vars[1]);
-            case 3 : return fprintf(F, format, Vars[0], Vars[1], Vars[2]);
-        }        
-    #else //MEDIAINFO_REGRESSION_TEST
-        switch (Count)
-        {
-            case 0 : return printf(format);
-            case 1 : return printf(format, Vars[0]);
-            case 2 : return printf(format, Vars[0], Vars[1]);
-            case 3 : return printf(format, Vars[0], Vars[1], Vars[2]);
-        }        
-    #endif //MEDIAINFO_REGRESSION_TEST
-}
-*/
-
-/***************************************************************************/
-/* Some examples of event handling                                         */
-/***************************************************************************/
-
-/*You can define your own structure*/
-struct UserHandle_struct
-{
-    void* MI;
-    int Option_DCA;
-};
-
-void MpegTs_PID_Reserved_0 (struct MediaInfo_Event_MpegTs_PID_Reserved_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1001\n");
-    else
-        echo0("MpegTs, Reserved PID in use\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    PID=%04x\n", Event->PID);
-}
-
-void MpegTs_continuity_counter_Check_NoPayload_0 (struct MediaInfo_Event_MpegTs_continuity_counter_Check_NoPayload_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1002\n");
-    else
-        echo0("MpegTs, no payload, continuity_counter shall not be incremented 1\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    PID=%04x\n", Event->PID);
-    echo1("    PCR=%s\n", Event->PCR_HR);
-}
-
-void MpegTs_continuity_counter_Check_Payload_0 (struct MediaInfo_Event_MpegTs_continuity_counter_Check_Payload_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1003\n");
-    else
-        echo0("MpegTs, payload, continuity_counter shall be incremented by 1\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    PID=%04x\n", Event->PID);
-    echo1("    PCR=%s\n", Event->PCR_HR);
-}
-
-void MpegTs_splice_type_Reserved_0 (struct MediaInfo_Event_MpegTs_splice_type_Reserved_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1004\n");
-    else
-        echo0("MpegTs, Reserved value found in splice_type field\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    PID=%04x\n", Event->PID);
-    echo1("    PCR=%s\n", Event->PCR_HR);
-    echo1("    splice_type=%01x\n", Event->splice_type);
-}
-
-void MpegTs_profile_level_NoMatch_0 (struct MediaInfo_Event_MpegTs_profile_level_NoMatch_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1005\n");
-    else
-        echo0("MpegTs, he container stream descriptor does not match the actual codec\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    PID=%04x\n", Event->PID);
-    echo1("    PCR=%s\n", Event->PCR_HR);
-    echo1("    FromDescriptor=%02x,", Event->profile_and_level_indication_FromDescriptor);
-    echo1(   " FromStream=%02x\n", Event->profile_and_level_indication_FromStream);
-}
-
-void MpegTs_SampleRate_NotConstant_Audio_0 (struct MediaInfo_Event_MpegTs_SampleRate_NotConstant_Audio_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1006\n");
-    else
-        echo0("MpegTs, Sample rate should be constant\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    SampleRate_Before=%i,", Event->SampleRate_Before);
-    echo1(   " SampleRate_After=%i\n", Event->SampleRate_After);
-}
-
-void MpegTs_SampleRate_NotConstant_Video_0 (struct MediaInfo_Event_MpegTs_SampleRate_NotConstant_Video_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1007\n");
-    else
-        echo0("MpegTs, Sample rate should be constant\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    SampleRate_Before=%i,", Event->SampleRate_Before);
-    echo1(   " SampleRate_After=%i\n", Event->SampleRate_After);
-}
-
-void MpegTs_OutOfSync_0 (struct MediaInfo_Event_MpegTs_OutOfSync_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1008\n");
-    else
-        echo0("MpegTs, Out of Sync\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-}
-
-void MpegTs_continuity_counter_Duplicate_0 (struct MediaInfo_Event_MpegTs_continuity_counter_Duplicate_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #????\n");
-    else
-        echo0("MpegTs, Duplicate packets are more than 2 times sent\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    PID=%04x\n", Event->PID);
-    echo1("    PCR=%s\n", Event->PCR_HR);
-}
-
-void MpegTs_TS_program_map_section_NonExistentPID_0 (struct MediaInfo_Event_MpegTs_TS_program_map_section_NonExistentPID_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1011\n");
-    else
-        echo0("MpegTs, The PMT contains a PID which points to a non-existent stream\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    PID=%04x\n", Event->PID);
-    echo1("    PCR=%s\n", Event->PCR_HR);
-    echo1("    program_number=%04x\n", Event->program_number);
-}
-
-void MpegTs_transport_error_indicator_Check_0 (struct MediaInfo_Event_MpegTs_transport_error_indicator_Check_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1012\n");
-    else
-        echo0("MpegTs, transport_error_indicator is set\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    PID=%04x\n", Event->PID);
-    echo1("    PCR=%s\n", Event->PCR_HR);
-}
-
-void MpegTs_PAT_MultiplePrograms_0 (struct MediaInfo_Event_MpegTs_PAT_MultiplePrograms_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.001\n");
-    else
-        echo0("MpegTs, The transport stream has more than a single program\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    Count=%i\n", Event->Count);
-}
-
-void MpegTs_PMT_NoAudioStreams_0 (struct MediaInfo_Event_MpegTs_PMT_NoAudioStreams_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.002\n");
-    else
-        echo0("MpegTs, The program has no audio stream\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    program_number=%04x,", Event->program_number);
-}
-
-void MpegTs_PacketSize_Not188_0 (struct MediaInfo_Event_MpegTs_PacketSize_Not188_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.003\n");
-    else
-        echo0("MpegTs, The packet size is not 188\n");
-    echo1("    Packet_Size=%i\n", Event->Packet_Size);
-}
-
-void MpegTs_Junk_Begin_0 (struct MediaInfo_Event_MpegTs_Junk_Begin_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.004\n");
-    else
-        echo0("MpegTs, The stream is not not in sync at the begining\n");
-    echo1("    Junk_Size=%i\n", Event->Junk_Size);
-}
-
-void MpegTs_Junk_End_0 (struct MediaInfo_Event_MpegTs_Junk_End_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.005\n");
-    else
-        echo0("MpegTs, The stream is not not in sync at the end\n");
-    echo1("    Junk_Size=%i\n", Event->Junk_Size);
-}
-
-void MpegTs_PCR_NotWithVideo_0 (struct MediaInfo_Event_MpegTs_PCR_NotWithVideo_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.007\n");
-    else
-        echo0("MpegTs, The PCR is on another PID than the video stream of this program\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    program_number=%04x\n", Event->program_number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " PCR_PID=%04x\n", Event->PCR_PID);
-}
-
-void MpegTs_PES_Video_PCR_NotAtStart_0 (struct MediaInfo_Event_MpegTs_PES_Video_PCR_NotAtStart_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("No DCA number\n");
-    else
-        echo0("MpegTs, A PCR is not present in a transport packet containing the first byte of a video PES payload\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
- }
-
-void MpegTs_PES_Video_PCR_NotAtStart_PerFrame_0 (struct MediaInfo_Event_MpegTs_PES_Video_PCR_NotAtStart_PerFrame_0* Event, int DCA)
-{
-    size_t Pos;
-    if (DCA)
-        echo0("DCA #7702.008\n");
-    else
-        echo0("MpegTs, A PCR is not present in a transport packet containing the first byte of a video PES payload (Per frame)\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    for (Pos=0; Pos<Event->Fields_Size; Pos++)
-    {
-        echo1("    PCR=%s,", Event->Fields[Pos].PCR_HR);
-        echo1(   " DTS=%s,", Event->Fields[Pos].DTS_HR);
-        echo1(   " PCR not at start for field 1=%i\n", Event->Fields[Pos].PCR_NotAtStart);
-    }
- }
-
-void MpegTs_discontinuity_indicator_NotInFirstPCR_0 (struct MediaInfo_Event_MpegTs_discontinuity_indicator_NotInFirstPCR_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.009\n");
-    else
-        echo0("MpegTs, The first PCR packet of the stream does not have the transport discontinuity_indicator flag set\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    PID=%04x\n", Event->PID);
-}
-
-void MpegTs_random_access_indicator_NotWithPictureI_0 (struct MediaInfo_Event_MpegTs_random_access_indicator_NotWithPictureI_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.010\n");
-    else
-        echo0("MpegTs, The random_access_indicator is not set but must be\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-}
-
-void MpegTs_PCR_Accuracy_0 (struct MediaInfo_Event_MpegTs_PCR_Accuracy_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.011\n");
-    else
-        echo0("MpegTs, The PCR is not accurate\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    PID=%04x\n", Event->PID);
-    echo1("    PCR_Theory=%u ns,", Event->PCR_Theory);
-    echo1(   " PCR_Reality=%u ns\n", Event->PCR_Reality);
-}
-
-void MpegTs_BitRate_NotConstant_0 (struct MediaInfo_Event_MpegTs_BitRate_NotConstant_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.012\n");
-    else
-        echo0("MpegTs, The bit rate is not constant +/- 1pc\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    PID=%04x\n", Event->PID);
-    echo1("    OverallBitRate_Theory=%u bps,", Event->OverallBitRate_Theory);
-    echo1(   " OverallBitRate_Reality=%u bps\n", Event->OverallBitRate_Reality);
-}
-
-void MpegTs_BitRate_MoreThan3dot75Mbps_0 (struct MediaInfo_Event_MpegTs_BitRate_MoreThan3dot75Mbps_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7379\n");
-    else
-        echo0("MpegTs, Bit rate is more than 15 Mbps\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    PID=%04x\n", Event->PID);
-    echo1("    PCR=%s\n", Event->PCR_HR);
-    echo1("    OverallBitRate=%u bps\n", Event->OverallBitRate);
-}
-
-void MpegTs_BitRate_MoreThan15Mbps_0 (struct MediaInfo_Event_MpegTs_BitRate_MoreThan15Mbps_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7382\n");
-    else
-        echo0("MpegTs, Bit rate is more than 15 Mbps\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    PID=%04x\n", Event->PID);
-    echo1("    PCR=%s\n", Event->PCR_HR);
-    echo1("    OverallBitRate=%u bps\n", Event->OverallBitRate);
-}
-
-void MpegTs_BitRate_MoreThan20Mbps_0 (struct MediaInfo_Event_MpegTs_BitRate_MoreThan20Mbps_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7384\n");
-    else
-        echo0("MpegTs, Bit rate is more than 20 Mbps\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    PID=%04x\n", Event->PID);
-    echo1("    PCR=%s\n", Event->PCR_HR);
-    echo1("    OverallBitRate=%u bps\n", Event->OverallBitRate);
-}
-
-void MpegTs_BitRate_IllegalForCustomer0_0 (struct MediaInfo_Event_MpegTs_BitRate_IllegalForCustomer0_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.013\n");
-    else
-        echo0("MpegTs, Bit rate doesn't conform to customer 0 needs\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    PID=%04x\n", Event->PID);
-    echo1("    OverallBitRate_Theory=%u bps,", Event->OverallBitRate_Theory);
-    echo1(   " OverallBitRate_Reality=%u bps\n", Event->OverallBitRate_Reality);
-    echo1("    PayloadBitRate_Reality=%u bps\n", Event->PayloadBitRate_Reality);
-}
-
-void MpegTs_PID_Detected_0 (struct MediaInfo_Event_MpegTs_PID_Detected_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("No DCA number\n");
-    else
-        echo0("MpegTs, A PID is detected\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    PID=%04x\n", Event->PID);
-    switch (Event->Kind)
-    {
-        case 0x01 : echo1("    Kind=PES,", Event->Kind); break;
-        case 0x02 : echo1("    Kind=PSI,", Event->Kind); break;
-        default   : echo1("    Kind=Unknown,", Event->Kind); break;
-    }
-    echo1(   " table_id=%02x\n", Event->table_id);
-}
-
-void MpegTs_PID_IllegalForCustomer0_2 (struct MediaInfo_Event_MpegTs_PID_IllegalForCustomer0_2* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.014\n");
-    else
-        echo0("MpegTs, The PID doesn't conform to customer 0 needs\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    PID=%04x\n", Event->PID);
-    echo1("    table_id=%02x,", Event->table_id);
-    echo1(   " stream_type=%02x", Event->stream_type);
-    echo1(   " kind=%02x\n", Event->kind);
-    echo1("    Expected PID=%04x\n", Event->PID_Expected);
-}
-
-void MpegTs_PID_IllegalForCableLabsVOD_2 (struct MediaInfo_Event_MpegTs_PID_IllegalForCableLabsVOD_2* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7376\n");
-    else
-        echo0("MpegTs, The PID doesn't conform to CableLabs VOD needs\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    PID=%04x\n", Event->PID);
-    echo1("    table_id=%02x,", Event->table_id);
-    echo1(   " stream_type=%02x", Event->stream_type);
-    echo1(   " kind=%02x\n", Event->kind);
-    echo1("    Expected PID=%04x\n", Event->PID_Expected);
-}
-
-void MpegTs_PAT_PMT_NotPresent_0 (struct MediaInfo_Event_MpegTs_PAT_PMT_NotPresent_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.015\n");
-    else
-        echo0("MpegTs, The PAT or the PMT are not present\n");
-    Event->EventCode=Event->EventCode;
-}
-
-void MpegTs_PAT_transport_stream_id_IllegalForCustomer0_1 (struct MediaInfo_Event_MpegTs_PAT_transport_stream_id_IllegalForCustomer0_1* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.015\n");
-    else
-        echo0("MpegTs, The PAT transport_stream_id doesn't conform to customer 0 needs\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    PID=%04x\n", Event->PID);
-    echo1("    transport_stream_id=%04x\n", Event->transport_stream_id);
-    echo1("    Expected transport_stream_id=%04x\n", Event->transport_stream_id_Expected);
-}
-
-void MpegTs_PMT_program_number_IllegalForCustomer0_1 (struct MediaInfo_Event_MpegTs_PMT_program_number_IllegalForCustomer0_1* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.015\n");
-    else
-        echo0("MpegTs, The PAT program_number doesn't conform to customer 0 needs\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    PID=%04x\n", Event->PID);
-    echo1("    program_number=%04x\n", Event->program_number);
-    echo1("    Expected program_number=%04x\n", Event->program_number_Expected);
-}
-
-void MpegTs_PAT_TooLate_0 (struct MediaInfo_Event_MpegTs_PAT_TooLate_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.016\n");
-    else
-        echo0("MpegTs, A complete PAT didn't occur in the TS before the first byte of a PMT\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    PID=%04x\n", Event->PID);
-    echo1("    program_number=%04x\n", Event->program_number);
-    echo1("    Stream_Offset_PAT_Begin=%08x,", Event->Stream_Offset_PAT_Begin);
-    echo1(   " Stream_Offset_PAT_End=%08x\n", Event->Stream_Offset_PAT_End);
-    echo1("    Stream_Offset_PMT_Begin=%08x,", Event->Stream_Offset_PMT_Begin);
-    echo1(   " Stream_Offset_PMT_End=%08x\n", Event->Stream_Offset_PMT_End);
-}
-
-void MpegTs_PAT_Repetition_Not100ms_0 (struct MediaInfo_Event_MpegTs_PAT_Repetition_Not100ms_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.017\n");
-    else
-        echo0("MpegTs, The repetition interval for a PAT is not be 100ms\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    program_number=%04x\n", Event->program_number);
-    echo1("    Interval=%i ns\n", Event->Interval);
-}
-
-void MpegTs_PAT_New_0 (struct MediaInfo_Event_MpegTs_PAT_New_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.018\n");
-    else
-        echo0("MpegTs, A new version_number of the PAT is found\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    version_number_Old=%02x,", Event->version_number_Old);
-    echo1(   " version_number_New=%02x\n", Event->version_number_New);
-}
-
-void MpegTs_PAT_NoPAS_0 (struct MediaInfo_Event_MpegTs_PAT_NoPAS_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.019\n");
-    else
-        echo0("MpegTs, The PAT doesn't contain a PAS\n");
-    echo1("    table_id=%02x\n", Event->table_id);
-}
-
-void MpegTs_PMT_stream_type_Unknown_0 (struct MediaInfo_Event_MpegTs_PMT_stream_type_Unknown_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.014 (Unknown stream)\n");
-    else
-        echo0("MpegTs, PID has an unknown stream_type\n");
-    echo1("    PID=%04x\n", Event->PID);
-    echo1("    registration_format_identifier=%08x,", Event->registration_format_identifier);
-    echo1(   " stream_type=%02x\n", Event->stream_type);
-}
-
-void MpegTs_PID_Unreferenced_0 (struct MediaInfo_Event_MpegTs_PID_Unreferenced_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.014 (Unreferenced PID)\n");
-    else
-        echo0("MpegTs, PID is not referenced\n");
-    echo1("    PID=%04x\n", Event->PID);
-}
-
-void MpegTs_PAT_current_next_indicator_NotSet_0 (struct MediaInfo_Event_MpegTs_PAT_current_next_indicator_NotSet_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.020\n");
-    else
-        echo0("MpegTs, The current_next_indicator is not set\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-}
-
-void MpegTs_network_PID_InUse_0 (struct MediaInfo_Event_MpegTs_network_PID_InUse_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.021\n");
-    else
-        echo0("MpegTs, A network_PID is set in the PMT\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    PID=%04x\n", Event->PID);
-}
-
-void MpegTs_PMT_TooLate_0 (struct MediaInfo_Event_MpegTs_PMT_TooLate_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.022\n");
-    else
-        echo0("MpegTs, A complete PMT didn't occur in the TS before the first byte of a PID\n");
-    echo1("    PID=%04x\n", Event->PID);
-    echo1("    program_number=%04x\n", Event->program_number);
-    echo1("    Stream_Offset_PMT_Begin=%08x,", Event->Stream_Offset_PMT_Begin);
-    echo1(   " Stream_Offset_PMT_End=%08x\n", Event->Stream_Offset_PMT_End);
-    echo1("    Stream_Offset_PID_Begin=%08x,", Event->Stream_Offset_PID_Begin);
-    echo1(   " Stream_Offset_PID_End=%08x\n", Event->Stream_Offset_PID_End);
-}
-
-void MpegTs_PMT_Repetition_Not100ms_0 (struct MediaInfo_Event_MpegTs_PMT_Repetition_Not100ms_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.023\n");
-    else
-        echo0("MpegTs, The repetition interval for a PMT is not be 100ms\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    program_number=%04x\n", Event->program_number);
-    echo1("    Interval=%i ns\n", Event->Interval);
-}
-
-void MpegTs_PMT_New_0 (struct MediaInfo_Event_MpegTs_PMT_New_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.024\n");
-    else
-        echo0("MpegTs, A new version_number of the PMT is found\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    program_number=%04x\n", Event->program_number);
-    echo1("    version_number_Old=%02x,", Event->version_number_Old);
-    echo1(   " version_number_New=%02x\n", Event->version_number_New);
-}
-
-void MpegTs_PMT_NoPMS_0 (struct MediaInfo_Event_MpegTs_PMT_NoPMS_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.025\n");
-    else
-        echo0("MpegTs, The PMT doesn't contain a PMS\n");
-    echo1("    PID=%04x\n", Event->PID);
-    echo1("    table_id=%02x\n", Event->table_id);
-}
-
-void MpegTs_PES_Information_0 (struct MediaInfo_Event_MpegTs_PES_Information_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("No DCA number\n");
-    else
-        echo0("MpegTs, PES information\n");
-    echo1("    PID=%04x\n", Event->PID);
-    echo1("    program_number=%04x\n", Event->program_number);
-    echo1("    registration_format_identifier=%08x\n", Event->registration_format_identifier);
-    echo1("    stream_type=%02x\n", Event->stream_type);
-}
-
-void MpegTs_PES_stream_type_IllegalForCustomer0_0 (struct MediaInfo_Event_MpegTs_PES_stream_type_IllegalForCustomer0_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.026 (stream_type does not conform)\n");
-    else
-        echo0("MpegTs, The PES stream_type doesn't conform to customer 0 needs\n");
-    echo1("    PID=%04x\n", Event->PID);
-    echo1("    program_number=%04x\n", Event->program_number);
-    echo1("    registration_format_identifier=%08x\n", Event->registration_format_identifier);
-    echo1("    stream_type=%02x\n", Event->stream_type);
-}
-
-void MpegTs_PMT_stream_type_DoesNotFit_0 (struct MediaInfo_Event_MpegTs_PMT_stream_type_DoesNotFit_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.026 (stream_type does not fit)\n");
-    else
-        echo0("MpegTs, The PMT stream_type doesn't not fit the stream format\n");
-    echo1("    PID=%04x\n", Event->PID);
-    echo1("    program_number=%04x\n", Event->program_number);
-    echo1("    registration_format_identifier=%08x\n", Event->registration_format_identifier);
-    echo1("    stream_type=%02x\n", Event->stream_type);
-}
-
-void MpegTs_PES_PCR_Repetition_Not40ms_0 (struct MediaInfo_Event_MpegTs_PES_PCR_Repetition_Not40ms_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.030\n");
-    else
-        echo0("MpegTs, The repetition interval for a PCR of an elementary stream is not 40ms\n");
-    echo1("    PID=%04x\n", Event->PID);
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    Interval=%i ns\n", Event->Interval);
-}
-
-void MpegTs_PAT_Repetition_MoreThan250ms_0 (struct MediaInfo_Event_MpegTs_PAT_Repetition_MoreThan250ms_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7374\n");
-    else
-        echo0("MpegTs, The repetition interval for a PAT is more than 250 ms\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    program_number=%04x\n", Event->program_number);
-    echo1("    Interval=%i ns\n", Event->Interval);
-}
-
-void MpegTs_PMT_Repetition_MoreThan250ms_0 (struct MediaInfo_Event_MpegTs_PMT_Repetition_MoreThan250ms_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7374\n");
-    else
-        echo0("MpegTs, The repetition interval for a PMT is more than 250 ms\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    program_number=%04x\n", Event->program_number);
-    echo1("    Interval=%i ns\n", Event->Interval);
-}
-
-void MpegTs_PMT_descriptor_tag_IllegalForCustomer0_0 (struct MediaInfo_Event_MpegTs_PMT_descriptor_tag_IllegalForCustomer0_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.027\n");
-    else
-        echo0("MpegTs, The PMT descriptor doesn't conform to customer 0 needs\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    PID=%04x\n", Event->PID);
-    echo1("    program_number=%04x\n", Event->program_number);
-    switch (Event->Kind)
-    {
-        case 0x00 : echo0("    Kind=Program\n"); break;
-        case 0x01 : echo0("    Kind=Stream\n"); break;
-        default   : echo0("    Kind=Unknown\n"); break;
-    }
-    echo1("    registration_format_identifier=%08x,", Event->registration_format_identifier);
-    echo1(   " stream_type=%02x\n", Event->stream_type);
-    switch (Event->IsUsed)
-    {
-        case 0x00 : echo0("    IsUsed=No,"); break;
-        case 0x01 : echo0("    IsUsed=Yes,"); break;
-        default   : echo0("    IsUsed=Unknown,"); break;
-    }
-    echo1(   " descriptor_tag=%02x\n", Event->descriptor_tag);
-}
-
-void MpegTs_PMT_registration_tag_IllegalForScte35_0 (struct MediaInfo_Event_MpegTs_PMT_registration_tag_IllegalForScte35_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7358\n");
-    else
-        echo0("MpegTs, program registration_tag is not CUEI\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    PID=%04x\n", Event->PID);
-    echo1("    program_number=%04x\n", Event->program_number);
-    echo1("    registration_format_identifier=%08x\n", Event->registration_format_identifier);
-    switch (Event->IsUsed)
-    {
-        case 0x00 : echo0("    IsUsed=No\n"); break;
-        case 0x01 : echo0("    IsUsed=Yes\n"); break;
-        default   : echo0("    IsUsed=Unknown\n"); break;
-    }
-}
-
-const char* Avc_slice_type[]=
-{
-    "P",
-    "B",
-    "I",
-    "SP",
-    "SI",
-    "P",
-    "B",
-    "I",
-    "SP",
-    "SI",
-};
-void Avc_GOP_0 (struct MediaInfo_Event_Avc_GOP_0* Event, int DCA)
-{
-    size_t Pos;
-    if (DCA)
-        echo0("DCA #???\n");
-    else
-        echo0("Avc, GOP information\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    IFrame_nal_unit_type=%02x\n", Event->IFrame_nal_unit_type);
-    echo1("    GOP_Size=%i\n", Event->GOP_Size);
-    echo0("    GOP=");
-    for (Pos=0; Pos<Event->GOP_FieldsOrder_Size; Pos++)
-        echo1("%s", Avc_slice_type[Event->GOP_FieldsOrder[Pos]]);
-    echo0("\n");
-}
-
-void Avc_BitRate_NotConstant_0 (struct MediaInfo_Event_Avc_BitRate_NotConstant_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.011\n");
-    else
-        echo0("Avc, BitRate_NotConstant information\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    BitRate=%i,", Event->BitRate);
-    echo1(   " BitRate_Expected=%i\n", Event->BitRate_Expected);
-}
-
-void Avc_NumBytesInNALunit_IllegalForBluray_0 (struct MediaInfo_Event_Avc_NumBytesInNALunit_IllegalForBluray_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7123\n");
-    else
-        echo0("Avc, NumBytesInNALunit is Illegal for Blu-ray\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    NumBytesInNALunit=%i\n", Event->NumBytesInNALunit);
-    echo1("    NumBytesInNALunit_MaximumAllowed=%i\n", Event->NumBytesInNALunit_MaximumAllowed);
-}
-
-void Avc_GOP_Size_IllegalForCustomer0_0 (struct MediaInfo_Event_Avc_GOP_Size_IllegalForCustomer0_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.109 and 210\n");
-    else
-        echo0("Avc, The GOP size doesn't conform to customer needs\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    GOP_Size=%i\n", Event->GOP_Size);
-}
-
-void Avc_GOP_FieldsOrder_IllegalForCustomer0_0 (struct MediaInfo_Event_Avc_GOP_FieldsOrder_IllegalForCustomer0_0* Event, int DCA)
-{
-    size_t Pos;
-    if (DCA)
-        echo0("DCA #3028, 7702.110, 111, 211 and 212\n");
-    else
-        echo0("Avc, The GOP field/frame order doesn't conform to customer needs\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo0("    GOP=");
-    for (Pos=0; Pos<Event->GOP_FieldsOrder_Size; Pos++)
-        echo1("%s", Avc_slice_type[Event->GOP_FieldsOrder[Pos]]);
-    echo0("\n");
-}
-
-void MpegPs_PES_Start_NotAligned_0 (struct MediaInfo_Event_MpegPs_PES_Start_NotAligned_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.112 and 213\n");
-    else
-        echo0("MpegTs, The elementary stream is not aligned with PES packet start\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-}
-
-void MpegPs_PES_NotOnePerFrame_0 (struct MediaInfo_Event_MpegPs_PES_NotOnePerFrame_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.113 and 214\n");
-    else
-        echo0("MpegTs, A picture is not contained in one PES packet\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    PES_Count=%i\n", Event->PES_Count);
-}
-
-void Avc_IFrame_WithoutStart_0 (struct MediaInfo_Event_Avc_IFrame_WithoutStart_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.114 and 215\n");
-    else
-        echo0("MpegTs, A reference frame (I-frame) is not preceded by a start code\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-}
-
-void MpegTs_Stream_Start_TooLate_0 (struct MediaInfo_Event_MpegTs_Stream_Start_TooLate_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.115 and 216\n");
-    else
-        echo0("MpegTs, Start of the stream is too late\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-}
-
-void MpegPs_PES_IFrame_NoTimeStamps_0 (struct MediaInfo_Event_MpegPs_PES_IFrame_NoTimeStamps_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7702.116 and 217\n");
-    else
-        echo0("MpegTs, PES with I-Frame has no time stamps\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s\n", Event->PCR_HR);
-}
-
-void MpegPs_SampleRate_NotConstant_Audio_0 (struct MediaInfo_Event_MpegPs_SampleRate_NotConstant_Audio_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1051\n");
-    else
-        echo0("MpegPs, Sample rate should be constant\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    SampleRate_Before=%i,", Event->SampleRate_Before);
-    echo1(   " SampleRate_After=%i\n", Event->SampleRate_After);
-}
-
-void MpegPs_SampleRate_NotConstant_Video_0 (struct MediaInfo_Event_MpegPs_SampleRate_NotConstant_Video_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1052\n");
-    else
-        echo0("MpegPs, Sample rate should be constant\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    SampleRate_Before=%i,", Event->SampleRate_Before);
-    echo1(   " SampleRate_After=%i\n", Event->SampleRate_After);
-}
-
-void MpegPs_program_stream_map_NonExistentESID_0 (struct MediaInfo_Event_MpegPs_program_stream_map_NonExistentESID_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1053\n");
-    else
-        echo0("MpegPs, The PSM contains a PID which points to a non-existent stream\n");
-    echo1("    Stream_Offset=%08x\n", Event->Stream_Offset);
-    echo1("    stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s\n", Event->PCR_HR);
-    echo1("    Origin=%02x\n", Event->Origin);
-}
-
-void Mpegv_group_start_closed_gop_0 (struct MediaInfo_Event_Mpegv_group_start_closed_gop_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #3013\n");
-    else
-        echo0("Mpegv, closed_gop\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    closed_gop=%i\n", Event->closed_gop);
-}
-
-void Mpegv_DataBeforeFirst_sequence_header_0 (struct MediaInfo_Event_Mpegv_DataBeforeFirst_sequence_header_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7351\n");
-    else
-        echo0("Mpegv, Data before first sequence_header\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    Data_Size=%i\n", Event->Data_Size);
-}
-
-void Mpegv_IFrame_Without_sequence_header_0 (struct MediaInfo_Event_Mpegv_IFrame_Without_sequence_header_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7352\n");
-    else
-        echo0("Mpegv, An I-Frame begins without a sequence_header or sequence_extension\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    MissingElements=%i\n", Event->MissingElements);
-}
-
-void Mpegv_picture_structure_Not3_0 (struct MediaInfo_Event_Mpegv_picture_structure_Not3_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7356\n");
-    else
-        echo0("Mpegv, picture_structure is not set to 3\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    picture_structure=%i\n", Event->picture_structure);
-}
-
-void Mpegv_Has_scalable_extensions_0 (struct MediaInfo_Event_Mpegv_Has_scalable_extensions_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #7357\n");
-    else
-        echo0("Mpegv, The sequece has scalable extensions\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    scalable_extensions=%1x\n", Event->scalable_extensions);
-}
-
-void Afd_Content_0 (struct MediaInfo_Event_Afd_Content_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #????\n");
-    else
-        echo0("AFD, Content\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    active_format=%i,", Event->active_format);
-    echo1(   " aspect_ratio=%02x\n", Event->aspect_ratio);
-}
-
-void BarData_Content_0 (struct MediaInfo_Event_BarData_Content_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #????\n");
-    else
-        echo0("AFD, Content\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    line_number_end_of_top_bar=%i,", Event->line_number_end_of_top_bar);
-    echo1(   " line_number_start_of_bottom_bar=%i\n", Event->line_number_start_of_bottom_bar);
-    echo1("    pixel_number_end_of_left_bar=%i,", Event->line_number_end_of_top_bar);
-    echo1(   " pixel_number_start_of_right_bar=%i\n", Event->line_number_start_of_bottom_bar);
-}
-
-void Eia608_ControlCode_NotTwice_0 (struct MediaInfo_Event_Eia608_ControlCode_NotTwice_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1501\n");
-    else
-        echo0("CEA-608, Control Code not transmitted twice in successive frames\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x,", Event->stream_id);
-    echo1(   " Field=%01x\n", Event->Field);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    Character_1=%02x,",  Event->Character_1);
-    echo1(   " Character_2=%02x\n",  Event->Character_2);
-}
-
-void Eia608_NoFieldMatch_0 (struct MediaInfo_Event_Eia608_NoFieldMatch_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1502\n");
-    else
-        echo0("CEA-608, non-printing character that does not match the data from the field\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x,", Event->stream_id);
-    echo1(   " Field=%01x\n", Event->Field);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-}
-
-void Eia608_CC_MoreThan32Chars_0 (struct MediaInfo_Event_Eia608_CC_MoreThan32Chars_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1503\n");
-    else
-        echo0("CEA-608, More than 32 Informational Characters\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x,", Event->stream_id);
-    echo1(   " Field=%01x,", Event->Field);
-    echo1(   " Service=%01x\n", Event->Service);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    Character=%c\n", Event->NewChar);
-}
-
-void Eia608_XDS_Current_ContentAdvisory_MPA_USTV_0 (struct MediaInfo_Event_Eia608_XDS_Current_ContentAdvisory_MPA_USTV_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1504\n");
-    else
-        echo0("CEA-608, MPA System is set, but TV Rating System is in use\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x,", Event->stream_id);
-    echo1(   " Field=%01x\n", Event->Field);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    Character_1=%02x,",  Event->Character_1);
-    echo1(   " Character_2=%02x\n",  Event->Character_2);
-}
-
-void Eia608_XDS_Current_ContentAdvisory_USTV_MPA_0 (struct MediaInfo_Event_Eia608_XDS_Current_ContentAdvisory_USTV_MPA_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1505\n");
-    else
-        echo0("CEA-608, TV Rating System is set, but MPA System is in use\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x,", Event->stream_id);
-    echo1(   " Field=%01x\n", Event->Field);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    Character_1=%02x,",  Event->Character_1);
-    echo1(   " Character_2=%02x\n",  Event->Character_2);
-}
-
-void Eia608_XDS_Current_CopyAndRedistributionControlPacket_0 (struct MediaInfo_Event_Eia608_XDS_Current_CopyAndRedistributionControlPacket_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1506 and 3026\n");
-    else
-        echo0("CEA-608, CGMS-A or APS is present\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x,", Event->stream_id);
-    echo1(   " Field=%01x\n", Event->Field);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    Byte_1=%02x,",  Event->Byte_1);
-    echo1(   " Byte_2=%02x\n",  Event->Byte_2);
-}
-
-void Eia608_XDS_PublicService_NationalWeather_0 (struct MediaInfo_Event_Eia608_XDS_PublicService_NationalWeather_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1507\n");
-    else
-        echo0("CEA-608, National Weather Service is present\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x,", Event->stream_id);
-    echo1(   " Field=%01x\n", Event->Field);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-}
-
-void Eia608_IllegalCharacter_0 (struct MediaInfo_Event_Eia608_IllegalCharacter_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1508\n");
-    else
-        echo0("CEA-608, Illegal character\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x,", Event->stream_id);
-    echo1(   " Field=%01x\n", Event->Field);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    Character_1=%02x,",  Event->Character_1);
-    echo1(   " Character_2=%02x\n",  Event->Character_2);
-}
-
-void Eia608_CC_MoreThan15Rows_0 (struct MediaInfo_Event_Eia608_CC_MoreThan15Rows_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1515\n");
-    else
-        echo0("CEA-608, More than 15 Rows\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x,", Event->stream_id);
-    echo1(   " Field=%01x,", Event->Field);
-    echo1(   " Service=%01x\n", Event->Service);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-}
-
-void Eia608_XDS_Field1_0 (struct MediaInfo_Event_Eia608_XDS_Field1_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1516\n");
-    else
-        echo0("CEA-608, XDS data in field 1\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x,", Event->stream_id);
-    echo1(   " Field=%01x\n", Event->Field);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-}
-
-void Eia608_XDS_Current_ContentAdvisory_Content_0 (struct MediaInfo_Event_Eia608_XDS_Current_ContentAdvisory_Content_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #3027\n");
-    else
-        echo0("CEA-608, ContentAdvisory Content information\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x,", Event->stream_id);
-    echo1(   " Field=%01x\n", Event->Field);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    Character_1=%02x,",  Event->Character_1);
-    echo1(   " Character_2=%02x\n",  Event->Character_2);
-}
-
-void Eia608_CC_Content_0 (struct MediaInfo_Event_Eia608_CC_Content_0* Event, int DCA)
-{
-    int Pos;
-    if (DCA)
-        echo0("DCA #????\n");
-    else
-        echo0("Eia608, Content\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x,", Event->stream_id);
-    echo1(   " Field=%01x,", Event->Field);
-    echo1(   " Service=%01x\n", Event->Service);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-
-    wecho0(L"    **********************************\n");
-    for (Pos=0; Pos<15; Pos++)
-    {
-        wecho1(L"    *%ls*\n", (const wchar_t *)(Event->Row_Values[Pos]));
-    }
-    wecho0(L"    **********************************\n");
-}
-
-void Eia608_End_0 (struct MediaInfo_Event_Eia608_End_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1514 (CEA-708)\n");
-    else
-        echo0("Eia608, End\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x,", Event->stream_id);
-    echo1(   " Field=%01x\n", Event->Field);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    ContentDetected=%02x\n", Event->ContentDetected);
-}
-
-void DtvccTransport_cc_count_0 (struct MediaInfo_Event_DtvccTransport_cc_count_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1512 (DTVCC Transport / Total)\n");
-    else
-        echo0("DTVCC Transport, cc_count\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    cc_count=%i\n", Event->cc_count);
-}
-
-void DtvccTransport_Eia608_cc_count_0 (struct MediaInfo_Event_DtvccTransport_Eia608_cc_count_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1512 (DTVCC Transport / EIA-608)\n");
-    else
-        echo0("DTVCC Transport, EIA-608 cc_count\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x,", Event->stream_id);
-    echo1(   " Field=%01x\n", Event->Field);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    cc_count=%i\n", Event->cc_count);
-}
-
-void DtvccTransport_picture_structure_cc_type_0 (struct MediaInfo_Event_DtvccTransport_picture_structure_cc_type_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1513\n");
-    else
-        echo0("DTVCC Transport, picture_structure cc_type\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    picture_structure=%i,", Event->picture_structure);
-    echo1(   " cc_type=%i\n", Event->cc_type);
-}
-
-void DtvccTransport_additional_data_flag_0 (struct MediaInfo_Event_DtvccTransport_additional_data_flag_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1651\n");
-    else
-        echo0("DTVCC Transport, additional_data_flag\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-}
-
-void DtvccCaption_WindowIsOutsideOfArea_Minimal_0 (struct MediaInfo_Event_DtvccCaption_WindowIsOutsideOfArea_Minimal_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1511\n");
-    else
-        echo0("DTVCC Caption, Window is outside of area (Minimal)\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x,", Event->stream_id);
-    echo1(   " Service=%01x,", Event->Service);
-    echo1(   " Window=%01x\n", Event->Window);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    Row_Position=%02x,", Event->Row_Position);
-    echo1(   " Row_Count=%02x\n", Event->Row_Count);
-    echo1("    Column_Position=%02x,", Event->Column_Position);
-    echo1(   " Column_Count=%02x\n", Event->Column_Count);
-}
-
-void DtvccCaption_ReservedCode_0 (struct MediaInfo_Event_DtvccCaption_ReservedCode_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1509\n");
-    else
-        echo0("DTVCC Caption, Reserved Code\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    Code=%01x\n", Event->Code[0]);
-}
-
-void DtvccCaption_wordwrap_Deprecated_0 (struct MediaInfo_Event_DtvccCaption_wordwrap_Deprecated_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1510\n");
-    else
-        echo0("DTVCC Caption, End\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x,", Event->stream_id);
-    echo1(   " Service=%01x,", Event->Service);
-    echo1(   " Window=%01x\n", Event->Window);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-}
-
-void DtvccCaption_Content_Minimal_0 (struct MediaInfo_Event_DtvccCaption_Content_Minimal_0* Event, int DCA)
-{
-    size_t Pos;
-    size_t Row_Length;
-    if (DCA)
-        echo0("DCA #????\n");
-    else
-        echo0("DTVCC Caption, Content\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x,", Event->stream_id);
-    echo1(   " Service=%01x\n", Event->Service);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-
-    Row_Length=wcslen(Event->Row_Values[0]);
-    wecho0(L"    *");
-    for (Pos=0; Pos<Row_Length; Pos++)
-        wecho0(L"*");
-    wecho0(L"*\n");
-    for (Pos=0; Pos<15; Pos++)
-    {
-        wecho1(L"    *%ls*\n", (const wchar_t *)(Event->Row_Values[Pos]));
-    }
-    wecho0(L"    *");
-    for (Pos=0; Pos<Row_Length; Pos++)
-        wecho0(L"*");
-    wecho0(L"*\n");
-}
-
-void DtvccCaption_Window_Content_Minimal_0 (struct MediaInfo_Event_DtvccCaption_Window_Content_Minimal_0* Event, int DCA)
-{
-    size_t Pos;
-    size_t Row_Length;
-    if (DCA)
-        echo0("DCA #????\n");
-    else
-        echo0("DTVCC Caption, Window content\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x,", Event->stream_id);
-    echo1(   " Service=%01x,", Event->Service);
-    echo1(   " Window=%01x\n", Event->Window);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-
-    Row_Length=wcslen(Event->Row_Values[0]);
-    wecho0(L"    *");
-    for (Pos=0; Pos<Row_Length; Pos++)
-        wecho0(L"*");
-    wecho0(L"*\n");
-    for (Pos=0; Pos<15; Pos++)
-    {
-        wecho1(L"    *%ls*\n", (const wchar_t *)(Event->Row_Values[Pos]));
-        if (Pos<15 && wcslen(Event->Row_Values[Pos+1])==0)
-            break; //No more content in next lines
-    }
-    wecho0(L"    *");
-    for (Pos=0; Pos<Row_Length; Pos++)
-        wecho0(L"*");
-    wecho0(L"*\n");
-}
-
-void DtvccCaption_End_0 (struct MediaInfo_Event_DtvccCaption_End_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1514 (CEA-708)\n");
-    else
-        echo0("DTVCC Caption, End\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    ContentDetected=%08x\n", Event->ContentDetected);
-}
-
-void Cdp_cc_count_0 (struct MediaInfo_Event_Cdp_cc_count_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1512 (CDP / Total)\n");
-    else
-        echo0("CDP, cc_count\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    cc_count=%i\n", Event->cc_count);
-}
-
-void Cdp_Eia608_cc_count_0 (struct MediaInfo_Event_Cdp_Eia608_cc_count_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1512 (CDP / EIA-608)\n");
-    else
-        echo0("CDP, EIA-608\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x,", Event->stream_id);
-    echo1(   " Field=%01x\n", Event->Field);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    cc_count=%i\n", Event->cc_count);
-}
-
-void Cdp_picture_structure_cc_type_0 (struct MediaInfo_Event_Cdp_picture_structure_cc_type_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1513 (CDP)\n");
-    else
-        echo0("CDP, picture_structure cc_type\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x,", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    picture_structure=%i,", Event->picture_structure);
-    echo1(   " cc_type=%i\n", Event->cc_type);
-}
-
-void Scte20_cc_count_0 (struct MediaInfo_Event_Scte20_cc_count_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1512 (SCTE20 / Total)\n");
-    else
-        echo0("SCTE 20, cc_count\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    cc_count=%i\n", Event->cc_count);
-}
-
-void Scte20_Eia608_cc_count_0 (struct MediaInfo_Event_Scte20_Eia608_cc_count_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1512 (SCTE20 / EIA-608)\n");
-    else
-        echo0("SCTE 20, EIA-608\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x,", Event->stream_id);
-    echo1(   " Field=%01x\n", Event->Field);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    cc_count=%i\n", Event->cc_count);
-}
-
-void Scte20_picture_structure_cc_type_0 (struct MediaInfo_Event_Scte20_picture_structure_cc_type_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1513 (SCTE20)\n");
-    else
-        echo0("SCTE 20, picture_structure cc_type\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x,", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-    echo1("    picture_structure=%i,", Event->picture_structure);
-    echo1(   " cc_type=%i\n", Event->cc_type);
-}
-
-void Scte20_field_number_Forbidden_0 (struct MediaInfo_Event_Scte20_field_number_Forbidden_0* Event, int DCA)
-{
-    if (DCA)
-        echo0("DCA #1601\n");
-    else
-        echo0("SCTE 20, field_number_Forbidden\n");
-    echo1("    Stream_Offset=%08x,", Event->Stream_Offset);
-    echo1(   " Frame_Number=%u\n", Event->Frame_Number);
-    echo1("    PID=%04x,", Event->PID);
-    echo1(   " stream_id=%02x\n", Event->stream_id);
-    echo1("    PCR=%s,", Event->PCR_HR);
-    echo1(   " PTS=%s\n", Event->PTS_HR);
-}
-
-void General_Start_0 (struct MediaInfo_Event_General_Start_0* Event, int DCA)
-{
-    if (DCA)
-    {
-        return; //No DCA need
-    }
-
-    echo1("MediaInfo starts, Size=%i bytes\n", Event->Stream_Size);
-}
-
-void General_End_0 (struct MediaInfo_Event_General_End_0* Event, int DCA)
-{
-    if (DCA)
-    {
-        return; //No DCA need
-    }
-
-    echo1("MediaInfo ends, %i bytes read\n", Event->Stream_Bytes_Analyzed);
-}
-
-void General_Parser_Selected_0 (struct MediaInfo_Event_General_Parser_Selected_0* Event, int DCA)
-{
-    if (DCA)
-    {
-        return; //No DCA need
-    }
-
-    echo1("MediaInfo has selected the parser: %s\n", Event->Name);
-}
-
-void General_Move_Request_0 (struct MediaInfo_Event_General_Move_Request_0* Event, int DCA)
-{
-    if (DCA)
-    {
-        return; //No DCA need
-    }
-
-    echo1("MediaInfo has requested to seek, Offset=%08x\n", Event->Stream_Offset);
-}
-
-void General_Move_Done_0 (struct MediaInfo_Event_General_Move_Done_0* Event, int DCA)
-{
-    if (DCA)
-    {
-        return; //No DCA need
-    }
-
-    echo1("MediaInfo has seek, Offset=%08x\n", Event->Stream_Offset);
-}
-
-/***************************************************************************/
-/* The callback function                                                   */
-/***************************************************************************/
-
-void __stdcall Event_CallBackFunction(unsigned char* Data_Content, size_t Data_Size, void* UserHandler_Void)
-{
-    /*Retrieving UserHandler*/
-    struct UserHandle_struct*           UserHandler=(struct UserHandle_struct*)UserHandler_Void;
-    struct MediaInfo_Event_Generic*     Event_Generic=(struct MediaInfo_Event_Generic*) Data_Content;
-    unsigned char                       ParserID;
-    unsigned short                      EventID;
-    unsigned char                       EventVersion;
-
-    /*integrity tests*/
-    if (Data_Size<4)
-        return; //There is a problem
-
-    #ifdef MEDIAINFO_REGRESSION_TEST
-    {
-        char FileName[65536];
-        char Temp[100];
-        size_t Pos;
-        strcpy(FileName, "..\\..\\..\\..\\..\\..\\MediaInfoLib_DCA_RegressionTest\\New\\");
-        strcpy(FileName+strlen(FileName), F_FileName);
-        CreateDirectory(FileName, NULL);
-        strcpy(FileName+strlen(FileName), "\\");
-        sprintf(Temp, "%x", Event_Generic->EventCode);
-        for (Pos=8; Pos>strlen(Temp); Pos--)
-            strcpy(FileName+strlen(FileName), "0");
-        strcpy(FileName+strlen(FileName), Temp);
-        strcpy(FileName+strlen(FileName), ".txt");
-        F=fopen(FileName, "a");
-    }
-    #endif //MEDIAINFO_REGRESSION_TEST
-    
-    /*Do what you need with the event, here is only an example*/
-    /*Retrieving EventID*/
-    ParserID    =(unsigned char) ((Event_Generic->EventCode&0xFF000000)>>24);
-    EventID     =(unsigned short)((Event_Generic->EventCode&0x00FFFF00)>>8 );
-    EventVersion=(unsigned char) ( Event_Generic->EventCode&0x000000FF     );
-    switch (ParserID)
-    {
-           /*DCA number in comment*/
-        case MediaInfo_Parser_None :    
-                switch (EventID)
-                {
-                    case MediaInfo_Event_General_Start                                          : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_General_Start_0)) General_Start_0((struct MediaInfo_Event_General_Start_0*)Data_Content, UserHandler->Option_DCA); break;
-                    case MediaInfo_Event_General_End                                            : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_General_End_0)) General_End_0((struct MediaInfo_Event_General_End_0*)Data_Content, UserHandler->Option_DCA); break;
-                    case MediaInfo_Event_General_Parser_Selected                                : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_General_Parser_Selected_0)) General_Parser_Selected_0((struct MediaInfo_Event_General_Parser_Selected_0*)Data_Content, UserHandler->Option_DCA); break;
-                    case MediaInfo_Event_General_Move_Request                                   : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_General_Move_Request_0)) General_Move_Request_0((struct MediaInfo_Event_General_Move_Request_0*)Data_Content, UserHandler->Option_DCA); break;
-                    case MediaInfo_Event_General_Move_Done                                      : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_General_Move_Done_0)) General_Move_Done_0((struct MediaInfo_Event_General_Move_Done_0*)Data_Content, UserHandler->Option_DCA); break;
-                    default                                                                     : ;
-                }
-                break;
-        case MediaInfo_Parser_MpegTs :    
-                switch (EventID)
-                {    
-           /*1001*/ case MediaInfo_Event_MpegTs_PID_Reserved                                    : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PID_Reserved_0)) MpegTs_PID_Reserved_0((struct MediaInfo_Event_MpegTs_PID_Reserved_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1002*/ case MediaInfo_Event_MpegTs_continuity_counter_Check_NoPayload              : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_continuity_counter_Check_NoPayload_0)) MpegTs_continuity_counter_Check_NoPayload_0((struct MediaInfo_Event_MpegTs_continuity_counter_Check_NoPayload_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1003*/ case MediaInfo_Event_MpegTs_continuity_counter_Check_Payload                : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_continuity_counter_Check_Payload_0)) MpegTs_continuity_counter_Check_Payload_0((struct MediaInfo_Event_MpegTs_continuity_counter_Check_Payload_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1004*/ case MediaInfo_Event_MpegTs_splice_type_Reserved                            : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_splice_type_Reserved_0)) MpegTs_splice_type_Reserved_0((struct MediaInfo_Event_MpegTs_splice_type_Reserved_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1005*/ case MediaInfo_Event_MpegTs_profile_level_NoMatch                           : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_profile_level_NoMatch_0)) MpegTs_profile_level_NoMatch_0((struct MediaInfo_Event_MpegTs_profile_level_NoMatch_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1006*/ case MediaInfo_Event_MpegTs_SampleRate_NotConstant_Audio                    : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_SampleRate_NotConstant_Audio_0)) MpegTs_SampleRate_NotConstant_Audio_0((struct MediaInfo_Event_MpegTs_SampleRate_NotConstant_Audio_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1007*/ case MediaInfo_Event_MpegTs_SampleRate_NotConstant_Video                    : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_SampleRate_NotConstant_Video_0)) MpegTs_SampleRate_NotConstant_Video_0((struct MediaInfo_Event_MpegTs_SampleRate_NotConstant_Video_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1008*/ case MediaInfo_Event_MpegTs_OutOfSync                                       : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_OutOfSync_0)) MpegTs_OutOfSync_0((struct MediaInfo_Event_MpegTs_OutOfSync_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1011*/ case MediaInfo_Event_MpegTs_TS_program_map_section_NonExistentPID           : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_TS_program_map_section_NonExistentPID_0)) MpegTs_TS_program_map_section_NonExistentPID_0((struct MediaInfo_Event_MpegTs_TS_program_map_section_NonExistentPID_0*)Data_Content, UserHandler->Option_DCA); break;
-                    case MediaInfo_Event_MpegTs_continuity_counter_Duplicate                    : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_continuity_counter_Duplicate_0)) MpegTs_continuity_counter_Duplicate_0((struct MediaInfo_Event_MpegTs_continuity_counter_Duplicate_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1012*/ case MediaInfo_Event_MpegTs_transport_error_indicator_Check                 : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_transport_error_indicator_Check_0)) MpegTs_transport_error_indicator_Check_0((struct MediaInfo_Event_MpegTs_transport_error_indicator_Check_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.001*/ case MediaInfo_Event_MpegTs_PAT_MultiplePrograms                            : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PAT_MultiplePrograms_0)) MpegTs_PAT_MultiplePrograms_0((struct MediaInfo_Event_MpegTs_PAT_MultiplePrograms_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.002*/ case MediaInfo_Event_MpegTs_PMT_NoAudioStreams                              : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PMT_NoAudioStreams_0)) MpegTs_PMT_NoAudioStreams_0((struct MediaInfo_Event_MpegTs_PMT_NoAudioStreams_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.003*/ case MediaInfo_Event_MpegTs_PacketSize_Not188                               : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PacketSize_Not188_0)) MpegTs_PacketSize_Not188_0((struct MediaInfo_Event_MpegTs_PacketSize_Not188_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.004*/ case MediaInfo_Event_MpegTs_Junk_Begin                                      : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_Junk_Begin_0)) MpegTs_Junk_Begin_0((struct MediaInfo_Event_MpegTs_Junk_Begin_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.005*/ case MediaInfo_Event_MpegTs_Junk_End                                        : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_Junk_End_0)) MpegTs_Junk_End_0((struct MediaInfo_Event_MpegTs_Junk_End_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.007*/ case MediaInfo_Event_MpegTs_PCR_NotWithVideo                                : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PCR_NotWithVideo_0)) MpegTs_PCR_NotWithVideo_0((struct MediaInfo_Event_MpegTs_PCR_NotWithVideo_0*)Data_Content, UserHandler->Option_DCA); break;
-                    case MediaInfo_Event_MpegTs_PES_Video_PCR_NotAtStart                        : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PES_Video_PCR_NotAtStart_0)) MpegTs_PES_Video_PCR_NotAtStart_0((struct MediaInfo_Event_MpegTs_PES_Video_PCR_NotAtStart_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.008*/ case MediaInfo_Event_MpegTs_PES_Video_PCR_NotAtStart_PerFrame               : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PES_Video_PCR_NotAtStart_PerFrame_0)) MpegTs_PES_Video_PCR_NotAtStart_PerFrame_0((struct MediaInfo_Event_MpegTs_PES_Video_PCR_NotAtStart_PerFrame_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.009*/ case MediaInfo_Event_MpegTs_discontinuity_indicator_NotInFirstPCR           : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_discontinuity_indicator_NotInFirstPCR_0)) MpegTs_discontinuity_indicator_NotInFirstPCR_0((struct MediaInfo_Event_MpegTs_discontinuity_indicator_NotInFirstPCR_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.010*/ case MediaInfo_Event_MpegTs_random_access_indicator_NotWithPictureI         : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_random_access_indicator_NotWithPictureI_0)) MpegTs_random_access_indicator_NotWithPictureI_0((struct MediaInfo_Event_MpegTs_random_access_indicator_NotWithPictureI_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.011*/ case MediaInfo_Event_MpegTs_PCR_Accuracy                                    : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PCR_Accuracy_0)) MpegTs_PCR_Accuracy_0((struct MediaInfo_Event_MpegTs_PCR_Accuracy_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.012*/ case MediaInfo_Event_MpegTs_BitRate_NotConstant                             : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_BitRate_NotConstant_0)) MpegTs_BitRate_NotConstant_0((struct MediaInfo_Event_MpegTs_BitRate_NotConstant_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*7379*/ case MediaInfo_Event_MpegTs_BitRate_MoreThan3dot75Mbps                      : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_BitRate_MoreThan3dot75Mbps_0)) MpegTs_BitRate_MoreThan3dot75Mbps_0((struct MediaInfo_Event_MpegTs_BitRate_MoreThan3dot75Mbps_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*7382*/ case MediaInfo_Event_MpegTs_BitRate_MoreThan15Mbps                          : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_BitRate_MoreThan15Mbps_0)) MpegTs_BitRate_MoreThan15Mbps_0((struct MediaInfo_Event_MpegTs_BitRate_MoreThan15Mbps_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*7384*/ case MediaInfo_Event_MpegTs_BitRate_MoreThan20Mbps                          : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_BitRate_MoreThan20Mbps_0)) MpegTs_BitRate_MoreThan20Mbps_0((struct MediaInfo_Event_MpegTs_BitRate_MoreThan20Mbps_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.013*/ case MediaInfo_Event_MpegTs_BitRate_IllegalForCustomer0                     : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_BitRate_IllegalForCustomer0_0)) MpegTs_BitRate_IllegalForCustomer0_0((struct MediaInfo_Event_MpegTs_BitRate_IllegalForCustomer0_0*)Data_Content, UserHandler->Option_DCA); break;
-                    case MediaInfo_Event_MpegTs_PID_Detected                                    : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PID_Detected_0)) MpegTs_PID_Detected_0((struct MediaInfo_Event_MpegTs_PID_Detected_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.014*/ case MediaInfo_Event_MpegTs_PID_IllegalForCustomer0                         : if (EventVersion==2 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PID_IllegalForCustomer0_2)) MpegTs_PID_IllegalForCustomer0_2((struct MediaInfo_Event_MpegTs_PID_IllegalForCustomer0_2*)Data_Content, UserHandler->Option_DCA); break;
-           /*7376*/ case MediaInfo_Event_MpegTs_PID_IllegalForCableLabsVOD                      : if (EventVersion==2 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PID_IllegalForCableLabsVOD_2)) MpegTs_PID_IllegalForCableLabsVOD_2((struct MediaInfo_Event_MpegTs_PID_IllegalForCableLabsVOD_2*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.014*/ case MediaInfo_Event_MpegTs_PMT_stream_type_Unknown                         : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PMT_stream_type_Unknown_0)) MpegTs_PMT_stream_type_Unknown_0((struct MediaInfo_Event_MpegTs_PMT_stream_type_Unknown_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.014*/ case MediaInfo_Event_MpegTs_PID_Unreferenced                                : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PID_Unreferenced_0)) MpegTs_PID_Unreferenced_0((struct MediaInfo_Event_MpegTs_PID_Unreferenced_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.015*/ case MediaInfo_Event_MpegTs_PAT_PMT_NotPresent                              : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PAT_PMT_NotPresent_0)) MpegTs_PAT_PMT_NotPresent_0((struct MediaInfo_Event_MpegTs_PAT_PMT_NotPresent_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.015*/ case MediaInfo_Event_MpegTs_PAT_transport_stream_id_IllegalForCustomer0     : if (EventVersion==1 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PAT_transport_stream_id_IllegalForCustomer0_1)) MpegTs_PAT_transport_stream_id_IllegalForCustomer0_1((struct MediaInfo_Event_MpegTs_PAT_transport_stream_id_IllegalForCustomer0_1*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.015*/ case MediaInfo_Event_MpegTs_PMT_program_number_IllegalForCustomer0          : if (EventVersion==1 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PMT_program_number_IllegalForCustomer0_1)) MpegTs_PMT_program_number_IllegalForCustomer0_1((struct MediaInfo_Event_MpegTs_PMT_program_number_IllegalForCustomer0_1*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.016*/ case MediaInfo_Event_MpegTs_PAT_TooLate                                     : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PAT_TooLate_0)) MpegTs_PAT_TooLate_0((struct MediaInfo_Event_MpegTs_PAT_TooLate_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.017*/ case MediaInfo_Event_MpegTs_PAT_Repetition_Not100ms                         : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PAT_Repetition_Not100ms_0)) MpegTs_PAT_Repetition_Not100ms_0((struct MediaInfo_Event_MpegTs_PAT_Repetition_Not100ms_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.018*/ case MediaInfo_Event_MpegTs_PAT_New                                         : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PAT_New_0)) MpegTs_PAT_New_0((struct MediaInfo_Event_MpegTs_PAT_New_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.019*/ case MediaInfo_Event_MpegTs_PAT_NoPAS                                       : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PAT_NoPAS_0)) MpegTs_PAT_NoPAS_0((struct MediaInfo_Event_MpegTs_PAT_NoPAS_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.020*/ case MediaInfo_Event_MpegTs_PAT_current_next_indicator_NotSet               : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PAT_current_next_indicator_NotSet_0)) MpegTs_PAT_current_next_indicator_NotSet_0((struct MediaInfo_Event_MpegTs_PAT_current_next_indicator_NotSet_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.021*/ case MediaInfo_Event_MpegTs_network_PID_InUse                               : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_network_PID_InUse_0)) MpegTs_network_PID_InUse_0((struct MediaInfo_Event_MpegTs_network_PID_InUse_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.022*/ case MediaInfo_Event_MpegTs_PMT_TooLate                                     : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PMT_TooLate_0)) MpegTs_PMT_TooLate_0((struct MediaInfo_Event_MpegTs_PMT_TooLate_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.023*/ case MediaInfo_Event_MpegTs_PMT_Repetition_Not100ms                         : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PMT_Repetition_Not100ms_0)) MpegTs_PMT_Repetition_Not100ms_0((struct MediaInfo_Event_MpegTs_PMT_Repetition_Not100ms_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.024*/ case MediaInfo_Event_MpegTs_PMT_New                                         : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PMT_New_0)) MpegTs_PMT_New_0((struct MediaInfo_Event_MpegTs_PMT_New_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.025*/ case MediaInfo_Event_MpegTs_PMT_NoPMS                                       : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PMT_NoPMS_0)) MpegTs_PMT_NoPMS_0((struct MediaInfo_Event_MpegTs_PMT_NoPMS_0*)Data_Content, UserHandler->Option_DCA); break;
-                    case MediaInfo_Event_MpegTs_PES_Information                                 : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PES_Information_0)) MpegTs_PES_Information_0((struct MediaInfo_Event_MpegTs_PES_Information_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.026*/ case MediaInfo_Event_MpegTs_PES_stream_type_IllegalForCustomer0             : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PES_stream_type_IllegalForCustomer0_0)) MpegTs_PES_stream_type_IllegalForCustomer0_0((struct MediaInfo_Event_MpegTs_PES_stream_type_IllegalForCustomer0_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.026*/ case MediaInfo_Event_MpegTs_PMT_stream_type_DoesNotFit                      : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PMT_stream_type_DoesNotFit_0)) MpegTs_PMT_stream_type_DoesNotFit_0((struct MediaInfo_Event_MpegTs_PMT_stream_type_DoesNotFit_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.027*/ case MediaInfo_Event_MpegTs_PMT_descriptor_tag_IllegalForCustomer0          : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PMT_descriptor_tag_IllegalForCustomer0_0)) MpegTs_PMT_descriptor_tag_IllegalForCustomer0_0((struct MediaInfo_Event_MpegTs_PMT_descriptor_tag_IllegalForCustomer0_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7702.030*/ case MediaInfo_Event_MpegTs_PES_PCR_Repetition_Not40ms                      : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PES_PCR_Repetition_Not40ms_0)) MpegTs_PES_PCR_Repetition_Not40ms_0((struct MediaInfo_Event_MpegTs_PES_PCR_Repetition_Not40ms_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7374*/     case MediaInfo_Event_MpegTs_PAT_Repetition_MoreThan250ms                    : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PAT_Repetition_MoreThan250ms_0)) MpegTs_PAT_Repetition_MoreThan250ms_0((struct MediaInfo_Event_MpegTs_PAT_Repetition_MoreThan250ms_0*)Data_Content, UserHandler->Option_DCA); break;
-       /*7374*/     case MediaInfo_Event_MpegTs_PMT_Repetition_MoreThan250ms                    : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PMT_Repetition_MoreThan250ms_0)) MpegTs_PMT_Repetition_MoreThan250ms_0((struct MediaInfo_Event_MpegTs_PMT_Repetition_MoreThan250ms_0*)Data_Content, UserHandler->Option_DCA); break;
-/*7702.115*//*216*/ case MediaInfo_Event_MpegTs_Stream_Start_TooLate                            : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_Stream_Start_TooLate_0)) MpegTs_Stream_Start_TooLate_0((struct MediaInfo_Event_MpegTs_Stream_Start_TooLate_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*7358*/ case MediaInfo_Event_MpegTs_PMT_registration_tag_IllegalForScte35           : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegTs_PMT_registration_tag_IllegalForScte35_0)) MpegTs_PMT_registration_tag_IllegalForScte35_0((struct MediaInfo_Event_MpegTs_PMT_registration_tag_IllegalForScte35_0*)Data_Content, UserHandler->Option_DCA); break;
-                    default                                                                     : ;
-                }
-                break;
-        case MediaInfo_Parser_MpegPs :    
-                switch (EventID)
-                {    
-           /*1051*/ case MediaInfo_Event_MpegPs_SampleRate_NotConstant_Audio                    : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegPs_SampleRate_NotConstant_Audio_0)) MpegPs_SampleRate_NotConstant_Audio_0((struct MediaInfo_Event_MpegPs_SampleRate_NotConstant_Audio_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1052*/ case MediaInfo_Event_MpegPs_SampleRate_NotConstant_Video                    : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegPs_SampleRate_NotConstant_Video_0)) MpegPs_SampleRate_NotConstant_Video_0((struct MediaInfo_Event_MpegPs_SampleRate_NotConstant_Video_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1053*/ case MediaInfo_Event_MpegPs_program_stream_map_NonExistentESID              : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegPs_program_stream_map_NonExistentESID_0)) MpegPs_program_stream_map_NonExistentESID_0((struct MediaInfo_Event_MpegPs_program_stream_map_NonExistentESID_0*)Data_Content, UserHandler->Option_DCA); break;
-/*7702.112*//*213*/ case MediaInfo_Event_MpegPs_PES_Start_NotAligned                            : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegPs_PES_Start_NotAligned_0)) MpegPs_PES_Start_NotAligned_0((struct MediaInfo_Event_MpegPs_PES_Start_NotAligned_0*)Data_Content, UserHandler->Option_DCA); break;
-/*7702.113*//*214*/ case MediaInfo_Event_MpegPs_PES_NotOnePerFrame                              : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegPs_PES_NotOnePerFrame_0)) MpegPs_PES_NotOnePerFrame_0((struct MediaInfo_Event_MpegPs_PES_NotOnePerFrame_0*)Data_Content, UserHandler->Option_DCA); break;
-/*7702.116*//*217*/ case MediaInfo_Event_MpegPs_PES_IFrame_NoTimeStamps                         : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_MpegPs_PES_IFrame_NoTimeStamps_0)) MpegPs_PES_IFrame_NoTimeStamps_0((struct MediaInfo_Event_MpegPs_PES_IFrame_NoTimeStamps_0*)Data_Content, UserHandler->Option_DCA); break;
-                    default                                                                     : ;
-                }
-                break;
-        case MediaInfo_Parser_Mpegv :    
-                switch (EventID)
-                {    
-           /*3013*/ case MediaInfo_Event_Mpegv_group_start_closed_gop                           : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Mpegv_group_start_closed_gop_0)) Mpegv_group_start_closed_gop_0((struct MediaInfo_Event_Mpegv_group_start_closed_gop_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*7351*/ case MediaInfo_Event_Mpegv_DataBeforeFirst_sequence_header                  : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Mpegv_DataBeforeFirst_sequence_header_0)) Mpegv_DataBeforeFirst_sequence_header_0((struct MediaInfo_Event_Mpegv_DataBeforeFirst_sequence_header_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*7352*/ case MediaInfo_Event_Mpegv_IFrame_Without_sequence_header                   : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Mpegv_IFrame_Without_sequence_header_0)) Mpegv_IFrame_Without_sequence_header_0((struct MediaInfo_Event_Mpegv_IFrame_Without_sequence_header_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*7356*/ case MediaInfo_Event_Mpegv_picture_structure_Not3                           : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Mpegv_picture_structure_Not3_0)) Mpegv_picture_structure_Not3_0((struct MediaInfo_Event_Mpegv_picture_structure_Not3_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*7357*/ case MediaInfo_Event_Mpegv_Has_scalable_extensions                          : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Mpegv_Has_scalable_extensions_0)) Mpegv_Has_scalable_extensions_0((struct MediaInfo_Event_Mpegv_Has_scalable_extensions_0*)Data_Content, UserHandler->Option_DCA); break;
-                    default                                                                     : ;
-                }
-                break;
-        case MediaInfo_Parser_Avc :    
-                switch (EventID)
-                {    
-                    case MediaInfo_Event_Avc_GOP                                                : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Avc_GOP_0)) Avc_GOP_0((struct MediaInfo_Event_Avc_GOP_0*)Data_Content, UserHandler->Option_DCA); break;
-                    case MediaInfo_Event_Avc_BitRate_NotConstant                                : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Avc_BitRate_NotConstant_0)) Avc_BitRate_NotConstant_0((struct MediaInfo_Event_Avc_BitRate_NotConstant_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*7123*/ case MediaInfo_Event_Avc_NumBytesInNALunit_IllegalForBluray                 : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Avc_NumBytesInNALunit_IllegalForBluray_0)) Avc_NumBytesInNALunit_IllegalForBluray_0((struct MediaInfo_Event_Avc_NumBytesInNALunit_IllegalForBluray_0*)Data_Content, UserHandler->Option_DCA); break;
-/*7702.114*//*215*/ case MediaInfo_Event_Avc_IFrame_WithoutStart                                : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Avc_IFrame_WithoutStart_0)) Avc_IFrame_WithoutStart_0((struct MediaInfo_Event_Avc_IFrame_WithoutStart_0*)Data_Content, UserHandler->Option_DCA); break;
-/*3012,7702.109*//*210*/ case MediaInfo_Event_Avc_GOP_Size_IllegalForCustomer0                  : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Avc_GOP_Size_IllegalForCustomer0_0)) Avc_GOP_Size_IllegalForCustomer0_0((struct MediaInfo_Event_Avc_GOP_Size_IllegalForCustomer0_0*)Data_Content, UserHandler->Option_DCA); break;
-/*3028,7702.110,111,211,212*/ case MediaInfo_Event_Avc_GOP_FieldsOrder_IllegalForCustomer0      : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Avc_GOP_FieldsOrder_IllegalForCustomer0_0)) Avc_GOP_FieldsOrder_IllegalForCustomer0_0((struct MediaInfo_Event_Avc_GOP_FieldsOrder_IllegalForCustomer0_0*)Data_Content, UserHandler->Option_DCA); break;
-                    default                                                                     : ;
-                }
-                break;
-        case MediaInfo_Parser_Afd :    
-                switch (EventID)
-                { 
-                    case MediaInfo_Event_Afd_Content                                            : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Afd_Content_0)) Afd_Content_0((struct MediaInfo_Event_Afd_Content_0*)Data_Content, UserHandler->Option_DCA); break;
-                    default                                                                     : ;
-                }
-                break;
-        case MediaInfo_Parser_BarData :    
-                switch (EventID)
-                { 
-                    case MediaInfo_Event_BarData_Content                                        : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_BarData_Content_0)) BarData_Content_0((struct MediaInfo_Event_BarData_Content_0*)Data_Content, UserHandler->Option_DCA); break;
-                    default                                                                     : ;
-                }
-                break;
-        case MediaInfo_Parser_Eia608 :    
-                switch (EventID)
-                { 
-           /*1501*/ case MediaInfo_Event_Eia608_ControlCode_NotTwice                            : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Eia608_ControlCode_NotTwice_0)) Eia608_ControlCode_NotTwice_0((struct MediaInfo_Event_Eia608_ControlCode_NotTwice_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1502*/ case MediaInfo_Event_Eia608_NoFieldMatch                                    : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Eia608_NoFieldMatch_0)) Eia608_NoFieldMatch_0((struct MediaInfo_Event_Eia608_NoFieldMatch_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1503*/ case MediaInfo_Event_Eia608_CC_MoreThan32Chars                              : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Eia608_CC_MoreThan32Chars_0)) Eia608_CC_MoreThan32Chars_0((struct MediaInfo_Event_Eia608_CC_MoreThan32Chars_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1504*/ case MediaInfo_Event_Eia608_XDS_Current_ContentAdvisory_MPA_USTV            : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Eia608_XDS_Current_ContentAdvisory_MPA_USTV_0)) Eia608_XDS_Current_ContentAdvisory_MPA_USTV_0((struct MediaInfo_Event_Eia608_XDS_Current_ContentAdvisory_MPA_USTV_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1505*/ case MediaInfo_Event_Eia608_XDS_Current_ContentAdvisory_USTV_MPA            : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Eia608_XDS_Current_ContentAdvisory_USTV_MPA_0)) Eia608_XDS_Current_ContentAdvisory_USTV_MPA_0((struct MediaInfo_Event_Eia608_XDS_Current_ContentAdvisory_USTV_MPA_0*)Data_Content, UserHandler->Option_DCA); break;
-   /*3026*//*1506*/ case MediaInfo_Event_Eia608_XDS_Current_CopyAndRedistributionControlPacket  : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Eia608_XDS_Current_CopyAndRedistributionControlPacket_0)) Eia608_XDS_Current_CopyAndRedistributionControlPacket_0((struct MediaInfo_Event_Eia608_XDS_Current_CopyAndRedistributionControlPacket_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1507*/ case MediaInfo_Event_Eia608_XDS_PublicService_NationalWeather               : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Eia608_XDS_PublicService_NationalWeather_0)) Eia608_XDS_PublicService_NationalWeather_0((struct MediaInfo_Event_Eia608_XDS_PublicService_NationalWeather_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1508*/ case MediaInfo_Event_Eia608_IllegalCharacter                                : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Eia608_IllegalCharacter_0)) Eia608_IllegalCharacter_0((struct MediaInfo_Event_Eia608_IllegalCharacter_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1514*/ case MediaInfo_Event_Eia608_End                                             : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Eia608_End_0)) Eia608_End_0((struct MediaInfo_Event_Eia608_End_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1515*/ case MediaInfo_Event_Eia608_CC_MoreThan15Rows                               : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Eia608_CC_MoreThan15Rows_0)) Eia608_CC_MoreThan15Rows_0((struct MediaInfo_Event_Eia608_CC_MoreThan15Rows_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1516*/ case MediaInfo_Event_Eia608_XDS_Field1                                      : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Eia608_XDS_Field1_0)) Eia608_XDS_Field1_0((struct MediaInfo_Event_Eia608_XDS_Field1_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*3027*/ case MediaInfo_Event_Eia608_XDS_Current_ContentAdvisory_Content             : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Eia608_XDS_Current_ContentAdvisory_Content_0)) Eia608_XDS_Current_ContentAdvisory_Content_0((struct MediaInfo_Event_Eia608_XDS_Current_ContentAdvisory_Content_0*)Data_Content, UserHandler->Option_DCA); break;
-                    case MediaInfo_Event_Eia608_CC_Content                                      : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Eia608_CC_Content_0)) Eia608_CC_Content_0((struct MediaInfo_Event_Eia608_CC_Content_0*)Data_Content, UserHandler->Option_DCA); break;
-                    default                                                                     : ;
-                }
-                break;
-        case MediaInfo_Parser_DtvccTransport :    
-                switch (EventID)
-                { 
-           /*1512*/ case MediaInfo_Event_DtvccTransport_cc_count                                : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_DtvccTransport_cc_count_0)) DtvccTransport_cc_count_0((struct MediaInfo_Event_DtvccTransport_cc_count_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1512*/ case MediaInfo_Event_DtvccTransport_Eia608_cc_count                         : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_DtvccTransport_Eia608_cc_count_0)) DtvccTransport_Eia608_cc_count_0((struct MediaInfo_Event_DtvccTransport_Eia608_cc_count_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1513*/ case MediaInfo_Event_DtvccTransport_picture_structure_cc_type               : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_DtvccTransport_picture_structure_cc_type_0)) DtvccTransport_picture_structure_cc_type_0((struct MediaInfo_Event_DtvccTransport_picture_structure_cc_type_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1651*/ case MediaInfo_Event_DtvccTransport_additional_data_flag                    : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_DtvccTransport_additional_data_flag_0)) DtvccTransport_additional_data_flag_0((struct MediaInfo_Event_DtvccTransport_additional_data_flag_0*)Data_Content, UserHandler->Option_DCA); break;
-                    default                                                                     : ;
-                }
-                break;
-        case MediaInfo_Parser_DtvccCaption :    
-                switch (EventID)
-                { 
-           /*1509*/ case MediaInfo_Event_DtvccCaption_ReservedCode                              : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_DtvccCaption_ReservedCode_0)) DtvccCaption_ReservedCode_0((struct MediaInfo_Event_DtvccCaption_ReservedCode_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1510*/ case MediaInfo_Event_DtvccCaption_wordwrap_Deprecated                       : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_DtvccCaption_wordwrap_Deprecated_0)) DtvccCaption_wordwrap_Deprecated_0((struct MediaInfo_Event_DtvccCaption_wordwrap_Deprecated_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1511*/ case MediaInfo_Event_DtvccCaption_WindowIsOutsideOfArea_Minimal             : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_DtvccCaption_WindowIsOutsideOfArea_Minimal_0)) DtvccCaption_WindowIsOutsideOfArea_Minimal_0((struct MediaInfo_Event_DtvccCaption_WindowIsOutsideOfArea_Minimal_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1514*/ case MediaInfo_Event_DtvccCaption_End                                       : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_DtvccCaption_End_0)) DtvccCaption_End_0((struct MediaInfo_Event_DtvccCaption_End_0*)Data_Content, UserHandler->Option_DCA); break;
-                    case MediaInfo_Event_DtvccCaption_Content_Minimal                           : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_DtvccCaption_Content_Minimal_0)) DtvccCaption_Content_Minimal_0((struct MediaInfo_Event_DtvccCaption_Content_Minimal_0*)Data_Content, UserHandler->Option_DCA); break;
-                    case MediaInfo_Event_DtvccCaption_Window_Content_Minimal                    : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_DtvccCaption_Window_Content_Minimal_0)) DtvccCaption_Window_Content_Minimal_0((struct MediaInfo_Event_DtvccCaption_Window_Content_Minimal_0*)Data_Content, UserHandler->Option_DCA); break;
-                    default                                                                     : ;
-                }
-                break;
-        case MediaInfo_Parser_Cdp :    
-                switch (EventID)
-                { 
-           /*1512*/ case MediaInfo_Event_Cdp_cc_count                                           : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Cdp_cc_count_0)) Cdp_cc_count_0((struct MediaInfo_Event_Cdp_cc_count_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1512*/ case MediaInfo_Event_Cdp_Eia608_cc_count                                    : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Cdp_Eia608_cc_count_0)) Cdp_Eia608_cc_count_0((struct MediaInfo_Event_Cdp_Eia608_cc_count_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1513*/ case MediaInfo_Event_Cdp_picture_structure_cc_type                          : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Cdp_picture_structure_cc_type_0)) Cdp_picture_structure_cc_type_0((struct MediaInfo_Event_Cdp_picture_structure_cc_type_0*)Data_Content, UserHandler->Option_DCA); break;
-                    default                                                                     : ;
-                }
-                break;
-        case MediaInfo_Parser_Scte20 :    
-                switch (EventID)
-                { 
-           /*1512*/ case MediaInfo_Event_Scte20_cc_count                                        : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Scte20_cc_count_0)) Scte20_cc_count_0((struct MediaInfo_Event_Scte20_cc_count_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1512*/ case MediaInfo_Event_Scte20_Eia608_cc_count                                 : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Scte20_Eia608_cc_count_0)) Scte20_Eia608_cc_count_0((struct MediaInfo_Event_Scte20_Eia608_cc_count_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1513*/ case MediaInfo_Event_Scte20_picture_structure_cc_type                       : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Scte20_picture_structure_cc_type_0)) Scte20_picture_structure_cc_type_0((struct MediaInfo_Event_Scte20_picture_structure_cc_type_0*)Data_Content, UserHandler->Option_DCA); break;
-           /*1601*/ case MediaInfo_Event_Scte20_field_number_Forbidden                          : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_Scte20_field_number_Forbidden_0)) Scte20_field_number_Forbidden_0((struct MediaInfo_Event_Scte20_field_number_Forbidden_0*)Data_Content, UserHandler->Option_DCA); break;
-                    default                                                                     : ;
-                }
-                break;
-        default : ; //ParserID is unknown
-    }
-
-    #ifdef MEDIAINFO_REGRESSION_TEST
-        fclose(F); F=NULL;
-    #endif //MEDIAINFO_REGRESSION_TEST
-}
-
-/***************************************************************************/
-/* Parsing the file, example with the stream interface                     */
-/***************************************************************************/
-
-int MI_Parse (void* MI, const char* FileName)
-{
-    /*Note: You can use basicly the analyze by FileName too, the code her is to demonstrate the usage of buffers, useful if you capture a stream*/
-    void* From;
-    unsigned char* From_Buffer;
-    DWORD From_Buffer_Size;
-    DWORD From_Size_Low; 
-    DWORD From_Size_High;
-    unsigned long long From_Size;
-
-    /***********************************************************************/
-    /* Preparing input file                                                */
-    /***********************************************************************/
-
-    /*From: preparing an example file for reading*/
-    From=CreateFile(FileName, FILE_READ_DATA, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
-    if (From==INVALID_HANDLE_VALUE)
-    {
-        echo0("Can not open input file");
-        return 1;
-    }
-    From_Size_Low=GetFileSize(From, &From_Size_High);
-    if (From_Size_Low==INVALID_FILE_SIZE && GetLastError()!=NO_ERROR)
-    {
-        echo0("Can not get input file size");
-        return 1;
-    }
-    From_Size=0x100000000ULL*From_Size_High+From_Size_Low;
-
-    /*From: preparing a memory buffer for reading*/
-    From_Buffer=(unsigned char*)malloc(300000); //Note: you can do your own buffer
-
-    /*Preparing to fill MediaInfo with a buffer*/
-    MediaInfo_Open_Buffer_Init(MI, From_Size, 0);
-
-    /***********************************************************************/
-    /* Parsing                                                             */
-    /***********************************************************************/
-
-    /*The parsing loop*/
-    do
-    {
-        /*Reading data somewhere, do what you want for this.*/
-        if (!ReadFile(From, From_Buffer, 300000, &From_Buffer_Size, NULL))
-        {
-                char lpMsgBuf[1000];
-                DWORD dw = GetLastError();
-                FormatMessageA(
-                FORMAT_MESSAGE_FROM_SYSTEM,
-                NULL,
-                dw,
-                MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                lpMsgBuf,
-                1000, NULL );
-
-            /*Clean up*/
-            free(From_Buffer);
-
-            echo0("Can not read input file");
-            return 1;
-        }
-
-        /*Sending the buffer to MediaInfo*/
-        if (MediaInfo_Open_Buffer_Continue(MI, From_Buffer, From_Buffer_Size)&0x08) //Bit 3 is set if analyzing is finished (TODO: documentation about function return vale)
-            break;
-
-        /*Managing seek requests*/
-        if (MediaInfo_Open_Buffer_Continue_GoTo_Get(MI)!=(MediaInfo_int64u)-1)
-        {
-            LARGE_INTEGER GoTo; GoTo.QuadPart=MediaInfo_Open_Buffer_Continue_GoTo_Get(MI);
-            GoTo.LowPart=SetFilePointer(From, GoTo.LowPart, &GoTo.HighPart, FILE_BEGIN);
-            if (GoTo.LowPart==INVALID_SET_FILE_POINTER && GetLastError()!=NO_ERROR)
-            {
-                /*Clean up*/
-                free(From_Buffer);
-
-                echo0("Error during input file seek");
-                return 1;
-            }
-            MediaInfo_Open_Buffer_Init(MI, From_Size, GoTo.QuadPart);
-        }
-    }
-    while (From_Buffer_Size>0);
-    MediaInfo_Open_Buffer_Finalize(MI);
-
-    /*Clean up*/
-    free(From_Buffer);
-
-    return 0;
-}
-
-/***************************************************************************/
-/* Per file                                                                */
-/***************************************************************************/
-
-int MI_PerFile (const char* FileName, struct UserHandle_struct UserHandle)
-{
-    void* MI;
-    char Event_CallBackFunction_Text[1000];
-    const char* MI_Result;
-    size_t StreamKind;
-    size_t StreamPos;
-    char OverallBitRate_String[1000];
-    char IDs_Format_String[10000];
-
-    /***********************************************************************/
-    /* Retrieving bit rate                                                 */
-    /***********************************************************************/
-
-    /*Init*/
-    MI=MediaInfo_New();
-    if (MI==NULL)
-    {
-        echo0("MediaInfo error: impossible to create a new MediaInfo handler");
-        return 1;
-    }
-  
-    /*We want only some details*/
-    MI_Result=MediaInfo_Option(MI, "ParseSpeed", "0.5");
-    if (strlen(MI_Result))
-    {
-        echo1("MediaInfo error: %s\r\n", MI_Result);
-        return 1;
-    }
-    
-    /*We want to test streams even if stream_type is wrong*/
-    MI_Result=MediaInfo_Option(MI, "File_MpegTs_stream_type_Trust", "0");
-    if (strlen(MI_Result))
-    {
-        echo1("MediaInfo error: %s\r\n", MI_Result);
-        return 1;
-    }
-    
-    /*Parsing*/
-    #ifdef MEDIAINFO_REGRESSION_TEST
-        F_FileName=strrchr(FileName, '\\');
-        if (F_FileName==NULL)
-            F_FileName=FileName;
-        else
-            F_FileName++; //Skipping antislash
-    #endif //MEDIAINFO_REGRESSION_TEST
-    if (MI_Parse(MI, FileName))
-        return 1;
-
-    /*Retrieving information*/
-    strcpy(OverallBitRate_String, MediaInfo_Get(MI, MediaInfo_Stream_General, 0, "OverallBitRate", MediaInfo_Info_Text, MediaInfo_Info_Name));
-    IDs_Format_String[0]='\0'; //Form is "ID1=Format1;ID2=Format2;..."
-    for (StreamKind=1; StreamKind<MediaInfo_Stream_Max; StreamKind++)
-        for (StreamPos=0; StreamPos<MediaInfo_Count_Get(MI, (MediaInfo_stream_C)StreamKind, (size_t)-1); StreamPos++)
-        {
-            strcpy(IDs_Format_String+strlen(IDs_Format_String), MediaInfo_Get(MI, (MediaInfo_stream_C)StreamKind, StreamPos, "ID", MediaInfo_Info_Text, MediaInfo_Info_Name));
-            strcpy(IDs_Format_String+strlen(IDs_Format_String), "=");
-            strcpy(IDs_Format_String+strlen(IDs_Format_String), MediaInfo_Get(MI, (MediaInfo_stream_C)StreamKind, StreamPos, "Format", MediaInfo_Info_Text, MediaInfo_Info_Name));
-            strcpy(IDs_Format_String+strlen(IDs_Format_String), ";");
-        }
-
-    /*Clean up*/
-    MediaInfo_Delete(MI);
-
-    /***********************************************************************/
-    /* Parsing, with events                                                */
-    /***********************************************************************/
-
-    /*Init*/
-    MI=MediaInfo_New();
-    if (MI==NULL)
-    {
-        echo0("MediaInfo error: impossible to create a new MediaInfo handler");
-        return 1;
-    }
-
-    /*CallBack configuration*/
-    /*MediaInfo need pointer as text, for compatibility with older version) + 64-bit OS handling*/
-    /*form is "CallBack=memory://handlerInDecimal;UserHandler=memory://handlerInDecimal"*/
-    /*UserHandler is a unique value wich will be provided to the callback function, in order to know which MediaInfo instance send the event*/
-    UserHandle.MI=MI;
-    strcpy(Event_CallBackFunction_Text, "CallBack=memory://");
-    _ui64toa_s((unsigned __int64)Event_CallBackFunction, Event_CallBackFunction_Text+strlen(Event_CallBackFunction_Text), 1000-strlen(Event_CallBackFunction_Text), 10);
-    strcpy(Event_CallBackFunction_Text+strlen(Event_CallBackFunction_Text), ";UserHandler=memory://");
-    _ui64toa_s((unsigned __int64)&UserHandle, Event_CallBackFunction_Text+strlen(Event_CallBackFunction_Text), 1000-strlen(Event_CallBackFunction_Text), 10);
-    MI_Result=MediaInfo_Option(MI, "File_Event_CallBackFunction", Event_CallBackFunction_Text);
-    if (strlen(MI_Result))
-    {
-        echo1("MediaInfo error: %s\r\n", MI_Result);
-        return 1;
-    }
-
-    /*Indicating previously retrieve information*/
-    MI_Result=MediaInfo_Option(MI, "File_OverallBitRate", OverallBitRate_String);
-    if (strlen(MI_Result))
-    {
-        echo1("MediaInfo error: %s\r\n", MI_Result);
-        return 1;
-    }
-    MI_Result=MediaInfo_Option(MI, "File_IDs_Format", IDs_Format_String);
-    if (strlen(MI_Result))
-    {
-        echo1("MediaInfo error: %s\r\n", MI_Result);
-        return 1;
-    }
-
-    /*Indicating the GOP structure for progressive assets*/
-    MI_Result=MediaInfo_Option(MI, "File_GopStructure_Progressive", "Format=IPB;IBBBPBBBPBBBPBBBPBBBPBBB");
-    if (strlen(MI_Result))
-    {
-        echo1("MediaInfo error: %s\r\n", MI_Result);
-        return 1;
-    }
-
-    /*Indicating the GOP structure for interlaced assets*/
-    MI_Result=MediaInfo_Option(MI, "File_GopStructure_Interlaced", "Format=IPB;IPBBBBBBPPBBBBBBPPBBBBBBPPBBBBBBPPBBBBBBPPBBBBBB");
-    if (strlen(MI_Result))
-    {
-        echo1("MediaInfo error: %s\r\n", MI_Result);
-        return 1;
-    }
-
-    /*We want all the stream, not only the beginning*/
-    MI_Result=MediaInfo_Option(MI, "ParseSpeed", "1.0");
-    if (strlen(MI_Result))
-    {
-        echo1("MediaInfo error: %s\r\n", MI_Result);
-        return 1;
-    }
-    
-    /*We want to test streams even if stream_type is wrong*/
-    MI_Result=MediaInfo_Option(MI, "File_MpegTs_stream_type_Trust", "0");
-    if (strlen(MI_Result))
-    {
-        echo1("MediaInfo error: %s\r\n", MI_Result);
-        return 1;
-    }
-    
-    /*Parsing*/
-    if (MI_Parse (MI, FileName))
-        return 1;
-
-    /*Clean up*/
-    MediaInfo_Delete(MI);
-
-    return 0;
-}
-
-/***************************************************************************/
-/* Main                                                                    */
-/***************************************************************************/
-
-int main (int argc, char *argv[])
-{
-    const char* FileNames[10000];
-    size_t FileNames_Max=0;
-    int argv_Problem=0;
-    struct UserHandle_struct UserHandle;
-    size_t Pos;
-
-    /***********************************************************************/
-    /* Options handling                                                    */
-    /***********************************************************************/
-
-    UserHandle.Option_DCA=1;
-    for (Pos=1; Pos<(size_t)argc; Pos++)
-    {
-        if (strcmp(argv[Pos], "--dca")==0)
-            UserHandle.Option_DCA=1;
-        else
-        {
-            FileNames[FileNames_Max]=argv[Pos];
-            FileNames_Max++;
-        }
-    }
-
-    #ifdef MEDIAINFO_REGRESSION_TEST
-    {
-        WIN32_FIND_DATA ffd;
-        HANDLE hFind = INVALID_HANDLE_VALUE;
-
-        FileNames_Max=0;
-        hFind = FindFirstFile("..\\..\\..\\..\\..\\..\\MediaInfoLib_DCA_RegressionTest\\Files\\*", &ffd);
-        if (hFind!=INVALID_HANDLE_VALUE)
-        {
-            do
-            {
-                if (strlen(ffd.cFileName)>2)
-                {
-                    char* Temp=(char*)malloc(65536);
-                    sprintf(Temp, "..\\..\\..\\..\\..\\..\\MediaInfoLib_DCA_RegressionTest\\Files\\%s", ffd.cFileName);
-                    FileNames[FileNames_Max]=Temp;
-                    FileNames_Max++;
-                }
-            }
-            while (FindNextFile(hFind, &ffd)!=0);
-        }
-    }
-    #endif //MEDIAINFO_REGRESSION_TEST
-
-    /*Input*/
-    if (argv_Problem || FileNames_Max==0)
-    {
-        echo0("Usage: MediaInfoDCA FileName [--dca]");
-        return 1;
-    }
-
-    /***********************************************************************/
-    /* MediaInfo library init                                              */
-    /***********************************************************************/
-
-    /*Initializing MediaInfo*/
-    if (MediaInfoDLL_Load()!=1)
-    {
-        printf("MediaInfo error: MediaInfo.dll not found");
-        return 1;
-    }
-
-    for (Pos=0; Pos<FileNames_Max; Pos++)
-    {
-        #ifdef MEDIAINFO_REGRESSION_TEST
-        {
-            printf("%d / %d\n", Pos, FileNames_Max);
-        }
-        #endif //MEDIAINFO_REGRESSION_TEST
-        MI_PerFile(FileNames[Pos], UserHandle);
-    }
-
-    #ifdef MEDIAINFO_REGRESSION_TEST
-        for (Pos=0; Pos<FileNames_Max; Pos++)
-        {
-            char FileNameRef[65536];
-            char FileNameNew[65536];
-            char FileNameRef_Find[65536];
-            WIN32_FIND_DATA ffd;
-            HANDLE hFind = INVALID_HANDLE_VALUE;
-
-            strcpy(FileNameRef, "..\\..\\..\\..\\..\\..\\MediaInfoLib_DCA_RegressionTest\\Ref\\");
-            strcpy(FileNameNew, "..\\..\\..\\..\\..\\..\\MediaInfoLib_DCA_RegressionTest\\New\\");
-            strcpy(FileNameRef+strlen(FileNameRef), strrchr(FileNames[Pos], '\\'));
-            strcpy(FileNameNew+strlen(FileNameNew), strrchr(FileNames[Pos], '\\'));
-            strcpy(FileNameRef+strlen(FileNameRef), "\\");
-            strcpy(FileNameNew+strlen(FileNameNew), "\\");
-
-            strcpy(FileNameRef_Find, FileNameRef);
-            strcpy(FileNameRef_Find+strlen(FileNameRef_Find), "*.txt");
-            hFind = FindFirstFile(FileNameRef_Find, &ffd);
-            if (hFind!=INVALID_HANDLE_VALUE)
-            {
-                do
-                {
-                    char* Ref_Buffer=NULL;
-                    FILE* Ref=NULL;
-                    char  Ref_CompleteFileName[65536];
-                    char* New_Buffer=NULL;
-                    FILE* New=NULL;
-                    char  New_CompleteFileName[65536];
-                    int   New_Size;
-
-                    strcpy(Ref_CompleteFileName, FileNameRef);
-                    strcpy(Ref_CompleteFileName+strlen(Ref_CompleteFileName), ffd.cFileName);
-                    Ref=fopen(Ref_CompleteFileName, "rb");
-                    Ref_Buffer=(char*)malloc(ffd.nFileSizeLow+1);
-                    fread(Ref_Buffer, ffd.nFileSizeLow, 1, Ref);
-                    Ref_Buffer[ffd.nFileSizeLow]='\0';
-
-                    strcpy(New_CompleteFileName, FileNameNew);
-                    strcpy(New_CompleteFileName+strlen(New_CompleteFileName), ffd.cFileName);
-                    New=fopen(New_CompleteFileName, "rb");
-                    if (New==NULL)
-                        New_Size=-1;
-                    else
-                    {
-                        fseek (New, 0 , SEEK_END);
-                        New_Size=ftell(New);
-                        rewind(New);
-                        if (New_Size==ffd.nFileSizeLow)
-                        {  
-                            New_Buffer=(char*)malloc(New_Size+1);
-                            fread(New_Buffer, New_Size, 1, New);
-                            New_Buffer[New_Size]='\0';
-                            if (strcmp(Ref_Buffer, New_Buffer))
-                                New_Size=-1;
-                        }
-                    }
-
-                    if (New_Size!=ffd.nFileSizeLow)
-                    {
-                        char FileNameDiff[65536];
-                        FILE* Result;
-                        char ToWrite[65536];
-
-                        strcpy(FileNameDiff, "..\\..\\..\\..\\..\\..\\MediaInfoLib_DCA_RegressionTest\\Diff\\");
-                        strcpy(FileNameDiff+strlen(FileNameDiff), strrchr(FileNames[Pos], '\\'));
-                        strcpy(FileNameDiff+strlen(FileNameDiff), ".txt");
-                        Result=fopen(FileNameDiff, "a");
-                    
-                        strcpy(ToWrite, ffd.cFileName);
-                        strcpy(ToWrite+strlen(ToWrite), " - Error\n");
-                        fwrite(ToWrite, strlen(ToWrite), 1, Result);
-                        fclose(Result); Result=NULL;
-                    }
-
-                    free(Ref_Buffer); Ref_Buffer=NULL;
-                    if (Ref) {fclose(Ref); Ref=NULL;}
-                    free(New_Buffer); New_Buffer=NULL;
-                    if (New) {fclose(New); New=NULL;}
-                }
-                while (FindNextFile(hFind, &ffd)!=0);
-                FindClose(hFind);
-            }
-        }
-    #endif //MEDIAINFO_REGRESSION_TEST
-
-    return 0;
-}
\ No newline at end of file

libmediainfo_0.7.34.tar.bz2/Source/Example/MpegTs_TimeStamps.cpp Deleted

@@ -1,433 +0,0 @@
-// MediaInfo_MPEG-TS_TimeStamps_Errors - Timestamps for MPEG-TS files, based on MediaInfo
-// Copyright (C) 2009-2009 MediaArea.net, info@MediaArea.net
-//
-// This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this library. If not, see <http://www.gnu.org/licenses/>.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//
-// This utility displays PCR continuity errors.
-// It can display all the PCR of a file with -f
-// Compilation:
-// g++ MediaInfo_MPEG-TS_TimeStamps_Errors.cpp -o MediaInfo_MPEG-TS_TimeStamps_Errors -lmediainfo -lzen -lz
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-//---------------------------------------------------------------------------
-#include "ZenLib/Ztring.h"
-#include "ZenLib/File.h"
-#include "vector"
-#include "iostream"
-#include "MediaInfoDLL/MediaInfoDLL.h"
-#include "MediaInfo/MediaInfo_Events.h"
-using namespace MediaInfoDLL;
-using namespace ZenLib;
-using namespace std;
-//---------------------------------------------------------------------------
-
-//---------------------------------------------------------------------------
-struct info
-{
-    File    TimeStampFile;
-    int64u  Value_First;
-    float64 Value_Last;
-    float64 Value_Current;
-    int64u  Offset_Last;
-    int64u  Offset_Current;
-    bool    IsNormal;
-
-    info()
-    {
-        Value_First=(int64u)-1;
-        Value_Last=(int64u)-1;
-        Value_Current=(int64u)-1;
-        Offset_Last=(int64u)-1;
-        Offset_Current=(int64u)-1;
-        IsNormal=false;
-    }
-};
-typedef std::vector<info*> infos;
-
-struct callback_data
-{
-    bool Full;
-    bool Cout;
-    Ztring FileName;
-    infos Infos;
-};
-//---------------------------------------------------------------------------
-
-/***************************************************************************/
-/* The callback function                                                   */
-/***************************************************************************/
-
-void __stdcall Event_CallBackFunction(unsigned char* Data_Content, size_t Data_Size, void* UserHandler_Void)
-{
-    /*Retrieving UserHandler*/
-    callback_data                      &CallBack=*((callback_data*)UserHandler_Void);
-    struct MediaInfo_Event_Generic*     Event_Generic=(struct MediaInfo_Event_Generic*) Data_Content;
-    unsigned char                       ParserID;
-    unsigned short                      EventID;
-    unsigned char                       EventVersion;
-
-    /*integrity tests*/
-    if (Data_Size<4)
-        return; //There is a problem
-
-    /*Do what you need with the event, here is only an example*/
-    /*Retrieving EventID*/
-    ParserID    =(unsigned char) ((Event_Generic->EventCode&0xFF000000)>>24);
-    EventID     =(unsigned short)((Event_Generic->EventCode&0x00FFFF00)>>8 );
-    EventVersion=(unsigned char) ( Event_Generic->EventCode&0x000000FF     );
-    switch (ParserID)
-    {
-        case MediaInfo_Parser_MpegPs :    
-                switch (EventID)
-                {    
-                    case MediaInfo_Event_MpegPs_PES_IFrame_NoTimeStamps                         : break;
-                    default                                                                     : return;
-                }
-                break;
-        default : return; //ParserID is unknown
-    }
-
-    MediaInfo_Event_MpegPs_PES_IFrame_NoTimeStamps_0 &Data=*(struct MediaInfo_Event_MpegPs_PES_IFrame_NoTimeStamps_0*)Data_Content;
-    if (Data.PTS==(int64u)-1)
-        return;
-
-    if (CallBack.Infos[Data.PID]==NULL)
-    {
-        //Creating pointer
-        CallBack.Infos[Data.PID]=new info;
-
-        //Saving Delay
-        CallBack.Infos[Data.PID]->Value_First=Data.PTS;
-        CallBack.Infos[Data.PID]->Value_Current=Data.PTS;
-
-        //Creating the file, depends of the count of programs
-        CallBack.Infos[Data.PID]->TimeStampFile.Create(CallBack.FileName+_T(".")+Ztring::ToZtring(Data.PID)+_T(".TimeStampFile.csv"), true);
-
-        //File header
-        Ztring Header=Ztring(_T("FileOffset (hexadecimal),FileOffset (decimal),AbsoluteDuration (27 MHz),AbsoluteDuration (ms),AbsoluteDuration (ISO 8601),RelativeDuration (27 MHz),RelativeDuration (ms),RelativeDuration (ISO 6801)"))+ZenLib::EOL;
-        if (CallBack.Cout)
-            wcout<<Header;
-        else
-            CallBack.Infos[Data.PID]->TimeStampFile.Write(Header);
-    }
-
-
-    //Saving data from the chunk before
-    CallBack.Infos[Data.PID]->Value_Last=CallBack.Infos[Data.PID]->Value_Current;
-    CallBack.Infos[Data.PID]->Offset_Last=CallBack.Infos[Data.PID]->Offset_Current;
-
-    //Retrieving the current data
-    CallBack.Infos[Data.PID]->Value_Current=Data.PTS;
-    CallBack.Infos[Data.PID]->Offset_Current=Data.Stream_Offset;
-
-    //Displaying the offset before if there is a gap
-    Ztring Text;
-    if (!CallBack.Full && CallBack.Infos[Data.PID]->Offset_Last!=(int64u)-1 && CallBack.Infos[Data.PID]->IsNormal && (CallBack.Infos[Data.PID]->Value_Last+700000000<CallBack.Infos[Data.PID]->Value_Current || CallBack.Infos[Data.PID]->Value_Last>CallBack.Infos[Data.PID]->Value_Current)) //Must be less than 0.7s
-    {
-        Text+=Ztring::ToZtring(CallBack.Infos[Data.PID]->Offset_Last, 16)+_T(",")
-              +Ztring::ToZtring(CallBack.Infos[Data.PID]->Offset_Last)+_T(",")
-              +Ztring::ToZtring(float64_int64s(((float64)CallBack.Infos[Data.PID]->Value_Last)*27/1000))+_T(",")
-              +Ztring::ToZtring(CallBack.Infos[Data.PID]->Value_Last)+_T(",")
-              +Ztring().Duration_From_Milliseconds(float64_int64s(((float64)CallBack.Infos[Data.PID]->Value_Last)/1000000))+_T(",")
-              //+Ztring::ToZtring(CallBack.Infos[Data.PID]->Duration_Before, 0)+_T(",")
-              //+Ztring::ToZtring(CallBack.Infos[Data.PID]->Duration_Before/27000, 6)+_T(",")
-              //+Ztring().Duration_From_Milliseconds(float64_int64s(CallBack.Infos[Data.PID]->Duration_Before/27000))
-              +ZenLib::EOL;
-    }
-    //Displaying the current offset
-    if (CallBack.Full)// || CallBack.Infos[Data.PID]->From_Position_Before==(int64u)-1 || (CallBack.Infos[Data.PID]->Duration_Before+700*27000<CallBack.Infos[Data.PID]->Duration_Current || CallBack.Infos[Data.PID]->Duration_Before>CallBack.Infos[Data.PID]->Duration_Current)) //Must be less than 0.7s
-    {
-        Text+=Ztring::ToZtring(CallBack.Infos[Data.PID]->Offset_Current, 16)+_T(",")
-              +Ztring::ToZtring(CallBack.Infos[Data.PID]->Offset_Current)+_T(",")
-              +Ztring::ToZtring(float64_int64s(((float64)CallBack.Infos[Data.PID]->Value_Current)*90/1000000))+_T(",")
-              +Ztring::ToZtring(((float64)CallBack.Infos[Data.PID]->Value_Current)/1000000, 6)+_T(",")
-              +Ztring().Duration_From_Milliseconds(float64_int64s(((float64)CallBack.Infos[Data.PID]->Value_Current)/1000000))+_T(",")
-              +Ztring::ToZtring(float64_int64s(((float64)(CallBack.Infos[Data.PID]->Value_Current-CallBack.Infos[Data.PID]->Value_First))*90/1000000))+_T(",")
-              +Ztring::ToZtring(((float64)(CallBack.Infos[Data.PID]->Value_Current-CallBack.Infos[Data.PID]->Value_First))/1000000, 6)+_T(",")
-              +Ztring().Duration_From_Milliseconds(float64_int64s(((float64)(CallBack.Infos[Data.PID]->Value_Current-CallBack.Infos[Data.PID]->Value_First))/1000000))+_T(",")
-              +Ztring::ToZtring(float64_int64s(((float64)(CallBack.Infos[Data.PID]->Value_Current-CallBack.Infos[Data.PID]->Value_Last))*90/1000000))+_T(",")
-              +Ztring::ToZtring(((float64)(CallBack.Infos[Data.PID]->Value_Current-CallBack.Infos[Data.PID]->Value_Last))/1000000, 6)+_T(",")
-              +Ztring().Duration_From_Milliseconds(float64_int64s(((float64)(CallBack.Infos[Data.PID]->Value_Current-CallBack.Infos[Data.PID]->Value_Last))/1000000))+_T(",")
-              +ZenLib::EOL;
-
-/*
-        Data+=Ztring::ToZtring(CallBack.Infos[Data.PID]->From_Position_Current, 16)+_T(",")
-              +Ztring::ToZtring(CallBack.Infos[Data.PID]->From_Position_Current)+_T(",")
-              +Ztring::ToZtring(Duration_Absolute_Current)+_T(",")
-              +Ztring::ToZtring(((float64)Duration_Absolute_Current)/27000, 6)+_T(",")
-              +Ztring().Duration_From_Milliseconds(float64_int64s(((float64)Duration_Absolute_Current)/27000))+_T(",")
-              +Ztring::ToZtring(CallBack.Infos[Data.PID]->Duration_Current, 0)+_T(",")
-              +MI.Get(StreamKind, Pos, _T("Duration"))+_T(",")
-              +MI.Get(StreamKind, Pos, _T("Duration/String3"))
-              +ZenLib::EOL;
-*/
-        CallBack.Infos[Data.PID]->IsNormal=false;
-    }
-
-    //Displaying "Is normal" if useful
-    else if (!CallBack.Full && !CallBack.Infos[Data.PID]->IsNormal)
-    {
-        Text+=Ztring(_T("(Is normal),(Is normal),(Is normal),(Is normal),(Is normal),(Is normal),(Is normal),(Is normal)"))+ZenLib::EOL;
-        CallBack.Infos[Data.PID]->IsNormal=true;
-    }
-
-    //Output
-    if (!Text.empty())
-    {
-        if (CallBack.Cout)
-            wcout<<Text;
-        else
-            CallBack.Infos[Data.PID]->TimeStampFile.Write(Text);
-    }
-
-    cout<<Data.PTS_HR<<std::endl;
-}
-
-//***************************************************************************
-// Main entry
-//***************************************************************************
-
-int main(int argc, char* argv[])
-{
-    //Input
-    callback_data CallBack_Data;
-    CallBack_Data.Full=false;
-    CallBack_Data.Cout=false;
-    for (int Pos=1; Pos<argc; Pos++)
-    {
-        if (string(argv[Pos])=="-f" || string(argv[Pos])=="--full")
-            CallBack_Data.Full=true;
-        else if (string(argv[Pos])=="-o" || string(argv[Pos])=="--cout")
-            CallBack_Data.Cout=true;
-        else if (string(argv[Pos])=="-h" || string(argv[Pos])=="--help")
-            ; //Help
-        else if (string(argv[Pos])=="-v" || string(argv[Pos])=="--version")
-            ; //Version
-        else if (!CallBack_Data.FileName.empty())
-        {
-            cout<<"Only 1 file per call"<<endl;
-            return 1;
-        }
-        else
-            CallBack_Data.FileName.From_UTF8(argv[Pos]);
-    }
-
-    if (CallBack_Data.FileName.empty())
-    {
-        cout<<"MediaInfo_MPEG-TS_TimeStamps_Errors v.20091228"<<endl;
-        cout<<endl;
-        cout<<"Options:"<<endl;
-        cout<<"-h, --help           : display this help message"<<endl;
-        cout<<"-v, --version        : display this help message"<<endl;
-        cout<<"-f, --full           : display all timestamps"<<endl;
-        cout<<"-o, --cout           : display to standard output instead of file"<<endl;
-        cout<<endl;
-        return 2;
-    }
-
-    //Initiating
-    CallBack_Data.Infos.resize(0x2000);
-    stream_t StreamKind=Stream_General; //General or Menu, depends of the count of programs in the TS file
-
-    //Initializing MediaInfo
-    MediaInfo MI;
-
-    MI.Option(_T("File_Event_CallBackFunction"), _T("CallBack=memory://")+Ztring::ToZtring((size_t)Event_CallBackFunction)+_T(";UserHandler=memory://")+Ztring::ToZtring((size_t)&CallBack_Data));
-    MI.Option(_T("ParseSpeed"), _T("1"));
-    
-    MI.Open(CallBack_Data.FileName);
-
-    return 0;
-
-    /*
-    //From: preparing for reading
-    ZenLib::File From; From.Open(CallBack_Data.FileName, ZenLib::File::Access_Read);
-    ZenLib::int8u* From_Buffer=new ZenLib::int8u[188]; //Note: you can do your own buffer
-    size_t From_Buffer_Size; //The size of the read file buffer
-
-    //Preparing to fill MediaInfo with a buffer
-    MI.Option(_T("File_ForceParser"), _T("MpegTs")); //We forcing the parser for speed improvement
-    MI.Option(_T("UserBits"), _T("Duration")); //Not useful now because Duration bit is set in all cases, but for future
-    MI.Open_Buffer_Init(From.Size_Get());
-    bool CanWrite_OnlyIfParsingIsOk=false;
-
-    //The parsing loop
-    do
-    {
-        //Reading data
-        From_Buffer_Size=From.Read(From_Buffer, 188);
-
-        //Sending the buffer to MediaInfo
-        size_t Result=MI.Open_Buffer_Continue(From_Buffer, From_Buffer_Size);
-
-        //Managing result (if streams are detected)
-        if (CanWrite_OnlyIfParsingIsOk && Result&(1<<16)) //Bit 16 is temporary bit for Duration modification in MPEG-TS (first UserBit)
-        {
-            for(size_t Pos=0; Pos<Infos.size(); Pos++)
-            {
-                const Ztring &Duration=MI.Get(StreamKind, Pos, _T("Duration"));
-                if (!Duration.empty())
-                {
-                    //Saving data from the chunk before
-                    Infos[Pos]->Duration_Before=Infos[Pos]->Duration_Current;
-                    Infos[Pos]->From_Position_Before=Infos[Pos]->From_Position_Current;
-                    int64u Duration_Absolute_Before=Infos[Pos]->Delay+float64_int64s(Infos[Pos]->Duration_Before);
-
-                    //Retrieving the current data
-                    Infos[Pos]->Duration_Current=Ztring(Duration).To_float64()*27000;
-                    int64u Duration_Absolute_Current=Infos[Pos]->Delay+float64_int64s(Infos[Pos]->Duration_Current);
-                    Infos[Pos]->From_Position_Current=From.Position_Get()-188;
-
-                    //Displaying the offset before if there is a gap
-                    Ztring Data;
-                    if (!CallBack_Data.Full && Infos[Pos]->From_Position_Before!=(int64u)-1 && Infos[Pos]->IsNormal && (Infos[Pos]->Duration_Before+700*27000<Infos[Pos]->Duration_Current || Infos[Pos]->Duration_Before>Infos[Pos]->Duration_Current)) //Must be less than 0.7s
-                    {
-                        Data+=Ztring::ToZtring(Infos[Pos]->From_Position_Before, 16)+_T(",")
-                              +Ztring::ToZtring(Infos[Pos]->From_Position_Before)+_T(",")
-                              +Ztring::ToZtring(Duration_Absolute_Before)+_T(",")
-                              +Ztring::ToZtring(((float64)Duration_Absolute_Before)/27000, 6)+_T(",")
-                              +Ztring().Duration_From_Milliseconds(float64_int64s(((float64)Duration_Absolute_Before)/27000))+_T(",")
-                              +Ztring::ToZtring(Infos[Pos]->Duration_Before, 0)+_T(",")
-                              +Ztring::ToZtring(Infos[Pos]->Duration_Before/27000, 6)+_T(",")
-                              +Ztring().Duration_From_Milliseconds(float64_int64s(Infos[Pos]->Duration_Before/27000))
-                              +ZenLib::EOL;
-                    }
-                    //Displaying the current offset
-                    if (CallBack_Data.Full || Infos[Pos]->From_Position_Before==(int64u)-1 || (Infos[Pos]->Duration_Before+700*27000<Infos[Pos]->Duration_Current || Infos[Pos]->Duration_Before>Infos[Pos]->Duration_Current)) //Must be less than 0.7s
-                    {
-                        Data+=Ztring::ToZtring(Infos[Pos]->From_Position_Current, 16)+_T(",")
-                              +Ztring::ToZtring(Infos[Pos]->From_Position_Current)+_T(",")
-                              +Ztring::ToZtring(Duration_Absolute_Current)+_T(",")
-                              +Ztring::ToZtring(((float64)Duration_Absolute_Current)/27000, 6)+_T(",")
-                              +Ztring().Duration_From_Milliseconds(float64_int64s(((float64)Duration_Absolute_Current)/27000))+_T(",")
-                              +Ztring::ToZtring(Infos[Pos]->Duration_Current, 0)+_T(",")
-                              +MI.Get(StreamKind, Pos, _T("Duration"))+_T(",")
-                              +MI.Get(StreamKind, Pos, _T("Duration/String3"))
-                              +ZenLib::EOL;
-                        Infos[Pos]->IsNormal=false;
-                    }
-
-                    //Displaying "Is normal" if useful
-                    else if (!CallBack_Data.Full && !Infos[Pos]->IsNormal)
-                    {
-                        Data+=Ztring(_T("(Is normal),(Is normal),(Is normal),(Is normal),(Is normal),(Is normal),(Is normal),(Is normal)"))+ZenLib::EOL;
-                        Infos[Pos]->IsNormal=true;
-                    }
-
-                    //Output
-                    if (!Data.empty())
-                    {
-                        if (CallBack_Data.Cout)
-                            wcout<<Data;
-                        else
-                            Infos[Pos]->TimeStampFile.Write(Data);
-                    }
-                }
-            }
-        }
-
-        //Configuring the library after the detection
-        if (!CanWrite_OnlyIfParsingIsOk && Result&0xFE)
-        {
-            if (MI.Get(Stream_General, 0, _T("Format"))!=_T("MPEG-TS"))
-            {
-                wcout<<CallBack_Data.FileName<<_T(" is not a MPEG-TS file")<<endl;
-                return 2;
-            }
-            if (CallBack_Data.Cout && MI.Count_Get(Stream_Menu)>2)
-            {
-                cout<<"Outputing to cout is not possible with multiple programs in a MPEG-TS, option disabled"<<endl;
-                CallBack_Data.Cout=false;
-            }
-
-            //Stream is detected
-            CanWrite_OnlyIfParsingIsOk=true;
-
-            //Detecting the count of programs
-            if (MI.Count_Get(Stream_Menu))
-                StreamKind=Stream_Menu;
-            else
-                StreamKind=Stream_General;
-            Infos.resize(MI.Count_Get(StreamKind));
-
-            for(size_t Pos=0; Pos<MI.Count_Get(StreamKind); Pos++)
-            {
-                //Creating pointer
-                Infos[Pos]=new info;
-
-                //Saving Delay
-                Infos[Pos]->Delay=float64_int64s(Ztring(MI.Get(StreamKind, Pos, _T("Delay"))).To_float64()*27000);
-
-                //Creating the file, depends of the count of programs
-                Infos[Pos]->TimeStampFile.Create(CallBack_Data.FileName+(StreamKind==Stream_Menu?(_T(".")+MI.Get(Stream_Menu, Pos, _T("MenuID"))):Ztring())+_T(".TimeStampFile.csv"), true);
-
-                //File header
-                Ztring Data=Ztring(_T("FileOffset (hexadecimal),FileOffset (decimal),AbsoluteDuration (27 MHz),AbsoluteDuration (ms),AbsoluteDuration (ISO 8601),RelativeDuration (27 MHz),RelativeDuration (ms),RelativeDuration (ISO 6801)"))+ZenLib::EOL;
-                if (CallBack_Data.Cout)
-                    wcout<<Data;
-                else
-                    Infos[Pos]->TimeStampFile.Write(Data);
-            }
-
-            //Re-opening the file: we want data from the begining
-            From.Close();
-            From.Open(CallBack_Data.FileName, ZenLib::File::Access_Read);
-            MI.Open_Buffer_Init(MI.Open_Buffer_Continue_GoTo_Get()+From.Size_Get(), MI.Open_Buffer_Continue_GoTo_Get());
-            MI.Option(_T("File_IsSeekable"), _T("0"));  //We say we want all now
-            //MI.Option(_T("ParseSpeed"), _T("1"));
-        }
-    }
-    while (From_Buffer_Size>0);
-    for(size_t Pos=0; Pos<Infos.size(); Pos++)
-    {
-        Ztring Data;
-        if (!CallBack_Data.Full && Infos[Pos]->IsNormal)
-        {
-            int64u Duration_Absolute_Current=Infos[Pos]->Delay+float64_int64s(Infos[Pos]->Duration_Current);
-            Data=Ztring::ToZtring(Infos[Pos]->From_Position_Current, 16)+_T(",")
-                +Ztring::ToZtring(Infos[Pos]->From_Position_Current)+_T(",")
-                +Ztring::ToZtring(Duration_Absolute_Current)+_T(",")
-                +Ztring::ToZtring(((float64)Duration_Absolute_Current)/27000, 6)+_T(",")
-                +Ztring().Duration_From_Milliseconds(float64_int64s(((float64)Duration_Absolute_Current)/27000))+_T(",")
-                +Ztring::ToZtring(Infos[Pos]->Duration_Current, 0)+_T(",")
-                +MI.Get(StreamKind, Pos, _T("Duration"))+_T(",")
-                +MI.Get(StreamKind, Pos, _T("Duration/String3"))
-                +ZenLib::EOL;
-        }
-
-        if (CallBack_Data.Cout)
-            wcout<<Data;
-        else
-        {
-            Infos[Pos]->TimeStampFile.Write(Data);
-
-            //User information
-            if (StreamKind==Stream_Menu)
-                wcout<<_T("Data for menu ")<<MI.Get(Stream_Menu, Pos, _T("MenuID"))<<_T(" is in ")<<CallBack_Data.FileName+(StreamKind==Stream_Menu?(_T(".")+MI.Get(Stream_Menu, Pos, _T("MenuID"))):Ztring())+_T(".TimeStampFile.csv");
-            else
-                wcout<<_T("Data is in ")<<CallBack_Data.FileName+(StreamKind==Stream_Menu?(_T(".")+MI.Get(Stream_Menu, Pos, _T("MenuID"))):Ztring())+_T(".TimeStampFile.csv")<<endl;
-        }
-    }
-
-    //Closing all
-    for (size_t Pos=0; Pos<Infos.size(); Pos++)
-        delete Infos[Pos]; //Infos[Pos]=NULL;
-    */
-
-    return 0;
-}

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Adif.cpp Deleted

@@ -1,237 +0,0 @@
-// File_Aac_Adif - Info for AAC (ADIF) files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
-//
-// This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this library. If not, see <http://www.gnu.org/licenses/>.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-//---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-//---------------------------------------------------------------------------
-
-//---------------------------------------------------------------------------
-#if defined(MEDIAINFO_ADIF_YES)
-//---------------------------------------------------------------------------
-
-//---------------------------------------------------------------------------
-#include "MediaInfo/Audio/File_Adif.h"
-//---------------------------------------------------------------------------
-
-namespace MediaInfoLib
-{
-
-//***************************************************************************
-// Infos
-//***************************************************************************
-
-//---------------------------------------------------------------------------
-const int32u ADIF_sampling_frequency[]=
-{96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050,
- 16000, 12000, 11025,  8000,  7350,     0,     0,     0,};
-
-//---------------------------------------------------------------------------
-const char* ADIF_Format_Profile[]=
-{
-    "Main",
-    "LC",
-    "SSR",
-    "LTP",
-};
-
-//---------------------------------------------------------------------------
-const char* ADIF_object_type[]=
-{
-    "A_AAC/MPEG4/MAIN",
-    "A_AAC/MPEG4/LC",
-    "A_AAC/MPEG4/SSR",
-    "A_AAC/MPEG4/LTP",
-};
-
-//***************************************************************************
-// Constructor/Destructor
-//***************************************************************************
-
-//---------------------------------------------------------------------------
-File_Adif::File_Adif()
-:File__Analyze(), File__Tags_Helper()
-{
-    //File__Tags_Helper
-    Base=this;
-}
-
-//***************************************************************************
-// Buffer - File header
-//***************************************************************************
-
-//---------------------------------------------------------------------------
-bool File_Adif::FileHeader_Begin()
-{
-    //Tags
-    if (!File__Tags_Helper::FileHeader_Begin())
-        return false;
-
-    //Testing
-    if (Buffer_Offset+4>Buffer_Size)
-        return false;
-    if (CC4(Buffer+Buffer_Offset)!=0x41444946) //"ADIF"
-    {
-        File__Tags_Helper::Reject("Adif");
-        return false;
-    }
-
-    return true;
-}
-
-//---------------------------------------------------------------------------
-void File_Adif::FileHeader_Parse()
-{
-    //Parsing
-    Ztring comment_field_data;
-    int32u bitrate;
-    int8u  num_program_config_elements;
-    int8u  object_type=(int8u)-1;
-    int8u  sampling_frequency_index=(int8u)-1;
-    int8u  num_front_channel_elements=(int8u)-1;
-    int8u  num_side_channel_elements=(int8u)-1;
-    int8u  num_back_channel_elements=(int8u)-1;
-    int8u  num_lfe_channel_elements=(int8u)-1;
-    int8u  num_assoc_data_elements;
-    int8u  num_valid_cc_elements;
-    bool   bitstream_type;
-    Skip_C4(                                                    "adif_id");
-    BS_Begin();
-    TEST_SB_SKIP(                                               "copyright_id_present");
-        Skip_S4(32,                                             "copyright_id");
-        Skip_S4(32,                                             "copyright_id");
-        Skip_S4( 8,                                             "copyright_id");
-    TEST_SB_END();
-    Skip_SB(                                                    "original_copy");
-    Skip_SB(                                                    "home");
-    Get_SB (    bitstream_type,                                 "bitstream_type"); Param_Info(bitstream_type?"VBR":"CBR");
-    Get_S3 (23, bitrate,                                        "bitrate");
-    Get_S1 ( 4, num_program_config_elements,                    "num_program_config_elements");
-    if (!bitstream_type)
-        Skip_S3(20,                                             "adif_buffer_fullness");
-    for (int8u Pos=0; Pos<num_program_config_elements+1; Pos++)
-    {
-        Element_Begin("program_config_element");
-        int8u comment_field_bytes;
-        Skip_S1(4,                                              "element_instance_tag");
-        Get_S1 (2, object_type,                                 "object_type"); Param_Info(ADIF_object_type[object_type]);
-        Get_S1 (4, sampling_frequency_index,                    "sampling_frequency_index"); Param_Info(ADIF_sampling_frequency[sampling_frequency_index]);
-        Get_S1 (4, num_front_channel_elements,                  "num_front_channel_elements");
-        Get_S1 (4, num_side_channel_elements,                   "num_side_channel_elements");
-        Get_S1 (4, num_back_channel_elements,                   "num_back_channel_elements");
-        Get_S1 (2, num_lfe_channel_elements,                    "num_lfe_channel_elements");
-        Get_S1 (3, num_assoc_data_elements,                     "num_assoc_data_elements");
-        Get_S1 (4, num_valid_cc_elements,                       "num_valid_cc_elements");
-        TEST_SB_SKIP(                                           "mono_mixdown_present");
-            Skip_S1(4,                                          "mono_mixdown_element_number");
-        TEST_SB_END();
-        TEST_SB_SKIP(                                           "stereo_mixdown_present");
-            Skip_S1(4,                                          "stereo_mixdown_element_number");
-        TEST_SB_END();
-        TEST_SB_SKIP(                                           "matrix_mixdown_idx_present");
-            Skip_S1(2,                                          "matrix_mixdown_idx");
-            Skip_S1(2,                                          "pseudo_surround_enable");
-        TEST_SB_END();
-        for (int8u Pos2=0; Pos2<num_front_channel_elements; Pos2++)
-        {
-            Element_Begin("front_channel_element");
-            Skip_SB(                                            "front_element_is_cpe");
-            Skip_S1(4,                                          "front_element_tag_select");
-            Element_End();
-        }
-        for (int8u Pos2=0; Pos2<num_side_channel_elements; Pos2++)
-        {
-            Element_Begin("side_channel_element");
-            Skip_SB(                                            "back_element_is_cpe");
-            Skip_S1(4,                                          "back_element_tag_select");
-            Element_End();
-        }
-        for (int8u Pos2=0; Pos2<num_back_channel_elements; Pos2++)
-        {
-            Element_Begin("back_channel_element");
-            Skip_SB(                                            "back_element_is_cpe");
-            Skip_S1(4,                                          "back_element_tag_select");
-            Element_End();
-        }
-        for (int8u Pos2=0; Pos2<num_lfe_channel_elements; Pos2++)
-        {
-            Element_Begin("lfe_channel_element");
-            Skip_S1(4,                                          "lfe_element_tag_select");
-            Element_End();
-        }
-        for (int8u Pos2=0; Pos2<num_assoc_data_elements; Pos2++)
-        {
-            Element_Begin("assoc_data_element");
-            Skip_S1(4,                                          "assoc_data_element_tag_select");
-            Element_End();
-        }
-        for (int8u Pos2=0; Pos2<num_valid_cc_elements; Pos2++)
-        {
-            Element_Begin("valid_cc_element");
-            Skip_SB(                                            "cc_element_is_ind_sw");
-            Skip_S1(4,                                          "valid_cc_element_tag_select");
-            Element_End();
-        }
-        BS_End();
-        Get_B1 (comment_field_bytes,                            "comment_field_bytes");
-        if (comment_field_bytes>0)
-            Get_Local(comment_field_bytes, comment_field_data,  "comment_field_data");
-        BS_Begin();
-        Element_End();
-
-        //We only support 1 element in ADIF
-        Pos=num_program_config_elements;
-    }
-    BS_End();
-
-    FILLING_BEGIN();
-        File__Tags_Helper::Accept("ADIF");
-
-        Fill(Stream_General, 0, General_Format, "ADIF");
-        Fill(Stream_General, 0, General_Comment, comment_field_data);
-
-        File__Tags_Helper::Stream_Prepare(Stream_Audio);
-        Fill (Stream_Audio, 0, Audio_Format, "AAC");
-        Fill (Stream_Audio, 0, Audio_Format_Version, "Version 2");
-        if (object_type!=(int8u)-1)
-        {
-            Fill (Stream_Audio, 0, Audio_Format_Profile, ADIF_Format_Profile[object_type]);
-            Fill (Stream_Audio, 0, Audio_Codec, ADIF_object_type[object_type]);
-        }
-        Fill(Stream_Audio, 0, Audio_BitRate_Mode, bitstream_type?"VBR":"CBR");
-        if (bitrate>0)
-            Fill(Stream_Audio, 0, bitstream_type?Audio_BitRate_Maximum:Audio_BitRate, bitrate);
-        if (sampling_frequency_index!=(int8u)-1)
-            Fill(Stream_Audio, 0, Audio_SamplingRate, ADIF_sampling_frequency[sampling_frequency_index]);
-        if (num_front_channel_elements!=(int8u)-1)
-            Fill(Stream_Audio, 0, Audio_Channel_s_, num_front_channel_elements+num_side_channel_elements+num_back_channel_elements+num_lfe_channel_elements);
-        Fill(Stream_Audio, 0, Audio_MuxingMode, "ADIF");
-
-        //No more need data
-        File__Tags_Helper::Finish("ADIF");
-    FILLING_END();
-}
-
-} //NameSpace
-
-#endif //MEDIAINFO_ADIF_YES
-

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Adif.h Deleted

@@ -1,57 +0,0 @@
-// File_Aac_Adif - Info for AAC (ADIF) files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
-//
-// This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this library. If not, see <http://www.gnu.org/licenses/>.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-//---------------------------------------------------------------------------
-#ifndef MediaInfo_File_AdifH
-#define MediaInfo_File_AdifH
-//---------------------------------------------------------------------------
-
-//---------------------------------------------------------------------------
-#include "MediaInfo/File__Analyze.h"
-#include "MediaInfo/Tag/File__Tags.h"
-//---------------------------------------------------------------------------
-
-namespace MediaInfoLib
-{
-
-//***************************************************************************
-// Class File_Adif
-//***************************************************************************
-
-class File_Adif : public File__Analyze, public File__Tags_Helper
-{
-public :
-    //Constructor/Destructor
-    File_Adif();
-
-private :
-    //Streams management
-    void Streams_Finish()                                                       {File__Tags_Helper::Streams_Finish();}
-
-    //Buffer - File header
-    bool FileHeader_Begin();
-    void FileHeader_Parse();
-
-    //Buffer - Global
-    void Read_Buffer_Continue()                                                 {File__Tags_Helper::Read_Buffer_Continue();}
-};
-
-} //NameSpace
-
-#endif

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Adts.cpp Deleted

@@ -1,318 +0,0 @@
-// File_Adts - Info for AAC (ADTS) files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
-//
-// This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this library. If not, see <http://www.gnu.org/licenses/>.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-//---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-//---------------------------------------------------------------------------
-
-//---------------------------------------------------------------------------
-#if defined(MEDIAINFO_ADTS_YES)
-//---------------------------------------------------------------------------
-
-//---------------------------------------------------------------------------
-#include "MediaInfo/Audio/File_Adts.h"
-//---------------------------------------------------------------------------
-
-namespace MediaInfoLib
-{
-
-//***************************************************************************
-// Infos
-//***************************************************************************
-
-//---------------------------------------------------------------------------
-const int32u ADTS_SamplingRate[]=
-{96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050,
- 16000, 12000, 11025,  8000,  7350,     0,     0,     0,};
-
-//---------------------------------------------------------------------------
-const char* ADTS_ID[]=
-{
-    "MPEG-4",
-    "MPEG-2",
-};
-
-//---------------------------------------------------------------------------
-const char* ADTS_Format_Profile[]=
-{
-    "Main",
-    "LC",
-    "SSR",
-    "LTP",
-};
-
-//---------------------------------------------------------------------------
-const char* ADTS_Profile[]=
-{
-    "A_AAC/MPEG4/MAIN",
-    "A_AAC/MPEG4/LC",
-    "A_AAC/MPEG4/SSR",
-    "A_AAC/MPEG4/LTP",
-};
-
-//***************************************************************************
-// Constructor/Destructor
-//***************************************************************************
-
-//---------------------------------------------------------------------------
-File_Adts::File_Adts()
-:File__Analyze(), File__Tags_Helper()
-{
-    //File__Tags_Helper
-    Base=this;
-
-    //Configuration
-    MustSynchronize=true;
-    Buffer_TotalBytes_FirstSynched_Max=64*1024;
-
-    //In
-    Frame_Count_Valid=MediaInfoLib::Config.ParseSpeed_Get()>=0.5?128:(MediaInfoLib::Config.ParseSpeed_Get()>=0.3?32:2);
-
-    //Temp
-    Frame_Count=0;
-}
-
-//***************************************************************************
-// Streams management
-//***************************************************************************
-
-//---------------------------------------------------------------------------
-void File_Adts::Streams_Fill()
-{
-    //Calculating
-    bool sbrPresentFlag=ADTS_SamplingRate[sampling_frequency_index]<=24000;
-    bool psPresentFlag=channel_configuration<=1; //1 channel
-    int64u BitRate=0;
-    if (!aac_frame_lengths.empty())
-    {
-        int64u aac_frame_length_Total=0;
-        for (size_t Pos=0; Pos<aac_frame_lengths.size(); Pos++)
-            aac_frame_length_Total+=aac_frame_lengths[Pos];
-
-        BitRate=(ADTS_SamplingRate[sampling_frequency_index]/1024);
-        BitRate*=aac_frame_length_Total*8;
-        BitRate/=aac_frame_lengths.size();
-    }
-
-    if (!IsSub)
-        Fill(Stream_General, 0, General_Format, "ADTS");
-
-    File__Tags_Helper::Stream_Prepare(Stream_Audio);
-    Fill(Stream_Audio, 0, Audio_Format, "AAC");
-    Fill(Stream_Audio, 0, Audio_Format_Version, id?"Version 2":"Version 4");
-    Fill(Stream_Audio, 0, Audio_Format_Profile, ADTS_Format_Profile[profile_ObjectType]);
-    if (!sbrPresentFlag && !psPresentFlag)
-        Fill(Stream_Audio, 0, Audio_Codec, ADTS_Profile[profile_ObjectType]);
-    Fill(Stream_Audio, 0, Audio_SamplingRate, ADTS_SamplingRate[sampling_frequency_index]*(sbrPresentFlag?2:1));
-    Fill(Stream_Audio, 0, Audio_Channel_s_, psPresentFlag?2:channel_configuration);
-    Fill(Stream_Audio, 0, Audio_MuxingMode, "ADTS");
-    if (adts_buffer_fullness==0x7FF)
-        Fill(Stream_Audio, 0, Audio_BitRate_Mode, "VBR");
-    else
-    {
-        Fill(Stream_Audio, 0, Audio_BitRate_Mode, "CBR");
-        if (BitRate)
-            Fill(Stream_Audio, 0, Audio_BitRate, BitRate);
-    }
-    if (sbrPresentFlag)
-    {
-        Fill(Stream_Audio, StreamPos_Last, Audio_Format_Settings, "SBR");
-        Fill(Stream_Audio, StreamPos_Last, Audio_Format_Settings_SBR, "Yes", Unlimited, true, true);
-        Fill(Stream_Audio, StreamPos_Last, Audio_Format_Settings_PS, "No");
-        Ztring Codec=Ztring().From_Local(ADTS_Profile[profile_ObjectType])+_T("/SBR");
-        Fill(Stream_Audio, StreamPos_Last, Audio_Codec, Codec, true);
-    }
-    if (psPresentFlag)
-    {
-        Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, 2, 10, true);
-        Fill(Stream_Audio, StreamPos_Last, Audio_Format_Settings, "PS");
-        Fill(Stream_Audio, StreamPos_Last, Audio_Format_Settings_PS, "Yes", Unlimited, true, true);
-        Ztring Codec=Ztring().From_Local(ADTS_Profile[profile_ObjectType])+(sbrPresentFlag?_T("/SBR"):_T(""))+_T("/PS");
-        Fill(Stream_Audio, StreamPos_Last, Audio_Codec, Codec, true);
-    }
-
-    File__Tags_Helper::Streams_Fill();
-}
-
-//***************************************************************************
-// Buffer - Synchro
-//***************************************************************************
-
-//---------------------------------------------------------------------------
-bool File_Adts::Synchronize()
-{
-    //Tags
-    bool Tag_Found;
-    if (!File__Tags_Helper::Synchronize(Tag_Found))
-        return false;
-    if (Tag_Found)
-        return true;
-
-    //Synchronizing
-    while (Buffer_Offset+6<=Buffer_Size)
-    {
-         while (Buffer_Offset+6<=Buffer_Size
-             && (CC2(Buffer+Buffer_Offset)&0xFFF6)!=0xFFF0)
-            Buffer_Offset++;
-
-        if (Buffer_Offset+6<=Buffer_Size)//Testing if size is coherant
-        {
-            //Testing next start, to be sure
-            int16u aac_frame_length=(CC3(Buffer+Buffer_Offset+3)>>5)&0x1FFF;
-            if (IsSub && Buffer_Offset+aac_frame_length==Buffer_Size)
-                break;
-            if (File_Offset+Buffer_Offset+aac_frame_length!=File_Size-File_EndTagSize)
-            {
-                if (Buffer_Offset+aac_frame_length+2>Buffer_Size)
-                    return false; //Need more data
-
-                //Testing
-                if (aac_frame_length<=7 || (CC2(Buffer+Buffer_Offset+aac_frame_length)&0xFFF6)!=0xFFF0)
-                    Buffer_Offset++;
-                else
-                {
-                    //Testing next start, to be sure
-                    int16u aac_frame_length2=(CC3(Buffer+Buffer_Offset+aac_frame_length+3)>>5)&0x1FFF;
-                    if (File_Offset+Buffer_Offset+aac_frame_length+aac_frame_length2!=File_Size-File_EndTagSize)
-                    {
-                        if (Buffer_Offset+aac_frame_length+aac_frame_length2+2>Buffer_Size)
-                            return false; //Need more data
-
-                        //Testing
-                        if (aac_frame_length<=7 || (CC2(Buffer+Buffer_Offset+aac_frame_length+aac_frame_length2)&0xFFF6)!=0xFFF0)
-                            Buffer_Offset++;
-                        else
-                            break; //while()
-                    }
-                    else
-                        break; //while()
-                }
-            }
-            else
-                break; //while()
-        }
-    }
-
-    //Parsing last bytes if needed
-    if (Buffer_Offset+6>Buffer_Size)
-    {
-        if (Buffer_Offset+5==Buffer_Size && (CC2(Buffer+Buffer_Offset)&0xFFF6)!=0xFFF0)
-            Buffer_Offset++;
-        if (Buffer_Offset+4==Buffer_Size && (CC2(Buffer+Buffer_Offset)&0xFFF6)!=0xFFF0)
-            Buffer_Offset++;
-        if (Buffer_Offset+3==Buffer_Size && (CC2(Buffer+Buffer_Offset)&0xFFF6)!=0xFFF0)
-            Buffer_Offset++;
-        if (Buffer_Offset+2==Buffer_Size && (CC2(Buffer+Buffer_Offset)&0xFFF6)!=0xFFF0)
-            Buffer_Offset++;
-        if (Buffer_Offset+1==Buffer_Size && CC1(Buffer+Buffer_Offset)!=0xFF)
-            Buffer_Offset++;
-        return false;
-    }
-
-    //Synched is OK
-    return true;
-}
-
-//---------------------------------------------------------------------------
-bool File_Adts::Synched_Test()
-{
-    //Tags
-    if (!File__Tags_Helper::Synched_Test())
-        return false;
-
-    //Must have enough buffer for having header
-    if (Buffer_Offset+2>Buffer_Size)
-        return false;
-
-    //Quick test of synchro
-    if ((CC2(Buffer+Buffer_Offset)&0xFFF6)!=0xFFF0)
-        Synched=false;
-
-    //We continue
-    return true;
-}
-
-//***************************************************************************
-// Buffer - Per element
-//***************************************************************************
-
-//---------------------------------------------------------------------------
-void File_Adts::Header_Parse()
-{
-    //Parsing
-    bool protection_absent;
-    BS_Begin();
-    Skip_BS(12,                                                 "syncword");
-    Get_SB (    id,                                             "id"); Param_Info(ADTS_ID[id]);
-    Skip_BS( 2,                                                 "layer");
-    Get_SB (    protection_absent,                              "protection_absent");
-    Get_S1 ( 2, profile_ObjectType,                             "profile_ObjectType"); Param_Info(ADTS_Profile[profile_ObjectType]);
-    Get_S1 ( 4, sampling_frequency_index,                       "sampling_frequency_index"); Param_Info(ADTS_SamplingRate[sampling_frequency_index], " Hz");
-    Skip_SB(                                                    "private");
-    Get_S1 ( 3, channel_configuration,                          "channel_configuration");
-    Skip_SB(                                                    "original");
-    Skip_SB(                                                    "home");
-    Skip_SB(                                                    "copyright_id");
-    Skip_SB(                                                    "copyright_id_start");
-    Get_S2 (13, aac_frame_length,                               "aac_frame_length");
-    Get_S2 (11, adts_buffer_fullness,                           "adts_buffer_fullness"); Param_Info(adts_buffer_fullness==0x7FF?"VBR":"CBR");
-    Skip_BS( 2,                                                 "num_raw_data_blocks");
-    BS_End();
-
-    //Filling
-    Header_Fill_Size(aac_frame_length);
-    Header_Fill_Code(0, "Frame");
-}
-
-//---------------------------------------------------------------------------
-void File_Adts::Data_Parse()
-{
-    //Counting
-    if (File_Offset+Buffer_Offset+Element_Size==File_Size)
-        Frame_Count_Valid=Frame_Count; //Finish frames in case of there are less than Frame_Count_Valid frames
-    Frame_Count++;
-
-    //Name
-    Element_Info(Ztring::ToZtring(Frame_Count));
-
-    //Parsing
-    Skip_XX(Element_Size,                                       "Data");
-
-    //Filling
-    aac_frame_lengths.push_back(aac_frame_length);
-    if (!Status[IsAccepted] && Frame_Count>=Frame_Count_Valid)
-    {
-        //Filling
-        File__Tags_Helper::Accept("ADTS");
-
-        Fill("ADTS");
-
-        //No more need data
-        File__Tags_Helper::Finish("ADTS");
-    }
-}
-
-} //NameSpace
-
-#endif //MEDIAINFO_ADTS_YES
-

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Adts.h Deleted

@@ -1,73 +0,0 @@
-// File_Aac_Adts - Info for AAC (ADTS) Audio files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
-//
-// This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this library. If not, see <http://www.gnu.org/licenses/>.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-//---------------------------------------------------------------------------
-#ifndef MediaInfo_File_AdtsH
-#define MediaInfo_File_AdtsH
-//---------------------------------------------------------------------------
-
-//---------------------------------------------------------------------------
-#include "MediaInfo/File__Analyze.h"
-#include "MediaInfo/Tag/File__Tags.h"
-#include <vector>
-//---------------------------------------------------------------------------
-
-namespace MediaInfoLib
-{
-
-//***************************************************************************
-// Class File_Aac_Adts
-//***************************************************************************
-
-class File_Adts : public File__Analyze, public File__Tags_Helper
-{
-public :
-    //In
-    size_t Frame_Count_Valid;
-
-    //Constructor/Destructor
-    File_Adts();
-
-private :
-    //Streams management
-    void Streams_Fill();
-    void Streams_Finish()                                                       {File__Tags_Helper::Streams_Finish();}
-
-    //Buffer - Synchro
-    bool Synchronize();
-    bool Synched_Test();
-
-    //Buffer - Per element
-    void Header_Parse();
-    void Data_Parse();
-
-    //Temp
-    std::vector<int16u> aac_frame_lengths;
-    size_t Frame_Count;
-    int16u adts_buffer_fullness;
-    int16u aac_frame_length;
-    int8u  profile_ObjectType;
-    int8u  sampling_frequency_index;
-    int8u  channel_configuration;
-    bool   id;
-};
-
-} //NameSpace
-
-#endif

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Latm.cpp Deleted

@@ -1,205 +0,0 @@
-// File_Latm - Info for LATM files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
-//
-// This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this library. If not, see <http://www.gnu.org/licenses/>.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-//---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-//---------------------------------------------------------------------------
-
-//---------------------------------------------------------------------------
-#if defined(MEDIAINFO_LATM_YES)
-//---------------------------------------------------------------------------
-
-//---------------------------------------------------------------------------
-#include "MediaInfo/Audio/File_Latm.h"
-//---------------------------------------------------------------------------
-
-namespace MediaInfoLib
-{
-
-//***************************************************************************
-// Constructor - Destructor
-//***************************************************************************
-
-//---------------------------------------------------------------------------
-File_Latm::File_Latm()
-:File__Analyze()
-{
-    //In
-    audioMuxVersionA=false;
-}
-
-//***************************************************************************
-// Buffer - Synchro
-//***************************************************************************
-
-//---------------------------------------------------------------------------
-bool File_Latm::Synchronize()
-{
-    //Synchronizing
-    while (Buffer_Offset+2<=Buffer_Size
-        && (CC2(Buffer+Buffer_Offset)&0xFFE0)!=0x56E0)
-        Buffer_Offset++;
-    if (Buffer_Offset+2>=Buffer_Size)
-        return false;
-
-    //Synched is OK
-    return true;
-}
-
-//---------------------------------------------------------------------------
-bool File_Latm::Synched_Test()
-{
-    //Must have enough buffer for having header
-    if (Buffer_Offset+2>Buffer_Size)
-        return false;
-
-    //Quick test of synchro
-    if ((CC2(Buffer+Buffer_Offset)&0xFFE0)!=0x56E0)
-        Synched=false;
-
-    //We continue
-    return true;
-}
-
-//***************************************************************************
-// Buffer - Per element
-//***************************************************************************
-
-//---------------------------------------------------------------------------
-void File_Latm::Header_Parse()
-{
-    int16u audioMuxLengthBytes;
-    BS_Begin();
-    Skip_S2(11,                                                 "syncword");
-    Get_S2 (13, audioMuxLengthBytes,                            "audioMuxLengthBytes");
-    BS_End();
-
-    //Filling
-    Header_Fill_Size(3+audioMuxLengthBytes);
-    Header_Fill_Code(0, "LATM");
-}
-
-//---------------------------------------------------------------------------
-void File_Latm::Data_Parse()
-{
-    AudioMuxElement(true);
-    Accept("LATM");
-    Finish("LATM");
-}
-
-//***************************************************************************
-// Elements
-//***************************************************************************
-
-//---------------------------------------------------------------------------
-void File_Latm::AudioMuxElement(bool muxConfigPresent)
-{
-    BS_Begin();
-    if (muxConfigPresent)
-    {
-        bool useSameStreamMux;
-        Get_SB (useSameStreamMux,                       "useSameStreamMux");
-        if (!useSameStreamMux)
-            StreamMuxConfig();
-        if (audioMuxVersionA==0)
-        {
-        }
-    }
-            /*if (!useSameStreamMux)
-            ;
-            }
-            if (audioMuxVersionA == 0) {
-            for (i = 0; i <= numSubFrames; i++) {
-            PayloadLengthInfo();
-            PayloadMux();
-            }
-            if (otherDataPresent) {
-            for(i = 0; i < otherDataLenBits; I++) {
-            otherDataBit; 1 bslbf
-            }
-            }
-            }
-            else {
-            }
-            ByteAlign();
-            BS_End();
-            Skip_XX(audioMuxLengthBytes-1,                             "Data");
-
-        }
-    }
-    */
-}
-
-//---------------------------------------------------------------------------
-void File_Latm::StreamMuxConfig()
-{
-    Element_Begin("StreamMuxConfig");
-
-    bool audioMuxVersion;
-    Get_SB (audioMuxVersion,                                    "audioMuxVersion");
-    if (audioMuxVersion)
-        Get_SB (audioMuxVersionA,                               "audioMuxVersionA");
-    else
-        audioMuxVersionA=false;
-
-    if (!audioMuxVersionA)
-    {
-        if (audioMuxVersion==1)
-        {
-            //taraBufferFullness=LatmGetValue();
-        }
-        Skip_SB(                                                "allStreamsSameTimeFraming");
-        Skip_S1(6,                                              "numSubFrames");
-        Skip_S1(4,                                              "numProgram");
-/*        for (int8u prog=0; prog<=numProgram; prog++)
-        {
-            int8u numLayer;
-            Get_S1(3,                                           "numLayer");
-            for (lay = 0; lay <= numLayer; lay++) {
-progSIndx[streamCnt] = prog; laySIndx[streamCnt] = lay;
-streamID [ prog][ lay] = streamCnt++;
-if (prog == 0 && lay == 0) {
-useSameConfig = 0;
-} else {
-useSameConfig; 1 uimsbf
-}
-if (! useSameConfig) {
-if ( audioMuxVersion == 0 ) {
-AudioSpecificConfig();
-}
-else {
-ascLen = LatmGetValue();
-ascLen -= AudioSpecificConfig(); Note 1
-fillBits; ascLen bslbf
-}
-}
-*/
-    }
-
-    Element_End();
-}
-
-} //NameSpace
-
-#endif //MEDIAINFO_LATM_YES
-

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Latm.h Deleted

@@ -1,61 +0,0 @@
-// File_Latm - Info for LATM files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
-//
-// This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this library. If not, see <http://www.gnu.org/licenses/>.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-//---------------------------------------------------------------------------
-#ifndef MediaInfo_LatmH
-#define MediaInfo_LatmH
-//---------------------------------------------------------------------------
-
-//---------------------------------------------------------------------------
-#include "MediaInfo/File__Analyze.h"
-//---------------------------------------------------------------------------
-
-namespace MediaInfoLib
-{
-
-//***************************************************************************
-// Class File_Latm
-//***************************************************************************
-
-class File_Latm : public File__Analyze
-{
-public :
-    //In
-    bool audioMuxVersionA;
-
-    //Constructor/Destructor
-    File_Latm();
-
-private :
-    //Buffer - Synchro
-    bool Synchronize();
-    bool Synched_Test();
-
-    //Buffer - Per element
-    void Header_Parse();
-    void Data_Parse();
-
-    //Elements
-    void AudioMuxElement(bool muxConfigPresent);
-    void StreamMuxConfig();
-};
-
-} //NameSpace
-
-#endif

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Mpeg4_AudioSpecificConfig.cpp Deleted

@@ -1,773 +0,0 @@
-// File_Aac - Info for AAC files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
-//
-// This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this library. If not, see <http://www.gnu.org/licenses/>.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-//---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-//---------------------------------------------------------------------------
-
-//---------------------------------------------------------------------------
-#if defined(MEDIAINFO_MPEG4_YES)
-//---------------------------------------------------------------------------
-
-//---------------------------------------------------------------------------
-#include "MediaInfo/Audio/File_Mpeg4_AudioSpecificConfig.h"
-#if defined(MEDIAINFO_RIFF_YES)
-    #include "MediaInfo/Multiple/File_Riff.h"
-#endif
-//---------------------------------------------------------------------------
-
-namespace MediaInfoLib
-{
-
-//***************************************************************************
-// Infos
-//***************************************************************************
-
-//---------------------------------------------------------------------------
-const int32u MP4_SamplingRate[]=
-{96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050,
- 16000, 12000, 11025,  8000,  7350,     0,     0,     0,};
-
-//---------------------------------------------------------------------------
-const char* MP4_ID[]=
-{
-    "MPEG-4",
-    "MPEG-2",
-};
-
-//---------------------------------------------------------------------------
-const char* MP4_Format(int8u ID)
-{
-    switch (ID)
-    {
-        case    1 :
-        case    2 :
-        case    3 :
-        case    4 : return "AAC";
-        case    5 : return "SBR";
-        case    6 : return "AAC Scalable";
-        case    7 : return "TwinVQ";
-        case    8 : return "CELP";
-        case    9 : return "HVXC";
-        case   12 : return "TTSI";
-        case   13 : return "Main synthetic";
-        case   14 : return "Wavetable synthesis";
-        case   15 : return "General MIDI";
-        case   16 : return "Algorithmic Synthesis and Audio FX";
-        case   17 :
-        case   19 :
-        case   20 : return "ER AAC";
-        case   21 : return "ER TwinVQ";
-        case   22 : return "ER BSAC";
-        case   23 : return "ER AAC LD";
-        case   24 : return "ER CELP";
-        case   25 : return "ER HVXC";
-        case   26 : return "ER HILN";
-        case   27 : return "ER Parametric";
-        case   28 : return "SSC";
-        case   29 : return "ParametricStereo";
-        case   32 : return "Layer-1";
-        case   33 : return "Layer-2";
-        case   34 : return "Layer-3";
-        case   35 : return "DST";
-        case   36 : return "ALS";
-        case   37 : return "SLS";
-        case   38 : return "SLS non-core";
-        case   39 : return "ER AAC ELD";
-        case   40 : return "SMR Simple";
-        case   41 : return "SMR Main";
-        default   : return "";
-    }
-}
-
-//---------------------------------------------------------------------------
-const char* MP4_Format_Profile(int8u ID)
-{
-    switch (ID)
-    {
-        case    1 : return "Main";
-        case    2 : return "LC";
-        case    3 : return "SSR";
-        case    4 : return "LTP";
-        case   17 : return "LC";
-        case   19 : return "LTP";
-        default   : return "";
-    }
-}
-
-//---------------------------------------------------------------------------
-const char* MP4_Profile(int8u ID)
-{
-    switch (ID)
-    {
-        case    1 : return "A_AAC/MPEG4/MAIN";
-        case    2 : return "A_AAC/MPEG4/LC";
-        case    3 : return "A_AAC/MPEG4/SSR";
-        case    4 : return "A_AAC/MPEG4/LTP";
-        case    5 : return "SBR";
-        case    6 : return "AAC Scalable";
-        case    7 : return "TwinVQ";
-        case    8 : return "CELP";
-        case    9 : return "HVXC";
-        case   12 : return "TTSI";
-        case   13 : return "Main synthetic";
-        case   14 : return "Wavetable synthesis";
-        case   15 : return "General MIDI";
-        case   16 : return "Algorithmic Synthesis and Audio FX";
-        case   17 : return "ER AAC LC";
-        case   19 : return "ER AAC LTP";
-        case   20 : return "ER AAC Scalable";
-        case   21 : return "ER TwinVQ";
-        case   22 : return "ER BSAC";
-        case   23 : return "ER AAC LD";
-        case   24 : return "ER CELP";
-        case   25 : return "ER HVXC";
-        case   26 : return "ER HILN";
-        case   27 : return "ER Parametric";
-        case   28 : return "SSC";
-        case   29 : return "PS";
-        case   31 : return "(escape)";
-        case   32 : return "Layer-1";
-        case   33 : return "Layer-2";
-        case   34 : return "Layer-3";
-        case   35 : return "DST";
-        case   36 : return "ALS";
-        case   37 : return "SLS";
-        case   38 : return "SLS non-core";
-        case   39 : return "ER AAC ELD";
-        case   40 : return "SMR Simple";
-        case   41 : return "SMR Main";
-        default   : return "";
-    }
-}
-
-//---------------------------------------------------------------------------
-const int8u MP4_Channels[]=
-{
-    0,
-    1,
-    2,
-    3,
-    4,
-    5,
-    6,
-    8,
-};
-
-//---------------------------------------------------------------------------
-const char* MP4_ChannelConfiguration[]=
-{
-    "",
-    "Front: C",
-    "Front: L R",
-    "Front: L C R",
-    "Front: L C R, Side: C",
-    "Front: L C R, Side: L R",
-    "Front: L C R, Side: L R, LFE",
-    "Front: L C R, Side: L R, Back: L R, LFE",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-};
-
-//---------------------------------------------------------------------------
-const char* MP4_ChannelConfiguration2[]=
-{
-    "",
-    "1/0/0",
-    "2/0/0",
-    "3/0/0",
-    "3/1/0",
-    "3/2/0",
-    "3/2/0.1",
-    "3/2/2.1",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-};
-
-//***************************************************************************
-// Constructor/Destructor
-//***************************************************************************
-
-//---------------------------------------------------------------------------
-File_Mpeg4_AudioSpecificConfig::File_Mpeg4_AudioSpecificConfig()
-:File__Analyze()
-{
-    //In
-    Channels_AreTrustable=false;
-}
-
-//***************************************************************************
-// Buffer - Global
-//***************************************************************************
-
-//---------------------------------------------------------------------------
-// AAC in ES, 2+ bytes
-void File_Mpeg4_AudioSpecificConfig::Read_Buffer_Continue()
-{
-    //Parsing
-    Element_Offset=0;
-    Element_Size=Buffer_Size;
-    int8u samplingFrequencyIndex;
-    BS_Begin();
-    Get_S1 (5, audioObjectType,                                 "audioObjectType"); Param_Info(MP4_Profile(audioObjectType));
-    if (audioObjectType==31)
-    {
-        int8u audioObjectTypeExt;
-        Get_S1 (6, audioObjectTypeExt,                          "audioObjectTypeExt");
-        audioObjectType=32+audioObjectTypeExt; Param_Info(audioObjectType); Param_Info(MP4_Profile(audioObjectType));
-    }
-    if (audioObjectType==36)
-    {
-        ALS();
-        return;
-    }
-
-    Get_S1 (4, samplingFrequencyIndex,                          "samplingFrequencyIndex"); Param_Info(MP4_SamplingRate[samplingFrequencyIndex]);
-    if (samplingFrequencyIndex>=0xF)
-    {
-        Get_S3 (24, samplingFrequency,                          "samplingFrequency");
-    }
-    else
-        samplingFrequency=MP4_SamplingRate[samplingFrequencyIndex];
-    Get_S1 (4, channelConfiguration,                            "channelConfiguration"); Param_Info(MP4_ChannelConfiguration[channelConfiguration]);
-
-    sbrPresentFlag=false;
-    psPresentFlag=false;
-    if (audioObjectType==0x05 || audioObjectType==0x29)
-    {
-        extensionAudioObjectType=audioObjectType;
-        sbrPresentFlag=true;
-        if (audioObjectType==0x29)
-            psPresentFlag=false;
-        Get_S1 (4, samplingFrequencyIndex,                      "extensionSamplingFrequencyIndex"); Param_Info(MP4_SamplingRate[samplingFrequencyIndex]);
-        if (samplingFrequencyIndex==0xF)
-        {
-            Get_S3 (24, samplingFrequency,                      "extensionSamplingFrequency");
-        }
-        else
-            samplingFrequency=MP4_SamplingRate[samplingFrequencyIndex];
-        Get_S1 (5, audioObjectType,                             "audioObjectType"); Param_Info(MP4_Profile(audioObjectType));
-        if (audioObjectType==31)
-        {
-            int8u audioObjectTypeExt;
-            Get_S1 (6, audioObjectTypeExt,                      "audioObjectTypeExt");
-            audioObjectType=32+audioObjectTypeExt; Param_Info(MP4_Profile(audioObjectType));
-        }
-        if (audioObjectType==22) //BSAC
-            Skip_S1(4,                                          "extensionChannelConfiguration");
-    }
-    else
-        extensionAudioObjectType=0x00;
-
-    switch(audioObjectType)
-    {
-        case  1:
-        case  2:
-        case  3:
-        case  4:
-        case  6:
-        case  7:
-        case 17:
-        case 19:
-        case 20:
-        case 21:
-        case 22:
-        case 23: GASpecificConfig();  break;
-        case 8:
-        //CelpSpecificConfig();
-        break;
-        case 9:
-        //HvxcSpecificConfig();
-        break;
-        case 12:
-        //TTSSpecificConfig();
-        break;
-        case 13:
-        case 14:
-        case 15:
-        case 16:
-        //StructuredAudioSpecificConfig();
-        break;
-        case 24:
-        //ErrorResilientCelpSpecificConfig();
-        break;
-        case 25:
-        //ErrorResilientHvxcSpecificConfig();
-        break;
-        case 26:
-        case 27:
-        //ParametricSpecificConfig();
-        break;
-        case 28:
-        //SSCSpecificConfig();
-        break;
-        case 32:
-        case 33:
-        case 34:
-        //MPEG_1_2_SpecificConfig();
-        break;
-        case 35:
-        //DSTSpecificConfig();
-        break;
-        default: ;
-    }
-
-    switch (audioObjectType)
-    {
-        case 17:
-        case 19:
-        case 20:
-        case 21:
-        case 22:
-        case 23:
-        case 24:
-        case 25:
-        case 26:
-        case 27:
-            {
-                int8u epConfig;
-                Get_S1 (2, epConfig,                            "epConfig");
-                if (epConfig==2 || epConfig==3)
-                {
-                    //ErrorProtectionSpecificConfig();
-                }
-                if (epConfig==3)
-                {
-                    bool directMapping;
-                    Get_SB (directMapping,                      "directMapping");
-                    if (directMapping)
-                    {
-                        //tbd
-                    }
-                }
-            }
-        default : ;
-    }
-
-    bool sbrData=false;
-    if (extensionAudioObjectType!=0x05 && Data_BS_Remain()>=16)
-    {
-        sbrData=true;
-        SBR();
-    }
-
-    BS_End();
-
-    //Handling implicit SBR and PS
-    if (!Channels_AreTrustable) //if not channel map in the container
-    {
-        bool Is3GP=false;
-        for (size_t Pos=0; Pos<ftyps.size(); Pos++)
-            if ((ftyps[Pos]&0xFFFFFF00)==0x33677000)
-                Is3GP=true;
-        if (!Is3GP) //If this is not a 3GP file
-        {
-            if (!sbrPresentFlag && samplingFrequency<=24000)
-            {
-                samplingFrequency*=2;
-                sbrPresentFlag=true;
-            }
-            if ((!sbrData || sbrPresentFlag) && !psPresentFlag && channelConfiguration<=1) //1 channel
-                psPresentFlag=true;
-        }
-    }
-
-    FILLING_BEGIN()
-        Accept("AudioSpecificConfig");
-
-        if (Count_Get(Stream_Audio)==0) //May be done elsewhere
-            Stream_Prepare(Stream_Audio);
-        Fill(Stream_Audio, StreamPos_Last, Audio_Format, MP4_Format(audioObjectType));
-        Fill(Stream_Audio, StreamPos_Last, Audio_Format_Version, "Version 4");
-        Fill(Stream_Audio, StreamPos_Last, Audio_Format_Profile, MP4_Format_Profile(audioObjectType));
-        if (audioObjectType==2) //LC
-        {
-            Fill(Stream_Audio, StreamPos_Last, Audio_Format_Settings_SBR, "No");
-            if (Channels_AreTrustable && !psPresentFlag && channelConfiguration<=1)
-                Fill(Stream_Audio, StreamPos_Last, Audio_Format_Settings_PS, "No");
-        }
-        if (!sbrPresentFlag && !psPresentFlag)
-            Fill(Stream_Audio, StreamPos_Last, Audio_Codec, MP4_Profile(audioObjectType));
-        Fill(Stream_Audio, StreamPos_Last, Audio_SamplingRate, samplingFrequency);
-        if (channelConfiguration && channelConfiguration<8)
-        {
-            Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, MP4_Channels[channelConfiguration]);
-            Fill(Stream_Audio, StreamPos_Last, Audio_ChannelPositions, MP4_ChannelConfiguration[channelConfiguration]);
-            Fill(Stream_Audio, StreamPos_Last, Audio_ChannelPositions_String2, MP4_ChannelConfiguration2[channelConfiguration]);
-        }
-
-        if (sbrPresentFlag)
-        {
-            Fill(Stream_Audio, StreamPos_Last, Audio_Format_Settings, "SBR");
-            Fill(Stream_Audio, StreamPos_Last, Audio_Format_Settings_SBR, "Yes", Unlimited, true, true);
-            Fill(Stream_Audio, StreamPos_Last, Audio_Format_Settings_PS, "No");
-            Fill(Stream_Audio, StreamPos_Last, Audio_Codec, Ztring().From_Local(MP4_Profile(audioObjectType))+_T("/SBR"), true);
-            Fill(Stream_Audio, StreamPos_Last, Audio_SamplingRate, samplingFrequency, 10, true);
-        }
-        if (psPresentFlag)
-        {
-            Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, 2, 10, true);
-            Fill(Stream_Audio, StreamPos_Last, Audio_Format_Settings, "PS");
-            Fill(Stream_Audio, StreamPos_Last, Audio_Format_Settings_PS, "Yes", Unlimited, true, true);
-            Ztring Codec=Retrieve(Stream_Audio, StreamPos_Last, Audio_Codec);
-            Fill(Stream_Audio, StreamPos_Last, Audio_Codec, Ztring().From_Local(MP4_Profile(audioObjectType))+(sbrPresentFlag?_T("/SBR"):_T(""))+_T("/PS"), true);
-            Fill(Stream_Audio, StreamPos_Last, Audio_ChannelPositions, "Front: L R", Unlimited, true, true);
-        }
-    }
-
-    Finish("AudioSpecificConfig");
-}
-
-//---------------------------------------------------------------------------
-// GASpecificConfig
-void File_Mpeg4_AudioSpecificConfig::GASpecificConfig ()
-{
-    Element_Begin("GASpecificConfig");
-    bool dependsOnCoreCoder, extensionFlag;
-    Info_SB(   frameLengthFlag,                                 "frameLengthFlag"); Param_Info(frameLengthFlag==0?1024:960, " bytes");
-    Get_SB (   dependsOnCoreCoder,                              "dependsOnCoreCoder");
-    if (dependsOnCoreCoder)
-        Skip_S2(14,                                             "coreCoderDelay");
-    Get_SB (   extensionFlag,                                   "extensionFlag");
-    if (channelConfiguration==0)
-    {
-        Element_Begin("Extension");
-        int8u Channels=0, Channels_Front=0, Channels_Side=0, Channels_Back=0, Channels_LFE=0;
-        int8u num_front_channel_elements, num_side_channel_elements, num_back_channel_elements, num_lfe_channel_elements, num_assoc_data_elements, num_valid_cc_elements, comment_field_bytes;
-        Skip_S1(4,                                              "element_instance_tag");
-        Skip_S1(2,                                              "object_type");
-        Skip_S1(4,                                              "sampling_frequency_index"); //Not used, is often 0
-        Get_S1 (4, num_front_channel_elements,                  "num_front_channel_elements");
-        Get_S1 (4, num_side_channel_elements,                   "num_side_channel_elements");
-        Get_S1 (4, num_back_channel_elements,                   "num_back_channel_elements");
-        Get_S1 (2, num_lfe_channel_elements,                    "num_lfe_channel_elements");
-        Get_S1 (3, num_assoc_data_elements,                     "num_assoc_data_elements");
-        Get_S1 (4, num_valid_cc_elements,                       "num_valid_cc_elements");
-        TEST_SB_SKIP(                                           "mono_mixdown_present");
-            Skip_S1(4,                                          "mono_mixdown_element_number");
-        TEST_SB_END();
-        TEST_SB_SKIP(                                           "stereo_mixdown_present");
-            Skip_S1(4,                                          "stereo_mixdown_element_number");
-        TEST_SB_END();
-        TEST_SB_SKIP(                                           "matrix_mixdown_idx_present");
-            Skip_S1(2,                                          "matrix_mixdown_idx");
-            Skip_SB(                                            "pseudo_surround_enable");
-        TEST_SB_END();
-        for (int8u Pos=0; Pos<num_front_channel_elements; Pos++)
-        {
-            Element_Begin("Front channel");
-            bool front_element_is_cpe;
-            Get_SB (   front_element_is_cpe,                    "front_element_is_cpe");
-            Skip_S1(4,                                          "front_element_tag_select");
-            if (front_element_is_cpe)
-            {
-                Channels_Front+=2;
-                Channels+=2;
-            }
-            else
-            {
-                Channels_Front++;
-                Channels++;
-            }
-            Element_End();
-        }
-        for (int8u Pos=0; Pos<num_side_channel_elements; Pos++)
-        {
-            Element_Begin("Side channel");
-            bool side_element_is_cpe;
-            Get_SB (   side_element_is_cpe,                     "side_element_is_cpe");
-            Skip_S1(4,                                          "side_element_tag_select");
-            if (side_element_is_cpe)
-            {
-                Channels_Side+=2;
-                Channels+=2;
-            }
-            else
-            {
-                Channels_Side++;
-                Channels++;
-            }
-            Element_End();
-        }
-        for (int8u Pos=0; Pos<num_back_channel_elements; Pos++)
-        {
-            Element_Begin("Back channel");
-            bool back_element_is_cpe;
-            Get_SB (   back_element_is_cpe,                     "back_element_is_cpe");
-            Skip_S1(4,                                          "back_element_tag_select");
-            if (back_element_is_cpe)
-            {
-                Channels_Back+=2;
-                Channels+=2;
-            }
-            else
-            {
-                Channels_Back++;
-                Channels++;
-            }
-            Element_End();
-        }
-        for (int8u Pos=0; Pos<num_lfe_channel_elements; Pos++)
-        {
-            Element_Begin("LFE");
-            Skip_S1(4,                                          "lfe_element_tag_select");
-            Channels_LFE++;
-            Channels++;
-            Element_End();
-        }
-        for (int8u Pos=0; Pos<num_assoc_data_elements; Pos++)
-        {
-            Element_Begin("assoc_data_element");
-            Skip_S1(4,                                          "assoc_data_element_tag_select");
-            Element_End();
-        }
-        for (int8u Pos=0; Pos<num_valid_cc_elements; Pos++)
-        {
-            Element_Begin("valid_cc_element");
-            Skip_SB(                                            "cc_element_is_ind_sw");
-            Skip_S1(4,                                          "valid_cc_element_tag_select");
-            Element_End();
-        }
-        BS_End(); //Byte align
-        Get_B1 (comment_field_bytes,                            "comment_field_bytes");
-        if (comment_field_bytes)
-            Skip_XX(comment_field_bytes,                        "comment_field_data");
-        BS_Begin(); //The stream needs continuity in the bitstream
-        Element_End();
-
-        //Filling
-        Ztring Channels_Positions, Channels_Positions2;
-        switch (Channels_Front)
-        {
-            case  0 : break;
-            case  1 : Channels_Positions+=_T("Front: C"); break;
-            case  2 : Channels_Positions+=_T("Front: L R"); break;
-            case  3 : Channels_Positions+=_T("Front: L C R"); break;
-            default : Channels_Positions+=_T("Front: "); Channels_Positions+=Ztring::ToZtring(Channels_Front); //Which config?
-        }
-        switch (Channels_Side)
-        {
-            case  0 : break;
-            case  1 : Channels_Positions+=_T(", Side: C"); break;
-            case  2 : Channels_Positions+=_T(", Side: L R"); break;
-            case  3 : Channels_Positions+=_T(", Side: L C R"); break;
-            default : Channels_Positions+=_T(", Side: "); Channels_Positions+=Ztring::ToZtring(Channels_Side); //Which config?
-        }
-        switch (Channels_Back)
-        {
-            case  0 : break;
-            case  1 : Channels_Positions+=_T(", Back: C"); break;
-            case  2 : Channels_Positions+=_T(", Back: L R"); break;
-            case  3 : Channels_Positions+=_T(", Back: L C R"); break;
-            default : Channels_Positions+=_T(", Back: "); Channels_Positions+=Ztring::ToZtring(Channels_Back); //Which config?
-        }
-        switch (Channels_LFE)
-        {
-            case  0 : break;
-            case  1 : Channels_Positions+=_T(", LFE"); break;
-            default : Channels_Positions+=_T(", LFE= "); Channels_Positions+=Ztring::ToZtring(Channels_LFE); //Which config?
-        }
-        Channels_Positions2=Ztring::ToZtring(Channels_Front)+_T('/')
-                           +Ztring::ToZtring(Channels_Side)+_T('/')
-                           +Ztring::ToZtring(Channels_Back)
-                           +(Channels_LFE?_T(".1"):_T(""));
-
-        //Filling
-        Accept("AudioSpecificConfig");
-
-        Stream_Prepare(Stream_Audio);
-        Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, Channels_Front+Channels_Side+Channels_Back+Channels_LFE);
-        Fill(Stream_Audio, StreamPos_Last, Audio_ChannelPositions, Channels_Positions);
-        Fill(Stream_Audio, StreamPos_Last, Audio_ChannelPositions_String2, Channels_Positions2);
-    }
-    if (audioObjectType==06 || audioObjectType==20)
-        Skip_S1(3,                                              "layerNr");
-    if (extensionFlag)
-    {
-        bool extensionFlag3;
-        if (audioObjectType==22)
-        {
-            Skip_S1( 5,                                         "numOfSubFrame");
-            Skip_S2(11,                                         "layer_length");
-        }
-        if (audioObjectType==17
-         || audioObjectType==19
-         || audioObjectType==20
-         || audioObjectType==23)
-        {
-            Skip_SB(                                            "aacSectionDataResilienceFlag");
-            Skip_SB(                                            "aacScalefactorDataResilienceFlag");
-            Skip_SB(                                            "aacSpectralDataResilienceFlag");
-        }
-        Get_SB (   extensionFlag3,                              "extensionFlag3");
-        if (extensionFlag3)
-        {
-            //TODO...
-        }
-    }
-    Element_End();
-}
-
-//---------------------------------------------------------------------------
-// AAC in ES, SBR part, 3+ bytes
-void File_Mpeg4_AudioSpecificConfig::SBR ()
-{
-    //Parsing
-    int16u syncExtensionType;
-    int8u  samplingFrequencyIndex;
-    Element_Begin("SBR");
-    Get_S2 (11, syncExtensionType,                             "syncExtensionType");
-    if (syncExtensionType!=0x2B7)
-    {
-        Element_End();
-        return;
-    }
-    Get_S1 (5, extensionAudioObjectType,                        "extensionAudioObjectType");
-    if (extensionAudioObjectType==0x05)
-    {
-        Get_SB (   sbrPresentFlag,                              "sbrPresentFlag");
-        if (sbrPresentFlag)
-        {
-            Get_S1 (4, samplingFrequencyIndex,                  "extensionSamplingFrequencyIndex"); Param_Info(MP4_SamplingRate[samplingFrequencyIndex]);
-            if (samplingFrequencyIndex>=0xF)
-            {
-                Get_S3 (24, samplingFrequency,                  "extensionSamplingFrequency");
-            }
-            else
-                samplingFrequency=MP4_SamplingRate[samplingFrequencyIndex];
-        }
-    }
-    Element_End();
-
-    //PS stuff
-    if (Data_Remain())
-        PS();
-}
-
-//---------------------------------------------------------------------------
-// AAC in ES, PS part, 2 bytes
-// Format is unknown
-void File_Mpeg4_AudioSpecificConfig::PS ()
-{
-    //Parsing
-    Element_Begin("PS");
-    int16u syncExtensionType;
-    Get_S2 (11, syncExtensionType,                             "syncExtensionType");
-    if (syncExtensionType!=0x548)
-    {
-        Element_End();
-        return;
-    }
-    Get_SB (psPresentFlag,                                     "psPresentFlag");
-    Element_End();
-
-    //BSAC stuff
-    //if (extensionAudioObjectType==22)
-    //    BSAC();
-    //if ( extensionAudioObjectType == 22 ) {
-    //    sbrPresentFlag;
-    //    if (sbrPresentFlag == 1) {
-    //        extensionSamplingFrequencyIndex;
-    //        if ( extensionSamplingFrequencyIndex == 0xf )
-    //            extensionSamplingFrequency;
-    //    }
-    //    extensionChannelConfiguration
-    //}
-}
-
-//---------------------------------------------------------------------------
-// ALS is detected
-// Format is unknown
-void File_Mpeg4_AudioSpecificConfig::ALS ()
-{
-    //Parsing
-    BS_End();
-
-    FILLING_BEGIN();
-        //Filling
-        Accept("AudioSpecificConfig");
-
-        Stream_Prepare(Stream_Audio);
-        Fill(Stream_Audio, StreamPos_Last, Audio_Format, "ALS");
-        Fill(Stream_Audio, StreamPos_Last, Audio_Codec, "ALS");
-    FILLING_END();
-
-    std::string Riff;
-    Riff.append((const char*)Buffer+Buffer_Offset, (size_t)(Element_Size-Element_Offset));
-    if (Riff.find("RIFF") && Riff.find("WAVEfmt"))
-    {
-        #if defined(MEDIAINFO_RIFF_YES)
-            //Creating the parser
-            File_Riff MI;
-            Open_Buffer_Init(&MI);
-
-            //Parsing
-            size_t Riff_Pos=Riff.find("RIFF");
-            Skip_XX(Riff_Pos,                                   "Unknown");
-            Open_Buffer_Continue(&MI);
-
-            //Filling
-            Finish(&MI);
-            Merge(MI, StreamKind_Last, 0, StreamPos_Last);
-
-            //The RIFF header is for PCM
-            Clear(Stream_Audio, StreamPos_Last, Audio_ID);
-            Clear(Stream_Audio, StreamPos_Last, Audio_Codec_String);
-            Clear(Stream_Audio, StreamPos_Last, Audio_Codec_Family);
-            Fill(Stream_Audio, StreamPos_Last, Audio_Format, "ALS", Unlimited, true, true);
-            Fill(Stream_Audio, StreamPos_Last, Audio_Codec, "ALS", Unlimited, true, true);
-            Clear(Stream_Audio, StreamPos_Last, Audio_CodecID);
-            Clear(Stream_Audio, StreamPos_Last, Audio_CodecID_Hint);
-            Clear(Stream_Audio, StreamPos_Last, Audio_CodecID_Url);
-            Clear(Stream_Audio, StreamPos_Last, Audio_BitRate);
-            Clear(Stream_Audio, StreamPos_Last, Audio_BitRate_Mode);
-            Clear(Stream_Audio, StreamPos_Last, Audio_Codec_CC);
-
-        #else
-            Skip_XX(Element_Size-Element_Offset,                "(RIFF chunck)");
-        #endif
-
-    }
-    else
-        Skip_XX(Element_Size-Element_Offset,                    "Unknown");
-
-    //No need more
-    Finish("AudioSpecificConfig");
-}
-
-} //NameSpace
-
-#endif //MEDIAINFO_MPEG4_YES
-

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Mpeg4_AudioSpecificConfig.h Deleted

@@ -1,68 +0,0 @@
-// File_Aac - Info for AAC Audio files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
-//
-// This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this library. If not, see <http://www.gnu.org/licenses/>.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-//---------------------------------------------------------------------------
-#ifndef MediaInfo_File_Mpeg4_AudioSpecificConfigH
-#define MediaInfo_File_Mpeg4_AudioSpecificConfigH
-//---------------------------------------------------------------------------
-
-//---------------------------------------------------------------------------
-#include "MediaInfo/File__Analyze.h"
-//---------------------------------------------------------------------------
-
-namespace MediaInfoLib
-{
-
-//***************************************************************************
-// Class File_Mpeg4_AudioSpecificConfig
-//***************************************************************************
-
-class File_Mpeg4_AudioSpecificConfig : public File__Analyze
-{
-public :
-    //In
-    std::vector<int32u> ftyps;
-    bool Channels_AreTrustable;
-
-public :
-    //Constructor/Destructor
-    File_Mpeg4_AudioSpecificConfig();
-
-private :
-    //Buffer - Global
-    void Read_Buffer_Continue ();
-
-    //Elements
-    void GASpecificConfig();
-    void SBR();
-    void PS();
-    void ALS();
-
-    //Temp
-    int32u samplingFrequency;
-    int8u  channelConfiguration;
-    int8u  audioObjectType;
-    int8u  extensionAudioObjectType;
-    bool   sbrPresentFlag;
-    bool   psPresentFlag;
-};
-
-} //NameSpace
-
-#endif

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Video/File_Afd.cpp Deleted

@@ -1,130 +0,0 @@
-// File_Afd - Info for AFD files
-// Copyright (C) 2010-2010 MediaArea.net SARL, Info@MediaArea.net
-//
-// This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this library. If not, see <http://www.gnu.org/licenses/>.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-//---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-//---------------------------------------------------------------------------
-
-//---------------------------------------------------------------------------
-#if defined(MEDIAINFO_AFD_YES)
-//---------------------------------------------------------------------------
-
-//---------------------------------------------------------------------------
-#include "MediaInfo/Video/File_Afd.h"
-
-//---------------------------------------------------------------------------
-namespace MediaInfoLib
-{
-//---------------------------------------------------------------------------
-
-//***************************************************************************
-// Infos
-//***************************************************************************
-
-//---------------------------------------------------------------------------
-const char* Afd_active_format[]=
-{
-    //1st value is for 4:3, 2nd is for 16:9
-    "", //Undefined
-    "Reserved",
-    "Not recommended",
-    "Not recommended",
-    "Aspect ratio greater than 16:9", //Use GA94
-    "Reserved",
-    "Reserved",
-    "Reserved",
-    "4:3 full frame image / 16:9 full frame image",
-    "4:3 full frame image / 4:3 pillarbox image",
-    "16:9 letterbox image / 16:9 full frame image",
-    "14:9 letterbox image / 14:9 pillarbox image",
-    "Reserved",
-    "4:3 full frame image, alternative 14:9 center / 4:3 pillarbox image, alternative 14:9 center",
-    "16:9 letterbox image, alternative 14:9 center / 16:9 full frame image, alternative 14:9 center",
-    "16:9 letterbox image, alternative 4:3 center / 16:9 full frame image, alternative 4:3 center",
-};
-
-//***************************************************************************
-// Constructor/Destructor
-//***************************************************************************
-
-//---------------------------------------------------------------------------
-File_Afd::File_Afd()
-:File__Analyze()
-{
-}
-
-//***************************************************************************
-// Streams management
-//***************************************************************************
-
-//---------------------------------------------------------------------------
-void File_Afd::Streams_Fill()
-{
-    //Filling
-    Stream_Prepare(Stream_Video);
-}
-
-//***************************************************************************
-// Buffer - Global
-//***************************************************************************
-
-//---------------------------------------------------------------------------
-void File_Afd::Read_Buffer_Continue()
-{
-    if (!Status[IsAccepted])
-        Accept("AFD");
-
-    //Parsing
-    Element_Begin("Active Format Description");
-    bool  active_format_flag;
-    int8u active_format;
-    BS_Begin();
-    Mark_0();
-    Get_SB (active_format_flag,                                 "active_format_flag");
-    Mark_0_NoTrustError();
-    Mark_0_NoTrustError();
-    Mark_0_NoTrustError();
-    Mark_0_NoTrustError();
-    Mark_0_NoTrustError();
-    Mark_1_NoTrustError();
-    if (active_format_flag)
-    {
-        Mark_1_NoTrustError();
-        Mark_1_NoTrustError();
-        Mark_1_NoTrustError();
-        Mark_1_NoTrustError();
-        Get_S1 (4, active_format,                               "active_format"); Param_Info(Afd_active_format[active_format]);
-    }
-    else
-        active_format=0;
-    BS_End();
-    Element_End();
-}
-
-//***************************************************************************
-// C++
-//***************************************************************************
-
-} //NameSpace
-
-#endif //MEDIAINFO_AFD_YES

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Video/File_Afd.h Deleted

@@ -1,71 +0,0 @@
-// File_Afd - Info for AFD files
-// Copyright (C) 2010-2010 MediaArea.net SARL, Info@MediaArea.net
-//
-// This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with this library. If not, see <http://www.gnu.org/licenses/>.
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//
-// Information about Active Format Description files
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-//---------------------------------------------------------------------------
-#ifndef MediaInfo_AfdH
-#define MediaInfo_AfdH
-//---------------------------------------------------------------------------
-
-//---------------------------------------------------------------------------
-#include "MediaInfo/File__Analyze.h"
-//---------------------------------------------------------------------------
-
-namespace MediaInfoLib
-{
-
-//***************************************************************************
-// Class File_Afd
-//***************************************************************************
-
-class File_Afd : public File__Analyze
-{
-public :
-    //In
-
-    //Constructor/Destructor
-    File_Afd();
-
-private :
-    //Streams management
-    void Streams_Fill();
-    
-    //Buffer - Global
-    void Read_Buffer_Continue();
-
-    //Sream
-    struct stream
-    {
-        int8u active_format;
-
-        stream()
-        {
-            active_format=0;
-        }
-    };
-    stream Stream;
-};
-
-} //NameSpace
-
-#endif
-

libmediainfo_0.7.34.tar.bz2/Source/PreRelease/Ressources.cpp Deleted

@@ -1,277 +0,0 @@
-//---------------------------------------------------------------------------
-#include <wx/wxprec.h>
-#ifdef __BORLANDC__
-    #pragma hdrstop
-#endif
-//---------------------------------------------------------------------------
-//---------------------------------------------------------------------------
-#include <wx/file.h>
-#include <ZenLib/File.h>
-#include <ZenLib/ZtringListListF.h>
-#include "PreRelease/Ressources.h"
-using namespace ZenLib;
-using namespace std;
-#define FILE_MAX 20000
-//---------------------------------------------------------------------------
-
-//---------------------------------------------------------------------------
-// Open a file
-ZenLib::Ztring Ressources_Create_Load(Ztring FileName, Ztring &Contents)
-{
-    wxFile F;
-    if (F.Open(FileName.c_str(), wxFile::read)==false)
-    {
-        Ztring ToReturn=L"Problems to open ";
-        ToReturn+=FileName;
-        ToReturn+=L"\r\n";
-        return ToReturn;
-    }
-
-    char C[FILE_MAX];
-    size_t Size=F.Read(C, FILE_MAX-1);
-    Contents.From_Local(C, Size);
-    return L"";
-}
-
-//---------------------------------------------------------------------------
-// Write a file
-ZenLib::Ztring Ressources_Create_Save(Ztring FileName, Ztring &Contents)
-{
-    File F;
-    if (F.Create(FileName.c_str(), true)==false)
-    {
-        Ztring ToReturn=L"Problems to create ";
-        ToReturn+=FileName;
-        ToReturn+=L"\r\n";
-        return ToReturn;
-    }
-
-    std::string S1=Contents.To_UTF8();
-    size_t Size=F.Write((const int8u*)S1.c_str(), S1.size());
-    Contents.From_Number(Size);
-    Contents+=L" bytes written";
-    return L"";
-}
-
-//---------------------------------------------------------------------------
-// Open an item
-ZenLib::Ztring Ressources_Create_Item(const Ztring &Directory, const Ztring &Name, const Ztring &Class, Ztring &Contents)
-{
-    Contents.clear();
-    Ztring Result;
-
-    //Load header
-    Ztring Partial;
-    Result=Ressources_Create_Load(L"../Source/Ressource/Text/_.2.txt", Partial);
-    if (!Result.empty())
-        return Result;
-    Partial.FindAndReplace(L"%Name%", Ztring(L"MediaInfo_Config_")+Name);
-    Partial.FindAndReplace(L"%Class%", Class);
-    Contents+=Partial;
-
-    //Load line template
-    Ztring Line;
-    Result=Ressources_Create_Load(L"../Source/Ressource/Text/_.5.txt", Line);
-    if (!Result.empty())
-        return Result;
-
-    //Read input file
-    ZtringListListF ZLL;
-    ZLL.Load(Ztring(L"../Source/Ressource/Text/")+Directory+L"/"+Name+L".csv");
-    for (size_t Pos=0; Pos<ZLL.size(); Pos++)
-    {
-        Ztring Line_Temp=Line;
-        Line_Temp.FindAndReplace(L"%Line%", ZLL.Read(Pos));
-        Contents+=Line_Temp;
-    }
-
-    //Load footer template
-    Result=Ressources_Create_Load(L"../Source/Ressource/Text/_.8.txt", Partial);
-    if (!Result.empty())
-        return Result;
-    Contents+=Partial;
-
-    return L"";
-}
-
-//---------------------------------------------------------------------------
-// Main
-ZenLib::Ztring Ressources_Create()
-{
-    Ztring Out;
-    Ztring Result;
-    Ztring Contents;
-
-    //Load header
-    Result=Ressources_Create_Load(L"../Source/Ressource/Text/_.1.txt", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    //Load datas
-    Result=Ressources_Create_Item(L"Language", L"DefaultLanguage", L"Translation", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"DataBase", L"Format", L"InfoMap", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"DataBase", L"CodecID_General_Mpeg4", L"InfoMap", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"DataBase", L"CodecID_Video_Matroska", L"InfoMap", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"DataBase", L"CodecID_Video_Mpeg4", L"InfoMap", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"DataBase", L"CodecID_Video_Real", L"InfoMap", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"DataBase", L"CodecID_Video_Riff", L"InfoMap", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"DataBase", L"CodecID_Audio_Matroska", L"InfoMap", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"DataBase", L"CodecID_Audio_Mpeg4", L"InfoMap", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"DataBase", L"CodecID_Audio_Real", L"InfoMap", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"DataBase", L"CodecID_Audio_Riff", L"InfoMap", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"DataBase", L"CodecID_Text_Matroska", L"InfoMap", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"DataBase", L"CodecID_Text_Mpeg4", L"InfoMap", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"DataBase", L"CodecID_Text_Riff", L"InfoMap", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"DataBase", L"Codec", L"InfoMap", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"Stream", L"Generic", L"ZtringListList", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"Stream", L"General", L"ZtringListList", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"Stream", L"Video", L"ZtringListList", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"Stream", L"Audio", L"ZtringListList", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"Stream", L"Text", L"ZtringListList", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"Stream", L"Chapters", L"ZtringListList", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"Stream", L"Image", L"ZtringListList", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"Stream", L"Menu", L"ZtringListList", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"DataBase", L"Iso639_1", L"InfoMap", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"DataBase", L"Iso639_2", L"InfoMap", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"DataBase", L"Library_DivX", L"InfoMap", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"DataBase", L"Library_XviD", L"InfoMap", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"DataBase", L"Library_MainConcept_Avc", L"InfoMap", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"DataBase", L"Library_VorbisCom", L"InfoMap", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    Result=Ressources_Create_Item(L"MediaInfo", L"Summary", L"ZtringListList", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    //Load footer
-    Result=Ressources_Create_Load(L"../Source/Ressource/Text/_.9.txt", Contents);
-    if (!Result.empty())
-        return Result;
-    Out+=Contents;
-
-    //Write file
-    Result=Ressources_Create_Save(L"../Source/MediaInfo/MediaInfo_Config_Automatic.cpp", Out);
-    if (!Result.empty())
-        return Result;
-
-    return Out;
-
-}
-//---------------------------------------------------------------------------
-

libmediainfo_0.7.34.tar.bz2/Source/PreRelease/Ressources.h Deleted

libmediainfo_0.7.34.tar.bz2/Source/Ressource Deleted

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text Deleted

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text/DataBase Deleted

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text/DataBase/Codec.csv Deleted

@@ -1,1072 +0,0 @@
- BIT;RGB;4CC;V;RGB;;Uncompressed;
- JPG;M-JPEG;4CC;V;M-JPEG;;;
- PNG;PNG;4CC;V;RGB;;;
- RAW;RGB;4CC;V;RGB;;Uncompressed;http://www.fourcc.org/indexrgb.htm
- RGB;RGB;4CC;V;RGB;;Uncompressed. Basic Windows bitmap format. 1, 4 and 8 bpp versions are palettised. 16, 24 and 32bpp contain Uncompressed RGB samples.;http://www.fourcc.org/indexrgb.htm
- RL4;RGB;4CC;V;RGB;;RLE 4bpp;http://www.fourcc.org/indexrgb.htm
- RL8;RGB;4CC;V;RGB;;RLE 8bpp;http://www.fourcc.org/indexrgb.htm
-1978;RGB;4CC;V;JPEG;;A.M.Paredes predictor;http://www.pegasusimaging.com/cgi-bin/download2.cgi?LVIDB
-2VUY;YUV;4CC;V;YUV;;Optibase VideoPump 8-bit 4:2:2 Component YCbCr;
-3IV0;3ivX;4CC;V;MPEG-4V;;3ivX pre-1.0;http://www.3ivx.com/download/
-3IV1;3ivX;4CC;V;MPEG-4V;;3ivX 1.0-3.5;http://www.3ivx.com/download/
-3IV2;3ivX;4CC;V;MPEG-4V;;3ivX 4.0;http://www.3ivx.com/download/
-3IVD;3ivX;4CC;V;MPEG-4V;;;http://ffdshow-tryout.sourceforge.net/
-3IVX;3ivX;4CC;V;MPEG-4V;;;http://www.3ivx.com/download/
-3VID;3ivX;4CC;V;MPEG-4V;;;http://www.3ivx.com/download/
-8BPS;QuickTime 8bps;4CC;V;RGB;;Apple QuickTime Planar RGB with Alpha-channel;http://ffdshow-tryout.sourceforge.net/
-AAS4;Autodesk;4CC;V;RGB;;Autodesk Animator Studio RLE (warning: this is a discoutinued product);http://mirror01.iptelecom.net.ua/~video/codecs/Autodesk.Animator.v1.11.Codec.exe
-AASC;Autodesk;4CC;V;RGB;;Autodesk Animator Studio RLE (warning: this is a discoutinued product);http://mirror01.iptelecom.net.ua/~video/codecs/Autodesk.Animator.v1.11.Codec.exe
-ABYR;Kensigton low;4CC;V;;;Kensington (low resolution, low frame rate (6fps) for digital cameras);
-ACTL;ACT-L2;4CC;V;;;Streambox ACT-L2;http://www.streambox.com/products/act-L2_codec.htm
-ADV1;WaveCodec;4CC;V;Wavelet;;Loronix WaveCodec;http://www.loronix.com/products/video_clips/wavecodec.asp
-ADVJ;Avid;4CC;V;M-JPEG;;Avid M-JPEG. Aka AVRn;
-AEIK;Indeo 3.2;4CC;V;;;Intel Indeo Video 3.2 (Vector Quantization);
-AEMI;VideoONE;4CC;V;MPEG-V;;Array VideoONE MPEG-1-I Capture. Array's used for I frame only MPEG-1 AVI files;http://www.array.com
-AFLC;Autodesk;4CC;V;;;Autodesk Animator Studio FLI (256 color) (warning: this is a discoutinued product);http://mirror01.iptelecom.net.ua/~video/codecs/Autodesk.Animator.v1.11.Codec.exe
-AFLI;Autodesk;4CC;V;;;Autodesk Animator Studio FLI (256 color) (warning: this is a discoutinued product);http://mirror01.iptelecom.net.ua/~video/codecs/Autodesk.Animator.v1.11.Codec.exe
-AHDV;CineForm HD;4CC;V;Wavelet;;CineForm 10-bit Visually Perfect HD (Wavelet);http://www.cineform.com/products/ConnectHD.htm
-AJPG;M-JPEG;4CC;V;M-JPEG;;22fps JPEG-based for digital cameras;
-ALPH;Ziracom;4CC;V;;;Ziracom Digital Communications Inc.;
-AMPG;VideoONE;4CC;V;MPEG-1;;Array VideoONE MPEG;http://www.array.com
-AMR ;AMR;4CC;V;;;Speech codec;
-ANIM;RDX;4CC;V;;;Intel RDX;
-AP41;AngelPotion;4CC;V;MPEG-4V;;AngelPotion Definitive 1 (hack of MS MPEG-4 v3);http://www.divxity.com/download/ap4v1-702.exe
-AP42;AngelPotion;4CC;V;MPEG-4V;;AngelPotion Definitive 2 (hack of MS MPEG-4 v3);http://www.divxity.com/download/ap4v1-702.exe
-ASLC;AlparySoft Lossless;4CC;V;;;AlparySoft Lossless;http://www.free-codecs.com/download/Alparysoft_Lossless_Video_Codec.htm
-ASV1;Asus 1;4CC;V;;;Asus Video 1;ftp://ftp.asuscom.de/pub/asuscom/treiber/vga/ASUS_VGA_TOOLS/asv2dec.zip
-ASV2;Asus 2;4CC;V;;;Asus Video 2;ftp://ftp.asuscom.de/pub/asuscom/treiber/vga/ASUS_VGA_TOOLS/asv2dec.zip
-ASVX;Asus X;4CC;V;;;Asus Video X;ftp://ftp.asuscom.de/pub/asuscom/treiber/vga/ASUS_VGA_TOOLS/asv2dec.zip
-ATM4;Nero MPEG-4;4CC;V;MPEG-4V;;Ahead Nero Digital MPEG-4;http://www.nero.com
-AUR2;YUV;4CC;V;YUV;;Auravision Aura 2 - YUV 422;
-AURA;YUV;4CC;V;YUV;;Auravision Aura 1 - YUV 411;
-AUVX;AUVX;4CC;V;;;USH GmbH;
-AV1X;Avid 1:1;4CC;V;;;Avid 1:1x (Quick Time);http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe
-AVC1;AVC;4CC;V;AVC;;Advanced Video Codec;http://ffdshow-tryout.sourceforge.net/
-AVD1;Avid DV;4CC;V;DV;;Avid DV (Quick Time);http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe
-AVDJ;Avid JFIF;4CC;V;M-JPEG;;Avid Meridien JFIF with Alpha-channel;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe
-AVDN;Avid HD;4CC;V;;;Avid DNxHD (Quick Time);http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe
-AVDV;Avid DV;4CC;V;DV;;Avid DV;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe
-AVI1;MainConcept;4CC;V;M-JPEG;;MainConcept M-JPEG;
-AVI2;MainConcept;4CC;V;M-JPEG;;MainConcept M-JPEG;
-AVID;Avid M-JPEG;4CC;V;M-JPEG;;Avid M-JPEG;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe
-AVIS;AviSynth;4CC;V;;;Wrapper for AviSynth (Dummy);http://ffdshow-tryout.sourceforge.net/
-AVMP;Avid IMX;4CC;V;;;Avid IMX (Quick Time);http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe
-AVR ;Avid NuVista;4CC;V;M-JPEG;;Avid ABVB/NuVista M-JPEG with Alpha-channel;
-AVRn;Avid M-JPEG;4CC;V;M-JPEG;;Avid M-JPEG;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe
-AVRN;Avid M-JPEG;4CC;V;M-JPEG;;Avid M-JPEG;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe
-AVUI;Avid;4CC;V;;;Avid Meridien Uncompressed with Alpha-channel;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe
-AVUP;Avid;4CC;V;;;Avid 10bit Packed (Quick Time);http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe
-AYUV;YUV;4CC;V;YUV;;4:4:4 YUV (AYUV);
-AZPR;QuickTime;4CC;V;;;Quicktime Apple Video;http://www.apple.com/quicktime/download/standalone.html
-AZRP;QuickTime;4CC;V;;;Quicktime Apple Video;http://www.apple.com/quicktime/download/standalone.html
-BGR ;RGB;4CC;V;RGB;;Uncompressed RGB32;
-BHIV;BeHere iVideo;4CC;V;;;BeHere iVideo;
-BINK;Bink;4CC;V;;;RAD Game Tools Bink Video;
-BIT ;RGB;4CC;V;RGB;;Uncompressed. BI_BITFIELDS;
-BITM;H.261;4CC;V;;;Microsoft H.261;
-BLOX;Blox;4CC;V;;;Jan Jezabek BLOX MPEG;http://www.ii.uj.edu.pl/~jezabek/blox/blox-0.1.0b.zip
-BLZ0;DivX;4CC;V;MPEG-4V;;DivX for Blizzard Decoder Filter;http://ffdshow-tryout.sourceforge.net/
-BT20;MediaStream;4CC;V;;;Conexant ProSummer MediaStream;
-BTCV;Composite;4CC;V;;;Conexant Composite Video;
-BTVC;Composite;4CC;V;;;Conexant Composite Video;
-BW00;BergWave;4CC;V;Wavelet;;BergWave (Wavelet);
-BW10;Broadway;4CC;V;MPEG-1;;Data Translation Broadway MPEG Capture/Compression;
-BXBG;Boxx RGB;4CC;V;;;BOXX BGR;
-BXRG;Boxx RGB;4CC;V;;;BOXX RGB;
-BXY2;Boxx YUV;4CC;V;;;BOXX 10-bit YUV;
-BXYV;Boxx YUV;4CC;V;;;BOXX YUV;
-CC12;Intel YUV;4CC;V;YUV;;Intel YUV12;
-CDV5;Canopus DV;4CC;V;DV;;Canopus SD50/DVHD;http://www.cineform.com/products/ConnectHD.htm
-CDVC;Canopus DV;4CC;V;DV;;Canopus DV (DV);http://www.cineform.com/products/ConnectHD.htm
-CDVH;Canopus DV;4CC;V;DV;;Canopus SD50/DVHD;http://www.cineform.com/products/ConnectHD.htm
-CFCC;Perception;4CC;V;;;DPS Perception M-JPEG (dummy format - only AVI header);
-CFHD;CineForm HD;4CC;V;;;CineForm 10-bit Visually Perfect HD (Wavelet);
-CGDI;Camcorder;4CC;V;;;Camcorder Video (MS Office 97);
-CHAM;Champagne;4CC;V;;;Winnov Caviara Champagne;
-CJPG;Creative M-JPEG;4CC;V;M-JPEG;;Creative Video Blaster Webcam Go JPEG;
-CLJR;YUV;4CC;V;YUV;;Cirrus Logic YUV 4:1:1;http://www.fourcc.org/indexyuv.htm
-CLLC;Canopus;4CC;V;;;Canopus LossLess;
-CLPL;YUV;4CC;V;YUV;;Format similar to YV12 but including a level of indirection.;
-CM10;MediaShow;4CC;V;;;CyberLink Corporation;http://www.cyberlink.com
-CMYK;CMYK;4CC;V;;;Common Data Format in Printing;
-COL0;MS MPEG-4 v3;4CC;V;MPEG-4V;;Hacked MS MPEG-4 v3;http://ffdshow-tryout.sourceforge.net/
-COL1;MS MPEG-4 v3;4CC;V;MPEG-4V;;Hacked MS MPEG-4 v3;http://ffdshow-tryout.sourceforge.net/
-CPLA;YUV;4CC;V;YUV;;Weitek YUV 4:2:0 Planar;
-CRAM;MS Video;4CC;V;;;Microsoft Video 1;
-CSCD;CamStudio;4CC;V;;;RenderSoft CamStudio lossless (LZO & GZIP compression);
-CT10;TalkingShow;4CC;V;;;CyberLink Corporation;http://www.cyberlink.com
-CTRX;Citrix;4CC;V;;;Citrix Scalable Video;
-CUVC;Canopus HQ;4CC;V;;;Canopus HQ;
-CVID;Cinepack;4CC;V;;;Cinepak by CTi (ex. Radius) Vector Quantization;http://www.cinepak.com/text.html
-cvid;Cinepack;4CC;V;;;Cinepak by CTi (ex. Radius) Vector Quantization;http://www.apple.com/quicktime/download/standalone.html
-CWLT;WLT;4CC;V;;;Microsoft Color WLT DIB;
-CYUV;YUV;4CC;V;YUV;;Creative Labs YUV 4:2:2;http://www.fourcc.org/indexyuv.htm
-CYUY;YUV;4CC;V;YUV;;ATI Technologies YUV;http://www.fourcc.org/indexyuv.htm
-D261;H.261;4CC;V;;;DEC H.261;
-D263;H.263;4CC;V;;;DEC H.263;
-DAVC;AVC;4CC;V;AVC;;Dicas MPEGable H.264/MPEG-4 AVC base profile;
-DC25;MainConcept DV;4CC;V;DV;;MainConcept ProDV;
-DCAP;Pinnacle DV25;4CC;V;DV;;Pinnacle DV25;
-DCL1;Data Connextion;4CC;V;;;Data Connection Conferencing;
-DCT0;WniWni;4CC;V;;;WniWni;
-DFSC;VFW;4CC;V;;;DebugMode FrameServer VFW;
-DIB ;RGB;4CC;V;RGB;;Device Independent Bitmap;
-DIV1;FFMpeg;4CC;V;MPEG-4V;;FFmpeg-4 V1 (hacked MS MPEG-4 V1);http://ffdshow-tryout.sourceforge.net/
-DIV2;MS MPEG-4 1/2;4CC;V;MPEG-4V;;;http://ffdshow-tryout.sourceforge.net/
-DIV3;DivX 3 Low;4CC;V;MPEG-4V;;;http://www.divx.com
-DIV4;DivX 3 Fast;4CC;V;MPEG-4V;;;http://www.divx.com
-DIV5;DivX 5;4CC;V;MPEG-4V;;;http://www.divx.com
-DIV6;MS MPEG-4 v3;4CC;V;MPEG-4V;;MS MPEG-4 v3;http://ffdshow-tryout.sourceforge.net/
-DIVX;DivX 4;4CC;V;MPEG-4V;;Project Mayo DivX 4;http://www.divx.com
-divx;DivX;4CC;V;MPEG-4V;;Mainly used by Google;http://www.divx.com
-DJPG;Broadway 101;4CC;V;M-JPEG;;Data Translation, Inc.;
-DM4V;Dicas;4CC;V;MPEG-4V;;Dicas MPEGable MPEG-4;
-DMB1;Rainbow;4CC;V;M-JPEG;;Matrox Rainbow Runner hardware compression;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.MJPG.v2.10.27.codec.exe
-DMB2;Paradigm M-JPEG;4CC;V;M-JPEG;;M-JPEG used by Paradigm;
-DMK2;V36 PDA;4CC;V;;;ViewSonic V36 PDA Video;
-DP02;DynaPel;4CC;V;MPEG-4V;;DynaPel MPEG-4;
-DP16;YUV411;4CC;V;YUV;;Matsushita Electric Industrial Co., Ltd. (With DPCM 6-bit compression);
-DP18;YUV411;4CC;V;YUV;;Matsushita Electric Industrial Co., Ltd. (With DPCM 8-bit compression)
-DP26;YUV422;4CC;V;YUV;;Matsushita Electric Industrial Co., Ltd. (With DPCM 6-bit compression)
-DP28;YUV422;4CC;V;YUV;;Matsushita Electric Industrial Co., Ltd. (With DPCM 8-bit compression)
-DP96;YVU9;4CC;V;YUV;;Matsushita Electric Industrial Co., Ltd. (With DPCM 6-bit compression)
-DP98;YVU9;4CC;V;YUV;;Matsushita Electric Industrial Co., Ltd. (With DPCM 8-bit compression)
-DP9L;YVU9;4CC;V;YUV;;Matsushita Electric Industrial Co., Ltd. (With DPCM 6-bit compression)
-DPS0;DPS Reality;4CC;V;M-JPEG;;DPS Reality M-JPEG (dummy format - only AVI header)
-DPSC;DPS PAR;4CC;V;M-JPEG;;DPS PAR M-JPEG (dummy format - only AVI header)
-DRWX;Pinnacle DV25;4CC;V;DV;;Pinnacle DV25
-DSVD;DV;4CC;V;DV;;Microsoft DirectShow DV
-DTMT;Media-100;4CC;V;;;Media-100
-DTNT;Media-100;4CC;V;;;Media-100
-DUCK;TrueMotion S;4CC;V;;;Duck Corporation True Motion S
-DV10;BlueFish;4CC;V;;;BlueFish444 (lossless RGBA, YUV 10-bit)
-DV25;DVCPro;4CC;V;DV;;Matrox DVCPRO
-DV50;DVCPro5;4CC;V;DV;;Matrox 
-DVAN;Pinnacle DV300;4CC;V;DV;;Pinnacle miroVideo DV300 SW only;
-DVC ;Apple DV NTSC;4CC;V;DV;;Apple QuickTime DV (DVCPRO NTSC);http://www.apple.com/quicktime/download/standalone.html
-dvc ;Apple DV NTSC;4CC;V;DV;;Apple QuickTime DV (DVCPRO NTSC);http://www.apple.com/quicktime/download/standalone.html
-DVCP;Apple DV PAL;4CC;V;DV;;Apple QuickTime DV (DVCPRO PAL);http://www.apple.com/quicktime/download/standalone.html
-dvcp;Apple DV PAL;4CC;V;DV;;Apple QuickTime DV (DVCPRO PAL);http://www.apple.com/quicktime/download/standalone.html
-DVCS;MainConcept DV;4CC;V;DV;;MainConcept DV;
-DVE2;Insoft DVE-2;4CC;V;DV;;InSoft DVE-2 Videoconferencing;
-DVH1;Pinnacle DV;4CC;V;DV;;Pinnacle DVHD100;
-dvhd;DV HD;4CC;V;DV;;DV 1125 lines at 30.00 Hz or 1250 lines at 25.00 Hz;
-dvhd;DV HD;4CC;A;DV;;Sony DV (DV), audio part;
-DVIS;DualMoon DV;4CC;V;DV;;VSYNC DualMoon Iris DV;
-DVL ;Radius DV NTSC;4CC;V;DV;;Radius SoftDV 16:9 NTSC;
-DVLP;Radius DV PAL;4CC;V;DV;;Radius SoftDV 16:9 PAL;
-DVMA;Darim DV;4CC;V;DV;;Darim Vision DVMPEG (dummy for MPEG compressor);
-DVNM;DVNM;4CC;V;;;Matsushita Electric Industrial Co., Ltd.;
-DVOR;BlueFish;4CC;V;;;BlueFish444 (lossless RGBA, YUV 10-bit);
-DVPN;Apple DV NTSC;4CC;V;DV;;Apple QuickTime DV (DV NTSC);
-DVPP;Apple DV PAL;4CC;V;DV;;Apple QuickTime DV (DV PAL);
-DVR ;MPEG-2 Video;4CC;V;MPEG-2;;MPEG-2 Video in a ASF container;
-DVR1;Targa2000;4CC;V;;;TARGA2000;
-DVRS;DualMoon DV;4CC;V;DV;;VSYNC DualMoon Iris DV;
-DVSD;DV;4CC;V;DV;;IEC 61834 and SMPTE 314M;
-dvsd;Sony DV;4CC;V;DV;;Sony DV (DV) 525 lines at 29.97 Hz or 625 lines at 25.00 Hz;
-dvsd;Sony DV;4CC;A;DV;;Sony DV (DV), audio part;
-dvsl;Sony DV;4CC;V;DV;;Sony DV (DV) 525 lines at 29.97 Hz or 625 lines at 25.00 Hz;
-dvsl;Sony DV;4CC;A;DV;;Sony DV (DV), audio part;
-DVSL;DSL DV;4CC;V;DV;;DV compressed in SD (SDL);
-DVX1;DVX 1 SP;4CC;V;;;Lucent DVX1000SP Video Decoder;
-DVX2;DVX 2 S;4CC;V;;;Lucent DVX2000S Video Decoder;
-DVX3;DVX 3 S;4CC;V;;;Lucent DVX3000S Video Decoder;
-DX50;DivX 5;4CC;V;MPEG-4V;;;http://www.divx.com
-DXGM;EA GameVideo;4CC;V;;;Electronic Arts Game Video;
-DXSB;DivX.com Subtitle;4CC;T;;;Subtitle in AVI from DivX networks;http://www.divx.com
-DXT1;DirectX TC;4CC;V;;;DirectX Compressed Texture (1bit alpha channel);
-DXT2;DirectX TC;4CC;V;;;DirectX Compressed Texture;
-DXT3;DirectX TC;4CC;V;;;DirectX Compressed Texture (4bit alpha channel);
-DXT4;DirectX TC;4CC;V;;;DirectX Compressed Texture;
-DXT5;DirectX TC;4CC;V;;;DirectX Compressed Texture (3bit alpha channel with interpolation);
-DXTC;DirectX TC;4CC;V;;;DirectX Texture Compression;
-DXTn;DirectX TC;4CC;V;;;Microsoft Compressed Texture;
-DXTN;DirectX TC;4CC;V;;;Microsoft DirectX Compressed Texture (DXTn);
-EKQ0;Elsa KQ;4CC;V;;;Elsa graphics card quick;
-ELK0;Elsa LK;4CC;V;;;Elsa graphics card;
-EM2V;Elymonyx MPEG-2;4CC;V;;;Etymonix MPEG-2 I-frame;
-EMWC;WMA;;A;;;EverAd, Inc.;
-EQK0;Elsa;4CC;V;;;Elsa graphics card quick;
-ESCP;Escape;4CC;V;;;Eidos Escape;
-ETV1;eTreppid 1;4CC;V;;;eTreppid Video 1;
-ETV2;eTreppid 2;4CC;V;;;eTreppid Video 2;
-ETVC;eTreppid C;4CC;V;;;eTreppid Video C;
-FFDS;FFDS;4CC;V;;;FFDShow supported;http://ffdshow-tryout.sourceforge.net/
-FFV1;FFV1;4CC;V;;;FFDShow supported;http://ffdshow-tryout.sourceforge.net/
-FFVH;FFVH;4CC;V;;;FFDShow supported;http://ffdshow-tryout.sourceforge.net/
-FLIC;FLI/FLC;4CC;V;;;Autodesk FLI/FLC Animation;
-FLJP;DField M-JPEG;4CC;V;;;D-Vision Field Encoded M-JPEG with LSI (or Targa emulation);
-FLV1;FFDS;4CC;V;;;FFDShow supported;http://ffdshow-tryout.sourceforge.net/
-FLV4;VP6;4CC;V;;;Flash, On2 Technologies;http://www.on2.com
-FMJP;D-Vision M-JPEG;4CC;V;;;D-Vision fieldbased ISO M-JPEG;
-FMP4;MPEG-4 Visual;4CC;V;MPEG-4V;;;http://ffdshow-tryout.sourceforge.net/
-FPS1;FRAPS;4CC;V;;;;http://www.fraps.com/
-FRLE;SoftLab-Nsk M-JPEG;4CC;V;;;SoftLab-NSK Y16 + Alpha RLE;
-FRWA;SoftLab-Nsk M-JPEG (w Alpha);4CC;V;;;SoftLab-NSK Vision Forward M-JPEG with Alpha-channel;
-FRWD;SoftLab-Nsk M-JPEG;4CC;V;;;SoftLab-NSK Vision Forward M-JPEG;
-FRWT;SoftLab-Nsk M-JPEG;4CC;V;;;SoftLab-NSK Vision Forward M-JPEG with Alpha-channel;
-FRWU;SoftLab-Nsk M-JPEG;4CC;V;;;SoftLab-NSK Vision Forward Uncompressed;
-FVF1;Itered Fractal;4CC;V;;;Iterated Systems Fractal Video Frame;
-FVFW;FVFW;4CC;V;;;FFDShow supported;http://ffdshow-tryout.sourceforge.net/
-FXT1;3DFX;4CC;V;;;3dfx Interactive, Inc.;
-G2M2;GoToMeeting2;4CC;V;;;Citrix Systems, Inc.;http://www.gotomeeting.com/
-G2M3;GoToMeeting3;4CC;V;;;Citrix Systems, Inc.;http://www.gotomeeting.com/
-GEPJ;White Pine M-JPEG;4CC;V;;;White Pine M-JPEG;
-GJPG;Grand Tech GT891x;4CC;V;;;Grand Tech GT891x;
-GLCC;GigaLink;4CC;V;;;GigaLink AV Capture;
-GLZW;Gabest;4CC;V;;;Motion LZW by Gabest;http://sourceforge.net/project/showfiles.php?group_id=82303&package_id=84358
-GPEG;Gabest;4CC;V;M-JPEG;;M-JPEG by Gabest (with floating point);http://sourceforge.net/project/showfiles.php?group_id=82303&package_id=84358
-GPJM;Pinnacle M-JPEG;4CC;V;M-JPEG;;Pinnacle ReelTime M-JPEG;
-GREY;YUV;4CC;V;YUV;;Simple grayscale video;http://www.fourcc.org/indexyuv.htm
-GWLT;MS GWLT;4CC;V;;;Microsoft Greyscale WLT DIB;
-GXVE;ViVD V2;4CC;V;;;SoftMedia;
-H260;Intel H.260;4CC;V;;;Intel H.260;
-H261;Intel H.261;4CC;V;;;Intel H.261
-H262;Intel H.262;4CC;V;;;Intel H.262
-H263;Intel H.263;4CC;V;;;Intel H.263
-H264;AVC;4CC;V;AVC;;Intel H.264
-h264;AVC;4CC;V;AVC;;Intel H.264
-H265;Intel H.265;4CC;V;;;Intel H.265
-H266;Intel H.266;4CC;V;;;Intel H.266
-H267;Intel H.267;4CC;V;;;Intel H.267
-H268;Intel H.268;4CC;V;;;Intel H.268
-H269;Intel H.263;4CC;V;;;Intel H.263 for POTS-based videoconferencing
-HD10;BlueFish;4CC;V;;;BlueFish444 (lossless RGBA, YUV 10-bit)
-HDX4;Jomigo;4CC;V;;;Jomigo HDX4
-HFYU;Huffman;4CC;V;;;Huffman Lossless YUV and RGB formats (with Alpha-channel)
-HMCR;Rendition;4CC;V;;;Rendition Motion Compensation Format
-HMRR;Rendition;4CC;V;;;Rendition Motion Compensation Format
-i263;Intel H.263;4CC;V;;;Intel H.263
-I420;YUV;4CC;V;;;Intel Indeo 4 H.263
-IAN ;Indeo 4;4CC;V;;;Intel Indeo 4
-ICLB;CellB;4CC;V;;;InSoft CellB Videoconferencing
-IDM0;Wavelets 2;4CC;V;;;IDM Motion Wavelets 2.0
-IF09;H.261;4CC;V;;;Microsoft H.261
-IFO9;YUV9;4CC;V;YUV;;Intel
-IGOR;PowerDVD;4CC;V;;;Power DVD
-IJPG;Intergraph M-JPEG;4CC;V;M-JPEG;;Intergraph
-ILVC;Layered Video;4CC;V;;;Intel Layered Video
-ILVR;H.263+;4CC;V;;;Intel H.263+
-IMAC;MotionComp;4CC;V;;;Intel hardware motion compensation.
-IMC1;YUV;4CC;V;YUV;;As YV12, except the U and V planes each have the same stride as the Y plane
-IMC2;YUV;4CC;V;YUV;;Similar to IMC1, except that the U and V lines are interleaved at half stride boundaries
-IMC3;YUV;4CC;V;YUV;;As IMC1, except that U and V are swapped
-IMC4;YUV;4CC;V;YUV;;As IMC2, except that U and V are swapped
-IMG ;YUV;4CC;V;YUV;;
-IMJG;Accom M-JPEG;4CC;V;;;Accom SphereOUS M-JPEG with Alpha-channel;
-IPDV;I-O DV;4CC;V;;;I-O Data Device Giga AVI DV;
-IPJ2;JPEG2000;4CC;V;;;Image Power JPEG2000;
-IR21;Indeo 2.1;4CC;V;;;Intel Indeo 2.1;
-IRAW;YUV;4CC;V;YUV;;Intel YUV Uncompressed;http://www.fourcc.org/indexyuv.htm
-ISME;ISME;4CC;V;;;Intel;
-IUYV;YUV;4CC;V;YUV;;Lead 16bpp. Interlaced version of UYVY (line order 0, 2, 4,....,1, 3, 5....);
-IV30;Indeo 3;4CC;V;;;Intel Indeo Video 3;
-IV31;Indeo 3;4CC;V;;;Intel Indeo Video 3.1;
-IV32;Indeo 3;4CC;V;;;Intel Indeo Video 3.2;
-IV33;Indeo 3;4CC;V;;;Intel Indeo Video 3.3;
-IV34;Indeo 3;4CC;V;;;Intel Indeo Video 3.4;
-IV35;Indeo 3;4CC;V;;;Intel Indeo Video 3.5;
-IV36;Indeo 3;4CC;V;;;Intel Indeo Video 3.6;
-IV37;Indeo 3;4CC;V;;;Intel Indeo Video 3.7;
-IV38;Indeo 3;4CC;V;;;Intel Indeo Video 3.8;
-IV39;Indeo 3;4CC;V;;;Intel Indeo Video 3.9;
-IV40;Indeo 4;4CC;V;;;Intel Indeo Video 4.0;
-IV41;Indeo 4;4CC;V;;;Intel Indeo Video 4.1;
-IV42;Indeo 4;4CC;V;;;Intel Indeo Video 4.2;
-IV43;Indeo 4;4CC;V;;;Intel Indeo Video 4.3;
-IV44;Indeo 4;4CC;V;;;Intel Indeo Video 4.4;
-IV45;Indeo 4;4CC;V;;;Intel Indeo Video 4.5;
-IV46;Indeo 4;4CC;V;;;Intel Indeo Video 4.6;
-IV47;Indeo 4;4CC;V;;;Intel Indeo Video 4.7;
-IV48;Indeo 4;4CC;V;;;Intel Indeo Video 4.8;
-IV49;Indeo 4;4CC;V;;;Intel Indeo Video 4.9;
-IV50;Indeo 4;4CC;V;;;Intel Indeo Video 5.0 Wavelet;http://www.fourcc.org/indexyuv.htm
-IY41;YUV;4CC;V;YUV;;Lead 16bpp. Interlaced version of Y41P (line order 0, 2, 4,....,1, 3, 5....);http://www.fourcc.org/indexyuv.htm
-IYU1;YUV;4CC;V;YUV;;IEEE1394 12bpp. 12 bit format used in mode 2 of the IEEE 1394 Digital Camera 1.04 spec;http://www.fourcc.org/indexyuv.htm
-IYU2;YUV;4CC;V;YUV;;IEEE1394 24bpp. 24 bit format used in mode 2 of the IEEE 1394 Digital Camera 1.04 spec;
-IYUV;YUV;4CC;V;YUV;;Intel Indeo iYUV 4:2:0;
-JBYR;Kensington;4CC;V;;;Kensington Video;http://ffdshow-tryout.sourceforge.net/
-JFIF;M-JPEG;4CC;V;M-JPEG;;FFDShow supported;
-JPEG;M-JPEG;4CC;V;M-JPEG;;JPEG compressed;http://www.apple.com/quicktime/download/standalone.html
-jpeg;M-JPEG;4CC;V;M-JPEG;;JPEG compressed;
-JPG;M-JPEG;4CC;V;M-JPEG;;JPEG compressed;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe
-JPGL;Pegasus M-JPEG;4CC;V;;;DIVIO JPEG Light for WebCams (Pegasus Lossless JPEG);
-KMVC;Karl;4CC;V;;;Karl Morton's Video (presumably);http://www.apple.com/quicktime/download/standalone.html
-kpcd;Photo CD;4CC;V;;;Kodak Photo CD;
-L261;H.261;4CC;V;;;Lead Technologies H.261;
-L263;H.263+;4CC;V;;;Lead Technologies H.263;
-LAGS;Lagarith;4CC;V;;;Lagarith LossLess;
-LBYR;Creative WebCam;4CC;V;;;Creative WebCam;
-LCMW;Lead CMW;4CC;V;;;Lead Technologies Motion CMW;
-LCW2;Lead MCMW;4CC;V;;;LEADTools MCMW 9Motion Wavelet;http://mirror01.iptelecom.net.ua/~video/codecs/LEAD.MCMP-M-JPEG.v1.016.codec.exe
-LEAD;Lead Video;4CC;V;;;LEAD Video;
-LGRY;Lead GrayScale;4CC;V;;;Lead Technologies Grayscale Image;
-LIA1;Liafail;4CC;V;;;Liafail, Inc.;
-LJ2K;Lead JPEG2000;4CC;V;;;LEADTools JPEG2000;http://mirror01.iptelecom.net.ua/~video/codecs/LEAD.MCMP-M-JPEG.v1.016.codec.exe
-LJPG;Lead M-JPEG;4CC;V;M-JPEG;;LEAD M-JPEG;http://mirror01.iptelecom.net.ua/~video/codecs/LEAD.MCMP-M-JPEG.v1.016.codec.exe
-Ljpg;Lead M-JPEG;4CC;V;M-JPEG;;LEAD M-JPEG;
-LMP2;Lead MPEG-2;4CC;V;;;LEADTools MPEG-2;
-LOCO;LOCO;4CC;V;;;LOCO Lossless;
-LSCR;Lead Screen capture;4CC;V;;;LEAD Screen Capture;
-LSV0;LSV0;4CC;V;;;Infinop Inc.;
-LSVC;Vmail;4CC;V;;;Vianet Lighting Strike Vmail (Streaming);
-LSVM;Vmail;4CC;V;;;Vianet Lighting Strike Vmail (Streaming);
-LSVW;Infinop;4CC;V;;;Infinop Lightning Strike multiple bit rate video codec.;
-LSVX;Vmail;4CC;V;;;Vianet Lightning Strike Video Codec;
-LZO1;LZO;4CC;V;;;LZO compressed (lossless);
-M101;YUV;4CC;V;YUV;;Matrox;
-M261;H.261;4CC;V;;;Microsoft H.261;
-M263;H.263;4CC;V;;;Microsoft H.263;
-M4CC;ESS Divo;4CC;V;MPEG-4V;;ESS MPEG-4 Divio;
-M4S2;FFmpeg MPEG-4;4CC;V;;;Microsoft MPEG-4 (hacked MS MPEG-4);
-MC12;ATI Motion;4CC;V;;;ATI Motion Compensation Format;
-MC24;MainConcept M-JPEG;4CC;V;M-JPEG;;MainConcept M-JPEG;
-MCAM;ATI Motion;4CC;V;;;ATI Motion Compensation Format;
-MCZM;RGB;4CC;V;RGB;;Theory MicroCosm Lossless 64bit RGB with Alpha-channel;
-MDVD;MicroDVD;4CC;V;;;Alex MicroDVD Video (hacked MS MPEG-4);
-MDVF;Pinnacle DV;4CC;V;DV;;Pinnacle DV/DV50/DVHD100;
-MHFY;YUB;4CC;V;YUV;;A.M.Paredes mhuffyYUV (LossLess);http://mirror01.iptelecom.net.ua/~video/codecs/Pinnacle.ReelTime.v2.5.software.only.codec.exe
-MJ2C;JPEG2000;4CC;V;;;Morgan Multimedia JPEG2000 Compression;http://mirror01.iptelecom.net.ua/~video/codecs/Pinnacle.ReelTime.v2.5.software.only.codec.exe
-MJPA;Pinacle M-JPEG A;4CC;V;;;Pinnacle ReelTime MJPG hardware;http://mediaxw.sourceforge.net
-MJPB;Pinacle M-JPEG B;4CC;V;M-JPEG;;M-JPEG;
-MJPG;M-JPEG;4CC;V;M-JPEG;;M-JPEG including Huffman Tables;
-mJPG;IBM M-JPEG (w Huffman);4CC;V;M-JPEG;;IBM M-JPEG including Huffman Tables;
-MJPX;Pegasus M-JPEG;4CC;V;;;Pegasus PICVideo M-JPEG;
-ML20;Webcam;4CC;V;;;Mimic MSN Messenger Webcam;
-MMES;Matrox MPEG-2;4CC;V;MPEG-V;;Matrox MPEG-2 I-frame;
-MMIF;Matrox MPEG-2;4CC;V;MPEG-V;;Matrox MPEG-2 I-frame;
-MNVD;MindVid;4CC;V;;;MindBend MindVid LossLess;
-MP2A;MPEG-2 Audio;4CC;A;MPEG-A;;Media Excel MPEG-2 Audio;
-MP2T;MPEG-2 TS;4CC;M;MPEG-TS;;Media Excel MPEG-2 Transport Stream;
-MP2V;MPEG-2 Video;4CC;V;MPEG-V;;Media Excel MPEG-2 Video;http://ffdshow-tryout.sourceforge.net/
-MP2v;MPEG-2 Video;4CC;V;MPEG-V;;MPEG-2 Video;http://ffdshow-tryout.sourceforge.net/
-MP41;S-Mpeg 4 v1;4CC;V;;;Microsoft MPEG-4 V1 (enhansed H263);http://ffdshow-tryout.sourceforge.net/
-MP42;S-Mpeg 4 v2;4CC;V;;;Microsoft MPEG-4 V2;http://www.apple.com/quicktime/download/standalone.html
-MP43;S-Mpeg 4 v3;4CC;V;;;Microsoft MPEG-4 V3;
-mp4a;AAC;4CC;A;AAC;;AAC;http://ffdshow-tryout.sourceforge.net/
-MP4A;MPEG-4 Audio;4CC;A;AAC;;Media Excel MPEG-4 Audio;http://www.apple.com/quicktime/download/standalone.html
-MP4S;MS MPEG-4 v3;4CC;V;MPEG-4V;;Microsoft MPEG-4 (Windows Media 7.0);
-mp4s;MPEG-4 TS;4CC;M;MPEG-TS;;(MPEG-4) Apple MPEG-4 Transport Stream;http://ffdshow-tryout.sourceforge.net/
-MP4T;MPEG-4 TS;4CC;M;MPEG-TS;;Media Excel MPEG-4 Transport Stream;http://www.apple.com/quicktime/download/standalone.html
-MP4V;MPEG-4 Video;4CC;V;MPEG-4V;;Apple QuickTime MPEG-4 native;http://ffdshow-tryout.sourceforge.net/
-mp4v;MPEG-4 Video;4CC;V;MPEG-4V;;(MPEG-4) Apple MPEG-4 Video;http://www.apple.com/quicktime/download/standalone.html
-MPEG;MPEG;4CC;V;MPEG-V;;Chromatic MPEG 1 Video I Frame;http://ffdshow-tryout.sourceforge.net/
-mpeg;MPEG;4CC;V;MPEG-V;;MPEG-1 Video;http://ffdshow-tryout.sourceforge.net/
-MPG1;FFmpeg MPEG 1/2;4CC;V;MPEG-V;;(MPEG-1/2) FFmpeg;http://ffdshow-tryout.sourceforge.net/
-MPG2;FFmpeg MPEG 1/2;4CC;V;MPEG-V;;(MPEG-1/2) FFmpeg;http://ffdshow-tryout.sourceforge.net/
-MPG3;FFmpeg DivX 3;4CC;V;MPEG-4V;;(MPEG-4) MS MPEG-4 v3;
-MPG4;MS MPEG-4 v1;4CC;V;MPEG-4V;;Microsoft MPEG-4 v1;
-MPGI;Sigma MPEG;4CC;V;MPEG-V;;Sigma Design MPEG-1 I-frame;
-MPNG;PNG;4CC;V;RGB;;Motion PNG;
-MRCA;Mrcodec;4CC;V;;;FAST Multimedia;
-MRLE;RLE;4CC;V;RGB;;Microsoft RLE;
-MSS1;Windows Screen Video;4CC;V;;;Windows Screen Video;
-MSS2;Windows Media;4CC;V;;;Windows Media 9;
-MSUC;MSU;4CC;V;;;MSU LossLess;
-MSUD;MSU;4CC;V;;;MSU LossLess;
-MSV1;Microsoft Video 1;4CC;V;;;Microsoft Video 1;
-MSVC;Microsoft Video 1;4CC;V;;;Microsoft Video 1
-MSZH;AVImszh;4CC;V;;;Lossless (ZIP compression)
-MTGA;TGA;4CC;V;RGB;;Motion TGA images (24, 32 bpp)
-MTX1;Matrox M-JPEG;4CC;V;M-JPEG;;Matrox M-JPEG
-MTX2;Matrox M-JPEG;4CC;V;M-JPEG;;Matrox M-JPEG
-MTX3;Matrox M-JPEG;4CC;V;M-JPEG;;Matrox M-JPEG
-MTX4;Matrox M-JPEG;4CC;V;M-JPEG;;Matrox M-JPEG
-MTX5;Matrox M-JPEG;4CC;V;M-JPEG;;Matrox M-JPEG
-MTX6;Matrox M-JPEG;4CC;V;M-JPEG;;Matrox M-JPEG
-MTX7;Matrox M-JPEG;4CC;V;M-JPEG;;Matrox M-JPEG
-MTX8;Matrox M-JPEG;4CC;V;M-JPEG;;Matrox M-JPEG
-MTX9;Matrox M-JPEG;4CC;V;M-JPEG;;Matrox M-JPEG
-MV10;Nokia;4CC;V;;;Nokia Mobile Phones
-MV11;Nokia;4CC;V;;;Nokia Mobile Phones
-MV12;MVI;4CC;V;;;Motion Pixels (old)
-MV99;Nokia;4CC;V;;;Nokia Mobile Phones
-MVC1;Nokia;4CC;V;;;Nokia Mobile Phones
-MVC2;Nokia;4CC;V;;;Nokia Mobile Phones
-MVC9;Nokia;4CC;V;;;Nokia Mobile Phones
-MVI1;MVI;4CC;V;;;Motion Pixels MVI
-MVI2;MVI;4CC;V;;;Motion Pixels MVI
-MWV1;Aware Motion Wavelets;4CC;V;;;Aware Motion Wavelets
-MYUV;RGB;4CC;V;RGB;;Media-100 844/X Uncompressed
-NAVI;MS MPEG-4;4CC;V;MPEG-4V;;nAVI video (hacked MS MPEG-4)
-NDIG;Ahead MPEG-4;4CC;V;MPEG-4V;;Ahead Nero Digital MPEG-4
-NHVU;Nvidia Texture;4CC;V;;;Nvidia Texture Format (GEForce 3)
-NO16;RGB;4CC;V;RGB;;Theory None16 64bit uncompressed Uncompressed
-NT00;LightWave;4CC;V;YUV;;NewTek LightWave HDTV YUV with Alpha-channel
-NTN1;NogaTech Video 1;4CC;V;;;Nogatech Video Compression 1
-NTN2;NogaTech Video 2;4CC;V;;;Nogatech Video Compression 2 (GrabBee hardware coder)
-NUV1;Nuppel;4CC;V;;;NuppelVideo
-NV12;YUV;4CC;V;YUV;;8-bit Y plane followed by an interleaved U/V plane with 2x2 subsampling
-NV21;YUV;4CC;V;YUV;;As NV12 with U and V reversed in the interleaved plane
-NVDS;Nvidia Texture;4CC;V;;;Nvidia Texture Format
-NVHS;Nvidia Texture;4CC;V;;;Nvidia Texture Format (GeForce 3)
-NVHU;Nvidia Texture;4CC;V;;;Nvidia Texture Format
-NVS0;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format
-NVS1;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format
-NVS2;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format
-NVS3;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format
-NVS4;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format
-NVS5;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format
-NVS6;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format
-NVS7;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format
-NVS8;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format
-NVS9;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format
-NVT0;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format
-NVT1;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format
-NVT2;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format;
-NVT3;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format;
-NVT4;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format;
-NVT5;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format;
-NVT6;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format;
-NVT7;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format;
-NVT8;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format;
-NVT9;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format;
-NY12;YUV;4CC;V;YUV;;Nogatech Ltd.;
-NYUV;YUV;4CC;V;YUV;;Nogatech Ltd.;
-ONYX;VP7;4CC;V;;;On2 VP7;http://www.on2.com/vp7.php3
-PCLE;Studio400;4CC;V;;;Pinnacle Systems, Inc.;
-PDVC;Panasonic DV;4CC;V;DV;;Panasonic DV;
-PGVV;Radius Video Vision;4CC;V;;;Radius Video Vision Telecast (adaptive JPEG);
-PHMO;Photomotion;4CC;V;;;IBM Photomotion;
-PIM1;Pegasus M-JPEG;4CC;V;M-JPEG;;Pinnacle DC1000 hardware (MPEG compression);http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe
-PIM2;Pegasus M-JPEG;4CC;V;M-JPEG;;Pegasus Imaging;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe
-PIMJ;Pegasus M-JPEG;4CC;V;M-JPEG;;Pegasus Imaging PICvideo Lossless JPEG;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe
-PIXL;Miro M-JPEG;4CC;V;M-JPEG;;MiroVideo XL (M-JPEG);
-PNG;PNG;4CC;V;RGB;;;
-PNG1;PNG;4CC;V;RGB;;Corecodec.org CorePNG;
-PVEZ;PowerEZ;4CC;V;;;Horizons Technology PowerEZ;
-PVMM;Pegasus MPEG-4;4CC;V;MPEG-4V;;PacketVideo Corporation MPEG-4;
-PVW2;Pegasus Wavelet;4CC;V;;;Pegasus Imaging Wavelet 2000;
-PVWV;Pegasus Wavelet;4CC;V;;;Pegasus Imaging Wavelet 2000;
-PXLT;Pixlet;4CC;V;;;Apple Pixlet (Wavelet);
-Q1.0;QPEG 1.0;4CC;V;;;Q-Team QPEG 1.0;http://www.q-team.de
-Q1.1;QPEG 1.1;4CC;V;;;Q-Team QPEG 1.1;http://www.q-team.de
-Qclp;QCLP;4CC;A;;;;
-QDGX;Apple GX;4CC;V;;;Apple QuickDUncompressed GX;
-QDM1;QDesign 1;4CC;A;;;QDesign Music 1;
-QDM2;Qdesign 2;4CC;A;;;QDesign Music 2;
-QDRW;Palettized Video;4CC;V;;;Apple;
-QPEG;QPEG 1.1;4CC;V;;;Q-Team QPEG 1.1;
-QPEQ;QPEG 1.1;4CC;V;;;Q-Team QPEG 1.1;
-R210;YUV;4CC;V;YUV;;BlackMagic YUV (Quick Time);
-R411;Radius DV;4CC;V;DV;;Radius DV NTSC YUV;
-R420;Radius DV;4CC;V;DV;;Radius DV PAL YUV;
-RAV_;GroupTron;4CC;V;MPEG-1;;GroupTRON ReferenceAVI (dummy for MPEG compressor);
-RAVI;GroupTron;4CC;V;MPEG-1;;GroupTRON ReferenceAVI (dummy for MPEG compressor);
-RAW ;RGB;4CC;V;RGB;;Full Frames (Uncompressed);
-raw ;RGB;4CC;V;RGB;;Full Frames (Uncompressed);http://www.apple.com/quicktime/download/standalone.html
-RGB ;RGB;4CC;V;RGB;;Uncompressed RGB32;
-RGB1;RGB;4CC;V;RGB;;Uncompressed RGB332 3:3:2;
-RGBA;RGB;4CC;V;RGB;;Uncompressed w/ Alpha. Uncompressed RGB with alpha. Sample precision and packing is arbitrary and determined using bit masks for each component, as for BI_BITFIELDS.;http://www.fourcc.org/indexrgb.htm
-RGBO;RGB;4CC;V;RGB;;Uncompressed RGB555 5:5:5;
-RGBP;RGB;4CC;V;RGB;;Uncompressed RGB565 5:6:5;
-RGBQ;RGB;4CC;V;RGB;;Uncompressed RGB555X 5:5:5 BE;
-RGBR;RGB;4CC;V;RGB;;Uncompressed RGB565X 5:6:5 BE;
-RGBT;RGB;4CC;V;RGB;;Uncompressed RGB with transparency;http://www.fourcc.org/indexrgb.htm
-RIVA;Swizzled texture;4CC;V;;;Nvidia;
-RL4;RLE;4CC;V;RGB;;RLE 4bpp RGB;
-RL8;RLE;4CC;V;RGB;;RLE 8bpp RGB;
-RLE ;RLE;4CC;V;RGB;;RLE RGB with arbitrary sample packing within a pixel;http://www.fourcc.org/indexrgb.htm
-rle  ;Animation;4CC;V;RGB;;;http://www.apple.com/quicktime/download/standalone.html
-RLE4;RLE;4CC;V;RGB;;RLE 4bpp RGB;http://www.fourcc.org/indexrgb.htm
-RLE8;RLE;4CC;V;RGB;;RLE 8bpp RGB;http://www.fourcc.org/indexrgb.htm
-RLND;Roland;4CC;V;;;Roland Corporation;
-RMP4;RealMagic MPEG-4;4CC;V;MPEG-4V;;REALmagic MPEG-4 Video (Sigma Design, built on XviD);
-ROQV;Id RoQ;4CC;V;;;Id RoQ File Video Decoder;
-rpza;Road Pizza;4CC;V;;;Apple Video 16 bit road pizza;http://www.apple.com/quicktime/download/standalone.html
-RT21;Intel Video 2.1;4CC;V;;;Intel Real Time Video 2.1;
-RTV0;NewTek VideoToaster;4CC;V;;;NewTek VideoToaster (dummy format - only AVI header);
-RUD0;Rududu;4CC;V;;;Rududu video;
-RV10;RealVideo 1;4CC;V;;;H263, RealVideo 5;http://www.real.com
-rv10;RealVideo 1;Real;V;;;H263, RealVideo 5;http://www.real.com
-RV13;RealVideo 1;4CC;V;;;H263, RealVideo 5;http://www.real.com
-rv20;RealVideo 2;Real;V;;;H263, RealVideo 6;http://www.real.com
-RV20;RealVideo 2;4CC;V;;;H263, RealVideo 6;http://www.real.com
-rv30;RealVideo 3;Real;V;;;Between H263 and H264, RealVideo 8;http://www.real.com
-RV30;RealVideo 3;4CC;V;;;Between H263 and H264, RealVideo 8;http://www.real.com
-rv40;RealVideo 4;Real;V;;;H264, RealVideo 9;http://www.real.com
-RV40;RealVideo 4;4CC;V;;;H264, RealVideo 9;http://www.real.com
-RVX ;RDX;4CC;V;;;Intel RDX;
-S263;S263;4CC;V;;;;http://ffdshow-tryout.sourceforge.net/
-S422;VideoCap C210;4CC;V;YUV;;VideoCap C210;
-s422;VideoCap C210;4CC;V;YUV;;VideoCap C210;
-SAMR;AMR;4CC;A;;;;
-SAN3;SAN3;4CC;V;MPEG-4V;;Direct copy of DivX 3.11;
-SANM;Smush v2;4CC;V;;;LucasArts;http://www.lucasarts.com/
-SCCD;SoftCam;4CC;V;;;;
-SDCC;Sun DV;4CC;V;DV;;Sun Digital Camera;
-SEDG;Samsung MPEG-4;4CC;V;MPEG-4V;;Samsung MPEG-4;
-SEG4;Cinepak;4CC;V;;;;http://www.sega.com/
-SEGA;Cinepak;4CC;V;;;;http://www.sega.com/
-SFMC;CrystalNet;4CC;V;;;CrystalNet Surface Fitting Method;
-SHR0;BitJazz SheerVideo;4CC;V;;;BitJazz SheerVideo (realtime lossless);
-SHR1;BitJazz SheerVideo;4CC;V;;;BitJazz SheerVideo (realtime lossless);
-SHR2;BitJazz SheerVideo;4CC;V;;;BitJazz SheerVideo (realtime lossless);
-SHR3;BitJazz SheerVideo;4CC;V;;;BitJazz SheerVideo (realtime lossless);
-SHR4;BitJazz SheerVideo;4CC;V;;;BitJazz SheerVideo (realtime lossless);
-SHR5;BitJazz SheerVideo;4CC;V;;;BitJazz SheerVideo (realtime lossless);
-SHR6;BitJazz SheerVideo;4CC;V;;;BitJazz SheerVideo (realtime lossless);
-SHR7;BitJazz SheerVideo;4CC;V;;;BitJazz SheerVideo (realtime lossless);
-SJPG;CuSeeMe;4CC;V;M-JPEG;;CuSeeMe;http://mirror01.iptelecom.net.ua/~video/codecs/CUseeMe.M-JPEG.CODEC.v1.17.exe
-SL25;SoftLab DVCPro;4CC;V;;;SoftLab-NSK DVCPRO;
-SL50;SoftLab DVCPro5;4CC;V;;;SoftLab-NSK ;
-SLDV;SoftLab DV;4CC;V;;;SoftLab-NSK Forward DV Draw;
-SLIF;SoftLab MPEG-2;4CC;V;MPEG-V;;SoftLab-NSK MPEG-2 I-frames;
-SLMJ;SoftLab M-JPEG;4CC;V;M-JPEG;;SoftLab-NSK Forward M-JPEG;
-smc ;SMC;4CC;V;;;Apple Graphics (SMC);http://www.apple.com/quicktime/download/standalone.html
-SMSC;Radius;4CC;V;;;;
-SMSD;Radius;4CC;V;;;;
-SMSV;Wavelet Video;4CC;V;;;WorldConnect Wavelet Streaming Video;
-smsv;Wavelet Video;4CC;V;;;WorldConnect Wavelet Video;
-SNOW;Snow;4CC;V;;;;http://ffdshow-tryout.sourceforge.net/
-SP40;SunPlus YUV;4CC;V;YUV;;SunPlus YUV;
-SP44;MegaCam;4CC;V;;;SunPlus Aiptek MegaCam;
-SP53;MegaCam;4CC;V;;;SunPlus Aiptek MegaCam;
-SP54;MegaCam;4CC;V;;;SunPlus Aiptek MegaCam;
-SP55;MegaCam;4CC;V;;;SunPlus Aiptek MegaCam;
-SP56;MegaCam;4CC;V;;;SunPlus Aiptek MegaCam;
-SP57;MegaCam;4CC;V;;;SunPlus Aiptek MegaCam
-SP58;MegaCam;4CC;V;;;SunPlus Aiptek MegaCam
-SP61;MegaCam;4CC;V;;;SunPlus Aiptek MegaCam
-SPIG;Spigot;4CC;V;;;Radius Spigot
-SPLC;ACM audio;4CC;V;;;Splash Studios ACM Audio
-SPRK;Spark;4CC;V;;;
-SQZ2;VXTreme 2;4CC;V;;;Microsoft VXTreme Video V2
-STVA;ST Imager;4CC;V;;;ST Microelectronics CMOS Imager Data (Bayer)
-STVB;ST Imager;4CC;V;;;ST Microelectronics CMOS Imager Data (Nudged Bayer)
-STVC;ST Imager;4CC;V;;;ST Microelectronics CMOS Imager Data (Bunched)
-STVX;ST Imager;4CC;V;;;ST Microelectronics CMOS Imager Data (Extended Data Format)
-STVY;ST Imager;4CC;V;;;ST Microelectronics CMOS Imager Data (Extended Data Format with Correction Data)
-subp;VobSub;4CC;T;;;The same subtitle format used on DVDs
-SV10;Sorenson;4CC;V;;;Sorenson Media Video R1
-SVQ1;Sorenson 1;4CC;V;;;Sorenson Media Video 1 (Apple QuickTime 3)
-SVQ2;Sorenson 2;4CC;V;;;Sorenson Media Video 2 (Apple QuickTime 4)
-SVQ3;Sorenson 3;4CC;V;;;Sorenson Media Video 3 (Apple QuickTime 5)
-SWC1;MainConcept M-JPEG;4CC;V;M-JPEG;;MainConcept M-JPEG
-T420;Toshiba YUV;4CC;V;YUV;;Toshiba YUV 4:2:0
-TGA ;Apple TGA;4CC;V;;;Apple TGA (with Alpha-channel)
-THEO;Theora;4CC;V;;;FFVFW Supported
-TIFF;Apple TIFF;4CC;V;;;Apple TIFF (with Alpha-channel)
-TIM2;Pinnacle DVI;4CC;V;;;Pinnacle RAL DVI
-TLMS;TeraLogic;4CC;V;;;TeraLogic Motion Intraframe
-TLST;TeraLogic;4CC;V;;;TeraLogic Motion Intraframe
-TM10;Duck;4CC;V;;;Duck TrueMotion
-TM20;Duck 2;4CC;V;;;Duck TrueMotion 2.0
-TM2A;Duck Archiver 2;4CC;V;;;Duck TrueMotion Archiver 2.0
-TM2X;Duck 2;4CC;V;;;Duck TrueMotion 2X
-TMIC;TeraLogic;4CC;V;;;TeraLogic Motion Intraframe
-TMOT;Horizons TM S;4CC;V;;;Horizons Technology TrueMotion Video
-TR20;Duck TM RT2;4CC;V;;;Duck TrueMotion RT 2.0
-TRLE;Akula;4CC;V;;;Akula Alpha Pro Custom AVI (LossLess);
-TSCC;TechSmith;4CC;V;;;TechSmith Screen Capture;
-TV10;Tecomac;4CC;V;;;Tecomac Low-Bit Rate;
-TVJP;Pinnacle/Truevision;4CC;V;;;TrueVision Field Encoded M-JPEG (Targa emulation);
-TVMJ;Pinnacle/Truevision;4CC;V;;;Truevision TARGA M-JPEG Hardware (or Targa emulation);
-TY0N;Trident;4CC;V;;;Trident Decompression Driver;
-TY2C;Trident;4CC;V;;;Trident Decompression Driver;
-TY2N;Trident;4CC;V;;;Trident Decompression Driver;
-U<Y ;Discreet YUV;4CC;V;YUV;;Discreet UC YUV 4:2:2:4 10 bit;
-U<YA;Discreet YUV;4CC;V;;;Discreet UC YUV 4:2:2:4 10 bit (with Alpha-channel);
-U263;UB H.263;4CC;V;;;UB Video H.263/H.263+/H.263++ Decoder;http://eMajix.com
-UCOD;ClearVideo;4CC;V;;;ClearVideo (fractal compression-based);
-ULTI;Ultimotion;4CC;V;;;IBM Ultimotion;
-UMP4;UB MPEG-4;4CC;V;MPEG-4V;;UB Video MPEG 4;http://www.fourcc.org/indexyuv.htm
-UYNV;YUV;4CC;V;YUV;;Nvidia 16bpp. A direct copy of UYVY registered by Nvidia to work around problems in some olds which did not like hardware which offered more than 2 UYVY surfaces.;http://www.fourcc.org/indexyuv.htm
-UYVP;YUV;4CC;V;YUV;;Evans & Sutherland 24bpp. YCbCr 4:2:2 extended precision 10-bits per component in U0Y0V0Y1 order;
-UYVU;SoftLab YUV;4CC;V;YUV;;SoftLab-NSK Forward YUV;http://www.fourcc.org/indexyuv.htm
-UYVY;YUV;4CC;V;YUV;;Uncompressed 16bpp. YUV 4:2:2 (Y sample at every pixel, U and V sampled at every second pixel horizontally on each line). A macropixel contains 2 pixels in 1 u_int32.;
-V210;Optibase;4CC;V;;;Optibase VideoPump 10-bit 4:2:2 Component YCbCr;
-V261;VX3000S;4CC;V;;;Lucent VX3000S;
-V422;Vitec YUV;4CC;V;YUV;;Vitec Multimedia YUV 4:2:2 as for UYVY, but with different component ordering within the u_int32 macropixel;
-V655;Vitec YUV;4CC;V;YUV;;Vitec Multimedia 16 bit YUV 4:2:2 (6:5:5) format;
-VBLE;MarcFD VBLE;4CC;V;;;MarcFD VBLE Lossless;
-VCR1;ATI Video 1;4CC;V;;;ATI VCR 1.0;
-VCR2;ATI Video 2;4CC;V;;;ATI VCR 2.0 (MPEG YV12);
-VCR3;ATI Video 3;4CC;V;;;ATI VCR 3.0;
-VCR4;ATI Video 4;4CC;V;;;ATI VCR 4.0;
-VCR5;ATI Video 5;4CC;V;;;ATI VCR 5.0;
-VCR6;ATI Video 6;4CC;V;;;ATI VCR 6.0;
-VCR7;ATI Video 7;4CC;V;;;ATI VCR 7.0;
-VCR8;ATI Video 8;4CC;V;;;ATI VCR 8.0;
-VCR9;ATI Video 9;4CC;V;;;ATI VCR 9.0;
-VCWV;Wavelet;4CC;V;;;VideoCon;
-VDCT;VideoMaker RGB;4CC;V;RGB;;Video Maker Pro DIB;
-VDOM;VDOWave;4CC;V;;;VDONet Wave;
-VDOW;VDOLive;4CC;V;;;VDONet Live (H,263);
-VDST;VirtualDub;4CC;V;;;VirtualDub remote frameclient ICM driver;
-VDTZ;YUV;4CC;V;YUV;;VideoTizer / Darim Vision YUV;
-VGPX;VGP;4CC;V;;;Alaris VideoGramPixel;
-VIDM;DivX 5 pro;4CC;V;MPEG-4V;;DivX 5.0 Pro Supported;
-VIDS;Vitec;4CC;V;;;Vitec Multimedia YUV 4:2:2;www.yks.ne.jp/~hori/
-VIFP;VFAPI;4CC;V;;;Virtual Frame API (VFAPI dummy format);
-VIV1;H.263;4CC;V;;;Vivo H.263;
-VIV2;H.263;4CC;V;;;Vivo H.263;
-VIVO;H.263;4CC;V;;;Vivo H.263;
-VIXL;Miro XL;4CC;V;M-JPEG;;Miro Video XL;http://mirror01.iptelecom.net.ua/~video/codecs/miroVIDEO-XL.codec.v2.2.exe
-VJPG;JPEG;4CC;V;M-JPEG;;;
-VLV1;Videologic;4CC;V;;;;
-VMNC;Vmware;4CC;V;;;;http://www.vmware.com/
-VP30;VP3;4CC;V;;;On2 VP3;
-VP31;VP3;4CC;V;;;On2 VP3;
-VP40;VP4;4CC;V;;;On2 TrueCast VP4;
-VP50;VP5;4CC;V;;;On2 TrueCast VP5;
-VP60;VP6;4CC;V;;;On2 TrueCast VP6;
-VP61;VP6.1;4CC;V;;;On2 TrueCast VP6.1;
-VP62;VP6.2;4CC;V;;;On2 TrueCast VP6.2;http://ftp.pub.cri74.org/pub/win9x/video/codecs/VP6/vp6_vfw_codec.exe
-VP70;VP7;4CC;V;;;On2 TrueMotion VP7;
-VP71;VP7;4CC;V;;;On2 TrueMotion VP7;
-VP72;VP7;4CC;V;;;On2 TrueMotion VP7;
-VQC1;Vector 1;4CC;V;;;Vector-quantised 1 (high compression) http://eprints.ecs.soton.ac.uk/archive/00001310/01/VTC97-js.pdf;
-VQC2;Vector 2;4CC;V;;;Vector-quantised 2 (high robustness against channel errors) http://eprints.ecs.soton.ac.uk/archive/00001310/01/VTC97-js.pdf;
-VQJP;VQ630;4CC;V;;;Dual-mode digital camera;
-VQS4;VQ110;4CC;V;;;DV camera;
-VR21;BlckMagic YUV;4CC;V;YUV;;BlackMagic YUV (Quick Time);
-VSSH;AVC;4CC;V;AVC;;Vanguard VSS H.264;
-VSSV;Vanguard Video;4CC;V;;;Vanguard Software Solutions Video;
-VSSW;AVC;4CC;V;AVC;;Vanguard VSS H.264;
-VTLP;GGP;4CC;V;;;Alaris VideoGramPixel;
-VX1K;DVX 1 S;4CC;V;;;Lucent VX1000S Video;
-VX2K;DVX 2 S;4CC;V;;;Lucent VX2000S Video;
-VXSP;DVX 1 SP;4CC;V;;;Lucent VX1000SP Video;
-VYU9;YUV;4CC;V;YUV;;ATI YUV;
-VYUY;YUV;4CC;V;YUV;;ATI Packed YUV Data;
-WBVC;W9960;4CC;V;;;Winbond Electronics W9960;
-WHAM;Microsoft Video 1;4CC;V;;;;
-WINX;Winnov;4CC;V;;;;
-WJPG;Winbond M-JPEG;4CC;V;M-JPEG;;Winbond JPEG (AverMedia USB devices);
-WMV1;WMV1;4CC;V;;;Windows Media Video 7;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx
-WMV2;WMV2;4CC;V;;;Windows Media Video 8;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx
-WMV3;WMV3;4CC;V;VC-1;;Windows Media Video 9;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx
-WMVA;WMV;4CC;V;VC-1;;Windows Media Video;http://ffdshow-tryout.sourceforge.net/
-WMVP;WMV3;4CC;V;;;Windows Media Video V9;
-WNIX;WniWni;4CC;V;;;WniWni;
-WNV1;WinNov;4CC;V;;;WinNov Videum Hardware Compression;http://www.winnov.com/
-WNVA;WinNov;4CC;V;;;WinNov Videum Hardware Compression;http://www.winnov.com/
-WRLE;Apple BMP;4CC;V;RGB;;Apple QuickTime BMP;
-WRPR;AVideoTools;4CC;V;;;VideoTools VideoServer Client (wrapper for AviSynth);
-WV1F;WV1F;4CC;V;;;;http://ffdshow-tryout.sourceforge.net/
-WVC1;VC-1;4CC;V;VC-1;;Microsoft;
-WVLT;IllusionHope Wavelet 9/7;4CC;V;;;IllusionHope Wavelet 9/7;
-WVP2;WVP2;4CC;V;;;;http://ffdshow-tryout.sourceforge.net/
-WZCD;iScan;4CC;V;;;CORE Co. Ltd.;
-WZDC;iSnap;4CC;V;;;CORE Co. Ltd.;
-X263;H.263;4CC;V;;;Xirlink H.263;
-x263;Xirlink;4CC;V;;;;
-X264;AVC;4CC;V;AVC;;XiWave GNU GPL x264 MPEG-4;
-x264;AVC;4CC;V;AVC;;XiWave GNU GPL x264 MPEG-4;
-XJPG;Xirlink;4CC;V;M-JPEG;;Xirlink, Inc.;
-XLV0;NetXL Video;4CC;V;;;NetXL Inc. XL Video Decoder;
-XMPG;Xing MPEG;4CC;V;MPEG-V;;XING MPEG (I frame only);
-XVID;XviD;4CC;V;MPEG-4V;;XviD project;http://www.xvid.org/Downloads.15.0.html
-XVIX;XviD;4CC;V;MPEG-4V;;Based on XviD MPEG-4;http://www.xvid.org/Downloads.15.0.html
-XWV0;XiWave Video;4CC;V;;;XiWave Video;
-XWV1;XiWave Video;4CC;V;;;XiWave Video;
-XWV2;XiWave Video;4CC;V;;;XiWave Video;
-XWV3;XiWave Video;4CC;V;;;XiWave Video (Xi-3 Video);
-XWV4;XiWave Video;4CC;V;;;XiWave Video;
-XWV5;XiWave Video;4CC;V;;;XiWave Video;
-XWV6;XiWave Video;4CC;V;;;XiWave Video;
-XWV7;XiWave Video;4CC;V;;;XiWave Video;
-XWV8;XiWave Video;4CC;V;;;XiWave Video;
-XWV9;XiWave Video;4CC;V;;;XiWave Video;
-XXAN;Origin VideoGame;4CC;V;;;Origin Video (used in Wing Commander 3 and 4);
-XYZP;PAL;4CC;V;;;Extended PAL format XYZ palette;
-Y211;YUV;4CC;V;YUV;;Packed YUV format with Y sampled at every second pixel across each line and U and V sampled at every fourth pixel;
-Y216;Targa YUV;4CC;V;YUV;;Pinnacle TARGA CineWave YUV (Quick Time);
-Y411;YUV;4CC;V;YUV;;YUV 4:1:1 Packed;
-Y41B;YUV;4CC;V;YUV;;YUV 4:1:1 Planar;
-Y41P;YUV;4CC;V;YUV;;Conexant (ex Brooktree) YUV 4:1:1 Raw;http://www.fourcc.org/indexyuv.htm
-Y41T;YUV;4CC;V;YUV;;Format as for Y41P, but the lsb of each Y component is used to signal pixel transparency;
-Y422;YUV;4CC;V;YUV;;Direct copy of UYVY as used by ADS Technologies Pyro WebCam firewire camera;
-Y42B;YUV;4CC;V;YUV;;YUV 4:2:2 Planar;
-Y42T;YUV;4CC;V;YUV;;Format as for UYVY, but the lsb of each Y component is used to signal pixel transparency;
-Y444;YUV;4CC;V;YUV;;IYU2 (iRez Stealth Fire camera);
-Y8  ;GrayScale;4CC;V;;;Simple grayscale video;
-Y800;GrayScale;4CC;V;;;Simple grayscale video;
-YC12;YUV;4CC;V;YUV;;Intel YUV12;http://www.fourcc.org/indexyuv.htm
-YCCK;YUV;4CC;V;YUV;;;
-YMPG;MPEG-2;4CC;V;MPEG-2;;YMPEG Alpha (dummy for MPEG-2 compressor);
-YU12;YUV;4CC;V;YUV;;ATI YV12 4:2:0 Planar;
-YU92;YUV;4CC;V;YUV;;Intel - YUV;
-YUNV;YUV;4CC;V;YUV;;A direct copy of YUY2 registered by Nvidia to work around problems in some olds which did not like hardware that offered more than 2 YUY2 surfaces;
-YUV2;YUV;4CC;V;YUV;;Apple Component Video (YUV 4:2:2);http://www.apple.com/quicktime/download/standalone.html
-YUV8;YUV;4CC;V;YUV;;Winnov Caviar YUV8 ;http://www.fourcc.org/indexyuv.htm
-YUV9;YUV;4CC;V;YUV;;Intel YUV9;
-YUVP;YUV;4CC;V;YUV;;YCbCr 4:2:2 extended precision 10-bits per component in Y0U0Y1V0 order;
-YUY2;YUV;4CC;V;YUV;;YUV 4:2:2 as for UYVY but with different component ordering within the u_int32 macropixel;http://www.fourcc.org/indexyuv.htm
-YUYP;YUV;4CC;V;YUV;;Evans & Sutherland;
-YUYV;YUV;4CC;V;YUV;;Canopus YUV format;http://www.fourcc.org/indexyuv.htm
-YV12;YUV;4CC;V;YUV;;ATI YVU12 4:2:0 Planar;http://www.fourcc.org/indexyuv.htm
-YV16;YUV;4CC;V;YUV;;Elecard YUV 4:2:2 Planar;
-YV92;YUV;4CC;V;YUV;;Intel Smart Video Recorder YVU9;
-YVU9;YUV;4CC;V;YUV;;Brooktree YVU9 Raw (YVU9 Planar);http://www.fourcc.org/indexyuv.htm
-YVYU;YUV;4CC;V;YUV;;YUV 4:2:2 as for UYVY but with different component ordering within the u_int32 macropixel;
-ZLIB;AVIzlib;4CC;V;RGB;;Lossless (ZIP compression);
-ZMBV;Zip;4CC;V;;;Zip Motion Blocks Video;
-ZPEG;Video Zipper;4CC;V;RGB;;Metheus Video Zipper;
-ZYGO;ZyGo;4CC;V;;;ZyGo Video;
-V_UNCOMPRESSED;Raw;Mk;V;;;Raw uncompressed video frames;
-V_DIRAC;Dirac;Mk;V;;;;http://diracvideo.org/
-V_MPEG4/ISO/SP;MPEG-4 Visual SP;Mk;V;MPEG-4V;;Simple Profile;http://www.divx.com
-V_MPEG4/ISO/ASP;MPEG-4 Visual ASP;Mk;V;MPEG-4V;;Advanced Simple Profile;http://www.xvid.org/Downloads.15.0.html
-V_MPEG4/ISO/AP;MPEG-4 Visual AP;Mk;V;MPEG-4V;;Advanced Profile;http://ffdshow-tryout.sourceforge.net/
-V_MPEG4/ISO/AVC;AVC;Mk;V;AVC;;Advanced Video Codec;http://ffdshow-tryout.sourceforge.net/
-V_MPEG4/MS/V2;MS MPEG-4 v2;Mk;V;MPEG-4V;;MS MPEG-4 v2;http://ffdshow-tryout.sourceforge.net/
-V_MPEG4/MS/V3;MS MPEG-4 v3;Mk;V;MPEG-4V;;MS MPEG-4 v3;http://ffdshow-tryout.sourceforge.net/
-V_MPEG1;MPEG-1 Video;Mk;V;MPEG-V;;MPEG 1 or 2 Video;http://ffdshow-tryout.sourceforge.net/
-V_MPEG2;MPEG-2 Video;Mk;V;MPEG-V;;MPEG 1 or 2 Video;http://ffdshow-tryout.sourceforge.net/
-V_REAL/RV10;Real 1;Mk;V;;;RealVideo 1.0 aka RealVideo 5;http://www.real.com
-V_REAL/RV20;Real 2;Mk;V;;;RealVideo 2.0 aka G2 and RealVideo G2+SVT;http://www.real.com
-V_REAL/RV30;Real 3;Mk;V;;;RealVideo 3.0 aka RealVideo 8;http://www.real.com
-V_REAL/RV40;Real 4;Mk;V;;;RealVideo 4.0 aka RealVideo 9;http://www.real.com
-V_THEORA;Theora;Mk;V;;;;http://www.theora.org
-A_MPEG/L1;MPEG1/2 L1;Mk;A;MPEG-A;;MPEG1 or 2 Audio layer 1;http://www.iis.fraunhofer.de/amm/index.html
-A_MPEG/L2;MPEG1/2 L2;Mk;A;MPEG-A;;MPEG1 or 2 Audio layer 2;http://www.iis.fraunhofer.de/amm/index.html
-A_MPEG/L3;MPEG1/2 L3;Mk;A;MPEG-A;;MPEG1 or 2 Audio Layer 3;http://www.iis.fraunhofer.de/amm/index.html
-A_PCM/INT/BIG;PCM;Mk;A;PCM;;Linear PCM (Big Endian);
-A_PCM/INT/LIT;PCM;Mk;A;PCM;;Linear PCM (Little Endian);
-A_PCM/FLOAT/IEEE;PCM;Mk;A;PCM;;Microsoft Linear PCM, Float;http://www.microsoft.com/windows/
-A_AC3;AC3;Mk;A;AC3;;Dolby AC3;
-A_AC3/BSID9;AC3;Mk;A;AC3;;Dolby AC3;
-A_AC3/BSID10;AC3;Mk;A;AC3;;Dolby AC3;
-A_DTS;DTS;Mk;A;DTS;;;
-A_EAC3;EAC3;Mk;A;EAC3;;Dolby Enhanced AC3;
-A_FLAC;Flac;Mk;A;Flac;;;http://flac.sourceforge.net
-A_TTA1;TTA;Mk;A;TTA;;The True Audio Lossless Codec;http://true-audio.com
-A_VORBIS;Vorbis;Mk;A;Vorbis;VBR;;http://www.vorbis.com
-A_WAVPACK4;WavPack;Mk;A;Real;VBR;;http://www.wavpack.com
-A_REAL/14_4;RealAudio 1;Mk;A;Real;;Real Audio 1 (14.4);http://www.real.com
-A_REAL/28_8;RealAudio 2;Mk;A;Real;;Real Audio 2 (28.8);http://www.real.com
-A_REAL/COOK;RealAudio 7;Mk;A;Real;;Real Audio Cook Codec (codename: Gecko);http://www.real.com
-A_REAL/SIPR;RealAudio 4;Mk;A;Real;;Real & Sipro Voice Codec;http://www.real.com
-A_REAL/RALF;RealAudio Lossless;Mk;A;Real;;Real Audio Lossless Format;http://www.real.com
-A_REAL/ATRC;RealAudio Atrac3;Mk;A;Real;;Real & Sony Atrac3 Codec;http://www.real.com
-A_AAC;AAC;Mk;A;AAC;;;
-A_AAC/MPEG2/MAIN;AAC Main;Mk;A;AAC;;AAC Main;
-A_AAC/MPEG2/LC;AAC LC;Mk;A;AAC;;AAC Low Complexity;
-A_AAC/MPEG2/LC/SBR;AAC LC-SBR;Mk;A;AAC;;AAC Low Complexity with Spectral Band Replication;
-A_AAC/MPEG2/SSR;AAC SSR;Mk;A;AAC;;AAC Scalable Sampling Rate;
-A_AAC/MPEG4/MAIN;AAC Main;Mk;A;AAC;;AAC Low Complexity;
-A_AAC/MPEG4/MAIN/SBR;AAC Main;Mk;A;AAC;;AAC Low Complexity with Spectral Band Replication;
-A_AAC/MPEG4/MAIN/SBR/PS;AAC Main;Mk;A;AAC;;AAC Low Complexity with Spectral Band Replication and Parametric Stereo;
-A_AAC/MPEG4/MAIN/PS;AAC Main;Mk;A;AAC;;AAC Low Complexity with Parametric Stereo;
-A_AAC/MPEG4/LC;AAC LC;Mk;A;AAC;;AAC Low Complexity;
-A_AAC/MPEG4/LC/SBR;AAC LC-SBR;Mk;A;AAC;;AAC Low Complexity with Spectral Band Replication;
-A_AAC/MPEG4/LC/SBR/PS;AAC LC-SBR-PS;Mk;A;AAC;;AAC Low Complexity with Spectral Band Replication and Parametric Stereo;
-A_AAC/MPEG4/LC/PS;AAC LC-PS;Mk;A;AAC;;AAC Low Complexity with Parametric Stereo;
-A_AAC/MPEG4/SSR;AAC SSR;Mk;A;AAC;;AAC Scalable Sampling Rate;
-A_AAC/MPEG4/LTP;AAC LTP;Mk;A;AAC;;AAC Long Term Prediction;
-14_4;VSELP;Real;A;;;EIA/TIA IS-54 VSELP, Real Audio 1 (for streaming 14.4 Kbps);http://www.real.com
-14.4;VSELP;Real;A;;;EIA/TIA IS-54 VSELP, Real Audio 1 (for streaming 14.4 Kbps);http://www.real.com
-lpcJ;VSELP;Real;A;;;EIA/TIA IS-54 VSELP, Real Audio 1 (for streaming 14.4 Kbps);http://www.real.com
-28_8;G.728;Real;A;;;ITU-T G.728, Real Audio 2 (for streaming 28.8 Kbps);http://www.real.com
-28.8;G.728;Real;A;;;ITU-T G.728, Real Audio 2 (for streaming 28.8 Kbps);http://www.real.com
-cook;Cooker;Real;A;;;Real Audio G2/7 Cook (low bitrate);http://www.real.com
-dnet;AC3;Real;A;AC3;;A52/AC3, Real Audio 2;http://www.real.com
-sipr;G.729;Real;A;;;G.729, Real Audio 2;http://www.real.com
-rtrc;RealAudio 8;Real;A;;;Real Audio 8 (RTRC);http://www.real.com
-ralf;Lossless;Real;A;;;Real Audio Lossless Format;http://www.real.com
-whrl;Multi-Channel;Real;A;;;Real Audio Multi-Channel;http://www.real.com
-atrc;Atrac;Real;A;;;Real & Sony Atrac3;http://www.real.com
-raac;AAC-LC;Real;A;AAC;;Real Audio 10 AAC LC;http://www.real.com
-racp;AAC-HE;Real;A;AAC;;Real Audio 10 AAC-HE;http://www.real.com
-Vorbis;Vorbis;Ogg;A;Vorbis;;;http://www.vorbis.com
-Theora;Theora;Ogg;V;Theora;;;http://www.theora.com
-mp4a;AAC;4CC;A;AAC;;AAC (3GPP);http://www.apple.com/quicktime/download/standalone.html
-mp4v;MPEG-4;4CC;V;MPEG-4V;;MPEG-4 Video (3GPP);http://www.apple.com/quicktime/download/standalone.html
-avc1;AVC;4CC;V;AVC;;Advanced Video Codec;http://www.apple.com/quicktime/download/standalone.html
-h263;H.263;4CC;V;;;H.263 (3GPP);http://www.apple.com/quicktime/download/standalone.html
-s263;H.263;4CC;V;;;H.263 (3GPP);http://www.apple.com/quicktime/download/standalone.html
-samr;AMR-NB;4CC;A;;;AMR narrow band (3GPP);http://www.apple.com/quicktime/download/standalone.html
-sawb;AMR-WB;4CC;A;;;AMR wide band (3GPP);http://www.apple.com/quicktime/download/standalone.html
-sevc;EVRC;4CC;A;;;;http://www.apple.com/quicktime/download/standalone.html
-tx3g;Timed;4CC;T;;;Timed text (3GPP);http://www.apple.com/quicktime/download/standalone.html
-encv;Encrypted;4CC;V;;;Encrypted Video (3GPP);http://www.apple.com/quicktime/download/standalone.html
-enca;Encrypted;4CC;A;;;Encrypted Audio (3GPP);http://www.apple.com/quicktime/download/standalone.html
-enct;Encrypted;4CC;T;;;Encrypted Text (3GPP);http://www.apple.com/quicktime/download/standalone.html
-ima4;ADPCM;4CC;A;ADPCM;;;http://www.apple.com/quicktime/download/standalone.html
-raw ;PCM;4CC;A;PCM;;;http://www.apple.com/quicktime/download/standalone.html
-twos;PCM;4CC;A;PCM;;;http://www.apple.com/quicktime/download/standalone.html
-sowt;PCM;4CC;A;PCM;;;http://www.apple.com/quicktime/download/standalone.html
-alac;Lossless;4CC;A;;;Apple Lossless Format (similar to FLAC);http://www.apple.com/quicktime/download/standalone.html
-sac3;AC3;4CC;A;AC3;;AC3 in MP4 (made in Nero);http://www.nerodigital.com
-in24;PCM;4CC;A;PCM;;;http://www.apple.com/quicktime/download/standalone.html
-in32;PCM;4CC;A;PCM;;;http://www.apple.com/quicktime/download/standalone.html
-fl32;PCM ;4CC;A;PCM;;;http://www.apple.com/quicktime/download/standalone.html
-fl64;PCM;4CC;A;PCM;;;http://www.apple.com/quicktime/download/standalone.html
-alaw;A-Law;4CC;A;ADPCM;;;http://www.apple.com/quicktime/download/standalone.html
-ulaw;U-Law;4CC;A;ADPCM;;;http://www.apple.com/quicktime/download/standalone.html
-.mp3;MPEG-1/2 L3;2CC;A;MPEG-A;;MPEG-1 or 2 layer 3;http://www.iis.fraunhofer.de/amm/index.html
-MPEG-4 AAC main;AAC Main;Mp4v2;A;AAC;;;
-MPEG-4 AAC LC;AAC LC;Mp4v2;A;AAC;;;
-MPEG-4 AAC SSR;AAC SSR;Mp4v2;A;AAC;;;
-MPEG-4 AAC LTP;AAC LTP;Mp4v2;A;AAC;;;
-AVC;AVC;MediaInfo;V;AVC;;Advanced Video Codec;http://developers.videolan.org/x264.html
-MPEG-1V;MPEG-1 Video;MediaInfo;V;MPEG-V;;;
-MPEG-2V;MPEG-2 Video;MediaInfo;V;MPEG-V;;;
-MPEG-4V;MPEG-4 Visual;MediaInfo;V;MPEG-4V;;;
-MPEG-1A;MPEG-1 Audio;MediaInfo;A;MPEG-A;;;
-MPEG-1A L1;MPEG-1 Audio Layer 1;MediaInfo;A;MPEG-A;;;
-MPEG-1A L2;MPEG-1 Audio Layer 2;MediaInfo;A;MPEG-A;;;
-MPEG-1A L3;MPEG-1 Audio Layer 3;MediaInfo;A;MPEG-A;;;
-MPEG-2A;MPEG-2 Audio;MediaInfo;A;MPEG-A;;;
-MPEG-2A L1;MPEG-2 Audio Layer 1;MediaInfo;A;MPEG-A;;;
-MPEG-2A L2;MPEG-2 Audio Layer 2;MediaInfo;A;MPEG-A;;;
-MPEG-2A L3;MPEG-2 Audio Layer 3;MediaInfo;A;MPEG-A;;;
-MPEG-2.5A;MPEG-2.5 Audio;MediaInfo;A;MPEG-A;;;;
-MPEG-2.5A L1;MPEG-2.5 Audio Layer 1;MediaInfo;A;MPEG-A;;;;
-MPEG-2.5A L2;MPEG-2.5 Audio Layer 2;MediaInfo;A;MPEG-A;;;;
-MPEG-2.5A L3;MPEG-2.5 Audio Layer 3;MediaInfo;A;MPEG-A;;;;
-APE;Monkey's Audio;MediaInfo;A;;;;http://www.monkeysaudio.com/;
-ALS;ALS;MediaInfo;A;;;MPEG-4 Audio Lossless Coding;http://www.nue.tu-berlin.de/forschung/projekte/lossless/mp4als.html#downloads;
-Vodei;Vodei MP;MediaInfo;V;;;Video On Demand Exploration Interface;http://www.vodei.com;
-SWF ADPCM;ADPCM;MediaInfo;A;ADPCM;;ADPCM found in SWF/FLV files;http://www.adobe.com;
-AC3+;AC3+;MediaInfo;A;AC3;;Dolby Ehanced AC3;;
-TrueHD;TrueHD;MediaInfo;A;AC3;;Dolby TrueHD (AC3 based);;
-VC-1;VC-1;MediaInfo;V;VC-1;;;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;
-LA;LA;MediaInfo;A;;;Lossless Audio Codec;la;http://www.lossless-audio.com/
-0;Unknown;2CC;A;;;;;
-1;PCM;2CC;A;PCM;;Microsoft PCM;http://www.microsoft.com/windows/;
-2;ADPCM;2CC;A;ADPCM;;Microsoft ADPCM;http://www.microsoft.com/windows/;
-3;PCM;2CC;A;PCM;;IEEE FLOAT;http://www.microsoft.com/windows/;
-4;VSELP;2CC;A;;;Compaq VSELP;
-5;CVSD;2CC;A;;;IBM CVSD;
-6;A-Law;2CC;A;ADPCM;;CCITT A-Law;http://www.microsoft.com/windows/
-7;U-Law;2CC;A;ADPCM;;CCITT U-Law;http://www.microsoft.com/windows/
-8;DTS;2CC;A;DTS;;;
-9;DRM;2CC;A;;;Microsoft;
-A;WMSpeech;2CC;A;;;;
-C;MPEG2 5.1;2CC;A;;;MPEG2 5.1;
-10;ADPCM;2CC;A;ADPCM;;OKI ADPCM;
-11;ADPCM;2CC;A;ADPCM;;Intel ADPCM;
-12;ADPCM;2CC;A;ADPCM;;Mediaspace (Videologic) ADPCM;
-13;ADPCM;2CC;A;ADPCM;;Sierra ADPCM;
-14;ADPCM;2CC;A;ADPCM;;Antex G723 ADPCM;
-15;STD;2CC;A;;;DSP solutions Digi-STD;
-16;FIX;2CC;A;;;DSP solutions Digi-FIX;
-17;ADPCM;2CC;A;ADPCM;;Dialogic-OKI ADPCM;http://www.microsoft.com/windows/
-18;ADPCM;2CC;A;ADPCM;;;
-19;CU;2CC;A;;;HP CU_CODEC;
-1A;Dynamic Voice;2CC;A;;;HP;
-20;ADPCM;2CC;A;ADPCM;;Yamaha ADPCM;
-21;SONARC;2CC;A;;;Speech Compression SONARC;
-22;Truespeech;2CC;A;;;DSP Group TrueSpeech;http://www.microsoft.com/windows/
-23;SC1;2CC;A;;;Echo Speech SC1;
-24;AF36;2CC;A;;;Virtual Music AudioFile 36;
-25;APTX;2CC;A;;;Audio Processing Technology X;
-26;AF10;2CC;A;;;Virtual Music AudioFile 10;
-27;Prosody 1612;2CC;A;;;Aculab plc Prosody 1612;
-28;LRC;2CC;A;;;Merging Technologies LRC;
-30;AC2;2CC;A;;;Dolby Laboratories AC2;
-31;GSM 6.10;2CC;A;;;Microsoft GSM 6.10;http://www.microsoft.com/windows/
-32;MSAUDIO;2CC;A;;;Microsoft Audio;
-33;ADPCM;2CC;A;ADPCM;;Antex ADPCM;
-34;VQLPC;2CC;A;;;Control Ressources VQLPC;
-35;REAL;2CC;A;;;DSP Solutions Digi-REAL;
-36;ADPCM;2CC;A;ADPCM;;DSP Solutions Digi-ADPCM;
-37;CR10;2CC;A;;;Control Resources 10;
-38;ADPCM;2CC;A;ADPCM;;Natural MicroSystems VBX ADPCM;
-39;ADPCM;2CC;A;ADPCM;;Crystal Semiconductor IMA ADPCM;
-3A;SC3;2CC;A;;;Echo Speech SC3;
-3B;ADPCM;2CC;A;;;Rockwell ADPCM;
-3C;DigiTalk;2CC;A;;;Rockwell DigiTalk;
-3D;Xebec;2CC;A;;;Xebec Multimedia Solutions;
-40;ADPCM;2CC;A;ADPCM;;Antex Electronics G721 ADPCM;
-41;CELP;2CC;A;;;Antex Electronics G728 CELP;
-42;G.723.1;2CC;A;;;Microsoft G.723.1;http://www.microsoft.com/windows/
-42;ADPCM;2CC;A;;;IBM;
-42;MSG729;2CC;A;;;Microsoft;
-45;ADPCM;2CC;A;ADPCM;;Microsoft G.726;http://www.microsoft.com/windows/
-50;MPEG-1/2 L1;2CC;A;MPEG-1;;;http://www.iis.fraunhofer.de/amm/index.html
-51;MPEG-1/2 L2;2CC;A;MPEG-1;;;http://www.iis.fraunhofer.de/amm/index.html
-52;RT24;2CC;A;;;InSoft, Inc.;
-53;PAC;2CC;A;;;InSoft, Inc.;
-55;MPEG-1/2 L3;2CC;A;MPEG-1;;MPEG-1 or 2 layer 3;http://www.iis.fraunhofer.de/amm/index.html
-59;G723;2CC;A;;;Lucent G723;
-60;Cirrus;2CC;A;;;Cirrus Logic;
-61;PCM;2CC;A;;;ESS Technology PCM;
-62;Voxware;2CC;A;;;;
-63;ATRAC;2CC;A;;;Canopus ATRAC;
-64;ADPCM;2CC;A;ADPCM;;APICOM G726 ADPCM;
-65;ADPCM;2CC;A;ADPCM;;APICOM G722 ADPCM;
-66;DSAT;2CC;A;;;Microsoft DSAT;
-67;DSAT Display;2CC;A;;;Microsoft DSAT DISPLAY;
-69;BYTE_ALIGNED;2CC;A;;;Voxware BYTE_ALIGNED;http://www.voxware.com/
-70;AC8;2CC;A;;;Voxware AC8;http://www.voxware.com/
-71;AC10;2CC;A;;;Voxware AC10;http://www.voxware.com/
-72;AC16;2CC;A;;;Voxware AC16;http://www.voxware.com/
-73;AC20;2CC;A;;;Voxware AC20;http://www.voxware.com/
-74;RT24;2CC;A;;;Voxware RT24 (MetaVoice);http://www.voxware.com/
-75;RT29;2CC;A;;;Voxware RT29 (MetaSound);http://www.voxware.com/
-76;RT29HW;2CC;A;;;Voxware RT29HW;http://www.voxware.com/
-77;VR12;2CC;A;;;Voxware VR12;http://www.voxware.com/
-78;VR18;2CC;A;;;Voxware VR18;http://www.voxware.com/
-79;TQ40;2CC;A;;;Voxware TQ40;http://www.voxware.com/
-7A;SC3;2CC;A;;;Voxware;
-7B;SC3;2CC;A;;;Voxware;
-80;Softsound;2CC;A;;;;
-81;TQ60;2CC;A;;;Voxware TQ60;http://www.voxware.com/
-82;MSRT24;2CC;A;;;Microsoft MSRT24;
-83;G729A;2CC;A;;;AT&T G729A;
-84;MVI_MVI2;2CC;A;;;Motion Pixels MVI_MVI2;
-85;ADPCM;2CC;A;ADPCM;;DataFusion Systems (Pty) G726
-86;GSM6.10;2CC;A;;;DataFusion Systems (Pty) GSM6.10
-88;ISI AUDIO;2CC;A;;;Iterated Systems AUDIO
-89;Onlive;2CC;A;;;OnLive! Technologies
-8A;SX20;2CC;A;;;Multitude
-8B;ADPCM;2CC;A;ADPCM;;Infocom ITS A/S
-8C;G.729;2CC;A;;;Convedia Corporation
-91;SBC24;2CC;A;;;Siemens Business Communications Sys 24
-92;AC3 SPDIF;2CC;A;;;Sonic Foundry AC3 SPDIF
-93;G723;2CC;A;;;MediaSonic G723
-94;Prosody 8KBPS;2CC;A;;;Aculab plc Prosody 8KBPS
-97;ADPCM;2CC;A;ADPCM;;ZyXEL Communications ADPCM
-98;LPCBB;2CC;A;;;Philips Speech Processing LPCBB
-99;Packed;2CC;A;;;Studer Professional Audio AG Packed
-A0;PHONYTALK;2CC;A;;;Malden Electronics PHONYTALK
-A1;GSM;2CC;A;;;Racal Recorders
-A2;G.720a;2CC;A;;;Racal Recorders;
-A3;G.723.1;2CC;A;;;Racal Recorders;
-A4;ACELP;2CC;A;;;Racal Recorders;
-B0;AAC;2CC;A;AAC;;NEC Corporation;
-FF;AAC;2CC;A;AAC;;;
-100;ADPCM;2CC;A;ADPCM;;;
-101;IRAT;2CC;A;;;BeCubed IRAT;
-102;;2CC;A;;;IBM A-law;
-103;;2CC;A;;;IBM AVC ADPCM;
-111;G723;2CC;A;;;Vivo G723;
-112;SIREN;2CC;A;;;Vivo SIREN;
-120;CELP;2CC;A;;;Philips Speech Processing;
-121;Grundig;2CC;A;;;Philips Speech Processing;
-123;G723;2CC;A;;;Digital Equipment Corporation (DEC) G723;
-125;ADPCM;2CC;A;ADPCM;;;
-130;ACEPL;2CC;A;;;Sipro ACEPL.net;http://dividix.host.sk
-131;ACELP4800;2CC;A;;;Sipro ACELP4800;
-132;ACELP8V3;2CC;A;;;Sipro ACELP8V3;
-133;G729;2CC;A;;;Sipro G729;
-134;G729;2CC;A;;;Sipro G729A;
-135;KELVIN;2CC;A;;;Sipro KELVIN;
-135;AMR;2CC;A;;;VoiceAge Corporation;
-140;ADPCM;2CC;A;ADPCM;;Dictaphone Corporation G726 ADPCM;
-140;CELP68;2CC;A;;;Dictaphone Corporation;
-140;CELP54;2CC;A;;;Dictaphone Corporation;
-150;PureVoice;2CC;A;;;Qualcomm PUREVOICE;
-151;HalfRate;2CC;A;;;Qualcomm HALFRATE;
-155;TUBGSM;2CC;A;;;Ring Zero Systems TUBGSM;
-160;WMA1;2CC;A;;;Windows Media Audio 1;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx
-161;WMA2;2CC;A;;;Windows Media Audio 2;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx
-162;WMA3;2CC;A;;;Windows Media Audio 3;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx
-163;WMA Lossless;2CC;A;;;Windows Media Audio 3;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx
-163;WMA Pro;2CC;A;;;WMA Pro over S/PDIF
-170;ADPCM;2CC;A;ADPCM;;Unisys Nap ADPCM
-171;U-Law;2CC;A;ADPCM;;Unisys Nap U-law
-172;A-Law;2CC;A;ADPCM;;Unisys Nap A-law
-173;16K;2CC;A;;;Unisys Nap 16K
-174;G.700;2CC;A;;;SyCom Technologies
-175;ADPCM;2CC;A;ADPCM;;SyCom Technologies
-176;CELP54;2CC;A;;;SyCom Technologies
-177;CELP68;2CC;A;;;SyCom Technologies
-178;ADPCM;2CC;A;ADPCM;;Knowledge Adventure, Inc.
-180;AAC;2CC;A;;;Fraunhofer IIS
-190;DTS;2CC;A;;;
-200;ADPCM;2CC;A;ADPCM;;Creative Labs ADPCM
-202;FastSpeech8;2CC;A;;;Creative Labs Fast Speech 8
-203;FastSpeech10;2CC;A;;;Creative Labs Fast Speech 10
-210;ADPCM;2CC;A;ADPCM;;UHER informatic GmbH ADPCM
-215;;2CC;A;;;Ulead DV ACM
-216;;2CC;A;;;Ulead DV ACM
-220;QuaterDeck;2CC;A;;;Quarterdeck
-230;VC;2CC;A;;;I-link VC
-240;RAW_SPORT;2CC;A;;;Aureal RAW_SPORT
-241;AC3;2CC;A;;;ESST AC3
-250;HSX;2CC;A;;;Interactive Products, Inc. (IPI) HSX
-251;RPELP;2CC;A;;;Interactive Products, Inc. (IPI) RPELP
-260;CS2;2CC;A;;;Consistent Software CS2
-270;SCX;2CC;A;;;Sony
-271;SCY;2CC;A;;;Sony
-272;Atrac3;2CC;A;;;Sony
-273;SPC;2CC;A;;;Sony
-280;Telum;2CC;A;;;
-281;TelumIA;2CC;A;;;
-285;ADPCM;2CC;A;ADPCM;;Norcom Voice Systems
-300;FM_TOWNS_SND;2CC;A;;;Fujitsu FM_TOWNS_SND;
-350;Dev;2CC;A;;;Micronas Semiconductors, Inc.;
-351;CELP833;2CC;A;;;Micronas Semiconductors, Inc.;
-400;BTV_DIGITAL;2CC;A;;;Brooktree (BTV) DIGITAL;
-401;Music Coder;2CC;A;;;Intel Music Coder;http://www.intel.com/
-402;IAC2;2CC;A;;;Ligos IAC2;http://www.ligos.com
-450;Qdesign;2CC;A;;;QDesign Music;
-500;VP7;2CC;A;;;On2 VP7 Audio;http://www.on2.com/vp7.php3
-501;VP6;2CC;A;;;On2 VP7 Audio;http://www.on2.com/vp7.php3
-680;VMPCM;2CC;A;;;AT&T VME_VMPCM;
-681;TPC;2CC;A;;;AT&T TPC;
-700;YMPEG;2CC;A;;;YMPEG Alpha;
-8AE;LiteWave;2CC;A;;;ClearJump LiteWave;
-AAC;AAC;2CC;A;AAC;;;
-1000;GSM;2CC;A;;;Ing C. Olivetti & C., S.p.A. GSM;
-1001;ADPCM;2CC;A;ADPCM;;Ing C. Olivetti & C., S.p.A. ADPCM;
-1002;CELP;2CC;A;;;Ing C. Olivetti & C., S.p.A. CELP;
-1003;SBC;2CC;A;;;Ing C. Olivetti & C., S.p.A. SBC;
-1004;OPR;2CC;A;;;Ing C. Olivetti & C., S.p.A. OPR;
-1100;LH_CODEC;2CC;A;;;Lernout & Hauspie Codec;
-1101;CELP;2CC;A;;;Lernout & Hauspie CELP 4.8 kb/s;http://www.microsoft.com/windows/
-1102;SBC;2CC;A;;;Lernout & Hauspie SBC 8 kb/s;http://www.microsoft.com/windows/
-1103;SBC;2CC;A;;;Lernout & Hauspie SBC 12 kb/s;http://www.microsoft.com/windows/
-1104;SBC;2CC;A;;;Lernout & Hauspie SBC 16 kb/s;http://www.microsoft.com/windows/
-1400;NORRIS;2CC;A;;;Norris Communications, Inc.;
-1401;ISIAUDIO;2CC;A;;;ISIAudio;
-1500;MUSICOMPRESS;2CC;A;;;Soundspace Music Compression;
-181C;RT24;2CC;A;;;VoxWare RT24 speech codec;
-181E;AX24000P;2CC;A;;;Lucent elemedia AX24000P Music codec;
-1971;SonicFoundry;2CC;A;;;Lossless;
-1C03;ADPCM;2CC;A;ADPCM;;Lucent SX5363S G.723 compliant codec;
-1C07;SX8300P;2CC;A;;;Lucent SX8300P speech codec;
-1C0C;ADPCM;2CC;A;ADPCM;;Lucent SX5363S G.723 compliant codec
-1F03;DigiTalk;2CC;A;;;CUseeMe DigiTalk (ex-Rocwell)
-1FC4;ALF2CD;2CC;A;;;NCT Soft ALF2CD ACM
-2000;AC3;2CC;A;AC3;CBR;Dolby AC3
-2001;DTS;2CC;A;DTS;;Digital Theater Systems
-2002;Real Audio 1;2CC;A;;;RealAudio 1/2 14.4
-2003;Real Audio 1;2CC;A;;;RealAudio 1/2 28.8
-2004;Real Audio 2;2CC;A;;;RealAudio G2/8 Cook (low bitrate)
-2005;Real Audio 3;2CC;A;;;RealAudio 3/4/5 Music (DNET)
-2006;AAC;2CC;A;AAC;;RealAudio 10 AAC (RAAC)
-2007;AAC+;2CC;A;AAC;;RealAudio 10 AAC+ (RACP)
-3313;AviSynth;2CC;A;;;makeAVIS (fake AVI sound from AviSynth scripts)
-4143;AAC;2CC;A;AAC;;Divio MPEG-4 AAC audio
-4201;Nokia;2CC;A;;;
-4243;ADPCM;2CC;A;ADPCM;;G726
-43AC;Lead Speech;2CC;A;;;
-564C;Lead Vorbis;2CC;A;;;;
-566F;Vorbis;2CC;A;Vorbis;;;http://www.vorbis.com
-5756;WavPack;2CC;A;;;;http://www.wavpack.com/
-674F;Vorbis;2CC;A;Vorbis;;Mode 1;http://www.vorbis.com
-6750;Vorbis;2CC;A;Vorbis;;Mode 2;http://www.vorbis.com
-6751;Vorbis;2CC;A;Vorbis;;Mode 3;http://www.vorbis.com
-676F;Vorbis;2CC;A;Vorbis;;Mode 1+;http://www.vorbis.com
-6770;Vorbis;2CC;A;Vorbis;;Mode 2+;http://www.vorbis.com
-6771;Vorbis;2CC;A;Vorbis;;Mode 2+;http://www.vorbis.com
-;3COM NBX;2CC;A;;;3Com Corporation;
-;FAAD AAC;2CC;A;;;;
-7A21;AMR;2CC;A;;CBR;GSM-AMR (CBR, no SID);http://www.microsoft.com
-7A22;AMR;2CC;A;;VBR;GSM-AMR (VBR, including SID);http://www.microsoft.com
-A100;G723.1;2CC;A;;;;
-A101;AVQSBC;2CC;A;;;;
-A102;ODSBC;2CC;A;;;;
-A103;G729A;2CC;A;;;;
-A104;AMR-WB;2CC;A;;;;
-A105;ADPCM;2CC;A;ADPCM;;G726;
-A106;AAC;2CC;A;;;;
-A107;ADPCM;2CC;A;ADPCM;;G726;
-A109;Speex;2CC;A;;;;http://www.speex.org/
-DFAC;FrameServer;2CC;A;;;DebugMode SonicFoundry Vegas FrameServer ACM Codec;
-F1AC;FLAC;2CC;A;;;Free Lossless Audio Codec FLAC;
-FFFE;PCM;2CC;A;PCM;;Extensible wave format;
-FFFF;In Development;2CC;A;;;In Development / Unregistered;
-S_TEXT/UTF8;UTF-8;Mk;T;;;UTF-8 Plain Text;
-S_TEXT/SSA;SSA;Mk;T;;;Sub Station Alpha;
-S_TEXT/ASS;ASS;Mk;T;;;Advanced Sub Station Alpha;
-S_TEXT/USF;USF;Mk;T;;;Universal Subtitle Format;
-S_IMAGE/BMP;Bitmap;Mk;T;;;Basic image based subtitle format;
-S_VOBSUB;VobSub;Mk;T;;;The same subtitle format used on DVDs;

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text/DataBase/CodecID_Audio_Matroska.csv Deleted

@@ -1,34 +0,0 @@
-A_MPEG/L1;MPEG Audio;MP1;;http://www.iis.fraunhofer.de/amm/index.html
-A_MPEG/L2;MPEG Audio;MP2;;http://www.iis.fraunhofer.de/amm/index.html
-A_MPEG/L3;MPEG Audio;MP3;;http://www.iis.fraunhofer.de/amm/index.html
-A_PCM/INT/BIG;PCM;;;
-A_PCM/INT/LIT;PCM;;;
-A_PCM/FLOAT/IEEE;PCM;;;
-A_AC3;AC-3;;;
-A_AC3/BSID9;AC-3;;;
-A_AC3/BSID10;AC-3;;;
-A_DTS;DTS;;;
-A_EAC3;E-AC-3;;;
-A_FLAC;Flac;;;http://flac.sourceforge.net
-A_TTA1;TTA;;The True Audio Lossless Codec;http://true-audio.com
-A_VORBIS;Vorbis;;;http://www.vorbis.com
-A_WAVPACK4;WavPack;;;http://www.wavpack.com
-A_REAL/14_4;VSELP;;Real Audio 1 (14.4);http://www.real.com
-A_REAL/28_8;G.728;;Real Audio 2 (28.8);http://www.real.com
-A_REAL/COOK;Cooker;;Real Audio Cook Codec (codename: Gecko);http://www.real.com
-A_REAL/SIPR;G.729;;Real & Sipro Voice Codec;http://www.real.com
-A_REAL/RALF;RealAudio Lossless;;Real Audio Lossless Format;http://www.real.com
-A_REAL/ATRC;Atrac;;Real & Sony Atrac3 Codec;http://www.real.com
-A_TRUEHD;TrueHD;;Dolby TrueHD;http://www.dolby.com/consumer/technology/trueHD.html
-A_MLP;MLP;;Meridian Lossless Packing;http://www.meridian-audio.com
-A_AAC;AAC;;;
-A_AAC/MPEG2/MAIN;AAC;;;
-A_AAC/MPEG2/LC;AAC;;;
-A_AAC/MPEG2/LC/SBR;AAC;;;
-A_AAC/MPEG2/SSR;AAC;;;
-A_AAC/MPEG4/MAIN;AAC;;;
-A_AAC/MPEG4/LC;AAC;;;
-A_AAC/MPEG4/LC/SBR;AAC;;;
-A_AAC/MPEG4/LC/SBR/PS;AAC;;;
-A_AAC/MPEG4/SSR;AAC
-A_AAC/MPEG4/LTP;AAC

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text/DataBase/CodecID_Audio_Mpeg4.csv Deleted

@@ -1,30 +0,0 @@
-.mp3;MPEG Audio;;;;
-A104;AMR;;;http://www.apple.com/quicktime/download/standalone.html;Wide band
-ac-3;AC-3;;;;
-alac;ALAC;;Apple Lossless Format;http://www.apple.com/quicktime/download/standalone.html;
-alaw;ADPCM;;;http://www.apple.com/quicktime/download/standalone.html;
-dvca;PCM;;;http://www.apple.com/quicktime/download/standalone.html;
-ec-3;E-AC-3;;;;
-enca;(Encrypted);;;;
-fl32;PCM ; ;;http://www.apple.com/quicktime/download/standalone.html;
-fl64;PCM;;;http://www.apple.com/quicktime/download/standalone.html;
-ima4;ADPCM;;;http://www.apple.com/quicktime/download/standalone.html;
-in24;PCM;;;http://www.apple.com/quicktime/download/standalone.html;
-in32;PCM;;;http://www.apple.com/quicktime/download/standalone.html;
-MAC3;MACE 3;;;;
-MAC6;MACE 6;;;;
-NONE;PCM;;;http://www.apple.com/quicktime/download/standalone.html;
-owma;WMA Pro;;Smooth Streaming Media Audio;http://alexzambelli.com/blog/2009/02/10/smooth-streaming-architecture/;
-Qclp;QCELP;;Qualcomm PureVoice;;
-QDM1;QDesign 1;;QDesign Music 1;http://www.apple.com/quicktime/download/standalone.html;
-QDM2;Qdesign 2;;QDesign Music 2;http://www.apple.com/quicktime/download/standalone.html;
-QDMC;Qdesign 2;(Old);QDesign Music 2 (old version, rare);http://www.apple.com/quicktime/download/standalone.html;
-raw ;PCM;;;http://www.apple.com/quicktime/download/standalone.html;
-sac3;AC-3;;Made by Nero;http://www.nerodigital.com;
-samr;AMR;;;http://www.apple.com/quicktime/download/standalone.html;Narrow band
-sawb;AMR;;;http://www.apple.com/quicktime/download/standalone.html;Wide band
-sevc;EVRC;;;http://www.apple.com/quicktime/download/standalone.html;
-sowt;PCM;;;http://www.apple.com/quicktime/download/standalone.html;
-twos;PCM;;;http://www.apple.com/quicktime/download/standalone.html;
-ulaw;ADPCM;;;http://www.apple.com/quicktime/download/standalone.html;
-vdva;PCM;;;http://www.apple.com/quicktime/download/standalone.html;

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text/DataBase/CodecID_Audio_Real.csv Deleted

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text/DataBase/CodecID_Audio_Riff.csv Deleted

@@ -1,240 +0,0 @@
-0;;;;;
-1;PCM;Microsoft;;http://www.microsoft.com/windows/;
-2;ADPCM;Microsoft;;http://www.microsoft.com/windows/;
-3;PCM;IEEE ;;http://www.microsoft.com/windows/;Float
-4;VSELP;Compaq;;;
-5;CVSD;IBM;;;
-6;ADPCM;CCITT;;http://www.microsoft.com/windows/;A-Law
-7;ADPCM;CCITT;;http://www.microsoft.com/windows/;U-Law
-8;DTS;;Digital Theater Systems;;
-9;DRM;Microsoft;;;
-A;WMA;;Windows Media Audio;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;Voice
-C;MPEG Audio;;;;MPEG-2 5.1
-10;ADPCM;OKI;;;
-11;ADPCM;Intel;;;
-12;ADPCM;Mediaspace;;;
-13;ADPCM;Sierra;;;
-14;ADPCM;Antex;G.723;
-15;STD;DSP solutions;;
-16;FIX;DSP solutions;;
-17;ADPCM;Dialogic-OKI;;http://www.microsoft.com/windows/
-18;ADPCM;;;
-19;CU;HP;;
-1A;Dynamic Voice;HP;;
-20;ADPCM;Yamaha;;
-21;SONARC;Speech Compression;;
-22;Truespeech;DSP Group;;http://www.microsoft.com/windows/
-23;SC1;Echo Speech;;
-24;AudioFile 36;Virtual Music ;;
-25;APTX;;Audio Processing Technology X;
-26;AudioFile 10;Virtual Music;;
-27;Prosody 1612;Aculab plc;;
-28;LRC;Merging Technologies;;
-30;AC-2;Dolby Laboratories;;
-31;GSM 6.10;Microsoft;;http://www.microsoft.com/windows/
-32;Microsoft Audio;;;
-33;ADPCM;Antex;;
-34;VQLPC;Control Ressources;;
-35;REAL;DSP Solutions;;
-36;ADPCM;DSP Solutions;;
-37;CR10;;Control Resources 10;
-38;ADPCM;Natural MicroSystems VBX;;
-39;ADPCM;Crystal Semiconductor IMA;;
-3A;SC3;Echo Speech;;
-3B;ADPCM;Rockwell;;
-3C;DigiTalk;Rockwell DigiTalk;;
-3D;Xebec;;Xebec Multimedia Solutions;
-40;ADPCM;Antex Electronics;G.721;
-41;CELP;Antex Electronics;G.728;
-42;G.723.1;Microsoft;;http://www.microsoft.com/windows/;;
-42;ADPCM;;IBM;;;
-42;G.729;Microsoft;;;;
-45;ADPCM;Microsoft;G.726;http://www.microsoft.com/windows/;;
-50;MPEG Audio;;;http://www.iis.fraunhofer.de/amm/index.html;;Version 1
-51;MPEG Audio;;;http://www.iis.fraunhofer.de/amm/index.html;;Version 2
-52;RT24;InSoft, Inc.;;;;
-53;PAC;InSoft, Inc.;;;;
-55;MPEG Audio;MP3;;http://www.iis.fraunhofer.de/amm/index.html;;
-59;G.723;Lucent;G.723;;;
-60;Cirrus;;Cirrus Logic;;;
-61;PCM;ESS Technology;;;;
-62;Voxware;;;;;
-63;Atrac;Canopus;;;;
-64;ADPCM;APICOM;G.726;;;
-65;ADPCM;APICOM;G.722;;;
-66;DSAT;Microsoft;;
-67;DSAT Display;Microsoft;;
-69;BYTE_ALIGNED;Voxware;;http://www.voxware.com/
-70;AC8;Voxware;;http://www.voxware.com/
-71;AC10;Voxware;;http://www.voxware.com/
-72;AC16;Voxware;;http://www.voxware.com/
-73;AC20;Voxware;;http://www.voxware.com/
-74;RT24;Voxware;MetaVoice;http://www.voxware.com/
-75;RT29;Voxware;MetaSound;http://www.voxware.com/
-76;RT29HW;Voxware;;http://www.voxware.com/
-77;VR12;Voxware;;http://www.voxware.com/
-78;VR18;Voxware;;http://www.voxware.com/
-79;TQ40;Voxware;;http://www.voxware.com/
-7A;SC3;Voxware;;
-7B;SC3;Voxware;;
-80;Softsound;;;
-81;TQ60;Voxware;;http://www.voxware.com/
-82;MSRT24;Microsoft;;
-83;G.729a;AT&T;;
-84;MVI_MVI2;Motion Pixels;;
-85;ADPCM;DataFusion Systems;G.726;
-86;GSM 6.10;DataFusion Systems;;
-88;ISI AUDIO;;Iterated Systems AUDIO;
-89;Onlive;;OnLive! Technologies;
-8A;SX20;Multitude;;
-8B;ADPCM;Infocom ITS A/S;;
-8C;G.729;Convedia Corporation;;
-91;SBC24;;Siemens Business Communications Sys 24;
-92;AC-3;Sonic Foundry;;
-93;G.723;MediaSonic;;
-94;Prosody 8KBPS;Aculab plc;;
-97;ADPCM;ZyXEL Communications;;
-98;LPCBB;Philips Speech Processing;;;
-99;Packed;;Studer Professional Audio AG Packed;;
-A0;PHONYTALK;Malden Electronics;;;
-A1;GSM;Racal Recorders;;;
-A2;G.720a;Racal Recorders;;;
-A3;G.723.1;Racal Recorders;;;
-A4;ACELP;Racal Recorders;;;
-B0;AAC;NEC Corporation;;;
-FF;AAC;;;;
-100;ADPCM;;;;
-101;IRAT;BeCubed;;;
-102;ADPCM;IBM;;;A-law
-103;ADPCM;IBM AVC;;;
-111;G.723;Vivo;;;
-112;SIREN;Vivo;;;
-120;CELP;Philips Speech Processing;;;
-121;Grundig;Philips Speech Processing;;;
-123;G.723;Digital Equipment Corporation;;;
-125;ADPCM;;;;
-130;ACELP;Sipro;;http://dividix.host.sk;.net
-131;ACELP;Sipro;;;4800
-132;ACELP;Sipro;;;8V3
-133;G.729;Sipro;;;
-134;G.729a;Sipro;;;
-135;KELVIN;Sipro;;;
-135;AMR;VoiceAge Corporation;;;
-140;ADPCM;Dictaphone Corporation;G.726;;
-140;CELP68;Dictaphone Corporation;;;
-140;CELP54;Dictaphone Corporation;;;
-150;PureVoice;Qualcomm;;;
-151;HalfRate;Qualcomm;;;
-155;TUBGSM;Ring Zero Systems;;;
-160;WMA;;Windows Media Audio;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;;Version 1
-161;WMA;;Windows Media Audio;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;;Version 2
-162;WMA;;Windows Media Audio;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;Pro;
-163;WMA;;Windows Media Audio;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;Lossless;
-170;ADPCM;Unisys Nap;;;;
-171;ADPCM;Unisys Nap;;;U-law;
-172;ADPCM;Unisys Nap;;;A-law;
-173;16K;Unisys Nap;;;;
-174;G.700;SyCom Technologies;;;;
-175;ADPCM;SyCom Technologies;;;;
-176;CELP54;SyCom Technologies;;;;
-177;CELP68;SyCom Technologies;;;;
-178;ADPCM;Knowledge Adventure, Inc.;;;;
-180;AAC;Fraunhofer IIS;;;;
-190;DTS;;Digital Theater Systems;;;
-200;ADPCM;Creative Labs;;;;
-202;Fast Speech 8;Creative Labs;
-203;Fast Speech 10;Creative Labs;
-210;ADPCM;UHER informatic GmbH;
-215;ACM;Ulead;
-216;ACM;Ulead;
-220;QuaterDeck;;
-230;VC;;I-link VC
-240;RAW_SPORT;;Aureal
-241;AC-3;ESST;
-250;HSX;Interactive Products, Inc.;
-251;RPELP;Interactive Products, Inc.;
-260;CS2;Consistent Software;
-270;Atrac3;Sony;
-271;SCY;Sony;
-272;Atrac3;Sony;
-273;SPC;Sony;
-280;Telum;;;
-281;TelumIA;;;
-285;ADPCM;Norcom Voice Systems;;
-300;FM_TOWNS_SND;Fujitsu;;
-350;Dev;Micronas Semiconductors, Inc.;;
-351;CELP833;Micronas Semiconductors, Inc.;;
-400;DIGITAL;Brooktree;;
-401;Music Coder;Intel;;http://www.intel.com/
-402;IAC2;Ligos;;http://www.ligos.com
-450;Qdesign;;QDesign Music;
-500;VP7;;On2 VP7 Audio;http://www.on2.com/vp7.php3
-501;VP6;;On2 VP7 Audio;http://www.on2.com/vp7.php3
-680;VM;;AT&T VME_VMPCM;
-681;TPC;;AT&T TPC;
-700;YMPEG;;YMPEG Alpha;
-8AE;LiteWave;;ClearJump LiteWave;
-AAC;AAC;;;;
-1000;GSM;Ing C. Olivetti & C., S.p.A.;;;
-1001;ADPCM;Ing C. Olivetti & C., S.p.A.;;;
-1002;CELP;Ing C. Olivetti & C., S.p.A.;;;
-1003;SBC;Ing C. Olivetti & C., S.p.A.;;;
-1004;OPR;Ing C. Olivetti & C., S.p.A.;;;
-1100;LH_CODEC;Lernout & Hauspie; Codec;;
-1101;CELP;Lernout & Hauspie;;http://www.microsoft.com/windows/;4.8 kb/s
-1102;SBC;Lernout & Hauspie;;http://www.microsoft.com/windows/;8 kb/s
-1103;SBC;Lernout & Hauspie;;http://www.microsoft.com/windows/;12 kb/s
-1104;SBC;Lernout & Hauspie;;http://www.microsoft.com/windows/;16 kb/s
-1400;Norris;;Norris Communications, Inc.;;
-1401;ISIAudio;;;;
-1500;MUSICOMPRESS;;Soundspace Music Compression;;
-181C;RT24;VoxWare;;;
-181E;AX24000P;Lucent elemedia;;;
-1971;SonicFoundry;;Lossless
-1C03;ADPCM;Lucent;G.723
-1C07;SX8300P;Lucent;
-1C0C;ADPCM;Lucent;G.723
-1F03;DigiTalk;;CUseeMe (ex-Rocwell)
-1FC4;ALF2CD;NCT Soft;
-2000;AC-3;;
-2001;DTS;;Digital Theater Systems
-2002;VSELP;;RealAudio 1/2 14.4
-2003;VSELP;;RealAudio 1/2 28.8
-2004;Cooker;;RealAudio G2/8 Cook (low bitrate)
-2005;DNET;;RealAudio 3/4/5 Music (DNET)
-2006;AAC;;RealAudio 10 AAC (RAAC)
-2007;AAC;;RealAudio 10 AAC+ (RACP)
-2048;Sonic;;
-3313;AviSynth;;makeAVIS (fake AVI sound from AviSynth scripts)
-4143;AAC;;Divio MPEG-4 AAC audio;;;
-4201;Nokia;;;;;
-4243;ADPCM;;G.726;;;
-43AC;Speex;;;;;
-564C;Vorbis;;;;;
-566F;Vorbis;;;http://www.vorbis.com;;
-5756;WavPack;;;http://www.wavpack.com/;;
-674F;Vorbis;;;http://www.vorbis.com;;Mode 1
-6750;Vorbis;;;http://www.vorbis.com;;Mode 2
-6751;Vorbis;;;http://www.vorbis.com;;Mode 3
-676F;Vorbis;;;http://www.vorbis.com;;Mode 1+
-6770;Vorbis;;;http://www.vorbis.com;;Mode 2+
-6771;Vorbis;;;http://www.vorbis.com;;Mode 2+
-7A21;AMR;;GSM-AMR (CBR, no SID);http://www.microsoft.com;;
-7A22;AMR;;GSM-AMR (VBR, including SID);http://www.microsoft.com;;
-A100;G.723.1;;;;;
-A101;AVQSBC;;;
-A102;ODSBC;;;
-A103;G729A;;;
-A104;AMR;;;
-A105;ADPCM;;G.726;
-A106;AAC;;;
-A107;ADPCM;;G.726;
-A109;Speex;;;http://www.speex.org/
-DFAC;FrameServer;;DebugMode SonicFoundry Vegas FrameServer ACM Codec;
-F1AC;FLAC;;Free Lossless Audio Codec;
-FFFE;Extensible;;;
-FFFF;In Development;;;
-58CB7144-23E9-BFAA-A119-FFFA01E4CE62;Atrac3;;;
-AD98D184-AAC3-11D0-A41C-00A0C9223196;VC;;;
-05589F81-C356-11CE-BF01-00AA0055595A;WaveFormatEx;;;
-518590A2-A184-11D0-8522-00C04FD9BAF3;DSound;;;

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text/DataBase/CodecID_General_Mpeg4.csv Deleted

@@ -1,57 +0,0 @@
-M4V ;MPEG-4;;;;
-isom;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;Base Media
-iso2;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;Base Media
-mp41;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;Base Media / Version 1
-mp42;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;Base Media / Version 2
-avc1;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;JVT
-3gp1;MPEG-4;;;http://www.3gpp.org/;3GPP Media Release 1
-3gp2;MPEG-4;;;http://www.3gpp.org/;3GPP Media Release 2
-3gp3;MPEG-4;;;http://www.3gpp.org/;3GPP Media Release 3
-3gp4;MPEG-4;;;http://www.3gpp.org/;3GPP Media Release 4
-3gp5;MPEG-4;;;http://www.3gpp.org/;3GPP Media Release 5
-3gp6;MPEG-4;;;http://www.3gpp.org/;3GPP Media Release 6 Basic
-3gp6;MPEG-4;;;http://www.3gpp.org/;3GPP Media Release 6 Progressive Download
-3gp6;MPEG-4;;;http://www.3gpp.org/;3GPP Media Release 6 Streaming Servers
-3gp7;MPEG-4;;;http://www.3gpp.org/;3GPP Media Release 7 Streaming Servers
-3g2a;MPEG-4;;;http://www.3gpp2.org/;3GPP2 Media
-3ge6;MPEG-4;;;http://www.3gpp.org/;3GPP Release 6 MBMS Extended Presentation
-3ge7;MPEG-4;;;http://www.3gpp.org/;3GPP Release 7 MBMS Extended Presentation
-3gg6;MPEG-4;;;http://www.3gpp.org/;3GPP Release 6 General
-3gp8;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;
-3gp9;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;
-CAQV;MPEG-4;;;http://world.casio.com/;Casio
-FACE;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;Facebook
-JP20;MPEG-4;;;http://gpac.sourceforge.net/;JPEG 2000
-JPM ;MPEG-4;;;http://www.iso.org/;JPEG 2000 Compound Image
-JPX ;MPEG-4;;;http://www.iso.org/;JPEG 2000 w/ extensions
-KDDI;MPEG-4;;;http://www.3gpp2.org/;3GPP2 EZMovie for KDDI 3G Cellphones
-MJ2S;MPEG-4;;;http://www.iso.org/;Motion JPEG 2000 Simple Profile
-MJP2;MPEG-4;;;http://www.iso.org/;Motion JPEG 2000 General Profile
-MQT ;MPEG-4;;;http://www.sony.com/;Sony/Mobile QuickTime
-MSNV;MPEG-4;;;http://www.sony.com/;Sony PSP
-ndas;MPEG-4;;;http://www.nerodigital.com;Nero Digital AAC Audio
-ndsc;MPEG-4;;;http://www.nerodigital.com;Nero Digital Cinema Profile
-ndsh;MPEG-4;;;http://www.nerodigital.com;Nero Digital HDTV Profile
-ndsm;MPEG-4;;;http://www.nerodigital.com;Nero Digital Mobile Profile
-ndsp;MPEG-4;;;http://www.nerodigital.com;Nero Digital Portable Profile
-ndss;MPEG-4;;;http://www.nerodigital.com;Nero Digital Standard Profile
-ndxc;MPEG-4;;;http://www.nerodigital.com;Nero Digital AVC Cinema Profile
-ndxh;MPEG-4;;;http://www.nerodigital.com;Nero Digital AVC HDTV Profile
-ndxm;MPEG-4;;;http://www.nerodigital.com;Nero Digital AVC Mobile Profile
-ndxp;MPEG-4;;;http://www.nerodigital.com;Nero Digital AVC Portable Profile
-ndxs;MPEG-4;;;http://www.nerodigital.com;Nero Digital AVC Standard Profile
-mmp4;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;Mobile version
-mp71;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;ISO 14496-12 MPEG-7 meta data
-mp7b;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;ISO 14496-12 MPEG-7 meta data
-qt  ;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;QuickTime
-SDV ;MPEG-4;;;http://www.sdcard.org/;SD Memory Card Video
-M4A ;MPEG-4;;;http://www.apple.com/itunes/;Apple AAC audio with iTunes info
-M4B ;MPEG-4;;;http://www.apple.com/itunes/;Apple audio with iTunes position
-M4P ;MPEG-4;;;http://www.apple.com/itunes/;AES encrypted audio
-M4VP;MPEG-4;;;http://www.apple.com/iphone/;Apple iPhone
-iphE;MPEG-4;;;http://www.apple.com/iphone/;Apple iPhone (Cellular)
-M4VH;MPEG-4;;;http://www.apple.com/appletv/;Apple TV
-QTCA;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;Quicktime compressed archive
-CAQV;MPEG-4;;;;Casio Digital Camera
-QTI ;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;QuickTime Image
-f4v ;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;Adobe Flash

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text/DataBase/CodecID_Text_Mpeg4.csv Deleted

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text/DataBase/CodecID_Video_Matroska.csv Deleted

@@ -1,20 +0,0 @@
-V_UNCOMPRESSED;RGB;;Raw uncompressed video frames;
-V_DIRAC;Dirac;;;http://diracvideo.org/
-V_MPEG4/IS0/SP;MPEG-4 Visual;;There is a zero instead of a O, may be a problem;http://www.divx.com
-V_MPEG4/IS0/ASP;MPEG-4 Visual;;There is a zero instead of a O, may be a problem;http://www.xvid.org/Downloads.15.0.html
-V_MPEG4/IS0/AP;MPEG-4 Visual;;There is a zero instead of a O, may be a problem;http://ffdshow-tryout.sourceforge.net/
-V_MPEG4/IS0/AVC;AVC;;There is a zero instead of a O, may be a problem;http://ffdshow-tryout.sourceforge.net/
-V_MPEG4/ISO/SP;MPEG-4 Visual;;Simple Profile;http://www.divx.com
-V_MPEG4/ISO/ASP;MPEG-4 Visual;;Advanced Simple Profile;http://www.xvid.org/Downloads.15.0.html
-V_MPEG4/ISO/AP;MPEG-4 Visual;;Advanced Profile;http://ffdshow-tryout.sourceforge.net/
-V_MPEG4/ISO/AVC;AVC;;;http://ffdshow-tryout.sourceforge.net/
-V_MPEG4/MS/V2;MPEG-4 Visual;MS MPEG-4 v2;MS MPEG-4 v2;http://ffdshow-tryout.sourceforge.net/
-V_MPEG4/MS/V3;MPEG-4 Visual;MS MPEG-4 v3;MS MPEG-4 v3;http://ffdshow-tryout.sourceforge.net/
-V_MPEG1;MPEG Video;;MPEG 1 or 2 Video;http://ffdshow-tryout.sourceforge.net/
-V_MPEG2;MPEG Video;;MPEG 1 or 2 Video;http://ffdshow-tryout.sourceforge.net/
-V_REAL/RV10;RealVideo 1;;RealVideo 1.0 aka RealVideo 5;http://www.real.com
-V_REAL/RV20;RealVideo 2;;RealVideo 2.0 aka G2 and RealVideo G2+SVT;http://www.real.com
-V_REAL/RV30;RealVideo 3;;RealVideo 3.0 aka RealVideo 8;http://www.real.com
-V_REAL/RV40;RealVideo 4;;RealVideo 4.0 aka RealVideo 9;http://www.real.com
-V_THEORA;Theora;;;http://www.theora.org
-V_VP8;VP8;;;http://www.webmproject.org/

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text/DataBase/CodecID_Video_Mpeg4.csv Deleted

@@ -1,116 +0,0 @@
-2vuy;YUV;;;;;;YUV;4:2:2
-8BPS;RGB;;;;;;RGB;8:8:8
-ac16;YUV;;;;;;YUV;4:2:2
-ac32;YUV;;;;;;YUV;4:2:2
-acBG;YUV;;;;;;YUV;4:2:2
-apch;ProRes;HQ;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
-apcn;ProRes;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
-avc1;AVC;;Advanced Video Coding;http://www.apple.com/quicktime/download/standalone.html;;;;
-avcp;AVC;;Advanced Video Coding Parameters;http://www.apple.com/quicktime/download/standalone.html;;;;
-AVdv;DV;;Avid;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
-AVdn;VC-3;DNxHD;Avid;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
-avr ;M-JPEG;;;;;;;
-b16g;Gray;;;;;;Y;16
-b32a;Gray/Alpha;;;;;;YA;16:16
-b48r;RGB;;;;;;RGB;16:16:16
-b64a;RGBA;;;;;;RGBA;16:16:16:16
-base;RGBA;;;;;;RGBA;16:16:16:16
-blit;RGBA;;;;;;RGBA;16:16:16:16
-blnd;Alpha Compositor;;;;;;;
-blur;Blur;;;;;;CMYK;
-CFHD;Cineform;;CineForm High-Definition (HD) wavelet codec;http://www.cineform.com/;;;;
-cmyk;CMYK;;;;;;;
-cvid;Cinepack;;;http://www.apple.com/quicktime/download/standalone.html;;;;
-drac;Dirac;;Dirac Video Coder;http://www.bbc.co.uk/rd/projects/dirac/index.shtml;;;;
-dslv;Cross Fade;;;http://www.apple.com/quicktime/download/standalone.html;;;;
-DV10;Digital Voodoo;;Digital Voodoo 10 bit Uncompressed 4:2:2 codec;http://www.digitalvoodoo.net/;;;;
-dv5n;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
-dv5p;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
-dvc ;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
-dvcp;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
-dvh1;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
-dvh2;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
-dvh3;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
-dvh4;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
-dvh5;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
-dvh6;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
-dvhp;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
-dvhq;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
-DVOO;Digital Voodoo;;Digital Voodoo 8 bit Uncompressed 4:2:2 codec;http://www.digitalvoodoo.net/;;;;
-DVOR;Digital Voodoo;;Digital Voodoo intermediate raw;http://www.digitalvoodoo.net/;;;;
-dvpp;DV;DVCPRO;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
-DVTV;Digital Voodoo;;Digital Voodoo intermediate 2vuy;http://www.digitalvoodoo.net/;;;;
-DVVT;Digital Voodoo;;Digital Voodoo intermediate v210;http://www.digitalvoodoo.net/;;;;
-encv;(Encrypted);;;http://www.apple.com/quicktime/download/standalone.html;;;;
-gif ;M-GIF;;;;;;;
-h261;H.261;;;http://www.apple.com/quicktime/download/standalone.html;;;;
-h263;H.263;;;http://www.apple.com/quicktime/download/standalone.html;;;;
-h264;H.264;;;http://www.apple.com/quicktime/download/standalone.html;;;;
-HD10;Digital Voodoo;;Digital Voodoo 10 bit Uncompressed 4:2:2 HD codec;http://www.digitalvoodoo.net/;;;;
-hdv3;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
-icod;Intermediate Codec;Apple;;http://www.apple.com/quicktime/download/standalone.html;;;;
-j420;YUV;;;;;;YUV;4:2:0
-jpeg;M-JPEG;;;http://www.apple.com/quicktime/download/standalone.html;;;;
-kpcd;Photo CD;;;;;;;
-M105;Matrox;;;http://www.matrox.com/;;;;
-mjp2;M-JPEG 2000;;;;;;;
-mjpa;M-JPEG;;;;;;;
-mjpb;M-JPEG;;;;;;;
-mp4v;MPEG-4 Visual;;;;;;;
-mx3n;MPEG Video;;;;;;;
-mx3p;MPEG Video;;;;;;;
-myuv;YUV;;;;;;YUV;4:2:0
-ovc1;VC-1;;Smooth Streaming Media Video;http://alexzambelli.com/blog/2009/02/10/smooth-streaming-architecture/;;;;
-png ;M-PNG;;;;;;;
-PNTG;MacPaint;;Apple MacPaint image format;http://www.apple.com/quicktime/download/standalone.html;;;;
-rle ;RLE;;;http://www.apple.com/quicktime/download/standalone.html;;;;
-rpza;Road Pizza;;;http://www.apple.com/quicktime/download/standalone.html;;;;
-s263;H.263;;;http://www.apple.com/quicktime/download/standalone.html;;;;
-Shr0;SheerVideo;;Generic SheerVideo codec;http://www.bitjazz.com/;;;;
-Shr1;SheerVideo;;SheerVideo RGB;http://www.bitjazz.com/;;;;
-Shr2;SheerVideo;;SheerVideo Y'CbCr[A] 4:4:4;http://www.bitjazz.com/;;;;
-Shr3;SheerVideo;;SheerVideo Y'CbCr 4:2:2;http://www.bitjazz.com/;;;;
-Shr4;SheerVideo;;SheerVideo Y'CbCr 4:2:2;http://www.bitjazz.com/;;;;
-SV10;Sorenson;;Sorenson Media Video R1;http://www.apple.com/quicktime/download/standalone.html;;;;
-SVQ1;Sorenson 1;;Sorenson Media Video 1 (Apple QuickTime 3);http://www.apple.com/quicktime/download/standalone.html;;;;
-SVQ2;Sorenson 2;;Sorenson Media Video 2 (Apple QuickTime 4);http://www.apple.com/quicktime/download/standalone.html;;;;
-SVQ3;Sorenson 3;;Sorenson Media Video 3 (Apple QuickTime 5);http://www.apple.com/quicktime/download/standalone.html;;;;
-v210;YUV;AJA Video Systems Xena;;;;;YUV;4:2:2
-vc-1;VC-1;;SMPTE VC-1;http://www.smpte.org/;;;YUV;
-WRLE;Bitmap;;Windows BMP image format;http://www.apple.com/quicktime/download/standalone.html;;;YUV;
-xd50;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xd51;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xd52;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xd53;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xd54;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xd55;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xd56;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xd57;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xd58;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xd59;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xd5a;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xd5b;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xd5c;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xd5d;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xd5e;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xd5f;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xdv0;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xdv1;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xdv2;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xdv3;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xdv4;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xdv5;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xdv6;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xdv7;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xdv8;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xdv9;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xdva;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xdvb;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xdvc;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xdvd;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xdve;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-xdvf;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-yuv2;YUV;;;;;;YUV;4:2:2
-yuvs;YUV;;;;;;YUV;4:2:2
-yuvu;YUV;;;;;;YUV;4:2:2
-yuvx;YUV;;;;;;YUV;4:2:2

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text/DataBase/CodecID_Video_Riff.csv Deleted

@@ -1,693 +0,0 @@
-0x00000000;RGB;;Basic Windows bitmap format. 1, 4 and 8 bpp versions are palettised. 16, 24 and 32bpp contain raw RGB samples;http://www.fourcc.org/indexrgb.htm;;;;;
-0x00000001;RLE;;Run length encoded 8bpp RGB image;http://www.fourcc.org/indexrgb.htm;;;;;
-0x00000002;RLE;;Run length encoded 4bpp RGB image;http://www.fourcc.org/indexrgb.htm;;;;;
-0x00000003;RGB;;Raw RGB with arbitrary sample packing within a pixel. Packing and precision of R, G and B components is determined by bit masks for each;http://www.fourcc.org/indexrgb.htm;;;;;
-1978;RGB;A.M.Paredes predictor;;http://www.pegasusimaging.com/cgi-bin/download2.cgi?LVIDB;;;RGB;;
- BIT;RGB;;;;;;RGB;;
- JPG;M-JPEG;;;;;;YUV;4:2:0;
- PNG;M-PNG;;;;;;RGB;;
- RAW;RGB;;;http://www.fourcc.org/indexrgb.htm;;;RGB;;
- raw;RGB;;;http://www.fourcc.org/indexrgb.htm;;;RGB;;
- RGB;RGB;;;http://www.fourcc.org/indexrgb.htm;;;RGB;;
- RL4;RLE;;;http://www.fourcc.org/indexrgb.htm;;;RGB;;4
- RL8;RLE;;;http://www.fourcc.org/indexrgb.htm;;;RGB;;8
-2VUY;YUV;Optibase VideoPump;;;;;YUV;4:2:2;
-3IV0;MPEG-4 Visual;3ivX;3ivX pre-1.0;http://www.3ivx.com/download/;;;YUV;4:2:0;
-3IV1;MPEG-4 Visual;3ivX;3ivX 1.0-3.5;http://www.3ivx.com/download/;;;YUV;4:2:0;
-3IV2;MPEG-4 Visual;3ivX;3ivX 4.0;http://www.3ivx.com/download/;;;YUV;4:2:0
-3IVD;MPEG-4 Visual;3ivX;;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
-3IVX;MPEG-4 Visual;3ivX;;http://www.3ivx.com/download/;;;YUV;4:2:0
-3VID;MPEG-4 Visual;3ivX;;http://www.3ivx.com/download/;;;YUV;4:2:0
-8BPS;RGB;Apple;;http://ffdshow-tryout.sourceforge.net/;;;RGBA;
-AAS4;RLE;Autodesk;;http://mirror01.iptelecom.net.ua/~video/codecs/Autodesk.Animator.v1.11.Codec.exe;;;RGB;
-AASC;RLE;Autodesk;;http://mirror01.iptelecom.net.ua/~video/codecs/Autodesk.Animator.v1.11.Codec.exe;;;RGB;
-ABYR;Kensigton low;Kensington;Low resolution, low frame rate (6fps) for digital cameras;;;;;
-ACTL;ACT-L2;Streambox;;http://www.streambox.com/products/act-L2_codec.htm;;;;
-ADV1;WaveCodec;Loronix;;http://www.loronix.com/products/video_clips/wavecodec.asp;;;;
-ADVJ;M-JPEG;Avid;;;;;YUV;4:2:0
-AEIK;Indeo 3.2;;Vector Quantization;;;;;
-AEMI;MPEG Video;VideoONE;MPEG-1-I Capture;http://www.array.com;;;YUV;4:2:0
-AFLC;FLC;Autodesk;;http://mirror01.iptelecom.net.ua/~video/codecs/Autodesk.Animator.v1.11.Codec.exe;;;;
-AFLI;FLI;Autodesk;;http://mirror01.iptelecom.net.ua/~video/codecs/Autodesk.Animator.v1.11.Codec.exe;;;;
-AHDV;Wavelet;CineForm HD;;http://www.cineform.com/products/ConnectHD.htm;;;;
-AJPG;M-JPEG;;22fps for digital cameras;;;;YUV;4:2:0
-ALPH;Ziracom;;Ziracom Digital Communications Inc.;;;;;
-AMPG;MPEG-1;VideoONE;;http://www.array.com;;;YUV;4:2:0
-AMR ;AMR;;Speech codec;;;;;
-ANIM;RDX;Intel;;;;;;
-AP41;MPEG-4 Visual;AngelPotion;Hack of MS MPEG-4 v3;http://www.divxity.com/download/ap4v1-702.exe;;;YUV;4:2:0
-AP42;MPEG-4 Visual;AngelPotion;Hack of MS MPEG-4 v3;http://www.divxity.com/download/ap4v1-702.exe;;;YUV;4:2:0
-ASLC;AlparySoft Lossless;;;http://www.free-codecs.com/download/Alparysoft_Lossless_Video_Codec.htm;;;;
-ASV1;Asus 1;;;ftp://ftp.asuscom.de/pub/asuscom/treiber/vga/ASUS_VGA_TOOLS/asv2dec.zip;;;;
-ASV2;Asus 2;;;ftp://ftp.asuscom.de/pub/asuscom/treiber/vga/ASUS_VGA_TOOLS/asv2dec.zip;;;;
-ASVX;Asus X;;;ftp://ftp.asuscom.de/pub/asuscom/treiber/vga/ASUS_VGA_TOOLS/asv2dec.zip;;;;
-ATM4;MPEG-4 Visual;Nero;;http://www.nero.com;;;YUV;4:2:0
-AUR2;YUV;;Auravision Aura 2;;;;YUV;4:2:2
-AURA;YUV;;Auravision Aura 1;;;;YUV;4:1:1
-AUVX;AUVX;;USH GmbH;;;;;
-AV1X;Avid 1:1;;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;;
-AVC1;AVC;;;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0;
-avc1;AVC;;;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0;
-AVD1;DV;Avid;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;YUV;;
-AVDJ;M-JPEG;Avid;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;YUV;4:2:0;
-AVDN;Avid HD;;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;;;
-AVDV;DV;Avid;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;YUV;;
-AVI1;M-JPEG;MainConcept;;;;;YUV;4:2:0;
-AVI2;M-JPEG;MainConcept;;;;;YUV;4:2:0;
-AVID;M-JPEG;Avid;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;YUV;4:2:0;
-AVIS;AviSynth;;Wrapper for AviSynth (Dummy);http://ffdshow-tryout.sourceforge.net/;;;;;
-AVMP;Avid IMX;;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;;;
-AVR ;M-JPEG;Avid NuVista;Avid ABVB/NuVista M-JPEG with Alpha-channel;;;;YUV;4:2:0;
-AVRn;M-JPEG;Avid M-JPEG;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;YUV;4:2:0;
-AVRN;M-JPEG;Avid M-JPEG;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;YUV;4:2:0;
-AVUI;Avid;;Avid Meridien Uncompressed with Alpha-channel;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;;;
-AVUP;Avid;;Avid 10bit Packed (Quick Time);http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;;;
-AYUV;YUV;YUV;;;;;YUVA;4:4:4;8
-AZPR;QuickTime;;;http://www.apple.com/quicktime/download/standalone.html;;;;
-AZRP;QuickTime;;;http://www.apple.com/quicktime/download/standalone.html;;;;
-BGR ;RGB;RGB;;;;;RGB;
-BHIV;BeHere iVideo;;;;;;;
-BINK;Bink;;;;;;;
-BIT ;RGB;RGB;;;;;RGB;
-BITM;H.261;Microsoft;;;;;YUV;
-BLOX;MPEG Video;Blox;;http://www.ii.uj.edu.pl/~jezabek/blox/blox-0.1.0b.zip;;;YUV;4:2:0
-BLZ0;MPEG-4 Visual;DivX;DivX for Blizzard Decoder Filter;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
-BT20;MediaStream;;Conexant ProSummer MediaStream;;;;;
-BTCV;Composite;;Conexant Composite Video;;;;;
-BTVC;Composite;;Conexant Composite Video;;;;;
-BW00;Wavelet;BergWave;;;;;;
-BW10;MPEG-1;Broadway;Data Translation Broadway MPEG Capture/Compression;;;;YUV;
-BXBG;RGB;Boxx;;;;;RGB;
-BXRG;RGB;Boxx;;;;;RGB;
-BXY2;YUV;Boxx;10-bit;;;;YUV;
-BXYV;YUV;Boxx;;;;;YUV;
-CC12;YUV;Intel;;;;;YUV;
-CDV5;DV;Canopus;Canopus SD50/DVHD;http://www.cineform.com/products/ConnectHD.htm;;;YUV;
-CDVC;DV;Canopus;Canopus DV (DV);http://www.cineform.com/products/ConnectHD.htm;;;YUV;
-CDVH;DV;Canopus;Canopus SD50/DVHD;http://www.cineform.com/products/ConnectHD.htm;;;YUV;
-CFCC;M-JPEG;DPS Perception;Dummy format - only AVI header;;;;YUV;4:2:0
-CFHD;CineForm HD;;CineForm 10-bit Visually Perfect HD (Wavelet);;;;;
-CGDI;Camcorder;;Camcorder Video (MS Office 97);;;;;
-CHAM;Champagne;;Winnov Caviara Champagne;;;;;
-CJPG;M-JPEG;Creative;Creative Video Blaster Webcam Go JPEG;;;;YUV;4:2:0
-CLJR;YUV;Cirrus Logic;Less than 8 bits per Y, U and V sample.;http://www.fourcc.org/indexyuv.htm;;;YUV;4:1:1
-CLLC;Canopus;;Canopus LossLess;;;;;
-CLPL;YUV;;Format similar to YV12 but including a level of indirection.;;;;YUV;
-CM10;MediaShow;;CyberLink Corporation;http://www.cyberlink.com;;;;
-CMYK;CMYK;;Common Data Format in Printing;;;;;
-COL0;MPEG-4 Visual;;Hacked MS MPEG-4 v3;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
-COL1;MPEG-4 Visual;;Hacked MS MPEG-4 v3;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
-CPLA;YUV;Weitek;;;;;YUV;4:2:0
-CRAM;MS Video;;Microsoft Video 1;;;;;
-CSCD;CamStudio;;RenderSoft CamStudio lossless (LZO & GZIP compression);;;;;
-CT10;TalkingShow;;CyberLink Corporation;http://www.cyberlink.com;;;;
-CTRX;Citrix;;Citrix Scalable Video;;;;;
-CUVC;Canopus HQ;;Canopus HQ;;;;;
-CVID;Cinepack;;;http://www.cinepak.com/text.html;;;;
-cvid;Cinepack;;;http://www.cinepak.com/text.html;;;;
-CWLT;WLT;;Microsoft Color WLT DIB;;;;;
-CYUV;YUV;Creative Labs;;http://www.fourcc.org/indexyuv.htm;;;YUV;4:2:2
-cyuv;YUV;;;http://www.fourcc.org/indexyuv.htm;;;YUV;4:2:2
-CYUY;YUV;ATI;;http://www.fourcc.org/indexyuv.htm;;;YUV;4:2:2
-D261;H.261;DEC;;;;;;
-D263;H.263;DEC;;;;;;
-DAVC;AVC;Dicas;;;;;YUV;4:2:0
-DC25;DV;MainConcept;;;;;YUV;
-DCAP;DV;Pinnacle;;;;;YUV;
-DCL1;Data Connextion;;Conferencing;;;;;
-DCT0;WniWni;;;;;;;
-DFSC;VFW;;DebugMode FrameServer VFW;;;;;
-DIB ;RGB;;;;;;RGB;
-DIV1;MPEG-4 Visual;FFMpeg;Hacked MS MPEG-4 V1;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
-DIV2;MPEG-4 Visual;MS MPEG-4 1/2;;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
-DIV3;MPEG-4 Visual;DivX 3 Low;;http://www.divx.com;;;YUV;4:2:0
-DIV4;MPEG-4 Visual;DivX 3 Fast;;http://www.divx.com;;;YUV;4:2:0
-DIV5;MPEG-4 Visual;DivX 5;;http://www.divx.com;;;YUV;4:2:0
-DIV6;MPEG-4 Visual;MS MPEG-4 v3;;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
-DIVX;MPEG-4 Visual;DivX 4;Project Mayo;http://mediaarea.net/DIVX;;;YUV;4:2:0
-divx;MPEG-4 Visual;DivX;Mainly used by Google;http://www.divx.com;;;YUV;4:2:0
-DJPG;M-JPEG;Broadway 101;Data Translation, Inc.;;;;YUV;4:2:0
-DM4V;MPEG-4 Visual;Dicas;;;;;YUV;4:2:0
-DMB1;M-JPEG;Rainbow;Matrox Rainbow Runner hardware compression;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.MJPG.v2.10.27.codec.exe;;;YUV;4:2:0
-DMB2;M-JPEG;Paradigm;;;;;YUV;4:2:0
-DMK2;V36 PDA;;ViewSonic V36 PDA Video;;;;;
-DP02;MPEG-4 Visual;DynaPel;;;;;YUV;4:2:0
-DP16;YUV;Matsushita;With DPCM 6-bit compression;;;;YUV;4:1:1
-DP18;YUV;Matsushita;With DPCM 8-bit compression;;;;YUV;4:1:1
-DP26;YUV;Matsushita;With DPCM 6-bit compression;;;;YUV;4:2:2
-DP28;YUV;Matsushita;With DPCM 8-bit compression;;;;YUV;4:2:2
-DP96;YUV;Matsushita;With DPCM 6-bit compression;;;;YUV;
-DP98;YUV;Matsushita;With DPCM 8-bit compression;;;;YUV;
-DP9L;YUV;Matsushita;With DPCM 6-bit compression;;;;YUV;
-DPS0;M-JPEG;DPS Reality;Dummy format - only AVI header;;;;YUV;4:2:0
-DPSC;M-JPEG;DPS PAR;Dummy format - only AVI header;;;;YUV;4:2:0
-DRWX;DV;Pinnacle;;;;;YUV;
-DSVD;DV;Microsoft;;;;;YUV;
-DTMT;Media-100;;;;;;
-DTNT;Media-100;;;;;;
-DUCK;TrueMotion S;Duck Corporation;;;;;
-DV10;RGB;BlueFish;BlueFish444 (lossless RGBA, YUV 10-bit);;;;RGB
-DV25;DV;DVCPro;;;;;YUV
-dv25;DV;DVCPro;;;;;YUV
-DV50;DV;DVCPro5;;;;;YUV
-dv50;DV;DVCPro5;;;;;YUV
-DVAN;DV;Pinnacle DV300;;;;;YUV
-DVC ;DV;Apple;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-DVCP;DV;Apple;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
-DVCS;DV;MainConcept;;;;;YUV
-DVE2;DV;Insoft DVE-2;InSoft DVE-2 Videoconferencing;;;;YUV
-DVH1;DV;Pinnacle;;;;;YUV
-dvhd;DV;HD;;;;;YUV
-DVIS;DV;DualMoon;;;;;YUV
-DVL ;DV;Radius;;;;;YUV
-DVLP;DV;Radius;;;;;YUV
-DVMA;DV;Darim;;;;;YUV;
-DVNM;DVNM;;Matsushita Electric Industrial Co., Ltd.;;;;;
-DVOR;RGB;BlueFish;BlueFish444 (lossless RGBA, YUV 10-bit);;;;RGB;
-DVPN;DV;Apple;;;;;YUV;
-DVPP;DV;Apple;;;;;YUV;
-DVR ;MPEG Video;ASF;;;;;YUV;4:2:0
-DVR1;Targa2000;;;;;;;
-DVRS;DV;DualMoon;;;;;YUV;
-dvsd;DV;Sony;;;;;YUV;
-dvsl;DV;Sony;;;;;YUV;
-DVSL;DV;;;;;;YUV;
-DVX1;DVX 1 SP;;Lucent DVX1000SP Video Decoder;;;;;
-DVX2;DVX 2 S;;Lucent DVX2000S Video Decoder;;;;;
-DVX3;DVX 3 S;;Lucent DVX3000S Video Decoder;;;;;
-DX50;MPEG-4 Visual;DivX 5;;http://mediaarea.net/DX50;;;YUV;4:2:0
-DXGM;EA GameVideo;;;;;;;
-DXT1;DirectX TC;;DirectX Compressed Texture (1bit alpha channel)
-DXT2;DirectX TC;;DirectX Compressed Texture
-DXT3;DirectX TC;;DirectX Compressed Texture (4bit alpha channel)
-DXT4;DirectX TC;;DirectX Compressed Texture
-DXT5;DirectX TC;;DirectX Compressed Texture (3bit alpha channel with interpolation)
-DXTC;DirectX TC;;DirectX Texture Compression
-DXTn;DirectX TC;;Microsoft Compressed Texture
-DXTN;DirectX TC;;Microsoft DirectX Compressed Texture (DXTn)
-EKQ0;Elsa KQ;;Elsa graphics card quick
-ELK0;Elsa LK;;Elsa graphics card
-EM2V;Elymonyx MPEG-2;;Etymonix MPEG-2 I-frame
-EQK0;Elsa;;Elsa graphics card quick
-ESCP;Escape;;Eidos Escape
-ETV1;eTreppid 1;;eTreppid Video 1
-ETV2;eTreppid 2;;eTreppid Video 2
-ETVC;eTreppid C;;eTreppid Video C
-FFDS;FFDS;;;http://ffdshow-tryout.sourceforge.net/;;;;
-FFV1;FFV1;;;http://ffdshow-tryout.sourceforge.net/;;;;
-FFVH;FFVH;;;http://ffdshow-tryout.sourceforge.net/;;;;
-FLIC;FLI/FLC;Autodesk;;;;;;
-FLJP;DField M-JPEG;;D-Vision Field Encoded M-JPEG with LSI (or Targa emulation);;;;;
-FLV1;FFDS;;FFDShow supported;http://ffdshow-tryout.sourceforge.net/;;;;
-FLV4;VP6;On2;;http://www.on2.com;;;;
-FMJP;M-JPEG;D-Vision;;;;;YUV;4:2:0
-FMP4;MPEG-4 Visual;;;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
-FPS1;Fraps;;;http://www.fraps.com/;;;;
-FRLE;M-JPEG;SoftLab-Nsk;SoftLab-NSK Y16 + Alpha RLE;;;;YUV;4:2:0
-FRWA;M-JPEG;SoftLab-Nsk;SoftLab-NSK Vision Forward M-JPEG with Alpha-channel;;;;YUV;4:2:0
-FRWD;M-JPEG;SoftLab-Nsk;SoftLab-NSK Vision Forward M-JPEG;;;;YUV;4:2:0
-FRWT;M-JPEG;SoftLab-Nsk;SoftLab-NSK Vision Forward M-JPEG with Alpha-channel;;;;YUV;4:2:0
-FRWU;M-JPEG;SoftLab-Nsk;SoftLab-NSK Vision Forward Uncompressed;;;;YUV;4:2:0
-FVF1;Itered Fractal;;;;;;;
-FVFW;FVFW;;;http://ffdshow-tryout.sourceforge.net/;;;;
-FXT1;3DFX;;;;;;;
-G2M2;GoToMeeting2;;Citrix Systems, Inc.;http://www.gotomeeting.com/;;;;
-G2M3;GoToMeeting3;;Citrix Systems, Inc.;http://www.gotomeeting.com/;;;;
-GEPJ;M-JPEG;White Pine;;;;;YUV;4:2:0
-GJPG;Grand Tech GT891x;;;;;;;
-GLCC;GigaLink;;;;;;;
-GLZW;LZW;Gabest;;http://sourceforge.net/project/showfiles.php?group_id=82303&package_id=84358;;;;
-GPEG;M-JPEG;Gabest;;http://sourceforge.net/project/showfiles.php?group_id=82303&package_id=84358;;;YUV;4:2:0
-GPJM;M-JPEG;Pinnacle;;;;;YUV;4:2:0
-GREY;YUV;;Simple grayscale video;http://www.fourcc.org/indexyuv.htm;;;YUV;
-GWLT;MS GWLT;;Microsoft Greyscale WLT DIB;;;;;
-GXVE;ViVD V2;SoftMedia;;;;;;
-H260;H.260;;;;;;;
-H261;H.261;;;;;;;
-H262;MPEG Video;;;;;;YUV;4:2:0
-H263;H.263;;;;;;;
-h263;H.263;;;http://www.apple.com/quicktime/download/standalone.html;;;;
-H264;AVC;;;;;;YUV;4:2:0
-h264;AVC;;;;;;YUV;4:2:0
-H265;H.265;;;;;;;
-H266;H.266;;;;;;;
-H267;H.267;;;;;;;
-H268;H.268;;;;;;;
-H269;H.263;;;;;;;
-HD10;RGB;BlueFish;BlueFish444 (lossless RGBA, YUV 10-bit);;;;RGB;
-HDX4;Jomigo HDX4;;;;;;;
-HFYU;Huffman;;;;;;;
-HMCR;Rendition;;Rendition Motion Compensation Format;;;;;
-HMRR;Rendition;;Rendition Motion Compensation Format;;;;;
-i263;H.263;;;;;;;
-I420;H.263;;;;;;;
-IAN ;Indeo 4;;;;;;;
-ICLB;CellB;;InSoft CellB Videoconferencing;;;;;
-IDM0;Wavelets 2;;IDM Motion Wavelets 2.0;;;;;
-IF09;H.261;Microsoft;;;;;;
-IFO9;YUV;Intel;;;;;YUV;
-IGOR;PowerDVD;;;;;;;
-IJPG;M-JPEG;Intergraph;;;;;YUV;4:2:0
-ILVC;Layered Video;Intel;;;;;;
-ILVR;H.263+;;;;;;;
-IMAC;MotionComp;;Intel hardware motion compensation.;;;;;
-IMC1;YUV;;As YV12, except the U and V planes each have the same stride as the Y plane;;;;YUV;
-IMC2;YUV;;Similar to IMC1, except that the U and V lines are interleaved at half stride boundaries;;;;YUV;
-IMC3;YUV;;As IMC1, except that U and V are swapped;;;;YUV;
-IMC4;YUV;;As IMC2, except that U and V are swapped;;;;YUV;
-IMG ;YUV;;;;;;YUV;
-IMJG;Accom M-JPEG;;Accom SphereOUS M-JPEG with Alpha-channel;;;;;
-IPDV;I-O DV;;I-O Data Device Giga AVI DV;;;;
-IPJ2;M-JPEG2000;;Image Power JPEG2000;;;;
-IR21;Indeo 2.1;;;;;;
-IRAW;YUV;;;http://www.fourcc.org/indexyuv.htm;;;YUV
-ISME;ISME;;Intel;;;;
-IUYV;YUV;;Lead 16bpp. Interlaced version of UYVY (line order 0, 2, 4,....,1, 3, 5....);;;;YUV
-IV30;Indeo 3;;Intel Indeo Video 3;;;;
-IV31;Indeo 3;;Intel Indeo Video 3.1;;;;
-IV32;Indeo 3;;Intel Indeo Video 3.2;;;;
-IV33;Indeo 3;;Intel Indeo Video 3.3;;;;
-IV34;Indeo 3;;Intel Indeo Video 3.4;;;;
-IV35;Indeo 3;;Intel Indeo Video 3.5;;;;
-IV36;Indeo 3;;Intel Indeo Video 3.6;;;;
-IV37;Indeo 3;;Intel Indeo Video 3.7;;;;
-IV38;Indeo 3;;Intel Indeo Video 3.8;;;;
-IV39;Indeo 3;;Intel Indeo Video 3.9;;;;
-IV40;Indeo 4;;Intel Indeo Video 4.0;;;;
-IV41;Indeo 4;;Intel Indeo Video 4.1;;;;
-IV42;Indeo 4;;Intel Indeo Video 4.2;;;;
-IV43;Indeo 4;;Intel Indeo Video 4.3;;;;
-IV44;Indeo 4;;Intel Indeo Video 4.4;;;;
-IV45;Indeo 4;;Intel Indeo Video 4.5;;;;
-IV46;Indeo 4;;Intel Indeo Video 4.6;;;;
-IV47;Indeo 4;;Intel Indeo Video 4.7;;;;
-IV48;Indeo 4;;Intel Indeo Video 4.8;;;;
-IV49;Indeo 4;;Intel Indeo Video 4.9;;;;
-IV50;Indeo 4;;Intel Indeo Video 5.0 Wavelet;http://www.fourcc.org/indexyuv.htm;;;
-IY41;YUV;;Lead 16bpp. Interlaced version of Y41P (line order 0, 2, 4,....,1, 3, 5....);http://www.fourcc.org/indexyuv.htm;;;YUV
-IYU1;YUV;;IEEE1394 12bpp. 12 bit format used in mode 2 of the IEEE 1394 Digital Camera 1.04 spec;http://www.fourcc.org/indexyuv.htm;;;YUV
-IYU2;YUV;;IEEE1394 24bpp. 24 bit format used in mode 2 of the IEEE 1394 Digital Camera 1.04 spec;;;;YUV
-IYUV;YUV;;Intel Indeo iYUV 4:2:0;;;;YUV
-JBYR;Kensington;;Kensington Video;http://ffdshow-tryout.sourceforge.net/;;;
-JFIF;M-JPEG;;;;;;YUV;4:2:0
-JPEG;M-JPEG;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:0
-JPG;M-JPEG;;;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe;;;YUV;4:2:0
-JPGL;M-JPEG;Pegasus;DIVIO JPEG Light for WebCams (Pegasus Lossless JPEG);;;;YUV;4:2:0
-KMVC;Karl;;Karl Morton's Video (presumably);http://www.apple.com/quicktime/download/standalone.html;;;;
-kpcd;Photo CD;;Kodak Photo CD;;;;;
-L261;H.261;Lead Technologies;;;;;;
-L263;H.263+;Lead Technologies;;;;;;
-LAGS;Lagarith;;;;;;;
-LBYR;Creative WebCam;;;;;;;
-LCMW;Lead CMW;;Lead Technologies Motion CMW;;;;;
-LCW2;Lead MCMW;;LEADTools MCMW 9Motion Wavelet;http://mirror01.iptelecom.net.ua/~video/codecs/LEAD.MCMP-M-JPEG.v1.016.codec.exe;;;;
-LEAD;Lead Video;;;;;;;
-LGRY;Lead GrayScale;;;;;;;
-LIA1;Liafail;;Liafail, Inc.;;;;;
-LJ2K;M-JPEG2000;Lead;;http://mirror01.iptelecom.net.ua/~video/codecs/LEAD.MCMP-M-JPEG.v1.016.codec.exe;;;;
-LJPG;M-JPEG;Lead;;http://mirror01.iptelecom.net.ua/~video/codecs/LEAD.MCMP-M-JPEG.v1.016.codec.exe;;;YUV;4:2:0
-Ljpg;M-JPEG;Lead;;;;;YUV;4:2:0
-LMP2;MPEG-PS;Lead;;;;;;
-LOCO;LOCO;;Lossless;;;;;
-LSCR;Lead Screen capture;;;;;;;
-LSV0;LSV0;;Infinop Inc.;;;;;
-LSVC;Vmail;;Vianet Lighting Strike Vmail (Streaming);;;;;
-LSVM;Vmail;;Vianet Lighting Strike Vmail (Streaming);;;;;
-LSVW;Infinop;;Infinop Lightning Strike multiple bit rate video codec.;;;;;
-LSVX;Vmail;;Vianet Lightning Strike Video Codec;;;;;
-LZO1;LZO;;LZO compressed (lossless);;;;;
-M101;YUV;Matrox;;;;;YUV;
-M261;H.261;Microsoft;;;;;;
-M263;H.263;Microsoft;;;;;;
-M4CC;MPEG-4 Visual;ESS Divo;;;;;YUV;4:2:0
-M4S2;MPEG-4 Visual;Microsoft;;;;;YUV;4:2:0
-MC12;ATI Motion;;ATI Motion Compensation Format;;;;;
-MC24;M-JPEG;MainConcept;;;;;YUV;4:2:0
-MCAM;ATI Motion;;ATI Motion Compensation Format;;;;;
-MCZM;RGB;;Theory MicroCosm Lossless 64bit RGB with Alpha-channel;;;;RGB;
-MDVD;MicroDVD;;Alex MicroDVD Video (hacked MS MPEG-4);;;;;
-MDVF;DV;Pinnacle;Pinnacle DV/DV50/DVHD100;;;;YUV;
-MHFY;YUV;;A.M.Paredes mhuffyYUV (LossLess);http://mirror01.iptelecom.net.ua/~video/codecs/Pinnacle.ReelTime.v2.5.software.only.codec.exe;;;YUV;
-MJ2C;M-JPEG2000;;Morgan Multimedia JPEG2000 Compression;http://mirror01.iptelecom.net.ua/~video/codecs/Pinnacle.ReelTime.v2.5.software.only.codec.exe;;;;
-MJPA;M-JPEG;Pinacle;Pinnacle ReelTime MJPG hardware;http://mediaxw.sourceforge.net;;;YUV;4:2:0
-MJPB;M-JPEG;Pinacle B;;;;;YUV;4:2:0
-MJPG;M-JPEG;;;;;;YUV;4:2:0
-mJPG;M-JPEG;IBM;Including Huffman Tables;;;;YUV;4:2:0
-MJPX;M-JPEG;Pegasus;Pegasus PICVideo M-JPEG;;;;YUV;4:2:0
-ML20;Webcam;;Mimic MSN Messenger Webcam;;;;;
-MMES;MPEG Video;Matrox;I-frame;;;;YUV;4:2:0
-MMIF;MPEG Video;Matrox;I-frame;;;;YUV;4:2:0
-MNVD;MindVid;;MindBend MindVid LossLess;;;;;
-MP2V;MPEG Video;;Media Excel MPEG-2 Video;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
-MP2v;MPEG Video;;MPEG-2 Video;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
-MP41;MPEG-4 Visual;Microsoft;Microsoft MPEG-4 v1 (pre-standard);http://ffdshow-tryout.sourceforge.net/;;;;
-MP42;MPEG-4 Visual;Microsoft;Microsoft MPEG-4 v2 (pre-standard);http://www.apple.com/quicktime/download/standalone.html;;;;
-MP43;MPEG-4 Visual;Microsoft;Microsoft MPEG-4 v3 (pre-standard);;;;;
-MP4S;MPEG-4 Visual;MS MPEG-4 v3;Microsoft MPEG-4 (Windows Media 7.0);;;;YUV;4:2:0
-MP4V;MPEG-4 Visual;;Apple QuickTime MPEG-4 native;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
-MPEG;MPEG Video;;Chromatic MPEG 1 Video I Frame;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
-mpeg;MPEG Video;;MPEG-1 Video;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
-MPG1;MPEG Video;Ffmpeg;(MPEG-1/2) FFmpeg;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
-mpg1;MPEG Video;Ffmpeg;(MPEG-1/2) FFmpeg;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
-MPG2;MPEG Video;Ffmpeg;(MPEG-1/2) FFmpeg;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
-mpg2;MPEG Video;Ffmpeg;(MPEG-1/2) FFmpeg;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
-MPG3;MPEG-4 Visual;FFmpeg DivX 3;(MPEG-4) MS MPEG-4 v3;;;;YUV;4:2:0
-MPG4;MPEG-4 Visual;MS MPEG-4 v1;Microsoft MPEG-4 v1;;;;YUV;4:2:0
-MPGI;MPEG Video;Sigma;Sigma Design MPEG-1 I-frame;;;;YUV;4:2:0
-MPNG;M-PNG;;Motion PNG;;;;;
-MRCA;Mrcodec;;FAST Multimedia;;;;;
-MRLE;RLE;;Microsoft RLE;;;;RGB;
-MSS1;Screen Video;Windows;Windows Screen Video;;;;;
-MSS2;Windows Media;;Windows Media 9;;;;;
-MSUC;MSU;;MSU LossLess;;;;;
-MSUD;MSU;;MSU LossLess;;;;;
-MSV1;Microsoft Video 1;;Microsoft Video 1;;;;;
-MSVC;Microsoft Video 1;;Microsoft Video 1;;;;;
-MSZH;AVImszh;;Lossless (ZIP compression);;;;;
-MTGA;TGA;;Motion TGA images (24, 32 bpp);;;;;
-MTX1;M-JPEG;Matrox;;;;;YUV;4:2:0
-MTX2;M-JPEG;Matrox;;;;;YUV;4:2:0
-MTX3;M-JPEG;Matrox;;;;;YUV;4:2:0
-MTX4;M-JPEG;Matrox;;;;;YUV;4:2:0
-MTX5;M-JPEG;Matrox;;;;;YUV;4:2:0
-MTX6;M-JPEG;Matrox;;;;;YUV;4:2:0
-MTX7;M-JPEG;Matrox;;;;;YUV;4:2:0
-MTX8;M-JPEG;Matrox;;;;;YUV;4:2:0
-MTX9;M-JPEG;Matrox;;;;;YUV;4:2:0
-MV10;Nokia;;Nokia Mobile Phones;;;;;
-MV11;Nokia;;Nokia Mobile Phones;;;;;
-MV12;MVI;;Motion Pixels (old);;;;;
-MV99;Nokia;;Nokia Mobile Phones;;;;;
-MVC1;Nokia;;Nokia Mobile Phones;;;;;
-MVC2;Nokia;;Nokia Mobile Phones;;;;;
-MVC9;Nokia;;Nokia Mobile Phones;;;;;
-MVI1;MVI;;Motion Pixels MVI;;;;;
-MVI2;MVI;;Motion Pixels MVI;;;;;
-MWV1;Aware Motion Wavelets;;Aware Motion Wavelets;;;;;
-MYUV;RGB;;Media-100 844/X Uncompressed;;;;RGB;
-NAVI;MPEG-4 Visual;;nAVI video (hacked MS MPEG-4);;;;YUV;4:2:0
-NDIG;MPEG-4 Visual;Ahead;Ahead Nero Digital MPEG-4;;;;YUV;4:2:0
-NHVU;Nvidia Texture;;Nvidia Texture Format (GEForce 3);;;;;
-NO16;RGB;;Theory None16 64bit uncompressed Uncompressed;;;;RGB;
-NT00;YUV;LightWave;NewTek LightWave HDTV YUV with Alpha-channel;;;;YUV;
-NTN1;NogaTech Video 1;;Nogatech Video Compression 1;;;;;
-NTN2;NogaTech Video 2;;Nogatech Video Compression 2 (GrabBee hardware coder);;;;;
-NUV1;Nuppel;;NuppelVideo;;;;;
-NV12;YUV;;8-bit Y plane followed by an interleaved U/V plane with 2x2 subsampling;;;;YUV;
-NV21;YUV;;As NV12 with U and V reversed in the interleaved plane;;;;YUV;
-NVDS;Nvidia Texture;;Nvidia Texture Format;;;;;
-NVHS;Nvidia Texture;;Nvidia Texture Format (GeForce 3);;;;;
-NVHU;Nvidia Texture;;Nvidia Texture Format;;;;;
-NVS0;Nvidia Texture;;Nvidia Texture Compression Format;;;;;
-NVS1;Nvidia Texture;;Nvidia Texture Compression Format;;;;;
-NVS2;Nvidia Texture;;Nvidia Texture Compression Format;;;;;
-NVS3;Nvidia Texture;;Nvidia Texture Compression Format
-NVS4;Nvidia Texture;;Nvidia Texture Compression Format
-NVS5;Nvidia Texture;;Nvidia Texture Compression Format
-NVS6;Nvidia Texture;;Nvidia Texture Compression Format
-NVS7;Nvidia Texture;;Nvidia Texture Compression Format
-NVS8;Nvidia Texture;;Nvidia Texture Compression Format
-NVS9;Nvidia Texture;;Nvidia Texture Compression Format
-NVT0;Nvidia Texture;;Nvidia Texture Compression Format
-NVT1;Nvidia Texture;;Nvidia Texture Compression Format
-NVT2;Nvidia Texture;;Nvidia Texture Compression Format
-NVT3;Nvidia Texture;;Nvidia Texture Compression Format
-NVT4;Nvidia Texture;;Nvidia Texture Compression Format
-NVT5;Nvidia Texture;;Nvidia Texture Compression Format
-NVT6;Nvidia Texture;;Nvidia Texture Compression Format
-NVT7;Nvidia Texture;;Nvidia Texture Compression Format
-NVT8;Nvidia Texture;;Nvidia Texture Compression Format
-NVT9;Nvidia Texture;;Nvidia Texture Compression Format;;;;;
-NY12;YUV;Nogatech;;;;;YUV;
-NYUV;YUV;Nogatech;;;;;YUV;
-ONYX;VP7;On2;;http://www.on2.com/vp7.php3;;;;
-PCLE;Studio400;Pinnacle;;;;;;
-PDVC;DV;Panasonic;;;;;YUV;
-PGVV;Radius Video Vision;;;;;;;
-PHMO;Photomotion;IBM;;;;;;
-PIM1;M-JPEG;Pegasus;Pinnacle DC1000 hardware (MPEG compression);http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe;;;YUV;4:2:0
-PIM2;M-JPEG;Pegasus;Pegasus Imaging;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe;;;YUV;4:2:0
-PIMJ;M-JPEG;Pegasus;Pegasus Imaging PICvideo Lossless JPEG;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe;;;YUV;4:2:0
-PIXL;M-JPEG;Miro;MiroVideo XL (M-JPEG);;;;YUV;4:2:0
-PNG;M-PNG;;;;;;;
-PNG1;M-PNG;;Corecodec.org CorePNG;;;;;
-PVEZ;PowerEZ;;Horizons Technology PowerEZ;;;;;
-PVMM;MPEG-4 Visual;Pegasus;PacketVideo Corporation MPEG-4;;;;YUV;4:2:0
-PVW2;Wavelet;Pegasus;Pegasus Imaging Wavelet 2000;;;;;
-PVWV;Wavelet;Pegasus;Pegasus Imaging Wavelet 2000;;;;;
-PXLT;Pixlet;;Apple Pixlet (Wavelet);;;;;
-Q1.0;QPEG 1.0;;Q-Team QPEG 1.0;http://www.q-team.de;;;;
-Q1.1;QPEG 1.1;;Q-Team QPEG 1.1;http://www.q-team.de;;;;
-QDGX;Apple GX;;Apple QuickDUncompressed GX;;;;;
-QDRW;Palettized Video;;Apple;;;;;
-QPEG;QPEG 1.1;;Q-Team QPEG 1.1;;;;;
-QPEQ;QPEG 1.1;;Q-Team QPEG 1.1;;;;;
-R210;YUV;;BlackMagic YUV (Quick Time);;;;YUV;
-R411;DV;Radius;Radius DV NTSC YUV;;;;YUV;
-R420;DV;Radius;Radius DV PAL YUV;;;;YUV;
-RAV_;MPEG-1;GroupTron;GroupTRON ReferenceAVI (dummy for MPEG compressor);;;;YUV;4:2:0
-RAVI;MPEG-1;GroupTron;GroupTRON ReferenceAVI (dummy for MPEG compressor);;;;YUV;4:2:0
-RAW ;RGB;;Full Frames (Uncompressed);;;;RGB;
-raw ;RGB;;Full Frames (Uncompressed);http://www.apple.com/quicktime/download/standalone.html;;;RGB;
-RGB ;RGB;;;;;;RGB;8:8:8
-RGB1;RGB;;;;;;RGB 3:3:2;3:3:2
-RGB2;RGB;;;;;;RGB 3:3:2;3:3:2
-RGBA;RGB;;;http://www.fourcc.org/indexrgb.htm;;;RGB;
-RGBO;RGB;;Little Endian;;;;RGB 5:5:5;5:5:5
-RGBP;RGB;;Little Endian;;;;RGB 5:6:5;5:6:5
-RGBQ;RGB;;Big Endian;;;;RGB 5:5:5;5:5:5
-RGBR;RGB;;Big Endian;;;;RGB 5:6:5;5:6:5
-RGBT;RGBA;;;http://www.fourcc.org/indexrgb.htm;;;RGBA;
-RIVA;Swizzled texture;;Nvidia;;;;;
-RL4;RLE;;RLE 4bpp RGB;;;;RGB;
-RL8;RLE;;RLE 8bpp RGB;;;;RGB;
-RLE ;RLE;;RLE RGB with arbitrary sample packing within a pixel;http://www.fourcc.org/indexrgb.htm;;;RGB;
-RLE4;RLE;;RLE 4bpp RGB;http://www.fourcc.org/indexrgb.htm;;;RGB;
-RLE8;RLE;;RLE 8bpp RGB;http://www.fourcc.org/indexrgb.htm;;;RGB;
-RLND;Roland;;Roland Corporation;;;;;
-RMP4;MPEG-4 Visual;RealMagic;REALmagic MPEG-4 Video (Sigma Design, built on XviD);;;;YUV;4:2:0
-ROQV;Id RoQ;;Id RoQ File Video Decoder;;;;;
-RT21;Intel Video 2.1;;Intel Real Time Video 2.1;;;;;
-RTV0;NewTek VideoToaster;;NewTek VideoToaster (dummy format - only AVI header);;;;;
-RUD0;Rududu;;Rududu video;;;;;
-RV10;RealVideo 1;;H263, RealVideo 5;http://www.real.com;;;;
-RV13;RealVideo 1;;H263, RealVideo 5;http://www.real.com;;;;
-RV20;RealVideo 2;;H263, RealVideo 6;http://www.real.com;;;;
-RV30;RealVideo 3;;Between H263 and H264, RealVideo 8;http://www.real.com;;;;
-RV40;RealVideo 4;;H264, RealVideo 9;http://www.real.com;;;;
-RVX ;RDX;;Intel RDX;;;;;
-S263;H.263;;;http://ffdshow-tryout.sourceforge.net/;;;;
-S422;YUV;VideoCap C210;VideoCap C210;;;;YUV;
-SAN3;MPEG-4 Visual;;Direct copy of DivX 3.11;;;;YUV;4:2:0
-SANM;Smush v2;;LucasArts;http://www.lucasarts.com/;;;;
-SCCD;SoftCam;;;;;;;
-SDCC;DV;Sun;Sun Digital Camera;;;;YUV;4:1:1
-SEDG;MPEG-4 Visual;Samsung;Samsung MPEG-4;;;;YUV;4:2:0
-SEG4;Cinepak;;;http://www.sega.com/;;;;
-SEGA;Cinepak;;;http://www.sega.com/;;;;
-SFMC;CrystalNet;;CrystalNet Surface Fitting Method;;;;;
-SHR0;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless);;;;;
-SHR1;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless);;;;;
-SHR2;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless);;;;;
-SHR3;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless);;;;;
-SHR4;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless);;;;;
-SHR5;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless);;;;;
-SHR6;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless);;;;;
-SHR7;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless);;;;;
-SIF1;SIF1;;;http://mysif.ru/SIF1_dd_Eng.htm;;;;
-SJPG;M-JPEG;CuSeeMe;CuSeeMe;http://mirror01.iptelecom.net.ua/~video/codecs/CUseeMe.M-JPEG.CODEC.v1.17.exe;;;YUV;4:2:0
-SL25;DV;SoftLab DVCPro;SoftLab-NSK DVCPRO;;;;YUV;4:1:1
-SL50;DV;SoftLab DVCPro5;SoftLab-NSK ;;;;YUV;4:1:1
-SLDV;DV;SoftLab;SoftLab-NSK Forward DV Draw;;;;YUV;4:1:1
-SLIF;MPEG Video;SoftLab;SoftLab-NSK MPEG-2 I-frames;;;;YUV;4:2:0
-SLMJ;M-JPEG;SoftLab;SoftLab-NSK Forward M-JPEG;;;;YUV;4:2:0
-smc ;SMC;;Apple Graphics (SMC);http://www.apple.com/quicktime/download/standalone.html;;;;
-SMSC;Radius;;;;;;;
-SMSD;Radius;;;;;;;
-SMSV;Wavelet Video;;WorldConnect Wavelet Streaming Video;;;;;
-SNOW;Snow;;;http://ffdshow-tryout.sourceforge.net/;;;;
-SP40;YUV;SunPlus;SunPlus YUV;;;;YUV;
-SP44;MegaCam;;SunPlus Aiptek MegaCam;;;;;
-SP53;MegaCam;;SunPlus Aiptek MegaCam;;;;;
-SP54;MegaCam;;SunPlus Aiptek MegaCam;;;;;
-SP55;MegaCam;;SunPlus Aiptek MegaCam;;;;;
-SP56;MegaCam;;SunPlus Aiptek MegaCam;;;;;
-SP57;MegaCam;;SunPlus Aiptek MegaCam;;;;;
-SP58;MegaCam;;SunPlus Aiptek MegaCam;;;;;
-SP61;MegaCam;;SunPlus Aiptek MegaCam;;;;;
-SPIG;Spigot;;Radius Spigot;;;;;
-SPLC;ACM audio;;Splash Studios ACM Audio;;;;;
-SPRK;Spark;;;;;;;
-SQZ2;VXTreme 2;;Microsoft VXTreme Video V2;;;;;
-STVA;ST Imager;;ST Microelectronics CMOS Imager Data (Bayer);;;;;
-STVB;ST Imager;;ST Microelectronics CMOS Imager Data (Nudged Bayer);;;;;
-STVC;ST Imager;;ST Microelectronics CMOS Imager Data (Bunched);;;;;
-STVX;ST Imager;;ST Microelectronics CMOS Imager Data (Extended Data Format);;;;;
-STVY;ST Imager;;ST Microelectronics CMOS Imager Data (Extended Data Format with Correction Data);;;;;
-SV10;Sorenson;;Sorenson Media Video R1;;;;;
-SVQ1;Sorenson 1;;Sorenson Media Video 1 (Apple QuickTime 3);;;;;
-SVQ2;Sorenson 2;;Sorenson Media Video 2 (Apple QuickTime 4);;;;;
-SVQ3;Sorenson 3;;Sorenson Media Video 3 (Apple QuickTime 5);;;;;
-SWC1;M-JPEG;MainConcept;MainConcept M-JPEG;;;;YUV;4:2:0
-T420;YUV;Toshiba;Toshiba YUV 4:2:0;;;;YUV;
-TGA ;TGA;Apple;Apple TGA (with Alpha-channel)
-THEO;Theora;;FFVFW Supported
-TIFF;Apple TIFF;;Apple TIFF (with Alpha-channel)
-TIM2;Pinnacle DVI;;Pinnacle RAL DVI
-TLMS;TeraLogic;;TeraLogic Motion Intraframe
-TLST;TeraLogic;;TeraLogic Motion Intraframe
-TM10;Duck;;Duck TrueMotion
-TM20;Duck 2;;Duck TrueMotion 2.0
-TM2A;Duck Archiver 2;;Duck TrueMotion Archiver 2.0
-TM2X;Duck 2;;Duck TrueMotion 2X
-TMIC;TeraLogic;;TeraLogic Motion Intraframe
-TMOT;Horizons TM S;;Horizons Technology TrueMotion Video
-TR20;Duck TM RT2;;Duck TrueMotion RT 2.0
-TRLE;Akula;;Akula Alpha Pro Custom AVI (LossLess)
-TSCC;TechSmith;;TechSmith Screen Capture
-tscc;TechSmith;;TechSmith Screen Capture
-TV10;Tecomac;;Tecomac Low-Bit Rate;;;;;
-TVJP;Pinnacle/Truevision;;TrueVision Field Encoded M-JPEG (Targa emulation);;;;;
-TVMJ;Pinnacle/Truevision;;Truevision TARGA M-JPEG Hardware (or Targa emulation);;;;;
-TY0N;Trident;;Trident Decompression Driver;;;;;
-TY2C;Trident;;Trident Decompression Driver;;;;;
-TY2N;Trident;;Trident Decompression Driver;;;;;
-U<Y ;YUV;Discreet;Discreet UC YUV 4:2:2:4 10 bit;;;;YUV;
-U<YA;YUV;Discreet;Discreet UC YUV 4:2:2:4 10 bit (with Alpha-channel);;;;YUV;
-U263;H.263;UB;UB Video H.263/H.263+/H.263++ Decoder;http://eMajix.com;;;;
-UCOD;ClearVideo;;ClearVideo (fractal compression-based);;;;;
-ULTI;Ultimotion;;IBM Ultimotion;;;;;
-UMP4;MPEG-4 Visual;UB;UB Video MPEG 4;http://www.fourcc.org/indexyuv.htm;;;YUV;4:2:0
-UYNV;YUV;;Nvidia 16bpp. A direct copy of UYVY registered by Nvidia to work around problems in some olds which did not like hardware which offered more than 2 UYVY surfaces.;http://www.fourcc.org/indexyuv.htm;;;YUV;
-UYVP;YUV;;Evans & Sutherland 24bpp. YUV 4:2:2 extended precision 10-bits per component in U0Y0V0Y1 order;;;;YUV;
-UYVU;YUV;SoftLab;SoftLab-NSK Forward YUV;http://www.fourcc.org/indexyuv.htm;;;YUV;
-UYVY;YUV;;Uncompressed 16bpp. YUV 4:2:2 (Y sample at every pixel, U and V sampled at every second pixel horizontally on each line). A macropixel contains 2 pixels in 1 u_int32.;;;;YUV;4:2:2
-V210;Optibase;;Optibase VideoPump 10-bit 4:2:2 Component YUV;;;;;
-V261;VX3000S;;Lucent VX3000S;;;;;
-V422;YUV;Vitec;;;;;YUV;4:2:2
-V655;YUV;Vitec;Vitec Multimedia 16 bit YUV 4:2:2 (6:5:5) format;;;;YUV;
-VBLE;MarcFD VBLE;;MarcFD VBLE Lossless;;;;;
-VCR1;ATI Video 1;;ATI VCR 1.0;;;;;
-VCR2;ATI Video 2;;ATI VCR 2.0 (MPEG YV12);;;;;
-VCR3;ATI Video 3;;ATI VCR 3.0;;;;;
-VCR4;ATI Video 4;;ATI VCR 4.0;;;;;
-VCR5;ATI Video 5;;ATI VCR 5.0;;;;;
-VCR6;ATI Video 6;;ATI VCR 6.0;;;;;
-VCR7;ATI Video 7;;ATI VCR 7.0;;;;;
-VCR8;ATI Video 8;;ATI VCR 8.0;;;;;
-VCR9;ATI Video 9;;ATI VCR 9.0;;;;;
-VCWV;Wavelet;;VideoCon;;;;;
-VDCT;RGB;VideoMaker;Video Maker Pro DIB;;;;RGB;
-VDOM;VDOWave;;VDONet Wave;;;;;
-VDOW;VDOLive;;VDONet Live (H,263);;;;;
-VDST;VirtualDub;;VirtualDub remote frameclient ICM driver;;;;;
-VDTZ;YUV;;VideoTizer / Darim Vision YUV;;;;YUV;4:2:2
-VGPX;VGP;;Alaris VideoGramPixel;;;;;
-VIDM;MPEG-4 Visual;DivX 5 Pro;DivX 5.0 Pro Supported;;;;YUV;4:2:0
-VIDS;Vitec;;Vitec Multimedia YUV 4:2:2;www.yks.ne.jp/~hori/;;;;
-VIFP;VFAPI;;Virtual Frame API (VFAPI dummy format);;;;;
-VIV1;H.263;Vivo;;;;;;
-VIV2;H.263;Vivo;;;;;;
-VIVO;H.263;Vivo;;;;;;
-VIXL;M-JPEG;Miro XL;Miro Video XL;http://mirror01.iptelecom.net.ua/~video/codecs/miroVIDEO-XL.codec.v2.2.exe;;;YUV;4:2:0
-VJPG;M-JPEG;;;;;;YUV;4:2:0
-VLV1;Videologic;;;;;;;
-VMNC;Vmware;;;http://www.vmware.com/;;;;
-VP30;VP3;On2;;;;;;
-VP31;VP3;On2;;;;;;
-VP40;VP4;On2;;;;;;
-VP50;VP5;On2;;;;;;
-VP60;VP6;On2;;;;;;
-VP61;VP6.1;On2;;;;;;
-VP62;VP6.2;On2;;http://ftp.pub.cri74.org/pub/win9x/video/codecs/VP6/vp6_vfw_codec.exe;;;;
-VP70;VP7;On2;;;;;;
-VP71;VP7;On2;;;;;;
-VP72;VP7;On2;;;;;;
-VP80;VP8;;;http://www.webmproject.org;;;YUV;4:2:0
-VQC1;Vector 1;;Vector-quantised 1 (high compression) http://eprints.ecs.soton.ac.uk/archive/00001310/01/VTC97-js.pdf;;;;;
-VQC2;Vector 2;;Vector-quantised 2 (high robustness against channel errors) http://eprints.ecs.soton.ac.uk/archive/00001310/01/VTC97-js.pdf;;;;;
-VQJP;VQ630;;Dual-mode digital camera;;;;;
-VQS4;VQ110;;DV camera;;;;;
-VR21;YUV;BlckMagic;BlackMagic YUV (Quick Time);;;;YUV;
-VSSH;AVC;Vanguard VSS;;;;;YUV;4:2:0
-VSSV;Vanguard Video;Vanguard VSS;;;;;;
-VSSW;AVC;Vanguard VSS;;;;;YUV;4:2:0
-VTLP;GGP;;Alaris VideoGramPixel;;;;;
-VX1K;DVX 1 S;;Lucent VX1000S Video;;;;;
-VX2K;DVX 2 S;;Lucent VX2000S Video;;;;;
-VXSP;DVX 1 SP;;Lucent VX1000SP Video;;;;;
-VYU9;YUV;ATI;;;;;YUV;
-VYUY;YUV;ATI;;;;;YUV;
-WBVC;W9960;;Winbond Electronics W9960;;;;;
-WHAM;Microsoft Video 1;;;;;;;
-WINX;Winnov;;;;;;;
-WJPG;M-JPEG;Winbond ;Winbond JPEG (AverMedia USB devices);;;;YUV;4:2:0
-WMV1;WMV1;;Windows Media Video 7;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;;;;
-WMV2;WMV2;;Windows Media Video 8;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;;;;
-WMV3;VC-1;WMV3;Windows Media Video 9;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;;;;
-WMVA;VC-1;WMV;Windows Media Video;http://ffdshow-tryout.sourceforge.net/;;;;
-WMVP;WMV3;;Windows Media Video V9;;;;;
-WNIX;WniWni;;WniWni;;;;;
-WNV1;WinNov;;WinNov Videum Hardware Compression;http://www.winnov.com/;;;;
-WNVA;WinNov;;WinNov Videum Hardware Compression;http://www.winnov.com/;;;;
-WRLE;RGB;Apple;Apple QuickTime BMP;;;;RGB;
-WRPR;AVideoTools;;VideoTools VideoServer Client (wrapper for AviSynth);;;;;
-WV1F;;;;http://ffdshow-tryout.sourceforge.net/;;;;
-WVC1;VC-1;Microsoft;;;;;;
-WVLT;IllusionHope Wavelet 9/7;;IllusionHope Wavelet 9/7;;;;;
-WVP2;;;;http://ffdshow-tryout.sourceforge.net/;;;;
-WZCD;iScan;;CORE Co. Ltd.;;;;;
-WZDC;iSnap;;CORE Co. Ltd.;;;;;
-X263;H.263;Xirlink;;;;;;
-X264;AVC;;XiWave GNU GPL x264 MPEG-4;;;;;
-XJPG;M-JPEG;Xirlink;;;;;YUV;4:2:0
-XLV0;NetXL Video;;NetXL Inc. XL Video Decoder;;;;;
-XMPG;MPEG Video;Xing;XING MPEG (I frame only);;;;YUV;4:2:0
-XVID;MPEG-4 Visual;XviD;;http://mediaarea.net/XVID;;;YUV;4:2:0
-XVIX;MPEG-4 Visual;XviD;Based on XviD MPEG-4;http://www.xvid.org/Downloads.15.0.html;;;YUV;4:2:0
-XWV0;XiWave Video;;;;;;;
-XWV1;XiWave Video;;;;;;;
-XWV2;XiWave Video;;;;;;;
-XWV3;XiWave Video;;;;;;;
-XWV4;XiWave Video;;;;;;;
-XWV5;XiWave Video;;;;;;;
-XWV6;XiWave Video;;;;;;;
-XWV7;XiWave Video;;;;;;;
-XWV8;XiWave Video;;;;;;;
-XWV9;XiWave Video;;;;;;;
-XXAN;Origin VideoGame;;Used in Wing Commander 3 and 4;;;;;
-XYZP;YUV;;Extended PAL format XYZ palette;;;;YUV;
-Y211;YUV;;Packed YUV format with Y sampled at every second pixel across each line and U and V sampled at every fourth pixel;;;;YUV;
-Y216;YUV;Targa;Pinnacle TARGA CineWave YUV (Quick Time);;;;YUV;
-Y411;YUV;;YUV 4:1:1 Packed;;;;YUV;4:1:1
-Y41B;YUV;;YUV 4:1:1 Planar;;;;YUV;4:1:1
-Y41P;YUV;;Conexant (ex Brooktree) YUV 4:1:1 Raw;http://www.fourcc.org/indexyuv.htm;;;YUV;4:1:1
-Y41T;YUV;;Format as for Y41P, but the lsb of each Y component is used to signal pixel transparency;;;;YUVA;4:1:1
-Y422;YUV;;Direct copy of UYVY as used by ADS Technologies Pyro WebCam firewire camera;;;;YUV;4:2:2
-Y42B;YUV;;YUV 4:2:2 Planar;;;;YUV;4:2:2
-Y42T;YUV;;Format as for UYVY, but the lsb of each Y component is used to signal pixel transparency;;;;YUVA;4:2:2
-Y444;YUV;;IYU2 (iRez Stealth Fire camera);;;;YUV;
-Y8  ;GrayScale;;Simple grayscale video;;;;Y;
-Y800;GrayScale;;Simple grayscale video;;;;Y;
-YC12;YUV;;Intel YUV12;http://www.fourcc.org/indexyuv.htm;;;YUV;
-YCCK;YUV;;;;;;YUV;
-YMPG;MPEG-PS;;YMPEG Alpha (dummy for MPEG-2 compressor);;;;;
-YU12;YUV;;ATI YV12 4:2:0 Planar;;;;YUV;4:2:0
-YU92;YUV;;Intel - YUV;;;;YUV;
-YUNV;YUV;;A direct copy of YUY2 registered by Nvidia to work around problems in some olds which did not like hardware that offered more than 2 YUY2 surfaces;;;;YUV;
-YUV2;YUV;;Apple Component Video (YUV 4:2:2);http://www.apple.com/quicktime/download/standalone.html;;;YUV;;
-YUV8;YUV;;Winnov Caviar YUV8 ;http://www.fourcc.org/indexyuv.htm;;;YUV;;
-YUV9;YUV;;Intel YUV9;;;;YUV;;
-YUVP;YUV;;YUV 4:2:2 extended precision 10-bits per component in Y0U0Y1V0 order;;;;YUV;4:2:2;10
-YUY2;YUV;;YUV 4:2:2 as for UYVY but with different component ordering within the u_int32 macropixel;http://www.fourcc.org/indexyuv.htm;;;YUV;4:2:2;
-YUYP;YUV;;Evans & Sutherland;;;;YUV;;
-YUYV;YUV;;Canopus YUV format;http://www.fourcc.org/indexyuv.htm;;;YUV;;
-YV12;YUV;;ATI YVU12 4:2:0 Planar;http://www.fourcc.org/indexyuv.htm;;;YUV;4:2:0;
-YV16;YUV;;Elecard YUV 4:2:2 Planar;;;;YUV;4:2:2;
-YV92;YUV;;Intel Smart Video Recorder YVU9;;;;YUV;;
-YVU9;YUV;;Brooktree YVU9 Raw (YVU9 Planar);http://www.fourcc.org/indexyuv.htm;;;YUV;;
-YVYU;YUV;;YUV 4:2:2 as for UYVY but with different component ordering within the u_int32 macropixel;;;;YUV;4:2:2;
-ZLIB;AVIzlib;;Lossless (ZIP compression);;;;;;
-ZMBV;Zip;;Zip Motion Blocks Video;;;;;;
-ZPEG;Video Zipper;;Metheus Video Zipper;;;;;;
-ZYGO;ZyGo;;ZyGo Video;;;;;;

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text/DataBase/Format.csv Deleted

@@ -1,119 +0,0 @@
-AIFF;;;M;Riff;Apple/SGI;aiff aifc aif;audio/x-aiff;
-AMV;;;M;Riff;Chinese hack of AVI;amv;;http://en.wikipedia.org/wiki/AMV_video_format
-AVI;;;M;Riff;Audio Video Interleave;avi;video/vnd.avi;
-BDAV;;;M;Bdav;Blu-ray Video;m2ts;;
-Blu-ray Clip info;;;M;Bdmv;;clpi;;
-Blu-ray Index;;;M;Bdmv;;bdmv;;
-Blu-ray Movie object;;;M;Bdmv;;bdmv;;
-Blu-ray Playlist;;;M;Bdmv;;mpls;;
-CDXA;;;M;Cdxa;;dat;;
-DV;;;M;DvdDif;;dv dif;video/DV;
-DivX;;;M;Riff;Hack of AVI;divx;video/vnd.avi;http://www.divx.com
-DPG;;;M;Dpg;Nintendo DS;dpg;;
-DVD Video;;;M;Dvdv;;ifo;;
-Flash Video;;;M;Flv;;flv;application/x-shockwave-flash;http://www.macromedia.com/go/getflashplayer
-GXF;;;M;Gxf;SMPTE 360M;gxf;;
-Google Video;;;M;Riff;Hack of AVI;gvi;;http://video.google.com/playerdownload.html
-LXF;;;M;Lxf;;lxf;video/lxf;
-Matroska;;;M;Mk;;mkv mka mks;;http://packs.matroska.org/
-MPEG-PS;;;M;MpegPs;;mpeg mpg m2p vob pss;video/MP2P;
-MPEG-TS;;;M;MpegTs;;ts m2t m2s m4t m4s ts tp trp;video/MP2T;
-MPEG-4;;;M;Mpeg4;;mp4 m4v m4a m4p 3gpp 3gp 3gpp2 3g2 k3g jpm jpx mqv ismv isma f4v;video/mp4;
-MTV;;;M;Other;Chinese hack of MPEG-1 layer 3;mtv;;http://en.wikipedia.org/wiki/Chinese_MP4/MTV_Player
-MXF;;;M;Mxf;;mxf;application/mxf;
-NSV;;;M;Nsv;Nullsoft Streaming Video;nsv;;http://winamp.com
-Ogg;;;M;Ogg;;ogg ogm;video/ogg;http://www.free-codecs.com/Ogg_DirectShow_Filters_download.htm
-QuickTime;;;M;Mpeg4;Original Apple specifications;mov qt;video/quicktime;http://www.apple.com/quicktime/download/standalone.html
-RealMedia;;;M;Rm;;rm rmvb ra;application/vnd.rn-realmedia;
-RIFF-MMP;;;M;Riff;RIFF Multimedia Movie;;;
-ShockWave;;;M;Swf;;swf;application/x-shockwave;http://www.macromedia.com/go/getflashplayer
-SKM;;;M;Skm;Sky Korean Mobilephone;skm;;http://www.isky.co.kr/html/cs/download.jsp
-Windows Media;;;M;Wm;;asf wmv wma;video/x-ms-wmv;
-WebM;;;M;Mkv;;webm;video/webm;http://www.webmproject.org/
-AVC;;;V;Avc;Advanced Video Codec;avc h264;video/H264;http://developers.videolan.org/x264.html
-AVS Video;;;V;AvsV;Audio Video Standart, Video part;;;http://www.avs.org.cn/
-Dirac;;;V;Dirac;;drc;;http://diracvideo.org/
-FLC;;;V;Flic;;fli flc;;http://www.chem.nott.ac.uk/flc.html
-FLI;;;V;Flic;;fli flc;;http://www.chem.nott.ac.uk/flc.html
-FLIC;;;V;Flic;;fli flc;;http://www.chem.nott.ac.uk/flc.html
-H.261;;;V;;;h261;video/H261;
-H.263;;;V;;;h263;video/H263;
-M-JPEG;;;V;;;;video/JPEG;
-M-JPEG 2000;;;V;;;;video/MJ2;
-MPEG Video;;;V;Mpegv;;mpgv mpv mp1v m1v mp2v m2v;video/MPV;
-MPEG-4 Visual;;;V;Mpeg4;;m4v mp4v;video/MP4V-ES;
-Theora;;;V;;;;;
-VC-1;;;V;Vc1;;vc1;video/vc1;
-VP8;;;V;;;;;http://www.webmproject.org/
-AAC;;;A;;Advanced Audio Codec;aac;;
-AC-3;;;A;Ac3;Audio Coding 3;ac3;;
-ADIF;;;A;Adif;Audio Data Interchange Format;aac;;
-ADTS;;;A;Adts;Audio Data Transport Stream;aac;;
-ALS;;;A;Als;MPEG-4 Audio Lossless Coding;als;;http://www.nue.tu-berlin.de/forschung/projekte/lossless/mp4als.html#downloads
-AMR;;;A;Amr;Adaptive Multi-Rate;amr;audio/AMR;http://www.apple.com/quicktime/download/standalone.html
-Atrac;;;A;;;;audio/ATRAC;
-Atrac3;;;A;;;;audio/ATRAC3;
-AU;;;A;Au;uLaw/AU Audio File;au;audio/basic;
-DTS;;;A;Dts;Digital Theater Systems;dts;;
-DTS-HD;;;A;Dts;Digital Theater Systems;dts;;
-E-AC-3;;;A;Ac3;Audio Coding 3;dd+;audio/eac3;
-Extended Module;;;A;ExtendedModule;;xm;;
-FLAC;;;A;Flac;Free Lossless Audio Codec;flac;;http://flac.sourceforge.net/
-G.719;;;A;;;;audio/G719;
-G.722;;;A;;;;audio/G722;
-G.722.1;;;A;;;;audio/G7221;
-G.723;;;A;;;;audio/G723;
-G.729;;;A;;;;audio/G729;
-G.729.1;;;A;;;;audio/G7291;
-Impulse Tracker;;;A;ImpulseTracker;;it;;
-LA;;;A;La;Lossless Audio Codec;la;;http://www.lossless-audio.com/
-MIDI;;;A;Riff;RIFF Musical Instrument Digital Interface;midi mid kar;audio/midi;
-Module;;;A;Module;;mod;;
-Monkey's Audio;;;A;Ape;;ape mac;;http://www.monkeysaudio.com/
-MPEG Audio;;;A;Mpega;;m1a mpa1 mp1 m2a mpa2 mp2 mp3;audio/mpeg;
-Musepack SV7;;;A;Mpc;;mpc;;http://www.musepack.net
-Musepack SV8;;;A;Mpc;;mp+;;http://www.musepack.net
-QCELP;;;A;;;;audio/QCELP;
-RIFF-MIDI;;;A;Riff;RIFF Musical Instrument Digital Interface;;;
-Scream Tracker 3;;;A;S3m;;s3m;;
-Shorten;;;A;;;shn;;http://etree.org/shnutils/shorten/
-SLS;;;A;;MPEG-4 Scalable Lossless Coding;sls;;http://www.chiariglione.org/mpeg/technologies/mp04-sls/index.htm
-Speex;;;A;;;;audio/speex;
-TAK;;;A;;;tak;;http://thbeck.de/Tak/Tak.html
-TrueHD;;;A;Ac3;;dts;;
-TwinVQ;;;A;TwinVQ;Transform domain Weighted INterleave Vector Quantization;vqf;;http://www.twinvq.org/english/index_en.html
-Vorbis;;;A;;;;audio/vorbis;
-Wave;;;A;Riff;;wav;audio/vnd.wave;
-Wave64;;;A;Riff;;w64;;
-WavPack;;;A;Wvpk;;wv wvc;;http://www.wavpack.com
-Bitmap;;;I;Bmp;;bmp;image/bmp;
-DIB;;;I;Riff;RIFF Device Independent Bitmap;;;
-GIF;;;I;Gif;Graphics Interchange Format;gif;image/gif;
-ICO;;;I;Ico;;ico;image/vnd.microsoft.icon;
-JNG;;;I;Jng;JPEG Network Graphic;jng;;
-JPEG;;;I;Jpeg;;jpeg jpg jpe;image/jpeg;
-JPEG2000;;;I;Jpeg;;jp2;image/jp2;http://www.morgan-multimedia.com/JPEG2000/
-LZ77;;;I;;;;;
-MNG;;;I;Mng;Multiple-Image Network Graphic;mng;;
-PNG;;;I;Png;Portable Network Graphic;png;image/png;
-RIFF Palette;;;I;Riff;RIFF Palette;;;
-RLE;;;I;;Run-length encoding;rle;;
-TIFF;;;I;Tiff;;tiff tif;image/tiff;
-7-Zip;;;C;7z;;7z;;http://7-zip.org
-ACE;;;C;Ace;;ace;;http://winace.com
-ELF;;;C;Elf;;so;;
-MZ;;;C;Mz;;exe dll;;
-RAR;;;C;Rar;From Rarlabs;rar;application/x-rar-compressed;http://rarlabs.com
-ZIP;;;C;Zip;;zip;application/zip;http://winzip.com
-Adobe encore DVD;;;T;Other;;txt;;http://www.adobe.fr/products/encore/
-AQTitle;;;T;Other;;aqt;;http://www.volny.cz/aberka/czech/aqt.html
-ASS;;;T;Other;;ssa;;http://ffdshow.sourceforge.net/tikiwiki/tiki-index.php?page=Getting+ffdshow
-Captions 32;;;T;Other;;txt;;
-Captions Inc;;;T;Other;;txt;;
-CPC Captioning;;;T;Other;;txt;;http://www.cpcweb.com/Captioning/cap_software.htm
-Cheeta;;;T;Other;;asc;;
-SSA;;;T;Other;;ssa;;http://ffdshow.sourceforge.net/tikiwiki/tiki-index.php?page=Getting+ffdshow
-SubRip;;;T;Other;;srt;;http://ffdshow.sourceforge.net/tikiwiki/tiki-index.php?page=Getting+ffdshow
-Blender;;;O;Other;;blenders;;http://www.blender3d.com
-AutoCAD;;;O;Other;;;;http://www.autodesk.com
-N19;;;T;N19;;stl;;

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text/Enums_.1.txt Deleted

@@ -1,33 +0,0 @@
-// Enums - Automaticly generated enums for MediaInfo
-// Copyright (C) 2008-2008 Jerome Martinez, Zen@MediaArea.net
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//
-// Automaticly generated methods for MediaInfo
-// Don't modify, this will be deleted at the next automatic update
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-//---------------------------------------------------------------------------
-#ifndef MediaInfo_File__Analyze_AutomaticH
-#define MediaInfo_File__Analyze_AutomaticH
-//---------------------------------------------------------------------------
-
-namespace MediaInfoLib
-{

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text/Language Deleted

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text/Language/DefaultLanguage.csv Deleted

@@ -1,954 +0,0 @@
-  Language_ISO639;en
-  Author_Email;Zen@mediaarea.net
-  Author_Name;Zen
-  Author_OldNames;Initial translator
-  Language_Name;English
-  Config_Text_ColumnSize;32
-  Config_Text_Separator; : 
-  Config_Text_NumberTag; #
-  Config_Text_FloatSeparator;.
-  Config_Text_ThousandsSeparator; 
- audio stream1; audio stream
- audio stream2; audio streams
- audio stream3; audio streams
- bit1; bit
- bit2; bits
- bit3; bits
- bps; bps
- Bps; Bps
- Byte1; Byte
- Byte2; Bytes
- Byte3; Bytes
- channel1; channel
- channel2; channels
- channel3; channels
- chapter1; chapter
- chapter2; chapters
- chapter3; chapters
- chapters stream1; chapters stream
- chapters stream2; chapters streams
- chapters stream3; chapters streams
- day1; day
- day2; days
- day3; days
- dB1; dB
- dB2; dB
- dB3; dB
- file1; file
- file2; files
- file3; files
- frame1; frame
- frame2; frames
- frame3; frames
- fps1; fps
- fps2; fps
- fps3; fps
- GB; GB
- Gb; Gb
- Gbps; Gbps
- GBps; GBps
- GHz; GHz
- GiB; GiB
- GibiByte1; GibiBytes
- GibiByte2; GibiBytes
- GibiByte3; GibiBytes
- GiBps; GiBps
- GigaBit1; GigaBit
- GigaBit2; GigaBits
- GigaBit3; GigaBits
- GigaByte1; GigaByte
- GigaByte2; GigaBytes
- GigaByte3; GigaBytes
- hour1; hour
- hour2; hours
- hour3; hours
- Hz; Hz
- image stream1; image stream
- image stream2; image streams
- image stream3; image streams
- KB; KB
- Kb; Kb
- KBps; KBps
- Kbps; Kbps
- KHz; KHz
- KiB; KiB
- KibiBit1; KibiBit
- KibiBit2; KibiBits
- KibiBit3; KibiBits
- KibiByte1; KibiByte
- KibiByte2; KibiBytes
- KibiByte3; KibiBytes
- KiBps; KiBps
- KiloBit1; KiloBit
- KiloBit2; KiloBits
- KiloBit3; KiloBits
- KiloByte1; KiloByte
- KiloByte2; KiloBytes
- KiloByte3; KiloBytes
- MB; MB
- Mb; Mb
- Mbps; Mbps
- MBps; MebiBytes
- MebiBit1; MebiBit
- MebiBit2; MebiBits
- MebiBit3; MebiBits
- MebiByte1; MebiByte
- MebiByte2; MebiBytes
- MebiByte3; MebiBytes
- MegaBit1; MegaBit
- MegaBit2; MegaBits
- MegaBit3; MegaBits
- MegaByte1; MegaByte
- MegaByte2; MegaBytes
- MegaByte3; MegaBytes
- MHz; MHz
- MiB; MiB
- Mib; Mib
- MiBps; MiBps
- milisecond1; milisecond
- milisecond2; miliseconds
- milisecond3; miliseconds
- minute1; minute
- minute2; minutes
- minute3; minutes
- month1; month
- month2; months
- month3; months
- pixel1; pixel
- pixel2; pixels
- pixel3; pixels
- second1; second
- second2; seconds
- second3; seconds
- text stream1; text stream
- text stream2; text streams
- text stream3; text streams
- video frames1; video frame
- video frames2; video frames
- video frames3; video frames
- video stream1; video stream
- video stream2; video streams
- video stream3; video streams
- warppoint0;No warppoints
- warppoint1; warppoint
- warppoint2; warppoints
- warppoint3; warppoints
- week1; week
- week2; weeks
- week3; weeks
- year1; year
- year2; years
- year3; years
-, ;, 
-: ;: 
-About;About
-About_Hint;How to contact me and find last version
-Accompaniment;Accompaniment
-Actor;Actor
-Actor_Character;Character played
-Added_Date;Added date
-Address;Address
-Advanced;Advanced
-Advanced mode;Advanced mode
-Album;Album
-Album_ReplayGain_Gain;Album replay gain
-Album_ReplayGain_Peak;Album replay gain peak
-Alignment;Alignment
-Alignment_Aligned;Aligned on interleaves
-Alignment_Split;Split accross interleaves
-All;All
-Archival_Location;Archival location
-Arranger;Arranger
-ArtDirector;ArtDirector
-AspectRatio;Aspect ratio
-AssistantDirector;AssistantDirector
-at;at
-At least one file;(You must at least open one file)
-Audio;Audio
-Audio stream(s);Audio streams
-Audio_Codec_List;Audio codecs
-Audio_No;No audio
-Audio1;First audio stream
-Audio2;Second audio stream
-AudioCount;Count of audio streams
-Author;Author
-BarCode;BarCode
-Basic;Basic
-Basic_Note;Note : for more information about this file, you must select a different view (Sheet, Tree...)
-BitDepth;Bit depth
-BitRate;Bit rate
-BitRate_Maximum;Maximum bit rate
-BitRate_Minimum;Minimum bit rate
-BitRate_Mode;Bit rate mode
-BitRate_Mode_CBR;Constant
-BitRate_Mode_VBR;Variable
-BitRate_Nominal;Nominal bit rate
-Bits-(Pixel*Frame);Bits/(Pixel*Frame)
-Cancel;Cancel
-Channel(s);Channel(s)
-ChannelPositions;Channel positions
-Chapter(s);Chapter(s)
-Chapters;Chapters
-Chapters stream(s);Chapters stream(s)
-Chapters_Codec_List;Chapters Codecs
-Chapters_No;No chapters
-ChaptersCount;Count of chapter streams
-CheckNewVersion;Check for new version
-Choose custom;Choose custom
-Choose custom sheet;Choose your desired custom sheet
-Choose custom text;Choose your desired custom text
-Choose export format;Choose your desired export format
-Choose file(s);Choose the files to open
-Choose filename;Choose your desired filename
-Choose language;Choose your desired language
-Choregrapher;Choregrapher
-Chroma;Chroma
-ChromaSubsampling;Chroma subsampling
-Close;Close
-Close all before open;Close all before open
-Codec;Codec
-Codec_Description;Codec description
-Codec_Info;Details for codec
-Codec_Settings;Codec settings
-Codec_Settings_PacketBitStream;Codec settings, Packet bitstream
-Codec_Settings_BVOP;Codec settings, BVOP
-Codec_Settings_QPel;Codec settings, QPel
-Codec_Settings_GMC;Codec settings, GMC
-Codec_Settings_Matrix;Codec settings, Matrix
-Codec_Settings_Floor;Codec settings, Floor
-Codec_Settings_CABAC;Codec settings, CABAC
-Codec_Settings_Firm;Codec settings, Firm
-Codec_Settings_Endianness;Codec settings, Endianness
-Codec_Settings_Sign;Codec settings, Sign
-Codec_Settings_Law;Codec settings, Law
-Codec_Settings_ITU;Codec settings, ITU
-Codec_Profile;Codec profile
-Codec_Url;Weblink for codec
-CodecID;Codec ID
-CodecID_Description;Description of the codec
-Collection;Collection
-Colorimetry;Colorimetry
-ColorSpace;Color space
-colour_primaries;Color primaries
-Comment;Comment
-CommissionedBy;Commissioned by
-CompleteName;Complete name
-Composer;Composer
-CompressionRatio;Compression ratio
-Conductor;Conductor
-Container and general information;Container and general information
-ContentType;ContentType
-CoProducer;Coproducer
-Copyright;Copyright
-CostumeDesigner;Costume designer
-Count;Count
-Country;Country
-Cover;Cover
-Cover_Datas;Cover datas
-Cover_Description;Cover description
-Cover_Mime;Cover MIME
-Cover_Type;Cover type
-Cropped;Crop dimensions
-Custom;Custom
-Customize;Customize
-Date;Date
-Debug;Debug
-Decimal point;Decimal point
-Delay;Delay
-Delete;Delete
-Description;Description
-Digitized_Date;Digitized date
-Dimensions;Dimensions
-Director;Director
-DirectorOfPhotography;Director of photography
-DisplayAspectRatio;Display aspect ratio
-DisplayAspectRatio_Original;Original display aspect ratio
-DistributedBy;Distributed by
-Donate;Donate
-DotsPerInch;Dots per inch
-Duration;Duration
-Duration_End;End time
-Duration_Start;Start time
-Edit;Edit
-EditedBy;Edited by
-EMail;E-Mail
-Encoded_Application;Writing application
-Encoded_Date;Encoded date
-Encoded_Library;Writing library
-Encoded_Library_Settings;Encoding settings
-Encoded_Original;Original support
-EncodedBy;Encoded by
-EPG_Positions;EPG positions (internal)
-Error_File;Error while reading file
-ExecutiveProducer;Executive producer
-Exit;Exit
-Exit_Hint;Quit the program
-Export;Export
-Export_Hint;Export in a customized format
-Extensions;Extensions usually used
-Family;Family
-Fax;Fax
-File;File
-File size;File size
-File_Append;Append to the existing file (Warning : be careful to have the same parameters)
-File_Created_Date;File creation date
-File_Created_Date_Local;File creation date (local)
-File_Hint;Select a multimedia file to study
-File_Modified_Date;File last modification date
-File_Modified_Date_Local;File last modification date (local)
-FileExtension;File extension
-FileName;File name
-FileSize;File size
-Folder;Folder
-Folder (R);Folder (R)
-Folder (R)_Hint;Select a folder to study (with all folders recursively)
-Folder (Recursively);Folder (Recursively)
-Folder_Hint;Select a folder to study
-FolderName;Folder name
-Format;Format
-Format_Description;Format description
-Format_Info;Details for format
-Format_Profile;Format profile
-Format_Settings;Format settings
-Format_Settings_PacketBitStream;Format settings, Packet bitstream
-Format_Settings_BVOP;Format settings, BVOP
-Format_Settings_QPel;Format settings, QPel
-Format_Settings_GMC;Format settings, GMC
-Format_Settings_Matrix;Format settings, Matrix
-Format_Settings_Matrix_Custom;Custom
-Format_Settings_Matrix_Default;Default
-Format_Settings_Floor;Format settings, Floor
-Format_Settings_CABAC;Format settings, CABAC
-Format_Settings_Firm;Format settings, Firm
-Format_Settings_Endianness;Format settings, Endianness
-Format_Settings_RefFrames;Format settings, ReFrames
-Format_Settings_Sign;Format settings, Sign
-Format_Settings_Law;Format settings, Law
-Format_Settings_ITU;Format settings, ITU
-Format_Settings_SBR;Format settings, SBR
-Format_Settings_PS;Format settings, PS
-Format_Settings_Pulldown;Format settings, Pulldown
-Format_Settings_Mode;Mode
-Format_Settings_FrameMode;Frame mode
-Format_Settings_Emphasis;Emphasis
-Format_Settings_ModeExtension;Mode extension
-Format_Settings_GOP;Format settings, GOP
-Format_Version;Format version
-Format_Url;Weblink for format
-FrameCount;Frame count
-FrameRate;Frame rate
-FrameRate_Mode;Frame rate mode
-FrameRate_Mode_CFR;Constant
-FrameRate_Mode_VFR;Variable
-FrameRate_Minimum;Minimum frame rate
-FrameRate_Nominal;Nominal frame rate
-FrameRate_Maximum;Maximum frame rate
-FrameRate_Original;Original frame rate
-General;General
-Genre;Genre
-Genre_000;Blues
-Genre_001;Classic Rock
-Genre_002;Country
-Genre_003;Dance
-Genre_004;Disco
-Genre_005;Funk
-Genre_006;Grunge
-Genre_007;Hip-Hop
-Genre_008;Jazz
-Genre_009;Metal
-Genre_010;New Age
-Genre_011;Oldies
-Genre_012;Other
-Genre_013;Pop
-Genre_014;R&B
-Genre_015;Rap
-Genre_016;Reggae
-Genre_017;Rock
-Genre_018;Techno
-Genre_019;Industrial
-Genre_020;Alternative
-Genre_021;Ska
-Genre_022;Death Metal
-Genre_023;Pranks
-Genre_024;Soundtrack
-Genre_025;Euro-Techno
-Genre_026;Ambient
-Genre_027;Trip-Hop
-Genre_028;Vocal
-Genre_029;Jazz+Funk
-Genre_030;Fusion
-Genre_031;Trance
-Genre_032;Classical
-Genre_033;Instrumental
-Genre_034;Acid
-Genre_035;House
-Genre_036;Game
-Genre_037;Sound Clip
-Genre_038;Gospel
-Genre_039;Noise
-Genre_040;AlternRock
-Genre_041;Bass
-Genre_042;Soul
-Genre_043;Punk
-Genre_044;Space
-Genre_045;Meditative
-Genre_046;Instrumental Pop
-Genre_047;Instrumental Rock
-Genre_048;Ethnic
-Genre_049;Gothic
-Genre_050;Darkwave
-Genre_051;Techno-Industrial
-Genre_052;Electronic
-Genre_053;Pop-Folk
-Genre_054;Eurodance
-Genre_055;Dream
-Genre_056;Southern Rock
-Genre_057;Comedy
-Genre_058;Cult
-Genre_059;Gangsta
-Genre_060;Top 40
-Genre_061;Christian Rap
-Genre_062;Pop/Funk
-Genre_063;Jungle
-Genre_064;Native American
-Genre_065;Cabaret
-Genre_066;New Wave
-Genre_067;Psychadelic
-Genre_068;Rave
-Genre_069;Showtunes
-Genre_070;Trailer
-Genre_071;Lo-Fi
-Genre_072;Tribal
-Genre_073;Acid Punk
-Genre_074;Acid Jazz
-Genre_075;Polka
-Genre_076;Retro
-Genre_077;Musical
-Genre_078;Rock & Roll
-Genre_079;Hard Rock
-Genre_080;Folk
-Genre_081;Folk-Rock
-Genre_082;National Folk
-Genre_083;Swing
-Genre_084;Fast Fusion
-Genre_085;Bebob
-Genre_086;Latin
-Genre_087;Revival
-Genre_088;Celtic
-Genre_089;Bluegrass
-Genre_090;Avantgarde
-Genre_091;Gothic Rock
-Genre_092;Progressive Rock
-Genre_093;Psychedelic Rock
-Genre_094;Symphonic Rock
-Genre_095;Slow Rock
-Genre_096;Big Band
-Genre_097;Chorus
-Genre_098;Easy Listening
-Genre_099;Acoustic
-Genre_100;Humour
-Genre_101;Speech
-Genre_102;Chanson
-Genre_103;Opera
-Genre_104;Chamber Music
-Genre_105;Sonata
-Genre_106;Symphony
-Genre_107;Booty Bass
-Genre_108;Primus
-Genre_109;Porn Groove
-Genre_110;Satire
-Genre_111;Slow Jam
-Genre_112;Club
-Genre_113;Tango
-Genre_114;Samba
-Genre_115;Folklore
-Genre_116;Ballad
-Genre_117;Power Ballad
-Genre_118;Rhythmic Soul
-Genre_119;Freestyle
-Genre_120;Duet
-Genre_121;Punk Rock
-Genre_122;Drum Solo
-Genre_123;A capella
-Genre_124;Euro-House
-Genre_125;Dance Hall
-Genre_126;Goa
-Genre_127;Drum & Bass
-Genre_128;Club-House
-Genre_129;Hardcore
-Genre_130;Terror
-Genre_131;Indie
-Genre_132;Britpop
-Genre_133;Negerpunk
-Genre_134;Polsk Punk
-Genre_135;Beat
-Genre_136;Christian Gangsta Rap
-Genre_137;Heavy Metal
-Genre_138;Black Metal
-Genre_139;Crossover
-Genre_140;Contemporary Christian
-Genre_141;Christian Rock 
-Genre_142;Merengue
-Genre_143;Salsa
-Genre_144;Trash Metal
-Genre_145;Anime
-Genre_146;JPop
-Genre_147;Synthpop
-Go to WebSite;Go to website
-h;h
-Header file;Create a header file
-Height;Height
-Height_Original;Original height
-Help;Help
-Hint;Hint
-How many audio streams?;How many audio streams?
-How many chapters streams?;How many chapters streams?
-How many text streams?;How many text streams?
-How many video streams?;How many video streams?
-HTML;HTML
-ID;ID
-Image;Image
-Image stream(s);Image streams
-Image_Codec_List;Codecs Image
-ImageCount;Count of image streams
-Info;Info
-Instruments;Instruments
-Interlacement;Interlacement
-Interlaced_Interlaced;Interlaced
-Interlaced_TFF;Top Field First
-Interlaced_BFF;Bottom Field First
-Interlaced_PPF;Progressive
-Interlaced_Progressive;Progressive
-Interleave_Duration;Interleave, duration
-Interleave_Preload;Interleave, preload duration
-Interleave_VideoFrames;Interleave, duration
-IRCA;IRCA
-ISBN;ISBN
-ISRC;ISRC
-Keywords;Keywords
-Known codecs;Known codecs
-Known formats;Known formats
-Known parameters;Known parameters
-Label;Label
-Language;Language
-Language_More;Language, more info
-Language_aa;Afar
-Language_ab;Abkhazian
-Language_ae;Avestan
-Language_af;Afrikaans
-Language_ak;Akan
-Language_am;Amharic
-Language_an;Aragonese
-Language_ar;Arabic
-Language_as;Assamese
-Language_av;Avaric
-Language_ay;Aymara
-Language_az;Azerbaijani
-Language_ba;Bashkir
-Language_be;Belarusian
-Language_bg;Bulgarian
-Language_bh;Bihari
-Language_bi;Bislama
-Language_bm;Bambara
-Language_bn;Bengali
-Language_bo;Tibetan
-Language_br;Breton
-Language_bs;Bosnian
-Language_ca;Catalan
-Language_ce;Chechen
-Language_ch;Chamorro
-Language_co;Corsican
-Language_cr;Cree
-Language_cs;Czech
-Language_cu;Slave
-Language_cv;Chuvash
-Language_cy;Welsh
-Language_da;Danish
-Language_de;German
-Language_dv;Divehi
-Language_dz;Dzongkha
-Language_ee;Ewe
-Language_el;Greek
-Language_en;English
-Language_en-gb;English (Great Britain)
-Language_en-us;English (United States)
-Language_eo;Esperanto
-Language_es;Spanish
-Language_et;Estonian
-Language_eu;Basque
-Language_fa;Persian
-Language_ff;Fulah
-Language_fi;Finnish
-Language_fj;Fijian
-Language_fo;Faroese
-Language_fr;French
-Language_fy;Frisian
-Language_ga;Irish
-Language_gd;Gaelic
-Language_gl;Galician
-Language_gn;Guarani
-Language_gu;Gujarati
-Language_gv;Manx
-Language_ha;Hausa
-Language_he;Hebrew
-Language_hi;Hindi
-Language_ho;Hiri Motu
-Language_hr;Croatian
-Language_ht;Haitian
-Language_hu;Hungarian
-Language_hy;Armenian
-Language_hz;Herero
-Language_ia;Auxiliary Language Association
-Language_id;Indonesian
-Language_ie;Interlingue
-Language_ig;Igbo
-Language_ii;Sichuan Yi
-Language_ik;Inupiaq
-Language_Info;Language info
-Language_io;Ido
-Language_is;Icelandic
-Language_it;Italian
-Language_iu;Inuktitut
-Language_ja;Japanese
-Language_jv;Javanese
-Language_ka;Georgian
-Language_kg;Kongo
-Language_ki;Kikuyu
-Language_kj;Kuanyama
-Language_kk;Kazakh
-Language_kl;Kalaallisut
-Language_km;Khmer
-Language_kn;Kannada
-Language_ko;Korean
-Language_kr;Kanuri
-Language_ks;Kashmiri
-Language_ku;Kurdish
-Language_kv;Komi
-Language_kw;Cornish
-Language_ky;Kirghiz
-Language_la;Latin
-Language_lb;Luxembourgish
-Language_lg;Ganda
-Language_li;Limburgish
-Language_ln;Lingala
-Language_lo;Lao
-Language_lt;Lithuanian
-Language_lu;Luba-Katanga
-Language_lv;Latvian
-Language_mg;Malagasy
-Language_mh;Marshallese
-Language_mi;Maori
-Language_mk;Macedonian
-Language_ml;Malayalam
-Language_mn;Mongolian
-Language_mo;Moldavian
-Language_mr;Marathi
-Language_ms;Malay
-Language_mt;Maltese
-Language_mul;Multiple languages
-Language_my;Burmese
-Language_na;Nauru
-Language_nb;Norwegian Bokmal
-Language_nd;Ndebele
-Language_ne;Nepali
-Language_ng;Ndonga
-Language_nl;Dutch
-Language_nn;Norwegian Nynorsk
-Language_no;Norwegian
-Language_nr;Ndebele
-Language_nv;Navaho
-Language_ny;Nyanja
-Language_oc;Occitan
-Language_oj;Ojibwa
-Language_om;Oromo
-Language_or;Oriya
-Language_os;Ossetic
-Language_pa;Panjabi
-Language_pi;Pali
-Language_pl;Polish
-Language_ps;Pushto
-Language_pt;Portuguese
-Language_pt-br;Portuguese (Brazil)
-Language_qu;Quechua
-Language_rm;Raeto-Romance
-Language_rn;Rundi
-Language_ro;Romanian
-Language_ru;Russian
-Language_rw;Kinyarwanda
-Language_sa;Sanskrit
-Language_sc;Sardinian
-Language_sd;Sindhi
-Language_se;Northern Sami
-Language_sg;Sango
-Language_si;Sinhala
-Language_sk;Slovak
-Language_sl;Slovenian
-Language_sm;Samoan
-Language_sn;Shona
-Language_so;Somali
-Language_sq;Albanian
-Language_sr;Serbian
-Language_ss;Swati
-Language_st;Sotho
-Language_su;Sundanese
-Language_sv;Swedish
-Language_sw;Swahili
-Language_ta;Tamil
-Language_te;Telugu
-Language_tg;Tajik
-Language_th;Thai
-Language_ti;Tigrinya
-Language_tk;Turkmen
-Language_tl;Tagalog
-Language_tn;Tswana
-Language_to;Tonga
-Language_tr;Turkish
-Language_ts;Tsonga
-Language_tt;Tatar
-Language_tw;Twi
-Language_ty;Tahitian
-Language_ug;Uighur
-Language_uk;Ukrainian
-Language_ur;Urdu
-Language_uz;Uzbek
-Language_ve;Venda
-Language_vi;Vietnamese
-Language_vo;Volapuk
-Language_wa;Walloon
-Language_wo;Wolof
-Language_xh;Xhosa
-Language_yi;Yiddish
-Language_yo;Yoruba
-Language_za;Zhuang
-Language_zh;Chinese
-Language_zh-cn;Chinese (China)
-Language_zh-tw;Chinese (Taiwan)
-Language_zu;Zulu
-LawRating;Law rating
-LCCN;LCCN
-Library;Muxing library
-Lightness;Lightness
-List;List
-Lyrics;Lyrics
-Lyricist;Lyricist
-Mastered_Date;Mastered date
-MasteredBy;Mastered by
-matrix_coefficients;Matrix coefficients
-MediaInfo_About;Supply very detailled information\r\nabout a multimedia file:\r\nMatroska, OGG (including OGM)\r\nMPEG1 (including VCD)\r\nMPEG2 (including DVD and SVCD)\r\nMPEG4 (including Itunes M4A)\r\nQuicktime\r\nRealMedia\r\nWindowsMedia (including WMV, WMA)\r\nMicrosoft RIFF (including AVI, WAV)\r\nSound-only formats (AC3, DTS, AAC, AU, AIFF...)
-Menu;Menu
-Menu stream(s);Menu streams
-Menu_Codec_List;Menu codecs
-Menu_No;No menu
-MenuCount;Count of menu streams
-Menu_Hint;More possibilities
-MenuID;Menu ID
-mn;mn
-Mood;Mood
-More;More
-Movie;Movie name
-ms;ms
-MSDI;MSDI
-MusicBy;Music by
-MuxingMode;Muxing mode
-MuxingMode_MoreInfo;Muxing mode, more info
-MuxingMode_PackedBitstream;Packed bitstream
-Name;Name
-Nationality;Nationality
-NetworkName;Network name
-New;New
-Newest version;Check for new versions (requires Internet connection)
-NewVersion_Menu;A new version is available
-NewVersion_Question_Title;A new version was released!
-NewVersion_Question_Content;A new version (v%Version%) is available, would you like to download it?
-No;No
-Not yet;Not yet
-NumColors;Number of colors
-OK;OK
-One output file per input file;One output file per input file
-Open;Open
-OpenCandy_01;Downloading ________
-OpenCandy_02;__% Complete
-OpenCandy_03;Internet connection interrupted
-OpenCandy_04;________ download complete
-OpenCandy_05;Click to install ________
-OpenCandy_06;Are you sure you wish to cancel the install?\r\nIf you wish to postpone the install until later, select 'No'.\r\nNote: You may select Exit from the menu to defer installation until after the next time you reboot.
-OpenCandy_07;Download of ________ has been paused.\r\nClick on the tray icon to resume downloading.
-OpenCandy_08;A critical error has occurred. Installation of _________ will be aborted.
-OpenCandy_09;Pause download
-OpenCandy_10;Cancel install
-OpenCandy_11;Resume download
-OpenCandy_12;Exit Installer
-OpenCandy_13;___________ - Recommended by ____________
-OpenCandy_14;Downloading _________
-OpenCandy_15;___________, the software recommended to you by ___________, is now downloading at your requestWe will let you know when it is ready to be installed.
-OpenCandy_16;___________ is ready for installation
-OpenCandy_17;___________ is now fully downloaded. Please click on 'Install' to proceed.
-OpenCandy_18;___________ of ___________ downloaded
-OpenCandy_19;Powered by OpenCandy
-OpenCandy_20;Learn more at OpenCandy.com
-OpenCandy_21;Install
-OpenCandy_22;Installation of ___________
-OpenCandy_23;This will cancel the installation of ___________\r\nAre you sure you wish to exit?
-OpenCandy_24;Pause
-OpenCandy_25;Your download has been paused. Click 'Resume' when you are ready to continue.
-OpenCandy_26;Resume
-OpenCandy_27;Install Now
-OpenCandy_28;Pause Download
-OpenCandy_29;Resume Download
-OpenCandy_30;Cancel Install
-OpenCandy_31;Please choose an installation option
-OpenCandy_32;Install ___________
-OpenCandy_33;Don't Install
-OpenCandy_34;Please select an install option
-OpenCandy_35;______ recommends this software
-OpenCandy_36;Your current installation will not be interrupted
-Options;Options
-Options_Hint;Preferences
-Original;Original
-OriginalNetworkName;Original network name
-OriginalSourceForm;Original source form
-OriginalSourceMedium;Original source medium
-Other;Other
-Output;Output
-Output format;Output format
-OverallBitRate;Overall bit rate
-OverallBitRate_Maximum;Maximum Overall bit rate
-OverallBitRate_Minimum;Minimum Overall bit rate
-OverallBitRate_Mode;Overall bit rate mode
-OverallBitRate_Nominal;Nominal Overall bit rate
-Part;Part
-Part_Count;Total count
-Performer;Performer
-Period;Period
-Phone;Phone
-PixelAspectRatio;Pixel aspect ratio
-PixelAspectRatio_Original;Original pixel aspect ratio
-PlayCounter;PlayCounter
-Played_Count;Times played
-Played_First_Date;First played
-Played_Last_Date;Last played
-PlayTime;PlayTime
-Position;Position
-Position_Total;Total
-Preferences;Preferences
-Producer;Producer
-ProductionDesigner;Production designer
-ProductionStudio;Production studio
-Publisher;Publisher
-Purchased_Date;purchased date
-Quote character;Quote character
-RadioStation;Radio station
-Rating;Rating
-Recorded_Date;Recorded date
-Recorded_Location;Recorded location
-Released_Date;Released date
-RemixedBy;Remixed by
-ReplayGain_Gain;Replay gain
-ReplayGain_Peak;Replay gain peak
-Resolution;Resolution
-s;s
-SamplingRate;Sampling rate
-Save;Save
-ScanType;Scan type
-ScanOrder;Scan order
-ScreenplayBy;Screenplay by
-Season;Season
-see below;see below
-Send HeaderFile;Please send me the Header file here : http://sourceforge.net/projects/mediainfo/ (Bug section)
-Separator_Columns;columns separator
-Separator_Lines;lines separator
-ServiceChannel;Service channel number
-ServiceName;Service name
-ServiceProvider;Service provider
-ServiceType;Service type
-Set;Set
-Set_Count;Set count
-Setup;Setup
-Sharpness;Sharpness
-Sheet;Sheet
-Sheet (Complete);Sheet (Complete)
-Shell extension;Shell extension (in Explorer, right click there will be a MediaInfo option)
-Shell extension, folder;For folders too
-Shell InfoTip;Shell InfoTip (in Explorer, move the mouse over the file, info will be displayed)
-Show menu;Show menu
-Show toolbar;Show toolbar
-Sort;Sorted by
-SoundEngineer;Sound engineer
-Standard;Standard
-Stream;Stream
-Stream_MoreInfo;More information about the stream
-StreamCount;Count of stream of this kind
-StreamID;Stream ID
-StreamKind;Kind of stream
-StreamKindID;Stream identifier
-StreamKindPos;Stream identifier
-StreamSize;Stream size
-StreamSize_Proportion;Proportion of this stream
-Subject;Subject
-SubTrack;SubTrack
-Summary;Summary
-Supported formats;Supported formats
-Supported?;Supported?
-Synopsis;Synopsis
-SystemId;Id
-Tagged_Application;Tagging application
-Tagged_Date;Tagged date
-Technician;Technician
-TermsOfUse;Terms of use
-Text;Text
-Text - Custom;Text - Custom
-Text (HTML);Text (HTML)
-Text stream(s);Text streams
-Text streams;Text streams
-Text_Codec_List;Text codecs
-Text_No;No text
-Text1;First text stream
-Text2;Second text stream
-Text3;Third text stream
-TextCount;Count of text streams
-ThanksTo;Thanks to
-Thousands separator;Thousands separator
-Title;Title
-Title_More;Title, more info
-TimeZone;Timezone
-Total;Total
-Track;Track name
-Track_Count;Track count
-transfer_characteristics;Transfer characteristics
-Translator;Translator
-Tree;Tree
-Tree & Text;Tree & Text
-Unknown;Unknown
-Url;Url
-Video;Video
-Video stream(s);Video stream(s)
-Video_Codec_List;Codecs Video
-Video_Delay;Video delay
-Video_No;No video
-Video0_Delay;Video0 delay
-Video1;First video stream
-VideoCount;Count of video streams
-View;View
-View_Hint;Change the means of viewing information
-Warning : more streams in the files;Warning : there are more streams in the files
-Web;Web
-WebSite_Audio;Go to the web site of this audio codec
-WebSite_Audio_More;Go to the web site (%Url%) to find this audio codec
-WebSite_General;Go to the web site of a player for this file
-WebSite_General_More;Go to the web site of a player for this file
-WebSite_Text;Go to the web site of this text codec
-WebSite_Text_More;Go to the web site (%Url%) to find this text codec
-WebSite_Url;http://mediainfo.sourceforge.net
-WebSite_Video;Go to the web site of this video codec
-WebSite_Video_More;Go to the web site (%Url%) to find this video codec
-Width;Width
-Width_Original;Original width
-WriteMe;Write mail to author
-WriteToTranslator;Write to translator
-Written_Date;Written date
-Written_Location;Written location
-WrittenBy;Written by
-Yes;Yes
-Your system;Your system
-ZZ_Automatic_Percent;100
-ZZ_AutomaticLanguage_Percent;100
\ No newline at end of file

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text/MediaInfo Deleted

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text/MediaInfo/Summary.csv Deleted

@@ -1,5 +0,0 @@
-General;[%Format%][ (%Format_Profile%)][ (%Format_Commercial_IfAny%)]$if(%Format%,$: $)%FileSize/String%[, %Duration/String%]
-Video;[%Language/String%, ][%BitRate/String%$if(%BitRate_Nominal/String%, \$%BitRate_Nominal/String%\$), ][%Width%*][%Height%][ (%DisplayAspectRatio/String%), ][$at$ %FrameRate/String%, ][%Format%][ (%CodecID/Hint%)][ (%Standard%)]$if(%MuxingMode%, \$%MuxingMode%\$)$if(%Format_Version%, \$%Format_Version%\$)$if(%Format_Profile%, \$%Format_Profile%\$)$if(%Format_Settings%, \$%Format_Settings%\$)[ (%Format_Commercial_IfAny%)]
-Audio;[%Language/String%, ][%BitRate/String%$if(%BitRate_Nominal/String%, \$%BitRate_Nominal/String%\$), ][%SamplingRate/String%, ][%BitDepth/String%, ][%Channel(s)/String%, ][%Format%][ (%CodecID/Hint%)]$if(%MuxingMode%, \$%MuxingMode%\$)$if(%Format_Version%, \$%Format_Version%\$)$if(%Format_Profile%, \$%Format_Profile%\$)$if(%Format_Settings%, \$%Format_Settings%\$)[ (%Format_Commercial_IfAny%)]
-Text;[%Language/String%, ][%Format%][ (%Format_Commercial_IfAny%)]
-Chapters;[%Language/String%, ]%Total% chapters[, %Format%][ (%Format_Commercial_IfAny%)]

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text/Stream Deleted

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text/Stream/Audio.csv Deleted

@@ -1,141 +0,0 @@
-Count;;;N NI;;;Number of objects available in this stream;;
-StreamCount;;;N NI;;;Number of streams of this kind available;;
-StreamKind;Audio;;N NI;;;Stream type name;;
-StreamKind/String;;;N NI;;;Stream type name;;
-StreamKindID;;;N NI;;;Number of the stream (base=0);;
-StreamKindPos;;;N NI;;;When multiple streams, number of the stream (base=1);;
-Inform;;;N NT;;;Last **Inform** call;;
-ID;;;N YI;;;The ID of this stream in this file;;
-ID/String;;;Y NT;;;The ID of this stream in this file;;
-UniqueID;;;N YI;;;A unique ID for this stream, should be copied with stream copy;;
-MenuID;;;N YI;;;The menu ID for this stream in this file;;
-MenuID/String;;;Y NT;;;The menu ID for this stream in this file;;
-Format;;;Y YT;;;Format used;;
-Format/Info;;;Y NT;;;Info about the format;;
-Format/Url;;;N NT;;;Homepage of this format;;
-Format_Commercial;;;N NT;;;Commercial name used by vendor for theses setings or Format field if there is no difference;;
-Format_Commercial_IfAny;;;Y NT;;;Commercial name used by vendor for theses setings if there is one;;
-Format_Version;;;Y NT;;;Version of this format;;
-Format_Profile;;;Y NT;;;Profile of this Format;;
-Format_Settings;;;N NT;;;Settings needed for decoder used, summary;;
-Format_Settings_SBR;;Yes;N YT;;;;;
-Format_Settings_SBR/String;;;Y NT;;;;;
-Format_Settings_PS;;Yes;N YT;;;;;
-Format_Settings_PS/String;;;Y NT;;;;;
-Format_Settings_Mode;;;Y YT;;;;;
-Format_Settings_ModeExtension;;;Y YT;;;;;
-Format_Settings_Emphasis;;;Y YT;;;;;
-Format_Settings_Floor;;;Y YT;;;;;
-Format_Settings_Firm;;;Y YT;;;;;
-Format_Settings_Endianness;;;Y YT;;;;;
-Format_Settings_Sign;;;Y YT;;;;;
-Format_Settings_Law;;;Y YT;;;;;
-Format_Settings_ITU;;;Y YT;;;;;
-InternetMediaType;;;N YT;;;Internet Media Type (aka MIME Type, Content-Type);;
-MuxingMode;;;Y NT;;;How this stream is muxed in the container;;
-MuxingMode_MoreInfo;;;Y NT;;;More info (text) about the muxing mode;;
-CodecID;;;Y YT;;;Codec ID (found in some containers);;
-CodecID/Info;;;Y NT;;;Info about codec ID;;
-CodecID/Hint;;;Y NT;;;Hint/popular name for this codec ID;;
-CodecID/Url;;;N NT;;;Homepage for more details about this codec ID;;
-CodecID_Description;;;Y NT;;;Manual description given by the container;;
-Codec;;;N NT;;;Deprecated, do not use in new projects;;
-Codec/String;;;N NT;;;Deprecated, do not use in new projects;;
-Codec/Family;;;N NT;;;Deprecated, do not use in new projects;;
-Codec/Info;;;N NT;;;Deprecated, do not use in new projects;;
-Codec/Url;;;N NT;;;Deprecated, do not use in new projects;;
-Codec/CC;;;N NT;;;Deprecated, do not use in new projects;;
-Codec_Description;;;N NT;;;Deprecated, do not use in new projects;;
-Codec_Profile;;;N NT;;;Deprecated, do not use in new projects;;
-Codec_Settings;;;N NT;;;Deprecated, do not use in new projects;;
-Codec_Settings_Automatic;;;N NT;;;Deprecated, do not use in new projects;;
-Codec_Settings_Floor;;;N NT;;;Deprecated, do not use in new projects;;
-Codec_Settings_Firm;;;N NT;;;Deprecated, do not use in new projects;;
-Codec_Settings_Endianness;;;N NT;;;Deprecated, do not use in new projects;;
-Codec_Settings_Sign;;;N NT;;;Deprecated, do not use in new projects;;
-Codec_Settings_Law;;;N NT;;;Deprecated, do not use in new projects;;
-Codec_Settings_ITU;;;N NT;;;Deprecated, do not use in new projects;;
-Duration;; ms;N YI;;;Play time of the stream;;
-Duration/String;;;Y NT;;;Play time in format : XXx YYy only, YYy omited if zero;;
-Duration/String1;;;N NT;;;Play time in format : HHh MMmn SSs MMMms, XX omited if zero;;
-Duration/String2;;;N NT;;;Play time in format : XXx YYy only, YYy omited if zero;;
-Duration/String3;;;N NT;;;Play time in format : HH:MM:SS.MMM;;
-BitRate_Mode;;;N YT;;;Bit rate mode (VBR, CBR);;
-BitRate_Mode/String;;;Y NT;;;Bit rate mode (Constant, Variable);;
-BitRate;; bps;N YF;;;Bit rate in bps;;
-BitRate/String;;;Y NT;;;Bit rate (with measurement);;
-BitRate_Minimum;; bps;N YF;;;Minimum Bit rate in bps;;
-BitRate_Minimum/String;;;Y NT;;;Minimum Bit rate (with measurement);;
-BitRate_Nominal;; bps;N YF;;;Nominal Bit rate in bps;;
-BitRate_Nominal/String;;;Y NT;;;Nominal Bit rate (with measurement);;
-BitRate_Maximum;; bps;N YF;;;Maximum Bit rate in bps;;
-BitRate_Maximum/String;;;Y NT;;;Maximum Bit rate (with measurement);;
-Channel(s);; channel;N YF;;;Number of channels;;
-Channel(s)/String;;;Y NT;;;Number of channels (with measurement);;
-ChannelPositions;;;Y YT;;;Position of channels;;
-ChannelPositions/String2;;;N NT;;;Position of channels (x/y.z format);;
-SamplingRate;; Hz;N YF;;;Sampling rate;;
-SamplingRate/String;;;Y NT;;;in KHz;;
-SamplingCount;;;N NI;;;Sample count (based on sampling rate);;
-FrameCount;;;N NI;;;Frame count (a frame contains a count of samples depends of the format);;
-Resolution;; bit;N NI;;;Deprecated, do not use in new projects;;
-Resolution/String;;;N NT;;;Deprecated, do not use in new projects;;
-BitDepth;; bit;N YI;;;Resolution in bits (8, 16, 20, 24);;
-BitDepth/String;;;Y NT;;;Resolution in bits (8, 16, 20, 24);;
-CompressionRatio;;;Y YF;;;Current stream size divided by uncompressed stream size;;
-Delay;; ms;N YI;;;Delay fixed in the stream (relative);;
-Delay/String;;;N NT;;;Delay in format : XXx YYy only, YYy omited if zero;;
-Delay/String1;;;N NT;;;Delay in format : HHh MMmn SSs MMMms, XX omited if zero;;
-Delay/String2;;;N NT;;;Delay in format : XXx YYy only, YYy omited if zero;;
-Delay/String3;;;N NT;;;Delay in format : HH:MM:SS.MMM;;
-Delay_Original;; ms;N NI;;;Delay fixed in the raw stream (relative) IN MS;;
-Delay_Original/String;;;N NT;;;Delay with measurement;;
-Delay_Original/String1;;;N NT;;;Delay with measurement;;
-Delay_Original/String2;;;N NT;;;Delay with measurement;;
-Delay_Original/String3;;;N NT;;;format : HH:MM:SS.MMM;;
-Delay_Original_Settings;;;N NT;;;Delay settings (in case of timecode for example);;
-Video_Delay;; ms;N NI;;;Delay fixed in the stream (absolute / video);;
-Video_Delay/String;;;Y NT;;;;;
-Video_Delay/String1;;;N NT;;;;;
-Video_Delay/String2;;;N NT;;;;;
-Video_Delay/String3;;;N NT;;;;;
-Video0_Delay;; ms;N NI;;;Deprecated, do not use in new projects;;
-Video0_Delay/String;;;N NT;;;Deprecated, do not use in new projects;;
-Video0_Delay/String1;;;N NT;;;Deprecated, do not use in new projects;;
-Video0_Delay/String2;;;N NT;;;Deprecated, do not use in new projects;;
-Video0_Delay/String3;;;N NT;;;Deprecated, do not use in new projects;;
-ReplayGain_Gain;; dB;N YT;;;The gain to apply to reach 89dB SPL on playback;;
-ReplayGain_Gain/String;;;Y YT;;;;;
-ReplayGain_Peak;;;Y YT;;;The maximum absolute peak value of the item;;
-StreamSize;; byte;N YI;;;Streamsize in bytes;;
-StreamSize/String;;;Y NT;;;Streamsize in with percentage value;;
-StreamSize/String1;;;N NT;;;;;
-StreamSize/String2;;;N NT;;;;;
-StreamSize/String3;;;N NT;;;;;
-StreamSize/String4;;;N NT;;;;;
-StreamSize/String5;;;N NT;;;Streamsize in with percentage value;;
-StreamSize_Proportion;;;N NT;;;Stream size divided by file size;;
-Alignment;;;N YT;;;How this stream file is aligned in the container;;
-Alignment/String;;;Y NT;;;Where this stream file is aligned in the container;;
-Interleave_VideoFrames;;;N YF;;;Between how many video frames the stream is inserted;;
-Interleave_Duration;;;N YI;;;Between how much time (ms) the stream is inserted;;
-Interleave_Duration/String;;;Y NT;;;Between how much time and video frames the stream is inserted (with measurement);;
-Interleave_Preload;;;N YI;;;How much time is buffered before the first video frame;;
-Interleave_Preload/String;;;Y NT;;;How much time is buffered before the first video frame (with measurement);;
-Title;;;Y YI;;;Name of the track;;
-Encoded_Library;;;N YT;;;Software used to create the file;;
-Encoded_Library/String;;;Y NT;;;Software used to create the file;;
-Encoded_Library/Name;;;N NT;;;Info from the software;;
-Encoded_Library/Version;;;N NT;;;Version of software;;
-Encoded_Library/Date;;;N NT;;;Release date of software;;
-Encoded_Library_Settings;;;Y YT;;;Parameters used by the software;;
-Language;;;N YT;;;Language (2-letter ISO 639-1 if exists, else 3-letter ISO 639-2, and with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn);;
-Language/String;;;Y NT;;;Language (full);;
-Language/String1;;;N NT;;;Language (full);;
-Language/String2;;;N NT;;;Language (2-letter ISO 639-1 if exists, else empty);;
-Language/String3;;;N NT;;;Language (3-letter ISO 639-2 if exists, else empty);;
-Language/String4;;;N NT;;;Language (2-letter ISO 639-1 if exists with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn, else empty);;
-Language_More;;;Y YT;;;More info about Language (e.g. Director's Comment);;
-Encoded_Date;;;Y YT;;;UTC time that the encoding of this item was completed began.;;Temporal
-Tagged_Date;;;Y YT;;;UTC time that the tags were done for this item.;;Temporal
-Encryption;;;Y YT;;;;;

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text/Stream/Chapters.csv Deleted

@@ -1,23 +0,0 @@
-Count;;;N NI;;;Count of objects available in this stream
-StreamCount;;;N NI;;;Count of streams of that kind available
-StreamKind;Chapters;;N NI;;;Stream type name
-StreamKind/String;;;N NI;;;Stream type name
-StreamKindID;;;N NI;;;Number of the stream (base=0)
-StreamKindPos;;;N NI;;;When multiple streams, number of the stream (base=1)
-Inform;;;N NT;;;Last **Inform** call
-ID;;;N YI;;;A ID for this stream in this file
-ID/String;;;Y NT;;;A ID for this stream in this file
-UniqueID;;;N YI;;;A unique ID for this stream, should be copied with stream copy
-MenuID;;;N YI;;;The menu ID for this stream in this file
-MenuID/String;;;Y NT;;;The menu ID for this stream in this file
-Format;;;Y YT;;;Format used
-Format/Info;;;Y NT;;;Info about Format
-Format/Url;;;N NT;;;Link
-Codec;;;N YT;;;Deprecated
-Codec/String;;;Y NT;;;Deprecated
-Codec/Info;;;Y NT;;;Deprecated
-Codec/Url;;;Y YT;;;Deprecated
-Total;;;N YT;;;Total number of chapters
-Title;;;Y YI;;;Name of the track
-Language;;;N YT;;;Language (2-letter ISO 639-1 if exists, else 3-letter ISO 639-2, and with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn)
-Language/String;;;Y NT;;;Language (full)

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text/Stream/General.csv Deleted

@@ -1,267 +0,0 @@
-Count;;;N NI;;;Number of objects available in this stream
-StreamCount;;;N NI;;;Number of streams of this kind available
-StreamKind;General;;N NI;;;Stream type name
-StreamKind/String;;;N NI;;;Stream type name
-StreamKindID;;;N NI;;;Number of the stream (base=0)
-StreamKindPos;;;N NI;;;When multiple streams, number of the stream (base=1)
-Inform;;;N NT;;;Last **Inform** call
-ID;;;N YI;;;The ID for this stream in this file
-ID/String;;;Y NT;;;The ID for this stream in this file
-UniqueID;;;N YI;;;The unique ID for this stream, should be copied with stream copy
-MenuID;;;N YI;;;The menu ID for this stream in this file
-MenuID/String;;;Y NT;;;The menu ID for this stream in this file
-GeneralCount;1;;N NI;;;Number of general streams
-VideoCount;;;N NI;;;Number of video streams
-AudioCount;;;N NI;;;Number of audio streams
-TextCount;;;N NI;;;Number of text streams
-ChaptersCount;;;N NI;;;Number of chapters streams
-ImageCount;;;N NI;;;Number of image streams
-MenuCount;;;N NI;;;Number of menu streams
-Video_Format_List;;;N NT;;;Video Codecs in this file, separated by /
-Video_Format_WithHint_List;;;N NT;;;Video Codecs in this file with popular name (hint), separated by /
-Video_Codec_List;;;N NT;;;Deprecated, do not use in new projects
-Video_Language_List;;;N NT;;;Video languagesin this file, full names, separated by /
-Audio_Format_List;;;N NT;;;Audio Codecs in this file,separated by /
-Audio_Format_WithHint_List;;;N NT;;;Audio Codecs in this file with popular name (hint), separated by /
-Audio_Codec_List;;;N NT;;;Deprecated, do not use in new projects
-Audio_Language_List;;;N NT;;;Audio languages in this file separated by /
-Text_Format_List;;;N NT;;;Text Codecs in this file, separated by /
-Text_Format_WithHint_List;;;N NT;;;Text Codecs in this file with popular name (hint),separated by /
-Text_Codec_List;;;N NT;;;Deprecated, do not use in new projects
-Text_Language_List;;;N NT;;;Text languages in this file, separated by /
-Chapters_Format_List;;;N NT;;;Chapters Codecs in this file, separated by /
-Chapters_Format_WithHint_List;;;N NT;;;Chapters Codecs in this file with popular name (hint), separated by /
-Chapters_Codec_List;;;N NT;;;Deprecated, do not use in new projects
-Chapters_Language_List;;;N NT;;;Chapters languages in this file, separated by /
-Image_Format_List;;;N NT;;;Image Codecs in this file, separated by /
-Image_Format_WithHint_List;;;N NT;;;Image Codecs in this file with popular name (hint), separated by /
-Image_Codec_List;;;N NT;;;Deprecated, do not use in new projects
-Image_Language_List;;;N NT;;;Image languages in this file, separated by /
-Menu_Format_List;;;N NT;;;Menu Codecsin this file, separated by /
-Menu_Format_WithHint_List;;;N NT;;;Menu Codecs in this file with popular name (hint),separated by /
-Menu_Codec_List;;;N NT;;;Deprecated, do not use in new projects
-Menu_Language_List;;;N NT;;;Menu languages in this file, separated by /
-CompleteName;;;Y NT;;;Complete name (Folder+Name+Extension)
-FolderName;;;N NT;;;Folder name only
-FileName;;;N NT;;;File name only
-FileExtension;;;N NT;;;File extension only
-Format;;;Y YT;;;Format used
-Format/String;;;N NT;;;Deprecated, do not use in new projects
-Format/Info;;;Y NT;;;Info about this Format
-Format/Url;;;N NT;;;Link to a description of this format
-Format/Extensions;;;N NT;;;Known extensions of this format
-Format_Commercial;;;N NT;;;Commercial name used by vendor for theses setings or Format field if there is no difference
-Format_Commercial_IfAny;;;Y NT;;;Commercial name used by vendor for theses setings if there is one
-Format_Version;;;Y NT;;;Version of this format
-Format_Profile;;;Y NT;;;Profile of the Format
-Format_Settings;;;Y NT;;;Settings needed for decoder used
-InternetMediaType;;;N YT;;;Internet Media Type (aka MIME Type, Content-Type)
-CodecID;;;Y YT;;;Codec ID (found in some containers)
-CodecID/Info;;;Y NT;;;Info about this codec
-CodecID/Hint;;;Y NT;;;A hint/popular name for this codec
-CodecID/Url;;;N NT;;;A link to more details about this codec ID
-CodecID_Description;;;Y NT;;;Manual description given by the container
-Interleaved;;;N NT;;;If Audio and video are muxed
-Codec;;;N NT;;;Deprecated, do not use in new projects
-Codec/String;;;N NT;;;Deprecated, do not use in new projects
-Codec/Info;;;N NT;;;Deprecated, do not use in new projects
-Codec/Url;;;N NT;;;Deprecated, do not use in new projects
-Codec/Extensions;;;N NT;;;Deprecated, do not use in new projects
-Codec_Settings;;;N NT;;;Deprecated, do not use in new projects
-Codec_Settings_Automatic;;;N NT;;;Deprecated, do not use in new projects
-FileSize;; byte;N NT;;;File size in bytes
-FileSize/String;;;Y NT;;;File size (with measure)
-FileSize/String1;;;N NT;;;File size (with measure, 1 digit mini)
-FileSize/String2;;;N NT;;;File size (with measure, 2 digit mini)
-FileSize/String3;;;N NT;;;File size (with measure, 3 digit mini)
-FileSize/String4;;;N NT;;;File size (with measure, 4 digit mini)
-Duration;; ms;N YI;;;Play time of the stream in ms
-Duration/String;;;Y NT;;;Play time in format : XXx YYy only, YYy omited if zero
-Duration/String1;;;N NT;;;Play time in format : HHh MMmn SSs MMMms, XX omited if zero
-Duration/String2;;;N NT;;;Play time in format : XXx YYy only, YYy omited if zero
-Duration/String3;;;N NT;;;Play time in format : HH:MM:SS.MMM
-Duration_Start;;;Y YT;;;
-Duration_End;;;Y YT;;;
-OverallBitRate_Mode;;;N YT;;;Bit rate mode of all streams (VBR, CBR)
-OverallBitRate_Mode/String;;;Y NT;;;Bit rate mode of all streams (Variable, Constant)
-OverallBitRate;; bps;N YF;;;Bit rate of all streams in bps
-OverallBitRate/String;;;Y NT;;;Bit rate of all streams (with measure)
-OverallBitRate_Minimum;; bps;N YF;;;Minimum Bit rate in bps
-OverallBitRate_Minimum/String;;;Y NT;;;Minimum Bit rate (with measurement)
-OverallBitRate_Nominal;; bps;N YF;;;Nominal Bit rate in bps
-OverallBitRate_Nominal/String;;;Y NT;;;Nominal Bit rate (with measurement)
-OverallBitRate_Maximum;; bps;N YF;;;Maximum Bit rate in bps
-OverallBitRate_Maximum/String;;;Y NT;;;Maximum Bit rate (with measurement)
-Delay;; ms;N NI;;;Delay fixed in the stream (relative) IN MS
-Delay/String;;;N NT;;;Delay with measurement
-Delay/String1;;;N NT;;;Delay with measurement
-Delay/String2;;;N NT;;;Delay with measurement
-Delay/String3;;;N NT;;;format : HH:MM:SS.MMM
-StreamSize;; byte;N YI;;;Stream size in bytes
-StreamSize/String;;;N NT;;;
-StreamSize/String1;;;N NT;;;
-StreamSize/String2;;;N NT;;;
-StreamSize/String3;;;N NT;;;
-StreamSize/String4;;;N NT;;;
-StreamSize/String5;;;N NT;;;With proportion
-StreamSize_Proportion;;;N NT;;;Stream size divided by file size
-HeaderSize;;;N NI;;;
-DataSize;;;N NI;;;
-FooterSize;;;N NI;;;
-Album_ReplayGain_Gain;; dB;N YT;;;The gain to apply to reach 89dB SPL on playback
-Album_ReplayGain_Gain/String;;;Y YT;;;
-Album_ReplayGain_Peak;;;Y YT;;;The maximum absolute peak value of the item;;
-Encryption;;;Y YT;;;;;
-Title;;;N NT;;;(Generic)Title of file;;Title
-Title/More;;;N NT;;;(Generic)More info about the title of file;;Title
-Title/Url;;;N NT;;;(Generic)Url;;Title
-Domain;;;Y YT;;;Univers movies belong to, e.g. Starwars, Stargate, Buffy, Dragonballs;;Title
-Collection;;;Y YT;;;Name of the series, e.g. Starwars movies, Stargate SG-1, Stargate Atlantis, Buffy, Angel;;Title
-Season;;;Y YT;;;Name of the season, e.g. Strawars first Trilogy, Season 1;;Title
-Season_Position;;;Y YI;;;Number of the Season;;Title
-Season_Position_Total;;;Y YI;;;Place of the season e.g. 2 of 7;;Title
-Movie;;;Y YT;;;Name of the movie. Eg : Starwars, a new hope;;Title
-Movie/More;;;Y YT;;;More infos about the movie;;Title
-Movie/Country;;;Y YT;;;Country, where the movie was procuced;;Title
-Movie/Url;;;Y YT;;;Homepage for the movie;;Title
-Album;;;Y YT;;;Name of an audio-album. Eg : The joshua tree;;Title
-Album/More;;;Y YT;;;More infos about the album;;Title
-Album/Sort;;;Y YT;;;;;Title
-Comic;;;Y YT;;;Name of the comic.;;Title
-Comic/More;;;Y YT;;;;;Title
-Comic/Position_Total;;;Y YI;;;;;Title
-Part;;;Y YT;;;Name of the part. e.g. CD1, CD2;;Title
-Part/Position;;;Y YI;;;Number of the part;;Title
-Part/Position_Total;;;Y YI;;;Place of the part e.g. 2 of 3;;Title
-Track;;;Y YT;;;Name of the track. e.g. track1, track 2;;Title
-Track/More;;;Y YT;;;More infos about the track;;Title
-Track/Url;;;Y YT;;;Link to a site about this track;;Title
-Track/Sort;;;Y YT;;;;;Title
-Track/Position;;;Y YI;;;Number of this track;;Title
-Track/Position_Total;;;Y YI;;;Place of this track, e.g. 3 of 15;;Title
-Chapter;;;Y YT;;;Name of the chapter.;;Title
-SubTrack;;;Y YT;;;Name of the subtrack.;;Title
-Original/Album;;;Y YT;;;Original name of album, serie...;;Title
-Original/Movie;;;Y YT;;;Original name of the movie;;Title
-Original/Part;;;Y YT;;;Original name of the part in the original support;;Title
-Original/Track;;;Y YT;;;Original name of the track in the original support;;Title
-Performer;;;Y YT;;;Main performer/artist of this file;;Entity
-Performer/Sort;;;Y YT;;;;;Entity
-Performer/Url;;;Y YT;;;Homepage of the performer/artist;;Entity
-Original/Performer;;;Y YT;;;Original artist(s)/performer(s).;;Entity
-Accompaniment;;;Y YT;;;Band/orchestra/accompaniment/musician.;;Entity
-Composer;;;Y YT;;;Name of the original composer.;;Entity
-Composer/Nationality;;;Y YT;;;Nationality of the main composer of the item, mostly for classical music.;;Entity
-Arranger;;;Y YT;;;The person who arranged the piece. e.g. Ravel.;;Entity
-Lyricist;;;Y YT;;;The person who wrote the lyrics for a musical item.;;Entity
-Original/Lyricist;;;Y YT;;;Original lyricist(s)/text writer(s).;;Entity
-Conductor;;;Y YT;;;The artist(s) who performed the work. In classical music this would be the conductor, orchestra, soloists.;;Entity
-Director;;;Y YT;;;Name of the director.;;Entity
-AssistantDirector;;;Y YT;;;Name of the assistant director.;;Entity
-DirectorOfPhotography;;;Y YT;;;The name of the director of photography, also known as cinematographer.;;Entity
-SoundEngineer;;;Y YT;;;The name of the sound engineer or sound recordist.;;Entity
-ArtDirector;;;Y YT;;;The person who oversees the artists and craftspeople who build the sets.;;Entity
-ProductionDesigner;;;Y YT;;;The person responsible for designing the Overall visual appearance of a movie.;;Entity
-Choregrapher;;;Y YT;;;The name of the choregrapher.;;Entity
-CostumeDesigner;;;Y YT;;;The name of the costume designer.;;Entity
-Actor;;;Y YT;;;Real name of an actor or actress playing a role in the movie.;;Entity
-Actor_Character;;;Y YT;;;Name of the character an actor or actress plays in this movie.;;Entity
-WrittenBy;;;Y YT;;;The author of the story or script.;;Entity
-ScreenplayBy;;;Y YT;;;The author of the screenplay or scenario (used for movies and TV shows).;;Entity
-EditedBy;;;Y YT;;;Editors name;;Entity
-CommissionedBy;;;Y YT;;;name of the person or organization that commissioned the subject of the file;;Entity
-Producer;;;Y YT;;;Name of the producer of the movie.;;Entity
-CoProducer;;;Y YT;;;The name of a co-producer.;;Entity
-ExecutiveProducer;;;Y YT;;;The name of an executive producer.;;Entity
-MusicBy;;;Y YT;;;Main music-artist for a movie;;Entity
-DistributedBy;;;Y YT;;;Company the item is mainly distributed by ;;Entity
-OriginalSourceForm/DistributedBy;;;Y YT;;;Name of the person or organization who supplied the original subject;;Entity
-MasteredBy;;;Y YT;;;The engineer who mastered the content for a physical medium or for digital distribution.;;Entity
-EncodedBy;;;Y YT;;;Name of the person or organisation that encoded/ripped the audio file.;;Entity
-RemixedBy;;;Y YT;;;Name of the artist(s), that interpreted, remixed, or otherwise modified the item.;;Entity
-ProductionStudio;;;Y YT;;;Main production studio ;;Entity
-ThanksTo;;;Y YT;;;A very general tag for everyone else that wants to be listed.;;Entity
-Publisher;;;Y YT;;;Name of the organization publishing the album (i.e. the 'record label') or movie.;;Entity
-Publisher/URL;;;Y YT;;;Publishers official webpage.;;Entity
-Label;;;Y YT;;;Brand or trademark associated with the marketing of music recordings and music videos.;;Entity
-Genre;;;Y YT;;;The main genre of the audio or video. e.g. classical, ambient-house, synthpop, sci-fi, drama, etc.;;Classification
-Mood;;;Y YT;;;Intended to reflect the mood of the item with a few keywords, e.g. Romantic, Sad, Uplifting, etc.;;Classification
-ContentType;;;Y YT;;;The type of the item. e.g. Documentary, Feature Film, Cartoon, Music Video, Music, Sound FX, etc.;;Classification
-Subject;;;Y YT;;;Describes the topic of the file, such as Aerial view of Seattle..;;Classification
-Description;;;Y YT;;;A short description of the contents, such as Two birds flying.;;Classification
-Keywords;;;Y YT;;;Keywords to the item separated by a comma, used for searching.;;Classification
-Summary;;;Y YT;;;A plot outline or a summary of the story.;;Classification
-Synopsis;;;Y YT;;;A description of the story line of the item.;;Classification
-Period;;;Y YT;;;Describes the period that the piece is from or about. e.g. Renaissance.;;Classification
-LawRating;;;Y YT;;;Depending on the country it's the format of the rating of a movie (P, R, X in the USA, an age in other countries or a URI defining a logo).;;Classification
-LawRating_Reason;;;Y YT;;;Reason for the law rating;;Classification
-ICRA;;;Y YT;;;The ICRA rating. (Previously RSACi);;Classification
-Released_Date;;;Y YT;;;The date/year that the item was released.;;Temporal
-Original/Released_Date;;;Y YT;;;The date/year that the item was originaly released.;;Temporal
-Recorded_Date;;;Y YT;;;The time/date/year that the recording began.;;Temporal
-Encoded_Date;;;Y YT;;;The time/date/year that the encoding of this item was completed began.;;Temporal
-Tagged_Date;;;Y YT;;;The time/date/year that the tags were done for this item.;;Temporal
-Written_Date;;;Y YT;;;The time/date/year that the composition of the music/script began.;;Temporal
-Mastered_Date;;;Y YT;;;The time/date/year that the item was tranfered to a digitalmedium.;;Temporal
-File_Created_Date;;;N NT;;;The time that the file was created on the file system;;Temporal
-File_Created_Date_Local;;;N NT;;;The time that the file was created on the file system (Warning: this field depends of local configuration, do not use it in an international database);;Temporal
-File_Modified_Date;;;N NT;;;The time that the file was modified on the file system;;Temporal
-File_Modified_Date_Local;;;N NT;;;The time that the file was modified on the file system (Warning: this field depends of local configuration, do not use it in an international database);;Temporal
-Recorded_Location;;;Y YT;;;Location where track was recorded. (See COMPOSITION_LOCATION for format);;Spatial
-Written_Location;;;Y YT;;;Location that the item was originaly designed/written. Information should be stored in the following format: country code, state/province, city where the coutry code is the same 2 octets as in Internet domains, or possibly ISO-3166. e.g. US, Texas, Austin or US, , Austin.;;Spatial
-Archival_Location;;;Y YT;;;Location, where an item is archived, e.eg. Louvre,Paris,France;;Spatial
-Encoded_Application;;;Y YT;;;Name of the software package used to create the file, such as Microsoft WaveEdit.;;Technical
-Encoded_Application/Url;;;N YT;;;Name of the software package used to create the file, such as Microsoft WaveEdit.;;Technical
-Encoded_Library;;;N YT;;;Software used to create the file;;Technical
-Encoded_Library/String;;;Y NT;;;Software used to create the file;;Technical
-Encoded_Library/Name;;;N NT;;;Name of the the encoding-software;;Technical
-Encoded_Library/Version;;;N NT;;;Version of encoding-software;;Technical
-Encoded_Library/Date;;;N NT;;;Release date of software;;Technical
-Encoded_Library_Settings;;;Y YT;;;Parameters used by the software;;Technical
-Cropped;;;Y YT;;;Describes whether an image has been cropped and, if so, how it was cropped.;;Technical
-Dimensions;;;Y YT;;;Specifies the size of the original subject of the file. eg 8.5 in h, 11 in w;;Technical
-DotsPerInch;;;Y YT;;;Stores dots per inch setting of the digitizer used to produce the file;;Technical
-Lightness;;;Y YT;;;Describes the changes in lightness settings on the digitizer required to produce the file;;Technical
-OriginalSourceMedium;;;Y YT;;;Original medium of the material, e.g. vinyl, Audio-CD, Super8 or BetaMax;;Technical
-OriginalSourceForm;;;Y YT;;;Original form of the material, e.g. slide, paper, map;;Technical
-OriginalSourceForm/NumColors;;;Y YT;;;Number of colors requested when digitizing, e.g. 256 for images or 32 bit RGB for video;;Technical
-OriginalSourceForm/Name;;;Y YT;;;Name of the product the file was originally intended for;;Technical
-OriginalSourceForm/Cropped;;;Y YT;;;Describes whether an image has been cropped and, if so, how it was cropped. e.g. 16:9 to 4:3, top and bottom;;Technical
-OriginalSourceForm/Sharpness;;;Y YT;;;Identifies the changes in sharpness for the digitizer requiered to produce the file;;Technical
-Tagged_Application;;;Y YT;;;Software used to tag this file;;Technical
-BPM;;;Y YT;;;Average number of beats per minute;;Technical
-ISRC;;;Y YT;;;International Standard Recording Code, excluding the ISRC prefix and including hyphens.;;Identifier
-ISBN;;;Y YT;;;International Standard Book Number.;;Identifier
-BarCode;;;Y YT;;;EAN-13 (13-digit European Article Numbering) or UPC-A (12-digit Universal Product Code) bar code identifier.;;Identifier
-LCCN;;;Y YT;;;Library of Congress Control Number.;;Identifier
-CatalogNumber;;;Y YT;;;A label-specific catalogue number used to identify the release. e.g. TIC 01.;;Identifier
-LabelCode;;;Y YT;;;A 4-digit or 5-digit number to identify the record label, typically printed as (LC) xxxx or (LC) 0xxxx on CDs medias or covers, with only the number being stored.;;Identifier
-Owner;;;Y YT;;;Owner of the file;;Legal
-Copyright;;;Y YT;;;Copyright attribution.;;Legal
-Copyright/Url;;;Y YT;;;Link to a site with copyright/legal information.;;Legal
-Producer_Copyright;;;Y YT;;;The copyright information as per the productioncopyright holder.;;Legal
-TermsOfUse;;;Y YT;;;License information, e.g., All Rights Reserved,Any Use Permitted.;;Legal
-ServiceName;;;Y YT;;;;;Legal
-ServiceChannel;;;Y YT;;;;;Legal
-Service/Url;;;Y YT;;;;;Legal
-ServiceProvider;;;Y YT;;;;;Legal
-ServiceProviderr/Url;;;Y YT;;;;;Legal
-ServiceType;;;Y YT;;;;;Legal
-NetworkName;;;Y YT;;;;;Legal
-OriginalNetworkName;;;Y YT;;;;;Legal
-Country;;;Y YT;;;;;Legal
-TimeZone;;;Y YT;;;;;Legal
-Cover;;;Y YT;;;Is there a cover;;Info
-Cover_Description;;;Y YT;;;short descriptio, e.g. Earth in space;;Info
-Cover_Type;;;Y YT;;;;;Info
-Cover_Mime;;;Y YT;;;;;Info
-Cover_Data;;;N YT;;;Cover, in binary format encoded BASE64;;Info
-Lyrics;;;Y YT;;;Text of a song;;Info
-Comment;;;Y YT;;;Any comment related to the content.;;Personal
-Rating;;;Y YT;;;A numeric value defining how much a person likes the song/movie. The number is between 0 and 5 with decimal values possible (e.g. 2.7), 5(.0) being the highest possible rating.;;Personal
-Added_Date;;;Y YT;;;Date/year the item was added to the owners collection;;Personal
-Played_First_Date;;;Y YT;;;The date, the owner first played an item;;Personal
-Played_Last_Date;;;Y YT;;;The date, the owner last played an item;;Personal
-Played_Count;;;Y YI;;;Number of times an item was played;;Personal
-EPG_Positions_Begin;;;N NI;;;;;
-EPG_Positions_End;;;N NI;;;;;

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text/Stream/Generic.csv Deleted

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text/Stream/Image.csv Deleted

@@ -1,66 +0,0 @@
-Count;;;N YI;;;Count of objects available in this stream
-StreamCount;;;N YI;;;Count of streams of that kind available
-StreamKind;Image;;N NI;;;Stream type name
-StreamKind/String;;;N NI;;;Stream type name
-StreamKindID;;;N NI;;;Number of the stream (base=0)
-StreamKindPos;;;N NI;;;When multiple streams, number of the stream (base=1)
-Inform;;;N NT;;;Last **Inform** call
-ID;;;N YI;;;A ID for this stream in this file
-ID/String;;;Y NT;;;The ID for this stream in this file
-UniqueID;;;N YI;;;A unique ID for this stream, should be copied with stream copy
-MenuID;;;N YI;;;The menu ID for this stream in this file
-MenuID/String;;;Y NT;;;The menu ID for this stream in this file
-Title;;;Y YI;;;Name of the track
-Format;;;Y YT;;;Format used
-Format/Info;;;Y NT;;;Info about Format
-Format/Url;;;N NT;;;Link
-Format_Commercial;;;N NT;;;Commercial name used by vendor for theses setings or Format field if there is no difference
-Format_Commercial_IfAny;;;Y NT;;;Commercial name used by vendor for theses setings if there is one
-Format_Version;;;Y NT;;;Version of this format
-Format_Profile;;;Y NT;;;Profile of the Format
-Format_Settings;;;Y NT;;;Settings needed for decoder used
-InternetMediaType;;;N YT;;;Internet Media Type (aka MIME Type, Content-Type)
-CodecID;;;Y YT;;;Codec ID (found in some containers)
-CodecID/Info;;;Y NT;;;Info about codec ID
-CodecID/Hint;;;Y NT;;;A hint for this codec ID
-CodecID/Url;;;N NT;;;A link for more details about this codec ID
-CodecID_Description;;;Y NT;;;Manual description given by the container
-Codec;;;N NT;;;Deprecated, do not use in new projects
-Codec/String;;;N NT;;;Deprecated, do not use in new projects
-Codec/Family;;;N NT;;;Deprecated, do not use in new projects
-Codec/Info;;;N NT;;;Deprecated, do not use in new projects
-Codec/Url;;;N NT;;;Deprecated, do not use in new projects
-Width;; pixel;N YI;;;Width
-Width/String;;;Y NT;;;
-Height;; pixel;N YI;;;Height
-Height/String;;;Y NT;;;
-ColorSpace;;;Y YT;;;
-ChromaSubsampling;;;Y YT;;;
-Resolution;; bit;N NI;;;Deprecated, do not use in new projects
-Resolution/String;;;N NT;;;Deprecated, do not use in new projects
-BitDepth;; bit;N YI;;;
-BitDepth/String;;;Y NT;;;
-StreamSize;; byte;N YI;;;Stream size in bytes
-StreamSize/String;;;Y NT;;;
-StreamSize/String1;;;N NT;;;
-StreamSize/String2;;;N NT;;;
-StreamSize/String3;;;N NT;;;
-StreamSize/String4;;;N NT;;;
-StreamSize/String5;;;N NT;;;With proportion;;
-StreamSize_Proportion;;;N NT;;;Stream size divided by file size;;
-Encoded_Library;;;N YT;;;Software used to create the file;;
-Encoded_Library/String;;;Y NT;;;Software used to create the file;;
-Encoded_Library/Name;;;N NT;;;Info from the software;;
-Encoded_Library/Version;;;N NT;;;Version of software;;
-Encoded_Library/Date;;;N NT;;;Release date of software;;
-Encoded_Library_Settings;;;Y YT;;;Parameters used by the software;;
-Language;;;N YT;;;Language (2-letter ISO 639-1 if exists, else 3-letter ISO 639-2, and with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn);;
-Language/String;;;Y NT;;;Language (full);;
-Language/String1;;;N NT;;;Language (full);;
-Language/String2;;;N NT;;;Language (2-letter ISO 639-1 if exists, else empty);;
-Language/String3;;;N NT;;;Language (3-letter ISO 639-2 if exists, else empty);;
-Language/String4;;;N NT;;;Language (2-letter ISO 639-1 if exists with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn, else empty);;
-Summary;;;N NT;;;;;
-Encoded_Date;;;Y YT;;;The time that the encoding of this item was completed began.;;Temporal
-Tagged_Date;;;Y YT;;;The time that the tags were done for this item.;;Temporal
-Encryption;;;Y YT;;;;;

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text/Stream/Menu.csv Deleted

@@ -1,65 +0,0 @@
-Count;;;N NI;;;Count of objects available in this stream
-StreamCount;;;N NI;;;Count of streams of that kind available
-StreamKind;Menu;;N NI;;;Stream type name
-StreamKind/String;;;N NI;;;Stream type name
-StreamKindID;;;N NI;;;Number of the stream (base=0)
-StreamKindPos;;;N NI;;;When multiple streams, number of the stream (base=1)
-Inform;;;N NT;;;Last **Inform** call
-ID;;;N YI;;;A ID for this stream in this file
-ID/String;;;Y NT;;;A ID for this stream in this file
-UniqueID;;;N YI;;;A unique ID for this stream, should be copied with stream copy
-MenuID;;;N YI;;;A menu ID for this stream in this file
-MenuID/String;;;Y NT;;;A menu ID for this stream in this file
-Format;;;N YT;;;Format used
-Format/Info;;;N NT;;;Info about Format
-Format/Url;;;N NT;;;Link
-Format_Commercial;;;N NT;;;Commercial name used by vendor for theses setings or Format field if there is no difference
-Format_Commercial_IfAny;;;Y NT;;;Commercial name used by vendor for theses setings if there is one
-Format_Version;;;Y NT;;;Version of this format
-Format_Profile;;;Y NT;;;Profile of the Format
-Format_Settings;;;Y NT;;;Settings needed for decoder used
-CodecID;;;Y YT;;;Codec ID (found in some containers)
-CodecID/Info;;;Y NT;;;Info about this codec
-CodecID/Hint;;;Y NT;;;A hint/popular name for this codec
-CodecID/Url;;;N NT;;;A link to more details about this codec ID
-CodecID_Description;;;Y NT;;;Manual description given by the container
-Codec;;;N YT;;;Deprecated
-Codec/String;;;N NT;;;Deprecated
-Codec/Info;;;N NT;;;Deprecated
-Codec/Url;;;N NT;;;Deprecated
-Duration;; ms;N YI;;;Play time of the stream in ms
-Duration/String;;;Y NT;;;Play time in format : XXx YYy only, YYy omited if zero
-Duration/String1;;;N NT;;;Play time in format : HHh MMmn SSs MMMms, XX omited if zero
-Duration/String2;;;N NT;;;Play time in format : XXx YYy only, YYy omited if zero
-Duration/String3;;;N NT;;;Play time in format : HH:MM:SS.MMM
-Duration_Start;;;Y YT;;;
-Duration_End;;;Y YT;;;
-Delay;; ms;N NI;;;Delay fixed in the stream (relative) IN MS
-Delay/String;;;N NT;;;Delay with measurement
-Delay/String1;;;N NT;;;Delay with measurement
-Delay/String2;;;N NT;;;Delay with measurement
-Delay/String3;;;N NT;;;format : HH:MM:SS.MMM
-List_StreamKind;;;N YT;;;List of programs available
-List_StreamPos;;;N YT;;;List of programs available
-List;;;N YT;;;List of programs available
-List/String;;;Y NT;;;List of programs available
-Title;;;Y YI;;;Name of this menu
-Language;;;N YT;;;Language (2-letter ISO 639-1 if exists, else 3-letter ISO 639-2, and with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn)
-Language/String;;;Y NT;;;Language (full)
-Language/String1;;;N NT;;;Language (full);;
-Language/String2;;;N NT;;;Language (2-letter ISO 639-1 if exists, else empty);;
-Language/String3;;;N NT;;;Language (3-letter ISO 639-2 if exists, else empty);;
-Language/String4;;;N NT;;;Language (2-letter ISO 639-1 if exists with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn, else empty);;
-Language_More;;;Y YT;;;More info about Language (e.g. Director's Comment);;
-ServiceName;;;Y YT;;;;;Legal
-ServiceChannel;;;Y YT;;;;;Legal
-Service/Url;;;Y YT;;;;;Legal
-ServiceProvider;;;Y YT;;;;;Legal
-ServiceProviderr/Url;;;Y YT;;;;;Legal
-ServiceType;;;Y YT;;;;;Legal
-NetworkName;;;Y YT;;;;;Legal
-Original/NetworkName;;;Y YT;;;;;Legal
-Countries;;;Y YT;;;;;Legal
-TimeZones;;;Y YT;;;;;Legal
-Chapters_Pos_Begin;;;N NI;;;Used by third-party developpers to know about the begining of the chapters list, to be used by Get(Stream_Menu, x, Pos), where Pos is an Integer between Chapters_Pos_Begin and Chapters_Pos_End;;
-Chapters_Pos_End;;;N NI;;;Used by third-party developpers to know about the end of the chapters list (this position excluded)

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text/Stream/Text.csv Deleted

@@ -1,119 +0,0 @@
-Count;;;N NI;;;Count of objects available in this stream
-StreamCount;;;N NI;;;Count of streams of that kind available
-StreamKind;Text;;N NI;;;Stream type name
-StreamKind/String;;;N NI;;;Stream type name
-StreamKindID;;;N NI;;;Number of the stream (base=0)
-StreamKindPos;;;N NI;;;When multiple streams, number of the stream (base=1)
-Inform;;;N NT;;;Last **Inform** call
-ID;;;N YI;;;A ID for this stream in this file
-ID/String;;;Y NT;;;A ID for this stream in this file
-UniqueID;;;N YI;;;A unique ID for this stream, should be copied with stream copy
-MenuID;;;N YI;;;A menu ID for this stream in this file
-MenuID/String;;;Y NT;;;A menu ID for this stream in this file
-Format;;;Y YT;;;Format used
-Format/Info;;;Y NT;;;Info about Format
-Format/Url;;;N NT;;;Link
-Format_Commercial;;;N NT;;;Commercial name used by vendor for theses setings or Format field if there is no difference
-Format_Commercial_IfAny;;;Y NT;;;Commercial name used by vendor for theses setings if there is one
-Format_Version;;;Y NT;;;Version of this format
-Format_Profile;;;Y NT;;;Profile of the Format
-Format_Settings;;;Y NT;;;Settings needed for decoder used
-InternetMediaType;;;N YT;;;Internet Media Type (aka MIME Type, Content-Type)
-MuxingMode;;;Y NT;;;How this stream is muxed in the container
-MuxingMode_MoreInfo;;;Y NT;;;More info (text) about the muxing mode
-CodecID;;;Y YT;;;Codec ID (found in some containers)
-CodecID/Info;;;Y NT;;;Info about codec ID
-CodecID/Hint;;;Y NT;;;A hint for this codec ID
-CodecID/Url;;;N NT;;;A link for more details about this codec ID
-CodecID_Description;;;Y NT;;;Manual description given by the container
-Codec;;;N YT;;;Deprecated
-Codec/String;;;N NT;;;Deprecated
-Codec/Info;;;N NT;;;Deprecated
-Codec/Url;;;N NT;;;Deprecated
-Codec/CC;;;N NT;;;Deprecated;
-Duration;; ms;N YI;;;Play time of the stream;
-Duration/String;;;Y NT;;;Play time (formated);
-Duration/String1;;;N NT;;;Play time in format : HHh MMmn SSs MMMms, XX omited if zero;
-Duration/String2;;;N NT;;;Play time in format : XXx YYy only, YYy omited if zero;
-Duration/String3;;;N NT;;;Play time in format : HH:MM:SS.MMM;
-Duration/String4;;;N NT;;;Play time in format : HH:MM:SS:FF (HH:MM:SS;FF for drop frame, if available)
-BitRate_Mode;;;N YT;;;Bit rate mode (VBR, CBR);
-BitRate_Mode/String;;;Y NT;;;Bit rate mode (Constant, Variable);
-BitRate;; bps;N YF;;;Bit rate in bps;
-BitRate/String;;;Y NT;;;Bit rate (with measurement);
-BitRate_Minimum;; bps;N YF;;;Minimum Bit rate in bps;
-BitRate_Minimum/String;;;Y NT;;;Minimum Bit rate (with measurement);
-BitRate_Nominal;; bps;N YF;;;Nominal Bit rate in bps;
-BitRate_Nominal/String;;;Y NT;;;Nominal Bit rate (with measurement);
-BitRate_Maximum;; bps;N YF;;;Maximum Bit rate in bps;
-BitRate_Maximum/String;;;Y NT;;;Maximum Bit rate (with measurement)
-Width;; pixel;N YI;;;Width
-Width/String;;;Y NT;;;
-Height;; pixel;N YI;;;Height
-Height/String;;;Y NT;;;
-FrameRate_Mode;;;N YT;;;Frame rate mode (CFR, VFR)
-FrameRate_Mode/String;;;Y NT;;;Frame rate mode (Constant, Variable)
-FrameRate;; fps;N YF;;;Frames per second
-FrameRate/String;;;Y NT;;;Frames per second (with measurement)
-FrameRate_Minimum;; fps;N YF;;;Minimum Frames per second
-FrameRate_Minimum/String;;;Y NT;;;Minimum Frames per second (with measurement)
-FrameRate_Nominal;; fps;N YF;;;Nominal Frames per second
-FrameRate_Nominal/String;;;Y NT;;;Nominal Frames per second (with measurement)
-FrameRate_Maximum;; fps;N YF;;;Maximum Frames per second
-FrameRate_Maximum/String;;;Y NT;;;Maximum Frames per second (with measurement)
-FrameRate_Original;; fps;N YF;;;Original (in the raw stream) Frames per second
-FrameRate_Original/String;;;Y NT;;;Original (in the raw stream) Frames per second (with measurement)
-FrameCount;;;N NI;;;Number of frames
-ColorSpace;;;Y YT;;;
-ChromaSubsampling;;;Y YT;;;
-Resolution;; bit;N NI;;;Deprecated, do not use in new projects
-Resolution/String;;;N NT;;;Deprecated, do not use in new projects
-BitDepth;; bit;N YI;;;
-BitDepth/String;;;Y NT;;;
-Delay;; ms;N YI;;;Delay fixed in the stream (relative)
-Delay/String;;;N NT;;;
-Delay/String1;;;N NT;;;
-Delay/String2;;;N NT;;;
-Delay/String3;;;N NT;;;
-Delay_Original;; ms;N NI;;;Delay fixed in the raw stream (relative) IN MS
-Delay_Original/String;;;N NT;;;Delay with measurement
-Delay_Original/String1;;;N NT;;;Delay with measurement
-Delay_Original/String2;;;N NT;;;Delay with measurement
-Delay_Original/String3;;;N NT;;;format : HH:MM:SS.MMM
-Delay_Original_Settings;;;N NT;;;Delay settings (in case of timecode for example)
-Video_Delay;; ms;N NI;;;Delay fixed in the stream (absolute / video)
-Video_Delay/String;;;Y NT;;;
-Video_Delay/String1;;;N NT;;;
-Video_Delay/String2;;;N NT;;;
-Video_Delay/String3;;;N NT;;;
-Video0_Delay;; ms;N NI;;;Deprecated
-Video0_Delay/String;;;N NT;;;Deprecated
-Video0_Delay/String1;;;N NT;;;Deprecated
-Video0_Delay/String2;;;N NT;;;Deprecated
-Video0_Delay/String3;;;N NT;;;Deprecated
-StreamSize;; byte;N YI;;;Stream size in bytes
-StreamSize/String;;;Y NT;;;
-StreamSize/String1;;;N NT;;;
-StreamSize/String2;;;N NT;;;
-StreamSize/String3;;;N NT;;;
-StreamSize/String4;;;N NT;;;
-StreamSize/String5;;;N NT;;;With proportion
-StreamSize_Proportion;;;N NT;;;Stream size divided by file size
-Title;;;Y YI;;;Name of the track
-Encoded_Library;;;N YT;;;Software used to create the file
-Encoded_Library/String;;;Y NT;;;Software used to create the file
-Encoded_Library/Name;;;N NT;;;Info from the software
-Encoded_Library/Version;;;N NT;;;Version of software
-Encoded_Library/Date;;;N NT;;;Release date of software
-Encoded_Library_Settings;;;Y YT;;;Parameters used by the software
-Language;;;N YT;;;Language (2-letter ISO 639-1 if exists, else 3-letter ISO 639-2, and with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn)
-Language/String;;;Y NT;;;Language (full)
-Language/String1;;;N NT;;;Language (full)
-Language/String2;;;N NT;;;Language (2-letter ISO 639-1 if exists, else empty)
-Language/String3;;;N NT;;;Language (3-letter ISO 639-2 if exists, else empty);;
-Language/String4;;;N NT;;;Language (2-letter ISO 639-1 if exists with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn, else empty);;
-Language_More;;;Y YT;;;More info about Language (e.g. Director's Comment);;
-Summary;;;N NT;;;;;
-Encoded_Date;;;Y YT;;;The time that the encoding of this item was completed began.;;Temporal
-Tagged_Date;;;Y YT;;;The time that the tags were done for this item.;;Temporal
-Encryption;;;Y YT;;;;;

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text/Stream/Video.csv Deleted

@@ -1,177 +0,0 @@
-Count;;;N NI;;;Number of objects available in this stream
-StreamCount;;;N NI;;;Number of streams of this kind available
-StreamKind;Video;;N NI;;;Stream type name
-StreamKind/String;;;N NI;;;Stream type name
-StreamKindID;;;N NI;;;Number of the stream (base=0)
-StreamKindPos;;;N NI;;;When multiple streams, number of the stream (base=1)
-Inform;;;N NT;;;Last **Inform** call
-ID;;;N YI;;;The ID for this stream in this file
-ID/String;;;Y NT;;;The ID for this stream in this file
-UniqueID;;;N YI;;;The unique ID for this stream, should be copied with stream copy
-MenuID;;;N YI;;;The menu ID for this stream in this file
-MenuID/String;;;Y NT;;;The menu ID for this stream in this file
-Format;;;Y YT;;;Format used
-Format/Info;;;Y NT;;;Info about Format
-Format/Url;;;N NT;;;Link
-Format_Commercial;;;N NT;;;Commercial name used by vendor for theses setings or Format field if there is no difference
-Format_Commercial_IfAny;;;Y NT;;;Commercial name used by vendor for theses setings if there is one
-Format_Version;;;Y NT;;;Version of this format
-Format_Profile;;;Y NT;;;Profile of the Format
-MultiView_BaseProfile;;;Y NT;;;Multiview, profile of the base stream
-MultiView_Count;;;Y NT;;;Multiview, count of views
-Format_Settings;;;N NT;;;Settings needed for decoder used, summary
-Format_Settings_BVOP;;Yes;N YT;;;Settings needed for decoder used, detailled
-Format_Settings_BVOP/String;;;Y NT;;;Settings needed for decoder used, detailled
-Format_Settings_QPel;;Yes;N YT;;;Settings needed for decoder used, detailled
-Format_Settings_QPel/String;;;Y NT;;;Settings needed for decoder used, detailled
-Format_Settings_GMC;; warppoint;N YI;;;Settings needed for decoder used, detailled
-Format_Settings_GMC/String;;;Y NT;;;
-Format_Settings_Matrix;;;N YT;;;Settings needed for decoder used, detailled
-Format_Settings_Matrix/String;;;Y NT;;;Settings needed for decoder used, detailled
-Format_Settings_Matrix_Data;;;N NT;;;Matrix, in binary format encoded BASE64. Order = intra, non-intra, gray intra, gray non-intra
-Format_Settings_CABAC;;Yes;N YT;;;Settings needed for decoder used, detailled
-Format_Settings_CABAC/String;;;Y NT;;;Settings needed for decoder used, detailled
-Format_Settings_RefFrames;; frame;N YI;;;Settings needed for decoder used, detailled
-Format_Settings_RefFrames/String;;;Y NT;;;Settings needed for decoder used, detailled
-Format_Settings_Pulldown;;;Y YT;;;Settings needed for decoder used, detailled
-Format_Settings_FrameMode;;;Y YT;;;Settings needed for decoder used, detailled
-Format_Settings_GOP;;;Y YT;;;Settings needed for decoder used, detailled (M=x N=y)
-Format_Settings_FrameStructures;;;Y YT;;;Settings needed for decoder used, detailled (Type of frame, and field/frame info)
-InternetMediaType;;;N YT;;;Internet Media Type (aka MIME Type, Content-Type)
-MuxingMode;;;Y NT;;;How this file is muxed in the container
-CodecID;;;Y YT;;;Codec ID (found in some containers)
-CodecID/Info;;;Y NT;;;Info on the codec
-CodecID/Hint;;;Y NT;;;Hint/popular name for this codec
-CodecID/Url;;;N NT;;;Homepage for more details about this codec
-CodecID_Description;;;Y NT;;;Manual description given by the container
-Codec;;;N NT;;;Deprecated, do not use in new projects
-Codec/String;;;N NT;;;Deprecated, do not use in new projects
-Codec/Family;;;N NT;;;Deprecated, do not use in new projects
-Codec/Info;;;N NT;;;Deprecated, do not use in new projects
-Codec/Url;;;N NT;;;Deprecated, do not use in new projects
-Codec/CC;;;N NT;;;Deprecated, do not use in new projects
-Codec_Profile;;;N NT;;;Deprecated, do not use in new projects
-Codec_Description;;;N NT;;;Deprecated, do not use in new projects
-Codec_Settings;;;N NT;;;Deprecated, do not use in new projects
-Codec_Settings_PacketBitStream;;;N NT;;;Deprecated, do not use in new projects
-Codec_Settings_BVOP;;;N NT;;;Deprecated, do not use in new projects
-Codec_Settings_QPel;;;N NT;;;Deprecated, do not use in new projects
-Codec_Settings_GMC;; warppoint;N NT;;;Deprecated, do not use in new projects
-Codec_Settings_GMC/String;;;N NT;;;Deprecated, do not use in new projects
-Codec_Settings_Matrix;;;N NT;;;Deprecated, do not use in new projects
-Codec_Settings_Matrix_Data;;;N NT;;;Deprecated, do not use in new projects
-Codec_Settings_CABAC;;;N NT;;;Deprecated, do not use in new projects
-Codec_Settings_RefFrames;;;N NT;;;Deprecated, do not use in new projects
-Duration;; ms;N YI;;;Play time of the stream in ms;
-Duration/String;;;Y NT;;;Play time in format : XXx YYy only, YYy omited if zero;
-Duration/String1;;;N NT;;;Play time in format : HHh MMmn SSs MMMms, XX omited if zero;
-Duration/String2;;;N NT;;;Play time in format : XXx YYy only, YYy omited if zero;
-Duration/String3;;;N NT;;;Play time in format : HH:MM:SS.MMM;
-Duration/String4;;;N NT;;;Play time in format : HH:MM:SS:FF (HH:MM:SS;FF for drop frame, if available)
-Duration_LastFrame;; ms;N YI;;;Duration of the last frame if it is longer than others, in ms;
-Duration_LastFrame/String;;;Y NT;;;Duration of the last frame if it is longer than others, in format : XXx YYy only, YYy omited if zero;
-Duration_LastFrame/String1;;;N NT;;;Duration of the last frame if it is longer than others, in format : HHh MMmn SSs MMMms, XX omited if zero;
-Duration_LastFrame/String2;;;N NT;;;Duration of the last frame if it is longer than others, in format : XXx YYy only, YYy omited if zero;
-Duration_LastFrame/String3;;;N NT;;;Duration of the last frame if it is longer than others, in format : HH:MM:SS.MMM;
-BitRate_Mode;;;N YT;;;Bit rate mode (VBR, CBR);
-BitRate_Mode/String;;;Y NT;;;Bit rate mode (Variable, Cconstant);
-BitRate;; bps;N YF;;;Bit rate in bps;
-BitRate/String;;;Y NT;;;Bit rate (with measurement);
-BitRate_Minimum;; bps;N YF;;;Minimum Bit rate in bps;
-BitRate_Minimum/String;;;Y NT;;;Minimum Bit rate (with measurement)
-BitRate_Nominal;; bps;N YF;;;Nominal Bit rate in bps
-BitRate_Nominal/String;;;Y NT;;;Nominal Bit rate (with measurement)
-BitRate_Maximum;; bps;N YF;;;Maximum Bit rate in bps
-BitRate_Maximum/String;;;Y NT;;;Maximum Bit rate (with measurement)
-Width;; pixel;N YI;;;Width in pixel
-Width/String;;;Y NT;;;Width with measurement (pixel)
-Width_Original;; pixel;N YI;;;Original (in the raw stream) Width in pixel
-Width_Original/String;;;Y NT;;;Original (in the raw stream) Width with measurement (pixel)
-Height;; pixel;N YI;;;Original (in the raw stream) Height in pixel
-Height/String;;;Y NT;;;Original (in the raw stream) Height with measurement (pixel)
-Height_Original;; pixel;N YI;;;Height in pixel
-Height_Original/String;;;Y NT;;;Height with measurement (pixel)
-PixelAspectRatio;;;N YF;;;Pixel Aspect ratio
-PixelAspectRatio/String;;;N NT;;;Pixel Aspect ratio
-PixelAspectRatio_Original;;;N YF;;;Original (in the raw stream) Pixel Aspect ratio
-PixelAspectRatio_Original/String;;;N NT;;;Original (in the raw stream) Pixel Aspect ratio
-DisplayAspectRatio;;;N YF;;;Display Aspect ratio
-DisplayAspectRatio/String;;;Y NT;;;Display Aspect ratio
-DisplayAspectRatio_Original;;;N YF;;;Original (in the raw stream) Display Aspect ratio
-DisplayAspectRatio_Original/String;;;Y NT;;;Original (in the raw stream) Display Aspect ratio
-Rotation;;;N YT;;;Rotation
-Rotation/String;;;Y NT;;;Rotation (if not horizontal)
-FrameRate_Mode;;;N YT;;;Frame rate mode (CFR, VFR)
-FrameRate_Mode/String;;;Y NT;;;Frame rate mode (Constant, Variable)
-FrameRate_Mode_Original;;;N YT;;;Original frame rate mode (CFR, VFR)
-FrameRate_Mode_Original/String;;;Y NT;;;Original frame rate mode (Constant, Variable)
-FrameRate;; fps;N YF;;;Frames per second
-FrameRate/String;;;Y NT;;;Frames per second (with measurement)
-FrameRate_Original;; fps;N YF;;;Original (in the raw stream) frames per second
-FrameRate_Original/String;;;Y NT;;;Original (in the raw stream) frames per second (with measurement)
-FrameRate_Minimum;; fps;N YF;;;Minimum Frames per second
-FrameRate_Minimum/String;;;Y NT;;;Minimum Frames per second (with measurement)
-FrameRate_Nominal;; fps;N YF;;;Nominal Frames per second
-FrameRate_Nominal/String;;;Y NT;;;Nominal Frames per second (with measurement)
-FrameRate_Maximum;; fps;N YF;;;Maximum Frames per second
-FrameRate_Maximum/String;;;Y NT;;;Maximum Frames per second (with measurement)
-FrameCount;;;N NI;;;Number of frames
-Standard;;;Y NT;;;NTSC or PAL
-Resolution;; bit;N NI;;;Deprecated, do not use in new projects
-Resolution/String;;;N NT;;;Deprecated, do not use in new projects
-Colorimetry;;;N NT;;;Deprecated, do not use in new projects
-ColorSpace;;;Y YT;;;
-ChromaSubsampling;;;Y YT;;;
-BitDepth;; bit;N YI;;;16/24/32 
-BitDepth/String;;;Y NT;;;16/24/32 bits
-ScanType;;;N YT;;;
-ScanType/String;;;Y NT;;;
-ScanOrder;;;N YT;;;;
-ScanOrder/String;;;Y NT;;;;
-Interlacement;;;N NT;;;Deprecated, do not use in new projects;
-Interlacement/String;;;N NT;;;Deprecated, do not use in new projects;
-Bits-(Pixel*Frame);;;Y YF;;;bits/(Pixel*Frame) (like Gordian Knot);
-Delay;; ms;N NI;;;Delay fixed in the stream (relative) IN MS;
-Delay/String;;;N NT;;;Delay with measurement;
-Delay/String1;;;N NT;;;Delay with measurement;
-Delay/String2;;;N NT;;;Delay with measurement;
-Delay/String3;;;N NT;;;format : HH:MM:SS.MMM;
-Delay/String4;;;N NT;;;Delay in format : HH:MM:SS:FF (HH:MM:SS;FF for drop frame, if available)
-Delay_Settings;;;N NT;;;Delay settings (in case of timecode for example);
-Delay_Original;; ms;N NI;;;Delay fixed in the raw stream (relative) IN MS;
-Delay_Original/String;;;N NT;;;Delay with measurement;
-Delay_Original/String1;;;N NT;;;Delay with measurement;
-Delay_Original/String2;;;N NT;;;Delay with measurement;
-Delay_Original/String3;;;N NT;;;format : HH:MM:SS.MMM;;
-Delay-Original/String4;;;N NT;;;Delay in format : HH:MM:SS:FF (HH:MM:SS;FF for drop frame, if available);
-Delay_Original_Settings;;;N NT;;;Delay settings (in case of timecode for example);;
-StreamSize;; byte;N YI;;;Stream size in bytes;;
-StreamSize/String;;;Y NT;;;Streamsize in with percentage value;;
-StreamSize/String1;;;N NT;;;Streamsize with measurement;;
-StreamSize/String2;;;N NT;;;Streamsize with measurement;;
-StreamSize/String3;;;N NT;;;Streamsize with measurement;;
-StreamSize/String4;;;N NT;;;Streamsize with measurement;;
-StreamSize/String5;;;N NT;;;Streamsize in with percentage value;;
-StreamSize_Proportion;;;N NT;;;Stream size divided by file size;;
-Alignment;;;Y NT;;;How this stream file is aligned in the container;;
-Alignment/String;;;N YT;;;;;
-Title;;;Y YI;;;Name of the track;;
-Encoded_Application;;;Y YT;;;Software. Identifies the name of the software package used to create the file, such as Microsoft WaveEdit.;;Technical
-Encoded_Application/Url;;;N YT;;;Software. Identifies the name of the software package used to create the file, such as Microsoft WaveEdit.;;Technical
-Encoded_Library;;;N YT;;;Software used to create the file;;
-Encoded_Library/String;;;Y NT;;;Software used to create the file;;
-Encoded_Library/Name;;;N NT;;;Info from the software;;
-Encoded_Library/Version;;;N NT;;;Version of software;;
-Encoded_Library/Date;;;N NT;;;Release date of software;;
-Encoded_Library_Settings;;;Y YT;;;Parameters used by the software;;
-Language;;;N YT;;;Language (2-letter ISO 639-1 if exists, else 3-letter ISO 639-2, and with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn);;
-Language/String;;;Y NT;;;Language (full);;
-Language/String1;;;N NT;;;Language (full);;
-Language/String2;;;N NT;;;Language (2-letter ISO 639-1 if exists, else empty);;
-Language/String3;;;N NT;;;Language (3-letter ISO 639-2 if exists, else empty);;
-Language/String4;;;N NT;;;Language (2-letter ISO 639-1 if exists with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn, else empty);;
-Language_More;;;Y YT;;;More info about Language (e.g. Director's Comment);;
-Encoded_Date;;;Y YT;;;UTC time that the encoding of this item was completed began.;;Temporal
-Tagged_Date;;;Y YT;;;UTC time that the tags were done for this item.;;Temporal
-Encryption;;;Y YT;;;;;
-BufferSize;;;N YT;;;Defines the size of the buffer needed to decode the sequence.

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text/_.1.txt Deleted

@@ -1,35 +0,0 @@
-// Helpers - Automaticly generated methods for MediaInfo
-// Copyright (C) 2005-2007 Jerome Martinez, Zen@MediaArea.net
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//
-// Automaticly generated methods for MediaInfo
-// Don't modify, this will be deleted at the next automatic update
-//
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-
-//---------------------------------------------------------------------------
-#include "ZenLib/ZtringListList.h"
-#include "ZenLib/InfoMap.h"
-#include "ZenLib/Translation.h"
-using namespace ZenLib;
-//---------------------------------------------------------------------------
-
-namespace MediaInfoLib
-{

libmediainfo_0.7.34.tar.bz2/Source/Ressource/Text/_.2.txt Deleted

libmediainfo_0.7.34.tar.bz2/debian/libmediainfo0-dev.dirs Deleted

libmediainfo_0.7.34.tar.bz2/debian/libmediainfo0-dev.install Deleted

libmediainfo_0.7.34.tar.bz2/Changes.txt -> libmediainfo_0.7.60.tar.bz2/Changes.txt Changed

@@ -2,6 +2,30 @@
 No break in binary compatibily (no crash), but some details.
 
 
+0.7.58 --> 0.7.59
+-----------------
+- colour_primaries, transfer_characteristics, matrix_coefficients: canonicalization of results
+
+0.7.53 --> 0.7.54
+-----------------
+- CEA-608: ID naming scheme has changed
+
+0.7.52 --> 0.7.53
+-----------------
+- MPEG-4: Material_* fields (in case of source duration different than track duration) --> Source_*
+
+0.7.44 --> 0.7.45
+-----------------
+- FLV and RIFF: Changing Sorenson H.263 to Sorenson Spark because this stream format is too much incompatible with H.263
+
+0.7.36 --> 0.7.37
+-----------------
+- JPEG 2000: Format_Profile=Reversible --> Compression_Mode=Lossless and Format_Profile=Irreversible --> Compression_Mode=Lossy
+
+0.7.35 --> 0.7.36
+-----------------
+- M-JPEG format is renamed JPEG, M-JPEG 2000 format is renamed JPEG 2000 (difference between video and image is made by the stream kind)
+
 0.7.32 --> 0.7.33
 -----------------
 - Colorimetry is deprecated, replaced by ColorSpace

libmediainfo_0.7.34.tar.bz2/History_DLL.txt -> libmediainfo_0.7.60.tar.bz2/History_DLL.txt Changed

@@ -7,6 +7,502 @@
 bug reports and feature request are here:
 http://sourceforge.net/tracker/?group_id=86862
 
+Version 0.7.60, 2012-09-02
+--------------
++ MPEG-TS/PS: improved detection of buggy time stamps
++ DPX: color primaries and transfer characteristics
++ MPEG-TS: Added support of scrambled streams without transport_scrambling_control bit set (e.g. PlayReady)
++ MPEG-TS: Name of some scrambling algorithms
++ MPEG-TS: detection of CBR/VBR at container level
++ MPEG Video: better detection of variable GOP
++ MPEG-TS: average, minimum, maximum PCR distance (hidden by default and you must parse the whole file with --ParseSpeed=1 option)
+x Matroska: some streams were wrongly detected sa VFR
+x #3538378, XML output: invalid characters, now if there is an invalid character, data is transported in base64
+x LXF: wrong video bit rate with some files
+x AC-3/E-AC-3: hang up with some Little Endian streams
+x AAC: wrong min and max bit rate in case of partial (default) parsing, disabling it
+x AVC: crash or hang up with some malformed/scrambled streams
+x Opus: wrong duration in case of non-48kHz stream
+x MOV: 25 fps + drop frame time codes were not handled correctly
+
+Version 0.7.59, 2012-08-08
+--------------
++ License: Switched back to LGPLv2+Exceptions
++ #3555183, PCX support, thanks to Lionel Duchateau
++ #3555182, PSD support, thanks to Lionel Duchateau
++ #3555181, Matroska: ALAC detection, thanks to Lionel Duchateau
++ #3540425, OGG/MKV: Opus speech format support, thanks to Lionel Duchateau
++ #3531808, AVI: detecting more inconsistencies in stream durations
++ GXF: crash with Time code tracks without frame rate info
++ MPEG-4: stream order (hidden by default), in order to provide the same numbers as mkvtoolnix 5.2+ Track ID
++ QuickTime: default channel map is "L R" for stereo streams (as it seems to be in QuickTime player)
++ MPEG-4: support of WMA (version 1, version 2, Pro, Lossless) in MPEG-4
++ FLV: handling of metadata with an underscore before the real metadata name
++ MXF: support of files with header missing TrackNumber in the descriptor (if it is present only in footer)
++ MXF: Language from DMS-1
++ ProRes: analysis of the ProRes raw stream (including scan order for interlaced content)
++ colour_primaries, transfer_characteristics, matrix_coefficients: canonicalization of results
++ MPEG-4 Visual: colour_primaries, transfer_characteristics, matrix_coefficients
++ ProRes: colour_primaries, transfer_characteristics, matrix_coefficients
++ GIF: Display Aspect Ratio
+x #3533984, different behavior depending of compilation options (so Linux version was missing some info)
+x MPEG-4: audio/video delay was wrong in case of negative delay
+x CEA-608: Memory leaks removed
+x AVC: crash in case of analyzing some invalid SEI
+x MPEG Audio: crash with some files having Lyrics 2 tags
+x MPEG Audio: crash with some files having APE tags
+x AVI: secondary genre comes after primary genres in the "Genre" field
+x FLV: better handling of files containing more than 1 meta chunk
+x MPEG-TS/MPEG-PS: was aborting during full parsing in the case of very damaged streams
+x Vorbis: infinite loop if codebook_entries>=256
+x Id3v2: crash with some unsynchronized frames, especially with UTF-16 comments
+x Id3v2: Wrong mime type of covers
+x MPEG-PS: crash in case of language info in descriptors
+x Java binding: crash with MediaInfo::Inform() (Windows 32-bit only)
+x MPEG-TS: false-positive in case of some MPEG-4 files with wrong extension
+x FLV: crash in some specific cases (malformed files)
+x 3548314, MVC: Scan type was wrong with MVC-only (without the underlying AVC stream) stream
+x 3553588, MPLS: stream duration was wrong with standalone (without the referenced M2TS) files
+x 3553588, MPLS: incoherent behavior with MPLS having more than one PlayListItem
+x 3554154, MPEG-TS: crash with some corrupted streams
+x MOV: all EIA/CEA-608 captions were not well detected
+x Matroska: Trying to better detect VFR streams, frame rate was wrong in case of interlaced content
+
+Version 0.7.58, 2012-05-28
+--------------
++ AC-3: Little Endian streams support
++ LXF: AVC streams support
++ ISM: better support
++ File referencing other files (HLS, ISM...): menu in case there is more than 1 stream per referenced file
++ MPEG-TS: option for keeping streams detected at the beginning then disabled in a an update of the PMT (activated by default)
++ MPEG-PS: program_map_section support for uncommon streams embedded in MPEG-PS
+x Referenced files (MXF, HLS, MOV, P2, XDCAM...): issues with source name, track order, files size
+x MPEG-TS/MPEG-PS: regression, some files with AC-3/DTS/DVD subtitles were not well analyzed anymore
+x MPEG-4 channel mapping: Lt and Rt (matrix-encoded) channel mapping were missing
+x GXF: handling of buggy files having non-PCM AES3 codec identifier but actually having PCM
+x MPEG-4: better support of MPEG-4 files having corrupted metadata atom
+x 3529510, EIA/CEA-708: was not detected if the stream was not present at the beginning, thanks to Pete Chapman
+
+Version 0.7.57, 2012-05-02
+--------------
++ #3513490, Vorbis comment (Flac, Ogg): more tags are supported
++ XML-based formats (P2, XDCAM, DCP, ISM, HLS...): support of UTF-16 encoding
++ MPEG-4: for buggy PCM, prioritizing the codec ID "in24" = 24-bit against the bit depth field
+x #3516900, Vorbis comment (Flac, Ogg): trying to do better mapping of PERFORMER and ARTIST tags
+x MXF: wrong video frame count in some cases
+x #3517374, GCC 4.7: compilation issues removal, thanks to SpepS
+x MPEG-PS: some files were not well demuxed so analysis was sometimes wrong (especially macroblock parsing)
+
+Version 0.7.56, 2012-04-08
+--------------
++ Better support of machines lacking of std::stringstream
++ Better support of machines requesting explicit stdc++ library link option (e.g. some ARM embedded devices)
+x #3515515, MPEG-4: crash with MPEG-4 container + H264/AVC video stream
+x #3515393, MPEG Audio: infinite loop (freeze) with some files
+x #3514677, Video: Well known 1.85:1 display aspect ratio was incorrectly displayed as 16:9
+x #3513908, File interface: No output if filename contain a colon
+x #3515893, MPEG-4: some specific files were not detected
+x AVI: infinite loop (freeze) with some files (having index containing 0-sized chunk)
+x AVC: memory leaks
+x libcurl support: libcurl config from MediaInfo is compatible with libcurl+gnutls
+
+Version 0.7.55, 2012-04-05
+--------------
++ AC-3: support of little endian streams
++ LXF: support of format version 0
++ HLS: support of .m3u8 index and sequence referencing a bunch of MPEG-TS files
++ MPEG-4: Added support of glbl atom and corresponding 4CC (ai12, ai15, ai1q, ai5q)
++ MPEG-4: Added detection of files with mx5p files wrongly filled with raw MPEG Video instead of MXF
++ MPEG-TS: Detection of 20-bit Dolby E even if the SMPTE 302 M header is set to 24-bit
+x #3513490, Id3v2: mapping of "Encoded by" and "Encoding library" is conform to the specs now
+x MXF: hang up with some clip-wrapped files
+x MPEG-4: AVC-100 bit rate was not coherent depending of the container (MPEG-4 or MXF)
+x reVTMD output is disabled due to its non-free (point of view of FSF and DFSG) licensing.
+
+Version 0.7.54, 2012-03-13
+--------------
++ #3480111, Matroska: parsing of WebM-style frame rate info
++ #3499859, ALAC: parsing of the alac atom, for real bit depth / sample rate
++ #3487601, DV: fields order (TFF/BFF)
++ MPEG-4: more video 4CCs binded to MPEG Video
++ H.263: raw stream parsing (width, height, aspect ratio), comparison with container data
++ Speed improvements
++ MPEG-PS: supporting parsing of some non-conform files
++ Full support of CEA-608 (separation of CC1-CC4, T1-T4)
++ #3494722, MPEG-4: trying to detect wrong duration in track header
++ MPEG-4 with embedded MXF track (XDCAM...): separation of video bitrate and padding bitrate
++ Compound streams (e.g. DV): separation of video bitrate and audio bitrate
++ Blu-ray: LPCM mono real bit rate is separated from the encoded (stereo) bit rate
++ Support of https, sftp scp protocols (custom builds only)
++ AVI: vprp (OpenDML) display aspect ratio support
+x #3480111, Matroska: some frame rates are incorrect in the file, trying to detect this kind of malformed file
+x #3479494, AVC: segmentation fault
+x #3440638, AAC: wrong detection for some malformed AAC streams
+x #3440638, MPEG-4: wrong analysis of some files having track header after media information
+x #3480111, MXF: Height was wrong for MXF with FrameLayout = Mixed fields
+x #3468235, Blu-ray: displaying PGS in all cases (even if PES is not detected, they are too much rare)
+x #3498846, MPEG-4: delay between audio and video was no more detected
+x #3495573, MPEG-4: crash with some files having fragments
+x MPEG-4: channel position in case of channel atom is configured with ChannelBitmap
+x MPEG-TS: crash with some buggy files (a PID indicated as PSI and PES at the same time)
+x AES3: not detecting Dolby E stream if there is guard band before the Dolby E frame, in MPEG-TS
+x DPX: some files with some invalid fields were not detected
+x DTVCC Captions: crash with some buggy streams
+
+Version 0.7.53, 2012-01-24
+--------------
++ DV: option for ignoring transmitting flags (TF1/TF2/TF3) (DLL and CLI only)
++ Matroska: ProRes detection
++ MPEG-4: official DTS CodecIDs (dtsc/dtsh/dtsl/dtse) support, thanks to Lionel Duchateau
++ Matroska: stream order (hidden by default), in order to provide the same numbers as mkvtoolnix 5.2+ Track ID
++ #3471516, BLu-ray: wrong channel count for mono/3-channel/5-channel/7-channel PCM streams
++ AVI: ISMP (SMPTE Time code), Tdat tc_o/tc_a (Adobe Premier time code) support
++ reVTMD output
+x QuickTime: crash and sometimes wrong info with some files having compressed header
+x MPEG-4: commercial format typo error (EX422 instead of HD422)
+x MXF: handling wrong MXF header having frame height instead of field height
+x #3471053, Tags: Id3v1 tag was used instead of Id3v2 if the file is short
+x #3463117, MPEG-TS: crash if Conditioal Access PID is same as the PES
+x Custom output: better handling of cases with special character strings (\n...) in the file content
+x #3440664: Audio only AVI file is missing duration
+x #3453476: detection so incorrect duration information in tkhd atom
+x Detailled XML output was producing duplicate xml-tags
+
+Version 0.7.52, 2011-12-19
+--------------
++ MXF with referenced files: if the referenced file is not available, trying to open local files
++ MPEG Video: GOP size for I-Frame only streams
++ MXF: support of CEA-608 in ancillary data for some other formats than MPEG Video, if there is no B-frame
++ LXF: support of SMPTE ST291/CDP/CEA-608/CEA-708 in ancillary data
++ WAV: better handling of files not having word alignment
+x DV: crash (division by zero) in some cases
+x DV: DVCPRO HD was sometimes not detected (low bitrate)
+x MXF: Crash if AFD field has an invalid value
+x MXF: Wrong endianess for some big endian PCM streams
+x MXF: some MXF referencing files have wrong duration
+x MXF: duration was wrong with some specific files
+x DVD-Video: detection of 20-bit and 24-bit PCM
+x XML output: it was sometimes containing some invalid characters
+x MPEG-4: considering default char set as ISO-8859-1
+x MXF: better handling of referencing files having the same ID for all tracks
+x MXF: Handling of MXF files with wrong FooterPartition field
+x MXF: Some captions (not starting at the beginning of the file) were not detected
+x WAV: duration was missing is some cases
+x RMP3 support was broken
+
+Version 0.7.51, 2011-11-11
+--------------
++ #2872918, MKV: add support for default and forced track flags
++ #3418881, RK Audio format support, thanks to Lionel Duchateau
++ #3418883, LA: version field, thanks to Lionel Duchateau
++ MPEG-4: basic support of Aigo .3dv files
++ MPEG-2 Video: color display info (colour_primaries, transfer_characteristics, matrix_coefficients)
++ QuickTime: color display info (colour_primaries, transfer_characteristics, matrix_coefficients)
++ QuickTime: ProRes LT, Proxy, 4:4:4 profiles detection
++ QuickTime: mpeg CodecID support
++ Template inputs are now insensitive to carriage return kind (Windows \r\n, Mac \r, Linux \n)
++ MPEG-TS: Support of ISO 8859-2 in EPG
++ MPEG-4: more CodedIDs supported
++ GXF: more info about DV streams
++ GXF: Handling of files with more than 1 Time code
+x #3414326, GXF: using only the first map chunk for duration calculation
+x #3414513, Id3v2: was not able to extract covers with UTF-16 description
+x #3417908, video from several files: crash if there is not enough place for the frame number
+x #3433602, DVD-Video (IFO): Crash when scanning some malformed IFO files
+x Matroska: parser hanging in case of huge zero-padded files
+x MPEG-4: was not providing some info about tracks with sample table before media header
+x MXF: better support of corrupted indexes
+x #3429831, MediaInfo library: unload wrong DLL, thanks to McSpecky
+x MPEG-TS: Better handling of EPG running_status flag
+x MXF: Handling of "file:///" in Network loacators
+x FLV: audio delay was sometimes wrong
+x H264: Buffer size was in bytes instead of bits like with other formats
+x #3429196: no output if absolute file name, on Linux
+x #3187050, FLV: wrong detection when FLV header is corrupt
+x BLu-ray: crash if MPLS files are on the root of a disk
+x Blu-ray: parsing was very slow if MPLS was pointing thousands of times on the same file
+x #3292830, Matroska: crash if AAC sample rate is not provided by the container
+
+Version 0.7.50, 2011-09-23
+--------------
++ DVB Subtitle: region_width / region_height / region_depth  (hidden by default)
++ MPEG-4: hdv6 and mx4p CodecID support (MPEG Video)
++ AVI: v210 CodecID (YUV) detect
++ #3411596, CDDA support, thanks to Lionel Duchateau
++ MXF: support of AC-3
++ #3411999, AVi: detection of GeoVision MPEG-4, thanks to Lionel Duchateau
++ #3411999, MPEG-4: detection of VC-1 (WMV3), Nellymoser and WMA2, thanks to Lionel Duchateau
+x AVI: Better support of 2 video streams (e.g. "3D AVI") in a file
+x MPEG-TS: Duration was not provided in some cases
+x FLV: Delay and duration for AAC was wrong if delay was not 0, thanks to Justin Greer http://zencoder.com
+x #3408005, IFO: crash with some files
+x MPEG-4: some bitrates where wrong if smooth streaming is used
+
+Version 0.7.49, 2011-09-09
+--------------
++ AES3: analyzing AAC, AC-3, MPEG Audio embedded in AES3 stream
++ GXF: detection of DolbyE in AES3 in GXF
++ WAV: detecting AES3 non-PCM audio inside WAV
++ MPEG Video: more precise duration for 29.97 fps material having time code without drop frame flag set
++ MPEG-4/MOV: delay from time code track conforming to Final cut (using integral frame rate value if frame drop flag is not set)
++ Overall bit rate mode (CBR or VBR)
++ DVB Subtitle: region_horizontal_address / region_vertical_address (hidden by default)
++ MPEG-TS: option (--ParseSpeed=0.8) for testing the stream until all advertised streams are detected
+x MXF: some files with SDTI were not well demuxed (frame number) or were crashing
+x Some files where wrongly detected as MPEG-PS without streams
+x AC-3: non-48 KHz streams were not analyzed
+x 3164893, JPEG: issue with some JPEG files with no/incorrect extention
+x 3403338, crash with four character filenames
+
+Version 0.7.48, 2011-08-16
+--------------
++ ISM (ISM/ISMV/ISMA/PIFF...): more attributes (frame rate, frame count, duration)
++ MP3: support of VBRI header in a corrupted frame
++ Active Format Description: muxing mode (A/35 or SMPTE ST 2016-3)
++ MP4/MOV: Displaying info about first description atom of a track (instead of all of them)
+x MP4/MOV: scan order (Top/Bottom) from container, thanks to Peter Chapman
+x MP4: Channel layout was not filled in some cases
+x libmms: default behavior is using official libmms API only
+x Vorbis comment: album performer data was in performer field
+x Captions in AVC: some captions were not detected and decoded
+x AVC: GOP structure info was often wrong
+x MXF: IndexTable search was buggy (parsing the whole file) for some rare files (index present twice)
+
+Version 0.7.47, 2011-07-14
+--------------
++ ISM (ISM/ISMV/ISMA/PIFF...) support
++ SCC (Scenarist Closed Captioning) support
++ #3201768, BMP: BitmapV4Header support, thanks to Lionel Duchateau
++ MP4: enda atom support (Endianess)
++ MXF: expliciting PCM endianess
+x #3354384, Vorbis in AVI, version 3+ was displayed as 2+
+x MPEG-4/MOV: files with big "free" atom were not parsed
+
+Version 0.7.46, 2011-07-04
+--------------
++ MXF: TrackName
++ DCP: Basic support (video and audio streams), both Interop and SMPTE versions
++ P2 Clip: Supporting directories with wrong letter case
++ MXF: detection of AES3/Dolby E in mono PCM streams without compression scheme
++ MP4: first frame duration difference if first frame has not the same duration than all other frames
++ MP4: frame rate set as CFR if only the first frame has a different duration
++ MP4: Handling of track duration smaller than media duration (track duration and stream size have priority)
++ #3348936, MXF: OP-Atom profile
++ Matroska, Stereo Layout support, thanks to Lionel Duchateau
+x libcurl (FTP/HTTP): seek request was buggy, invalid data was read
+x MPEG Video in MPEG-TS or MP4: streams were wrongly detected as VBR or CBR, any bit rate mode is removed until a working solution is found
+x AES (S302M): was no more detected if the packet was split in several PES
+x #3325235, Vorbis: streams were wrongly reported as CBR
+x EXR: Width/Height were 1 less than real value
+x #3344635, MP4/MOV: Delay missing if timecode track found before audio/video, thanks to Peter Chapman
+
+Version 0.7.45, 2011-06-15
+--------------
++ QuickTime: Support of EIA-608 streams created by Final Cut
++ Matroska: Support of Matroska tags
++ Matroska: parsing of tags at the end of the file (previously: only tags at the beginning)
++ MP4/MOV with uncompressed streams: scan type (interlaced/progressive)
++ YUV4MPEG2 (Y4M) support
++ GXF: more information about AES3 audio streams
++ EXR: Basic support
++ E-AC-3: dialnorm/dynrng (first frame / first block) information
++ LXF: support of DV PAL
++ DPX: Support of Cineon old format
++ DPX: Support of file with Little Endian configuration
++ MPEG-4: better support of file with more than one mdat or moov atom
++ WAV: more details from bext chunk
++ MXF: AFD (in both descriptor or ANC) support
++ MXF: Support of AES3 / Dolby E in 2 mono channels
++ MPEG-4: support of some malformed (without mdat atom) files
++ MXF: Better detection of streams without Essence Compression descriptor
+x MPEG Video: Custom matrix detection was broken
+x DPX: Industry specific header was not well decoded
+x JPEG-2000: Chroma subsampling 4:2:0 was recognized as 4:4:4.
+x Matroska: Handling default values for TrackVideoDisplayWidth and TrackVideoDisplayHeight
+x MPEG-TS: private audio streams with 0xCO stream_id were not correctly detected
+x FLV and RIFF: Changing Sorenson H.263 to Sorenson Spark because this stream format is too much incompatible with H.263
+x MXF: Some specific files (including AFD in descriptor) were not well parsed
+
+Version 0.7.44, 2011-04-19
+--------------
++ AVI: support of some corrupted files (RIFF size set to 0)
++ AC-3: support of streams with 16-byte time stamp between frames
++ MPEG-TS: creation of index files, seek feature
++ GXF: seek feature
++ MXF: seek feature
++ MPEG-TS: detecting wrong stream registration information and skipping it
++ NTSC: accepting 483-line streams as NTSC
++ MXF: Parsing speed improvement, especially for high bitrate (>300 Mbps) streams
++ TGA file basic support
++ libmms: MMSH support (Linux/Mac only), thanks to RGB Networks
++ libcurl: HTTP header option and Time to live, thanks to RGB Networks
++ Id3v2 and MPEG-4: possibility to customize tag mapping
++ TIFF: more details
+x MXF: some specific files were not analyzed, fix sponsored by http://maxnine.com
+x LXF: random crashes
+
+Version 0.7.43, 2011-03-19
+--------------
++ MPEG-TS: detection and display of real time PAT/PMT change improved
+x EIA-708: crash with some specific files
+x MP4: crash with wiles including mix of PCM and other audio formats
+x AAC: crash with some malformed streams
+x FLV: crash with some specific files (longer audio than video at the end of the file)
+x MP4: wrong framerate information with some specific files (track header after media information)
+
+Version 0.7.42, 2011-03-03
+--------------
++ AES3: bit depth of AES3, bit depth of compressed audio stream, endianess
++ Id3v2 and MP4 tags: better mapping with iTunes fields
++ Tags: removal of technical only fields
++ MPEG Video: intra_dc_precision information (in advanced mode)
++ MXF: detection of raw pictures
++ MXF: support of URL encoded locators
++ MXF: color subsampling
++ DXW format support
+x #3171468, ADIF: crash in some cases
+x #3169916, IFO: crash in some cases
+x #3173391, Id3v2: was using local encoding instead of ISO-8859-1
+x MPEG Video, discarding bad (always 0) group_start
+x AVC: crash with file having big log2_max_pic_order_cnt_lsb_minus4 value
+x AVC: wrong GOP information in some cases
+x Ut Video: Color space information was wrong
+x MPEG-4 Visual: Advanced Simple@L0 was detected as Advanced Simple@L1
+x AVI: Crash with some AVC streams (not sized blocks)
+x MPEG Audio: crash with some files
+x AAC: crash, infinite loop or wrong result with some files
+x Trying to quicker reject a junk file
+x AVI: OpenDML indexes were no more parsed
+x Windows installer: OpenCandy library is updated and Microsoft agrees it is not dangerous for user privacy, it does not alert anymore. We do not transmit or collect personally identifiable information.
+
+Version 0.7.41, 2011-01-24
+--------------
++ MPEG-TS: random cases with full parsing of the file
+
+Version 0.7.40, 2011-01-24
+--------------
++ QuickTime: detection of AES3 and Dolby E
++ QuickTime: Apple CEA-608 and CEA-708 (in CDP) support
++ JPEG 2000: Chroma subsampling
++ JPEG 2000 in MXF: Color space
++ JPEG 2000 in MPEG-4 and MJ2: Color space
++ MPEG-4: mx5p CodecID support
++ ISO 9660 (CD/DVD/Blu-ray dump) detection
+x MPEG-TS: wrong detection (as encrypted) of some streams with a lot of transmission errors
+x MPEG-TS: wrong management of some PAT/PMT updates (real time parsing)
+x MPEG Video: wrong duration with some raw streams
+x FLV: wrong duration with some files
+x libcurl: crash if requesting a libcurl URL but libcurl library not present
+x MPEG Audio: crash with some malformed files
+x MPEG-4: error between recorded date and encoded date
+
+Version 0.7.39, 2011-01-03
+--------------
++ OGG: more CELT attributes, thanks to Lionel Duchateau
++ DV: better detection of display aspect ratio for specific (non standard?) streams
++ MPEG-7: support of ISO-IEC 13818-2 / H.262 (MPEG Video) version 2000 (multi-view / 4:2:2)
++ MXF: Clean aperture size support
++ D-10 (AES3) in MXF: real channel count
++ MPEG-TS: detection and analysis of ADTS in stream_id_extension
++ #2943900, MPEG-4 Visual: count of maximum consecutive B-frames
++ MP4: Handling of Nero library information atom
++ Id3: TAG+ support
+x #3140453, MKV with AAC: support of HE-AAC v1/v2 detection even if AudioSpecificConfig is missing
+x #3138883, ID3v2: crash in some cases if Data length indicator is used
+x #3139417, MPEG-PS: duration for caption detection was shorter than expected
+x #3139276, H.263: more precision about the different flavors of H.263
+x AVI and MPEG-2 Audio Layer 3: error if audio stream duration estimation
+x FLV: better handling of weird bitrate metadata
+x D-10 (AES3) in MXF: Bit rate was wrong
+x AC-3: crash if false-positive detection of AC-3 and CRC is valid and bsid is wrongly set
+x #3141059, FLV: trying to detect partial files (so metadata are wrong) and using timestamps instead
+x #3141052, AVI: wrong duration, no detection of rec chunks, with some files
+x #3145968, RealMedia: not integer frame rate handling + HE-AAC filling
+x Id3v2: bad handling of some tags
+x MPEG-TS/PS: Frame count / duration accuracy of some very specific files
+x MPEG-TS/PS: Not counting non-decodable frames (without the corresponding I-Frame)
+
+Version 0.7.38, 2010-12-16
+--------------
++ uClibc compatibility, thanks to Metin KAYA <metin@EnderUNIX.org>
++ MPEG-TS: ID in all streams if a TS streams contains several substreams
++ JPEG in MOV: Scan type
++ AAC: implicit SBR and implicit PS detection (complete HE-AAC and HE-AACv2 detection)
++ AAC/LATM: more details (channels, profile...)
++ AAC/SL: more details (channels, profile...)
++ MPEG-TS and MPEG-PS with trace feature activated (Linux/Mac by default): speed improvement
++ DTS: indication of HD and Core configurations if there is an HD part
++ #3118446, MXF: VC-3 (DNxHD) detection
++ VC-3 (DNxHD) raw stream support
++ VC-3 (DNxHD): Bit depth
++ TrueHD/MLP: Duration (only in full parsing mode)
++ MPEG-TS: option for ignoring ATSC transport_stream_id indication
+x MPEG-TS: some teletext and DVB subtitles were not detected
+x #3111584, MXF: phantom track with weird result if an unknown track is found
+x #3116952, DTS and AC-3: was set as lossy in all cases (DTS Master Audio and AC-3 TrueHD are lossless)
+x #3137160, ADTS: some files with wrong extension were not correctly detected
+
+Version 0.7.37, 2010-11-22
+--------------
++ DPX format support
++ Compression mode (Lossy / Lossless) information (note: JPEG 2000 "profile" is moved to this new field)
++ #3095129, AVI: MLC Lossless codec support
++ #3095136, AVI: AMV Video Codec support
++ IFO: chapter information (thanks to Bastian Wegener)
++ MPEG-4: header size / data size / footer size information (in advanced mode)
++ MPEG-4: AVmp CodecID (.mov referencing .mxf) support
++ MPEG-TS: option for setting maximum scan duration
++ MPEG-TS: option for forcing stream info display even if not found in the stream (data from PMT)
+x MXF: avoiding infinite loop due to circular reference
+
+Version 0.7.36, 2010-10-24
+--------------
++ HDV 720p/1080i/1080p commercial names support, sponsored by http://www.chyro.fr/
++ Raw TrueHD support
++ MP4: "lpcm" (PCM from DVD) Support (with channel positions)
++ MKV: compression mode (zlib...) display
++ WAV: support of AAC (ADTS) with CodecID 0x8180
++ WMV: Handling of weird Aspect Ratio information in Extended Content Description
++ File interface: possibility to indicate begin and end offset of the analysis (partial analysis)
++ #3082158, .m4b file extension support
++ #3087674, Ut Video Lossless support
++ #3087677, WebP: basic support (detection only)
++ #3072929, MP4: DTS Express support
++ MPEG-4: Handling of external files referenced by "code" atom
++ M-JPEG and M-JPEG 2000 are renamed JPEG and JPEG 2000
++ MP4 and HDV 1080i: detecting containers lying about width (saying 1920 but it is 1440)
++ DTVCC Transport and SCTE20: Option for displaying empty streams
++ DPX format detection
+x #3034092, MPEG-TS: hang up if program is modified (zapping) in the file
+x AAC: removal of empirical detection of SBR and PS (too many problems)
+x AVI: trusting in priority frame count from index of indexes with broken files
+x MKV: AVC "unknown profile" removal
+x AVC: some frame rates were reported as twice the real frame rate
+x #3029308, Id3v2: support of frames with Unsynchronisation bit set
+x #3065114, MPEG-Video: duration calculation issues with raw streams and open GOPs
+x AFD: crash with malformed streams
+x MPEG-7 output: missing references for MPEG-4 Visual and RF64
+x #3086701, ID3: freeze/crash with ID3 tag at the end of the the file
+x LXF: some files were not completely analyzed (missing video)
+x JPEG: Chroma subsampling value was always set to 4:2:0, wrong
+x MP4 with MPEG Video: do not trust anymore raw stream timecode
+
+Version 0.7.35, 2010-09-05
+--------------
++ Teletext subtitle support
++ DVB subtitle support
++ CEA-608/708: language
++ Library: "Per frame" interface, like ffmpeg
++ AFD: AFD (Active Format Description) value and detail
++ MPEG-TS: SCTE35 detection and parsing
++ MXF: Ancillary data (S436M) support
++ MPEG-TS: Codec ID (stream_type)
++ MXF parser improvements
+x #3036119, MKV: default language value is eng
+x DV: weird display with some DV with synch problems.
+x AVC: wrong detection of bitrate mode for AVC in MP4
+x MPEG-TS: crash and wrong detection of some non MPEG-TS files
+
 Version 0.7.34, 2010-07-09
 --------------
 + WebM support, sponsored by http://digi-metrics.com/
@@ -793,7 +1289,7 @@
 ---------------
 + Encoders database updated with 20 new encoder versions
 + Codecs database updated with 100 new codecs (video or audio)
-x Matroska, sometimes wrong Playtime 
+x Matroska, sometimes wrong Playtime
 x MPEG-4 : some Titles were not well parsed
 x MPEG PS : some video stream were missing
 x Crash with some malformed files
@@ -1122,9 +1618,9 @@
 Bug fixes
 - MPEG1 and 2: huge bugfixes: now you can believe what it say:)
 - Files > 4 GigaBytes (OK for file size, but duration calculation is sometimes NOK)
-- Quicktime: bad codec in Audio if based of Microsoft 2cc 
+- Quicktime: bad codec in Audio if based of Microsoft 2cc
 - Quicktime: sometimes don't handle compressed headers
-- multiple video streams: second streams was not displayed 
+- multiple video streams: second streams was not displayed
 - A lot of other minor bugs...

libmediainfo_0.7.34.tar.bz2/License.html -> libmediainfo_0.7.60.tar.bz2/License.html Changed

@@ -8,9 +8,9 @@
 <body>
 <div id="mediainfolib_license">
 <h3 style="text-align: center;">MediaInfo(Lib) License</h3>
-<p style="text-align: center;">Version 1.1, 3 January 2010</p>
+<p style="text-align: center;">Version 1.2, 6 August 2012</p>
 
-<p>Copyright 2002-2010 MediaArea.net SARL. All rights reserved.</p>
+<p>Copyright 2002-2012 MediaArea.net SARL. All rights reserved.</p>
 
 <p>Redistribution and use in source and binary forms, <b><u>without</u></b> modification, are
 permitted provided that the following conditions are met:</p>
@@ -25,8 +25,8 @@
 </ol>
 
 <p>Redistribution and use in source and binary forms, <b><u>with</u></b> modification, are
-permitted provided that the <a href="#lgpl3">GNU Lesser General Public License</a>
-as published by the Free Software Foundation, either version 3 of the License, or
+permitted provided that the <a href="#lgpl2">GNU Library General Public License</a>
+as published by the Free Software Foundation, either version 2 of the License, or
 any later version is met.<br />
 Dynamic or static linking to this software are not deemed a modification.</p>
 
@@ -43,811 +43,569 @@
 
 <hr />
 
-<div id="lgpl3">
-<h3 style="text-align: center;">GNU LESSER GENERAL PUBLIC LICENSE</h3>
-<p style="text-align: center;">Version 3, 29 June 2007</p>
-
-<p>Copyright (C) 2007 Free Software Foundation, Inc. &lt;http://fsf.org/&gt;</p><p>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.</p>
-
-<p>This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.</p>
-
-<h4><a name="section0"></a>0. Additional Definitions.</h4>
-
-<p>As used herein, &ldquo;this License&rdquo; refers to version 3 of the GNU Lesser
-General Public License, and the &ldquo;GNU GPL&rdquo; refers to version 3 of the GNU
-General Public License.</p>
-
-<p>&ldquo;The Library&rdquo; refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.</p>
-
-<p>An &ldquo;Application&rdquo; is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.</p>
-
-<p>A &ldquo;Combined Work&rdquo; is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the &ldquo;Linked
-Version&rdquo;.</p>
-
-<p>The &ldquo;Minimal Corresponding Source&rdquo; for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.</p>
-
-<p>The &ldquo;Corresponding Application Code&rdquo; for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.</p>
-
-<h4><a name="section1"></a>1. Exception to Section 3 of the GNU GPL.</h4>
-
-<p>You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.</p>
-
-<h4><a name="section2"></a>2. Conveying Modified Versions.</h4>
-
-<p>If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:</p>
-
-<ul>
-<li>a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or</li>
-
-<li>b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.</li>
-</ul>
-
-<h4><a name="section3"></a>3. Object Code Incorporating Material from Library Header Files.</h4>
-
-<p>The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:</p>
-
-<ul>
-<li>a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.</li>
-
-<li>b) Accompany the object code with a copy of the GNU GPL and this license
-   document.</li>
-</ul>
-
-<h4><a name="section4"></a>4. Combined Works.</h4>
-
-<p>You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:</p>
-
-<ul>
-<li>a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.</li>
-
-<li>b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.</li>
-
-<li>c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.</li>
-
-<li>d) Do one of the following:
-
-<ul>
-<li>0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.</li>
-
-<li>1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.</li>
-</ul></li>
-
-<li>e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)</li>
-</ul>
-
-<h4><a name="section5"></a>5. Combined Libraries.</h4>
-
-<p>You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:</p>
-
-<ul>
-<li>a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.</li>
-
-<li>b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.</li>
-</ul>
-
-<h4><a name="section6"></a>6. Revised Versions of the GNU Lesser General Public License.</h4>
-
-<p>The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser 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.</p>
-
-<p>Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License &ldquo;or any later version&rdquo;
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.</p>
-
-<p>If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.</p>
-
-</div>
-<hr />
-
-<div id="gpl3">
-<h3 style="text-align: center;">GNU GENERAL PUBLIC LICENSE</h3>
-<p style="text-align: center;">Version 3, 29 June 2007</p>
-
-<p>Copyright (C) 2007 Free Software Foundation, Inc. &lt;http://fsf.org/&gt;</p><p>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.</p>
-
-<h3><a name="preamble"></a>Preamble</h3>
-
-<p>The GNU General Public License is a free, copyleft license for
-software and other kinds of works.</p>
-
-<p>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.</p>
-
-<p>When we speak of free software, we are referring to freedom, not
+<div id="lgpl2">
+<h3><a id="SEC1">GNU LIBRARY GENERAL PUBLIC LICENSE</a></h3>
+<p>
+Version 2, June 1991
+</p>
+
+<pre>
+Copyright (C) 1991 Free Software Foundation, Inc.
+51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+[This is the first released version of the library GPL.  It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+</pre>
+
+<h3><a id="SEC2">Preamble</a></h3>
+
+<p>
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+</p>
+
+<p>
+  This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it.  You can use it for
+your libraries, too.
+</p>
+
+<p>
+  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.</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<p>The precise terms and conditions for copying, distribution and
-modification follow.</p>
-
-<h3><a name="terms"></a>TERMS AND CONDITIONS</h3>
-
-<h4><a name="section0"></a>0. Definitions.</h4>
-
-<p>&ldquo;This License&rdquo; refers to version 3 of the GNU General Public License.</p>
-
-<p>&ldquo;Copyright&rdquo; also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.</p>
- 
-<p>&ldquo;The Program&rdquo; refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as &ldquo;you&rdquo;.  &ldquo;Licensees&rdquo; and
-&ldquo;recipients&rdquo; may be individuals or organizations.</p>
-
-<p>To &ldquo;modify&rdquo; 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 &ldquo;modified version&rdquo; of the
-earlier work or a work &ldquo;based on&rdquo; the earlier work.</p>
-
-<p>A &ldquo;covered work&rdquo; means either the unmodified Program or a work based
-on the Program.</p>
-
-<p>To &ldquo;propagate&rdquo; 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.</p>
-
-<p>To &ldquo;convey&rdquo; 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.</p>
-
-<p>An interactive user interface displays &ldquo;Appropriate Legal Notices&rdquo;
-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.</p>
-
-<h4><a name="section1"></a>1. Source Code.</h4>
-
-<p>The &ldquo;source code&rdquo; for a work means the preferred form of the work
-for making modifications to it.  &ldquo;Object code&rdquo; means any non-source
-form of a work.</p>
-
-<p>A &ldquo;Standard Interface&rdquo; 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.</p>
-
-<p>The &ldquo;System Libraries&rdquo; 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
-&ldquo;Major Component&rdquo;, 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.</p>
-
-<p>The &ldquo;Corresponding Source&rdquo; 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.</p>
-
-<p>The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.</p>
-
-<p>The Corresponding Source for a work in source code form is that
-same work.</p>
-
-<h4><a name="section2"></a>2. Basic Permissions.</h4>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<p>Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.</p>
-
-<h4><a name="section3"></a>3. Protecting Users' Legal Rights From Anti-Circumvention Law.</h4>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<h4><a name="section4"></a>4. Conveying Verbatim Copies.</h4>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<h4><a name="section5"></a>5. Conveying Modified Source Versions.</h4>
-
-<p>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:</p>
-
+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.
+</p>
+
+<p>
+  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 library, or if you modify it.
+</p>
+
+<p>
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+</p>
+
+<p>
+  Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+</p>
+
+<p>
+  Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library.  If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, so that any problems introduced by others will not reflect on
+the original authors' reputations.
+</p>
+
+<p>
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software.  To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+</p>
+
+<p>
+  Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs.  This
+license, the GNU Library General Public License, applies to certain
+designated libraries.  This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+</p>
+
+<p>
+  The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it.  Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program.  However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+</p>
+
+<p>
+  Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries.  We
+concluded that weaker conditions might promote sharing better.
+</p>
+
+<p>
+  However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves.  This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them.  (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.)  The hope is that this
+will lead to faster development of free libraries.
+</p>
+
+<p>
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, while the latter only
+works together with the library.
+</p>
+
+<p>
+  Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+</p>
+
+<h3><a id="SEC3">TERMS AND CONDITIONS FOR
+COPYING, DISTRIBUTION AND MODIFICATION</a></h3>
+
+<p>
+<strong>0.</strong>
+ This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License").  Each licensee is
+addressed as "you".
+</p>
+<p>
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+</p>
+<p>
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+</p>
+<p>
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, 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 library.
+</p>
+<p>
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+</p>
+<p>
+<strong>1.</strong>
+ You may copy and distribute verbatim copies of the Library's
+complete 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 distribute a copy of this License along with the
+Library.
+</p>
+<p>
+  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.
+</p>
+<p>
+<strong>2.</strong>
+ You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+</p>
+
+
+
 <ul>
-<li>a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.</li>
-
-<li>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
-    &ldquo;keep intact all notices&rdquo;.</li>
-
-<li>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.</li>
-
-<li>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.</li>
-</ul>
-
-<p>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
-&ldquo;aggregate&rdquo; 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.</p>
 
-<h4><a name="section6"></a>6. Conveying Non-Source Forms.</h4>
-
-<p>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:</p>
+<li><strong>a)</strong>
+     The modified work must itself be a software library.
+</li>
+
+<li><strong>b)</strong>
+     You must cause the files modified to carry prominent notices
+     stating that you changed the files and the date of any change.
+</li>
+
+<li><strong>c)</strong>
+     You must cause the whole of the work to be licensed at no
+     charge to all third parties under the terms of this License.
+</li>
+
+<li><strong>d)</strong>
+     If a facility in the modified Library refers to a function or a
+     table of data to be supplied by an application program that uses
+     the facility, other than as an argument passed when the facility
+     is invoked, then you must make a good faith effort to ensure that,
+     in the event an application does not supply such function or
+     table, the facility still operates, and performs whatever part of
+     its purpose remains meaningful.
+     <p>
+     (For example, a function in a library to compute square roots has
+     a purpose that is entirely well-defined independent of the
+     application.  Therefore, Subsection 2d requires that any
+     application-supplied function or table used by this function must
+     be optional: if the application does not supply it, the square
+     root function must still compute square roots.)</p>
+</li>
+</ul>
 
+<p>
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+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 Library, 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.
+</p>
+<p>
+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 Library.
+</p>
+<p>
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+</p>
+<p>
+<strong>3.</strong>
+ You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+</p>
+<p>
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+</p>
+<p>
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+</p>
+<p>
+<strong>4.</strong>
+ You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you 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.
+</p>
+<p>
+  If distribution of 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 satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+</p>
+<p>
+<strong>5.</strong>
+ A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+</p>
+<p>
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+</p>
+<p>
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+</p>
+<p>
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+</p>
+<p>
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+</p>
+<p>
+<strong>6.</strong>
+ As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+</p>
+<p>
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+</p>
+
+
+
 <ul>
-<li>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.</li>
-
-<li>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.</li>
-
-<li>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.</li>
-
-<li>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.</li>
-
-<li>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.</li>
+<li><strong>a)</strong>
+     Accompany the work with the complete corresponding
+     machine-readable source code for the Library including whatever
+     changes were used in the work (which must be distributed under
+     Sections 1 and 2 above); and, if the work is an executable linked
+     with the Library, with the complete machine-readable "work that
+     uses the Library", as object code and/or source code, so that the
+     user can modify the Library and then relink to produce a modified
+     executable containing the modified Library.  (It is understood
+     that the user who changes the contents of definitions files in the
+     Library will not necessarily be able to recompile the application
+     to use the modified definitions.)
+</li>
+
+<li><strong>b)</strong>
+     Accompany the work with a written offer, valid for at
+     least three years, to give the same user the materials
+     specified in Subsection 6a, above, for a charge no more
+     than the cost of performing this distribution.
+</li>
+
+<li><strong>c)</strong>
+     If distribution of the work is made by offering access to copy
+     from a designated place, offer equivalent access to copy the above
+     specified materials from the same place.
+</li>
+
+<li><strong>d)</strong>
+     Verify that the user has already received a copy of these
+     materials or that you have already sent this user a copy.
+</li>
 </ul>
 
-<p>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.</p>
-
-<p>A &ldquo;User Product&rdquo; is either (1) a &ldquo;consumer product&rdquo;, 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, &ldquo;normally used&rdquo; 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.</p>
-
-<p>&ldquo;Installation Information&rdquo; 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.</p>
-
-<p>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).</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<h4><a name="section7"></a>7. Additional Terms.</h4>
-
-<p>&ldquo;Additional permissions&rdquo; 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.</p>
-
-<p>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.</p>
-
-<p>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:</p>
-
+<p>
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  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.
+</p>
+<p>
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+</p>
+<p>
+<strong>7.</strong>
+ You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+</p>
+
+
+
 <ul>
-<li>a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or</li>
-
-<li>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</li>
-
-<li>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</li>
-
-<li>d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or</li>
-
-<li>e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or</li>
-
-<li>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.</li>
+<li><strong>a)</strong>
+     Accompany the combined library with a copy of the same work
+     based on the Library, uncombined with any other library
+     facilities.  This must be distributed under the terms of the
+     Sections above.
+</li>
+
+<li><strong>b)</strong>
+     Give prominent notice with the combined library of the fact
+     that part of it is a work based on the Library, and explaining
+     where to find the accompanying uncombined form of the same work.
+</li>
 </ul>
 
-<p>All other non-permissive additional terms are considered &ldquo;further
-restrictions&rdquo; 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.</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<h4><a name="section8"></a>8. Termination.</h4>
-
-<p>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).</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<h4><a name="section9"></a>9. Acceptance Not Required for Having Copies.</h4>
-
-<p>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.</p>
-
-<h4><a name="section10"></a>10. Automatic Licensing of Downstream Recipients.</h4>
-
-<p>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.</p>
-
-<p>An &ldquo;entity transaction&rdquo; 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.</p>
-
-<p>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.</p>
-
-<h4><a name="section11"></a>11. Patents.</h4>
-
-<p>A &ldquo;contributor&rdquo; 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 &ldquo;contributor version&rdquo;.</p>
-
-<p>A contributor's &ldquo;essential patent claims&rdquo; 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, &ldquo;control&rdquo; includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.</p>
-
-<p>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.</p>
-
-<p>In the following three paragraphs, a &ldquo;patent license&rdquo; 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 &ldquo;grant&rdquo; such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.</p>
-
-<p>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.  &ldquo;Knowingly relying&rdquo; 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.</p>
-  
-<p>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.</p>
-
-<p>A patent license is &ldquo;discriminatory&rdquo; 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.</p>
-
-<p>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.</p>
-
-<h4><a name="section12"></a>12. No Surrender of Others' Freedom.</h4>
-
-<p>If conditions are imposed on you (whether by court order, agreement or
+<p>
+<strong>8.</strong>
+ You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library 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.
+</p>
+<p>
+<strong>9.</strong>
+ 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 Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+</p>
+<p>
+<strong>10.</strong>
+ Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+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.
+</p>
+<p>
+<strong>11.</strong>
+ 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 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.</p>
-
-<h4><a name="section13"></a>13. Use with the GNU Affero General Public License.</h4>
-
-<p>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.</p>
-
-<h4><a name="section14"></a>14. Revised Versions of this License.</h4>
-
-<p>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.</p>
-
-<p>Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License &ldquo;or any later version&rdquo; 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.</p>
-
-<p>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.</p>
-
-<p>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.</p>
-
-<h4><a name="section15"></a>15. Disclaimer of Warranty.</h4>
-
-<p>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 &ldquo;AS IS&rdquo; 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.</p>
-
-<h4><a name="section16"></a>16. Limitation of Liability.</h4>
-
-<p>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.</p>
-
-<h4><a name="section17"></a>17. Interpretation of Sections 15 and 16.</h4>
-
-<p>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.</p>
+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 Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library 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 Library.
+</p>
+<p>
+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.
+</p>
+<p>
+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.
+</p>
+<p>
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+</p>
+<p>
+<strong>12.</strong>
+ If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library 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.
+</p>
+<p>
+<strong>13.</strong>
+ The Free Software Foundation may publish revised and/or new
+versions of the Library 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.
+</p>
+<p>
+Each version is given a distinguishing version number.  If the Library
+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 Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+</p>
+<p>
+<strong>14.</strong>
+ If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+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.
+</p>
+
+<p><strong>NO WARRANTY</strong></p>
+
+<p>
+<strong>15.</strong>
+ BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "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
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+</p>
+<p>
+<strong>16.</strong>
+ 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 LIBRARY 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
+LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+</p>
+
 </div>
 </body>
 </html>

libmediainfo_0.7.34.tar.bz2/Project/BCB/Dll/MediaInfo.cbproj -> libmediainfo_0.7.60.tar.bz2/Project/BCB/Dll/MediaInfo.cbproj Changed

@@ -19,7 +19,7 @@
 			<Base>true</Base>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base)'!=''">
-			<IncludePath>..\..\..\Source\MediaInfoDLL\;..\..\..\Source\MediaInfoDLL;$(IncludePath)</IncludePath>
+			<IncludePath>..\..\..\Source\MediaInfo\Multiple\;..\..\..\Source\MediaInfoDLL\;..\..\..\Source\MediaInfoDLL;$(IncludePath)</IncludePath>
 			<TASM_Defines>_UNICODE _WIN32;$(TASM_Defines)</TASM_Defines>
 			<BRCC_Defines>_UNICODE;_WIN32;$(BRCC_Defines)</BRCC_Defines>
 			<BCC_PCHCache>true</BCC_PCHCache>
@@ -46,7 +46,7 @@
 			<NoVCL>true</NoVCL>
 			<BCC_UserSuppliedOptions> -a4 -Vx -d -Ve</BCC_UserSuppliedOptions>
 			<BCC_GenerateDLL>true</BCC_GenerateDLL>
-			<ILINK_LibraryPath>..\..\..\..\ZenLib\Project\BCB\Library\Release_Build\;..\Library\Release_Build\;..\..\..\..\zlib\projects\BCB\Release_Build\;..\..\..\Source\MediaInfoDLL\;..\..\..\..\ZenLib\Project\BCB\Library\Release_Build;..\Library\Release_Build;..\..\..\..\zlib\projects\BCB\Release_Build;..\..\..\Source\MediaInfoDLL;$(BDS)\lib\obj;$(BDS)\lib;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+			<ILINK_LibraryPath>..\..\..\Source\MediaInfo\Multiple\;..\..\..\..\ZenLib\Project\BCB\Library\Release_Build\;..\Library\Release_Build\;..\..\..\..\zlib\projects\BCB\Release_Build\;..\..\..\Source\MediaInfoDLL\;..\..\..\..\ZenLib\Project\BCB\Library\Release_Build;..\Library\Release_Build;..\..\..\..\zlib\projects\BCB\Release_Build;..\..\..\Source\MediaInfoDLL;$(BDS)\lib\obj;$(BDS)\lib;$(ILINK_LibraryPath)</ILINK_LibraryPath>
 			<DCC_ObjPath>..\..\..\Source\MediaInfoDLL;$(DCC_ObjPath)</DCC_ObjPath>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Cfg_1)'!=''">
@@ -72,18 +72,6 @@
 			<BCC_UserSuppliedOptions> -a4 -Vx -d -Ve -r</BCC_UserSuppliedOptions>
 		</PropertyGroup>
 		<ItemGroup>
-			<LibFiles Include="..\..\..\..\ZenLib\Project\BCB\Library\Release_Build\ZenLib.lib">
-				<BuildOrder>4</BuildOrder>
-				<BuildOrder>0</BuildOrder>
-			</LibFiles>
-			<LibFiles Include="..\Library\Release_Build\MediaInfoLib.lib">
-				<BuildOrder>5</BuildOrder>
-				<BuildOrder>1</BuildOrder>
-			</LibFiles>
-			<LibFiles Include="..\..\..\..\zlib\projects\BCB\Release_Build\zlib.lib">
-				<BuildOrder>6</BuildOrder>
-				<BuildOrder>2</BuildOrder>
-			</LibFiles>
 			<ResFiles Include="MediaInfo.res">
 				<BuildOrder>-1</BuildOrder>
 				<BuildOrder>0</BuildOrder>
@@ -97,6 +85,18 @@
 				<BuildOrder>5</BuildOrder>
 				<BuildOrder>3</BuildOrder>
 			</DefFile>
+			<LibFiles Include="..\..\..\..\ZenLib\Project\BCB\Library\Release_Build\ZenLib.lib">
+				<BuildOrder>4</BuildOrder>
+				<BuildOrder>0</BuildOrder>
+			</LibFiles>
+			<LibFiles Include="..\Library\Release_Build\MediaInfoLib.lib">
+				<BuildOrder>5</BuildOrder>
+				<BuildOrder>1</BuildOrder>
+			</LibFiles>
+			<LibFiles Include="..\..\..\..\zlib\projects\BCB\Release_Build\zlib.lib">
+				<BuildOrder>6</BuildOrder>
+				<BuildOrder>2</BuildOrder>
+			</LibFiles>
 			<BuildConfiguration Include="Base">
 				<Key>Base</Key>
 			</BuildConfiguration>

libmediainfo_0.7.34.tar.bz2/Project/BCB/Library/MediaInfoLib.cbproj -> libmediainfo_0.7.60.tar.bz2/Project/BCB/Library/MediaInfoLib.cbproj Changed

@@ -19,7 +19,7 @@
 			<Base>true</Base>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base)'!=''">
-			<IncludePath>..\..\..\Source\MediaInfo\Video\;..\..\..\Source\MediaInfo\Image\;..\..\..\Source\MediaInfo\Audio\;..\..\..\Source\MediaInfo\Text\;..\..\..\Source\MediaInfo\Tag\;..\..\..\Source\MediaInfo\Duplicate\;..\..\..\Source\MediaInfo\;..\..\..\Source\MediaInfo\Multiple\;..\..\..\Source\MediaInfo\Archive\;..\..\..\Source\MediaInfo\Reader\;..\..\..\Source\MediaInfo\Export\;..\..\..\Source\MediaInfo\Export;..\..\..\Source\MediaInfo\Reader;..\..\..\Source\MediaInfo\Audio;..\..\..\Source\MediaInfo\Video;..\..\..\Source\MediaInfo\Image;..\..\..\Source\MediaInfo\Text;..\..\..\Source\MediaInfo\Tag;..\..\..\Source\MediaInfo\Duplicate;..\..\..\Source\MediaInfo;..\..\..\Source\MediaInfo\Multiple;..\..\..\Source\MediaInfo\Archive;$(IncludePath)</IncludePath>
+			<IncludePath>..\..\..\Source\ThirdParty\tinyxml2\;..\..\..\Source\ThirdParty\base64\;..\..\..\Source\;..\..\..\Source\MediaInfo\Video\;..\..\..\Source\MediaInfo\Image\;..\..\..\Source\MediaInfo\Audio\;..\..\..\Source\MediaInfo\Text\;..\..\..\Source\MediaInfo\Tag\;..\..\..\Source\MediaInfo\Duplicate\;..\..\..\Source\MediaInfo\;..\..\..\Source\MediaInfo\Multiple\;..\..\..\Source\MediaInfo\Archive\;..\..\..\Source\MediaInfo\Reader\;..\..\..\Source\MediaInfo\Export\;..\..\..\Source\MediaInfo\Export;..\..\..\Source\MediaInfo\Reader;..\..\..\Source\MediaInfo\Audio;..\..\..\Source\MediaInfo\Video;..\..\..\Source\MediaInfo\Image;..\..\..\Source\MediaInfo\Text;..\..\..\Source\MediaInfo\Tag;..\..\..\Source\MediaInfo\Duplicate;..\..\..\Source\MediaInfo;..\..\..\Source\MediaInfo\Multiple;..\..\..\Source\MediaInfo\Archive;$(IncludePath)</IncludePath>
 			<BRCC_Defines>_RTLDLL;NO_STRICT;WIN32;_WIN32;UNICODE;_UNICODE;$(BRCC_Defines)</BRCC_Defines>
 			<PackageImports>vcl.bpi;rtl.bpi;vclx.bpi;xmlrtl.bpi;vclie.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;dbrtl.bpi;dsnap.bpi;bcbie.bpi;vcldb.bpi;websnap.bpi;webdsnap.bpi;vclactnband.bpi</PackageImports>
 			<TASM_Defines>_RTLDLL;NO_STRICT;WIN32;_WIN32;UNICODE;_UNICODE;$(TASM_Defines)</TASM_Defines>
@@ -71,371 +71,375 @@
 			<ILINK_LibraryPath>$(BDS)\lib\release;$(ILINK_LibraryPath);$(ILINK_LibraryPath)</ILINK_LibraryPath>
 		</PropertyGroup>
 		<ItemGroup>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Video\File_AvsV.cpp">
-				<BuildOrder>84</BuildOrder>
-				<BuildOrder>10</BuildOrder>
-			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Video\File_Dirac.cpp">
-				<BuildOrder>81</BuildOrder>
-				<BuildOrder>11</BuildOrder>
-			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Archive\File_Tar.cpp">
-				<BuildOrder>83</BuildOrder>
-				<BuildOrder>13</BuildOrder>
-			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Archive\File_Zip.cpp">
-				<BuildOrder>84</BuildOrder>
-				<BuildOrder>10</BuildOrder>
-			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Image\File_Gif.cpp">
-				<BuildOrder>80</BuildOrder>
-				<BuildOrder>2</BuildOrder>
-			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Image\File_Tiff.cpp">
-				<BuildOrder>85</BuildOrder>
-				<BuildOrder>7</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\File__Analyze_Buffer.cpp">
+				<BuildOrder>115</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Video\File_Avc.cpp">
-				<BuildOrder>86</BuildOrder>
-				<BuildOrder>8</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Ac3.cpp">
+				<BuildOrder>91</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Video\File_Mpeg4v.cpp">
-				<BuildOrder>83</BuildOrder>
-				<BuildOrder>13</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\MediaInfo_Config_MediaInfo.cpp">
+				<BuildOrder>41</BuildOrder>
+				<DependentOn>..\..\..\Source\MediaInfo\MediaInfo_Config_MediaInfo.h</DependentOn>
+				<BuildOrder>111</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Tag\File_ApeTag.cpp">
-				<BuildOrder>64</BuildOrder>
-				<BuildOrder>16</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_MpcSv8.cpp">
+				<BuildOrder>110</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\File_Dummy.cpp">
-				<BuildOrder>35</BuildOrder>
-				<BuildOrder>105</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\MediaInfo_Config_Automatic.cpp">
+				<BuildOrder>40</BuildOrder>
+				<BuildOrder>114</BuildOrder>
 			</CppCompile>
 			<CppCompile Include="..\..\..\Source\MediaInfo\Video\File_Avc_Duplicate.cpp">
 				<BuildOrder>9</BuildOrder>
 				<BuildOrder>87</BuildOrder>
 			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Image\File_Ico.cpp">
+				<BuildOrder>77</BuildOrder>
+				<BuildOrder>3</BuildOrder>
+			</CppCompile>
 			<CppCompile Include="..\..\..\Source\MediaInfo\File__Analyze_Streams_Finish.cpp">
 				<BuildOrder>113</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\File__Analyze.cpp">
-				<BuildOrder>114</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_TwinVQ.cpp">
+				<BuildOrder>119</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Archive\File_Gzip.cpp">
-				<BuildOrder>80</BuildOrder>
-				<BuildOrder>2</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Video\File_AvsV.cpp">
+				<BuildOrder>84</BuildOrder>
+				<BuildOrder>10</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Image\File_Ico.cpp">
-				<BuildOrder>77</BuildOrder>
-				<BuildOrder>3</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Video\File_Avc.cpp">
+				<BuildOrder>86</BuildOrder>
+				<BuildOrder>8</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Image\File_Rle.cpp">
-				<BuildOrder>76</BuildOrder>
-				<BuildOrder>6</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\File_Unknown.cpp">
+				<BuildOrder>37</BuildOrder>
+				<BuildOrder>115</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Archive\File_Elf.cpp">
-				<BuildOrder>79</BuildOrder>
-				<BuildOrder>1</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\File__Analyze_Streams.cpp">
+				<BuildOrder>117</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Video\File_Flic.cpp">
-				<BuildOrder>82</BuildOrder>
-				<BuildOrder>12</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Module.cpp">
+				<BuildOrder>108</BuildOrder>
 			</CppCompile>
 			<CppCompile Include="..\..\..\Source\MediaInfo\File__Base.cpp">
 				<BuildOrder>32</BuildOrder>
 				<BuildOrder>110</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\File__Duplicate.cpp">
-				<BuildOrder>33</BuildOrder>
-				<DependentOn>..\..\..\Source\MediaInfo\File__Duplicate.h</DependentOn>
-				<BuildOrder>107</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Aac_Others.cpp">
+				<BuildOrder>147</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Video\File_Vc1.cpp">
-				<BuildOrder>71</BuildOrder>
-				<BuildOrder>23</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Reader\Reader_libcurl.cpp">
+				<DependentOn>..\..\..\Source\MediaInfo\Reader\Reader_libcurl.h</DependentOn>
+				<BuildOrder>124</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Duplicate\File__Duplicate__Writer.cpp">
-				<BuildOrder>69</BuildOrder>
-				<DependentOn>..\..\..\Source\MediaInfo\Duplicate\File__Duplicate__Writer.h</DependentOn>
-				<BuildOrder>25</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Archive\File_7z.cpp">
+				<BuildOrder>76</BuildOrder>
+				<BuildOrder>6</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Tag\File__Tags.cpp">
-				<BuildOrder>63</BuildOrder>
-				<BuildOrder>15</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\MediaInfo.cpp">
+				<BuildOrder>38</BuildOrder>
+				<DependentOn>..\..\..\Source\MediaInfo\MediaInfo.h</DependentOn>
+				<BuildOrder>116</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Duplicate\File__Duplicate__Base.cpp">
-				<BuildOrder>72</BuildOrder>
-				<DependentOn>..\..\..\Source\MediaInfo\Duplicate\File__Duplicate__Base.h</DependentOn>
-				<BuildOrder>24</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Flac.cpp">
+				<BuildOrder>103</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Tag\File_Id3.cpp">
-				<BuildOrder>65</BuildOrder>
-				<BuildOrder>17</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Archive\File_Ace.cpp">
+				<BuildOrder>77</BuildOrder>
+				<BuildOrder>3</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Duplicate\File__Duplicate_MpegTs.cpp">
-				<BuildOrder>66</BuildOrder>
-				<DependentOn>..\..\..\Source\MediaInfo\Duplicate\File__Duplicate_MpegTs.h</DependentOn>
-				<BuildOrder>26</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Archive\File_Gzip.cpp">
+				<BuildOrder>80</BuildOrder>
+				<BuildOrder>2</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Image\File_Jpeg.cpp">
-				<BuildOrder>74</BuildOrder>
-				<BuildOrder>4</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Tag\File_ApeTag.cpp">
+				<BuildOrder>64</BuildOrder>
+				<BuildOrder>16</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Image\File_Bmp.cpp">
+				<BuildOrder>-1</BuildOrder>
+				<BuildOrder>1</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\File__Analyze_Buffer_MinimizeSize.cpp">
+				<BuildOrder>116</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\File_Dummy.cpp">
+				<BuildOrder>35</BuildOrder>
+				<BuildOrder>105</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Archive\File_Mz.cpp">
+				<BuildOrder>81</BuildOrder>
+				<BuildOrder>11</BuildOrder>
 			</CppCompile>
 			<CppCompile Include="..\..\..\Source\MediaInfo\Archive\File_Rar.cpp">
 				<BuildOrder>82</BuildOrder>
 				<BuildOrder>12</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\File__MultipleParsing.cpp">
-				<BuildOrder>34</BuildOrder>
-				<BuildOrder>104</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Image\File_Png.cpp">
+				<BuildOrder>75</BuildOrder>
+				<BuildOrder>5</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Image\File_Bmp.cpp">
-				<BuildOrder>-1</BuildOrder>
-				<BuildOrder>1</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Image\File_Gif.cpp">
+				<BuildOrder>80</BuildOrder>
+				<BuildOrder>2</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Video\File_Mpegv.cpp">
-				<BuildOrder>73</BuildOrder>
-				<BuildOrder>14</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Image\File_Tiff.cpp">
+				<BuildOrder>85</BuildOrder>
+				<BuildOrder>7</BuildOrder>
 			</CppCompile>
 			<CppCompile Include="..\..\..\Source\MediaInfo\MediaInfoList.cpp">
 				<BuildOrder>93</BuildOrder>
 				<DependentOn>..\..\..\Source\MediaInfo\MediaInfoList.h</DependentOn>
 				<BuildOrder>45</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\MediaInfoList_Internal.cpp">
-				<BuildOrder>94</BuildOrder>
-				<DependentOn>..\..\..\Source\MediaInfo\MediaInfoList_Internal.h</DependentOn>
-				<BuildOrder>46</BuildOrder>
-			</CppCompile>
-			<CppCompile Include="MediaInfoLib.cpp">
-				<BuildOrder>-1</BuildOrder>
-				<BuildOrder>0</BuildOrder>
-			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Image\File_Png.cpp">
-				<BuildOrder>75</BuildOrder>
-				<BuildOrder>5</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Video\File_Dirac.cpp">
+				<BuildOrder>81</BuildOrder>
+				<BuildOrder>11</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\File__Analyze_Buffer_MinimizeSize.cpp">
-				<BuildOrder>116</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Video\File_Flic.cpp">
+				<BuildOrder>82</BuildOrder>
+				<BuildOrder>12</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\MediaInfo_Config.cpp">
-				<BuildOrder>39</BuildOrder>
-				<DependentOn>..\..\..\Source\MediaInfo\MediaInfo_Config.h</DependentOn>
-				<BuildOrder>117</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Archive\File_Tar.cpp">
+				<BuildOrder>83</BuildOrder>
+				<BuildOrder>13</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Reader\Reader_libcurl.cpp">
-				<DependentOn>..\..\..\Source\MediaInfo\Reader\Reader_libcurl.h</DependentOn>
-				<BuildOrder>124</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\File__Analyze.cpp">
+				<BuildOrder>114</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\File_Unknown.cpp">
-				<BuildOrder>37</BuildOrder>
-				<BuildOrder>115</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Video\File_Mpegv.cpp">
+				<BuildOrder>73</BuildOrder>
+				<BuildOrder>14</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\MediaInfo.cpp">
-				<BuildOrder>38</BuildOrder>
-				<DependentOn>..\..\..\Source\MediaInfo\MediaInfo.h</DependentOn>
-				<BuildOrder>116</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Archive\File_Elf.cpp">
+				<BuildOrder>79</BuildOrder>
+				<BuildOrder>1</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\MediaInfo_Internal.cpp">
-				<BuildOrder>44</BuildOrder>
-				<DependentOn>..\..\..\Source\MediaInfo\MediaInfo_Internal.h</DependentOn>
-				<BuildOrder>103</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Video\File_Vc1.cpp">
+				<BuildOrder>71</BuildOrder>
+				<BuildOrder>23</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Archive\File_Bzip2.cpp">
-				<BuildOrder>78</BuildOrder>
-				<BuildOrder>0</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Video\File_Mpeg4v.cpp">
+				<BuildOrder>83</BuildOrder>
+				<BuildOrder>13</BuildOrder>
 			</CppCompile>
 			<CppCompile Include="..\..\..\Source\MediaInfo\MediaInfo_File.cpp">
 				<BuildOrder>42</BuildOrder>
 				<BuildOrder>112</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Archive\File_7z.cpp">
+			<CppCompile Include="..\..\..\Source\MediaInfo\Image\File_Rle.cpp">
 				<BuildOrder>76</BuildOrder>
 				<BuildOrder>6</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\File_Other.cpp">
-				<BuildOrder>36</BuildOrder>
-				<BuildOrder>106</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Archive\File_Zip.cpp">
+				<BuildOrder>84</BuildOrder>
+				<BuildOrder>10</BuildOrder>
 			</CppCompile>
-			<None Include="..\..\..\Source\MediaInfo\Multiple\File_Ivf.h">
-				<BuildOrder>139</BuildOrder>
-			</None>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Ivf.cpp">
-				<BuildOrder>138</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Adpcm.cpp">
+				<BuildOrder>93</BuildOrder>
 			</CppCompile>
-			<None Include="..\..\..\Source\MediaInfo\Multiple\File_Lxf.h">
-				<BuildOrder>141</BuildOrder>
-			</None>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Lxf.cpp">
-				<BuildOrder>140</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Text\File_Teletext.cpp">
+				<BuildOrder>160</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Reader\Reader_Directory.cpp">
-				<DependentOn>..\..\..\Source\MediaInfo\Reader\Reader_Directory.h</DependentOn>
-				<BuildOrder>122</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Text\File_DvbSubtitle.cpp">
+				<BuildOrder>159</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Reader\Reader_File.cpp">
-				<DependentOn>..\..\..\Source\MediaInfo\Reader\Reader_File.h</DependentOn>
-				<BuildOrder>123</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Text\File_Scc.cpp">
+				<BuildOrder>161</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\MediaInfo_Inform.cpp">
-				<BuildOrder>43</BuildOrder>
-				<BuildOrder>113</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Aac.cpp">
+				<BuildOrder>90</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Archive\File_Mz.cpp">
-				<BuildOrder>81</BuildOrder>
-				<BuildOrder>11</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Reader\Reader_Directory.cpp">
+				<DependentOn>..\..\..\Source\MediaInfo\Reader\Reader_Directory.h</DependentOn>
+				<BuildOrder>122</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Reader\Reader_libmms.cpp">
-				<DependentOn>..\..\..\Source\MediaInfo\Reader\Reader_libmms.h</DependentOn>
-				<BuildOrder>125</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Wvpk.cpp">
+				<BuildOrder>89</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\File__Analyze_Streams.cpp">
+			<CppCompile Include="..\..\..\Source\MediaInfo\MediaInfo_Config.cpp">
+				<BuildOrder>39</BuildOrder>
+				<DependentOn>..\..\..\Source\MediaInfo\MediaInfo_Config.h</DependentOn>
 				<BuildOrder>117</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_MpcSv8.cpp">
-				<BuildOrder>110</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Aac_GeneralAudio.cpp">
+				<BuildOrder>143</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Flac.cpp">
-				<BuildOrder>103</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Ibi.cpp">
+				<BuildOrder>154</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Adts.cpp">
-				<BuildOrder>94</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Video\File_AfdBarData.cpp">
+				<BuildOrder>130</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\MediaInfo_Config_MediaInfo.cpp">
-				<BuildOrder>41</BuildOrder>
-				<DependentOn>..\..\..\Source\MediaInfo\MediaInfo_Config_MediaInfo.h</DependentOn>
-				<BuildOrder>111</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Aes3.cpp">
+				<BuildOrder>95</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\File__Analyze_Buffer.cpp">
-				<BuildOrder>115</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Video\File_Vp8.cpp">
+				<BuildOrder>169</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_TwinVQ.cpp">
-				<BuildOrder>119</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Export\Export_reVTMD.cpp">
+				<DependentOn>..\..\..\Source\MediaInfo\Export\Export_reVTMD.h</DependentOn>
+				<BuildOrder>168</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\MediaInfo_Config_Automatic.cpp">
-				<BuildOrder>40</BuildOrder>
-				<BuildOrder>114</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Image\File_Psd.cpp">
+				<BuildOrder>172</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Au.cpp">
-				<BuildOrder>100</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Opus.cpp">
+				<BuildOrder>170</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Video\File_Afd.cpp">
-				<BuildOrder>129</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Ape.cpp">
+				<BuildOrder>99</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Mpeg4_AudioSpecificConfig.cpp">
-				<BuildOrder>111</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Aac_GeneralAudio_Sbr.cpp">
+				<BuildOrder>144</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Video\File_AfdBarData.cpp">
-				<BuildOrder>130</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Ism.cpp">
+				<BuildOrder>162</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Archive\File_Ace.cpp">
-				<BuildOrder>77</BuildOrder>
-				<BuildOrder>3</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\TimeCode.cpp">
+				<BuildOrder>158</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Aac.cpp">
-				<BuildOrder>90</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_SequenceInfo.cpp">
+				<BuildOrder>167</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Ac3.cpp">
-				<BuildOrder>91</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Ibi_Creation.cpp">
+				<BuildOrder>155</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\File__MultipleParsing.cpp">
+				<BuildOrder>34</BuildOrder>
+				<BuildOrder>104</BuildOrder>
 			</CppCompile>
 			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Amv.cpp">
 				<BuildOrder>98</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Wvpk.cpp">
-				<BuildOrder>89</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Archive\File_Bzip2.cpp">
+				<BuildOrder>78</BuildOrder>
+				<BuildOrder>0</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Adpcm.cpp">
-				<BuildOrder>93</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Celt.cpp">
+				<BuildOrder>149</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Amr.cpp">
-				<BuildOrder>97</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\MediaInfo_Internal.cpp">
+				<BuildOrder>44</BuildOrder>
+				<DependentOn>..\..\..\Source\MediaInfo\MediaInfo_Internal.h</DependentOn>
+				<BuildOrder>103</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Pcm.cpp">
+			<CppCompile Include="..\..\..\Source\MediaInfo\Reader\Reader_File.cpp">
+				<DependentOn>..\..\..\Source\MediaInfo\Reader\Reader_File.h</DependentOn>
+				<BuildOrder>123</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Aac_Main.cpp">
+				<BuildOrder>146</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Reader\Reader_libmms.cpp">
+				<DependentOn>..\..\..\Source\MediaInfo\Reader\Reader_libmms.h</DependentOn>
+				<BuildOrder>125</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Dts.cpp">
+				<BuildOrder>101</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Tag\File_Lyrics3v2.cpp">
+				<BuildOrder>60</BuildOrder>
+				<BuildOrder>20</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_DvDif.cpp">
+				<BuildOrder>110</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\MediaInfo_Inform.cpp">
+				<BuildOrder>43</BuildOrder>
 				<BuildOrder>113</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_ImpulseTracker.cpp">
-				<BuildOrder>104</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Gxf_TimeCode.cpp">
+				<BuildOrder>144</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Module.cpp">
-				<BuildOrder>108</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\File_Other.cpp">
+				<BuildOrder>36</BuildOrder>
+				<BuildOrder>106</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_ExtendedModule.cpp">
-				<BuildOrder>102</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_DolbyE.cpp">
+				<BuildOrder>151</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Tag\File_Lyrics3.cpp">
-				<BuildOrder>59</BuildOrder>
-				<BuildOrder>19</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Ivf.cpp">
+				<BuildOrder>138</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Duplicate\File__Duplicate_MpegTs.cpp">
+				<BuildOrder>66</BuildOrder>
+				<DependentOn>..\..\..\Source\MediaInfo\Duplicate\File__Duplicate_MpegTs.h</DependentOn>
+				<BuildOrder>26</BuildOrder>
 			</CppCompile>
 			<CppCompile Include="..\..\..\Source\MediaInfo\Tag\File_Id3v2.cpp">
 				<BuildOrder>62</BuildOrder>
 				<BuildOrder>18</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Export\Export_Mpeg7.cpp">
-				<DependentOn>..\..\..\Source\MediaInfo\Export\Export_Mpeg7.h</DependentOn>
-				<BuildOrder>126</BuildOrder>
-			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Mpc.cpp">
-				<BuildOrder>109</BuildOrder>
-			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Tag\File_Lyrics3v2.cpp">
-				<BuildOrder>60</BuildOrder>
-				<BuildOrder>20</BuildOrder>
-			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Text\File_OtherText.cpp">
-				<BuildOrder>131</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\MediaInfoList_Internal.cpp">
+				<BuildOrder>94</BuildOrder>
+				<DependentOn>..\..\..\Source\MediaInfo\MediaInfoList_Internal.h</DependentOn>
+				<BuildOrder>46</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Adif.cpp">
-				<BuildOrder>92</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Tag\File_Lyrics3.cpp">
+				<BuildOrder>59</BuildOrder>
+				<BuildOrder>19</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Aes3.cpp">
-				<BuildOrder>95</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Aac_GeneralAudio_Sbr_Ps.cpp">
+				<BuildOrder>145</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Tta.cpp">
-				<BuildOrder>118</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Lxf.cpp">
+				<BuildOrder>140</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Dts.cpp">
-				<BuildOrder>101</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Midi.cpp">
+				<BuildOrder>107</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Mpega.cpp">
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Dvdv.cpp">
 				<BuildOrder>112</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Ape.cpp">
-				<BuildOrder>99</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_MpegPs.cpp">
+				<BuildOrder>122</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Latm.cpp">
-				<BuildOrder>106</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Tta.cpp">
+				<BuildOrder>118</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Midi.cpp">
-				<BuildOrder>107</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Mpeg4_Elements.cpp">
+				<BuildOrder>118</BuildOrder>
 			</CppCompile>
 			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Speex.cpp">
 				<BuildOrder>116</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Tak.cpp">
-				<BuildOrder>117</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Mxf.cpp">
+				<BuildOrder>125</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Als.cpp">
-				<BuildOrder>96</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Mpc.cpp">
+				<BuildOrder>109</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Ps2Audio.cpp">
+				<BuildOrder>114</BuildOrder>
 			</CppCompile>
 			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_La.cpp">
 				<BuildOrder>105</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Vorbis.cpp">
-				<BuildOrder>120</BuildOrder>
-			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Ps2Audio.cpp">
-				<BuildOrder>114</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Mk.cpp">
+				<BuildOrder>115</BuildOrder>
 			</CppCompile>
 			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_ScreamTracker3.cpp">
 				<BuildOrder>115</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Export\Export_PBCore.cpp">
-				<DependentOn>..\..\..\Source\MediaInfo\Export\Export_PBCore.h</DependentOn>
-				<BuildOrder>127</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Cdxa.cpp">
+				<BuildOrder>108</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Vorbis.cpp">
+				<BuildOrder>120</BuildOrder>
 			</CppCompile>
 			<CppCompile Include="..\..\..\Source\MediaInfo\Text\File_Cdp.cpp">
 				<BuildOrder>124</BuildOrder>
 			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Als.cpp">
+				<BuildOrder>96</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Ogg.cpp">
+				<BuildOrder>127</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Mpega.cpp">
+				<BuildOrder>112</BuildOrder>
+			</CppCompile>
 			<CppCompile Include="..\..\..\Source\MediaInfo\Text\File_Cmml.cpp">
 				<BuildOrder>125</BuildOrder>
 			</CppCompile>
@@ -445,131 +449,219 @@
 			<CppCompile Include="..\..\..\Source\MediaInfo\Text\File_Eia608.cpp">
 				<BuildOrder>127</BuildOrder>
 			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Tak.cpp">
+				<BuildOrder>117</BuildOrder>
+			</CppCompile>
 			<CppCompile Include="..\..\..\Source\MediaInfo\Text\File_Eia708.cpp">
 				<BuildOrder>128</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Text\File_Kate.cpp">
-				<BuildOrder>129</BuildOrder>
-			</CppCompile>
 			<CppCompile Include="..\..\..\Source\MediaInfo\Text\File_N19.cpp">
 				<BuildOrder>130</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Nut.cpp">
-				<BuildOrder>126</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Text\File_Kate.cpp">
+				<BuildOrder>129</BuildOrder>
 			</CppCompile>
 			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Xdcam_Clip.cpp">
 				<BuildOrder>106</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Bdmv.cpp">
-				<BuildOrder>107</BuildOrder>
-			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Mpeg4_Elements.cpp">
-				<BuildOrder>118</BuildOrder>
-			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Dvdv.cpp">
-				<BuildOrder>112</BuildOrder>
-			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_DvDif.cpp">
-				<BuildOrder>110</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Nut.cpp">
+				<BuildOrder>126</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_DvDif_Analysis.cpp">
-				<BuildOrder>111</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Amr.cpp">
+				<BuildOrder>97</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Text\File_Pgs.cpp">
-				<BuildOrder>132</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Export\Export_PBCore.cpp">
+				<DependentOn>..\..\..\Source\MediaInfo\Export\Export_PBCore.h</DependentOn>
+				<BuildOrder>127</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Text\File_Scte20.cpp">
-				<BuildOrder>133</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_MpegTs.cpp">
+				<BuildOrder>123</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Mpeg4_Descriptors.cpp">
-				<BuildOrder>117</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Ogg_SubElement.cpp">
+				<BuildOrder>128</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Mk.cpp">
-				<BuildOrder>115</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Mpeg_Descriptors.cpp">
+				<BuildOrder>120</BuildOrder>
 			</CppCompile>
 			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Mpeg4.cpp">
 				<BuildOrder>116</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Tag\File_VorbisCom.cpp">
-				<BuildOrder>61</BuildOrder>
-				<BuildOrder>21</BuildOrder>
-			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Video\File_Theora.cpp">
-				<BuildOrder>70</BuildOrder>
-				<BuildOrder>22</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Wm.cpp">
+				<BuildOrder>136</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Mpeg4_TimeCode.cpp">
-				<BuildOrder>119</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_MpegTs_Duplicate.cpp">
+				<BuildOrder>124</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Mpeg_Descriptors.cpp">
-				<BuildOrder>120</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_ChannelGrouping.cpp">
+				<BuildOrder>150</BuildOrder>
 			</CppCompile>
 			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Flv.cpp">
 				<BuildOrder>113</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Gxf.cpp">
-				<BuildOrder>114</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_ExtendedModule.cpp">
+				<BuildOrder>102</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Cdxa.cpp">
-				<BuildOrder>108</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Image\File_Jpeg.cpp">
+				<BuildOrder>74</BuildOrder>
+				<BuildOrder>4</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_MpegTs_Duplicate.cpp">
-				<BuildOrder>124</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Mpeg4_TimeCode.cpp">
+				<BuildOrder>119</BuildOrder>
 			</CppCompile>
 			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Mpeg_Psi.cpp">
 				<BuildOrder>121</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_P2_Clip.cpp">
-				<BuildOrder>129</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Gxf.cpp">
+				<BuildOrder>114</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_MpegTs.cpp">
-				<BuildOrder>123</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Tag\File_Id3.cpp">
+				<BuildOrder>65</BuildOrder>
+				<BuildOrder>17</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Ogg_SubElement.cpp">
-				<BuildOrder>128</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_P2_Clip.cpp">
+				<BuildOrder>129</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Mxf.cpp">
-				<BuildOrder>125</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Image\File_Tga.cpp">
+				<BuildOrder>159</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_MpegPs.cpp">
-				<BuildOrder>122</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Swf.cpp">
+				<BuildOrder>134</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Ogg.cpp">
-				<BuildOrder>127</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Bdmv.cpp">
+				<BuildOrder>107</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Umf.cpp">
-				<BuildOrder>135</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Rm.cpp">
+				<BuildOrder>132</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Skm.cpp">
+			<CppCompile Include="..\..\..\Source\MediaInfo\Text\File_Scte20.cpp">
 				<BuildOrder>133</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Riff.cpp">
-				<BuildOrder>130</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Riff_Elements.cpp">
+				<BuildOrder>131</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Dpg.cpp">
-				<BuildOrder>109</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Video\File_Theora.cpp">
+				<BuildOrder>70</BuildOrder>
+				<BuildOrder>22</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Rm.cpp">
-				<BuildOrder>132</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Tag\File__Tags.cpp">
+				<BuildOrder>63</BuildOrder>
+				<BuildOrder>15</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Wm_Elements.cpp">
-				<BuildOrder>137</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Riff.cpp">
+				<BuildOrder>130</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Swf.cpp">
-				<BuildOrder>134</BuildOrder>
+			<CppCompile Include="MediaInfoLib.cpp">
+				<BuildOrder>-1</BuildOrder>
+				<BuildOrder>0</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Riff_Elements.cpp">
+			<CppCompile Include="..\..\..\Source\MediaInfo\Text\File_OtherText.cpp">
 				<BuildOrder>131</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Wm.cpp">
-				<BuildOrder>136</BuildOrder>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Au.cpp">
+				<BuildOrder>100</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Export\Export_Mpeg7.cpp">
+				<DependentOn>..\..\..\Source\MediaInfo\Export\Export_Mpeg7.h</DependentOn>
+				<BuildOrder>126</BuildOrder>
 			</CppCompile>
 			<CppCompile Include="..\..\..\Source\MediaInfo\Video\File_Fraps.cpp">
 				<BuildOrder>142</BuildOrder>
 			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Duplicate\File__Duplicate__Writer.cpp">
+				<BuildOrder>69</BuildOrder>
+				<DependentOn>..\..\..\Source\MediaInfo\Duplicate\File__Duplicate__Writer.h</DependentOn>
+				<BuildOrder>25</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\File__Duplicate.cpp">
+				<BuildOrder>33</BuildOrder>
+				<DependentOn>..\..\..\Source\MediaInfo\File__Duplicate.h</DependentOn>
+				<BuildOrder>107</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Wm_Elements.cpp">
+				<BuildOrder>137</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Umf.cpp">
+				<BuildOrder>135</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Dxw.cpp">
+				<BuildOrder>157</BuildOrder>
+			</CppCompile>
 			<CppCompile Include="..\..\..\Source\MediaInfo\Video\File_Lagarith.cpp">
 				<BuildOrder>143</BuildOrder>
 			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File__ReferenceFilesHelper.cpp">
+				<DependentOn>..\..\..\Source\MediaInfo\Multiple\File__ReferenceFilesHelper.h</DependentOn>
+				<BuildOrder>160</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Duplicate\File__Duplicate__Base.cpp">
+				<BuildOrder>72</BuildOrder>
+				<DependentOn>..\..\..\Source\MediaInfo\Duplicate\File__Duplicate__Base.h</DependentOn>
+				<BuildOrder>24</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Image\File_Exr.cpp">
+				<BuildOrder>158</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Dcp.cpp">
+				<BuildOrder>160</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Pcm.cpp">
+				<BuildOrder>113</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Text\File_Pgs.cpp">
+				<BuildOrder>132</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Video\File_Y4m.cpp">
+				<BuildOrder>156</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Video\File_Vc3.cpp">
+				<BuildOrder>148</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_DvDif_Analysis.cpp">
+				<BuildOrder>111</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Tag\File_VorbisCom.cpp">
+				<BuildOrder>61</BuildOrder>
+				<BuildOrder>21</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Archive\File_Iso9660.cpp">
+				<BuildOrder>153</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Ancillary.cpp">
+				<BuildOrder>146</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Mpeg4_Descriptors.cpp">
+				<BuildOrder>117</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_ImpulseTracker.cpp">
+				<BuildOrder>104</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Dpg.cpp">
+				<BuildOrder>109</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Audio\File_Rkau.cpp">
+				<BuildOrder>163</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Video\File_H263.cpp">
+				<BuildOrder>170</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Image\File_Dpx.cpp">
+				<BuildOrder>158</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Skm.cpp">
+				<BuildOrder>133</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\ThirdParty\tinyxml2\tinyxml2.cpp">
+				<BuildOrder>168</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Hls.cpp">
+				<BuildOrder>169</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Video\File_ProRes.cpp">
+				<BuildOrder>171</BuildOrder>
+			</CppCompile>
+			<CppCompile Include="..\..\..\Source\MediaInfo\Image\File_Pcx.cpp">
+				<BuildOrder>173</BuildOrder>
+			</CppCompile>
 			<BuildConfiguration Include="Base">
 				<Key>Base</Key>
 			</BuildConfiguration>

libmediainfo_0.7.34.tar.bz2/Project/BCB/PreRelease/PreRelease.cbproj -> libmediainfo_0.7.60.tar.bz2/Project/BCB/PreRelease/PreRelease.cbproj Changed

@@ -21,7 +21,7 @@
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base)'!=''">
 			<LinkPackageStatics>rtl.lib;vcl.lib</LinkPackageStatics>
-			<IncludePath>..\..\..\Source\PreRelease\VCL\;..\..\..\Source\PreRelease\;..\..\..\..\ZenLib\Source\ZenLib\;..\..\..\Source\PreRelease\VCL;..\..\..\Source\PreRelease;..\..\..\..\ZenLib\Source\ZenLib;$(IncludePath)</IncludePath>
+			<IncludePath>..\..\..\Source\PreRelease\VCL\;..\..\..\Source\PreRelease\;..\..\..\..\ZenLib\Source\ZenLib\;..\..\..\Source\PreRelease\VCL;..\..\..\Source\PreRelease;..\..\..\..\ZenLib\Source\ZenLib;..\..\..\..\wx\include;..\..\..\..\wx\lib\bcc_lib\;..\..\..\..\wx\lib\bcc_lib\msu;..\..\..\..\wx\lib\bcc_lib\mswu;$(IncludePath)</IncludePath>
 			<TASM_Defines>_RTLDLL;USEPACKAGES;NO_STRICT;UNICODE;$(TASM_Defines)</TASM_Defines>
 			<BRCC_Defines>_RTLDLL;USEPACKAGES;NO_STRICT;UNICODE;$(BRCC_Defines)</BRCC_Defines>
 			<PackageImports>vcl.bpi;rtl.bpi;vclx.bpi;xmlrtl.bpi;vclie.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;dbrtl.bpi;dsnap.bpi;bcbie.bpi;vcldb.bpi;websnap.bpi;webdsnap.bpi;vclactnband.bpi</PackageImports>
@@ -43,7 +43,7 @@
 			<BCC_Defines>NO_STRICT;UNICODE;$(BCC_Defines)</BCC_Defines>
 			<DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
 			<Multithreaded>true</Multithreaded>
-			<ILINK_LibraryPath>..\..\..\..\ZenLib\Project\BCB\Library\Release_Build\;..\..\..\Source\PreRelease\VCL\;..\..\..\Source\PreRelease\;..\..\..\..\zlib\projects\BCB\Release_Build\;..\..\..\..\ZenLib\Source\ZenLib\;..\..\..\..\wxMSW\lib\bcc_lib\;..\..\..\..\ZenLib\Project\BCB\Library\Release_Build;..\..\..\..\zlib\projects\BCB\Release_Build;..\..\..\..\wxMSW\lib\bcc_lib;..\..\..\..\ZenLib\Source\ZenLib;..\..\..\Source\PreRelease\VCL;..\..\..\Source\PreRelease\WxWidgets;..\..\..\Source\PreRelease;E:\Programmation\MediaInfoLib\Project\BCB\PreRelease;$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;$(ILINK_LibraryPath)</ILINK_LibraryPath>
+			<ILINK_LibraryPath>..\..\..\..\ZenLib\Project\BCB\Library\Release_Build\;..\..\..\Source\PreRelease\VCL\;..\..\..\Source\PreRelease\;..\..\..\..\zlib\projects\BCB\Release_Build\;..\..\..\..\ZenLib\Source\ZenLib\;..\..\..\..\wx\lib\bcc_lib\;..\..\..\..\ZenLib\Project\BCB\Library\Release_Build;..\..\..\..\zlib\projects\BCB\Release_Build;..\..\..\..\ZenLib\Source\ZenLib;..\..\..\Source\PreRelease\VCL;..\..\..\Source\PreRelease\WxWidgets;..\..\..\Source\PreRelease;E:\Programmation\MediaInfoLib\Project\BCB\PreRelease;$(BDS)\lib\obj;..\..\..\..\zlib\projects\BCB\Debug_Build\;$(ILINK_LibraryPath)</ILINK_LibraryPath>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Cfg_1)'!=''">
 			<BCC_Defines>_DEBUG;$(BCC_Defines);$(BCC_Defines)</BCC_Defines>
@@ -86,10 +86,6 @@
 				<DependentOn>..\..\..\Source\PreRelease\VCL\PreRelease_.h</DependentOn>
 				<BuildOrder>2</BuildOrder>
 			</CppCompile>
-			<CppCompile Include="..\..\..\Source\PreRelease\Ressources.cpp">
-				<BuildOrder>3</BuildOrder>
-				<BuildOrder>10</BuildOrder>
-			</CppCompile>
 			<CppCompile Include="..\..\..\Source\PreRelease\OldFiles.cpp">
 				<BuildOrder>9</BuildOrder>
 				<BuildOrder>4</BuildOrder>
@@ -117,6 +113,9 @@
 				<BuildOrder>3</BuildOrder>
 				<BuildOrder>10</BuildOrder>
 			</CppCompile>
+			<CppCompile Include="..\..\..\Source\PreRelease\Resources.cpp">
+				<BuildOrder>10</BuildOrder>
+			</CppCompile>
 			<FormResources Include="..\..\..\Source\PreRelease\VCL\PreRelease_.dfm"/>
 			<BuildConfiguration Include="Base">
 				<Key>Base</Key>

libmediainfo_0.7.34.tar.bz2/Project/CMake/CMakeLists.txt -> libmediainfo_0.7.60.tar.bz2/Project/CMake/CMakeLists.txt Changed

@@ -2,16 +2,17 @@
 
 set(MEDIAINFO_MAJOR_VERSION 0)
 set(MEDIAINFO_MINOR_VERSION 7)
-set(MEDIAINFO_PATCH_VERSION 9)
+set(MEDIAINFO_PATCH_VERSION 53)
 set(MEDIAINFO_VERSION ${MEDIAINFO_MAJOR_VERSION}.${MEDIAINFO_MINOR_VERSION}.${MEDIAINFO_PATCH_VERSION})
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../)
 
 include_directories(${ZLIB_INCLUDE_DIR})
 
-add_definitions(-DUNICODE -DMEDIAINFO_MINIMIZESIZE)
+add_definitions(-DUNICODE)
 
 set(mediainfo_SRCS
+	ThirdParty/tinyxml2/tinyxml2.cpp
 	MediaInfo/File__Analyze.cpp
 	MediaInfo/File__Analyze_Buffer.cpp
 	MediaInfo/File__Analyze_Buffer_MinimizeSize.cpp
@@ -32,40 +33,48 @@
 	MediaInfo/MediaInfo_Internal.cpp
 	MediaInfo/MediaInfoList.cpp
 	MediaInfo/MediaInfoList_Internal.cpp
+	MediaInfo/TimeCode.cpp
 	MediaInfo/Archive/File_7z.cpp
 	MediaInfo/Archive/File_Ace.cpp
 	MediaInfo/Archive/File_Bzip2.cpp
 	MediaInfo/Archive/File_Elf.cpp
 	MediaInfo/Archive/File_Gzip.cpp
+	MediaInfo/Archive/File_Iso9660.cpp
 	MediaInfo/Archive/File_Mz.cpp
 	MediaInfo/Archive/File_Rar.cpp
 	MediaInfo/Archive/File_Tar.cpp
 	MediaInfo/Archive/File_Zip.cpp
 	MediaInfo/Audio/File_Aac.cpp
+	MediaInfo/Audio/File_Aac_GeneralAudio.cpp
+	MediaInfo/Audio/File_Aac_GeneralAudio_Sbr.cpp
+	MediaInfo/Audio/File_Aac_GeneralAudio_Sbr_Ps.cpp
+	MediaInfo/Audio/File_Aac_Main.cpp
+	MediaInfo/Audio/File_Aac_Others.cpp
 	MediaInfo/Audio/File_Ac3.cpp
-	MediaInfo/Audio/File_Adif.cpp
 	MediaInfo/Audio/File_Adpcm.cpp
-	MediaInfo/Audio/File_Adts.cpp
 	MediaInfo/Audio/File_Aes3.cpp
 	MediaInfo/Audio/File_Als.cpp
 	MediaInfo/Audio/File_Amr.cpp
 	MediaInfo/Audio/File_Amv.cpp
 	MediaInfo/Audio/File_Ape.cpp
 	MediaInfo/Audio/File_Au.cpp
+	MediaInfo/Audio/File_Celt.cpp
+	MediaInfo/Audio/File_ChannelGrouping.cpp
 	MediaInfo/Audio/File_Dts.cpp
+	MediaInfo/Audio/File_DolbyE.cpp
 	MediaInfo/Audio/File_ExtendedModule.cpp
 	MediaInfo/Audio/File_Flac.cpp
 	MediaInfo/Audio/File_ImpulseTracker.cpp
 	MediaInfo/Audio/File_La.cpp
-	MediaInfo/Audio/File_Latm.cpp
 	MediaInfo/Audio/File_Midi.cpp
 	MediaInfo/Audio/File_Module.cpp
 	MediaInfo/Audio/File_Mpc.cpp
 	MediaInfo/Audio/File_MpcSv8.cpp
-	MediaInfo/Audio/File_Mpeg4_AudioSpecificConfig.cpp
 	MediaInfo/Audio/File_Mpega.cpp
+	MediaInfo/Audio/File_Opus.cpp
 	MediaInfo/Audio/File_Pcm.cpp
 	MediaInfo/Audio/File_Ps2Audio.cpp
+	MediaInfo/Audio/File_Rkau.cpp
 	MediaInfo/Audio/File_ScreamTracker3.cpp
 	MediaInfo/Audio/File_Speex.cpp
 	MediaInfo/Audio/File_Tak.cpp
@@ -78,20 +87,35 @@
 	MediaInfo/Duplicate/File__Duplicate_MpegTs.cpp
 	MediaInfo/Export/Export_Mpeg7.cpp
 	MediaInfo/Export/Export_PBCore.cpp
+	MediaInfo/Export/Export_reVTMD.cpp
 	MediaInfo/Image/File_Bmp.cpp
+	MediaInfo/Image/File_Dpx.cpp
+	MediaInfo/Image/File_Exr.cpp
 	MediaInfo/Image/File_Gif.cpp
 	MediaInfo/Image/File_Ico.cpp
 	MediaInfo/Image/File_Jpeg.cpp
+	MediaInfo/Image/File_Pcx.cpp
 	MediaInfo/Image/File_Png.cpp
+	MediaInfo/Image/File_Psd.cpp
 	MediaInfo/Image/File_Rle.cpp
 	MediaInfo/Image/File_Tiff.cpp
+	MediaInfo/Image/File_Tga.cpp
+	MediaInfo/Multiple/File__ReferenceFilesHelper.cpp
+	MediaInfo/Multiple/File_Ancillary.cpp
+	MediaInfo/Multiple/File_Bdav.cpp
 	MediaInfo/Multiple/File_Cdxa.cpp
+	MediaInfo/Multiple/File_Dcp.cpp
 	MediaInfo/Multiple/File_Dpg.cpp
 	MediaInfo/Multiple/File_DvDif.cpp
 	MediaInfo/Multiple/File_DvDif_Analysis.cpp
 	MediaInfo/Multiple/File_Dvdv.cpp
+	MediaInfo/Multiple/File_Dxw.cpp
 	MediaInfo/Multiple/File_Flv.cpp
 	MediaInfo/Multiple/File_Gxf.cpp
+	MediaInfo/Multiple/File_Gxf_TimeCode.cpp
+	MediaInfo/Multiple/File_Ibi.cpp
+	MediaInfo/Multiple/File_Ibi_Create.cpp
+	MediaInfo/Multiple/File_Ism.cpp
 	MediaInfo/Multiple/File_Ivf.cpp
 	MediaInfo/Multiple/File_Lxf.cpp
 	MediaInfo/Multiple/File_Mk.cpp
@@ -112,6 +136,7 @@
 	MediaInfo/Multiple/File_Riff.cpp
 	MediaInfo/Multiple/File_Riff_Elements.cpp
 	MediaInfo/Multiple/File_Rm.cpp
+	MediaInfo/Multiple/File_SequenceInfo.cpp
 	MediaInfo/Multiple/File_Skm.cpp
 	MediaInfo/Multiple/File_Swf.cpp
 	MediaInfo/Multiple/File_Umf.cpp
@@ -131,6 +156,7 @@
 	MediaInfo/Tag/File_VorbisCom.cpp
 	MediaInfo/Text/File_Cdp.cpp
 	MediaInfo/Text/File_Cmml.cpp
+	MediaInfo/Text/File_DvbSubtitle.cpp
 	MediaInfo/Text/File_DtvccTransport.cpp
 	MediaInfo/Text/File_Eia608.cpp
 	MediaInfo/Text/File_Eia708.cpp
@@ -138,7 +164,9 @@
 	MediaInfo/Text/File_N19.cpp
 	MediaInfo/Text/File_OtherText.cpp
 	MediaInfo/Text/File_Pgs.cpp
-	MediaInfo/Text/File_Scte20cpp
+	MediaInfo/Text/File_Scc.cpp
+	MediaInfo/Text/File_Scte20.cpp
+	MediaInfo/Text/File_Teletext.cpp
 	MediaInfo/Video/File_Avc.cpp
 	MediaInfo/Video/File_Avc_Duplicate.cpp
 	MediaInfo/Video/File_AvsV.cpp
@@ -146,13 +174,18 @@
 	MediaInfo/Video/File_Dirac.cpp
 	MediaInfo/Video/File_Flic.cpp
 	MediaInfo/Video/File_Fraps.cpp
+	MediaInfo/Video/File_H263.cpp
 	MediaInfo/Video/File_Lagarith.cpp
 	MediaInfo/Video/File_Mpeg4v.cpp
 	MediaInfo/Video/File_Mpegv.cpp
+	MediaInfo/Video/File_ProRes.cpp
 	MediaInfo/Video/File_Theora.cpp
 	MediaInfo/Video/File_Vc1.cpp
-	MediaInfo/MediaInfoDLL.cpp
-	MediaInfo/MediaInfoDLL.def
+	MediaInfo/Video/File_Vc3.cpp
+	MediaInfo/Video/File_Vp8.cpp
+	MediaInfo/Video/File_Y4m.cpp
+	MediaInfoDLL/MediaInfoDLL.cpp
+	MediaInfoDLL/MediaInfoDLL.def
 )
 
 if (WIN32)

libmediainfo_0.7.34.tar.bz2/Project/CodeBlocks/Library/MediaInfoLib.cbp -> libmediainfo_0.7.60.tar.bz2/Project/CodeBlocks/Library/MediaInfoLib.cbp Changed

@@ -67,7 +67,8 @@
 		<Unit filename="..\..\..\Source\MediaInfo\Audio\File_Mpeg4_AudioSpecificConfig.cpp" />
 		<Unit filename="..\..\..\Source\MediaInfo\Audio\File_Mpeg4_AudioSpecificConfig.h" />
 		<Unit filename="..\..\..\Source\MediaInfo\Audio\File_Mpega.cpp" />
-		<Unit filename="..\..\..\Source\MediaInfo\Audio\File_Mpega.h" />
+		<Unit filename="..\..\..\Source\MediaInfo\Audio\File_MpeOpusPcm.cpp" />
+		<Unit filename="..\..\..\Source\MediaInfo\Audio\File_Opus.h" />
 		<Unit filename="..\..\..\Source\MediaInfo\Audio\File_Pcm.cpp" />
 		<Unit filename="..\..\..\Source\MediaInfo\Audio\File_Pcm.h" />
 		<Unit filename="..\..\..\Source\MediaInfo\Audio\File_Tta.cpp" />
@@ -103,7 +104,9 @@
 		<Unit filename="..\..\..\Source\MediaInfo\Image\File_Ico.h" />
 		<Unit filename="..\..\..\Source\MediaInfo\Image\File_Jpeg.cpp" />
 		<Unit filename="..\..\..\Source\MediaInfo\Image\File_Jpeg.h" />
+		<Unit filename="..\..\..\Source\MediaInfo\Image\File_Pcx.cpp" />
 		<Unit filename="..\..\..\Source\MediaInfo\Image\File_Png.cpp" />
+		<Unit filename="..\..\..\Source\MediaInfo\Image\File_Psd.cpp" />
 		<Unit filename="..\..\..\Source\MediaInfo\Image\File_Png.h" />
 		<Unit filename="..\..\..\Source\MediaInfo\Image\File_Tiff.cpp" />
 		<Unit filename="..\..\..\Source\MediaInfo\Image\File_Tiff.h" />
@@ -167,6 +170,8 @@
 		<Unit filename="..\..\..\Source\MediaInfo\Video\File_Mpeg4v.h" />
 		<Unit filename="..\..\..\Source\MediaInfo\Video\File_Mpegv.cpp" />
 		<Unit filename="..\..\..\Source\MediaInfo\Video\File_Mpegv.h" />
+		<Unit filename="..\..\..\Source\MediaInfo\Video\File_ProRes.cpp" />
+		<Unit filename="..\..\..\Source\MediaInfo\Video\File_ProRes.h" />
 		<Extensions>
 			<code_completion />
 		</Extensions>

libmediainfo_0.7.34.tar.bz2/Project/GNU/Library/Makefile.am -> libmediainfo_0.7.60.tar.bz2/Project/GNU/Library/Makefile.am Changed

@@ -22,40 +22,48 @@
                        ../../../Source/MediaInfo/MediaInfo_Internal.cpp \
                        ../../../Source/MediaInfo/MediaInfoList.cpp \
                        ../../../Source/MediaInfo/MediaInfoList_Internal.cpp \
+                       ../../../Source/MediaInfo/TimeCode.cpp \
                        ../../../Source/MediaInfo/Archive/File_7z.cpp \
                        ../../../Source/MediaInfo/Archive/File_Ace.cpp \
                        ../../../Source/MediaInfo/Archive/File_Bzip2.cpp \
                        ../../../Source/MediaInfo/Archive/File_Elf.cpp \
                        ../../../Source/MediaInfo/Archive/File_Gzip.cpp \
+                       ../../../Source/MediaInfo/Archive/File_Iso9660.cpp \
                        ../../../Source/MediaInfo/Archive/File_Mz.cpp \
                        ../../../Source/MediaInfo/Archive/File_Rar.cpp \
                        ../../../Source/MediaInfo/Archive/File_Tar.cpp \
                        ../../../Source/MediaInfo/Archive/File_Zip.cpp \
                        ../../../Source/MediaInfo/Audio/File_Aac.cpp \
+                       ../../../Source/MediaInfo/Audio/File_Aac_GeneralAudio.cpp \
+                       ../../../Source/MediaInfo/Audio/File_Aac_GeneralAudio_Sbr.cpp \
+                       ../../../Source/MediaInfo/Audio/File_Aac_GeneralAudio_Sbr_Ps.cpp \
+                       ../../../Source/MediaInfo/Audio/File_Aac_Main.cpp \
+                       ../../../Source/MediaInfo/Audio/File_Aac_Others.cpp \
                        ../../../Source/MediaInfo/Audio/File_Ac3.cpp \
-                       ../../../Source/MediaInfo/Audio/File_Adif.cpp \
                        ../../../Source/MediaInfo/Audio/File_Adpcm.cpp \
-                       ../../../Source/MediaInfo/Audio/File_Adts.cpp \
                        ../../../Source/MediaInfo/Audio/File_Aes3.cpp \
                        ../../../Source/MediaInfo/Audio/File_Als.cpp \
                        ../../../Source/MediaInfo/Audio/File_Amr.cpp \
                        ../../../Source/MediaInfo/Audio/File_Amv.cpp \
                        ../../../Source/MediaInfo/Audio/File_Ape.cpp \
                        ../../../Source/MediaInfo/Audio/File_Au.cpp \
+                       ../../../Source/MediaInfo/Audio/File_Celt.cpp \
+                       ../../../Source/MediaInfo/Audio/File_ChannelGrouping.cpp \
                        ../../../Source/MediaInfo/Audio/File_Dts.cpp \
+                       ../../../Source/MediaInfo/Audio/File_DolbyE.cpp \
                        ../../../Source/MediaInfo/Audio/File_ExtendedModule.cpp \
                        ../../../Source/MediaInfo/Audio/File_Flac.cpp \
                        ../../../Source/MediaInfo/Audio/File_ImpulseTracker.cpp \
                        ../../../Source/MediaInfo/Audio/File_La.cpp \
-                       ../../../Source/MediaInfo/Audio/File_Latm.cpp \
                        ../../../Source/MediaInfo/Audio/File_Midi.cpp \
                        ../../../Source/MediaInfo/Audio/File_Module.cpp \
                        ../../../Source/MediaInfo/Audio/File_Mpc.cpp \
                        ../../../Source/MediaInfo/Audio/File_MpcSv8.cpp \
-                       ../../../Source/MediaInfo/Audio/File_Mpeg4_AudioSpecificConfig.cpp \
                        ../../../Source/MediaInfo/Audio/File_Mpega.cpp \
+                       ../../../Source/MediaInfo/Audio/File_Opus.cpp \
                        ../../../Source/MediaInfo/Audio/File_Pcm.cpp \
                        ../../../Source/MediaInfo/Audio/File_Ps2Audio.cpp \
+                       ../../../Source/MediaInfo/Audio/File_Rkau.cpp \
                        ../../../Source/MediaInfo/Audio/File_ScreamTracker3.cpp \
                        ../../../Source/MediaInfo/Audio/File_Speex.cpp \
                        ../../../Source/MediaInfo/Audio/File_Tak.cpp \
@@ -68,21 +76,36 @@
                        ../../../Source/MediaInfo/Duplicate/File__Duplicate_MpegTs.cpp \
                        ../../../Source/MediaInfo/Export/Export_Mpeg7.cpp \
                        ../../../Source/MediaInfo/Export/Export_PBCore.cpp \
+                       ../../../Source/MediaInfo/Export/Export_reVTMD.cpp \
                        ../../../Source/MediaInfo/Image/File_Bmp.cpp \
+                       ../../../Source/MediaInfo/Image/File_Dpx.cpp \
+                       ../../../Source/MediaInfo/Image/File_Exr.cpp \
                        ../../../Source/MediaInfo/Image/File_Gif.cpp \
                        ../../../Source/MediaInfo/Image/File_Ico.cpp \
                        ../../../Source/MediaInfo/Image/File_Jpeg.cpp \
+                       ../../../Source/MediaInfo/Image/File_Pcx.cpp \
                        ../../../Source/MediaInfo/Image/File_Png.cpp \
+                       ../../../Source/MediaInfo/Image/File_Psd.cpp \
                        ../../../Source/MediaInfo/Image/File_Rle.cpp \
                        ../../../Source/MediaInfo/Image/File_Tiff.cpp \
+                       ../../../Source/MediaInfo/Image/File_Tga.cpp \
+                       ../../../Source/MediaInfo/Multiple/File__ReferenceFilesHelper.cpp \
+                       ../../../Source/MediaInfo/Multiple/File_Ancillary.cpp \
                        ../../../Source/MediaInfo/Multiple/File_Bdmv.cpp \
                        ../../../Source/MediaInfo/Multiple/File_Cdxa.cpp \
+                       ../../../Source/MediaInfo/Multiple/File_Dcp.cpp \
                        ../../../Source/MediaInfo/Multiple/File_Dpg.cpp \
                        ../../../Source/MediaInfo/Multiple/File_DvDif.cpp \
                        ../../../Source/MediaInfo/Multiple/File_DvDif_Analysis.cpp \
                        ../../../Source/MediaInfo/Multiple/File_Dvdv.cpp \
+                       ../../../Source/MediaInfo/Multiple/File_Dxw.cpp \
                        ../../../Source/MediaInfo/Multiple/File_Flv.cpp \
                        ../../../Source/MediaInfo/Multiple/File_Gxf.cpp \
+                       ../../../Source/MediaInfo/Multiple/File_Gxf_TimeCode.cpp \
+                       ../../../Source/MediaInfo/Multiple/File_Hls.cpp \
+                       ../../../Source/MediaInfo/Multiple/File_Ibi.cpp \
+                       ../../../Source/MediaInfo/Multiple/File_Ibi_Creation.cpp \
+                       ../../../Source/MediaInfo/Multiple/File_Ism.cpp \
                        ../../../Source/MediaInfo/Multiple/File_Ivf.cpp \
                        ../../../Source/MediaInfo/Multiple/File_Lxf.cpp \
                        ../../../Source/MediaInfo/Multiple/File_Mk.cpp \
@@ -103,6 +126,7 @@
                        ../../../Source/MediaInfo/Multiple/File_Riff.cpp \
                        ../../../Source/MediaInfo/Multiple/File_Riff_Elements.cpp \
                        ../../../Source/MediaInfo/Multiple/File_Rm.cpp \
+                       ../../../Source/MediaInfo/Multiple/File_SequenceInfo.cpp \
                        ../../../Source/MediaInfo/Multiple/File_Skm.cpp \
                        ../../../Source/MediaInfo/Multiple/File_Swf.cpp \
                        ../../../Source/MediaInfo/Multiple/File_Umf.cpp \
@@ -122,6 +146,7 @@
                        ../../../Source/MediaInfo/Tag/File_VorbisCom.cpp \
                        ../../../Source/MediaInfo/Text/File_Cdp.cpp \
                        ../../../Source/MediaInfo/Text/File_Cmml.cpp \
+                       ../../../Source/MediaInfo/Text/File_DvbSubtitle.cpp \
                        ../../../Source/MediaInfo/Text/File_DtvccTransport.cpp \
                        ../../../Source/MediaInfo/Text/File_Kate.cpp \
                        ../../../Source/MediaInfo/Text/File_Eia608.cpp \
@@ -129,7 +154,9 @@
                        ../../../Source/MediaInfo/Text/File_N19.cpp \
                        ../../../Source/MediaInfo/Text/File_OtherText.cpp \
                        ../../../Source/MediaInfo/Text/File_Pgs.cpp \
+                       ../../../Source/MediaInfo/Text/File_Scc.cpp \
                        ../../../Source/MediaInfo/Text/File_Scte20.cpp \
+                       ../../../Source/MediaInfo/Text/File_Teletext.cpp \
                        ../../../Source/MediaInfo/Video/File_Avc.cpp \
                        ../../../Source/MediaInfo/Video/File_Avc_Duplicate.cpp \
                        ../../../Source/MediaInfo/Video/File_AvsV.cpp \
@@ -138,12 +165,22 @@
                        ../../../Source/MediaInfo/Video/File_Flic.cpp \
                        ../../../Source/MediaInfo/Video/File_Fraps.cpp \
                        ../../../Source/MediaInfo/Video/File_Lagarith.cpp \
+                       ../../../Source/MediaInfo/Video/File_H263.cpp \
                        ../../../Source/MediaInfo/Video/File_Mpeg4v.cpp \
                        ../../../Source/MediaInfo/Video/File_Mpegv.cpp \
+                       ../../../Source/MediaInfo/Video/File_ProRes.cpp \
                        ../../../Source/MediaInfo/Video/File_Theora.cpp \
                        ../../../Source/MediaInfo/Video/File_Vc1.cpp \
+                       ../../../Source/MediaInfo/Video/File_Vc3.cpp \
+                       ../../../Source/MediaInfo/Video/File_Vp8.cpp \
+                       ../../../Source/MediaInfo/Video/File_Y4m.cpp \
                        ../../../Source/MediaInfoDLL/MediaInfoDLL.cpp
 
+if COMPILE_TINYXML2
+libmediainfo_la_SOURCES += \
+                       ../../../Source/ThirdParty/tinyxml2/tinyxml2.cpp
+endif
+
 libmediainfo_la_LDFLAGS     = -no-undefined -version-info 0:0:0
 
 INCLUDES = -I../../../Source -I../../../../ZenLib/Source

libmediainfo_0.7.34.tar.bz2/Project/GNU/Library/configure.ac -> libmediainfo_0.7.60.tar.bz2/Project/GNU/Library/configure.ac Changed

@@ -52,10 +52,11 @@
 AC_ARG_ENABLE(arch-x86_64,      AC_HELP_STRING([--enable-arch-x86_64],      [Create Mac x86_64 architecture]),            , enable_arch_x86_64=no)
 AC_ARG_ENABLE(staticlibs,       AC_HELP_STRING([--enable-staticlibs],       [Use static libmediainfo and libzen]),        , enable_staticlibs=no)
 AC_ARG_ENABLE(minimize-size,    AC_HELP_STRING([--enable-minimize-size],    [Enable size optimisations]),                 MediaInfoMinimizeSize=$enableval, MediaInfoMinimizeSize=depend)
-AC_ARG_ENABLE(minimum,    		AC_HELP_STRING([--enable-minimum],    		[Enable minimum management]),                 MediaInfoMinimum=$enableval, MediaInfoMinimum=depend)
+AC_ARG_ENABLE(minimal,    		AC_HELP_STRING([--enable-minimal],    		[Enable minimal management (except parsers)]),MediaInfoMinimal=$enableval, MediaInfoMinimal=depend)
 AC_ARG_ENABLE(trace,    		AC_HELP_STRING([--enable-trace],    		[Enable trace management]),                   MediaInfoTrace=$enableval,   MediaInfoTrace=depend)
 AC_ARG_ENABLE(events,    		AC_HELP_STRING([--enable-events],    		[Enable events management]),                  MediaInfoEvents=$enableval,  MediaInfoEvents=depend)
 AC_ARG_ENABLE(demux,    		AC_HELP_STRING([--enable-demux],    		[Enable demux management]),                   MediaInfoDemux=$enableval,   MediaInfoDemux=depend)
+AC_ARG_ENABLE(libmms-describe-support, AC_HELP_STRING([--enable-libmms-describe-support], [Enable customized libmms describe support]), MediaInfoLibmmsDescribeSupport=$enableval, MediaInfoLibmmsDescribeSupport=depend)
 AC_ARG_ENABLE(all,     AC_HELP_STRING([--disable-all],     [Disable all parsers]),                                        MediaInfoAll=$enableval,     MediaInfoAll=depend)
 AC_ARG_ENABLE(archive, AC_HELP_STRING([--disable-archive], [Disable all archive parsers]),                                MediaInfoArchive=$enableval, MediaInfoArchive=depend)
 AC_ARG_ENABLE(audio,   AC_HELP_STRING([--disable-audio],   [Disable all audio parsers]),                                  MediaInfoAudio=$enableval,   MediaInfoAudio=depend)
@@ -69,6 +70,7 @@
 AC_ARG_ENABLE(bzip2,   AC_HELP_STRING([--disable-bzip2],   [Disable Archive - Bzip2]),                                    MediaInfoBzip2=$enableval,   MediaInfoBzip2=depend)
 AC_ARG_ENABLE(elf,     AC_HELP_STRING([--disable-elf],     [Disable Archive - ELF]),                                      MediaInfoElf=$enableval,     MediaInfoElf=depend)
 AC_ARG_ENABLE(gzip,    AC_HELP_STRING([--disable-gzip],    [Disable Archive - GZip]),                                     MediaInfoGzip=$enableval,    MediaInfoGzip=depend)
+AC_ARG_ENABLE(iso9660, AC_HELP_STRING([--disable-iso9660], [Disable Archive - ISO 9660]),                                 MediaInfoIso9660=$enableval, MediaInfoIso9660=depend)
 AC_ARG_ENABLE(mz,      AC_HELP_STRING([--disable-mz],      [Disable Archive - MZ (DOS) and PE (Windows)]),                MediaInfoMz=$enableval,      MediaInfoMz=depend)
 AC_ARG_ENABLE(rar,     AC_HELP_STRING([--disable-rar],     [Disable Archive - Rar]),                                      MediaInfoRar=$enableval,     MediaInfoRar=depend)
 AC_ARG_ENABLE(tar,     AC_HELP_STRING([--disable-tar],     [Disable Archive - Tar]),                                      MediaInfoTar=$enableval,     MediaInfoTar=depend)
@@ -84,6 +86,7 @@
 AC_ARG_ENABLE(amv,     AC_HELP_STRING([--disable-amv],     [Disable Audio - AMV]),                                        MediaInfoAmv=$enableval,     MediaInfoAmv=depend)
 AC_ARG_ENABLE(ape,     AC_HELP_STRING([--disable-ape],     [Disable Audio - Monkey Audio (.ape, .mac)]),                  MediaInfoApe=$enableval,     MediaInfoApe=depend)
 AC_ARG_ENABLE(au,      AC_HELP_STRING([--disable-au],      [Disable Audio - Au]),                                         MediaInfoAu=$enableval,      MediaInfoAu=depend)
+AC_ARG_ENABLE(celt,    AC_HELP_STRING([--disable-celt],    [Disable Audio - CELT]),                                       MediaInfoCelt=$enableval,    MediaInfoCelt=depend)
 AC_ARG_ENABLE(dts,     AC_HELP_STRING([--disable-dts],     [Disable Audio - DTS]),                                        MediaInfoDts=$enableval,     MediaInfoDts=depend)
 AC_ARG_ENABLE(flac,    AC_HELP_STRING([--disable-flac],    [Disable Audio - FLAC format]),                                MediaInfoFlac=$enableval,    MediaInfoFlac=depend)
 AC_ARG_ENABLE(la,      AC_HELP_STRING([--disable-la],      [Disable Audio - LA (Lossless Audio)]),                        MediaInfoLa=$enableval,      MediaInfoLa=depend)
@@ -94,6 +97,7 @@
 AC_ARG_ENABLE(mpega,   AC_HELP_STRING([--disable-mpega],   [Disable Audio - MPEG-Audio]),                                 MediaInfoMpega=$enableval,   MediaInfoMpega=depend)
 AC_ARG_ENABLE(pcm,     AC_HELP_STRING([--disable-pcm],     [Disable Audio - PCM]),                                        MediaInfoPcm=$enableval,     MediaInfoPcm=depend)
 AC_ARG_ENABLE(ps2a,    AC_HELP_STRING([--disable-ps2a],    [Disable Audio - PS2 Audio]),                                  MediaInfoPs2a=$enableval,    MediaInfoPs2a=depend)
+AC_ARG_ENABLE(rkau,    AC_HELP_STRING([--disable-rkau],    [Disable Audio - RK Audio]),                                   MediaInfoRkau=$enableval,    MediaInfoRkau=depend)
 AC_ARG_ENABLE(speex,   AC_HELP_STRING([--disable-speex],   [Disable Audio - Speex]),                                      MediaInfoSpeex=$enableval,   MediaInfoSpeex=depend)
 AC_ARG_ENABLE(tak,     AC_HELP_STRING([--disable-tak],     [Disable Audio - TAK]),                                        MediaInfoTak=$enableval,     MediaInfoTak=depend)
 AC_ARG_ENABLE(tta,     AC_HELP_STRING([--disable-tta],     [Disable Audio - True Audio]),                                 MediaInfoTta=$enableval,     MediaInfoTta=depend)
@@ -101,19 +105,26 @@
 AC_ARG_ENABLE(vorbis,  AC_HELP_STRING([--disable-vorbis],  [Disable Audio - Vorbis]),                                     MediaInfovorbis=$enableval,  MediaInfovorbis=depend)
 AC_ARG_ENABLE(wvpk,    AC_HELP_STRING([--disable-wvpk],    [Disable Audio - Wavepack]),                                   MediaInfoWvpk=$enableval,    MediaInfoWvpk=depend)
 AC_ARG_ENABLE(bmp,     AC_HELP_STRING([--disable-bmp],     [Disable Image - Bitmap]),                                     MediaInfoBmp=$enableval,     MediaInfoBmp=depend)
+AC_ARG_ENABLE(dpx,     AC_HELP_STRING([--disable-dpx],     [Disable Image - DPX]),                                        MediaInfoDpx=$enableval,     MediaInfoDpx=depend)
+AC_ARG_ENABLE(exr,     AC_HELP_STRING([--disable-exr],     [Disable Image - EXR]),                                        MediaInfoExr=$enableval,     MediaInfoExr=depend)
 AC_ARG_ENABLE(gif,     AC_HELP_STRING([--disable-gif],     [Disable Image - GIF]),                                        MediaInfoGif=$enableval,     MediaInfoGif=depend)
 AC_ARG_ENABLE(ico,     AC_HELP_STRING([--disable-ico],     [Disable Image - ICO]),                                        MediaInfoIco=$enableval,     MediaInfoIco=depend)
 AC_ARG_ENABLE(jpeg,    AC_HELP_STRING([--disable-jpeg],    [Disable Image - JPEG]),                                       MediaInfoJpeg=$enableval,    MediaInfoJpeg=depend)
+AC_ARG_ENABLE(pcx,     AC_HELP_STRING([--disable-pcx],     [Disable Image - PCX]),                                        MediaInfoPcx=$enableval,     MediaInfoPcx=depend)
 AC_ARG_ENABLE(png,     AC_HELP_STRING([--disable-png],     [Disable Image - PNG]),                                        MediaInfoPng=$enableval,     MediaInfoPng=depend)
+AC_ARG_ENABLE(psd,     AC_HELP_STRING([--disable-psd],     [Disable Image - PSD]),                                        MediaInfoPsd=$enableval,     MediaInfoPsd=depend)
 AC_ARG_ENABLE(rle,     AC_HELP_STRING([--disable-rle],     [Disable Image - Run-length encoding]),                        MediaInfoRle=$enableval,     MediaInfoRle=depend)
 AC_ARG_ENABLE(tiff,    AC_HELP_STRING([--disable-tiff],    [Disable Image - TIFF]),                                       MediaInfoTiff=$enableval,    MediaInfoTiff=depend)
 AC_ARG_ENABLE(bdav,    AC_HELP_STRING([--disable-bdav],    [Disable Multiple - Blu-ray audio-video (BDAV)]),              MediaInfoBdav=$enableval,    MediaInfoBdav=depend)
 AC_ARG_ENABLE(bdmv,    AC_HELP_STRING([--disable-bdmv],    [Disable Multiple - Blu-ray Movie]),                           MediaInfoBdmv=$enableval,    MediaInfoBdmv=depend)
 AC_ARG_ENABLE(cdxa,    AC_HELP_STRING([--disable-cdxa],    [Disable Multiple - CDXA (CD mode 2)]),                        MediaInfoCdxa=$enableval,    MediaInfoCdxa=depend)
+AC_ARG_ENABLE(dcp,     AC_HELP_STRING([--disable-dcp],     [Disable Multiple - DCP]),                                     MediaInfoDcp=$enableval,     MediaInfoDcp=depend)
 AC_ARG_ENABLE(dpg,     AC_HELP_STRING([--disable-dpg],     [Disable Multiple - DPG (Nintendo DS)]),                       MediaInfoDpg=$enableval,     MediaInfoDpg=depend)
+AC_ARG_ENABLE(references, AC_HELP_STRING([--disable-references], [Disable Multiple - Reference files support]),           MediaInfoReferences=$enableval, MediaInfoReferences=depend)
 AC_ARG_ENABLE(dvdif,   AC_HELP_STRING([--disable-dvdif],   [Disable Multiple - DV DIF (Digital Video)]),                  MediaInfoDvDif=$enableval,   MediaInfoDvDif=depend)
 AC_ARG_ENABLE(dvdif-analyze, AC_HELP_STRING([--enable-dvdif-analyze],   [Enable Multiple - DV DIF (Digital Video) Analyze part]), MediaInfoDvDifAnalyze=$enableval,   MediaInfoDvDifAnalyze=depend)
 AC_ARG_ENABLE(dvdv,    AC_HELP_STRING([--disable-dvdv],    [Disable Multiple - DVD-Video]),                               MediaInfoDvdv=$enableval,    MediaInfoDvdv=depend)
+AC_ARG_ENABLE(dxw,     AC_HELP_STRING([--disable-dxw],     [Disable Multiple - DXW]),                                     MediaInfoDxw=$enableval,     MediaInfoDxw=depend)
 AC_ARG_ENABLE(flv,     AC_HELP_STRING([--disable-flv],     [Disable Multiple - FLV (Flash video)]),                       MediaInfoFlv=$enableval,     MediaInfoFlv=depend)
 AC_ARG_ENABLE(mk,      AC_HELP_STRING([--disable-mk],      [Disable Multiple - Matroska]),                                MediaInfoMk=$enableval,      MediaInfoMk=depend)
 AC_ARG_ENABLE(mpeg4,   AC_HELP_STRING([--disable-mpeg4],   [Disable Multiple - MPEG-4 based formats (MOV, AAC...)]),      MediaInfoMpeg4=$enableval,   MediaInfoMpeg4=depend)
@@ -137,17 +148,25 @@
 AC_ARG_ENABLE(Lyrics3v2, AC_HELP_STRING([--disable-Lyrics3v2], [Disable Tag - Lyrics3v2]),                                MediaInfoLyrics3v2=$enableval, MediaInfoLyrics3v2=depend)
 AC_ARG_ENABLE(VorbisCom, AC_HELP_STRING([--disable-VorbisCom], [Disable Tag - VorbisCom]),                                MediaInfoVorbisCom=$enableval, MediaInfoVorbisCom=depend)
 AC_ARG_ENABLE(cmml,    AC_HELP_STRING([--disable-cmml],    [Disable Text - CMML]),                                        MediaInfoCmml=$enableval,    MediaInfoCmml=depend)
+AC_ARG_ENABLE(dvbsubtitle,  AC_HELP_STRING([--disable-dvbSsubtitle],  [Disable Text - DVB Subtitle]),                     MediaInfoDvbSubtitle=$enableval,  MediaInfoDvbSubtitle=depend)
 AC_ARG_ENABLE(eia608,  AC_HELP_STRING([--disable-eia608],  [Disable Text - Closed captions (EIA-608)]),                   MediaInfoEia608=$enableval,  MediaInfo608=depend)
 AC_ARG_ENABLE(eia708,  AC_HELP_STRING([--disable-eia708],  [Disable Text - Closed captions (EIA-708)]),                   MediaInfoEia708=$enableval,  MediaInfo708=depend)
+AC_ARG_ENABLE(teletext,  AC_HELP_STRING([--disable-teletext],  [Disable Text - Teletext]),                                MediaInfoTeletext=$enableval,  MediaInfoTeletext=depend)
 AC_ARG_ENABLE(kate,    AC_HELP_STRING([--disable-kate],    [Disable Text - Kate]),                                        MediaInfoKate=$enableval,    MediaInfoKate=depend)
 AC_ARG_ENABLE(pgs,     AC_HELP_STRING([--disable-pgs] ,    [Disable Text - PGS]),                                         MediaInfoPgs=$enableval,     MediaInfoPgs=depend)
+AC_ARG_ENABLE(scc,     AC_HELP_STRING([--disable-scc] ,    [Disable Text - SCC]),                                         MediaInfoScc=$enableval,     MediaInfoScc=depend)
 AC_ARG_ENABLE(avc,     AC_HELP_STRING([--disable-avc],     [Disable Video - AVC/H264]),                                   MediaInfoAvc=$enableval,     MediaInfoAvc=depend)
 AC_ARG_ENABLE(avsV,    AC_HELP_STRING([--disable-avsv],    [Disable Video - AVS (Chinese)]),                              MediaInfoAvsV=$enableval,    MediaInfoAvsV=depend)
 AC_ARG_ENABLE(flic,    AC_HELP_STRING([--disable-flic],    [Disable Video - FLIC (fli, flc)]),                            MediaInfoFlic=$enableval,    MediaInfoFlic=depend)
+AC_ARG_ENABLE(h263,    AC_HELP_STRING([--disable-h263],    [Disable Video - H.263]),                                      MediaInfoH263=$enableval,    MediaInfoH263=depend)
 AC_ARG_ENABLE(mpeg4v,  AC_HELP_STRING([--disable-mpeg4v],  [Disable Video - MPEG-4 Video based formats (DivX, XviD...)]), MediaInfoMpeg4v=$enableval,  MediaInfoMpeg4v=depend)
 AC_ARG_ENABLE(mpegv,   AC_HELP_STRING([--disable-mpegv],   [Disable Video - MPEG-Video]),                                 MediaInfoMpegv=$enableval,   MediaInfoMpegv=depend)
+AC_ARG_ENABLE(prores,  AC_HELP_STRING([--disable-prores],  [Disable Video - ProRes]),                                     MediaInfoProRes=$enableval,  MediaInfoProRes=depend)
 AC_ARG_ENABLE(theora,  AC_HELP_STRING([--disable-theora],  [Disable Video - Theora]),                                     MediaInfoTheora=$enableval,  MediaInfoTheora=depend)
 AC_ARG_ENABLE(vc1,     AC_HELP_STRING([--disable-vc1],     [Disable Video - VC-1]),                                       MediaInfoVc1=$enableval,     MediaInfoVc1=depend)
+AC_ARG_ENABLE(vc3,     AC_HELP_STRING([--disable-vc3],     [Disable Video - VC-3 (DNxHD)]),                               MediaInfoVc3=$enableval,     MediaInfoVc3=depend)
+AC_ARG_ENABLE(vp8,     AC_HELP_STRING([--disable-vp8],     [Disable Video - VP8]),                                        MediaInfovp8=$enableval,     MediaInfovp8=depend)
+AC_ARG_ENABLE(y4m,     AC_HELP_STRING([--disable-y4m],     [Disable Video - YUV4MPEG2]),                                  MediaInfoy4m=$enableval,     MediaInfoy4m=depend)
 
 dnl -------------------------------------------------------------------------
 dnl With
@@ -157,6 +176,7 @@
 AC_ARG_WITH(libz_static,        AC_HELP_STRING([--with-libz-static],        [Use static version of Zlib]),                , with_libz_static=no)
 AC_ARG_WITH(libcurl,            AC_HELP_STRING([--with-libcurl],            [Use libcurl (specific directory)]),          , with_libcurl=no)
 AC_ARG_WITH(libmms,             AC_HELP_STRING([--with-libmms],             [Use libmms (specific directory)]),           , with_libmms=no)
+AC_ARG_WITH(libtinyxml2,        AC_HELP_STRING([--with-libtinyxml2],        [Use libtinyxml2 (system)]),                  , with_libtinyxml2=depend)
 
 dnl -------------------------------------------------------------------------
 dnl MediaInfo *
@@ -166,6 +186,7 @@
 if test "$MediaInfoTrace"   = "no";  then AC_DEFINE(MEDIAINFO_TRACE_NO)   fi; if test "$MediaInfoTrace"   = "yes"; then AC_DEFINE(MEDIAINFO_TRACE_YES)   fi
 if test "$MediaInfoEvents"  = "no";  then AC_DEFINE(MEDIAINFO_EVENTS_NO)  fi; if test "$MediaInfoEvents"  = "yes"; then AC_DEFINE(MEDIAINFO_EVENTS_YES)  fi
 if test "$MediaInfoDemux"   = "no";  then AC_DEFINE(MEDIAINFO_DEMUX_NO)   fi; if test "$MediaInfoDemux"   = "yes"; then AC_DEFINE(MEDIAINFO_DEMUX_YES)   fi
+if test "$MediaInfoLibmmsDescribeSupport" = "yes"; then AC_DEFINE(MEDIAINFO_LIBMMS_DESCRIBE_SUPPORT)   fi
 if test "$MediaInfoAll"     = "no";  then AC_DEFINE(MEDIAINFO_ALL_NO)     fi
 if test "$MediaInfoArchive" = "no";  then AC_DEFINE(MEDIAINFO_ARCHIVE_NO) fi
 if test "$MediaInfoAudio"   = "no";  then AC_DEFINE(MEDIAINFO_AUDIO_NO)   fi
@@ -179,6 +200,7 @@
 if test "$MediaInfoBzip2"   = "no";  then AC_DEFINE(MEDIAINFO_BZIP2_NO)   fi; if test "$MediaInfoBzip2"   = "yes"; then AC_DEFINE(MEDIAINFO_BZIP2_YES)   fi
 if test "$MediaInfoElf"     = "no";  then AC_DEFINE(MEDIAINFO_ELF_NO)     fi; if test "$MediaInfoElf"     = "yes"; then AC_DEFINE(MEDIAINFO_ELF_YES)     fi
 if test "$MediaInfoGzip"    = "no";  then AC_DEFINE(MEDIAINFO_GZIP_NO)    fi; if test "$MediaInfoGzip"    = "yes"; then AC_DEFINE(MEDIAINFO_GZIP_YES)    fi
+if test "$MediaInfoIso9660" = "no";  then AC_DEFINE(MEDIAINFO_ISO9660_NO) fi; if test "$MediaInfoIso9660" = "yes"; then AC_DEFINE(MEDIAINFO_ISO9660_YES) fi
 if test "$MediaInfoMz"      = "no";  then AC_DEFINE(MEDIAINFO_MZ_NO)      fi; if test "$MediaInfoMz"      = "yes"; then AC_DEFINE(MEDIAINFO_MZ_YES)      fi
 if test "$MediaInfoRar"     = "no";  then AC_DEFINE(MEDIAINFO_RAR_NO)     fi; if test "$MediaInfoRar"     = "yes"; then AC_DEFINE(MEDIAINFO_RAR_YES)     fi
 if test "$MediaInfoTar"     = "no";  then AC_DEFINE(MEDIAINFO_TAR_NO)     fi; if test "$MediaInfoTar"     = "yes"; then AC_DEFINE(MEDIAINFO_TAR_YES)     fi
@@ -194,6 +216,7 @@
 if test "$MediaInfoAmv"     = "no";  then AC_DEFINE(MEDIAINFO_AMV_NO)     fi; if test "$MediaInfoAmv"     = "yes"; then AC_DEFINE(MEDIAINFO_AMV_YES)     fi
 if test "$MediaInfoApe"     = "no";  then AC_DEFINE(MEDIAINFO_APE_NO)     fi; if test "$MediaInfoApe"     = "yes"; then AC_DEFINE(MEDIAINFO_APE_YES)     fi
 if test "$MediaInfoAu"      = "no";  then AC_DEFINE(MEDIAINFO_AU_NO)      fi; if test "$MediaInfoAu"      = "yes"; then AC_DEFINE(MEDIAINFO_AU_YES)      fi
+if test "$MediaInfoCelt"    = "no";  then AC_DEFINE(MEDIAINFO_CELT_NO)    fi; if test "$MediaInfoCelt"    = "yes"; then AC_DEFINE(MEDIAINFO_CELT_YES)    fi
 if test "$MediaInfoDts"     = "no";  then AC_DEFINE(MEDIAINFO_DTS_NO)     fi; if test "$MediaInfoDts"     = "yes"; then AC_DEFINE(MEDIAINFO_DTS_YES)     fi
 if test "$MediaInfoFlac"    = "no";  then AC_DEFINE(MEDIAINFO_FLAC_NO)    fi; if test "$MediaInfoFlac"    = "yes"; then AC_DEFINE(MEDIAINFO_FLAC_YES)    fi
 if test "$MediaInfoLa"      = "no";  then AC_DEFINE(MEDIAINFO_LA_NO)      fi; if test "$MediaInfoLa"      = "yes"; then AC_DEFINE(MEDIAINFO_LA_YES)      fi
@@ -204,6 +227,7 @@
 if test "$MediaInfoMpega"   = "no";  then AC_DEFINE(MEDIAINFO_MPEGA_NO)   fi; if test "$MediaInfoMpega"   = "yes"; then AC_DEFINE(MEDIAINFO_MPEGA_YES)   fi
 if test "$MediaInfoPcm"     = "no";  then AC_DEFINE(MEDIAINFO_PCM_NO)     fi; if test "$MediaInfoPcm"     = "yes"; then AC_DEFINE(MEDIAINFO_PCM_YES)     fi
 if test "$MediaInfoPs2a"    = "no";  then AC_DEFINE(MEDIAINFO_PS2A_NO)    fi; if test "$MediaInfoPs2a"    = "yes"; then AC_DEFINE(MEDIAINFO_PS2A_YES)    fi
+if test "$MediaInfoRkau"    = "no";  then AC_DEFINE(MEDIAINFO_RKAU_NO)    fi; if test "$MediaInfoRkau"    = "yes"; then AC_DEFINE(MEDIAINFO_RKAU_YES)    fi
 if test "$MediaInfoSpeex"   = "no";  then AC_DEFINE(MEDIAINFO_SPEEX_NO)   fi; if test "$MediaInfoSpeex"   = "yes"; then AC_DEFINE(MEDIAINFO_SPEEX_YES)   fi
 if test "$MediaInfoTak"     = "no";  then AC_DEFINE(MEDIAINFO_TAK_NO)     fi; if test "$MediaInfoTak"     = "yes"; then AC_DEFINE(MEDIAINFO_TAK_YES)     fi
 if test "$MediaInfoTta"     = "no";  then AC_DEFINE(MEDIAINFO_TTA_NO)     fi; if test "$MediaInfoTta"     = "yes"; then AC_DEFINE(MEDIAINFO_TTA_YES)     fi
@@ -211,18 +235,25 @@
 if test "$MediaInfoVorbis"  = "no";  then AC_DEFINE(MEDIAINFO_VORBIS_NO)  fi; if test "$MediaInfoVorbis"  = "yes"; then AC_DEFINE(MEDIAINFO_VORBIS_YES)  fi
 if test "$MediaInfoWvpk"    = "no";  then AC_DEFINE(MEDIAINFO_WVPK_NO)    fi; if test "$MediaInfoWvpk"    = "yes"; then AC_DEFINE(MEDIAINFO_WVPK_YES)    fi
 if test "$MediaInfoBmp"     = "no";  then AC_DEFINE(MEDIAINFO_BMP_NO)     fi; if test "$MediaInfoBmp"     = "yes"; then AC_DEFINE(MEDIAINFO_BMP_YES)     fi
+if test "$MediaInfoDpx"     = "no";  then AC_DEFINE(MEDIAINFO_DPX_NO)     fi; if test "$MediaInfoDpx"     = "yes"; then AC_DEFINE(MEDIAINFO_DPX_YES)     fi
+if test "$MediaInfoExr"     = "no";  then AC_DEFINE(MEDIAINFO_EXR_NO)     fi; if test "$MediaInfoExr"     = "yes"; then AC_DEFINE(MEDIAINFO_EXR_YES)     fi
 if test "$MediaInfoGif"     = "no";  then AC_DEFINE(MEDIAINFO_GIF_NO)     fi; if test "$MediaInfoGif"     = "yes"; then AC_DEFINE(MEDIAINFO_GIF_YES)     fi
 if test "$MediaInfoIco"     = "no";  then AC_DEFINE(MEDIAINFO_ICO_NO)     fi; if test "$MediaInfoIco"     = "yes"; then AC_DEFINE(MEDIAINFO_ICO_YES)     fi
 if test "$MediaInfoJpeg"    = "no";  then AC_DEFINE(MEDIAINFO_JPEG_NO)    fi; if test "$MediaInfoJpeg"    = "yes"; then AC_DEFINE(MEDIAINFO_JPEG_YES)    fi
+if test "$MediaInfoPcx"     = "no";  then AC_DEFINE(MEDIAINFO_PCX_NO)     fi; if test "$MediaInfoPcx"     = "yes"; then AC_DEFINE(MEDIAINFO_PCX_YES)     fi
 if test "$MediaInfoPng"     = "no";  then AC_DEFINE(MEDIAINFO_PNG_NO)     fi; if test "$MediaInfoPng"     = "yes"; then AC_DEFINE(MEDIAINFO_PNG_YES)     fi
+if test "$MediaInfoPsd"     = "no";  then AC_DEFINE(MEDIAINFO_PSD_NO)     fi; if test "$MediaInfoPsd"     = "yes"; then AC_DEFINE(MEDIAINFO_PSD_YES)     fi
 if test "$MediaInfoTiff"    = "no";  then AC_DEFINE(MEDIAINFO_TIFF_NO)    fi; if test "$MediaInfoTiff"    = "yes"; then AC_DEFINE(MEDIAINFO_TIFF_YES)    fi
 if test "$MediaInfoBdav"    = "no";  then AC_DEFINE(MEDIAINFO_BDAV_NO)    fi; if test "$MediaInfoBdav"    = "yes"; then AC_DEFINE(MEDIAINFO_BDAV_YES)    fi
 if test "$MediaInfoBdmv"    = "no";  then AC_DEFINE(MEDIAINFO_BDMV_NO)    fi; if test "$MediaInfoBdmv"    = "yes"; then AC_DEFINE(MEDIAINFO_BDMV_YES)    fi
 if test "$MediaInfoCdxa"    = "no";  then AC_DEFINE(MEDIAINFO_CDXA_NO)    fi; if test "$MediaInfoCdxa"    = "yes"; then AC_DEFINE(MEDIAINFO_CDXA_YES)    fi
+if test "$MediaInfoDcp"     = "no";  then AC_DEFINE(MEDIAINFO_DCP_NO)     fi; if test "$MediaInfoDcp"     = "yes"; then AC_DEFINE(MEDIAINFO_DCP_YES)     fi
 if test "$MediaInfoDpg"     = "no";  then AC_DEFINE(MEDIAINFO_DPG_NO)     fi; if test "$MediaInfoDpg"     = "yes"; then AC_DEFINE(MEDIAINFO_DPG_YES)     fi
+if test "$MediaInfoReferences" = "no";  then AC_DEFINE(MEDIAINFO_REFERENCES_NO)   fi; if test "$MediaInfoReferences" = "yes"; then AC_DEFINE(MEDIAINFO_REFERENCES_YES)   fi
 if test "$MediaInfoDvDif"   = "no";  then AC_DEFINE(MEDIAINFO_DVDIF_NO)   fi; if test "$MediaInfoDvDif"   = "yes"; then AC_DEFINE(MEDIAINFO_DVDIF_YES)   fi
 if test "$MediaInfoDvDifAnalyze" = "no";  then AC_DEFINE(MEDIAINFO_DVDIF_ANALYZE_NO)   fi; if test "$MediaInfoDvDifAnalyze" = "yes"; then AC_DEFINE(MEDIAINFO_DVDIF_ANALYZE_YES) fi
 if test "$MediaInfoDvdv"    = "no";  then AC_DEFINE(MEDIAINFO_DVDV_NO)    fi; if test "$MediaInfoDvdv"    = "yes"; then AC_DEFINE(MEDIAINFO_DVDV_YES)    fi
+if test "$MediaInfoDxw"     = "no";  then AC_DEFINE(MEDIAINFO_DXW_NO)     fi; if test "$MediaInfoDxw"     = "yes"; then AC_DEFINE(MEDIAINFO_DXW_YES)     fi
 if test "$MediaInfoFlv"     = "no";  then AC_DEFINE(MEDIAINFO_FLV_NO)     fi; if test "$MediaInfoFlv"     = "yes"; then AC_DEFINE(MEDIAINFO_FLV_YES)     fi
 if test "$MediaInfoMk"      = "no";  then AC_DEFINE(MEDIAINFO_MK_NO)      fi; if test "$MediaInfoMk"      = "yes"; then AC_DEFINE(MEDIAINFO_MK_YES)      fi
 if test "$MediaInfoMpeg4"   = "no";  then AC_DEFINE(MEDIAINFO_MPEG4_NO)   fi; if test "$MediaInfoMpeg4"   = "yes"; then AC_DEFINE(MEDIAINFO_MPEG4_YES)   fi
@@ -246,17 +277,25 @@
 if test "$MediaInfoLyrics3v2" = "no";  then AC_DEFINE(MEDIAINFO_LYRICS3V2_NO) fi; if test "$MediaInfoLyrics3v2" = "yes"; then AC_DEFINE(MEDIAINFO_LYRICS3V2_YES) fi
 if test "$MediaInfoVorbisCom" = "no";  then AC_DEFINE(MEDIAINFO_VORBISCOM_NO) fi; if test "$MediaInfoVorbisCom" = "yes"; then AC_DEFINE(MEDIAINFO_VORBISCOM_YES) fi
 if test "$MediaInfoCmml"    = "no";  then AC_DEFINE(MEDIAINFO_CMML_NO)    fi; if test "$MediaInfoCmml"    = "yes"; then AC_DEFINE(MEDIAINFO_CMML_YES)    fi
+if test "$MediaInfoDvbSubtitle"  = "no";  then AC_DEFINE(MEDIAINFO_DVBSUBTITLE_NO)  fi; if test "$MediaInfoDvbSubtitle"  = "yes"; then AC_DEFINE(MEDIAINFO_DVBSUBTITLE_YES)  fi
 if test "$MediaInfoEia608"  = "no";  then AC_DEFINE(MEDIAINFO_EIA608_NO)  fi; if test "$MediaInfoEia608"  = "yes"; then AC_DEFINE(MEDIAINFO_EIA608_YES)  fi
 if test "$MediaInfoEia708"  = "no";  then AC_DEFINE(MEDIAINFO_EIA708_NO)  fi; if test "$MediaInfoEia708"  = "yes"; then AC_DEFINE(MEDIAINFO_EIA708_YES)  fi
+if test "$MediaInfoTeletext"  = "no";  then AC_DEFINE(MEDIAINFO_TELETEXT_NO)  fi; if test "$MediaInfoTeletext"  = "yes"; then AC_DEFINE(MEDIAINFO_TELETEXT_YES)  fi
 if test "$MediaInfoKate"    = "no";  then AC_DEFINE(MEDIAINFO_KATE_NO)    fi; if test "$MediaInfoKate"    = "yes"; then AC_DEFINE(MEDIAINFO_KATE_YES)    fi
 if test "$MediaInfoPgs"     = "no";  then AC_DEFINE(MEDIAINFO_PGS_NO)     fi; if test "$MediaInfoPgs"     = "yes"; then AC_DEFINE(MEDIAINFO_PGS_YES)     fi
+if test "$MediaInfoScc"     = "no";  then AC_DEFINE(MEDIAINFO_PGS_NO)     fi; if test "$MediaInfoScc"     = "yes"; then AC_DEFINE(MEDIAINFO_PGS_YES)     fi
 if test "$MediaInfoAvc"     = "no";  then AC_DEFINE(MEDIAINFO_AVC_NO)     fi; if test "$MediaInfoAvc"     = "yes"; then AC_DEFINE(MEDIAINFO_AVC_YES)     fi
 if test "$MediaInfoAvsV"    = "no";  then AC_DEFINE(MEDIAINFO_AVSV_NO)    fi; if test "$MediaInfoAvsV"    = "yes"; then AC_DEFINE(MEDIAINFO_AVSV_YES)    fi
-if test "$MediaInfoFlic"    = "no";  then AC_DEFINE(MEDIAINFO_FLIC_NO)    fi; if test "$MediaInfoflic"    = "yes"; then AC_DEFINE(MEDIAINFO_FLIC_YES)    fi
+if test "$MediaInfoFlic"    = "no";  then AC_DEFINE(MEDIAINFO_FLIC_NO)    fi; if test "$MediaInfoFlic"    = "yes"; then AC_DEFINE(MEDIAINFO_FLIC_YES)    fi
+if test "$MediaInfoH263"    = "no";  then AC_DEFINE(MEDIAINFO_H263_NO)    fi; if test "$MediaInfoH263"    = "yes"; then AC_DEFINE(MEDIAINFO_H263_YES)    fi
 if test "$MediaInfoMpeg4v"  = "no";  then AC_DEFINE(MEDIAINFO_MPEG4V_NO)  fi; if test "$MediaInfoMpeg4v"  = "yes"; then AC_DEFINE(MEDIAINFO_MPEG4V_YES)  fi
 if test "$MediaInfoMpegv"   = "no";  then AC_DEFINE(MEDIAINFO_MPEGV_NO)   fi; if test "$MediaInfoMpegv"   = "yes"; then AC_DEFINE(MEDIAINFO_MPEGV_YES)   fi
+if test "$MediaInfoProRes"  = "no";  then AC_DEFINE(MEDIAINFO_PRORES_NO)  fi; if test "$MediaInfoProRes"  = "yes"; then AC_DEFINE(MEDIAINFO_PRORES_YES)  fi
 if test "$MediaInfoTheora"  = "no";  then AC_DEFINE(MEDIAINFO_THEORA_NO)  fi; if test "$MediaInfoTheora"  = "yes"; then AC_DEFINE(MEDIAINFO_THEORA_YES)  fi
 if test "$MediaInfoVc1"     = "no";  then AC_DEFINE(MEDIAINFO_VC1_NO)     fi; if test "$MediaInfoVc1"     = "yes"; then AC_DEFINE(MEDIAINFO_VC1_YES)     fi
+if test "$MediaInfoVc3"     = "no";  then AC_DEFINE(MEDIAINFO_VC3_NO)     fi; if test "$MediaInfoVc3"     = "yes"; then AC_DEFINE(MEDIAINFO_VC3_YES)     fi
+if test "$MediaInfoVp8"     = "no";  then AC_DEFINE(MEDIAINFO_VP8_NO)     fi; if test "$MediaInfoVp8"     = "yes"; then AC_DEFINE(MEDIAINFO_VP8_YES)     fi
+if test "$MediaInfoY4m"     = "no";  then AC_DEFINE(MEDIAINFO_Y4M_NO)     fi; if test "$MediaInfoY4m"     = "yes"; then AC_DEFINE(MEDIAINFO_Y4M_YES)     fi
 
 dnl #########################################################################
 dnl ### Options from elsewhere
@@ -282,7 +321,7 @@
 dnl #########################################################################
 
 dnl -------------------------------------------------------------------------
-dnl ZLib
+dnl zlib
 dnl
 
 if test "$with_libz_static" != "yes"; then
@@ -292,30 +331,30 @@
 	have_libz="no"
 fi
 if test "$have_libz" != "yes"; then
-	if test -e ../../../../Shared/Source/ZLib/libz.a || test -e ../../../../Shared/Source/ZLib/libz.la; then
+	if test -e ../../../../Shared/Source/zlib/libz.a || test -e ../../../../Shared/Source/zlib/libz.la; then
 		with_zlib="builtin"
 	else
 		AC_MSG_NOTICE([zlib is not found, trying to download and compile it])
-		if test -e ../../../../Shared/Project/ZLib/Compile.sh; then
-			cd ../../../../Shared/Project/ZLib
+		if test -e ../../../../Shared/Project/zlib/Compile.sh; then
+			cd ../../../../Shared/Project/zlib
 			chmod u+x Compile.sh
 			./Compile.sh --build=$build_alias
 			cd $Home
-			if test -e ../../../../Shared/Source/ZLib/libz.a || test -e ../../../../Shared/Source/ZLib/libz.la; then
+			if test -e ../../../../Shared/Source/zlib/libz.a || test -e ../../../../Shared/Source/zlib/libz.la; then
 				with_zlib="builtin"
 			else
 				with_zlib="no"
-				AC_MSG_ERROR([Problem while compiling builtin ZLib])
+				AC_MSG_ERROR([Problem while compiling builtin zlib])
 			fi
 		else
 			with_zlib="no"
-			AC_MSG_ERROR([ZLib is not found, please install development package of zlib])
+			AC_MSG_ERROR([zlib is not found, please install development package of zlib])
 		fi
 	fi
-	CXXFLAGS="$CXXFLAGS -I../../../../Shared/Source/ZLib"
-	LIBS="$LIBS -L../../../../Shared/Source/ZLib"
-	MediaInfoLib_LIBS="$MediaInfoLib_LIBS -L../../../../Shared/Source/ZLib -lz"
-	MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static -L../../../../Shared/Source/ZLib -lz"
+	CXXFLAGS="$CXXFLAGS -I../../../../Shared/Source/zlib"
+	LIBS="$LIBS -L../../../../Shared/Source/zlib"
+	MediaInfoLib_LIBS="$MediaInfoLib_LIBS -L../../../../Shared/Source/zlib -lz"
+	MediaInfoLib_LIBS_Static="$MediaInfoLib_LIBS_Static -L../../../../Shared/Source/zlib -lz"
 else
     with_zlib="system"
     LIBS="$LIBS -lz"
@@ -328,7 +367,6 @@
 dnl
 if test -e ../../../../ZenLib/Project/GNU/Library/libzen.la; then
 	CXXFLAGS="$CXXFLAGS $(../../../../ZenLib/Project/GNU/Library/libzen-config CXXFLAGS)"
-	MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(../../../../ZenLib/Project/GNU/Library/libzen-config CXXFLAGS)"
 	if test "$enable_staticlibs" = "yes"; then
 		with_zenlib="builtin (static)"
 		LIBS="$LIBS $(../../../../ZenLib/Project/GNU/Library/libzen-config LIBS_Static)"
@@ -340,7 +378,6 @@
 	fi
 elif test "$(libzen-config Exists)" = "yes" ; then
 	CXXFLAGS="$CXXFLAGS $(libzen-config CXXFLAGS)"
-	MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(libzen-config CXXFLAGS)"
 	if test "$enable_staticlibs" = "yes"; then
 		with_zenlib="system (static)"
 		LIBS="$LIBS $(libzen-config LIBS_Static)"
@@ -353,7 +390,6 @@
 else
 	if pkg-config --exists libzen; then
 		CXXFLAGS="$CXXFLAGS $(pkg-config --cflags libzen)"
-		MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $(pkg-config --cflags libzen)"
 		if test "$enable_staticlibs" = "yes"; then
 			with_zenlib="system (static)"
 			LIBS="$LIBS $(pkg-config --variable=LIBS_Static libzen)"
@@ -440,8 +476,7 @@
 		AC_MSG_ERROR([Problem while compiling builtin curl])
 	fi
 else
-	CXXFLAGS="$CXXFLAGS -DMEDIAINFO_LIBCURL_NO"
-	using_libcurl="not found"
+	AC_MSG_ERROR([libcurl development files are not found. Install the corresponding libcurl development package (e.g. "apt-get install libcurl-dev" or "yum install libcurl-devel"])
 fi
 
 dnl -------------------------------------------------------------------------
@@ -491,6 +526,28 @@
 	using_libmms="not found"
 fi
 
+dnl -------------------------------------------------------------------------
+dnl libtinyxml2
+dnl
+if test "$with_libtinyxml2" = "yes"; then
+	PKG_CHECK_MODULES([TINYXML2], [tinyxml2])
+	CXXFLAGS="$CXXFLAGS $TINYXML2_CXXFLAGS"
+	MediaInfoLib_CXXFLAGS="$MediaInfoLib_CXXFLAGS $TINYXML2_CXXFLAGS"
+	LIBS="$LIBS $TINYXML2_LIBS"
+	MediaInfoLib_LIBS="$MediaInfoLib_LIBS $TINYXML2_LIBS"
+	AM_CONDITIONAL(COMPILE_TINYXML2, false)
+	using_libtinyxml2="system"
+else
+	CXXFLAGS="$CXXFLAGS -I../../../Source/ThirdParty/tinyxml2"
+	using_libtinyxml2="internal"
+	AM_CONDITIONAL(COMPILE_TINYXML2, true)
+fi
+
+dnl -------------------------------------------------------------------------
+dnl base64
+dnl
+CXXFLAGS="$CXXFLAGS -I../../../Source/ThirdParty/base64"
+
 dnl #########################################################################
 dnl ### Compiler specific
 dnl #########################################################################
@@ -501,6 +558,9 @@
     CFLAGS="$CFLAGS -D__MONTAVISTA__"
     CXXFLAGS="$CXXFLAGS -D__MONTAVISTA__"
   ;;
+  powerpc64-* )
+    enable_visibility="no"
+  ;;
 esac
 
 dnl -------------------------------------------------------------------------
@@ -640,11 +700,13 @@
 echo "  Using libcurl?                                          $using_libcurl"
 echo "  Using libmms?                                           $using_libmms"
 echo "  Using zlib?                                             $with_zlib"
+echo "  Using tinyxml2?                                          $using_libtinyxml2"
 echo ""
 echo "  Create static lib?                                      $enable_static"
 echo "  Create shared lib?                                      $enable_shared"
 echo ""
 Mcho "Minimize size" "$MediaInfoMinimizeSize"
+Mcho "libmms describe support" "$MediaInfoLibmmsDescribeSupport"
 Mcho "All    " "$MediaInfoAll"
 Mcho "Archive" "$MediaInfoArchive"
 Mcho "Audio  " "$MediaInfoAudio"
@@ -658,6 +720,7 @@
 Mcho "Bzip2  " "$MediaInfoBzip2"
 Mcho "Elf    " "$MediaInfoElf"
 Mcho "Gzip   " "$MediaInfoGzip"
+Mcho "ISO9660" "$MediaInfoIso9660"
 Mcho "Mz     " "$MediaInfoMz"
 Mcho "Rar    " "$MediaInfoRar"
 Mcho "Tar    " "$MediaInfoTar"
@@ -673,6 +736,7 @@
 Mcho "Amv    " "$MediaInfoAmv"
 Mcho "Ape    " "$MediaInfoApe"
 Mcho "Au     " "$MediaInfoAu"
+Mcho "Celt   " "$MediaInfoCelt"
 Mcho "Dts    " "$MediaInfoDts"
 Mcho "Flac   " "$MediaInfoFlac"
 Mcho "La     " "$MediaInfoLa"
@@ -683,6 +747,7 @@
 Mcho "Mpega  " "$MediaInfoMpega"
 Mcho "Pcm    " "$MediaInfoPcm"
 Mcho "Ps2a   " "$MediaInfoPs2a"
+Mcho "Rkau   " "$MediaInfoRkau"
 Mcho "Speex  " "$MediaInfoSpeex"
 Mcho "Tak    " "$MediaInfoTak"
 Mcho "Tta    " "$MediaInfoTta"
@@ -690,18 +755,25 @@
 Mcho "Vorbis " "$MediaInfoVorbis"
 Mcho "Wvpk   " "$MediaInfoWvpk"
 Mcho "Bmp    " "$MediaInfoBmp"
+Mcho "Dpx    " "$MediaInfoDpx"
+Mcho "Exr    " "$MediaInfoDpx"
 Mcho "Gif    " "$MediaInfoGif"
 Mcho "Ico    " "$MediaInfoIco"
 Mcho "Jpeg   " "$MediaInfoJpeg"
+Mcho "Pcx    " "$MediaInfoPcx"
 Mcho "Png    " "$MediaInfoPng"
+Mcho "Psd    " "$MediaInfoPsd"
 Mcho "Tiff   " "$MediaInfoTiff"
 Mcho "Bdav   " "$MediaInfoBdav"
 Mcho "Bdmv   " "$MediaInfoBdmv"
 Mcho "Cdxa   " "$MediaInfoCdxa"
+Mcho "Dcp    " "$MediaInfoDcp"
 Mcho "Dpg    " "$MediaInfoDpg"
+Mcho "References" "$References"
 Mcho "DvDif  " "$MediaInfoDvDif"
 Mcho "DvDifAnalyze" "$MediaInfoDvDifAnalyze"
 Mcho "Dvdv   " "$MediaInfoDvdv"
+Mcho "Dxw    " "$MediaInfoFlv"
 Mcho "Flv    " "$MediaInfoFlv"
 Mcho "Mk     " "$MediaInfoMk"
 Mcho "Mpeg4  " "$MediaInfoMpeg4"
@@ -725,17 +797,25 @@
 Mcho "Lyrics3v2" "$MediaInfoLyrics3v2"
 Mcho "VorbisCom" "$MediaInfoVorbisCom"
 Mcho "Cmml   " "$MediaInfoCmml"
+Mcho "DvbSubtitle " "$MediaInfoDvbSubtitle"
 Mcho "Eia608 " "$MediaInfoEia608"
 Mcho "Eia708 " "$MediaInfoEia708"
+Mcho "Teletext " "$MediaInfoTeletext"
 Mcho "Kate   " "$MediaInfoKate"
 Mcho "Pgs    " "$MediaInfoPgs"
+Mcho "Scc    " "$MediaInfoScc"
 Mcho "Avc    " "$MediaInfoAvc"
 Mcho "AvsV   " "$MediaInfoAvsV"
 Mcho "Flic   " "$MediaInfoFlic"
+Mcho "H263   " "$MediaInfoH263"
 Mcho "Mpeg4v " "$MediaInfoMpeg4v"
 Mcho "Mpegv  " "$MediaInfoMpegv"
-Mcho "Mpegv  " "$MediaInfoTheora"
-Mcho "Mpegv  " "$MediaInfoVc1"
+Mcho "ProRes " "$MediaInfoProRes"
+Mcho "Theora " "$MediaInfoTheora"
+Mcho "Vc1    " "$MediaInfoVc1"
+Mcho "Vc3    " "$MediaInfoVc3"
+Mcho "VP8    " "$MediaInfoVp8"
+Mcho "Y4m    " "$MediaInfoY4m"
 echo ""
 echo "  CXXFLAGS: $CXXFLAGS"
 echo "  LDFLAGS: $LDFLAGS"

libmediainfo_0.7.34.tar.bz2/Project/GNU/Library/libmediainfo.pc.in -> libmediainfo_0.7.60.tar.bz2/Project/GNU/Library/libmediainfo.pc.in Changed

libmediainfo_0.7.34.tar.bz2/Project/GNU/libmediainfo.dsc -> libmediainfo_0.7.60.tar.bz2/Project/GNU/libmediainfo.dsc Changed

libmediainfo_0.7.34.tar.bz2/Project/GNU/libmediainfo.spec -> libmediainfo_0.7.60.tar.bz2/Project/GNU/libmediainfo.spec Changed

@@ -1,72 +1,136 @@
-# Copyright (c) 2007-2008 oc2pus
+# Copyright (c) 2007-2012 MediaArea.net SARL <info@mediaarea.net>
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
-#
-# Please submit bugfixes or comments to toni@links2linux.de
 
 # norootforbuild
 
-%define libmediainfo_version	0.7.34
-%define libzen_version			0.4.14
-
-Name:			libmediainfo0
-Version:		%libmediainfo_version
-Release:		1
-Summary:		Supplies technical and tag information about a video or audio file
-Group:			System/Libraries
-License:		GPL
-URL:			http://mediainfo.sourceforge.net/
-Packager:		Jerome Martinez <zen@mediaarea.net>
-Source0:		libmediainfo_%{version}-1.tar.gz
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires:	dos2unix
-BuildRequires: 	gcc-c++
-BuildRequires:	libzen0-devel >= %libzen_version
-BuildRequires:	pkgconfig
-BuildRequires: 	zlib-devel
-BuildRequires:	doxygen
-Requires:		libzen0 >= %libzen_version
+%define libmediainfo_version        0.7.60
+%define libzen_version              0.4.25
+
+Name:           libmediainfo
+Version:        %libmediainfo_version
+Release:        1
+Summary:        Most relevant technical and tag data for video and audio files (Library)
+
+Group:          System/Libraries
+License:        LGPLv3+
+URL:            http://mediainfo.sourceforge.net/
+Packager:       MediaArea.net SARL <info@mediaarea.net>
+Source0:        libmediainfo_%{version}-1.tar.gz
+
+BuildRequires:  dos2unix
+BuildRequires:  gcc-c++
+BuildRequires:  libzen-devel >= %libzen_version
+BuildRequires:  pkgconfig
+BuildRequires:  zlib-devel
+BuildRequires:  glibc-devel
+BuildRequires:  doxygen
+BuildRequires:  libtool
+BuildRequires:  automake
+BuildRequires:  autoconf
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
-MediaInfo supplies technical and tag information about a video or
-audio file.
-
-What information can I get from MediaInfo?
-* General: title, author, director, album, track number, date, duration...
-* Video: codec, aspect, fps, bitrate...
-* Audio: codec, sample rate, channels, language, bitrate...
-* Text: language of subtitle
-* Chapters: number of chapters, list of chapters
-
-DivX, XviD, H263, H.263, H264, x264, ASP, AVC, iTunes, MPEG-1,
-MPEG1, MPEG-2, MPEG2, MPEG-4, MPEG4, MP4, M4A, M4V, QuickTime,
-RealVideo, RealAudio, RA, RM, MSMPEG4v1, MSMPEG4v2, MSMPEG4v3,
-VOB, DVD, WMA, VMW, ASF, 3GP, 3GPP, 3GP2
-
-What format (container) does MediaInfo support?
-* Video: MKV, OGM, AVI, DivX, WMV, QuickTime, Real, MPEG-1,
-  MPEG-2, MPEG-4, DVD (VOB) (Codecs: DivX, XviD, MSMPEG4, ASP,
-  H.264, AVC...)
-* Audio: OGG, MP3, WAV, RA, AC3, DTS, AAC, M4A, AU, AIFF
-* Subtitles: SRT, SSA, ASS, SAMI
+MediaInfo is a convenient unified display of the most relevant technical
+and tag data for video and audio files.
+
+The MediaInfo data display includes:
+ - Container: format, profile, commercial name of the format, duration,
+   overall bit rate, writing application and library, title, author,
+   director, album, track number, date, duration...
+ - Video: format, codec id, aspect, frame rate, bit rate, color space,
+   chroma subsampling, bit depth, scan type, scan order...
+ - Audio: format, codec id, sample rate, channels, bit depth, language,
+   bit rate...
+ - Text: format, codec id, language of subtitle...
+ - Chapters: count of chapters, list of chapters...
+
+MediaInfo analyticals include:
+ - Container: MPEG-4, QuickTime, Matroska, AVI, MPEG-PS (including DVD),
+   MPEG-TS (including Blu-ray), MXF, GXF, LXF, WMV, FLV, Real...
+ - Tags: Id3v1, Id3v2, Vorbis comments, APE tags...
+ - Video: MPEG-1/2 Video, H.263, MPEG-4 Visual (including DivX, XviD),
+   H.264/AVC, Dirac...
+ - Audio: MPEG Audio (including MP3), AC3, DTS, AAC, Dolby E, AES3, FLAC...
+ - Subtitles: CEA-608, CEA-708, DTVCC, SCTE-20, SCTE-128, ATSC/53, CDP, 
+   DVB Subtitle, Teletext, SRT, SSA, ASS, SAMI...
+
+%package -n libmediainfo0
+Summary:        Most relevant technical and tag data for video and audio files (Library)
+Group:          System/Libraries
+Requires:       libzen0 >= %libzen_version
+Requires:       glibc
+
+%description -n libmediainfo0
+MediaInfo is a convenient unified display of the most relevant technical
+and tag data for video and audio files.
+
+The MediaInfo data display includes:
+ - Container: format, profile, commercial name of the format, duration,
+   overall bit rate, writing application and library, title, author,
+   director, album, track number, date, duration...
+ - Video: format, codec id, aspect, frame rate, bit rate, color space,
+   chroma subsampling, bit depth, scan type, scan order...
+ - Audio: format, codec id, sample rate, channels, bit depth, language,
+   bit rate...
+ - Text: format, codec id, language of subtitle...
+ - Chapters: count of chapters, list of chapters...
+
+MediaInfo analyticals include:
+ - Container: MPEG-4, QuickTime, Matroska, AVI, MPEG-PS (including DVD),
+   MPEG-TS (including Blu-ray), MXF, GXF, LXF, WMV, FLV, Real...
+ - Tags: Id3v1, Id3v2, Vorbis comments, APE tags...
+ - Video: MPEG-1/2 Video, H.263, MPEG-4 Visual (including DivX, XviD),
+   H.264/AVC, Dirac...
+ - Audio: MPEG Audio (including MP3), AC3, DTS, AAC, Dolby E, AES3, FLAC...
+ - Subtitles: CEA-608, CEA-708, DTVCC, SCTE-20, SCTE-128, ATSC/53, CDP, 
+   DVB Subtitle, Teletext, SRT, SSA, ASS, SAMI...
 
 This package contains the shared library for MediaInfo.
 
-%package -n libmediainfo0-devel
-Summary:	Include files and mandatory libraries for development
-Group:		Development/Libraries/C and C++
-Requires:	libmediainfo0 = %{version}
-Requires:	libzen0-devel >= %libzen_version
-
-%description -n libmediainfo0-devel
-Include files and mandatory libraries for development.
+%package -n libmediainfo-devel
+Summary:        Most relevant technical and tag data for video and audio files (Library devel)
+Group:          Development/Libraries/C and C++
+Requires:       libmediainfo0%{?_isa} = %{version}
+Requires:       libzen-devel%{?_isa} >= %libzen_version
+Requires:       glibc-devel
+Obsoletes:      libmediainfo0-devel
+
+%description -n libmediainfo-devel
+MediaInfo is a convenient unified display of the most relevant technical
+and tag data for video and audio files.
+
+The MediaInfo data display includes:
+ - Container: format, profile, commercial name of the format, duration,
+   overall bit rate, writing application and library, title, author,
+   director, album, track number, date, duration...
+ - Video: format, codec id, aspect, frame rate, bit rate, color space,
+   chroma subsampling, bit depth, scan type, scan order...
+ - Audio: format, codec id, sample rate, channels, bit depth, language,
+   bit rate...
+ - Text: format, codec id, language of subtitle...
+ - Chapters: count of chapters, list of chapters...
+
+MediaInfo analyticals include:
+ - Container: MPEG-4, QuickTime, Matroska, AVI, MPEG-PS (including DVD),
+   MPEG-TS (including Blu-ray), MXF, GXF, LXF, WMV, FLV, Real...
+ - Tags: Id3v1, Id3v2, Vorbis comments, APE tags...
+ - Video: MPEG-1/2 Video, H.263, MPEG-4 Visual (including DivX, XviD),
+   H.264/AVC, Dirac...
+ - Audio: MPEG Audio (including MP3), AC3, DTS, AAC, Dolby E, AES3, FLAC...
+ - Subtitles: CEA-608, CEA-708, DTVCC, SCTE-20, SCTE-128, ATSC/53, CDP, 
+   DVB Subtitle, Teletext, SRT, SSA, ASS, SAMI...
+
+This package contains the development support files needed for compiling
+and linking applications and libraries which use MediaInfo shared library.
 
 %prep
 %setup -q -n MediaInfoLib
 cp           Release/ReadMe_DLL_Linux.txt ReadMe.txt
 mv           History_DLL.txt History.txt
-dos2unix     *.txt *.html Source/Doc/*.html
-%__chmod 644 *.txt *.html Source/Doc/*.html
+dos2unix     *.txt *.html Source/Doc/*.html Source/Example/*.*
+%__chmod 644 *.txt *.html Source/Doc/*.html Source/Example/*.*
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -74,26 +138,25 @@
 export CXXFLAGS="$RPM_OPT_FLAGS"
 
 pushd Source/Doc/
-	doxygen Doxyfile
+    doxygen Doxyfile
 popd
 cp Source/Doc/*.html ./
 
 pushd Project/GNU/Library
-	%__chmod +x autogen
-	./autogen
-	%configure --enable-shared --disable-libcurl --disable-libmms \
+    %__chmod +x autogen
+    ./autogen
+    %configure --disable-static --enable-shared --disable-libcurl --disable-libmms \
 %if ( 0%{?centos_version} && 0%{?centos_version} < 500 ) || ( 0%{?rhel_version} && 0%{?rhel_version} < 500 )  
 %else
         --enable-visibility
 %endif
 
-	%__make clean
-	%__make %{?jobs:-j%{jobs}}
+    %__make %{?_smp_mflags}
 popd
 
 %install
 pushd Project/GNU/Library/
-	%__make install-strip DESTDIR=%{buildroot}
+    %__make install-strip DESTDIR=%{buildroot}
 popd
 
 # MediaInfoDLL headers and MediaInfo-config
@@ -111,11 +174,11 @@
 %__install -m 644 Source/MediaInfoDLL/MediaInfoDLL.py %{buildroot}%{_includedir}/MediaInfoDLL
 %__install -m 644 Source/MediaInfoDLL/MediaInfoDLL3.py %{buildroot}%{_includedir}/MediaInfoDLL
 
-%__sed -i -e 's|Version: |Version: %{version}|g' \
-	Project/GNU/Library/libmediainfo.pc
+%__sed -i -e 's|Version: |Version: %{version}|g' Project/GNU/Library/libmediainfo.pc
 %__install -dm 755 %{buildroot}%{_libdir}/pkgconfig
-%__install -m 644 Project/GNU/Library/libmediainfo.pc \
-	%{buildroot}%{_libdir}/pkgconfig
+%__install -m 644 Project/GNU/Library/libmediainfo.pc %{buildroot}%{_libdir}/pkgconfig
+
+rm -f %{buildroot}%{_libdir}/%{name}.*a
 
 %clean
 [ -d "%{buildroot}" -a "%{buildroot}" != "" ] && %__rm -rf "%{buildroot}"
@@ -124,24 +187,22 @@
 
 %postun -n libmediainfo0 -p /sbin/ldconfig
 
-%files
+%files -n libmediainfo0
 %defattr(-,root,root,-)
 %doc History.txt License.html ReadMe.txt
 %{_libdir}/libmediainfo.so.*
 
-%files -n libmediainfo0-devel
+%files -n libmediainfo-devel
 %defattr(-,root,root,-)
 %doc Changes.txt Documentation.html Doc Source/Example
 %dir %{_includedir}/MediaInfo
 %{_includedir}/MediaInfo/*
 %dir %{_includedir}/MediaInfoDLL
 %{_includedir}/MediaInfoDLL/*
-%{_libdir}/libmediainfo.a
-%{_libdir}/libmediainfo.la
 %{_libdir}/libmediainfo.so
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Tue Jan 01 2009 Jerome Martinez <zen@mediaarea.net> - 0.7.34-0
+* Tue Jan 01 2012 MediaArea.net SARL <info@mediaarea.net> - 0.7.60-0
 - See History.txt for more info and real dates
 - Previous packages made by Toni Graffy <toni@links2linux.de>

libmediainfo_0.7.34.tar.bz2/Project/Java/Example.JNA/ReadMe.txt -> libmediainfo_0.7.60.tar.bz2/Project/Java/Example.JNA/ReadMe.txt Changed

libmediainfo_0.7.60.tar.bz2/Project/MSCS2008 Added

libmediainfo_0.7.60.tar.bz2/Project/MSCS2008/Example Added

libmediainfo_0.7.60.tar.bz2/Project/MSCS2008/Example/App.ico Changed

libmediainfo_0.7.60.tar.bz2/Project/MSCS2008/Example/AssemblyInfo.cs Added

@@ -0,0 +1,58 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+//
+// Les informations générales relatives à un assembly dépendent de
+// l'ensemble d'attributs suivant. Pour modifier les informations
+// associées à un assembly, changez les valeurs de ces attributs.
+//
+[assembly: AssemblyTitle("")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+//
+// Les informations de version pour un assembly se composent des quatre valeurs suivantes :
+//
+//      Version principale
+//      Version secondaire
+//      Numéro de build
+//      Révision
+//
+// Vous pouvez spécifier toutes les valeurs ou indiquer des numéros de révision et de build par défaut
+// en utilisant '*', comme ci-dessous :
+
+[assembly: AssemblyVersion("1.0.*")]
+
+//
+// Pour signer votre assembly, vous devez spécifier la clé à utiliser. Consultez
+// la documentation Microsoft .NET Framework pour plus d'informations sur la signature d'un assembly.
+//
+// Utilisez les attributs ci-dessous pour contrôler la clé utilisée lors de la signature.
+//
+// Remarques :
+//   (*) Si aucune clé n'est spécifiée, l'assembly n'est pas signé.
+//   (*) KeyName fait référence à une clé installée dans le fournisseur de
+//       services cryptographiques (CSP) de votre ordinateur. KeyFile fait référence à un fichier qui contient
+//       une clé.
+//   (*) Si les valeurs de KeyFile et de KeyName sont spécifiées, le
+//       traitement suivant se produit :
+//       (1) Si KeyName se trouve dans le CSP, la clé est utilisée.
+//       (2) Si KeyName n'existe pas mais que KeyFile existe, la clé
+//           de KeyFile est installée dans le CSP et utilisée.
+//   (*) Pour créer KeyFile, vous pouvez utiliser l'utilitaire sn.exe (Strong Name, Nom fort).
+//        Lors de la spécification de KeyFile, son emplacement doit être
+//        relatif au répertoire de sortie du projet qui est
+//       %Project Directory%\obj\<configuration>. Par exemple, si votre KeyFile se trouve
+//       dans le répertoire du projet, vous devez spécifier l'attribut
+//       AssemblyKeyFile sous la forme [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
+//   (*) DelaySign (signature différée) est une option avancée. Pour plus d'informations, consultez la
+//       documentation Microsoft .NET Framework.
+//
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
+[assembly: AssemblyKeyName("")]

libmediainfo_0.7.60.tar.bz2/Project/MSCS2008/Example/HowToUse_Dll.cs Added

@@ -0,0 +1,233 @@
+// MediaInfoDLL - All info about media files
+// This software is provided 'as-is', without any express or implied
+// warranty.  In no event will the authors be held liable for any damages
+// arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it
+// freely, subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented; you must not
+//    claim that you wrote the original software. If you use this software
+//    in a product, an acknowledgment in the product documentation would be
+//    appreciated but is not required.
+// 2. Altered source versions must be plainly marked as such, and must not be
+//    misrepresented as being the original software.
+// 3. This notice may not be removed or altered from any source distribution.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Microsoft Visual C# example
+//
+// To make this example working, you must put MediaInfo.Dll and Example.ogg
+// in the "./Bin/__ConfigurationName__" folder
+// and add MediaInfoDll.cs to your project
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+using System;
+using System.Drawing;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+using System.Data;
+using System.Text;
+using System.IO;
+using MediaInfoLib;
+
+namespace MediaInfoLib_MSCS
+{
+    /// <summary>
+    /// Summary description for Form1.
+    /// </summary>
+    public class Form1 : System.Windows.Forms.Form
+    {
+        private System.Windows.Forms.RichTextBox richTextBox1;
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.Container components = null;
+
+        public Form1()
+        {
+            //
+            // Required for Windows Form Designer support
+            //
+            InitializeComponent();
+
+            //
+            // TODO: Add any constructor code after InitializeComponent call
+            //
+        }
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        protected override void Dispose( bool disposing )
+        {
+            if( disposing )
+            {
+                if (components != null)
+                {
+                    components.Dispose();
+                }
+            }
+            base.Dispose( disposing );
+        }
+
+        #region Windows Form Designer generated code
+        /// <summary>
+        /// Méthode requise pour la prise en charge du concepteur - ne modifiez pas
+        /// le contenu de cette méthode avec l'éditeur de code.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.richTextBox1 = new System.Windows.Forms.RichTextBox();
+            this.SuspendLayout();
+            //
+            // richTextBox1
+            //
+            this.richTextBox1.Location = new System.Drawing.Point(0, 0);
+            this.richTextBox1.Name = "richTextBox1";
+            this.richTextBox1.Size = new System.Drawing.Size(768, 512);
+            this.richTextBox1.TabIndex = 0;
+            this.richTextBox1.Text = "";
+            //
+            // Form1
+            //
+            this.ClientSize = new System.Drawing.Size(770, 514);
+            this.Controls.Add(this.richTextBox1);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
+            this.Name = "Form1";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.Text = "How to use MediaInfo.Dll";
+            this.Load += new System.EventHandler(this.Form1_Load);
+            this.ResumeLayout(false);
+
+        }
+        #endregion
+
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+
+
+        [STAThread]
+        static void Main()
+        {
+            Application.Run(new Form1());
+        }
+
+        private void Form1_Load(object sender, System.EventArgs e)
+        {
+            //Test if version of DLL is compatible : 3rd argument is "version of DLL tested;Your application name;Your application version"
+            String ToDisplay;
+            MediaInfo MI = new MediaInfo();
+
+            ToDisplay = MI.Option("Info_Version", "0.7.0.0;MediaInfoDLL_Example_CS;0.7.0.0");
+            if (ToDisplay.Length == 0)
+            {
+                richTextBox1.Text = "MediaInfo.Dll: this version of the DLL is not compatible";
+                return;
+            }
+
+            //Information about MediaInfo
+            ToDisplay += "\r\n\r\nInfo_Parameters\r\n";
+            ToDisplay += MI.Option("Info_Parameters");
+
+            ToDisplay += "\r\n\r\nInfo_Capacities\r\n";
+            ToDisplay += MI.Option("Info_Capacities");
+
+            ToDisplay += "\r\n\r\nInfo_Codecs\r\n";
+            ToDisplay += MI.Option("Info_Codecs");
+
+            //An example of how to use the library
+            ToDisplay += "\r\n\r\nOpen\r\n";
+            MI.Open("Example.ogg");
+
+            ToDisplay += "\r\n\r\nInform with Complete=false\r\n";
+            MI.Option("Complete");
+            ToDisplay += MI.Inform();
+
+            ToDisplay += "\r\n\r\nInform with Complete=true\r\n";
+            MI.Option("Complete", "1");
+            ToDisplay += MI.Inform();
+
+            ToDisplay += "\r\n\r\nCustom Inform\r\n";
+            MI.Option("Inform", "General;File size is %FileSize% bytes");
+            ToDisplay += MI.Inform();
+
+            ToDisplay += "\r\n\r\nGet with Stream=General and Parameter='FileSize'\r\n";
+            ToDisplay += MI.Get(0, 0, "FileSize");
+
+            ToDisplay += "\r\n\r\nGet with Stream=General and Parameter=46\r\n";
+            ToDisplay += MI.Get(0, 0, 46);
+
+            ToDisplay += "\r\n\r\nCount_Get with StreamKind=Stream_Audio\r\n";
+            ToDisplay += MI.Count_Get(StreamKind.Audio);
+
+            ToDisplay += "\r\n\r\nGet with Stream=General and Parameter='AudioCount'\r\n";
+            ToDisplay += MI.Get(StreamKind.General, 0, "AudioCount");
+
+            ToDisplay += "\r\n\r\nGet with Stream=Audio and Parameter='StreamCount'\r\n";
+            ToDisplay += MI.Get(StreamKind.Audio, 0, "StreamCount");
+
+            ToDisplay += "\r\n\r\nClose\r\n";
+            MI.Close();
+
+            //Example with a stream
+            //ToDisplay+="\r\n"+ExampleWithStream()+"\r\n";
+
+            //Displaying the text
+            richTextBox1.Text = ToDisplay;
+        }
+
+        String ExampleWithStream()
+        {
+            //Initilaizing MediaInfo
+            MediaInfo MI = new MediaInfo();
+
+            //From: preparing an example file for reading
+            FileStream From = new FileStream("Example.ogg", FileMode.Open, FileAccess.Read);
+
+            //From: preparing a memory buffer for reading
+            byte[] From_Buffer = new byte[64*1024];
+            int    From_Buffer_Size; //The size of the read file buffer
+
+            //Preparing to fill MediaInfo with a buffer
+            MI.Open_Buffer_Init(From.Length, 0);
+
+            //The parsing loop
+            do
+            {
+                //Reading data somewhere, do what you want for this.
+                From_Buffer_Size=From.Read(From_Buffer, 0, 64*1024);
+
+                //Sending the buffer to MediaInfo
+                System.Runtime.InteropServices.GCHandle GC = System.Runtime.InteropServices.GCHandle.Alloc(From_Buffer, System.Runtime.InteropServices.GCHandleType.Pinned);
+                IntPtr From_Buffer_IntPtr = GC.AddrOfPinnedObject();
+                if (MI.Open_Buffer_Continue(From_Buffer_IntPtr, (IntPtr)From_Buffer_Size) == 0) //Note: How to provide a buffer[]?
+                {
+                    GC.Free();
+                    break;
+                }
+                GC.Free();
+
+                //Testing if MediaInfo request to go elsewhere
+                if (MI.Open_Buffer_Continue_GoTo_Get()!=-1)
+                {
+                    Int64 Position=From.Seek(MI.Open_Buffer_Continue_GoTo_Get(), SeekOrigin.Begin); //Position the file
+                    MI.Open_Buffer_Init(From.Length, Position); //Informing MediaInfo we have seek
+                }
+            }
+            while (From_Buffer_Size>0);
+
+            //Finalizing
+            MI.Open_Buffer_Finalize(); //This is the end of the stream, MediaInfo must finnish some work
+
+            //Get() example
+            return MI.Get(StreamKind.General, 0, "Format");
+        }
+    }
+}

libmediainfo_0.7.60.tar.bz2/Project/MSCS2008/Example/HowToUse_Dll.csproj Changed

libmediainfo_0.7.60.tar.bz2/Project/MSCS2008/Example/MediaInfoDLL.cs Added

@@ -0,0 +1,291 @@
+// MediaInfoDLL - All info about media files, for DLL
+// Copyright (C) 2002-2009 Jerome Martinez, Zen@MediaArea.net
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// MediaInfoDLL - All info about media files, for DLL
+// Copyright (C) 2002-2009 Jerome Martinez, Zen@MediaArea.net
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Microsoft Visual C# wrapper for MediaInfo Library
+// See MediaInfo.h for help
+//
+// To make it working, you must put MediaInfo.Dll
+// in the executable folder
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace MediaInfoLib
+{
+    public enum StreamKind
+    {
+        General,
+        Video,
+        Audio,
+        Text,
+        Chapters,
+        Image
+    }
+
+    public enum InfoKind
+    {
+        Name,
+        Text,
+        Measure,
+        Options,
+        NameText,
+        MeasureText,
+        Info,
+        HowTo
+    }
+
+    public enum InfoOptions
+    {
+        ShowInInform,
+        Support,
+        ShowInSupported,
+        TypeOfValue
+    }
+
+    public enum InfoFileOptions
+    {
+        FileOption_Nothing      = 0x00,
+        FileOption_NoRecursive  = 0x01,
+        FileOption_CloseAll     = 0x02,
+        FileOption_Max          = 0x04
+    };
+
+
+    public class MediaInfo
+    {
+        //Import of DLL functions. DO NOT USE until you know what you do (MediaInfo DLL do NOT use CoTaskMemAlloc to allocate memory)
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfo_New();
+        [DllImport("MediaInfo.dll")]
+        private static extern void   MediaInfo_Delete(IntPtr Handle);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfo_Open(IntPtr Handle, [MarshalAs(UnmanagedType.LPWStr)] string FileName);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoA_Open(IntPtr Handle, IntPtr FileName);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfo_Open_Buffer_Init(IntPtr Handle, Int64 File_Size, Int64 File_Offset);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoA_Open(IntPtr Handle, Int64 File_Size, Int64 File_Offset);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfo_Open_Buffer_Continue(IntPtr Handle, IntPtr Buffer, IntPtr Buffer_Size);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoA_Open_Buffer_Continue(IntPtr Handle, Int64 File_Size, byte[] Buffer, IntPtr Buffer_Size);
+        [DllImport("MediaInfo.dll")]
+        private static extern Int64  MediaInfo_Open_Buffer_Continue_GoTo_Get(IntPtr Handle);
+        [DllImport("MediaInfo.dll")]
+        private static extern Int64  MediaInfoA_Open_Buffer_Continue_GoTo_Get(IntPtr Handle);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfo_Open_Buffer_Finalize(IntPtr Handle);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoA_Open_Buffer_Finalize(IntPtr Handle);
+        [DllImport("MediaInfo.dll")]
+        private static extern void   MediaInfo_Close(IntPtr Handle);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfo_Inform(IntPtr Handle, IntPtr Reserved);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoA_Inform(IntPtr Handle, IntPtr Reserved);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfo_GetI(IntPtr Handle, IntPtr StreamKind, IntPtr StreamNumber, IntPtr Parameter, IntPtr KindOfInfo);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoA_GetI(IntPtr Handle, IntPtr StreamKind, IntPtr StreamNumber, IntPtr Parameter, IntPtr KindOfInfo);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfo_Get(IntPtr Handle, IntPtr StreamKind, IntPtr StreamNumber, [MarshalAs(UnmanagedType.LPWStr)] string Parameter, IntPtr KindOfInfo, IntPtr KindOfSearch);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoA_Get(IntPtr Handle, IntPtr StreamKind, IntPtr StreamNumber, IntPtr Parameter, IntPtr KindOfInfo, IntPtr KindOfSearch);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfo_Option(IntPtr Handle, [MarshalAs(UnmanagedType.LPWStr)] string Option, [MarshalAs(UnmanagedType.LPWStr)] string Value);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoA_Option(IntPtr Handle, IntPtr Option,  IntPtr Value);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfo_State_Get(IntPtr Handle);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfo_Count_Get(IntPtr Handle, IntPtr StreamKind, IntPtr StreamNumber);
+
+        //MediaInfo class
+        public MediaInfo()
+        {
+            Handle = MediaInfo_New();
+            if (Environment.OSVersion.ToString().IndexOf("Windows")==-1)
+                MustUseAnsi=true;
+            else
+                MustUseAnsi=false;
+        }
+        ~MediaInfo() { MediaInfo_Delete(Handle); }
+        public int Open(String FileName)
+        {
+            if (MustUseAnsi)
+            {
+                IntPtr FileName_Ptr = Marshal.StringToHGlobalAnsi(FileName);
+                int ToReturn = (int)MediaInfoA_Open(Handle, FileName_Ptr);
+                Marshal.FreeHGlobal(FileName_Ptr);
+                return ToReturn;
+            }
+            else
+                return (int)MediaInfo_Open(Handle, FileName);
+        }
+        public int Open_Buffer_Init(Int64 File_Size, Int64 File_Offset)
+        {
+            return (int)MediaInfo_Open_Buffer_Init(Handle, File_Size, File_Offset);
+        }
+        public int Open_Buffer_Continue(IntPtr Buffer, IntPtr Buffer_Size)
+        {
+            return (int)MediaInfo_Open_Buffer_Continue(Handle, Buffer, Buffer_Size);
+        }
+        public Int64 Open_Buffer_Continue_GoTo_Get()
+        {
+            return (int)MediaInfo_Open_Buffer_Continue_GoTo_Get(Handle);
+        }
+        public int Open_Buffer_Finalize()
+        {
+            return (int)MediaInfo_Open_Buffer_Finalize(Handle);
+        }
+        public void Close() { MediaInfo_Close(Handle); }
+        public String Inform()
+        {
+            if (MustUseAnsi)
+                return Marshal.PtrToStringAnsi(MediaInfoA_Inform(Handle, (IntPtr)0));
+            else
+                return Marshal.PtrToStringUni(MediaInfo_Inform(Handle, (IntPtr)0));
+        }
+        public String Get(StreamKind StreamKind, int StreamNumber, String Parameter, InfoKind KindOfInfo, InfoKind KindOfSearch)
+        {
+            if (MustUseAnsi)
+            {
+                IntPtr Parameter_Ptr=Marshal.StringToHGlobalAnsi(Parameter);
+                String ToReturn=Marshal.PtrToStringAnsi(MediaInfoA_Get(Handle, (IntPtr)StreamKind, (IntPtr)StreamNumber, Parameter_Ptr, (IntPtr)KindOfInfo, (IntPtr)KindOfSearch));
+                Marshal.FreeHGlobal(Parameter_Ptr);
+                return ToReturn;
+            }
+            else
+                return Marshal.PtrToStringUni(MediaInfo_Get(Handle, (IntPtr)StreamKind, (IntPtr)StreamNumber, Parameter, (IntPtr)KindOfInfo, (IntPtr)KindOfSearch));
+        }
+        public String Get(StreamKind StreamKind, int StreamNumber, int Parameter, InfoKind KindOfInfo)
+        {
+            if (MustUseAnsi)
+                return Marshal.PtrToStringAnsi(MediaInfoA_GetI(Handle, (IntPtr)StreamKind, (IntPtr)StreamNumber, (IntPtr)Parameter, (IntPtr)KindOfInfo));
+            else
+                return Marshal.PtrToStringUni(MediaInfo_GetI(Handle, (IntPtr)StreamKind, (IntPtr)StreamNumber, (IntPtr)Parameter, (IntPtr)KindOfInfo));
+        }
+        public String Option(String Option, String Value)
+        {
+            if (MustUseAnsi)
+            {
+                IntPtr Option_Ptr=Marshal.StringToHGlobalAnsi(Option);
+                IntPtr Value_Ptr=Marshal.StringToHGlobalAnsi(Value);
+                String ToReturn=Marshal.PtrToStringAnsi(MediaInfoA_Option(Handle, Option_Ptr, Value_Ptr));
+                Marshal.FreeHGlobal(Option_Ptr);
+                Marshal.FreeHGlobal(Value_Ptr);
+                return ToReturn;
+            }
+            else
+                return Marshal.PtrToStringUni(MediaInfo_Option(Handle, Option, Value));
+        }
+        public int State_Get() { return (int)MediaInfo_State_Get(Handle); }
+        public int Count_Get(StreamKind StreamKind, int StreamNumber) { return (int)MediaInfo_Count_Get(Handle, (IntPtr)StreamKind, (IntPtr)StreamNumber); }
+        private IntPtr Handle;
+        private bool MustUseAnsi;
+
+        //Default values, if you know how to set default values in C#, say me
+        public String Get(StreamKind StreamKind, int StreamNumber, String Parameter, InfoKind KindOfInfo) { return Get(StreamKind, StreamNumber, Parameter, KindOfInfo, InfoKind.Name); }
+        public String Get(StreamKind StreamKind, int StreamNumber, String Parameter) { return Get(StreamKind, StreamNumber, Parameter, InfoKind.Text, InfoKind.Name); }
+        public String Get(StreamKind StreamKind, int StreamNumber, int Parameter) { return Get(StreamKind, StreamNumber, Parameter, InfoKind.Text); }
+        public String Option(String Option_) { return Option(Option_, ""); }
+        public int Count_Get(StreamKind StreamKind) { return Count_Get(StreamKind, -1); }
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public class MediaInfoList
+    {
+        //Import of DLL functions. DO NOT USE until you know what you do (MediaInfo DLL do NOT use CoTaskMemAlloc to allocate memory)
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoList_New();
+        [DllImport("MediaInfo.dll")]
+        private static extern void MediaInfoList_Delete(IntPtr Handle);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoList_Open(IntPtr Handle, [MarshalAs(UnmanagedType.LPWStr)] string FileName, IntPtr Options);
+        [DllImport("MediaInfo.dll")]
+        private static extern void MediaInfoList_Close(IntPtr Handle, IntPtr FilePos);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoList_Inform(IntPtr Handle, IntPtr FilePos, IntPtr Reserved);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoList_GetI(IntPtr Handle, IntPtr FilePos, IntPtr StreamKind, IntPtr StreamNumber, IntPtr Parameter, IntPtr KindOfInfo);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoList_Get(IntPtr Handle, IntPtr FilePos, IntPtr StreamKind, IntPtr StreamNumber, [MarshalAs(UnmanagedType.LPWStr)] string Parameter, IntPtr KindOfInfo, IntPtr KindOfSearch);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoList_Option(IntPtr Handle, [MarshalAs(UnmanagedType.LPWStr)] string Option, [MarshalAs(UnmanagedType.LPWStr)] string Value);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoList_State_Get(IntPtr Handle);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoList_Count_Get(IntPtr Handle, IntPtr FilePos, IntPtr StreamKind, IntPtr StreamNumber);
+
+        //MediaInfo class
+        public MediaInfoList() { Handle = MediaInfoList_New(); }
+        ~MediaInfoList() { MediaInfoList_Delete(Handle); }
+        public int Open(String FileName, InfoFileOptions Options) { return (int)MediaInfoList_Open(Handle, FileName, (IntPtr)Options); }
+        public void Close(int FilePos) { MediaInfoList_Close(Handle, (IntPtr)FilePos); }
+        public String Inform(int FilePos) { return Marshal.PtrToStringUni(MediaInfoList_Inform(Handle, (IntPtr)FilePos, (IntPtr)0)); }
+        public String Get(int FilePos, StreamKind StreamKind, int StreamNumber, String Parameter, InfoKind KindOfInfo, InfoKind KindOfSearch) { return Marshal.PtrToStringUni(MediaInfoList_Get(Handle, (IntPtr)FilePos, (IntPtr)StreamKind, (IntPtr)StreamNumber, Parameter, (IntPtr)KindOfInfo, (IntPtr)KindOfSearch)); }
+        public String Get(int FilePos, StreamKind StreamKind, int StreamNumber, int Parameter, InfoKind KindOfInfo) { return Marshal.PtrToStringUni(MediaInfoList_GetI(Handle, (IntPtr)FilePos, (IntPtr)StreamKind, (IntPtr)StreamNumber, (IntPtr)Parameter, (IntPtr)KindOfInfo)); }
+        public String Option(String Option, String Value) { return Marshal.PtrToStringUni(MediaInfoList_Option(Handle, Option, Value)); }
+        public int State_Get() { return (int)MediaInfoList_State_Get(Handle); }
+        public int Count_Get(int FilePos, StreamKind StreamKind, int StreamNumber) { return (int)MediaInfoList_Count_Get(Handle, (IntPtr)FilePos, (IntPtr)StreamKind, (IntPtr)StreamNumber); }
+        private IntPtr Handle;
+
+        //Default values, if you know how to set default values in C#, say me
+        public void Open(String FileName) { Open(FileName, 0); }
+        public void Close() { Close(-1); }
+        public String Get(int FilePos, StreamKind StreamKind, int StreamNumber, String Parameter, InfoKind KindOfInfo) { return Get(FilePos, StreamKind, StreamNumber, Parameter, KindOfInfo, InfoKind.Name); }
+        public String Get(int FilePos, StreamKind StreamKind, int StreamNumber, String Parameter) { return Get(FilePos, StreamKind, StreamNumber, Parameter, InfoKind.Text, InfoKind.Name); }
+        public String Get(int FilePos, StreamKind StreamKind, int StreamNumber, int Parameter) { return Get(FilePos, StreamKind, StreamNumber, Parameter, InfoKind.Text); }
+        public String Option(String Option_) { return Option(Option_, ""); }
+        public int Count_Get(int FilePos, StreamKind StreamKind) { return Count_Get(FilePos, StreamKind, -1); }
+    }
+
+} //NameSpace

libmediainfo_0.7.60.tar.bz2/Project/MSCS2008/MediaInfoLib_MSCS.sln Changed

libmediainfo_0.7.60.tar.bz2/Project/MSCS2008/asp_net_web_application Added

libmediainfo_0.7.60.tar.bz2/Project/MSCS2008/asp_net_web_application/Default.aspx.cs Changed

libmediainfo_0.7.60.tar.bz2/Project/MSCS2008/asp_net_web_application/Default.aspx.designer.cs Added

libmediainfo_0.7.60.tar.bz2/Project/MSCS2008/asp_net_web_application/MediaInfoDLL.cs Added

libmediainfo_0.7.60.tar.bz2/Project/MSCS2008/asp_net_web_application/Properties Added

libmediainfo_0.7.60.tar.bz2/Project/MSCS2008/asp_net_web_application/Properties/AssemblyInfo.cs Added

@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("asp_net_web_application")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Zenitram")]
+[assembly: AssemblyProduct("asp_net_web_application")]
+[assembly: AssemblyCopyright("Copyright © Zenitram 2009")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("3d5900ae-111a-45be-96b3-d9e4606ca793")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers
+// by using the '*' as shown below:
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

libmediainfo_0.7.60.tar.bz2/Project/MSCS2008/asp_net_web_application/asp_net_web_application.csproj Changed

libmediainfo_0.7.60.tar.bz2/Project/MSCS2010 Added

libmediainfo_0.7.60.tar.bz2/Project/MSCS2010/Example Added

libmediainfo_0.7.60.tar.bz2/Project/MSCS2010/Example/App.ico Added

libmediainfo_0.7.60.tar.bz2/Project/MSCS2010/Example/AssemblyInfo.cs Added

libmediainfo_0.7.60.tar.bz2/Project/MSCS2010/Example/HowToUse_Dll.cs Added

libmediainfo_0.7.60.tar.bz2/Project/MSCS2010/Example/HowToUse_Dll.csproj Added

@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <ProjectType>Local</ProjectType>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{574FB186-52E8-4EAA-9BC9-815F2B2CA632}</ProjectGuid>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ApplicationIcon>App.ico</ApplicationIcon>
+    <AssemblyKeyContainerName>
+    </AssemblyKeyContainerName>
+    <AssemblyName>HowToUse_Dll</AssemblyName>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+    <DefaultClientScript>JScript</DefaultClientScript>
+    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+    <DefaultTargetSchema>IE50</DefaultTargetSchema>
+    <DelaySign>false</DelaySign>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>HowToUse_Dll</RootNamespace>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <StartupObject>
+    </StartupObject>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>false</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile>
+    </ConfigurationOverrideFile>
+    <DefineConstants>TRACE</DefineConstants>
+    <DocumentationFile>
+    </DocumentationFile>
+    <DebugSymbols>false</DebugSymbols>
+    <FileAlignment>4096</FileAlignment>
+    <NoStdLib>false</NoStdLib>
+    <NoWarn>
+    </NoWarn>
+    <Optimize>true</Optimize>
+    <RegisterForComInterop>false</RegisterForComInterop>
+    <RemoveIntegerChecks>false</RemoveIntegerChecks>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System">
+      <Name>System</Name>
+    </Reference>
+    <Reference Include="System.Data">
+      <Name>System.Data</Name>
+    </Reference>
+    <Reference Include="System.Drawing">
+      <Name>System.Drawing</Name>
+    </Reference>
+    <Reference Include="System.Windows.Forms">
+      <Name>System.Windows.Forms</Name>
+    </Reference>
+    <Reference Include="System.Xml">
+      <Name>System.XML</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="App.ico" />
+    <Compile Include="AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="HowToUse_Dll.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MediaInfoDLL.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>
+    </PreBuildEvent>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+</Project>
\ No newline at end of file

libmediainfo_0.7.60.tar.bz2/Project/MSCS2010/Example/MediaInfoDLL.cs Added

@@ -0,0 +1,308 @@
+// MediaInfoDLL - All info about media files, for DLL
+// Copyright (C) 2002-2009 Jerome Martinez, Zen@MediaArea.net
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// MediaInfoDLL - All info about media files, for DLL
+// Copyright (C) 2002-2009 Jerome Martinez, Zen@MediaArea.net
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Microsoft Visual C# wrapper for MediaInfo Library
+// See MediaInfo.h for help
+//
+// To make it working, you must put MediaInfo.Dll
+// in the executable folder
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace MediaInfoLib
+{
+    public enum StreamKind
+    {
+        General,
+        Video,
+        Audio,
+        Text,
+        Chapters,
+        Image
+    }
+
+    public enum InfoKind
+    {
+        Name,
+        Text,
+        Measure,
+        Options,
+        NameText,
+        MeasureText,
+        Info,
+        HowTo
+    }
+
+    public enum InfoOptions
+    {
+        ShowInInform,
+        Support,
+        ShowInSupported,
+        TypeOfValue
+    }
+
+    public enum InfoFileOptions
+    {
+        FileOption_Nothing      = 0x00,
+        FileOption_NoRecursive  = 0x01,
+        FileOption_CloseAll     = 0x02,
+        FileOption_Max          = 0x04
+    };
+
+
+    public class MediaInfo
+    {
+        //Import of DLL functions. DO NOT USE until you know what you do (MediaInfo DLL do NOT use CoTaskMemAlloc to allocate memory)
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfo_New();
+        [DllImport("MediaInfo.dll")]
+        private static extern void   MediaInfo_Delete(IntPtr Handle);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfo_Open(IntPtr Handle, [MarshalAs(UnmanagedType.LPWStr)] string FileName);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoA_Open(IntPtr Handle, IntPtr FileName);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfo_Open_Buffer_Init(IntPtr Handle, Int64 File_Size, Int64 File_Offset);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoA_Open(IntPtr Handle, Int64 File_Size, Int64 File_Offset);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfo_Open_Buffer_Continue(IntPtr Handle, IntPtr Buffer, IntPtr Buffer_Size);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoA_Open_Buffer_Continue(IntPtr Handle, Int64 File_Size, byte[] Buffer, IntPtr Buffer_Size);
+        [DllImport("MediaInfo.dll")]
+        private static extern Int64  MediaInfo_Open_Buffer_Continue_GoTo_Get(IntPtr Handle);
+        [DllImport("MediaInfo.dll")]
+        private static extern Int64  MediaInfoA_Open_Buffer_Continue_GoTo_Get(IntPtr Handle);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfo_Open_Buffer_Finalize(IntPtr Handle);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoA_Open_Buffer_Finalize(IntPtr Handle);
+        [DllImport("MediaInfo.dll")]
+        private static extern void   MediaInfo_Close(IntPtr Handle);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfo_Inform(IntPtr Handle, IntPtr Reserved);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoA_Inform(IntPtr Handle, IntPtr Reserved);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfo_GetI(IntPtr Handle, IntPtr StreamKind, IntPtr StreamNumber, IntPtr Parameter, IntPtr KindOfInfo);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoA_GetI(IntPtr Handle, IntPtr StreamKind, IntPtr StreamNumber, IntPtr Parameter, IntPtr KindOfInfo);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfo_Get(IntPtr Handle, IntPtr StreamKind, IntPtr StreamNumber, [MarshalAs(UnmanagedType.LPWStr)] string Parameter, IntPtr KindOfInfo, IntPtr KindOfSearch);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoA_Get(IntPtr Handle, IntPtr StreamKind, IntPtr StreamNumber, IntPtr Parameter, IntPtr KindOfInfo, IntPtr KindOfSearch);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfo_Option(IntPtr Handle, [MarshalAs(UnmanagedType.LPWStr)] string Option, [MarshalAs(UnmanagedType.LPWStr)] string Value);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoA_Option(IntPtr Handle, IntPtr Option,  IntPtr Value);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfo_State_Get(IntPtr Handle);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfo_Count_Get(IntPtr Handle, IntPtr StreamKind, IntPtr StreamNumber);
+
+        //MediaInfo class
+        public MediaInfo()
+        {
+            try
+            {
+                Handle = MediaInfo_New();
+            }
+            catch
+            {
+                Handle = (IntPtr)0;
+            }
+            if (Environment.OSVersion.ToString().IndexOf("Windows") == -1)
+                MustUseAnsi=true;
+            else
+                MustUseAnsi=false;
+        }
+        ~MediaInfo() { if (Handle == (IntPtr)0) return; MediaInfo_Delete(Handle); }
+        public int Open(String FileName)
+        {
+            if (Handle == (IntPtr)0)
+                return 0;
+            if (MustUseAnsi)
+            {
+                IntPtr FileName_Ptr = Marshal.StringToHGlobalAnsi(FileName);
+                int ToReturn = (int)MediaInfoA_Open(Handle, FileName_Ptr);
+                Marshal.FreeHGlobal(FileName_Ptr);
+                return ToReturn;
+            }
+            else
+                return (int)MediaInfo_Open(Handle, FileName);
+        }
+        public int Open_Buffer_Init(Int64 File_Size, Int64 File_Offset)
+        {
+            if (Handle == (IntPtr)0) return 0; return (int)MediaInfo_Open_Buffer_Init(Handle, File_Size, File_Offset);
+        }
+        public int Open_Buffer_Continue(IntPtr Buffer, IntPtr Buffer_Size)
+        {
+            if (Handle == (IntPtr)0) return 0; return (int)MediaInfo_Open_Buffer_Continue(Handle, Buffer, Buffer_Size);
+        }
+        public Int64 Open_Buffer_Continue_GoTo_Get()
+        {
+            if (Handle == (IntPtr)0) return 0; return (int)MediaInfo_Open_Buffer_Continue_GoTo_Get(Handle);
+        }
+        public int Open_Buffer_Finalize()
+        {
+            if (Handle == (IntPtr)0) return 0; return (int)MediaInfo_Open_Buffer_Finalize(Handle);
+        }
+        public void Close() { if (Handle == (IntPtr)0) return; MediaInfo_Close(Handle); }
+        public String Inform()
+        {
+            if (Handle == (IntPtr)0)
+                return "Unable to load MediaInfo library";
+            if (MustUseAnsi)
+                return Marshal.PtrToStringAnsi(MediaInfoA_Inform(Handle, (IntPtr)0));
+            else
+                return Marshal.PtrToStringUni(MediaInfo_Inform(Handle, (IntPtr)0));
+        }
+        public String Get(StreamKind StreamKind, int StreamNumber, String Parameter, InfoKind KindOfInfo, InfoKind KindOfSearch)
+        {
+            if (Handle == (IntPtr)0)
+                return "Unable to load MediaInfo library";
+            if (MustUseAnsi)
+            {
+                IntPtr Parameter_Ptr=Marshal.StringToHGlobalAnsi(Parameter);
+                String ToReturn=Marshal.PtrToStringAnsi(MediaInfoA_Get(Handle, (IntPtr)StreamKind, (IntPtr)StreamNumber, Parameter_Ptr, (IntPtr)KindOfInfo, (IntPtr)KindOfSearch));
+                Marshal.FreeHGlobal(Parameter_Ptr);
+                return ToReturn;
+            }
+            else
+                return Marshal.PtrToStringUni(MediaInfo_Get(Handle, (IntPtr)StreamKind, (IntPtr)StreamNumber, Parameter, (IntPtr)KindOfInfo, (IntPtr)KindOfSearch));
+        }
+        public String Get(StreamKind StreamKind, int StreamNumber, int Parameter, InfoKind KindOfInfo)
+        {
+            if (Handle == (IntPtr)0)
+                return "Unable to load MediaInfo library";
+            if (MustUseAnsi)
+                return Marshal.PtrToStringAnsi(MediaInfoA_GetI(Handle, (IntPtr)StreamKind, (IntPtr)StreamNumber, (IntPtr)Parameter, (IntPtr)KindOfInfo));
+            else
+                return Marshal.PtrToStringUni(MediaInfo_GetI(Handle, (IntPtr)StreamKind, (IntPtr)StreamNumber, (IntPtr)Parameter, (IntPtr)KindOfInfo));
+        }
+        public String Option(String Option, String Value)
+        {
+            if (Handle == (IntPtr)0)
+                return "Unable to load MediaInfo library";
+            if (MustUseAnsi)
+            {
+                IntPtr Option_Ptr=Marshal.StringToHGlobalAnsi(Option);
+                IntPtr Value_Ptr=Marshal.StringToHGlobalAnsi(Value);
+                String ToReturn=Marshal.PtrToStringAnsi(MediaInfoA_Option(Handle, Option_Ptr, Value_Ptr));
+                Marshal.FreeHGlobal(Option_Ptr);
+                Marshal.FreeHGlobal(Value_Ptr);
+                return ToReturn;
+            }
+            else
+                return Marshal.PtrToStringUni(MediaInfo_Option(Handle, Option, Value));
+        }
+        public int State_Get() { if (Handle == (IntPtr)0) return 0; return (int)MediaInfo_State_Get(Handle); }
+        public int Count_Get(StreamKind StreamKind, int StreamNumber) { if (Handle == (IntPtr)0) return 0; return (int)MediaInfo_Count_Get(Handle, (IntPtr)StreamKind, (IntPtr)StreamNumber); }
+        private IntPtr Handle;
+        private bool MustUseAnsi;
+
+        //Default values, if you know how to set default values in C#, say me
+        public String Get(StreamKind StreamKind, int StreamNumber, String Parameter, InfoKind KindOfInfo) { return Get(StreamKind, StreamNumber, Parameter, KindOfInfo, InfoKind.Name); }
+        public String Get(StreamKind StreamKind, int StreamNumber, String Parameter) { return Get(StreamKind, StreamNumber, Parameter, InfoKind.Text, InfoKind.Name); }
+        public String Get(StreamKind StreamKind, int StreamNumber, int Parameter) { return Get(StreamKind, StreamNumber, Parameter, InfoKind.Text); }
+        public String Option(String Option_) { return Option(Option_, ""); }
+        public int Count_Get(StreamKind StreamKind) { return Count_Get(StreamKind, -1); }
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    public class MediaInfoList
+    {
+        //Import of DLL functions. DO NOT USE until you know what you do (MediaInfo DLL do NOT use CoTaskMemAlloc to allocate memory)
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoList_New();
+        [DllImport("MediaInfo.dll")]
+        private static extern void MediaInfoList_Delete(IntPtr Handle);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoList_Open(IntPtr Handle, [MarshalAs(UnmanagedType.LPWStr)] string FileName, IntPtr Options);
+        [DllImport("MediaInfo.dll")]
+        private static extern void MediaInfoList_Close(IntPtr Handle, IntPtr FilePos);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoList_Inform(IntPtr Handle, IntPtr FilePos, IntPtr Reserved);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoList_GetI(IntPtr Handle, IntPtr FilePos, IntPtr StreamKind, IntPtr StreamNumber, IntPtr Parameter, IntPtr KindOfInfo);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoList_Get(IntPtr Handle, IntPtr FilePos, IntPtr StreamKind, IntPtr StreamNumber, [MarshalAs(UnmanagedType.LPWStr)] string Parameter, IntPtr KindOfInfo, IntPtr KindOfSearch);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoList_Option(IntPtr Handle, [MarshalAs(UnmanagedType.LPWStr)] string Option, [MarshalAs(UnmanagedType.LPWStr)] string Value);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoList_State_Get(IntPtr Handle);
+        [DllImport("MediaInfo.dll")]
+        private static extern IntPtr MediaInfoList_Count_Get(IntPtr Handle, IntPtr FilePos, IntPtr StreamKind, IntPtr StreamNumber);
+
+        //MediaInfo class
+        public MediaInfoList() { Handle = MediaInfoList_New(); }
+        ~MediaInfoList() { MediaInfoList_Delete(Handle); }
+        public int Open(String FileName, InfoFileOptions Options) { return (int)MediaInfoList_Open(Handle, FileName, (IntPtr)Options); }
+        public void Close(int FilePos) { MediaInfoList_Close(Handle, (IntPtr)FilePos); }
+        public String Inform(int FilePos) { return Marshal.PtrToStringUni(MediaInfoList_Inform(Handle, (IntPtr)FilePos, (IntPtr)0)); }
+        public String Get(int FilePos, StreamKind StreamKind, int StreamNumber, String Parameter, InfoKind KindOfInfo, InfoKind KindOfSearch) { return Marshal.PtrToStringUni(MediaInfoList_Get(Handle, (IntPtr)FilePos, (IntPtr)StreamKind, (IntPtr)StreamNumber, Parameter, (IntPtr)KindOfInfo, (IntPtr)KindOfSearch)); }
+        public String Get(int FilePos, StreamKind StreamKind, int StreamNumber, int Parameter, InfoKind KindOfInfo) { return Marshal.PtrToStringUni(MediaInfoList_GetI(Handle, (IntPtr)FilePos, (IntPtr)StreamKind, (IntPtr)StreamNumber, (IntPtr)Parameter, (IntPtr)KindOfInfo)); }
+        public String Option(String Option, String Value) { return Marshal.PtrToStringUni(MediaInfoList_Option(Handle, Option, Value)); }
+        public int State_Get() { return (int)MediaInfoList_State_Get(Handle); }
+        public int Count_Get(int FilePos, StreamKind StreamKind, int StreamNumber) { return (int)MediaInfoList_Count_Get(Handle, (IntPtr)FilePos, (IntPtr)StreamKind, (IntPtr)StreamNumber); }
+        private IntPtr Handle;
+
+        //Default values, if you know how to set default values in C#, say me
+        public void Open(String FileName) { Open(FileName, 0); }
+        public void Close() { Close(-1); }
+        public String Get(int FilePos, StreamKind StreamKind, int StreamNumber, String Parameter, InfoKind KindOfInfo) { return Get(FilePos, StreamKind, StreamNumber, Parameter, KindOfInfo, InfoKind.Name); }
+        public String Get(int FilePos, StreamKind StreamKind, int StreamNumber, String Parameter) { return Get(FilePos, StreamKind, StreamNumber, Parameter, InfoKind.Text, InfoKind.Name); }
+        public String Get(int FilePos, StreamKind StreamKind, int StreamNumber, int Parameter) { return Get(FilePos, StreamKind, StreamNumber, Parameter, InfoKind.Text); }
+        public String Option(String Option_) { return Option(Option_, ""); }
+        public int Count_Get(int FilePos, StreamKind StreamKind) { return Count_Get(FilePos, StreamKind, -1); }
+    }
+
+} //NameSpace

libmediainfo_0.7.60.tar.bz2/Project/MSCS2010/MediaInfoLib_MSCS.sln Added

@@ -0,0 +1,25 @@
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HowToUse_Dll", "Example\HowToUse_Dll.csproj", "{574FB186-52E8-4EAA-9BC9-815F2B2CA632}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "asp_net_web_application", "asp_net_web_application\asp_net_web_application.csproj", "{7B5EECA2-2BDA-472C-AB04-0C2E3D428908}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{574FB186-52E8-4EAA-9BC9-815F2B2CA632}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{574FB186-52E8-4EAA-9BC9-815F2B2CA632}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{574FB186-52E8-4EAA-9BC9-815F2B2CA632}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{574FB186-52E8-4EAA-9BC9-815F2B2CA632}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7B5EECA2-2BDA-472C-AB04-0C2E3D428908}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B5EECA2-2BDA-472C-AB04-0C2E3D428908}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7B5EECA2-2BDA-472C-AB04-0C2E3D428908}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7B5EECA2-2BDA-472C-AB04-0C2E3D428908}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

libmediainfo_0.7.60.tar.bz2/Project/MSCS2010/asp_net_web_application Added

libmediainfo_0.7.60.tar.bz2/Project/MSCS2010/asp_net_web_application/Default.aspx.cs Added

libmediainfo_0.7.60.tar.bz2/Project/MSCS2010/asp_net_web_application/Default.aspx.designer.cs Added

libmediainfo_0.7.60.tar.bz2/Project/MSCS2010/asp_net_web_application/MediaInfoDLL.cs Added

libmediainfo_0.7.60.tar.bz2/Project/MSCS2010/asp_net_web_application/Properties Added

libmediainfo_0.7.60.tar.bz2/Project/MSCS2010/asp_net_web_application/Properties/AssemblyInfo.cs Added

libmediainfo_0.7.60.tar.bz2/Project/MSCS2010/asp_net_web_application/asp_net_web_application.csproj Added

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{7B5EECA2-2BDA-472C-AB04-0C2E3D428908}</ProjectGuid>
+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>asp_net_web_application</RootNamespace>
+    <AssemblyName>asp_net_web_application</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <TargetFrameworkProfile />
+    <UseIISExpress>false</UseIISExpress>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Web.DynamicData" />
+    <Reference Include="System.Web.Entity" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Web.Services" />
+    <Reference Include="System.EnterpriseServices" />
+    <Reference Include="System.Web.Mobile" />
+    <Reference Include="System.Xml.Linq" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Default.aspx" />
+    <Content Include="Web.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Default.aspx.cs">
+      <SubType>ASPXCodeBehind</SubType>
+      <DependentUpon>Default.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="Default.aspx.designer.cs">
+      <DependentUpon>Default.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="MediaInfoDLL.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="App_Data\" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
+  
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <UseIIS>False</UseIIS>
+          <AutoAssignPort>True</AutoAssignPort>
+          <DevelopmentServerPort>2866</DevelopmentServerPort>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <IISUrl>
+          </IISUrl>
+          <NTLMAuthentication>False</NTLMAuthentication>
+          <UseCustomServer>False</UseCustomServer>
+          <CustomServerUrl>
+          </CustomServerUrl>
+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+        </WebProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+</Project>
\ No newline at end of file

libmediainfo_0.7.34.tar.bz2/Project/MSVB/Example/My Project/Application.Designer.vb -> libmediainfo_0.7.60.tar.bz2/Project/MSVB/Example/My Project/Application.Designer.vb Changed

libmediainfo_0.7.60.tar.bz2/Project/MSVB2010 Added

libmediainfo_0.7.60.tar.bz2/Project/MSVB2010/Example Added

libmediainfo_0.7.60.tar.bz2/Project/MSVB2010/Example/HowToUse_Dll.Designer.vb Added

@@ -0,0 +1,46 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class Form1
+    Inherits System.Windows.Forms.Form
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        If disposing AndAlso components IsNot Nothing Then
+            components.Dispose()
+        End If
+        MyBase.Dispose(disposing)
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.RichTextBox1 = New System.Windows.Forms.RichTextBox
+        Me.SuspendLayout()
+        '
+        'RichTextBox1
+        '
+        Me.RichTextBox1.Location = New System.Drawing.Point(0, 0)
+        Me.RichTextBox1.Name = "RichTextBox1"
+        Me.RichTextBox1.Size = New System.Drawing.Size(740, 515)
+        Me.RichTextBox1.TabIndex = 0
+        Me.RichTextBox1.Text = ""
+        '
+        'Form1
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(742, 516)
+        Me.Controls.Add(Me.RichTextBox1)
+        Me.Name = "Form1"
+        Me.Text = "MediaInfo.Dll example"
+        Me.ResumeLayout(False)
+
+    End Sub
+    Friend WithEvents RichTextBox1 As System.Windows.Forms.RichTextBox
+
+End Class

libmediainfo_0.7.60.tar.bz2/Project/MSVB2010/Example/HowToUse_Dll.resx Added

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file

libmediainfo_0.7.60.tar.bz2/Project/MSVB2010/Example/HowToUse_Dll.vb Added

@@ -0,0 +1,92 @@
+'' MediaInfoDLL - All info about media files
+'' This software is provided 'as-is', without any express or implied
+'' warranty.  In no event will the authors be held liable for any damages
+'' arising from the use of this software.
+''
+'' Permission is granted to anyone to use this software for any purpose,
+'' including commercial applications, and to alter it and redistribute it
+'' freely, subject to the following restrictions:
+''
+'' 1. The origin of this software must not be misrepresented; you must not
+''    claim that you wrote the original software. If you use this software
+''    in a product, an acknowledgment in the product documentation would be
+''    appreciated but is not required.
+'' 2. Altered source versions must be plainly marked as such, and must not be
+''    misrepresented as being the original software.
+'' 3. This notice may not be removed or altered from any source distribution.
+''
+''+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+''+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+''
+'' Microsoft Visual Basic example
+''
+'' To make this example working, you must put MediaInfo.Dll and Example.ogg
+'' in the "./Bin/__ConfigurationName__" folder
+'' and add MediaInfo_Dll.vb to your project
+''
+''+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+Public Class Form1
+
+    Private Sub Form1_Load(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles MyBase.Load
+        Dim To_Display As String
+        Dim Temp As String
+        Dim MI As MediaInfo
+
+        MI = New MediaInfo
+        To_Display = MI.Option_("Info_Version", "0.7.0.0;MediaInfoDLL_Example_MSVB;0.7.0.0")
+
+        If (To_Display.Length() = 0) Then
+            RichTextBox1.Text = "MediaInfo.Dll: this version of the DLL is not compatible"
+            Return
+        End If
+
+        'Information about MediaInfo
+        To_Display += vbCrLf + vbCrLf + "Info_Parameters" + vbCrLf
+        To_Display += MI.Option_("Info_Parameters")
+
+        To_Display += vbCrLf + vbCrLf + "Info_Capacities" + vbCrLf
+        To_Display += MI.Option_("Info_Capacities")
+
+        To_Display += vbCrLf + vbCrLf + "Info_Codecs" + vbCrLf
+        To_Display += MI.Option_("Info_Codecs")
+
+        'An example of how to use the library
+        To_Display += vbCrLf + vbCrLf + "Open" + vbCrLf
+        MI.Open("Example.ogg")
+
+        To_Display += vbCrLf + vbCrLf + "Inform with Complete=false" + vbCrLf
+        MI.Option_("Complete")
+        To_Display += MI.Inform()
+
+        To_Display += vbCrLf + vbCrLf + "Inform with Complete=true" + vbCrLf
+        MI.Option_("Complete", "1")
+        To_Display += MI.Inform()
+
+        To_Display += vbCrLf + vbCrLf + "Custom Inform" + vbCrLf
+        MI.Option_("Inform", "General;Example : FileSize=%FileSize%")
+        To_Display += MI.Inform()
+
+        To_Display += vbCrLf + vbCrLf + "Get with Stream=General and Parameter='FileSize'" + vbCrLf
+        To_Display += MI.Get_(StreamKind.General, 0, "FileSize")
+
+        To_Display += vbCrLf + vbCrLf + "GetI with Stream=General and Parameter=46" + vbCrLf
+        To_Display += MI.Get_(StreamKind.General, 0, 46)
+
+        To_Display += vbCrLf + vbCrLf + "Count_Get with StreamKind=Stream_Audio" + vbCrLf
+        Temp = MI.Count_Get(StreamKind.Audio)
+        To_Display += Temp
+
+        To_Display += vbCrLf + vbCrLf + "Get with Stream=General and Parameter='AudioCount'" + vbCrLf
+        To_Display += MI.Get_(StreamKind.General, 0, "AudioCount")
+
+        To_Display += vbCrLf + vbCrLf + "Get with Stream=Audio and Parameter='StreamCount'" + vbCrLf
+        To_Display += MI.Get_(StreamKind.Audio, 0, "StreamCount")
+
+        To_Display += RichTextBox1.Text + vbCrLf + vbCrLf + "Close" + vbCrLf
+        MI.Close()
+
+        'Displaying the text
+        RichTextBox1.Text = To_Display
+    End Sub
+End Class

libmediainfo_0.7.60.tar.bz2/Project/MSVB2010/Example/HowToUse_Dll.vbproj Added

@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{FE4B9E8D-D358-44F3-8E6C-37BD585A8321}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <StartupObject>HowToUse_Dll.My.MyApplication</StartupObject>
+    <RootNamespace>HowToUse_Dll</RootNamespace>
+    <AssemblyName>HowToUse_Dll</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <MyType>WindowsForms</MyType>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <OptionExplicit>On</OptionExplicit>
+    <OptionCompare>Binary</OptionCompare>
+    <OptionStrict>Off</OptionStrict>
+    <OptionInfer>On</OptionInfer>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DocumentationFile>HowToUse_Dll.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,42353,42354,42355</NoWarn>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <DefineDebug>false</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DocumentationFile>HowToUse_Dll.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022,42353,42354,42355</NoWarn>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Deployment" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Import Include="Microsoft.VisualBasic" />
+    <Import Include="System" />
+    <Import Include="System.Collections" />
+    <Import Include="System.Collections.Generic" />
+    <Import Include="System.Data" />
+    <Import Include="System.Drawing" />
+    <Import Include="System.Diagnostics" />
+    <Import Include="System.Windows.Forms" />
+    <Import Include="System.Linq" />
+    <Import Include="System.Xml.Linq" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="HowToUse_Dll.Designer.vb">
+      <DependentUpon>HowToUse_Dll.vb</DependentUpon>
+    </Compile>
+    <Compile Include="HowToUse_Dll.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="MediaInfoDLL.vb" />
+    <Compile Include="My Project\AssemblyInfo.vb" />
+    <Compile Include="My Project\Application.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Application.myapp</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Resources.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="My Project\Settings.Designer.vb">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="My Project\Resources.resx">
+      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
+      <CustomToolNamespace>My.Resources</CustomToolNamespace>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="My Project\Application.myapp">
+      <Generator>MyApplicationCodeGenerator</Generator>
+      <LastGenOutput>Application.Designer.vb</LastGenOutput>
+    </None>
+    <None Include="My Project\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <CustomToolNamespace>My</CustomToolNamespace>
+      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  
+</Project>
\ No newline at end of file

libmediainfo_0.7.60.tar.bz2/Project/MSVB2010/Example/MediaInfoDLL.vb Added

@@ -0,0 +1,111 @@
+'' MediaInfoDLL - All info about media files, for DLL
+'' Copyright (C) 2002-2009 Jerome Martinez, Zen@MediaArea.net
+''
+'' This library is free software; you can redistribute it and/or
+'' modify it under the terms of the GNU Lesser General Public
+'' License as published by the Free Software Foundation; either
+'' version 2.1 of the License, or (at your option) any later version.
+''
+'' This library is distributed in the hope that it will be useful,
+'' but WITHOUT ANY WARRANTY; without even the implied warranty of
+'' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+'' Lesser General Public License for more details.
+''
+'' You should have received a copy of the GNU Lesser General Public
+'' License along with this library; if not, write to the Free Software
+'' Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+''
+''+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+''+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+''
+'' Microsoft Visual Basic wrapper for MediaInfo Library
+'' See MediaInfo.h for help
+''
+'' To make it working, you must put MediaInfo.Dll
+'' in the executable folder
+''
+''+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+Imports System.Runtime.InteropServices
+
+Public Enum StreamKind As UInteger
+    General
+    Visual
+    Audio
+    Text
+    Chapters
+    Image
+    Menu
+    Max
+End Enum
+
+Public Enum InfoKind As UInteger
+    Name
+    Text
+    Measure
+    Options
+    NameText
+    MeasureText
+    Info
+    HowTo
+    Max
+End Enum
+
+Public Enum InfoOptions As UInteger
+    ShowInInform
+    Reserved
+    ShowInSupported
+    TypeOfValue
+    Max
+End Enum
+
+Public Class MediaInfo
+    Private Declare Unicode Function MediaInfo_New Lib "MediaInfo.DLL" () As IntPtr
+    Private Declare Unicode Sub MediaInfo_Delete Lib "MediaInfo.DLL" (ByVal Handle As IntPtr)
+    Private Declare Unicode Function MediaInfo_Open Lib "MediaInfo.DLL" (ByVal Handle As IntPtr, ByVal FileName As String) As UIntPtr
+    Private Declare Unicode Sub MediaInfo_Close Lib "MediaInfo.DLL" (ByVal Handle As IntPtr)
+    Private Declare Unicode Function MediaInfo_Inform Lib "MediaInfo.DLL" (ByVal Handle As IntPtr, ByVal Reserved As UIntPtr) As IntPtr
+    Private Declare Unicode Function MediaInfo_GetI Lib "MediaInfo.DLL" (ByVal Handle As IntPtr, ByVal StreamKind As UIntPtr, ByVal StreamNumber As UIntPtr, ByVal Parameter As UIntPtr, ByVal KindOfInfo As UIntPtr) As IntPtr 'See MediaInfoDLL.h for enumeration values
+    Private Declare Unicode Function MediaInfo_Get Lib "MediaInfo.DLL" (ByVal Handle As IntPtr, ByVal StreamKind As UIntPtr, ByVal StreamNumber As UIntPtr, ByVal Parameter As String, ByVal KindOfInfo As UIntPtr, ByVal KindOfSearch As UIntPtr) As IntPtr
+    Private Declare Unicode Function MediaInfo_Option Lib "MediaInfo.DLL" (ByVal Handle As IntPtr, ByVal Option_ As String, ByVal Value As String) As IntPtr
+    Private Declare Unicode Function MediaInfo_State_Get Lib "MediaInfo.DLL" (ByVal Handle As IntPtr) As UIntPtr 'see MediaInfo.h for details
+    Private Declare Unicode Function MediaInfo_Count_Get Lib "MediaInfo.DLL" (ByVal Handle As IntPtr, ByVal StreamKind As UIntPtr, ByVal StreamNumber As IntPtr) As UIntPtr 'see MediaInfoDLL.h for enumeration values
+
+    Dim Handle As IntPtr
+
+    Sub New()
+        Handle = MediaInfo_New()
+    End Sub
+    Protected Overrides Sub Finalize()
+        MediaInfo_Delete(Handle)
+    End Sub
+    Function Open(ByVal FileName As String) As System.UIntPtr
+        Return MediaInfo_Open(Handle, FileName)
+    End Function
+    Sub Close()
+        MediaInfo_Close(Handle)
+    End Sub
+    Function Inform() As String
+        Return Marshal.PtrToStringUni(MediaInfo_Inform(Handle, CType(0, UIntPtr)))
+    End Function
+    Function Get_(ByVal StreamKind As StreamKind, ByVal StreamNumber As Integer, ByVal Parameter As Integer, Optional ByVal KindOfInfo As InfoKind = InfoKind.Text) As String
+        Return Marshal.PtrToStringUni(MediaInfo_GetI(Handle, CType(StreamKind, UIntPtr), CType(StreamNumber, UIntPtr), CType(Parameter, UIntPtr), CType(KindOfInfo, UIntPtr)))
+    End Function
+    Function Get_(ByVal StreamKind As StreamKind, ByVal StreamNumber As Integer, ByVal Parameter As String, Optional ByVal KindOfInfo As InfoKind = InfoKind.Text, Optional ByVal KindOfSearch As InfoKind = InfoKind.Name) As String
+        Return Marshal.PtrToStringUni(MediaInfo_Get(Handle, CType(StreamKind, UIntPtr), CType(StreamNumber, UIntPtr), Parameter, CType(KindOfInfo, UIntPtr), CType(KindOfSearch, UIntPtr)))
+    End Function
+    Function Option_(ByVal Option__ As String, Optional ByVal Value As String = "") As String
+        Return Marshal.PtrToStringUni(MediaInfo_Option(Handle, Option__, Value))
+    End Function
+    Function State_Get() As Integer
+        Return CInt(MediaInfo_State_Get(Handle))
+    End Function
+    Function Count_Get(ByVal StreamKind As StreamKind, Optional ByVal StreamNumber As UInteger = UInteger.MaxValue) As Integer
+        If StreamNumber = UInteger.MaxValue Then
+            Return CInt(MediaInfo_Count_Get(Handle, CType(StreamKind, UIntPtr), CType(-1, IntPtr)))
+        Else
+            Return CInt(MediaInfo_Count_Get(Handle, CType(StreamKind, UIntPtr), CType(StreamNumber, IntPtr)))
+        End If
+    End Function
+End Class
+

libmediainfo_0.7.60.tar.bz2/Project/MSVB2010/Example/My Project Added

libmediainfo_0.7.60.tar.bz2/Project/MSVB2010/Example/My Project/Application.Designer.vb Added

@@ -0,0 +1,38 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     This code was generated by a tool.
+'     Runtime Version:4.0.30319.1
+'
+'     Changes to this file may cause incorrect behavior and will be lost if
+'     the code is regenerated.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+
+Namespace My
+    
+    'NOTE: This file is auto-generated; do not modify it directly.  To make changes,
+    ' or if you encounter build errors in this file, go to the Project Designer
+    ' (go to Project Properties or double-click the My Project node in
+    ' Solution Explorer), and make changes on the Application tab.
+    '
+    Partial Friend Class MyApplication
+        
+        <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
+        Public Sub New()
+            MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows)
+            Me.IsSingleInstance = false
+            Me.EnableVisualStyles = true
+            Me.SaveMySettingsOnExit = true
+            Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses
+        End Sub
+        
+        <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
+        Protected Overrides Sub OnCreateMainForm()
+            Me.MainForm = Global.HowToUse_Dll.Form1
+        End Sub
+    End Class
+End Namespace

libmediainfo_0.7.60.tar.bz2/Project/MSVB2010/Example/My Project/AssemblyInfo.vb Added

@@ -0,0 +1,35 @@
+Imports System
+Imports System.Reflection
+Imports System.Runtime.InteropServices
+
+' General Information about an assembly is controlled through the following 
+' set of attributes. Change these attribute values to modify the information
+' associated with an assembly.
+
+' Review the values of the assembly attributes
+
+<Assembly: AssemblyTitle("HowToUse_Dll")> 
+<Assembly: AssemblyDescription("")> 
+<Assembly: AssemblyCompany("Zenitram")> 
+<Assembly: AssemblyProduct("HowToUse_Dll")> 
+<Assembly: AssemblyCopyright("Copyright © Zenitram 2008")> 
+<Assembly: AssemblyTrademark("")> 
+
+<Assembly: ComVisible(False)>
+
+'The following GUID is for the ID of the typelib if this project is exposed to COM
+<Assembly: Guid("7398464a-e759-492a-b6a9-46f49110c74d")> 
+
+' Version information for an assembly consists of the following four values:
+'
+'      Major Version
+'      Minor Version 
+'      Build Number
+'      Revision
+'
+' You can specify all the values or you can default the Build and Revision Numbers 
+' by using the '*' as shown below:
+' <Assembly: AssemblyVersion("1.0.*")> 
+
+<Assembly: AssemblyVersion("1.0.0.0")> 
+<Assembly: AssemblyFileVersion("1.0.0.0")>

libmediainfo_0.7.60.tar.bz2/Project/MSVB2010/Example/My Project/Resources.Designer.vb Added

@@ -0,0 +1,63 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     This code was generated by a tool.
+'     Runtime Version:4.0.30319.1
+'
+'     Changes to this file may cause incorrect behavior and will be lost if
+'     the code is regenerated.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+Imports System
+
+Namespace My.Resources
+    
+    'This class was auto-generated by the StronglyTypedResourceBuilder
+    'class via a tool like ResGen or Visual Studio.
+    'To add or remove a member, edit your .ResX file then rerun ResGen
+    'with the /str option, or rebuild your VS project.
+    '''<summary>
+    '''  A strongly-typed resource class, for looking up localized strings, etc.
+    '''</summary>
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"),  _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
+     Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
+    Friend Module Resources
+        
+        Private resourceMan As Global.System.Resources.ResourceManager
+        
+        Private resourceCulture As Global.System.Globalization.CultureInfo
+        
+        '''<summary>
+        '''  Returns the cached ResourceManager instance used by this class.
+        '''</summary>
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
+            Get
+                If Object.ReferenceEquals(resourceMan, Nothing) Then
+                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("HowToUse_Dll.Resources", GetType(Resources).Assembly)
+                    resourceMan = temp
+                End If
+                Return resourceMan
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Overrides the current thread's CurrentUICulture property for all
+        '''  resource lookups using this strongly typed resource class.
+        '''</summary>
+        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Friend Property Culture() As Global.System.Globalization.CultureInfo
+            Get
+                Return resourceCulture
+            End Get
+            Set
+                resourceCulture = value
+            End Set
+        End Property
+    End Module
+End Namespace

libmediainfo_0.7.60.tar.bz2/Project/MSVB2010/Example/My Project/Resources.resx Added

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file

libmediainfo_0.7.60.tar.bz2/Project/MSVB2010/Example/My Project/Settings.Designer.vb Added

@@ -0,0 +1,73 @@
+'------------------------------------------------------------------------------
+' <auto-generated>
+'     This code was generated by a tool.
+'     Runtime Version:4.0.30319.1
+'
+'     Changes to this file may cause incorrect behavior and will be lost if
+'     the code is regenerated.
+' </auto-generated>
+'------------------------------------------------------------------------------
+
+Option Strict On
+Option Explicit On
+
+
+Namespace My
+    
+    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0"),  _
+     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+    Partial Friend NotInheritable Class MySettings
+        Inherits Global.System.Configuration.ApplicationSettingsBase
+        
+        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
+        
+#Region "My.Settings Auto-Save Functionality"
+#If _MyType = "WindowsForms" Then
+    Private Shared addedHandler As Boolean
+
+    Private Shared addedHandlerLockObject As New Object
+
+    <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
+    Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
+        If My.Application.SaveMySettingsOnExit Then
+            My.Settings.Save()
+        End If
+    End Sub
+#End If
+#End Region
+        
+        Public Shared ReadOnly Property [Default]() As MySettings
+            Get
+                
+#If _MyType = "WindowsForms" Then
+               If Not addedHandler Then
+                    SyncLock addedHandlerLockObject
+                        If Not addedHandler Then
+                            AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
+                            addedHandler = True
+                        End If
+                    End SyncLock
+                End If
+#End If
+                Return defaultInstance
+            End Get
+        End Property
+    End Class
+End Namespace
+
+Namespace My
+    
+    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),  _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
+    Friend Module MySettingsProperty
+        
+        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
+        Friend ReadOnly Property Settings() As Global.HowToUse_Dll.My.MySettings
+            Get
+                Return Global.HowToUse_Dll.My.MySettings.Default
+            End Get
+        End Property
+    End Module
+End Namespace

libmediainfo_0.7.60.tar.bz2/Project/MSVB2010/MediaInfoLib_MSVB.sln Added

libmediainfo_0.7.34.tar.bz2/Project/MSVC2005/DLL/MediaInfo.rc -> libmediainfo_0.7.60.tar.bz2/Project/MSVC2005/DLL/MediaInfo.rc Changed

@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,7,34,0
- PRODUCTVERSION 0,7,34,0
+ FILEVERSION 0,7,60,0
+ PRODUCTVERSION 0,7,60,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -17,14 +17,14 @@
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "CompanyName", "http://mediainfo.sourceforge.net"
-            VALUE "FileDescription", "Library to read info about media files"
-            VALUE "FileVersion", "0,7,34,0"
-            VALUE "InternalName", "MediaInfoLib - Dll - MSVC 2005"
-            VALUE "LegalCopyright", "LGPL"
+            VALUE "CompanyName", "MediaArea.net"
+            VALUE "FileDescription", "All about your audio and video files"
+            VALUE "FileVersion", "0.7.60.0"
+            VALUE "InternalName", "MediaInfoLib - DLL - MSVC 2005"
+            VALUE "LegalCopyright", "MediaArea.net"
             VALUE "OriginalFilename", "MediaInfo.dll"
-            VALUE "ProductName", "MediaInfoLib"
-            VALUE "ProductVersion", "0,7,34,0"
+            VALUE "ProductName", "MediaInfo"
+            VALUE "ProductVersion", "0.7.60.0"
         END
     END
     BLOCK "VarFileInfo"

libmediainfo_0.7.34.tar.bz2/Project/MSVC2005/Library/MediaInfoLib.vcproj -> libmediainfo_0.7.60.tar.bz2/Project/MSVC2005/Library/MediaInfoLib.vcproj Changed

@@ -40,13 +40,14 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="../../../Source;../../../../curl/include;../../../../ZenLib/Source;../../../../zlib"
+				AdditionalIncludeDirectories="../../../Source;../../../Source/ThirdParty/tinyxml2;../../../Source/ThirdParty/base64;../../../../ZenLib/Source;../../../../ZLib;../../../../curl/include"
 				AdditionalUsingDirectories=""
-				PreprocessorDefinitions="WIN32;NDEBUG;MEDIAINFO_TRACE_NO;MEDIAINFO_LIBCURL_NO;MEDIAINFO_LIBMMS_NO;MEDIAINFO_EVENTS_NOx;CURL_STATICLIB"
+				PreprocessorDefinitions="WIN32;NDEBUG;MEDIAINFO_TRACE_NO;MEDIAINFO_EVENTS_NO;MEDIAINFO_DEMUX_NO;MEDIAINFO_DUPLICATE_NO;MEDIAINFO_DVDIF_ANALYZE_NO;MEDIAINFO_MPEGTS_DUPLICATE_NO;MEDIAINFO_LIBCURL_DLL_RUNTIME;MEDIAINFO_LIBCURL_NO;MEDIAINFO_SEEK_NO;MEDIAINFO_IBI_NO;MEDIAINFO_NEXTPACKET_NO"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="MediaInfo/PreComp.h"
 				DisableSpecificWarnings="4060;4065;4390"
 			/>
 			<Tool
@@ -163,6 +164,22 @@
 				RelativePath="..\..\..\Source\MediaInfo\MediaInfoList_Internal.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\Source\MediaInfo\PreComp.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\Source\MediaInfo\TimeCode.cpp"
+				>
+			</File>
 			<Filter
 				Name="Archive"
 				>
@@ -187,6 +204,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Archive\File_Iso9660.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Archive\File_Mz.cpp"
 					>
 				</File>
@@ -211,19 +232,31 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Ac3.cpp"
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Aac_GeneralAudio.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Adif.cpp"
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Aac_GeneralAudio_Sbr.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Adpcm.cpp"
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Aac_GeneralAudio_Sbr_Ps.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Aac_Main.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Adts.cpp"
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Aac_Others.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Ac3.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Adpcm.cpp"
 					>
 				</File>
 				<File
@@ -251,6 +284,18 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Celt.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_ChannelGrouping.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_DolbyE.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Dts.cpp"
 					>
 				</File>
@@ -271,10 +316,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Latm.cpp"
-					>
-				</File>
-				<File
 					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Midi.cpp"
 					>
 				</File>
@@ -291,11 +332,11 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Mpeg4_AudioSpecificConfig.cpp"
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Mpega.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Mpega.cpp"
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Opus.cpp"
 					>
 				</File>
 				<File
@@ -307,6 +348,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Rkau.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Audio\File_ScreamTracker3.cpp"
 					>
 				</File>
@@ -367,6 +412,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Video\File_H263.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Video\File_Lagarith.cpp"
 					>
 				</File>
@@ -379,6 +428,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Video\File_ProRes.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Video\File_Theora.cpp"
 					>
 				</File>
@@ -386,6 +439,18 @@
 					RelativePath="..\..\..\Source\MediaInfo\Video\File_Vc1.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Video\File_Vc3.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Video\File_Vp8.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Video\File_Y4m.cpp"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="Image"
@@ -395,6 +460,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Image\File_Dpx.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Image\File_Exr.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Image\File_Gif.cpp"
 					>
 				</File>
@@ -407,14 +480,26 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Image\File_Pcx.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Image\File_Png.cpp"
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Image\File_Psd.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Image\File_Rle.cpp"
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Image\File_Tga.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Image\File_Tiff.cpp"
 					>
 				</File>
@@ -427,6 +512,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File__ReferenceFilesHelper.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Ancillary.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Bdmv.cpp"
 					>
 				</File>
@@ -435,6 +528,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Dcp.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Dpg.cpp"
 					>
 				</File>
@@ -451,6 +548,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Dxw.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Flv.cpp"
 					>
 				</File>
@@ -459,6 +560,26 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Gxf_TimeCode.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Hls.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Ibi.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Ibi_Creation.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Ism.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Ivf.cpp"
 					>
 				</File>
@@ -539,6 +660,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_SequenceInfo.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Skm.cpp"
 					>
 				</File>
@@ -579,6 +704,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Text\File_DvbSubtitle.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Text\File_Eia608.cpp"
 					>
 				</File>
@@ -603,9 +732,17 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Text\File_Scc.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Text\File_Scte20.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Text\File_Teletext.cpp"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="Tag"
@@ -621,15 +758,6 @@
 				<File
 					RelativePath="..\..\..\Source\MediaInfo\Tag\File_Id3.cpp"
 					>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							ObjectFile="$(IntDir)\$(InputName)1.obj"
-							XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-						/>
-					</FileConfiguration>
 				</File>
 				<File
 					RelativePath="..\..\..\Source\MediaInfo\Tag\File_Id3v2.cpp"
@@ -691,6 +819,10 @@
 					RelativePath="..\..\..\Source\MediaInfo\Export\Export_PBCore.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Export\Export_reVTMD.cpp"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
@@ -774,6 +906,10 @@
 				RelativePath="..\..\..\Source\MediaInfo\Setup.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\Source\MediaInfo\TimeCode.h"
+				>
+			</File>
 			<Filter
 				Name="Archive"
 				>
@@ -798,6 +934,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Archive\File_Iso9660.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Archive\File_Mz.h"
 					>
 				</File>
@@ -822,19 +962,23 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Ac3.h"
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Aac_GeneralAudio.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Adif.h"
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Aac_GeneralAudio_Sbr.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Adpcm.h"
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Aac_GeneralAudio_Sbr_Ps.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Ac3.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Adts.h"
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Adpcm.h"
 					>
 				</File>
 				<File
@@ -862,10 +1006,22 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Celt.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_ChannelGrouping.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Dirac.h"
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_DolbyE.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Dts.h"
 					>
 				</File>
@@ -886,10 +1042,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Latm.h"
-					>
-				</File>
-				<File
 					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Midi.h"
 					>
 				</File>
@@ -906,11 +1058,11 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Mpeg4_AudioSpecificConfig.h"
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Mpega.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Mpega.h"
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Opus.h"
 					>
 				</File>
 				<File
@@ -922,6 +1074,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Rkau.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Audio\File_ScreamTracker3.h"
 					>
 				</File>
@@ -958,6 +1114,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Image\File_Dpx.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Image\File_Exr.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Image\File_Gif.h"
 					>
 				</File>
@@ -970,14 +1134,26 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Image\File_Pcx.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Image\File_Png.h"
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Image\File_Psd.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Image\File_Rle.h"
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Image\File_Tga.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Image\File_Tiff.h"
 					>
 				</File>
@@ -986,6 +1162,14 @@
 				Name="Multiple"
 				>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File__ReferenceFilesHelper.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Ancillary.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Bdmv.h"
 					>
 				</File>
@@ -994,6 +1178,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Dcp.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Dpg.h"
 					>
 				</File>
@@ -1006,6 +1194,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Dxw.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Flv.h"
 					>
 				</File>
@@ -1014,6 +1206,26 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Gxf_TimeCode.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Hls.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Ibi.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Ibi_Creation.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Ism.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Ivf.h"
 					>
 				</File>
@@ -1078,6 +1290,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_SequenceInfo.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Skm.h"
 					>
 				</File>
@@ -1126,6 +1342,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Video\File_H263.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Video\File_Lagarith.h"
 					>
 				</File>
@@ -1138,6 +1358,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Video\File_ProRes.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Video\File_Theora.h"
 					>
 				</File>
@@ -1145,6 +1369,18 @@
 					RelativePath="..\..\..\Source\MediaInfo\Video\File_Vc1.h"
 					>
 				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Video\File_Vc3.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Video\File_Vp8.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Video\File_Y4m.h"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="Text"
@@ -1162,6 +1398,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Text\File_DvbSubtitle.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Text\File_Eia608.h"
 					>
 				</File>
@@ -1185,6 +1425,14 @@
 					RelativePath="..\..\..\Source\MediaInfo\Text\File_Pgs.h"
 					>
 				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Text\File_Scc.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Text\File_Teletext.h"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="Tag"
@@ -1261,6 +1509,10 @@
 					RelativePath="..\..\..\Source\MediaInfo\Export\Export_PBCore.h"
 					>
 				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Export\Export_reVTMD.h"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
@@ -1269,6 +1521,38 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 		</Filter>
+		<Filter
+			Name="ThirdParty"
+			>
+			<Filter
+				Name="base64"
+				>
+				<File
+					RelativePath="..\..\..\Source\ThirdParty\base64\base64.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="tinyxml2"
+				>
+				<File
+					RelativePath="..\..\..\Source\ThirdParty\tinyxml2\tinyxml2.cpp"
+					>
+					<FileConfiguration
+						Name="Release|Win32"
+						>
+						<Tool
+							Name="VCCLCompilerTool"
+							UsePrecompiledHeader="0"
+						/>
+					</FileConfiguration>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\ThirdParty\tinyxml2\tinyxml2.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>

libmediainfo_0.7.34.tar.bz2/Project/MSVC2008/Dll/MediaInfo.rc -> libmediainfo_0.7.60.tar.bz2/Project/MSVC2008/Dll/MediaInfo.rc Changed

@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,7,34,0
- PRODUCTVERSION 0,7,34,0
+ FILEVERSION 0,7,60,0
+ PRODUCTVERSION 0,7,60,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -17,14 +17,14 @@
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "CompanyName", "http://mediainfo.sourceforge.net"
-            VALUE "FileDescription", "Library to read info about media files"
-            VALUE "FileVersion", "0,7,34,0"
-            VALUE "InternalName", "MediaInfoLib - Dll - MSVC 2008"
-            VALUE "LegalCopyright", "LGPL"
+            VALUE "CompanyName", "MediaArea.net"
+            VALUE "FileDescription", "All about your audio and video files"
+            VALUE "FileVersion", "0.7.60.0"
+            VALUE "InternalName", "MediaInfoLib - DLL - MSVC 2008"
+            VALUE "LegalCopyright", "MediaArea.net"
             VALUE "OriginalFilename", "MediaInfo.dll"
-            VALUE "ProductName", "MediaInfoLib"
-            VALUE "ProductVersion", "0,7,34,0"
+            VALUE "ProductName", "MediaInfo"
+            VALUE "ProductVersion", "0.7.60.0"
         END
     END
     BLOCK "VarFileInfo"

libmediainfo_0.7.34.tar.bz2/Project/MSVC2008/Example/HowToUse_Dll.vcproj -> libmediainfo_0.7.60.tar.bz2/Project/MSVC2008/Example/HowToUse_Dll.vcproj Changed

libmediainfo_0.7.34.tar.bz2/Project/MSVC2008/Example/resource.h -> libmediainfo_0.7.60.tar.bz2/Project/MSVC2008/Example/resource.h Changed

libmediainfo_0.7.34.tar.bz2/Project/MSVC2008/Library/MediaInfoLib.vcproj -> libmediainfo_0.7.60.tar.bz2/Project/MSVC2008/Library/MediaInfoLib.vcproj Changed

@@ -45,12 +45,13 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../Source;../../../../ZenLib/Source;../../../../ZLib;../../../../curl/include"
+				AdditionalIncludeDirectories="../../../Source;../../../Source/ThirdParty/tinyxml2;../../../Source/ThirdParty/base64;../../../../ZenLib/Source;../../../../ZLib;../../../../curl/include"
 				AdditionalUsingDirectories=""
-				PreprocessorDefinitions="WIN32;_DEBUG;MEDIAINFO_TRACE_NO;MEDIAINFO_LIBCURL_NO;MEDIAINFO_LIBMMS_NO;CURL_STATICLIB"
+				PreprocessorDefinitions="WIN32;_DEBUG;MEDIAINFO_TRACE_NO;MEDIAINFO_EVENTS_NO;MEDIAINFO_DEMUX_NO;MEDIAINFO_DVDIF_ANALYZE_NO;MEDIAINFO_MPEGTS_DUPLICATE_NO;MEDIAINFO_LIBCURL_DLL_RUNTIME"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="MediaInfo/PreComp.h"
 				WarningLevel="4"
 				DebugInformationFormat="4"
 				DisableSpecificWarnings="4060;4065;4100;4127;4390"
@@ -111,12 +112,13 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../Source;../../../../ZenLib/Source;../../../../ZLib;../../../../Shared/Include"
+				AdditionalIncludeDirectories="../../../Source;../../../Source/ThirdParty/tinyxml2;../../../Source/ThirdParty/base64;../../../../ZenLib/Source;../../../../ZLib;../../../../curl/include"
 				AdditionalUsingDirectories=""
 				PreprocessorDefinitions="WIN32;_DEBUG;MEDIAINFO_TRACE_NO;MEDIAINFO_LIBCURL_NO;MEDIAINFO_LIBMMS_NO;CURL_STATICLIB"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="MediaInfo/PreComp.h"
 				WarningLevel="4"
 				DebugInformationFormat="3"
 				DisableSpecificWarnings="4060;4065;4100;4127;4390"
@@ -178,13 +180,14 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="2"
-				AdditionalIncludeDirectories="../../../Source;../../../../ZenLib/Source;../../../../ZLib;../../../../Shared/Include"
+				AdditionalIncludeDirectories="../../../Source;../../../Source/ThirdParty/tinyxml2;../../../Source/ThirdParty/base64;../../../../ZenLib/Source;../../../../ZLib;../../../../curl/include"
 				AdditionalUsingDirectories=""
-				PreprocessorDefinitions="WIN32;NDEBUG;MEDIAINFO_TRACE_NO;MEDIAINFO_LIBCURL_NO;MEDIAINFO_LIBMMS_NO;CURL_STATICLIB"
+				PreprocessorDefinitions="WIN32;NDEBUG;MEDIAINFO_TRACE_NO;MEDIAINFO_EVENTS_NO;MEDIAINFO_DEMUX_NO;MEDIAINFO_NEXTPACKET_NO;MEDIAINFO_DVDIF_ANALYZE_NO;MEDIAINFO_MPEGTS_DUPLICATE_NO;MEDIAINFO_SEEK_NO;MEDIAINFO_IBI_NO;MEDIAINFO_LIBCURL_NO"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="MediaInfo/PreComp.h"
 				WarningLevel="4"
 				DisableSpecificWarnings="4060;4065;4100;4127;4390"
 			/>
@@ -245,11 +248,12 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="2"
-				AdditionalIncludeDirectories="../../../Source;../../../../ZenLib/Source;../../../../ZLib;../../../../Shared/Include"
+				AdditionalIncludeDirectories="../../../Source;../../../Source/ThirdParty/tinyxml2;../../../Source/ThirdParty/base64;../../../../ZenLib/Source;../../../../ZLib;../../../../curl/include"
 				AdditionalUsingDirectories=""
-				PreprocessorDefinitions="WIN32;NDEBUG;MEDIAINFO_TRACE_NO;MEDIAINFO_LIBCURL_NO;MEDIAINFO_LIBMMS_NO;CURL_STATICLIB"
+				PreprocessorDefinitions="WIN32;NDEBUG;MEDIAINFO_TRACE_NO;MEDIAINFO_EVENTS_NO;MEDIAINFO_DEMUX_NO;MEDIAINFO_NEXTPACKET_NO;MEDIAINFO_DVDIF_ANALYZE_NO;MEDIAINFO_MPEGTS_DUPLICATE_NO;MEDIAINFO_SEEK_NO;MEDIAINFO_IBI_NO;MEDIAINFO_LIBCURL_NO"
 				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="MediaInfo/PreComp.h"
 				WarningLevel="4"
 				DisableSpecificWarnings="4060;4065;4100;4127;4390"
 			/>
@@ -308,12 +312,13 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../../Source;../../../../ZenLib/Source;../../../../ZLib;../../../../Shared/Include"
+				AdditionalIncludeDirectories="../../../Source;../../../Source/ThirdParty/tinyxml2;../../../Source/ThirdParty/base64;../../../../ZenLib/Source;../../../../ZLib;../../../../curl/include"
 				AdditionalUsingDirectories=""
 				PreprocessorDefinitions="WIN32;_DEBUG;MEDIAINFO_LIBCURL_NO;MEDIAINFO_LIBMMS_NO"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="MediaInfo/PreComp.h"
 				WarningLevel="4"
 				DebugInformationFormat="4"
 				DisableSpecificWarnings="4060;4065;4100;4127;4390"
@@ -373,9 +378,11 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
-				AdditionalIncludeDirectories="../../../Source;../../../../ZenLib/Source;../../../../ZLib;../../../../Shared/Include"
+				AdditionalIncludeDirectories="../../../Source;../../../Source/ThirdParty/tinyxml2;../../../Source/ThirdParty/base64;../../../../ZenLib/Source;../../../../ZLib;../../../../curl/include"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="MediaInfo/PreComp.h"
 				WarningLevel="4"
 				DisableSpecificWarnings="4060;4065;4100;4127;4390"
 				EnablePREfast="true"
@@ -436,13 +443,14 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="2"
-				AdditionalIncludeDirectories="../../../Source;../../../../ZenLib/Source;../../../../ZLib;../../../../Shared/Include"
+				AdditionalIncludeDirectories="../../../Source;../../../Source/ThirdParty/tinyxml2;../../../Source/ThirdParty/base64;../../../../ZenLib/Source;../../../../ZLib;../../../../curl/include"
 				AdditionalUsingDirectories=""
 				PreprocessorDefinitions="WIN32;NDEBUG;MEDIAINFO_TRACE_NO;MEDIAINFO_LIBCURL_NO;MEDIAINFO_LIBMMS_NO"
 				StringPooling="true"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="false"
-				UsePrecompiledHeader="0"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="MediaInfo/PreComp.h"
 				WarningLevel="4"
 				DisableSpecificWarnings="4060;4065;4100;4127;4390"
 			/>
@@ -500,7 +508,9 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
-				AdditionalIncludeDirectories="../../../Source;../../../../ZenLib/Source;../../../../ZLib;../../../../Shared/Include"
+				AdditionalIncludeDirectories="../../../Source;../../../Source/ThirdParty/tinyxml2;../../../Source/ThirdParty/base64;../../../../ZenLib/Source;../../../../ZLib;../../../../curl/include"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderThrough="MediaInfo/PreComp.h"
 				WarningLevel="4"
 				DisableSpecificWarnings="4060;4065;4100;4127;4390"
 			/>
@@ -622,6 +632,78 @@
 				RelativePath="..\..\..\Source\MediaInfo\MediaInfoList_Internal.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\Source\MediaInfo\PreComp.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DebugA|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="DebugA|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="ReleaseA|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="ReleaseA|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\Source\MediaInfo\TimeCode.cpp"
+				>
+			</File>
 			<Filter
 				Name="Archive"
 				>
@@ -646,6 +728,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Archive\File_Iso9660.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Archive\File_Mz.cpp"
 					>
 				</File>
@@ -670,19 +756,31 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Ac3.cpp"
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Aac_GeneralAudio.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Adif.cpp"
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Aac_GeneralAudio_Sbr.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Adpcm.cpp"
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Aac_GeneralAudio_Sbr_Ps.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Aac_Main.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Adts.cpp"
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Aac_Others.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Ac3.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Adpcm.cpp"
 					>
 				</File>
 				<File
@@ -710,6 +808,18 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Celt.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_ChannelGrouping.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_DolbyE.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Dts.cpp"
 					>
 				</File>
@@ -730,10 +840,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Latm.cpp"
-					>
-				</File>
-				<File
 					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Midi.cpp"
 					>
 				</File>
@@ -750,11 +856,11 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Mpeg4_AudioSpecificConfig.cpp"
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Mpega.cpp"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Mpega.cpp"
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Opus.cpp"
 					>
 				</File>
 				<File
@@ -766,6 +872,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Rkau.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Audio\File_ScreamTracker3.cpp"
 					>
 				</File>
@@ -826,6 +936,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Video\File_H263.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Video\File_Lagarith.cpp"
 					>
 				</File>
@@ -838,6 +952,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Video\File_ProRes.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Video\File_Theora.cpp"
 					>
 				</File>
@@ -845,6 +963,18 @@
 					RelativePath="..\..\..\Source\MediaInfo\Video\File_Vc1.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Video\File_Vc3.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Video\File_Vp8.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Video\File_Y4m.cpp"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="Image"
@@ -854,6 +984,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Image\File_Dpx.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Image\File_Exr.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Image\File_Gif.cpp"
 					>
 				</File>
@@ -866,14 +1004,26 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Image\File_Pcx.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Image\File_Png.cpp"
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Image\File_Psd.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Image\File_Rle.cpp"
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Image\File_Tga.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Image\File_Tiff.cpp"
 					>
 				</File>
@@ -882,6 +1032,14 @@
 				Name="Multiple"
 				>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File__ReferenceFilesHelper.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Ancillary.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Bdmv.cpp"
 					>
 				</File>
@@ -890,6 +1048,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Dcp.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Dpg.cpp"
 					>
 				</File>
@@ -906,6 +1068,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Dxw.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Flv.cpp"
 					>
 				</File>
@@ -914,6 +1080,26 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Gxf_TimeCode.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Hls.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Ibi.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Ibi_Creation.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Ism.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Ivf.cpp"
 					>
 				</File>
@@ -994,6 +1180,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_SequenceInfo.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Skm.cpp"
 					>
 				</File>
@@ -1034,6 +1224,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Text\File_DvbSubtitle.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Text\File_Eia608.cpp"
 					>
 				</File>
@@ -1058,9 +1252,17 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Text\File_Scc.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Text\File_Scte20.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Text\File_Teletext.cpp"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="Tag"
@@ -1195,6 +1397,10 @@
 					RelativePath="..\..\..\Source\MediaInfo\Export\Export_PBCore.cpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Export\Export_reVTMD.cpp"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
@@ -1278,6 +1484,10 @@
 				RelativePath="..\..\..\Source\MediaInfo\Setup.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\Source\MediaInfo\TimeCode.h"
+				>
+			</File>
 			<Filter
 				Name="Archive"
 				>
@@ -1302,6 +1512,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Archive\File_Iso9660.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Archive\File_Mz.h"
 					>
 				</File>
@@ -1326,19 +1540,23 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Ac3.h"
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Aac_GeneralAudio.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Adif.h"
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Aac_GeneralAudio_Sbr.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Adpcm.h"
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Aac_GeneralAudio_Sbr_Ps.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Adts.h"
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Ac3.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Adpcm.h"
 					>
 				</File>
 				<File
@@ -1366,7 +1584,15 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Dirac.h"
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Celt.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_ChannelGrouping.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_DolbyE.h"
 					>
 				</File>
 				<File
@@ -1390,10 +1616,6 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Latm.h"
-					>
-				</File>
-				<File
 					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Midi.h"
 					>
 				</File>
@@ -1410,11 +1632,11 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Mpeg4_AudioSpecificConfig.h"
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Mpega.h"
 					>
 				</File>
 				<File
-					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Mpega.h"
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Opus.h"
 					>
 				</File>
 				<File
@@ -1426,6 +1648,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Audio\File_Rkau.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Audio\File_ScreamTracker3.h"
 					>
 				</File>
@@ -1462,6 +1688,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Image\File_Dpx.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Image\File_Exr.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Image\File_Gif.h"
 					>
 				</File>
@@ -1474,14 +1708,26 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Image\File_Pcx.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Image\File_Png.h"
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Image\File_Psd.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Image\File_Rle.h"
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Image\File_Tga.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Image\File_Tiff.h"
 					>
 				</File>
@@ -1490,6 +1736,14 @@
 				Name="Multiple"
 				>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File__ReferenceFilesHelper.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Ancillary.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Bdmv.h"
 					>
 				</File>
@@ -1498,6 +1752,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Dcp.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Dpg.h"
 					>
 				</File>
@@ -1510,6 +1768,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Dxw.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Flv.h"
 					>
 				</File>
@@ -1518,6 +1780,26 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Gxf_TimeCode.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Hls.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Ibi.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Ibi_Creation.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Ism.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Ivf.h"
 					>
 				</File>
@@ -1582,6 +1864,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_SequenceInfo.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Multiple\File_Skm.h"
 					>
 				</File>
@@ -1630,6 +1916,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Video\File_H263.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Video\File_Lagarith.h"
 					>
 				</File>
@@ -1642,6 +1932,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Video\File_ProRes.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Text\File_Scc.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Video\File_Theora.h"
 					>
 				</File>
@@ -1649,6 +1947,18 @@
 					RelativePath="..\..\..\Source\MediaInfo\Video\File_Vc1.h"
 					>
 				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Video\File_Vc3.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Video\File_Vp8.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Video\File_Y4m.h"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="Text"
@@ -1666,6 +1976,10 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\Source\MediaInfo\Text\File_DvbSubtitle.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\Source\MediaInfo\Text\File_Eia608.h"
 					>
 				</File>
@@ -1689,6 +2003,10 @@
 					RelativePath="..\..\..\Source\MediaInfo\Text\File_Pgs.h"
 					>
 				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Text\File_Teletext.h"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="Tag"
@@ -1769,6 +2087,10 @@
 					RelativePath="..\..\..\Source\MediaInfo\Export\Export_PBCore.h"
 					>
 				</File>
+				<File
+					RelativePath="..\..\..\Source\MediaInfo\Export\Export_reVTMD.h"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
@@ -1777,6 +2099,30 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 		</Filter>
+		<Filter
+			Name="ThirdParty"
+			>
+			<Filter
+				Name="base64"
+				>
+				<File
+					RelativePath="..\..\..\Source\ThirdParty\base64\base64.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="tinyxml2"
+				>
+				<File
+					RelativePath="..\..\..\Source\ThirdParty\tinyxml2\tinyxml2.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\Source\ThirdParty\tinyxml2\tinyxml2.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>

libmediainfo_0.7.34.tar.bz2/Project/MSVC2008/MediaInfoLib.sln -> libmediainfo_0.7.60.tar.bz2/Project/MSVC2008/MediaInfoLib.sln Changed

libmediainfo_0.7.34.tar.bz2/Project/MSVC2008/ShellExtension/MediaInfoShellExt.cpp -> libmediainfo_0.7.60.tar.bz2/Project/MSVC2008/ShellExtension/MediaInfoShellExt.cpp Changed

@@ -9,8 +9,8 @@
 class CMediaInfoShellExtModule : public CAtlDllModuleT< CMediaInfoShellExtModule >
 {
 public :
-	DECLARE_LIBID(LIBID_MediaInfoShellExtLib)
-	DECLARE_REGISTRY_APPID_RESOURCEID(IDR_MEDIAINFOSHELLEXT, "{23D95783-1AF5-4C0F-84C1-EC49047EA2DC}")
+    DECLARE_LIBID(LIBID_MediaInfoShellExtLib)
+    DECLARE_REGISTRY_APPID_RESOURCEID(IDR_MEDIAINFOSHELLEXT, "{23D95783-1AF5-4C0F-84C1-EC49047EA2DC}")
 };
 
 CMediaInfoShellExtModule _AtlModule;
@@ -23,8 +23,8 @@
 // DLL Entry Point
 extern "C" BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
 {
-	hInstance;
-    return _AtlModule.DllMain(dwReason, lpReserved); 
+    hInstance;
+    return _AtlModule.DllMain(dwReason, lpReserved);
 }
 
 #ifdef _MANAGED
@@ -53,14 +53,14 @@
 {
     // registers object, typelib and all interfaces in typelib
     HRESULT hr = _AtlModule.DllRegisterServer();
-	return hr;
+    return hr;
 }
 
 
 // DllUnregisterServer - Removes entries from the system registry
 STDAPI DllUnregisterServer(void)
 {
-	HRESULT hr = _AtlModule.DllUnregisterServer();
-	return hr;
+    HRESULT hr = _AtlModule.DllUnregisterServer();
+    return hr;
 }

libmediainfo_0.7.34.tar.bz2/Project/MSVC2008/ShellExtension/MediaInfoShellExt.h -> libmediainfo_0.7.60.tar.bz2/Project/MSVC2008/ShellExtension/MediaInfoShellExt.h Changed

@@ -4,13 +4,13 @@
 
 
  /* File created by MIDL compiler version 7.00.0500 */
-/* at Sun May 02 07:03:36 2010
+/* at Thu Apr 05 09:28:54 2012
  */
 /* Compiler settings for .\MediaInfoShellExt.idl:
-    Oicf, W1, Zp8, env=Win64 (32b run)
-    protocol : dce , ms_ext, c_ext, robust
-    error checks: allocation ref bounds_check enum stub_data 
-    VC __declspec() decoration level: 
+    Oicf, W1, Zp8, env=Win32 (32b run)
+    protocol : dce , ms_ext, c_ext
+    error checks: allocation ref bounds_check enum stub_data
+    VC __declspec() decoration level:
          __declspec(uuid()), __declspec(selectany), __declspec(novtable)
          DECLSPEC_UUID(), MIDL_INTERFACE()
 */
@@ -21,7 +21,7 @@
 
 /* verify that the <rpcndr.h> version is high enough to compile this file*/
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
-#define __REQUIRED_RPCNDR_H_VERSION__ 475
+#define __REQUIRED_RPCNDR_H_VERSION__ 440
 #endif
 
 #include "rpc.h"
@@ -43,12 +43,12 @@
 #pragma once
 #endif
 
-/* Forward Declarations */ 
+/* Forward Declarations */
 
 #ifndef __IMediaInfoShellExt__FWD_DEFINED__
 #define __IMediaInfoShellExt__FWD_DEFINED__
 typedef interface IMediaInfoShellExt_ IMediaInfoShellExt_;
-#endif 	/* __IMediaInfoShellExt__FWD_DEFINED__ */
+#endif  /* __IMediaInfoShellExt__FWD_DEFINED__ */
 
 
 #ifndef __MediaInfoShellExt__FWD_DEFINED__
@@ -60,7 +60,7 @@
 typedef struct MediaInfoShellExt_ MediaInfoShellExt_;
 #endif /* __cplusplus */
 
-#endif 	/* __MediaInfoShellExt__FWD_DEFINED__ */
+#endif  /* __MediaInfoShellExt__FWD_DEFINED__ */
 
 
 /* header files for imported files */
@@ -69,44 +69,44 @@
 
 #ifdef __cplusplus
 extern "C"{
-#endif 
+#endif
 
 
 #ifndef __IMediaInfoShellExt__INTERFACE_DEFINED__
 #define __IMediaInfoShellExt__INTERFACE_DEFINED__
 
 /* interface IMediaInfoShellExt_ */
-/* [unique][helpstring][uuid][object] */ 
+/* [unique][helpstring][uuid][object] */
 
 
 EXTERN_C const IID IID_IMediaInfoShellExt_;
 
 #if defined(__cplusplus) && !defined(CINTERFACE)
-    
+
     MIDL_INTERFACE("6482FE39-D67B-49E5-BAA1-EBDDB318055D")
     IMediaInfoShellExt_ : public IUnknown
     {
     public:
     };
-    
-#else 	/* C style interface */
+
+#else   /* C style interface */
 
     typedef struct IMediaInfoShellExt_Vtbl
     {
         BEGIN_INTERFACE
-        
-        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
             IMediaInfoShellExt_ * This,
             /* [in] */ REFIID riid,
-            /* [iid_is][out] */ 
+            /* [iid_is][out] */
             __RPC__deref_out  void **ppvObject);
-        
-        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
             IMediaInfoShellExt_ * This);
-        
-        ULONG ( STDMETHODCALLTYPE *Release )( 
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
             IMediaInfoShellExt_ * This);
-        
+
         END_INTERFACE
     } IMediaInfoShellExt_Vtbl;
 
@@ -115,30 +115,30 @@
         CONST_VTBL struct IMediaInfoShellExt_Vtbl *lpVtbl;
     };
 
-    
+
 
 #ifdef COBJMACROS
 
 
-#define IMediaInfoShellExt__QueryInterface(This,riid,ppvObject)	\
-    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+#define IMediaInfoShellExt__QueryInterface(This,riid,ppvObject) \
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
 
-#define IMediaInfoShellExt__AddRef(This)	\
-    ( (This)->lpVtbl -> AddRef(This) ) 
+#define IMediaInfoShellExt__AddRef(This)    \
+    ( (This)->lpVtbl -> AddRef(This) )
 
-#define IMediaInfoShellExt__Release(This)	\
-    ( (This)->lpVtbl -> Release(This) ) 
+#define IMediaInfoShellExt__Release(This)   \
+    ( (This)->lpVtbl -> Release(This) )
 
 
 #endif /* COBJMACROS */
 
 
-#endif 	/* C style interface */
+#endif  /* C style interface */
 
 
 
 
-#endif 	/* __IMediaInfoShellExt__INTERFACE_DEFINED__ */
+#endif  /* __IMediaInfoShellExt__INTERFACE_DEFINED__ */
 
 
 
@@ -146,7 +146,7 @@
 #define __MediaInfoShellExtLib_LIBRARY_DEFINED__
 
 /* library MediaInfoShellExtLib */
-/* [helpstring][version][uuid] */ 
+/* [helpstring][version][uuid] */
 
 
 EXTERN_C const IID LIBID_MediaInfoShellExtLib;

libmediainfo_0.7.34.tar.bz2/Project/MSVC2008/ShellExtension/MediaInfoShellExt.rc -> libmediainfo_0.7.60.tar.bz2/Project/MSVC2008/ShellExtension/MediaInfoShellExt.rc Changed

@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,7,34,0
- PRODUCTVERSION 0,7,34,0
+ FILEVERSION 0,7,60,0
+ PRODUCTVERSION 0,7,60,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -17,14 +17,14 @@
     BEGIN
         BLOCK "040904e4"
         BEGIN
-            VALUE "CompanyName", "http://mediainfo.sourceforge.net"
-            VALUE "FileDescription", "MediaInfo Shell ToolTip"
-            VALUE "FileVersion", "0,7,34,0"
-            VALUE "InternalName", "MediaInfo_ToolTip.dll"
-            VALUE "LegalCopyright", "GPL"
-            VALUE "OriginalFilename", "MediaInfo_ToolTip.dll"
+            VALUE "CompanyName", "MediaArea.net"
+            VALUE "FileDescription", "All about your audio and video files"
+            VALUE "FileVersion", "0.7.60.0"
+            VALUE "InternalName", "MediaInfo_InfoTip - DLL - MSVC 2008"
+            VALUE "LegalCopyright", "MediaArea.net"
+            VALUE "OriginalFilename", "MediaInfo_InfoTip.dll"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "0,7,34,0"
+            VALUE "ProductVersion", "0.7.60.0"
         END
     END
     BLOCK "VarFileInfo"

libmediainfo_0.7.34.tar.bz2/Project/MSVC2008/ShellExtension/MediaInfoShellExt.vcproj -> libmediainfo_0.7.60.tar.bz2/Project/MSVC2008/ShellExtension/MediaInfoShellExt.vcproj Changed

@@ -56,7 +56,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\MediaInfoLib\Source"
+				AdditionalIncludeDirectories="..\..\..\Source"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -146,7 +146,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\MediaInfoLib\Source"
+				AdditionalIncludeDirectories="..\..\..\Source"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -237,7 +237,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\..\..\MediaInfoLib\Source"
+				AdditionalIncludeDirectories="..\..\..\Source"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="2"
@@ -323,7 +323,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="2"
-				AdditionalIncludeDirectories="..\..\..\..\MediaInfoLib\Source"
+				AdditionalIncludeDirectories="..\..\..\Source"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="2"

libmediainfo_0.7.34.tar.bz2/Project/MSVC2008/ShellExtension/MediaInfoShellExt_.cpp -> libmediainfo_0.7.60.tar.bz2/Project/MSVC2008/ShellExtension/MediaInfoShellExt_.cpp Changed

@@ -13,7 +13,7 @@
     FileName = wszFilename;
 
     //OK
-	return S_OK;
+    return S_OK;
 }
 
 HRESULT CMediaInfoShellExt_::GetInfoTip (DWORD, LPWSTR* ppwszTip)
@@ -26,9 +26,9 @@
         return E_FAIL;
 
     //Creating tooltip
-	ToolTip=_T("MediaInfo:\n");
-	MediaInfoDLL::MediaInfo I;
-	I.Option(_T("Inform"), _T("Summary"));
+    ToolTip=_T("MediaInfo:\n");
+    MediaInfoDLL::MediaInfo I;
+    I.Option(_T("Inform"), _T("Summary"));
     I.Open(FileName);
     for (size_t StreamKind=0; StreamKind<(size_t)MediaInfoDLL::Stream_Max; StreamKind++)
         for (size_t StreamPos=0; StreamPos<I.Count_Get((MediaInfoDLL::stream_t)StreamKind); StreamPos++)
@@ -44,8 +44,8 @@
     if (ToolTip.size()>2)
         ToolTip.resize(ToolTip.size()-2); //Removing the ending \r\n
 
-    //Allocate a buffer for Explorer.  Note that the must pass the string 
-    //back as a Unicode string, so the string length is multiplied by the 
+    //Allocate a buffer for Explorer.  Note that the must pass the string
+    //back as a Unicode string, so the string length is multiplied by the
     //size of a Unicode character.
     *ppwszTip=(LPWSTR)Malloc->Alloc((ToolTip.size()+1)*sizeof(wchar_t));
 
@@ -53,12 +53,12 @@
     Malloc->Release();
 
     //Enough memory?
-	if (*ppwszTip==NULL)
+    if (*ppwszTip==NULL)
         return E_OUTOFMEMORY;
 
     //Use the Unicode string copy function to put the tooltip text in the buffer.
     wcscpy_s(*ppwszTip, ToolTip.size()+1, T2COLE(ToolTip.c_str()));
 
     //OK
-	return S_OK;
+    return S_OK;
 }
\ No newline at end of file

libmediainfo_0.7.34.tar.bz2/Project/MSVC2008/ShellExtension/MediaInfoShellExt_.h -> libmediainfo_0.7.60.tar.bz2/Project/MSVC2008/ShellExtension/MediaInfoShellExt_.h Changed

@@ -18,37 +18,37 @@
 // CMediaInfoShellExt_
 
 class ATL_NO_VTABLE CMediaInfoShellExt_ :
-	public CComObjectRootEx<CComSingleThreadModel>,
-	public CComCoClass<CMediaInfoShellExt_, &CLSID_MediaInfoShellExt_>,
+    public CComObjectRootEx<CComSingleThreadModel>,
+    public CComCoClass<CMediaInfoShellExt_, &CLSID_MediaInfoShellExt_>,
     public IPersistFile,
     public IQueryInfo
 {
 public:
-	CMediaInfoShellExt_()
-	{
-	}
+    CMediaInfoShellExt_()
+    {
+    }
 
 DECLARE_REGISTRY_RESOURCEID(IDR_MEDIAINFOSHELLEXT_)
 
 DECLARE_NOT_AGGREGATABLE(CMediaInfoShellExt_)
 
 BEGIN_COM_MAP(CMediaInfoShellExt_)
-	COM_INTERFACE_ENTRY(IPersistFile)
-	COM_INTERFACE_ENTRY(IQueryInfo)
+    COM_INTERFACE_ENTRY(IPersistFile)
+    COM_INTERFACE_ENTRY(IQueryInfo)
 END_COM_MAP()
 
 
 
-	DECLARE_PROTECT_FINAL_CONSTRUCT()
+    DECLARE_PROTECT_FINAL_CONSTRUCT()
 
-	HRESULT FinalConstruct()
-	{
-		return S_OK;
-	}
+    HRESULT FinalConstruct()
+    {
+        return S_OK;
+    }
 
-	void FinalRelease()
-	{
-	}
+    void FinalRelease()
+    {
+    }
 
 protected:
     std::wstring FileName;

libmediainfo_0.7.34.tar.bz2/Project/MSVC2008/ShellExtension/resource.h -> libmediainfo_0.7.60.tar.bz2/Project/MSVC2008/ShellExtension/resource.h Changed

libmediainfo_0.7.34.tar.bz2/Project/MSVC2008/ShellExtension/stdafx.h -> libmediainfo_0.7.60.tar.bz2/Project/MSVC2008/ShellExtension/stdafx.h Changed

@@ -10,26 +10,26 @@
 
 // Modify the following defines if you have to target a platform prior to the ones specified below.
 // Refer to MSDN for the latest info on corresponding values for different platforms.
-#ifndef WINVER				// Allow use of features specific to Windows XP or later.
-#define WINVER 0x0501		// Change this to the appropriate value to target other versions of Windows.
+#ifndef WINVER              // Allow use of features specific to Windows XP or later.
+#define WINVER 0x0501       // Change this to the appropriate value to target other versions of Windows.
 #endif
 
-#ifndef _WIN32_WINNT		// Allow use of features specific to Windows XP or later.                   
-#define _WIN32_WINNT 0x0501	// Change this to the appropriate value to target other versions of Windows.
-#endif						
+#ifndef _WIN32_WINNT        // Allow use of features specific to Windows XP or later.
+#define _WIN32_WINNT 0x0501 // Change this to the appropriate value to target other versions of Windows.
+#endif
 
-#ifndef _WIN32_WINDOWS		// Allow use of features specific to Windows 98 or later.
+#ifndef _WIN32_WINDOWS      // Allow use of features specific to Windows 98 or later.
 #define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
 #endif
 
-#ifndef _WIN32_IE			// Allow use of features specific to IE 6.0 or later.
-#define _WIN32_IE 0x0600	// Change this to the appropriate value to target other versions of IE.
+#ifndef _WIN32_IE           // Allow use of features specific to IE 6.0 or later.
+#define _WIN32_IE 0x0600    // Change this to the appropriate value to target other versions of IE.
 #endif
 
 #define _ATL_APARTMENT_THREADED
 #define _ATL_NO_AUTOMATIC_NAMESPACE
 
-#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS	// some CString constructors will be explicit
+#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS  // some CString constructors will be explicit
 
 
 #include "resource.h"

libmediainfo_0.7.34.tar.bz2/Project/MSVC2010/Dll/MediaInfo.rc -> libmediainfo_0.7.60.tar.bz2/Project/MSVC2010/Dll/MediaInfo.rc Changed

@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,7,34,0
- PRODUCTVERSION 0,7,34,0
+ FILEVERSION 0,7,60,0
+ PRODUCTVERSION 0,7,60,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -17,14 +17,14 @@
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "CompanyName", "http://mediainfo.sourceforge.net"
-            VALUE "FileDescription", "Library to read info about media files"
-            VALUE "FileVersion", "0,7,34,0"
-            VALUE "InternalName", "MediaInfoLib - Dll - MSVC 2010"
-            VALUE "LegalCopyright", "LGPL"
+            VALUE "CompanyName", "MediaArea.net"
+            VALUE "FileDescription", "All about your audio and video files"
+            VALUE "FileVersion", "0.7.60.0"
+            VALUE "InternalName", "MediaInfoLib - DLL - MSVC 2010"
+            VALUE "LegalCopyright", "MediaArea.net"
             VALUE "OriginalFilename", "MediaInfo.dll"
-            VALUE "ProductName", "MediaInfoLib"
-            VALUE "ProductVersion", "0,7,34,0"
+            VALUE "ProductName", "MediaInfo"
+            VALUE "ProductVersion", "0.7.60.0"
         END
     END
     BLOCK "VarFileInfo"

libmediainfo_0.7.34.tar.bz2/Project/MSVC2010/Dll/MediaInfoDll.vcxproj -> libmediainfo_0.7.60.tar.bz2/Project/MSVC2010/Dll/MediaInfoDll.vcxproj Changed

@@ -72,8 +72,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -126,30 +126,6 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'">$(Platform)\$(Configuration)\Intermediate\</IntDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'">$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'">$(Platform)\$(Configuration)\Intermediate\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'">MediaInfo</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MediaInfo</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'">MediaInfo</TargetName>
@@ -158,153 +134,114 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MediaInfo</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'">MediaInfo</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MediaInfo</TargetName>
-    <RunCodeAnalysis Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</RunCodeAnalysis>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>../../../Source;../../../../ZenLib/Source;../../../../Shared/Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MEDIAINFODLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MEDIAINFODLL_EXPORTS_NODLLEXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableSpecificWarnings>4060;4065;4100;4127;4390;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <EnablePREfast>true</EnablePREfast>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>MediaInfo.lib;ZenLib.lib;zlib.lib;ws2_32.lib;wldap32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)MediaInfo.dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\..\Project\MSVC2010\Library\$(Platform)\$(Configuration);..\..\..\..\ZenLib\Project\MSVC2010\Library\$(Platform)\$(Configuration);..\..\..\..\zlib\projects\MSVC2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>../../../Source/MediaInfoDLL/MediaInfoDLL.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <ModuleDefinitionFile>../../../Source/MediaInfoDLL/MediaInfoDLL.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>../../../Source;../../../../ZenLib/Source;../../../../Shared/Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MEDIAINFODLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MEDIAINFODLL_EXPORTS_NODLLEXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4060;4065;4100;4127;4390;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <EnablePREfast>true</EnablePREfast>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>MediaInfo.lib;ZenLib.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)MediaInfo.dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\..\Project\MSVC2010\Library\$(Platform)\$(Configuration);..\..\..\..\ZenLib\Project\MSVC2010\Library\$(Platform)\$(Configuration);..\..\..\..\zlib\projects\MSVC2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>../../../Source/MediaInfoDLL/MediaInfoDLL.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
       <TargetMachine>MachineX64</TargetMachine>
+      <ModuleDefinitionFile>../../../Source/MediaInfoDLL/MediaInfoDLL.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <AdditionalIncludeDirectories>../../../Source;../../../../ZenLib/Source;../../../../Shared/Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MEDIAINFODLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MEDIAINFODLL_EXPORTS_NODLLEXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
-      <DisableSpecificWarnings>4060;4065;4100;4127;4390;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <EnablePREfast>true</EnablePREfast>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <OmitFramePointers>true</OmitFramePointers>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>MediaInfo.lib;ZenLib.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)MediaInfo.dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\..\Project\MSVC2010\Library\$(Platform)\$(Configuration);..\..\..\..\ZenLib\Project\MSVC2010\Library\$(Platform)\$(Configuration);..\..\..\..\zlib\projects\MSVC2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>../../../Source/MediaInfoDLL/MediaInfoDLL.def</ModuleDefinitionFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <SetChecksum>true</SetChecksum>
+      <ModuleDefinitionFile>../../../Source/MediaInfoDLL/MediaInfoDLL.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <AdditionalIncludeDirectories>../../../Source;../../../../ZenLib/Source;../../../../Shared/Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MEDIAINFODLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MEDIAINFODLL_EXPORTS_NODLLEXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
-      <DisableSpecificWarnings>4060;4065;4100;4127;4390;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <EnablePREfast>true</EnablePREfast>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>MediaInfo.lib;ZenLib.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)MediaInfo.dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\..\Project\MSVC2010\Library\$(Platform)\$(Configuration);..\..\..\..\ZenLib\Project\MSVC2010\Library\$(Platform)\$(Configuration);..\..\..\..\zlib\projects\MSVC2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>../../../Source/MediaInfoDLL/MediaInfoDLL.def</ModuleDefinitionFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <SetChecksum>true</SetChecksum>
+      <ModuleDefinitionFile>../../../Source/MediaInfoDLL/MediaInfoDLL.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>../../../Source;../../../../ZenLib/Source;../../../../Shared/Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MEDIAINFODLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MEDIAINFODLL_EXPORTS_NODLLEXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableSpecificWarnings>4060;4065;4100;4127;4390;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <EnablePREfast>true</EnablePREfast>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>MediaInfo.lib;ZenLib.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)MediaInfo.dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\..\Project\MSVC2010\Library\$(Platform)\$(Configuration);..\..\..\..\ZenLib\Project\MSVC2010\Library\$(Platform)\$(Configuration);..\..\..\..\zlib\projects\MSVC2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>../../../Source/MediaInfoDLL/MediaInfoDLL.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
       <TargetMachine>MachineX86</TargetMachine>
+      <ModuleDefinitionFile>../../../Source/MediaInfoDLL/MediaInfoDLL.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'">
     <ClCompile>
       <WarningLevel>Level4</WarningLevel>
-      <DisableSpecificWarnings>4060;4065;4100;4127;4390;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <EnablePREfast>true</EnablePREfast>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>MediaInfo.lib;ZenLib.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)MediaInfo.dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\..\Project\MSVC2010\Library\$(Platform)\$(Configuration);..\..\..\..\ZenLib\Project\MSVC2010\Library\$(Platform)\$(Configuration);..\..\..\..\zlib\projects\MSVC2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+    <Link>
       <ModuleDefinitionFile>../../../Source/MediaInfoDLL/MediaInfoDLL.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
@@ -312,35 +249,34 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <AdditionalIncludeDirectories>../../../Source;../../../../ZenLib/Source;../../../../Shared/Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MEDIAINFODLL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;MEDIAINFODLL_EXPORTS_NODLLEXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
-      <DisableSpecificWarnings>4060;4065;4100;4127;4390;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <EnablePREfast>true</EnablePREfast>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <OmitFramePointers>true</OmitFramePointers>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>MediaInfo.lib;ZenLib.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)MediaInfo.dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\..\Project\MSVC2010\Library\$(Platform)\$(Configuration);..\..\..\..\ZenLib\Project\MSVC2010\Library\$(Platform)\$(Configuration);..\..\..\..\zlib\projects\MSVC2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>../../../Source/MediaInfoDLL/MediaInfoDLL.def</ModuleDefinitionFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <SetChecksum>true</SetChecksum>
+      <ModuleDefinitionFile>../../../Source/MediaInfoDLL/MediaInfoDLL.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'">
     <ClCompile>
       <WarningLevel>Level4</WarningLevel>
-      <DisableSpecificWarnings>4060;4065;4100;4127;4390;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <EnablePREfast>true</EnablePREfast>
+      <DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>MediaInfo.lib;ZenLib.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)MediaInfo.dll</OutputFile>
-      <AdditionalLibraryDirectories>..\..\..\Project\MSVC2010\Library\$(Platform)\$(Configuration);..\..\..\..\ZenLib\Project\MSVC2010\Library\$(Platform)\$(Configuration);..\..\..\..\zlib\projects\MSVC2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <SetChecksum>true</SetChecksum>
       <ModuleDefinitionFile>../../../Source/MediaInfoDLL/MediaInfoDLL.def</ModuleDefinitionFile>
     </Link>
   </ItemDefinitionGroup>
@@ -354,6 +290,12 @@
     <ResourceCompile Include="MediaInfo.rc" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\ZenLib\Project\MSVC2010\Library\ZenLib.vcxproj">
+      <Project>{0da1da7d-f393-4e7c-a7ce-cb5c6a67bc94}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\zlib\projects\MSVC2010\zlib.vcxproj">
+      <Project>{fd328ae2-5136-460f-a622-12cfd4d4c131}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\Library\MediaInfoLib.vcxproj">
       <Project>{20e0f8d6-213c-460b-b361-9c725cb375c7}</Project>
     </ProjectReference>

libmediainfo_0.7.34.tar.bz2/Project/MSVC2010/Dll/MediaInfoDll.vcxproj.filters -> libmediainfo_0.7.60.tar.bz2/Project/MSVC2010/Dll/MediaInfoDll.vcxproj.filters Changed

@@ -5,10 +5,6 @@
       <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
     </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
     <Filter Include="Resource Files">
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
@@ -20,13 +16,13 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\..\Source\MediaInfoDLL\MediaInfoDLL.def">
-      <Filter>Source Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
     <ResourceCompile Include="MediaInfo.rc">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\Source\MediaInfoDLL\MediaInfoDLL.def">
+      <Filter>Source Files</Filter>
+    </None>
+  </ItemGroup>
 </Project>
\ No newline at end of file

libmediainfo_0.7.34.tar.bz2/Project/MSVC2010/Library/MediaInfoLib.vcxproj -> libmediainfo_0.7.60.tar.bz2/Project/MSVC2010/Library/MediaInfoLib.vcxproj Changed

@@ -121,30 +121,6 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'">$(Platform)\$(Configuration)\Intermediate\</IntDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'">$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'">$(Platform)\$(Configuration)\Intermediate\</IntDir>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MediaInfo</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MediaInfo</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'">MediaInfo</TargetName>
@@ -153,155 +129,153 @@
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MediaInfo</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'">MediaInfo</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MediaInfo</TargetName>
-    <RunCodeAnalysis Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</RunCodeAnalysis>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../../Source;../../../../ZenLib/Source;../../../../ZLib;../../../../curl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MEDIAINFO_TRACE_NO;MEDIAINFO_LIBCURL_NO;MEDIAINFO_LIBMMS_NO;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/tinyxml2;../../../Source/ThirdParty/base64;../../../../ZenLib/Source;../../../../ZLib;../../../../curl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;MEDIAINFO_LIBCURL_DLL_RUNTIME;MEDIAINFO_DVDIF_ANALYZE_NO;MEDIAINFO_MPEGTS_DUPLICATE_NO;MEDIAINFO_TRACE_NO;MEDIAINFO_LIBMMS_NO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableSpecificWarnings>4060;4065;4100;4127;4390;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <EnablePREfast>true</EnablePREfast>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>MediaInfo/PreComp.h</PrecompiledHeaderFile>
+      <DisableSpecificWarnings>4100;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Lib>
-      <OutputFile>$(OutDir)MediaInfo.lib</OutputFile>
+      <TargetMachine>MachineX86</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
     <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../../Source;../../../../ZenLib/Source;../../../../ZLib;../../../../Shared/Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;MEDIAINFO_TRACE_NO;MEDIAINFO_LIBCURL_NO;MEDIAINFO_LIBMMS_NO;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/tinyxml2;../../../Source/ThirdParty/tinyxml2;../../../Source/ThirdParty/base64;../../../../ZenLib/Source;../../../../ZLib;../../../../curl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;MEDIAINFO_LIBCURL_DLL_RUNTIME;MEDIAINFO_ADVANCEDx_NO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <DisableSpecificWarnings>4060;4065;4100;4127;4390;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <EnablePREfast>true</EnablePREfast>
+      <DisableSpecificWarnings>4100;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <PrecompiledHeaderFile>MediaInfo/PreComp.h</PrecompiledHeaderFile>
     </ClCompile>
     <Lib>
-      <OutputFile>$(OutDir)MediaInfo.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>../../../Source;../../../../ZenLib/Source;../../../../ZLib;../../../../Shared/Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;MEDIAINFO_TRACE_NO;MEDIAINFO_LIBCURL_NO;MEDIAINFO_LIBMMS_NO;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
+      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/tinyxml2;../../../Source/ThirdParty/base64;../../../../ZenLib/Source;../../../../ZLib;../../../../curl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
-      <DisableSpecificWarnings>4060;4065;4100;4127;4390;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4100;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <PreprocessorDefinitions>WIN32;NDEBUG;MEDIAINFO_DVDIF_ANALYZE_NO;MEDIAINFO_MPEGTS_DUPLICATE_NO;MEDIAINFO_TRACE_NO;MEDIAINFO_LIBMMS_NO;MEDIAINFO_LIBCURL_DLL_RUNTIME;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>MediaInfo/PreComp.h</PrecompiledHeaderFile>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <OmitFramePointers>true</OmitFramePointers>
     </ClCompile>
     <Lib>
-      <OutputFile>$(OutDir)MediaInfo.lib</OutputFile>
+      <TargetMachine>MachineX86</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <TargetEnvironment>X64</TargetEnvironment>
-    </Midl>
     <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>../../../Source;../../../../ZenLib/Source;../../../../ZLib;../../../../Shared/Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;MEDIAINFO_TRACE_NO;MEDIAINFO_LIBCURL_NO;MEDIAINFO_LIBMMS_NO;CURL_STATICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/tinyxml2;../../../Source/ThirdParty/base64;../../../../ZenLib/Source;../../../../ZLib;../../../../curl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;MEDIAINFO_TRACE_NO;MEDIAINFO_EVENTS_NO;MEDIAINFO_DEMUX_NO;MEDIAINFO_DVDIF_ANALYZE_NO;MEDIAINFO_MPEGTS_DUPLICATE_NO;MEDIAINFO_SEEK_NO;MEDIAINFO_NEXTPACKET_NO;MEDIAINFO_IBI_NO;MEDIAINFO_LIBCURL_NO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
-      <DisableSpecificWarnings>4060;4065;4100;4127;4390;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4100;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>MediaInfo/PreComp.h</PrecompiledHeaderFile>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
     </ClCompile>
     <Lib>
-      <OutputFile>$(OutDir)MediaInfo.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'">
     <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../../Source;../../../../ZenLib/Source;../../../../ZLib;../../../../Shared/Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
+      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/tinyxml2;../../../Source/ThirdParty/base64;../../../../ZenLib/Source;../../../../ZLib;../../../../curl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;MEDIAINFO_LIBCURL_NO;MEDIAINFO_LIBMMS_NO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <DisableSpecificWarnings>4060;4065;4100;4127;4390;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <EnablePREfast>true</EnablePREfast>
+      <DisableSpecificWarnings>4100;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>MediaInfo/PreComp.h</PrecompiledHeaderFile>
     </ClCompile>
     <Lib>
-      <OutputFile>$(OutDir)MediaInfo.lib</OutputFile>
+      <TargetMachine>MachineX86</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'">
     <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>../../../Source;../../../../ZenLib/Source;../../../../ZLib;../../../../Shared/Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/tinyxml2;../../../Source/ThirdParty/base64;../../../../ZenLib/Source;../../../../ZLib;../../../../curl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <WarningLevel>Level4</WarningLevel>
-      <DisableSpecificWarnings>4060;4065;4100;4127;4390;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-      <EnablePREfast>true</EnablePREfast>
+      <DisableSpecificWarnings>4100;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>MediaInfo/PreComp.h</PrecompiledHeaderFile>
     </ClCompile>
     <Lib>
-      <OutputFile>$(OutDir)MediaInfo.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'">
     <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>../../../Source;../../../../ZenLib/Source;../../../../ZLib;../../../../Shared/Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalUsingDirectories>%(AdditionalUsingDirectories)</AdditionalUsingDirectories>
+      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/tinyxml2;../../../Source/ThirdParty/base64;../../../../ZenLib/Source;../../../../ZLib;../../../../curl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;MEDIAINFO_TRACE_NO;MEDIAINFO_LIBCURL_NO;MEDIAINFO_LIBMMS_NO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <RuntimeTypeInfo>false</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
-      <DisableSpecificWarnings>4060;4065;4100;4127;4390;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4100;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>MediaInfo/PreComp.h</PrecompiledHeaderFile>
     </ClCompile>
     <Lib>
-      <OutputFile>$(OutDir)MediaInfo.lib</OutputFile>
+      <TargetMachine>MachineX86</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'">
     <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>../../../Source;../../../../ZenLib/Source;../../../../ZLib;../../../../Shared/Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../../Source;../../../Source/ThirdParty/tinyxml2;../../../Source/ThirdParty/base64;../../../../ZenLib/Source;../../../../ZLib;../../../../curl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <WarningLevel>Level4</WarningLevel>
-      <DisableSpecificWarnings>4060;4065;4100;4127;4390;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4100;4127;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>MediaInfo/PreComp.h</PrecompiledHeaderFile>
     </ClCompile>
     <Lib>
-      <OutputFile>$(OutDir)MediaInfo.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Archive\File_Iso9660.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Aac_GeneralAudio.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Aac_GeneralAudio_Sbr.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Aac_GeneralAudio_Sbr_Ps.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Aac_Main.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Aac_Others.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Celt.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_ChannelGrouping.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_DolbyE.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Opus.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Rkau.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Export\Export_reVTMD.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\File__Analyze.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\File__Analyze_Buffer.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\File__Analyze_Buffer_MinimizeSize.cpp" />
@@ -313,6 +287,11 @@
     <ClCompile Include="..\..\..\Source\MediaInfo\File_Dummy.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\File_Other.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\File_Unknown.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Image\File_Dpx.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Image\File_Exr.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Image\File_Pcx.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Image\File_Psd.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Image\File_Tga.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\MediaInfo.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\MediaInfo_Config.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\MediaInfo_Config_Automatic.cpp" />
@@ -333,9 +312,7 @@
     <ClCompile Include="..\..\..\Source\MediaInfo\Archive\File_Zip.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Aac.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Ac3.cpp" />
-    <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Adif.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Adpcm.cpp" />
-    <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Adts.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Aes3.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Als.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Amr.cpp" />
@@ -347,12 +324,10 @@
     <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Flac.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_ImpulseTracker.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_La.cpp" />
-    <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Latm.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Midi.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Module.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Mpc.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_MpcSv8.cpp" />
-    <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Mpeg4_AudioSpecificConfig.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Mpega.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Pcm.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Ps2Audio.cpp" />
@@ -363,11 +338,35 @@
     <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_TwinVQ.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Vorbis.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Wvpk.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Ancillary.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Dcp.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Dxw.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Gxf_TimeCode.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Hls.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Ibi.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Ibi_Creation.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Ism.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Ivf.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Lxf.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_P2_Clip.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_SequenceInfo.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Xdcam_Clip.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File__ReferenceFilesHelper.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\PreComp.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='DebugA|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='ReleaseA|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="..\..\..\Source\MediaInfo\Text\File_DtvccTransport.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Text\File_DvbSubtitle.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Text\File_Scc.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Text\File_Teletext.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\TimeCode.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Video\File_Avc.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Video\File_Avc_Duplicate.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Video\File_AvsV.cpp" />
@@ -375,9 +374,11 @@
     <ClCompile Include="..\..\..\Source\MediaInfo\Video\File_Dirac.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Video\File_Flic.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Video\File_Fraps.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Video\File_H263.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Video\File_Lagarith.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Video\File_Mpeg4v.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Video\File_Mpegv.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Video\File_ProRes.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Video\File_Theora.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Video\File_Vc1.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Image\File_Bmp.cpp" />
@@ -428,20 +429,7 @@
     <ClCompile Include="..\..\..\Source\MediaInfo\Text\File_Scte20.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Tag\File__Tags.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Tag\File_ApeTag.cpp" />
-    <ClCompile Include="..\..\..\Source\MediaInfo\Tag\File_Id3.cpp">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='DebugA|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseA|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Tag\File_Id3.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Tag\File_Id3v2.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Tag\File_Lyrics3.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Tag\File_Lyrics3v2.cpp" />
@@ -455,8 +443,26 @@
     <ClCompile Include="..\..\..\Source\MediaInfo\Reader\Reader_libmms.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Export\Export_Mpeg7.cpp" />
     <ClCompile Include="..\..\..\Source\MediaInfo\Export\Export_PBCore.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Video\File_Vc3.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Video\File_Vp8.cpp" />
+    <ClCompile Include="..\..\..\Source\MediaInfo\Video\File_Y4m.cpp" />
+    <ClCompile Include="..\..\..\Source\ThirdParty\tinyxml2\tinyxml2.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Archive\File_Iso9660.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Aac_GeneralAudio.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Aac_GeneralAudio_Sbr.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Aac_GeneralAudio_Sbr_Ps.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Celt.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_ChannelGrouping.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_DolbyE.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Opus.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Rkau.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Export\Export_reVTMD.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\File__Analyse_Automatic.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\File__Analyze.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\File__Analyze_MinimizeSize.h" />
@@ -466,6 +472,11 @@
     <ClInclude Include="..\..\..\Source\MediaInfo\File_Dummy.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\File_Other.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\File_Unknown.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Image\File_Dpx.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Image\File_Exr.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Image\File_Pcx.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Image\File_Psd.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Image\File_Tga.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\MediaInfo.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\MediaInfo_Config.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\MediaInfo_Config_MediaInfo.h" />
@@ -474,11 +485,23 @@
     <ClInclude Include="..\..\..\Source\MediaInfo\MediaInfo_Internal_Const.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\MediaInfoList.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\MediaInfoList_Internal.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Ancillary.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Dcp.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Dxw.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Gxf_TimeCode.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Hls.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Ibi.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Ibi_Creation.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Ism.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Ivf.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Lxf.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_P2_Clip.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_SequenceInfo.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Xdcam_Clip.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File__ReferenceFilesHelper.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\PreComp.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Reader\Reader_libcurl_Include.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Reader\Reader__Base.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Setup.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Archive\File_7z.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Archive\File_Ace.h" />
@@ -491,27 +514,22 @@
     <ClInclude Include="..\..\..\Source\MediaInfo\Archive\File_Zip.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Aac.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Ac3.h" />
-    <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Adif.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Adpcm.h" />
-    <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Adts.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Aes3.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Als.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Amr.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Amv.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Ape.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Au.h" />
-    <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Dirac.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Dts.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_ExtendedModule.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Flac.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_ImpulseTracker.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_La.h" />
-    <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Latm.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Midi.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Module.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Mpc.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_MpcSv8.h" />
-    <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Mpeg4_AudioSpecificConfig.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Mpega.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Pcm.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Ps2Audio.h" />
@@ -554,15 +572,22 @@
     <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Umf.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Wm.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Text\File_DtvccTransport.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Text\File_DvbSubtitle.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Text\File_Scc.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Text\File_Scte20.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Text\File_Teletext.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\TimeCode.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Video\File_Avc.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Video\File_AvsV.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Video\File_AfdBarData.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Video\File_Dirac.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Video\File_Flic.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Video\File_Fraps.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Video\File_H263.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Video\File_Lagarith.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Video\File_Mpeg4v.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Video\File_Mpegv.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Video\File_ProRes.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Video\File_Theora.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Video\File_Vc1.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Text\File_Cdp.h" />
@@ -589,6 +614,11 @@
     <ClInclude Include="..\..\..\Source\MediaInfo\Reader\Reader_libmms.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Export\Export_Mpeg7.h" />
     <ClInclude Include="..\..\..\Source\MediaInfo\Export\Export_PBCore.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Video\File_Vc3.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Video\File_Vp8.h" />
+    <ClInclude Include="..\..\..\Source\MediaInfo\Video\File_Y4m.h" />
+    <ClInclude Include="..\..\..\Source\ThirdParty\base64\base64.h" />
+    <ClInclude Include="..\..\..\Source\ThirdParty\tinyxml2\tinyxml2.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\ZenLib\Project\MSVC2010\Library\ZenLib.vcxproj">

libmediainfo_0.7.34.tar.bz2/Project/MSVC2010/Library/MediaInfoLib.vcxproj.filters -> libmediainfo_0.7.60.tar.bz2/Project/MSVC2010/Library/MediaInfoLib.vcxproj.filters Changed

@@ -69,9 +69,14 @@
     <Filter Include="Header Files\Export">
       <UniqueIdentifier>{fb691036-49d1-42d5-a991-92e4e43a27ec}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    <Filter Include="ThirdParty">
+      <UniqueIdentifier>{5dc08159-7486-493c-b920-e170f1b36077}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="ThirdParty\base64">
+      <UniqueIdentifier>{d307708b-372c-475a-98e6-a76965d555ac}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="ThirdParty\tinyxml2">
+      <UniqueIdentifier>{5b70a9dd-eddc-44ba-bce4-35d86e77acdb}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
@@ -168,15 +173,9 @@
     <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Ac3.cpp">
       <Filter>Source Files\Audio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Adif.cpp">
-      <Filter>Source Files\Audio</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Adpcm.cpp">
       <Filter>Source Files\Audio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Adts.cpp">
-      <Filter>Source Files\Audio</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Aes3.cpp">
       <Filter>Source Files\Audio</Filter>
     </ClCompile>
@@ -210,9 +209,6 @@
     <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_La.cpp">
       <Filter>Source Files\Audio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Latm.cpp">
-      <Filter>Source Files\Audio</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Midi.cpp">
       <Filter>Source Files\Audio</Filter>
     </ClCompile>
@@ -225,9 +221,6 @@
     <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_MpcSv8.cpp">
       <Filter>Source Files\Audio</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Mpeg4_AudioSpecificConfig.cpp">
-      <Filter>Source Files\Audio</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Mpega.cpp">
       <Filter>Source Files\Audio</Filter>
     </ClCompile>
@@ -495,6 +488,120 @@
     <ClCompile Include="..\..\..\Source\MediaInfo\Video\File_Fraps.cpp">
       <Filter>Source Files\Video</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Ancillary.cpp">
+      <Filter>Source Files\Multiple</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Gxf_TimeCode.cpp">
+      <Filter>Source Files\Multiple</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_DolbyE.cpp">
+      <Filter>Source Files\Audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Image\File_Dpx.cpp">
+      <Filter>Source Files\Image</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Aac_GeneralAudio.cpp">
+      <Filter>Source Files\Audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Aac_GeneralAudio_Sbr.cpp">
+      <Filter>Source Files\Audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Aac_GeneralAudio_Sbr_Ps.cpp">
+      <Filter>Source Files\Audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Aac_Main.cpp">
+      <Filter>Source Files\Audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Aac_Others.cpp">
+      <Filter>Source Files\Audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Video\File_Vc3.cpp">
+      <Filter>Source Files\Video</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Celt.cpp">
+      <Filter>Source Files\Audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_ChannelGrouping.cpp">
+      <Filter>Source Files\Audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Archive\File_Iso9660.cpp">
+      <Filter>Source Files\Archive</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Dxw.cpp">
+      <Filter>Source Files\Multiple</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Ibi.cpp">
+      <Filter>Source Files\Multiple</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Ibi_Creation.cpp">
+      <Filter>Source Files\Multiple</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Image\File_Tga.cpp">
+      <Filter>Source Files\Image</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Video\File_Y4m.cpp">
+      <Filter>Source Files\Video</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Image\File_Exr.cpp">
+      <Filter>Source Files\Image</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File__ReferenceFilesHelper.cpp">
+      <Filter>Source Files\Multiple</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Text\File_DvbSubtitle.cpp">
+      <Filter>Source Files\Text</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Text\File_Teletext.cpp">
+      <Filter>Source Files\Text</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Dcp.cpp">
+      <Filter>Source Files\Multiple</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Text\File_Scc.cpp">
+      <Filter>Source Files\Text</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Ism.cpp">
+      <Filter>Source Files\Multiple</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\TimeCode.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\PreComp.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Rkau.cpp">
+      <Filter>Source Files\Audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_SequenceInfo.cpp">
+      <Filter>Source Files\Multiple</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Export\Export_reVTMD.cpp">
+      <Filter>Source Files\Export</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Video\File_Vp8.cpp">
+      <Filter>Source Files\Video</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Video\File_H263.cpp">
+      <Filter>Source Files\Video</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Multiple\File_Hls.cpp">
+      <Filter>Source Files\Multiple</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\ThirdParty\tinyxml2\tinyxml2.cpp">
+      <Filter>ThirdParty\tinyxml2</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Audio\File_Opus.cpp">
+      <Filter>Source Files\Audio</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Video\File_ProRes.cpp">
+      <Filter>Source Files\Video</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Image\File_Psd.cpp">
+      <Filter>Source Files\Image</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\MediaInfo\Image\File_Pcx.cpp">
+      <Filter>Source Files\Image</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\Source\MediaInfo\File__Analyse_Automatic.h">
@@ -581,15 +688,9 @@
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Ac3.h">
       <Filter>Header Files\Audio</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Adif.h">
-      <Filter>Header Files\Audio</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Adpcm.h">
       <Filter>Header Files\Audio</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Adts.h">
-      <Filter>Header Files\Audio</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Aes3.h">
       <Filter>Header Files\Audio</Filter>
     </ClInclude>
@@ -608,9 +709,6 @@
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Au.h">
       <Filter>Header Files\Audio</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Dirac.h">
-      <Filter>Header Files\Audio</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Dts.h">
       <Filter>Header Files\Audio</Filter>
     </ClInclude>
@@ -626,9 +724,6 @@
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_La.h">
       <Filter>Header Files\Audio</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Latm.h">
-      <Filter>Header Files\Audio</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Midi.h">
       <Filter>Header Files\Audio</Filter>
     </ClInclude>
@@ -641,9 +736,6 @@
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_MpcSv8.h">
       <Filter>Header Files\Audio</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Mpeg4_AudioSpecificConfig.h">
-      <Filter>Header Files\Audio</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Mpega.h">
       <Filter>Header Files\Audio</Filter>
     </ClInclude>
@@ -893,5 +985,125 @@
     <ClInclude Include="..\..\..\Source\MediaInfo\Video\File_Lagarith.h">
       <Filter>Header Files\Video</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Ancillary.h">
+      <Filter>Header Files\Multiple</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Gxf_TimeCode.h">
+      <Filter>Header Files\Multiple</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_DolbyE.h">
+      <Filter>Header Files\Audio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Image\File_Dpx.h">
+      <Filter>Header Files\Image</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Aac_GeneralAudio.h">
+      <Filter>Header Files\Audio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Aac_GeneralAudio_Sbr.h">
+      <Filter>Header Files\Audio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Aac_GeneralAudio_Sbr_Ps.h">
+      <Filter>Header Files\Audio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Video\File_Vc3.h">
+      <Filter>Header Files\Video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Celt.h">
+      <Filter>Header Files\Audio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Text\File_Scte20.h">
+      <Filter>Header Files\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Reader\Reader__Base.h">
+      <Filter>Header Files\Reader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_ChannelGrouping.h">
+      <Filter>Header Files\Video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Archive\File_Iso9660.h">
+      <Filter>Header Files\Archive</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Dxw.h">
+      <Filter>Header Files\Multiple</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Ibi.h">
+      <Filter>Header Files\Multiple</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Ibi_Creation.h">
+      <Filter>Header Files\Multiple</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Image\File_Tga.h">
+      <Filter>Header Files\Image</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Video\File_Y4m.h">
+      <Filter>Header Files\Video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Image\File_Exr.h">
+      <Filter>Header Files\Image</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File__ReferenceFilesHelper.h">
+      <Filter>Header Files\Multiple</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Text\File_DvbSubtitle.h">
+      <Filter>Header Files\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Text\File_Teletext.h">
+      <Filter>Header Files\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Dcp.h">
+      <Filter>Header Files\Multiple</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Text\File_Scc.h">
+      <Filter>Header Files\Text</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Ism.h">
+      <Filter>Header Files\Multiple</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\TimeCode.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Reader\Reader_libcurl_Include.h">
+      <Filter>Header Files\Reader</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Rkau.h">
+      <Filter>Header Files\Audio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_SequenceInfo.h">
+      <Filter>Header Files\Multiple</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Export\Export_reVTMD.h">
+      <Filter>Header Files\Export</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\ThirdParty\base64\base64.h">
+      <Filter>ThirdParty\base64</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Video\File_Vp8.h">
+      <Filter>Header Files\Video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Video\File_H263.h">
+      <Filter>Header Files\Video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Hls.h">
+      <Filter>Header Files\Multiple</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Multiple\File_Hls.h">
+      <Filter>Header Files\Multiple</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\ThirdParty\tinyxml2\tinyxml2.h">
+      <Filter>ThirdParty\tinyxml2</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Audio\File_Opus.h">
+      <Filter>Header Files\Audio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Video\File_ProRes.h">
+      <Filter>Header Files\Video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Image\File_Psd.h">
+      <Filter>Header Files\Image</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\Source\MediaInfo\Image\File_Pcx.h">
+      <Filter>Header Files\Image</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

libmediainfo_0.7.34.tar.bz2/Project/MSVC2010/MediaInfoLib.sln -> libmediainfo_0.7.60.tar.bz2/Project/MSVC2010/MediaInfoLib.sln Changed

@@ -15,6 +15,12 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\..\zlib\projects\MSVC2010\zlib.vcxproj", "{FD328AE2-5136-460F-A622-12CFD4D4C131}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RegressionTest", "RegressionTest\RegressionTest.vcxproj", "{91C094CA-1170-4CE4-9B79-17324C8DACA8}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94} = {0DA1DA7D-F393-4E7C-A7CE-CB5C6A67BC94}
+		{BE6D3EF8-2F82-4F1E-956A-890C3614A2D5} = {BE6D3EF8-2F82-4F1E-956A-890C3614A2D5}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -123,6 +129,18 @@
 		{FD328AE2-5136-460F-A622-12CFD4D4C131}.ReleaseA|Win32.Build.0 = Release|Win32
 		{FD328AE2-5136-460F-A622-12CFD4D4C131}.ReleaseA|x64.ActiveCfg = Release|x64
 		{FD328AE2-5136-460F-A622-12CFD4D4C131}.ReleaseA|x64.Build.0 = Release|x64
+		{91C094CA-1170-4CE4-9B79-17324C8DACA8}.Debug|Win32.ActiveCfg = Debug|Win32
+		{91C094CA-1170-4CE4-9B79-17324C8DACA8}.Debug|Win32.Build.0 = Debug|Win32
+		{91C094CA-1170-4CE4-9B79-17324C8DACA8}.Debug|x64.ActiveCfg = Debug|Win32
+		{91C094CA-1170-4CE4-9B79-17324C8DACA8}.DebugA|Win32.ActiveCfg = Debug|Win32
+		{91C094CA-1170-4CE4-9B79-17324C8DACA8}.DebugA|Win32.Build.0 = Debug|Win32
+		{91C094CA-1170-4CE4-9B79-17324C8DACA8}.DebugA|x64.ActiveCfg = Debug|Win32
+		{91C094CA-1170-4CE4-9B79-17324C8DACA8}.Release|Win32.ActiveCfg = Release|Win32
+		{91C094CA-1170-4CE4-9B79-17324C8DACA8}.Release|Win32.Build.0 = Release|Win32
+		{91C094CA-1170-4CE4-9B79-17324C8DACA8}.Release|x64.ActiveCfg = Release|Win32
+		{91C094CA-1170-4CE4-9B79-17324C8DACA8}.ReleaseA|Win32.ActiveCfg = Release|Win32
+		{91C094CA-1170-4CE4-9B79-17324C8DACA8}.ReleaseA|Win32.Build.0 = Release|Win32
+		{91C094CA-1170-4CE4-9B79-17324C8DACA8}.ReleaseA|x64.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

libmediainfo_0.7.60.tar.bz2/Project/MSVC2010/RegressionTest Added

libmediainfo_0.7.60.tar.bz2/Project/MSVC2010/RegressionTest/RegressionTest.vcxproj Added

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\Source\RegressionTest\RegressionTest.cpp" />
+    <ClCompile Include="..\..\..\Source\RegressionTest\RegressionTest_Basic.cpp" />
+    <ClCompile Include="..\..\..\Source\RegressionTest\RegressionTest_Events.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\Source\RegressionTest\RegressionTest.h" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{91C094CA-1170-4CE4-9B79-17324C8DACA8}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>RegressionTest</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\Intermediate\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\Intermediate\</IntDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\Source;..\..\..\..\ZenLib\Source</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>..\..\..\..\ZenLib\Project\MSVC2010\Library\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>ZenLib.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\..\Source;..\..\..\..\ZenLib\Source</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>ZenLib.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>..\..\..\..\ZenLib\Project\MSVC2010\Library\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

libmediainfo_0.7.60.tar.bz2/Project/MSVC2010/RegressionTest/RegressionTest.vcxproj.filters Added

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\Source\RegressionTest\RegressionTest_Basic.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\RegressionTest\RegressionTest_Events.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\Source\RegressionTest\RegressionTest.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\Source\RegressionTest\RegressionTest.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file

libmediainfo_0.7.60.tar.bz2/Project/MSVC2010/RegressionTest/Win32 Added

libmediainfo_0.7.60.tar.bz2/Project/MSVC2010/RegressionTest/Win32/Debug Added

libmediainfo_0.7.60.tar.bz2/Project/MSVC2010/RegressionTest/Win32/Debug/Intermediate Added

libmediainfo_0.7.60.tar.bz2/Project/MSVC2010/RegressionTest/Win32/Debug/Intermediate/RegressionTest_manifest.rc Added

libmediainfo_0.7.34.tar.bz2/Project/MSVC2010/ShellExtension/MediaInfoShellExt.cpp -> libmediainfo_0.7.60.tar.bz2/Project/MSVC2010/ShellExtension/MediaInfoShellExt.cpp Changed

libmediainfo_0.7.60.tar.bz2/Project/MSVC2010/ShellExtension/MediaInfoShellExt.h Added

@@ -0,0 +1,173 @@
+
+
+/* this ALWAYS GENERATED file contains the definitions for the interfaces */
+
+
+ /* File created by MIDL compiler version 7.00.0555 */
+/* at Wed Aug 08 11:24:42 2012
+ */
+/* Compiler settings for MediaInfoShellExt.idl:
+    Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555
+    protocol : dce , ms_ext, c_ext
+    error checks: allocation ref bounds_check enum stub_data
+    VC __declspec() decoration level:
+         __declspec(uuid()), __declspec(selectany), __declspec(novtable)
+         DECLSPEC_UUID(), MIDL_INTERFACE()
+*/
+/* @@MIDL_FILE_HEADING(  ) */
+
+#pragma warning( disable: 4049 )  /* more than 64k source lines */
+
+
+/* verify that the <rpcndr.h> version is high enough to compile this file*/
+#ifndef __REQUIRED_RPCNDR_H_VERSION__
+#define __REQUIRED_RPCNDR_H_VERSION__ 440
+#endif
+
+#include "rpc.h"
+#include "rpcndr.h"
+
+#ifndef __RPCNDR_H_VERSION__
+#error this stub requires an updated version of <rpcndr.h>
+#endif // __RPCNDR_H_VERSION__
+
+#ifndef COM_NO_WINDOWS_H
+#include "windows.h"
+#include "ole2.h"
+#endif /*COM_NO_WINDOWS_H*/
+
+#ifndef __MediaInfoShellExt_h__
+#define __MediaInfoShellExt_h__
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#pragma once
+#endif
+
+/* Forward Declarations */
+
+#ifndef __IMediaInfoShellExt__FWD_DEFINED__
+#define __IMediaInfoShellExt__FWD_DEFINED__
+typedef interface IMediaInfoShellExt_ IMediaInfoShellExt_;
+#endif  /* __IMediaInfoShellExt__FWD_DEFINED__ */
+
+
+#ifndef __MediaInfoShellExt__FWD_DEFINED__
+#define __MediaInfoShellExt__FWD_DEFINED__
+
+#ifdef __cplusplus
+typedef class MediaInfoShellExt_ MediaInfoShellExt_;
+#else
+typedef struct MediaInfoShellExt_ MediaInfoShellExt_;
+#endif /* __cplusplus */
+
+#endif  /* __MediaInfoShellExt__FWD_DEFINED__ */
+
+
+/* header files for imported files */
+#include "oaidl.h"
+#include "ocidl.h"
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+
+#ifndef __IMediaInfoShellExt__INTERFACE_DEFINED__
+#define __IMediaInfoShellExt__INTERFACE_DEFINED__
+
+/* interface IMediaInfoShellExt_ */
+/* [unique][helpstring][uuid][object] */
+
+
+EXTERN_C const IID IID_IMediaInfoShellExt_;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+
+    MIDL_INTERFACE("6482FE39-D67B-49E5-BAA1-EBDDB318055D")
+    IMediaInfoShellExt_ : public IUnknown
+    {
+    public:
+    };
+
+#else   /* C style interface */
+
+    typedef struct IMediaInfoShellExt_Vtbl
+    {
+        BEGIN_INTERFACE
+
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )(
+            IMediaInfoShellExt_ * This,
+            /* [in] */ REFIID riid,
+            /* [annotation][iid_is][out] */
+            __RPC__deref_out  void **ppvObject);
+
+        ULONG ( STDMETHODCALLTYPE *AddRef )(
+            IMediaInfoShellExt_ * This);
+
+        ULONG ( STDMETHODCALLTYPE *Release )(
+            IMediaInfoShellExt_ * This);
+
+        END_INTERFACE
+    } IMediaInfoShellExt_Vtbl;
+
+    interface IMediaInfoShellExt_
+    {
+        CONST_VTBL struct IMediaInfoShellExt_Vtbl *lpVtbl;
+    };
+
+
+
+#ifdef COBJMACROS
+
+
+#define IMediaInfoShellExt__QueryInterface(This,riid,ppvObject) \
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) )
+
+#define IMediaInfoShellExt__AddRef(This)    \
+    ( (This)->lpVtbl -> AddRef(This) )
+
+#define IMediaInfoShellExt__Release(This)   \
+    ( (This)->lpVtbl -> Release(This) )
+
+
+#endif /* COBJMACROS */
+
+
+#endif  /* C style interface */
+
+
+
+
+#endif  /* __IMediaInfoShellExt__INTERFACE_DEFINED__ */
+
+
+
+#ifndef __MediaInfoShellExtLib_LIBRARY_DEFINED__
+#define __MediaInfoShellExtLib_LIBRARY_DEFINED__
+
+/* library MediaInfoShellExtLib */
+/* [helpstring][version][uuid] */
+
+
+EXTERN_C const IID LIBID_MediaInfoShellExtLib;
+
+EXTERN_C const CLSID CLSID_MediaInfoShellExt_;
+
+#ifdef __cplusplus
+
+class DECLSPEC_UUID("869C14C8-1830-491F-B575-5F9AB40D2B42")
+MediaInfoShellExt_;
+#endif
+#endif /* __MediaInfoShellExtLib_LIBRARY_DEFINED__ */
+
+/* Additional Prototypes for ALL interfaces */
+
+/* end of Additional Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+

libmediainfo_0.7.34.tar.bz2/Project/MSVC2010/ShellExtension/MediaInfoShellExt.rc -> libmediainfo_0.7.60.tar.bz2/Project/MSVC2010/ShellExtension/MediaInfoShellExt.rc Changed

libmediainfo_0.7.34.tar.bz2/Project/MSVC2010/ShellExtension/MediaInfoShellExt.vcxproj -> libmediainfo_0.7.60.tar.bz2/Project/MSVC2010/ShellExtension/MediaInfoShellExt.vcxproj Changed

@@ -28,6 +28,7 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfAtl>Static</UseOfAtl>
     <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -38,6 +39,7 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfAtl>Static</UseOfAtl>
     <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -74,18 +76,6 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\Intermediate\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MediaInfo_InfoTip</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MediaInfo_InfoTip</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MediaInfo_InfoTip</TargetName>
@@ -109,12 +99,12 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\MediaInfoLib\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -125,7 +115,7 @@
       <AdditionalDependencies>MediaInfo.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)MediaInfo_InfoTip.dll</OutputFile>
       <AdditionalLibraryDirectories>../../../../MediaInfoLib/Project/MSVC2010/DLL\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>.\MediaInfoShellExt.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>MediaInfoShellExt.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
@@ -148,12 +138,12 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>..\..\..\..\MediaInfoLib\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -164,7 +154,7 @@
       <AdditionalDependencies>MediaInfo.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)MediaInfo_InfoTip.dll</OutputFile>
       <AdditionalLibraryDirectories>../../../../MediaInfoLib/Project/MSVC2010/DLL\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>.\MediaInfoShellExt.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>MediaInfoShellExt.def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
@@ -191,6 +181,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -201,9 +192,12 @@
       <AdditionalDependencies>MediaInfo.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)MediaInfo_InfoTip.dll</OutputFile>
       <AdditionalLibraryDirectories>../../../../MediaInfoLib/Project/MSVC2010/DLL\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>.\MediaInfoShellExt.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>MediaInfoShellExt.def</ModuleDefinitionFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX86</TargetMachine>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <SetChecksum>true</SetChecksum>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -226,6 +220,7 @@
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -236,9 +231,12 @@
       <AdditionalDependencies>MediaInfo.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)MediaInfo_InfoTip.dll</OutputFile>
       <AdditionalLibraryDirectories>../../../../MediaInfoLib/Project/MSVC2010/DLL\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <ModuleDefinitionFile>.\MediaInfoShellExt.def</ModuleDefinitionFile>
+      <ModuleDefinitionFile>MediaInfoShellExt.def</ModuleDefinitionFile>
       <SubSystem>Windows</SubSystem>
       <TargetMachine>MachineX64</TargetMachine>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <SetChecksum>true</SetChecksum>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

libmediainfo_0.7.34.tar.bz2/Project/MSVC2010/ShellExtension/MediaInfoShellExt_.cpp -> libmediainfo_0.7.60.tar.bz2/Project/MSVC2010/ShellExtension/MediaInfoShellExt_.cpp Changed

libmediainfo_0.7.60.tar.bz2/Project/MSVC2010/ShellExtension/MediaInfoShellExt_.h Added

@@ -0,0 +1,70 @@
+// MediaInfoShellExt_.h : Declaration of the CMediaInfoShellExt_
+
+#pragma once
+#include "resource.h"       // main symbols
+#include "MediaInfoShellExt.h"
+#include <comdef.h>
+struct __declspec(uuid("00021500-0000-0000-c000-000000000046")) IQueryInfo;
+#include <shlobj.h>
+#include <string>
+
+
+#if defined(_WIN32_WCE) && !defined(_CE_DCOM) && !defined(_CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA)
+#error "Single-threaded COM objects are not properly supported on Windows CE platform, such as the Windows Mobile platforms that do not include full DCOM support. Define _CE_ALLOW_SINGLE_THREADED_OBJECTS_IN_MTA to force ATL to support creating single-thread COM object's and allow use of it's single-threaded COM object implementations. The threading model in your rgs file was set to 'Free' as that is the only threading model supported in non DCOM Windows CE platforms."
+#endif
+
+
+
+// CMediaInfoShellExt_
+
+class ATL_NO_VTABLE CMediaInfoShellExt_ :
+    public CComObjectRootEx<CComSingleThreadModel>,
+    public CComCoClass<CMediaInfoShellExt_, &CLSID_MediaInfoShellExt_>,
+    public IPersistFile,
+    public IQueryInfo
+{
+public:
+    CMediaInfoShellExt_()
+    {
+    }
+
+DECLARE_REGISTRY_RESOURCEID(IDR_MEDIAINFOSHELLEXT_)
+
+DECLARE_NOT_AGGREGATABLE(CMediaInfoShellExt_)
+
+BEGIN_COM_MAP(CMediaInfoShellExt_)
+    COM_INTERFACE_ENTRY(IPersistFile)
+    COM_INTERFACE_ENTRY(IQueryInfo)
+END_COM_MAP()
+
+
+
+    DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+    HRESULT FinalConstruct()
+    {
+        return S_OK;
+    }
+
+    void FinalRelease()
+    {
+    }
+
+protected:
+    std::wstring FileName;
+
+public:
+    // IPersistFile
+    STDMETHOD(GetClassID)(LPCLSID)      { return E_NOTIMPL; }
+    STDMETHOD(IsDirty)()                { return E_NOTIMPL; }
+    STDMETHOD(Load)(LPCOLESTR, DWORD);
+    STDMETHOD(Save)(LPCOLESTR, BOOL)    { return E_NOTIMPL; }
+    STDMETHOD(SaveCompleted)(LPCOLESTR) { return E_NOTIMPL; }
+    STDMETHOD(GetCurFile)(LPOLESTR*)    { return E_NOTIMPL; }
+
+    // IQueryInfo
+    STDMETHOD(GetInfoFlags)(DWORD*)     { return E_NOTIMPL; }
+    STDMETHOD(GetInfoTip)(DWORD, LPWSTR*);
+};
+
+OBJECT_ENTRY_AUTO(__uuidof(MediaInfoShellExt_), CMediaInfoShellExt_)

libmediainfo_0.7.60.tar.bz2/Project/MSVC2010/ShellExtension/resource.h Added

libmediainfo_0.7.60.tar.bz2/Project/MSVC2010/ShellExtension/stdafx.h Added

@@ -0,0 +1,39 @@
+// stdafx.h : include file for standard system include files,
+// or project specific include files that are used frequently,
+// but are changed infrequently
+
+#pragma once
+
+#ifndef STRICT
+#define STRICT
+#endif
+
+// Modify the following defines if you have to target a platform prior to the ones specified below.
+// Refer to MSDN for the latest info on corresponding values for different platforms.
+#ifndef WINVER              // Allow use of features specific to Windows XP or later.
+#define WINVER 0x0501       // Change this to the appropriate value to target other versions of Windows.
+#endif
+
+#ifndef _WIN32_WINNT        // Allow use of features specific to Windows XP or later.
+#define _WIN32_WINNT 0x0501 // Change this to the appropriate value to target other versions of Windows.
+#endif
+
+#ifndef _WIN32_WINDOWS      // Allow use of features specific to Windows 98 or later.
+#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
+#endif
+
+#ifndef _WIN32_IE           // Allow use of features specific to IE 6.0 or later.
+#define _WIN32_IE 0x0600    // Change this to the appropriate value to target other versions of IE.
+#endif
+
+#define _ATL_APARTMENT_THREADED
+#define _ATL_NO_AUTOMATIC_NAMESPACE
+
+#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS  // some CString constructors will be explicit
+
+
+#include "resource.h"
+#include <atlbase.h>
+#include <atlcom.h>
+
+using namespace ATL;
\ No newline at end of file

libmediainfo_0.7.34.tar.bz2/Project/Solaris/mkpkg -> libmediainfo_0.7.60.tar.bz2/Project/Solaris/mkpkg Changed

libmediainfo_0.7.34.tar.bz2/ReadMe.txt -> libmediainfo_0.7.60.tar.bz2/ReadMe.txt Changed

libmediainfo_0.7.34.tar.bz2/Release/CleanUp.bat -> libmediainfo_0.7.60.tar.bz2/Release/CleanUp.bat Changed

libmediainfo_0.7.34.tar.bz2/Release/ReadMe_DLL_Linux.txt -> libmediainfo_0.7.60.tar.bz2/Release/ReadMe_DLL_Linux.txt Changed

libmediainfo_0.7.34.tar.bz2/Release/ReadMe_DLL_Mac.txt -> libmediainfo_0.7.60.tar.bz2/Release/ReadMe_DLL_Mac.txt Changed

@@ -1,1 +1,1 @@
-libmediainfo.dylib - http://mediainfo.sourceforge.net
Copyright (c) 2002-2010 MediaArea.net SARL, Info@MediaArea.net

This program is freeware (LGLPv3+).
See License.html for more information.

For software developers
-----------------------
You can use it as you want (example: without this text file, without sources),
but a reference to "http://mediainfo.sourceforge.net" in your software would be appreciated.

There are examples for:
- GNU: GNU Autotools based
- Java: Netbeans (with JNA or JNative binding)
- Python 2
- Python 3
- C/C++
Don't forget to put libmediainfo.0.dylib in your library folder and Example.ogg in your executable folder.

Note: versioning method, for people who develop with LoadLibrary method
- if one of 2 first numbers change, there is no guaranties that the DLL is compatible with old one. You should verify with MediaInfo_Option("Version") if you are compatible
- if one of 2 last numbers change, there is a guaranty that the DLL is compatible with old one.
So you should test the version of the DLL, and if one of the 2 first numbers change, not load it.
\ No newline at end of file
+libmediainfo.dylib - http://mediainfo.sourceforge.net
Copyright (c) 2002-2012 MediaArea.net SARL, Info@MediaArea.net

This program is freeware (LGLPv2+).
See License.html for more information.

libmediainfo_0.7.34.tar.bz2/Release/ReadMe_DLL_Windows.txt -> libmediainfo_0.7.60.tar.bz2/Release/ReadMe_DLL_Windows.txt Changed

libmediainfo_0.7.34.tar.bz2/Release/Release_DLL_GNU.sub -> libmediainfo_0.7.60.tar.bz2/Release/Release_DLL_GNU.sub Changed

libmediainfo_0.7.34.tar.bz2/Release/Release_DLL_GNU_FromSource.sh -> libmediainfo_0.7.60.tar.bz2/Release/Release_DLL_GNU_FromSource.sh Changed

@@ -1,3 +1,22 @@
+# MediaInfo
+# Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http:#www.gnu.org/licenses/>.
+#
+#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
 #! /bin/sh
 
 #-----------------------------------------------------------------------
@@ -71,8 +90,8 @@
 cp -r ../../Shared/Project/_Common/*.sh MediaInfo_DLL_GNU_FromSource/Shared/Project/_Common
 mkdir -p MediaInfo_DLL_GNU_FromSource/Shared/Project/curl
 cp -r ../../Shared/Project/curl/*.sh MediaInfo_DLL_GNU_FromSource/Shared/Project/curl
-mkdir -p MediaInfo_DLL_GNU_FromSource/Shared/Project/ZLib
-cp -r ../../Shared/Project/ZLib/*.sh MediaInfo_DLL_GNU_FromSource/Shared/Project/ZLib
+mkdir -p MediaInfo_DLL_GNU_FromSource/Shared/Project/zlib
+cp -r ../../Shared/Project/zlib/*.sh MediaInfo_DLL_GNU_FromSource/Shared/Project/zlib
 
 #-----------------------------------------------------------------------
 # Preparing Archive : Automation

libmediainfo_0.7.34.tar.bz2/Release/Release_DLL_GNU_Prepare.bat -> libmediainfo_0.7.60.tar.bz2/Release/Release_DLL_GNU_Prepare.bat Changed

libmediainfo_0.7.34.tar.bz2/Release/Release_DLL_Linux_i386.sh -> libmediainfo_0.7.60.tar.bz2/Release/Release_DLL_Linux_i386.sh Changed

libmediainfo_0.7.34.tar.bz2/Release/Release_DLL_Linux_x64.sh -> libmediainfo_0.7.60.tar.bz2/Release/Release_DLL_Linux_x64.sh Changed

libmediainfo_0.7.34.tar.bz2/Release/Release_DLL_Mac_Intel.sh -> libmediainfo_0.7.60.tar.bz2/Release/Release_DLL_Mac_Intel.sh Changed

libmediainfo_0.7.34.tar.bz2/Release/Release_DLL_Mac_PPC.sh -> libmediainfo_0.7.60.tar.bz2/Release/Release_DLL_Mac_PPC.sh Changed

libmediainfo_0.7.34.tar.bz2/Release/Release_DLL_Mac_Universal.sh -> libmediainfo_0.7.60.tar.bz2/Release/Release_DLL_Mac_Universal.sh Changed

libmediainfo_0.7.34.tar.bz2/Release/Release_DLL_Windows_i386.bat -> libmediainfo_0.7.60.tar.bz2/Release/Release_DLL_Windows_i386.bat Changed

@@ -1,3 +1,22 @@
+@rem MediaInfo
+@rem Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
+@rem
+@rem This program is free software: you can redistribute it and/or modify it
+@rem under the terms of the GNU Lesser General Public License as published by
+@rem the Free Software Foundation, either version 3 of the License, or
+@rem (at your option) any later version.
+@rem
+@rem This program is distributed in the hope that it will be useful,
+@rem but WITHOUT ANY WARRANTY; without even the implied warranty of
+@rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+@rem GNU Lesser General Public License for more details.
+@rem
+@rem You should have received a copy of the GNU Lesser General Public License
+@rem along with this program. If not, see <http:@remwww.gnu.org/licenses/>.
+@rem
+@rem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+@rem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
 @echo off
 
 rem --- Clean up ---
@@ -17,7 +36,7 @@
 rmdir Doc /S /Q
 xcopy ..\Source\Doc\*.html MediaInfoDLL_Windows_i386\Developers\ /S
 mkdir MediaInfoDLL_Windows_i386\Developers\List_Of_Parameters
-copy ..\Source\Ressource\Text\Stream\*.csv MediaInfoDLL_Windows_i386\Developers\List_Of_Parameters
+copy ..\Source\Resource\Text\Stream\*.csv MediaInfoDLL_Windows_i386\Developers\List_Of_Parameters
 
 rem --- Copying : Include ---
 xcopy ..\Source\MediaInfoDLL\MediaInfoDLL.h MediaInfoDLL_Windows_i386\Developers\Source\MediaInfoDLL\
@@ -47,15 +66,24 @@
 xcopy ..\Project\Delphi\Example\*.bdsproj MediaInfoDLL_Windows_i386\Developers\Project\Delphi\Example\
 xcopy ..\Project\Delphi\Example\*.bdsgroup MediaInfoDLL_Windows_i386\Developers\Project\Delphi\Example\
 xcopy ..\Project\DevCpp\Example\*.dev MediaInfoDLL_Windows_i386\Developers\Project\DevCpp\Example\
-xcopy ..\Project\MSCS\*.sln MediaInfoDLL_Windows_i386\Developers\Project\MSCS\
-xcopy ..\Project\MSCS\Example\*.cs MediaInfoDLL_Windows_i386\Developers\Project\MSCS\Example\
-xcopy ..\Project\MSCS\Example\*.csproj MediaInfoDLL_Windows_i386\Developers\Project\MSCS\Example\
-xcopy ..\Project\MSCS\Example\*.res* MediaInfoDLL_Windows_i386\Developers\Project\MSCS\Example\
-xcopy ..\Project\MSCS\Example\*.ico MediaInfoDLL_Windows_i386\Developers\Project\MSCS\Example\
-xcopy ..\Project\MSCS\asp_net_web_application\*.cs MediaInfoDLL_Windows_i386\Developers\Project\MSCS\asp_net_web_application\ /S
-xcopy ..\Project\MSCS\asp_net_web_application\*.csproj MediaInfoDLL_Windows_i386\Developers\Project\MSCS\asp_net_web_application\
-xcopy ..\Project\MSCS\asp_net_web_application\*.aspx MediaInfoDLL_Windows_i386\Developers\Project\MSCS\asp_net_web_application\
-xcopy ..\Project\MSCS\asp_net_web_application\*.config MediaInfoDLL_Windows_i386\Developers\Project\MSCS\asp_net_web_application\
+xcopy ..\Project\MSCS2008\*.sln MediaInfoDLL_Windows_i386\Developers\Project\MSCS2008\
+xcopy ..\Project\MSCS2008\Example\*.cs MediaInfoDLL_Windows_i386\Developers\Project\MSCS2008\Example\
+xcopy ..\Project\MSCS2008\Example\*.csproj MediaInfoDLL_Windows_i386\Developers\Project\MSCS2008\Example\
+xcopy ..\Project\MSCS2008\Example\*.res* MediaInfoDLL_Windows_i386\Developers\Project\MSCS2008\Example\
+xcopy ..\Project\MSCS2008\Example\*.ico MediaInfoDLL_Windows_i386\Developers\Project\MSCS2008\Example\
+xcopy ..\Project\MSCS2008\asp_net_web_application\*.cs MediaInfoDLL_Windows_i386\Developers\Project\MSCS2008\asp_net_web_application\ /S
+xcopy ..\Project\MSCS2008\asp_net_web_application\*.csproj MediaInfoDLL_Windows_i386\Developers\Project\MSCS2008\asp_net_web_application\
+xcopy ..\Project\MSCS2008\asp_net_web_application\*.aspx MediaInfoDLL_Windows_i386\Developers\Project\MSCS2008\asp_net_web_application\
+xcopy ..\Project\MSCS2008\asp_net_web_application\*.config MediaInfoDLL_Windows_i386\Developers\Project\MSCS2008\asp_net_web_application\
+xcopy ..\Project\MSCS2010\*.sln MediaInfoDLL_Windows_i386\Developers\Project\MSCS2010\
+xcopy ..\Project\MSCS2010\Example\*.cs MediaInfoDLL_Windows_i386\Developers\Project\MSCS2010\Example\
+xcopy ..\Project\MSCS2010\Example\*.csproj MediaInfoDLL_Windows_i386\Developers\Project\MSCS2010\Example\
+xcopy ..\Project\MSCS2010\Example\*.res* MediaInfoDLL_Windows_i386\Developers\Project\MSCS2010\Example\
+xcopy ..\Project\MSCS2010\Example\*.ico MediaInfoDLL_Windows_i386\Developers\Project\MSCS2010\Example\
+xcopy ..\Project\MSCS2010\asp_net_web_application\*.cs MediaInfoDLL_Windows_i386\Developers\Project\MSCS2010\asp_net_web_application\ /S
+xcopy ..\Project\MSCS2010\asp_net_web_application\*.csproj MediaInfoDLL_Windows_i386\Developers\Project\MSCS2010\asp_net_web_application\
+xcopy ..\Project\MSCS2010\asp_net_web_application\*.aspx MediaInfoDLL_Windows_i386\Developers\Project\MSCS2010\asp_net_web_application\
+xcopy ..\Project\MSCS2010\asp_net_web_application\*.config MediaInfoDLL_Windows_i386\Developers\Project\MSCS2010\asp_net_web_application\
 xcopy ..\Project\MSJS\*.sln MediaInfoDLL_Windows_i386\Developers\Project\MSJS\
 xcopy ..\Project\MSJS\Example\*.jsl MediaInfoDLL_Windows_i386\Developers\Project\MSJS\Example\
 xcopy ..\Project\MSJS\Example\*.vjsproj MediaInfoDLL_Windows_i386\Developers\Project\MSJS\Example\
@@ -66,8 +94,11 @@
 xcopy ..\Project\MSVB\Example\*.res* MediaInfoDLL_Windows_i386\Developers\Project\MSVB\Example\
 xcopy "..\Project\MSVB\Example\My Project\*.*" "MediaInfoDLL_Windows_i386\Developers\Project\MSVB\Example\My Project\"
 xcopy "..\Project\MSVB\Example VB6\*.*" "MediaInfoDLL_Windows_i386\Developers\Project\MSVB\Example VB6\"
-xcopy ..\Project\MSVC\*.sln MediaInfoDLL_Windows_i386\Developers\Project\MSVC\
-xcopy ..\Project\MSVC\Example\HowToUse_Dll.vcproj MediaInfoDLL_Windows_i386\Developers\Project\MSVC\Example\
+xcopy ..\Project\MSVC2008\*.sln MediaInfoDLL_Windows_i386\Developers\Project\MSVC2008\
+xcopy ..\Project\MSVC2008\Example\HowToUse_Dll.vcproj MediaInfoDLL_Windows_i386\Developers\Project\MSVC2008\Example\
+xcopy ..\Project\MSVC2010\*.sln MediaInfoDLL_Windows_i386\Developers\Project\MSVC2010\
+xcopy ..\Project\MSVC2010\Example\HowToUse_Dll.vcxproj MediaInfoDLL_Windows_i386\Developers\Project\MSVC2010\Example\
+xcopy ..\Project\MSVC2010\Example\HowToUse_Dll.vcxproj.filters MediaInfoDLL_Windows_i386\Developers\Project\MSVC2010\Example\
 xcopy ..\Project\GCC\Example\Make* MediaInfoDLL_Windows_i386\Developers\Project\GCC\Example\
 xcopy ..\Project\Java\Example.JNA\*.java MediaInfoDLL_Windows_i386\Developers\Project\Java\Example.JNA\
 xcopy ..\Project\Java\Example.JNA\*.txt MediaInfoDLL_Windows_i386\Developers\Project\Java\Example.JNA\

libmediainfo_0.7.34.tar.bz2/Release/Release_DLL_Windows_x64.bat -> libmediainfo_0.7.60.tar.bz2/Release/Release_DLL_Windows_x64.bat Changed

@@ -1,3 +1,22 @@
+@rem MediaInfo
+@rem Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
+@rem
+@rem This program is free software: you can redistribute it and/or modify it
+@rem under the terms of the GNU Lesser General Public License as published by
+@rem the Free Software Foundation, either version 3 of the License, or
+@rem (at your option) any later version.
+@rem
+@rem This program is distributed in the hope that it will be useful,
+@rem but WITHOUT ANY WARRANTY; without even the implied warranty of
+@rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+@rem GNU Lesser General Public License for more details.
+@rem
+@rem You should have received a copy of the GNU Lesser General Public License
+@rem along with this program. If not, see <http:@remwww.gnu.org/licenses/>.
+@rem
+@rem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+@rem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
 @echo off
 
 rem --- Clean up ---
@@ -17,7 +36,7 @@
 rmdir Doc /S /Q
 xcopy ..\Source\Doc\*.html MediaInfoDLL_Windows_x64\Developers\ /S
 mkdir MediaInfoDLL_Windows_x64\Developers\List_Of_Parameters
-copy ..\Source\Ressource\Text\Stream\*.csv MediaInfoDLL_Windows_x64\Developers\List_Of_Parameters
+copy ..\Source\Resource\Text\Stream\*.csv MediaInfoDLL_Windows_x64\Developers\List_Of_Parameters
 
 rem --- Copying : Include ---
 xcopy ..\Source\MediaInfoDLL\MediaInfoDLL.h MediaInfoDLL_Windows_x64\Developers\Source\MediaInfoDLL\
@@ -33,28 +52,53 @@
 xcopy ..\Source\MediaInfoDLL\MediaInfoDLL3.py MediaInfoDLL_Windows_x64\Developers\Source\MediaInfoDLL\
 
 @rem --- Copying : Projects ---
-xcopy ..\Project\MSCS\*.sln MediaInfoDLL_Windows_x64\Developers\Project\MSCS\
-xcopy ..\Project\MSCS\Example\*.cs MediaInfoDLL_Windows_x64\Developers\Project\MSCS\Example\
-xcopy ..\Project\MSCS\Example\*.csproj MediaInfoDLL_Windows_x64\Developers\Project\MSCS\Example\
-xcopy ..\Project\MSCS\Example\*.res* MediaInfoDLL_Windows_x64\Developers\Project\MSCS\Example\
-xcopy ..\Project\MSCS\Example\*.ico MediaInfoDLL_Windows_x64\Developers\Project\MSCS\Example\
-xcopy ..\Project\MSCS\asp_net_web_application\*.cs MediaInfoDLL_Windows_x64\Developers\Project\MSCS\asp_net_web_application\ /S
-xcopy ..\Project\MSCS\asp_net_web_application\*.csproj MediaInfoDLL_Windows_x64\Developers\Project\MSCS\asp_net_web_application\
-xcopy ..\Project\MSCS\asp_net_web_application\*.aspx MediaInfoDLL_Windows_x64\Developers\Project\MSCS\asp_net_web_application\
-xcopy ..\Project\MSCS\asp_net_web_application\*.config MediaInfoDLL_Windows_x64\Developers\Project\MSCS\asp_net_web_application\
+xcopy ..\Project\BCB\Example\*.bpf MediaInfoDLL_Windows_x64\Developers\Project\BCB\Example\
+xcopy ..\Project\BCB\Example\*.bpr MediaInfoDLL_Windows_x64\Developers\Project\BCB\Example\
+xcopy ..\Project\BCB\Example\*.res* MediaInfoDLL_Windows_x64\Developers\Project\BCB\Example\
+xcopy ..\Project\BCB\Example\*.dfm MediaInfoDLL_Windows_x64\Developers\Project\BCB\Example\
+xcopy ..\Project\BCB\Example\*.h MediaInfoDLL_Windows_x64\Developers\Project\BCB\Example\
+xcopy ..\Project\BCB\Example\*.cpp MediaInfoDLL_Windows_x64\Developers\Project\BCB\Example\
+xcopy ..\Project\CodeBlocks\Example\*.cbp MediaInfoDLL_Windows_x64\Developers\Project\CodeBlocks\Example\
+xcopy ..\Project\Delphi\Example\*.dpr MediaInfoDLL_Windows_x64\Developers\Project\Delphi\Example\
+xcopy ..\Project\Delphi\Example\*.dfm MediaInfoDLL_Windows_x64\Developers\Project\Delphi\Example\
+xcopy ..\Project\Delphi\Example\*.res MediaInfoDLL_Windows_x64\Developers\Project\Delphi\Example\
+xcopy ..\Project\Delphi\Example\*.pas MediaInfoDLL_Windows_x64\Developers\Project\Delphi\Example\
+xcopy ..\Project\Delphi\Example\*.bdsproj MediaInfoDLL_Windows_x64\Developers\Project\Delphi\Example\
+xcopy ..\Project\Delphi\Example\*.bdsgroup MediaInfoDLL_Windows_x64\Developers\Project\Delphi\Example\
+xcopy ..\Project\DevCpp\Example\*.dev MediaInfoDLL_Windows_x64\Developers\Project\DevCpp\Example\
+xcopy ..\Project\MSCS2008\*.sln MediaInfoDLL_Windows_x64\Developers\Project\MSCS2008\
+xcopy ..\Project\MSCS2008\Example\*.cs MediaInfoDLL_Windows_x64\Developers\Project\MSCS2008\Example\
+xcopy ..\Project\MSCS2008\Example\*.csproj MediaInfoDLL_Windows_x64\Developers\Project\MSCS2008\Example\
+xcopy ..\Project\MSCS2008\Example\*.res* MediaInfoDLL_Windows_x64\Developers\Project\MSCS2008\Example\
+xcopy ..\Project\MSCS2008\Example\*.ico MediaInfoDLL_Windows_x64\Developers\Project\MSCS2008\Example\
+xcopy ..\Project\MSCS2008\asp_net_web_application\*.cs MediaInfoDLL_Windows_x64\Developers\Project\MSCS2008\asp_net_web_application\ /S
+xcopy ..\Project\MSCS2008\asp_net_web_application\*.csproj MediaInfoDLL_Windows_x64\Developers\Project\MSCS2008\asp_net_web_application\
+xcopy ..\Project\MSCS2008\asp_net_web_application\*.aspx MediaInfoDLL_Windows_x64\Developers\Project\MSCS2008\asp_net_web_application\
+xcopy ..\Project\MSCS2008\asp_net_web_application\*.config MediaInfoDLL_Windows_x64\Developers\Project\MSCS2008\asp_net_web_application\
+xcopy ..\Project\MSCS2010\*.sln MediaInfoDLL_Windows_x64\Developers\Project\MSCS2010\
+xcopy ..\Project\MSCS2010\Example\*.cs MediaInfoDLL_Windows_x64\Developers\Project\MSCS2010\Example\
+xcopy ..\Project\MSCS2010\Example\*.csproj MediaInfoDLL_Windows_x64\Developers\Project\MSCS2010\Example\
+xcopy ..\Project\MSCS2010\Example\*.res* MediaInfoDLL_Windows_x64\Developers\Project\MSCS2010\Example\
+xcopy ..\Project\MSCS2010\Example\*.ico MediaInfoDLL_Windows_x64\Developers\Project\MSCS2010\Example\
+xcopy ..\Project\MSCS2010\asp_net_web_application\*.cs MediaInfoDLL_Windows_x64\Developers\Project\MSCS2010\asp_net_web_application\ /S
+xcopy ..\Project\MSCS2010\asp_net_web_application\*.csproj MediaInfoDLL_Windows_x64\Developers\Project\MSCS2010\asp_net_web_application\
+xcopy ..\Project\MSCS2010\asp_net_web_application\*.aspx MediaInfoDLL_Windows_x64\Developers\Project\MSCS2010\asp_net_web_application\
+xcopy ..\Project\MSCS2010\asp_net_web_application\*.config MediaInfoDLL_Windows_x64\Developers\Project\MSCS2010\asp_net_web_application\
+xcopy ..\Project\MSJS\*.sln MediaInfoDLL_Windows_x64\Developers\Project\MSJS\
+xcopy ..\Project\MSJS\Example\*.jsl MediaInfoDLL_Windows_x64\Developers\Project\MSJS\Example\
+xcopy ..\Project\MSJS\Example\*.vjsproj MediaInfoDLL_Windows_x64\Developers\Project\MSJS\Example\
+xcopy ..\Project\MSJS\Example\*.res* MediaInfoDLL_Windows_x64\Developers\Project\MSJS\Example\
 xcopy ..\Project\MSVB\*.sln MediaInfoDLL_Windows_x64\Developers\Project\MSVB\
 xcopy ..\Project\MSVB\Example\*.vb MediaInfoDLL_Windows_x64\Developers\Project\MSVB\Example\
 xcopy ..\Project\MSVB\Example\*.vbproj MediaInfoDLL_Windows_x64\Developers\Project\MSVB\Example\
 xcopy ..\Project\MSVB\Example\*.res* MediaInfoDLL_Windows_x64\Developers\Project\MSVB\Example\
 xcopy "..\Project\MSVB\Example\My Project\*.*" "MediaInfoDLL_Windows_x64\Developers\Project\MSVB\Example\My Project\"
-xcopy ..\Project\MSVC2010\*.sln MediaInfoDLL_Windows_x64\Developers\Project\MSVC\
-xcopy ..\Project\MSVC2010\Example\HowToUse_Dll.vcxproj MediaInfoDLL_Windows_x64\Developers\Project\MSVC2010\Example\
-xcopy ..\Project\MSVC2010\Example\*.rc MediaInfoDLL_Windows_x64\Developers\Project\MSVC2010\Example\
-xcopy ..\Project\MSVC2010\Example\*.h MediaInfoDLL_Windows_x64\Developers\Project\MSVC2010\Example\
+xcopy "..\Project\MSVB\Example VB6\*.*" "MediaInfoDLL_Windows_x64\Developers\Project\MSVB\Example VB6\"
 xcopy ..\Project\MSVC2008\*.sln MediaInfoDLL_Windows_x64\Developers\Project\MSVC2008\
 xcopy ..\Project\MSVC2008\Example\HowToUse_Dll.vcproj MediaInfoDLL_Windows_x64\Developers\Project\MSVC2008\Example\
-xcopy ..\Project\MSVC2008\Example\*.rc MediaInfoDLL_Windows_x64\Developers\Project\MSVC2008\Example\
-xcopy ..\Project\MSVC2008\Example\*.h MediaInfoDLL_Windows_x64\Developers\Project\MSVC2008\Example\
+xcopy ..\Project\MSVC2010\*.sln MediaInfoDLL_Windows_x64\Developers\Project\MSVC2010\
+xcopy ..\Project\MSVC2010\Example\HowToUse_Dll.vcxproj MediaInfoDLL_Windows_x64\Developers\Project\MSVC2010\Example\
+xcopy ..\Project\MSVC2010\Example\HowToUse_Dll.vcxproj.filters MediaInfoDLL_Windows_x64\Developers\Project\MSVC2010\Example\
 xcopy ..\Project\GCC\Example\Make* MediaInfoDLL_Windows_x64\Developers\Project\GCC\Example\
 xcopy ..\Project\Java\Example.JNA\*.java MediaInfoDLL_Windows_x64\Developers\Project\Java\Example.JNA\
 xcopy ..\Project\Java\Example.JNA\*.txt MediaInfoDLL_Windows_x64\Developers\Project\Java\Example.JNA\
@@ -103,7 +147,6 @@
 rem --- Installer ---
 ..\..\Shared\Binary\Windows_i386\NSIS\makensis ..\Source\Install\MediaInfo_DLL_Windows_x64.nsi
 
-
 rem --- Clean up ---
 if "%1"=="SkipCleanUp" goto SkipCleanUp
 rmdir MediaInfoDLL_Windows_x64\ /S /Q

libmediainfo_0.7.34.tar.bz2/Release/Release_Lib_GNU_FromSource.sh -> libmediainfo_0.7.60.tar.bz2/Release/Release_Lib_GNU_FromSource.sh Changed

@@ -1,3 +1,22 @@
+# MediaInfo
+# Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
+#
+# This program is free software: you can redistribute it and/or modify it
+# under the terms of the GNU Lesser 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 Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program. If not, see <http:#www.gnu.org/licenses/>.
+#
+#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
 #! /bin/sh
 
 #-----------------------------------------------------------------------
@@ -36,6 +55,11 @@
 
 #-----------------------------------------------------------------------
 # Copying : Source
+mkdir -p MediaInfo_Lib_GNU_FromSource/Source/ThirdParty/base64
+cp -r ../Source/ThirdParty/base64/*.h MediaInfo_Lib_GNU_FromSource/Source/ThirdParty/base64/
+mkdir -p MediaInfo_Lib_GNU_FromSource/Source/ThirdParty/tinyxml2
+cp -r ../Source/ThirdParty/tinyxml2/*.h MediaInfo_Lib_GNU_FromSource/Source/ThirdParty/tinyxml2/
+cp -r ../Source/ThirdParty/tinyxml2/*.cpp MediaInfo_Lib_GNU_FromSource/Source/ThirdParty/tinyxml2/
 mkdir -p MediaInfo_Lib_GNU_FromSource/Source/MediaInfo
 cp -r ../Source/MediaInfo/*.h MediaInfo_Lib_GNU_FromSource/Source/MediaInfo/
 cp -r ../Source/MediaInfo/*.cpp MediaInfo_Lib_GNU_FromSource/Source/MediaInfo/

libmediainfo_0.7.34.tar.bz2/Release/Release_Lib_GNU_Prepare.bat -> libmediainfo_0.7.60.tar.bz2/Release/Release_Lib_GNU_Prepare.bat Changed

libmediainfo_0.7.34.tar.bz2/Release/Release_Source.bat -> libmediainfo_0.7.60.tar.bz2/Release/Release_Source.bat Changed

@@ -1,9 +1,28 @@
+@rem MediaInfo
+@rem Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
+@rem
+@rem This program is free software: you can redistribute it and/or modify it
+@rem under the terms of the GNU Lesser General Public License as published by
+@rem the Free Software Foundation, either version 3 of the License, or
+@rem (at your option) any later version.
+@rem
+@rem This program is distributed in the hope that it will be useful,
+@rem but WITHOUT ANY WARRANTY; without even the implied warranty of
+@rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+@rem GNU Lesser General Public License for more details.
+@rem
+@rem You should have received a copy of the GNU Lesser General Public License
+@rem along with this program. If not, see <http:@remwww.gnu.org/licenses/>.
+@rem
+@rem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+@rem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
 @echo off
 
 rem --- Clean up ---
 del MediaInfo_Lib_Source.tar
 del libmediainfo_.tar.bz2
-del libmediainfo_-1.tar.gz 
+del libmediainfo_-1.tar.gz
 del libmediainfo__AllInclusive.7z
 rmdir MediaInfo_Lib_Source /S /Q
 rmdir ZenLib /S /Q
@@ -26,7 +45,7 @@
 xcopy ..\Source\*.jsl MediaInfo_Lib_Source\Source\ /S
 xcopy ..\Source\*.vb MediaInfo_Lib_Source\Source\ /S
 xcopy ..\Source\*.java MediaInfo_Lib_Source\Source\ /S
-xcopy ..\Source\Ressource\*.txt MediaInfo_Lib_Source\Source\Ressource\ /S
+xcopy ..\Source\Resource\*.txt MediaInfo_Lib_Source\Source\Resource\ /S
 xcopy ..\Source\*.csv MediaInfo_Lib_Source\Source\ /S
 xcopy ..\Source\*.dfm MediaInfo_Lib_Source\Source\ /S
 xcopy ..\Source\*.au3 MediaInfo_Lib_Source\Source\ /S
@@ -69,8 +88,10 @@
 xcopy ..\Project\*.idl MediaInfo_Lib_Source\Project\ /S
 xcopy ..\Project\BCB\*.h MediaInfo_Lib_Source\Project\BCB\ /S
 xcopy ..\Project\CMake\*.txt MediaInfo_Lib_Source\Project\CMake\ /S
-xcopy ..\Project\MSVC\*.h MediaInfo_Lib_Source\Project\MSVC\ /S
+xcopy ..\Project\MSVC2010\*.h MediaInfo_Lib_Source\Project\MSVC2010\ /S
 xcopy ..\Project\MSVC2008\*.h MediaInfo_Lib_Source\Project\MSVC2008\ /S
+xcopy ..\Project\MSCS\*.aspx MediaInfo_Lib_Source\Project\MSCS2010\ /S
+xcopy ..\Project\MSCS\*.config MediaInfo_Lib_Source\Project\MSCS2010\ /S
 xcopy ..\Project\BCB\*.res MediaInfo_Lib_Source\Project\BCB /S
 xcopy ..\Project\Delphi\*.res MediaInfo_Lib_Source\Project\Delphi /S
 xcopy ..\Project\MSVB\*.rc MediaInfo_Lib_Source\Project\MSVB\ /S
@@ -104,7 +125,7 @@
 xcopy *.sh  MediaInfo_Lib_Source\Release\
 xcopy *.sub MediaInfo_Lib_Source\Release\
 xcopy BCB\*.txt MediaInfo_Lib_Source\Release\BCB\ /S
-xcopy MSVC\*.txt MediaInfo_Lib_Source\Release\MSVC\ /S
+xcopy MSVC2010\*.txt MediaInfo_Lib_Source\Release\MSVC2010\ /S
 xcopy GCC_MinGW32\*.txt MediaInfo_Lib_Source\Release\GCC_MinGW32\ /S
 xcopy GCC_Linux_i386\*.txt MediaInfo_Lib_Source\Release\GCC_Linux_i386\ /S

libmediainfo_0.7.34.tar.bz2/Source/Doc/Documentation.html -> libmediainfo_0.7.60.tar.bz2/Source/Doc/Documentation.html Changed

libmediainfo_0.7.34.tar.bz2/Source/Doc/Doxyfile -> libmediainfo_0.7.60.tar.bz2/Source/Doc/Doxyfile Changed

@@ -4,18 +4,23 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 
+DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = MediaInfoLib
 PROJECT_NUMBER         = 0.7
+PROJECT_LOGO           = 
 OUTPUT_DIRECTORY       = ./
 OUTPUT_LANGUAGE        = English
 REPEAT_BRIEF           = YES
 ABBREVIATE_BRIEF       = 
+FULL_PATH_NAMES        = NO
+BUILTIN_STL_SUPPORT    = YES
+OPTIMIZE_OUTPUT_FOR_C  = NO
 
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
 
-EXTRACT_ALL            = YES
+EXTRACT_ALL            = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
@@ -92,4 +97,4 @@
 # The SEARCHENGINE tag specifies whether or not a search engine should be 
 # used. If set to NO the values of all tags below this one will be ignored.
 
-SEARCHENGINE           = YES
+SEARCHENGINE           = NO

libmediainfo_0.7.34.tar.bz2/Source/Example/HowToUse.cpp -> libmediainfo_0.7.60.tar.bz2/Source/Example/HowToUse.cpp Changed

@@ -1,17 +1,17 @@
 // HowToUse - Example for MediaInfoLib (commandline version)
-// Copyright (C) 2004-2007 Jerome Martinez, Zen@MediaArea.net
+// Copyright (C) 2004-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -19,79 +19,68 @@
 //
 // Example for MediaInfoLib
 // Command line version
-// Note : it uses wprintf instead of wcout, because
-//        MinGW doesn't support std::wcout
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 #include <string>
-#include <stdlib.h>
-#include <stdio.h>
+#include <iostream>
 #include "ZenLib/Ztring.h" //Note : I need it for universal atoi, but you have not to use it for be able to use MediaInfoLib
 #include "MediaInfo/MediaInfo.h"
 
 using namespace MediaInfoLib;
 using namespace ZenLib;
 
-#ifdef _UNICODE
-    #define tprintf wprintf
-#else
-    #define tprintf printf
-#endif
-
-int main (int argc, ZenLib::Char *argv[])
+int main (int argc, char *argv[])
 {
     //Information about MediaInfo
     MediaInfo MI;
-    ZenLib::Ztring To_Display=MI.Option(_T("Info_Version"), _T("0.7.0.0;MediaInfoDLL_Example_MSVC;0.7.0.0")).c_str();
+    ZenLib::Ztring To_Display=MI.Option(__T("Info_Version"), __T("0.7.0.0;MediaInfoDLL_Example_MSVC;0.7.0.0")).c_str();
 
-    To_Display += _T("\r\n\r\nInfo_Parameters\r\n");
-    To_Display += MI.Option(_T("Info_Parameters")).c_str();
+    To_Display += __T("\r\n\r\nInfo_Parameters\r\n");
+    To_Display += MI.Option(__T("Info_Parameters")).c_str();
 
-    To_Display += _T("\r\n\r\nInfo_Capacities\r\n");
-    To_Display += MI.Option(_T("Info_Capacities")).c_str();
+    To_Display += __T("\r\n\r\nInfo_Capacities\r\n");
+    To_Display += MI.Option(__T("Info_Capacities")).c_str();
 
-    To_Display += _T("\r\n\r\nInfo_Codecs\r\n");
-    To_Display += MI.Option(_T("Info_Codecs")).c_str();
+    To_Display += __T("\r\n\r\nInfo_Codecs\r\n");
+    To_Display += MI.Option(__T("Info_Codecs")).c_str();
 
     //An example of how to use the library
-    To_Display += _T("\r\n\r\nOpen\r\n");
-    MI.Open(_T("Example.ogg"));
+    To_Display += __T("\r\n\r\nOpen\r\n");
+    MI.Open(__T("Example.ogg"));
 
-    To_Display += _T("\r\n\r\nInform with Complete=false\r\n");
-    MI.Option(_T("Complete"));
+    To_Display += __T("\r\n\r\nInform with Complete=false\r\n");
+    MI.Option(__T("Complete"));
     To_Display += MI.Inform().c_str();
 
-    To_Display += _T("\r\n\r\nInform with Complete=true\r\n");
-    MI.Option(_T("Complete"), _T("1"));
+    To_Display += __T("\r\n\r\nInform with Complete=true\r\n");
+    MI.Option(__T("Complete"), __T("1"));
     To_Display += MI.Inform().c_str();
 
-    To_Display += _T("\r\n\r\nCustom Inform\r\n");
-    MI.Option(_T("Inform"), _T("General;Example : FileSize=%FileSize%"));
+    To_Display += __T("\r\n\r\nCustom Inform\r\n");
+    MI.Option(__T("Inform"), __T("General;Example : FileSize=%FileSize%"));
     To_Display += MI.Inform().c_str();
 
-    To_Display += _T("\r\n\r\nGet with Stream=General and Parameter=\"FileSize\"\r\n");
-    To_Display += MI.Get(Stream_General, 0, _T("FileSize"), Info_Text, Info_Name).c_str();
+    To_Display += __T("\r\n\r\nGet with Stream=General and Parameter=\"FileSize\"\r\n");
+    To_Display += MI.Get(Stream_General, 0, __T("FileSize"), Info_Text, Info_Name).c_str();
 
-    To_Display += _T("\r\n\r\nGetI with Stream=General and Parameter=46\r\n");
+    To_Display += __T("\r\n\r\nGetI with Stream=General and Parameter=46\r\n");
     To_Display += MI.Get(Stream_General, 0, 46, Info_Text).c_str();
 
-    To_Display += _T("\r\n\r\nCount_Get with StreamKind=Stream_Audio\r\n");
+    To_Display += __T("\r\n\r\nCount_Get with StreamKind=Stream_Audio\r\n");
     To_Display += ZenLib::Ztring::ToZtring(MI.Count_Get(Stream_Audio, -1)); //Warning : this is an integer
 
-    To_Display += _T("\r\n\r\nGet with Stream=General and Parameter=\"AudioCount\"\r\n");
-    To_Display += MI.Get(Stream_General, 0, _T("AudioCount"), Info_Text, Info_Name).c_str();
+    To_Display += __T("\r\n\r\nGet with Stream=General and Parameter=\"AudioCount\"\r\n");
+    To_Display += MI.Get(Stream_General, 0, __T("AudioCount"), Info_Text, Info_Name).c_str();
 
-    To_Display += _T("\r\n\r\nGet with Stream=Audio and Parameter=\"StreamCount\"\r\n");
-    To_Display += MI.Get(Stream_Audio, 0, _T("StreamCount"), Info_Text, Info_Name).c_str();
+    To_Display += __T("\r\n\r\nGet with Stream=Audio and Parameter=\"StreamCount\"\r\n");
+    To_Display += MI.Get(Stream_Audio, 0, __T("StreamCount"), Info_Text, Info_Name).c_str();
 
-    To_Display += _T("\r\n\r\nClose\r\n");
+    To_Display += __T("\r\n\r\nClose\r\n");
     MI.Close();
 
-    tprintf (_T("%s\r\n"), To_Display.c_str());
-    system("PAUSE");
-    
+    std::cout<<To_Display.To_Local().c_str()<<std::endl;
+
     return 0;
 }
 //---------------------------------------------------------------------------
-

libmediainfo_0.7.34.tar.bz2/Source/Example/HowToUse_Dll.cpp -> libmediainfo_0.7.60.tar.bz2/Source/Example/HowToUse_Dll.cpp Changed

@@ -2,16 +2,16 @@
 // Copyright (C) 2004-2008 Jerome Martinez, Zen@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -45,37 +45,37 @@
 {
     //Information about MediaInfo
     MediaInfo MI;
-    String To_Display=MI.Option(_T("Info_Version"), _T("0.7.13;MediaInfoDLL_Example_MSVC;0.7.13")).c_str();
+    String To_Display=MI.Option(__T("Info_Version"), __T("0.7.13;MediaInfoDLL_Example_MSVC;0.7.13")).c_str();
 
-    To_Display += _T("\r\n\r\nInfo_Parameters\r\n");
-    To_Display += MI.Option(_T("Info_Parameters")).c_str();
+    To_Display += __T("\r\n\r\nInfo_Parameters\r\n");
+    To_Display += MI.Option(__T("Info_Parameters")).c_str();
 
-    To_Display += _T("\r\n\r\nInfo_Codecs\r\n");
-    To_Display += MI.Option(_T("Info_Codecs")).c_str();
+    To_Display += __T("\r\n\r\nInfo_Codecs\r\n");
+    To_Display += MI.Option(__T("Info_Codecs")).c_str();
 
     //An example of how to use the library
-    To_Display += _T("\r\n\r\nOpen\r\n");
-    MI.Open(_T("Example.ogg"));
+    To_Display += __T("\r\n\r\nOpen\r\n");
+    MI.Open(__T("Example.ogg"));
 
-    To_Display += _T("\r\n\r\nInform with Complete=false\r\n");
-    MI.Option(_T("Complete"));
+    To_Display += __T("\r\n\r\nInform with Complete=false\r\n");
+    MI.Option(__T("Complete"));
     To_Display += MI.Inform().c_str();
 
-    To_Display += _T("\r\n\r\nInform with Complete=true\r\n");
-    MI.Option(_T("Complete"), _T("1"));
+    To_Display += __T("\r\n\r\nInform with Complete=true\r\n");
+    MI.Option(__T("Complete"), __T("1"));
     To_Display += MI.Inform().c_str();
 
-    To_Display += _T("\r\n\r\nCustom Inform\r\n");
-    MI.Option(_T("Inform"), _T("General;Example : FileSize=%FileSize%"));
+    To_Display += __T("\r\n\r\nCustom Inform\r\n");
+    MI.Option(__T("Inform"), __T("General;Example : FileSize=%FileSize%"));
     To_Display += MI.Inform().c_str();
 
-    To_Display += _T("\r\n\r\nGet with Stream=General and Parameter=\"FileSize\"\r\n");
-    To_Display += MI.Get(Stream_General, 0, _T("FileSize"), Info_Text, Info_Name).c_str();
+    To_Display += __T("\r\n\r\nGet with Stream=General and Parameter=\"FileSize\"\r\n");
+    To_Display += MI.Get(Stream_General, 0, __T("FileSize"), Info_Text, Info_Name).c_str();
 
-    To_Display += _T("\r\n\r\nGetI with Stream=General and Parameter=46\r\n");
+    To_Display += __T("\r\n\r\nGetI with Stream=General and Parameter=46\r\n");
     To_Display += MI.Get(Stream_General, 0, 46, Info_Text).c_str();
 
-    To_Display += _T("\r\n\r\nCount_Get with StreamKind=Stream_Audio\r\n");
+    To_Display += __T("\r\n\r\nCount_Get with StreamKind=Stream_Audio\r\n");
     #ifdef __MINGW32__
         Char* C1=new Char[33];
         _itot (MI.Count_Get(Stream_Audio), C1, 10);
@@ -87,13 +87,13 @@
         To_Display += SS.str();
     #endif
 
-    To_Display += _T("\r\n\r\nGet with Stream=General and Parameter=\"AudioCount\"\r\n");
-    To_Display += MI.Get(Stream_General, 0, _T("AudioCount"), Info_Text, Info_Name).c_str();
+    To_Display += __T("\r\n\r\nGet with Stream=General and Parameter=\"AudioCount\"\r\n");
+    To_Display += MI.Get(Stream_General, 0, __T("AudioCount"), Info_Text, Info_Name).c_str();
 
-    To_Display += _T("\r\n\r\nGet with Stream=Audio and Parameter=\"StreamCount\"\r\n");
-    To_Display += MI.Get(Stream_Audio, 0, _T("StreamCount"), Info_Text, Info_Name).c_str();
+    To_Display += __T("\r\n\r\nGet with Stream=Audio and Parameter=\"StreamCount\"\r\n");
+    To_Display += MI.Get(Stream_Audio, 0, __T("StreamCount"), Info_Text, Info_Name).c_str();
 
-    To_Display += _T("\r\n\r\nClose\r\n");
+    To_Display += __T("\r\n\r\nClose\r\n");
     MI.Close();
 
     #ifdef _UNICODE
@@ -102,42 +102,55 @@
         std::cout  << To_Display;
     #endif
 
-    return 1;
+    return 0;
 }
 
-//---------------------------------------------------------------------------
+//***************************************************************************
+// By buffer example
+//***************************************************************************
 /*
-//Note: you can replace ZenLib::File by your own file management class
-int ExampleWithBuffers (int argc, Char *argv[])
+//---------------------------------------------------------------------------
+//Note: you can replace file operations by your own buffer management class
+#include <stdio.h>
+int main (int argc, Char *argv[])
 {
-    //Initilaizing MediaInfo
-    MediaInfo MI;
 
     //From: preparing an example file for reading
-    ZenLib::File From; From.Open(FileName, ZenLib::File::Access_Read); //You can use something else than a file
+    FILE* F=fopen("Example.ogg", "rb"); //You can use something else than a file
+    if (F==0)
+        return 1;
 
     //From: preparing a memory buffer for reading
-    ZenLib::int8u* From_Buffer=new ZenLib::int8u[7*188]; //Note: you can do your own buffer
+    unsigned char* From_Buffer=new unsigned char[7*188]; //Note: you can do your own buffer
     size_t From_Buffer_Size; //The size of the read file buffer
 
+    //From: retrieving file size
+    fseek(F, 0, SEEK_END);
+    long F_Size=ftell(F);
+    fseek(F, 0, SEEK_SET);
+
+    //Initializing MediaInfo
+    MediaInfo MI;
+
     //Preparing to fill MediaInfo with a buffer
-    MI.Open_Buffer_Init(From.Size_Get(), 0);
+    MI.Open_Buffer_Init(F_Size, 0);
 
     //The parsing loop
     do
     {
         //Reading data somewhere, do what you want for this.
-        From_Buffer_Size=From.Read(From_Buffer, 7*188);
+        From_Buffer_Size=fread(From_Buffer, 1, 7*188, F);
 
         //Sending the buffer to MediaInfo
-        if (MI.Open_Buffer_Continue(From_Buffer, From_Buffer_Size)==0)
+        size_t Status=MI.Open_Buffer_Continue(From_Buffer, From_Buffer_Size);
+        if (Status&0x08) //Bit3=Finished
             break;
 
-        //Testing if MediaInfo request to go elsewhere
-        if (MI.Open_Buffer_Continue_GoTo_Get()!=(ZenLib::int64u)-1)
+        //Testing if there is a MediaInfo request to go elsewhere
+        if (MI.Open_Buffer_Continue_GoTo_Get()!=(MediaInfo_int64u)-1)
         {
-            From.GoTo(MI.Open_Buffer_Continue_GoTo_Get());              //Position the file
-            MI.Open_Buffer_Init(From.Size_Get(), From.Position_Get());  //Informaing MediaInfo we have seek
+            fseek(F, (long)MI.Open_Buffer_Continue_GoTo_Get(), SEEK_SET);   //Position the file
+            MI.Open_Buffer_Init(F_Size, ftell(F));                          //Informing MediaInfo we have seek
         }
     }
     while (From_Buffer_Size>0);
@@ -146,6 +159,12 @@
     MI.Open_Buffer_Finalize(); //This is the end of the stream, MediaInfo must finnish some work
 
     //Get() example
-    MediaInfoNameSpace::String Text=MI.Get(Stream_General, 0, _T("Format"));
+    String To_Display=MI.Get(Stream_General, 0, __T("Format"));
+
+    #ifdef _UNICODE
+        std::wcout << To_Display;
+    #else
+        std::cout  << To_Display;
+    #endif
 }
-*/
\ No newline at end of file
+*/

libmediainfo_0.7.34.tar.bz2/Source/Example/HowToUse_Dll.cs -> libmediainfo_0.7.60.tar.bz2/Source/Example/HowToUse_Dll.cs Changed

@@ -37,64 +37,64 @@
 
 namespace MediaInfoLib_MSCS
 {
-	/// <summary>
-	/// Summary description for Form1.
-	/// </summary>
-	public class Form1 : System.Windows.Forms.Form
-	{
-		private System.Windows.Forms.RichTextBox richTextBox1;
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.Container components = null;
-
-		public Form1()
-		{
-			//
-			// Required for Windows Form Designer support
-			//
-			InitializeComponent();
-
-			//
-			// TODO: Add any constructor code after InitializeComponent call
-			//
-		}
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		protected override void Dispose( bool disposing )
-		{
-			if( disposing )
-			{
-				if (components != null) 
-				{
-					components.Dispose();
-				}
-			}
-			base.Dispose( disposing );
-		}
-
-		#region Windows Form Designer generated code
-		/// <summary>
-		/// Méthode requise pour la prise en charge du concepteur - ne modifiez pas
-		/// le contenu de cette méthode avec l'éditeur de code.
-		/// </summary>
-		private void InitializeComponent()
-		{
+    /// <summary>
+    /// Summary description for Form1.
+    /// </summary>
+    public class Form1 : System.Windows.Forms.Form
+    {
+        private System.Windows.Forms.RichTextBox richTextBox1;
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.Container components = null;
+
+        public Form1()
+        {
+            //
+            // Required for Windows Form Designer support
+            //
+            InitializeComponent();
+
+            //
+            // TODO: Add any constructor code after InitializeComponent call
+            //
+        }
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        protected override void Dispose( bool disposing )
+        {
+            if( disposing )
+            {
+                if (components != null)
+                {
+                    components.Dispose();
+                }
+            }
+            base.Dispose( disposing );
+        }
+
+        #region Windows Form Designer generated code
+        /// <summary>
+        /// Méthode requise pour la prise en charge du concepteur - ne modifiez pas
+        /// le contenu de cette méthode avec l'éditeur de code.
+        /// </summary>
+        private void InitializeComponent()
+        {
             this.richTextBox1 = new System.Windows.Forms.RichTextBox();
             this.SuspendLayout();
-            // 
+            //
             // richTextBox1
-            // 
+            //
             this.richTextBox1.Location = new System.Drawing.Point(0, 0);
             this.richTextBox1.Name = "richTextBox1";
             this.richTextBox1.Size = new System.Drawing.Size(768, 512);
             this.richTextBox1.TabIndex = 0;
             this.richTextBox1.Text = "";
-            // 
+            //
             // Form1
-            // 
+            //
             this.ClientSize = new System.Drawing.Size(770, 514);
             this.Controls.Add(this.richTextBox1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
@@ -104,54 +104,54 @@
             this.Load += new System.EventHandler(this.Form1_Load);
             this.ResumeLayout(false);
 
-		}
-		#endregion
+        }
+        #endregion
 
-		/// <summary>
-		/// The main entry point for the application.
-		/// </summary>
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
 
 
-		[STAThread]
-		static void Main() 
-		{
-			Application.Run(new Form1());
-		}
+        [STAThread]
+        static void Main()
+        {
+            Application.Run(new Form1());
+        }
 
-		private void Form1_Load(object sender, System.EventArgs e)
-		{
-			//Test if version of DLL is compatible : 3rd argument is "version of DLL tested;Your application name;Your application version"
+        private void Form1_Load(object sender, System.EventArgs e)
+        {
+            //Test if version of DLL is compatible : 3rd argument is "version of DLL tested;Your application name;Your application version"
             String ToDisplay;
             MediaInfo MI = new MediaInfo();
 
             ToDisplay = MI.Option("Info_Version", "0.7.0.0;MediaInfoDLL_Example_CS;0.7.0.0");
-			if (ToDisplay.Length == 0)
-			{
+            if (ToDisplay.Length == 0)
+            {
                 richTextBox1.Text = "MediaInfo.Dll: this version of the DLL is not compatible";
-				return;
-			}
+                return;
+            }
 
-			//Information about MediaInfo
-			ToDisplay += "\r\n\r\nInfo_Parameters\r\n";
-			ToDisplay += MI.Option("Info_Parameters");
+            //Information about MediaInfo
+            ToDisplay += "\r\n\r\nInfo_Parameters\r\n";
+            ToDisplay += MI.Option("Info_Parameters");
 
-			ToDisplay += "\r\n\r\nInfo_Capacities\r\n";
+            ToDisplay += "\r\n\r\nInfo_Capacities\r\n";
             ToDisplay += MI.Option("Info_Capacities");
 
-			ToDisplay += "\r\n\r\nInfo_Codecs\r\n";
+            ToDisplay += "\r\n\r\nInfo_Codecs\r\n";
             ToDisplay += MI.Option("Info_Codecs");
 
-			//An example of how to use the library
-			ToDisplay += "\r\n\r\nOpen\r\n";
-			MI.Open("Example.ogg");
+            //An example of how to use the library
+            ToDisplay += "\r\n\r\nOpen\r\n";
+            MI.Open("Example.ogg");
 
-			ToDisplay += "\r\n\r\nInform with Complete=false\r\n";
-			MI.Option("Complete");
-			ToDisplay += MI.Inform();
+            ToDisplay += "\r\n\r\nInform with Complete=false\r\n";
+            MI.Option("Complete");
+            ToDisplay += MI.Inform();
 
             ToDisplay += "\r\n\r\nInform with Complete=true\r\n";
-			MI.Option("Complete", "1");
-			ToDisplay += MI.Inform();
+            MI.Option("Complete", "1");
+            ToDisplay += MI.Inform();
 
             ToDisplay += "\r\n\r\nCustom Inform\r\n";
             MI.Option("Inform", "General;File size is %FileSize% bytes");
@@ -175,8 +175,8 @@
             ToDisplay += "\r\n\r\nClose\r\n";
             MI.Close();
 
-			//Displaying the text
-			richTextBox1.Text = ToDisplay;
-		}
-	}
+            //Displaying the text
+            richTextBox1.Text = ToDisplay;
+        }
+    }
 }

libmediainfo_0.7.34.tar.bz2/Source/Example/HowToUse_Dll.py -> libmediainfo_0.7.60.tar.bz2/Source/Example/HowToUse_Dll.py Changed

libmediainfo_0.7.34.tar.bz2/Source/Example/HowToUse_Dll3.py -> libmediainfo_0.7.60.tar.bz2/Source/Example/HowToUse_Dll3.py Changed

libmediainfo_0.7.34.tar.bz2/Source/Example/HowToUse_Dll_CLI.cs -> libmediainfo_0.7.60.tar.bz2/Source/Example/HowToUse_Dll_CLI.cs Changed

@@ -31,8 +31,8 @@
 
 namespace MediaInfoLib_MSCS
 {
-	public class CLI
-	{
+    public class CLI
+    {
         [STAThread]
         static void Main(string[] Args)
         {
@@ -47,17 +47,17 @@
             }
 
             //Information about MediaInfo
-			ToDisplay += "\r\n\r\nInfo_Parameters\r\n";
-			ToDisplay += MI.Option("Info_Parameters");
+            ToDisplay += "\r\n\r\nInfo_Parameters\r\n";
+            ToDisplay += MI.Option("Info_Parameters");
 
-			ToDisplay += "\r\n\r\nInfo_Capacities\r\n";
+            ToDisplay += "\r\n\r\nInfo_Capacities\r\n";
             ToDisplay += MI.Option("Info_Capacities");
 
-			ToDisplay += "\r\n\r\nInfo_Codecs\r\n";
+            ToDisplay += "\r\n\r\nInfo_Codecs\r\n";
             ToDisplay += MI.Option("Info_Codecs");
 
-			//An example of how to use the library
-			ToDisplay += "\r\n\r\nOpen\r\n";
+            //An example of how to use the library
+            ToDisplay += "\r\n\r\nOpen\r\n";
             String File_Name;
             if (Args.Length == 0)
                 File_Name = "Example.ogg";
@@ -65,13 +65,13 @@
                 File_Name = Args[0];
             MI.Open(File_Name);
 
-			ToDisplay += "\r\n\r\nInform with Complete=false\r\n";
-			MI.Option("Complete");
-			ToDisplay += MI.Inform();
+            ToDisplay += "\r\n\r\nInform with Complete=false\r\n";
+            MI.Option("Complete");
+            ToDisplay += MI.Inform();
 
             ToDisplay += "\r\n\r\nInform with Complete=true\r\n";
-			MI.Option("Complete", "1");
-			ToDisplay += MI.Inform();
+            MI.Option("Complete", "1");
+            ToDisplay += MI.Inform();
 
             ToDisplay += "\r\n\r\nCustom Inform\r\n";
             MI.Option("Inform", "General;File size is %FileSize% bytes");
@@ -95,8 +95,8 @@
             ToDisplay += "\r\n\r\nClose\r\n";
             MI.Close();
 
-			//Displaying the text
-			Console.Out.WriteLine(ToDisplay);
-		}
-	}
+            //Displaying the text
+            Console.Out.WriteLine(ToDisplay);
+        }
+    }
 }

libmediainfo_0.7.34.tar.bz2/Source/Install/MediaInfo_DLL_Windows_i386.nsi -> libmediainfo_0.7.60.tar.bz2/Source/Install/MediaInfo_DLL_Windows_i386.nsi Changed

@@ -4,8 +4,8 @@
 ; Some defines
 !define PRODUCT_NAME "MediaInfo"
 !define PRODUCT_PUBLISHER "MediaArea.net"
-!define PRODUCT_VERSION "0.7.34"
-!define PRODUCT_VERSION4 "0.7.34.0"
+!define PRODUCT_VERSION "0.7.60"
+!define PRODUCT_VERSION4 "${PRODUCT_VERSION}.0"
 !define PRODUCT_WEB_SITE "http://mediainfo.sourceforge.net"
 !define COMPANY_REGISTRY "Software\MediaArea.net"
 !define PRODUCT_REGISTRY "Software\MediaArea.net\MediaInfo.dll"
@@ -19,10 +19,14 @@
 ; x64 stuff
 !include "x64.nsh"
 
+; File size
+!include FileFunc.nsh
+!include WinVer.nsh
+
 ; Modern UI
 !include "MUI2.nsh"
 !define MUI_ABORTWARNING
-!define MUI_ICON "..\..\..\MediaInfo\Source\Ressource\Image\MediaInfo_TinyOnly.ico"
+!define MUI_ICON "..\..\..\MediaInfo\Source\Resource\Image\MediaInfo.ico"
 
 ; Language Selection Dialog Settings
 !define MUI_LANGDLL_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
@@ -40,6 +44,7 @@
 !insertmacro MUI_UNPAGE_FINISH
 
 ; Language files
+!insertmacro MUI_LANGUAGE "Arabic"
 !insertmacro MUI_LANGUAGE "Albanian"
 !insertmacro MUI_LANGUAGE "Belarusian"
 !insertmacro MUI_LANGUAGE "Catalan"
@@ -71,13 +76,13 @@
 
 ; Info
 VIProductVersion "${PRODUCT_VERSION4}"
-VIAddVersionKey "ProductName" "${PRODUCT_NAME}.dll" 
-VIAddVersionKey "Comments" "All about your audio and video files"
-VIAddVersionKey "CompanyName" "MediaArea.net"
-VIAddVersionKey "LegalTrademarks" "LGPL license" 
-VIAddVersionKey "LegalCopyright" "" 
+VIAddVersionKey "CompanyName" "${PRODUCT_PUBLISHER}"
+VIAddVersionKey "ProductName" "${PRODUCT_NAME}"
+VIAddVersionKey "ProductVersion" "${PRODUCT_VERSION4}"
 VIAddVersionKey "FileDescription" "All about your audio and video files"
-VIAddVersionKey "FileVersion" "${PRODUCT_VERSION}"
+VIAddVersionKey "FileVersion" "${PRODUCT_VERSION4}"
+VIAddVersionKey "LegalCopyright" "${PRODUCT_PUBLISHER}"
+VIAddVersionKey "OriginalFilename" "${PRODUCT_NAME}_DLL_${PRODUCT_VERSION}_Windows_i386.exe"
 BrandingText " "
 
 ; Modern UI end
@@ -90,21 +95,21 @@
 ShowUnInstDetails nevershow
 
 Function .onInit
-  !insertmacro MUI_LANGDLL_DISPLAY
   ${If} ${RunningX64}
-    MessageBox MB_OK|MB_ICONSTOP 'You are trying to install the 32-bit version of ${PRODUCT_NAME} on 64-bit Windows.$\r$\nPlease download and use the 64-bit version instead.$\r$\nClick OK to quit Setup.'
-    Quit
+    MessageBox MB_YESNO|MB_ICONQUESTION|MB_DEFBUTTON2 'You are trying to install the 32-bit version of ${PRODUCT_NAME} on 64-bit Windows.$\r$\nPlease download and use the 64-bit version instead.$\r$\nContinue with the installation of the 32-bit version?' IDYES noprob
+  Quit
+  noprob:
   ${Else}
   ${EndIf}
+  !insertmacro MUI_LANGDLL_DISPLAY
 FunctionEnd
 
 !include Library.nsh
 
 Section "SectionPrincipale" SEC01
-  SetOverwrite ifnewer
   SetOutPath "$INSTDIR"
   !insertmacro InstallLib REGDLL NOTSHARED NOREBOOT_NOTPROTECTED "..\..\Project\MSVC2005\DLL\Win32\Release\MediaInfo.dll" $SYSDIR\MediaInfo.dll $SYSDIR
-  !insertmacro InstallLib REGDLL NOTSHARED NOREBOOT_NOTPROTECTED "..\..\Project\MSVC2008\ShellExtension\Win32\Release\MediaInfo_InfoTip.dll" $INSTDIR\MediaInfo_InfoTip.dll $INSTDIR
+  !insertmacro InstallLib REGDLL NOTSHARED NOREBOOT_NOTPROTECTED "..\..\Project\MSVC2010\ShellExtension\Win32\Release\MediaInfo_InfoTip.dll" $INSTDIR\MediaInfo_InfoTip.dll $INSTDIR
 SectionEnd
 
 Section -Post
@@ -121,6 +126,13 @@
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\MediaInfo_InfoTip.dll"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
+
+  ; File size, taken from SumatraPDF installer
+  ${If} ${AtLeastWin7}
+  ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
+  IntFmt $0 "0x%08X" $0 ; Convert the decimal KB value in $0 to DWORD, put it right back into $0
+  WriteRegDWORD ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "EstimatedSize" "$0" ; Create/Write the reg key with the dword value
+  ${EndIf}
 SectionEnd

libmediainfo_0.7.34.tar.bz2/Source/Install/MediaInfo_DLL_Windows_x64.nsi -> libmediainfo_0.7.60.tar.bz2/Source/Install/MediaInfo_DLL_Windows_x64.nsi Changed

@@ -4,8 +4,8 @@
 ; Some defines
 !define PRODUCT_NAME "MediaInfo"
 !define PRODUCT_PUBLISHER "MediaArea.net"
-!define PRODUCT_VERSION "0.7.34"
-!define PRODUCT_VERSION4 "0.7.34.0"
+!define PRODUCT_VERSION "0.7.60"
+!define PRODUCT_VERSION4 "${PRODUCT_VERSION}.0"
 !define PRODUCT_WEB_SITE "http://mediainfo.sourceforge.net"
 !define COMPANY_REGISTRY "Software\MediaArea.net"
 !define PRODUCT_REGISTRY "Software\MediaArea.net\MediaInfo.dll"
@@ -19,10 +19,14 @@
 ; x64 stuff
 !include "x64.nsh"
 
+; File size
+!include FileFunc.nsh
+!include WinVer.nsh
+
 ; Modern UI
 !include "MUI2.nsh"
 !define MUI_ABORTWARNING
-!define MUI_ICON "..\..\..\MediaInfo\Source\Ressource\Image\MediaInfo_TinyOnly.ico"
+!define MUI_ICON "..\..\..\MediaInfo\Source\Resource\Image\MediaInfo.ico"
 
 ; Language Selection Dialog Settings
 !define MUI_LANGDLL_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
@@ -40,6 +44,7 @@
 !insertmacro MUI_UNPAGE_FINISH
 
 ; Language files
+!insertmacro MUI_LANGUAGE "Arabic"
 !insertmacro MUI_LANGUAGE "Albanian"
 !insertmacro MUI_LANGUAGE "Belarusian"
 !insertmacro MUI_LANGUAGE "Catalan"
@@ -71,13 +76,13 @@
 
 ; Info
 VIProductVersion "${PRODUCT_VERSION4}"
-VIAddVersionKey "ProductName" "${PRODUCT_NAME}.dll" 
-VIAddVersionKey "Comments" "All about your audio and video files"
-VIAddVersionKey "CompanyName" "MediaArea.net"
-VIAddVersionKey "LegalTrademarks" "LGPL license" 
-VIAddVersionKey "LegalCopyright" "" 
+VIAddVersionKey "CompanyName" "${PRODUCT_PUBLISHER}"
+VIAddVersionKey "ProductName" "${PRODUCT_NAME}"
+VIAddVersionKey "ProductVersion" "${PRODUCT_VERSION4}"
 VIAddVersionKey "FileDescription" "All about your audio and video files"
-VIAddVersionKey "FileVersion" "${PRODUCT_VERSION}"
+VIAddVersionKey "FileVersion" "${PRODUCT_VERSION4}"
+VIAddVersionKey "LegalCopyright" "${PRODUCT_PUBLISHER}"
+VIAddVersionKey "OriginalFilename" "${PRODUCT_NAME}_DLL_${PRODUCT_VERSION}_Windows_x64.exe"
 BrandingText " "
 
 ; Modern UI end
@@ -90,19 +95,18 @@
 ShowUnInstDetails nevershow
 
 Function .onInit
-  !insertmacro MUI_LANGDLL_DISPLAY
   ${If} ${RunningX64}
     SetRegView 64
   ${Else}
     MessageBox MB_OK|MB_ICONSTOP 'You are trying to install the 64-bit version of ${PRODUCT_NAME} on 32-bit Windows.$\r$\nPlease download and use the 32-bit version instead.$\r$\nClick OK to quit Setup.'
     Quit
   ${EndIf}
+  !insertmacro MUI_LANGDLL_DISPLAY
 FunctionEnd
 
 !include Library.nsh
 
 Section "SectionPrincipale" SEC01
-  SetOverwrite ifnewer
   SetOutPath "$INSTDIR"
   !insertmacro InstallLib REGDLL NOTSHARED NOREBOOT_NOTPROTECTED "..\..\Project\MSVC2010\DLL\x64\Release\MediaInfo.dll" $SYSDIR\MediaInfo.dll $SYSDIR
   !insertmacro InstallLib REGDLL NOTSHARED NOREBOOT_NOTPROTECTED "..\..\Project\MSVC2010\ShellExtension\x64\Release\MediaInfo_InfoTip.dll" $INSTDIR\MediaInfo_InfoTip.dll $INSTDIR
@@ -117,6 +121,13 @@
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\MediaInfo_InfoTip.dll"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
+
+  ; File size, taken from SumatraPDF installer
+  ${If} ${AtLeastWin7}
+  ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
+  IntFmt $0 "0x%08X" $0 ; Convert the decimal KB value in $0 to DWORD, put it right back into $0
+  WriteRegDWORD ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "EstimatedSize" "$0" ; Create/Write the reg key with the dword value
+  ${EndIf}
 SectionEnd

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Archive/File_7z.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Archive/File_7z.cpp Changed

@@ -1,31 +1,35 @@
 // File_7z - Info for 7z files
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_7Z_YES)
 //---------------------------------------------------------------------------

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Archive/File_7z.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Archive/File_7z.h Changed

@@ -1,17 +1,17 @@
 // File_7z - Info for 7z files
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Archive/File_Ace.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Archive/File_Ace.cpp Changed

@@ -1,31 +1,35 @@
 // File_Ace - Info for ACE files
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_ACE_YES)
 //---------------------------------------------------------------------------

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Archive/File_Ace.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Archive/File_Ace.h Changed

@@ -1,17 +1,17 @@
 // File_Ace - Info for ACE files
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Archive/File_Bzip2.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Archive/File_Bzip2.cpp Changed

@@ -1,31 +1,35 @@
 // File_Bzip2 - Info for BZIP2 files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_BZIP2_YES)
 //---------------------------------------------------------------------------

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Archive/File_Bzip2.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Archive/File_Bzip2.h Changed

@@ -1,17 +1,17 @@
 // File_Bzip2 - Info for PCM files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Archive/File_Elf.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Archive/File_Elf.cpp Changed

@@ -1,31 +1,35 @@
 // File_Elf - Info for ELF files
-// Copyright (C) 2008-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_ELF_YES)
 //---------------------------------------------------------------------------
 
@@ -198,19 +202,19 @@
     Get_L1 (classs,                                             "class");
     Get_L1 (data,                                               "data");
     Get_L1 (version1,                                           "version");
-    Get_L1 (osabi,                                              "osabi"); Param_Info(Elf_osabi(osabi));
+    Get_L1 (osabi,                                              "osabi"); Param_Info1(Elf_osabi(osabi));
     Get_L1 (abiversion,                                         "abiversion");
     Skip_XX(7,                                                  "reserved");
     if (data==1) //LE
     {
-        Get_L2 (type,                                           "type"); Param_Info(Elf_type(type));
-        Get_L2 (machine,                                        "machine"); Param_Info(Elf_machine(machine));
+        Get_L2 (type,                                           "type"); Param_Info1(Elf_type(type));
+        Get_L2 (machine,                                        "machine"); Param_Info1(Elf_machine(machine));
         Get_L4 (version4,                                       "version");
     }
     if (data==2) //BE
     {
-        Get_B2 (type,                                           "type"); Param_Info(Elf_type(type));
-        Get_B2 (machine,                                        "machine"); Param_Info(Elf_machine(machine));
+        Get_B2 (type,                                           "type"); Param_Info1(Elf_type(type));
+        Get_B2 (machine,                                        "machine"); Param_Info1(Elf_machine(machine));
         Get_B4 (version4,                                       "version");
     }
     Skip_XX(Element_Size-Element_Offset,                        "Data");

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Archive/File_Elf.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Archive/File_Elf.h Changed

@@ -1,17 +1,17 @@
 // File_Elf - Info for ELF files
-// Copyright (C) 2008-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Archive/File_Gzip.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Archive/File_Gzip.cpp Changed

@@ -1,31 +1,35 @@
 // File_Gzip - Info for Gzip files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_GZIP_YES)
 //---------------------------------------------------------------------------

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Archive/File_Gzip.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Archive/File_Gzip.h Changed

@@ -1,17 +1,17 @@
 // File_Gzip - Info for Gzip files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Archive/File_Iso9660.cpp Added

@@ -0,0 +1,122 @@
+// File_Iso9660 - Info for Iso9660 files
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_7Z_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Archive/File_Iso9660.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// File header
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_Iso9660::FileHeader_Begin()
+{
+    //Element_Size
+    if (Buffer_Size<65536)
+        return false; //Must wait for more data
+
+    if (CC6(Buffer+32768)!=0x014344303031LL) //"Iso9660...."
+    {
+        Reject("ISO 9660");
+        return false;
+    }
+
+    //All should be OK...
+    Accept("ISO 9660");
+    return true;
+}
+
+//***************************************************************************
+// Buffer - Global
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Iso9660::Read_Buffer_Continue()
+{
+    Skip_XX(32768,                                              "System Area");
+    Primary_Volume_Descriptor();
+
+    FILLING_BEGIN();
+        Fill(Stream_General, 0, General_Format, "ISO 9660");
+
+        Finish("ISO 9660");
+    FILLING_END();
+}
+
+//***************************************************************************
+// Elements
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Iso9660::Primary_Volume_Descriptor()
+{
+    int32u Volume_Space_Size;
+    Element_Begin1("Volume_Descriptor");
+    Skip_B1("Volume Descriptor Type");
+    Skip_Local(5,"Standard Identifier");
+    Skip_B1("Volume Descriptor Version");
+    Skip_B1("Unused field");
+    Skip_Local(32,"System Identifier");
+    Skip_Local(32,"Volume Identifier");
+    Skip_XX(8,"Unused field");
+    Get_D4(Volume_Space_Size,                                   "Volume Space Size"); Param_Info2(Volume_Space_Size*(int64u)2048, " bytes");
+    Skip_XX(32,"Unused field");
+    Skip_B4("Volume Set Size");
+    Skip_B4("Volume Sequence Number");
+    Skip_B4("Logical Block Size");
+    Skip_B8("Path Table Size");
+    Skip_B4("Location of Occurrence of Type L Path Table");
+    Skip_B4("Location of Optional Occurrence of Type L Path Table");
+    Skip_B4("Location of Occurrence of Type M Path Table");
+    Skip_B4("Location of Optional Occurrence of Type M Path Table");
+    Skip_Local(34,"Directory Record for Root Directory");
+    Skip_Local(128,"Volume Set Identifier");
+    Skip_Local(128,"Publisher Identifier");
+    Skip_Local(128,"Data Preparer Identifier");
+    Skip_Local(128,"Application Identifier");
+    Skip_Local(37,"Copyright File Identifier");
+    Skip_Local(37,"Abstract File Identifier");
+    Skip_Local(37,"Bibliographic File Identifier");
+    Skip_XX(17,"Volume Creation Date and Time");
+    Element_End0();
+}
+
+} //NameSpace
+
+#endif //MEDIAINFO_7Z_YES

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Archive/File_Iso9660.h Added

@@ -0,0 +1,55 @@
+// File_Iso9660 - Info for Iso9660 files
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Information about Iso9660 files
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_File_Iso9660H
+#define MediaInfo_File_Iso9660H
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Class File_Iso9660
+//***************************************************************************
+
+class File_Iso9660 : public File__Analyze
+{
+protected :
+    //Buffer - File header
+    bool FileHeader_Begin();
+
+    //Buffer - Global
+    void Read_Buffer_Continue ();
+
+    //Elements
+    void Primary_Volume_Descriptor();
+};
+
+} //NameSpace
+
+#endif

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Archive/File_Mz.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Archive/File_Mz.cpp Changed

@@ -1,31 +1,35 @@
 // File_Mz - Info for MZ files
-// Copyright (C) 2008-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_MZ_YES)
 //---------------------------------------------------------------------------
 
@@ -88,7 +92,7 @@
 {
     //Parsing
     int32u lfanew;
-    Element_Begin("MZ");
+    Element_Begin1("MZ");
     Skip_C2(                                                    "magic");
     Skip_L2(                                                    "cblp");
     Skip_L2(                                                    "cp");
@@ -125,11 +129,11 @@
     if (lfanew>Element_Offset)
     {
         Skip_XX(lfanew-Element_Offset,                          "MZ data");
-        Element_End();
+        Element_End0();
     }
     if (Element_Offset>lfanew)
     {
-        Element_End();
+        Element_End0();
         Element_Offset=lfanew; //Multi usage off the first bytes
     }
 
@@ -139,16 +143,16 @@
     Peek_B4(Signature);
     if (Signature==0x50450000) //"PE"
     {
-        Element_Begin("PE");
+        Element_Begin1("PE");
         Skip_C4(                                                "Header");
-        Get_L2 (Machine,                                        "Machine"); Param_Info(Mz_Machine(Machine));
+        Get_L2 (Machine,                                        "Machine"); Param_Info1(Mz_Machine(Machine));
         Skip_L2(                                                "NumberOfSections");
-        Get_L4 (TimeDateStamp,                                  "TimeDateStamp"); Param_Info(Ztring().Date_From_Seconds_1970(TimeDateStamp));
+        Get_L4 (TimeDateStamp,                                  "TimeDateStamp"); Param_Info1(Ztring().Date_From_Seconds_1970(TimeDateStamp));
         Skip_L4(                                                "PointerToSymbolTable");
         Skip_L4(                                                "NumberOfSymbols");
         Skip_L2(                                                "SizeOfOptionalHeader");
         Get_L2 (Characteristics,                                "Characteristics");
-        Element_End("PE");
+        Element_End0();
     }
 
     FILLING_BEGIN();

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Archive/File_Mz.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Archive/File_Mz.h Changed

@@ -1,17 +1,17 @@
 // File_Mz - Info for MZ files
-// Copyright (C) 2008-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Archive/File_Rar.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Archive/File_Rar.cpp Changed

@@ -1,31 +1,35 @@
 // File_Rar - Info for RAR files
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_RAR_YES)
 //---------------------------------------------------------------------------
 
@@ -39,6 +43,71 @@
 {
 
 //***************************************************************************
+// Infos
+//***************************************************************************
+
+
+//---------------------------------------------------------------------------
+const char* Rar_host_os[6]=
+{
+    "MS DOS",
+    "OS/2",
+    "Win32",
+    "Unix",
+    "Mac OS",
+    "BeOS"
+};
+
+//---------------------------------------------------------------------------
+const char* Rar_packing_method[6]=
+{
+    "storing",
+    "fastest compression",
+    "fast compression",
+    "normal compression",
+    "good compression",
+    "best compression"
+};
+
+//---------------------------------------------------------------------------
+const char* Rar_HEADER_TYPE(int8u HEADER_TYPE)
+{
+    switch(HEADER_TYPE)
+    {
+        case 0x72 : return "marker block";
+        case 0x73 : return "archive header";
+        case 0x74 : return "file header";
+        case 0x75 : return "old style comment header";
+        case 0x76 : return "old style authenticity information";
+        case 0x77 : return "old style subblock";
+        case 0x78 : return "old style recovery record";
+        case 0x79 : return "old style authenticity informatio";
+        case 0x7A : return "subblock";
+        case 0x7B : return "end of file";
+        default   : return "";
+    }
+};
+
+//---------------------------------------------------------------------------
+Ztring Rar_version_number(int8u byte)
+{
+    //Version number is encoded as 10 * Major version + minor version.
+    return Ztring::ToZtring(byte/10)+Ztring(".")+Ztring::ToZtring(byte%10);
+}
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File_Rar::File_Rar()
+:File__Analyze()
+{
+    //Configuration
+    DataMustAlwaysBeComplete=false;
+}
+
+//***************************************************************************
 // Static stuff
 //***************************************************************************
 
@@ -46,10 +115,12 @@
 bool File_Rar::FileHeader_Begin()
 {
     //Element_Size
-    if (Buffer_Size<4)
+    if (Buffer_Size<7)
         return false; //Must wait for more data
 
-    if (CC4(Buffer)!=0x52415221) //"RAR!"
+    state=0;
+
+    if (CC7(Buffer)!=0x526172211A0700LL) //"Rar!"
     {
         Reject("RAR");
         return false;
@@ -60,22 +131,197 @@
 }
 
 //***************************************************************************
-// Buffer - Global
+// Buffer - Per element
 //***************************************************************************
 
 //---------------------------------------------------------------------------
-void File_Rar::Read_Buffer_Continue()
+bool File_Rar::Header_Begin()
+{
+    if (Element_Offset+7>Element_Size)
+        return false; //Not enough data for header size
+    int16u HEAD_SIZE=LittleEndian2int16u(Buffer+Buffer_Offset+(size_t)Element_Offset+5);
+
+    if (Element_Offset+HEAD_SIZE>Element_Size)
+        return false; //Not enough data for header
+
+    return true;
+}
+
+//---------------------------------------------------------------------------
+void File_Rar::Header_Parse()
 {
-    Skip_B4(                                                    "Magic");
-    Skip_XX(File_Size-4,                                        "Data");
+    //Config
+    HIGH_PACK_SIZE=0;
+    PACK_SIZE=0;
 
-    FILLING_BEGIN();
-        Accept("RAR");
+    //Parsing
+    int16u HEAD_SIZE;
+    Skip_L2(                                                    "HEAD_CRC"); //CRC of total block or block part
+    Get_L1 (HEAD_TYPE,                                          "HEAD_TYPE"); //Block type
+    Get_L2 (HEAD_FLAGS,                                         "HEAD_FLAGS");
+    Header_Parse_Flags();
+    Get_L2 (HEAD_SIZE,                                          "HEAD_SIZE");
+    Header_Parse_Content();
+    Skip_XX(HEAD_SIZE-(size_t)Element_Offset,                   "REST OF HEADER");
 
-        Fill(Stream_General, 0, General_Format, "RAR");
+    //Filling
+    Header_Fill_Size(HEAD_SIZE+HIGH_PACK_SIZE*0x100000000LL+PACK_SIZE);
+    Header_Fill_Code(HEAD_TYPE, Rar_HEADER_TYPE(HEAD_TYPE));
+}
+
+//---------------------------------------------------------------------------
+void File_Rar::Header_Parse_Flags()
+{
+    switch (HEAD_TYPE)
+    {
+        case 0x73 : Header_Parse_Flags_73(); break;
+        case 0x74 : Header_Parse_Flags_74(); break;
+        default   : Header_Parse_Flags_XX();
+    }
+}
+
+//---------------------------------------------------------------------------
+// archive header
+void File_Rar::Header_Parse_Flags_73()
+{
+    Skip_Flags(HEAD_FLAGS, 1,                                   "Volume attribute (archive volume)");
+    Skip_Flags(HEAD_FLAGS, 2,                                   "Archive comment present");
+    Skip_Flags(HEAD_FLAGS, 3,                                   "Archive lock attribute");
+    Skip_Flags(HEAD_FLAGS, 4,                                   "Solid attribute (solid archive)");
+    Skip_Flags(HEAD_FLAGS, 5,                                   "New volume naming scheme"); // (\'volname.partN.rar\')
+    Skip_Flags(HEAD_FLAGS, 6,                                   "Authenticity information present");
+    Skip_Flags(HEAD_FLAGS, 7,                                   "Recovery record present");
+    Skip_Flags(HEAD_FLAGS, 8,                                   "Block headers are encrypted");
+    Skip_Flags(HEAD_FLAGS, 9,                                   "First volume (set only by RAR 3.0 and later)");
+    Get_Flags (HEAD_FLAGS, 15, add_size,                        "ADD_SIZE present");
+}
+
+//---------------------------------------------------------------------------
+// file header
+void File_Rar::Header_Parse_Flags_74()
+{
+    Skip_Flags(HEAD_FLAGS,0,                                    "file continued from previous volume");
+    Skip_Flags(HEAD_FLAGS,1,                                    "file continued in next volume");
+    Skip_Flags(HEAD_FLAGS,2,                                    "file encrypted with password");
+    Skip_Flags(HEAD_FLAGS,3,                                    "file comment present");
+    Skip_Flags(HEAD_FLAGS,4,                                    "information from previous files is used"); // (solid flag)
+               // bits 7 6 5 (for RAR 2.0 and later)
+               //      0 0 0    - dictionary size   64 KB
+               //      0 0 1    - dictionary size  128 KB
+               //      0 1 0    - dictionary size  256 KB
+               //      0 1 1    - dictionary size  512 KB
+               //      1 0 0    - dictionary size 1024 KB
+               //      1 0 1    - dictionary size 2048 KB
+               //      1 1 0    - dictionary size 4096 KB
+               //      1 1 1    - file is directory
+    Get_Flags (HEAD_FLAGS,  8, high_fields,                     "HIGH_PACK_SIZE and HIGH_UNP_SIZE fields");
+    Get_Flags (HEAD_FLAGS,  9, usual_or_utf8,                   "FILE_NAME contains usual and encoded unicode");
+    Get_Flags (HEAD_FLAGS, 10, salt,                            "SALT present");
+    Skip_Flags(HEAD_FLAGS, 11,                                  "Version flag.");
+    Get_Flags (HEAD_FLAGS, 12, exttime,                         "Extended time field present");
+    Get_Flags (HEAD_FLAGS, 15, add_size,                        "ADD_SIZE present");
+}
+
+//---------------------------------------------------------------------------
+// Generic
+void File_Rar::Header_Parse_Flags_XX()
+{
+    Get_Flags (HEAD_FLAGS, 15, add_size,                        "ADD_SIZE present");
+}
+
+//---------------------------------------------------------------------------
+void File_Rar::Header_Parse_Content()
+{
+    switch (HEAD_TYPE)
+    {
+        case 0x73 : Header_Parse_Content_73(); break;
+        case 0x74 : Header_Parse_Content_74(); break;
+        default   : Header_Parse_Content_XX(); break;
+    }
+}
+
+//---------------------------------------------------------------------------
+// archive header
+void File_Rar::Header_Parse_Content_73()
+{
+    Skip_L2(                                                    "RESERVED_1");
+    Skip_L4(                                                    "RESERVED_2");
+}
+
+//---------------------------------------------------------------------------
+// file header
+void File_Rar::Header_Parse_Content_74()
+{
+    int16u name_size;
+    int8u HOST_OS, METHOD, UNP_VER;
+    Get_L4 (PACK_SIZE,                                          "PACK_SIZE"); //Compressed file size
+    Skip_L4(                                                    "UNP_SIZE"); //Uncompressed file size
+    Get_L1 (HOST_OS,                                            "HOST_OS"); Param_Info1((HOST_OS<6?Rar_host_os[HOST_OS]:"Unknown"));
+    Skip_L4(                                                    "FILE_CRC");
+    Skip_L4(                                                    "FTIME"); //Date and time in standard MS DOS format
+    Get_L1 (UNP_VER,                                            "UNP_VER"); Param_Info1(Rar_version_number(UNP_VER)); //RAR version needed to extract file
+    Get_L1 (METHOD,                                             "METHOD"); Param_Info1(((METHOD>=0x30)&&(METHOD<0x36)?Rar_packing_method[METHOD-0x30]:"Unknown"));
+    Get_L2 (name_size,                                          "NAME_SIZE"); //File name size
+    Skip_L4(                                                    "ATTR"); //File attributes
+    if(high_fields)
+    {
+        Get_L4 (HIGH_PACK_SIZE,                                 "HIGH_PACK_SIZE"); //High 4 bytes of 64 bit value of compressed file size.
+        Skip_L4(                                                "HIGH_UNP_SIZE"); //High 4 bytes of 64 bit value of uncompressed file size.
+    }
+    else
+        HIGH_PACK_SIZE=0;
+    if (usual_or_utf8)
+    {
+        //Must test the content before reading, looking fore zero byte
+        if (Element_Offset+name_size>Element_Size)
+        {
+            Skip_XX(Element_Size-Element_Offset,                "Error");
+            return;
+        }
+        int64u ZeroPos=0;
+        while (ZeroPos<name_size)
+        {
+            if (Buffer[Buffer_Offset+(size_t)(Element_Offset+ZeroPos)]==0)
+                break; //Found
+            ZeroPos++;
+        }
+
+        if (ZeroPos==name_size)
+            Skip_UTF8(name_size,                                "FILE_NAME");
+        else
+        {
+            Skip_Local(ZeroPos,                                 "FILE_NAME"); //Up to ZeroPos
+            Skip_L1(                                            "Zero");
+            Skip_UTF16L(name_size-(ZeroPos+1),                  "FILE_NAME"); //Spec is not precise, "Unicode" without encoding format (character size, endianess), because RAR is from Windows, we hope this is the format from Windows (UTF-16 Little Endian)
+        }
+    }
+    else
+        Skip_Local(name_size,                                   "FILE_NAME");
+
+    if (salt)
+        Skip_L8(                                                "SALT");
+    //if(exttime)
+        //Skip_XX("EXT_TIME"); //Which size?
+}
+
+//---------------------------------------------------------------------------
+// Generic
+void File_Rar::Header_Parse_Content_XX()
+{
+    if (add_size)
+        Get_L4 (PACK_SIZE,                                      "ADD_SIZE"); //Additional data size
+}
+
+//---------------------------------------------------------------------------
+void File_Rar::Data_Parse()
+{
+    switch (Element_Code)
+    {
+        case 0x72 : Accept("RAR"); Fill(Stream_General, 0, General_Format, "RAR"); break;
+        default   : ;
+    }
 
-        Finish("RAR");
-    FILLING_END();
+    Skip_XX(Element_Size,                                       "Data");
 }
 
 } //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Archive/File_Rar.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Archive/File_Rar.h Changed

@@ -1,17 +1,17 @@
 // File_Rar - Info for RAR files
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -39,12 +39,38 @@
 
 class File_Rar : public File__Analyze
 {
+public :
+    File_Rar();
+
 protected :
+    int state;
+
     //Buffer - File header
     bool FileHeader_Begin();
 
-    //Buffer - Global
-    void Read_Buffer_Continue ();
+    //Buffer - Per element
+    bool Header_Begin();
+    void Header_Parse();
+    void Header_Parse_Flags();
+    void Header_Parse_Flags_73();
+    void Header_Parse_Flags_74();
+    void Header_Parse_Flags_XX();
+    void Header_Parse_Content();
+    void Header_Parse_Content_73();
+    void Header_Parse_Content_74();
+    void Header_Parse_Content_XX();
+    void Data_Parse();
+
+    //Temp
+    int8u  HEAD_TYPE;
+    int32u PACK_SIZE;
+    int32u HIGH_PACK_SIZE;
+    int16u HEAD_FLAGS;
+    bool   high_fields;
+    bool   usual_or_utf8;
+    bool   salt;
+    bool   exttime;
+    bool   add_size;
 };
 
 } //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Archive/File_Tar.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Archive/File_Tar.cpp Changed

@@ -1,31 +1,35 @@
 // File_Tar - Info for Tar files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_TAR_YES)
 //---------------------------------------------------------------------------
 
@@ -43,6 +47,14 @@
 //---------------------------------------------------------------------------
 void File_Tar::Read_Buffer_Continue()
 {
+    if (File_Size<257)
+    {
+        Reject();
+        return;
+    }
+    if (Buffer_Size<257)
+        return; //Wait for more data
+
     //Parsing
     Ztring ChecksumO;
     Skip_Local(100,                                             "File name");

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Archive/File_Tar.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Archive/File_Tar.h Changed

@@ -1,17 +1,17 @@
 // File_Tar - Info for Tar files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Archive/File_Zip.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Archive/File_Zip.cpp Changed

@@ -1,31 +1,35 @@
 // File_Zip - Info for NewFormat files
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_ZIP_YES)
 //---------------------------------------------------------------------------
 
@@ -38,6 +42,63 @@
 {
 
 //***************************************************************************
+// Infos
+//***************************************************************************
+
+
+//---------------------------------------------------------------------------
+const char* Zip_made_by[20]=
+{
+    "MS-DOS and OS/2 (FAT / VFAT / FAT32 file systems)",
+    "Amiga",
+    "OpenVMS",
+    "UNIX",
+    "VM/CMS",
+    "Atari ST",
+    "OS/2 H.P.F.S.",
+    "Macintosh",
+    "Z-System",
+    "CP/M",
+    "Windows NTFS",
+    "MVS (OS/390 - Z/OS)",
+    "VSE",
+    "Acorn Risc",
+    "VFAT",
+    "alternate MVS",
+    "BeOS",
+    "Tandem",
+    "OS/400",
+    "OS/X (Darwin)"
+};
+
+//---------------------------------------------------------------------------
+const char* Zip_compression_method[22]=
+{
+    "stored (no compression)",
+    "Shrunk",
+    "Reduced with compression factor 1",
+    "Reduced with compression factor 2",
+    "Reduced with compression factor 3",
+    "Reduced with compression factor 4",
+    "Imploded",
+    "Tokenizing compression algorithm",
+    "Deflated",
+    "Enhanced Deflating using Deflate64(tm)",
+    "PKWARE Data Compression Library Imploding (old IBM TERSE)",
+    "Reserved by PKWARE",
+    "compressed using BZIP2 algorithm",
+    "Reserved by PKWARE",
+    "LZMA (EFS)",
+    "Reserved by PKWARE",
+    "Reserved by PKWARE",
+    "Reserved by PKWARE",
+    "File is compressed using IBM TERSE (new)",
+    "IBM LZ77 z Architecture (PFS)",
+    "WavPack compressed data", // 97
+    "PPMd version I, Rev 1" // 98
+};
+
+//***************************************************************************
 // Static stuff
 //***************************************************************************
 
@@ -54,7 +115,17 @@
         return false;
     }
 
-    //All should be OK...
+    //This is OK, ZIP detected
+    Accept();
+
+    //Init
+    signature=0x00000000;
+    local_file_Step=0;
+    end_of_central_directory_IsParsed=false;
+
+    //Jumping to the end of the file minus  end_of_central_directory size (we hope there is no comment)
+    GoTo(File_Size-22);
+
     return true;
 }
 
@@ -65,16 +136,346 @@
 //---------------------------------------------------------------------------
 void File_Zip::Read_Buffer_Continue()
 {
-    Skip_B4(                                                    "Magic");
-    Skip_XX(File_Size-4,                                        "Data");
+    for (;;)
+    {
+        //Probing
+        if (signature==0x00000000) //If not already tested (else an element is being parsed)
+        {
+            if (Element_Offset+4>Element_Size) //signature size
+                return; //Not enough data
+            signature=LittleEndian2int32u(Buffer+(size_t)Element_Offset);
+        }
+
+        //Parsing
+        switch (signature)
+        {
+            case 0x04034b50 :   if (!local_file())
+                                    return; //Not enough data
+                                break;
+            case 0x02014b50 :   if (!central_directory())
+                                    return; //Not enough data
+                                break;
+            case 0x05054b50 :   if (!digital_signature())
+                                    return; //Not enough data
+                                break;
+            case 0x06054b50 :   if (!end_of_central_directory())
+                                    return; //Not enough data
+                                break;
+            case 0x08064b50 :   if(!archive_extra_data_record())
+                                    return;
+                                break;
+            case 0x06064b50 :   if(!Zip64_end_of_central_directory_record())
+                                    return;
+                                break;
+            case 0x07064b50 :   if(!Zip64_end_of_central_directory_locator())
+                                    return;
+                                break;
+            default:    Finish(); return; //Reject(); return; //Unknown value  //Décommenter quand toutes les signatures sont implémentées
+        }
+
+        //Cleanup
+        signature=0x00000000; //Reset, must probe again the signature (next element)
+    }
+}
+
+//***************************************************************************
+// Files
+//***************************************************************************
+
+bool File_Zip::local_file()
+{
+    switch(local_file_Step)
+    {
+        case 0 :
+                    if (!local_file_header())
+                        return false;
+                    local_file_Step=1; //local_file_header parsed
+        case 1 :
+                    local_file_Step=2; //file_data is always parsed
+                    if (!file_data())
+                        return false;
+        case 2 :
+                    if (!data_descriptor())
+                        return false;
+                    local_file_Step=0; //data_descriptor is parsed, back to begin
+        default :   ; //Should never happen
+    }
+
+    return true;
+}
+
+bool File_Zip::archive_extra_data_record()
+{
+    if (Element_Offset+8>Element_Size) //archive_extra_data_record
+        return false; //Not enough data
+
+    //Retrieving complete archive_extra_data_record size
+    int32u extra_field_length=LittleEndian2int32u(Buffer+(size_t)Element_Offset+4);
+
+    //Parsing
+    Element_Begin1("archive_extra_data_record");
+        Skip_C4("Archive extra data signature");
+        Skip_L4("extra field length");
+        Skip_XX(extra_field_length,"extra_field_data");
+    Element_End0();
+
+    return true;
+}
+
+bool File_Zip::digital_signature()
+{
+    if (Element_Offset+6>Element_Size) //digital_signature
+        return false; //Not enough data
+
+    //Retrieving complete archive_extra_data_record size
+    int16u size_of_data=LittleEndian2int16u(Buffer+(size_t)Element_Offset+4);
+
+    //Parsing
+    Element_Begin1("digital_signature");
+        Skip_C4("Header signature");
+        Skip_L2("size of data");
+        Skip_XX(size_of_data,"signature data");
+    Element_End0();
+
+    return true;
+}
+
+bool File_Zip::local_file_header()
+{
+    if (Element_Offset+30>Element_Size) //local_file_header up to extra_field_length included
+        return false; //Not enough data
+
+    //Retrieving complete local_file_header size
+    int16u file_name_length=LittleEndian2int16u(Buffer+(size_t)Element_Offset+26);
+    int16u extra_field_length=LittleEndian2int16u(Buffer+(size_t)Element_Offset+28);
+    if (Element_Offset+30+file_name_length+extra_field_length>Element_Size) //local_file_header all included
+        return false; //Not enough data
+
+    //Parsing
+    Element_Begin1("local_file_header");
+    int16u general_purpose_bit_flag,compression_method;
+    bool efs;
+    Skip_C4("Local file header signature");
+    Skip_L2("Version needed to extract");
+    Get_L2 (general_purpose_bit_flag,"general purpose bit flag");
+    Skip_Flags(general_purpose_bit_flag, 0,                     "encrypted file");
+    Skip_Flags(general_purpose_bit_flag, 1,                     "8K sliding dictionary");
+    Skip_Flags(general_purpose_bit_flag, 2,                     "3 Shannon-Fano trees");
+    Get_Flags (general_purpose_bit_flag, 3, data_descriptor_set,    "data descriptor");
+    Skip_Flags(general_purpose_bit_flag, 4,                     "Reserved for use with method 8");
+    Skip_Flags(general_purpose_bit_flag, 4,                     "file is compressed patched data");
+    Skip_Flags(general_purpose_bit_flag, 4,                     "Strong encryption");
+    //~ Skip_Flags(general_purpose_bit_flag, 4,                     "Currently unused");
+    //~ Skip_Flags(general_purpose_bit_flag, 4,                     "Currently unused");
+    //~ Skip_Flags(general_purpose_bit_flag, 4,                     "Currently unused");
+    //~ Skip_Flags(general_purpose_bit_flag, 4,                     "Currently unused");
+    Get_Flags (general_purpose_bit_flag, 11, efs,                "Language encoding flag (EFS)");
+    //~ Skip_Flags(general_purpose_bit_flag, 4,                     "Reserved by PKWARE for enhanced compression");
+    //~ Skip_Flags(general_purpose_bit_flag, 4,                     "");
+    //~ Skip_Flags(general_purpose_bit_flag, 4,                     "Reserved by PKWARE");
+    //~ Skip_Flags(general_purpose_bit_flag, 4,                     "Reserved by PKWARE");
+    Get_L2 (compression_method,"compression method");
+    Param_Info1C((compression_method<20), Zip_compression_method[compression_method]);
+    Param_Info1C((compression_method==97||compression_method==98), Zip_compression_method[compression_method-97+20]);
+    Skip_L2("last mod file time");
+    Skip_L2("last mod file date");
+    Skip_L4("crc-32");
+    Get_L4(compressed_size,"compressed size");
+    Skip_L4("uncompressed size");
+    Get_L2(file_name_length,"file name lenth");
+    Get_L2(extra_field_length,"extra field length");
+    if(efs) {
+        Skip_UTF8(file_name_length,"file name");
+        Skip_UTF8(extra_field_length,"extra field");
+    } else {
+        Skip_Local(file_name_length,"file name");
+        Skip_Local(extra_field_length,"extra field");
+    }
+    Element_End0();
 
     FILLING_BEGIN();
         Accept("Zip");
-
         Fill(Stream_General, 0, General_Format, "ZIP");
-
-        Finish("Zip");
     FILLING_END();
+    return true;
+}
+
+bool File_Zip::file_data()
+{
+    Element_Begin1("file_data");
+        Skip_XX(compressed_size,"File_data");
+    Element_End0();
+
+    if (Element_Offset>Element_Size)
+    {
+        GoTo(File_Offset+Element_Offset);
+        return false;
+    }
+    return true;
+
+}
+
+bool File_Zip::data_descriptor()
+{
+    if(data_descriptor_set)
+    {
+        if (Element_Offset+12>Element_Size)
+            return false; //Not enough data
+
+        Element_Begin1("data_descriptor");
+            Skip_L4("crc-32");
+            Skip_L4("compressed size");
+            Skip_L4("uncompressed size");
+        Element_End0();
+    }
+    return true;
+}
+
+bool File_Zip::central_directory()
+{
+    if (Element_Offset+46>Element_Size) //central_directory up to relative offset of local header included
+        return false; //Not enough data
+
+    //Retrieving complete local_file_header size
+    int16u file_name_length=LittleEndian2int16u(Buffer+(size_t)Element_Offset+28);
+    int16u extra_field_length=LittleEndian2int16u(Buffer+(size_t)Element_Offset+30);
+    int16u file_comment_length=LittleEndian2int16u(Buffer+(size_t)Element_Offset+32);
+    if (Element_Offset+46+file_name_length+extra_field_length+file_comment_length>Element_Size) //central_directory_structure all included
+        return false; //Not enough data
+
+    int16u general_purpose_bit_flag;
+    bool efs;
+    int16u version_made_by,compression_method;
+
+    //Parsing
+    Element_Begin1("Central directory");
+    Skip_C4("central file header signature");
+    Get_L2 (version_made_by,"version made by");Param_Info1((version_made_by>>8)>20?"unused":Zip_made_by[version_made_by>>8]);
+    Skip_L2("version needed to extract");
+    Get_L2 (general_purpose_bit_flag,"general purpose bit flag");
+    Skip_Flags(general_purpose_bit_flag, 0,                     "encrypted file");
+    Skip_Flags(general_purpose_bit_flag, 1,                     "8K sliding dictionary");
+    Skip_Flags(general_purpose_bit_flag, 2,                     "3 Shannon-Fano trees");
+    Skip_Flags(general_purpose_bit_flag, 3,                     "data descriptor");
+    Skip_Flags(general_purpose_bit_flag, 4,                     "Reserved for use with method 8");
+    Skip_Flags(general_purpose_bit_flag, 4,                     "file is compressed patched data");
+    Skip_Flags(general_purpose_bit_flag, 4,                     "Strong encryption");
+    //~ Skip_Flags(general_purpose_bit_flag, 4,                     "Currently unused");
+    //~ Skip_Flags(general_purpose_bit_flag, 4,                     "Currently unused");
+    //~ Skip_Flags(general_purpose_bit_flag, 4,                     "Currently unused");
+    //~ Skip_Flags(general_purpose_bit_flag, 4,                     "Currently unused");
+    Get_Flags (general_purpose_bit_flag, 11, efs,                "Language encoding flag (EFS)");
+    //~ Skip_Flags(general_purpose_bit_flag, 4,                     "Reserved by PKWARE for enhanced compression");
+    //~ Skip_Flags(general_purpose_bit_flag, 4,                     "");
+    //~ Skip_Flags(general_purpose_bit_flag, 4,                     "Reserved by PKWARE");
+    //~ Skip_Flags(general_purpose_bit_flag, 4,                     "Reserved by PKWARE");
+    Get_L2 (compression_method,"compression method");
+    Param_Info1C((compression_method<20), Zip_compression_method[compression_method]);
+    Param_Info1C((compression_method==97||compression_method==98), Zip_compression_method[compression_method-97+20]);
+    Skip_L2("last mod file time");
+    Skip_L2("last mod file date");
+    Skip_L4("crc-32");
+    Skip_L4("compressed size");
+    Skip_L4("uncompressed size");
+    Skip_L2("file name length");
+    Skip_L2("extra field length");
+    Skip_L2("file comment length");
+    Skip_L2("disk number start");
+    Skip_L2("internal file attributes");
+    Skip_L4("external file attributes");
+    Skip_L4("relative offset of local header");
+    if(efs) {
+        Skip_UTF8(file_name_length,"file name");
+        Skip_UTF8(extra_field_length,"extra field");
+        Skip_UTF8(file_comment_length,"file comment");
+    } else {
+        Skip_Local(file_name_length,"file name");
+        Skip_Local(extra_field_length,"extra field");
+        Skip_Local(file_comment_length,"file comment");
+    }
+    Element_End0();
+
+    return true;
+}
+
+bool File_Zip::end_of_central_directory()
+{
+    if (Element_Offset+22>Element_Size) //end_of_central_directory up to relative offset of .ZIP file comment length included
+        return false; //Not enough data
+
+    //Retrieving complete local_file_header size
+    int16u zip_comment_length=LittleEndian2int16u(Buffer+(size_t)Element_Offset+20);
+    if (Element_Offset+22+zip_comment_length>Element_Size) //end_of_central_directory all included
+        return false; //Not enough data
+
+    //Parsing
+    int32u offset;
+    Element_Begin1("End of central directory");
+    Skip_C4(                                                    "end of central dir signature");
+    Skip_L2(                                                    "number of this disk");
+    Skip_L2(                                                    "number of the disk");// with the start of the central directory
+    Skip_L2(                                                    "total number of entries on this disk");// in the central directory
+    Skip_L2(                                                    "total number of entries");// in the central directory
+    Skip_L4(                                                    "size of the central directory");
+    Get_L4 (offset,                                             "offset of start of central directory");// with respect to the starting disk number
+    Skip_L2(                                                    "zip file comment length");
+    Skip_XX(zip_comment_length,                                 "zip file comment");
+    Element_End0();
+
+    //Going to first central directory (once)
+    if (!end_of_central_directory_IsParsed)
+    {
+        end_of_central_directory_IsParsed=true;
+        GoTo(offset);
+    }
+    return true;
+}
+
+bool File_Zip::Zip64_end_of_central_directory_record()
+{
+    if (Element_Offset+12>Element_Size) //Zip64_end_of_central_directory_record
+        return false; //Not enough data
+
+    //Retrieving complete Zip64_end_of_central_directory_record size
+    int64u size_of_Zip64_end_of_central_directory_record=LittleEndian2int64u(Buffer+(size_t)Element_Offset+4);
+    if (Element_Offset+12+size_of_Zip64_end_of_central_directory_record>Element_Size) //end_of_central_directory all included
+        return false; //Not enough data
+
+    //Parsing
+    //~ int32u offset;
+    int16u version_made_by;
+    Element_Begin1("Zip64 End of central directory record");
+    Skip_C4(                                                    "Zip64 end of central dir signature");
+    Skip_L8(                                                    "size of zip64 end of central directory record");
+    Get_L2 (version_made_by,                                    "version made by");
+    Param_Info1((version_made_by>>8)>20?"unused":Zip_made_by[version_made_by>>8]);
+    Skip_L2(                                                    "version needed to extract");
+    Skip_L4(                                                    "number of this disk");
+    Skip_L4(                                                    "number of the disk");// with the start of the central directory
+    Skip_L8(                                                    "total number of entries on this disk");// in the central directory
+    Skip_L8(                                                    "total number of entries");// in the central directory
+    Skip_L8(                                                    "size of the central directory");
+    Skip_L8(                                                    "offset of start of central directory"); //  with respect to the starting disk number
+    Skip_XX(size_of_Zip64_end_of_central_directory_record-44,   "zip64 extensible data sector");
+    Element_End0();
+
+    return true;
+}
+
+bool File_Zip::Zip64_end_of_central_directory_locator()
+{
+    if (Element_Offset+20>Element_Size) //Zip64_end_of_central_directory_locator
+        return false; //Not enough data
+
+    //Parsing
+    Element_Begin1("Zip64 end of central directory locator");
+    Skip_C4("zip64 end of central dir locator signature");
+    Skip_L4("number of the disk");// with the start of the zip64 end of central directory
+    Skip_L8("relative offset of the zip64 end of central directory record");
+    Skip_L4("total number of disks");
+    Element_End0();
+
+    return true;
 }
 
 } //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Archive/File_Zip.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Archive/File_Zip.h Changed

@@ -1,17 +1,17 @@
 // File_Zip - Info for NewFormat files
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -43,8 +43,26 @@
     //Buffer - File header
     bool FileHeader_Begin();
 
+
     //Buffer - Global
     void Read_Buffer_Continue ();
+
+    int32u compressed_size;
+    bool data_descriptor_set;
+    int32u signature;
+    int8u  local_file_Step;
+    bool    end_of_central_directory_IsParsed;
+
+    bool local_file();
+    bool local_file_header();
+    bool file_data();
+    bool data_descriptor();
+    bool archive_extra_data_record();
+    bool central_directory();
+    bool digital_signature();
+    bool end_of_central_directory();
+    bool Zip64_end_of_central_directory_record();
+    bool Zip64_end_of_central_directory_locator();
 };
 
 } //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Aac.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Aac.cpp Changed

@@ -1,184 +1,680 @@
 // File_Aac - Info for AAC (Raw) files
-// Copyright (C) 2008-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_AAC_YES)
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 #include "MediaInfo/Audio/File_Aac.h"
+#include "MediaInfo/MediaInfo_Config_MediaInfo.h"
 //---------------------------------------------------------------------------
 
 namespace MediaInfoLib
 {
 
 //***************************************************************************
+// Infos
+//***************************************************************************
+
+//***************************************************************************
 // Constructor/Destructor
 //***************************************************************************
 
 //---------------------------------------------------------------------------
 File_Aac::File_Aac()
+:File__Analyze(), File__Tags_Helper()
 {
+    //File__Tags_Helper
+    Base=this;
+
+    //Configuration
+    MustSynchronize=true;
+    Buffer_TotalBytes_FirstSynched_Max=64*1024;
+    PTS_DTS_Needed=true;
+    IsRawStream=true;
+
     //In
-    #ifdef MEDIAINFO_MPEG4_YES
-        DecSpecificInfoTag=NULL;
-        SLConfig=NULL;
-    #endif
+    Frame_Count_Valid=MediaInfoLib::Config.ParseSpeed_Get()>=0.5?128:(MediaInfoLib::Config.ParseSpeed_Get()>=0.3?32:2);
+    FrameIsAlwaysComplete=false;
+    Mode=Mode_Unknown;
+
+    audioObjectType=(int8u)-1;
+    extensionAudioObjectType=(int8u)-1;
+    channelConfiguration=(int8u)-1;
+    frame_length=1024;
+    sampling_frequency_index=(int8u)-1;
+    sampling_frequency=(int32u)-1;
+    extension_sampling_frequency_index=(int8u)-1;
+    extension_sampling_frequency=(int32u)-1;
+    aacSpectralDataResilienceFlag=false;
+    aacSectionDataResilienceFlag=false;
+    aacScalefactorDataResilienceFlag=false;
+    FrameSize_Min=(int64u)-1;
+    FrameSize_Max=0;
 
-    //libfaad specific
-    #ifdef MEDIAINFO_FAAD_YES
-        hAac=NULL;
-    #endif
+    //Temp - Main
+    muxConfigPresent=true;
+    audioMuxVersionA=false;
+
+    //Temp - General Audio
+    sbr=NULL;
+    ps=NULL;
+
+    //Temp
+    CanFill=false;
 }
 
 //---------------------------------------------------------------------------
 File_Aac::~File_Aac()
 {
-    //libfaad specific
-    #ifdef MEDIAINFO_FAAD_YES
-        NeAACDecClose(hAac); //hAac=NULL;
-    #endif
+    delete sbr;
+    delete ps;
 }
 
 //***************************************************************************
-// Buffer - Global
+// Streams management
 //***************************************************************************
 
 //---------------------------------------------------------------------------
-void File_Aac::Read_Buffer_Continue()
+void File_Aac::Streams_Fill()
 {
-    if (!Codec.empty())
-        From_Codec(); //It is impossible to detect... Default is no detection, only filling
-    else
-        libfaad(); //Trying libfaad if available
+    switch(Mode)
+    {
+        case Mode_LATM : Fill(Stream_General, 0, General_Format, "LATM"); if (IsSub) Fill(Stream_Audio, 0, Audio_MuxingMode, "LATM"); break;
+        default : ;
+    }
+
+    for (std::map<std::string, Ztring>::iterator Info=Infos_General.begin(); Info!=Infos_General.end(); ++Info)
+        Fill(Stream_General, 0, Info->first.c_str(), Info->second);
+    File__Tags_Helper::Stream_Prepare(Stream_Audio);
+    for (std::map<std::string, Ztring>::iterator Info=Infos.begin(); Info!=Infos.end(); ++Info)
+        Fill(Stream_Audio, StreamPos_Last, Info->first.c_str(), Info->second);
+
+    switch(Mode)
+    {
+        case Mode_ADTS    : File__Tags_Helper::Streams_Fill(); break;
+        default           : ;
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::Streams_Finish()
+{
+    switch(Mode)
+    {
+        case Mode_ADIF    :
+        case Mode_ADTS    : File__Tags_Helper::Streams_Finish(); break;
+        default           : ;
+    }
+
+    if (FrameSize_Min!=(int32u)-1 && FrameSize_Max)
+    {
+        if (FrameSize_Max>FrameSize_Min*1.02)
+        {
+            Fill(Stream_Audio, 0, Audio_BitRate_Mode, "VBR", Unlimited, true, true);
+            if (Config->ParseSpeed>=1.0)
+            {
+                Fill(Stream_Audio, 0, Audio_BitRate_Minimum, ((float64)FrameSize_Min)/1024*48000*8, 0);
+                Fill(Stream_Audio, 0, Audio_BitRate_Maximum, ((float64)FrameSize_Max)/1024*48000*8, 0);
+            }
+        }
+        else if (Config->ParseSpeed>=1.0)
+        {
+            Fill(Stream_Audio, 0, Audio_BitRate_Mode, "CBR");
+        }
+    }
 }
 
 //***************************************************************************
-// Helpers
+// Buffer - File header
 //***************************************************************************
 
 //---------------------------------------------------------------------------
-void File_Aac::From_Codec()
+bool File_Aac::FileHeader_Begin()
 {
-    //Filling
-    Accept("AAC");
+    switch(Mode)
+    {
+        case Mode_AudioSpecificConfig :
+        case Mode_ADIF                :
+                                        MustSynchronize=false; break;
+        default                       : ; //Synchronization is requested, and this is the default
+    }
+
+    switch(Mode)
+    {
+        case Mode_Unknown             :
+        case Mode_ADIF                :
+        case Mode_ADTS                :
+                                        break;
+        default                       : return true; //no file header test with other modes
+    }
+
+    //Tags
+    if (!File__Tags_Helper::FileHeader_Begin())
+        return false;
+
+    //Testing
+    if (Buffer_Offset+4>Buffer_Size)
+        return false;
+    if (CC4(Buffer+Buffer_Offset)==0x41444946) //"ADIF"
+    {
+        Mode=Mode_ADIF;
+        File__Tags_Helper::Accept("ADIF");
+        MustSynchronize=false;
+    }
+
+    return true;
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::FileHeader_Parse()
+{
+    switch (Mode)
+    {
+        case Mode_ADIF    : FileHeader_Parse_ADIF(); break;
+        default           : ; //no file header test with other modes
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::FileHeader_Parse_ADIF()
+{
+    adif_header();
+    BS_Begin();
+    raw_data_block();
+    BS_End();
+
+    FILLING_BEGIN();
+        File__Tags_Helper::Finish();
+    FILLING_END();
+}
+
+//***************************************************************************
+// Buffer - Global
+//***************************************************************************
 
-    Stream_Prepare(Stream_Audio);
-    Fill(Stream_Audio, 0, Audio_Format, "AAC");
-    Fill(Stream_Audio, 0, Audio_Codec, Codec);
-    Ztring Profile;
-    int8u Version=0, SBR=2, PS=2;
-         if (0);
-    else if (Codec==_T("A_AAC/MPEG2/MAIN"))     {Version=2; Profile=_T("Main");}
-    else if (Codec==_T("A_AAC/MPEG2/LC"))       {Version=2; Profile=_T("LC");   SBR=0;}
-    else if (Codec==_T("A_AAC/MPEG2/LC/SBR"))   {Version=2; Profile=_T("LC");   SBR=1;}
-    else if (Codec==_T("A_AAC/MPEG2/SSR"))      {Version=2; Profile=_T("SSR");}
-    else if (Codec==_T("A_AAC/MPEG4/MAIN"))     {Version=4; Profile=_T("Main");}
-    else if (Codec==_T("A_AAC/MPEG4/LC"))       {Version=4; Profile=_T("LC");   SBR=0;}
-    else if (Codec==_T("A_AAC/MPEG4/LC/SBR"))   {Version=4; Profile=_T("LC");   SBR=1; PS=0;}
-    else if (Codec==_T("A_AAC/MPEG4/LC/SBR/PS")){Version=4; Profile=_T("LC");   SBR=1; PS=1;}
-    else if (Codec==_T("A_AAC/MPEG4/SSR"))      {Version=4; Profile=_T("SSR");}
-    else if (Codec==_T("A_AAC/MPEG4/LTP"))      {Version=4; Profile=_T("LTP");}
-    else if (Codec==_T("raac"))                 {           Profile=_T("LC");}
-    else if (Codec==_T("racp"))                 {           Profile=_T("LC");   SBR=1; PS=0;}
+//---------------------------------------------------------------------------
+void File_Aac::Read_Buffer_Continue()
+{
+    if (Element_Size==0)
+        return;
 
-    if (Version>0)
-        Fill(Stream_Audio, 0, Audio_Format_Version, Version==2?"Version 2":"Version 4");
-    Fill(Stream_Audio, 0, Audio_Format_Profile, Profile);
-    if (SBR!=2)
+    switch(Mode)
     {
-        if (SBR)
-            Fill(Stream_Audio, 0, Audio_Format_Settings, "SBR");
-        Fill(Stream_Audio, 0, Audio_Format_Settings_SBR, SBR?"Yes":"No");
+        case Mode_AudioSpecificConfig : Read_Buffer_Continue_AudioSpecificConfig(); break;
+        case Mode_raw_data_block      : Read_Buffer_Continue_raw_data_block(); break;
+        case Mode_ADIF                :
+        case Mode_ADTS                : File__Tags_Helper::Read_Buffer_Continue(); break;
+        default                       : ;
     }
-    if (PS!=2)
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::Read_Buffer_Continue_AudioSpecificConfig()
+{
+    File__Analyze::Accept(); //We automaticly trust it
+
+    BS_Begin();
+    AudioSpecificConfig(0); //Up to the end of the block
+    BS_End();
+
+    Mode=Mode_raw_data_block; //Mode_AudioSpecificConfig only once
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::Read_Buffer_Continue_raw_data_block()
+{
+    if (Frame_Count>Frame_Count_Valid)
     {
-        if (PS)
-            Fill(Stream_Audio, 0, Audio_Format_Settings, "PS");
-        Fill(Stream_Audio, 0, Audio_Format_Settings_PS, PS?"Yes":"No");
+        Skip_XX(Element_Size,                                   "Data");
+        return; //Parsing completely only the 1st frame
     }
 
-    Finish("AAC");
+    BS_Begin();
+    raw_data_block();
+    BS_End();
+    if (FrameIsAlwaysComplete && Element_Offset<Element_Size)
+        Skip_XX(Element_Size-Element_Offset,                    "Unknown");
+
+    FILLING_BEGIN();
+        //Counting
+        Frame_Count++;
+        if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+            Frame_Count_NotParsedIncluded++;
+        Element_Info1(Ztring::ToZtring(Frame_Count));
+
+        //Filling
+        if (!Status[IsAccepted])
+            File__Analyze::Accept();
+        if (Frame_Count>=Frame_Count_Valid)
+        {
+            //No more need data
+            File__Analyze::Finish();
+        }
+    FILLING_END();
 }
 
 //***************************************************************************
-// libfaad specific
+// Buffer - Synchro
 //***************************************************************************
 
 //---------------------------------------------------------------------------
-void File_Aac::libfaad()
+bool File_Aac::Synchronize()
 {
-    #if defined(MEDIAINFO_FAAD_YES) && defined(MEDIAINFO_MPEG4_YES)
-        unsigned long samplerate;
-        unsigned char channels;
+    switch (Mode)
+    {
+        case Mode_Unknown     : if (Synchronize_LATM()) return true; Buffer_Offset=0; return Synchronize_ADTS();
+        case Mode_ADTS        : return Synchronize_ADTS();
+        case Mode_LATM        : return Synchronize_LATM();
+        default               : return true; //No synchro
+    }
+}
 
-        //Open the library
-        if (hAac==NULL)
+//---------------------------------------------------------------------------
+bool File_Aac::Synchronize_ADTS()
+{
+    //Tags
+    bool Tag_Found;
+    if (!File__Tags_Helper::Synchronize(Tag_Found))
+        return false;
+    if (Tag_Found)
+        return true;
+
+    //Synchronizing
+    while (Buffer_Offset+6<=Buffer_Size)
+    {
+         while (Buffer_Offset+6<=Buffer_Size && (Buffer[Buffer_Offset  ]!=0xFF
+                                              || (Buffer[Buffer_Offset+1]&0xF6)!=0xF0))
+            Buffer_Offset++;
+
+        if (Buffer_Offset+6<=Buffer_Size)//Testing if size is coherant
         {
-            hAac = NeAACDecOpen();
-            // Initialise the library using one of the initialization functions
-            char err = NeAACDecInit2(hAac, (unsigned char *)DecSpecificInfoTag->Buffer, DecSpecificInfoTag->Buffer_Size, &samplerate, &channels);
-            if (err != 0)
+            //Testing next start, to be sure
+            int16u aac_frame_length=(CC3(Buffer+Buffer_Offset+3)>>5)&0x1FFF;
+            if (IsSub && Buffer_Offset+aac_frame_length==Buffer_Size)
+                break;
+            if (File_Offset+Buffer_Offset+aac_frame_length!=File_Size-File_EndTagSize)
             {
-                //
-                // Handle error
-                //
+                if (Buffer_Offset+aac_frame_length+2>Buffer_Size)
+                    return false; //Need more data
+
+                //Testing
+                if (aac_frame_length<=7 || (CC2(Buffer+Buffer_Offset+aac_frame_length)&0xFFF6)!=0xFFF0)
+                    Buffer_Offset++;
+                else
+                {
+                    //Testing next start, to be sure
+                    int16u aac_frame_length2=(CC3(Buffer+Buffer_Offset+aac_frame_length+3)>>5)&0x1FFF;
+                    if (File_Offset+Buffer_Offset+aac_frame_length+aac_frame_length2!=File_Size-File_EndTagSize)
+                    {
+                        if (Buffer_Offset+aac_frame_length+aac_frame_length2+2>Buffer_Size)
+                            return false; //Need more data
+
+                        //Testing
+                        if (aac_frame_length2<=7 || (CC2(Buffer+Buffer_Offset+aac_frame_length+aac_frame_length2)&0xFFF6)!=0xFFF0)
+                            Buffer_Offset++;
+                        else
+                        {
+                            //Testing next start, to be sure
+                            int16u aac_frame_length3=(CC3(Buffer+Buffer_Offset+aac_frame_length+aac_frame_length2+3)>>5)&0x1FFF;
+                            if (File_Offset+Buffer_Offset+aac_frame_length+aac_frame_length2+aac_frame_length3!=File_Size-File_EndTagSize)
+                            {
+                                if (Buffer_Offset+aac_frame_length+aac_frame_length2+aac_frame_length3+2>Buffer_Size)
+                                    return false; //Need more data
+
+                                //Testing
+                                if (aac_frame_length3<=7 || (CC2(Buffer+Buffer_Offset+aac_frame_length+aac_frame_length2+aac_frame_length3)&0xFFF6)!=0xFFF0)
+                                    Buffer_Offset++;
+                                else
+                                    break; //while()
+                            }
+                            else
+                                break; //while()
+                        }
+                    }
+                    else
+                        break; //while()
+                }
             }
+            else
+                break; //while()
         }
+    }
 
-        //Decode the frame in buffer
-        void* samplebuffer;
-        NeAACDecFrameInfo hInfo;
-        samplebuffer = NeAACDecDecode(hAac, &hInfo, (unsigned char *)Buffer, Buffer_Size);
-        if ((hInfo.error == 0) && (hInfo.samples > 0))
-        {
-            //
-            // do what you need to do with the decoded samples
-            //
-        }
-        else if (hInfo.error != 0)
+    //Parsing last bytes if needed
+    if (Buffer_Offset+6>Buffer_Size)
+    {
+        if (Buffer_Offset+5==Buffer_Size && (CC2(Buffer+Buffer_Offset)&0xFFF6)!=0xFFF0)
+            Buffer_Offset++;
+        if (Buffer_Offset+4==Buffer_Size && (CC2(Buffer+Buffer_Offset)&0xFFF6)!=0xFFF0)
+            Buffer_Offset++;
+        if (Buffer_Offset+3==Buffer_Size && (CC2(Buffer+Buffer_Offset)&0xFFF6)!=0xFFF0)
+            Buffer_Offset++;
+        if (Buffer_Offset+2==Buffer_Size && (CC2(Buffer+Buffer_Offset)&0xFFF6)!=0xFFF0)
+            Buffer_Offset++;
+        if (Buffer_Offset+1==Buffer_Size && CC1(Buffer+Buffer_Offset)!=0xFF)
+            Buffer_Offset++;
+        return false;
+    }
+
+    //Synched is OK
+    Mode=Mode_ADTS;
+    File__Tags_Helper::Accept("ADTS");
+    return true;
+}
+
+//---------------------------------------------------------------------------
+bool File_Aac::Synchronize_LATM()
+{
+    //Synchronizing
+    while (Buffer_Offset+3<=Buffer_Size)
+    {
+         while (Buffer_Offset+3<=Buffer_Size && (Buffer[Buffer_Offset  ]!=0x56
+                                              || (Buffer[Buffer_Offset+1]&0xE0)!=0xE0))
+            Buffer_Offset++;
+
+        if (Buffer_Offset+3<=Buffer_Size)//Testing if size is coherant
         {
-            //
-            // Some error occurred while decoding this frame
-            //
+            //Testing next start, to be sure
+            int16u audioMuxLengthBytes=CC2(Buffer+Buffer_Offset+1)&0x1FFF;
+            if (IsSub && Buffer_Offset+3+audioMuxLengthBytes==Buffer_Size)
+                break;
+            if (File_Offset+Buffer_Offset+3+audioMuxLengthBytes!=File_Size)
+            {
+                if (Buffer_Offset+3+audioMuxLengthBytes+3>Buffer_Size)
+                    return false; //Need more data
+
+                //Testing
+                if ((CC2(Buffer+Buffer_Offset+3+audioMuxLengthBytes)&0xFFE0)!=0x56E0)
+                    Buffer_Offset++;
+                else
+                {
+                    //Testing next start, to be sure
+                    int16u audioMuxLengthBytes2=CC2(Buffer+Buffer_Offset+3+audioMuxLengthBytes+1)&0x1FFF;
+                    if (File_Offset+Buffer_Offset+3+audioMuxLengthBytes+3+audioMuxLengthBytes2!=File_Size)
+                    {
+                        if (Buffer_Offset+3+audioMuxLengthBytes+3+audioMuxLengthBytes2+3>Buffer_Size)
+                            return false; //Need more data
+
+                        //Testing
+                        if ((CC2(Buffer+Buffer_Offset+3+audioMuxLengthBytes+3+audioMuxLengthBytes2)&0xFFE0)!=0x56E0)
+                            Buffer_Offset++;
+                        else
+                            break; //while()
+                    }
+                    else
+                        break; //while()
+                }
+            }
+            else
+                break; //while()
         }
-    #else
+    }
+
+
+    //Synchronizing
+    while (Buffer_Offset+2<=Buffer_Size && (Buffer[Buffer_Offset  ]!=0x56
+                                         || (Buffer[Buffer_Offset+1]&0xE0)!=0xE0))
+        Buffer_Offset++;
+    if (Buffer_Offset+2>=Buffer_Size)
+        return false;
+
+    //Synched is OK
+    Mode=Mode_LATM;
+    File__Analyze::Accept("LATM");
+    return true;
+}
+
+//---------------------------------------------------------------------------
+bool File_Aac::Synched_Test()
+{
+    switch (Mode)
+    {
+        case Mode_ADTS        : return Synched_Test_ADTS();
+        case Mode_LATM        : return Synched_Test_LATM();
+        default               : return true; //No synchro
+    }
+}
+
+//---------------------------------------------------------------------------
+bool File_Aac::Synched_Test_ADTS()
+{
+    //Tags
+    if (!File__Tags_Helper::Synched_Test())
+        return false;
+
+    //Must have enough buffer for having header
+    if (Buffer_Offset+2>Buffer_Size)
+        return false;
+
+    //Quick test of synchro
+    if ((CC2(Buffer+Buffer_Offset)&0xFFF6)!=0xFFF0)
+        Synched=false;
+
+    //We continue
+    return true;
+}
+
+//---------------------------------------------------------------------------
+bool File_Aac::Synched_Test_LATM()
+{
+    //Must have enough buffer for having header
+    if (Buffer_Offset+2>Buffer_Size)
+        return false;
+
+    //Quick test of synchro
+    if ((CC2(Buffer+Buffer_Offset)&0xFFE0)!=0x56E0)
+        Synched=false;
+
+    //We continue
+    return true;
+}
+
+//***************************************************************************
+// Buffer - Demux
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_DEMUX
+bool File_Aac::Demux_UnpacketizeContainer_Test()
+{
+    switch (Mode)
+    {
+        case Mode_ADTS        : return Demux_UnpacketizeContainer_Test_ADTS();
+        case Mode_LATM        : return Demux_UnpacketizeContainer_Test_LATM();
+        default               : return true; //No header
+    }
+}
+bool File_Aac::Demux_UnpacketizeContainer_Test_ADTS()
+{
+    int16u aac_frame_length=(BigEndian2int24u(Buffer+Buffer_Offset+3)>>5)&0x1FFF; //13 bits
+    Demux_Offset=Buffer_Offset+aac_frame_length;
+
+    if (Demux_Offset>Buffer_Size && File_Offset+Buffer_Size!=File_Size)
+        return false; //No complete frame
+
+    Demux_UnpacketizeContainer_Demux();
+
+    return true;
+}
+bool File_Aac::Demux_UnpacketizeContainer_Test_LATM()
+{
+    int16u audioMuxLengthBytes=BigEndian2int16u(Buffer+Buffer_Offset+1)&0x1FFF; //13 bits
+    Demux_Offset=Buffer_Offset+3+audioMuxLengthBytes;
+
+    if (Demux_Offset>Buffer_Size && File_Offset+Buffer_Size!=File_Size)
+        return false; //No complete frame
+
+    Demux_UnpacketizeContainer_Demux();
+
+    return true;
+}
+#endif //MEDIAINFO_DEMUX
+
+//***************************************************************************
+// Buffer - Per element
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_Aac::Header_Begin()
+{
+    switch (Mode)
+    {
+        case Mode_ADTS        : return Header_Begin_ADTS();
+        case Mode_LATM        : return Header_Begin_LATM();
+        default               : return true; //No header
+    }
+}
+
+//---------------------------------------------------------------------------
+bool File_Aac::Header_Begin_ADTS()
+{
+    //There is no real header in ADTS, retrieving only the frame length
+    if (Buffer_Offset+8>Buffer_Size) //size of adts_fixed_header + adts_variable_header
+        return false;
+
+    return true;
+}
+
+//---------------------------------------------------------------------------
+bool File_Aac::Header_Begin_LATM()
+{
+    if (Buffer_Offset+3>Buffer_Size) //fixed 24-bit header
+        return false;
+
+    return true;
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::Header_Parse()
+{
+    switch (Mode)
+    {
+        case Mode_ADTS        : Header_Parse_ADTS(); break;
+        case Mode_LATM        : Header_Parse_LATM(); break;
+        default               : ; //No header
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::Header_Parse_ADTS()
+{
+    //There is no "header" in ADTS, retrieving only the frame length
+    int16u aac_frame_length=(BigEndian2int24u(Buffer+Buffer_Offset+3)>>5)&0x1FFF; //13 bits
+
+    //Filling
+    Header_Fill_Size(aac_frame_length);
+    Header_Fill_Code(0, "adts_frame");
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::Header_Parse_LATM()
+{
+    int16u audioMuxLengthBytes;
+    BS_Begin();
+    Skip_S2(11,                                                 "syncword");
+    Get_S2 (13, audioMuxLengthBytes,                            "audioMuxLengthBytes");
+    BS_End();
+
+    //Filling
+    Header_Fill_Size(3+audioMuxLengthBytes);
+    Header_Fill_Code(0, "LATM");
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::Data_Parse()
+{
+    if (FrameSize_Min>Header_Size+Element_Size)
+        FrameSize_Min=Header_Size+Element_Size;
+    if (FrameSize_Max<Header_Size+Element_Size)
+        FrameSize_Max=Header_Size+Element_Size;
+
+    if (Frame_Count>Frame_Count_Valid || CanFill)
+    {
+        Skip_XX(Element_Size,                                   "Data");
+        FrameInfo.DTS+=float64_int64s(((float64)frame_length)*1000000000/sampling_frequency);
+        FrameInfo.PTS=FrameInfo.DTS;
+        return; //Parsing completely only the 1st frame
+    }
+
+    switch (Mode)
+    {
+        case Mode_ADTS        : Data_Parse_ADTS(); break;
+        case Mode_LATM        : Data_Parse_LATM(); break;
+        default               : ; //No header
+    }
+
+    FILLING_BEGIN();
+        //Counting
+        if (File_Offset+Buffer_Offset+Element_Size==File_Size)
+            Frame_Count_Valid=Frame_Count; //Finish frames in case of there are less than Frame_Count_Valid frames
+        Frame_Count++;
+        if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+            Frame_Count_NotParsedIncluded++;
+        Element_Info1(Ztring::ToZtring(Frame_Count));
+
         //Filling
-        if (!Status[IsAccepted])
+        if ((Frame_Count>=Frame_Count_Valid || CanFill) && Config->ParseSpeed<1.0)
         {
-            Accept("AAC");
-
-            Stream_Prepare(Stream_Audio);
-            Fill(Stream_Audio, 0, Audio_Format, "AAC");
-            Fill(Stream_Audio, 0, Audio_Codec, "AAC");
+            //No more need data
+            switch (Mode)
+            {
+                case Mode_ADTS        :
+                case Mode_LATM        :
+                                        Fill();
+                                        if (!IsSub)
+                                            File__Tags_Helper::Finish(); break;
+                default               : ; //No header
+            }
 
-            Finish("AAC");
         }
-    #endif
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::Data_Parse_ADTS()
+{
+    //Parsing
+    BS_Begin();
+    adts_frame();
+    BS_End();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::Data_Parse_LATM()
+{
+    BS_Begin();
+    AudioMuxElement();
+    BS_End();
 }
 
 //***************************************************************************

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Aac.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Aac.h Changed

@@ -1,23 +1,23 @@
 // File_Aac - Info for AAC (Raw) files
-// Copyright (C) 2008-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //
-// Information about AAC (Raw) files
+// Information about AAC files
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
@@ -31,9 +31,7 @@
 #ifdef MEDIAINFO_MPEG4_YES
     #include "MediaInfo/Multiple/File_Mpeg4_Descriptors.h"
 #endif
-#ifdef MEDIAINFO_FAAD_YES
-    #include "neaacdec.h";
-#endif
+#include "MediaInfo/Tag/File__Tags.h"
 //---------------------------------------------------------------------------
 
 namespace MediaInfoLib
@@ -43,34 +41,338 @@
 // Class File_Aac
 //***************************************************************************
 
-class File_Aac : public File__Analyze
+struct sbr_handler
+{
+    //sbr_header
+    int8u  bs_amp_res[2];
+    int8u  bs_amp_res_FromHeader;
+    int8u  bs_start_freq;
+    int8u  bs_stop_freq;
+    int8u  bs_xover_band;
+    int8u  bs_freq_scale;
+    int8u  bs_alter_scale;
+    int8u  bs_noise_bands;
+
+    //sbr_grid
+    int8u   bs_num_env[2];
+    bool    bs_freq_res[2][8];
+    int8u   bs_num_noise[2];
+
+    //sbr_dtdf
+    int8u   bs_df_env[2][4];
+    int8u   bs_df_noise[2][2];
+
+    //Computed values
+    int8u  num_noise_bands;
+    int8u  num_env_bands[2];
+};
+
+struct ps_handler
+{
+    bool   enable_iid;
+    bool   enable_icc;
+    bool   enable_ext;
+    int8u  iid_mode;
+    int8u  icc_mode;
+};
+
+typedef const int8s (*sbr_huffman)[2];
+
+class File_Aac : public File__Analyze, public File__Tags_Helper
 {
 public :
     //In
-    ZenLib::Ztring Codec;
-    #ifdef MEDIAINFO_MPEG4_YES
-        File_Mpeg4_Descriptors::decspecificinfotag* DecSpecificInfoTag;
-        File_Mpeg4_Descriptors::slconfig* SLConfig;
-    #endif
+    int64u  Frame_Count_Valid;
+    bool    FrameIsAlwaysComplete;
+    enum mode
+    {
+        Mode_Unknown,
+        Mode_AudioSpecificConfig,
+        Mode_raw_data_block,
+        Mode_ADIF,
+        Mode_ADTS,
+        Mode_LATM,
+    };
+    mode   Mode;
+    void   AudioSpecificConfig_OutOfBand(int32u sampling_frequency, int8u audioObjectType=(int8u)-1, bool sbrData=false, bool psData=false, bool sbrPresentFlag=false, bool psPresentFlag=false);
 
     //Constructor/Destructor
     File_Aac();
     ~File_Aac();
 
 protected :
+    //Streams management
+    void Streams_Fill();
+    void Streams_Finish();
+
+    //Buffer - File header
+    bool FileHeader_Begin();
+    void FileHeader_Parse();
+    void FileHeader_Parse_ADIF();
+
     //Buffer - Global
     void Read_Buffer_Continue ();
+    void Read_Buffer_Continue_AudioSpecificConfig();
+    void Read_Buffer_Continue_raw_data_block();
+
+    //Buffer - Synchro
+    bool Synchronize();
+    bool Synchronize_ADTS();
+    bool Synchronize_LATM();
+    bool Synched_Test();
+    bool Synched_Test_ADTS();
+    bool Synched_Test_LATM();
+
+    //Buffer - Demux
+    #if MEDIAINFO_DEMUX
+    bool Demux_UnpacketizeContainer_Test();
+    bool Demux_UnpacketizeContainer_Test_ADTS();
+    bool Demux_UnpacketizeContainer_Test_LATM();
+    #endif //MEDIAINFO_DEMUX
+
+    //Buffer - Per element
+    bool Header_Begin();
+    bool Header_Begin_ADTS();
+    bool Header_Begin_LATM();
+    void Header_Parse();
+    void Header_Parse_ADTS();
+    void Header_Parse_LATM();
+    void Data_Parse();
+    void Data_Parse_ADTS();
+    void Data_Parse_LATM();
+
+    //***********************************************************************
+    // Elements - Main
+    //***********************************************************************
+
+    //Elements - Interface to MPEG-4 container
+    void AudioSpecificConfig                (size_t End=(size_t)-1);
+    void GetAudioObjectType                 (int8u &ObjectType, const char* Name);
+
+    //Elements - Multiplex layer
+    void EPMuxElement                       ();
+    void AudioMuxElement                    ();
+    void StreamMuxConfig                    ();
+    int32u LatmGetValue                     ();
+    void PayloadLengthInfo                  ();
+    void PayloadMux                         ();
+    bool muxConfigPresent;
+
+    //Elements - Error protection
+    void ErrorProtectionSpecificConfig      ();
+
+    //Elements - MPEG-2 AAC Audio_Data_Interchange_Format, ADIF
+    void adif_header                        ();
+
+    //Elements - Audio_Data_Transport_Stream frame, ADTS
+    void adts_frame                         ();
+    void adts_fixed_header                  ();
+    void adts_variable_header               ();
+
+    //Temp
+    int8u   numSubFrames;
+    int8u   numProgram;
+    int8u   numLayer;
+    int8u   numChunk;
+    bool    audioMuxVersionA;
+    int8u   streamID[16][8];
+    int8u   progSIndx[128];
+    int8u   laySIndx[128];
+    int8u   progCIndx[128];
+    int8u   layCIndx[128];
+    int8u   frameLengthType[128];
+    int16u  frameLength[128];
+    int32u  MuxSlotLengthBytes[128];
+    int32u  otherDataLenBits;
+    bool    otherDataPresent;
+    bool    allStreamsSameTimeFraming;
+    int8u   audioObjectType;
+    int8u   extensionAudioObjectType;
+    int8u   channelConfiguration;
+    int16u  frame_length;
+    int8u   sampling_frequency_index;
+    int32u  sampling_frequency;
+    int8u   extension_sampling_frequency_index;
+    int32u  extension_sampling_frequency;
+    bool    aacScalefactorDataResilienceFlag;
+    bool    aacSectionDataResilienceFlag;
+    bool    aacSpectralDataResilienceFlag;
+    std::vector<int16u> aac_frame_lengths;
+    int8u   num_raw_data_blocks;
+    bool    protection_absent;
+    int64u  FrameSize_Min;
+    int64u  FrameSize_Max;
+
+    //***********************************************************************
+    // Elements - Speech coding (HVXC)
+    //***********************************************************************
+
+    void HvxcSpecificConfig                 ();
+    void HVXCconfig                         ();
+    void ErrorResilientHvxcSpecificConfig   ();
+    void ErHVXCconfig                       ();
+
+    //***********************************************************************
+    // Elements - Speech Coding (CELP)
+    //***********************************************************************
+
+    void CelpSpecificConfig                 ();
+    void CelpHeader                         ();
+    void ErrorResilientCelpSpecificConfig   ();
+    void ER_SC_CelpHeader                   ();
+
+    //***********************************************************************
+    // Elements - General Audio (GA)
+    //***********************************************************************
+
+    //Elements - Decoder configuration
+    void GASpecificConfig                   ();
+    void program_config_element             ();
+
+    //Elements - GA bitstream
+    void raw_data_block                     ();
+    void single_channel_element             ();
+    void channel_pair_element               ();
+    void ics_info                           ();
+    void pulse_data                         ();
+    void coupling_channel_element           ();
+    void lfe_channel_element                ();
+    void data_stream_element                ();
+    void fill_element                       (int8u old_id);
+    void gain_control_data                  ();
+
+    //Elements - Subsidiary
+    void individual_channel_stream          (bool common_window, bool scale_flag);
+    void section_data                       ();
+    void scale_factor_data                  ();
+    void tns_data                           ();
+    void ltp_data                           ();
+    void spectral_data                      ();
+    void extension_payload                  (size_t End, int8u id_aac);
+    void dynamic_range_info                 ();
+    void sac_extension_data                 (size_t End);
+
+    //Elements - SBR
+    void sbr_extension_data                 (size_t End, int8u id_aac, bool crc_flag);
+    void sbr_header                         ();
+    void sbr_data                           (int8u id_aac);
+    void sbr_single_channel_element         ();
+    void sbr_channel_pair_element           ();
+    void sbr_grid                           (bool ch);
+    void sbr_dtdf                           (bool ch);
+    void sbr_invf                           (bool ch);
+    void sbr_envelope                       (bool ch, bool bs_coupling);
+    void sbr_noise                          (bool ch, bool bs_coupling);
+    void sbr_sinusoidal_coding              (bool ch);
+    int16u sbr_huff_dec                     (sbr_huffman Table, const char* Name);
+
+    //Elements - SBR - PS
+    void ps_data                            (size_t End);
+
+    //Elements - Perceptual noise substitution (PNS)
+    bool is_noise                           (size_t group, size_t sfb);
+    int  is_intensity                       (size_t group, size_t sfb);
+
+    //Elements - Enhanced Low Delay Codec
+    void ELDSpecificConfig                  ();
+    void ld_sbr_header                      ();
 
     //Helpers
-    void From_Codec();
+    void hcod                               (int8u sect_cb, const char* Name);
+    void hcod_sf                            (const char* Name);
+    void hcod_binary                        (int8u CodeBook, int8s* Values, int8u Values_Count);
+    void hcod_2step                         (int8u CodeBook, int8s* Values, int8u Values_Count);
+
+    //Temp - channel_pair_element
+    bool    common_window;
+
+    //Temp - ics_info
+    int8u   window_sequence;
+    int8u   max_sfb;
+    int8u   scale_factor_grouping;
+    int8u   num_windows;
+    int8u   num_window_groups;
+    int8u   window_group_length             [8];
+    int16u  sect_sfb_offset                 [8][1024];
+    int16u  swb_offset                      [64];
+    int8u   sfb_cb                          [8][64];
+    int8u   num_swb;
+
+    //Temp - section_data
+    int8u   num_sec                         [8];
+    int8u   sect_cb                         [8][64];
+    int16u  sect_start                      [8][64];
+    int16u  sect_end                        [8][64];
+
+    //Temp - ltp_data
+    int16u  ltp_lag;
+
+    //Temp - SBR
+    sbr_handler* sbr;
+
+    //Temp - PS
+    ps_handler* ps;
+
+    //***********************************************************************
+    // Elements - Structured Audio (SA)
+    //***********************************************************************
+
+    void StructuredAudioSpecificConfig      ();
+
+    //***********************************************************************
+    // Elements - Text to Speech Interface (TTSI)
+    //***********************************************************************
 
-    //libfaad specific
-    void libfaad();
-    #if defined(MEDIAINFO_FAAD_YES) && defined(MEDIAINFO_MPEG4_YES)
-        NeAACDecHandle hAac;
-    #endif
+    void TTSSpecificConfig                  ();
+
+    //***********************************************************************
+    // Elements - Parametric Audio (HILN)
+    //***********************************************************************
+
+    void HILNconfig                         ();
+    void HILNenexConfig                     ();
+    void ParametricSpecificConfig           ();
+    void PARAconfig                         ();
+
+    //***********************************************************************
+    // Elements - Technical description of parametric coding for high quality audio
+    //***********************************************************************
+
+    void SSCSpecificConfig                  ();
+
+    //***********************************************************************
+    // Elements - MPEG-1/2 Audio
+    //***********************************************************************
+
+    void MPEG_1_2_SpecificConfig            ();
+
+    //***********************************************************************
+    // Elements - Technical description of lossless coding of oversampled audio
+    //***********************************************************************
+
+    void DSTSpecificConfig                  ();
+    //***********************************************************************
+    // Elements - Audio Lossless
+    //***********************************************************************
+
+    void ALSSpecificConfig                  ();
+
+    //***********************************************************************
+    // Elements - Scalable lossless
+    //***********************************************************************
+
+    void SLSSpecificConfig                  ();
+
+    //***********************************************************************
+    // Temp
+    //***********************************************************************
+
+    std::map<std::string, Ztring>   Infos_General;
+    std::map<std::string, Ztring>   Infos;
+    bool                            CanFill;
 };
 
 } //NameSpace
 
 #endif
+

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Aac_GeneralAudio.cpp Added

@@ -0,0 +1,1439 @@
+// File_Aac - Info for AAC (Raw) files
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_AAC_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Audio/File_Aac.h"
+#include "MediaInfo/Audio/File_Aac_GeneralAudio.h"
+using namespace std;
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Infos
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+extern const int32u Aac_sampling_frequency[];
+extern const char* Aac_audioObjectType(int8u audioObjectType);
+extern const char* Aac_Format_Profile(int8u ID);
+
+//---------------------------------------------------------------------------
+const char* Aac_id_syn_ele[8]=
+{
+    "SCE - single_channel_element",
+    "CPE - channel_pair_element",
+    "CCE - coupling_channel_element",
+    "LFE - lfe_channel_element",
+    "DSE - data_stream_element",
+    "PCE - program_config_element",
+    "FIL - fill_element",
+    "END - End"
+};
+
+//---------------------------------------------------------------------------
+const char* Aac_window_sequence[4]=
+{
+    "ONLY_LONG_SEQUENCE",
+    "LONG_START_SEQUENCE",
+    "EIGHT_SHORT_SEQUENCE",
+    "LONG_STOP_SEQUENCE"
+};
+
+//***************************************************************************
+// Elements - Decoder configuration
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Aac::GASpecificConfig ()
+{
+    //Parsing
+    Element_Begin1("GASpecificConfig");
+    bool frameLengthFlag, dependsOnCoreCoder, extensionFlag;
+    Get_SB (   frameLengthFlag,                                 "frameLengthFlag");
+    frame_length=frameLengthFlag==0?1024:960; Param_Info2(frame_length, " bytes");
+    Get_SB (   dependsOnCoreCoder,                              "dependsOnCoreCoder");
+    if (dependsOnCoreCoder)
+        Skip_S2(14,                                             "coreCoderDelay");
+    Get_SB (   extensionFlag,                                   "extensionFlag");
+    if (channelConfiguration==0)
+        program_config_element();
+    if (audioObjectType==06 || audioObjectType==20)
+        Skip_S1(3,                                              "layerNr");
+    if (extensionFlag)
+    {
+        bool extensionFlag3;
+        if (audioObjectType==22)
+        {
+            Skip_S1( 5,                                         "numOfSubFrame");
+            Skip_S2(11,                                         "layer_length");
+        }
+        if (audioObjectType==17
+         || audioObjectType==19
+         || audioObjectType==20
+         || audioObjectType==23)
+        {
+            Skip_SB(                                            "aacSectionDataResilienceFlag");
+            Skip_SB(                                            "aacScalefactorDataResilienceFlag");
+            Skip_SB(                                            "aacSpectralDataResilienceFlag");
+        }
+        Get_SB (   extensionFlag3,                              "extensionFlag3");
+        if (extensionFlag3)
+        {
+            Skip_BS(Data_BS_Remain(),                           "Not implemented");
+        }
+    }
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::program_config_element()
+{
+    Element_Begin1("program_config_element");
+    Ztring comment_field_data;
+    int8u Channels=0, Channels_Front=0, Channels_Side=0, Channels_Back=0, Channels_LFE=0;
+    int8u num_front_channel_elements, num_side_channel_elements, num_back_channel_elements, num_lfe_channel_elements, num_assoc_data_elements, num_valid_cc_elements, comment_field_bytes;
+    int8u audioObjectType_Temp, sampling_frequency_index_Temp;
+    Skip_S1(4,                                                  "element_instance_tag");
+    Get_S1 (2, audioObjectType_Temp,                            "object_type"); audioObjectType_Temp++; Param_Info1(Aac_audioObjectType(audioObjectType_Temp));
+    Get_S1 (4, sampling_frequency_index_Temp,                   "sampling_frequency_index"); Param_Info1(Aac_sampling_frequency[sampling_frequency_index_Temp]);
+    Get_S1 (4, num_front_channel_elements,                      "num_front_channel_elements");
+    Get_S1 (4, num_side_channel_elements,                       "num_side_channel_elements");
+    Get_S1 (4, num_back_channel_elements,                       "num_back_channel_elements");
+    Get_S1 (2, num_lfe_channel_elements,                        "num_lfe_channel_elements");
+    Get_S1 (3, num_assoc_data_elements,                         "num_assoc_data_elements");
+    Get_S1 (4, num_valid_cc_elements,                           "num_valid_cc_elements");
+    TEST_SB_SKIP(                                               "mono_mixdown_present");
+        Skip_S1(4,                                              "mono_mixdown_element_number");
+    TEST_SB_END();
+    TEST_SB_SKIP(                                               "stereo_mixdown_present");
+        Skip_S1(4,                                              "stereo_mixdown_element_number");
+    TEST_SB_END();
+    TEST_SB_SKIP(                                               "matrix_mixdown_idx_present");
+        Skip_S1(2,                                              "matrix_mixdown_idx");
+        Skip_SB(                                                "pseudo_surround_enable");
+    TEST_SB_END();
+    for (int8u Pos=0; Pos<num_front_channel_elements; Pos++)
+    {
+        Element_Begin1("front_element");
+        bool front_element_is_cpe;
+        Get_SB (   front_element_is_cpe,                        "front_element_is_cpe");
+        Skip_S1(4,                                              "front_element_tag_select");
+        if (front_element_is_cpe)
+        {
+            Channels_Front+=2;
+            Channels+=2;
+        }
+        else
+        {
+            Channels_Front++;
+            Channels++;
+        }
+        Element_End0();
+    }
+    for (int8u Pos=0; Pos<num_side_channel_elements; Pos++)
+    {
+        Element_Begin1("side_element");
+        bool side_element_is_cpe;
+        Get_SB (   side_element_is_cpe,                         "side_element_is_cpe");
+        Skip_S1(4,                                              "side_element_tag_select");
+        if (side_element_is_cpe)
+        {
+            Channels_Side+=2;
+            Channels+=2;
+        }
+        else
+        {
+            Channels_Side++;
+            Channels++;
+        }
+        Element_End0();
+    }
+    for (int8u Pos=0; Pos<num_back_channel_elements; Pos++)
+    {
+        Element_Begin1("back_element");
+        bool back_element_is_cpe;
+        Get_SB (   back_element_is_cpe,                         "back_element_is_cpe");
+        Skip_S1(4,                                              "back_element_tag_select");
+        if (back_element_is_cpe)
+        {
+            Channels_Back+=2;
+            Channels+=2;
+        }
+        else
+        {
+            Channels_Back++;
+            Channels++;
+        }
+        Element_End0();
+    }
+    for (int8u Pos=0; Pos<num_lfe_channel_elements; Pos++)
+    {
+        Element_Begin1("lfe_element");
+        Skip_S1(4,                                              "lfe_element_tag_select");
+        Channels_LFE++;
+        Channels++;
+        Element_End0();
+    }
+    for (int8u Pos=0; Pos<num_assoc_data_elements; Pos++)
+    {
+        Element_Begin1("assoc_data_element");
+        Skip_S1(4,                                              "assoc_data_element_tag_select");
+        Element_End0();
+    }
+    for (int8u Pos=0; Pos<num_valid_cc_elements; Pos++)
+    {
+        Element_Begin1("valid_cc_element");
+        Skip_SB(                                                "cc_element_is_ind_sw");
+        Skip_S1(4,                                              "valid_cc_element_tag_select");
+        Element_End0();
+    }
+    BS_End(); //Byte align
+    Get_B1 (comment_field_bytes,                                "comment_field_bytes");
+    if (comment_field_bytes)
+        Get_Local(comment_field_bytes, comment_field_data,      "comment_field_data");
+    BS_Begin(); //The stream needs continuity in the bitstream
+    Element_End0();
+
+    //Filling
+    Ztring Channels_Positions, Channels_Positions2;
+    switch (Channels_Front)
+    {
+        case  0 : break;
+        case  1 : Channels_Positions+=__T("Front: C"); break;
+        case  2 : Channels_Positions+=__T("Front: L R"); break;
+        case  3 : Channels_Positions+=__T("Front: L C R"); break;
+        default : Channels_Positions+=__T("Front: "); Channels_Positions+=Ztring::ToZtring(Channels_Front); //Which config?
+    }
+    switch (Channels_Side)
+    {
+        case  0 : break;
+        case  1 : Channels_Positions+=__T(", Side: C"); break;
+        case  2 : Channels_Positions+=__T(", Side: L R"); break;
+        case  3 : Channels_Positions+=__T(", Side: L C R"); break;
+        default : Channels_Positions+=__T(", Side: "); Channels_Positions+=Ztring::ToZtring(Channels_Side); //Which config?
+    }
+    switch (Channels_Back)
+    {
+        case  0 : break;
+        case  1 : Channels_Positions+=__T(", Back: C"); break;
+        case  2 : Channels_Positions+=__T(", Back: L R"); break;
+        case  3 : Channels_Positions+=__T(", Back: L C R"); break;
+        default : Channels_Positions+=__T(", Back: "); Channels_Positions+=Ztring::ToZtring(Channels_Back); //Which config?
+    }
+    switch (Channels_LFE)
+    {
+        case  0 : break;
+        case  1 : Channels_Positions+=__T(", LFE"); break;
+        default : Channels_Positions+=__T(", LFE= "); Channels_Positions+=Ztring::ToZtring(Channels_LFE); //Which config?
+    }
+    Channels_Positions2=Ztring::ToZtring(Channels_Front)+__T('/')
+                       +Ztring::ToZtring(Channels_Side)+__T('/')
+                       +Ztring::ToZtring(Channels_Back)
+                       +(Channels_LFE?__T(".1"):__T(""));
+
+    FILLING_BEGIN();
+        //Integrity test
+        if (Aac_sampling_frequency[sampling_frequency_index_Temp]==0 || Channels_Front<Channels_Side || Channels_Side<Channels_Back)
+        {
+            Skip_BS(Data_BS_Remain(),                               "(Unknown frequency)");
+            return;
+        }
+
+        if (audioObjectType==(int8u)-1)
+            audioObjectType=audioObjectType_Temp;
+        if (sampling_frequency_index==(int8u)-1)
+            sampling_frequency_index=sampling_frequency_index_Temp;
+
+        Infos_General["Comment"]=comment_field_data;
+
+        Infos["Format"].From_Local("AAC");
+        Infos["Format_Profile"].From_Local(Aac_Format_Profile(audioObjectType));
+        Infos["Codec"].From_Local(Aac_audioObjectType(audioObjectType));
+        Infos["SamplingRate"].From_Number(Aac_sampling_frequency[sampling_frequency_index]);
+        Infos["Channel(s)"].From_Number(Channels);
+        Infos["ChannelPositions"]=Channels_Positions;
+        Infos["ChannelPositions/String2"]=Channels_Positions2;
+
+        if (!Infos["Format_Settings_SBR"].empty())
+        {
+            Infos["Format_Profile"]=__T("HE-AAC");
+            Ztring SamplingRate=Infos["SamplingRate"];
+            Infos["SamplingRate"].From_Number((extension_sampling_frequency_index==(int8u)-1)?(sampling_frequency*2):extension_sampling_frequency, 10);
+            if (MediaInfoLib::Config.LegacyStreamDisplay_Get())
+            {
+                Infos["Format_Profile"]+=__T(" / LC");
+                Infos["SamplingRate"]+=__T(" / ")+SamplingRate;
+            }
+            Infos["Format_Settings_SBR"]=__T("Yes (Implicit)");
+            Infos["Codec"]=Ztring().From_Local(Aac_audioObjectType(audioObjectType))+__T("-SBR");
+        }
+
+        if (!Infos["Format_Settings_PS"].empty())
+        {
+            Infos["Format_Profile"]=__T("HE-AACv2");
+            Ztring Channels=Infos["Channel(s)"];
+            Ztring ChannelPositions=Infos["ChannelPositions"];
+            Ztring SamplingRate=Infos["SamplingRate"];
+            Infos["Channel(s)"]=__T("2");
+            Infos["ChannelPositions"]=__T("Front: L R");
+            if (MediaInfoLib::Config.LegacyStreamDisplay_Get())
+            {
+                Infos["Format_Profile"]+=__T(" / HE-AAC / LC");
+                Infos["Channel(s)"]+=__T(" / ")+Channels+__T(" / ")+Channels;
+                Infos["ChannelPositions"]+=__T(" / ")+ChannelPositions+__T(" / ")+ChannelPositions;
+                Infos["SamplingRate"]=Ztring().From_Number((extension_sampling_frequency_index==(int8u)-1)?(sampling_frequency*2):extension_sampling_frequency, 10)+__T(" / ")+SamplingRate;
+            }
+            Infos["Format_Settings_PS"]=__T("Yes (Implicit)");
+            Ztring Codec=Retrieve(Stream_Audio, StreamPos_Last, Audio_Codec);
+            Infos["Codec"]=Ztring().From_Local(Aac_audioObjectType(audioObjectType))+__T("-SBR-PS");
+        }
+    FILLING_END();
+}
+
+//***************************************************************************
+// Elements - GA bitstream
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Aac::raw_data_block()
+{
+    if (audioObjectType!=2)
+    {
+        Skip_BS(Data_BS_Remain(),                               "Data");
+        return; //We test only AAC LC
+    }
+
+    if (sampling_frequency_index>=16 || Aac_sampling_frequency[sampling_frequency_index]==0)
+    {
+        Trusted_IsNot("(Problem)");
+        Skip_BS(Data_BS_Remain(),                               "(Problem)");
+        return;
+    }
+
+    //Parsing
+    Element_Begin1("raw_data_block");
+    int8u id_syn_ele=0, id_syn_ele_Previous;
+    do
+    {
+        Element_Begin0();
+        id_syn_ele_Previous=id_syn_ele;
+        Get_S1 (3, id_syn_ele,                                  "id_syn_ele"); Param_Info1(Aac_id_syn_ele[id_syn_ele]); Element_Name(Aac_id_syn_ele[id_syn_ele]);
+        switch (id_syn_ele)
+        {
+            case 0x00 : single_channel_element();           break; //ID_SCE
+            case 0x01 : channel_pair_element();             break; //ID_CPE
+            case 0x02 : coupling_channel_element();         break; //ID_CCE
+            case 0x03 : lfe_channel_element();              break; //ID_LFE
+            case 0x04 : data_stream_element();              break; //ID_DSE
+            case 0x05 : program_config_element();           break; //ID_PCE
+            case 0x06 : fill_element(id_syn_ele_Previous);  break; //ID_FIL
+            case 0x07 :                                     break; //ID_END
+            default   :                                          ; //Can not happen
+        }
+        Element_End0();
+    }
+    while(Element_IsOK() && Data_BS_Remain() && id_syn_ele!=0x07); //ID_END
+    if (Element_IsOK() && Data_BS_Remain()%8)
+        Skip_S1(Data_BS_Remain()%8,                             "byte_alignment");
+    Element_End0();
+
+    if (sampling_frequency)
+    {
+        FrameInfo.DTS+=float64_int64s(((float64)frame_length)*1000000000/sampling_frequency);
+        FrameInfo.PTS=FrameInfo.DTS;
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::single_channel_element()
+{
+    //Parsing
+    Skip_S1 (4,                                                 "element_instance_tag");
+    individual_channel_stream(false, false);
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::channel_pair_element()
+{
+    //Parsing
+    Skip_S1(4,                                                  "element_instance_tag");
+    Get_SB (common_window,                                      "common_window");
+    if (common_window)
+    {
+        int8u ms_mask_present;
+        ics_info();
+        Get_S1(2, ms_mask_present,                              "ms_mask_present");
+        if (ms_mask_present==1)
+        {
+            Element_Begin1("ms_mask");
+            for (int8u g=0; g<num_window_groups; g++)
+            {
+                Element_Begin1("window");
+                for (int8u sfb=0; sfb<max_sfb; sfb++)
+                    Skip_SB(                                    "ms_used[g][sfb]");
+                Element_End0();
+            }
+            Element_End0();
+        }
+    }
+    individual_channel_stream(common_window, false);
+    if (!Element_IsOK())
+        return;
+    individual_channel_stream(common_window, false);
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::ics_info()
+{
+    //Parsing
+    Element_Begin1("ics_info");
+    Skip_SB(                                                    "ics_reserved_bit");
+    Get_S1 (2, window_sequence,                                 "window_sequence"); Param_Info1(Aac_window_sequence[window_sequence]);
+    Skip_SB(                                                    "window_shape");
+    if (window_sequence==2) //EIGHT_SHORT_SEQUENCE
+    {
+        Get_S1 (4, max_sfb,                                     "max_sfb");
+        Get_S1 (7, scale_factor_grouping,                       "scale_factor_grouping");
+    }
+    else
+    {
+        bool predictor_data_present;
+        Get_S1 (6, max_sfb,                                     "max_sfb");
+        Get_SB (   predictor_data_present,                      "predictor_data_present");
+        if (predictor_data_present)
+        {
+            if (audioObjectType==1) //AAC Main
+            {
+                bool predictor_reset;
+                Get_SB (predictor_reset,                        "predictor_reset");
+                if (predictor_reset)
+                    Skip_S1(5,                                  "predictor_reset_group_number");
+                int8u PRED_SFB_MAX=max_sfb;
+                if (PRED_SFB_MAX>Aac_PRED_SFB_MAX[sampling_frequency_index])
+                    PRED_SFB_MAX=Aac_PRED_SFB_MAX[sampling_frequency_index];
+                for (int8u sfb=0; sfb<PRED_SFB_MAX; sfb++)
+                    Skip_SB(                                    "prediction_used[sfb]");
+            }
+            else
+            {
+                bool ltp_data_present;
+                Get_SB (ltp_data_present,                       "ltp_data_present");
+                if (ltp_data_present)
+                    ltp_data();
+                if (common_window)
+                {
+                    Get_SB (ltp_data_present,                   "ltp_data_present");
+                    if (ltp_data_present)
+                        ltp_data();
+                }
+            }
+        }
+    }
+    Element_End0();
+
+    //Calculation of windows
+    switch (window_sequence)
+    {
+        case 0 :    //ONLY_LONG_SEQUENCE
+        case 1 :    //LONG_START_SEQUENCE
+        case 3 :    //LONG_STOP_SEQUENCE
+                    num_windows=1;
+                    num_window_groups=1;
+                    window_group_length[0]=1;
+                    num_swb=Aac_swb_offset_long_window[sampling_frequency_index]->num_swb;
+                    for (int8u i=0; i<num_swb+1; i++)
+                    {
+                        if (Aac_swb_offset_long_window[sampling_frequency_index]->swb_offset[i]<frame_length)
+                            swb_offset[i]=Aac_swb_offset_long_window[sampling_frequency_index]->swb_offset[i];
+                        else
+                            swb_offset[i]=frame_length;
+                        sect_sfb_offset[0][i]=swb_offset[i];
+                    }
+                    break;
+        case 2 :    //EIGHT_SHORT_SEQUENCE
+                    num_windows=8;
+                    num_window_groups=1;
+                    window_group_length[0]=1;
+                    num_swb=Aac_swb_offset_short_window[sampling_frequency_index]->num_swb;
+                    for (int8u i=0; i<num_swb + 1; i++)
+                        swb_offset[i] = Aac_swb_offset_short_window[sampling_frequency_index]->swb_offset[i];
+                    swb_offset[num_swb] = frame_length/8;
+                    for (int8u i=0; i<num_windows-1; i++)
+                    {
+                        if (!(scale_factor_grouping&(1<<(6-i))))
+                        {
+                            num_window_groups++;
+                            window_group_length[num_window_groups-1]=1;
+                        }
+                        else
+                            window_group_length[num_window_groups-1]++;
+                    }
+                    for (int g = 0; g < num_window_groups; g++)
+                    {
+                        int8u sect_sfb = 0;
+                        int16u offset = 0;
+                        for (int8u i=0; i<num_swb; i++)
+                        {
+                            int16u width = Aac_swb_offset_short_window[sampling_frequency_index]->swb_offset[i+1] - Aac_swb_offset_short_window[sampling_frequency_index]->swb_offset[i];
+                            width *= window_group_length[g];
+                            sect_sfb_offset[g][sect_sfb++] = offset;
+                            offset += width;
+                        }
+                        sect_sfb_offset[g][sect_sfb] = offset;
+                    }
+                    break;
+        default:    ;
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::pulse_data()
+{
+    //Parsing
+    int8u number_pulse;
+    Get_S1(2,number_pulse,                                      "number_pulse");
+    Skip_S1(6,                                                  "pulse_start_sfb");
+    for (int i = 0; i < number_pulse+1; i++)
+    {
+        Skip_S1(5,                                              "pulse_offset[i]");
+        Skip_S1(4,                                              "pulse_amp[i]");
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::coupling_channel_element()
+{
+    //Parsing
+    int8u num_coupled_elements;
+    bool ind_sw_cce_flag;
+    Skip_S1(4,                                                  "element_instance_tag");
+    Get_SB (   ind_sw_cce_flag,                                 "ind_sw_cce_flag");
+    Get_S1 (3, num_coupled_elements,                            "num_coupled_elements");
+    size_t num_gain_element_lists=0;
+    for (int8u c=0; c<num_coupled_elements+1; c++)
+    {
+        num_gain_element_lists++;
+        bool cc_target_is_cpe;
+        Get_SB (   cc_target_is_cpe,                            "cc_target_is_cpe[c]");
+        Skip_S1(4,                                              "cc_target_tag_select[c]");
+        if (cc_target_is_cpe)
+        {
+            bool cc_l, cc_r;
+            Get_SB (cc_l,                                       "cc_l[c]");
+            Get_SB (cc_r,                                       "cc_r[c]");
+            if (cc_l && cc_r)
+                num_gain_element_lists++;
+        }
+    }
+    Skip_SB(                                                    "cc_domain");
+    Skip_SB(                                                    "gain_element_sign");
+    Skip_S1(2,                                                  "gain_element_scale");
+    individual_channel_stream(false, false);
+    if (!Element_IsOK())
+        return;
+    bool cge;
+    for (size_t c=1; c<num_gain_element_lists; c++)
+    {
+        if (ind_sw_cce_flag)
+            cge = true;
+        else
+            Get_SB (cge,                                        "common_gain_element_present[c]");
+        if (cge)
+            hcod_sf(                                            "hcod_sf[common_gain_element[c]]");
+        else
+        {
+            for (int g = 0; g < num_window_groups; g++)
+            {
+                for (int sfb=0; sfb<max_sfb; sfb++)
+                {
+                    if (sfb_cb[g][sfb]) //Not ZERO_HCB
+                        hcod_sf(                                "hcod_sf[dpcm_gain_element[c][g][sfb]]");
+                }
+            }
+        }
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::lfe_channel_element()
+{
+    Skip_S1(4,                                                  "element_instance_tag");
+    individual_channel_stream(false, false);
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::data_stream_element()
+{
+    bool data_byte_align_flag;
+    int16u cnt;
+    int8u  count;
+    Skip_S1(4,                                                  "element_instance_tag");
+    Get_SB (   data_byte_align_flag,                            "data_byte_align_flag");
+    Get_S1 (8, count,                                           "count");
+    cnt=count;
+    if (cnt==255)
+    {
+        Get_S1(8, count,                                        "esc_count");
+        cnt+=count;
+    }
+    if (data_byte_align_flag)
+    {
+        if (Data_BS_Remain()%8)
+            Skip_S1(Data_BS_Remain()%8,                         "byte_alignment");
+    }
+    Element_Begin1("data_stream_byte[element_instance_tag]");
+    for (int16u i=0; i<cnt; i++)
+        Skip_S1(8,                                                "[i]");
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::fill_element(int8u id_syn_ele)
+{
+    //Parsing
+    int8u  count;
+    Get_S1 (4, count,                                           "count");
+    size_t cnt=count;
+    if (count==15)
+    {
+        int8u esc_count;
+        Get_S1 (8, esc_count,                                   "esc_count");
+        cnt+=esc_count-1;
+    }
+    if (cnt)
+    {
+        if (Data_BS_Remain()>=8*cnt)
+        {
+            size_t End=Data_BS_Remain()-8*cnt;
+            extension_payload(End, id_syn_ele);
+        }
+        else
+            Skip_BS(Data_BS_Remain(),                           "(Error)");
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::gain_control_data()
+{
+    int8u max_band, adjust_num, aloc_bits, aloc_bits0;
+    int8u wd_max=0;
+    switch(window_sequence)
+    {
+        case 0 :    //ONLY_LONG_SEQUENCE
+                    wd_max = 1;
+                    aloc_bits0 = 5;
+                    aloc_bits = 5;
+                    break;
+        case 1 :    //LONG_START_SEQUENCE
+                    wd_max = 2;
+                    aloc_bits0 = 4;
+                    aloc_bits = 2;
+                    break;
+        case 2 :    //EIGHT_SHORT_SEQUENCE
+                    wd_max = 8;
+                    aloc_bits0 = 2;
+                    aloc_bits = 2;
+                    break;
+        case 3 :    //LONG_STOP_SEQUENCE
+                    wd_max = 2;
+                    aloc_bits0 = 4;
+                    aloc_bits = 5;
+                    break;
+        default:    return; //Never happens but makes compiler happy
+    }
+    Get_S1 (2, max_band,                                        "max_band");
+    for (int8u bd=1; bd<=max_band; bd++)
+    {
+        for (int8u wd=0; wd<wd_max; wd++)
+        {
+            Get_S1(3, adjust_num,                               "adjust_num[bd][wd]");
+            for (int8u ad=0; ad<adjust_num; ad++)
+            {
+                Skip_S1(4,                                      "alevcode[bd][wd][ad]");
+                Skip_S1(wd==0?aloc_bits0:aloc_bits,             "aloccode[bd][wd][ad]");
+            }
+        }
+    }
+}
+
+//***************************************************************************
+// Elements - Subsidiary
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Aac::individual_channel_stream (bool common_window, bool scale_flag)
+{
+    Element_Begin1("individual_channel_stream");
+    Skip_S1(8,                                                  "global_gain");
+    if (!common_window && !scale_flag)
+        ics_info();
+    if (!Element_IsOK())
+    {
+        Element_End0();
+        return;
+    }
+   section_data();
+    if (!Element_IsOK())
+    {
+        Element_End0();
+        return;
+    }
+    scale_factor_data();
+    if (!Element_IsOK())
+    {
+        Element_End0();
+        return;
+    }
+    if (!scale_flag)
+    {
+        bool pulse_data_present;
+        Get_SB (pulse_data_present,                             "pulse_data_present");
+        if (pulse_data_present)
+            pulse_data ();
+        bool tns_data_present;
+        Get_SB(tns_data_present,                                "tns_data_present");
+        if (tns_data_present)
+            tns_data ();
+        bool gain_control_data_present;
+        Get_SB(gain_control_data_present,                       "gain_control_data_present");
+        if (gain_control_data_present)
+            gain_control_data ();
+    }
+    if (!aacSpectralDataResilienceFlag)
+        spectral_data ();
+    else
+    {
+        Skip_BS(Data_BS_Remain(),                               "Not implemented");
+        //~ length_of_reordered_spectral_data;
+        //~ length_of_longest_codeword;
+        //~ reordered_spectral_data ();
+    }
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::section_data()
+{
+    Element_Begin1("section_data");
+    int8u sect_esc_val;
+    if (window_sequence==2) //EIGHT_SHORT_SEQUENCE
+        sect_esc_val=(1<<3)-1;
+    else
+        sect_esc_val=(1<<5)-1;
+    for (int8u g=0; g<num_window_groups; g++)
+    {
+        if (num_window_groups>1)
+            Element_Begin1("windows");
+        int8u k=0;
+        int8u i=0;
+        while (k<max_sfb)
+        {
+            if (aacSectionDataResilienceFlag)
+                Get_S1(5, sect_cb[g][i],                        "sect_cb[g][i]");
+            else
+                Get_S1(4, sect_cb[g][i],                        "sect_cb[g][i]");
+            int8u sect_len=0;
+            int8u sect_len_incr;
+            if (!aacSectionDataResilienceFlag || sect_cb[g][i]<11 || (sect_cb[g][i]>11 && sect_cb[g][i]<16))
+            {
+                for (;;)
+                {
+                    if (Data_BS_Remain()==0)
+                    {
+                        Trusted_IsNot("Size is wrong");
+                        if (num_window_groups>1)
+                            Element_End0();
+                        Element_End0();
+                        return; //Error
+                    }
+                    Get_S1 ((window_sequence==2?3:5), sect_len_incr, "sect_len_incr"); // (window_sequence == EIGHT_SHORT_SEQUENCE) => 3
+                    if (sect_len_incr!=sect_esc_val)
+                        break;
+                    sect_len+=sect_esc_val;
+                }
+            }
+            else
+                sect_len_incr=1;
+            sect_len+=sect_len_incr;
+            sect_start[g][i]=k;
+            sect_end[g][i]=k+sect_len;
+            for (int8u sfb=k; sfb<k+sect_len; sfb++)
+                sfb_cb[g][sfb]=sect_cb[g][i];
+            k+= sect_len;
+            i++;
+        }
+        num_sec[g]=i;
+        if (num_window_groups>1)
+            Element_End0();
+    }
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::scale_factor_data()
+{
+    Element_Begin1("scale_factor_data");
+    if (!aacScalefactorDataResilienceFlag)
+    {
+        bool noise_pcm_flag=true;
+        for (int g=0; g<num_window_groups; g++)
+        {
+            for (int8u sfb=0; sfb<max_sfb; sfb++)
+            {
+                if (sfb_cb[g][sfb]) //Not ZERO_HCB
+                {
+                    if (is_intensity( g, sfb))
+                        hcod_sf(                                "hcod_sf[dpcm_is_position[g][sfb]]");
+                    else
+                    {
+                        if (is_noise(g, sfb))
+                        {
+                            if (noise_pcm_flag)
+                            {
+                                noise_pcm_flag = 0;
+                                Skip_S2(9,                      "dpcm_noise_nrg[g][sfb]");
+                            }
+                            else
+                                hcod_sf(                        "hcod_sf[dpcm_noise_nrg[g][sfb]]");
+                        }
+                        else
+                            hcod_sf(                            "hcod_sf[dpcm_sf[g][sfb]]");
+                    }
+                }
+            }
+        }
+    }
+    else
+    {
+        //scale_factor_data - part not implemented
+        Skip_BS(Data_BS_Remain(),                               "Not implemented");
+        //~ intensity_used = 0;
+        //~ noise_used = 0;
+        //~ sf_concealment;
+        //~ rev_global_gain;
+        //~ length_of_rvlc_sf;
+        //~ for ( g = 0; g < num_window_groups; g++ ) {
+            //~ for ( sfb=0; sfb < max_sfb; sfb++ ) {
+                //~ if ( sfb_cb[g][sfb] ) { //Not ZERO_HCB
+                    //~ if ( is_intensity ( g, sfb) ) {
+                        //~ intensity_used = 1;
+                        //~ rvlc_cod_sf[dpcm_is_position[g][sfb]];
+                    //~ } else {
+                        //~ if ( is_noise(g,sfb) ) {
+                            //~ if ( ! noise_used ) {
+                                //~ noise_used = 1;
+                                //~ dpcm_noise_nrg[g][sfb];
+                            //~ } else {
+                                //~ rvlc_cod_sf[dpcm_noise_nrg[g][sfb]];
+                            //~ }
+                        //~ } else {
+                            //~ rvlc_cod_sf[dpcm_sf[g][sfb]];
+                        //~ }
+                    //~ }
+                //~ }
+            //~ }
+        //~ }
+        //~ if ( intensity_used ) {
+            //~ rvlc_cod_sf[dpcm_is_last_position];
+        //~ }
+        //~ noise_used = 0;
+        //~ sf_escapes_present;
+        //~ if ( sf_escapes_present ) {
+            //~ length_of_rvlc_escapes;
+            //~ for ( g = 0; g < num_window_groups; g++ ) {
+                //~ for ( sfb = 0; sfb < max_sfb; sfb++ ) {
+                    //~ if ( sfb_cb[g][sfb]) {  //Not ZERO_HCB
+                        //~ if ( is_intensity ( g, sfb ) &&    dpcm_is_position[g][sfb] == ESC_FLAG ) {
+                            //~ rvlc_esc_sf[dpcm_is_position[g][sfb]];
+                        //~ } else {
+                            //~ if ( is_noise ( g, sfb ) {
+                                //~ if ( ! noise_used ) {
+                                    //~ noise_used = 1;
+                                //~ } else {
+                                    //~ if (dpcm_noise_nrg[g][sfb] == ESC_FLAG ) {
+                                        //~ rvlc_esc_sf[dpcm_noise_nrg[g][sfb]];
+                                    //~ }
+                                //~ }
+                            //~ } else {
+                                //~ if (dpcm_sf[g][sfb] == ESC_FLAG ) {
+                                    //~ rvlc_esc_sf[dpcm_sf[g][sfb]];
+                                //~ }
+                            //~ }
+                        //~ }
+                    //~ }
+                //~ }
+            //~ }
+            //~ if ( intensity_used && dpcm_is_last_position == ESC_FLAG ) {
+                //~ rvlc_esc_sf[dpcm_is_last_position];
+            //~ }
+        //~ }
+        //~ if ( noise_used ) {
+            //~ dpcm_noise_last_position;
+        //~ }
+    }
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::tns_data()
+{
+    int8u n_filt_bits=2;
+    int8u length_bits=6;
+    int8u order_bits=5;
+
+    if (window_sequence==2) //EIGHT_SHORT_SEQUENCE
+    {
+        n_filt_bits=1;
+        length_bits=4;
+        order_bits=3;
+    }
+
+    for (int8u w=0; w<num_windows; w++)
+    {
+        int8u start_coef_bits, n_filt;
+        Get_S1(n_filt_bits, n_filt,                             "n_filt[w]");
+        if (n_filt)
+        {
+            bool coef_res;
+            Get_SB (coef_res,                                   "coef_res[w]");
+            start_coef_bits=coef_res?4:3;
+
+            for (int8u filt=0; filt<n_filt; filt++)
+            {
+                int8u order;
+                Skip_S1(length_bits,                            "length[w][filt]");
+                Get_S1 (order_bits, order,                      "order[w][filt]");
+                if (order)
+                {
+                    bool coef_compress;
+                    Skip_SB(                                    "direction[w][filt]");
+                    Get_SB (coef_compress,                      "coef_compress[w][filt]");
+                    int8u coef_bits=start_coef_bits-(coef_compress?1:0);
+                    for (int8u i=0; i<order; i++)
+                        Skip_S1(coef_bits,                      "coef[w][filt][i]");
+                }
+            }
+        }
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::ltp_data()
+{
+    Element_Begin1("ltp_data");
+    //int sfb;
+    //bool ltp_lag_update;
+    //if (AudioObjectType == ER_AAC_LD ) {
+        //~ Get_SB(ltp_lag_update,"ltp_lag_update");
+        //~ if ( ltp_lag_update ) {
+            //~ Get_S2(10,ltp_lag,"ltp_lag");
+        //~ } else {
+            //~ //ltp_lag = ltp_prev_lag;
+        //~ }
+        //~ Skip_S1(3,"ltp_coef");
+        //~ for (sfb = 0; sfb <(max_sfb<MAX_LTP_LONG_SFB?max_sfb:MAX_LTP_LONG_SFB);& sfb++ ) {
+            //~ Skip_SB("ltp_long_used[sfb]");
+        //~ }
+    //} else {
+        Get_S2(11,ltp_lag,                                        "ltp_lag");
+        Skip_S1(3,                                                "ltp_coef");
+        if(window_sequence!=2) //EIGHT_SHORT_SEQUENCE
+        {
+            for (int8u sfb=0; sfb<(max_sfb<40?max_sfb:40); sfb++ ) //MAX_LTP_LONG_SFB=40
+                Skip_SB("ltp_long_used[sfb]");
+        }
+    //}
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::spectral_data()
+{
+    Element_Begin1("spectral_data");
+    for (int g = 0; g < num_window_groups; g++)
+    {
+        if (num_window_groups>1)
+            Element_Begin1("windows");
+        for (int8u i=0; i<num_sec[g]; i++)
+        {
+            switch (sect_cb[g][i])
+            {
+                case  0 :   //ZERO_HCB
+                case 13 :   //NOISE_HCB
+                case 14 :   //INTENSITY_HCB2
+                case 15 :   //INTENSITY_HCB
+                            break;
+                default :
+                            if (sect_end[g][i]>=num_swb+1)
+                            {
+                                Trusted_IsNot("(Problem)");
+                                Skip_BS(Data_BS_Remain(),       "(Problem)");
+                                if (num_window_groups>1)
+                                    Element_End0();
+                                Element_End0();
+                                return;
+                            }
+                            for (int16u k=sect_sfb_offset[g][sect_start[g][i]]; k<sect_sfb_offset[g][sect_end[g][i]]; k+=(sect_cb[g][i]<5?4:2))
+                            {
+                                hcod(sect_cb[g][i],             "sect_cb");
+                                if (!Element_IsOK())
+                                {
+                                    Skip_BS(Data_BS_Remain(),   "(Problem)");
+                                    if (num_window_groups>1)
+                                        Element_End0();
+                                    Element_End0();
+                                    return;
+                                }
+                            }
+            }
+        }
+        if (num_window_groups>1)
+            Element_End0();
+    }
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::extension_payload(size_t End, int8u id_aac)
+{
+    Element_Begin1("extension_payload");
+    int8u extension_type;
+    Get_S1 (4, extension_type,                                  "extension_type");
+    switch(extension_type)
+    {
+        case 11 :   dynamic_range_info(); break;                //EXT_DYNAMIC_RANGE
+        case 12 :   sac_extension_data(End); break;             //EXT_SAC_DATA
+        case 13 :   sbr_extension_data(End, id_aac, 0); break;  //EXT_SBR_DATA
+        case 14 :   sbr_extension_data(End, id_aac, 1); break;  //EXT_SBR_DATA_CRC
+        case  1 :   //EXT_FILL_DATA
+                    Skip_S1(4,                                  "fill_nibble"); Param_Info1("must be 0000");
+                    if (Data_BS_Remain()>End)
+                    {
+                        Element_Begin1("fill_byte");
+                        while (Data_BS_Remain()>End)
+                            Skip_S1(8,                          "fill_byte[i]"); Param_Info1("must be 10100101");
+                        Element_End0();
+                    }
+                    break;
+        case  2 :   //EXT_DATA_ELEMENT
+                    int8u data_element_version;
+                    Get_S1 (4,data_element_version,             "data_element_version");
+                    switch(data_element_version)
+                    {
+                        case 0 :    //ANC_DATA
+                                    {
+                                    int16u dataElementLength=0;
+                                    int8u dataElementLengthPart;
+                                    do
+                                    {
+                                        Get_S1 (8, dataElementLengthPart, "dataElementLengthPart");
+                                        dataElementLength+=dataElementLengthPart;
+                                    }
+                                    while (dataElementLengthPart==255);
+                                    Skip_BS(8*dataElementLength, "data_element_byte[i]");
+                                    }
+                                    break;
+                        default:    ;
+                    }
+        case 0 : //EXT_FILL
+        default:
+            Skip_BS(Data_BS_Remain()-End,                       "other_bits");
+    }
+
+    Element_End0();
+    if (End<Data_BS_Remain())
+        Skip_BS(Data_BS_Remain()-End,                           "padding");
+    if (Data_BS_Remain()!=End)
+    {
+        Skip_BS(Data_BS_Remain(),                               "Wrong size");
+        Trusted_IsNot("Wrong size");
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::dynamic_range_info()
+{
+    Element_Begin1("dynamic_range_info");
+    int8u  drc_num_bands=1;
+    bool   present;
+    Get_SB (present,                                            "pce_tag_present");
+    if (present)
+    {
+        Skip_S1(4,                                              "pce_ instance_tag");
+        Skip_S1(4,                                              "drc_tag_reserved_bits");
+    }
+    Skip_SB(                                                    "excluded_chns_present");
+    Get_SB (present,                                            "drc_bands_present");
+    if (present)
+    {
+        int8u drc_band_incr;
+        Get_S1 (4, drc_band_incr,                               "drc_band_incr");
+        Skip_S1(4,                                              "drc_interpolation_scheme");
+        drc_num_bands+=drc_band_incr;
+        for (int8u i=0; i<drc_num_bands; i++)
+        {
+            Skip_S1(8,                                          "drc_band_top[i]");
+        }
+    }
+    Get_SB (present,                                            "prog_ref_level_present");
+    if (present)
+    {
+        Skip_S1(7,                                              "prog_ref_level");
+        Skip_S1(1,                                              "prog_ref_level_reserved_bits");
+    }
+    for (int8u i=0; i<drc_num_bands; i++)
+    {
+        Skip_S1(1,                                              "dyn_rng_sgn[i]");
+        Skip_S1(7,                                              "dyn_rng_ctl[i]");
+    }
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::sac_extension_data(size_t End)
+{
+    Element_Begin1("sac_extension_data");
+    Skip_S1(2,                                                  "ancType");
+    Skip_SB(                                                    "ancStart");
+    Skip_SB(                                                    "ancStop");
+    Element_Begin1("ancDataSegmentByte");
+    while (Data_BS_Remain()>End)
+        Skip_S1(8,                                              "ancDataSegmentByte[i]");
+    Element_End0();
+    Element_End0();
+}
+
+//***************************************************************************
+// Elements - Perceptual noise substitution (PNS)
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+int File_Aac::is_intensity(size_t group, size_t sfb)
+{
+    switch (sfb_cb[group][sfb])
+    {
+        case 14 :   return 1;
+        case 15 :   return -1;
+        default :   return 0;
+    }
+}
+
+//---------------------------------------------------------------------------
+bool File_Aac::is_noise(size_t group, size_t sfb)
+{
+    return (sfb_cb[group][sfb]==13);
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//---------------------------------------------------------------------------
+void File_Aac::hcod_sf(const char* Name)
+{
+    Element_Begin1(Name);
+    int16u Pos=0;
+
+    while (huffman_sf[Pos][1])
+    {
+        bool h;
+        Get_SB (h,                                              "huffman");
+        Pos+=huffman_sf[Pos][h];
+
+        if (Pos>240)
+        {
+            Skip_BS(Data_BS_Remain(),                           "Error");
+            Element_End0();
+            return;
+        }
+    }
+    Element_Info1(huffman_sf[Pos][0]-60);
+    Element_End0();
+
+    return;
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::hcod_2step(int8u CodeBook, int8s* Values, int8u Values_Count)
+{
+    int8u CodeWord;
+    int8u ToRead=hcb_2step_Bytes[CodeBook];
+    if ((size_t)ToRead>Data_BS_Remain())
+        ToRead=(int8u)Data_BS_Remain(); //Read a maximum of remaining bytes
+    Peek_S1(ToRead, CodeWord);
+    int16u Offset=hcb_2step[CodeBook][CodeWord].Offset;
+    int8u  Extra=hcb_2step[CodeBook][CodeWord].Extra;
+
+    if (Extra)
+    {
+        Skip_BS(hcb_2step_Bytes[CodeBook],                            "extra");
+        int8u Offset_inc;
+        Peek_S1(Extra, Offset_inc);
+        Offset+=Offset_inc;
+        if(hcb_table[CodeBook][Offset][0]-hcb_2step_Bytes[CodeBook])
+            Skip_BS(hcb_table[CodeBook][Offset][0]-hcb_2step_Bytes[CodeBook],"extra");
+    }
+    else
+    {
+        Skip_BS(hcb_table[CodeBook][Offset][0],                 "bits");
+    }
+
+    if (Offset>=hcb_table_size[CodeBook])
+    {
+        Skip_BS(Data_BS_Remain(),                               "Error");
+        return;
+    }
+
+    for (int8u Pos=0; Pos<Values_Count; Pos++)
+        Values[Pos]=hcb_table[CodeBook][Offset][Pos+1];
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::hcod_binary(int8u CodeBook, int8s* Values, int8u Values_Count)
+{
+    int16u Offset=0;
+    while (!hcb_table[CodeBook][Offset][0])
+    {
+        bool b;
+        Get_SB(b,                                               "huffman binary");
+        Offset+=hcb_table[CodeBook][Offset][1+(b?1:0)];
+    }
+
+    if (Offset>=hcb_table_size[CodeBook])
+    {
+        Skip_BS(Data_BS_Remain(),                               "Error");
+        return;
+    }
+
+    for (int8u Pos=0; Pos<Values_Count; Pos++)
+        Values[Pos]=hcb_table[CodeBook][Offset][Pos+1];
+}
+
+
+
+//***************************************************************************
+// Elements - Enhanced Low Delay Codec
+//***************************************************************************
+
+
+//---------------------------------------------------------------------------
+void File_Aac::ELDSpecificConfig ()
+{
+    Element_Begin1("ELDSpecificConfig");
+    Skip_SB("frameLengthFlag");
+    Skip_SB("aacSectionDataResilienceFlag");
+    Skip_SB("aacScalefactorDataResilienceFlag");
+    Skip_SB("aacSpectralDataResilienceFlag");
+
+    bool ldSbrPresentFlag;
+    Get_SB(ldSbrPresentFlag,"ldSbrPresentFlag");
+    if (ldSbrPresentFlag)
+    {
+        Skip_SB("ldSbrSamplingRate");
+        Skip_SB("ldSbrCrcFlag");
+        ld_sbr_header();
+    }
+
+    int8u eldExtType;
+    Get_S1(4,eldExtType,"eldExtType");
+    while (eldExtType != 0/*ELDEXT_TERM*/)
+    {
+        int8u eldExtLen,eldExtLenAdd=0;
+        int16u eldExtLenAddAdd;
+        Get_S1(4,eldExtLen,"eldExtLen");
+        int32u len = eldExtLen;
+        if (eldExtLen == 15)
+        {
+            Get_S1(8,eldExtLenAdd,"eldExtLenAdd");
+            len += eldExtLenAdd;
+        }
+        if (eldExtLenAdd==255)
+        {
+            Get_S2(16,eldExtLenAddAdd,"eldExtLenAddAdd");
+            len += eldExtLenAdd;
+        }
+        //~ switch (eldExtType) {
+            /* add future eld extension configs here */
+                //~ default:
+                for(int32u cnt=0; cnt<len; cnt++)
+                    Skip_S1(8,"other_byte");
+                //~ break;
+        //~ }
+
+    }
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::ld_sbr_header()
+{
+    int8u numSbrHeader;
+    switch (channelConfiguration)
+    {
+        case 1:
+        case 2:
+            numSbrHeader = 1;
+            break;
+        case 3:
+            numSbrHeader = 2;
+            break;
+        case 4:
+        case 5:
+        case 6:
+            numSbrHeader = 3;
+            break;
+        case 7:
+            numSbrHeader = 4;
+            break;
+        default:
+            numSbrHeader = 0;
+            break;
+    }
+
+    for (int el=0; el<numSbrHeader; el++) {
+        //~ sbr_header();
+        Element_Begin1("not implemented");
+        Element_End0();
+    }
+}
+
+//***************************************************************************
+// Helpers
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Aac::hcod(int8u sect_cb, const char* Name)
+{
+    int8s Values[4];
+
+    Element_Begin1(Name);
+    switch (sect_cb)
+    {
+        case  1 :
+        case  2 :
+        case  4 :   //4-values, 2-step method
+                    hcod_2step(sect_cb, Values, 4);
+                    break;
+        case  3 :   //4-values, binary search method
+                    hcod_binary(sect_cb, Values, 4);
+                    break;
+        case  5 :
+        case  7 :
+        case  9 :   //2-values, binary search method
+                    hcod_binary(sect_cb, Values, 2);
+                    break;
+        case  6 :
+        case  8 :
+        case 10 :
+        case 11 :   //2-values, 2-step method
+                    hcod_2step(sect_cb, Values, 2);
+                    break;
+        default:    Trusted_IsNot("(Problem)");
+                    Element_End0();
+                    return;
+    }
+
+    switch (sect_cb)
+    {
+        case  1 :
+        case  2 :
+        case  5 :
+        case  6 :
+                    break;
+        default :   //With sign
+                    for(int i=0; i<((sect_cb<5)?4:2); i++)
+                        if(Values[i])
+                            Skip_SB(                            "sign");
+    }
+
+    switch (sect_cb)
+    {
+        case 11 : //With hcod_esc
+            for (int i=0; i<2; i++)
+                if (Values[i]==16 || Values[i] == -16)
+                {
+                    Element_Begin1("hcod_esc");
+                    bool Escape;
+                    int BitCount=3;
+                    do
+                    {
+                        BitCount++;
+                        Get_SB(Escape,                          "bit count");
+                    }
+                    while (Escape);
+
+
+                    Skip_BS(BitCount,                           "value");
+                    Element_End0();
+
+                }
+            break;
+        default: ;
+    }
+
+    Element_End0();
+}
+
+
+
+//***************************************************************************
+// C++
+//***************************************************************************
+
+} //NameSpace
+
+#endif //MEDIAINFO_AAC_YES

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Aac_GeneralAudio.h Added

@@ -0,0 +1,2848 @@
+// File_Aac - Info for AAC files
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_File_Aac_GeneralAudioH
+#define MediaInfo_File_Aac_GeneralAudioH
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Huffman tables
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+// Optimal huffman from:
+// "SELECTING AN OPTIMAL HUFFMAN DECODER FOR AAC"
+// VLADIMIR Z. MESAROVIC , RAGHUNATH RAO, MIROSLAV V. DOKIC, and SACHIN DEO
+// AES Convention Paper 5436
+
+//---------------------------------------------------------------------------
+//2-step 1st pass
+struct hcb_struct_1
+{
+    int8u Offset;
+    int8u Extra;
+};
+
+//2-step 2nd pass or binary
+typedef int8s hcb_struct[5]; //0=bits to read (2step) or more to read (binary), 1-4: data (1-2 in case of pairs)
+
+//---------------------------------------------------------------------------
+// Scalefactor Huffman Codebook
+static int8u huffman_sf[241][2]=
+{
+    {   1,   2 },
+    {  60,   0 },
+    {   1,   2 },
+    {   2,   3 },
+    {   3,   4 },
+    {  59,   0 },
+    {   3,   4 },
+    {   4,   5 },
+    {   5,   6 },
+    {  61,   0 },
+    {  58,   0 },
+    {  62,   0 },
+    {   3,   4 },
+    {   4,   5 },
+    {   5,   6 },
+    {  57,   0 },
+    {  63,   0 },
+    {   4,   5 },
+    {   5,   6 },
+    {   6,   7 },
+    {   7,   8 },
+    {  56,   0 },
+    {  64,   0 },
+    {  55,   0 },
+    {  65,   0 },
+    {   4,   5 },
+    {   5,   6 },
+    {   6,   7 },
+    {   7,   8 },
+    {  66,   0 },
+    {  54,   0 },
+    {  67,   0 },
+    {   5,   6 },
+    {   6,   7 },
+    {   7,   8 },
+    {   8,   9 },
+    {   9,  10 },
+    {  53,   0 },
+    {  68,   0 },
+    {  52,   0 },
+    {  69,   0 },
+    {  51,   0 },
+    {   5,   6 },
+    {   6,   7 },
+    {   7,   8 },
+    {   8,   9 },
+    {   9,  10 },
+    {  70,   0 },
+    {  50,   0 },
+    {  49,   0 },
+    {  71,   0 },
+    {   6,   7 },
+    {   7,   8 },
+    {   8,   9 },
+    {   9,  10 },
+    {  10,  11 },
+    {  11,  12 },
+    {  72,   0 },
+    {  48,   0 },
+    {  73,   0 },
+    {  47,   0 },
+    {  74,   0 },
+    {  46,   0 },
+    {   6,   7 },
+    {   7,   8 },
+    {   8,   9 },
+    {   9,  10 },
+    {  10,  11 },
+    {  11,  12 },
+    {  76,   0 },
+    {  75,   0 },
+    {  77,   0 },
+    {  78,   0 },
+    {  45,   0 },
+    {  43,   0 },
+    {   6,   7 },
+    {   7,   8 },
+    {   8,   9 },
+    {   9,  10 },
+    {  10,  11 },
+    {  11,  12 },
+    {  44,   0 },
+    {  79,   0 },
+    {  42,   0 },
+    {  41,   0 },
+    {  80,   0 },
+    {  40,   0 },
+    {   6,   7 },
+    {   7,   8 },
+    {   8,   9 },
+    {   9,  10 },
+    {  10,  11 },
+    {  11,  12 },
+    {  81,   0 },
+    {  39,   0 },
+    {  82,   0 },
+    {  38,   0 },
+    {  83,   0 },
+    {   7,   8 },
+    {   8,   9 },
+    {   9,  10 },
+    {  10,  11 },
+    {  11,  12 },
+    {  12,  13 },
+    {  13,  14 },
+    {  37,   0 },
+    {  35,   0 },
+    {  85,   0 },
+    {  33,   0 },
+    {  36,   0 },
+    {  34,   0 },
+    {  84,   0 },
+    {  32,   0 },
+    {   6,   7 },
+    {   7,   8 },
+    {   8,   9 },
+    {   9,  10 },
+    {  10,  11 },
+    {  11,  12 },
+    {  87,   0 },
+    {  89,   0 },
+    {  30,   0 },
+    {  31,   0 },
+    {   8,   9 },
+    {   9,  10 },
+    {  10,  11 },
+    {  11,  12 },
+    {  12,  13 },
+    {  13,  14 },
+    {  14,  15 },
+    {  15,  16 },
+    {  86,   0 },
+    {  29,   0 },
+    {  26,   0 },
+    {  27,   0 },
+    {  28,   0 },
+    {  24,   0 },
+    {  88,   0 },
+    {   9,  10 },
+    {  10,  11 },
+    {  11,  12 },
+    {  12,  13 },
+    {  13,  14 },
+    {  14,  15 },
+    {  15,  16 },
+    {  16,  17 },
+    {  17,  18 },
+    {  25,   0 },
+    {  22,   0 },
+    {  23,   0 },
+    {  15,  16 },
+    {  16,  17 },
+    {  17,  18 },
+    {  18,  19 },
+    {  19,  20 },
+    {  20,  21 },
+    {  21,  22 },
+    {  22,  23 },
+    {  23,  24 },
+    {  24,  25 },
+    {  25,  26 },
+    {  26,  27 },
+    {  27,  28 },
+    {  28,  29 },
+    {  29,  30 },
+    {  90,   0 },
+    {  21,   0 },
+    {  19,   0 },
+    {   3,   0 },
+    {   1,   0 },
+    {   2,   0 },
+    {   0,   0 },
+    {  23,  24 },
+    {  24,  25 },
+    {  25,  26 },
+    {  26,  27 },
+    {  27,  28 },
+    {  28,  29 },
+    {  29,  30 },
+    {  30,  31 },
+    {  31,  32 },
+    {  32,  33 },
+    {  33,  34 },
+    {  34,  35 },
+    {  35,  36 },
+    {  36,  37 },
+    {  37,  38 },
+    {  38,  39 },
+    {  39,  40 },
+    {  40,  41 },
+    {  41,  42 },
+    {  42,  43 },
+    {  43,  44 },
+    {  44,  45 },
+    {  45,  46 },
+    {  98,   0 },
+    {  99,   0 },
+    { 100,   0 },
+    { 101,   0 },
+    { 102,   0 },
+    { 117,   0 },
+    {  97,   0 },
+    {  91,   0 },
+    {  92,   0 },
+    {  93,   0 },
+    {  94,   0 },
+    {  95,   0 },
+    {  96,   0 },
+    { 104,   0 },
+    { 111,   0 },
+    { 112,   0 },
+    { 113,   0 },
+    { 114,   0 },
+    { 115,   0 },
+    { 116,   0 },
+    { 110,   0 },
+    { 105,   0 },
+    { 106,   0 },
+    { 107,   0 },
+    { 108,   0 },
+    { 109,   0 },
+    { 118,   0 },
+    {   6,   0 },
+    {   8,   0 },
+    {   9,   0 },
+    {  10,   0 },
+    {   5,   0 },
+    { 103,   0 },
+    { 120,   0 },
+    { 119,   0 },
+    {   4,   0 },
+    {   7,   0 },
+    {  15,   0 },
+    {  16,   0 },
+    {  18,   0 },
+    {  20,   0 },
+    {  17,   0 },
+    {  11,   0 },
+    {  12,   0 },
+    {  14,   0 },
+    {  13,   0 }
+};
+
+//---------------------------------------------------------------------------
+// Spectrum Huffman Codebook 1
+static hcb_struct_1 huffman_01_1[32]=
+{
+    {  0, 0 },
+    {  0, 0 },
+    {  0, 0 },
+    {  0, 0 },
+    {  0, 0 },
+    {  0, 0 },
+    {  0, 0 },
+    {  0, 0 },
+    {  0, 0 },
+    {  0, 0 },
+    {  0, 0 },
+    {  0, 0 },
+    {  0, 0 },
+    {  0, 0 },
+    {  0, 0 },
+    {  0, 0 },
+    {  1, 0 },
+    {  2, 0 },
+    {  3, 0 },
+    {  4, 0 },
+    {  5, 0 },
+    {  6, 0 },
+    {  7, 0 },
+    {  8, 0 },
+    {  9, 2 },
+    { 13, 2 },
+    { 17, 2 },
+    { 21, 2 },
+    { 25, 2 },
+    { 29, 2 },
+    { 33, 4 },
+    { 49, 6 }
+};
+
+static hcb_struct huffman_01[114]=
+{
+    {  1,  0,  0,  0,  0 },
+    {  5,  1,  0,  0,  0 },
+    {  5, -1,  0,  0,  0 },
+    {  5,  0,  0,  0, -1 },
+    {  5,  0,  1,  0,  0 },
+    {  5,  0,  0,  0,  1 },
+    {  5,  0,  0, -1,  0 },
+    {  5,  0,  0,  1,  0 },
+    {  5,  0, -1,  0,  0 },
+    {  7,  1, -1,  0,  0 },
+    {  7, -1,  1,  0,  0 },
+    {  7,  0,  0, -1,  1 },
+    {  7,  0,  1, -1,  0 },
+    {  7,  0, -1,  1,  0 },
+    {  7,  0,  0,  1, -1 },
+    {  7,  1,  1,  0,  0 },
+    {  7,  0,  0, -1, -1 },
+    {  7, -1, -1,  0,  0 },
+    {  7,  0, -1, -1,  0 },
+    {  7,  1,  0, -1,  0 },
+    {  7,  0,  1,  0, -1 },
+    {  7, -1,  0,  1,  0 },
+    {  7,  0,  0,  1,  1 },
+    {  7,  1,  0,  1,  0 },
+    {  7,  0, -1,  0,  1 },
+    {  7,  0,  1,  1,  0 },
+    {  7,  0,  1,  0,  1 },
+    {  7, -1,  0, -1,  0 },
+    {  7,  1,  0,  0,  1 },
+    {  7, -1,  0,  0, -1 },
+    {  7,  1,  0,  0, -1 },
+    {  7, -1,  0,  0,  1 },
+    {  7,  0, -1,  0, -1 },
+    {  9,  1,  1, -1,  0 },
+    {  9, -1,  1, -1,  0 },
+    {  9,  1, -1,  1,  0 },
+    {  9,  0,  1,  1, -1 },
+    {  9,  0,  1, -1,  1 },
+    {  9,  0, -1,  1,  1 },
+    {  9,  0, -1,  1, -1 },
+    {  9,  1, -1, -1,  0 },
+    {  9,  1,  0, -1,  1 },
+    {  9,  0,  1, -1, -1 },
+    {  9, -1,  1,  1,  0 },
+    {  9, -1,  0,  1, -1 },
+    {  9, -1, -1,  1,  0 },
+    {  9,  0, -1, -1,  1 },
+    {  9,  1, -1,  0,  1 },
+    {  9,  1, -1,  0, -1 },
+    {  9, -1,  1,  0, -1 },
+    {  9, -1,  1,  0, -1 },
+    {  9, -1,  1,  0, -1 },
+    {  9, -1,  1,  0, -1 },
+    {  9, -1, -1, -1,  0 },
+    {  9, -1, -1, -1,  0 },
+    {  9, -1, -1, -1,  0 },
+    {  9, -1, -1, -1,  0 },
+    {  9,  0, -1, -1, -1 },
+    {  9,  0, -1, -1, -1 },
+    {  9,  0, -1, -1, -1 },
+    {  9,  0, -1, -1, -1 },
+    {  9,  0,  1,  1,  1 },
+    {  9,  0,  1,  1,  1 },
+    {  9,  0,  1,  1,  1 },
+    {  9,  0,  1,  1,  1 },
+    {  9,  1,  0,  1, -1 },
+    {  9,  1,  0,  1, -1 },
+    {  9,  1,  0,  1, -1 },
+    {  9,  1,  0,  1, -1 },
+    {  9,  1,  1,  0,  1 },
+    {  9,  1,  1,  0,  1 },
+    {  9,  1,  1,  0,  1 },
+    {  9,  1,  1,  0,  1 },
+    {  9, -1,  1,  0,  1 },
+    {  9, -1,  1,  0,  1 },
+    {  9, -1,  1,  0,  1 },
+    {  9, -1,  1,  0,  1 },
+    {  9,  1,  1,  1,  0 },
+    {  9,  1,  1,  1,  0 },
+    {  9,  1,  1,  1,  0 },
+    {  9,  1,  1,  1,  0 },
+    { 10, -1, -1,  0,  1 },
+    { 10, -1, -1,  0,  1 },
+    { 10, -1,  0, -1, -1 },
+    { 10, -1,  0, -1, -1 },
+    { 10,  1,  1,  0, -1 },
+    { 10,  1,  1,  0, -1 },
+    { 10,  1,  0, -1, -1 },
+    { 10,  1,  0, -1, -1 },
+    { 10, -1,  0, -1,  1 },
+    { 10, -1,  0, -1,  1 },
+    { 10, -1, -1,  0, -1 },
+    { 10, -1, -1,  0, -1 },
+    { 10, -1,  0,  1,  1 },
+    { 10, -1,  0,  1,  1 },
+    { 10,  1,  0,  1,  1 },
+    { 10,  1,  0,  1,  1 },
+    { 11,  1, -1,  1, -1 },
+    { 11, -1,  1, -1,  1 },
+    { 11, -1,  1,  1, -1 },
+    { 11,  1, -1, -1,  1 },
+    { 11,  1,  1,  1,  1 },
+    { 11, -1, -1,  1,  1 },
+    { 11,  1,  1, -1, -1 },
+    { 11, -1, -1,  1, -1 },
+    { 11, -1, -1, -1, -1 },
+    { 11,  1,  1, -1,  1 },
+    { 11,  1, -1,  1,  1 },
+    { 11, -1,  1,  1,  1 },
+    { 11, -1,  1, -1, -1 },
+    { 11, -1, -1, -1,  1 },
+    { 11,  1, -1, -1, -1 },
+    { 11,  1,  1,  1, -1 }
+};
+
+//---------------------------------------------------------------------------
+// Spectrum Huffman Codebook 2
+static hcb_struct_1 huffman_02_1[] =
+{
+    {  0, 0 },
+    {  0, 0 },
+    {  0, 0 },
+    {  0, 0 },
+    {  1, 0 },
+    {  1, 0 },
+    {  2, 0 },
+    {  3, 0 },
+    {  4, 0 },
+    {  5, 0 },
+    {  6, 0 },
+    {  7, 0 },
+    {  8, 0 },
+    {  9, 1 },
+    { 11, 1 },
+    { 13, 1 },
+    { 15, 1 },
+    { 17, 1 },
+    { 19, 1 },
+    { 21, 1 },
+    { 23, 1 },
+    { 25, 1 },
+    { 27, 1 },
+    { 29, 1 },
+    { 31, 1 },
+    { 33, 2 },
+    { 37, 2 },
+    { 41, 2 },
+    { 45, 3 },
+    { 53, 3 },
+    { 61, 3 },
+    { 69, 4 }
+};
+
+static hcb_struct huffman_02[86]=
+{
+    { 3,  0,  0,  0,  0 },
+    { 4,  1,  0,  0,  0 },
+    { 5, -1,  0,  0,  0 },
+    { 5,  0,  0,  0,  1 },
+    { 5,  0,  0, -1,  0 },
+    { 5,  0,  0,  0, -1 },
+    { 5,  0, -1,  0,  0 },
+    { 5,  0,  0,  1,  0 },
+    { 5,  0,  1,  0,  0 },
+    { 6,  0, -1,  1,  0 },
+    { 6, -1,  1,  0,  0 },
+    { 6,  0,  1, -1,  0 },
+    { 6,  0,  0,  1, -1 },
+    { 6,  0,  1,  0, -1 },
+    { 6,  0,  0, -1,  1 },
+    { 6, -1,  0,  0, -1 },
+    { 6,  1, -1,  0,  0 },
+    { 6,  1,  0, -1,  0 },
+    { 6, -1, -1,  0,  0 },
+    { 6,  0,  0, -1, -1 },
+    { 6,  1,  0,  1,  0 },
+    { 6,  1,  0,  0,  1 },
+    { 6,  0, -1,  0,  1 },
+    { 6, -1,  0,  1,  0 },
+    { 6,  0,  1,  0,  1 },
+    { 6,  0, -1, -1,  0 },
+    { 6, -1,  0,  0,  1 },
+    { 6,  0, -1,  0, -1 },
+    { 6, -1,  0, -1,  0 },
+    { 6,  1,  1,  0,  0 },
+    { 6,  0,  1,  1,  0 },
+    { 6,  0,  0,  1,  1 },
+    { 6,  1,  0,  0, -1 },
+    { 7,  0,  1, -1,  1 },
+    { 7,  1,  0, -1,  1 },
+    { 7, -1,  1, -1,  0 },
+    { 7,  0, -1,  1, -1 },
+    { 7,  1, -1,  1,  0 },
+    { 7,  1,  1,  0, -1 },
+    { 7,  1,  0,  1,  1 },
+    { 7, -1,  1,  1,  0 },
+    { 7,  0, -1, -1,  1 },
+    { 7,  1,  1,  1,  0 },
+    { 7, -1,  0,  1, -1 },
+    { 7, -1, -1, -1,  0 },
+    { 7, -1,  0, -1,  1 },
+    { 7, -1,  0, -1,  1 },
+    { 7,  1, -1, -1,  0 },
+    { 7,  1, -1, -1,  0 },
+    { 7,  1,  1, -1,  0 },
+    { 7,  1,  1, -1,  0 },
+    { 8,  1, -1,  0,  1 },
+    { 8, -1,  1,  0, -1 },
+    { 8, -1, -1,  1,  0 },
+    { 8, -1,  0,  1,  1 },
+    { 8, -1, -1,  0,  1 },
+    { 8, -1, -1,  0, -1 },
+    { 8,  0, -1, -1, -1 },
+    { 8,  1,  0,  1, -1 },
+    { 8,  1,  0, -1, -1 },
+    { 8,  0,  1, -1, -1 },
+    { 8,  0,  1,  1,  1 },
+    { 8, -1,  1,  0,  1 },
+    { 8, -1,  0, -1, -1 },
+    { 8,  0,  1,  1, -1 },
+    { 8,  1, -1,  0, -1 },
+    { 8,  0, -1,  1,  1 },
+    { 8,  1,  1,  0,  1 },
+    { 8,  1, -1,  1, -1 },
+    { 8, -1,  1, -1,  1 },
+    { 8, -1,  1, -1,  1 },
+    { 9,  1, -1, -1,  1 },
+    { 9, -1, -1, -1, -1 },
+    { 9, -1,  1,  1, -1 },
+    { 9, -1,  1,  1,  1 },
+    { 9,  1,  1,  1,  1 },
+    { 9, -1, -1,  1, -1 },
+    { 9,  1, -1,  1,  1 },
+    { 9, -1,  1, -1, -1 },
+    { 9, -1, -1,  1,  1 },
+    { 9,  1,  1, -1, -1 },
+    { 9,  1, -1, -1, -1 },
+    { 9, -1, -1, -1,  1 },
+    { 9,  1,  1, -1,  1 },
+    { 9,  1,  1,  1, -1 }
+};
+
+//---------------------------------------------------------------------------
+// Spectrum Huffman Codebook 2
+static hcb_struct huffman_03[161] =
+{
+    { 0,  1,  2 },
+    { 1,  0,  0 },
+    { 0,  1,  2 },
+    { 0,  2,  3 },
+    { 0,  3,  4 },
+    { 0,  4,  5 },
+    { 0,  5,  6 },
+    { 0,  6,  7 },
+    { 0,  7,  8 },
+    { 1,  1,  0 },
+    { 1,  0,  0,  0,  1 },
+    { 1,  0,  1,  0,  0 },
+    { 1,  0,  0,  1,  0 },
+    { 0,  4,  5 },
+    { 0,  5,  6 },
+    { 0,  6,  7 },
+    { 0,  7,  8 },
+    { 1,  1,  1 },
+    { 1,  0,  0,  1,  1 },
+    { 0,  6,  7 },
+    { 0,  7,  8 },
+    { 0,  8,  9 },
+    { 0,  9, 10 },
+    { 0, 10, 11 },
+    { 0, 11, 12 },
+    { 1,  0,  1,  1,  0 },
+    { 1,  0,  1,  0,  1 },
+    { 1,  1,  0,  1,  0 },
+    { 1,  0,  1,  1,  1 },
+    { 1,  1,  0,  0,  1 },
+    { 1,  1,  1,  1,  0 },
+    { 0,  6,  7 },
+    { 0,  7,  8 },
+    { 0,  8,  9 },
+    { 0,  9, 10 },
+    { 0, 10, 11 },
+    { 0, 11, 12 },
+    { 1,  1,  1,  1,  1 },
+    { 1,  1,  0,  1,  1 },
+    { 1,  1,  1,  0,  1 },
+    { 0,  9, 10 },
+    { 0, 10, 11 },
+    { 0, 11, 12 },
+    { 0, 12, 13 },
+    { 0, 13, 14 },
+    { 0, 14, 15 },
+    { 0, 15, 16 },
+    { 0, 16, 17 },
+    { 0, 17, 18 },
+    { 1,  2,  0,  0,  0 },
+    { 1,  0,  0,  0,  2 },
+    { 1,  0,  0,  1,  2 },
+    { 1,  2,  1,  0,  0 },
+    { 1,  1,  2,  1,  0 },
+    { 0, 13, 14 },
+    { 0, 14, 15 },
+    { 0, 15, 16 },
+    { 0, 16, 17 },
+    { 0, 17, 18 },
+    { 0, 18, 19 },
+    { 0, 19, 20 },
+    { 0, 20, 21 },
+    { 0, 21, 22 },
+    { 0, 22, 23 },
+    { 0, 23, 24 },
+    { 0, 24, 25 },
+    { 0, 25, 26 },
+    { 1,  0,  0,  2,  1 },
+    { 1,  0,  1,  2,  1 },
+    { 1,  1,  2,  0,  0 },
+    { 1,  0,  1,  1,  2 },
+    { 1,  2,  1,  1,  0 },
+    { 1,  0,  0,  2,  0 },
+    { 1,  0,  2,  1,  0 },
+    { 1,  0,  1,  2,  0 },
+    { 1,  0,  2,  0,  0 },
+    { 1,  0,  1,  0,  2 },
+    { 1,  2,  0,  1,  0 },
+    { 1,  1,  2,  1,  1 },
+    { 1,  0,  2,  1,  1 },
+    { 1,  1,  1,  2,  0 },
+    { 1,  1,  1,  2,  1 },
+    { 0, 11, 12 },
+    { 0, 12, 13 },
+    { 0, 13, 14 },
+    { 0, 14, 15 },
+    { 0, 15, 16 },
+    { 0, 16, 17 },
+    { 0, 17, 18 },
+    { 0, 18, 19 },
+    { 0, 19, 20 },
+    { 0, 20, 21 },
+    { 0, 21, 22 },
+    { 1,  1,  2,  0,  1 },
+    { 1,  1,  0,  2,  0 },
+    { 1,  1,  0,  2,  1 },
+    { 1,  0,  2,  0,  1 },
+    { 1,  2,  1,  1,  1 },
+    { 1,  1,  1,  1,  2 },
+    { 1,  2,  1,  0,  1 },
+    { 1,  1,  0,  1,  2 },
+    { 1,  0,  0,  2,  2 },
+    { 1,  0,  1,  2,  2 },
+    { 1,  2,  2,  1,  0 },
+    { 1,  1,  2,  2,  0 },
+    { 1,  1,  0,  0,  2 },
+    { 1,  2,  0,  0,  1 },
+    { 1,  0,  2,  2,  1 },
+    { 0,  7,  8 },
+    { 0,  8,  9 },
+    { 0,  9, 10 },
+    { 0, 10, 11 },
+    { 0, 11, 12 },
+    { 0, 12, 13 },
+    { 0, 13, 14 },
+    { 1,  2,  2,  0,  0 },
+    { 1,  1,  2,  2,  1 },
+    { 1,  1,  1,  0,  2 },
+    { 1,  2,  0,  1,  1 },
+    { 1,  1,  1,  2,  2 },
+    { 1,  2,  2,  1,  1 },
+    { 1,  0,  2,  2,  0 },
+    { 1,  0,  2,  1,  2 },
+    { 0,  6,  7 },
+    { 0,  7,  8 },
+    { 0,  8,  9 },
+    { 0,  9, 10 },
+    { 0, 10, 11 },
+    { 0, 11, 12 },
+    { 1,  1,  0,  2,  2 },
+    { 1,  2,  2,  0,  1 },
+    { 1,  2,  1,  2,  0 },
+    { 1,  2,  2,  2,  0 },
+    { 1,  0,  2,  2,  2 },
+    { 1,  2,  2,  2,  1 },
+    { 1,  2,  1,  2,  1 },
+    { 1,  1,  2,  1,  2 },
+    { 1,  1,  2,  2,  2 },
+    { 0,  3,  4 },
+    { 0,  4,  5 },
+    { 0,  5,  6 },
+    { 1,  0,  2,  0,  2 },
+    { 1,  2,  0,  2,  0 },
+    { 1,  1,  2,  0,  2 },
+    { 0,  3,  4 },
+    { 0,  4,  5 },
+    { 0,  5,  6 },
+    { 1,  2,  0,  2,  1 },
+    { 1,  2,  1,  1,  2 },
+    { 1,  2,  1,  0,  2 },
+    { 0,  3,  4 },
+    { 0,  4,  5 },
+    { 0,  5,  6 },
+    { 1,  2,  2,  2,  2 },
+    { 1,  2,  2,  1,  2 },
+    { 1,  2,  1,  2,  2 },
+    { 1,  2,  0,  1,  2 },
+    { 1,  2,  0,  0,  2 },
+    { 0,  1,  2 },
+    { 1,  2,  2,  0,  2 },
+    { 1,  2,  0,  2,  2 },
+};
+
+//---------------------------------------------------------------------------
+// Spectrum Huffman Codebook 4
+static hcb_struct_1 huffman_04_1[32]=
+{
+    {  0, 0 },
+    {  0, 0 },
+    {  1, 0 },
+    {  1, 0 },
+    {  2, 0 },
+    {  2, 0 },
+    {  3, 0 },
+    {  3, 0 },
+    {  4, 0 },
+    {  4, 0 },
+    {  5, 0 },
+    {  5, 0 },
+    {  6, 0 },
+    {  6, 0 },
+    {  7, 0 },
+    {  7, 0 },
+    {  8, 0 },
+    {  8, 0 },
+    {  9, 0 },
+    {  9, 0 },
+    { 10, 0 },
+    { 11, 0 },
+    { 12, 0 },
+    { 13, 0 },
+    { 14, 0 },
+    { 15, 0 },
+    { 16, 2 },
+    { 20, 2 },
+    { 24, 3 },
+    { 32, 3 },
+    { 40, 4 },
+    { 56, 7 }
+};
+
+static hcb_struct huffman_04[185]=
+{
+    {  4,  1,  1,  1,  1 },
+    {  4,  0,  1,  1,  1 },
+    {  4,  1,  1,  0,  1 },
+    {  4,  1,  1,  1,  0 },
+    {  4,  1,  0,  1,  1 },
+    {  4,  1,  0,  0,  0 },
+    {  4,  1,  1,  0,  0 },
+    {  4,  0,  0,  0,  0 },
+    {  4,  0,  0,  1,  1 },
+    {  4,  1,  0,  1,  0 },
+    {  5,  1,  0,  0,  1 },
+    {  5,  0,  1,  1,  0 },
+    {  5,  0,  0,  0,  1 },
+    {  5,  0,  1,  0,  1 },
+    {  5,  0,  0,  1,  0 },
+    {  5,  0,  1,  0,  0 },
+    {  7,  2,  1,  1,  1 },
+    {  7,  1,  1,  2,  1 },
+    {  7,  1,  2,  1,  1 },
+    {  7,  1,  1,  1,  2 },
+    {  7,  2,  1,  1,  0 },
+    {  7,  2,  1,  0,  1 },
+    {  7,  1,  2,  1,  0 },
+    {  7,  2,  0,  1,  1 },
+    {  7,  0,  1,  2,  1 },
+    {  7,  0,  1,  2,  1 },
+    {  8,  0,  1,  1,  2 },
+    {  8,  1,  1,  2,  0 },
+    {  8,  0,  2,  1,  1 },
+    {  8,  1,  0,  1,  2 },
+    {  8,  1,  2,  0,  1 },
+    {  8,  1,  1,  0,  2 },
+    {  8,  1,  0,  2,  1 },
+    {  8,  2,  1,  0,  0 },
+    {  8,  2,  0,  1,  0 },
+    {  8,  1,  2,  0,  0 },
+    {  8,  2,  0,  0,  1 },
+    {  8,  0,  1,  0,  2 },
+    {  8,  0,  2,  1,  0 },
+    {  8,  0,  0,  1,  2 },
+    {  8,  0,  1,  2,  0 },
+    {  8,  0,  1,  2,  0 },
+    {  8,  0,  2,  0,  1 },
+    {  8,  0,  2,  0,  1 },
+    {  8,  1,  0,  0,  2 },
+    {  8,  1,  0,  0,  2 },
+    {  8,  0,  0,  2,  1 },
+    {  8,  0,  0,  2,  1 },
+    {  8,  1,  0,  2,  0 },
+    {  8,  1,  0,  2,  0 },
+    {  8,  2,  0,  0,  0 },
+    {  8,  2,  0,  0,  0 },
+    {  8,  0,  0,  0,  2 },
+    {  8,  0,  0,  0,  2 },
+    {  9,  0,  2,  0,  0 },
+    {  9,  0,  0,  2,  0 },
+    {  9,  1,  2,  2,  1 },
+    {  9,  1,  2,  2,  1 },
+    {  9,  1,  2,  2,  1 },
+    {  9,  1,  2,  2,  1 },
+    {  9,  1,  2,  2,  1 },
+    {  9,  1,  2,  2,  1 },
+    {  9,  1,  2,  2,  1 },
+    {  9,  1,  2,  2,  1 },
+    {  9,  2,  2,  1,  1 },
+    {  9,  2,  2,  1,  1 },
+    {  9,  2,  2,  1,  1 },
+    {  9,  2,  2,  1,  1 },
+    {  9,  2,  2,  1,  1 },
+    {  9,  2,  2,  1,  1 },
+    {  9,  2,  2,  1,  1 },
+    {  9,  2,  2,  1,  1 },
+    {  9,  2,  1,  2,  1 },
+    {  9,  2,  1,  2,  1 },
+    {  9,  2,  1,  2,  1 },
+    {  9,  2,  1,  2,  1 },
+    {  9,  2,  1,  2,  1 },
+    {  9,  2,  1,  2,  1 },
+    {  9,  2,  1,  2,  1 },
+    {  9,  2,  1,  2,  1 },
+    {  9,  1,  1,  2,  2 },
+    {  9,  1,  1,  2,  2 },
+    {  9,  1,  1,  2,  2 },
+    {  9,  1,  1,  2,  2 },
+    {  9,  1,  1,  2,  2 },
+    {  9,  1,  1,  2,  2 },
+    {  9,  1,  1,  2,  2 },
+    {  9,  1,  1,  2,  2 },
+    {  9,  1,  2,  1,  2 },
+    {  9,  1,  2,  1,  2 },
+    {  9,  1,  2,  1,  2 },
+    {  9,  1,  2,  1,  2 },
+    {  9,  1,  2,  1,  2 },
+    {  9,  1,  2,  1,  2 },
+    {  9,  1,  2,  1,  2 },
+    {  9,  1,  2,  1,  2 },
+    {  9,  2,  1,  1,  2 },
+    {  9,  2,  1,  1,  2 },
+    {  9,  2,  1,  1,  2 },
+    {  9,  2,  1,  1,  2 },
+    {  9,  2,  1,  1,  2 },
+    {  9,  2,  1,  1,  2 },
+    {  9,  2,  1,  1,  2 },
+    {  9,  2,  1,  1,  2 },
+    { 10,  1,  2,  2,  0 },
+    { 10,  1,  2,  2,  0 },
+    { 10,  1,  2,  2,  0 },
+    { 10,  1,  2,  2,  0 },
+    { 10,  2,  2,  1,  0 },
+    { 10,  2,  2,  1,  0 },
+    { 10,  2,  2,  1,  0 },
+    { 10,  2,  2,  1,  0 },
+    { 10,  2,  1,  2,  0 },
+    { 10,  2,  1,  2,  0 },
+    { 10,  2,  1,  2,  0 },
+    { 10,  2,  1,  2,  0 },
+    { 10,  0,  2,  2,  1 },
+    { 10,  0,  2,  2,  1 },
+    { 10,  0,  2,  2,  1 },
+    { 10,  0,  2,  2,  1 },
+    { 10,  0,  1,  2,  2 },
+    { 10,  0,  1,  2,  2 },
+    { 10,  0,  1,  2,  2 },
+    { 10,  0,  1,  2,  2 },
+    { 10,  2,  2,  0,  1 },
+    { 10,  2,  2,  0,  1 },
+    { 10,  2,  2,  0,  1 },
+    { 10,  2,  2,  0,  1 },
+    { 10,  0,  2,  1,  2 },
+    { 10,  0,  2,  1,  2 },
+    { 10,  0,  2,  1,  2 },
+    { 10,  0,  2,  1,  2 },
+    { 10,  2,  0,  2,  1 },
+    { 10,  2,  0,  2,  1 },
+    { 10,  2,  0,  2,  1 },
+    { 10,  2,  0,  2,  1 },
+    { 10,  1,  0,  2,  2 },
+    { 10,  1,  0,  2,  2 },
+    { 10,  1,  0,  2,  2 },
+    { 10,  1,  0,  2,  2 },
+    { 10,  2,  2,  2,  1 },
+    { 10,  2,  2,  2,  1 },
+    { 10,  2,  2,  2,  1 },
+    { 10,  2,  2,  2,  1 },
+    { 10,  1,  2,  0,  2 },
+    { 10,  1,  2,  0,  2 },
+    { 10,  1,  2,  0,  2 },
+    { 10,  1,  2,  0,  2 },
+    { 10,  2,  0,  1,  2 },
+    { 10,  2,  0,  1,  2 },
+    { 10,  2,  0,  1,  2 },
+    { 10,  2,  0,  1,  2 },
+    { 10,  2,  1,  0,  2 },
+    { 10,  2,  1,  0,  2 },
+    { 10,  2,  1,  0,  2 },
+    { 10,  2,  1,  0,  2 },
+    { 10,  1,  2,  2,  2 },
+    { 10,  1,  2,  2,  2 },
+    { 10,  1,  2,  2,  2 },
+    { 10,  1,  2,  2,  2 },
+    { 11,  2,  1,  2,  2 },
+    { 11,  2,  1,  2,  2 },
+    { 11,  2,  2,  1,  2 },
+    { 11,  2,  2,  1,  2 },
+    { 11,  0,  2,  2,  0 },
+    { 11,  0,  2,  2,  0 },
+    { 11,  2,  2,  0,  0 },
+    { 11,  2,  2,  0,  0 },
+    { 11,  0,  0,  2,  2 },
+    { 11,  0,  0,  2,  2 },
+    { 11,  2,  0,  2,  0 },
+    { 11,  2,  0,  2,  0 },
+    { 11,  0,  2,  0,  2 },
+    { 11,  0,  2,  0,  2 },
+    { 11,  2,  0,  0,  2 },
+    { 11,  2,  0,  0,  2 },
+    { 11,  2,  2,  2,  2 },
+    { 11,  2,  2,  2,  2 },
+    { 11,  0,  2,  2,  2 },
+    { 11,  0,  2,  2,  2 },
+    { 11,  2,  2,  2,  0 },
+    { 11,  2,  2,  2,  0 },
+    { 12,  2,  2,  0,  2 },
+    { 12,  2,  0,  2,  2 },
+};
+
+//---------------------------------------------------------------------------
+// Spectrum Huffman Codebook 5
+static hcb_struct huffman_05[161]=
+{
+    { 0,  1,  2 },
+    { 1,  0,  0 },
+    { 0,  1,  2 },
+    { 0,  2,  3 },
+    { 0,  3,  4 },
+    { 0,  4,  5 },
+    { 0,  5,  6 },
+    { 0,  6,  7 },
+    { 0,  7,  8 },
+    { 1, -1,  0 },
+    { 1,  1,  0 },
+    { 1,  0,  1 },
+    { 1,  0, -1 },
+    { 0,  4,  5 },
+    { 0,  5,  6 },
+    { 0,  6,  7 },
+    { 0,  7,  8 },
+    { 1,  1, -1 },
+    { 1, -1,  1 },
+    { 1, -1, -1 },
+    { 1,  1,  1 },
+    { 0,  4,  5 },
+    { 0,  5,  6 },
+    { 0,  6,  7 },
+    { 0,  7,  8 },
+    { 0,  8,  9 },
+    { 0,  9, 10 },
+    { 0, 10, 11 },
+    { 0, 11, 12 },
+    { 0, 12, 13 },
+    { 0, 13, 14 },
+    { 0, 14, 15 },
+    { 0, 15, 16 },
+    { 1, -2,  0 },
+    { 1,  0,  2 },
+    { 1,  2,  0 },
+    { 1,  0, -2 },
+    { 0, 12, 13 },
+    { 0, 13, 14 },
+    { 0, 14, 15 },
+    { 0, 15, 16 },
+    { 0, 16, 17 },
+    { 0, 17, 18 },
+    { 0, 18, 19 },
+    { 0, 19, 20 },
+    { 0, 20, 21 },
+    { 0, 21, 22 },
+    { 0, 22, 23 },
+    { 0, 23, 24 },
+    { 1, -2, -1 },
+    { 1,  2,  1 },
+    { 1, -1, -2 },
+    { 1,  1,  2 },
+    { 1, -2,  1 },
+    { 1,  2, -1 },
+    { 1, -1,  2 },
+    { 1,  1, -2 },
+    { 1, -3,  0 },
+    { 1,  3,  0 },
+    { 1,  0, -3 },
+    { 1,  0,  3 },
+    { 0, 12, 13 },
+    { 0, 13, 14 },
+    { 0, 14, 15 },
+    { 0, 15, 16 },
+    { 0, 16, 17 },
+    { 0, 17, 18 },
+    { 0, 18, 19 },
+    { 0, 19, 20 },
+    { 0, 20, 21 },
+    { 0, 21, 22 },
+    { 0, 22, 23 },
+    { 0, 23, 24 },
+    { 1, -3, -1 },
+    { 1,  1,  3 },
+    { 1,  3,  1 },
+    { 1, -1, -3 },
+    { 1, -3,  1 },
+    { 1,  3, -1 },
+    { 1,  1, -3 },
+    { 1, -1,  3 },
+    { 1, -2,  2 },
+    { 1,  2,  2 },
+    { 1, -2, -2 },
+    { 1,  2, -2 },
+    { 0, 12, 13 },
+    { 0, 13, 14 },
+    { 0, 14, 15 },
+    { 0, 15, 16 },
+    { 0, 16, 17 },
+    { 0, 17, 18 },
+    { 0, 18, 19 },
+    { 0, 19, 20 },
+    { 0, 20, 21 },
+    { 0, 21, 22 },
+    { 0, 22, 23 },
+    { 0, 23, 24 },
+    { 1, -3, -2 },
+    { 1,  3, -2 },
+    { 1, -2,  3 },
+    { 1,  2, -3 },
+    { 1,  3,  2 },
+    { 1,  2,  3 },
+    { 1, -3,  2 },
+    { 1, -2, -3 },
+    { 1,  0, -4 },
+    { 1, -4,  0 },
+    { 1,  4,  1 },
+    { 1,  4,  0 },
+    { 0, 12, 13 },
+    { 0, 13, 14 },
+    { 0, 14, 15 },
+    { 0, 15, 16 },
+    { 0, 16, 17 },
+    { 0, 17, 18 },
+    { 0, 18, 19 },
+    { 0, 19, 20 },
+    { 0, 20, 21 },
+    { 0, 21, 22 },
+    { 0, 22, 23 },
+    { 0, 23, 24 },
+    { 1, -4, -1 },
+    { 1,  0,  4 },
+    { 1,  4, -1 },
+    { 1, -1, -4 },
+    { 1,  1,  4 },
+    { 1, -1,  4 },
+    { 1, -4,  1 },
+    { 1,  1, -4 },
+    { 1,  3, -3 },
+    { 1, -3, -3 },
+    { 1, -3,  3 },
+    { 1, -2,  4 },
+    { 1, -4, -2 },
+    { 1,  4,  2 },
+    { 1,  2, -4 },
+    { 1,  2,  4 },
+    { 1,  3,  3 },
+    { 1, -4,  2 },
+    { 0,  6,  7 },
+    { 0,  7,  8 },
+    { 0,  8,  9 },
+    { 0,  9, 10 },
+    { 0, 10, 11 },
+    { 0, 11, 12 },
+    { 1, -2, -4 },
+    { 1,  4, -2 },
+    { 1,  3, -4 },
+    { 1, -4, -3 },
+    { 1, -4,  3 },
+    { 1,  3,  4 },
+    { 1, -3,  4 },
+    { 1,  4,  3 },
+    { 1,  4, -3 },
+    { 1, -3, -4 },
+    { 0,  2,  3 },
+    { 0,  3,  4 },
+    { 1,  4, -4 },
+    { 1, -4,  4 },
+    { 1,  4,  4 },
+    { 1, -4, -4 }
+};
+
+//---------------------------------------------------------------------------
+// Spectrum Huffman Codebook 6
+static hcb_struct_1 huffman_06_1[32] = {
+    {  0, 0 },
+    {  0, 0 },
+    {  1, 0 },
+    {  1, 0 },
+    {  2, 0 },
+    {  2, 0 },
+    {  3, 0 },
+    {  3, 0 },
+    {  4, 0 },
+    {  4, 0 },
+    {  5, 0 },
+    {  5, 0 },
+    {  6, 0 },
+    {  6, 0 },
+    {  7, 0 },
+    {  7, 0 },
+    {  8, 0 },
+    {  8, 0 },
+    {  9, 1 },
+    {  11, 1 },
+    {  13, 1 },
+    {  15, 1 },
+    {  17, 1 },
+    {  19, 1 },
+    {  21, 1 },
+    {  23, 1 },
+    {  25, 2 },
+    {  29, 2 },
+    {  33, 2 },
+    {  37, 3 },
+    {  45, 4 },
+    {  61, 6 }
+};
+
+static hcb_struct huffman_06[126]=
+{
+    {  4,  0,  0 },
+    {  4,  1,  0 },
+    {  4,  0, -1 },
+    {  4,  0,  1 },
+    {  4, -1,  0 },
+    {  4,  1,  1 },
+    {  4, -1,  1 },
+    {  4,  1, -1 },
+    {  4, -1, -1 },
+    {  6,  2, -1 },
+    {  6,  2,  1 },
+    {  6, -2,  1 },
+    {  6, -2, -1 },
+    {  6, -2,  0 },
+    {  6, -1,  2 },
+    {  6,  2,  0 },
+    {  6,  1, -2 },
+    {  6,  1,  2 },
+    {  6,  0, -2 },
+    {  6, -1, -2 },
+    {  6,  0,  2 },
+    {  6,  2, -2 },
+    {  6, -2,  2 },
+    {  6, -2, -2 },
+    {  6,  2,  2 },
+    {  7, -3,  1 },
+    {  7,  3,  1 },
+    {  7,  3, -1 },
+    {  7, -1,  3 },
+    {  7, -3, -1 },
+    {  7,  1,  3 },
+    {  7,  1, -3 },
+    {  7, -1, -3 },
+    {  7,  3,  0 },
+    {  7, -3,  0 },
+    {  7,  0, -3 },
+    {  7,  0,  3 },
+    {  7,  3,  2 },
+    {  7,  3,  2 },
+    {  8, -3, -2 },
+    {  8, -2,  3 },
+    {  8,  2,  3 },
+    {  8,  3, -2 },
+    {  8,  2, -3 },
+    {  8, -2, -3 },
+    {  8, -3,  2 },
+    {  8, -3,  2 },
+    {  8,  3,  3 },
+    {  8,  3,  3 },
+    {  9,  3, -3 },
+    {  9, -3, -3 },
+    {  9, -3,  3 },
+    {  9,  1, -4 },
+    {  9, -1, -4 },
+    {  9,  4,  1 },
+    {  9, -4,  1 },
+    {  9, -4, -1 },
+    {  9,  1,  4 },
+    {  9,  4, -1 },
+    {  9, -1,  4 },
+    {  9,  0, -4 },
+    {  9, -4,  2 },
+    {  9, -4,  2 },
+    {  9, -4,  2 },
+    {  9, -4,  2 },
+    {  9, -4, -2 },
+    {  9, -4, -2 },
+    {  9, -4, -2 },
+    {  9, -4, -2 },
+    {  9,  2,  4 },
+    {  9,  2,  4 },
+    {  9,  2,  4 },
+    {  9,  2,  4 },
+    {  9, -2, -4 },
+    {  9, -2, -4 },
+    {  9, -2, -4 },
+    {  9, -2, -4 },
+    {  9, -4,  0 },
+    {  9, -4,  0 },
+    {  9, -4,  0 },
+    {  9, -4,  0 },
+    {  9,  4,  2 },
+    {  9,  4,  2 },
+    {  9,  4,  2 },
+    {  9,  4,  2 },
+    {  9,  4, -2 },
+    {  9,  4, -2 },
+    {  9,  4, -2 },
+    {  9,  4, -2 },
+    {  9, -2,  4 },
+    {  9, -2,  4 },
+    {  9, -2,  4 },
+    {  9, -2,  4 },
+    {  9,  4,  0 },
+    {  9,  4,  0 },
+    {  9,  4,  0 },
+    {  9,  4,  0 },
+    {  9,  2, -4 },
+    {  9,  2, -4 },
+    {  9,  2, -4 },
+    {  9,  2, -4 },
+    {  9,  0,  4 },
+    {  9,  0,  4 },
+    {  9,  0,  4 },
+    {  9,  0,  4 },
+    { 10, -3, -4 },
+    { 10, -3, -4 },
+    { 10, -3,  4 },
+    { 10, -3,  4 },
+    { 10,  3, -4 },
+    { 10,  3, -4 },
+    { 10,  4, -3 },
+    { 10,  4, -3 },
+    { 10,  3,  4 },
+    { 10,  3,  4 },
+    { 10,  4,  3 },
+    { 10,  4,  3 },
+    { 10, -4,  3 },
+    { 10, -4,  3 },
+    { 10, -4, -3 },
+    { 10, -4, -3 },
+    { 11,  4,  4 },
+    { 11, -4,  4 },
+    { 11, -4, -4 },
+    { 11,  4, -4 }
+};
+
+//---------------------------------------------------------------------------
+// Spectrum Huffman Codebook 7
+static hcb_struct huffman_07[127] =
+{
+    { 0,  1,  2 },
+    { 1,  0,  0 },
+    { 0,  1,  2 },
+    { 0,  2,  3 },
+    { 0,  3,  4 },
+    { 1,  1,  0 },
+    { 1,  0,  1 },
+    { 0,  2,  3 },
+    { 0,  3,  4 },
+    { 1,  1,  1 },
+    { 0,  3,  4 },
+    { 0,  4,  5 },
+    { 0,  5,  6 },
+    { 0,  6,  7 },
+    { 0,  7,  8 },
+    { 0,  8,  9 },
+    { 0,  9, 10 },
+    { 0, 10, 11 },
+    { 0, 11, 12 },
+    { 1,  2,  1 },
+    { 1,  1,  2 },
+    { 1,  2,  0 },
+    { 1,  0,  2 },
+    { 0,  8,  9 },
+    { 0,  9, 10 },
+    { 0, 10, 11 },
+    { 0, 11, 12 },
+    { 0, 12, 13 },
+    { 0, 13, 14 },
+    { 0, 14, 15 },
+    { 0, 15, 16 },
+    { 1,  3,  1 },
+    { 1,  1,  3 },
+    { 1,  2,  2 },
+    { 1,  3,  0 },
+    { 1,  0,  3 },
+    { 0, 11, 12 },
+    { 0, 12, 13 },
+    { 0, 13, 14 },
+    { 0, 14, 15 },
+    { 0, 15, 16 },
+    { 0, 16, 17 },
+    { 0, 17, 18 },
+    { 0, 18, 19 },
+    { 0, 19, 20 },
+    { 0, 20, 21 },
+    { 0, 21, 22 },
+    { 1,  2,  3 },
+    { 1,  3,  2 },
+    { 1,  1,  4 },
+    { 1,  4,  1 },
+    { 1,  1,  5 },
+    { 1,  5,  1 },
+    { 1,  3,  3 },
+    { 1,  2,  4 },
+    { 1,  0,  4 },
+    { 1,  4,  0 },
+    { 0, 12, 13 },
+    { 0, 13, 14 },
+    { 0, 14, 15 },
+    { 0, 15, 16 },
+    { 0, 16, 17 },
+    { 0, 17, 18 },
+    { 0, 18, 19 },
+    { 0, 19, 20 },
+    { 0, 20, 21 },
+    { 0, 21, 22 },
+    { 0, 22, 23 },
+    { 0, 23, 24 },
+    { 1,  4,  2 },
+    { 1,  2,  5 },
+    { 1,  5,  2 },
+    { 1,  0,  5 },
+    { 1,  6,  1 },
+    { 1,  5,  0 },
+    { 1,  1,  6 },
+    { 1,  4,  3 },
+    { 1,  3,  5 },
+    { 1,  3,  4 },
+    { 1,  5,  3 },
+    { 1,  2,  6 },
+    { 1,  6,  2 },
+    { 1,  1,  7 },
+    { 0, 10, 11 },
+    { 0, 11, 12 },
+    { 0, 12, 13 },
+    { 0, 13, 14 },
+    { 0, 14, 15 },
+    { 0, 15, 16 },
+    { 0, 16, 17 },
+    { 0, 17, 18 },
+    { 0, 18, 19 },
+    { 0, 19, 20 },
+    { 1,  3,  6 },
+    { 1,  0,  6 },
+    { 1,  6,  0 },
+    { 1,  4,  4 },
+    { 1,  7,  1 },
+    { 1,  4,  5 },
+    { 1,  7,  2 },
+    { 1,  5,  4 },
+    { 1,  6,  3 },
+    { 1,  2,  7 },
+    { 1,  7,  3 },
+    { 1,  6,  4 },
+    { 1,  5,  5 },
+    { 1,  4,  6 },
+    { 1,  3,  7 },
+    { 0,  5,  6 },
+    { 0,  6,  7 },
+    { 0,  7,  8 },
+    { 0,  8,  9 },
+    { 0,  9, 10 },
+    { 1,  7,  0 },
+    { 1,  0,  7 },
+    { 1,  6,  5 },
+    { 1,  5,  6 },
+    { 1,  7,  4 },
+    { 1,  4,  7 },
+    { 1,  5,  7 },
+    { 1,  7,  5 },
+    { 0,  2,  3 },
+    { 0,  3,  4 },
+    { 1,  7,  6 },
+    { 1,  6,  6 },
+    { 1,  6,  7 },
+    { 1,  7,  7 }
+};
+
+//---------------------------------------------------------------------------
+// Spectrum Huffman Codebook 8
+static hcb_struct_1 huffman_08_1[32]=
+{
+    {  0, 0 },
+    {  0, 0 },
+    {  0, 0 },
+    {  0, 0 },
+    {  1, 0 },
+    {  1, 0 },
+    {  2, 0 },
+    {  2, 0 },
+    {  3, 0 },
+    {  3, 0 },
+    {  4, 0 },
+    {  4, 0 },
+    {  5, 0 },
+    {  5, 0 },
+    {  6, 0 },
+    {  7, 0 },
+    {  8, 0 },
+    {  9, 0 },
+    { 10, 0 },
+    { 11, 0 },
+    { 12, 0 },
+    { 13, 1 },
+    { 15, 1 },
+    { 17, 1 },
+    { 19, 1 },
+    { 21, 1 },
+    { 23, 2 },
+    { 27, 2 },
+    { 31, 2 },
+    { 35, 3 },
+    { 43, 3 },
+    { 51, 5 }
+};
+
+static hcb_struct huffman_08[83]=
+{
+    {  3,  1,  1 },
+    {  4,  2,  1 },
+    {  4,  1,  0 },
+    {  4,  1,  2 },
+    {  4,  0,  1 },
+    {  4,  2,  2 },
+    {  5,  0,  0 },
+    {  5,  2,  0 },
+    {  5,  0,  2 },
+    {  5,  3,  1 },
+    {  5,  1,  3 },
+    {  5,  3,  2 },
+    {  5,  2,  3 },
+    {  6,  3,  3 },
+    {  6,  4,  1 },
+    {  6,  1,  4 },
+    {  6,  4,  2 },
+    {  6,  2,  4 },
+    {  6,  3,  0 },
+    {  6,  0,  3 },
+    {  6,  4,  3 },
+    {  6,  3,  4 },
+    {  6,  5,  2 },
+    {  7,  5,  1 },
+    {  7,  2,  5 },
+    {  7,  1,  5 },
+    {  7,  5,  3 },
+    {  7,  3,  5 },
+    {  7,  4,  4 },
+    {  7,  5,  4 },
+    {  7,  0,  4 },
+    {  7,  4,  5 },
+    {  7,  4,  0 },
+    {  7,  2,  6 },
+    {  7,  6,  2 },
+    {  7,  6,  1 },
+    {  7,  6,  1 },
+    {  7,  1,  6 },
+    {  7,  1,  6 },
+    {  8,  3,  6 },
+    {  8,  6,  3 },
+    {  8,  5,  5 },
+    {  8,  5,  0 },
+    {  8,  6,  4 },
+    {  8,  0,  5 },
+    {  8,  4,  6 },
+    {  8,  7,  1 },
+    {  8,  7,  2 },
+    {  8,  2,  7 },
+    {  8,  6,  5 },
+    {  8,  7,  3 },
+    {  8,  1,  7 },
+    {  8,  1,  7 },
+    {  8,  1,  7 },
+    {  8,  1,  7 },
+    {  8,  5,  6 },
+    {  8,  5,  6 },
+    {  8,  5,  6 },
+    {  8,  5,  6 },
+    {  8,  3,  7 },
+    {  8,  3,  7 },
+    {  8,  3,  7 },
+    {  8,  3,  7 },
+    {  9,  6,  6 },
+    {  9,  6,  6 },
+    {  9,  7,  4 },
+    {  9,  7,  4 },
+    {  9,  6,  0 },
+    {  9,  6,  0 },
+    {  9,  4,  7 },
+    {  9,  4,  7 },
+    {  9,  0,  6 },
+    {  9,  0,  6 },
+    {  9,  7,  5 },
+    {  9,  7,  5 },
+    {  9,  7,  6 },
+    {  9,  7,  6 },
+    {  9,  6,  7 },
+    {  9,  6,  7 },
+    { 10,  5,  7 },
+    { 10,  7,  0 },
+    { 10,  0,  7 },
+    { 10,  7,  7 }
+};
+
+//---------------------------------------------------------------------------
+// Spectrum Huffman Codebook 9
+static hcb_struct huffman_09[337]=
+{
+    { 0,  1,  2 },
+    { 1,  0,  0 },
+    { 0,  1,  2 },
+    { 0,  2,  3 },
+    { 0,  3,  4 },
+    { 1,  1,  0 },
+    { 1,  0,  1 },
+    { 0,  2,  3 },
+    { 0,  3,  4 },
+    { 1,  1,  1 },
+    { 0,  3,  4 },
+    { 0,  4,  5 },
+    { 0,  5,  6 },
+    { 0,  6,  7 },
+    { 0,  7,  8 },
+    { 0,  8,  9 },
+    { 0,  9, 10 },
+    { 0, 10, 11 },
+    { 0, 11, 12 },
+    { 1,  2,  1 },
+    { 1,  1,  2 },
+    { 1,  2,  0 },
+    { 1,  0,  2 },
+    { 0,  8,  9 },
+    { 0,  9, 10 },
+    { 0, 10, 11 },
+    { 0, 11, 12 },
+    { 0, 12, 13 },
+    { 0, 13, 14 },
+    { 0, 14, 15 },
+    { 0, 15, 16 },
+    { 1,  3,  1 },
+    { 1,  2,  2 },
+    { 1,  1,  3 },
+    { 0, 13, 14 },
+    { 0, 14, 15 },
+    { 0, 15, 16 },
+    { 0, 16, 17 },
+    { 0, 17, 18 },
+    { 0, 18, 19 },
+    { 0, 19, 20 },
+    { 0, 20, 21 },
+    { 0, 21, 22 },
+    { 0, 22, 23 },
+    { 0, 23, 24 },
+    { 0, 24, 25 },
+    { 0, 25, 26 },
+    { 1,  3,  0 },
+    { 1,  0,  3 },
+    { 1,  2,  3 },
+    { 1,  3,  2 },
+    { 1,  1,  4 },
+    { 1,  4,  1 },
+    { 1,  2,  4 },
+    { 1,  1,  5 },
+    { 0, 18, 19 },
+    { 0, 19, 20 },
+    { 0, 20, 21 },
+    { 0, 21, 22 },
+    { 0, 22, 23 },
+    { 0, 23, 24 },
+    { 0, 24, 25 },
+    { 0, 25, 26 },
+    { 0, 26, 27 },
+    { 0, 27, 28 },
+    { 0, 28, 29 },
+    { 0, 29, 30 },
+    { 0, 30, 31 },
+    { 0, 31, 32 },
+    { 0, 32, 33 },
+    { 0, 33, 34 },
+    { 0, 34, 35 },
+    { 0, 35, 36 },
+    { 1,  4,  2 },
+    { 1,  3,  3 },
+    { 1,  0,  4 },
+    { 1,  4,  0 },
+    { 1,  5,  1 },
+    { 1,  2,  5 },
+    { 1,  1,  6 },
+    { 1,  3,  4 },
+    { 1,  5,  2 },
+    { 1,  6,  1 },
+    { 1,  4,  3 },
+    { 0, 25, 26 },
+    { 0, 26, 27 },
+    { 0, 27, 28 },
+    { 0, 28, 29 },
+    { 0, 29, 30 },
+    { 0, 30, 31 },
+    { 0, 31, 32 },
+    { 0, 32, 33 },
+    { 0, 33, 34 },
+    { 0, 34, 35 },
+    { 0, 35, 36 },
+    { 0, 36, 37 },
+    { 0, 37, 38 },
+    { 0, 38, 39 },
+    { 0, 39, 40 },
+    { 0, 40, 41 },
+    { 0, 41, 42 },
+    { 0, 42, 43 },
+    { 0, 43, 44 },
+    { 0, 44, 45 },
+    { 0, 45, 46 },
+    { 0, 46, 47 },
+    { 0, 47, 48 },
+    { 0, 48, 49 },
+    { 0, 49, 50 },
+    { 1,  0,  5 },
+    { 1,  2,  6 },
+    { 1,  5,  0 },
+    { 1,  1,  7 },
+    { 1,  3,  5 },
+    { 1,  1,  8 },
+    { 1,  8,  1 },
+    { 1,  4,  4 },
+    { 1,  5,  3 },
+    { 1,  6,  2 },
+    { 1,  7,  1 },
+    { 1,  0,  6 },
+    { 1,  8,  2 },
+    { 1,  2,  8 },
+    { 1,  3,  6 },
+    { 1,  2,  7 },
+    { 1,  4,  5 },
+    { 1,  9,  1 },
+    { 1,  1,  9 },
+    { 1,  7,  2 },
+    { 0, 30, 31 },
+    { 0, 31, 32 },
+    { 0, 32, 33 },
+    { 0, 33, 34 },
+    { 0, 34, 35 },
+    { 0, 35, 36 },
+    { 0, 36, 37 },
+    { 0, 37, 38 },
+    { 0, 38, 39 },
+    { 0, 39, 40 },
+    { 0, 40, 41 },
+    { 0, 41, 42 },
+    { 0, 42, 43 },
+    { 0, 43, 44 },
+    { 0, 44, 45 },
+    { 0, 45, 46 },
+    { 0, 46, 47 },
+    { 0, 47, 48 },
+    { 0, 48, 49 },
+    { 0, 49, 50 },
+    { 0, 50, 51 },
+    { 0, 51, 52 },
+    { 0, 52, 53 },
+    { 0, 53, 54 },
+    { 0, 54, 55 },
+    { 0, 55, 56 },
+    { 0, 56, 57 },
+    { 0, 57, 58 },
+    { 0, 58, 59 },
+    { 0, 59, 60 },
+    { 1,  6,  0 },
+    { 1,  5,  4 },
+    { 1,  6,  3 },
+    { 1,  8,  3 },
+    { 1,  0,  7 },
+    { 1,  9,  2 },
+    { 1,  3,  8 },
+    { 1,  4,  6 },
+    { 1,  3,  7 },
+    { 1,  0,  8 },
+    { 1, 10,  1 },
+    { 1,  6,  4 },
+    { 1,  2,  9 },
+    { 1,  5,  5 },
+    { 1,  8,  0 },
+    { 1,  7,  0 },
+    { 1,  7,  3 },
+    { 1, 10,  2 },
+    { 1,  9,  3 },
+    { 1,  8,  4 },
+    { 1,  1, 10 },
+    { 1,  7,  4 },
+    { 1,  6,  5 },
+    { 1,  5,  6 },
+    { 1,  4,  8 },
+    { 1,  4,  7 },
+    { 1,  3,  9 },
+    { 1, 11,  1 },
+    { 1,  5,  8 },
+    { 1,  9,  0 },
+    { 1,  8,  5 },
+    { 0, 29, 30 },
+    { 0, 30, 31 },
+    { 0, 31, 32 },
+    { 0, 32, 33 },
+    { 0, 33, 34 },
+    { 0, 34, 35 },
+    { 0, 35, 36 },
+    { 0, 36, 37 },
+    { 0, 37, 38 },
+    { 0, 38, 39 },
+    { 0, 39, 40 },
+    { 0, 40, 41 },
+    { 0, 41, 42 },
+    { 0, 42, 43 },
+    { 0, 43, 44 },
+    { 0, 44, 45 },
+    { 0, 45, 46 },
+    { 0, 46, 47 },
+    { 0, 47, 48 },
+    { 0, 48, 49 },
+    { 0, 49, 50 },
+    { 0, 50, 51 },
+    { 0, 51, 52 },
+    { 0, 52, 53 },
+    { 0, 53, 54 },
+    { 0, 54, 55 },
+    { 0, 55, 56 },
+    { 0, 56, 57 },
+    { 0, 57, 58 },
+    { 1, 10,  3 },
+    { 1,  2, 10 },
+    { 1,  0,  9 },
+    { 1, 11,  2 },
+    { 1,  9,  4 },
+    { 1,  6,  6 },
+    { 1, 12,  1 },
+    { 1,  4,  9 },
+    { 1,  8,  6 },
+    { 1,  1, 11 },
+    { 1,  9,  5 },
+    { 1, 10,  4 },
+    { 1,  5,  7 },
+    { 1,  7,  5 },
+    { 1,  2, 11 },
+    { 1,  1, 12 },
+    { 1, 12,  2 },
+    { 1, 11,  3 },
+    { 1,  3, 10 },
+    { 1,  5,  9 },
+    { 1,  6,  7 },
+    { 1,  8,  7 },
+    { 1, 11,  4 },
+    { 1,  0, 10 },
+    { 1,  7,  6 },
+    { 1, 12,  3 },
+    { 1, 10,  0 },
+    { 1, 10,  5 },
+    { 1,  4, 10 },
+    { 1,  6,  8 },
+    { 1,  2, 12 },
+    { 1,  9,  6 },
+    { 1,  9,  7 },
+    { 1,  4, 11 },
+    { 1, 11,  0 },
+    { 1,  6,  9 },
+    { 1,  3, 11 },
+    { 1,  5, 10 },
+    { 0, 20, 21 },
+    { 0, 21, 22 },
+    { 0, 22, 23 },
+    { 0, 23, 24 },
+    { 0, 24, 25 },
+    { 0, 25, 26 },
+    { 0, 26, 27 },
+    { 0, 27, 28 },
+    { 0, 28, 29 },
+    { 0, 29, 30 },
+    { 0, 30, 31 },
+    { 0, 31, 32 },
+    { 0, 32, 33 },
+    { 0, 33, 34 },
+    { 0, 34, 35 },
+    { 0, 35, 36 },
+    { 0, 36, 37 },
+    { 0, 37, 38 },
+    { 0, 38, 39 },
+    { 0, 39, 40 },
+    { 1,  8,  8 },
+    { 1,  7,  8 },
+    { 1, 12,  5 },
+    { 1,  3, 12 },
+    { 1, 11,  5 },
+    { 1,  7,  7 },
+    { 1, 12,  4 },
+    { 1, 11,  6 },
+    { 1, 10,  6 },
+    { 1,  4, 12 },
+    { 1,  7,  9 },
+    { 1,  5, 11 },
+    { 1,  0, 11 },
+    { 1, 12,  6 },
+    { 1,  6, 10 },
+    { 1, 12,  0 },
+    { 1, 10,  7 },
+    { 1,  5, 12 },
+    { 1,  7, 10 },
+    { 1,  9,  8 },
+    { 1,  0, 12 },
+    { 1, 11,  7 },
+    { 1,  8,  9 },
+    { 1,  9,  9 },
+    { 1, 10,  8 },
+    { 1,  7, 11 },
+    { 1, 12,  7 },
+    { 1,  6, 11 },
+    { 1,  8, 11 },
+    { 1, 11,  8 },
+    { 1,  7, 12 },
+    { 1,  6, 12 },
+    { 0,  8,  9 },
+    { 0,  9, 10 },
+    { 0, 10, 11 },
+    { 0, 11, 12 },
+    { 0, 12, 13 },
+    { 0, 13, 14 },
+    { 0, 14, 15 },
+    { 0, 15, 16 },
+    { 1,  8, 10 },
+    { 1, 10,  9 },
+    { 1,  8, 12 },
+    { 1,  9, 10 },
+    { 1,  9, 11 },
+    { 1,  9, 12 },
+    { 1, 10, 11 },
+    { 1, 12,  9 },
+    { 1, 10, 10 },
+    { 1, 11,  9 },
+    { 1, 12,  8 },
+    { 1, 11, 10 },
+    { 1, 12, 10 },
+    { 1, 12, 11 },
+    { 0,  2,  3 },
+    { 0,  3,  4 },
+    { 1, 10, 12 },
+    { 1, 11, 11 },
+    { 1, 11, 12 },
+    { 1, 12, 12 }
+};
+
+//---------------------------------------------------------------------------
+// Spectrum Huffman Codebook 10
+static hcb_struct_1 huffman_10_1[64]=
+{
+    {   0, 0 },
+    {   0, 0 },
+    {   0, 0 },
+    {   0, 0 },
+    {   1, 0 },
+    {   1, 0 },
+    {   1, 0 },
+    {   1, 0 },
+    {   2, 0 },
+    {   2, 0 },
+    {   2, 0 },
+    {   2, 0 },
+    {   3, 0 },
+    {   3, 0 },
+    {   4, 0 },
+    {   4, 0 },
+    {   5, 0 },
+    {   5, 0 },
+    {   6, 0 },
+    {   6, 0 },
+    {   7, 0 },
+    {   7, 0 },
+    {   8, 0 },
+    {   8, 0 },
+    {   9, 0 },
+    {   9, 0 },
+    {  10, 0 },
+    {  10, 0 },
+    {  11, 0 },
+    {  12, 0 },
+    {  13, 0 },
+    {  14, 0 },
+    {  15, 0 },
+    {  16, 0 },
+    {  17, 0 },
+    {  18, 0 },
+    {  19, 0 },
+    {  20, 0 },
+    {  21, 0 },
+    {  22, 0 },
+    {  23, 0 },
+    {  24, 0 },
+    {  25, 1 },
+    {  27, 1 },
+    {  29, 1 },
+    {  31, 1 },
+    {  33, 1 },
+    {  35, 1 },
+    {  37, 1 },
+    {  39, 1 },
+    {  41, 2 },
+    {  45, 2 },
+    {  49, 2 },
+    {  53, 2 },
+    {  57, 2 },
+    {  61, 2 },
+    {  65, 3 },
+    {  73, 3 },
+    {  81, 3 },
+    {  89, 3 },
+    {  97, 4 },
+    { 113, 4 },
+    { 129, 4 },
+    { 145, 6 }
+};
+
+static hcb_struct huffman_10[210]=
+{
+    {  4,  1,  1 },
+    {  4,  1,  2 },
+    {  4,  2,  1 },
+    {  5,  2,  2 },
+    {  5,  1,  0 },
+    {  5,  0,  1 },
+    {  5,  1,  3 },
+    {  5,  3,  2 },
+    {  5,  3,  1 },
+    {  5,  2,  3 },
+    {  5,  3,  3 },
+    {  6,  2,  0 },
+    {  6,  0,  2 },
+    {  6,  2,  4 },
+    {  6,  4,  2 },
+    {  6,  1,  4 },
+    {  6,  4,  1 },
+    {  6,  0,  0 },
+    {  6,  4,  3 },
+    {  6,  3,  4 },
+    {  6,  3,  0 },
+    {  6,  0,  3 },
+    {  6,  4,  4 },
+    {  6,  2,  5 },
+    {  6,  5,  2 },
+    {  7,  1,  5 },
+    {  7,  5,  1 },
+    {  7,  5,  3 },
+    {  7,  3,  5 },
+    {  7,  5,  4 },
+    {  7,  4,  5 },
+    {  7,  6,  2 },
+    {  7,  2,  6 },
+    {  7,  6,  3 },
+    {  7,  4,  0 },
+    {  7,  6,  1 },
+    {  7,  0,  4 },
+    {  7,  1,  6 },
+    {  7,  3,  6 },
+    {  7,  5,  5 },
+    {  7,  6,  4 },
+    {  7,  4,  6 },
+    {  7,  4,  6 },
+    {  8,  6,  5 },
+    {  8,  7,  2 },
+    {  8,  3,  7 },
+    {  8,  2,  7 },
+    {  8,  5,  6 },
+    {  8,  8,  2 },
+    {  8,  7,  3 },
+    {  8,  5,  0 },
+    {  8,  7,  1 },
+    {  8,  0,  5 },
+    {  8,  8,  1 },
+    {  8,  1,  7 },
+    {  8,  8,  3 },
+    {  8,  7,  4 },
+    {  8,  4,  7 },
+    {  8,  2,  8 },
+    {  8,  6,  6 },
+    {  8,  7,  5 },
+    {  8,  1,  8 },
+    {  8,  3,  8 },
+    {  8,  8,  4 },
+    {  8,  4,  8 },
+    {  8,  5,  7 },
+    {  8,  5,  7 },
+    {  8,  8,  5 },
+    {  8,  8,  5 },
+    {  8,  5,  8 },
+    {  8,  5,  8 },
+    {  9,  7,  6 },
+    {  9,  6,  7 },
+    {  9,  9,  2 },
+    {  9,  6,  0 },
+    {  9,  6,  8 },
+    {  9,  9,  3 },
+    {  9,  3,  9 },
+    {  9,  9,  1 },
+    {  9,  2,  9 },
+    {  9,  0,  6 },
+    {  9,  8,  6 },
+    {  9,  9,  4 },
+    {  9,  4,  9 },
+    {  9, 10,  2 },
+    {  9,  1,  9 },
+    {  9,  7,  7 },
+    {  9,  8,  7 },
+    {  9,  9,  5 },
+    {  9,  7,  8 },
+    {  9, 10,  3 },
+    {  9,  5,  9 },
+    {  9, 10,  4 },
+    {  9,  2, 10 },
+    {  9, 10,  1 },
+    {  9,  3, 10 },
+    {  9,  9,  6 },
+    {  9,  6,  9 },
+    {  9,  6,  9 },
+    {  9,  8,  0 },
+    {  9,  8,  0 },
+    {  9,  4, 10 },
+    {  9,  4, 10 },
+    {  9,  7,  0 },
+    {  9,  7,  0 },
+    {  9, 11,  2 },
+    {  9, 11,  2 },
+    { 10,  7,  9 },
+    { 10, 11,  3 },
+    { 10, 10,  6 },
+    { 10,  1, 10 },
+    { 10, 11,  1 },
+    { 10,  9,  7 },
+    { 10,  0,  7 },
+    { 10,  8,  8 },
+    { 10, 10,  5 },
+    { 10,  3, 11 },
+    { 10,  5, 10 },
+    { 10,  8,  9 },
+    { 10, 11,  5 },
+    { 10,  0,  8 },
+    { 10, 11,  4 },
+    { 10,  2, 11 },
+    { 10,  7, 10 },
+    { 10,  6, 10 },
+    { 10, 10,  7 },
+    { 10,  4, 11 },
+    { 10,  1, 11 },
+    { 10, 12,  2 },
+    { 10,  9,  8 },
+    { 10, 12,  3 },
+    { 10, 11,  6 },
+    { 10,  5, 11 },
+    { 10, 12,  4 },
+    { 10, 11,  7 },
+    { 10, 12,  5 },
+    { 10,  3, 12 },
+    { 10,  6, 11 },
+    { 10,  9,  0 },
+    { 10, 10,  8 },
+    { 10, 10,  0 },
+    { 10, 12,  1 },
+    { 10,  0,  9 },
+    { 10,  4, 12 },
+    { 10,  9,  9 },
+    { 10, 12,  6 },
+    { 10, 12,  6 },
+    { 10, 12,  6 },
+    { 10, 12,  6 },
+    { 10,  2, 12 },
+    { 10,  2, 12 },
+    { 10,  2, 12 },
+    { 10,  2, 12 },
+    { 10,  8, 10 },
+    { 10,  8, 10 },
+    { 10,  8, 10 },
+    { 10,  8, 10 },
+    { 11,  9, 10 },
+    { 11,  9, 10 },
+    { 11,  1, 12 },
+    { 11,  1, 12 },
+    { 11, 11,  8 },
+    { 11, 11,  8 },
+    { 11, 12,  7 },
+    { 11, 12,  7 },
+    { 11,  7, 11 },
+    { 11,  7, 11 },
+    { 11,  5, 12 },
+    { 11,  5, 12 },
+    { 11,  6, 12 },
+    { 11,  6, 12 },
+    { 11, 10,  9 },
+    { 11, 10,  9 },
+    { 11,  8, 11 },
+    { 11,  8, 11 },
+    { 11, 12,  8 },
+    { 11, 12,  8 },
+    { 11,  0, 10 },
+    { 11,  0, 10 },
+    { 11,  7, 12 },
+    { 11,  7, 12 },
+    { 11, 11,  0 },
+    { 11, 11,  0 },
+    { 11, 10, 10 },
+    { 11, 10, 10 },
+    { 11, 11,  9 },
+    { 11, 11,  9 },
+    { 11, 11, 10 },
+    { 11, 11, 10 },
+    { 11,  0, 11 },
+    { 11,  0, 11 },
+    { 11, 11, 11 },
+    { 11, 11, 11 },
+    { 11,  9, 11 },
+    { 11,  9, 11 },
+    { 11, 10, 11 },
+    { 11, 10, 11 },
+    { 11, 12,  0 },
+    { 11, 12,  0 },
+    { 11,  8, 12 },
+    { 11,  8, 12 },
+    { 12, 12,  9 },
+    { 12, 10, 12 },
+    { 12,  9, 12 },
+    { 12, 11, 12 },
+    { 12, 12, 11 },
+    { 12,  0, 12 },
+    { 12, 12, 10 },
+    { 12, 12, 12 }
+};
+
+//---------------------------------------------------------------------------
+// Spectrum Huffman Codebook 11
+static hcb_struct_1 huffman_11_1[32]=
+{
+    {   0, 0 },
+    {   0, 0 },
+    {   1, 0 },
+    {   1, 0 },
+    {   2, 0 },
+    {   3, 0 },
+    {   4, 0 },
+    {   5, 0 },
+    {   6, 0 },
+    {   7, 0 },
+    {   8,  1 },
+    {  10, 1 },
+    {  12, 1 },
+    {  14, 2 },
+    {  18, 2 },
+    {  22, 2 },
+    {  26, 2 },
+    {  30, 3 },
+    {  38, 3 },
+    {  46, 3 },
+    {  54, 3 },
+    {  62, 3 },
+    {  70, 3 },
+    {  78, 3 },
+    {  86, 4 },
+    { 102, 4 },
+    { 118, 4 },
+    { 134, 4 },
+    { 150, 5 },
+    { 182, 5 },
+    { 214, 5 },
+    { 246, 7 }
+};
+
+static hcb_struct huffman_11[374]=
+{
+    { 4,  0,  0 },
+    { 4,  1,  1 },
+    { 5, 16, 16 },
+    { 5,  1,  0 },
+    { 5,  0,  1 },
+    { 5,  2,  1 },
+    { 5,  1,  2 },
+    { 5,  2,  2 },
+    { 6,  1,  3 },
+    { 6,  3,  1 },
+    { 6,  3,  2 },
+    { 6,  2,  0 },
+    { 6,  2,  3 },
+    { 6,  0,  2 },
+    { 6,  3,  3 },
+    { 6,  3,  3 },
+    { 7,  4,  1 },
+    { 7,  1,  4 },
+    { 7,  4,  2 },
+    { 7,  2,  4 },
+    { 7,  4,  3 },
+    { 7,  3,  4 },
+    { 7,  3,  0 },
+    { 7,  0,  3 },
+    { 7,  5,  1 },
+    { 7,  5,  2 },
+    { 7,  2,  5 },
+    { 7,  4,  4 },
+    { 7,  1,  5 },
+    { 7,  5,  3 },
+    { 7,  3,  5 },
+    { 7,  3,  5 },
+    { 7,  5,  4 },
+    { 7,  5,  4 },
+    { 8,  4,  5 },
+    { 8,  6,  2 },
+    { 8,  2,  6 },
+    { 8,  6,  1 },
+    { 8,  6,  3 },
+    { 8,  3,  6 },
+    { 8,  1,  6 },
+    { 8,  4, 16 },
+    { 8,  3, 16 },
+    { 8, 16,  5 },
+    { 8, 16,  3 },
+    { 8, 16,  4 },
+    { 8,  6,  4 },
+    { 8, 16,  6 },
+    { 8,  4,  0 },
+    { 8,  4,  6 },
+    { 8,  0,  4 },
+    { 8,  2, 16 },
+    { 8,  5,  5 },
+    { 8,  5, 16 },
+    { 8, 16,  7 },
+    { 8, 16,  2 },
+    { 8, 16,  8 },
+    { 8,  2,  7 },
+    { 8,  7,  2 },
+    { 8,  3,  7 },
+    { 8,  6,  5 },
+    { 8,  5,  6 },
+    { 8,  6, 16 },
+    { 8, 16, 10 },
+    { 8,  7,  3 },
+    { 8,  7,  1 },
+    { 8, 16,  9 },
+    { 8,  7, 16 },
+    { 8,  1, 16 },
+    { 8,  1,  7 },
+    { 8,  4,  7 },
+    { 8, 16, 11 },
+    { 8,  7,  4 },
+    { 8, 16, 12 },
+    { 8,  8, 16 },
+    { 8, 16,  1 },
+    { 8,  6,  6 },
+    { 8,  9, 16 },
+    { 8,  2,  8 },
+    { 8,  5,  7 },
+    { 8, 10, 16 },
+    { 8, 16, 13 },
+    { 8,  8,  3 },
+    { 8,  8,  2 },
+    { 8,  3,  8 },
+    { 8,  5,  0 },
+    { 8, 16, 14 },
+    { 8, 16, 14 },
+    { 8, 11, 16 },
+    { 8, 11, 16 },
+    { 8,  7,  5 },
+    { 8,  7,  5 },
+    { 8,  4,  8 },
+    { 8,  4,  8 },
+    { 8,  6,  7 },
+    { 8,  6,  7 },
+    { 8,  7,  6 },
+    { 8,  7,  6 },
+    { 8,  0,  5 },
+    { 8,  0,  5 },
+    { 9,  8,  4 },
+    { 9, 16, 15 },
+    { 9, 12, 16 },
+    { 9,  1,  8 },
+    { 9,  8,  1 },
+    { 9, 14, 16 },
+    { 9,  5,  8 },
+    { 9, 13, 16 },
+    { 9,  3,  9 },
+    { 9,  8,  5 },
+    { 9,  7,  7 },
+    { 9,  2,  9 },
+    { 9,  8,  6 },
+    { 9,  9,  2 },
+    { 9,  9,  3 },
+    { 9, 15, 16 },
+    { 9,  4,  9 },
+    { 9,  6,  8 },
+    { 9,  6,  0 },
+    { 9,  9,  4 },
+    { 9,  5,  9 },
+    { 9,  8,  7 },
+    { 9,  7,  8 },
+    { 9,  1,  9 },
+    { 9, 10,  3 },
+    { 9,  0,  6 },
+    { 9, 10,  2 },
+    { 9,  9,  1 },
+    { 9,  9,  5 },
+    { 9,  4, 10 },
+    { 9,  2, 10 },
+    { 9,  9,  6 },
+    { 9,  3, 10 },
+    { 9,  6,  9 },
+    { 9, 10,  4 },
+    { 9,  8,  8 },
+    { 9, 10,  5 },
+    { 9,  9,  7 },
+    { 9, 11,  3 },
+    { 9,  1, 10 },
+    { 9,  7,  0 },
+    { 9, 10,  6 },
+    { 9,  7,  9 },
+    { 9,  3, 11 },
+    { 9,  5, 10 },
+    { 9, 10,  1 },
+    { 9,  4, 11 },
+    { 9, 11,  2 },
+    { 9, 13,  2 },
+    { 9,  6, 10 },
+    { 9, 13,  3 },
+    { 9, 13,  3 },
+    { 9,  2, 11 },
+    { 9,  2, 11 },
+    { 9, 16,  0 },
+    { 9, 16,  0 },
+    { 9,  5, 11 },
+    { 9,  5, 11 },
+    { 9, 11,  5 },
+    { 9, 11,  5 },
+    { 10, 11,  4 },
+    { 10,  9,  8 },
+    { 10,  7, 10 },
+    { 10,  8,  9 },
+    { 10,  0, 16 },
+    { 10,  4, 13 },
+    { 10,  0,  7 },
+    { 10,  3, 13 },
+    { 10, 11,  6 },
+    { 10, 13,  1 },
+    { 10, 13,  4 },
+    { 10, 12,  3 },
+    { 10,  2, 13 },
+    { 10, 13,  5 },
+    { 10,  8, 10 },
+    { 10,  6, 11 },
+    { 10, 10,  8 },
+    { 10, 10,  7 },
+    { 10, 14,  2 },
+    { 10, 12,  4 },
+    { 10,  1, 11 },
+    { 10,  4, 12 },
+    { 10, 11,  1 },
+    { 10,  3, 12 },
+    { 10,  1, 13 },
+    { 10, 12,  2 },
+    { 10,  7, 11 },
+    { 10,  3, 14 },
+    { 10,  5, 12 },
+    { 10,  5, 13 },
+    { 10, 14,  4 },
+    { 10,  4, 14 },
+    { 10, 11,  7 },
+    { 10, 14,  3 },
+    { 10, 12,  5 },
+    { 10, 13,  6 },
+    { 10, 12,  6 },
+    { 10,  8,  0 },
+    { 10, 11,  8 },
+    { 10,  2, 12 },
+    { 10,  9,  9 },
+    { 10, 14,  5 },
+    { 10,  6, 13 },
+    { 10, 10, 10 },
+    { 10, 15,  2 },
+    { 10,  8, 11 },
+    { 10,  9, 10 },
+    { 10, 14,  6 },
+    { 10, 10,  9 },
+    { 10,  5, 14 },
+    { 10, 11,  9 },
+    { 10, 14,  1 },
+    { 10,  2, 14 },
+    { 10,  6, 12 },
+    { 10,  1, 12 },
+    { 10, 13,  8 },
+    { 10,  0,  8 },
+    { 10, 13,  7 },
+    { 10,  7, 12 },
+    { 10, 12,  7 },
+    { 10,  7, 13 },
+    { 10, 15,  3 },
+    { 10, 12,  1 },
+    { 10,  6, 14 },
+    { 10,  2, 15 },
+    { 10, 15,  5 },
+    { 10, 15,  4 },
+    { 10,  1, 14 },
+    { 10,  9, 11 },
+    { 10,  4, 15 },
+    { 10, 14,  7 },
+    { 10,  8, 13 },
+    { 10, 13,  9 },
+    { 10,  8, 12 },
+    { 10,  5, 15 },
+    { 10,  3, 15 },
+    { 10, 10, 11 },
+    { 10, 11, 10 },
+    { 10, 12,  8 },
+    { 10, 15,  6 },
+    { 10, 15,  7 },
+    { 10,  8, 14 },
+    { 10, 15,  1 },
+    { 10,  7, 14 },
+    { 10,  9,  0 },
+    { 10,  0,  9 },
+    { 10,  9, 13 },
+    { 10,  9, 13 },
+    { 10,  9, 13 },
+    { 10,  9, 13 },
+    { 10,  9, 12 },
+    { 10,  9, 12 },
+    { 10,  9, 12 },
+    { 10,  9, 12 },
+    { 10, 12,  9 },
+    { 10, 12,  9 },
+    { 10, 12,  9 },
+    { 10, 12,  9 },
+    { 10, 14,  8 },
+    { 10, 14,  8 },
+    { 10, 14,  8 },
+    { 10, 14,  8 },
+    { 10, 10, 13 },
+    { 10, 10, 13 },
+    { 10, 10, 13 },
+    { 10, 10, 13 },
+    { 10, 14,  9 },
+    { 10, 14,  9 },
+    { 10, 14,  9 },
+    { 10, 14,  9 },
+    { 10, 12, 10 },
+    { 10, 12, 10 },
+    { 10, 12, 10 },
+    { 10, 12, 10 },
+    { 10,  6, 15 },
+    { 10,  6, 15 },
+    { 10,  6, 15 },
+    { 10,  6, 15 },
+    { 10,  7, 15 },
+    { 10,  7, 15 },
+    { 10,  7, 15 },
+    { 10,  7, 15 },
+    { 11,  9, 14 },
+    { 11,  9, 14 },
+    { 11, 15,  8 },
+    { 11, 15,  8 },
+    { 11, 11, 11 },
+    { 11, 11, 11 },
+    { 11, 11, 14 },
+    { 11, 11, 14 },
+    { 11,  1, 15 },
+    { 11,  1, 15 },
+    { 11, 10, 12 },
+    { 11, 10, 12 },
+    { 11, 10, 14 },
+    { 11, 10, 14 },
+    { 11, 13, 11 },
+    { 11, 13, 11 },
+    { 11, 13, 10 },
+    { 11, 13, 10 },
+    { 11, 11, 13 },
+    { 11, 11, 13 },
+    { 11, 11, 12 },
+    { 11, 11, 12 },
+    { 11,  8, 15 },
+    { 11,  8, 15 },
+    { 11, 14, 11 },
+    { 11, 14, 11 },
+    { 11, 13, 12 },
+    { 11, 13, 12 },
+    { 11, 12, 13 },
+    { 11, 12, 13 },
+    { 11, 15,  9 },
+    { 11, 15,  9 },
+    { 11, 14, 10 },
+    { 11, 14, 10 },
+    { 11, 10,  0 },
+    { 11, 10,  0 },
+    { 11, 12, 11 },
+    { 11, 12, 11 },
+    { 11,  9, 15 },
+    { 11,  9, 15 },
+    { 11,  0, 10 },
+    { 11,  0, 10 },
+    { 11, 12, 12 },
+    { 11, 12, 12 },
+    { 11, 11,  0 },
+    { 11, 11,  0 },
+    { 11, 12, 14 },
+    { 11, 12, 14 },
+    { 11, 10, 15 },
+    { 11, 10, 15 },
+    { 11, 13, 13 },
+    { 11, 13, 13 },
+    { 11,  0, 13 },
+    { 11,  0, 13 },
+    { 11, 14, 12 },
+    { 11, 14, 12 },
+    { 11, 15, 10 },
+    { 11, 15, 10 },
+    { 11, 15, 11 },
+    { 11, 15, 11 },
+    { 11, 11, 15 },
+    { 11, 11, 15 },
+    { 11, 14, 13 },
+    { 11, 14, 13 },
+    { 11, 13,  0 },
+    { 11, 13,  0 },
+    { 11,  0, 11 },
+    { 11,  0, 11 },
+    { 11, 13, 14 },
+    { 11, 13, 14 },
+    { 11, 15, 12 },
+    { 11, 15, 12 },
+    { 11, 15, 13 },
+    { 11, 15, 13 },
+    { 11, 12, 15 },
+    { 11, 12, 15 },
+    { 11, 14,  0 },
+    { 11, 14,  0 },
+    { 11, 14, 14 },
+    { 11, 14, 14 },
+    { 11, 13, 15 },
+    { 11, 13, 15 },
+    { 11, 12,  0 },
+    { 11, 12,  0 },
+    { 11, 14, 15 },
+    { 11, 14, 15 },
+    { 12,  0, 14 },
+    { 12,  0, 12 },
+    { 12, 15, 14 },
+    { 12, 15,  0 },
+    { 12,  0, 15 },
+    { 12, 15, 15 },
+};
+
+//---------------------------------------------------------------------------
+const int8u hcb_2step_Bytes[]=
+{
+    0,            5,            5, 0,            5, 0,            5, 0,           5, 0,             6,            5
+};
+
+const hcb_struct_1* hcb_2step[]=
+{
+    0, huffman_01_1, huffman_02_1, 0, huffman_04_1, 0, huffman_06_1, 0, huffman_08_1, 0, huffman_10_1, huffman_11_1
+};
+
+//---------------------------------------------------------------------------
+const int16u hcb_table_size[]=
+{
+    0,        114,         86,        161,        185,       161,         126,        127,        83,         337,        210,        374
+};
+const hcb_struct* hcb_table[]=
+{
+    0, huffman_01, huffman_02, huffman_03, huffman_04, huffman_05, huffman_06, huffman_07, huffman_08, huffman_09, huffman_10, huffman_11
+};
+
+//***************************************************************************
+// PRED_SFB_MAX
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+const int8u Aac_PRED_SFB_MAX[16]=
+{
+    33, 33, 38, 40, 40, 40, 41, 41, 37, 37, 37, 34, 64, 64, 64, 64
+};
+
+//***************************************************************************
+// swb offsets
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+struct Aac_swb_offset
+{
+    int8u  num_swb;
+    int16u swb_offset[64];
+};
+
+//---------------------------------------------------------------------------
+const Aac_swb_offset Aac_swb_short_window_96[] =
+{
+    {
+        12,
+        {
+               0,    4,    8,   12,   16,   20,   24,   32,   40,   48,
+              64,   92,  128
+        }
+    }
+};
+
+const Aac_swb_offset Aac_swb_short_window_64[] =
+{
+    {
+        12,
+        {
+                0,    4,    8,   12,   16,   20,   24,   32,   40,   48,
+                64,   92,  128
+        }
+    }
+};
+
+const Aac_swb_offset Aac_swb_short_window_48[] =
+{
+    {
+        14,
+        {
+               0,    4,    8,   12,   16,   20,   28,   36,   44,   56,
+              68,   80,   96,  112,  128
+        }
+    }
+};
+
+const Aac_swb_offset Aac_swb_short_window_24[] =
+{
+    {
+        15,
+        {
+               0,    4,    8,   12,   16,   20,   24,   28,   36,   44,
+              52,   64,   76,   92,  108,  128
+        }
+    }
+};
+
+const Aac_swb_offset Aac_swb_short_window_16[] =
+{
+    {
+        15,
+        {
+               0,    4,    8,   12,   16,   20,   24,   28,   32,   40,
+              48,   60,   72,   88,  108,  128
+        }
+    }
+};
+
+const Aac_swb_offset Aac_swb_short_window_8[] =
+{
+    {
+        15,
+        {
+               0,    4,    8,   12,   16,   20,   24,   28,   36,   44,
+              52,   60,   72,   88,  108,  128
+        }
+    }
+};
+
+const  Aac_swb_offset* Aac_swb_offset_short_window[] =
+{
+    Aac_swb_short_window_96,       //96000
+    Aac_swb_short_window_96,       //88200
+    Aac_swb_short_window_64,       //64000
+    Aac_swb_short_window_48,       //48000
+    Aac_swb_short_window_48,       //44100
+    Aac_swb_short_window_48,       //32000
+    Aac_swb_short_window_24,       //24000
+    Aac_swb_short_window_24,       //22050
+    Aac_swb_short_window_16,       //16000
+    Aac_swb_short_window_16,       //12000
+    Aac_swb_short_window_16,       //11025
+    Aac_swb_short_window_8         //8000
+};
+
+//---------------------------------------------------------------------------
+const Aac_swb_offset Aac_swb_long_window_96[]=
+{
+    {
+        41,
+        {
+               0,    4,    8,   12,   16,   20,   24,   28,   32,   36,
+              40,   44,   48,   52,   56,   64,   72,   80,   88,   96,
+             108,  120,  132,  144,  156,  172,  188,  212,  240,  276,
+             320,  384,  448,  512,  576,  640,  704,  768,  832,  896,
+             960,  1024
+        }
+    }
+};
+
+const Aac_swb_offset Aac_swb_long_window_64[]=
+{
+    {
+        47,
+        {
+               0,    4,    8,   12,   16,   20,   24,   28,   32,   36,
+              40,   44,   48,   52,   56,   64,   72,   80,   88,  100,
+             112,  124,  140,  156,  172,  192,  216,  240,  268,  304,
+             344,  384,  424,  464,  504,  544,  584,  624,  664,  704,
+             744,  784,  824,  864,  904,  944,  984, 1024
+        }
+    }
+};
+//---------------------------------------------------------------------------
+const Aac_swb_offset Aac_swb_long_window_48[]=
+{
+    {
+        49,
+        {
+               0,    4,    8,   12,   16,   20,   24,   28,   32,   36,
+              40,   48,   56,   64,   72,   80,   88,   96,  108,  120,
+             132,  144,  160,  176,  196,  216,  240,  264,  292,  320,
+             352,  384,  416,  448,  480,  512,  544,  576,  608,  640,
+             672,  704,  736,  768,  800,  832,  864,  896,  928, 1024
+        }
+    }
+};
+//---------------------------------------------------------------------------
+const Aac_swb_offset Aac_swb_long_window_32[]=
+{
+    {
+        51,
+        {
+               0,    4,    8,   12,   16,   20,   24,   28,   32,   36,
+              40,   48,   56,   64,   72,   80,   88,   96,  108,  120,
+             132,  144,  160,  176,  196,  216,  240,  264,  292,  320,
+             352,  384,  416,  448,  480,  512,  544,  576,  608,  640,
+             672,  704,  736,  768,  800,  832,  864,  896,  928,  960,
+             992, 1024
+        }
+    }
+};
+//---------------------------------------------------------------------------
+const Aac_swb_offset Aac_swb_long_window_24[]=
+{
+    {
+        47,
+        {
+               0,    4,    8,   12,   16,   20,   24,   28,   32,   36,
+              40,   44,   52,   60,   68,   76,   84,   92,  100,  108,
+             116,  124,  136,  148,  160,  172,  188,  204,  220,  240,
+             260,  284,  308,  336,  364,  396,  432,  468,  508,  552,
+             600,  652,  704,  768,  832,  896,  960, 1024
+        }
+    }
+};
+//---------------------------------------------------------------------------
+const Aac_swb_offset Aac_swb_long_window_16[]=
+{
+    {
+        43,
+        {
+               0,    8,   16,   24,   32,   40,   48,   56,   64,   72,
+              80,   88,  100,  112,  124,  136,  148,  160,  172,  184,
+             196,  212,  228,  244,  260,  280,  300,  320,  344,  368,
+             396,  424,  456,  492,  532,  572,  616,  664,  716,  772,
+             832,  896,  960, 1024
+        }
+    }
+};
+//---------------------------------------------------------------------------
+const Aac_swb_offset Aac_swb_long_window_8[]=
+{
+    {
+        40,
+        {
+               0,   12,   24,   36,   48,   60,   72,   84,   96,  108,
+             120,  132,  144,  156,  172,  188,  204,  220,  236,  252,
+             268,  288,  308,  328,  348,  372,  396,  420,  448,  476,
+             508,  544,  580,  620,  664,  712,  764,  820,  880,  944,
+            1024
+        }
+    }
+};
+
+//---------------------------------------------------------------------------
+const Aac_swb_offset* Aac_swb_offset_long_window[]=
+{
+    Aac_swb_long_window_96,        //96000
+    Aac_swb_long_window_96,        //88200
+    Aac_swb_long_window_64,        //64000
+    Aac_swb_long_window_48,        //48000
+    Aac_swb_long_window_48,        //44100
+    Aac_swb_long_window_32,        //32000
+    Aac_swb_long_window_24,        //24000
+    Aac_swb_long_window_24,        //22050
+    Aac_swb_long_window_16,        //16000
+    Aac_swb_long_window_16,        //12000
+    Aac_swb_long_window_16,        //11025
+    Aac_swb_long_window_8          //8000
+};
+
+} //NameSpace
+
+#endif

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Aac_GeneralAudio_Sbr.cpp Added

@@ -0,0 +1,752 @@
+// File_Aac - Info for AAC files
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_AAC_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Audio/File_Aac.h"
+#include "MediaInfo/Audio/File_Aac_GeneralAudio_Sbr.h"
+#include <cmath>
+#include <algorithm>
+#include <cstring>
+using namespace std;
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//---------------------------------------------------------------------------
+extern const char* Aac_audioObjectType(int8u audioObjectType);
+
+//---------------------------------------------------------------------------
+int8u Aac_AudioSpecificConfig_sampling_frequency_index(const int32u sampling_frequency);
+
+//---------------------------------------------------------------------------
+// Master frequency band table
+// k0 = lower frequency boundary
+int8u Aac_k0_Compute(int8u bs_start_freq, int8u extension_sampling_frequency_index)
+{
+    return Aac_k0_startMin[extension_sampling_frequency_index]+Aac_k0_offset[extension_sampling_frequency_index][bs_start_freq];
+}
+
+//---------------------------------------------------------------------------
+// Master frequency band table
+// k2 = upper frequency boundary
+int8u Aac_k2_Compute(int8u bs_stop_freq, int8u extension_sampling_frequency_index, int8u  k0)
+{
+    switch (bs_stop_freq)
+    {
+        case 14 : return (int8u)min(64, 2*k0);
+        case 15 : return (int8u)min(64, 3*k0);
+        default : ;
+    }
+
+    return (int8u)min(64, Aac_k2_stopMin[extension_sampling_frequency_index]+Aac_k2_offset[extension_sampling_frequency_index][bs_stop_freq]);
+}
+
+//---------------------------------------------------------------------------
+//Helper
+int8u Aac_bands_Compute(bool warp, int8u bands, int8u a0, int8u a1)
+{
+    float div=(float)log(2.0);
+    if (warp)
+        div*=(float)1.3;
+
+    return (int8u)(bands*log((float)a1/(float)a0)/div+0.5);
+}
+
+//---------------------------------------------------------------------------
+// Master frequency band table
+// Computing for bs_freq_scale = 0
+bool Aac_f_master_Compute_0(int8u &num_env_bands_Master, int8u* f_Master, sbr_handler *sbr, int8u  k0, int8u  k2)
+{
+    int8u dk, numBands;
+    if (sbr->bs_alter_scale)
+    {
+        dk=1;
+        numBands=(((k2-k0+2)>>2)<<1);
+    }
+    else
+    {
+        dk=2;
+        numBands=(((k2-k0)>>1)<<1);
+    }
+
+    int8u k2Achieved=k0+numBands*dk;
+    int8s k2Diff=k2-k2Achieved;
+    int8s vDk[64];
+    for (int8u k=0; k<numBands; k++)
+        vDk[k]=dk;
+
+    if (k2Diff)
+    {
+        int8s  incr;
+        int8u  k;
+        if (k2Diff>0)
+        {
+            incr=-1;
+            k=numBands-1;
+        }
+        else
+        {
+            incr=1;
+            k=0;
+        }
+
+        while (k2Diff)
+        {
+            vDk[k]-=incr;
+            k+=incr;
+            k2Diff+=incr;
+        }
+    }
+
+    f_Master[0]=k0;
+    for (int8u k=1; k<=numBands; k++)
+        f_Master[k]=f_Master[k-1]+vDk[k-1];
+
+    num_env_bands_Master=numBands;
+
+    return true;
+}
+
+//---------------------------------------------------------------------------
+// Master frequency band table
+// Computing for bs_freq_scale != 0
+int int8u_cmp(const void *a, const void *b)
+{
+    return ((int8u)(*(int8u*)a - *(int8u*)b));
+}
+bool Aac_f_master_Compute(int8u &num_env_bands_Master, int8u* f_Master, sbr_handler *sbr, int8u  k0, int8u  k2)
+{
+    int8u temp1[]={6, 5, 4 };
+    int8u bands=temp1[sbr->bs_freq_scale-1];
+
+    int8u twoRegions, k1;
+    if ((float)k2/(float)k0>2.2449)
+    {
+        twoRegions=1;
+        k1=2*k0;
+    }
+    else
+    {
+        twoRegions=0;
+        k1=k2;
+    }
+
+    int8u numBands0=2*Aac_bands_Compute(false, bands, k0, k1);
+    if (numBands0>=64)
+        return false;
+
+    int8u vDk0[64];
+    int8u vk0[64];
+    float Power=pow((float)k1/(float)k0, (float)1/(float)numBands0);
+    float Power2=(float)k0;
+    int8s Temp1=(int8s)(Power2+0.5);
+    for (int8u k=0; k<=numBands0-1; k++)
+    {
+        int8s Temp0=Temp1;
+        Power2*=Power;
+        Temp1=(int8s)(Power2+0.5);
+        vDk0[k]=Temp1-Temp0;
+    }
+    qsort(vDk0, numBands0, sizeof(int8u), int8u_cmp);
+    vk0[0]=k0;
+    for (int8u k=1; k<=numBands0; k++)
+    {
+        if (vDk0[k-1]==0)
+            return false;
+        vk0[k]=vk0[k-1]+vDk0[k-1];
+    }
+
+    if (!twoRegions)
+    {
+        for (int8u k=0; k<=numBands0; k++)
+            f_Master[k]=vk0[k];
+        num_env_bands_Master=numBands0;
+        return true;
+    }
+
+    //With twoRegions
+    int8u numBands1;
+    int8u vDk1[64];
+    int8u vk1[64];
+    numBands1=2*Aac_bands_Compute(true, bands, k1, k2);
+    if (numBands0+numBands1>=64)
+        return false;
+
+    Power=(float)pow((float)k2/(float)k1, (float)1/(float)numBands1);
+    Power2=(float)k1;
+    Temp1=(int8s)(Power2+0.5);
+    for (int8u k=0; k<=numBands1-1; k++)
+    {
+        int8s Temp0=Temp1;
+        Power2*=Power;
+        Temp1=(int8s)(Power2+0.5);
+        vDk1[k]=Temp1-Temp0;
+    }
+
+    if (vDk1[0]<vDk0[numBands0-1])
+    {
+        qsort(vDk1, numBands1+1, sizeof(int8u), int8u_cmp);
+        int8u change=vDk0[numBands0-1]-vDk1[0];
+        vDk1[0]=vDk0[numBands0-1];
+        vDk1[numBands1-1]=vDk1[numBands1-1]-change;
+    }
+
+    qsort(vDk1, numBands1, sizeof(int8u), int8u_cmp);
+    vk1[0]=k1;
+    for (int8u k=1; k<=numBands1; k++)
+    {
+        if (vDk1[k-1]==0)
+            return false;
+        vk1[k]=vk1[k-1]+vDk1[k-1];
+    }
+
+    num_env_bands_Master=numBands0+numBands1;
+    for (int8u k=0; k<=numBands0; k++)
+        f_Master[k]=vk0[k];
+    for (int8u k=numBands0+1; k <=num_env_bands_Master; k++)
+        f_Master[k]=vk1[k-numBands0];
+
+    return true;
+}
+
+//---------------------------------------------------------------------------
+// Derived frequency border tables
+bool Aac_bands_Compute(int8u &num_env_bands_Master, int8u* f_Master, sbr_handler *sbr, int8u  k2)
+{
+    sbr->num_env_bands[1]=num_env_bands_Master-sbr->bs_xover_band;
+    sbr->num_env_bands[0]=(sbr->num_env_bands[1]>>1)+(sbr->num_env_bands[1]-((sbr->num_env_bands[1]>>1)<<1));
+
+    if (f_Master[sbr->bs_xover_band]>32)
+        return false;
+
+    if (sbr->bs_noise_bands==0)
+        sbr->num_noise_bands=1;
+    else
+    {
+        sbr->num_noise_bands=Aac_bands_Compute(false, sbr->bs_noise_bands, f_Master[sbr->bs_xover_band], k2);
+        if (sbr->num_noise_bands<1 || sbr->num_noise_bands>5)
+            return false;
+    }
+
+    return true;
+}
+
+//---------------------------------------------------------------------------
+bool Aac_Sbr_Compute(sbr_handler *sbr, int8u extension_sampling_frequency_index)
+{
+    if (extension_sampling_frequency_index>=9)
+        return 0; //Not supported
+    int8u k0=Aac_k0_Compute(sbr->bs_start_freq, extension_sampling_frequency_index);
+    int8u k2=Aac_k2_Compute(sbr->bs_stop_freq, extension_sampling_frequency_index, k0);
+    if (k2<=k0) return false;
+    switch (extension_sampling_frequency_index)
+    {
+        case  0 :
+        case  1 :
+        case  2 :
+        case  3 : if ((k2-k0)>32) return false; break;
+        case  4 : if ((k2-k0)>35) return false; break;
+        case  5 :
+        case  6 :
+        case  7 :
+        case  8 : if ((k2-k0)>48) return false; break;
+        default : ;
+    }
+
+    int8u  num_env_bands_Master;
+    int8u  f_Master[64];
+    if (sbr->bs_freq_scale==0)
+    {
+        if (!Aac_f_master_Compute_0(num_env_bands_Master, f_Master, sbr, k0, k2))
+            return false;
+    }
+    else
+    {
+        if (!Aac_f_master_Compute(num_env_bands_Master, f_Master, sbr, k0, k2))
+            return false;
+    }
+    if (num_env_bands_Master<=sbr->bs_xover_band)
+        return false;
+    if (!Aac_bands_Compute(num_env_bands_Master, f_Master, sbr, k2))
+        return false;
+
+    return true;
+}
+
+//---------------------------------------------------------------------------
+int16u File_Aac::sbr_huff_dec(sbr_huffman Table, const char* Name)
+{
+    int8u bit;
+    int16s index = 0;
+
+    Element_Begin1(Name);
+    while (index>=0)
+    {
+        Get_S1(1, bit,                                          "bit");
+        index=Table[index][bit];
+    }
+    Element_End0();
+
+    return index+64;
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::sbr_extension_data(size_t End, int8u id_aac, bool crc_flag)
+{
+    FILLING_BEGIN();
+        if (Infos["Format_Settings_SBR"].empty())
+        {
+            Infos["Format_Profile"]=__T("HE-AAC");
+            Ztring SamplingRate=Infos["SamplingRate"];
+            if (SamplingRate.empty())
+                SamplingRate.From_Number(sampling_frequency);
+            Infos["SamplingRate"].From_Number((extension_sampling_frequency_index==(int8u)-1)?(sampling_frequency*2):extension_sampling_frequency, 10);
+            if (MediaInfoLib::Config.LegacyStreamDisplay_Get())
+            {
+                Infos["Format_Profile"]+=__T(" / LC");
+                Infos["SamplingRate"]+=__T(" / ")+SamplingRate;
+            }
+            Infos["Format_Settings_SBR"]=__T("Yes (Implicit)");
+            Infos["Codec"]=Ztring().From_Local(Aac_audioObjectType(audioObjectType))+__T("-SBR");
+        }
+    FILLING_END();
+
+    Element_Begin1("sbr_extension_data");
+    bool bs_header_flag;
+    if (crc_flag)
+        Skip_S2(10,                                             "bs_sbr_crc_bits");
+    //~ if (sbr_layer != SBR_STEREO_ENHANCE)
+    //~ {
+        Get_SB(bs_header_flag,                                  "bs_header_flag");
+        if (bs_header_flag)
+        {
+            if (extension_sampling_frequency_index==(int8u)-1)
+            {
+                extension_sampling_frequency=sampling_frequency*2;
+                extension_sampling_frequency_index=Aac_AudioSpecificConfig_sampling_frequency_index(extension_sampling_frequency);
+            }
+
+            delete sbr;
+            sbr=new sbr_handler;
+
+            sbr_header();
+
+            if (!Aac_Sbr_Compute(sbr, extension_sampling_frequency_index))
+            {
+                delete sbr; sbr=NULL;
+            }
+        }
+    //~ }
+
+    //Parsing
+    if (sbr) //only if a header is found
+    {
+        sbr->bs_amp_res[0]=sbr->bs_amp_res_FromHeader; //Set up with header data
+        sbr->bs_amp_res[1]=sbr->bs_amp_res_FromHeader; //Set up with header data
+        sbr_data(id_aac);
+    }
+    if (Data_BS_Remain()>End)
+        Skip_BS(Data_BS_Remain()-End,                           "bs_fill_bits");
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::sbr_header()
+{
+    Element_Begin1("sbr_header");
+    Get_S1 (1, sbr->bs_amp_res_FromHeader,                      "bs_amp_res");
+    Get_S1 (4, sbr->bs_start_freq,                              "bs_start_freq");
+    Get_S1 (4, sbr->bs_stop_freq,                               "bs_stop_freq");
+    Get_S1 (3, sbr->bs_xover_band,                              "bs_xover_band");
+    Skip_S1(2,                                                  "bs_reserved");
+    bool bs_header_extra_1, bs_header_extra_2;
+    Get_SB (bs_header_extra_1,                                  "bs_header_extra_1");
+    Get_SB (bs_header_extra_2,                                  "bs_header_extra_2");
+    if(bs_header_extra_1)
+    {
+        Get_S1 (2, sbr->bs_freq_scale,                          "bs_freq_scale");
+        Get_S1 (1, sbr->bs_alter_scale,                         "bs_alter_scale");
+        Get_S1 (2, sbr->bs_noise_bands,                         "bs_noise_bands");
+    }
+    else
+    {
+        sbr->bs_freq_scale=2;
+        sbr->bs_alter_scale=1;
+        sbr->bs_noise_bands=2;
+    }
+    if(bs_header_extra_2)
+    {
+        Skip_S1(2,                                              "bs_limiter_bands");
+        Skip_S1(2,                                              "bs_limiter_gains");
+        Skip_SB(                                                "bs_interpol_freq");
+        Skip_SB(                                                "bs_smoothing_mode");
+    }
+
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::sbr_data(int8u id_aac)
+{
+    Element_Begin1("sbr_data");
+    switch (id_aac)
+    {
+        case  0 : sbr_single_channel_element();     break; //ID_SCE
+        case  1 : sbr_channel_pair_element();       break; //ID_CPE
+        default : ;
+    }
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::sbr_single_channel_element()
+{
+    Element_Begin1("sbr_single_channel_element");
+    bool bs_data_extra, bs_add_harmonic_flag, bs_extended_data;
+    int8u bs_extension_size, bs_esc_count, bs_extension_id;
+    Get_SB (bs_data_extra,                                      "bs_data_extra");
+    if (bs_data_extra)
+    {
+        Skip_S1(4,                                              "bs_reserved");
+    }
+    sbr_grid(0);
+    sbr_dtdf(0);
+    sbr_invf(0);
+    sbr_envelope(0, 0);
+    sbr_noise(0, 0);
+    Get_SB (bs_add_harmonic_flag,                               "bs_add_harmonic_flag[0]");
+    if (bs_add_harmonic_flag)
+        sbr_sinusoidal_coding(0);
+
+    Get_SB (bs_extended_data,                                   "bs_extended_data[0]");
+    if (bs_extended_data) {
+        Get_S1 (4,bs_extension_size,                            "bs_extension_size");
+        size_t cnt=bs_extension_size;
+        if (cnt==15)
+        {
+            Get_S1 (8, bs_esc_count,                            "bs_esc_count");
+            cnt+=bs_esc_count;
+        }
+
+        if (Data_BS_Remain()>=8*cnt)
+        {
+            size_t End=Data_BS_Remain()-8*cnt;
+            while (Data_BS_Remain()>End+7)
+            {
+                Get_S1 (2,bs_extension_id,                      "bs_extension_id");
+                switch (bs_extension_id)
+                {
+                    case 2 : ps_data(End); break; //EXTENSION_ID_PS
+                    default: ;
+                }
+            }
+            if (End<Data_BS_Remain())
+                Skip_BS(Data_BS_Remain()-End,                   "bs_fill_bits");
+        }
+        else
+            Skip_BS(Data_BS_Remain(),                           "(Error)");
+
+    }
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::sbr_grid(bool ch)
+{
+    Element_Begin1("sbr_grid");
+    int8u bs_frame_class, bs_num_rel_0, bs_num_rel_1, tmp;
+    int ptr_bits;
+    Get_S1(2, bs_frame_class,                                   "bs_frame_class");
+    switch (bs_frame_class)
+    {
+        case 0 : //FIXFIX
+            Get_S1 (2, tmp,                                     "tmp");
+            sbr->bs_num_env[ch]=(int8u)pow(2.0, tmp);
+            if (sbr->bs_num_env[ch]==1)
+                sbr->bs_amp_res[ch]=0;
+            Get_SB (   sbr->bs_freq_res[ch][0],                 "bs_freq_res[ch][0]");
+            for (int8u env=1; env<sbr->bs_num_env[ch]; env++)
+                sbr->bs_freq_res[ch][env]=sbr->bs_freq_res[ch][0];
+            break;
+        case 1 : //FIXVAR
+            Skip_S1(2,                                          "bs_var_bord_1[ch]");
+            Get_S1 (2, bs_num_rel_1,                            "bs_num_rel_1[ch]");
+            sbr->bs_num_env[ch]=bs_num_rel_1+1;
+            for (int8u rel=0; rel<sbr->bs_num_env[ch]-1; rel++) {
+                Skip_S1(2,                                      "tmp");
+            }
+            ptr_bits=(int8u)ceil(log((double)sbr->bs_num_env[ch]+1)/log((double)2));
+            Skip_BS(ptr_bits,                                   "bs_pointer[ch]");
+            Element_Begin1("bs_freq_res[ch]");
+            for (int8u env=0; env<sbr->bs_num_env[ch]; env++)
+                Get_SB (sbr->bs_freq_res[ch][sbr->bs_num_env[ch]-1-env], "bs_freq_res[ch][bs_num_env[ch]-1-env]");
+            Element_End0();
+            break;
+        case 2 : //VARFIX
+            Skip_S1(2,                                          "bs_var_bord_0[ch]");
+            Get_S1 (2,bs_num_rel_0,                             "bs_num_rel_0[ch]");
+            sbr->bs_num_env[ch] = bs_num_rel_0 + 1;
+            for (int8u rel=0; rel<sbr->bs_num_env[ch]-1; rel++)
+                Skip_S1(2,                                      "tmp");
+            ptr_bits=(int8u)ceil(log((double)sbr->bs_num_env[ch]+1)/log((double)2));
+            Skip_BS(ptr_bits,                                   "bs_pointer[ch]");
+            Element_Begin1("bs_freq_res[ch]");
+            for (int8u env = 0; env < sbr->bs_num_env[ch]; env++)
+                Get_SB (sbr->bs_freq_res[ch][env],              "bs_freq_res[ch][env]");
+            Element_End0();
+            break;
+        case 3 : //VARVAR
+            Skip_S1(2,                                          "bs_var_bord_0[ch]");
+            Skip_S1(2,                                          "bs_var_bord_1[ch]");
+            Get_S1 (2,bs_num_rel_0,                             "bs_num_rel_0[ch]");
+            Get_S1 (2,bs_num_rel_1,                             "bs_num_rel_1[ch]");
+            sbr->bs_num_env[ch] = bs_num_rel_0 + bs_num_rel_1 + 1;
+            for (int8u rel=0; rel<bs_num_rel_0; rel++)
+                Skip_S1(2,                                      "tmp");
+            for (int8u rel=0; rel<bs_num_rel_1; rel++)
+                Skip_S1(2,                                      "tmp");
+            ptr_bits=(int8u)ceil(log((double)(sbr->bs_num_env[ch]+1))/log((double)2));
+            Skip_BS(ptr_bits,                                   "bs_pointer[ch]");
+            Element_Begin1("bs_freq_res[ch]");
+            for (int8u env=0; env<sbr->bs_num_env[ch]; env++)
+                Get_SB (sbr->bs_freq_res[ch][env],              "bs_freq_res[ch][env]");
+            Element_End0();
+            break;
+    }
+    if (sbr->bs_num_env[ch]>1)
+        sbr->bs_num_noise[ch]=2;
+    else
+        sbr->bs_num_noise[ch]=1;
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::sbr_channel_pair_element()
+{
+    Element_Begin1("sbr_channel_pair_element");
+    bool bs_data_extra,bs_coupling,bs_add_harmonic_flag,bs_extended_data;
+    int8u bs_extension_size,bs_esc_count,bs_extension_id;
+    Get_SB (bs_data_extra,                                      "bs_data_extra");
+    if (bs_data_extra) {
+        Skip_S1(4,                                              "bs_reserved");
+        Skip_S1(4,                                              "bs_reserved");
+    }
+
+    Get_SB (bs_coupling,                                        "bs_coupling");
+    sbr_grid(0);
+    if (bs_coupling)
+    {
+        //Coupling
+        sbr->bs_num_env    [1]=sbr->bs_num_env    [0];
+        sbr->bs_num_noise  [1]=sbr->bs_num_noise  [0];
+        for (int8u env=0; env<sbr->bs_num_env[0]; env++)
+            sbr->bs_freq_res[1][env]=sbr->bs_freq_res[0][env];
+    }
+    else
+        sbr_grid(1);
+    sbr_dtdf(0);
+    sbr_dtdf(1);
+    sbr_invf(0);
+    if (!bs_coupling)
+        sbr_invf(1);
+    sbr_envelope(0, bs_coupling);
+    if (bs_coupling)
+    {
+        sbr_noise(0, bs_coupling);
+        sbr_envelope(1, bs_coupling);
+    }
+    else
+    {
+        sbr_envelope(1, bs_coupling);
+        sbr_noise(0, bs_coupling);
+    }
+    sbr_noise(1, bs_coupling);
+    Get_SB (bs_add_harmonic_flag,                               "bs_add_harmonic_flag[0]");
+    if (bs_add_harmonic_flag)
+        sbr_sinusoidal_coding(0);
+    Get_SB (bs_add_harmonic_flag,                               "bs_add_harmonic_flag[1]");
+    if (bs_add_harmonic_flag)
+        sbr_sinusoidal_coding(1);
+
+    Get_SB (bs_extended_data,                                   "bs_extended_data");
+    if (bs_extended_data) {
+        Get_S1(4,bs_extension_size,                             "bs_extension_size");
+        size_t cnt = bs_extension_size;
+        if (cnt == 15)
+        {
+            Get_S1(8,bs_esc_count,                              "bs_esc_count");
+            cnt += bs_esc_count;
+        }
+        if (Data_BS_Remain()>=8*cnt)
+        {
+            size_t End=Data_BS_Remain()-8*cnt;
+            while (Data_BS_Remain()>End+7)
+            {
+                Get_S1 (2,bs_extension_id,                      "bs_extension_id");
+                switch (bs_extension_id)
+                {
+                    case 2 : ps_data(End); break; //EXTENSION_ID_PS
+                    default: ;
+                }
+            }
+            if (End<Data_BS_Remain())
+                Skip_BS(Data_BS_Remain()-End,                   "bs_fill_bits");
+        }
+        else
+            Skip_BS(Data_BS_Remain(),                           "(Error)");
+
+    }
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::sbr_dtdf(bool ch)
+{
+    Element_Begin1("sbr_dtdf");
+    for (int env=0; env<sbr->bs_num_env[ch]; env++)
+        Get_S1 (1, sbr->bs_df_env[ch][env],                     "bs_df_env[ch][env]");
+    for (int noise=0; noise<sbr->bs_num_noise[ch]; noise++)
+        Get_S1 (1, sbr->bs_df_noise[ch][noise],                 "bs_df_noise[ch][noise]");
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::sbr_invf(bool)
+{
+    Element_Begin1("sbr_invf");
+    for (int n = 0; n<sbr->num_noise_bands; n++ )
+         Skip_S1(2,                                             "bs_invf_mode[ch][n]");
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::sbr_envelope(bool ch, bool bs_coupling)
+{
+    sbr_huffman t_huff, f_huff;
+    Element_Begin1("sbr_envelope");
+    if (bs_coupling && ch)
+    {
+        if (sbr->bs_amp_res[ch])
+        {
+            t_huff = t_huffman_env_bal_3_0dB;
+            f_huff = f_huffman_env_bal_3_0dB;
+        }
+        else
+        {
+            t_huff = t_huffman_env_bal_1_5dB;
+            f_huff = f_huffman_env_bal_1_5dB;
+        }
+    }
+    else
+    {
+        if (sbr->bs_amp_res[ch])
+        {
+            t_huff = t_huffman_env_3_0dB;
+            f_huff = f_huffman_env_3_0dB;
+        }
+        else
+        {
+            t_huff = t_huffman_env_1_5dB;
+            f_huff = f_huffman_env_1_5dB;
+        }
+    }
+
+    for (int8u env=0; env<sbr->bs_num_env[ch]; env++)
+    {
+        if (sbr->bs_df_env[ch][env] == 0)
+        {
+            if (bs_coupling && ch)
+                Skip_S1(sbr->bs_amp_res[ch]?5:6,                "bs_env_start_value_balance");
+            else
+                Skip_S1(sbr->bs_amp_res[ch]?6:7,                "bs_env_start_value_level");
+            for (int8u band = 1; band < sbr->num_env_bands[sbr->bs_freq_res[ch][env]]; band++)
+                sbr_huff_dec(f_huff,                            "bs_data_env[ch][env][band]");
+        }
+        else
+        {
+            for (int8u band = 0; band < sbr->num_env_bands[sbr->bs_freq_res[ch][env]]; band++)
+                sbr_huff_dec(t_huff,                            "bs_data_env[ch][env][band]");
+        }
+    }
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::sbr_noise(bool ch, bool bs_coupling)
+{
+    sbr_huffman t_huff, f_huff;
+    Element_Begin1("sbr_noise");
+    if (bs_coupling && ch)
+    {
+        t_huff = t_huffman_noise_bal_3_0dB;
+        f_huff = f_huffman_env_bal_3_0dB;
+    }
+    else
+    {
+        t_huff = t_huffman_noise_3_0dB;
+        f_huff = f_huffman_env_3_0dB;
+    }
+
+    for (int noise=0; noise<sbr->bs_num_noise[ch]; noise++)
+    {
+        if (sbr->bs_df_noise[ch][noise] == 0)
+        {
+            Skip_S1(5,                                          (bs_coupling && ch)?"bs_noise_start_value_balance":"bs_noise_start_value_level");
+            for (int8u band=1; band<sbr->num_noise_bands; band++)
+                sbr_huff_dec(f_huff,                            "bs_data_noise[ch][noise][band]");
+        }
+        else
+        {
+            for (int8u band = 0; band < sbr->num_noise_bands; band++)
+                sbr_huff_dec(t_huff,                            "bs_data_noise[ch][noise][band]");
+        }
+    }
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::sbr_sinusoidal_coding(bool)
+{
+    Element_Begin1("sbr_sinusoidal_coding");
+    for (int8u n=0; n<sbr->num_env_bands[1]; n++)
+        Skip_SB(                                                "bs_add_harmonic[ch][n]");
+    Element_End0();
+}
+
+} //NameSpace
+
+#endif //MEDIAINFO_AAC_YES
+

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Aac_GeneralAudio_Sbr.h Added

@@ -0,0 +1,728 @@
+// File_Aac - Info for AAC files
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_File_Aac_GeneralAudio_SbrH
+#define MediaInfo_File_Aac_GeneralAudio_SbrH
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+const int8s t_huffman_env_1_5dB[120][2]=
+{
+    {   1,    2 },
+    { -64,  -65 },
+    {   3,    4 },
+    { -63,  -66 },
+    {   5,    6 },
+    { -62,  -67 },
+    {   7,    8 },
+    { -61,  -68 },
+    {   9,   10 },
+    { -60,  -69 },
+    {  11,   12 },
+    { -59,  -70 },
+    {  13,   14 },
+    { -58,  -71 },
+    {  15,   16 },
+    { -57,  -72 },
+    {  17,   18 },
+    { -73,  -56 },
+    {  19,   21 },
+    { -74,   20 },
+    { -55,  -75 },
+    {  22,   26 },
+    {  23,   24 },
+    { -54,  -76 },
+    { -77,   25 },
+    { -53,  -78 },
+    {  27,   34 },
+    {  28,   29 },
+    { -52,  -79 },
+    {  30,   31 },
+    { -80,  -51 },
+    {  32,   33 },
+    { -83,  -82 },
+    { -81,  -50 },
+    {  35,   57 },
+    {  36,   40 },
+    {  37,   38 },
+    { -88,  -84 },
+    { -48,   39 },
+    { -90,  -85 },
+    {  41,   46 },
+    {  42,   43 },
+    { -49,  -87 },
+    {  44,   45 },
+    { -89,  -86 },
+    {-124, -123 },
+    {  47,   50 },
+    {  48,   49 },
+    {-122, -121 },
+    {-120, -119 },
+    {  51,   54 },
+    {  52,   53 },
+    {-118, -117 },
+    {-116, -115 },
+    {  55,   56 },
+    {-114, -113 },
+    {-112, -111 },
+    {  58,   89 },
+    {  59,   74 },
+    {  60,   67 },
+    {  61,   64 },
+    {  62,   63 },
+    {-110, -109 },
+    {-108, -107 },
+    {  65,   66 },
+    {-106, -105 },
+    {-104, -103 },
+    {  68,   71 },
+    {  69,   70 },
+    {-102, -101 },
+    {-100,  -99 },
+    {  72,   73 },
+    { -98,  -97 },
+    { -96,  -95 },
+    {  75,   82 },
+    {  76,   79 },
+    {  77,   78 },
+    { -94,  -93 },
+    { -92,  -91 },
+    {  80,   81 },
+    { -47,  -46 },
+    { -45,  -44 },
+    {  83,   86 },
+    {  84,   85 },
+    { -43,  -42 },
+    { -41,  -40 },
+    {  87,   88 },
+    { -39,  -38 },
+    { -37,  -36 },
+    {  90,  105 },
+    {  91,   98 },
+    {  92,   95 },
+    {  93,   94 },
+    { -35,  -34 },
+    { -33,  -32 },
+    {  96,   97 },
+    { -31,  -30 },
+    { -29,  -28 },
+    {  99,  102 },
+    { 100,  101 },
+    { -27,  -26 },
+    { -25,  -24 },
+    { 103,  104 },
+    { -23,  -22 },
+    { -21,  -20 },
+    { 106,  113 },
+    { 107,  110 },
+    { 108,  109 },
+    { -19,  -18 },
+    { -17,  -16 },
+    { 111,  112 },
+    { -15,  -14 },
+    { -13,  -12 },
+    { 114,  117 },
+    { 115,  116 },
+    { -11,  -10 },
+    {  -9,   -8 },
+    { 118,  119 },
+    {  -7,   -6 },
+    {  -5,   -4 }
+};
+
+const int8s f_huffman_env_1_5dB[120][2]=
+{
+    {   1,    2 },
+    { -64,  -65 },
+    {   3,    4 },
+    { -63,  -66 },
+    {   5,    6 },
+    { -67,  -62 },
+    {   7,    8 },
+    { -68,  -61 },
+    {   9,   10 },
+    { -69,  -60 },
+    {  11,   13 },
+    { -70,   12 },
+    { -59,  -71 },
+    {  14,   16 },
+    { -58,   15 },
+    { -72,  -57 },
+    {  17,   19 },
+    { -73,   18 },
+    { -56,  -74 },
+    {  20,   23 },
+    {  21,   22 },
+    { -55,  -75 },
+    { -54,  -53 },
+    {  24,   27 },
+    {  25,   26 },
+    { -76,  -52 },
+    { -77,  -51 },
+    {  28,   31 },
+    {  29,   30 },
+    { -50,  -78 },
+    { -79,  -49 },
+    {  32,   36 },
+    {  33,   34 },
+    { -48,  -47 },
+    { -80,   35 },
+    { -81,  -82 },
+    {  37,   47 },
+    {  38,   41 },
+    {  39,   40 },
+    { -83,  -46 },
+    { -45,  -84 },
+    {  42,   44 },
+    { -85,   43 },
+    { -44,  -43 },
+    {  45,   46 },
+    { -88,  -87 },
+    { -86,  -90 },
+    {  48,   66 },
+    {  49,   56 },
+    {  50,   53 },
+    {  51,   52 },
+    { -92,  -42 },
+    { -41,  -39 },
+    {  54,   55 },
+    {-105,  -89 },
+    { -38,  -37 },
+    {  57,   60 },
+    {  58,   59 },
+    { -94,  -91 },
+    { -40,  -36 },
+    {  61,   63 },
+    { -20,   62 },
+    {-115, -110 },
+    {  64,   65 },
+    {-108, -107 },
+    {-101,  -97 },
+    {  67,   89 },
+    {  68,   75 },
+    {  69,   72 },
+    {  70,   71 },
+    { -95,  -93 },
+    { -34,  -27 },
+    {  73,   74 },
+    { -22,  -17 },
+    { -16, -124 },
+    {  76,   82 },
+    {  77,   79 },
+    {-123,   78 },
+    {-122, -121 },
+    {  80,   81 },
+    {-120, -119 },
+    {-118, -117 },
+    {  83,   86 },
+    {  84,   85 },
+    {-116, -114 },
+    {-113, -112 },
+    {  87,   88 },
+    {-111, -109 },
+    {-106, -104 },
+    {  90,  105 },
+    {  91,   98 },
+    {  92,   95 },
+    {  93,   94 },
+    {-103, -102 },
+    {-100,  -99 },
+    {  96,   97 },
+    { -98,  -96 },
+    { -35,  -33 },
+    {  99,  102 },
+    { 100,  101 },
+    { -32,  -31 },
+    { -30,  -29 },
+    { 103,  104 },
+    { -28,  -26 },
+    { -25,  -24 },
+    { 106,  113 },
+    { 107,  110 },
+    { 108,  109 },
+    { -23,  -21 },
+    { -19,  -18 },
+    { 111,  112 },
+    { -15,  -14 },
+    { -13,  -12 },
+    { 114,  117 },
+    { 115,  116 },
+    { -11,  -10 },
+    {  -9,   -8 },
+    { 118,  119 },
+    {  -7,   -6 },
+    {  -5,   -4 }
+};
+
+const int8s t_huffman_env_bal_1_5dB[48][2]=
+{
+    { -64,    1 },
+    { -63,    2 },
+    { -65,    3 },
+    { -62,    4 },
+    { -66,    5 },
+    { -61,    6 },
+    { -67,    7 },
+    { -60,    8 },
+    { -68,    9 },
+    {  10,   11 },
+    { -69,  -59 },
+    {  12,   13 },
+    { -70,  -58 },
+    {  14,   28 },
+    {  15,   21 },
+    {  16,   18 },
+    { -57,   17 },
+    { -71,  -56 },
+    {  19,   20 },
+    { -88,  -87 },
+    { -86,  -85 },
+    {  22,   25 },
+    {  23,   24 },
+    { -84,  -83 },
+    { -82,  -81 },
+    {  26,   27 },
+    { -80,  -79 },
+    { -78,  -77 },
+    {  29,   36 },
+    {  30,   33 },
+    {  31,   32 },
+    { -76,  -75 },
+    { -74,  -73 },
+    {  34,   35 },
+    { -72,  -55 },
+    { -54,  -53 },
+    {  37,   41 },
+    {  38,   39 },
+    { -52,  -51 },
+    { -50,   40 },
+    { -49,  -48 },
+    {  42,   45 },
+    {  43,   44 },
+    { -47,  -46 },
+    { -45,  -44 },
+    {  46,   47 },
+    { -43,  -42 },
+    { -41,  -40 }
+};
+
+const int8s f_huffman_env_bal_1_5dB[48][2]=
+{
+    { -64,    1 },
+    { -65,    2 },
+    { -63,    3 },
+    { -66,    4 },
+    { -62,    5 },
+    { -61,    6 },
+    { -67,    7 },
+    { -68,    8 },
+    { -60,    9 },
+    {  10,   11 },
+    { -69,  -59 },
+    { -70,   12 },
+    { -58,   13 },
+    {  14,   17 },
+    { -71,   15 },
+    { -57,   16 },
+    { -56,  -73 },
+    {  18,   32 },
+    {  19,   25 },
+    {  20,   22 },
+    { -72,   21 },
+    { -88,  -87 },
+    {  23,   24 },
+    { -86,  -85 },
+    { -84,  -83 },
+    {  26,   29 },
+    {  27,   28 },
+    { -82,  -81 },
+    { -80,  -79 },
+    {  30,   31 },
+    { -78,  -77 },
+    { -76,  -75 },
+    {  33,   40 },
+    {  34,   37 },
+    {  35,   36 },
+    { -74,  -55 },
+    { -54,  -53 },
+    {  38,   39 },
+    { -52,  -51 },
+    { -50,  -49 },
+    {  41,   44 },
+    {  42,   43 },
+    { -48,  -47 },
+    { -46,  -45 },
+    {  45,   46 },
+    { -44,  -43 },
+    { -42,   47 },
+    { -41,  -40 }
+};
+
+const int8s t_huffman_env_3_0dB[62][2]=
+{
+    { -64,    1 },
+    { -65,    2 },
+    { -63,    3 },
+    { -66,    4 },
+    { -62,    5 },
+    { -67,    6 },
+    { -61,    7 },
+    { -68,    8 },
+    { -60,    9 },
+    {  10,   11 },
+    { -69,  -59 },
+    {  12,   14 },
+    { -70,   13 },
+    { -71,  -58 },
+    {  15,   18 },
+    {  16,   17 },
+    { -72,  -57 },
+    { -73,  -74 },
+    {  19,   22 },
+    { -56,   20 },
+    { -55,   21 },
+    { -54,  -77 },
+    {  23,   31 },
+    {  24,   25 },
+    { -75,  -76 },
+    {  26,   27 },
+    { -78,  -53 },
+    {  28,   29 },
+    { -52,  -95 },
+    { -94,   30 },
+    { -93,  -92 },
+    {  32,   47 },
+    {  33,   40 },
+    {  34,   37 },
+    {  35,   36 },
+    { -91,  -90 },
+    { -89,  -88 },
+    {  38,   39 },
+    { -87,  -86 },
+    { -85,  -84 },
+    {  41,   44 },
+    {  42,   43 },
+    { -83,  -82 },
+    { -81,  -80 },
+    {  45,   46 },
+    { -79,  -51 },
+    { -50,  -49 },
+    {  48,   55 },
+    {  49,   52 },
+    {  50,   51 },
+    { -48,  -47 },
+    { -46,  -45 },
+    {  53,   54 },
+    { -44,  -43 },
+    { -42,  -41 },
+    {  56,   59 },
+    {  57,   58 },
+    { -40,  -39 },
+    { -38,  -37 },
+    {  60,   61 },
+    { -36,  -35 },
+    { -34,  -33 }
+};
+
+const int8s f_huffman_env_3_0dB[62][2]=
+{
+    { -64,    1 },
+    { -65,    2 },
+    { -63,    3 },
+    { -66,    4 },
+    { -62,    5 },
+    { -67,    6 },
+    {   7,    8 },
+    { -61,  -68 },
+    {   9,   10 },
+    { -60,  -69 },
+    {  11,   12 },
+    { -59,  -70 },
+    {  13,   14 },
+    { -58,  -71 },
+    {  15,   16 },
+    { -57,  -72 },
+    {  17,   19 },
+    { -56,   18 },
+    { -55,  -73 },
+    {  20,   24 },
+    {  21,   22 },
+    { -74,  -54 },
+    { -53,   23 },
+    { -75,  -76 },
+    {  25,   30 },
+    {  26,   27 },
+    { -52,  -51 },
+    {  28,   29 },
+    { -77,  -79 },
+    { -50,  -49 },
+    {  31,   39 },
+    {  32,   35 },
+    {  33,   34 },
+    { -78,  -46 },
+    { -82,  -88 },
+    {  36,   37 },
+    { -83,  -48 },
+    { -47,   38 },
+    { -86,  -85 },
+    {  40,   47 },
+    {  41,   44 },
+    {  42,   43 },
+    { -80,  -44 },
+    { -43,  -42 },
+    {  45,   46 },
+    { -39,  -87 },
+    { -84,  -40 },
+    {  48,   55 },
+    {  49,   52 },
+    {  50,   51 },
+    { -95,  -94 },
+    { -93,  -92 },
+    {  53,   54 },
+    { -91,  -90 },
+    { -89,  -81 },
+    {  56,   59 },
+    {  57,   58 },
+    { -45,  -41 },
+    { -38,  -37 },
+    {  60,   61 },
+    { -36,  -35 },
+    { -34,  -33 }
+};
+
+const int8s t_huffman_env_bal_3_0dB[24][2]=
+{
+    { -64,    1 },
+    { -63,    2 },
+    { -65,    3 },
+    { -66,    4 },
+    { -62,    5 },
+    { -61,    6 },
+    { -67,    7 },
+    { -68,    8 },
+    { -60,    9 },
+    {  10,   16 },
+    {  11,   13 },
+    { -69,   12 },
+    { -76,  -75 },
+    {  14,   15 },
+    { -74,  -73 },
+    { -72,  -71 },
+    {  17,   20 },
+    {  18,   19 },
+    { -70,  -59 },
+    { -58,  -57 },
+    {  21,   22 },
+    { -56,  -55 },
+    { -54,   23 },
+    { -53,  -52 }
+};
+
+const int8s f_huffman_env_bal_3_0dB[24][2]=
+{
+    { -64,    1 },
+    { -65,    2 },
+    { -63,    3 },
+    { -66,    4 },
+    { -62,    5 },
+    { -61,    6 },
+    { -67,    7 },
+    { -68,    8 },
+    { -60,    9 },
+    {  10,   13 },
+    { -69,   11 },
+    { -59,   12 },
+    { -58,  -76 },
+    {  14,   17 },
+    {  15,   16 },
+    { -75,  -74 },
+    { -73,  -72 },
+    {  18,   21 },
+    {  19,   20 },
+    { -71,  -70 },
+    { -57,  -56 },
+    {  22,   23 },
+    { -55,  -54 },
+    { -53,  -52 }
+};
+
+const int8s t_huffman_noise_3_0dB[62][2]=
+{
+    { -64,    1 },
+    { -63,    2 },
+    { -65,    3 },
+    { -66,    4 },
+    { -62,    5 },
+    { -67,    6 },
+    {   7,    8 },
+    { -61,  -68 },
+    {   9,   30 },
+    {  10,   15 },
+    { -60,   11 },
+    { -69,   12 },
+    {  13,   14 },
+    { -59,  -53 },
+    { -95,  -94 },
+    {  16,   23 },
+    {  17,   20 },
+    {  18,   19 },
+    { -93,  -92 },
+    { -91,  -90 },
+    {  21,   22 },
+    { -89,  -88 },
+    { -87,  -86 },
+    {  24,   27 },
+    {  25,   26 },
+    { -85,  -84 },
+    { -83,  -82 },
+    {  28,   29 },
+    { -81,  -80 },
+    { -79,  -78 },
+    {  31,   46 },
+    {  32,   39 },
+    {  33,   36 },
+    {  34,   35 },
+    { -77,  -76 },
+    { -75,  -74 },
+    {  37,   38 },
+    { -73,  -72 },
+    { -71,  -70 },
+    {  40,   43 },
+    {  41,   42 },
+    { -58,  -57 },
+    { -56,  -55 },
+    {  44,   45 },
+    { -54,  -52 },
+    { -51,  -50 },
+    {  47,   54 },
+    {  48,   51 },
+    {  49,   50 },
+    { -49,  -48 },
+    { -47,  -46 },
+    {  52,   53 },
+    { -45,  -44 },
+    { -43,  -42 },
+    {  55,   58 },
+    {  56,   57 },
+    { -41,  -40 },
+    { -39,  -38 },
+    {  59,   60 },
+    { -37,  -36 },
+    { -35,   61 },
+    { -34,  -33 }
+};
+
+const int8s t_huffman_noise_bal_3_0dB[24][2]=
+{
+    { -64,    1 },
+    { -65,    2 },
+    { -63,    3 },
+    {   4,    9 },
+    { -66,    5 },
+    { -62,    6 },
+    {   7,    8 },
+    { -76,  -75 },
+    { -74,  -73 },
+    {  10,   17 },
+    {  11,   14 },
+    {  12,   13 },
+    { -72,  -71 },
+    { -70,  -69 },
+    {  15,   16 },
+    { -68,  -67 },
+    { -61,  -60 },
+    {  18,   21 },
+    {  19,   20 },
+    { -59,  -58 },
+    { -57,  -56 },
+    {  22,   23 },
+    { -55,  -54 },
+    { -53,  -52 }
+};
+
+//---------------------------------------------------------------------------
+// Master frequency band table
+// k0 = lower frequency boundary
+const int8s Aac_k0_offset_16[16]=
+{
+     -8, -7, -6, -5, -4, -3, -2, -1,  0,  1,  2,  3,  4,  5,  6,  7,
+};
+const int8s Aac_k0_offset_22[16]=
+{
+     -5, -4, -3, -2, -1,  0,  1,  2,  3,  4,  5,  6,  7,  9, 11, 13,
+};
+const int8s Aac_k0_offset_24[16]=
+{
+     -5, -3, -2, -1,  0,  1,  2,  3,  4,  5,  6,  7,  9, 11, 13, 16,
+};
+const int8s Aac_k0_offset_32[16]=
+{
+     -6, -4, -2, -1,  0,  1,  2,  3,  4,  5,  6,  7,  9, 11, 13, 16,
+};
+const int8s Aac_k0_offset_64[16]=
+{
+     -4, -2, -1,  0,  1,  2,  3,  4,  5,  6,  7,  9, 11, 13, 16, 20,
+};
+const int8s Aac_k0_offset_96[16]=
+{
+     -2, -1,  0,  1,  2,  3,  4,  5,  6,  7,  9, 11, 13, 16, 20, 24,
+};
+const int8s* Aac_k0_offset[9]=
+{
+    Aac_k0_offset_96,       //96000
+    Aac_k0_offset_96,       //88200
+    Aac_k0_offset_64,       //64000
+    Aac_k0_offset_64,       //48000
+    Aac_k0_offset_64,       //44100
+    Aac_k0_offset_32,       //32000
+    Aac_k0_offset_24,       //24000
+    Aac_k0_offset_22,       //22050
+    Aac_k0_offset_16,       //16000
+};
+const int8u Aac_k0_startMin[9]=
+{
+     7,  7, 10, 11, 12, 16, 16, 17, 24, //32, 35, 48,  0,  0,  0,  0,
+};
+
+//---------------------------------------------------------------------------
+// Master frequency band table
+// k2 = upper frequency boundary
+const int8u Aac_k2_stopMin[9]=
+{
+    13, 15, 20, 21, 23, 32, 32, 35, 48, //64, 70, 96,  0,  0,  0,  0,
+};
+const int8s Aac_k2_offset[9][14]=
+{
+    { 0,  2,  4,  6,  8, 11, 14, 18, 22, 26, 31, 37, 44, 51 },
+    { 0,  2,  4,  6,  8, 11, 14, 18, 22, 26, 31, 36, 42, 49 },
+    { 0,  2,  4,  6,  8, 11, 14, 17, 21, 25, 29, 34, 39, 44 },
+    { 0,  2,  4,  6,  8, 11, 14, 17, 20, 24, 28, 33, 38, 43 },
+    { 0,  2,  4,  6,  8, 11, 14, 17, 20, 24, 28, 32, 36, 41 },
+    { 0,  2,  4,  6,  8, 10, 12, 14, 17, 20, 23, 26, 29, 32 },
+    { 0,  2,  4,  6,  8, 10, 12, 14, 17, 20, 23, 26, 29, 32 },
+    { 0,  1,  3,  5,  7,  9, 11, 13, 15, 17, 20, 23, 26, 29 },
+    { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 12, 14, 16 },
+};
+
+} //NameSpace
+
+#endif

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Aac_GeneralAudio_Sbr_Ps.cpp Added

@@ -0,0 +1,110 @@
+// File_Aac - Info for AAC (Raw) files
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_AAC_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Audio/File_Aac.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//---------------------------------------------------------------------------
+extern const char* Aac_audioObjectType(int8u audioObjectType);
+
+//---------------------------------------------------------------------------
+void File_Aac::ps_data(size_t End)
+{
+    FILLING_BEGIN();
+        if (Infos["Format_Settings_PS"].empty())
+        {
+            Infos["Format_Profile"]=__T("HE-AACv2");
+            Ztring Channels=Infos["Channel(s)"];
+            Ztring ChannelPositions=Infos["ChannelPositions"];
+            Ztring SamplingRate=Infos["SamplingRate"];
+            Infos["Channel(s)"]=__T("2");
+            Infos["ChannelPositions"]=__T("Front: L R");
+            if (MediaInfoLib::Config.LegacyStreamDisplay_Get())
+            {
+                Infos["Format_Profile"]+=__T(" / HE-AAC / LC");
+                Infos["Channel(s)"]+=__T(" / ")+Channels+__T(" / ")+Channels;
+                Infos["ChannelPositions"]+=__T(" / ")+ChannelPositions+__T(" / ")+ChannelPositions;
+                Infos["SamplingRate"]=Ztring().From_Number((extension_sampling_frequency_index==(int8u)-1)?(sampling_frequency*2):extension_sampling_frequency, 10)+__T(" / ")+SamplingRate;
+            }
+            Infos["Format_Settings_PS"]=__T("Yes (Implicit)");
+            Ztring Codec=Retrieve(Stream_Audio, StreamPos_Last, Audio_Codec);
+            Infos["Codec"]=Ztring().From_Local(Aac_audioObjectType(audioObjectType))+__T("-SBR-PS");
+        }
+    FILLING_END();
+
+    //Parsing
+    Element_Begin1("ps_data");
+    bool enable_ps_header;
+    Get_SB(enable_ps_header,                                    "enable_ps_header");
+    if (enable_ps_header)
+    {
+        //Init
+        delete ps; ps=new ps_handler();
+
+        Get_SB(ps->enable_iid,                                  "enable_iid");
+        if (ps->enable_iid)
+        {
+            Get_S1 (3, ps->iid_mode,                            "iid_mode");
+        }
+        Get_SB(ps->enable_icc,                                  "enable_icc");
+        if (ps->enable_icc)
+        {
+            Get_S1 (3, ps->icc_mode,                            "icc_mode");
+        }
+        Get_SB(ps->enable_ext,                                  "enable_ext");
+    }
+
+    if (ps==NULL)
+    {
+        if (Data_BS_Remain()>End)
+            Skip_BS(Data_BS_Remain()-End,                       "(Waiting for header)");
+        Element_End0();
+        return;
+    }
+
+    //PS not yet parsed
+    if (Data_BS_Remain()>End)
+        Skip_BS(Data_BS_Remain()-End,                           "Data");
+    Element_End0();
+}
+
+} //NameSpace
+
+#endif //MEDIAINFO_AAC_YES
+

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Aac_GeneralAudio_Sbr_Ps.h Added

@@ -0,0 +1,150 @@
+// File_Aac - Info for AAC (Raw) files
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_File_Aac_GeneralAudio_Sbr_PsH
+#define MediaInfo_File_Aac_GeneralAudio_Sbr_PsH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Audio/File_Aac.h"
+
+
+using namespace std;
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+typedef float complex_t[2];
+typedef complex_t qmf_t;
+#define MAX_PS_ENVELOPES 5
+#define NO_ALLPASS_LINKS 3
+
+struct hyb_info
+{
+    int8u  frame_len;
+    int8u  resolution20[3];
+    int8u  resolution34[5];
+
+    qmf_t *work;
+    qmf_t **buffer;
+    qmf_t **temp;
+
+    hyb_info(int8u numTimeSlotsRate);
+    ~hyb_info();
+};
+
+struct ps_info
+{
+    //ps_data
+    bool   enable_ps_header;
+    bool   enable_iid;
+    bool   enable_icc;
+    bool   enable_ext;
+    int8u  iid_mode;
+    int8u  nr_iid_par;
+    int8u  nr_ipdopd_par;
+    int8u  icc_mode;
+    int8u  nr_icc_par;
+    bool   frame_class;
+    int8u  num_env;
+
+    int8u  border_position[MAX_PS_ENVELOPES+1];
+
+    int8u  iid_dt[MAX_PS_ENVELOPES];
+    int8u  icc_dt[MAX_PS_ENVELOPES];
+
+    int8u  enable_ipdopd;
+    int8u  ipd_mode;
+    int8u  ipd_dt[MAX_PS_ENVELOPES];
+    int8u  opd_dt[MAX_PS_ENVELOPES];
+
+    /* indices */
+    int8s  iid_index_prev[34];
+    int8s  icc_index_prev[34];
+    int8s  ipd_index_prev[17];
+    int8s  opd_index_prev[17];
+    int8s  iid_index[MAX_PS_ENVELOPES][34];
+    int8s  icc_index[MAX_PS_ENVELOPES][34];
+    int8s  ipd_index[MAX_PS_ENVELOPES][17];
+    int8s  opd_index[MAX_PS_ENVELOPES][17];
+
+    int8s  ipd_index_1[17];
+    int8s  opd_index_1[17];
+    int8s  ipd_index_2[17];
+    int8s  opd_index_2[17];
+
+    /* ps data was correctly read */
+    int8u  ps_data_available;
+
+    /* a header has been read */
+    int8u  header_read;
+
+    /* hybrid filterbank parameters */
+    hyb_info *hyb;
+    int8u  use34hybrid_bands;
+    int8u  numTimeSlotsRate;
+
+    /**/
+    int8u  num_groups;
+    int8u  num_hybrid_groups;
+    int8u  nr_par_bands;
+    int8u  nr_allpass_bands;
+    int8u  decay_cutoff;
+
+    int8u  *group_border;
+    int16u *map_group2bk;
+
+    /* filter delay handling */
+    int8u  saved_delay;
+    int8u  delay_buf_index_ser[NO_ALLPASS_LINKS];
+    int8u  num_sample_delay_ser[NO_ALLPASS_LINKS];
+    int8u  delay_D[64];
+    int8u  delay_buf_index_delay[64];
+
+    complex_t delay_Qmf[14][64]; /* 14 samples delay max, 64 QMF channels */
+    complex_t delay_SubQmf[2][32]; /* 2 samples delay max (SubQmf is always allpass filtered) */
+    complex_t delay_Qmf_ser[NO_ALLPASS_LINKS][5][64]; /* 5 samples delay max (table 8.34), 64 QMF channels */
+    complex_t delay_SubQmf_ser[NO_ALLPASS_LINKS][5][32]; /* 5 samples delay max (table 8.34) */
+
+    /* transients */
+    float alpha_decay;
+    float alpha_smooth;
+
+    float P_PeakDecayNrg[34];
+    float P_prev[34];
+    float P_SmoothPeakDecayDiffNrg_prev[34];
+
+    /* mixing and phase */
+    complex_t h11_prev[50];
+    complex_t h12_prev[50];
+    complex_t h21_prev[50];
+    complex_t h22_prev[50];
+    int8u  phase_hist;
+    complex_t ipd_prev[20][2];
+    complex_t opd_prev[20][2];
+
+    ps_info(int8u sr_index, int8u numTimeSlotsRate);
+    ~ps_info();
+};
+
+} //NameSpace
+
+#endif

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Aac_Main.cpp Added

@@ -0,0 +1,1142 @@
+// File_Aac - Info for AAC files
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_AAC_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Audio/File_Aac.h"
+#include <cmath>
+using namespace std;
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Infos
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+extern const int32u Aac_sampling_frequency[]=
+{96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050,
+ 16000, 12000, 11025,  8000,  7350,     0,     0,     0,};
+
+//---------------------------------------------------------------------------
+const char* Aac_Adts_ID[]=
+{
+    "MPEG-4",
+    "MPEG-2",
+};
+
+//---------------------------------------------------------------------------
+const char* Aac_Format(int8u ID)
+{
+    switch (ID)
+    {
+        case    1 :
+        case    2 :
+        case    3 :
+        case    4 : return "AAC";
+        case    5 : return "SBR";
+        case    6 : return "AAC Scalable";
+        case    7 : return "TwinVQ";
+        case    8 : return "CELP";
+        case    9 : return "HVXC";
+        case   12 : return "TTSI";
+        case   13 : return "Main synthetic";
+        case   14 : return "Wavetable synthesis";
+        case   15 : return "General MIDI";
+        case   16 : return "Algorithmic Synthesis and Audio FX";
+        case   17 :
+        case   19 :
+        case   20 : return "ER AAC";
+        case   21 : return "ER TwinVQ";
+        case   22 : return "ER BSAC";
+        case   23 : return "ER AAC LD";
+        case   24 : return "ER CELP";
+        case   25 : return "ER HVXC";
+        case   26 : return "ER HILN";
+        case   27 : return "ER Parametric";
+        case   28 : return "SSC";
+        case   29 : return "ParametricStereo";
+        case   32 : return "Layer-1";
+        case   33 : return "Layer-2";
+        case   34 : return "Layer-3";
+        case   35 : return "DST";
+        case   36 : return "ALS";
+        case   37 :
+        case   38 : return "SLS";
+        case   39 : return "ER AAC ELD";
+        case   40 : return "SMR Simple";
+        case   41 : return "SMR Main";
+        default   : return "";
+    }
+}
+
+//---------------------------------------------------------------------------
+const char* Aac_Format_Profile(int8u ID)
+{
+    switch (ID)
+    {
+        case    1 : return "Main";
+        case    2 : return "LC";
+        case    3 : return "SSR";
+        case    4 : return "LTP";
+        case   17 : return "LC";
+        case   19 : return "LTP";
+        case   37 : return "non-core";
+        default   : return "";
+    }
+}
+
+//---------------------------------------------------------------------------
+const char* Aac_audioObjectType(int8u audioObjectType)
+{
+    switch (audioObjectType)
+    {
+        case    1 : return "AAC Main";
+        case    2 : return "AAC LC";
+        case    3 : return "AAC SSR";
+        case    4 : return "AAC LTP";
+        case    5 : return "SBR";
+        case    6 : return "AAC Scalable";
+        case    7 : return "TwinVQ";
+        case    8 : return "CELP";
+        case    9 : return "HVXC";
+        case   12 : return "TTSI";
+        case   13 : return "Main synthetic";
+        case   14 : return "Wavetable synthesis";
+        case   15 : return "General MIDI";
+        case   16 : return "Algorithmic Synthesis and Audio FX";
+        case   17 : return "ER AAC LC";
+        case   19 : return "ER AAC LTP";
+        case   20 : return "ER AAC Scalable";
+        case   21 : return "ER TwinVQ";
+        case   22 : return "ER BSAC";
+        case   23 : return "ER AAC LD";
+        case   24 : return "ER CELP";
+        case   25 : return "ER HVXC";
+        case   26 : return "ER HILN";
+        case   27 : return "ER Parametric";
+        case   28 : return "SSC";
+        case   29 : return "PS";
+        case   31 : return "(escape)";
+        case   32 : return "Layer-1";
+        case   33 : return "Layer-2";
+        case   34 : return "Layer-3";
+        case   35 : return "DST";
+        case   36 : return "ALS";
+        case   37 : return "SLS";
+        case   38 : return "SLS non-core";
+        case   39 : return "ER AAC ELD";
+        case   40 : return "SMR Simple";
+        case   41 : return "SMR Main";
+        default   : return "";
+    }
+}
+
+//---------------------------------------------------------------------------
+const int8u Aac_Channels[]=
+{
+    0,
+    1,
+    2,
+    3,
+    4,
+    5,
+    6,
+    8,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+};
+
+//---------------------------------------------------------------------------
+const char* Aac_ChannelConfiguration[]=
+{
+    "",
+    "Front: C",
+    "Front: L R",
+    "Front: L C R",
+    "Front: L C R, Side: C",
+    "Front: L C R, Side: L R",
+    "Front: L C R, Side: L R, LFE",
+    "Front: L C R, Side: L R, Back: L R, LFE",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+};
+
+//---------------------------------------------------------------------------
+const char* Aac_ChannelConfiguration2[]=
+{
+    "",
+    "1/0/0",
+    "2/0/0",
+    "3/0/0",
+    "3/1/0",
+    "3/2/0",
+    "3/2/0.1",
+    "3/2/2.1",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+};
+
+int8u Aac_AudioSpecificConfig_sampling_frequency_index(const int32u sampling_frequency)
+{
+    if (sampling_frequency>=92017) return 0;
+    if (sampling_frequency>=75132) return 1;
+    if (sampling_frequency>=55426) return 2;
+    if (sampling_frequency>=46009) return 3;
+    if (sampling_frequency>=37566) return 4;
+    if (sampling_frequency>=27713) return 5;
+    if (sampling_frequency>=23004) return 6;
+    if (sampling_frequency>=18783) return 7;
+    if (sampling_frequency>=13856) return 8;
+    if (sampling_frequency>=11502) return 9;
+    if (sampling_frequency>=9391) return 10;
+    return 11;
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::AudioSpecificConfig (size_t End)
+{
+    //Parsing
+    bool    sbrData=false, sbrPresentFlag=false, psData=false, psPresentFlag=false;
+    Element_Begin1("AudioSpecificConfig");
+    GetAudioObjectType(audioObjectType,                         "audioObjectType");
+    Get_S1 (4, sampling_frequency_index,                        "samplingFrequencyIndex"); Param_Info1(Aac_sampling_frequency[sampling_frequency_index]);
+    if (sampling_frequency_index==0xF)
+    {
+        Get_S3 (24, sampling_frequency,                         "samplingFrequency");
+        sampling_frequency_index=Aac_AudioSpecificConfig_sampling_frequency_index(sampling_frequency);
+    }
+    else
+        sampling_frequency=Aac_sampling_frequency[sampling_frequency_index];
+    Get_S1 (4, channelConfiguration,                            "channelConfiguration"); Param_Info1(Aac_ChannelConfiguration[channelConfiguration]);
+    if (audioObjectType==0x05 || audioObjectType==0x29)
+    {
+        extensionAudioObjectType=5;
+        sbrPresentFlag=true;
+        if (audioObjectType==29)
+            psPresentFlag=true;
+        Get_S1 (4, extension_sampling_frequency_index,          "extensionSamplingFrequencyIndex"); Param_Info1(Aac_sampling_frequency[extension_sampling_frequency_index]);
+        if (extension_sampling_frequency_index==0xF)
+        {
+            Get_S3 (24, extension_sampling_frequency,           "extensionSamplingFrequency");
+            sampling_frequency_index=Aac_AudioSpecificConfig_sampling_frequency_index(extension_sampling_frequency);
+        }
+        else
+            extension_sampling_frequency=Aac_sampling_frequency[extension_sampling_frequency_index];
+        GetAudioObjectType(audioObjectType,                     "audioObjectType");
+        if (audioObjectType==22) //BSAC
+            Skip_S1(4,                                          "extensionChannelConfiguration");
+    }
+    else
+        extensionAudioObjectType=0x00;
+
+    switch (audioObjectType)
+    {
+        case 1:
+        case 2:
+        case 3:
+        case 4:
+        case 6:
+        case 7:
+        case 17:
+        case 19:
+        case 20:
+        case 21:
+        case 22:
+        case 23:
+            GASpecificConfig();
+            break;
+        case 8:
+            CelpSpecificConfig();
+            break;
+        case 9:
+            HvxcSpecificConfig();
+            break;
+        case 12:
+            TTSSpecificConfig();
+            break;
+        //~ case 13:
+        //~ case 14:
+        //~ case 15:
+        //~ case 16:
+            //~ StructuredAudioSpecificConfig();
+            //~ break;
+        case 24:
+            ErrorResilientCelpSpecificConfig();
+            break;
+        case 25:
+            ErrorResilientHvxcSpecificConfig();
+            break;
+        case 26:
+        case 27:
+            ParametricSpecificConfig();
+            break;
+        case 28:
+            SSCSpecificConfig();
+            break;
+        //~ case 30:
+            //~ Skip_S1(1,                                          "sacPayloadEmbedding");
+            //~ SpatialSpecificConfig(); //ISO/IEC 23003-1
+            //~ break;
+        case 32:
+        case 33:
+        case 34:
+            MPEG_1_2_SpecificConfig();
+            break;
+        case 35:
+            DSTSpecificConfig();
+            break;
+        case 36:
+            Skip_S1(5,                                          "fillBits");
+            ALSSpecificConfig();
+            break;
+        case 37:
+        case 38:
+            SLSSpecificConfig();
+            break;
+        case 39:
+            ELDSpecificConfig();
+            break;
+        //~ case 40:
+        //~ case 41:
+            //~ SymbolicMusicSpecificConfig(); //ISO/IEC 14496-23
+            //~ break;
+        default:
+            Element_Begin1("not implemented part");
+            Skip_BS(Data_BS_Remain()-End,                       "(Not implemented)");
+            Element_End0();
+            if (Mode==File_Aac::Mode_ADIF || Mode==File_Aac::Mode_ADTS)
+                File__Tags_Helper::Finish();
+            else
+                File__Analyze::Finish();
+            Frame_Count=(size_t)-1; //Forcing not to parse following data anymore (if ParseSpeed==1)
+            return;
+    }
+
+    switch (audioObjectType)
+    {
+        case 17:
+        case 19:
+        case 20:
+        case 21:
+        case 22:
+        case 23:
+        case 24:
+        case 25:
+        case 26:
+        case 27:
+        case 39:
+            int8u epConfig;
+            Get_S1(2,epConfig,                                  "epConfig");
+            if ( epConfig == 2 || epConfig == 3 )
+                ErrorProtectionSpecificConfig();
+            if ( epConfig == 3 )
+            {
+                bool directMapping;
+                Get_SB(directMapping,                           "directMapping");
+                if ( ! directMapping )
+                {
+                    Element_Begin1("not implemented part");
+                    Skip_BS(Data_BS_Remain()-End,               "(Not implemented)");
+                    Element_End0();
+                    if (Mode==File_Aac::Mode_ADIF || Mode==File_Aac::Mode_ADTS)
+                        File__Tags_Helper::Finish();
+                    else
+                        File__Analyze::Finish();
+                    Frame_Count=(size_t)-1; //Forcing not to parse following data anymore (if ParseSpeed==1)
+                    return;
+                }
+            }
+        default : ;
+    }
+
+    if (extensionAudioObjectType!=5 && End!=(size_t)-1 && Data_BS_Remain()>=End+16)
+    {
+        int16u syncExtensionType;
+        Get_S2(11,syncExtensionType,                            "syncExtensionType");
+        if (syncExtensionType == 0x2b7)
+        {
+            sbrData=true;
+            GetAudioObjectType(extensionAudioObjectType,        "extensionAudioObjectType");
+            if (extensionAudioObjectType==5 )
+            {
+                Get_SB(sbrPresentFlag,                          "sbrPresentFlag");
+                if (sbrPresentFlag)
+                {
+                    Get_S1 (4, extension_sampling_frequency_index, "extensionSamplingFrequencyIndex"); Param_Info1(Aac_sampling_frequency[extension_sampling_frequency_index]);
+                    if (extension_sampling_frequency_index==0xF)
+                    {
+                        Get_S3 (24, extension_sampling_frequency, "extensionSamplingFrequency");
+                        extension_sampling_frequency_index=Aac_AudioSpecificConfig_sampling_frequency_index(extension_sampling_frequency);
+                    }
+                    else
+                        extension_sampling_frequency=Aac_sampling_frequency[extension_sampling_frequency_index];
+                    if (End!=(size_t)-1 && Data_BS_Remain()>=End+12)
+                    {
+                        int16u syncExtensionType;
+                        Get_S2(11,syncExtensionType,            "syncExtensionType");
+                        if (syncExtensionType == 0x548)
+                        {
+                            psData=true;
+                            Get_SB (psPresentFlag,              "psPresentFlag");
+                        }
+                    }
+                }
+            }
+            if ( extensionAudioObjectType == 22 )
+            {
+                Get_SB(sbrPresentFlag,                          "sbrPresentFlag");
+                if (sbrPresentFlag)
+                {
+                    Get_S1 (4, extension_sampling_frequency_index, "extensionSamplingFrequencyIndex"); Param_Info1(Aac_sampling_frequency[extension_sampling_frequency_index]);
+                    if (extension_sampling_frequency_index==0xF)
+                    {
+                        Get_S3 (24, extension_sampling_frequency, "extensionSamplingFrequency");
+                        extension_sampling_frequency_index=Aac_AudioSpecificConfig_sampling_frequency_index(extension_sampling_frequency);
+                    }
+                    else
+                        extension_sampling_frequency=Aac_sampling_frequency[extension_sampling_frequency_index];
+                }
+                Skip_S1(4,                                      "extensionChannelConfiguration");
+            }
+        }
+    }
+    Element_End0();
+    if (Data_BS_Remain()>End)
+    {
+        int8u LastByte=0xFF;
+        if (Data_BS_Remain()-End<8)
+            Peek_S1((int8u)(Data_BS_Remain()-End), LastByte);
+        Skip_BS(Data_BS_Remain()-End,                           LastByte?"Unknown":"Padding");
+    }
+
+    FILLING_BEGIN()
+        AudioSpecificConfig_OutOfBand (sampling_frequency, audioObjectType, sbrData, psData, sbrPresentFlag, psPresentFlag);
+
+        //Parsing the rest
+        if (audioObjectType!=2) //We continue only if AAC LC (in order to detect SBR and PS)
+        {
+            File__Analyze::Finish();
+            Frame_Count=(size_t)-1; //Forcing not to parse following data anymore (if ParseSpeed==1)
+        }
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::AudioSpecificConfig_OutOfBand (int32u sampling_frequency_, int8u audioObjectType_, bool sbrData, bool psData, bool sbrPresentFlag, bool psPresentFlag)
+{
+    if (sampling_frequency==(int32u)-1 && sampling_frequency_) //Only if not yet set
+    {
+        sampling_frequency=sampling_frequency_;
+        sampling_frequency_index=Aac_AudioSpecificConfig_sampling_frequency_index(sampling_frequency);
+    }
+
+    if (audioObjectType_==(int8u)-1)
+    {
+        if (audioObjectType==(int8u)-1)
+            return; //All data is not yet available
+        if (Infos.find("Format_Settings_SBR")!=Infos.end())
+        {
+            sbrData=true;
+            sbrPresentFlag=Infos["Format_Settings_SBR"].find(__T("Yes"))!=string::npos;
+        }
+        else
+        {
+            sbrData=false;
+            sbrPresentFlag=false;
+        }
+        if (Infos.find("Format_Settings_PS")!=Infos.end())
+        {
+            psData=true;
+            psPresentFlag=Infos["Format_Settings_PS"].find(__T("Yes"))!=string::npos;
+        }
+        else
+        {
+            psData=false;
+            psPresentFlag=false;
+        }
+    }
+    else
+        audioObjectType=audioObjectType_;
+
+    Infos["SamplingRate"].From_Number(sampling_frequency);
+    Infos["Format"].From_Local(Aac_Format(audioObjectType));
+    Infos["Format_Profile"].From_Local(Aac_Format_Profile(audioObjectType));
+    Infos["Codec"].From_Local(Aac_audioObjectType(audioObjectType));
+    if (channelConfiguration && channelConfiguration<8)
+    {
+        Infos["Channel(s)"].From_Number(Aac_Channels[channelConfiguration]);
+        Infos["ChannelPositions"].From_Local(Aac_ChannelConfiguration[channelConfiguration]);
+        Infos["ChannelPositions/String2"].From_Local(Aac_ChannelConfiguration2[channelConfiguration]);
+    }
+
+    if (sbrPresentFlag)
+    {
+        Infos["Format_Profile"]=__T("HE-AAC");
+        Ztring SamplingRate=Infos["SamplingRate"];
+        Infos["SamplingRate"].From_Number((extension_sampling_frequency_index==(int8u)-1)?(sampling_frequency*2):extension_sampling_frequency, 10);
+        if (MediaInfoLib::Config.LegacyStreamDisplay_Get())
+        {
+            Infos["Format_Profile"]+=__T(" / LC");
+            Infos["SamplingRate"]+=__T(" / ")+SamplingRate;
+        }
+        Infos["Format_Settings_SBR"]=__T("Yes (Implicit)");
+        Infos["Codec"]=Ztring().From_Local(Aac_audioObjectType(audioObjectType))+__T("-SBR");
+    }
+    else if (sbrData)
+        Infos["Format_Settings_SBR"]=__T("No (Explicit)");
+
+    if (psPresentFlag)
+    {
+        Infos["Format_Profile"]=__T("HE-AACv2");
+        Ztring Channels=Infos["Channel(s)"];
+        Ztring ChannelPositions=Infos["ChannelPositions"];
+        Ztring SamplingRate=Infos["SamplingRate"];
+        Infos["Channel(s)"]=__T("2");
+        Infos["ChannelPositions"]=__T("Front: L R");
+        if (MediaInfoLib::Config.LegacyStreamDisplay_Get())
+        {
+            Infos["Format_Profile"]+=__T(" / HE-AAC / LC");
+            Infos["Channel(s)"]+=__T(" / ")+Channels+__T(" / ")+Channels;
+            Infos["ChannelPositions"]+=__T(" / ")+ChannelPositions+__T(" / ")+ChannelPositions;
+            Infos["SamplingRate"]=Ztring().From_Number((extension_sampling_frequency_index==(int8u)-1)?(sampling_frequency*2):extension_sampling_frequency, 10)+__T(" / ")+SamplingRate;
+        }
+        Infos["Format_Settings_PS"]=__T("Yes (Implicit)");
+        if (StreamPos_Last!=(size_t)-1)
+        {
+            Ztring Codec=Retrieve(Stream_Audio, StreamPos_Last, Audio_Codec);
+            Infos["Codec"]=Ztring().From_Local(Aac_audioObjectType(audioObjectType))+__T("-SBR-PS");
+        }
+    }
+    else if (psData)
+        Infos["Format_Settings_PS"]=__T("No (Explicit)");
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::GetAudioObjectType(int8u &ObjectType, const char* Name)
+{
+    Element_Begin1(Name);
+    Get_S1(5, ObjectType,                                       "audioObjectType");
+    if (ObjectType==31)
+    {
+        Get_S1(6, ObjectType,                                   "audioObjectTypeExt");
+        ObjectType+=32;
+    }
+    Element_Info1(ObjectType); Element_Info1(Aac_Format_Profile(ObjectType));
+    Element_End0();
+}
+
+//***************************************************************************
+// Elements - Multiplex layer
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Aac::AudioMuxElement()
+{
+    Element_Begin1("AudioMuxElement");
+    if (muxConfigPresent)
+    {
+        bool useSameStreamMux;
+        Get_SB (useSameStreamMux,                               "useSameStreamMux");
+        if (!useSameStreamMux)
+            StreamMuxConfig();
+    }
+    if (sampling_frequency_index==(int8u)-1) //No previous config
+    {
+        Skip_BS(Data_BS_Remain(),                               "(Waiting for configuration)");
+        return;
+    }
+    if (audioMuxVersionA==0)
+    {
+        for (int8u i=0; i<=numSubFrames; i++)
+        {
+            PayloadLengthInfo();
+            PayloadMux();
+        }
+        if (otherDataPresent)
+        {
+            for(int32u i=0; i<otherDataLenBits; i++)
+                Skip_SB(                                        "otherDataBit");
+        }
+    }
+    else
+    {
+        Element_Begin1("(not implemented)");
+        Skip_BS(Data_BS_Remain(),                               "(not implemented)");
+        Element_End0();
+    }
+    if (Data_BS_Remain()%8)
+        Skip_S1(Data_BS_Remain()%8,                             "byte_alignment");
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::StreamMuxConfig()
+{
+    Element_Begin1("StreamMuxConfig");
+
+    bool useSameConfig,audioMuxVersion;
+    Get_SB (audioMuxVersion,                                    "audioMuxVersion");
+    if (audioMuxVersion)
+        Get_SB (audioMuxVersionA,                               "audioMuxVersionA");
+    else
+        audioMuxVersionA=false;
+
+    if (!audioMuxVersionA)
+    {
+        if (audioMuxVersion==1)
+        {
+            Element_Begin1("(not implemented)");
+            Skip_BS(Data_BS_Remain(),                               "(not implemented)");
+            Element_End0();
+            //taraBufferFullness=LatmGetValue();
+        }
+
+        int8u streamCnt = 0;
+
+        Get_SB (allStreamsSameTimeFraming,                      "allStreamsSameTimeFraming");
+        Get_S1 (6, numSubFrames,                                "numSubFrames");
+        Get_S1 (4, numProgram,                                  "numProgram");
+
+        for (int8u prog=0; prog<=numProgram; prog++)
+        {
+            Get_S1(3,numLayer,                                  "numLayer");
+            for (int8u lay=0; lay<=numLayer; lay++)
+            {
+                progSIndx[streamCnt]=prog;
+                laySIndx[streamCnt]=lay;
+                streamID[prog][lay]=streamCnt++;
+                if (prog==0 && lay==0)
+                    useSameConfig=0;
+                else
+                    Get_SB(useSameConfig,                       "useSameConfig");
+
+                if (!useSameConfig)
+                {
+                    if (audioMuxVersion==0)
+                        AudioSpecificConfig();
+                    else
+                    {
+                        int ascLen=LatmGetValue();
+                        AudioSpecificConfig(Data_BS_Remain()-ascLen);
+                    }
+                }
+
+                Get_S1(3,frameLengthType[streamID[prog][lay]],  "frameLengthType[streamID[prog][lay]]");
+                switch(frameLengthType[streamID[prog][lay]])
+                {
+                    case 0 :
+                            Skip_S1(8,                          "latmBufferFullness[streamID[prog][lay]]");
+                            if(!allStreamsSameTimeFraming)
+                            {
+                                Element_Begin1("(not implemented)");
+                                Skip_BS(Data_BS_Remain(),       "(not implemented)");
+                                Element_End0();
+                            }
+                            //~ if ((!allStreamsSameTimeFraming) &&
+                            //~ (AudioObjectType[lay] == 6 || AudioObjectType[lay] == 20) &&
+                            //~ (AudioObjectType[lay-1] == 8 || AudioObjectType[lay-1] == 24))
+                            //~ {
+                                //~ Skip_S1(6,                          "coreFrameOffset");
+                            //~ }
+                            break;
+                    case 1 :
+                            Get_S2(9,frameLength[streamID[prog][lay]],"frameLength[streamID[prog][lay]]");
+                            break;
+                    case 3 :
+                    case 4 :
+                    case 5 :
+                            Skip_S1(6,                          "CELPframeLengthTableIndex[streamID[prog][lay]]");
+                            break;
+                    case 6 :
+                    case 7 :
+                            Skip_S1(1,                          "HVXCframeLengthTableIndex[streamID[prog][lay]]");
+                            break;
+                    default :
+                            Element_Begin1("(not implemented)");
+                            Skip_BS(Data_BS_Remain(),       "(not implemented)");
+                            Element_End0();
+                }
+            }
+        }
+        bool otherDataLenEsc, crcCheckPresent;
+        Get_SB (otherDataPresent,                               "otherDataPresent");
+        if (otherDataPresent)
+        {
+            if (audioMuxVersion==1)
+                otherDataLenBits=LatmGetValue();
+            else
+            {
+                otherDataLenBits=0;
+                do
+                {
+                    int8u otherDataLenTmp;
+                    otherDataLenBits<<=8;
+                    Get_SB(   otherDataLenEsc,                   "otherDataLenEsc");
+                    Get_S1(8, otherDataLenTmp,                   "otherDataLenTmp");
+                    otherDataLenBits+=otherDataLenTmp;
+                }
+                while (otherDataLenEsc);
+            }
+        }
+        Get_SB(crcCheckPresent,                                 "crcCheckPresent");
+        if(crcCheckPresent)
+            Skip_S1(8,                                          "crcCheckSum");
+    }
+    else
+    {
+        Element_Begin1("(not implemented)");
+        Skip_BS(Data_BS_Remain(),                               "(not implemented)");
+        Element_End0();
+    }
+    Element_End0();
+
+    FILLING_BEGIN();
+        CanFill=true;
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
+int32u File_Aac::LatmGetValue()
+{
+    Element_Begin1("LatmGetValue");
+    int8u valueTmp, bytesForValue;
+    Get_S1(2, bytesForValue,                                    "bytesForValue");
+    int32u value=0;
+    for (int8u i=0; i<=bytesForValue; i++)
+    {
+        value<<=8;
+        Get_S1(8, valueTmp,                                     "valueTmp");
+        value+=valueTmp;
+    }
+    Element_End0();
+    return value;
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::PayloadLengthInfo()
+{
+    Element_Begin1("PayloadLengthInfo");
+    int8u tmp;
+    if (allStreamsSameTimeFraming)
+    {
+        for (int8u prog=0; prog<=numProgram; prog++)
+        {
+            for (int8u lay=0; lay<=numLayer; lay++)
+            {
+                if (frameLengthType[streamID[prog][lay]]==0)
+                {
+                    MuxSlotLengthBytes[streamID[prog][lay]]=0;
+                    do
+                    {
+                        Get_S1(8, tmp,                          "tmp");
+                        MuxSlotLengthBytes[streamID[prog][lay]]+=tmp;
+                    }
+                    while(tmp==255);
+                }
+                else if (frameLengthType[streamID[prog][lay]]==3
+                      || frameLengthType[streamID[prog][lay]]==5
+                      || frameLengthType[streamID[prog][lay]]==7)
+                {
+                    Skip_S1(2,                                  "MuxSlotLengthCoded[streamID[prog][lay]]");
+                }
+            }
+        }
+    }
+    else
+    {
+        int8u streamIndx;
+        int8u prog, lay;
+        Get_S1(4, numChunk,                                     "numChunk");
+        for (int chunkCnt=0; chunkCnt<=numChunk; chunkCnt++)
+        {
+            Get_S1(4,streamIndx,                                "streamIndx");
+            prog=progCIndx[chunkCnt]=progSIndx[streamIndx];
+            lay=layCIndx[chunkCnt]=laySIndx[streamIndx];
+            if (frameLengthType[streamID[prog][lay]]==0)
+            {
+                MuxSlotLengthBytes[streamID[prog][lay]]=0;
+                do
+                {
+                    Get_S1(8, tmp,                              "tmp");
+                    MuxSlotLengthBytes[streamID[prog][lay]]+=tmp;
+                }
+                while(tmp==255);
+                Skip_SB(                                        "AuEndFlag[streamID[prog][lay]]");
+            }
+            else if (frameLengthType[streamID[prog][lay]]==3
+                  || frameLengthType[streamID[prog][lay]]==5
+                  || frameLengthType[streamID[prog][lay]]==7)
+            {
+                Skip_S1(2,                                      "MuxSlotLengthCoded[streamID[prog][lay]]");
+            }
+        }
+    }
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::PayloadMux()
+{
+    Element_Begin1("PayloadMux");
+    if (allStreamsSameTimeFraming)
+    {
+        for (int8u prog=0; prog<=numProgram; prog++)
+            for (int8u lay=0; lay<=numLayer; lay++)
+            {
+                switch(frameLengthType[streamID[prog][lay]])
+                {
+                    case 0 :
+                            if (CA_system_ID_MustSkipSlices)
+                            {
+                                //Encryption management
+                                Skip_BS(8*MuxSlotLengthBytes[streamID[prog][lay]], "Encrypted payload[streamID[prog][lay]]");
+                                Frame_Count_Valid=0;
+                            }
+                            else
+                                raw_data_block();
+                            break;
+                    case 1 :
+                            Skip_BS(8 * (frameLength[streamID[prog][lay]] + 20),"payload[streamID[prog][lay]]");
+                            break;
+                    default:
+                            Element_Begin1("(not implemented)");
+                            Skip_BS(Data_BS_Remain(),           "(not implemented)");
+                            Element_End0();
+                }
+            }
+    }
+    else
+    {
+        for (int8u chunkCnt=0; chunkCnt<=numChunk; chunkCnt++)
+        {
+            int8u prog=progCIndx[chunkCnt];
+            int8u lay=layCIndx[chunkCnt];
+            switch(frameLengthType[streamID[prog][lay]])
+            {
+                case 0 :
+                        raw_data_block(); //Skip_BS(MuxSlotLengthBytes[streamID[prog][lay]], "payload[streamID[prog][lay]]");
+                        break;
+                case 1 :
+                        Skip_BS(8*(frameLength[streamID[prog][lay]]+20), "payload[streamID[prog][lay]]");
+                        break;
+                default:
+                        Element_Begin1("not implemented");
+                        Element_End0();
+            }
+        }
+    }
+    Element_End0();
+}
+
+//***************************************************************************
+// Elements - Error protection
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Aac::ErrorProtectionSpecificConfig()
+{
+    Element_Begin1("ErrorProtectionSpecificConfig");
+    int8u number_of_predefined_set,number_of_concatenated_frame,interleave_type;
+    Get_S1(8,number_of_predefined_set,                          "number_of_predefined_set");
+    Get_S1(2,interleave_type,                                   "interleave_type");
+    Skip_S1(3,                                                  "bit_stuffing");
+    Get_S1(3,number_of_concatenated_frame,                      "number_of_concatenated_frame");
+    for (int8u i = 0; i < number_of_predefined_set; i++ )
+    {
+        int8u number_of_class;
+        Get_S1(6,number_of_class,                               "number_of_class[i]");
+        for (int8u j = 0; j < number_of_class; j++)
+        {
+            bool length_escape,fec_type,rate_escape,crclen_escape;
+            Get_SB(length_escape,                               "length_escape[i][j]");
+            Get_SB(rate_escape,                                 "rate_escape[i][j]");
+            Get_SB(crclen_escape,                               "crclen_escape[i][j]");
+            if (number_of_concatenated_frame != 1)
+                Skip_SB(                                        "concatenate_flag[i][j]");
+            Get_SB(fec_type,                                    "fec_type[i][j]");
+            if(!fec_type)
+                Skip_SB(                                        "termination_switch[i][j]");
+            if (interleave_type == 2)
+                Skip_S1(2,                                      "interleave_switch[i][j]");
+            Skip_SB(                                            "class_optional");
+            if (length_escape)
+            {
+                /* ESC */
+                Skip_S1(4,                                      "number_of_bits_for_length[i][j]");
+            }
+            else
+            {
+                Skip_S2(16,                                     "class_length[i][j]");
+            }
+            if (!rate_escape)
+            { /* not ESC */
+                if(fec_type)
+                {
+                    Skip_S1(7,                                  "class_rate[i][j]");
+                }
+                else
+                {
+                    Skip_S1(5,                                  "class_rate[i][j]");
+                }
+            }
+            if (!crclen_escape)
+            {
+            /* not ESC */
+            Skip_S1(5,                                          "class_crclen[i][j]");
+            }
+        }
+        bool class_reordered_output;
+        Get_SB(class_reordered_output,                          "class_reordered_output");
+        if ( class_reordered_output )
+        {
+            for (int j = 0; j < number_of_class; j++ )
+            {
+                Skip_S1(6,                                      "class_output_order[i][j]");
+            }
+        }
+    }
+    bool header_protection;
+    Get_SB(header_protection,                                   "header_protection");
+    if (header_protection)
+    {
+        Skip_S1(5,                                              "header_rate");
+        Skip_S1(5,                                              "header_crclen");
+    }
+    Element_End0();
+}
+
+//***************************************************************************
+// Elements - MPEG-2 AAC Audio_Data_Interchange_Format, ADIF
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Aac::adif_header()
+{
+    //Parsing
+    int32u bitrate;
+    int8u  num_program_config_elements;
+    bool   bitstream_type;
+    Skip_C4(                                                    "adif_id");
+    BS_Begin();
+    TEST_SB_SKIP(                                               "copyright_id_present");
+        Skip_S4(32,                                             "copyright_id");
+        Skip_S4(32,                                             "copyright_id");
+        Skip_S4( 8,                                             "copyright_id");
+    TEST_SB_END();
+    Skip_SB(                                                    "original_copy");
+    Skip_SB(                                                    "home");
+    Get_SB (    bitstream_type,                                 "bitstream_type"); Param_Info1(bitstream_type?"VBR":"CBR");
+    Get_S3 (23, bitrate,                                        "bitrate");
+    Get_S1 ( 4, num_program_config_elements,                    "num_program_config_elements");
+    if (!bitstream_type)
+        Skip_S3(20,                                             "adif_buffer_fullness");
+    for (int8u Pos=0; Pos<num_program_config_elements+1; Pos++)
+        program_config_element();
+    BS_End();
+
+    FILLING_BEGIN();
+        Fill(Stream_General, 0, General_Format, "ADIF", Unlimited, true, true);
+        Fill(Stream_General, 0, General_HeaderSize, Element_Size);
+        Fill(Stream_General, 0, General_OverallBitRate_Mode, bitstream_type?"VBR":"CBR");
+
+        for (size_t StreamPos=0; StreamPos<Count_Get(Stream_Audio); StreamPos++)
+            Fill(Stream_Audio, StreamPos, Audio_MuxingMode, "ADIF");
+        if (num_program_config_elements==0) //Easy to fill only if 1 audio stream
+        {
+            Infos["BitRate_Mode"].From_Local(bitstream_type?"VBR":"CBR");
+            if (bitrate>0)
+                Infos[bitstream_type?"BitRate_Maximum":"BitRate"].From_Number(bitrate);
+        }
+
+        //No more need data
+        File__Tags_Helper::Finish("ADIF");
+    FILLING_END();
+}
+
+//***************************************************************************
+// Elements - Audio_Data_Transport_Stream frame, ADTS
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Aac::adts_frame()
+{
+    //Parsing
+    adts_fixed_header();
+    adts_variable_header();
+
+    //Encryption management
+    if (CA_system_ID_MustSkipSlices)
+    {
+        //Is not decodable
+        BS_End();
+        Skip_XX(Element_Size-Element_Offset,                    "Encrypted data");
+        Frame_Count_Valid=0;
+        return;
+    }
+
+    if (num_raw_data_blocks==0)
+    {
+        if (!protection_absent)
+        {
+            Element_Begin1("adts_error_check");
+                Skip_S2(16,                                     "crc_check");
+            Element_End0();
+        }
+        raw_data_block();
+    }
+    else
+    {
+        Element_Begin1("adts_header_error_check");
+            if (!protection_absent)
+                for (int i=1; i<=num_raw_data_blocks; i++)
+                    Skip_S2(16,                                 "raw_data_block_position(i)");
+            Skip_S2(16,                                         "crc_check");
+        Element_End0();
+
+        for(int i=0; i<=num_raw_data_blocks; i++)
+        {
+            raw_data_block();
+            if (!protection_absent)
+            {
+                Element_Begin1("adts_raw_data_block_error_check");
+                    Skip_BS(16,                                 "crc_check");
+                Element_End0();
+            }
+        }
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::adts_fixed_header()
+{
+    //Parsing
+    bool    id;
+    Element_Begin1("adts_fixed_header");
+    Skip_BS(12,                                                 "syncword");
+    Get_SB (    id,                                             "id"); Param_Info1(Aac_Adts_ID[id]);
+    Skip_BS( 2,                                                 "layer");
+    Get_SB (    protection_absent,                              "protection_absent");
+    Get_S1 ( 2, audioObjectType,                                "profile_ObjectType"); audioObjectType++; Param_Info1(Aac_audioObjectType(audioObjectType));
+    Get_S1 ( 4, sampling_frequency_index,                       "sampling_frequency_index"); Param_Info2(Aac_sampling_frequency[sampling_frequency_index], " Hz");
+    sampling_frequency=Aac_sampling_frequency[sampling_frequency_index];
+    Skip_SB(                                                    "private");
+    Get_S1 ( 3, channelConfiguration,                           "channel_configuration");
+    Skip_SB(                                                    "original");
+    Skip_SB(                                                    "home");
+    Element_End0();
+
+    FILLING_BEGIN();
+        if (Infos["Format"].empty())
+        {
+            Infos_General["Format"].From_Local("ADTS");
+
+            Infos["Format"].From_Local("AAC");
+            Infos["Format_Version"].From_Local(id?"Version 2":"Version 4");
+            Infos["Format_Profile"].From_Local(Aac_Format_Profile(audioObjectType));
+            Infos["Codec"].From_Local(Aac_audioObjectType(audioObjectType));
+            Infos["SamplingRate"].From_Number(Aac_sampling_frequency[sampling_frequency_index]);
+            Infos["Channel(s)"].From_Number(channelConfiguration);
+            Infos["ChannelPositions"].From_Local(Aac_ChannelConfiguration[channelConfiguration]);
+            Infos["ChannelPositions/String2"].From_Local(Aac_ChannelConfiguration2[channelConfiguration]);
+            if (IsSub)
+                Infos["MuxingMode"].From_Local("ADTS");
+        }
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::adts_variable_header()
+{
+    //Parsing
+    int16u  aac_frame_length, adts_buffer_fullness;
+    Element_Begin1("adts_variable_header");
+    Skip_SB(                                                    "copyright_id");
+    Skip_SB(                                                    "copyright_id_start");
+    Get_S2 (13, aac_frame_length,                               "aac_frame_length");
+    Get_S2 (11, adts_buffer_fullness,                           "adts_buffer_fullness"); Param_Info1(adts_buffer_fullness==0x7FF?"VBR":"CBR");
+    Get_S1 ( 2, num_raw_data_blocks,                            "num_raw_data_blocks");
+    Element_End0();
+
+    FILLING_BEGIN();
+        aac_frame_lengths.push_back(aac_frame_length);
+
+        if (adts_buffer_fullness==0x7FF)
+            Infos["BitRate_Mode"].From_Local("VBR");
+        else
+        {
+            //Calculating
+            int64u aac_frame_length_Total=0;
+            for (size_t Pos=0; Pos<aac_frame_lengths.size(); Pos++)
+                aac_frame_length_Total+=aac_frame_lengths[Pos];
+
+            int64u BitRate=(Aac_sampling_frequency[sampling_frequency_index]/1024);
+            BitRate*=aac_frame_length_Total*8;
+            BitRate/=aac_frame_lengths.size();
+
+            //Filling
+            Infos["BitRate_Mode"].From_Local("CBR");
+            Infos["BitRate"].From_Number(BitRate);
+        }
+    FILLING_END();
+}
+
+//***************************************************************************
+// C++
+//***************************************************************************
+
+} //NameSpace
+
+#endif //MEDIAINFO_AAC_YES
+

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Aac_Others.cpp Added

@@ -0,0 +1,472 @@
+// File_aac - Info for AAC files
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_AAC_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Audio/File_Aac.h"
+#if defined(MEDIAINFO_RIFF_YES)
+    #include "MediaInfo/Multiple/File_Riff.h"
+#endif
+#include <cmath>
+using namespace std;
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Speech coding (HVXC)
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Aac::HvxcSpecificConfig()
+{
+    Element_Begin1("HvxcSpecificConfig");
+    bool isBaseLayer;
+    Get_SB(isBaseLayer,                                         "isBaseLayer");
+    if (isBaseLayer)
+        HVXCconfig();
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::HVXCconfig()
+{
+    Element_Begin1("HVXCconfig");
+    Skip_SB(                                                    "HVXCvarMode");
+    Skip_S1(2,                                                  "HVXCrateMode");
+    Skip_SB(                                                    "extensionFlag");
+    //~ if (extensionFlag) {
+        /*< to be defined in MPEG-4 Version 2 >*/
+    //~ }
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::ErrorResilientHvxcSpecificConfig() {
+    Element_Begin1("ErrorResilientHvxcSpecificConfig");
+    bool isBaseLayer;
+    Get_SB(isBaseLayer,"isBaseLayer");
+    if (isBaseLayer) {
+        ErHVXCconfig();
+    }
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::ErHVXCconfig()
+{
+    Element_Begin1("ErHVXCconfig");
+    bool extensionFlag;
+    Skip_SB(                                                    "HVXCvarMode");
+    Skip_S1(2,                                                  "HVXCrateMode");
+    Get_SB (extensionFlag,                                      "extensionFlag");
+
+    if (extensionFlag) {
+        Skip_SB(                                                "var_ScalableFlag");
+    }
+    Element_End0();
+}
+
+//***************************************************************************
+// Speech Coding (CELP)
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Aac::CelpSpecificConfig ()
+{
+    Element_Begin1("CelpSpecificConfig");
+    bool isBaseLayer;
+    Get_SB(isBaseLayer,                                         "isBaseLayer");
+    if (isBaseLayer)
+    {
+        CelpHeader ();
+    }
+    else
+    {
+        bool isBWSLayer;
+        Get_SB(isBWSLayer,                                      "isBWSLayer");
+        if (isBWSLayer)
+        {
+            //~ CelpBWSenhHeader ()
+            //~ {
+            Skip_S1(2,                                          "BWS_configuration");
+            //~ }
+
+        }
+        else
+        {
+            Skip_S1(2,                                          "CELP-BRS-id");
+        }
+    }
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::CelpHeader ()
+{
+    Element_Begin1("CelpHeader");
+    bool ExcitationMode;
+    Get_SB(ExcitationMode,                                      "ExcitationMode");
+    Skip_SB(                                                    "SampleRateMode");
+    Skip_SB(                                                    "FineRateControl");
+    if (ExcitationMode == 1/*RPE*/)
+    {
+        Skip_S1(3,                                              "RPE_Configuration");
+    }
+    if (ExcitationMode == 0/*MPE*/)
+    {
+        Skip_S1(5,                                              "MPE_Configuration");
+        Skip_S1(2,                                              "NumEnhLayers");
+        Skip_SB(                                                "BandwidthScalabilityMode");
+    }
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::ErrorResilientCelpSpecificConfig ()
+{
+    Element_Begin1("ErrorResilientCelpSpecificConfig");
+    bool isBaseLayer;
+    Get_SB(isBaseLayer,                                         "isBaseLayer");
+    if (isBaseLayer)
+    {
+        ER_SC_CelpHeader ();
+    }
+    else
+    {
+        bool isBWSLayer;
+        Get_SB(isBWSLayer,                                      "isBWSLayer");
+        if (isBWSLayer)
+        {
+            //~ CelpBWSenhHeader ()
+            //~ {
+            Skip_S1(2,                                          "BWS_configuration");
+            //~ }
+
+        }
+        else
+        {
+            Skip_S1(2,                                          "CELP-BRS-id");
+        }
+    }
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::ER_SC_CelpHeader ()
+{
+    Element_Begin1("ER_SC_CelpHeader");
+    bool ExcitationMode;
+    Get_SB(ExcitationMode,                                      "ExcitationMode");
+    Skip_SB(                                                    "SampleRateMode");
+    Skip_SB(                                                    "FineRateControl");
+    Skip_SB(                                                    "SilenceCompression");
+
+    if (ExcitationMode == 1/*RPE*/) {
+        Skip_S1(3,                                              "RPE_Configuration");
+    }
+    if (ExcitationMode == 0/*MPE*/) {
+        Skip_S1(5,                                              "MPE_Configuration");
+        Skip_S1(2,                                              "NumEnhLayers");
+        Skip_SB(                                                "BandwidthScalabilityMode");
+    }
+    Element_End0();
+}
+
+//***************************************************************************
+// Structured Audio (SA)
+//***************************************************************************
+
+//***************************************************************************
+// Text to Speech Interface (TTSI)
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Aac::TTSSpecificConfig()
+{
+    Element_Begin1("TTSSpecificConfig");
+    //~ TTS_Sequence()
+    //~ {
+    Skip_S1(5,                                                  "TTS_Sequence_ID");
+    Skip_BS(18,                                                 "Language_Code");
+    Skip_SB(                                                    "Gender_Enable");
+    Skip_SB(                                                    "Age_Enable");
+    Skip_SB(                                                    "Speech_Rate_Enable");
+    Skip_SB(                                                    "Prosody_Enable");
+    Skip_SB(                                                    "Video_Enable");
+    Skip_SB(                                                    "Lip_Shape_Enable");
+    Skip_SB(                                                    "Trick_Mode_Enable");
+    //~ }
+    Element_End0();
+}
+
+//***************************************************************************
+// Parametric Audio (HILN)
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Aac::HILNconfig()
+{
+    Element_Begin1("HILNconfig");
+    Skip_SB(                                                    "HILNquantMode");
+    Skip_S1(8,                                                  "HILNmaxNumLine");
+    Skip_S1(4,                                                  "HILNsampleRateCode");
+    Skip_S2(12,                                                 "HILNframeLength");
+    Skip_S1(2,                                                  "HILNcontMode");
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::HILNenexConfig()
+{
+    Element_Begin1("HILNenexConfig");
+    bool HILNenhaLayer;
+    Get_SB(HILNenhaLayer,                                       "HILNenhaLayer");
+    if (HILNenhaLayer)
+        Skip_S1(2,                                              "HILNenhaQuantMode");
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::ParametricSpecificConfig()
+{
+    Element_Begin1("ParametricSpecificConfig");
+    bool isBaseLayer;
+    Get_SB(isBaseLayer,                                         "isBaseLayer");
+    if (isBaseLayer)
+        PARAconfig();
+    else
+        HILNenexConfig();
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Aac::PARAconfig()
+{
+    Element_Begin1("PARAconfig");
+    int8u PARAmode;
+    Get_S1(2,PARAmode,                                          "PARAmode");
+    if (PARAmode != 1)
+        ErHVXCconfig();
+    if (PARAmode != 0)
+        HILNconfig();
+    bool PARAextensionFlag;
+    Get_SB(PARAextensionFlag,                                   "PARAextensionFlag");
+    if (PARAextensionFlag) {
+        /* to be defined in MPEG-4 Phase 3 */
+    }
+    Element_End0();
+}
+
+//***************************************************************************
+// Technical description of parametric coding for high quality audio
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Aac::SSCSpecificConfig ()
+{
+    Element_Begin1("SSCSpecificConfig");
+    Skip_S1(2,"decoder_level");
+    Skip_S1(4,"update_rate");
+    Skip_S1(2,"synthesis_method");
+    if (channelConfiguration != 1)
+    {
+        int8u mode_ext;
+        Get_S1(2,mode_ext,"mode_ext");
+        if ((channelConfiguration == 2) && (mode_ext == 1))
+        {
+            /*reserved*/
+        }
+    }
+    Element_End0();
+}
+
+//***************************************************************************
+// MPEG-1/2 Audio
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Aac::MPEG_1_2_SpecificConfig()
+{
+    Element_Begin1("MPEG_1_2_SpecificConfig");
+    Skip_SB(                                                    "extension");
+    Element_End0();
+}
+
+//***************************************************************************
+// Technical description of lossless coding of oversampled audio
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Aac::DSTSpecificConfig()
+{
+    Element_Begin1("DSTSpecificConfig");
+    Skip_SB("DSDDST_Coded");
+    Skip_S2(14,"N_Channels");
+    Skip_SB("reserved");
+    Element_End0();
+}
+
+//***************************************************************************
+// Audio Lossless
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Aac::ALSSpecificConfig()
+{
+    //Not in spec, but something weird in the example I have
+    int32u Junk;
+    while (Data_BS_Remain())
+    {
+        Peek_S4(32, Junk);
+        if (Junk!=0x414C5300)
+        {
+            Skip_SB(                                            "Unknown");
+        }
+        else
+            break;
+    }
+    if (Data_BS_Remain()==0)
+        return; //There is a problem
+
+    Element_Begin1("ALSSpecificConfig");
+    bool chan_config,chan_sort,crc_enabled,aux_data_enabled;
+    int32u samp_freq, samples;
+    int16u channels,frame_length;
+    int8u ra_flag,random_access, file_type;
+    Skip_BS(32,"als_id");
+    Get_BS (32, samp_freq,                                      "samp_freq");
+    Get_BS (32, samples,                                        "samples");
+    Get_S2 (16, channels,                                       "channels"); Param_Info2(channels+1, " channel(s)");
+    Get_S1 (3, file_type,                                       "file_type");
+    Skip_S1(3,"resolution");
+    Skip_SB("floating");
+    Skip_SB("msb_first");
+    Get_S2 (16,frame_length,"frame_length");
+    Get_S1 (8,random_access,"random_access");
+    Get_S1 (2,ra_flag,"ra_flag");
+    Skip_SB("adapt_order");
+    Skip_S1(2,"coef_table");
+    Skip_SB("long_term_prediction");
+    Skip_S2(10,"max_order");
+    Skip_S1(2,"block_switching");
+    Skip_SB("bgmc_mode");
+    Skip_SB("sb_part");
+    Skip_SB("joint_stereo");
+    Skip_SB("mc_coding");
+    Get_SB (chan_config,"chan_config");
+    Get_SB (chan_sort,"chan_sort");
+    Get_SB (crc_enabled,"crc_enabled");
+    Skip_SB("RLSLMS");
+    Skip_BS(5,"(reserved)");
+    Get_SB (aux_data_enabled,"aux_data_enabled");
+    if (chan_config)
+        Skip_S2(16,"chan_config_info");
+    if (chan_sort)
+    {
+        int16u ChBits=(int16u)ceil(log((double)(channels+1))/log((double)2));
+        for (int8u c=0; c<=channels; c++)
+            Skip_BS(ChBits,                                     "chan_pos[c]");
+    }
+    if(Data_BS_Remain()%8)
+        Skip_S1(Data_BS_Remain()%8,                             "byte_align");
+    BS_End();
+    int32u header_size,trailer_size;
+    Get_B4(header_size,                                         "header_size");
+    Get_B4(trailer_size,                                        "trailer_size");
+    #ifdef MEDIAINFO_RIFF_YES
+    if (file_type==1) //WAVE file
+    {
+        Element_Begin1("orig_header");
+        File_Riff MI;
+        Open_Buffer_Init(&MI);
+        Open_Buffer_Continue(&MI, Buffer+Buffer_Offset+(size_t)Element_Offset, header_size);
+        Element_Offset+=header_size;
+        File__Analyze::Finish(&MI); //No merge of data, only for trace information, because this is the data about the decoded stream, not the encoded stream
+        Element_End0();
+    }
+    else
+    #endif //MEDIAINFO_RIFF_YES
+        Skip_XX(header_size,                                    "orig_header[]");
+
+    Skip_XX(trailer_size,                                       "orig_trailer[]");
+    if (crc_enabled)
+        Skip_B4(                                                "crc");
+    if ((ra_flag == 2) && (random_access > 0))
+        for (int32u f=0; f<((samples-1)/(frame_length+1))+1; f++)
+            Skip_B4(                                            "ra_unit_size[f]");
+    if (aux_data_enabled)
+    {
+        int32u aux_size;
+        Get_B4(aux_size,                                        "aux_size");
+        Skip_XX(aux_size,                                       "aux_data[]");
+    }
+    Element_End0();
+    BS_Begin(); //To be in sync with other objectTypes
+
+    FILLING_BEGIN();
+        //Filling
+        File__Analyze::Stream_Prepare(Stream_Audio);
+        Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, channels+1);
+
+        //Forcing default confignuration (something weird in the example I have)
+        channelConfiguration=0;
+        sampling_frequency_index=(int8u)-1;
+        sampling_frequency=samp_freq;
+    FILLING_END();
+}
+
+//***************************************************************************
+// Scalable lossless
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Aac::SLSSpecificConfig()
+{
+    Element_Begin1("SLSSpecificConfig");
+    Skip_S1(3,"pcmWordLength");
+    Skip_SB("aac_core_present");
+    Skip_SB("lle_main_stream");
+    Skip_SB("reserved_bit");
+    Skip_S1(3,"frameLength");
+    if (!channelConfiguration)
+        program_config_element();
+    Element_End0();
+}
+
+} //NameSpace
+
+#endif //MEDIAINFO_AAC_YES
+

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Ac3.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Ac3.cpp Changed

@@ -1,30 +1,34 @@
 // File_Ac3 - Info for AC3 files
-// Copyright (C) 2004-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2004-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
 //***************************************************************************
 // Infos (Common)
 //***************************************************************************
@@ -44,7 +48,7 @@
 { 48000,  44100,  32000,      0,};
 
 //---------------------------------------------------------------------------
-extern const char*  AC3_Mode[]=
+const char*  AC3_Mode[]=
 {
     "CM (complete main)",
     "ME (music and effects)",
@@ -57,11 +61,11 @@
 };
 
 //---------------------------------------------------------------------------
-extern const char*  AC3_Surround[]=
+const char*  AC3_Surround[]=
 {
     "",
-    "(No surround)",
-    "(Surround)",
+    "Not Dolby Surround encoded",
+    "Dolby Surround encoded",
     "",
 };
 
@@ -431,9 +435,9 @@
 
     Ztring Text;
     Text+=Ztring::ToZtring(Front);
-    Text+=_T('/')+Ztring::ToZtring(Surround);
-    Text+=_T('/')+Ztring::ToZtring(Rear);
-    Text+=_T('.')+Ztring::ToZtring(LFE);
+    Text+=__T('/')+Ztring::ToZtring(Surround);
+    Text+=__T('/')+Ztring::ToZtring(Rear);
+    Text+=__T('.')+Ztring::ToZtring(LFE);
     return Text;
 }
 
@@ -504,34 +508,51 @@
 :File__Analyze()
 {
     //Configuration
+    #if MEDIAINFO_EVENTS
+        ParserIDs[0]=MediaInfo_Parser_Ac3;
+        StreamIDs_Width[0]=0;
+    #endif //MEDIAINFO_EVENTS
+    #if MEDIAINFO_TRACE
+        Trace_Layers_Update(8); //Stream
+    #endif //MEDIAINFO_TRACE
     MustSynchronize=true;
     Buffer_TotalBytes_FirstSynched_Max=32*1024;
+    Buffer_TotalBytes_Fill_Max=1024*1024;
     PTS_DTS_Needed=true;
+    IsRawStream=true;
+    Frame_Count_NotParsedIncluded=0;
 
     //In
     Frame_Count_Valid=MediaInfoLib::Config.ParseSpeed_Get()>=0.3?32:2;
     MustParse_dac3=false;
     MustParse_dec3=false;
+    CalculateDelay=false;
+
+    //Buffer
+    Save_Buffer=NULL;
 
     //Temp
-    Frame_Count=0;
-    HD_Count=0;
     chanmap=0;
     frmsiz=0;
     fscod=0;
     fscod2=0;
     frmsizecod=0;
-    bsid=0;
+    bsid=(int8u)-1;
     bsmod=0;
     acmod=0;
     dsurmod=0;
-    numblks=0;
+    numblkscod=0;
     lfeon=false;
     dxc3_Parsed=false;
     HD_MajorSync_Parsed=false;
-    HD_AlreadyCounted=false;
     Core_IsPresent=false;
+    HD_IsPresent=false;
     dynrnge_Exists=false;
+    TimeStamp_IsPresent=false;
+    TimeStamp_IsParsing=false;
+    TimeStamp_Parsed=false;
+    TimeStamp_DropFrame_IsValid=false;
+    BigEndian=true;
 }
 
 //***************************************************************************
@@ -549,24 +570,27 @@
 
         if (HD_StreamType==0xBA) //TrueHD
         {
-            Fill(Stream_General, 0, General_Format_Profile, "TrueHD");
-            Fill(Stream_General, 0, General_Format_Profile, "Core");
-            Fill(Stream_Audio, 0, Audio_Format_Profile, "TrueHD");
-            Fill(Stream_Audio, 0, Audio_Format_Profile, "Core");
+            Fill(Stream_General, 0, General_Format, "TrueHD");
+            Fill(Stream_Audio, 0, Audio_Format, "TrueHD");
+
             Fill(Stream_Audio, 0, Audio_Codec, "TrueHD");
             Fill(Stream_Audio, 0, Audio_BitRate_Mode, "VBR");
-            Fill(Stream_Audio, 0, Audio_BitRate, "Variable");
             Fill(Stream_Audio, 0, Audio_SamplingRate, AC3_HD_SamplingRate(HD_SamplingRate1));
             Fill(Stream_Audio, 0, Audio_Channel_s_, AC3_TrueHD_Channels(HD_Channels2));
             Fill(Stream_Audio, 0, Audio_ChannelPositions, AC3_TrueHD_Channels_Positions(HD_Channels2));
             Fill(Stream_Audio, 0, Audio_ChannelPositions_String2, AC3_TrueHD_Channels_Positions2(HD_Channels2));
-            if (!IsSub)
+            if (Core_IsPresent && !IsSub)
                 Fill(Stream_Audio, 0, Audio_MuxingMode, "After core data");
         }
 
         if (HD_StreamType==0xBB) //TrueHD
         {
             Fill(Stream_General, 0, General_Format, "MLP");
+            if (!Core_IsPresent)
+            {
+                Fill(Stream_Audio, 0, Audio_Format, "MLP");
+                Fill(Stream_Audio, 0, Audio_Codec,  "MLP");
+            }
             Fill(Stream_Audio, 0, Audio_BitRate_Mode, "VBR");
             Fill(Stream_Audio, 0, Audio_SamplingRate, AC3_HD_SamplingRate(HD_SamplingRate2));
             if (HD_SamplingRate1!=HD_SamplingRate2)
@@ -574,38 +598,35 @@
             Fill(Stream_Audio, 0, Audio_Channel_s_, AC3_MLP_Channels[HD_Channels1]);
             if (HD_Channels1!=HD_Channels2)
                 Fill(Stream_Audio, 0, Audio_Channel_s_, AC3_MLP_Channels[HD_Channels1]);
-            Fill(Stream_Audio, 0, Audio_Resolution, AC3_MLP_Resolution[HD_Resolution2]);
+            Fill(Stream_Audio, 0, Audio_BitDepth, AC3_MLP_Resolution[HD_Resolution2]);
             if (HD_Resolution1!=HD_Resolution2)
-                Fill(Stream_Audio, 0, Audio_Resolution, AC3_MLP_Resolution[HD_Resolution1]);
+                Fill(Stream_Audio, 0, Audio_BitDepth, AC3_MLP_Resolution[HD_Resolution1]);
         }
     }
 
-    //MLP
-    if (!Core_IsPresent)
-    {
-        Fill(Stream_Audio, 0, Audio_Format, "MLP");
-        Fill(Stream_Audio, 0, Audio_Codec,  "MLP");
-    }
-
     //AC-3
-    else if (bsid<=0x08)
+    if (bsid<=0x08)
     {
         if (Count_Get(Stream_Audio)==0)
-        {
             Stream_Prepare(Stream_Audio);
-            Fill(Stream_Audio, 0, Audio_Codec, "AC3");
-        }
+        Fill(Stream_General, 0, General_Format, "AC-3");
         Fill(Stream_Audio, 0, Audio_Format, "AC-3");
-        Fill(Stream_Audio, 0, Audio_Resolution, 16);
+        Fill(Stream_Audio, 0, Audio_Codec, "AC3");
+        Fill(Stream_Audio, 0, Audio_BitDepth, 16);
 
         if (Ztring::ToZtring(AC3_SamplingRate[fscod])!=Retrieve(Stream_Audio, 0, Audio_SamplingRate))
             Fill(Stream_Audio, 0, Audio_SamplingRate, AC3_SamplingRate[fscod]);
         if (frmsizecod/2<19)
         {
+            if (Info_HD.Frame_Count)
+                Fill(Stream_Audio, 0, Audio_BitRate, "Unknown");
             int32u BitRate=AC3_BitRate[frmsizecod/2]*1000;
             Fill(Stream_Audio, 0, Audio_BitRate, BitRate);
-            if (Buffer_TotalBytes_FirstSynched>100 && BitRate>0)
+            if (CalculateDelay && Buffer_TotalBytes_FirstSynched>100 && BitRate>0)
+            {
                 Fill(Stream_Audio, 0, Audio_Delay, (float)Buffer_TotalBytes_FirstSynched*8*1000/BitRate, 0);
+                Fill(Stream_Audio, 0, Audio_Delay_Source, "Stream");
+            }
         }
 
         if (acmod==0)
@@ -617,8 +638,8 @@
         if (lfeon)
         {
             Channels+=1;
-            ChannelPositions+=_T(", LFE");
-            ChannelPositions2+=_T(".1");
+            ChannelPositions+=__T(", LFE");
+            ChannelPositions2+=__T(".1");
         }
         if (Ztring::ToZtring(Channels)!=Retrieve(Stream_Audio, 0, Audio_Channel_s_))
             Fill(Stream_Audio, 0, Audio_Channel_s_, Channels);
@@ -631,18 +652,19 @@
             Fill(Stream_Audio, 0, Audio_Format_Profile, "Dolby Digital");
             Fill(Stream_Audio, 0, Audio_Codec_Profile, "Dolby Digital");
         }
-        if (_T("CBR")!=Retrieve(Stream_Audio, 0, Audio_BitRate_Mode))
+        if (__T("CBR")!=Retrieve(Stream_Audio, 0, Audio_BitRate_Mode))
             Fill(Stream_Audio, 0, Audio_BitRate_Mode, "CBR");
     }
 
     //E-AC-3
-    else if (bsid==0x10)
+    else if (bsid<=0x10)
     {
         Stream_Prepare(Stream_Audio);
         Fill(Stream_Audio, 0, Audio_Format, "E-AC-3");
         Fill(Stream_Audio, 0, Audio_Codec, "AC3+");
 
         Fill(Stream_Audio, 0, Audio_BitRate_Mode, "CBR");
+        int8u numblks=numblkscod==3?6:numblkscod+1;
         if (numblks>0)
             Fill(Stream_Audio, 0, Audio_BitRate, ((frmsiz*2+2)*8*(750/numblks))/4);
 
@@ -663,7 +685,7 @@
             if (lfeon)
             {
                 Channels+=1;
-                ChannelPositions+=_T(", LFE");
+                ChannelPositions+=__T(", LFE");
             }
             Fill(Stream_Audio, 0, Audio_Channel_s_, Channels);
             Fill(Stream_Audio, 0, Audio_ChannelPositions, ChannelPositions);
@@ -674,39 +696,61 @@
     {
         //Filling Maximum bitrate with the constant core bitrate for better coherancy
         ZtringList List;
-        List.Separator_Set(0, _T(" / "));
+        List.Separator_Set(0, __T(" / "));
         List.Write(Retrieve(Stream_Audio, 0, Audio_BitRate));
         if (List.size()>=2)
             Fill(Stream_Audio, 0, Audio_BitRate_Maximum, List[1]);
     }
 
     //Dolby Metadata
-    Fill(Stream_Audio, 0, "dialnorm", FirstFrame_Dolby.dialnorm==0?-31:-FirstFrame_Dolby.dialnorm);
-    (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dialnorm"), Info_Options)=_T("N NT");
-    Fill(Stream_Audio, 0, "dialnorm/String", Ztring::ToZtring(FirstFrame_Dolby.dialnorm==0?-31:-FirstFrame_Dolby.dialnorm)+_T(" dB"));
-    (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dialnorm/String"), Info_Options)=_T("N NT");
-    if (FirstFrame_Dolby.compre)
+    if (Core_IsPresent)
     {
-        float64 Value=AC3_compr[FirstFrame_Dolby.compr>>4]+20*std::log10(((float)(0x10+(FirstFrame_Dolby.compr&0x0F)))/32);
-        Fill(Stream_Audio, 0, "compr", Value, 2);
-        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("compr"), Info_Options)=_T("N NT");
-        Fill(Stream_Audio, 0, "compr/String", Ztring::ToZtring(Value, 2)+_T(" dB"));
-        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("compr/String"), Info_Options)=_T("N NT");
+        //Endianess
+        Fill(Stream_Audio, 0, Audio_Format_Settings_Endianness, BigEndian?"Big":"Little");
+
+        if (acmod==2)
+        {
+            Fill(Stream_Audio, 0, "dsurmod", dsurmod);
+            (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dsurmod"), Info_Options)=__T("N NT");
+            Fill(Stream_Audio, 0, "dsurmod/String", AC3_Surround[dsurmod]);
+            (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dsurmod/String"), Info_Options)=__T("N NT");
+        }
+        Fill(Stream_Audio, 0, "dialnorm", FirstFrame_Dolby.dialnorm==0?-31:-FirstFrame_Dolby.dialnorm);
+        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dialnorm"), Info_Options)=__T("N NT");
+        Fill(Stream_Audio, 0, "dialnorm/String", Ztring::ToZtring(FirstFrame_Dolby.dialnorm==0?-31:-FirstFrame_Dolby.dialnorm)+__T(" dB"));
+        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dialnorm/String"), Info_Options)=__T("N NT");
+        if (FirstFrame_Dolby.compre)
+        {
+            float64 Value=AC3_compr[FirstFrame_Dolby.compr>>4]+20*std::log10(((float)(0x10+(FirstFrame_Dolby.compr&0x0F)))/32);
+            Fill(Stream_Audio, 0, "compr", Value, 2);
+            (*Stream_More)[Stream_Audio][0](Ztring().From_Local("compr"), Info_Options)=__T("N NT");
+            Fill(Stream_Audio, 0, "compr/String", Ztring::ToZtring(Value, 2)+__T(" dB"));
+            (*Stream_More)[Stream_Audio][0](Ztring().From_Local("compr/String"), Info_Options)=__T("N NT");
+        }
+        if (FirstFrame_Dolby.dynrnge)
+        {
+            float64 Value;
+            if (FirstFrame_Dolby.dynrng==0)
+                Value=0; //Special case in the formula
+            else
+                Value=AC3_dynrng[FirstFrame_Dolby.dynrng>>5]+20*std::log10(((float)(0x20+(FirstFrame_Dolby.dynrng&0x1F)))/64);
+            Fill(Stream_Audio, 0, "dynrng", Value, 2);
+            (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dynrng"), Info_Options)=__T("N NT");
+            Fill(Stream_Audio, 0, "dynrng/String", Ztring::ToZtring(Value, 2)+__T(" dB"));
+            (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dynrng/String"), Info_Options)=__T("N NT");
+        }
+        Fill(Stream_Audio, 0, "bsid", bsid);
+        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("bsid"), Info_Options)=__T("N NT");
     }
-    if (FirstFrame_Dolby.dynrnge)
+
+    //TimeStamp
+    if (TimeStamp_IsPresent)
     {
-        float64 Value;
-        if (FirstFrame_Dolby.dynrng==0)
-            Value=0; //Special case in the formula
-        else
-            Value=AC3_dynrng[FirstFrame_Dolby.dynrng>>5]+20*std::log10(((float)(0x20+(FirstFrame_Dolby.dynrng&0x1F)))/64);
-        Fill(Stream_Audio, 0, "dynrng", Value, 2);
-        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dynrng"), Info_Options)=_T("N NT");
-        Fill(Stream_Audio, 0, "dynrng/String", Ztring::ToZtring(Value, 2)+_T(" dB"));
-        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dynrng/String"), Info_Options)=_T("N NT");
+        Fill(Stream_Audio, 0, Audio_Delay, TimeStamp_Content*1000, 0);
+        Fill(Stream_Audio, 0, Audio_Delay_Source, "Stream");
+        if (TimeStamp_DropFrame_IsValid)
+            Fill(Stream_Audio, 0, Audio_Delay_Settings, TimeStamp_DropFrame_Content?"drop_frame_flag=1":"drop_frame_flag=0");
     }
-    Fill(Stream_Audio, 0, "bsid", bsid);
-    (*Stream_More)[Stream_Audio][0](Ztring().From_Local("bsid"), Info_Options)=_T("N NT");
 }
 
 //---------------------------------------------------------------------------
@@ -719,7 +763,7 @@
         int8u Maximum_Raw=31;
         float64 Sum_Intensity=0;
         int64u Count=0;
-        for (int8u Pos=0; Pos<dialnorms.size(); Pos++)
+        for (int8u Pos=0; (size_t)Pos<dialnorms.size(); Pos++)
             if (dialnorms[Pos])
             {
                 if (Minimum_Raw<(Pos==0?31:Pos))
@@ -731,19 +775,19 @@
             }
         float64 Average_dB=log10(Sum_Intensity/Count)*10;
         Fill(Stream_Audio, 0, "dialnorm_Average", Average_dB, 0);
-        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dialnorm_Average"), Info_Options)=_T("N NT");
-        Fill(Stream_Audio, 0, "dialnorm_Average/String", Ztring::ToZtring(Average_dB, 0)+_T(" dB"));
-        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dialnorm_Average/String"), Info_Options)=_T("N NT");
+        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dialnorm_Average"), Info_Options)=__T("N NT");
+        Fill(Stream_Audio, 0, "dialnorm_Average/String", Ztring::ToZtring(Average_dB, 0)+__T(" dB"));
+        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dialnorm_Average/String"), Info_Options)=__T("N NT");
         Fill(Stream_Audio, 0, "dialnorm_Minimum", -Minimum_Raw);
-        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dialnorm_Minimum"), Info_Options)=_T("N NT");
-        Fill(Stream_Audio, 0, "dialnorm_Minimum/String", Ztring::ToZtring(-Minimum_Raw)+_T(" dB"));
-        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dialnorm_Minimum/String"), Info_Options)=_T("N NT");
+        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dialnorm_Minimum"), Info_Options)=__T("N NT");
+        Fill(Stream_Audio, 0, "dialnorm_Minimum/String", Ztring::ToZtring(-Minimum_Raw)+__T(" dB"));
+        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dialnorm_Minimum/String"), Info_Options)=__T("N NT");
         Fill(Stream_Audio, 0, "dialnorm_Maximum", -Maximum_Raw);
-        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dialnorm_Maximum"), Info_Options)=_T("N NT");
-        Fill(Stream_Audio, 0, "dialnorm_Maximum/String", Ztring::ToZtring(-Maximum_Raw)+_T(" dB"));
-        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dialnorm_Maximum/String"), Info_Options)=_T("N NT");
+        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dialnorm_Maximum"), Info_Options)=__T("N NT");
+        Fill(Stream_Audio, 0, "dialnorm_Maximum/String", Ztring::ToZtring(-Maximum_Raw)+__T(" dB"));
+        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dialnorm_Maximum/String"), Info_Options)=__T("N NT");
         Fill(Stream_Audio, 0, "dialnorm_Count", Count);
-        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dialnorm_Count"), Info_Options)=_T("N NT");
+        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dialnorm_Count"), Info_Options)=__T("N NT");
     }
     if (!comprs.empty())
     {
@@ -764,19 +808,19 @@
             }
         float64 Average_dB=log10(Sum_Intensity/Count)*10;
         Fill(Stream_Audio, 0, "compr_Average", Average_dB, 2);
-        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("compr_Average"), Info_Options)=_T("N NT");
-        Fill(Stream_Audio, 0, "compr_Average/String", Ztring::ToZtring(Average_dB, 2)+_T(" dB"));
-        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("compr_Average/String"), Info_Options)=_T("N NT");
+        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("compr_Average"), Info_Options)=__T("N NT");
+        Fill(Stream_Audio, 0, "compr_Average/String", Ztring::ToZtring(Average_dB, 2)+__T(" dB"));
+        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("compr_Average/String"), Info_Options)=__T("N NT");
         Fill(Stream_Audio, 0, "compr_Minimum", Minimum_dB, 2);
-        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("compr_Minimum"), Info_Options)=_T("N NT");
-        Fill(Stream_Audio, 0, "compr_Minimum/String", Ztring::ToZtring(Minimum_dB, 2)+_T(" dB"));
-        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("compr_Minimum/String"), Info_Options)=_T("N NT");
+        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("compr_Minimum"), Info_Options)=__T("N NT");
+        Fill(Stream_Audio, 0, "compr_Minimum/String", Ztring::ToZtring(Minimum_dB, 2)+__T(" dB"));
+        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("compr_Minimum/String"), Info_Options)=__T("N NT");
         Fill(Stream_Audio, 0, "compr_Maximum", Maximum_dB, 2);
-        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("compr_Maximum"), Info_Options)=_T("N NT");
-        Fill(Stream_Audio, 0, "compr_Maximum/String", Ztring::ToZtring(Maximum_dB, 2)+_T(" dB"));
-        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("compr_Maximum/String"), Info_Options)=_T("N NT");
+        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("compr_Maximum"), Info_Options)=__T("N NT");
+        Fill(Stream_Audio, 0, "compr_Maximum/String", Ztring::ToZtring(Maximum_dB, 2)+__T(" dB"));
+        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("compr_Maximum/String"), Info_Options)=__T("N NT");
         Fill(Stream_Audio, 0, "compr_Count", Count);
-        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("compr_Count"), Info_Options)=_T("N NT");
+        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("compr_Count"), Info_Options)=__T("N NT");
     }
     if (dynrnge_Exists && !dynrngs.empty())
     {
@@ -801,19 +845,19 @@
             }
         float64 Average_dB=log10(Sum_Intensity/Count)*10;
         Fill(Stream_Audio, 0, "dynrng_Average", Average_dB, 2);
-        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dynrng_Average"), Info_Options)=_T("N NT");
-        Fill(Stream_Audio, 0, "dynrng_Average/String", Ztring::ToZtring(Average_dB, 2)+_T(" dB"));
-        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dynrng_Average/String"), Info_Options)=_T("N NT");
+        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dynrng_Average"), Info_Options)=__T("N NT");
+        Fill(Stream_Audio, 0, "dynrng_Average/String", Ztring::ToZtring(Average_dB, 2)+__T(" dB"));
+        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dynrng_Average/String"), Info_Options)=__T("N NT");
         Fill(Stream_Audio, 0, "dynrng_Minimum", Minimum_dB, 2);
-        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dynrng_Minimum"), Info_Options)=_T("N NT");
-        Fill(Stream_Audio, 0, "dynrng_Minimum/String", Ztring::ToZtring(Minimum_dB, 2)+_T(" dB"));
-        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dynrng_Minimum/String"), Info_Options)=_T("N NT");
+        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dynrng_Minimum"), Info_Options)=__T("N NT");
+        Fill(Stream_Audio, 0, "dynrng_Minimum/String", Ztring::ToZtring(Minimum_dB, 2)+__T(" dB"));
+        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dynrng_Minimum/String"), Info_Options)=__T("N NT");
         Fill(Stream_Audio, 0, "dynrng_Maximum", Maximum_dB, 2);
-        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dynrng_Maximum"), Info_Options)=_T("N NT");
-        Fill(Stream_Audio, 0, "dynrng_Maximum/String", Ztring::ToZtring(Maximum_dB, 2)+_T(" dB"));
-        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dynrng_Maximum/String"), Info_Options)=_T("N NT");
+        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dynrng_Maximum"), Info_Options)=__T("N NT");
+        Fill(Stream_Audio, 0, "dynrng_Maximum/String", Ztring::ToZtring(Maximum_dB, 2)+__T(" dB"));
+        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dynrng_Maximum/String"), Info_Options)=__T("N NT");
         Fill(Stream_Audio, 0, "dynrng_Count", Count);
-        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dynrng_Count"), Info_Options)=_T("N NT");
+        (*Stream_More)[Stream_Audio][0](Ztring().From_Local("dynrng_Count"), Info_Options)=__T("N NT");
     }
 
     //Duration
@@ -825,17 +869,90 @@
             Frame_Count_ForDuration=Frame_Count; //We have the exact count of frames
             Fill(Stream_Audio, 0, Audio_StreamSize, File_Offset+Buffer_Offset+Element_Size-File_Offset_FirstSynched);
         }
-        else if (bsid<=8 && frmsizecods.size()==1 && fscods.size()==1)
+        else if (bsid<=8 && frmsizecods.size()==1 && fscods.size()==1 && Info_HD.Frame_Count==0)
         {
             int16u Size=AC3_FrameSize_Get(frmsizecods.begin()->first, fscods.begin()->first);
+            if (TimeStamp_IsPresent)
+                Size+=16;
             Frame_Count_ForDuration=(File_Size-File_Offset_FirstSynched)/Size; //Only complete frames
             Fill(Stream_Audio, 0, Audio_StreamSize, Frame_Count_ForDuration*Size);
         }
         if (Frame_Count_ForDuration)
-            Fill(Stream_Audio, 0, Audio_Duration, Frame_Count_ForDuration*32);
+        {
+            Clear(Stream_Audio, 0, Audio_BitRate);
+
+            //HD part
+            if (Info_HD.Frame_Count)
+            {
+                int32u HD_SamplingRate=AC3_HD_SamplingRate(HD_SamplingRate1);
+                if (HD_SamplingRate)
+                {
+                    int8u FrameDuration; //In samples
+                    if (HD_SamplingRate<44100)
+                        FrameDuration=0; //Unknown
+                    else if (HD_SamplingRate<=48000)
+                        FrameDuration=40;
+                    else if (HD_SamplingRate<=96000)
+                        FrameDuration=80;
+                    else if (HD_SamplingRate<=192000)
+                        FrameDuration=160;
+                    else
+                        FrameDuration=0; //Unknown
+                    if (FrameDuration)
+                    {
+                        int64u SamplingCount=Info_HD.Frame_Count*FrameDuration;
+                        Fill(Stream_Audio, 0, Audio_Duration, SamplingCount/(((float64)HD_SamplingRate)/1000), 0);
+                        Fill(Stream_Audio, 0, Audio_SamplingCount, SamplingCount);
+                        Fill(Stream_Audio, 0, Audio_BitRate, (File_Size-File_Offset_FirstSynched)/(SamplingCount/(((float64)HD_SamplingRate)/1000))*8, 0);
+                    }
+                    Fill(Stream_Audio, 0, Audio_FrameCount, Info_HD.Frame_Count);
+                }
+            }
+            if (Core_IsPresent)
+            {
+                Fill(Stream_Audio, 0, Audio_FrameCount, Frame_Count_ForDuration);
+                if (AC3_SamplingRate[fscod])
+                {
+                    float64 FrameDuration=((float64)(32*48000))/AC3_SamplingRate[fscod]; //32 ms for 48 KHz, else proportional (34.83 for 44.1 KHz, 48 ms for 32 KHz)
+                    Fill(Stream_Audio, 0, Audio_SamplingCount, Frame_Count_ForDuration*1536);
+                    Fill(Stream_Audio, 0, Audio_Duration, Frame_Count_ForDuration*FrameDuration, 0);
+                    int32u BitRate=AC3_BitRate[frmsizecod/2]*1000;
+                    Fill(Stream_Audio, 0, Audio_BitRate, BitRate);
+                }
+            }
+        }
+    }
+    else if (FrameInfo.PTS!=(int64u)-1 && FrameInfo.PTS>PTS_Begin)
+    {
+        Fill(Stream_Audio, 0, Audio_Duration, float64_int64s(((float64)(FrameInfo.PTS-PTS_Begin))/1000000));
+        Fill(Stream_Audio, 0, Audio_FrameCount, float64_int64s(((float64)(FrameInfo.PTS-PTS_Begin))/1000000/32));
     }
 }
 
+//---------------------------------------------------------------------------
+void File_Ac3::Read_Buffer_Unsynched()
+{
+    Info_Core.FrameInfo=FrameInfo;
+    Info_Core.Frame_Count_NotParsedIncluded=Frame_Count_NotParsedIncluded;
+    Info_HD.FrameInfo=FrameInfo;
+    Info_HD.Frame_Count_NotParsedIncluded=Frame_Count_NotParsedIncluded;
+
+    delete[] Save_Buffer; Save_Buffer=NULL;
+
+    if (File_GoTo==0)
+        Synched_Init();
+}
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_SEEK
+size_t File_Ac3::Read_Buffer_Seek (size_t Method, int64u Value, int64u /*ID*/)
+{
+    GoTo(0);
+    Open_Buffer_Unsynch();
+    return 1;
+}
+#endif //MEDIAINFO_SEEK
+
 //***************************************************************************
 // Buffer - Synchro
 //***************************************************************************
@@ -852,7 +969,7 @@
         return false; //Must wait for more data
 
     //False positives detection: detect Matroska files, AC-3 parser is not smart enough
-    if (CC4(Buffer)==0x1A45DFA3) //EBML
+    if (!FileHeader_Begin_0x000001())
     {
         Finish("AC-3");
         return false;
@@ -876,84 +993,99 @@
     //Synchronizing
     while (Buffer_Offset+8<=Buffer_Size)
     {
-        while (Buffer_Offset+8<=Buffer_Size)
-        {
-            if (CC2(Buffer+Buffer_Offset)==0x0B77) //AC-3
-                break; //while()
-            if (CC4(Buffer+Buffer_Offset+4)==0xF8726FBB) //MLP
-                break; //while()
-            Buffer_Offset++;
-        }
-
-        if (Buffer_Offset+8<=Buffer_Size && CC2(Buffer+Buffer_Offset)==0x0B77) //Testing if CRC is coherant
-        {
-            int8u bsid =CC1(Buffer+Buffer_Offset+5)>>3;
-            int16u Size=0;
-            if (bsid<=0x08)
-            {
-                int8u fscod     =(CC1(Buffer+Buffer_Offset+4)>>6)&0x03;
-                int8u frmsizecod=(CC1(Buffer+Buffer_Offset+4)   )&0x3F;
-                Size=AC3_FrameSize_Get(frmsizecod, fscod);
-            }
-            else if (bsid>0x0A && bsid<=0x10)
-            {
-                int16u frmsiz=CC2(Buffer+Buffer_Offset+2)&0x07FF;
-                Size=2+frmsiz*2;
-            }
-            if (Size>=6)
-            {
-                if (Buffer_Offset+Size>Buffer_Size)
-                    return false; //Need more data
-
-                //Testing
-                int16u CRC_16=0x0000;
-                const int8u* CRC_16_Buffer=Buffer+Buffer_Offset+2; //After syncword
-                while(CRC_16_Buffer<Buffer+Buffer_Offset+Size)
-                {
-                    CRC_16=(CRC_16<<8) ^ CRC_16_Table[(CRC_16>>8)^(*CRC_16_Buffer)];
-                    CRC_16_Buffer++;
-                }
-                if (CRC_16!=0x0000)
-                    Buffer_Offset++;
-                else
-                    break;
-            }
-            else
-                Buffer_Offset++;
-        }
-
-        if (Buffer_Offset+8<=Buffer_Size && CC4(Buffer+Buffer_Offset+4)==0xF8726FBB) //MLP
-        {
+        if (!FrameSynchPoint_Test())
+            return false; //Need more data
+        if (Synched)
             break;
-        }
+        Buffer_Offset++;
     }
 
     //Parsing last bytes if needed
     if (Buffer_Offset+8>Buffer_Size)
     {
-        if (Buffer_Offset+7==Buffer_Size && CC3(Buffer+Buffer_Offset+4)!=0xF8726F && CC2(Buffer+Buffer_Offset)!=0x0B77)
+        //We must keep more bytes in order to detect TimeStamp
+        if (Frame_Count==0)
+        {
+            if (Buffer_Offset>=16)
+                Buffer_Offset-=16;
+            else
+                Buffer_Offset=0;
+            return false;
+        }
+
+        if (Buffer_Offset+7==Buffer_Size && CC3(Buffer+Buffer_Offset+4)!=0xF8726F && CC2(Buffer+Buffer_Offset)!=0x0B77 && CC2(Buffer+Buffer_Offset)!=0x770B)
             Buffer_Offset++;
-        if (Buffer_Offset+6==Buffer_Size && CC2(Buffer+Buffer_Offset+4)!=0xF872   && CC2(Buffer+Buffer_Offset)!=0x0B77)
+        if (Buffer_Offset+6==Buffer_Size && CC2(Buffer+Buffer_Offset+4)!=0xF872   && CC2(Buffer+Buffer_Offset)!=0x0B77 && CC2(Buffer+Buffer_Offset)!=0x770B)
             Buffer_Offset++;
-        if (Buffer_Offset+5==Buffer_Size && CC1(Buffer+Buffer_Offset+4)!=0xF8     && CC2(Buffer+Buffer_Offset)!=0x0B77)
+        if (Buffer_Offset+5==Buffer_Size && CC1(Buffer+Buffer_Offset+4)!=0xF8     && CC2(Buffer+Buffer_Offset)!=0x0B77 && CC2(Buffer+Buffer_Offset)!=0x770B)
             Buffer_Offset++;
-        if (Buffer_Offset+4==Buffer_Size && CC2(Buffer+Buffer_Offset)!=0x0B77)
+        if (Buffer_Offset+4==Buffer_Size && CC2(Buffer+Buffer_Offset)!=0x0B77 && CC2(Buffer+Buffer_Offset)!=0x770B)
             Buffer_Offset++;
-        if (Buffer_Offset+3==Buffer_Size && CC2(Buffer+Buffer_Offset)!=0x0B77)
+        if (Buffer_Offset+3==Buffer_Size && CC2(Buffer+Buffer_Offset)!=0x0B77 && CC2(Buffer+Buffer_Offset)!=0x770B)
             Buffer_Offset++;
-        if (Buffer_Offset+2==Buffer_Size && CC2(Buffer+Buffer_Offset)!=0x0B77)
+        if (Buffer_Offset+2==Buffer_Size && CC2(Buffer+Buffer_Offset)!=0x0B77 && CC2(Buffer+Buffer_Offset)!=0x770B)
             Buffer_Offset++;
-        if (Buffer_Offset+1==Buffer_Size && CC1(Buffer+Buffer_Offset)!=0x0B)
+        if (Buffer_Offset+1==Buffer_Size && CC1(Buffer+Buffer_Offset)!=0x0B && CC1(Buffer+Buffer_Offset)!=0x77)
             Buffer_Offset++;
         return false;
     }
 
+    //Testing if we have TimeStamp
+    if (Buffer_Offset>=16)
+    {
+        if ( Buffer[Buffer_Offset-0x10+0x02]==0x00      //First  byte of HH? Always 0x00
+         && (Buffer[Buffer_Offset-0x10+0x03]>>4 )<0x6   //Second byte of HH? First  4 bits must be <0x6
+         && (Buffer[Buffer_Offset-0x10+0x03]&0xF)<0xA   //Second byte of HH? Second 4 bits must be <0xA
+         &&  Buffer[Buffer_Offset-0x10+0x04]==0x00      //First  byte of MM? Always 0x00
+         && (Buffer[Buffer_Offset-0x10+0x05]>>4 )<0x6   //Second byte of MM? First  4 bits must be <0x6
+         && (Buffer[Buffer_Offset-0x10+0x05]&0xF)<0xA   //Second byte of MM? Second 4 bits must be <0xA
+         &&  Buffer[Buffer_Offset-0x10+0x06]==0x00      //First  byte of SS? Always 0x00
+         && (Buffer[Buffer_Offset-0x10+0x07]>>4 )<0x6   //Second byte of SS? First  4 bits must be <0x6
+         && (Buffer[Buffer_Offset-0x10+0x07]&0xF)<0xA   //Second byte of SS? Second 4 bits must be <0xA
+         &&  Buffer[Buffer_Offset-0x10+0x08]==0x00      //First  byte of FF? Always 0x00
+         && (Buffer[Buffer_Offset-0x10+0x09]>>4 )<0x4   //Second byte of FF? First  4 bits must be <0x4
+         && (Buffer[Buffer_Offset-0x10+0x09]&0xF)<0xA   //Second byte of FF? Second 4 bits must be <0xA
+         && !(Buffer[Buffer_Offset-0x10+0x00]==0x00     //We want at least a byte not zero, in order to differentiate TimeStamp from padding
+           && Buffer[Buffer_Offset-0x10+0x01]==0x00
+           && Buffer[Buffer_Offset-0x10+0x0C]==0x00
+           && Buffer[Buffer_Offset-0x10+0x0D]==0x00
+           && Buffer[Buffer_Offset-0x10+0x0E]==0x00
+           && Buffer[Buffer_Offset-0x10+0x0F]==0x00))
+        {
+            TimeStamp_IsPresent=true;
+            Buffer_Offset-=16;
+
+            if (Frame_Count_Valid<10000)
+                Frame_Count_Valid=10000; //Setting it to 10000 in order to be able to have the drop frame for extreme stream (60 fps...)
+        }
+    }
+
     //Synched
     Data_Accept("AC-3");
     return true;
 }
 
 //---------------------------------------------------------------------------
+void File_Ac3::Synched_Init()
+{
+    //FrameInfo
+    PTS_End=0;
+    if (FrameInfo.DTS==(int64u)-1)
+        FrameInfo.DTS=0; //No DTS in container
+    if (FrameInfo.PTS==(int64u)-1)
+        FrameInfo.PTS=0; //No PTS in container
+    DTS_Begin=FrameInfo.DTS;
+    DTS_End=FrameInfo.DTS;
+    if (Frame_Count_NotParsedIncluded==(int64u)-1)
+        Frame_Count_NotParsedIncluded=0; //No Frame_Count_NotParsedIncluded in the container
+
+    Info_Core.FrameInfo=FrameInfo;
+    Info_Core.Frame_Count_NotParsedIncluded=Frame_Count_NotParsedIncluded;
+    Info_HD.FrameInfo=FrameInfo;
+    Info_HD.Frame_Count_NotParsedIncluded=Frame_Count_NotParsedIncluded;
+}
+
+//---------------------------------------------------------------------------
 bool File_Ac3::Synched_Test()
 {
     //Specific cases
@@ -961,78 +1093,181 @@
         return true;
 
     //Must have enough buffer for having header
-    if (Buffer_Offset+6>Buffer_Size)
+    if (Buffer_Offset+(TimeStamp_IsPresent?16:0)+6>Buffer_Size)
         return false;
 
-    //Quick test of synchro
-    if (CC2(Buffer+Buffer_Offset)!=0x0B77)
+    //TimeStamp
+    if (TimeStamp_IsPresent && !TimeStamp_Parsed)
     {
-        //MLP or TrueHD CRC, not working
-        /*
-        int16u CRC_16_Table_HD[256];
-        CRC16_Init(CRC_16_Table_HD, 0x002D);
+        if (!( Buffer[Buffer_Offset+0x02]==0x00         //First  byte of HH? Always 0x00
+           && (Buffer[Buffer_Offset+0x03]>>4 )<0x6      //Second byte of HH? First  4 bits must be <0x6
+           && (Buffer[Buffer_Offset+0x03]&0xF)<0xA      //Second byte of HH? Second 4 bits must be <0xA
+           &&  Buffer[Buffer_Offset+0x04]==0x00         //First  byte of MM? Always 0x00
+           && (Buffer[Buffer_Offset+0x05]>>4 )<0x6      //Second byte of MM? First  4 bits must be <0x6
+           && (Buffer[Buffer_Offset+0x05]&0xF)<0xA      //Second byte of MM? Second 4 bits must be <0xA
+           &&  Buffer[Buffer_Offset+0x06]==0x00         //First  byte of SS? Always 0x00
+           && (Buffer[Buffer_Offset+0x07]>>4 )<0x6      //Second byte of SS? First  4 bits must be <0x6
+           && (Buffer[Buffer_Offset+0x07]&0xF)<0xA      //Second byte of SS? Second 4 bits must be <0xA
+           &&  Buffer[Buffer_Offset+0x08]==0x00         //First  byte of FF? Always 0x00
+           && (Buffer[Buffer_Offset+0x09]>>4 )<0x4      //Second byte of FF? First  4 bits must be <0x4
+           && (Buffer[Buffer_Offset+0x09]&0xF)<0xA      //Second byte of FF? Second 4 bits must be <0xA
+           &&  Buffer[Buffer_Offset+0x10]==0x0B         //TimeStamp is followed by AC-3
+           &&  Buffer[Buffer_Offset+0x11]==0x77))
+            TimeStamp_IsPresent=false;
+    }
+    if (TimeStamp_IsPresent && !TimeStamp_Parsed)
+        Buffer_Offset+=16;
 
-        if (Buffer_Offset+28>Buffer_Size)
-            return false; //Need more data
+    //Quick test of synchro
+    if (!FrameSynchPoint_Test())
+        return false; //Need more data
+    if (!Synched)
+        return true;
 
-        //Testing
-        int16u CRC_16=0x0000;
-        const int8u* CRC_16_Buffer=Buffer+Buffer_Offset+4;
-        while(CRC_16_Buffer<Buffer+Buffer_Offset+4+24)
+    //TimeStamp
+    if (TimeStamp_IsPresent && !TimeStamp_Parsed)
+    {
+        Buffer_Offset-=16;
+        if (Synched)
         {
-            CRC_16=(CRC_16<<8) ^ CRC_16_Table_HD[(CRC_16>>8)^(*CRC_16_Buffer)];
-            CRC_16_Buffer++;
+            TimeStamp_IsParsing=true;
+            TimeStamp_Parsed=false;
         }
-        if (CRC_16!=0x0000)
-            return false;
-        */
+        else
+        {
+            TimeStamp_IsParsing=false;
+            TimeStamp_Parsed=false;
+        }
+    }
+
+    //We continue
+    return true;
+}
+
+//***************************************************************************
+// Buffer - Demux
+//***************************************************************************
 
-        //TrueHD detection
-        if ((Frame_Count>=1 && HD_Count+(HD_AlreadyCounted?0:1)==Frame_Count && bsid<=0x08) || !Core_IsPresent)
+//---------------------------------------------------------------------------
+#if MEDIAINFO_DEMUX
+bool File_Ac3::Demux_UnpacketizeContainer_Test()
+{
+    if (TimeStamp_IsPresent)
+        Buffer_Offset+=16;
+
+    if (!HD_IsPresent && Info_Core.Frame_Count==0 && Save_Buffer==NULL)
+    {
+        //Searching HD part
+        size_t Buffer_Offset_Save=Buffer_Offset;
+        Buffer_Offset++;
+        Synched=false;
+        while (Buffer_Offset+8<=Buffer_Size)
+        {
+            if (!FrameSynchPoint_Test())
+            {
+                Buffer_Offset=Buffer_Offset_Save;
+                return false; //Need more data
+            }
+            if (Synched)
+                break;
+            Buffer_Offset++;
+        }
+        Buffer_Offset=Buffer_Offset_Save;
+        if (!Synched)
         {
             Synched=true;
-            return true;
+            if (TimeStamp_IsPresent)
+                Buffer_Offset-=16;
+            return false; //Need more data
         }
+    }
 
-        return false;
+    if (Save_Buffer)
+    {
+        Demux_TotalBytes-=Buffer_Offset;
+        Demux_Offset-=Buffer_Offset;
+        File_Offset+=Buffer_Offset;
+        swap(Buffer, Save_Buffer);
+        swap(Buffer_Offset, Save_Buffer_Offset);
+        swap(Buffer_Size, Save_Buffer_Size);
     }
 
-    //AC-3 CRC
-    bsid=(Buffer[(size_t)(Buffer_Offset+5)]&0xF8)>>3;
-    int16u Size=0;
-    if (bsid<=0x08)
+    if (Buffer[Buffer_Offset]==0x0B && Buffer[Buffer_Offset+1]==0x77)
     {
-        int8u fscod     =(CC1(Buffer+Buffer_Offset+4)>>6)&0x03;
-        int8u frmsizecod=(CC1(Buffer+Buffer_Offset+4)   )&0x3F;
-        Size=AC3_FrameSize_Get(frmsizecod, fscod);
+        FrameInfo=Info_Core.FrameInfo;
+        FrameInfo.DUR=32000000;
+        Frame_Count=Info_Core.Frame_Count;
+        Frame_Count_InThisBlock=Info_Core.Frame_Count_InThisBlock;
+        Frame_Count_NotParsedIncluded=Info_Core.Frame_Count_NotParsedIncluded;
+
+        Demux_Offset=Buffer_Offset+Core_Size_Get();
+
+        //Core part
+        if (HD_IsPresent)
+        {
+            if (TimeStamp_IsPresent)
+                Buffer_Offset-=16;
+
+            if (Save_Buffer)
+            {
+                swap(Buffer, Save_Buffer);
+                swap(Buffer_Offset, Save_Buffer_Offset);
+                swap(Buffer_Size, Save_Buffer_Size);
+                Demux_TotalBytes+=Buffer_Offset;
+                Demux_Offset+=Buffer_Offset;
+                File_Offset-=Buffer_Offset;
+            }
+
+            return true; //No AC-3 demux
+        }
     }
-    else if (bsid>0x0A && bsid<=0x10)
+    else
     {
-        int16u frmsiz=CC2(Buffer+Buffer_Offset+2)&0x07FF;
-        Size=2+frmsiz*2;
+        FrameInfo=Info_HD.FrameInfo;
+        Frame_Count=Info_HD.Frame_Count;
+        Frame_Count_InThisBlock=Info_HD.Frame_Count_InThisBlock;
+        Frame_Count_NotParsedIncluded=Info_HD.Frame_Count_NotParsedIncluded;
+
+        Demux_Offset=Buffer_Offset+HD_Size_Get();
     }
-    if (Size!=0)
+
+
+    if (Demux_Offset>Buffer_Size && File_Offset+Buffer_Size!=File_Size)
     {
-        if (Buffer_Offset+Size>Buffer_Size)
-            return false; //Need more data
+        if (TimeStamp_IsPresent)
+            Buffer_Offset-=16;
 
-        //Testing
-        int16u CRC_16=0x0000;
-        const int8u* CRC_16_Buffer=Buffer+Buffer_Offset+2; //After syncword
-        while(CRC_16_Buffer<Buffer+Buffer_Offset+Size)
+        if (Save_Buffer)
         {
-            CRC_16=(CRC_16<<8) ^ CRC_16_Table[(CRC_16>>8)^(*CRC_16_Buffer)];
-            CRC_16_Buffer++;
+            swap(Buffer, Save_Buffer);
+            swap(Buffer_Offset, Save_Buffer_Offset);
+            swap(Buffer_Size, Save_Buffer_Size);
+            Demux_TotalBytes+=Buffer_Offset;
+            Demux_Offset+=Buffer_Offset;
+            File_Offset-=Buffer_Offset;
         }
-        if (CRC_16!=0x0000)
-            return false;
+
+        return false; //No complete frame
     }
-    else
-        return false;
 
-    //We continue
+    Demux_UnpacketizeContainer_Demux();
+
+    if (Save_Buffer)
+    {
+        swap(Buffer, Save_Buffer);
+        swap(Buffer_Offset, Save_Buffer_Offset);
+        swap(Buffer_Size, Save_Buffer_Size);
+        Demux_TotalBytes+=Buffer_Offset;
+        Demux_Offset+=Buffer_Offset;
+        File_Offset-=Buffer_Offset;
+    }
+
+    if (TimeStamp_IsPresent)
+        Buffer_Offset-=16;
+
     return true;
 }
+#endif //MEDIAINFO_DEMUX
 
 //***************************************************************************
 // Buffer - Global
@@ -1042,9 +1277,23 @@
 void File_Ac3::Read_Buffer_Continue()
 {
     if (MustParse_dac3)
+    {
         dac3();
+        return;
+    }
     if (MustParse_dec3)
+    {
         dec3();
+        return;
+    }
+
+    if (IsSub)
+    {
+        Info_Core.FrameInfo=FrameInfo;
+        Info_Core.Frame_Count_InThisBlock=0;
+        Info_HD.FrameInfo=FrameInfo;
+        Info_HD.Frame_Count_InThisBlock=0;
+    }
 }
 
 //***************************************************************************
@@ -1054,109 +1303,151 @@
 //---------------------------------------------------------------------------
 void File_Ac3::Header_Parse()
 {
-    //MLP or TrueHD specific
-    if (CC2(Buffer+Buffer_Offset)!=0x0B77)
+    //TimeStamp
+    if (TimeStamp_IsParsing)
     {
-        int16u Size;
-        BS_Begin();
-        Skip_S1( 4,                                             "Unknown");
-        Get_S2 (12, Size,                                       "Size");
-        BS_End();
-        Skip_B2(                                                "Timestamp?");
+        Header_Fill_Size(16);
+        Header_Fill_Code(2, "TimeStamp");
+        return;
+    }
+    else
+        TimeStamp_Parsed=false; //Currently, only one kind of intermediate element is detected (no TimeStamp and HD part together), and we don't know the precise specification of MLP nor TimeStamp, so we consider next eleemnt is TimeStamp
 
-        //Filling
-        if (Size<2)
+    if (Save_Buffer)
+    {
+        File_Offset+=Buffer_Offset;
+        swap(Buffer, Save_Buffer);
+        swap(Buffer_Offset, Save_Buffer_Offset);
+        swap(Buffer_Size, Save_Buffer_Size);
+    }
+
+    //Filling
+    if ((Buffer[Buffer_Offset]==0x0B && Buffer[Buffer_Offset+1]==0x77)
+     || (Buffer[Buffer_Offset]==0x77 && Buffer[Buffer_Offset+1]==0x0B))
+    {
+        Header_Fill_Size(Core_Size_Get());
+        Header_Fill_Code(0, "syncframe");
+
+        //Little Endian management
+        if (Save_Buffer)
         {
-            Synched=false;
-            Size=2;
+            swap(Buffer, Save_Buffer);
+            swap(Buffer_Offset, Save_Buffer_Offset);
+            swap(Buffer_Size, Save_Buffer_Size);
+            File_Offset-=Buffer_Offset;
         }
 
-        Header_Fill_Size(Size*2);
-        Header_Fill_Code(1, "HD");
         return;
     }
 
-    //Testing bsid before parsing
+    //MLP or TrueHD specific
     int16u Size;
-    bsid=(Buffer[(size_t)(Buffer_Offset+5)]&0xF8)>>3;
-    if (bsid<=0x08)
-    {
-        fscod     =(Buffer[(size_t)(Buffer_Offset+4)]&0xC0)>>6;
-        frmsizecod= Buffer[(size_t)(Buffer_Offset+4)]&0x3F;
+    BS_Begin();
+    Skip_S1( 4,                                                 "CRC?");
+    Get_S2 (12, Size,                                           "Size");
+    BS_End();
+    Skip_B2(                                                    "Timestamp?");
 
-        //Filling
-        fscods[fscod]++;
-        frmsizecods[frmsizecod]++;
-        Size=AC3_FrameSize_Get(frmsizecod, fscod);
-    }
-    else if (bsid>0x0A && bsid<=0x10)
+    //Little Endian management
+    if (Save_Buffer)
     {
-        frmsiz    =((int16u)(Buffer[(size_t)(Buffer_Offset+2)]&0x07)<<8)
-                 | (         Buffer[(size_t)(Buffer_Offset+3)]         );
-        fscod     =         (Buffer[(size_t)(Buffer_Offset+4)]&0xC0)>>6;
-        int8u numblkscod;
-        if (fscod==0x03)
-            numblkscod=0x03;
-        else
-            numblkscod=     (Buffer[(size_t)(Buffer_Offset+4)]&0x30)>>4;
-
-        //Filling
-        Size=2+frmsiz*2;
-        numblks=numblkscod==3?6:numblkscod+1;
+        swap(Buffer, Save_Buffer);
+        swap(Buffer_Offset, Save_Buffer_Offset);
+        swap(Buffer_Size, Save_Buffer_Size);
     }
-    else
+
+    //Filling
+    if (Size<2)
     {
-        Reject("AC-3");
-        return;
+        Synched=false;
+        Size=2;
     }
 
-
-    //Filling
+    Size*=2;
     Header_Fill_Size(Size);
-    Header_Fill_Code(0, "syncframe");
+    Header_Fill_Code(1, "HD");
 }
 
 //---------------------------------------------------------------------------
 void File_Ac3::Data_Parse()
 {
+    if (Save_Buffer)
+    {
+        File_Offset+=Buffer_Offset;
+        swap(Buffer, Save_Buffer);
+        swap(Buffer_Offset, Save_Buffer_Offset);
+        swap(Buffer_Size, Save_Buffer_Size);
+    }
+
     //Parsing
-    switch(Element_Code)
+    switch (Element_Code)
     {
-        case 0 : Core(); break;
-        case 1 : HD();   break;
+        case 0 :
+                    FrameInfo=Info_Core.FrameInfo;
+                    Frame_Count=Info_Core.Frame_Count;
+                    Frame_Count_InThisBlock=Info_Core.Frame_Count_InThisBlock;
+                    Frame_Count_NotParsedIncluded=Info_Core.Frame_Count_NotParsedIncluded;
+                    Element_Info1C((FrameInfo.PTS!=(int64u)-1), __T("PTS ")+Ztring().Duration_From_Milliseconds(float64_int64s(((float64)FrameInfo.PTS)/1000000)));
+                    Element_Info1(Frame_Count);
+                    Core();
+                    Info_Core.FrameInfo=FrameInfo;
+                    Info_Core.Frame_Count=Frame_Count;
+                    Info_Core.Frame_Count_InThisBlock=Frame_Count_InThisBlock;
+                    Info_Core.Frame_Count_NotParsedIncluded=Frame_Count_NotParsedIncluded;
+                    break;
+        case 1 :
+                    FrameInfo=Info_HD.FrameInfo;
+                    Frame_Count=Info_HD.Frame_Count;
+                    Frame_Count_InThisBlock=Info_HD.Frame_Count_InThisBlock;
+                    Frame_Count_NotParsedIncluded=Info_HD.Frame_Count_NotParsedIncluded;
+                    Element_Info1C((FrameInfo.PTS!=(int64u)-1), __T("PTS ")+Ztring().Duration_From_Milliseconds(float64_int64s(((float64)FrameInfo.PTS)/1000000)));
+                    Element_Info1(Frame_Count);
+                    HD();
+                    Info_HD.FrameInfo=FrameInfo;
+                    Info_HD.Frame_Count=Frame_Count;
+                    Info_HD.Frame_Count_InThisBlock=Frame_Count_InThisBlock;
+                    Info_HD.Frame_Count_NotParsedIncluded=Frame_Count_NotParsedIncluded;
+                    break;
+        case 2 : TimeStamp();   break;
         default: ;
     }
+
+    //Little Endian management
+    if (Save_Buffer)
+    {
+        delete[] Buffer;
+        Buffer=Save_Buffer; Save_Buffer=NULL;
+        Buffer_Offset=Save_Buffer_Offset;
+        Buffer_Size=Save_Buffer_Size;
+        File_Offset-=Buffer_Offset;
+    }
 }
 
 //---------------------------------------------------------------------------
 void File_Ac3::Core()
 {
-    //PTS
-    if (PTS!=(int64u)-1)
-        Element_Info(_T("PTS ")+Ztring().Duration_From_Milliseconds(float64_int64s(((float64)PTS+PTS_DTS_Offset_InThisBlock)/1000000)));
-
     //Parsing
+    int8u  dialnorm=(int8u)-1, dialnorm2=(int8u)-1, compr=(int8u)-1, compr2=(int8u)-1, dynrng=(int8u)-1, dynrng2=(int8u)-1;
+    bool   compre=false, compr2e=false, dynrnge=false, dynrng2e=false;
     if (bsid<=0x08)
     {
-        int8u  dialnorm, dialnorm2=(int8u)-1, compr=(int8u)-1, compr2=(int8u)-1, dynrng=(int8u)-1, dynrng2=(int8u)-1;
-        bool   compre, compr2e=false, dynrnge, dynrng2e=false;
-        Element_Begin("synchinfo");
-            Skip_B2(                                               "syncword");
+        Element_Begin1("synchinfo");
+            Skip_B2(                                                "syncword");
             Skip_B2(                                                "crc1");
             BS_Begin();
-            Get_S1 (2, fscod,                                       "fscod - Sample Rate Code"); Param_Info(AC3_SamplingRate[fscod], " Hz");
-            Get_S1 (6, frmsizecod,                                  "frmsizecod - Frame Size Code"); if (frmsizecod/2<19) {Param_Info(AC3_BitRate[frmsizecod/2]*1000, " bps");}
-        Element_End();
-        Element_Begin("bsi");
+            Get_S1 (2, fscod,                                       "fscod - Sample Rate Code"); Param_Info2(AC3_SamplingRate[fscod], " Hz");
+            Get_S1 (6, frmsizecod,                                  "frmsizecod - Frame Size Code"); if (frmsizecod/2<19) {Param_Info2(AC3_BitRate[frmsizecod/2]*1000, " bps");}
+        Element_End0();
+        Element_Begin1("bsi");
             Get_S1 (5, bsid,                                        "bsid - Bit Stream Identification");
-            Get_S1 (3, bsmod,                                       "bsmod - Bit Stream Mode"); Param_Info(AC3_Mode[bsmod]);
-            Get_S1 (3, acmod,                                       "acmod - Audio Coding Mode"); Param_Info(AC3_ChannelPositions[acmod]);
+            Get_S1 (3, bsmod,                                       "bsmod - Bit Stream Mode"); Param_Info1(AC3_Mode[bsmod]);
+            Get_S1 (3, acmod,                                       "acmod - Audio Coding Mode"); Param_Info1(AC3_ChannelPositions[acmod]);
             if ((acmod&1) && acmod!=1) //central present
                 Skip_S1(2,                                          "cmixlev - Center Mix Level");
             if (acmod&4) //back present
                 Skip_S1(2,                                          "surmixlev - Surround Mix Level");
             if (acmod==2)
-                Get_S1 (2, dsurmod,                                 "dsurmod - Dolby Surround Mode"); Param_Info(AC3_Surround[dsurmod]);
+                Get_S1 (2, dsurmod,                                 "dsurmod - Dolby Surround Mode"); Param_Info1(AC3_Surround[dsurmod]);
             Get_SB (   lfeon,                                       "lfeon - Low Frequency Effects");
             Get_S1 (5, dialnorm,                                    "dialnorm - Dialogue Normalization");
             Get_SB (   compre,                                      "compre - Compression Gain Word Exists");
@@ -1197,8 +1488,8 @@
                 for (int8u Pos=0; Pos<=addbsil; Pos++) //addbsil+1 bytes
                     Skip_S1(8,                                      "addbsi");
             TEST_SB_END();
-        Element_End();
-        Element_Begin("audblk");
+        Element_End0();
+        Element_Begin1("audblk");
             for (int8u Pos=0; Pos<AC3_Channels[acmod]; Pos++)
                 Skip_SB(                                            "blksw - Block Switch Flag");
             for (int8u Pos=0; Pos<AC3_Channels[acmod]; Pos++)
@@ -1213,68 +1504,16 @@
                     Get_S1 (8, dynrng2,                             "dynrng2 - Dynamic Range Gain Word");
             }
             BS_End();
-        Element_End();
+        Element_End0();
         Skip_XX(Element_Size-Element_Offset,                        "audblk(continue)+5*audblk+auxdata+errorcheck");
-
-        FILLING_BEGIN();
-            //Specific to first frame
-            if (Frame_Count==0)
-            {
-                FirstFrame_Dolby.dialnorm=dialnorm;
-                if (compre)
-                    FirstFrame_Dolby.compr=compr;
-                if (dynrnge)
-                    FirstFrame_Dolby.dynrng=dynrng;
-                FirstFrame_Dolby.compre=compre;
-                FirstFrame_Dolby.dynrnge=dynrnge;
-                if (acmod==0) //1+1 mode
-                {
-                    FirstFrame_Dolby2.dialnorm=dialnorm2;
-                    if (compr2e)
-                        FirstFrame_Dolby2.compr=compr2;
-                    if (dynrng2e)
-                        FirstFrame_Dolby2.dynrng=dynrng2;
-                    FirstFrame_Dolby2.compre=compr2e;
-                    FirstFrame_Dolby2.dynrnge=dynrng2e;
-                }
-            }
-
-            //Stats
-            if (dialnorms.empty())
-                dialnorms.resize(32);
-            dialnorms[dialnorm]++;
-            if (compre)
-            {
-                if (comprs.empty())
-                    comprs.resize(256);
-                comprs[compr]++;
-            }
-            if (dynrnge)
-            {
-                //Saving new value
-                dynrnge_Exists=true;
-                dynrng_Old=dynrng;
-            }
-            if (!dynrnge)
-                dynrng=0;
-            if (dynrngs.empty())
-                dynrngs.resize(256);
-            dynrngs[dynrng]++;
-            if (acmod==0) //1+1 mode
-            {
-                if (dialnorm2s.empty())
-                    dialnorm2s.resize(32);
-                dialnorm2s[dialnorm2]++;
-            }
-        FILLING_END();
     }
     else if (bsid>0x0A && bsid<=0x10)
     {
-        Element_Begin("synchinfo");
+        Element_Begin1("synchinfo");
             Skip_B2(                                               "syncword");
-        Element_End();
-        Element_Begin("bsi");
-            int8u  strmtyp, numblkscod;
+        Element_End0();
+        Element_Begin1("bsi");
+            int8u  strmtyp;
             BS_Begin();
             Get_S1 ( 2, strmtyp,                                    "strmtyp");
             Skip_S1( 3,                                             "substreamid");
@@ -1287,17 +1526,18 @@
             }
             else
                 Get_S1 ( 2, numblkscod,                             "numblkscod");
-            Get_S1 (3, acmod,                                       "acmod - Audio Coding Mode"); Param_Info(AC3_ChannelPositions[acmod]);
+            Get_S1 (3, acmod,                                       "acmod - Audio Coding Mode"); Param_Info1(AC3_ChannelPositions[acmod]);
             Get_SB (   lfeon,                                       "lfeon - Low Frequency Effects");
             Get_S1 ( 5, bsid,                                       "bsid - Bit Stream Identification");
-            TEST_SB_SKIP(                                           "compre");
-                Skip_S1(8,                                          "compr");
+            Get_S1 ( 5, dialnorm,                                   "dialnorm");
+            TEST_SB_GET(compre,                                     "compre");
+                Get_S1 (8, compr,                                   "compr");
             TEST_SB_END();
             if (acmod==0) //1+1 mode
             {
-                Skip_SB(                                            "dialnorm2");
-                TEST_SB_SKIP(                                       "compr2e");
-                    Skip_S1(1,                                      "compr2");
+                Get_S1 (5, dialnorm2,                              "dialnorm2");
+                TEST_SB_GET(compr2e,                                "compr2e");
+                    Get_S1 (8, compr2,                              "compr2");
                 TEST_SB_END();
             }
             if (strmtyp==1) //dependent stream
@@ -1306,34 +1546,97 @@
                     Get_S2(16, chanmap,                             "chanmap");
                 TEST_SB_END();
             }
+        Element_End0();
+        if (Data_BS_Remain()<17)
+        {
+            BS_End();
+            Trusted_IsNot("Not enough data");
+        }
+        else
+        {
+            Element_Begin1("errorcheck");
+            Skip_BS(Data_BS_Remain()-17,                            "bsi(continue)+audfrm+x*audblk+auxdata+errorcheck");
+            Skip_SB(                                                "encinfo");
             BS_End();
-        Element_End();
-        Skip_XX(Element_Size-Element_Offset,                        "bsi(continue)+audfrm+x*audblk+auxdata+errorcheck");
+            Skip_B2(                                                "crc2");
+            Element_End0();
+        }
     }
 
     FILLING_BEGIN();
-        //Name
-        Element_Info(_T("Frame ")+Ztring::ToZtring(Frame_Count));
+        //Specific to first frame
+        if (Frame_Count==0)
+        {
+            FirstFrame_Dolby.dialnorm=dialnorm;
+            if (compre)
+                FirstFrame_Dolby.compr=compr;
+            if (dynrnge)
+                FirstFrame_Dolby.dynrng=dynrng;
+            FirstFrame_Dolby.compre=compre;
+            FirstFrame_Dolby.dynrnge=dynrnge;
+            if (acmod==0) //1+1 mode
+            {
+                FirstFrame_Dolby2.dialnorm=dialnorm2;
+                if (compr2e)
+                    FirstFrame_Dolby2.compr=compr2;
+                if (dynrng2e)
+                    FirstFrame_Dolby2.dynrng=dynrng2;
+                FirstFrame_Dolby2.compre=compr2e;
+                FirstFrame_Dolby2.dynrnge=dynrng2e;
+            }
+        }
+
+        //Stats
+        if (dialnorms.empty())
+            dialnorms.resize(32);
+        dialnorms[dialnorm]++;
+        if (compre)
+        {
+            if (comprs.empty())
+                comprs.resize(256);
+            comprs[compr]++;
+        }
+        if (dynrnge)
+        {
+            //Saving new value
+            dynrnge_Exists=true;
+            dynrng_Old=dynrng;
+        }
+        if (!dynrnge)
+            dynrng=0;
+        if (dynrngs.empty())
+            dynrngs.resize(256);
+        dynrngs[dynrng]++;
+        if (acmod==0) //1+1 mode
+        {
+            if (dialnorm2s.empty())
+                dialnorm2s.resize(32);
+            dialnorm2s[dialnorm2]++;
+        }
 
         //Counting
-        if (!Core_IsPresent)
+        if (Frame_Count==0)
         {
-            Frame_Count=0;
             Core_IsPresent=true;
+            PTS_Begin=FrameInfo.PTS;
         }
-        if (File_Offset+Buffer_Offset+Element_Size==File_Size)
-            Frame_Count_Valid=Frame_Count; //Finish frames in case of there are less than Frame_Count_Valid frames
         Frame_Count++;
-        HD_AlreadyCounted=false;
-
-        //PTS
-        if (PTS!=(int64u)-1 && frmsizecod/2<19)
+        Frame_Count_InThisBlock++;
+        if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+            Frame_Count_NotParsedIncluded++;
+        FrameInfo.DUR=32000000;
+        if (fscod && AC3_SamplingRate[fscod])
         {
-            int64u BitRate=AC3_BitRate[frmsizecod/2]*1000;
-            int64u Bits=Element_Size*8;
-            float64 Frame_Duration=((float64)Bits)/BitRate;
-            PTS_DTS_Offset_InThisBlock+=float64_int64s(Frame_Duration*1000000000);
+            FrameInfo.DUR*=48000;
+            FrameInfo.DUR/=AC3_SamplingRate[fscod];
         }
+        if (FrameInfo.DTS!=(int64u)-1)
+            FrameInfo.DTS+=FrameInfo.DUR;
+        if (FrameInfo.PTS!=(int64u)-1)
+            FrameInfo.PTS=FrameInfo.DTS;
+
+        if (File_Offset+Buffer_Offset+Element_Size==File_Size)
+            Frame_Count_Valid=Frame_Count; //Finish frames in case of there are less than Frame_Count_Valid frames
 
         //Filling
         if (!Status[IsFilled] && Frame_Count>=Frame_Count_Valid)
@@ -1341,7 +1644,7 @@
             Fill("AC-3");
 
             //No more need data
-            if (MediaInfoLib::Config.ParseSpeed_Get()<1)
+            if (!IsSub && MediaInfoLib::Config.ParseSpeed_Get()<1)
                 Finish("AC-3");
         }
     FILLING_END();
@@ -1350,6 +1653,8 @@
 //---------------------------------------------------------------------------
 void File_Ac3::HD()
 {
+    Trusted=1000;
+
     //Parsing
     int32u Synch;
     Peek_B3(Synch);
@@ -1376,18 +1681,18 @@
         CRC_16^=LittleEndian2int16u(Buffer+Buffer_Offset+24);
         */
 
-        Element_Begin("MajorSync", 28);
+        Element_Begin1("MajorSync");
         Skip_B3(                                                "Synch");
-        Get_B1 (HD_StreamType,                                  "Stream type"); Param_Info(AC3_HD_StreamType(HD_StreamType));
+        Get_B1 (HD_StreamType,                                  "Stream type"); Param_Info1(AC3_HD_StreamType(HD_StreamType));
 
         if (HD_StreamType==0xBA)
         {
             BS_Begin();
-            Get_S1 ( 4, HD_SamplingRate1,                       "Sampling rate"); Param_Info(AC3_HD_SamplingRate(HD_SamplingRate1), " Hz");
+            Get_S1 ( 4, HD_SamplingRate1,                       "Sampling rate"); Param_Info2(AC3_HD_SamplingRate(HD_SamplingRate1), " Hz");
             Skip_S1( 8,                                         "Unknown");
-            Get_S1 ( 5, HD_Channels1,                           "Channels (1st substream)"); Param_Info(AC3_TrueHD_Channels(HD_Channels1)); Param_Info(Ztring().From_Local(AC3_TrueHD_Channels_Positions(HD_Channels1)));
+            Get_S1 ( 5, HD_Channels1,                           "Channels (1st substream)"); Param_Info1(AC3_TrueHD_Channels(HD_Channels1)); Param_Info1(Ztring().From_Local(AC3_TrueHD_Channels_Positions(HD_Channels1)));
             Skip_S1( 2,                                         "Unknown");
-            Get_S2 (13, HD_Channels2,                           "Channels (2nd substream)"); Param_Info(AC3_TrueHD_Channels(HD_Channels2)); Param_Info(Ztring().From_Local(AC3_TrueHD_Channels_Positions(HD_Channels2)));
+            Get_S2 (13, HD_Channels2,                           "Channels (2nd substream)"); Param_Info1(AC3_TrueHD_Channels(HD_Channels2)); Param_Info1(Ztring().From_Local(AC3_TrueHD_Channels_Positions(HD_Channels2)));
             BS_End();
             HD_Resolution2=HD_Resolution1=24; //Not sure
             HD_SamplingRate2=HD_SamplingRate1;
@@ -1395,12 +1700,12 @@
         else if (HD_StreamType==0xBB)
         {
             BS_Begin();
-            Get_S1 ( 4, HD_Resolution1,                         "Resolution1"); Param_Info(AC3_MLP_Resolution[HD_Resolution1], " bits");
-            Get_S1 ( 4, HD_Resolution2,                         "Resolution2"); Param_Info(AC3_MLP_Resolution[HD_Resolution2], " bits");
-            Get_S1 ( 4, HD_SamplingRate1,                       "Sampling rate"); Param_Info(AC3_HD_SamplingRate(HD_SamplingRate1), " Hz");
-            Get_S1 ( 4, HD_SamplingRate2,                       "Sampling rate"); Param_Info(AC3_HD_SamplingRate(HD_SamplingRate2), " Hz");
+            Get_S1 ( 4, HD_Resolution1,                         "Resolution1"); Param_Info2(AC3_MLP_Resolution[HD_Resolution1], " bits");
+            Get_S1 ( 4, HD_Resolution2,                         "Resolution2"); Param_Info2(AC3_MLP_Resolution[HD_Resolution2], " bits");
+            Get_S1 ( 4, HD_SamplingRate1,                       "Sampling rate"); Param_Info2(AC3_HD_SamplingRate(HD_SamplingRate1), " Hz");
+            Get_S1 ( 4, HD_SamplingRate2,                       "Sampling rate"); Param_Info2(AC3_HD_SamplingRate(HD_SamplingRate2), " Hz");
             Skip_S1(11,                                         "Unknown");
-            Get_S1 ( 5, HD_Channels1,                           "Channels"); Param_Info(AC3_MLP_Channels[HD_Channels1]);
+            Get_S1 ( 5, HD_Channels1,                           "Channels"); Param_Info1(AC3_MLP_Channels[HD_Channels1]);
             BS_End();
             HD_Channels2=HD_Channels1;
         }
@@ -1413,7 +1718,7 @@
         Skip_B6(                                                "Unknown");
         BS_Begin();
         Get_SB (    HD_IsVBR,                                   "Is VBR");
-        Get_S2 (15, HD_BitRate_Max,                             "Maximum bitrate"); Param_Info((HD_BitRate_Max*(AC3_HD_SamplingRate(HD_SamplingRate2)?AC3_HD_SamplingRate(HD_SamplingRate2):AC3_HD_SamplingRate(HD_SamplingRate1))+8)>>4, " bps");
+        Get_S2 (15, HD_BitRate_Max,                             "Maximum bitrate"); Param_Info2((HD_BitRate_Max*(AC3_HD_SamplingRate(HD_SamplingRate2)?AC3_HD_SamplingRate(HD_SamplingRate2):AC3_HD_SamplingRate(HD_SamplingRate1))+8)>>4, " bps");
         Get_S1 ( 4, HD_SubStreams_Count,                        "SubStreams_Count");
         Skip_S1( 4,                                             "Unknown");
         BS_End();
@@ -1428,7 +1733,7 @@
         Skip_B1(                                                "Unknown");
         Skip_B1(                                                "Unknown");
         Skip_B1(                                                "Unknown");
-        Element_End();
+        Element_End0();
 
         FILLING_BEGIN();
             HD_MajorSync_Parsed=true;
@@ -1441,13 +1746,14 @@
         FILLING_END();
     }
 
+    /*
     if (HD_MajorSync_Parsed)
     {
-        Element_Begin("Sizes");
+        Element_Begin1("Sizes");
         std::vector<int16u> Sizes;
         for (int8u Pos=0; Pos<HD_SubStreams_Count; Pos++)
         {
-            Element_Begin("Size");
+            Element_Begin1("Size");
             int16u Size;
             bool HD_Unknown1_Present, HD_NoRestart, HD_ExtraParity;
             BS_Begin();
@@ -1460,14 +1766,14 @@
             if (HD_Unknown1_Present)
                 Skip_B2(                                        "Unknown");
             Sizes.push_back(Size);
-            Element_End();
+            Element_End0();
         }
-        Element_End();
+        Element_End0();
 
         int64u Element_Offset_Begin=Element_Offset;
         for (int8u Pos=0; Pos<HD_SubStreams_Count; Pos++)
         {
-            Element_Begin("Block", Sizes[Pos]);
+            Element_Begin1("Block");
             bool DecodingParameterBlockPresent;
             BS_Begin();
             Get_SB (DecodingParameterBlockPresent,              "Decoding parameter block is present");
@@ -1498,35 +1804,113 @@
             }
             BS_End();
             Skip_XX(Element_Offset_Begin+Sizes[Pos]*2-Element_Offset, "Data");
-            Element_End();
+            Element_End0();
         }
     }
     else
         Skip_XX(Element_Size-Element_Offset,                    "Waiting for MajorSync...");
+    */
+        Skip_XX(Element_Size-Element_Offset,                    "(Data)");
 
     FILLING_BEGIN_PRECISE();
-        if (!Core_IsPresent)
-            Frame_Count++;
-
-        if (!HD_AlreadyCounted)
+        if (Frame_Count==0)
+            PTS_Begin=FrameInfo.PTS;
+        Frame_Count++;
+        Frame_Count_InThisBlock++;
+        if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+            Frame_Count_NotParsedIncluded++;
+        FrameInfo.DUR=833333;
+        int64u HD_SamplingRate=AC3_HD_SamplingRate(HD_SamplingRate1);
+        if (HD_SamplingRate && HD_SamplingRate!=48000)
         {
-            HD_Count++;
-            HD_AlreadyCounted=true;
+            FrameInfo.DUR*=48000;
+            FrameInfo.DUR/=HD_SamplingRate;
         }
+        if (FrameInfo.DTS!=(int64u)-1)
+            FrameInfo.DTS+=FrameInfo.DUR;
+        if (FrameInfo.PTS!=(int64u)-1)
+            FrameInfo.PTS=FrameInfo.DTS;
 
         //Filling
-        if (!Status[IsFilled] && Frame_Count>=Frame_Count_Valid)
+        if (!Status[IsFilled] && !Core_IsPresent && Frame_Count>=Frame_Count_Valid*32)
         {
             Fill("AC-3");
 
             //No more need data
-            if (MediaInfoLib::Config.ParseSpeed_Get()<1)
+            if (!IsSub && MediaInfoLib::Config.ParseSpeed_Get()<1)
                 Finish("AC-3");
         }
     FILLING_END();
 }
 
 //---------------------------------------------------------------------------
+void File_Ac3::TimeStamp()
+{
+    //Parsing
+    int8u H1, H2, M1, M2, S1, S2, F1, F2;
+    Skip_B2(                                                    "Unknown");
+    BS_Begin();
+    Skip_S1(8,                                                  "H");
+    Get_S1 (4, H1,                                              "H");
+    Get_S1( 4, H2,                                              "H");
+    Skip_S1(8,                                                  "M");
+    Get_S1 (4, M1,                                              "M");
+    Get_S1( 4, M2,                                              "M");
+    Skip_S1(8,                                                  "S");
+    Get_S1 (4, S1,                                              "S");
+    Get_S1( 4, S2,                                              "S");
+    Skip_S1(8,                                                  "F");
+    Get_S1 (4, F1,                                              "F");
+    Get_S1( 4, F2,                                              "F");
+    BS_End();
+    Skip_B2(                                                    "Byte offset related to frame");
+    Skip_B4(                                                    "Unknown");
+
+    FILLING_BEGIN();
+        float64 Temp=H1*10*60*60
+                   + H2   *60*60
+                   + M1   *10*60
+                   + M2      *60
+                   + S1      *10
+                   + S2
+                   + (F1*10+F2)/29.97; //No idea about where is the frame rate
+        #ifdef MEDIAINFO_TRACE
+            Element_Info1(Ztring::ToZtring(H1)+Ztring::ToZtring(H2)+__T(':')
+                       + Ztring::ToZtring(M1)+Ztring::ToZtring(M2)+__T(':')
+                       + Ztring::ToZtring(S1)+Ztring::ToZtring(S2)+__T(':')
+                       + Ztring::ToZtring(F1)+Ztring::ToZtring(F2));
+        #endif //MEDIAINFO_TRACE
+        if (Frame_Count==0)
+            TimeStamp_Content=Temp;
+        TimeStamp_IsParsing=false;
+        TimeStamp_Parsed=true;
+
+        if (!TimeStamp_DropFrame_IsValid && M2 && !S2 && !S1 && !F1)
+        {
+            //If drop frame configuration, frames 0 and 1 are dropped for every minutes except 00 10 20 30 40 50
+            switch (F2)
+            {
+                case 0 :
+                case 1 :
+                            TimeStamp_DropFrame_IsValid=true;
+                            TimeStamp_DropFrame_Content=false;
+                            break;
+                case 2 :
+                            if (Frame_Count>=2)
+                            {
+                                TimeStamp_DropFrame_IsValid=true;
+                                TimeStamp_DropFrame_Content=true;
+                            }
+                default:    ;
+            }
+
+            if (TimeStamp_DropFrame_IsValid)
+                Frame_Count_Valid=32; //Reset
+        }
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
 void File_Ac3::dac3()
 {
     BS_Begin();
@@ -1553,7 +1937,7 @@
     Get_S1 ( 3, num_ind_sub,                                    "num_ind_sub");
     for (int8u Pos=0; Pos<num_ind_sub; Pos++)
     {
-        Element_Begin("independent substream");
+        Element_Begin1("independent substream");
         int8u num_dep_sub;
         Get_S1 (2, fscod,                                       "fscod");
         Get_S1 (5, bsid,                                        "bsid");
@@ -1566,7 +1950,7 @@
             Skip_S2(9,                                          "chan_loc");
         else
             Skip_SB(                                            "reserved");
-        Element_End();
+        Element_End0();
     }
     BS_End();
 
@@ -1574,7 +1958,183 @@
     dxc3_Parsed=true;
 }
 
+//---------------------------------------------------------------------------
+bool File_Ac3::FrameSynchPoint_Test()
+{
+    if (Save_Buffer)
+        return true; //Test already made by Synchronize()
+
+    if (Buffer[Buffer_Offset  ]==0x0B
+     && Buffer[Buffer_Offset+1]==0x77) //AC-3
+    {
+        int8u bsid=CC1(Buffer+Buffer_Offset+5)>>3;
+        int16u  Size=0;
+        if (bsid<=0x08)
+        {
+            int8u fscod     =(CC1(Buffer+Buffer_Offset+4)>>6)&0x03;
+            int8u frmsizecod=(CC1(Buffer+Buffer_Offset+4)   )&0x3F;
+            Size=AC3_FrameSize_Get(frmsizecod, fscod);
+        }
+        else if (bsid>0x0A && bsid<=0x10)
+        {
+            int16u frmsiz=CC2(Buffer+Buffer_Offset+2)&0x07FF;
+            Size=2+frmsiz*2;
+        }
+        if (Size>=6)
+        {
+            if (Buffer_Offset+Size>Buffer_Size)
+                return false; //Need more data
+            if (CRC_Compute(Size))
+            {
+                Synched=true;
+                return true;
+            }
+        }
+    }
+
+    if (Buffer[Buffer_Offset+0]==0x77
+     && Buffer[Buffer_Offset+1]==0x0B) //AC-3 LE
+    {
+        int8u bsid=CC1(Buffer+Buffer_Offset+4)>>3;
+        int16u  Size=0;
+        if (bsid<=0x08)
+        {
+            int8u fscod     =(CC1(Buffer+Buffer_Offset+5)>>6)&0x03;
+            int8u frmsizecod=(CC1(Buffer+Buffer_Offset+5)   )&0x3F;
+            Size=AC3_FrameSize_Get(frmsizecod, fscod);
+        }
+        else if (bsid>0x0A && bsid<=0x10)
+        {
+            int16u frmsiz=LittleEndian2int16u(Buffer+Buffer_Offset+2)&0x07FF;
+            Size=2+frmsiz*2;
+        }
+        if (Size>=6)
+        {
+            if (Buffer_Offset+Size>Buffer_Size)
+                return false; //Need more data
+
+            Save_Buffer=Buffer;
+            Save_Buffer_Offset=Buffer_Offset;
+            Save_Buffer_Size=Buffer_Size;
+
+            //Exception handling
+            try
+            {
+                int8u* Buffer_Little=new int8u[Size];
+                for (size_t Pos=0; Pos+1<Size; Pos+=2)
+                {
+                    Buffer_Little[Pos+1]=Save_Buffer[Buffer_Offset+Pos  ];
+                    Buffer_Little[Pos  ]=Save_Buffer[Buffer_Offset+Pos+1];
+                }
+                Buffer=Buffer_Little;
+                Buffer_Offset=0;
+                Buffer_Size=Size;
+
+                Synched=CRC_Compute(Size);
+
+                if (Synched)
+                {
+                    BigEndian=false;
+
+                    swap(Buffer, Save_Buffer);
+                    swap(Buffer_Offset, Save_Buffer_Offset);
+                    swap(Buffer_Size, Save_Buffer_Size);
+
+                    return true;
+                }
+
+                delete[] Buffer_Little;
+            }
+            catch(...)
+            {
+            }
+            Buffer=Save_Buffer; Save_Buffer=NULL;
+            Buffer_Offset=Save_Buffer_Offset;
+            Buffer_Size=Save_Buffer_Size;
+        }
+    }
+
+    if (HD_MajorSync_Parsed
+     || (Buffer[Buffer_Offset+4]==0xF8
+      && Buffer[Buffer_Offset+5]==0x72
+      && Buffer[Buffer_Offset+6]==0x6F
+      && (Buffer[Buffer_Offset+7]&0xFE)==0xBA)) //TrueHD or MLP
+    {
+        HD_IsPresent=true;
+        Synched=true;
+        return true;
+    }
+
+    Synched=false;
+    return true;
+}
+
+//---------------------------------------------------------------------------
+bool File_Ac3::CRC_Compute(size_t Size)
+{
+    int16u CRC_16=0x0000;
+    const int8u* CRC_16_Buffer=Buffer+Buffer_Offset+2; //After syncword
+    const int8u* CRC_16_Buffer_5_8=Buffer+Buffer_Offset+(((Size>>2)+(Size>>4))<<1); //Magic formula to meet 5/8 frame size from Dolby
+    const int8u* CRC_16_Buffer_EndMinus3=Buffer+Buffer_Offset+Size-3; //End of frame minus 3
+    const int8u* CRC_16_Buffer_End=Buffer+Buffer_Offset+Size; //End of frame
+    while(CRC_16_Buffer<CRC_16_Buffer_End)
+    {
+        CRC_16=(CRC_16<<8) ^ CRC_16_Table[(CRC_16>>8)^(*CRC_16_Buffer)];
+        CRC_16_Buffer++;
+
+        //CRC bytes inversion
+        if (CRC_16_Buffer==CRC_16_Buffer_EndMinus3 && ((*CRC_16_Buffer)&0x01)) //CRC inversion bit
+        {
+            CRC_16=(CRC_16<<8) ^ CRC_16_Table[(CRC_16>>8)^(~(*CRC_16_Buffer))];
+            CRC_16_Buffer++;
+            CRC_16=(CRC_16<<8) ^ CRC_16_Table[(CRC_16>>8)^(~(*CRC_16_Buffer))];
+            CRC_16_Buffer++;
+        }
+
+        //5/8 intermediate test
+        if (CRC_16_Buffer==CRC_16_Buffer_5_8 && bsid<=0x08 && CRC_16!=0x0000)
+            break;
+    }
+
+    return (CRC_16==0x0000);
+}
+
+//---------------------------------------------------------------------------
+size_t File_Ac3::Core_Size_Get()
+{
+    int16u Size=(int16u)-1;
+    bsid=(Buffer[(size_t)(Buffer_Offset+5)]&0xF8)>>3;
+    if (bsid<=0x08)
+    {
+        fscod     =(Buffer[(size_t)(Buffer_Offset+4)]&0xC0)>>6;
+        frmsizecod= Buffer[(size_t)(Buffer_Offset+4)]&0x3F;
+
+        //Filling
+        fscods[fscod]++;
+        frmsizecods[frmsizecod]++;
+        Size=AC3_FrameSize_Get(frmsizecod, fscod);
+    }
+    else if (bsid>0x0A && bsid<=0x10)
+    {
+        frmsiz    =((int16u)(Buffer[(size_t)(Buffer_Offset+2)]&0x07)<<8)
+                 | (         Buffer[(size_t)(Buffer_Offset+3)]         );
+
+        //Filling
+        Size=2+frmsiz*2;
+    }
+
+    return Size;
+}
+
+//---------------------------------------------------------------------------
+size_t File_Ac3::HD_Size_Get()
+{
+    size_t Size=BigEndian2int16u(Buffer+Buffer_Offset)&0x0FFF;
+    Size*=2;
+
+    return Size;
+}
+
 } //NameSpace
 
 #endif //MEDIAINFO_AC3_YES
-

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Ac3.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Ac3.h Changed

@@ -1,17 +1,17 @@
 // File_Ac3 - Info for AC3 files
-// Copyright (C) 2004-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2004-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -37,9 +37,10 @@
 {
 public :
     //In
-    size_t Frame_Count_Valid;
+    int64u Frame_Count_Valid;
     bool   MustParse_dac3;
     bool   MustParse_dec3;
+    bool   CalculateDelay;
 
     //Constructor/Destructor
     File_Ac3();
@@ -54,10 +55,20 @@
 
     //Buffer - Synchro
     bool Synchronize();
+    void Synched_Init();
     bool Synched_Test();
 
+    //Buffer - Demux
+    #if MEDIAINFO_DEMUX
+    bool Demux_UnpacketizeContainer_Test();
+    #endif //MEDIAINFO_DEMUX
+
     //Buffer - Global
     void Read_Buffer_Continue ();
+    void Read_Buffer_Unsynched();
+    #if MEDIAINFO_SEEK
+    size_t Read_Buffer_Seek (size_t Method, int64u Value, int64u ID);
+    #endif //MEDIAINFO_SEEK
 
     //Buffer - Per element
     void Header_Parse();
@@ -66,8 +77,18 @@
     //Elements
     void Core();
     void HD();
+    void TimeStamp();
     void dac3();
     void dec3();
+    bool FrameSynchPoint_Test();
+    bool CRC_Compute(size_t Size);
+    size_t Core_Size_Get();
+    size_t HD_Size_Get();
+
+    //Buffer
+    const int8u* Save_Buffer;
+    size_t Save_Buffer_Offset;
+    size_t Save_Buffer_Size;
 
     //Temp
     struct dolby
@@ -95,8 +116,22 @@
     std::vector<int64u> dynrng2s;
     std::map<int8u, int64u> fscods;
     std::map<int8u, int64u> frmsizecods;
-    size_t Frame_Count;
-    size_t HD_Count;
+    struct frame_info2
+    {
+        frame_info FrameInfo;
+        int64u Frame_Count;
+        int64u Frame_Count_InThisBlock;
+        int64u Frame_Count_NotParsedIncluded;
+
+        frame_info2()
+        {
+            Frame_Count=0;
+            Frame_Count_InThisBlock=0;
+            Frame_Count_NotParsedIncluded=(int64u)-1;
+        }
+    };
+    frame_info2 Info_Core;
+    frame_info2 Info_HD;
     int16u chanmap;
     int16u frmsiz;
     int16u HD_BitRate_Max;
@@ -108,7 +143,7 @@
     int8u  bsmod;
     int8u  acmod;
     int8u  dsurmod;
-    int8u  numblks;
+    int8u  numblkscod;
     int8u  HD_StreamType;
     int8u  HD_SubStreams_Count;
     int8u  HD_SamplingRate1;
@@ -122,10 +157,17 @@
     bool   HD_MajorSync_Parsed;
     bool   HD_NoRestart;
     bool   HD_ExtraParity;
-    bool   HD_AlreadyCounted;
     bool   HD_IsVBR;
     bool   Core_IsPresent;
+    bool   HD_IsPresent;
     bool   dynrnge_Exists;
+    bool   TimeStamp_IsPresent;
+    bool   TimeStamp_IsParsing;
+    bool   TimeStamp_Parsed;
+    bool   TimeStamp_DropFrame_IsValid;
+    bool   TimeStamp_DropFrame_Content;
+    bool   BigEndian;
+    float64 TimeStamp_Content;
 };
 
 } //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Adpcm.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Adpcm.cpp Changed

@@ -1,31 +1,35 @@
 // File_Adpcm - Info for ADPCM files
-// Copyright (C) 2008-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_ADPCM_YES)
 //---------------------------------------------------------------------------
 
@@ -52,16 +56,14 @@
     Fill(Stream_General, 0, Audio_Format, "ADPCM");
     Fill(Stream_General, 0, Audio_Codec, "ADPCM");
     Ztring Profile, Firm;
-    if (0)
-        ;
-    else if (Codec==_T("alaw"))             {Profile=_T("A-Law");}
-    else if (Codec==_T("ulaw"))             {Profile=_T("U-Law");}
-    else if (Codec==_T("ima4"))             {                     Firm=_T("IMA");}
-    else if (Codec==_T("6"))                {Profile=_T("A-Law");}
-    else if (Codec==_T("7"))                {Profile=_T("U-Law");}
-    else if (Codec==_T("102"))              {Profile=_T("A-Law");}
-    else if (Codec==_T("171"))              {Profile=_T("U-Law"); Firm=_T("Unisys");}
-    else if (Codec==_T("172"))              {Profile=_T("A-Law"); Firm=_T("Unisys");}
+         if (Codec==__T("alaw"))             {Profile=__T("A-Law");}
+    else if (Codec==__T("ulaw"))             {Profile=__T("U-Law");}
+    else if (Codec==__T("ima4"))             {                     Firm=__T("IMA");}
+    else if (Codec==__T("6"))                {Profile=__T("A-Law");}
+    else if (Codec==__T("7"))                {Profile=__T("U-Law");}
+    else if (Codec==__T("102"))              {Profile=__T("A-Law");}
+    else if (Codec==__T("171"))              {Profile=__T("U-Law"); Firm=__T("Unisys");}
+    else if (Codec==__T("172"))              {Profile=__T("A-Law"); Firm=__T("Unisys");}
 
     if (!Profile.empty())
         Fill(Stream_Audio, 0, Audio_Format_Profile, Profile);

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Adpcm.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Adpcm.h Changed

@@ -1,17 +1,17 @@
 // File_Adpcm - Info for ADPCM files
-// Copyright (C) 2008-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Aes3.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Aes3.cpp Changed

@@ -1,36 +1,62 @@
 // File_Aes3 - Info for AES3 packetized streams
-// Copyright (C) 2008-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// AES3 PCM and non-PCM (SMPTE 337M)
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_AES3_YES)
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 #include "MediaInfo/Audio/File_Aes3.h"
+#if defined(MEDIAINFO_AAC_YES)
+    #include "MediaInfo/Audio/File_Aac.h"
+#endif
+#if defined(MEDIAINFO_AC3_YES)
+    #include "MediaInfo/Audio/File_Ac3.h"
+#endif
+#if defined(MEDIAINFO_DOLBYE_YES)
+    #include "MediaInfo/Audio/File_DolbyE.h"
+#endif
+#if defined(MEDIAINFO_MPEGA_YES)
+    #include "MediaInfo/Audio/File_Mpega.h"
+#endif
+#if MEDIAINFO_EVENTS
+    #include "MediaInfo/MediaInfo_Events.h"
+#endif //MEDIAINFO_EVENTS
+#if MEDIAINFO_SEEK
+    #include "MediaInfo/MediaInfo_Internal.h"
+#endif //MEDIAINFO_SEEK
 //---------------------------------------------------------------------------
 
 namespace MediaInfoLib
@@ -66,6 +92,80 @@
     }
 }
 
+//---------------------------------------------------------------------------
+const char* Aes3_NonPCM_data_type[32]= //SMPTE 338M
+{
+    "",
+    "AC-3",
+    "Time stamp",
+    "Pause",
+    "MPEG Audio",
+    "MPEG Audio",
+    "MPEG Audio",
+    "AAC",
+    "MPEG Audio",
+    "MPEG Audio",
+    "AAC",
+    "AAC",
+    "",
+    "",
+    "",
+    "",
+    "E-AC-3",
+    "",
+    "",
+    "AAC",
+    "",
+    "E-AC-3",
+    "",
+    "",
+    "",
+    "",
+    "Utility",
+    "KLV",
+    "Dolby E",
+    "Captioning",
+    "User defined",
+    "",
+};
+
+//---------------------------------------------------------------------------
+stream_t Aes3_NonPCM_data_type_StreamKind[32]= //SMPTE 338M
+{
+    Stream_Max,
+    Stream_Audio,
+    Stream_Max,
+    Stream_Max,
+    Stream_Audio,
+    Stream_Audio,
+    Stream_Audio,
+    Stream_Max,
+    Stream_Audio,
+    Stream_Audio,
+    Stream_Max,
+    Stream_Max,
+    Stream_Max,
+    Stream_Max,
+    Stream_Max,
+    Stream_Max,
+    Stream_Max,
+    Stream_Max,
+    Stream_Max,
+    Stream_Max,
+    Stream_Max,
+    Stream_Max,
+    Stream_Max,
+    Stream_Max,
+    Stream_Max,
+    Stream_Max,
+    Stream_Max,
+    Stream_Menu,
+    Stream_Audio,
+    Stream_Text,
+    Stream_Max,
+    Stream_Max,
+};
+
 //***************************************************************************
 // Constructor/Destructor
 //***************************************************************************
@@ -74,35 +174,1347 @@
 File_Aes3::File_Aes3()
 :File__Analyze()
 {
-    //Configure
+    //Configuration
+    #if MEDIAINFO_EVENTS
+        ParserIDs[0]=MediaInfo_Parser_Aes3;
+    #endif //MEDIAINFO_EVENTS
+    MustSynchronize=true;
+    Buffer_TotalBytes_FirstSynched_Max=32*1024;
     PTS_DTS_Needed=true;
+    FrameInfo.DTS=0;
+    IsRawStream=true;
+
+    //In
+    SampleRate=0;
+    ByteSize=0;
+    QuantizationBits=0;
+    ChannelCount=0;
+    From_Raw=false;
+    From_MpegPs=false;
+    From_Aes3=false;
+    IsAes3=false;
+    Endianness=0x00;
+
+    //Out
+    FrameRate=0;
 
     //Temp
-    Block_Count=0;
-    Block_Last_PTS=(int32u)-1;
-    Block_Last_Size=(int64u)-1;
+    Frame_Count=0;
+    Frame_Size=(int64u)-1;
+    Frame_Duration=(int64u)-1;
+    IsPcm_Frame_Count=0;
+    NotPCM_SizePerFrame=(int64u)-1;
+    data_type=(int8u)-1;
+    IsParsingNonPcm=false;
+    IsPcm=false;
+
+    //Parser
+    Parser=NULL;
+
+    #if MEDIAINFO_SEEK
+        Duration_Detected=false;
+    #endif //MEDIAINFO_SEEK
+}
+
+//---------------------------------------------------------------------------
+File_Aes3::~File_Aes3()
+{
+    delete Parser; //Parser=NULL;
+}
+
+//***************************************************************************
+// Streams management
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Aes3::Streams_Accept()
+{
+    Fill(Stream_General, 0, General_Format, "AES3");
+}
+
+//---------------------------------------------------------------------------
+void File_Aes3::Streams_Fill()
+{
+    int64u BitRate=(int64u)-1;
+    int64u SamplingRate=(int64u)-1;
+    if (Frame_Count && FrameInfo.PTS!=(int32u)-1 && PTS_Begin!=(int64u)-1 && FrameInfo.PTS!=PTS_Begin)
+    {
+        //Rounding
+        BitRate=Frame_Size*8*1000*1000000*(Frame_Count-1)/(FrameInfo.PTS-PTS_Begin);
+        SamplingRate=BitRate*(4+bits_per_sample)/(5+bits_per_sample)/(2+2*number_channels)/(16+4*bits_per_sample);
+        if (SamplingRate>  7840 && SamplingRate<  8160) SamplingRate=  8000;
+        if (SamplingRate> 15680 && SamplingRate< 16320) SamplingRate= 16000;
+        if (SamplingRate> 31360 && SamplingRate< 32640) SamplingRate= 32000;
+        if (SamplingRate> 62720 && SamplingRate< 65280) SamplingRate= 64000;
+        if (SamplingRate> 10804 && SamplingRate< 11246) SamplingRate= 11025;
+        if (SamplingRate> 21609 && SamplingRate< 22491) SamplingRate= 22050;
+        if (SamplingRate> 43218 && SamplingRate< 44982) SamplingRate= 44100;
+        if (SamplingRate> 86436 && SamplingRate< 89964) SamplingRate= 88200;
+        if (SamplingRate> 11760 && SamplingRate< 12240) SamplingRate= 12000;
+        if (SamplingRate> 23520 && SamplingRate< 24480) SamplingRate= 24000;
+        if (SamplingRate> 47040 && SamplingRate< 48960) SamplingRate= 48000;
+        if (SamplingRate> 94080 && SamplingRate< 97920) SamplingRate= 96000;
+        if (SamplingRate>188160 && SamplingRate<195840) SamplingRate=192000;
+        BitRate=SamplingRate/(4+bits_per_sample)*(5+bits_per_sample)*(2+2*number_channels)*(16+4*bits_per_sample);
+    }
+    Fill(Stream_Audio, 0, Audio_BitRate_Mode, "CBR", Unlimited, true, true);
+
+    if (Parser && Parser->Status[IsAccepted] && !Parser->Status[IsFilled])
+    {
+        Fill(Parser);
+        Merge(*Parser);
+    }
+    else if (data_type!=(int8u)-1)
+    {
+        if (Retrieve(Stream_Audio, 0, Audio_Format).empty() && Aes3_NonPCM_data_type_StreamKind[data_type]!=Stream_Max)
+        {
+            Stream_Prepare(Aes3_NonPCM_data_type_StreamKind[data_type]);
+            Fill(StreamKind_Last, 0, Fill_Parameter(StreamKind_Last, Generic_Format), Aes3_NonPCM_data_type[data_type]);
+        }
+
+        if (IsSub)
+            Fill(Stream_Audio, 0, Audio_MuxingMode, "AES3", Unlimited, true, true);
+    }
+    else if (IsPcm)
+    {
+        Stream_Prepare(Stream_Audio);
+        Fill(Stream_Audio, 0, Audio_Format, "PCM");
+        Fill(Stream_Audio, 0, Audio_Codec, "PCM");
+        switch (Endianness)
+        {
+            case 'B' : Fill(Stream_Audio, 0, Audio_Format_Settings_Endianness, "Big"); break;
+            case 'L' : Fill(Stream_Audio, 0, Audio_Format_Settings_Endianness, "Little"); break;
+            default  : ;
+        }
+    }
+
+    if (Count_Get(Stream_Audio))
+    {
+        if (Count_Get(Stream_Audio)==1 && Retrieve(Stream_Audio, 0, Audio_BitRate).empty() && BitRate!=(int64u)-1)
+            Fill(Stream_Audio, 0, Audio_BitRate, BitRate);
+
+        if (!IsSub && NotPCM_SizePerFrame!=(int64u)-1 && NotPCM_SizePerFrame && FrameRate)
+        {
+            int64u BitRate=float64_int64s(NotPCM_SizePerFrame*8*FrameRate);
+            int64u SamplingRate=Retrieve(Stream_Audio, 0, Audio_SamplingRate).To_int64u();
+            if (Container_Bits && SamplingRate)
+            {
+                float Ratio=((float)BitRate)/(Container_Bits*SamplingRate*2);
+                if (Ratio>=0.99 && Ratio<=1.01)
+                    BitRate=Container_Bits*SamplingRate*2;
+            }
+            Fill(Stream_General, 0, General_OverallBitRate, BitRate);
+        }
+    }
+    else if (From_MpegPs)
+    {
+        Stream_Prepare(Stream_Audio);
+        Fill(Stream_Audio, 0, Audio_Format, "PCM");
+        Fill(Stream_Audio, 0, Audio_MuxingMode, "AES3");
+        Fill(Stream_Audio, 0, Audio_Codec, "AES3");
+        Fill(Stream_Audio, 0, Audio_Channel_s_, 2+2*number_channels);
+        Fill(Stream_Audio, 0, Audio_ChannelPositions, Aes3_ChannelsPositions(number_channels));
+        Fill(Stream_Audio, 0, Audio_ChannelPositions_String2, Aes3_ChannelsPositions2(number_channels));
+        Fill(Stream_Audio, 0, Audio_BitDepth, 16+4*bits_per_sample);
+        if (FrameInfo.PTS!=(int64u)-1 && PTS_Begin!=(int64u)-1 && FrameInfo.PTS!=PTS_Begin)
+        {
+            Fill(Stream_Audio, 0, Audio_SamplingRate, SamplingRate);
+            Fill(Stream_Audio, 0, Audio_BitRate, BitRate);
+        }
+    }
+    else
+    {
+        Stream_Prepare(Stream_Audio);
+        Fill(Stream_Audio, 0, Audio_Format, "AES3");
+    }
+
+    if (!From_Raw && !From_Aes3 && !IsPcm && IsParsingNonPcm)
+    {
+        for (size_t Pos=0; Pos<Count_Get(Stream_Audio); Pos++)
+        {
+            switch (Endianness)
+            {
+                case 'B' : Fill(Stream_Audio, Pos, Audio_Format_Settings_Endianness, "Big"); break;
+                case 'L' : Fill(Stream_Audio, Pos, Audio_Format_Settings_Endianness, "Little"); break;
+                default  : ;
+            }
+            Fill(Stream_Audio, Pos, Audio_Format_Settings_Mode, Container_Bits);
+            if (Retrieve(Stream_Audio, Pos, Audio_BitDepth).empty())
+                Fill(Stream_Audio, Pos, Audio_BitDepth, Stream_Bits);
+        }
+    }
+
+    if (From_Raw)
+    {
+        for (size_t Pos=0; Pos<Count_Get(Stream_Audio); Pos++)
+            Fill(Stream_Audio, Pos, Audio_Format_Settings_Endianness, "Little");
+    }
+
+    if (!IsSub && File_Size!=(int64u)-1 && Frame_Size!=(int64u)-1)
+    {
+        for (size_t Pos=0; Pos<Count_Get(Stream_Audio); Pos++)
+            Fill(Stream_Audio, Pos, Audio_FrameCount, File_Size/Frame_Size);
+        Fill(Stream_General, 0, General_DataSize, ((File_Size-Buffer_TotalBytes_FirstSynched)/Frame_Size)*Frame_Size);
+    }
+}
+
+//***************************************************************************
+// Buffer - Global
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Aes3::Read_Buffer_Init()
+{
+    if (From_MpegPs)
+    {
+        MustSynchronize=false;
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Aes3::Read_Buffer_Continue()
+{
+    if (Frame_Count==0)
+    {
+        PTS_Begin=FrameInfo.PTS;
+        Frame_Size=Element_Size;
+    }
+
+    if (IsPcm)
+    {
+        #if MEDIAINFO_DEMUX
+            if (ByteSize)
+                Element_Size=(Buffer_Size/ByteSize)*ByteSize;
+            else
+                Element_Size=Buffer_Size;
+            if (Demux_UnpacketizeContainer && !(!IsAes3 && StreamIDs_Size>=2 && ParserIDs[StreamIDs_Size-2]==MediaInfo_Parser_ChannelGrouping))
+            {
+                FrameInfo.PTS=FrameInfo.DTS;
+                if (SampleRate && ByteSize)
+                    FrameInfo.DUR=Element_Size*1000000000/(SampleRate*ByteSize);
+                Demux_random_access=true;
+                Element_Code=(int64u)-1;
+                Demux(Buffer, (size_t)Element_Size, ContentType_MainStream);
+            }
+        #endif //MEDIAINFO_DEMUX
+
+        Skip_XX(Element_Size,                                   "Data");
+
+        Frame_Count_InThisBlock++;
+        if (IsPcm_Frame_Count)
+        {
+            Frame_Count_InThisBlock++; //If IsPcm_Frame_Count is set, 2 frames were needed in order to detect PCM
+            IsPcm_Frame_Count=0;
+        }
+        if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+            Frame_Count_NotParsedIncluded++;
+        #if MEDIAINFO_DEMUX
+            if (FrameInfo.DTS!=(int64u)-1 && FrameInfo.DUR!=(int64u)-1)
+            {
+                FrameInfo.DTS+=FrameInfo.DUR;
+                FrameInfo.PTS=FrameInfo.DTS;
+            }
+        #endif //MEDIAINFO_DEMUX
+
+        return;
+    }
+    if (From_Raw)
+    {
+        Raw();
+        return;
+    }
+    if (From_MpegPs)
+    {
+        Frame_FromMpegPs();
+        return;
+    }
+
+    //Special cases
+    if (!From_Aes3 && !Status[IsAccepted])
+    {
+        Synchronize();
+        if (!IsParsingNonPcm)
+        {
+            IsPcm_Frame_Count++;
+            Buffer_Offset=0;
+            if ((IsSub && Buffer_Size>32*1024) || (IsSub && IsPcm_Frame_Count>1) || ChannelCount==1)
+            {
+                //Raw PCM
+                MustSynchronize=false;
+                IsPcm=true;
+                Read_Buffer_Continue();
+
+                Accept("PCM");
+                Finish();
+
+                return;
+            }
+
+            Element_WaitForMoreData();
+            return;
+        }
+    }
+
+    if (!From_Aes3 && Frame_Count==0)
+    {
+        //Guard band
+        Buffer_Offset_Temp=Buffer_Offset;
+        if (ByteSize==6)
+        {
+            while(Buffer_Offset_Temp+6<=Buffer_Size && CC3(Buffer+Buffer_Offset_Temp)==0x000000)
+                Buffer_Offset_Temp+=6;
+
+            if (Buffer_Offset_Temp+6>Buffer_Size)
+            {
+                Element_WaitForMoreData();
+                return;
+            }
+        }
+        else if (ByteSize==8)
+        {
+            while(Buffer_Offset_Temp+8<=Buffer_Size && CC4(Buffer+Buffer_Offset_Temp)==0x00000000)
+                Buffer_Offset_Temp+=8;
+
+            if (Buffer_Offset_Temp+8>Buffer_Size)
+            {
+                Element_WaitForMoreData();
+                return;
+            }
+        }
+        else
+        {
+            if (Buffer_Offset_Temp+8>Buffer_Size)
+            {
+                Element_WaitForMoreData();
+                return;
+            }
+
+            if (CC8(Buffer+Buffer_Offset_Temp)==0x0000000000000000LL)
+            {
+                while(Buffer_Offset_Temp+2<=Buffer_Size && CC2(Buffer+Buffer_Offset_Temp)==0x0000)
+                    Buffer_Offset_Temp+=2;
+
+                if (Buffer_Offset_Temp+2>Buffer_Size)
+                {
+                    Element_WaitForMoreData();
+                    return;
+                }
+            }
+        }
+        if (Buffer_Offset_Temp-Buffer_Offset)
+        {
+            Skip_XX(Buffer_Offset_Temp-Buffer_Offset,  "Guard band");
+        }
+    }
+}
+
+#if MEDIAINFO_SEEK
+//---------------------------------------------------------------------------
+void File_Aes3::Read_Buffer_Unsynched()
+{
+    if (File_GoTo==0)
+        Synched_Init();
+
+    if (Frame_Count_NotParsedIncluded!=(int64u)-1 && Frame_Duration!=(int64u)-1 && Frame_Size!=(int64u)-1)
+    {
+        Frame_Count_NotParsedIncluded=File_GoTo/Frame_Size;
+        if (Frame_Count_NotParsedIncluded*Frame_Size<File_GoTo)
+            Frame_Count_NotParsedIncluded++;
+        FrameInfo.DTS=Frame_Count_NotParsedIncluded*Frame_Duration;
+    }
+}
+#endif //MEDIAINFO_SEEK
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_SEEK
+size_t File_Aes3::Read_Buffer_Seek (size_t Method, int64u Value, int64u /*ID*/)
+{
+    //Init
+    if (!Duration_Detected && File_Size!=(int64u)-1 && (Frame_Size==(int64u)-1 || Frame_Duration==(int64u)-1))
+    {
+        MediaInfo_Internal MI;
+        MI.Option(__T("File_KeepInfo"), __T("1"));
+        Ztring ParseSpeed_Save=MI.Option(__T("ParseSpeed_Get"), __T(""));
+        Ztring Demux_Save=MI.Option(__T("Demux_Get"), __T(""));
+        MI.Option(__T("ParseSpeed"), __T("0"));
+        MI.Option(__T("Demux"), Ztring());
+        size_t MiOpenResult=MI.Open(File_Name);
+        MI.Option(__T("ParseSpeed"), ParseSpeed_Save); //This is a global value, need to reset it. TODO: local value
+        MI.Option(__T("Demux"), Demux_Save); //This is a global value, need to reset it. TODO: local value
+        if (!MiOpenResult)
+            return 0;
+
+        int64u FrameCount=MI.Get(Stream_Audio, 0, __T("FrameCount")).To_int64u();
+        int64u Duration=MI.Get(Stream_Audio, 0, __T("Duration")).To_int64u();
+        int64u DataSize=MI.Get(Stream_General, 0, __T("DataSize")).To_int64u();
+        if (FrameCount && Duration)
+            Frame_Duration=Duration*1000000/FrameCount; //In nanoseconds
+        if (FrameCount && DataSize)
+            Frame_Size=DataSize/FrameCount;
+
+        Duration_Detected=true;
+    }
+
+    //Parsing
+    switch (Method)
+    {
+        case 0  :
+                    GoTo(Value);
+                    Open_Buffer_Unsynch();
+                    return 1;
+        case 1  :
+                    GoTo(File_Size*Value/10000);
+                    Open_Buffer_Unsynch();
+                    return 1;
+        case 2  :   //Timestamp
+                    {
+                    if (Frame_Duration==(int64u)-1 || Frame_Size==(int64u)-1)
+                        return (size_t)-1; //Not supported
+
+                    Unsynch_Frame_Count=float64_int64s(((float64)Value)/Frame_Duration);
+                    GoTo(Unsynch_Frame_Count*Frame_Size);
+                    Open_Buffer_Unsynch();
+                    return 1;
+                    }
+        case 3  :   //FrameNumber
+                    {
+                    if (Frame_Size==(int64u)-1)
+                        return (size_t)-1; //Not supported
+
+                    Unsynch_Frame_Count=Value;
+                    GoTo(Unsynch_Frame_Count*Frame_Size);
+                    Open_Buffer_Unsynch();
+                    return 1;
+                    }
+        default :   return (size_t)-1; //Not supported
+    }
 }
+#endif //MEDIAINFO_SEEK
 
 //***************************************************************************
-// Format
+// Buffer - Synchro
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_Aes3::Synchronize()
+{
+    if (IsPcm)
+        return false; //No sync with raw PCM, must return immediatly and wait for more data
+
+    //Synchronizing
+    while (Buffer_Offset+16<=Buffer_Size)
+    {
+        if ((ByteSize==0 || ByteSize==4) && ((Buffer_TotalBytes+Buffer_Offset)%4)==0)
+        {
+            if (Buffer[Buffer_Offset  ]==0xF8
+             && Buffer[Buffer_Offset+1]==0x72
+             && Buffer[Buffer_Offset+2]==0x4E
+             && Buffer[Buffer_Offset+3]==0x1F) //SMPTE 337M 16-bit, BE
+            {
+                ByteSize=4;
+                Container_Bits=16;
+                Stream_Bits=16;
+                Endianness='B'; //BE
+                break; //while()
+            }
+            if (Buffer[Buffer_Offset  ]==0x72
+             && Buffer[Buffer_Offset+1]==0xF8
+             && Buffer[Buffer_Offset+2]==0x1F
+             && Buffer[Buffer_Offset+3]==0x4E) //SMPTE 337M 16-bit, LE
+            {
+                ByteSize=4;
+                Container_Bits=16;
+                Stream_Bits=16;
+                Endianness='L'; //LE
+                break; //while()
+            }
+        }
+        if ((ByteSize==0 || ByteSize==5) && ((Buffer_TotalBytes+Buffer_Offset)%5)==0)
+        {
+            if (Buffer[Buffer_Offset  ]==0x6F
+             && Buffer[Buffer_Offset+1]==0x87
+             && Buffer[Buffer_Offset+2]==0x25
+             && Buffer[Buffer_Offset+3]==0x4E
+             && Buffer[Buffer_Offset+4]==0x1F) //SMPTE 337M 20-bit, BE
+            {
+                ByteSize=5;
+                Container_Bits=20;
+                Stream_Bits=20;
+                Endianness='B'; //BE
+                break; //while()
+            }
+        }
+        if ((ByteSize==0 || ByteSize==6) && ((Buffer_TotalBytes+Buffer_Offset)%6)==0)
+        {
+            if (Buffer[Buffer_Offset  ]==0x96
+             && Buffer[Buffer_Offset+1]==0xF8
+             && Buffer[Buffer_Offset+2]==0x72
+             && Buffer[Buffer_Offset+3]==0xA5
+             && Buffer[Buffer_Offset+4]==0x4E
+             && Buffer[Buffer_Offset+5]==0x1F) //SMPTE 337M 24-bit, BE
+            {
+                ByteSize=6;
+                Container_Bits=24;
+                Stream_Bits=24;
+                Endianness='B'; //BE
+                break; //while()
+            }
+            if (Buffer[Buffer_Offset  ]==0x72
+             && Buffer[Buffer_Offset+1]==0xF8
+             && Buffer[Buffer_Offset+2]==0x96
+             && Buffer[Buffer_Offset+3]==0x1F
+             && Buffer[Buffer_Offset+4]==0x4E
+             && Buffer[Buffer_Offset+5]==0x5A) //SMPTE 337M 24-bit, LE
+            {
+                ByteSize=6;
+                Container_Bits=24;
+                Stream_Bits=24;
+                Endianness='L'; //LE
+                break; //while()
+            }
+            if (Buffer[Buffer_Offset  ]==0x00
+             && Buffer[Buffer_Offset+1]==0xF8
+             && Buffer[Buffer_Offset+2]==0x72
+             && Buffer[Buffer_Offset+3]==0x00
+             && Buffer[Buffer_Offset+4]==0x4E
+             && Buffer[Buffer_Offset+5]==0x1F) //16-bit in 24-bit, BE
+            {
+                ByteSize=6;
+                Container_Bits=24;
+                Stream_Bits=16;
+                Endianness='B'; //BE
+                break; //while()
+            }
+            if (Buffer[Buffer_Offset  ]==0x00
+             && Buffer[Buffer_Offset+1]==0x72
+             && Buffer[Buffer_Offset+2]==0xF8
+             && Buffer[Buffer_Offset+3]==0x00
+             && Buffer[Buffer_Offset+4]==0x1F
+             && Buffer[Buffer_Offset+5]==0x4E) //16-bit in 24-bit, LE
+            {
+                ByteSize=6;
+                Container_Bits=24;
+                Stream_Bits=16;
+                Endianness='L'; //LE
+                break; //while()
+            }
+            if (Buffer[Buffer_Offset  ]==0x6F
+             && Buffer[Buffer_Offset+1]==0x87
+             && Buffer[Buffer_Offset+2]==0x20
+             && Buffer[Buffer_Offset+3]==0x54
+             && Buffer[Buffer_Offset+4]==0xE1
+             && Buffer[Buffer_Offset+5]==0xF0) //20-bit in 24-bit, BE
+            {
+                ByteSize=6;
+                Container_Bits=24;
+                Stream_Bits=20;
+                Endianness='B'; //BE
+                break; //while()
+            }
+            if (Buffer[Buffer_Offset  ]==0x20
+             && Buffer[Buffer_Offset+1]==0x87
+             && Buffer[Buffer_Offset+2]==0x6F
+             && Buffer[Buffer_Offset+3]==0xF0
+             && Buffer[Buffer_Offset+4]==0xE1
+             && Buffer[Buffer_Offset+5]==0x54) //20-bit in 24-bit, LE
+            {
+                ByteSize=6;
+                Container_Bits=24;
+                Stream_Bits=20;
+                Endianness='L'; //LE
+                break; //while()
+            }
+        }
+        if ((ByteSize==0 || ByteSize==8) && ((Buffer_TotalBytes+Buffer_Offset)%8)==0)
+        {
+            if (Buffer[Buffer_Offset  ]==0x00
+             && Buffer[Buffer_Offset+1]==0x00
+             && Buffer[Buffer_Offset+2]==0xF8
+             && Buffer[Buffer_Offset+3]==0x72
+             && Buffer[Buffer_Offset+4]==0x00
+             && Buffer[Buffer_Offset+5]==0x00
+             && Buffer[Buffer_Offset+6]==0x4E
+             && Buffer[Buffer_Offset+7]==0x1F) //16-bit in 32-bit, BE
+            {
+                ByteSize=8;
+                Container_Bits=32;
+                Stream_Bits=16;
+                Endianness='B'; //BE
+                break; //while()
+            }
+            if (Buffer[Buffer_Offset  ]==0x00
+             && Buffer[Buffer_Offset+1]==0x00
+             && Buffer[Buffer_Offset+2]==0x72
+             && Buffer[Buffer_Offset+3]==0xF8
+             && Buffer[Buffer_Offset+4]==0x00
+             && Buffer[Buffer_Offset+5]==0x00
+             && Buffer[Buffer_Offset+6]==0x1F
+             && Buffer[Buffer_Offset+7]==0x4E) //16-bit in 32-bit, LE
+            {
+                ByteSize=8;
+                Container_Bits=32;
+                Stream_Bits=16;
+                Endianness='L'; //LE
+                break; //while()
+            }
+            if (Buffer[Buffer_Offset  ]==0x00
+             && Buffer[Buffer_Offset+1]==0x6F
+             && Buffer[Buffer_Offset+2]==0x87
+             && Buffer[Buffer_Offset+3]==0x20
+             && Buffer[Buffer_Offset+4]==0x00
+             && Buffer[Buffer_Offset+5]==0x54
+             && Buffer[Buffer_Offset+6]==0xE1
+             && Buffer[Buffer_Offset+7]==0xF0) //20-bit in 32-bit, BE
+            {
+                ByteSize=8;
+                Container_Bits=32;
+                Stream_Bits=20;
+                Endianness='B'; //BE
+                break; //while()
+            }
+            if (Buffer[Buffer_Offset  ]==0x00
+             && Buffer[Buffer_Offset+1]==0x20
+             && Buffer[Buffer_Offset+2]==0x87
+             && Buffer[Buffer_Offset+3]==0x6F
+             && Buffer[Buffer_Offset+4]==0x00
+             && Buffer[Buffer_Offset+5]==0xF0
+             && Buffer[Buffer_Offset+6]==0xE1
+             && Buffer[Buffer_Offset+7]==0x54) //20-bit in 32-bit, LE
+            {
+                ByteSize=8;
+                Container_Bits=32;
+                Stream_Bits=20;
+                Endianness='L'; //LE
+                break; //while()
+            }
+            if (Buffer[Buffer_Offset  ]==0x00
+             && Buffer[Buffer_Offset+1]==0x96
+             && Buffer[Buffer_Offset+2]==0xF8
+             && Buffer[Buffer_Offset+3]==0x72
+             && Buffer[Buffer_Offset+4]==0x00
+             && Buffer[Buffer_Offset+5]==0xA5
+             && Buffer[Buffer_Offset+6]==0x4E
+             && Buffer[Buffer_Offset+7]==0x1F) //24-bit in 32-bit, BE
+            {
+                ByteSize=8;
+                Container_Bits=32;
+                Stream_Bits=24;
+                Endianness='B'; //BE
+                break; //while()
+            }
+            if (Buffer[Buffer_Offset  ]==0x00
+             && Buffer[Buffer_Offset+1]==0x72
+             && Buffer[Buffer_Offset+2]==0xF8
+             && Buffer[Buffer_Offset+3]==0x96
+             && Buffer[Buffer_Offset+4]==0x00
+             && Buffer[Buffer_Offset+5]==0x1F
+             && Buffer[Buffer_Offset+6]==0x4E
+             && Buffer[Buffer_Offset+7]==0xA5) //24-bit in 32-bit, LE
+            {
+                ByteSize=8;
+                Container_Bits=32;
+                Stream_Bits=24;
+                Endianness='L'; //LE
+                break; //while()
+            }
+        }
+
+        if (ByteSize)
+            Buffer_Offset+=ByteSize;
+        else
+            Buffer_Offset++;
+    }
+
+    //Parsing last bytes if needed
+    if (Buffer_Offset+16>Buffer_Size)
+    {
+        return false;
+    }
+
+    //Synched
+    IsParsingNonPcm=true;
+    return true;
+}
+
+//---------------------------------------------------------------------------
+bool File_Aes3::Synched_Test()
+{
+    //Skip NULL padding
+    if (!From_Aes3)
+    {
+        size_t Buffer_Offset_Temp=Buffer_Offset;
+        if (ByteSize==4)
+        {
+            while ((Buffer_TotalBytes+Buffer_Offset_Temp)%4) //Padding in part of the AES3 block
+            {
+                if (Buffer_Offset_Temp+1>Buffer_Size)
+                {
+                    Element_WaitForMoreData();
+                    return false;
+                }
+                if (Buffer[Buffer_Offset_Temp])
+                {
+                    Trusted_IsNot("Bad sync");
+                    return true;
+                }
+                Buffer_Offset_Temp++;
+            }
+            while(Buffer_Offset_Temp+4<=Buffer_Size && CC4(Buffer+Buffer_Offset_Temp)==0x00000000)
+                Buffer_Offset_Temp+=4;
+            if (Buffer_Offset_Temp+4>Buffer_Size)
+            {
+                Element_WaitForMoreData();
+                return false;
+            }
+        }
+        if (ByteSize==6)
+        {
+            while ((Buffer_TotalBytes+Buffer_Offset_Temp)%6) //Padding in part of the AES3 block
+            {
+                if (Buffer_Offset_Temp+1>Buffer_Size)
+                {
+                    Element_WaitForMoreData();
+                    return false;
+                }
+                if (Buffer[Buffer_Offset_Temp])
+                {
+                    Trusted_IsNot("Bad sync");
+                    return true;
+                }
+                Buffer_Offset_Temp++;
+            }
+            while(Buffer_Offset_Temp+6<=Buffer_Size && CC6(Buffer+Buffer_Offset_Temp)==0x000000000000LL)
+                Buffer_Offset_Temp+=6;
+            if (Buffer_Offset_Temp+6>Buffer_Size)
+            {
+                Element_WaitForMoreData();
+                return false;
+            }
+        }
+        else if (ByteSize==8)
+        {
+            while ((Buffer_TotalBytes+Buffer_Offset_Temp)%8) //Padding in part of the AES3 block
+            {
+                if (Buffer_Offset_Temp+1>Buffer_Size)
+                {
+                    Element_WaitForMoreData();
+                    return false;
+                }
+                if (Buffer[Buffer_Offset_Temp])
+                {
+                    Trusted_IsNot("Bad sync");
+                    return true;
+                }
+                Buffer_Offset_Temp++;
+            }
+            while(Buffer_Offset_Temp+8<=Buffer_Size && CC8(Buffer+Buffer_Offset_Temp)==0x0000000000000000LL)
+                Buffer_Offset_Temp+=8;
+            if (Buffer_Offset_Temp+8>Buffer_Size)
+            {
+                Element_WaitForMoreData();
+                return false;
+            }
+        }
+
+        if (Frame_Count && NotPCM_SizePerFrame==(int64u)-1)
+            NotPCM_SizePerFrame=Buffer_Offset_Temp;
+        #if MEDIAINFO_TRACE
+            if (Buffer_Offset_Temp-Buffer_Offset)
+            {
+                Element_Size=Buffer_Offset_Temp-Buffer_Offset;
+                Skip_XX(Buffer_Offset_Temp-Buffer_Offset,           "Guard band");
+            }
+        #endif //MEDIAINFO_TRACE
+        Buffer_Offset=Buffer_Offset_Temp;
+    }
+
+    //Must have enough buffer for having header
+    if (Buffer_Offset+16>Buffer_Size)
+        return false;
+
+    //Quick test of synchro
+    switch (Endianness)
+    {
+        case 'B' :
+                    switch (Container_Bits)
+                    {
+                        case 16 :   if (CC4(Buffer+Buffer_Offset)!=0xF8724E1F) {Synched=false; return true;} break;
+                        case 20 :   if (CC5(Buffer+Buffer_Offset)!=0x6F87254E1FLL) {Synched=false; return true;} break;
+                        case 24 :
+                                    switch (Stream_Bits)
+                                    {
+                                        case 16 : if (CC6(Buffer+Buffer_Offset)!=0xF872004E1F00LL) {Synched=false; return true;} break;
+                                        case 20 : if (CC6(Buffer+Buffer_Offset)!=0x6F872054E1F0LL) {Synched=false; return true;} break;
+                                        case 24 : if (CC6(Buffer+Buffer_Offset)!=0x96F872A54E1FLL) {Synched=false; return true;} break;
+                                        default : ;
+                                    }
+                                    break;
+                        case 32 :
+                                    switch (Stream_Bits)
+                                    {
+                                        case 16 : if (CC6(Buffer+Buffer_Offset)!=0x0000F87200004E1FLL) {Synched=false; return true;} break;
+                                        case 20 : if (CC6(Buffer+Buffer_Offset)!=0x006F87200054E1F0LL) {Synched=false; return true;} break;
+                                        case 24 : if (CC6(Buffer+Buffer_Offset)!=0x0096F87200A5F41FLL) {Synched=false; return true;} break;
+                                        default : ;
+                                    }
+                                    break;
+                        default : ;
+                    }
+                    break;
+        case 'L'  :
+                    switch (Container_Bits)
+                    {
+                        case 16 :   if (CC4(Buffer+Buffer_Offset)!=0x72F81F4E) {Synched=false; return true;} break;
+                        case 24 :
+                                    switch (Stream_Bits)
+                                    {
+                                        case 16 : if (CC6(Buffer+Buffer_Offset)!=0x0072F8001F4ELL) {Synched=false; return true;} break;
+                                        case 20 : if (CC6(Buffer+Buffer_Offset)!=0x20876FF0E154LL) {Synched=false; return true;} break;
+                                        case 24 : if (CC6(Buffer+Buffer_Offset)!=0x72F8961F4EA5LL) {Synched=false; return true;} break;
+                                            default : ;
+                                    }
+                                    break;
+                        case 32 :
+                                    switch (Stream_Bits)
+                                    {
+                                        case 16 : if (CC8(Buffer+Buffer_Offset)!=0x000072F800001F4ELL) {Synched=false; return true;} break;
+                                        case 20 : if (CC8(Buffer+Buffer_Offset)!=0x0020876F00F0E154LL) {Synched=false; return true;} break;
+                                        case 24 : if (CC8(Buffer+Buffer_Offset)!=0x0072F896001F4EA5LL) {Synched=false; return true;} break;
+                                        default : ;
+                                    }
+                                    break;
+                        default : ;
+                    }
+                    break;
+        default    : ; //Should never happen
+    }
+
+    //We continue
+    return true;
+}
+
+//---------------------------------------------------------------------------
+void File_Aes3::Synched_Init()
+{
+    if (Frame_Count_NotParsedIncluded==(int64u)-1)
+        Frame_Count_NotParsedIncluded=0;
+    if (FrameInfo.DTS==(int64u)-1)
+        FrameInfo.DTS=0;
+}
+
+//***************************************************************************
+// Per element
 //***************************************************************************
 
 //---------------------------------------------------------------------------
 void File_Aes3::Header_Parse()
 {
+    if (IsPcm)
+    {
+        Element_WaitForMoreData();
+        return;
+    }
+
     //Parsing
-    int16u Size;
-    Get_B2 (Size,                                               "Size");
+    int32u Size=0;
+    switch (Endianness)
+    {
+        case 'B' :
+                    switch (Container_Bits)
+                    {
+                        case 16 :   Size=BigEndian2int16u(Buffer+Buffer_Offset+6)         ; break;
+                        case 20 :   Size=BigEndian2int24u(Buffer+Buffer_Offset+7)&0x0FFFFF; break;
+                        case 24 :
+                                    switch (Stream_Bits)
+                                    {
+                                        case 16 : Size=BigEndian2int16u(Buffer+Buffer_Offset+9)   ; break;
+                                        case 20 : Size=BigEndian2int24u(Buffer+Buffer_Offset+9)>>4; break;
+                                        case 24 : Size=BigEndian2int24u(Buffer+Buffer_Offset+9)   ; break;
+                                        default : ;
+                                    }
+                                    break;
+                        case 32 :
+                                    switch (Stream_Bits)
+                                    {
+                                        case 16 : Size=BigEndian2int16u(Buffer+Buffer_Offset+0xC)   ; break;
+                                        case 20 : Size=BigEndian2int24u(Buffer+Buffer_Offset+0xC)>>4; break;
+                                        case 24 : Size=BigEndian2int24u(Buffer+Buffer_Offset+0xC)   ; break;
+                                        default : ;
+                                    }
+                                    break;
+                        default : ;
+                    }
+                    break;
+        case 'L'  :
+                    switch (Container_Bits)
+                    {
+                        case 16 :   Size=LittleEndian2int16u(Buffer+Buffer_Offset+6)   ; break;
+                        case 24 :
+                                    switch (Stream_Bits)
+                                    {
+                                        case 16 : Size=LittleEndian2int16u(Buffer+Buffer_Offset+0xA)   ; break;
+                                        case 20 : Size=LittleEndian2int24u(Buffer+Buffer_Offset+0x9)>>4; break;
+                                        case 24 : Size=LittleEndian2int24u(Buffer+Buffer_Offset+0x9)   ; break;
+                                        default : ;
+                                    }
+                                    break;
+                        case 32 :
+                                    switch (Stream_Bits)
+                                    {
+                                        case 16 : Size=LittleEndian2int16u(Buffer+Buffer_Offset+0xE)   ; break;
+                                        case 20 : Size=LittleEndian2int24u(Buffer+Buffer_Offset+0xD)>>4; break;
+                                        case 24 : Size=LittleEndian2int24u(Buffer+Buffer_Offset+0xD)   ; break;
+                                        default : ;
+                                    }
+                                    break;
+                        default : ;
+                    }
+                    break;
+        default   : ; //Should never happen
+    }
+
+    //Adaptation
+    if (Container_Bits!=Stream_Bits)
+    {
+        Size*=Container_Bits; Size/=Stream_Bits;
+    }
+
+    //Coherency test
+    if (!IsSub && !Status[IsAccepted])
+    {
+        size_t Offset=Buffer_Offset+(size_t)(Container_Bits*4/8+Size/8);
+        while (Offset<Buffer_Size && Buffer[Offset]==0x00)
+            Offset++;
+        if (Offset+ByteSize>Buffer_Size)
+        {
+            Element_WaitForMoreData();
+            return;
+        }
+        Offset/=ByteSize;
+        Offset*=ByteSize;
+        bool IsOK=true;
+        for (size_t Pos=0; Pos<ByteSize; Pos++)
+            if (Buffer[Buffer_Offset+Pos]!=Buffer[Offset+Pos])
+            {
+                IsOK=false;
+                break;
+            }
+        if (!IsOK)
+        {
+            Trusted_IsNot("Bad sync");
+            Buffer_Offset++;
+            return;
+        }
+    }
+
+    //Filling
+    Header_Fill_Size(Container_Bits*4/8+Size/8);
+    Header_Fill_Code(0, "AES3");
+}
+
+//---------------------------------------------------------------------------
+void File_Aes3::Data_Parse()
+{
+    if (!Status[IsAccepted])
+        Accept("AES3");
+
+    if (Container_Bits==Stream_Bits && Endianness=='B')
+        Frame();
+    else
+        Frame_WithPadding();
+}
+
+//---------------------------------------------------------------------------
+void File_Aes3::Raw()
+{
+    //SMPTE 331M
+    int16u Audio_Sample_Count;
+    int8u Channels_valid;
     BS_Begin();
-    Get_S1 (2, number_channels,                                 "number_channels"); Param_Info(2+2*number_channels, " channels");
-    Info_S1(8, channel_id,                                      "channel_id");
-    Get_S1 (2, bits_per_samples,                                "bits_per_samples"); Param_Info(16+4*bits_per_samples, " bits");
-    Info_S1(4, alignments,                                      "alignments");
+    Skip_SB(                                                "FVUCP Valid Flag");
+    Skip_S1(4,                                              "Reserved");
+    Skip_S1(3,                                              "5-sequence count");
     BS_End();
+    Get_L2 (Audio_Sample_Count,                             "Audio Sample Count");
+    Get_B1 (Channels_valid,                                 "Channels valid");
 
-    //Filling
-    Header_Fill_Size(Element_Offset+Size);
-    Header_Fill_Code(0, "Block");
+    //Parsing
+    if (QuantizationBits==16)
+        bits_per_sample=0; //16 bits
+    else
+        bits_per_sample=2; //24 bits
+    switch (bits_per_sample)
+    {
+        case 0  : //16 bits
+        {
+            int8u* Info=new int8u[(size_t)(Element_Size/2)];
+            size_t Info_Offset=0;
+
+            while (Element_Offset+8*4<=Element_Size)
+            {
+                for (int8u Pos=0; Pos<8; Pos++)
+                {
+                    if (Channels_valid&(1<<Pos))
+                    {
+                        size_t Buffer_Pos=Buffer_Offset+(size_t)Element_Offset;
+
+                        Info[Info_Offset+0] = (Buffer[Buffer_Pos+1]>>4) | ((Buffer[Buffer_Pos+2]<<4)&0xF0 );
+                        Info[Info_Offset+1] = (Buffer[Buffer_Pos+2]>>4) | ((Buffer[Buffer_Pos+3]<<4)&0xF0 );
+
+                        Info_Offset+=2;
+                    }
+                    Element_Offset+=4;
+                }
+            }
+            Element_Offset=4;
+
+            #if MEDIAINFO_DEMUX
+                FrameInfo.PTS=FrameInfo.DTS;
+                if (SampleRate)
+                    FrameInfo.DUR=(Element_Size-4)/4*1000000000/(SampleRate*8);
+                Demux_random_access=true;
+                Element_Code=(int64u)-1;
+                Demux(Info, Info_Offset, ContentType_MainStream);
+            #endif //MEDIAINFO_DEMUX
+
+            delete[] Info;
+
+            Skip_XX(Element_Size-4,                             "Data");
+
+            Frame_Count_InThisBlock++;
+            if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+                Frame_Count_NotParsedIncluded++;
+            #if MEDIAINFO_DEMUX
+                if (FrameInfo.DTS!=(int64u)-1 && FrameInfo.DUR!=(int64u)-1)
+                {
+                    FrameInfo.DTS+=FrameInfo.DUR;
+                    FrameInfo.PTS=FrameInfo.DTS;
+                }
+            #endif //MEDIAINFO_DEMUX
+        }
+        break;
+        case 2  : //24 bits
+        {
+            int8u* Info=new int8u[(size_t)(Element_Size*3/4)];
+            size_t Info_Offset=0;
+
+            while (Element_Offset+8*4<=Element_Size)
+            {
+                for (int8u Pos=0; Pos<8; Pos++)
+                {
+                    if (Channels_valid&(1<<Pos))
+                    {
+                        size_t Buffer_Pos=Buffer_Offset+(size_t)Element_Offset;
+
+                        Info[Info_Offset+0] = (Buffer[Buffer_Pos+0]>>4) | ((Buffer[Buffer_Pos+1]<<4)&0xF0 );
+                        Info[Info_Offset+1] = (Buffer[Buffer_Pos+1]>>4) | ((Buffer[Buffer_Pos+2]<<4)&0xF0 );
+                        Info[Info_Offset+2] = (Buffer[Buffer_Pos+2]>>4) | ((Buffer[Buffer_Pos+3]<<4)&0xF0 );
+
+                        Info_Offset+=3;
+                    }
+                    Element_Offset+=4;
+                }
+            }
+            Element_Offset=4;
+
+            #if MEDIAINFO_DEMUX
+                FrameInfo.PTS=FrameInfo.DTS;
+                if (SampleRate)
+                    FrameInfo.DUR=(Element_Size-4)/4*1000000000/(SampleRate*8);
+                Demux_random_access=true;
+                Element_Code=(int64u)-1;
+                Demux(Info, Info_Offset, ContentType_MainStream);
+            #endif //MEDIAINFO_DEMUX
+
+            delete[] Info;
+
+            Skip_XX(Element_Size-4,                             "Data");
+
+            Frame_Count_InThisBlock++;
+            if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+                Frame_Count_NotParsedIncluded++;
+            #if MEDIAINFO_DEMUX
+                if (FrameInfo.DTS!=(int64u)-1 && FrameInfo.DUR!=(int64u)-1)
+                {
+                    FrameInfo.DTS+=FrameInfo.DUR;
+                    FrameInfo.PTS=FrameInfo.DTS;
+                }
+            #endif //MEDIAINFO_DEMUX
+        }
+        break;
+        default :
+            Skip_XX(Element_Size-4,                             "Data");
+    }
+
+    FILLING_BEGIN();
+    if (!Status[IsAccepted])
+    {
+        Accept("AES3");
+
+        int8u Channels=0;
+        for (int8u Pos=0; Pos<8; Pos++)
+        {
+            if (Channels_valid&(1<<Pos))
+                Channels++;
+            Element_Offset+=4;
+        }
+
+        Stream_Prepare(Stream_Audio);
+        Fill(Stream_Audio, 0, Audio_Format, "PCM");
+        Fill(Stream_Audio, 0, Audio_Channel_s_, Channels);
+    }
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
+void File_Aes3::Frame()
+{
+    //Parsing
+    int32u  length_code;
+    Element_Begin1("Header");
+        BS_Begin();
+        Skip_S3(Stream_Bits,                                    "Pa");
+        Skip_S3(Stream_Bits,                                    "Pb");
+        Element_Begin1("Pc");
+            Skip_S1( 3,                                         "data_stream_number");
+            Skip_S1( 5,                                         "data_type_dependent");
+            Skip_SB(                                            "error_flag");
+            Info_S1( 2, data_mode,                              "data_mode"); Param_Info2(16+4*data_mode, " bits");
+            Get_S1 ( 5, data_type,                              "data_type"); Param_Info1(Aes3_NonPCM_data_type[data_type]);
+            if (Stream_Bits>16)
+                Skip_S1( 4,                                     "reserved");
+            if (Stream_Bits>20)
+                Skip_S1( 4,                                     "reserved");
+        Element_End0();
+        Get_S3 (Stream_Bits, length_code,                       "length_code"); Param_Info2(length_code/8, " bytes");
+        BS_End();
+    Element_End0();
+
+    if (Parser==NULL)
+    {
+        switch(data_type)
+        {
+            //SMPTE ST338
+            case  1 :   //AC-3
+            case 16 :   //E-AC-3 (professional)
+            case 21 :   //E-AC-3 (consumer)
+                        Parser=new File_Ac3();
+                        ((File_Ac3*)Parser)->Frame_Count_Valid=2;
+                        break;
+            case  4 :   //MPEG-1 Layer 1
+            case  5 :   //MPEG-1 Layer 2/3, MPEG-2 Layer 1/2/3 without extension
+            case  6 :   //MPEG-2 Layer 1/2/3 with extension
+            case  8 :   //MPEG-2 Layer 1 low frequency
+            case  9 :   //MPEG-2 Layer 2/3 low frequency
+                        Parser=new File_Mpega();
+                        break;
+            case  7 :   //MPEG-2 AAC in ADTS
+            case 19 :   //MPEG-2 AAC in ADTS low frequency
+                        Parser=new File_Aac();
+                        ((File_Aac*)Parser)->Mode=File_Aac::Mode_ADTS;
+                        break;
+            case 10 :   //MPEG-4 AAC in ADTS or LATM
+            case 11 :   //MPEG-4 AAC in ADTS or LATM
+                        Parser=new File_Aac();
+                        break;
+            case 28 :   //Dolby E
+                        Parser=new File_DolbyE();
+                        break;
+            default : ;
+        }
+
+        if (Parser)
+        {
+            Open_Buffer_Init(Parser);
+        }
+    }
+    if (Parser)
+    {
+        #if MEDIAINFO_DEMUX
+            FrameInfo.PTS=FrameInfo.DTS;
+            if (SampleRate && ByteSize)
+                FrameInfo.DUR=(Element_Size-Element_Offset)*1000000000/(SampleRate*ByteSize);
+            Demux_random_access=true;
+            Element_Code=(int64u)-1;
+            Demux(Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)(Element_Size-Element_Offset), ContentType_MainStream);
+        #endif //MEDIAINFO_DEMUX
+
+        Parser->FrameInfo=FrameInfo;
+        Open_Buffer_Continue(Parser, Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)(Element_Size-Element_Offset));
+        #if MEDIAINFO_DEMUX
+            if (Parser->FrameInfo.DUR!=FrameInfo.DUR && Parser->FrameInfo.DUR!=(int64u)-1)
+                FrameInfo.DUR=Parser->FrameInfo.DUR;
+            if (FrameInfo.DUR!=(int64u)-1)
+                FrameInfo.DTS+=FrameInfo.DUR;
+            else if (Parser->FrameInfo.DTS!=(int64u)-1)
+                FrameInfo=Parser->FrameInfo;
+            else
+                FrameInfo.DTS=(int64u)-1;
+        #endif //MEDIAINFO_DEMUX
+        Frame_Count++;
+        if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+            Frame_Count_NotParsedIncluded++;
+        if (!Status[IsFilled] && Parser->Status[IsFilled])
+        {
+            Merge(*Parser);
+            int64u OverallBitRate=Parser->Retrieve(Stream_General, 0, General_OverallBitRate).To_int64u();
+            if (OverallBitRate)
+            {
+                OverallBitRate*=Element_Size; OverallBitRate/=Element_Size-Stream_Bits*4/8;
+                Fill(Stream_General, 0, General_OverallBitRate, Ztring::ToZtring(OverallBitRate)+__T(" / ")+Parser->Retrieve(Stream_General, 0, General_OverallBitRate));
+            }
+            int64u BitRate=Parser->Retrieve(Stream_Audio, 0, Audio_BitRate).To_int64u();
+            if (BitRate)
+                FrameRate=((float64)BitRate)/((Element_Size-Element_Offset)*8);
+            Fill("AES3");
+        }
+        if (Parser->Status[IsFinished])
+            Finish("AES3");
+        Element_Offset=Element_Size;
+    }
+    else
+        Finish("AES3");
+}
+
+//---------------------------------------------------------------------------
+void File_Aes3::Frame_WithPadding()
+{
+    #if MEDIAINFO_DEMUX
+        FrameInfo.PTS=FrameInfo.DTS;
+        if (SampleRate && ByteSize)
+            FrameInfo.DUR=Element_Size*1000000000/(SampleRate*ByteSize);
+        Demux_random_access=true;
+        Element_Code=(int64u)-1;
+        Demux(Buffer+Buffer_Offset, (size_t)Element_Size, ContentType_MainStream);
+    #endif //MEDIAINFO_DEMUX
+
+    int8u* Info=new int8u[(size_t)Element_Size];
+    size_t Info_Offset=0;
+
+    if (Container_Bits==16 && Stream_Bits==16 && Endianness=='L')
+    {
+        while (Element_Offset+4<=Element_Size)
+        {
+            size_t Buffer_Pos=Buffer_Offset+(size_t)Element_Offset;
+
+            Info[Info_Offset+0]=  Buffer[Buffer_Pos+1];
+            Info[Info_Offset+1]=  Buffer[Buffer_Pos+0];
+            Info[Info_Offset+2]=  Buffer[Buffer_Pos+3];
+            Info[Info_Offset+3]=  Buffer[Buffer_Pos+2];
+            Info_Offset+=4;
+            Element_Offset+=4;
+        }
+        if (Element_Offset+2<=Element_Size) //Only in half of the AES3 stream
+        {
+            size_t Buffer_Pos=Buffer_Offset+(size_t)Element_Offset;
+
+            Info[Info_Offset+0]=  Buffer[Buffer_Pos+1];
+            Info[Info_Offset+1]=  Buffer[Buffer_Pos+0];
+            Info_Offset+=2;
+            Element_Offset+=2;
+        }
+    }
+    if (Container_Bits==24 && Stream_Bits==16 && Endianness=='L')
+    {
+        while (Element_Offset+6<=Element_Size)
+        {
+            size_t Buffer_Pos=Buffer_Offset+(size_t)Element_Offset;
+
+            Info[Info_Offset+0]=  Buffer[Buffer_Pos+2];
+            Info[Info_Offset+1]=  Buffer[Buffer_Pos+1];
+            Info[Info_Offset+2]=  Buffer[Buffer_Pos+5];
+            Info[Info_Offset+3]=  Buffer[Buffer_Pos+4];
+            Info_Offset+=4;
+            Element_Offset+=6;
+        }
+    }
+    if (Container_Bits==24 && Stream_Bits==20 && Endianness=='L')
+    {
+        while (Element_Offset+6<=Element_Size)
+        {
+            size_t Buffer_Pos=Buffer_Offset+(size_t)Element_Offset;
+
+            Info[Info_Offset+0]=  Buffer[Buffer_Pos+2];
+            Info[Info_Offset+1]=  Buffer[Buffer_Pos+1];
+            Info[Info_Offset+2]=((Buffer[Buffer_Pos+0]&0xF0)   ) | ((Buffer[Buffer_Pos+5]&0xF0)>>4);
+            Info[Info_Offset+3]=((Buffer[Buffer_Pos+5]&0x0F)<<4) | ((Buffer[Buffer_Pos+4]&0xF0)>>4);
+            Info[Info_Offset+4]=((Buffer[Buffer_Pos+4]&0x0F)<<4) | ((Buffer[Buffer_Pos+3]&0xF0)>>4);
+            Info_Offset+=5;
+            Element_Offset+=6;
+        }
+    }
+    if (Container_Bits==32 && Stream_Bits==16 && Endianness=='L')
+    {
+        while (Element_Offset+8<=Element_Size)
+        {
+            size_t Buffer_Pos=Buffer_Offset+(size_t)Element_Offset;
+
+            Info[Info_Offset+0]=  Buffer[Buffer_Pos+3];
+            Info[Info_Offset+1]=  Buffer[Buffer_Pos+2];
+            Info[Info_Offset+2]=  Buffer[Buffer_Pos+7];
+            Info[Info_Offset+3]=  Buffer[Buffer_Pos+6];
+            Info_Offset+=4;
+            Element_Offset+=8;
+        }
+    }
+    if (Container_Bits==32 && Stream_Bits==20 && Endianness=='L')
+    {
+        while (Element_Offset+8<=Element_Size)
+        {
+            size_t Buffer_Pos=Buffer_Offset+(size_t)Element_Offset;
+
+            Info[Info_Offset+0]=  Buffer[Buffer_Pos+3];
+            Info[Info_Offset+1]=  Buffer[Buffer_Pos+2];
+            Info[Info_Offset+2]=((Buffer[Buffer_Pos+1]&0xF0)   ) | ((Buffer[Buffer_Pos+7]&0xF0)>>4);
+            Info[Info_Offset+3]=((Buffer[Buffer_Pos+7]&0x0F)<<4) | ((Buffer[Buffer_Pos+6]&0xF0)>>4);
+            Info[Info_Offset+4]=((Buffer[Buffer_Pos+6]&0x0F)<<4) | ((Buffer[Buffer_Pos+5]&0xF0)>>4);
+            Info_Offset+=5;
+            Element_Offset+=8;
+        }
+    }
+    if (Container_Bits==32 && Stream_Bits==24 && Endianness=='L')
+    {
+        while (Element_Offset+8<=Element_Size)
+        {
+            size_t Buffer_Pos=Buffer_Offset+(size_t)Element_Offset;
+
+            Info[Info_Offset+0]=  Buffer[Buffer_Pos+3];
+            Info[Info_Offset+1]=  Buffer[Buffer_Pos+2];
+            Info[Info_Offset+2]=  Buffer[Buffer_Pos+1];
+            Info[Info_Offset+3]=  Buffer[Buffer_Pos+7];
+            Info[Info_Offset+4]=  Buffer[Buffer_Pos+6];
+            Info[Info_Offset+5]=  Buffer[Buffer_Pos+5];
+            Info_Offset+=6;
+            Element_Offset+=8;
+        }
+    }
+
+    if (Container_Bits==24 && Stream_Bits==20 && Endianness=='B')
+    {
+        while (Element_Offset+6<=Element_Size)
+        {
+            size_t Buffer_Pos=Buffer_Offset+(size_t)Element_Offset;
+
+            Info[Info_Offset+0]=  Buffer[Buffer_Pos+0];
+            Info[Info_Offset+1]=  Buffer[Buffer_Pos+1];
+            Info[Info_Offset+2]=((Buffer[Buffer_Pos+2]&0xF0)   ) | ((Buffer[Buffer_Pos+3]&0xF0)>>4);
+            Info[Info_Offset+3]=((Buffer[Buffer_Pos+3]&0x0F)<<4) | ((Buffer[Buffer_Pos+4]&0xF0)>>4);
+            Info[Info_Offset+4]=((Buffer[Buffer_Pos+4]&0x0F)<<4) | ((Buffer[Buffer_Pos+5]&0xF0)>>4);
+            Info_Offset+=5;
+            Element_Offset+=6;
+        }
+    }
+
+    if (Element_Offset==0)
+    {
+        Skip_XX(Element_Size,                                   "Data");
+        Finish();
+        delete[] Info;
+        return;
+    }
+
+    Parser_Parse(Info, Info_Offset);
+    delete[] Info;
 }
 
 //---------------------------------------------------------------------------
@@ -117,168 +1529,344 @@
 }
 
 //---------------------------------------------------------------------------
-void File_Aes3::Data_Parse()
+void File_Aes3::Frame_FromMpegPs()
 {
-    Block_Count++;
+    //SMPTE 302M
+    int16u audio_packet_size=0;
+    Get_B2 (audio_packet_size,                              "audio_packet_size");
+    BS_Begin();
+    Get_S1 (2, number_channels,                             "number_channels"); Param_Info2(2+2*number_channels, " channels");
+    Info_S1(8, channel_identification,                      "channel_identification");
+    Get_S1 (2, bits_per_sample,                             "bits_per_sample"); Param_Info2(16+4*bits_per_sample, " bits");
+    Info_S1(4, alignment_bits,                              "alignment_bits");
+    BS_End();
+
+    //Enough data
+    if (Element_Size<4+(int64u)audio_packet_size)
+    {
+        Element_WaitForMoreData();
+        return;
+    }
+    if (Element_Size!=4+(int64u)audio_packet_size)
+    {
+        Trusted_IsNot("Wrong size");
+        Skip_XX(Element_Size-4,                             "Problem?");
+        return;
+    }
+
+    if (!Status[IsAccepted])
+    {
+        Accept("AES3");
+        Container_Bits=Stream_Bits=16+4*bits_per_sample;
+        Endianness='L';
+        if (Container_Bits%8)
+            Container_Bits+=4; //Rounded to next byte
+    }
 
     //Parsing
-    switch (bits_per_samples)
+    switch (bits_per_sample)
     {
-        /*
         case 0  : //16 bits
         {
+            int8u* Info=new int8u[(size_t)Element_Size-4];
+            size_t Info_Offset=0;
+
             while (Element_Offset<Element_Size)
             {
-                Element_Begin("2Ch group");
-                int8u Info[4];
                 size_t Buffer_Pos=Buffer_Offset+(size_t)Element_Offset;
 
                 //Channel 1 (16 bits, as "s16l" codec)
-                Info[0]= Reverse8(Buffer[Buffer_Pos+0]);
-                Info[1]= Reverse8(Buffer[Buffer_Pos+1]);
+                Info[Info_Offset+0]= Reverse8(Buffer[Buffer_Pos+0]);
+                Info[Info_Offset+1]= Reverse8(Buffer[Buffer_Pos+1]);
 
                 //Channel 2 (16 bits, as "s16l" codec)
-                Info[2]=(Reverse8(Buffer[Buffer_Pos+2])>>4) | ((Reverse8(Buffer[Buffer_Pos+3])<<4)&0xF0);
-                Info[3]=(Reverse8(Buffer[Buffer_Pos+3])>>4) | ((Reverse8(Buffer[Buffer_Pos+4])<<4)&0xF0);
+                Info[Info_Offset+2]=(Reverse8(Buffer[Buffer_Pos+2])>>4) | ((Reverse8(Buffer[Buffer_Pos+3])<<4)&0xF0);
+                Info[Info_Offset+3]=(Reverse8(Buffer[Buffer_Pos+3])>>4) | ((Reverse8(Buffer[Buffer_Pos+4])<<4)&0xF0);
+
+                Info_Offset+=4;
+                Element_Offset+=5;
+            }
+            Element_Offset=4;
+
+            #if MEDIAINFO_DEMUX
+                FrameInfo.PTS=FrameInfo.DTS;
+                if (SampleRate)
+                    FrameInfo.DUR=(Element_Size-4)/4*1000000000/(SampleRate*8);
+                Demux_random_access=true;
+                Element_Code=(int64u)-1;
+                Element_Offset=0;
+                Demux(Info, Info_Offset, ContentType_MainStream);
+                Element_Offset=4;
+            #endif //MEDIAINFO_DEMUX
 
-                //Details
-                if (Config_Details>0)
+            for (size_t Pos=0; Pos<Info_Offset; Pos++)
+                if (Info[Pos])
                 {
-                    Param("0", Info[0]);
-                    Param("1", Info[1]);
-                    Param("2", Info[2]);
-                    Param("3", Info[3]);
+                    if (Pos+16<Info_Offset && Info[Pos]==0x72 && Info[Pos+1]==0xF8 && Info[Pos+2]==0x1F && Info[Pos+3]==0x4E)
+                        IsParsingNonPcm=true;
+                    else
+                        IsParsingNonPcm=false;
+
+                    break;
                 }
 
-                Element_Offset+=5;
-                Element_End();
+            if (IsParsingNonPcm)
+            {
+                IsParsingNonPcm=true;
+                Parser_Parse(Info, Info_Offset);
+            }
+            else
+            {
+                Skip_XX(Element_Size-Element_Offset,            "Data");
+
+                #if MEDIAINFO_DEMUX
+                    if (FrameInfo.DTS!=(int64u)-1 && FrameInfo.DUR!=(int64u)-1)
+                    {
+                        FrameInfo.DTS+=FrameInfo.DUR;
+                        FrameInfo.PTS=FrameInfo.DTS;
+                    }
+                #endif //MEDIAINFO_DEMUX
             }
+
+            delete[] Info;
         }
         break;
         case 1  : //20 bits
         {
+            int8u* Info=new int8u[(size_t)Element_Size-4];
+            size_t Info_Offset=0;
+
             while (Element_Offset<Element_Size)
             {
-                Element_Begin("2Ch group");
-                int8u Info[6];
                 size_t Buffer_Pos=Buffer_Offset+(size_t)Element_Offset;
 
-                //Channel 1 (24 bits, as "s24l" codec, 4 highest bits are set to 0)
-                Info[0]=                                       ((Reverse8(Buffer[Buffer_Pos+0])<<4)&0xF0);
-                Info[1]=(Reverse8(Buffer[Buffer_Pos+0])>>4 ) | ((Reverse8(Buffer[Buffer_Pos+1])<<4)&0xF0);
-                Info[2]=(Reverse8(Buffer[Buffer_Pos+1])>>4 ) | ((Reverse8(Buffer[Buffer_Pos+2])<<4)&0xF0);
+                //Channel 1 (24 bits, as "s24l" codec, 4 lowest bits are set to 0)
+                Info[Info_Offset+0]=                                       ((Reverse8(Buffer[Buffer_Pos+0])<<4)&0xF0);
+                Info[Info_Offset+1]=(Reverse8(Buffer[Buffer_Pos+0])>>4 ) | ((Reverse8(Buffer[Buffer_Pos+1])<<4)&0xF0);
+                Info[Info_Offset+2]=(Reverse8(Buffer[Buffer_Pos+1])>>4 ) | ((Reverse8(Buffer[Buffer_Pos+2])<<4)&0xF0);
+
+                //Channel 2 (24 bits, as "s24l" codec, 4 lowest bits are set to 0)
+                Info[Info_Offset+3]=                                      ((Reverse8(Buffer[Buffer_Pos+3])<<4)&0xF0);
+                Info[Info_Offset+4]=(Reverse8(Buffer[Buffer_Pos+3])>>4) | ((Reverse8(Buffer[Buffer_Pos+4])<<4)&0xF0);
+                Info[Info_Offset+5]=(Reverse8(Buffer[Buffer_Pos+4])>>4) | ((Reverse8(Buffer[Buffer_Pos+5])<<4)&0xF0);
+
+                Info_Offset+=6;
+                Element_Offset+=6;
+            }
+            Element_Offset=4;
+
+            #if MEDIAINFO_DEMUX
+                //if (StreamIDs_Size==0 || Config->ID_Format_Get(StreamIDs[0]==(int64u)-1?Ztring():Ztring::ToZtring(StreamIDs[0]))==__T("PCM")) //TODO: to but in an "advanced" version
+                {
+                    FrameInfo.PTS=FrameInfo.DTS;
+                    if (SampleRate)
+                        FrameInfo.DUR=(Element_Size-4)/4*1000000000/(SampleRate*8);
+                    Demux_random_access=true;
+                    Element_Code=(int64u)-1;
+                    Element_Offset=0;
+                    if (Config->Demux_PCM_20bitTo16bit_Get())
+                    {
+                        size_t Info2_Size=((size_t)Element_Size-4)*2/3;
+                        int8u* Info2=new int8u[Info2_Size];
+                        size_t Info2_Pos=0;
+                        size_t Info_Pos=0;
 
-                //Channel 2 (24 bits, as "s24l" codec, 4 highest bits are set to 0)
-                Info[3]=                                      ((Reverse8(Buffer[Buffer_Pos+3])<<4)&0xF0);
-                Info[4]=(Reverse8(Buffer[Buffer_Pos+3])>>4) | ((Reverse8(Buffer[Buffer_Pos+4])<<4)&0xF0);
-                Info[5]=(Reverse8(Buffer[Buffer_Pos+4])>>4) | ((Reverse8(Buffer[Buffer_Pos+5])<<4)&0xF0);
+                        while (Info_Pos<Info_Offset)
+                        {
+                            Info2[Info2_Pos+0]=Info[Info_Pos+1];
+                            Info2[Info2_Pos+1]=Info[Info_Pos+2];
+                            Info2[Info2_Pos+2]=Info[Info_Pos+4];
+                            Info2[Info2_Pos+3]=Info[Info_Pos+5];
 
+                            Info2_Pos+=4;
+                            Info_Pos+=6;
+                        }
 
-                //Details
-                if (Config_Details>0)
+                        Demux(Info2, Info2_Pos, ContentType_MainStream);
+                    }
+                    else
+                        Demux(Info, Info_Offset, ContentType_MainStream);
+                    Element_Offset=4;
+                }
+            #endif //MEDIAINFO_DEMUX
+
+            for (size_t Pos=0; Pos<Info_Offset; Pos++)
+                if (Info[Pos])
                 {
-                    Param("0", Info[0]);
-                    Param("1", Info[1]);
-                    Param("2", Info[2]);
-                    Param("3", Info[3]);
-                    Param("4", Info[4]);
-                    Param("5", Info[5]);
+                    if (Pos+16<Info_Offset && Info[Pos]==0x20 && Info[Pos+1]==0x87 && Info[Pos+2]==0x6F && Info[Pos+3]==0xF0 && Info[Pos+4]==0xE1 && Info[Pos+5]==0x54)
+                        IsParsingNonPcm=true;
+                    else
+                        IsParsingNonPcm=false;
+
+                    break;
                 }
 
-                Element_Offset+=6;
-                Element_End();
+            if (IsParsingNonPcm)
+            {
+                IsParsingNonPcm=true;
+                Parser_Parse(Info, Info_Offset);
+            }
+            else
+            {
+                Skip_XX(Element_Size-Element_Offset,            "Data");
+
+                #if MEDIAINFO_DEMUX
+                    if (FrameInfo.DTS!=(int64u)-1 && FrameInfo.DUR!=(int64u)-1)
+                    {
+                        FrameInfo.DTS+=FrameInfo.DUR;
+                        FrameInfo.PTS=FrameInfo.DTS;
+                    }
+                #endif //MEDIAINFO_DEMUX
             }
+
+            delete[] Info;
         }
         break;
         case 2  : //24 bits
         {
+            int8u* Info=new int8u[(size_t)Element_Size-4];
+            size_t Info_Offset=0;
+
             while (Element_Offset<Element_Size)
             {
-                Element_Begin("2Ch group");
-                int8u Info[6];
                 size_t Buffer_Pos=Buffer_Offset+(size_t)Element_Offset;
 
                 //Channel 1 (24 bits, as "s24l" codec)
-                Info[0] = Reverse8(Buffer[Buffer_Pos+0] );
-                Info[1] = Reverse8(Buffer[Buffer_Pos+1] );
-                Info[2] = Reverse8(Buffer[Buffer_Pos+2] );
+                Info[Info_Offset+0] = Reverse8(Buffer[Buffer_Pos+0] );
+                Info[Info_Offset+1] = Reverse8(Buffer[Buffer_Pos+1] );
+                Info[Info_Offset+2] = Reverse8(Buffer[Buffer_Pos+2] );
 
                 //Channel 2 (24 bits, as "s24l" codec)
-                Info[3] = (Reverse8(Buffer[Buffer_Pos+3])>>4) | ((Reverse8(Buffer[Buffer_Pos+4])<<4)&0xF0 );
-                Info[4] = (Reverse8(Buffer[Buffer_Pos+4])>>4) | ((Reverse8(Buffer[Buffer_Pos+5])<<4)&0xF0 );
-                Info[5] = (Reverse8(Buffer[Buffer_Pos+5])>>4) | ((Reverse8(Buffer[Buffer_Pos+6])<<4)&0xF0 );
+                Info[Info_Offset+3] = (Reverse8(Buffer[Buffer_Pos+3])>>4) | ((Reverse8(Buffer[Buffer_Pos+4])<<4)&0xF0 );
+                Info[Info_Offset+4] = (Reverse8(Buffer[Buffer_Pos+4])>>4) | ((Reverse8(Buffer[Buffer_Pos+5])<<4)&0xF0 );
+                Info[Info_Offset+5] = (Reverse8(Buffer[Buffer_Pos+5])>>4) | ((Reverse8(Buffer[Buffer_Pos+6])<<4)&0xF0 );
+
+                Info_Offset+=6;
+                Element_Offset+=7;
+            }
+            Element_Offset=4;
+
+            #if MEDIAINFO_DEMUX
+                FrameInfo.PTS=FrameInfo.DTS;
+                if (SampleRate)
+                    FrameInfo.DUR=(Element_Size-4)/4*1000000000/(SampleRate*8);
+                Demux_random_access=true;
+                Element_Code=(int64u)-1;
+                Element_Offset=0;
+                Demux(Info, Info_Offset, ContentType_MainStream);
+                Element_Offset=4;
+            #endif //MEDIAINFO_DEMUX
 
-                //Details
-                if (Config_Details>0)
+            for (size_t Pos=0; Pos<Info_Offset; Pos++)
+                if (Info[Pos])
                 {
-                    Param("0", Info[0]);
-                    Param("1", Info[1]);
-                    Param("2", Info[2]);
-                    Param("3", Info[3]);
-                    Param("4", Info[4]);
-                    Param("5", Info[5]);
+                    if (Pos+16<Info_Offset && ((Info[Pos]==0x72 && Info[Pos+1]==0xF8 && Info[Pos+2]==0x96 && Info[Pos+3]==0x1F && Info[Pos+4]==0x4E && Info[Pos+5]==0xA5)   //24-bit
+                                            || (Info[Pos]==0x20 && Info[Pos+1]==0x87 && Info[Pos+2]==0x6F && Info[Pos+3]==0xF0 && Info[Pos+4]==0xE1 && Info[Pos+5]==0x54))) //20-bit
+                        IsParsingNonPcm=true;
+                    else
+                        IsParsingNonPcm=false;
+
+                    break;
                 }
 
-                Element_Offset+=7;
-                Element_End();
+            if (IsParsingNonPcm)
+            {
+                IsParsingNonPcm=true;
+                Parser_Parse(Info, Info_Offset);
+            }
+            else
+            {
+                Skip_XX(Element_Size-Element_Offset,            "Data");
+
+                #if MEDIAINFO_DEMUX
+                    if (FrameInfo.DTS!=(int64u)-1 && FrameInfo.DUR!=(int64u)-1)
+                    {
+                        FrameInfo.DTS+=FrameInfo.DUR;
+                        FrameInfo.PTS=FrameInfo.DTS;
+                    }
+                #endif //MEDIAINFO_DEMUX
             }
+
+            delete[] Info;
         }
         break;
-        */
         default :
             Skip_XX(Element_Size,                           "Data");
     }
 
-    FILLING_BEGIN();
-    FILLING_END();
+    //Filling
+    Frame_Count++;
+    if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+        Frame_Count_NotParsedIncluded++;
+    if ((!IsParsingNonPcm || (Parser && Parser->Status[IsFinished])) && Frame_Count>=2)
+    {
+        //Filling
+        Finish("AES3");
+    }
+}
 
+//---------------------------------------------------------------------------
+void File_Aes3::Parser_Parse(const int8u* Parser_Buffer, size_t Parser_Buffer_Size)
+{
+    if (Parser==NULL)
+    {
+        Parser=new File_Aes3();
+        ((File_Aes3*)Parser)->From_Aes3=true;
+        if (SampleRate)
+            ((File_Aes3*)Parser)->SampleRate=SampleRate;
+        #if MEDIAINFO_DEMUX
+            if (From_MpegPs) //TODO: separate AES from MPEG-PS/TS
+            {
+                Demux_UnpacketizeContainer=false; //No demux from this parser
+                Demux_Level=4; //Intermediate
+                Parser->Demux_Level=2; //Container
+                Parser->Demux_UnpacketizeContainer=true;
+            }
+        #endif //MEDIAINFO_DEMUX
+        Open_Buffer_Init(Parser);
+    }
+    Element_Offset=0;
+    Parser->FrameInfo=FrameInfo;
+    Open_Buffer_Continue(Parser, Parser_Buffer, Parser_Buffer_Size);
+    #if MEDIAINFO_DEMUX
+        if (Parser->FrameInfo.DUR!=FrameInfo.DUR && Parser->FrameInfo.DUR!=(int64u)-1)
+            FrameInfo.DUR=Parser->FrameInfo.DUR;
+        if (FrameInfo.DUR!=(int64u)-1)
+            FrameInfo.DTS+=FrameInfo.DUR;
+        else if (Parser->FrameInfo.DTS!=(int64u)-1)
+            FrameInfo=Parser->FrameInfo;
+        else
+            FrameInfo.DTS=(int64u)-1;
+    #endif //MEDIAINFO_DEMUX
+    Element_Offset=Element_Size;
 
-    if (PTS==(int64u)-1)
-        Block_Count=2; //We don't have PTS, don't need more
-    else if (Block_Count==1)
+    if (!From_MpegPs)
     {
-        Block_Last_PTS=PTS;
-        Block_Last_Size=Element_Size;
+        Frame_Count_InThisBlock++;
+        Frame_Count++;
+        if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+            Frame_Count_NotParsedIncluded++;
     }
 
-    if (Block_Count>=2)
+    if (!Status[IsFilled] && Parser->Status[IsFilled])
     {
         //Filling
-        Accept("AES3");
-
-        Stream_Prepare(Stream_Audio);
-        Fill(Stream_Audio, 0, Audio_Format, "PCM");
-        Fill(Stream_Audio, 0, Audio_Format_Profile, "AES3");
-        Fill(Stream_Audio, 0, Audio_Codec, "AES3");
-        Fill(Stream_Audio, 0, Audio_Channel_s_, 2+2*number_channels);
-        Fill(Stream_Audio, 0, Audio_ChannelPositions, Aes3_ChannelsPositions(number_channels));
-        Fill(Stream_Audio, 0, Audio_ChannelPositions_String2, Aes3_ChannelsPositions2(number_channels));
-        Fill(Stream_Audio, 0, Audio_Resolution, 16+4*bits_per_samples);
-        if (PTS!=(int32u)-1 && Block_Last_PTS!=(int32u)-1 && PTS!=Block_Last_PTS)
-        {
-            //Rounding
-            int64u BitRate=Block_Last_Size*8*1000*1000000/(PTS-Block_Last_PTS);
-            int64u SamplingRate=BitRate*(4+bits_per_samples)/(5+bits_per_samples)/(2+2*number_channels)/(16+4*bits_per_samples);
-            if (SamplingRate>  7840 && SamplingRate<  8160) SamplingRate=  8000;
-            if (SamplingRate> 15680 && SamplingRate< 16320) SamplingRate= 16000;
-            if (SamplingRate> 31360 && SamplingRate< 32640) SamplingRate= 32000;
-            if (SamplingRate> 62720 && SamplingRate< 65280) SamplingRate= 64000;
-            if (SamplingRate> 10804 && SamplingRate< 11246) SamplingRate= 11025;
-            if (SamplingRate> 21609 && SamplingRate< 22491) SamplingRate= 22050;
-            if (SamplingRate> 43218 && SamplingRate< 44982) SamplingRate= 44100;
-            if (SamplingRate> 86436 && SamplingRate< 89964) SamplingRate= 88200;
-            if (SamplingRate> 11760 && SamplingRate< 12240) SamplingRate= 12000;
-            if (SamplingRate> 23520 && SamplingRate< 24480) SamplingRate= 24000;
-            if (SamplingRate> 47040 && SamplingRate< 48960) SamplingRate= 48000;
-            if (SamplingRate> 94080 && SamplingRate< 97920) SamplingRate= 96000;
-            if (SamplingRate>188160 && SamplingRate<195840) SamplingRate=192000;
-            BitRate=SamplingRate/(4+bits_per_samples)*(5+bits_per_samples)*(2+2*number_channels)*(16+4*bits_per_samples);
-
-            Fill(Stream_Audio, 0, Audio_SamplingRate, SamplingRate);
-            Fill(Stream_Audio, 0, Audio_BitRate, BitRate);
+        Merge(*Parser);
+        ZtringList OverallBitRates; OverallBitRates.Separator_Set(0, __T(" / ")); OverallBitRates.Write(Parser->Retrieve(Stream_General, 0, General_OverallBitRate));
+        if (!OverallBitRates.empty())
+        {
+            int64u OverallBitRate=OverallBitRates[0].To_int64u();
+            if (OverallBitRate)
+            {
+                OverallBitRate*=Element_Offset; OverallBitRate/=Parser_Buffer_Size;
+                OverallBitRates[0].From_Number(OverallBitRate);
+            }
+            Fill(Stream_General, 0, General_OverallBitRate, OverallBitRates.Read(), true);
         }
-
-        Finish("AES3");
+        FrameRate=((File_Aes3*)Parser)->FrameRate;
+        Fill("AES3");
+        if (!From_MpegPs)
+            Finish("AES3");
     }
 }

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Aes3.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Aes3.h Changed

@@ -1,17 +1,17 @@
 // File_Aes3 - Info Info for AES3 packetized streams
-// Copyright (C) 2008-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -40,22 +40,75 @@
 class File_Aes3 : public File__Analyze
 {
 public :
+    //In
+    int64u  SampleRate;
+    size_t  ByteSize;
+    int32u  QuantizationBits;
+    int32u  ChannelCount;
+    bool    From_Raw;
+    bool    From_MpegPs;
+    bool    From_Aes3;
+    bool    IsAes3;
+    int8u   Endianness;
+
+    //Out
+    float64 FrameRate;
+
     //Constructor/Destructor
     File_Aes3();
+    ~File_Aes3();
 
 private :
+    //Streams management
+    void Streams_Accept();
+    void Streams_Fill();
+
+    //Buffer - Global
+    void Read_Buffer_Init ();
+    void Read_Buffer_Continue ();
+    #if MEDIAINFO_SEEK
+    void Read_Buffer_Unsynched();
+    size_t Read_Buffer_Seek (size_t Method, int64u Value, int64u ID);
+    #endif //MEDIAINFO_SEEK
+
+    //Buffer - Synchro
+    bool Synchronize();
+    bool Synched_Test();
+    void Synched_Init();
+
     //Buffer - Per element
     void Header_Parse();
     void Data_Parse();
 
+    //Elements
+    void Raw();
+    void Frame();
+    void Frame_WithPadding();
+    void Frame_FromMpegPs();
+
     //Temp
-    size_t Block_Count;
-    int64u Block_Last_Size;
-    int64u Block_Last_PTS;
-    int8u  number_channels;
-    int8u  bits_per_samples;
+    int64u  Frame_Size;
+    int64u  Frame_Duration;
+    int64u  IsPcm_Frame_Count;
+    int64u  NotPCM_SizePerFrame;
+    int8u   number_channels;
+    int8u   bits_per_sample;
+    int8u   Container_Bits;
+    int8u   Stream_Bits;
+    int8u   data_type;
+    bool    IsParsingNonPcm;
+    bool    IsPcm;
+
+    //Parser
+    File__Analyze* Parser;
+    void Parser_Parse(const int8u* Parser_Buffer, size_t Parser_Buffer_Size);
+
+    #if MEDIAINFO_SEEK
+        bool                        Duration_Detected;
+    #endif //MEDIAINFO_SEEK
 };
 
 } //NameSpace
 
 #endif
+

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Als.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Als.cpp Changed

@@ -1,18 +1,18 @@
 // File_Als - Info for MPEG-4 ALS files
-// Copyright (C) 2009-2009 Lionel Duchateau, kurtnoise@free.fr
-// Copyright (C) 2009-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2009-2012 Lionel Duchateau, kurtnoise@free.fr
+// Copyright (C) 2009-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -25,14 +25,18 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_ALS_YES)
 //---------------------------------------------------------------------------
 
@@ -67,7 +71,7 @@
     float32 CompressionRatio=((float32)UncompressedSize)/CompressedSize;
 
     Fill(Stream_Audio, 0, Audio_StreamSize, CompressedSize);
-    Fill(Stream_Audio, 0, Audio_CompressionRatio, CompressionRatio);
+    Fill(Stream_Audio, 0, Audio_Compression_Ratio, CompressionRatio);
 
     File__Tags_Helper::Streams_Finish();
 }
@@ -104,10 +108,10 @@
     Skip_C4(                                                    "signature");
     Get_B4 (SampleRate,                                         "sample rate");
     Get_B4 (Samples,                                            "samples");
-    Get_B2 (Channels,                                           "channels-1"); Param_Info(Channels+1, " channel(s)");
+    Get_B2 (Channels,                                           "channels-1"); Param_Info2(Channels+1, " channel(s)");
     BS_Begin();
     Get_S1 (3, FileType,                                        "file type"); // WAV, RIFF, AIFF
-    Get_S1 (3, BitsPerSample,                                   "bits per sample"); Param_Info((BitsPerSample+1)*8, " bits");
+    Get_S1 (3, BitsPerSample,                                   "bits per sample"); Param_Info2((BitsPerSample+1)*8, " bits");
     Skip_SB(                                                    "floating point");
     Skip_SB(                                                    "samples are big-endian");
     BS_End();
@@ -127,7 +131,7 @@
         File__Tags_Helper::Stream_Prepare(Stream_Audio);
         Fill(Stream_Audio, 0, Audio_Format, "ALS");
         Fill(Stream_Audio, 0, Audio_Codec, "ALS");
-        Fill(Stream_Audio, 0, Audio_Resolution, (BitsPerSample+1)*8);
+        Fill(Stream_Audio, 0, Audio_BitDepth, (BitsPerSample+1)*8);
         Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, Channels+1);
         Fill(Stream_Audio, StreamPos_Last, Audio_SamplingRate, SampleRate);
         Fill(Stream_Audio, 0, Audio_Duration, Duration);

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Als.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Als.h Changed

@@ -1,18 +1,18 @@
 // File_Als - Info for MPEG-4 ALS files
 // Copyright (C) 2009-2009 Lionel Duchateau, kurtnoise@free.fr
-// Copyright (C) 2009-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2009-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Amr.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Amr.cpp Changed

@@ -1,31 +1,35 @@
 // File_Amr - Info for AMR files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_AMR_YES)
 //---------------------------------------------------------------------------
 
@@ -111,9 +115,9 @@
     Fill(Stream_Audio, 0, Audio_Codec, "AMR");
     if (!Codec.empty())
     {
-        if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Mpeg4, Codec, InfoCodecID_Profile)==_T("Narrow band"))
+        if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Mpeg4, Codec, InfoCodecID_Profile)==__T("Narrow band"))
             IsWB=false;
-        if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Mpeg4, Codec, InfoCodecID_Profile)==_T("Wide band"))
+        if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Mpeg4, Codec, InfoCodecID_Profile)==__T("Wide band"))
             IsWB=true;
         Channels=1;
     }
@@ -129,7 +133,7 @@
         Fill(Stream_Audio, 0, Audio_Codec, "sawb", Unlimited, true, true);
         if (Codec.empty()) //If there is a container, trusting the container sampling rate
             Fill(Stream_Audio, 0, Audio_SamplingRate, 16000);
-        Fill(Stream_Audio, 0, Audio_Resolution, 14);
+        Fill(Stream_Audio, 0, Audio_BitDepth, 14);
         //Fill(Stream_Audio, 0, Audio_InternetMediaType, "audio/AMR-WB", Unlimited, true, true);
     }
     else
@@ -138,7 +142,7 @@
         Fill(Stream_Audio, 0, Audio_Codec, "samr", Unlimited, true, true);
         if (Codec.empty()) //If there is a container, trusting the container sampling rate
             Fill(Stream_Audio, 0, Audio_SamplingRate, 8000);
-        Fill(Stream_Audio, 0, Audio_Resolution, 13);
+        Fill(Stream_Audio, 0, Audio_BitDepth, 13);
         if (FrameType!=(int8u)-1 && Amr_BitRate[FrameType] && FrameTypes.size()==1)
         {
             Fill(Stream_Audio, 0, Audio_BitRate_Mode, "CBR");
@@ -251,7 +255,7 @@
 //---------------------------------------------------------------------------
 void File_Amr::Data_Parse()
 {
-    Element_Info(Frame_Number);
+    Element_Info1(Frame_Number);
 
     //Parsing
     Skip_XX(Element_Size,                                       "Data");

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Amr.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Amr.h Changed

@@ -1,17 +1,17 @@
 // File_Amr - Info for AMR files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Amv.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Amv.cpp Changed

@@ -1,31 +1,35 @@
 // File_Amv - Info for AMV  files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_AMV_YES)
 //---------------------------------------------------------------------------

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Amv.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Amv.h Changed

@@ -1,14 +1,17 @@
+// File_Amv - Info for AMV  files
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
+//
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Ape.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Ape.cpp Changed

@@ -1,32 +1,36 @@
 // File_Ape - Info for Ape files
 // Copyright (C) 2003-2009 Jasper van de Gronde, th.v.d.gronde@hccnet.nl
-// Copyright (C) 2003-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2003-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_APE_YES)
 //---------------------------------------------------------------------------
 
@@ -94,7 +98,7 @@
     float32 CompressionRatio=((float32)UncompressedSize)/CompressedSize;
     int64u BitRate=Duration?(CompressedSize*8*1000/Duration):0;
 
-    Fill(Stream_Audio, 0, Audio_CompressionRatio, CompressionRatio);
+    Fill(Stream_Audio, 0, Audio_Compression_Ratio, CompressionRatio);
     Fill(Stream_Audio, 0, Audio_BitRate, BitRate);
 
     File__Tags_Helper::Streams_Finish();
@@ -133,7 +137,7 @@
     Get_L2 (Version,                                            "Version");
     if (Version<3980) //<3.98
     {
-        Get_L2 (CompressionLevel,                               "CompressionLevel"); Param_Info(Ape_Codec_Settings(CompressionLevel));
+        Get_L2 (CompressionLevel,                               "CompressionLevel"); Param_Info1(Ape_Codec_Settings(CompressionLevel));
         Get_L2 (Flags,                                          "FormatFlags");
             Get_Flags (Flags, 0, Resolution8,                   "8-bit");
             Skip_Flags(Flags, 1,                                "crc-32");
@@ -171,7 +175,7 @@
         Skip_L4(                                                "APEFrameDataBytesHigh");
         Skip_L4(                                                "WavTerminatingDataBytes");
         Skip_L16(                                               "FileMD5");
-        Get_L2 (CompressionLevel,                               "CompressionLevel"); Param_Info(Ape_Codec_Settings(CompressionLevel));
+        Get_L2 (CompressionLevel,                               "CompressionLevel"); Param_Info1(Ape_Codec_Settings(CompressionLevel));
         Get_L2 (Flags,                                          "FormatFlags");
         Get_L4 (SamplesPerFrame,                                "BlocksPerFrame");
         Get_L4 (FinalFrameSamples,                              "FinalFrameBlocks");
@@ -201,7 +205,7 @@
         Fill(Stream_Audio, 0, Audio_Format, "Monkey's Audio");
         Fill(Stream_Audio, 0, Audio_Encoded_Library_Settings, Ape_Codec_Settings(CompressionLevel));
         Fill(Stream_Audio, 0, Audio_Codec, "APE");
-        Fill(Stream_Audio, 0, Audio_Resolution, Resolution);
+        Fill(Stream_Audio, 0, Audio_BitDepth, Resolution);
         Fill(Stream_Audio, 0, Audio_Channel_s_, Channels);
         Fill(Stream_Audio, 0, Audio_SamplingRate, SampleRate);
         Fill(Stream_Audio, 0, Audio_Duration, Duration);

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Ape.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Ape.h Changed

@@ -1,18 +1,18 @@
 // File_Ape - Info for Ape Audio files
 // Copyright (C) 2003-2009 Jasper van de Gronde, th.v.d.gronde@hccnet.nl
-// Copyright (C) 2003-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2003-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Au.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Au.cpp Changed

@@ -1,17 +1,17 @@
 // File_Au - Info for AU  files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,14 +22,18 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_AU_YES)
 //---------------------------------------------------------------------------

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Au.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Au.h Changed

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Celt.cpp Added

@@ -0,0 +1,161 @@
+// File_Celt - Info for CELT files
+// Copyright (C) 2010-2012 Lionel Duchateau, kurtnoise@free.fr
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Note : the buffer must be given in ONE call
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_CELT_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Audio/File_Celt.h"
+using namespace std;
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File_Celt::File_Celt()
+:File__Analyze()
+{
+    //Internal
+    Identification_Done=false;
+}
+
+//***************************************************************************
+// Buffer - Per element
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Celt::Header_Parse()
+{
+    //Filling
+    Header_Fill_Code(0, "CELT");
+    Header_Fill_Size(Element_Size);
+}
+
+//---------------------------------------------------------------------------
+void File_Celt::Data_Parse()
+{
+    //Parsing
+    if (Identification_Done)
+        Comment();
+    else
+        Identification();
+}
+
+//***************************************************************************
+// Elements
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Celt::Identification()
+{
+    Element_Name("Identification");
+
+    //Parsing
+    Ztring celt_version;
+    int32u Celt_version_id, sample_rate, nb_channels;
+    Skip_Local(8,                                               "celt_codec_id");
+    Get_Local(20, celt_version,                                 "celt_version");
+    Get_L4 (Celt_version_id,                                    "celt_version_id");
+    Skip_L4(                                                    "header_size");
+    Get_L4 (sample_rate,                                        "rate");
+    Get_L4 (nb_channels,                                        "nb_channels");
+    Skip_L4(                                                    "frame_size");
+    Skip_L4(                                                    "overlap");
+    Skip_L4(                                                    "bytes_per_packet");
+    Skip_L4(                                                    "extra_headers");
+
+    //Filling
+    FILLING_BEGIN()
+        Accept("CELT");
+
+        Stream_Prepare(Stream_Audio);
+        Fill(Stream_Audio, 0, Audio_Format, "CELT");
+        Fill(Stream_Audio, 0, Audio_Codec, "CELT");
+
+        if (!celt_version.empty())
+        {
+            //Fill(Stream_Audio, 0, Audio_Encoded_Library, celt_version); //Need more info about hte different possibilities, in the meanwhile trusting more the comment part
+            Fill(Stream_Audio, 0, Audio_SamplingRate, sample_rate);
+            Fill(Stream_Audio, 0, Audio_Channel_s_, nb_channels);
+        }
+
+    FILLING_END();
+
+    //Filling
+    Identification_Done=true;
+}
+
+//---------------------------------------------------------------------------
+void File_Celt::Comment()
+{
+    Element_Name("Comment?");
+
+    while (Element_Offset<Element_Size)
+    {
+        Ztring value;
+        int32u size;
+        Get_L4(size,                                            "size");
+        if (size)
+            Get_Local(size, value,                              "value");
+
+        //Filling
+        if (value.find(__T("CELT "))!=std::string::npos)
+        {
+            Ztring Version=value.SubString(__T("CELT "), __T(" ("));
+            Fill(Stream_Audio, 0, Audio_Encoded_Library, __T("CELT ")+Version);
+            Fill(Stream_Audio, 0, Audio_Encoded_Library_Name, __T("CELT"));
+            Fill(Stream_Audio, 0, Audio_Encoded_Library_Version, Version);
+        }
+        else if (!value.empty())
+            Fill(Stream_Audio, 0, "Comment", value);
+    }
+
+    Finish("CELT");
+}
+
+//***************************************************************************
+// C++
+//***************************************************************************
+
+} //NameSpace
+
+#endif //MEDIAINFO_CELT_YES

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Celt.h Added

@@ -0,0 +1,65 @@
+// File_Celt - Info for CELT files
+// Copyright (C) 2010-2012 Lionel Duchateau, kurtnoise@free.fr
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Information about CELT files
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_File_CeltH
+#define MediaInfo_File_CeltH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Class File_Celt
+//***************************************************************************
+
+class File_Celt : public File__Analyze
+{
+public :
+    File_Celt();
+
+private :
+    //Buffer - Per element
+    void Header_Parse();
+    void Data_Parse();
+
+    //Elements
+    void Identification();
+    void Comment();
+
+    //Temp
+    int8u Identification_Done;
+};
+
+} //NameSpace
+
+#endif

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_ChannelGrouping.cpp Added

@@ -0,0 +1,333 @@
+// File_ChannelGrouping - Regrouping PCM streams
+// Copyright (C) 2011-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_AES3_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Audio/File_ChannelGrouping.h"
+#if defined(MEDIAINFO_AES3_YES)
+    #include "MediaInfo/Audio/File_Aes3.h"
+#endif
+#if MEDIAINFO_EVENTS
+    #include "MediaInfo/MediaInfo_Events.h"
+#endif //MEDIAINFO_EVENTS
+#include "MediaInfo/MediaInfo_Config_MediaInfo.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+File_ChannelGrouping::File_ChannelGrouping()
+{
+    //Configuration
+    #if MEDIAINFO_EVENTS
+        ParserIDs[0]=MediaInfo_Parser_ChannelGrouping;
+        StreamIDs_Width[0]=0;
+    #endif //MEDIAINFO_EVENTS
+    #if MEDIAINFO_DEMUX
+        Demux_Level=2; //Container
+    #endif //MEDIAINFO_DEMUX
+    #if MEDIAINFO_TRACE
+        Trace_Layers_Update(0); //Container1
+    #endif //MEDIAINFO_TRACE
+    IsRawStream=true;
+
+    //In
+    ByteDepth=0;
+    Common=NULL;
+    Channel_Pos=0;
+    Channel_Total=1;
+    SampleRate=0;
+    Endianness=0;
+    IsAes3=false;
+
+    //Temp
+    Buffer_Offset_AlreadyInCommon=0;
+    IsPcm_Frame_Count=0;
+}
+
+File_ChannelGrouping::~File_ChannelGrouping()
+{
+    if (Channel_Pos==0)
+    {
+        for (size_t Pos=0; Pos<Common->Channels.size(); Pos++)
+            delete Common->Channels[Pos]; //Common->Channels[Pos]=NULL;
+        delete Common; //Common=NULL;
+    }
+}
+
+//***************************************************************************
+// Streams management
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_ChannelGrouping::Streams_Fill()
+{
+    if (Common->Parser->Count_Get(Stream_Audio)==0 || Common->Parser->Get(Stream_Audio, 0, Audio_Format)==__T("PCM"))
+    {
+        Fill(Stream_General, 0, General_Format, "PCM");
+        Stream_Prepare(Stream_Audio);
+        Fill(Stream_Audio, 0, Audio_Format, "PCM");
+        Fill(Stream_Audio, 0, Audio_Codec, "PCM");
+        Fill(Stream_Audio, 0, Audio_BitRate_Mode, "CBR");
+        switch (Endianness)
+        {
+            case 'B' : Fill(Stream_Audio, 0, Audio_Format_Settings_Endianness, "Big"); break;
+            case 'L' : Fill(Stream_Audio, 0, Audio_Format_Settings_Endianness, "Little"); break;
+            default  : ;
+        }
+        return;
+    }
+
+    if (!Common->IsAes3)
+        return; //Nothing to do
+
+    Fill(Stream_General, 0, General_Format, "ChannelGrouping");
+
+    if (Common->Channel_Master!=Channel_Pos)
+        return;
+    Fill(Common->Parser);
+    Merge(*Common->Parser);
+}
+
+//---------------------------------------------------------------------------
+void File_ChannelGrouping::Streams_Finish()
+{
+    if (!Common->IsAes3)
+        return; //Nothing to do
+
+    if (Common->Channel_Master!=Channel_Pos)
+        return;
+    Finish(Common->Parser);
+    //Merge(*Common->Parser);
+}
+
+//***************************************************************************
+// Buffer - Global
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_ChannelGrouping::Read_Buffer_Init()
+{
+    if (Common==NULL)
+    {
+        Common=new common;
+        Common->Parser=new File_Aes3;
+        ((File_Aes3*)Common->Parser)->SampleRate=SampleRate;
+        ((File_Aes3*)Common->Parser)->ByteSize=ByteDepth*Channel_Total;
+        ((File_Aes3*)Common->Parser)->IsAes3=IsAes3;
+        Common->Channels.resize(Channel_Total);
+        for (size_t Pos=0; Pos<Common->Channels.size(); Pos++)
+            Common->Channels[Pos]=new common::channel;
+        Element_Code=(int64u)-1;
+        Open_Buffer_Init(Common->Parser);
+    }
+
+    Accept(); //Forcing acceptance, no possibility to choose something else or detect PCM
+    #if MEDIAINFO_DEMUX
+         Demux_UnpacketizeContainer=Config->Demux_Unpacketize_Get();
+    #endif //MEDIAINFO_DEMUX
+}
+
+//---------------------------------------------------------------------------
+void File_ChannelGrouping::Read_Buffer_Continue()
+{
+    //Handling of multiple frames in one block
+    if (Buffer_Size-Buffer_Offset_AlreadyInCommon==0)
+    {
+        if (Common->Parser && Common->Parser->Buffer_Size)
+            Open_Buffer_Continue(Common->Parser, Common->MergedChannel.Buffer+Common->MergedChannel.Buffer_Offset, 0);
+        Element_WaitForMoreData();
+        return;
+    }
+
+    //If basic PCM is already detected
+    if (!IsAes3 && Common->IsPcm)
+    {
+        if (Buffer_Size==Buffer_Offset_AlreadyInCommon)
+        {
+            Element_WaitForMoreData();
+            return;
+        }
+        Buffer_Offset_AlreadyInCommon=0;
+
+        #if MEDIAINFO_DEMUX
+            Demux_Level=2; //Container
+            Demux_Offset=Buffer_Size;
+            FrameInfo.PTS=FrameInfo.DTS;
+            if (FrameInfo.DUR!=(int64u)-1 && IsPcm_Frame_Count)
+                FrameInfo.DUR*=IsPcm_Frame_Count+1;
+            Demux_UnpacketizeContainer_Demux();
+        #endif //MEDIAINFO_DEMUX
+
+        Skip_XX(Element_Size,                                   "Data");
+
+        if (IsPcm_Frame_Count)
+        {
+            Frame_Count+=IsPcm_Frame_Count;
+            Frame_Count_InThisBlock+=IsPcm_Frame_Count;
+            if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+                Frame_Count_NotParsedIncluded+=IsPcm_Frame_Count;
+            IsPcm_Frame_Count=0;
+        }
+        Frame_Count++;
+        Frame_Count_InThisBlock++;
+        if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+            Frame_Count_NotParsedIncluded++;
+
+        if (!Status[IsFilled])
+        {
+            Finish();
+        }
+
+        return;
+    }
+    else if (Buffer_Size && Buffer_Size>Buffer_Offset_AlreadyInCommon && !Common->IsAes3)
+        IsPcm_Frame_Count++;
+
+    //Demux
+    #if MEDIAINFO_DEMUX
+        if (Demux_UnpacketizeContainer)
+        {
+            Common->Parser->Demux_UnpacketizeContainer=true;
+            Common->Parser->Demux_Level=2; //Container
+            Demux_Level=4; //Intermediate
+        }
+        Demux(Common->MergedChannel.Buffer+Common->MergedChannel.Buffer_Offset, Common->MergedChannel.Buffer_Size-Common->MergedChannel.Buffer_Offset, ContentType_MainStream);
+    #endif //MEDIAINFO_EVENTS
+
+    //Copying to Channel buffer
+    if (Common->Channels[Channel_Pos]->Buffer_Size+Buffer_Size-Buffer_Offset_AlreadyInCommon>Common->Channels[Channel_Pos]->Buffer_Size_Max)
+        Common->Channels[Channel_Pos]->resize(Common->Channels[Channel_Pos]->Buffer_Size+Buffer_Size-Buffer_Offset_AlreadyInCommon);
+    memcpy(Common->Channels[Channel_Pos]->Buffer+Common->Channels[Channel_Pos]->Buffer_Size, Buffer+Buffer_Offset_AlreadyInCommon, Buffer_Size-Buffer_Offset_AlreadyInCommon);
+    Common->Channels[Channel_Pos]->Buffer_Size+=Buffer_Size-Buffer_Offset_AlreadyInCommon;
+    if (!Common->IsAes3 && !Common->IsPcm)
+        Buffer_Offset_AlreadyInCommon=Buffer_Size;
+    else
+        Buffer_Offset_AlreadyInCommon=0;
+    Common->Channel_Current++;
+    if (Common->Channel_Current>=Channel_Total)
+        Common->Channel_Current=0;
+
+    //Copying to merged channel
+    size_t Minimum=(size_t)-1;
+    for (size_t Pos=0; Pos<Common->Channels.size(); Pos++)
+        if (Minimum>Common->Channels[Pos]->Buffer_Size-Common->Channels[Pos]->Buffer_Offset)
+            Minimum=Common->Channels[Pos]->Buffer_Size-Common->Channels[Pos]->Buffer_Offset;
+    while (Minimum>=ByteDepth)
+    {
+        for (size_t Pos=0; Pos<Common->Channels.size(); Pos++)
+        {
+            if (Common->MergedChannel.Buffer_Size+Minimum>Common->MergedChannel.Buffer_Size_Max)
+                Common->MergedChannel.resize(Common->MergedChannel.Buffer_Size+Minimum);
+            memcpy(Common->MergedChannel.Buffer+Common->MergedChannel.Buffer_Size, Common->Channels[Pos]->Buffer+Common->Channels[Pos]->Buffer_Offset, ByteDepth);
+            Common->Channels[Pos]->Buffer_Offset+=ByteDepth;
+            Common->MergedChannel.Buffer_Size+=ByteDepth;
+        }
+        Minimum-=ByteDepth;
+    }
+
+    if (Common->MergedChannel.Buffer_Size-Common->MergedChannel.Buffer_Offset)
+    {
+        if (FrameInfo_Next.DTS!=(int64u)-1)
+            Common->Parser->FrameInfo=FrameInfo_Next; //AES3 parse has its own buffer management
+        else
+            Common->Parser->FrameInfo=FrameInfo;
+        Open_Buffer_Continue(Common->Parser, Common->MergedChannel.Buffer+Common->MergedChannel.Buffer_Offset, Common->MergedChannel.Buffer_Size-Common->MergedChannel.Buffer_Offset);
+        Common->MergedChannel.Buffer_Offset=Common->MergedChannel.Buffer_Size;
+    }
+
+    if (!Common->IsAes3)
+    {
+        if (!Status[IsFilled] && Common->Parser->Status[IsAccepted])
+        {
+            if (Common->Parser->Get(Stream_Audio, 0, Audio_Format)==__T("PCM"))
+                Common->IsPcm=true;
+            else
+            {
+                Common->IsAes3=true;
+                if (Common->Channel_Master==(size_t)-1)
+                    Common->Channel_Master=Channel_Pos;
+                Buffer_Offset_AlreadyInCommon=0;
+                Fill();
+            }
+        }
+        else if (Common->MergedChannel.Buffer_Size==0 && IsPcm_Frame_Count>=2)
+            Common->IsPcm=true;
+    }
+
+    if (Common->IsAes3 || Common->IsPcm)
+    {
+        Buffer_Offset=Buffer_Size;
+        Buffer_Offset_AlreadyInCommon=0;
+    }
+    else
+        Element_WaitForMoreData();
+
+    if (Common->Parser->Status[IsFinished])
+        Finish();
+
+    //Optimize buffer
+    for (size_t Pos=0; Pos<Common->Channels.size(); Pos++)
+        Common->Channels[Pos]->optimize();
+    Common->MergedChannel.optimize();
+}
+
+//---------------------------------------------------------------------------
+void File_ChannelGrouping::Read_Buffer_Unsynched()
+{
+    if (Common->Parser)
+        Common->Parser->Open_Buffer_Unsynch();
+
+    Buffer_Offset_AlreadyInCommon=0;
+    Common->MergedChannel.Buffer_Offset=0;
+    Common->MergedChannel.Buffer_Size=0;
+    for (size_t Pos=0; Pos<Common->Channels.size(); Pos++)
+    {
+        Common->Channels[Pos]->Buffer_Offset=0;
+        Common->Channels[Pos]->Buffer_Size=0;
+    }
+}
+
+//***************************************************************************
+// C++
+//***************************************************************************
+
+} //NameSpace
+
+#endif //MEDIAINFO_AES3_YES
+

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_ChannelGrouping.h Added

@@ -0,0 +1,147 @@
+// File_ChannelGrouping - Regrouping PCM streams
+// Copyright (C) 2011-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Some containers use mono stream for AES3 (Stereo) grouping
+// We need to group the 2-mono streams in one before sending
+// data to AES parser
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_File_ChannelGroupingH
+#define MediaInfo_File_ChannelGroupingH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+#include <cstring>
+using namespace std;
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Class File_ChannelGrouping
+//***************************************************************************
+
+class File_ChannelGrouping : public File__Analyze
+{
+public :
+    //In
+    size_t  ByteDepth;
+    struct common
+    {
+        struct channel
+        {
+            int8u*          Buffer;
+            size_t          Buffer_Offset;
+            size_t          Buffer_Size;
+            size_t          Buffer_Size_Max;
+
+            channel()
+            {
+                Buffer=new int8u[32768];
+                Buffer_Offset=0;
+                Buffer_Size=0;
+                Buffer_Size_Max=32768;
+            }
+
+            ~channel()
+            {
+                delete[] Buffer; //Buffer=NULL;
+            }
+
+            void resize(size_t NewSize)
+            {
+                if (NewSize<Buffer_Size_Max)
+                    return;
+                int8u* Old=Buffer;
+                if (NewSize<2*Buffer_Size_Max)
+                    Buffer_Size_Max*=2;
+                else
+                    Buffer_Size_Max=NewSize;
+                Buffer=new int8u[Buffer_Size_Max];
+                std::memcpy(Buffer, Old, Buffer_Size);
+                delete[] Old; //Old=NULL;
+            }
+
+            void optimize()
+            {
+                if (Buffer_Offset<Buffer_Size_Max/2)
+                    return;
+                std::memcpy(Buffer, Buffer+Buffer_Offset, Buffer_Size-Buffer_Offset);
+                Buffer_Size-=Buffer_Offset;
+                Buffer_Offset=0;
+            }
+
+        };
+        vector<channel*>    Channels;
+        channel             MergedChannel;
+        size_t              Channel_Current;
+        size_t              Channel_Master;
+        File__Analyze*      Parser;
+        bool                IsPcm;
+        bool                IsAes3;
+
+        common()
+        {
+            Channel_Current=0;
+            Channel_Master=(size_t)-1;
+            Parser=NULL;
+            IsPcm=false;
+            IsAes3=false;
+        }
+
+        ~common()
+        {
+            delete Parser; //Parser=NULL;
+        }
+    };
+    int64u  StreamID;
+    common* Common;
+    size_t  Channel_Pos;
+    size_t  Channel_Total;
+    int64u  SampleRate;
+    int8u   Endianness;
+    bool    IsAes3;
+
+    //Constructor/Destructor
+    File_ChannelGrouping();
+    ~File_ChannelGrouping();
+
+private :
+    //Streams management
+    void Streams_Fill();
+    void Streams_Finish();
+
+    //Buffer - Global
+    void Read_Buffer_Init ();
+    void Read_Buffer_Continue ();
+    void Read_Buffer_Unsynched ();
+
+    //Temp
+    size_t  Buffer_Offset_AlreadyInCommon;
+    int64u  IsPcm_Frame_Count;
+};
+
+} //NameSpace
+
+#endif
+

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_DolbyE.cpp Added

@@ -0,0 +1,126 @@
+// File_DolbyE - Info for Dolby E
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// This is a place holder for Dolby E parser
+// But open-source version of MediaInfo has *no* Dolby E support
+// If you want Dolby E support,
+// contact http://www.dolby.com/about/contact_us/contactus.aspx?goto=28
+// for a license before asking it in MediaInfo
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_DOLBYE_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Audio/File_DolbyE.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Infos
+//***************************************************************************
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File_DolbyE::File_DolbyE()
+:File__Analyze()
+{
+    //Configuration
+    MustSynchronize=true;
+    Buffer_TotalBytes_FirstSynched_Max=32*1024;
+}
+
+//***************************************************************************
+// Streams management
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_DolbyE::Streams_Fill()
+{
+}
+
+//***************************************************************************
+// Buffer - File header
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_DolbyE::FileHeader_Begin()
+{
+    Reject("Dolby E");
+    return true;
+}
+
+//***************************************************************************
+// Buffer - Synchro
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_DolbyE::Synchronize()
+{
+    //Synched
+    return true;
+}
+
+//---------------------------------------------------------------------------
+bool File_DolbyE::Synched_Test()
+{
+    //We continue
+    return true;
+}
+
+//***************************************************************************
+// Buffer - Per element
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_DolbyE::Header_Parse()
+{
+}
+
+//---------------------------------------------------------------------------
+void File_DolbyE::Data_Parse()
+{
+}
+
+//***************************************************************************
+// C++
+//***************************************************************************
+
+} //NameSpace
+
+#endif //MEDIAINFO_DOLBYE_YES

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_DolbyE.h Added

@@ -0,0 +1,64 @@
+// File_DolbyE - Info Info for Dolby E
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Information about Dolby E files
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_File_DolbyEH
+#define MediaInfo_File_DolbyEH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Class File_DolbyE
+//***************************************************************************
+
+class File_DolbyE : public File__Analyze
+{
+public :
+    //Constructor/Destructor
+    File_DolbyE();
+
+private :
+    //Streams management
+    void Streams_Fill();
+
+    //Buffer - File header
+    bool FileHeader_Begin();
+
+    //Buffer - Synchro
+    bool Synchronize();
+    bool Synched_Test();
+
+    //Buffer - Per element
+    void Header_Parse();
+    void Data_Parse();
+};
+
+} //NameSpace
+
+#endif

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Dts.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Dts.cpp Changed

@@ -1,31 +1,35 @@
 // File_Dts - Info for DTS files
-// Copyright (C) 2004-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2004-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_DTS_YES)
 //---------------------------------------------------------------------------
 
@@ -81,10 +85,10 @@
 {16, 20, 24, 24};
 
 //---------------------------------------------------------------------------
-const char*  DTS_ChannelPositions[]=
+const char*  DTS_ChannelPositions[16]=
 {
-    "Mono",
-    "Dual mono",
+    "Front: C",
+    "Front: C C",
     "Front: L R",
     "Front: L R",
     "Front: L R",
@@ -102,7 +106,7 @@
 };
 
 //---------------------------------------------------------------------------
-const char*  DTS_ChannelPositions2[]=
+const char*  DTS_ChannelPositions2[16]=
 {
     "1/0/0",
     "2/0/0",
@@ -189,7 +193,7 @@
     if (SpeakerActivityMask&0x2000)
         Text+=", HiSide: L R";
 
-    if ((SpeakerActivityMask&0xC000)==0x0C00)
+    if ((SpeakerActivityMask&0xC000)==0x0C000)
         Text+=", HiRear: L C R";
     else
     {
@@ -198,7 +202,7 @@
         if (SpeakerActivityMask&0x8000)
             Text+=", HiRear: L R";
     }
-        
+
     if (SpeakerActivityMask&0x0008)
         Text+=", LFE";
     if (SpeakerActivityMask&0x1000)
@@ -257,7 +261,7 @@
     if (SpeakerActivityMask&0x2000)
         Text+=".2";
 
-    if ((SpeakerActivityMask&0xC000)==0x0C00)
+    if ((SpeakerActivityMask&0xC000)==0x0C000)
         Text+=".3";
     else
     {
@@ -266,7 +270,7 @@
         if (SpeakerActivityMask&0x8000)
             Text+=".2";
     }
-        
+
     if (SpeakerActivityMask&0x0008)
         Text+=".1";
     if (SpeakerActivityMask&0x1000)
@@ -326,26 +330,31 @@
 :File__Analyze()
 {
     //Configuration
-    ParserName=_T("Dts");
+    ParserName=__T("Dts");
     #if MEDIAINFO_EVENTS
         ParserIDs[0]=MediaInfo_Parser_Dts;
         StreamIDs_Width[0]=0;
     #endif //MEDIAINFO_EVENTS
+    #if MEDIAINFO_TRACE
+        Trace_Layers_Update(8); //Stream
+    #endif //MEDIAINFO_TRACE
     MustSynchronize=true;
     Buffer_TotalBytes_FirstSynched_Max=32*1024;
+    PTS_DTS_Needed=true;
+    IsRawStream=true;
 
     //In
     Frame_Count_Valid=MediaInfoLib::Config.ParseSpeed_Get()>=0.3?32:2;
 
     //Temp
     Parser=NULL;
-    Frame_Count=0;
     HD_size=0;
     Primary_Frame_Byte_Size_minus_1=0;
     HD_SpeakerActivityMask=(int16u)-1;
     channel_arrangement=(int8u)-1;
     channel_arrangement_XCh=(int8u)-1;
     sample_frequency=(int8u)-1;
+    sample_frequency_X96k=(int8u)-1;
     bit_rate=(int8u)-1;
     lfe_effects=(int8u)-1;
     bits_per_sample=(int8u)-1;
@@ -373,11 +382,7 @@
 //---------------------------------------------------------------------------
 void File_Dts::Streams_Fill()
 {
-    if (!IsSub)
-    {
-        Fill(Stream_General, 0, General_Format, "DTS");
-        Fill(Stream_General, 0, General_Format_Profile, Profile);
-    }
+    Fill(Stream_General, 0, General_Format, "DTS");
 
     Stream_Prepare(Stream_Audio);
     Fill(Stream_Audio, 0, Audio_Format, "DTS");
@@ -385,80 +390,73 @@
     if (Parser) //LE or 14-bit
         return; //filled by the parser
 
-    if (Profile.empty() && ES)
-        Profile="ES";
-    Fill(Stream_Audio, 0, Audio_Format_Profile, Profile);
-    Fill(Stream_Audio, 0, Audio_Codec, (Profile.find(_T("MA"))==0 || Profile.find(_T("HRA"))==0)?"DTS-HD":"DTS");
-    Fill(Stream_Audio, 0, Audio_BitRate_Mode, Profile.find(_T("MA"))==0?"VBR":"CBR");
-    Fill(Stream_Audio, 0, Audio_SamplingRate, DTS_SamplingRate[sample_frequency]);
-    if (Profile!=_T("MA") && (bit_rate<29 || Profile==_T("Express")))
-    {
-        float64 BitRate;
-        if (Profile==_T("Express"))
-            BitRate=0; //No core bitrate
-        else
-            BitRate=(float64)DTS_BitRate[bit_rate];
-        if (HD_ExSSFrameDurationCode!=(int8u)-1)
-        {
-            int32u SamplePerFrames=HD_ExSSFrameDurationCode;
-            switch (HD_MaximumSampleRate)
-            {
-                case  0 : //  8000
-                case 10 : // 12000
-                                SamplePerFrames*= 128; break;
-                case  1 : // 16000
-                case  5 : // 22050
-                case 11 : // 24000
-                                SamplePerFrames*= 256; break;
-                case  2 : // 32000
-                case  6 : // 44100
-                case 12 : // 48000
-                                SamplePerFrames*= 512; break;
-                case  3 : // 64000
-                case  7 : // 88200
-                case 13 : // 96000
-                                SamplePerFrames*=1024; break;
-                case  4 : //128000
-                case  8 : //176400
-                case 14 : //192000
-                                SamplePerFrames*=2048; break;
-                case  9 : //352800
-                case 15 : //384000
-                                SamplePerFrames*=4096; break;
-                default     :   SamplePerFrames=    0; break; //Can never happen (4 bits)
-            }
-            if (SamplePerFrames)
-                BitRate+=HD_size*8*DTS_HD_MaximumSampleRate[HD_MaximumSampleRate]/SamplePerFrames;
-        }
-        //if (Primary_Frame_Byte_Size_minus_1 && Profile==_T("HRA"))
-        //    BitRate*=1+((float64)HD_size)/Primary_Frame_Byte_Size_minus_1; //HD block are not in the nominal bitrate
-        Fill(Stream_Audio, 0, Audio_BitRate, BitRate, 0);
-    }
-    else if (bit_rate==29)
-        Fill(Stream_Audio, 0, Audio_BitRate, "Open");
-    else if (bit_rate==30)
-        Fill(Stream_Audio, 0, Audio_BitRate, "Variable");
-    else if (bit_rate==31)
-        Fill(Stream_Audio, 0, Audio_BitRate, "LossLess");
+    if (!Profile.empty())
+        Fill(Stream_Audio, 0, Audio_Format_Profile, Profile+(Core_Exists?__T(" / Core"):__T("")));
+    else if (ES)
+        Fill(Stream_Audio, 0, Audio_Format_Profile, "ES");
+    Fill(Stream_General, 0, General_Format_Profile, Retrieve(Stream_Audio, 0, Audio_Format_Profile));
+    Fill(Stream_Audio, 0, Audio_Codec, (Profile.find(__T("MA"))==0 || Profile.find(__T("HRA"))==0)?"DTS-HD":"DTS");
+
+    //HD data
     if ((ExtendedCoding && (ExtensionAudioDescriptor==0 || ExtensionAudioDescriptor==3 || ExtensionAudioDescriptor==6)))
     {
         switch(channel_arrangement_XCh)
         {
             case 1 :
                     Fill(Stream_Audio, 0, Audio_Channel_s_, 7);
-                    Fill(Stream_Audio, 0, Audio_ChannelPositions, Ztring("Front: L C R, Side: L R, Back: C")+(lfe_effects?_T(", LFE"):_T("")));
-                    Fill(Stream_Audio, 0, Audio_ChannelPositions_String2, Ztring("3/2/1")+(lfe_effects?_T(".1"):_T(".0")));
+                    Fill(Stream_Audio, 0, Audio_ChannelPositions, Ztring("Front: L C R, Side: L R, Back: C")+(lfe_effects?__T(", LFE"):__T("")));
+                    Fill(Stream_Audio, 0, Audio_ChannelPositions_String2, Ztring("3/2/1")+(lfe_effects?__T(".1"):__T(".0")));
                     break;
             case 2 :
                     Fill(Stream_Audio, 0, Audio_Channel_s_, 8);
-                    Fill(Stream_Audio, 0, Audio_ChannelPositions, Ztring("Front: L C R, Side: L R, Back: L R")+(lfe_effects?_T(", LFE"):_T("")));
-                    Fill(Stream_Audio, 0, Audio_ChannelPositions_String2, Ztring("3/2/2")+(lfe_effects?_T(".1"):_T(".0")));
+                    Fill(Stream_Audio, 0, Audio_ChannelPositions, Ztring("Front: L C R, Side: L R, Back: L R")+(lfe_effects?__T(", LFE"):__T("")));
+                    Fill(Stream_Audio, 0, Audio_ChannelPositions_String2, Ztring("3/2/2")+(lfe_effects?__T(".1"):__T(".0")));
                     break;
             default:;
         }
     }
     else
     {
+        if (HD_SpeakerActivityMask!=(int16u)-1)
+        {
+            Fill(Stream_Audio, 0, Audio_ChannelPositions, DTS_HD_SpeakerActivityMask(HD_SpeakerActivityMask).c_str());
+            Fill(Stream_Audio, 0, Audio_ChannelPositions_String2, DTS_HD_SpeakerActivityMask2(HD_SpeakerActivityMask).c_str());
+        }
+        if(HD_BitResolution!=(int8u)-1)
+            Fill(Stream_Audio, 0, Audio_BitDepth, HD_BitResolution);
+        if(HD_MaximumSampleRate!=(int8u)-1)
+            Fill(Stream_Audio, 0, Audio_SamplingRate, DTS_HD_MaximumSampleRate[HD_MaximumSampleRate]);
+        else if (sample_frequency_X96k!=(int8u)-1)
+            Fill(Stream_Audio, 0, Audio_SamplingRate, DTS_SamplingRate[sample_frequency_X96k]);
+        if(HD_TotalNumberChannels!=(int8u)-1)
+            Fill(Stream_Audio, 0, Audio_Channel_s_, HD_TotalNumberChannels);
+        if (bit_rate<29 || Profile==__T("Express"))
+            Fill(Stream_Audio, 0, Audio_BitRate, BitRate_Get(true), 0);
+        if (Profile==__T("Express"))
+            Fill(Stream_Audio, 0, Audio_BitRate_Mode, "CBR");
+    }
+
+    //Core data
+    if (Core_Exists)
+    {
+        if ((Profile.find(__T("MA"))==0?__T("VBR"):__T("CBR"))!=Retrieve(Stream_Audio, 0, Audio_BitRate_Mode))
+            Fill(Stream_Audio, 0, Audio_BitRate_Mode, Profile.find(__T("MA"))==0?"VBR":"CBR");
+        if (DTS_SamplingRate[sample_frequency]!=Retrieve(Stream_Audio, 0, Audio_SamplingRate).To_int32u())
+            Fill(Stream_Audio, 0, Audio_SamplingRate, DTS_SamplingRate[sample_frequency]);
+        Ztring BitRate;
+        if (bit_rate<29 || Profile==__T("Express"))
+            BitRate=Ztring::ToZtring(BitRate_Get(), 0);
+        else if (bit_rate==29)
+            BitRate=__T("Open");
+        else if (bit_rate==30)
+            BitRate=__T("Variable");
+        else if (bit_rate==31)
+            BitRate=__T("LossLess");
+        if (BitRate!=Retrieve(Stream_Audio, 0, Audio_BitRate))
+            Fill(Stream_Audio, 0, Audio_BitRate, BitRate);
+        if (Profile.find(__T("MA"))==0 || bit_rate==31)
+            Fill(Stream_Audio, 0, Audio_Compression_Mode, "Lossless / Lossy", Unlimited, true, true);
+
         int8u Channels;
         Ztring ChannelPositions, ChannelPositions2;
         if (channel_arrangement<16)
@@ -474,27 +472,18 @@
         }
         if (lfe_effects)
         {
-            ChannelPositions+=_T(", LFE");
-            ChannelPositions2+=_T(".1");
+            ChannelPositions+=__T(", LFE");
+            ChannelPositions2+=__T(".1");
         }
-        Fill(Stream_Audio, 0, Audio_Channel_s_, Channels);
-        Fill(Stream_Audio, 0, Audio_ChannelPositions, ChannelPositions);
-        Fill(Stream_Audio, 0, Audio_ChannelPositions_String2, ChannelPositions2);
+        if (Channels!=Retrieve(Stream_Audio, 0, Audio_Channel_s_).To_int8u())
+            Fill(Stream_Audio, 0, Audio_Channel_s_, Channels);
+        if (ChannelPositions!=Retrieve(Stream_Audio, 0, Audio_ChannelPositions))
+            Fill(Stream_Audio, 0, Audio_ChannelPositions, ChannelPositions);
+        if (ChannelPositions2!=Retrieve(Stream_Audio, 0, Audio_ChannelPositions_String2))
+            Fill(Stream_Audio, 0, Audio_ChannelPositions_String2, ChannelPositions2);
+        if (DTS_Resolution[bits_per_sample]!=Retrieve(Stream_Audio, 0, Audio_BitDepth).To_int8u())
+            Fill(Stream_Audio, 0, Audio_BitDepth, DTS_Resolution[bits_per_sample]);
     }
-    Fill(Stream_Audio, 0, Audio_Resolution, DTS_Resolution[bits_per_sample]);
-
-    //Priority on HD data
-    if (HD_SpeakerActivityMask!=(int16u)-1)
-    {
-        Fill(Stream_Audio, 0, Audio_ChannelPositions, DTS_HD_SpeakerActivityMask(HD_SpeakerActivityMask).c_str(), Unlimited, true, true);
-        Fill(Stream_Audio, 0, Audio_ChannelPositions_String2, DTS_HD_SpeakerActivityMask2(HD_SpeakerActivityMask).c_str(), Unlimited, true, true);
-    }
-    if(HD_BitResolution!=(int8u)-1)
-        Fill(Stream_Audio, 0, Audio_Resolution, HD_BitResolution, 10, true);
-    if(HD_MaximumSampleRate!=(int8u)-1)
-        Fill(Stream_Audio, 0, Audio_SamplingRate, DTS_HD_MaximumSampleRate[HD_MaximumSampleRate], 10, true);
-    if(HD_TotalNumberChannels!=(int8u)-1)
-        Fill(Stream_Audio, 0, Audio_Channel_s_, HD_TotalNumberChannels, 10, true);
 }
 
 //---------------------------------------------------------------------------
@@ -504,8 +493,15 @@
     {
         Parser->Finish();
         Merge(*Parser, Stream_Audio, 0, 0);
-        if (!BigEndian) Fill(Stream_Audio, 0, Audio_Format_Profile, "LE");
-        if (!Word)      Fill(Stream_Audio, 0, Audio_Format_Profile, "14");
+        Fill(Stream_Audio, 0, Audio_MuxingMode, BigEndian?"BE":"LE");
+        Fill(Stream_Audio, 0, Audio_MuxingMode, Word?"16":"14");
+        return;
+    }
+
+    if (FrameInfo.PTS!=(int64u)-1 && FrameInfo.PTS>PTS_Begin)
+    {
+        Fill(Stream_Audio, 0, Audio_Duration, float64_int64s(((float64)(FrameInfo.PTS-PTS_Begin))/1000000));
+        Fill(Stream_Audio, 0, Audio_FrameCount, float64_int64s(((float64)(FrameInfo.PTS-PTS_Begin))/1000000/32));
     }
 }
 
@@ -520,7 +516,7 @@
     if (Buffer_Size<4)
         return false; //Must wait for more data
 
-    //False positives detection: Detect WAV files, the parser can't detect it easily, there is only 70 bytes of begining for saying WAV
+    //False positives detection: Detect WAV files, the parser can't detect it easily, there is only 70 bytes of beginning for saying WAV
     switch (CC4(Buffer))
     {
         case 0x52494646 : //"RIFF"
@@ -609,7 +605,7 @@
         }
         return false;
     }
-    
+
     //Configuration - 14 bits or Little Endian
     switch (CC1(Buffer+Buffer_Offset))
     {
@@ -631,7 +627,8 @@
         return false;
 
     //Quick test of synchro
-    switch (CC4(Buffer+Buffer_Offset))
+    int32u Value=CC4(Buffer+Buffer_Offset);
+    switch (Value)
     {
         case 0x7FFE8001 :  //16 bits and big    endian Core
         case 0xFE7F0180 :  //16 bits and little endian Core
@@ -647,6 +644,30 @@
 }
 
 //***************************************************************************
+// Buffer - Demux
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_DEMUX
+bool File_Dts::Demux_UnpacketizeContainer_Test()
+{
+    int32u Value=CC4(Buffer+Buffer_Offset);
+    if (Value==0x7FFE8001)
+    {
+        int16u Size=((BigEndian2int24u(Buffer+Buffer_Offset+5)>>4)&0x3FFF)+1;
+        Demux_Offset=Buffer_Offset+Size;
+
+        if (Buffer_Offset+Size>Buffer_Size && File_Offset+Buffer_Size!=File_Size)
+            return false; //No complete frame
+
+        Demux_UnpacketizeContainer_Demux();
+    }
+
+    return true;
+}
+#endif //MEDIAINFO_DEMUX
+
+//***************************************************************************
 // Buffer - Global
 //***************************************************************************
 
@@ -702,11 +723,13 @@
         }
         Demux(Dest, Dest_Size, ContentType_MainStream);
         Open_Buffer_Continue(Parser, Dest, Dest_Size);
-        if (!Status[IsFinished] && Parser->Status[IsFinished])
+        if (!Status[IsFilled] && Parser->Status[IsFilled])
         {
             Accept("DTS");
-            Finish("DTS");
+            Fill("DTS");
         }
+        if (!Status[IsFinished] && Parser->Status[IsFinished])
+            Finish("DTS");
 
         delete[] Dest;
         Buffer_Offset+=Buffer_Size;
@@ -742,42 +765,42 @@
         Get_SB (isBlownUpHeader,                                "Is blown up header");
         if (isBlownUpHeader)
         {
-            Get_S2 (12, header_size,                            "Header size"); header_size++; Param_Info(header_size, " bytes");
-            Get_S3 (20, HD_size,                                "HD block size"); HD_size++; Param_Info(HD_size, " bytes");
+            Get_S2 (12, header_size,                            "Header size"); header_size++; Param_Info2(header_size, " bytes");
+            Get_S3 (20, HD_size,                                "HD block size"); HD_size++; Param_Info2(HD_size, " bytes");
         }
         else
         {
-            Get_S2 ( 8, header_size,                            "Header size"); header_size++; Param_Info(header_size, " bytes");
-            Get_S3 (16, HD_size,                                "HD block size"); HD_size++; Param_Info(HD_size, " bytes");
+            Get_S2 ( 8, header_size,                            "Header size"); header_size++; Param_Info2(header_size, " bytes");
+            Get_S3 (16, HD_size,                                "HD block size"); HD_size++; Param_Info2(HD_size, " bytes");
         }
         TESTELSE_SB_GET(StaticFieldsPresent,                    "Static fields present");
             std::vector<int32u> ActiveExSSMasks;
-            Info_S1(2, RefClockCode,                            "Reference clock code"); Param_Info(DTS_HD_RefClockCode[RefClockCode]);
-            Get_S1 (3, HD_ExSSFrameDurationCode,                "ExSS frame duration code"); HD_ExSSFrameDurationCode++; Param_Info(HD_ExSSFrameDurationCode);
+            Info_S1(2, RefClockCode,                            "Reference clock code"); Param_Info1(DTS_HD_RefClockCode[RefClockCode]);
+            Get_S1 (3, HD_ExSSFrameDurationCode,                "ExSS frame duration code"); HD_ExSSFrameDurationCode++; Param_Info1(HD_ExSSFrameDurationCode);
             TEST_SB_SKIP(                                       "Timestamp flag");
                 Skip_S5(36,                                     "Timestamp");
             TEST_SB_END();
-            Get_S1 (3, NumAudioPresent,                         "Num audio present"); NumAudioPresent++; Param_Info(NumAudioPresent, " channels");
-            Get_S1 (3, NumAssets,                               "Num assets"); NumAssets++; Param_Info(NumAssets, " assets");
-            Element_Begin("Active masks");
+            Get_S1 (3, NumAudioPresent,                         "Num audio present"); NumAudioPresent++; Param_Info2(NumAudioPresent, " channels");
+            Get_S1 (3, NumAssets,                               "Num assets"); NumAssets++; Param_Info2(NumAssets, " assets");
+            Element_Begin1("Active masks");
             for (int8u Pos=0; Pos<NumAudioPresent; Pos++)
             {
                 int32u ActiveExSSMask;
                 Get_S4 (SubStreamIndex+1, ActiveExSSMask,       "Active ExSS mask");
                 ActiveExSSMasks.push_back(ActiveExSSMask);
             }
-            Element_End();
-            Element_Begin("Active masks 2");
+            Element_End0();
+            Element_Begin1("Active masks 2");
             for (int8u Pos=0; Pos<NumAudioPresent; Pos++)
                 for (int8u Pos2=0; Pos2<SubStreamIndex+1; Pos2+=2)
                     if (ActiveExSSMasks[Pos]%2)
                         Skip_S1(8,                              "Active ExSS Mask");
-            Element_End();
+            Element_End0();
             TEST_SB_SKIP(                                       "Mix metadata Enabled");
                 int8u Bits4MixOutMask, NumMixOutConfigs;
                 Skip_S1(2,                                      "Mix metadata adjustment level");
-                Get_S1 (2, Bits4MixOutMask,                     "Bits4Mix out mask"); Bits4MixOutMask=4+Bits4MixOutMask*4; Param_Info(Bits4MixOutMask, " bits");
-                Get_S1 (2, NumMixOutConfigs,                    "Number of mix out configs"); NumMixOutConfigs++; Param_Info(NumMixOutConfigs, " configs");
+                Get_S1 (2, Bits4MixOutMask,                     "Bits4Mix out mask"); Bits4MixOutMask=4+Bits4MixOutMask*4; Param_Info2(Bits4MixOutMask, " bits");
+                Get_S1 (2, NumMixOutConfigs,                    "Number of mix out configs"); NumMixOutConfigs++; Param_Info2(NumMixOutConfigs, " configs");
                 for (int8u Pos=0; Pos<NumMixOutConfigs; Pos++)
                     Skip_S1(Bits4MixOutMask,                    "MixOutChMask");
             TEST_SB_END();
@@ -786,45 +809,45 @@
             NumAssets=1;
         TESTELSE_SB_END();
         Asset_Sizes.clear();
-        Element_Begin("Sizes");
+        Element_Begin1("Sizes");
         for (int8u Pos=0; Pos<NumAssets; Pos++)
         {
             int32u Size;
             if (isBlownUpHeader)
             {
-                Get_S3 (20, Size,                               "Size"); Size++; Param_Info(Size, " bytes");
+                Get_S3 (20, Size,                               "Size"); Size++; Param_Info2(Size, " bytes");
             }
             else
             {
-                Get_S3 (16, Size,                               "Size"); Size++; Param_Info(Size, " bytes");
+                Get_S3 (16, Size,                               "Size"); Size++; Param_Info2(Size, " bytes");
             }
             Asset_Sizes.push_back(Size);
         }
-        Element_End();
+        Element_End0();
         for (int8u Asset_Pos=0; Asset_Pos<NumAssets; Asset_Pos++)
         {
-            Element_Begin("Asset");
+            Element_Begin1("Asset");
             int16u AssetSize;
             Get_S2 (9, AssetSize,                               "Asset size");
-            AssetSize++;  Param_Info(AssetSize, " bytes?");
+            AssetSize++;  Param_Info2(AssetSize, " bytes?");
             Skip_S1(3,                                          "Descriptor data for asset index");
             if (StaticFieldsPresent)
             {
                 TEST_SB_SKIP(                                   "Asset type descriptor present");
-                    Info_S1( 4, TypeDescriptor,                 "Asset type descriptor"); Param_Info(DTS_HD_TypeDescriptor[TypeDescriptor]);
+                    Info_S1( 4, TypeDescriptor,                 "Asset type descriptor"); Param_Info1(DTS_HD_TypeDescriptor[TypeDescriptor]);
                 TEST_SB_END();
                 TEST_SB_SKIP(                                   "Language descriptor present");
-                    Info_S3(24, LanguageDescriptor,             "Language descriptor"); Param_Info(Ztring().From_CC3(LanguageDescriptor));
+                    Info_S3(24, LanguageDescriptor,             "Language descriptor"); Param_Info1(Ztring().From_CC3(LanguageDescriptor));
                 TEST_SB_END();
                 TEST_SB_SKIP(                                   "Info text present");
                     int16u InfoTextByteSize;
-                    Get_S2(10, InfoTextByteSize,                "Info text size"); InfoTextByteSize++; Param_Info(InfoTextByteSize, "bytes");
+                    Get_S2(10, InfoTextByteSize,                "Info text size"); InfoTextByteSize++; Param_Info2(InfoTextByteSize, "bytes");
                     for (int16u Pos=0; Pos<InfoTextByteSize; Pos++)
                         Skip_S1(8,                              "Info text");
                 TEST_SB_END();
-                Get_S1 (5, HD_BitResolution,                    "Bit resolution"); HD_BitResolution++; Param_Info(HD_BitResolution, " bits");
-                Get_S1 (4, HD_MaximumSampleRate,                "Maximum sample rate"); Param_Info(DTS_HD_MaximumSampleRate[HD_MaximumSampleRate], " Hz");
-                Get_S1 (8, HD_TotalNumberChannels,              "Total number of channels"); HD_TotalNumberChannels++; Param_Info(HD_TotalNumberChannels, " channels");
+                Get_S1 (5, HD_BitResolution,                    "Bit resolution"); HD_BitResolution++; Param_Info2(HD_BitResolution, " bits");
+                Get_S1 (4, HD_MaximumSampleRate,                "Maximum sample rate"); Param_Info2(DTS_HD_MaximumSampleRate[HD_MaximumSampleRate], " Hz");
+                Get_S1 (8, HD_TotalNumberChannels,              "Total number of channels"); HD_TotalNumberChannels++; Param_Info2(HD_TotalNumberChannels, " channels");
                 TEST_SB_SKIP(                                   "1 to 1 map channels to speakers");
                     int8u SpeakerActivityMaskBits, SpeakerRemapSetsCount;
                     if (HD_TotalNumberChannels>2)
@@ -832,9 +855,9 @@
                     if (HD_TotalNumberChannels>6)
                         Skip_SB(                                "Embedded 6 Channels flag"); //else is 0
                     TESTELSE_SB_SKIP(                           "Speaker mask enabled");
-                        Get_S1 (2, SpeakerActivityMaskBits,     "Speaker activity mask bits"); Param_Info(4+SpeakerActivityMaskBits*4, " bits");
+                        Get_S1 (2, SpeakerActivityMaskBits,     "Speaker activity mask bits"); Param_Info2(4+SpeakerActivityMaskBits*4, " bits");
                         SpeakerActivityMaskBits=4+SpeakerActivityMaskBits*4;
-                        Get_S2 (SpeakerActivityMaskBits, HD_SpeakerActivityMask, "Speaker activity mask"); Param_Info(DTS_HD_SpeakerActivityMask(HD_SpeakerActivityMask).c_str());
+                        Get_S2 (SpeakerActivityMaskBits, HD_SpeakerActivityMask, "Speaker activity mask"); Param_Info1(DTS_HD_SpeakerActivityMask(HD_SpeakerActivityMask).c_str());
                     TESTELSE_SB_ELSE(                           "Speaker mask enabled");
                         SpeakerActivityMaskBits=0;
                     TESTELSE_SB_END();
@@ -848,7 +871,7 @@
                         //Not finnished!
                     }
                 TEST_SB_END();
-                Element_End();
+                Element_End0();
             }
         }
         BS_End();
@@ -864,22 +887,22 @@
         int8u  EncoderSoftwareRevision;
         bool   crc_present;
         BS_Begin();
-        Info_SB(    FrameType,                                      "Frame Type"); Param_Info(DTS_FrameType[FrameType]);
+        Info_SB(    FrameType,                                      "Frame Type"); Param_Info1(DTS_FrameType[FrameType]);
         Skip_S1( 5,                                                 "Deficit Sample Count");
         Get_SB (    crc_present,                                    "CRC Present");
         Skip_S1( 7,                                                 "Number of PCM Sample Blocks");
         Get_S2 (14, Primary_Frame_Byte_Size_minus_1,                "Primary Frame Byte Size minus 1");
         Primary_Frame_Byte_Size_minus_1+=1;
-        if (!Word) Primary_Frame_Byte_Size_minus_1=Primary_Frame_Byte_Size_minus_1*8/14*2; Param_Info(Ztring::ToZtring(Primary_Frame_Byte_Size_minus_1)+_T(" bytes")); //Word is on 14 bits!
-        Get_S1 ( 6, channel_arrangement,                            "Audio Channel Arrangement"); Param_Info(Ztring::ToZtring(DTS_Channels[channel_arrangement])+_T(" channels"));
-        Get_S1 ( 4, sample_frequency,                               "Core Audio Sampling Frequency"); Param_Info(Ztring::ToZtring(DTS_SamplingRate[sample_frequency])+_T(" Hz"));
-        Get_S1 ( 5, bit_rate,                                       "Transmission Bit Rate"); Param_Info(Ztring::ToZtring(DTS_BitRate[bit_rate])+_T(" bps"));
+        if (!Word) Primary_Frame_Byte_Size_minus_1=Primary_Frame_Byte_Size_minus_1*8/14*2; Param_Info2(Primary_Frame_Byte_Size_minus_1, " bytes"); //Word is on 14 bits!
+        Get_S1 ( 6, channel_arrangement,                            "Audio Channel Arrangement"); Param_Info2(DTS_Channels[channel_arrangement], " channels");
+        Get_S1 ( 4, sample_frequency,                               "Core Audio Sampling Frequency"); Param_Info2(DTS_SamplingRate[sample_frequency], " Hz");
+        Get_S1 ( 5, bit_rate,                                       "Transmission Bit Rate"); Param_Info2(DTS_BitRate[bit_rate], " bps");
         Skip_SB(                                                    "Embedded Down Mix Enabled");
         Skip_SB(                                                    "Embedded Dynamic Range");
         Skip_SB(                                                    "Embedded Time Stamp");
         Skip_SB(                                                    "Auxiliary Data");
         Skip_SB(                                                    "HDCD");
-        Get_S1 ( 3, ExtensionAudioDescriptor,                       "Extension Audio Descriptor"); Param_Info(DTS_ExtensionAudioDescriptor[ExtensionAudioDescriptor]);
+        Get_S1 ( 3, ExtensionAudioDescriptor,                       "Extension Audio Descriptor"); Param_Info1(DTS_ExtensionAudioDescriptor[ExtensionAudioDescriptor]);
         Get_SB (    ExtendedCoding,                                 "Extended Coding");
         Skip_SB(                                                    "Audio Sync Word Insertion");
         Get_S1 ( 2, lfe_effects,                                    "Low Frequency Effects");
@@ -889,7 +912,7 @@
         Skip_SB(                                                    "Multirate Interpolator");
         Get_S1 ( 4, EncoderSoftwareRevision,                        "Encoder Software Revision");
         Skip_S1( 2,                                                 "Copy History");
-        Get_S1 ( 2, bits_per_sample,                                "Source PCM Resolution"); Param_Info(Ztring::ToZtring(DTS_Resolution[bits_per_sample])+_T(" bits"));
+        Get_S1 ( 2, bits_per_sample,                                "Source PCM Resolution"); Param_Info1(Ztring::ToZtring(DTS_Resolution[bits_per_sample])+__T(" bits"));
         Get_SB (    ES,                                             "ES");
         Skip_SB(                                                    "Front Sum/Difference");
         Skip_SB(                                                    "Surrounds Sum/Difference");
@@ -921,14 +944,47 @@
 //---------------------------------------------------------------------------
 void File_Dts::Data_Parse()
 {
+    //Partial frame
+    if ((Element_Code==0 && Header_Size+Element_Size<Primary_Frame_Byte_Size_minus_1)
+     || (Element_Code==1 && Header_Size+Element_Size<HD_size))
+    {
+        Element_Name("Partial frame");
+        Skip_XX(Element_Size,                                   "Data");
+        return;
+    }
+
+    //Name
+    Element_Info1(Ztring::ToZtring(Frame_Count));
+
+    //PTS
+    Element_Info1C((FrameInfo.PTS!=(int64u)-1), __T("PTS ")+Ztring().Duration_From_Milliseconds(float64_int64s(((float64)FrameInfo.PTS)/1000000)));
+
     //Counting
     if (File_Offset+Buffer_Offset+Element_Size==File_Size)
         Frame_Count_Valid=Frame_Count; //Finish frames in case of there are less than Frame_Count_Valid frames
     if (Element_Code==0 || !Core_Exists)
+    {
+        if (Frame_Count==0)
+            PTS_Begin=FrameInfo.PTS;
         Frame_Count++;
+        Frame_Count_InThisBlock++;
+        float64 BitRate=BitRate_Get();
+        if (BitRate)
+        {
+            FrameInfo.DUR=float64_int64s(((float64)(Element_Size+Header_Size))*8/BitRate*1000000000);
+            if (FrameInfo.DTS!=(int64u)-1)
+                FrameInfo.DTS+=FrameInfo.DUR;
+            if (FrameInfo.PTS!=(int64u)-1)
+                FrameInfo.PTS=FrameInfo.DTS;
+        }
+    }
 
-    //Name
-    Element_Info(Ztring::ToZtring(Frame_Count));
+    //If filled
+    if (Status[IsFilled])
+    {
+        Skip_XX(Element_Size,                                   "Data");
+        return;
+    }
 
     //Parsing
     switch(Element_Code)
@@ -986,24 +1042,24 @@
     Skip_XX(Core_Size,                                          "Core data");
     if (ExtendedCoding && (ExtensionAudioDescriptor==2 || ExtensionAudioDescriptor==3))
     {
-        Element_Begin();
+        Element_Begin0();
         Skip_B4(                                                "Magic");
         Core_X96k(XCh_Sync-Element_Offset);
-        Element_End();
+        Element_End0();
     }
     if (ExtendedCoding && (ExtensionAudioDescriptor==0 || ExtensionAudioDescriptor==3))
     {
-        Element_Begin();
+        Element_Begin0();
         Skip_B4(                                                "Magic");
         Core_XCh(Element_Size-Element_Offset);
-        Element_End();
+        Element_End0();
     }
     if (ExtendedCoding && ExtensionAudioDescriptor==6)
     {
-        Element_Begin();
+        Element_Begin0();
         Skip_B4(                                                "Magic");
         Core_XXCh(Element_Size-Element_Offset);
-        Element_End();
+        Element_End0();
     }
 
     //Filling
@@ -1011,7 +1067,11 @@
         if (Count_Get(Stream_Audio)==0 && Frame_Count>=Frame_Count_Valid)
         {
             Accept("DTS");
-            Finish("DTS");
+            Fill("DTS");
+
+            //No more need data
+            if (!IsSub && MediaInfoLib::Config.ParseSpeed_Get()<1)
+                Finish("DTS");
         }
     FILLING_END();
 }
@@ -1029,7 +1089,10 @@
     BS_End();
     if (XChFSIZE==Element_Size-(Element_Offset-6))
         XChFSIZE--; //Compatibility reason (from specs)
-    Skip_XX(XChFSIZE+1-6,                                       "XCh data");
+    if ((int64u)XChFSIZE+1-6<=Size-2)
+        Skip_XX(XChFSIZE+1-6,                                   "XCh data");
+    else
+        Skip_XX(Size-2,                                         "XCh data (with problem)");
 
     FILLING_BEGIN();
         channel_arrangement_XCh=AMODE;
@@ -1067,7 +1130,7 @@
     Skip_XX(Size-2,                                             "X96k data"); //FSIZE96 is until end, not X96k size
 
     FILLING_BEGIN();
-        sample_frequency=14; //96KHz
+        sample_frequency_X96k=14; //96KHz
         Profile="96/24";
     FILLING_END();
 }
@@ -1096,7 +1159,7 @@
         if (Next+4>Element_Size)
             Next=Element_Size;
 
-        Element_Begin();
+        Element_Begin0();
         int32u Magic;
         Get_B4 (Magic,                                          "Magic");
         switch (Magic)
@@ -1113,7 +1176,7 @@
                             Profile="HD";
                         Skip_XX(Next-Element_Offset,            "Data");
         }
-        Element_End();
+        Element_End0();
     }
 
     //Filling
@@ -1121,7 +1184,11 @@
         if (Count_Get(Stream_Audio)==0 && Frame_Count>=Frame_Count_Valid)
         {
             Accept("DTS");
-            Finish("DTS");
+            Fill("DTS");
+
+            //No more need data
+            if (!IsSub && MediaInfoLib::Config.ParseSpeed_Get()<1)
+                Finish("DTS");
         }
     FILLING_END();
 }
@@ -1205,6 +1272,60 @@
     FILLING_END();
 }
 
+//***************************************************************************
+// Helpers
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+float64 File_Dts::BitRate_Get(bool WithHD)
+{
+    if (bit_rate<29 || Profile==__T("Express"))
+    {
+        float64 BitRate;
+        if (Profile==__T("Express"))
+            BitRate=0; //No core bitrate
+        else
+            BitRate=(float64)DTS_BitRate[bit_rate];
+        if (WithHD && HD_ExSSFrameDurationCode!=(int8u)-1)
+        {
+            int32u SamplePerFrames=HD_ExSSFrameDurationCode;
+            switch (HD_MaximumSampleRate)
+            {
+                case  0 : //  8000
+                case 10 : // 12000
+                                SamplePerFrames*= 128; break;
+                case  1 : // 16000
+                case  5 : // 22050
+                case 11 : // 24000
+                                SamplePerFrames*= 256; break;
+                case  2 : // 32000
+                case  6 : // 44100
+                case 12 : // 48000
+                                SamplePerFrames*= 512; break;
+                case  3 : // 64000
+                case  7 : // 88200
+                case 13 : // 96000
+                                SamplePerFrames*=1024; break;
+                case  4 : //128000
+                case  8 : //176400
+                case 14 : //192000
+                                SamplePerFrames*=2048; break;
+                case  9 : //352800
+                case 15 : //384000
+                                SamplePerFrames*=4096; break;
+                default     :   SamplePerFrames=    0; break; //Can never happen (4 bits)
+            }
+            if (SamplePerFrames)
+                BitRate+=HD_size*8*DTS_HD_MaximumSampleRate[HD_MaximumSampleRate]/SamplePerFrames;
+        }
+        //if (Primary_Frame_Byte_Size_minus_1 && Profile==__T("HRA"))
+        //    BitRate*=1+((float64)HD_size)/Primary_Frame_Byte_Size_minus_1; //HD block are not in the nominal bitrate
+        return BitRate;
+    }
+    else
+        return 0;
+}
+
 //---------------------------------------------------------------------------
 } //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Dts.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Dts.h Changed

@@ -1,17 +1,17 @@
 // File_Dts - Info for DTS files
-// Copyright (C) 2004-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2004-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -40,7 +40,7 @@
 {
 public :
     //In
-    size_t Frame_Count_Valid;
+    int64u Frame_Count_Valid;
 
     //Constructor/Destructor
     File_Dts();
@@ -58,6 +58,11 @@
     bool Synchronize();
     bool Synched_Test();
 
+    //Buffer - Demux
+    #if MEDIAINFO_DEMUX
+    bool Demux_UnpacketizeContainer_Test();
+    #endif //MEDIAINFO_DEMUX
+
     //Buffer - Global
     void Read_Buffer_Continue ();
 
@@ -83,13 +88,13 @@
     std::vector<ZenLib::int32u> Asset_Sizes;
     Ztring Profile;
     File__Analyze* Parser; //14 bits or Little Endian
-    size_t Frame_Count;
     int32u HD_size;
     int16u Primary_Frame_Byte_Size_minus_1;
     int16u HD_SpeakerActivityMask;
     int8u  channel_arrangement;
     int8u  channel_arrangement_XCh;
     int8u  sample_frequency;
+    int8u  sample_frequency_X96k;
     int8u  bit_rate;
     int8u  lfe_effects;
     int8u  bits_per_sample;
@@ -103,6 +108,9 @@
     bool   BigEndian;
     bool   ES;
     bool   Core_Exists;
+
+    //Helpers
+    float64 BitRate_Get(bool WithHD=false);
 };
 
 } //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_ExtendedModule.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_ExtendedModule.cpp Changed

@@ -1,31 +1,35 @@
 // File_ExtendedModule - Info for Extended Module files
-// Copyright (C) 2008-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WXMHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILXMY or FXMNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_XM_YES)
 //---------------------------------------------------------------------------
 
@@ -91,16 +95,16 @@
         Accept("Extended Module");
 
         Fill(Stream_General, 0, General_Format, "Extended Module");
-        Fill(Stream_General, 0, General_Format_Version, Ztring(_T("Version"))+Ztring::ToZtring(VersionMajor)+_T(".")+Ztring::ToZtring(VersionMinor/10)+Ztring::ToZtring(VersionMinor%10));
-        Fill(Stream_General, 0, General_Track, ModuleName.Trim(_T(' ')));
-        Fill(Stream_General, 0, General_Encoded_Application, TrackerName.Trim(_T(' ')));
+        Fill(Stream_General, 0, General_Format_Version, Ztring::ToZtring(VersionMajor)+__T(".")+Ztring::ToZtring(VersionMinor/10)+Ztring::ToZtring(VersionMinor%10));
+        Fill(Stream_General, 0, General_Track, ModuleName.Trim(__T(' ')));
+        Fill(Stream_General, 0, General_Encoded_Application, TrackerName.Trim(__T(' ')));
         Fill(Stream_General, 0, "Tempo", Tempo);
         Fill(Stream_General, 0, "BPM", BPM);
 
-        for (int16u Pos=0; Pos<Channels; Pos++)
-        {
-            Stream_Prepare(Stream_Audio);
-        }
+        Stream_Prepare(Stream_Audio);
+        Fill(Stream_Audio, 0, "Sampler, Channels", Channels);
+        Fill(Stream_Audio, 0, "Sampler, Patterns", Patterns);
+        Fill(Stream_Audio, 0, "Sampler, Instruments", Instruments);
 
         //No more need data
         Finish("Extended Module");

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_ExtendedModule.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_ExtendedModule.h Changed

@@ -1,17 +1,17 @@
 // File_ExtendedModule - Info for Extended Module files
-// Copyright (C) 2008-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WXMHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILXMY or FXMNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Flac.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Flac.cpp Changed

@@ -1,38 +1,42 @@
 // File_Flac - Info for Flac files
-// Copyright (C) 2003-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2003-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_FLAC_YES)
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 #include "MediaInfo/Audio/File_Flac.h"
 #include "MediaInfo/Tag/File_VorbisCom.h"
-#include "ZenLib/Base64/base64.h"
+#include "base64.h"
 //---------------------------------------------------------------------------
 
 namespace MediaInfoLib
@@ -58,7 +62,7 @@
 
     //In
     VorbisHeader=false;
-    
+
     //Temp
     Last_metadata_block=false;
 }
@@ -127,7 +131,7 @@
 void File_Flac::Data_Parse()
 {
     #define CASE_INFO(_NAME) \
-        case Flac::_NAME : Element_Info(#_NAME); _NAME(); break;
+        case Flac::_NAME : Element_Info1(#_NAME); _NAME(); break;
 
     //Parsing
     switch ((int16u)Element_Code)
@@ -169,8 +173,8 @@
     Get_B3 (    FrameSize_Max,                                  "FrameSize_Max"); //The maximum frame size (in bytes) used in the stream. May be 0 to imply the value is not known.
     BS_Begin();
     Get_S3 (20, SampleRate,                                     "SampleRate"); //Sample rate in Hz. Though 20 bits are available, the maximum sample rate is limited by the structure of frame headers to 1048570Hz. Also, a value of 0 is invalid.
-    Get_S1 ( 3, Channels,                                       "Channels"); Param_Info(Channels+1, " channels"); //(number of channels)-1. FLAC supports from 1 to 8 channels
-    Get_S1 ( 5, BitPerSample,                                   "BitPerSample"); Param_Info(BitPerSample+1, " bits"); //(bits per sample)-1. FLAC supports from 4 to 32 bits per sample. Currently the reference encoder and decoders only support up to 24 bits per sample.
+    Get_S1 ( 3, Channels,                                       "Channels"); Param_Info2(Channels+1, " channels"); //(number of channels)-1. FLAC supports from 1 to 8 channels
+    Get_S1 ( 5, BitPerSample,                                   "BitPerSample"); Param_Info2(BitPerSample+1, " bits"); //(bits per sample)-1. FLAC supports from 4 to 32 bits per sample. Currently the reference encoder and decoders only support up to 24 bits per sample.
     Get_S5 (36, Samples,                                        "Samples");
     BS_End();
     Skip_B16(                                                   "MD5 signature of the unencoded audio data");
@@ -191,7 +195,7 @@
             Fill(Stream_Audio, 0, Audio_BitRate_Mode, "VBR");
         Fill(Stream_Audio, 0, Audio_SamplingRate, SampleRate);
         Fill(Stream_Audio, 0, Audio_Channel_s_, Channels+1);
-        Fill(Stream_Audio, 0, Audio_Resolution, BitPerSample+1);
+        Fill(Stream_Audio, 0, Audio_BitDepth, BitPerSample+1);
         if (!IsSub)
             Fill(Stream_Audio, 0, Audio_Duration, Samples*1000/SampleRate);
 
@@ -232,7 +236,7 @@
     //Parsing
     int32u PictureType, MimeType_Size, Description_Size, Data_Size;
     Ztring MimeType, Description;
-    Get_B4 (PictureType,                                        "Picture type"); Element_Info(Id3v2_PictureType((int8u)PictureType));
+    Get_B4 (PictureType,                                        "Picture type"); Element_Info1(Id3v2_PictureType((int8u)PictureType));
     Get_B4 (MimeType_Size,                                      "MIME type size");
     Get_Local(MimeType_Size, MimeType,                          "MIME type");
     Get_B4 (Description_Size,                                   "Description size");

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Flac.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Flac.h Changed

@@ -1,17 +1,17 @@
 // File_Flac - Info for Flac Audio files
-// Copyright (C) 2003-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2003-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_ImpulseTracker.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_ImpulseTracker.cpp Changed

@@ -1,31 +1,35 @@
 // File_ImpulseTracker - Info for Impulse Tracker files
-// Copyright (C) 2008-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_IT_YES)
 //---------------------------------------------------------------------------
 
@@ -114,14 +118,14 @@
         Accept("Impulse Tracker");
 
         Fill(Stream_General, 0, General_Format, "Impulse Tracker");
-        Fill(Stream_General, 0, General_Format_Version, Ztring(_T("Version "))+Ztring::ToZtring(VersionMajor)+_T(".")+Ztring::ToZtring(VersionMinor/16)+Ztring::ToZtring(VersionMinor%16));
+        Fill(Stream_General, 0, General_Format_Version, Ztring(__T("Version "))+Ztring::ToZtring(VersionMajor)+__T(".")+Ztring::ToZtring(VersionMinor/16)+Ztring::ToZtring(VersionMinor%16));
         Fill(Stream_General, 0, General_Track, SongName);
-        Fill(Stream_General, 0, General_Encoded_Application, Ztring(_T("Impulse Tracker ")+Ztring::ToZtring(SoftwareVersionMajor)+_T(".")+Ztring::ToZtring(SoftwareVersionMinor/16)+Ztring::ToZtring(SoftwareVersionMinor%16)));
+        Fill(Stream_General, 0, General_Encoded_Application, Ztring(__T("Impulse Tracker ")+Ztring::ToZtring(SoftwareVersionMajor)+__T(".")+Ztring::ToZtring(SoftwareVersionMinor/16)+Ztring::ToZtring(SoftwareVersionMinor%16)));
         Fill(Stream_General, 0, "BPM", TS);
 
         Stream_Prepare(Stream_Audio);
         Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, Stereo?2:1);
-        
+
         //No more need data
         Finish("Impulse Tracker");
     FILLING_END();

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_ImpulseTracker.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_ImpulseTracker.h Changed

@@ -1,17 +1,17 @@
 // File_ImpulseTracker - Info for Impulse Tracker files
-// Copyright (C) 2008-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_La.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_La.cpp Changed

@@ -1,17 +1,18 @@
 // File_La - Info for LA files
-// Copyright (C) 2009-2009 Lionel Duchateau, kurtnoise@free.fr
+// Copyright (C) 2009-2012 Lionel Duchateau, kurtnoise@free.fr
+// Copyright (C) 2009-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -21,14 +22,18 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_LA_YES)
 //---------------------------------------------------------------------------
 
@@ -63,7 +68,7 @@
     float32 CompressionRatio=((float32)UncompressedSize)/CompressedSize;
 
     Fill(Stream_Audio, 0, Audio_StreamSize, CompressedSize);
-    Fill(Stream_Audio, 0, Audio_CompressionRatio, CompressionRatio);
+    Fill(Stream_Audio, 0, Audio_Compression_Ratio, CompressionRatio);
 
     File__Tags_Helper::Streams_Finish();
 }
@@ -79,9 +84,9 @@
         return false;
 
     //Synchro
-    if (Buffer_Offset+4>Buffer_Size)
+    if (Buffer_Offset+2>Buffer_Size)
         return false;
-    if (CC4(Buffer+Buffer_Offset)!=0x4C413034) //"LA04"
+    if (CC3(Buffer+Buffer_Offset)!=0x4C4130) //"LA0"
     {
         File__Tags_Helper::Reject("LA");
         return false;
@@ -94,17 +99,20 @@
 void File_La::FileHeader_Parse()
 {
     //Parsing
+    Ztring Major, Minor;
     int32u SampleRate, Samples, BytesPerSecond, UnCompSize, WAVEChunk, FmtSize, FmtChunk, CRC32;
     int16u RawFormat, Channels, BytesPerSample, BitsPerSample;
 
-    Skip_C4(                                                    "signature");
+    Skip_Local(2,                                               "signature");
+    Get_Local (1, Major,                                        "major_version");
+    Get_Local (1, Minor,                                        "minor_version");
     Get_L4 (UnCompSize,                                         "uncompressed_size");
     Get_L4 (WAVEChunk,                                          "chunk");
     Skip_L4(                                                    "fmt_size");
     Get_L4 (FmtChunk,                                           "fmt_chunk");
     Get_L4 (FmtSize,                                            "fmt_size");
     Get_L2 (RawFormat,                                          "raw_format");
-    Get_L2 (Channels,                                           "channels"); Param_Info(Channels, " channel(s)");
+    Get_L2 (Channels,                                           "channels"); Param_Info2(Channels, " channel(s)");
     Get_L4 (SampleRate,                                         "sample_rate");
     Get_L4 (BytesPerSecond,                                     "bytes_per_second");
     Get_L2 (BytesPerSample,                                     "bytes_per_sample");
@@ -124,11 +132,13 @@
             return;
 
         File__Tags_Helper::Accept("LA");
+        Fill(Stream_General, 0, General_Format_Version, Major+__T('.')+Minor);
 
         File__Tags_Helper::Stream_Prepare(Stream_Audio);
         Fill(Stream_Audio, 0, Audio_Format, "LA");
         Fill(Stream_Audio, 0, Audio_Codec, "LA");
-        Fill(Stream_Audio, 0, Audio_Resolution, BitsPerSample);
+        Fill(Stream_Audio, 0, Audio_Format_Version, Major+__T('.')+Minor);
+        Fill(Stream_Audio, 0, Audio_BitDepth, BitsPerSample);
         Fill(Stream_Audio, 0, Audio_Channel_s_, Channels);
         Fill(Stream_Audio, 0, Audio_SamplingRate, SampleRate);
         Fill(Stream_Audio, 0, Audio_Duration, Duration);

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_La.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_La.h Changed

@@ -2,16 +2,16 @@
 // Copyright (C) 2009-2009 Lionel Duchateau, kurtnoise@free.fr
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Midi.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Midi.cpp Changed

@@ -1,31 +1,35 @@
 // File_Midi - Info for MIDI  files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_MIDI_YES)
 //---------------------------------------------------------------------------

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Midi.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Midi.h Changed

@@ -1,17 +1,17 @@
 // File_Midi - Info for MIDI files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Module.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Module.cpp Changed

@@ -1,31 +1,35 @@
 // File_Module - Info for Module files
-// Copyright (C) 2008-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WXMHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILXMY or FXMNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_MOD_YES)
 //---------------------------------------------------------------------------
 
@@ -77,14 +81,14 @@
     Get_Local (20, ModuleName,                                  "Module name");
     for (int8u Pos=0; Pos<31; Pos++)
     {
-        Element_Begin();
+        Element_Begin0();
         Get_Local(22, SamplesName,                              "Sample's name"); Element_Name(SamplesName);
         Skip_B2(                                                "Sample length");
         Skip_B1(                                                "Finetune value for the sample");
         Skip_B1(                                                "Volume of the sample");
         Skip_B2(                                                "Start of sample repeat offset");
         Skip_B2(                                                "Length of sample repeat");
-        Element_End();
+        Element_End0();
     }
     Skip_B1(                                                    "Number of song positions");
     Skip_B1(                                                    "0x8F");

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Module.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Module.h Changed

@@ -1,17 +1,17 @@
 // File_Module - Info for Module files
-// Copyright (C) 2008-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WXMHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILXMY or FXMNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Mpc.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Mpc.cpp Changed

@@ -1,17 +1,17 @@
 // File_Mpc - Info for Musepack files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,13 +22,17 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
 //***************************************************************************
 // Infos (Common)
 //***************************************************************************
@@ -150,7 +154,7 @@
 void File_Mpc::FileHeader_Parse()
 {
     //Parsing
-    Element_Begin("SV7 header", 21);
+    Element_Begin1("SV7 header");
     Ztring Encoder;
     int32u FrameCount;
     int16u TitleGain, AlbumGain;
@@ -166,19 +170,19 @@
 
     Skip_L2(                                                    "MaxLevel");
     BS_Begin();
-    Get_S1 (4, Profile,                                         "Profile"); Param_Info(Mpc_Profile[Profile]);
-    Get_S1 (2, Link,                                            "Link"); Param_Info(Mpc_Link[Link]);
-    Get_S1 (2, SampleFreq,                                      "SampleFreq"); Param_Info(Mpc_SampleFreq[SampleFreq]);
+    Get_S1 (4, Profile,                                         "Profile"); Param_Info1(Mpc_Profile[Profile]);
+    Get_S1 (2, Link,                                            "Link"); Param_Info1(Mpc_Link[Link]);
+    Get_S1 (2, SampleFreq,                                      "SampleFreq"); Param_Info1(Mpc_SampleFreq[SampleFreq]);
     Skip_SB(                                                    "IntensityStereo");
     Skip_SB(                                                    "MidSideStereo");
     Skip_S1(6,                                                  "MaxBand");
     BS_End();
 
     Skip_L2(                                                    "TitlePeak");
-    Get_L2 (TitleGain,                                          "TitleGain"); Param_Info(((float32)((int16s)TitleGain))/1000, 2, " dB");
+    Get_L2 (TitleGain,                                          "TitleGain"); Param_Info3(((float32)((int16s)TitleGain))/1000, 2, " dB");
 
     Skip_L2(                                                    "AlbumPeak");
-    Get_L2 (AlbumGain,                                          "AlbumGain"); Param_Info(((float32)((int16s)TitleGain))/1000, 2, " dB");
+    Get_L2 (AlbumGain,                                          "AlbumGain"); Param_Info3(((float32)((int16s)TitleGain))/1000, 2, " dB");
 
     BS_Begin();
     Skip_S2(16,                                                 "unused");
@@ -190,9 +194,9 @@
     BS_End();
 
     Get_L1 (EncoderVersion,                                     "EncoderVersion");
-    Encoder.From_Number(((float)EncoderVersion)/100, 2); if (EncoderVersion%10==0); else if (EncoderVersion%2==0) Encoder+=_T(" Beta"); else if (EncoderVersion%2==1) Encoder+=_T(" Alpha"); Param_Info(Encoder);
+    Encoder.From_Number(((float)EncoderVersion)/100, 2); if (EncoderVersion%10==0); else if (EncoderVersion%2==0) Encoder+=__T(" Beta"); else if (EncoderVersion%2==1) Encoder+=__T(" Alpha"); Param_Info1(Encoder);
 
-    Element_End();
+    Element_End0();
 
     FILLING_BEGIN();
         File__Tags_Helper::Accept("Musepack SV7");
@@ -204,7 +208,7 @@
         Fill(Stream_Audio, 0, Audio_Codec, "SV7");
         Fill(Stream_Audio, 0, Audio_Codec_Settings, Mpc_Profile[Profile]);
         Fill(Stream_Audio, 0, Audio_Encoded_Library, Encoder);
-        Fill(Stream_Audio, 0, Audio_Resolution, 16); //MPC support only 16 bits
+        Fill(Stream_Audio, 0, Audio_BitDepth, 16); //MPC support only 16 bits
         Fill(Stream_Audio, 0, Audio_Duration, ((int64u)FrameCount)*1152*1000/Mpc_SampleFreq[SampleFreq]);
         if (FrameCount)
             Fill(Stream_Audio, 0, Audio_BitRate, (File_Size-25)*8*Mpc_SampleFreq[SampleFreq]/FrameCount/1152);

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Mpc.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Mpc.h Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_MpcSv8.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_MpcSv8.cpp Changed

@@ -1,17 +1,17 @@
 // File_MpcSv8 - Info for Musepack (SV8) files
-// Copyright (C) 2008-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,14 +22,18 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_MPCSV8_YES)
 //---------------------------------------------------------------------------
 
@@ -153,7 +157,7 @@
 void File_MpcSv8::Data_Parse()
 {
     #define CASE_INFO(_NAME, _DETAIL) \
-        case Elements::_NAME : Element_Info(_DETAIL); _NAME(); break;
+        case Elements::_NAME : Element_Info1(_DETAIL); _NAME(); break;
 
     //Parsing
     switch (Element_Code)
@@ -202,9 +206,9 @@
     //Parsing
     int16u TitleGain, AlbumGain;
     Skip_B1(                                                    "Version");
-    Get_L2 (TitleGain,                                          "Title gain"); Param_Info(((float32)((int16s)TitleGain))/1000, 2, " dB");
+    Get_L2 (TitleGain,                                          "Title gain"); Param_Info3(((float32)((int16s)TitleGain))/1000, 2, " dB");
     Skip_L2(                                                    "Title peak");
-    Get_L2 (AlbumGain,                                          "Album gain"); Param_Info(((float32)((int16s)TitleGain))/1000, 2, " dB");
+    Get_L2 (AlbumGain,                                          "Album gain"); Param_Info3(((float32)((int16s)TitleGain))/1000, 2, " dB");
     Skip_L2(                                                    "Album peak");
 }
 
@@ -220,7 +224,7 @@
     Get_VS (SampleCount,                                        "Sample count");
     Skip_VS(                                                    "Beginning silence");
     BS_Begin();
-    Get_S1 (3, SampleFrequency,                                 "Sample frequency"); Param_Info(Mpc_SampleFreq[SampleFrequency]);
+    Get_S1 (3, SampleFrequency,                                 "Sample frequency"); Param_Info1(Mpc_SampleFreq[SampleFrequency]);
     Skip_S1(5,                                                  "Max used bands");
     Get_S1 (4, ChannelCount,                                    "Channel count");
     Get_SB (   MidSideStereo,                                   "Mid side stereo used");
@@ -236,7 +240,7 @@
             Fill(Stream_Audio, 0, Audio_Duration, SampleCount*1000/Mpc_SampleFreq[SampleFrequency]);
             Fill(Stream_Audio, 0, Audio_BitRate, File_Size*8*Mpc_SampleFreq[SampleFrequency]/SampleCount); //Should be more precise...
         }
-        Fill(Stream_Audio, 0, Audio_Resolution, 16); //MPC support only 16 bits
+        Fill(Stream_Audio, 0, Audio_BitDepth, 16); //MPC support only 16 bits
     FILLING_END();
 }

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_MpcSv8.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_MpcSv8.h Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Mpega.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Mpega.cpp Changed

@@ -1,17 +1,17 @@
 // File_Mpega - Info for MPEG Audio files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,13 +22,17 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
 //***************************************************************************
 // Constants (Common)
 //***************************************************************************
@@ -250,7 +254,7 @@
     1, // Layer3
     1, // Layer2
     4, // Layer1
-};                       
+};
 
 //---------------------------------------------------------------------------
 const int16u Mpega_CRC12_Table[]=
@@ -304,10 +308,12 @@
     MustSynchronize=true;
     Buffer_TotalBytes_FirstSynched_Max=64*1024;
     PTS_DTS_Needed=true;
+    IsRawStream=true;
 
     //In
-    Frame_Count_Valid=MediaInfoLib::Config.ParseSpeed_Get()>=0.5?128:(MediaInfoLib::Config.ParseSpeed_Get()>=0.3?32:2);
+    Frame_Count_Valid=MediaInfoLib::Config.ParseSpeed_Get()>=0.5?128:(MediaInfoLib::Config.ParseSpeed_Get()>=0.3?32:4);
     FrameIsAlwaysComplete=false;
+    CalculateDelay=false;
 
     //Temp - BitStream info
     Surround_Frames=0;
@@ -326,8 +332,6 @@
     Emphasis_Count[1]=0;
     Emphasis_Count[2]=0;
     Emphasis_Count[3]=0;
-    Frame_Count=0;
-    Frame_Count_Consecutive=0;
     Scfsi=0;
     Scalefac=0;
     Reservoir=0;
@@ -337,6 +341,7 @@
     Reservoir_Max=0;
     Xing_Scale=0;
     BitRate=0;
+    MpegPsPattern_Count=0;
 }
 
 //***************************************************************************
@@ -351,7 +356,7 @@
     {
         //How much kinds of bitrates?
         if (BitRate_Count.size()>1)
-            BitRate_Mode=_T("VBR");
+            BitRate_Mode=__T("VBR");
     }
 
     File__Tags_Helper::Stream_Prepare(Stream_Audio);
@@ -383,14 +388,17 @@
     }
 
     //Bitrate, if CBR
-    if (VBR_Frames==0 && BitRate_Mode!=_T("VBR"))
+    if (VBR_Frames==0 && BitRate_Mode!=__T("VBR"))
     {
-        BitRate_Mode=_T("CBR");
+        BitRate_Mode=__T("CBR");
         BitRate=Mpega_BitRate[ID][layer][bitrate_index]*1000;
         Fill(Stream_General, 0, General_OverallBitRate, BitRate);
         Fill(Stream_Audio, 0, Audio_BitRate, BitRate);
-        if (Buffer_TotalBytes_FirstSynched>10 && BitRate>0)
+        if (CalculateDelay && Buffer_TotalBytes_FirstSynched>10 && BitRate>0)
+        {
             Fill(Stream_Audio, 0, Audio_Delay, Buffer_TotalBytes_FirstSynched*8*1000/BitRate, 0);
+            Fill(Stream_Audio, 0, Audio_Delay_Source, "Stream");
+        }
     }
 
     //Bitrate mode
@@ -410,7 +418,7 @@
     //Fill("Reservoir_Max", Reservoir_Max);
     //size_t Granules=(Mpeg==3?2:1);
     //size_t Ch=Mpega_Channels[Channels];
-    //Fill("Scalefactors", Ztring::ToZtring(Scalefac*100/(Granules*Ch*Frame_Count))+_T('%'));
+    //Fill("Scalefactors", Ztring::ToZtring(Scalefac*100/(Granules*Ch*Frame_Count))+__T('%'));
 
     //VBR_FileSize calculation
     if (!IsSub && (File_Size!=(int64u)-1 || LastSync_Offset!=(int64u)-1) && VBR_FileSize==0)
@@ -430,27 +438,31 @@
     }
 
     //Bitrate calculation if VBR
+    int64u FrameCount=0;
     if (VBR_Frames>0)
     {
+        FrameCount=VBR_Frames;
         float32 FrameLength=((float32)(VBR_FileSize?VBR_FileSize:File_Size-File_EndTagSize-File_BeginTagSize))/VBR_Frames;
         size_t Divider;
         if (ID==3 && layer==3) //MPEG 1 layer 1
              Divider=384/8;
+        else if ((ID==2 || ID==0) && layer==3) ///MPEG 2 or 2.5 layer 1
+             Divider=192/8;
         else if ((ID==2 || ID==0) && layer==1) //MPEG 2 or 2.5 layer 3
             Divider=576/8;
         else
             Divider=1152/8;
         if (ID<4 && sampling_frequency<4)
             BitRate=(int32u)(FrameLength*Mpega_SamplingRate[ID][sampling_frequency]/Divider);
-        BitRate_Mode=_T("VBR");
+        BitRate_Mode=__T("VBR");
     }
     //if (BitRate_Count.size()>1)
     //{
     //    Ztring BitRate_VBR;
     //    if (!BitRate_VBR.empty())
-    //        BitRate_VBR+=_T(' ');
+    //        BitRate_VBR+=__T(' ');
     //    BitRate_VBR+=Ztring::ToZtring(8);
-    //    BitRate_VBR+=_T(':');
+    //    BitRate_VBR+=__T(':');
     //    BitRate_VBR+=Ztring::ToZtring(BitRate_Count[8]);
     //    Fill("BitRate_VBR", Ztring::ToZtring(BitRate_Count[8]));
     //}
@@ -461,21 +473,23 @@
             Fill(Stream_General, 0, General_Duration, VBR_FileSize*8*1000/BitRate, 10, true);
             Fill(Stream_General, 0, General_OverallBitRate, BitRate, 10, true);
             Fill(Stream_Audio, 0, Audio_BitRate, BitRate, 10, true);
-            if (Buffer_TotalBytes_FirstSynched>10 && BitRate>0)
+            if (CalculateDelay && Buffer_TotalBytes_FirstSynched>10 && BitRate>0)
+            {
                 Fill(Stream_Audio, 0, Audio_Delay, Buffer_TotalBytes_FirstSynched*8*1000/BitRate, 0, true);
+                Fill(Stream_Audio, 0, Audio_Delay_Source, "Stream", Unlimited, true, true);
+            }
         }
         Fill(Stream_Audio, 0, Audio_StreamSize, VBR_FileSize);
     }
-
     Fill(Stream_Audio, 0, Audio_BitRate_Mode, BitRate_Mode, true);
 
     //Encoding library
     if (!Encoded_Library.empty())
-        Fill(Stream_General, 0, General_Encoded_Library, Encoded_Library);
+        Fill(Stream_General, 0, General_Encoded_Library, Encoded_Library, true);
     if (Encoded_Library.empty())
         Encoded_Library_Guess();
-    Fill(Stream_Audio, 0, Audio_Encoded_Library, Encoded_Library);
-    Fill(Stream_Audio, 0, Audio_Encoded_Library_Settings, Encoded_Library_Settings);
+    Fill(Stream_Audio, 0, Audio_Encoded_Library, Encoded_Library, true);
+    Fill(Stream_Audio, 0, Audio_Encoded_Library_Settings, Encoded_Library_Settings, true);
 
     //Surround
     if (Surround_Frames>=Frame_Count*0.9)
@@ -483,6 +497,44 @@
         //Fill(Stream_Audio, 0, Audio_Channel_s_, 6);
     }
 
+    if (FrameInfo.PTS!=(int64u)-1 && FrameInfo.PTS>PTS_Begin)
+    {
+        Fill(Stream_Audio, 0, Audio_Duration, float64_int64s(((float64)(FrameInfo.PTS-PTS_Begin))/1000000));
+        if (Retrieve(Stream_Audio, 0, Audio_BitRate_Mode)==__T("CBR"))
+        {
+            int16u Samples;
+            if (ID==3 && layer==3) //MPEG 1 layer 1
+                 Samples=384;
+            else if ((ID==2 || ID==0) && layer==1) //MPEG 2 or 2.5 layer 3
+                Samples=576;
+            else
+                Samples=1152;
+
+            float64 Frame_Duration=((float64)1)/Mpega_SamplingRate[ID][sampling_frequency]*Samples;
+            FrameCount=float64_int64s(((float64)(FrameInfo.PTS-PTS_Begin))/1000000000/Frame_Duration);
+        }
+    }
+
+    if (FrameCount==0 && VBR_FileSize && Retrieve(Stream_Audio, 0, Audio_BitRate_Mode)==__T("CBR") && Mpega_SamplingRate[ID][sampling_frequency])
+    {
+        size_t Size=(Mpega_Coefficient[ID][layer]*Mpega_BitRate[ID][layer][bitrate_index]*1000/Mpega_SamplingRate[ID][sampling_frequency])*Mpega_SlotSize[layer];
+        if (Size)
+            FrameCount=float64_int64s(((float64)VBR_FileSize)/Size);
+    }
+
+    if (FrameCount)
+    {
+        int16u Samples;
+        if (ID==3 && layer==3) //MPEG 1 layer 1
+             Samples=384;
+        else if ((ID==2 || ID==0) && layer==1) //MPEG 2 or 2.5 layer 3
+            Samples=576;
+        else
+            Samples=1152;
+        Fill(Stream_Audio, 0, Audio_FrameCount, FrameCount, 10, true);
+        Fill(Stream_Audio, 0, Audio_SamplingCount, FrameCount*Samples, 10, true);
+    }
+
     File__Tags_Helper::Streams_Finish();
 }
 
@@ -494,14 +546,14 @@
 bool File_Mpega::FileHeader_Begin()
 {
     //Buffer size
-    if (Buffer_Size<4)
-        return File_Size<4; //Must wait for more data
+    if (Buffer_Size<8)
+        return File_Size<8; //Must wait for more data
 
-    //Detecting WAV/SWF/FLV/ELF/DPG/WM/MZ files
+    //Detecting WAV/SWF/FLV/ELF/DPG/WM/MZ/DLG files
     int32u Magic4=CC4(Buffer);
     int32u Magic3=Magic4>>8;
     int16u Magic2=Magic4>>16;
-    if (Magic4==0x52494646 || Magic3==0x465753 || Magic3==0x464C56 || Magic4==0x7F454C46 || Magic4==0x44504730 || Magic4==0x3026B275 || Magic2==0x4D5A)
+    if (Magic4==0x52494646 || Magic3==0x465753 || Magic3==0x464C56 || Magic4==0x7F454C46 || Magic4==0x44504730 || Magic4==0x3026B275 || Magic2==0x4D5A || Magic4==0x000001BA || Magic4==0x000001B3 || Magic4==0x00000100 || CC8(Buffer+Buffer_Offset)==0x444C472056312E30LL)
     {
         File__Tags_Helper::Reject("MPEG Audio");
         return false;
@@ -530,7 +582,10 @@
     {
         while (Buffer_Offset+4<=Buffer_Size)
         {
-            if ((CC2(Buffer+Buffer_Offset+0)&0xFFE0)==0xFFE0 && (CC1(Buffer+Buffer_Offset+2)&0xF0)!=0xF0 && (CC1(Buffer+Buffer_Offset+2)&0x0C)!=0x0C)
+            if (Buffer[Buffer_Offset  ]==0xFF
+             && (Buffer[Buffer_Offset+1]&0xE0)==0xE0
+             && (Buffer[Buffer_Offset+2]&0xF0)!=0xF0
+             && (Buffer[Buffer_Offset+2]&0x0C)!=0x0C)
                 break; //while()
 
             //Tags
@@ -540,6 +595,21 @@
             if (Tag_Found_Synchro)
                 return true;
 
+            //Better detect MPEG-PS
+            if (Frame_Count==0
+             && Buffer[Buffer_Offset  ]==0x00
+             && Buffer[Buffer_Offset+1]==0x00
+             && Buffer[Buffer_Offset+2]==0x01
+             && Buffer[Buffer_Offset+3]==0xBA)
+            {
+                MpegPsPattern_Count++;
+                if (MpegPsPattern_Count>=2)
+                {
+                    File__Tags_Helper::Reject("MPEG Audio");
+                    return false;
+                }
+            }
+
             Buffer_Offset++;
         }
 
@@ -576,7 +646,26 @@
 
                     //Testing
                     if ((CC2(Buffer+Buffer_Offset+Size0)&0xFFE0)!=0xFFE0 || (CC1(Buffer+Buffer_Offset+Size0+2)&0xF0)==0xF0 || (CC1(Buffer+Buffer_Offset+Size0+2)&0x0C)==0x0C)
+                    {
+                        //Testing VBRI in a malformed frame
+                        bool VbriFound=false;
+                        for (size_t Pos=Buffer_Offset+3; Pos+4<Buffer_Offset+Size0; Pos++)
+                        {
+                            if (Buffer[Pos  ]==0x56
+                             && Buffer[Pos+1]==0x42
+                             && Buffer[Pos+2]==0x52
+                             && Buffer[Pos+3]==0x49)
+                            {
+                                VbriFound=true;
+                                break;
+                            }
+                            if (Buffer[Pos])
+                                break; //Only NULL bytes are authorized before VBRI header
+                        }
+                        if (VbriFound)
+                            break;
                         Buffer_Offset++;
+                    }
                     else
                     {
                         //Retrieving some info
@@ -612,7 +701,50 @@
                                 if ((CC2(Buffer+Buffer_Offset+Size0+Size1)&0xFFE0)!=0xFFE0 || (CC1(Buffer+Buffer_Offset+Size0+Size1+2)&0xF0)==0xF0 || (CC1(Buffer+Buffer_Offset+Size0+Size1+2)&0x0C)==0x0C)
                                     Buffer_Offset++;
                                 else
-                                    break; //while()
+                                {
+                                    //Retrieving some info
+                                    int8u ID2                =(CC1(Buffer+Buffer_Offset+Size0+Size1+1)>>3)&0x03;
+                                    int8u layer2             =(CC1(Buffer+Buffer_Offset+Size0+Size1+1)>>1)&0x03;
+                                    int8u bitrate_index2     =(CC1(Buffer+Buffer_Offset+Size0+Size1+2)>>4)&0x0F;
+                                    int8u sampling_frequency2=(CC1(Buffer+Buffer_Offset+Size0+Size1+2)>>2)&0x03;
+                                    int8u padding_bit2       =(CC1(Buffer+Buffer_Offset+Size0+Size1+2)>>1)&0x01;
+                                    //Coherancy
+                                    if (Mpega_SamplingRate[ID2][sampling_frequency2]==0 || Mpega_Coefficient[ID2][layer2]==0 || Mpega_BitRate[ID2][layer2][bitrate_index2]==0 || Mpega_SlotSize[layer2]==0)
+                                        Buffer_Offset++; //False start
+                                    else
+                                    {
+                                        //Testing next start, to be sure
+                                        size_t Size2=(Mpega_Coefficient[ID2][layer2]*Mpega_BitRate[ID2][layer2][bitrate_index2]*1000/Mpega_SamplingRate[ID2][sampling_frequency2]+(padding_bit2?1:0))*Mpega_SlotSize[layer2];
+                                        if (IsSub && Buffer_Offset+Size0+Size1+Size2==Buffer_Size)
+                                            break;
+                                        if (File_Offset+Buffer_Offset+Size0+Size1+Size2!=File_Size-File_EndTagSize)
+                                        {
+                                            if (Buffer_Offset+Size0+Size1+Size2+4>Buffer_Size)
+                                            {
+                                                if (IsSub || File_Offset+Buffer_Offset+Size0+Size1+Size2<File_Size)
+                                                    break;
+                                                return false; //Need more data
+                                            }
+
+                                            //Tags
+                                            bool Tag_Found2;
+                                            if (!File__Tags_Helper::Synchronize(Tag_Found2, Size0+Size1+Size2))
+                                                return false;
+                                            if (Tag_Found2)
+                                                return true;
+                                            if (File_Offset+Buffer_Offset+Size0+Size1+Size2==File_Size-File_EndTagSize)
+                                                break;
+
+                                            //Testing
+                                            if ((CC2(Buffer+Buffer_Offset+Size0+Size1+Size2)&0xFFE0)!=0xFFE0 || (CC1(Buffer+Buffer_Offset+Size0+Size1+Size2+2)&0xF0)==0xF0 || (CC1(Buffer+Buffer_Offset+Size0+Size1+Size2+2)&0x0C)==0x0C)
+                                                Buffer_Offset++;
+                                            else
+                                                break; //while()
+                                        }
+                                        else
+                                            break; //while()
+                                    }
+                                }
                             }
                             else
                                 break; //while()
@@ -638,6 +770,8 @@
     }
 
     //Synched is OK
+    if (!Status[IsAccepted])
+        File__Tags_Helper::Accept("MPEG Audio");
     return true;
 }
 
@@ -653,10 +787,24 @@
         return false;
 
     //Quick test of synchro
-    if ((CC2(Buffer+Buffer_Offset)&0xFFE0)!=0xFFE0 || (CC1(Buffer+Buffer_Offset+2)&0xF0)==0xF0 || (CC1(Buffer+Buffer_Offset+2)&0x0C)==0x0C)
+    if (Buffer[Buffer_Offset  ]!=0xFF
+     || (Buffer[Buffer_Offset+1]&0xE0)!=0xE0
+     || (Buffer[Buffer_Offset+2]&0xF0)==0xF0
+     || (Buffer[Buffer_Offset+2]&0x0C)==0x0C)
+    {
+        Synched=false;
+        return true;
+    }
+
+    //Retrieving some info
+    int8u ID0                =(CC1(Buffer+Buffer_Offset+1)>>3)&0x03;
+    int8u layer0             =(CC1(Buffer+Buffer_Offset+1)>>1)&0x03;
+    int8u bitrate_index0     =(CC1(Buffer+Buffer_Offset+2)>>4)&0x0F;
+    int8u sampling_frequency0=(CC1(Buffer+Buffer_Offset+2)>>2)&0x03;
+    if (Mpega_SamplingRate[ID0][sampling_frequency0]==0 || Mpega_Coefficient[ID0][layer0]==0 || Mpega_BitRate[ID0][layer0][bitrate_index0]==0 || Mpega_SlotSize[layer0]==0)
     {
-        Frame_Count_Consecutive=0; //Reset the frame count, we try to find x consecutive frames
         Synched=false;
+        return true;
     }
 
     //We continue
@@ -664,6 +812,31 @@
 }
 
 //***************************************************************************
+// Buffer - Demux
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_DEMUX
+bool File_Mpega::Demux_UnpacketizeContainer_Test()
+{
+    //Retrieving some info
+    int8u ID0                =(CC1(Buffer+Buffer_Offset+1)>>3)&0x03;
+    int8u layer0             =(CC1(Buffer+Buffer_Offset+1)>>1)&0x03;
+    int8u bitrate_index0     =(CC1(Buffer+Buffer_Offset+2)>>4)&0x0F;
+    int8u sampling_frequency0=(CC1(Buffer+Buffer_Offset+2)>>2)&0x03;
+    int8u padding_bit0       =(CC1(Buffer+Buffer_Offset+2)>>1)&0x01;
+    Demux_Offset=Buffer_Offset+(Mpega_Coefficient[ID0][layer0]*Mpega_BitRate[ID0][layer0][bitrate_index0]*1000/Mpega_SamplingRate[ID0][sampling_frequency0]+(padding_bit0?1:0))*Mpega_SlotSize[layer0];
+
+    if (Demux_Offset>Buffer_Size)
+        return false;
+
+    Demux_UnpacketizeContainer_Demux();
+
+    return true;
+}
+#endif //MEDIAINFO_DEMUX
+
+//***************************************************************************
 // Buffer - Per element
 //***************************************************************************
 
@@ -673,18 +846,18 @@
     //Parsing
     BS_Begin();
     Skip_S2(11,                                                 "syncword");
-    Get_S1 (2, ID,                                              "ID"); Param_Info(Mpega_Version[ID]);
-    Get_S1 (2, layer,                                           "layer"); Param_Info(Mpega_Layer[layer]);
+    Get_S1 (2, ID,                                              "ID"); Param_Info1(Mpega_Version[ID]);
+    Get_S1 (2, layer,                                           "layer"); Param_Info1(Mpega_Layer[layer]);
     Get_SB (   protection_bit,                                  "protection_bit");
-    Get_S1 (4, bitrate_index,                                   "bitrate_index"); Param_Info(Mpega_BitRate[ID][layer][bitrate_index], " Kbps");
-    Get_S1 (2, sampling_frequency,                              "sampling_frequency"); Param_Info(Mpega_SamplingRate[ID][sampling_frequency], " Hz");
+    Get_S1 (4, bitrate_index,                                   "bitrate_index"); Param_Info2(Mpega_BitRate[ID][layer][bitrate_index], " Kbps");
+    Get_S1 (2, sampling_frequency,                              "sampling_frequency"); Param_Info2(Mpega_SamplingRate[ID][sampling_frequency], " Hz");
     Get_SB (   padding_bit,                                     "padding_bit");
     Skip_SB(                                                    "private_bit");
-    Get_S1 (2, mode,                                            "mode"); Param_Info(Mpega_Channels[mode], " channels"); Param_Info(Mpega_Codec_Profile[mode]);
-    Get_S1 (2, mode_extension,                                  "mode_extension"); Param_Info(Mpega_Codec_Profile_Extension[mode_extension]);
+    Get_S1 (2, mode,                                            "mode"); Param_Info2(Mpega_Channels[mode], " channels"); Param_Info1(Mpega_Codec_Profile[mode]);
+    Get_S1 (2, mode_extension,                                  "mode_extension"); Param_Info1(Mpega_Codec_Profile_Extension[mode_extension]);
     Get_SB (   copyright,                                       "copyright");
     Get_SB (   original_home,                                   "original_home");
-    Get_S1 (2, emphasis,                                        "emphasis"); Param_Info(Mpega_Emphasis[emphasis]);
+    Get_S1 (2, emphasis,                                        "emphasis"); Param_Info1(Mpega_Emphasis[emphasis]);
     BS_End();
 
     //Coherancy
@@ -724,18 +897,19 @@
         return;
     }
 
-    //PTS
-    if (PTS!=(int64u)-1)
+    //Partial frame
+    if (Header_Size+Element_Size<(int64u)((Mpega_Coefficient[ID][layer]*Mpega_BitRate[ID][layer][bitrate_index]*1000/Mpega_SamplingRate[ID][sampling_frequency]+(padding_bit?1:0))*Mpega_SlotSize[layer]))
     {
-        Element_Info(_T("PTS ")+Ztring().Duration_From_Milliseconds(float64_int64s(((float64)PTS+PTS_DTS_Offset_InThisBlock)/1000000)));
-        int64u BitRate=Mpega_BitRate[ID][layer][bitrate_index]*1000;
-        int64u Bits=Element_Size*8;
-        float64 Frame_Duration=((float64)Bits)/BitRate;
-        PTS_DTS_Offset_InThisBlock+=float64_int64s(Frame_Duration*1000000000);
+        Element_Name("Partial frame");
+        Skip_XX(Element_Size,                                   "Data");
+        return;
     }
 
+    //PTS
+    Element_Info1C((FrameInfo.PTS!=(int64u)-1), __T("PTS ")+Ztring().Duration_From_Milliseconds(float64_int64s(((float64)FrameInfo.PTS)/1000000)));
+
     //Name
-    Element_Info(_T("Frame ")+Ztring::ToZtring(Frame_Count));
+    Element_Info1(__T("Frame ")+Ztring::ToZtring(Frame_Count));
 
     //VBR and library headers
     if (Frame_Count<3) //No need to do it too much
@@ -746,12 +920,29 @@
 
     //Counting
     if (File_Offset+Buffer_Offset+Element_Size==File_Size-File_EndTagSize)
-        Frame_Count_Valid=Frame_Count_Consecutive; //Finish MPEG Audio frames in case of there are less than Frame_Count_Valid frames
+        Frame_Count_Valid=Frame_Count; //Finish MPEG Audio frames in case of there are less than Frame_Count_Valid frames
+    if (Frame_Count==0)
+        PTS_Begin=FrameInfo.PTS;
     Frame_Count++;
-    Frame_Count_Consecutive++;
-    
+    Frame_Count_InThisBlock++;
+    LastSync_Offset=File_Offset+Buffer_Offset+Element_Size;
+    {
+        int16u Samples;
+        if (ID==3 && layer==3) //MPEG 1 layer 1
+             Samples=384;
+        else if ((ID==2 || ID==0) && layer==1) //MPEG 2 or 2.5 layer 3
+            Samples=576;
+        else
+            Samples=1152;
+        FrameInfo.DUR=float64_int64s(((float64)1)/Mpega_SamplingRate[ID][sampling_frequency]*Samples*1000000000);
+        if (FrameInfo.DTS!=(int64u)-1)
+            FrameInfo.DTS+=FrameInfo.DUR;
+        if (FrameInfo.PTS!=(int64u)-1)
+            FrameInfo.PTS=FrameInfo.DTS;
+    }
+
     //LAME
-    if (Encoded_Library.empty() && (Frame_Count_Consecutive<Frame_Count_Valid || File_Offset+Buffer_Offset+Element_Size==File_Size-File_EndTagSize)) //Can be elsewhere... At the start, or end frame
+    if (Encoded_Library.empty() && (Frame_Count<Frame_Count_Valid || File_Offset+Buffer_Offset+Element_Size==File_Size-File_EndTagSize)) //Can be elsewhere... At the start, or end frame
         Header_Encoders();
 
     //Filling
@@ -760,6 +951,12 @@
     Extension_Count[mode_extension]++;
     Emphasis_Count[emphasis]++;
 
+    if (Status[IsFilled])
+    {
+        Skip_XX(Element_Size,                                   "Data");
+        return;
+    }
+
     //Parsing
     int16u main_data_end;
     if (protection_bit)
@@ -788,7 +985,7 @@
     }
     if (ID==3) //MPEG-1
     {
-    Element_Begin("scfsi");
+    Element_Begin1("scfsi");
         for(int8u ch=0; ch<Mpega_Channels[mode]; ch++)
             for(int8u scfsi_band=0; scfsi_band<4; scfsi_band++)
             {
@@ -797,16 +994,16 @@
                 if (scfsi)
                     Scfsi++;
             }
-        Element_End();
+        Element_End0();
     }
     for(int8u gr=0; gr<(ID==3?2:1); gr++)
     {
-        Element_Begin("granule");
+        Element_Begin1("granule");
         if (mode>=4)
             return;
         for(int8u ch=0; ch<Mpega_Channels[mode]; ch++)
         {
-            Element_Begin("channel");
+            Element_Begin1("channel");
             Skip_S2(12,                                         "part2_3_length");
             Skip_S2(9,                                          "big_values");
             Skip_S1(8,                                          "global_gain");
@@ -830,18 +1027,18 @@
                 {
                     if (mixed_block_flag==1)
                     {
-                        Param_Info("Mixed");
+                        Param_Info1("Mixed");
                         Block_Count[2]++; //Mixed
                     }
                     else
                     {
-                        Param_Info("Short");
+                        Param_Info1("Short");
                         Block_Count[1]++; //Short
                     }
                 }
                 else
                 {
-                    Param_Info("Long");
+                    Param_Info1("Long");
                     Block_Count[0]++; //Long
                 }
             }
@@ -851,7 +1048,7 @@
                     Skip_S1(5,                                  "table_select");
                 Skip_S1(4,                                      "region0_count");
                 Skip_S1(3,                                      "region1_count");
-                Param_Info("Long");
+                Param_Info1("Long");
                 Block_Count[0]++; //Long
             }
             if (ID==3) //MPEG-1
@@ -861,9 +1058,9 @@
             if (scalefac)
                 Scalefac++;
             Skip_SB(                                            "count1table_select");
-            Element_End();
+            Element_End0();
         } //channels
-        Element_End();
+        Element_End0();
     } //granules
     BS_End();
 
@@ -893,13 +1090,13 @@
             //Parsing
             Skip_XX(Element_Offset_S-Element_Offset,            "data");
             BS_Begin();
-            Element_Begin("Surround");
+            Element_Begin1("Surround");
             Skip_S2(12,                                         "Sync");
             Skip_S1( 8,                                         "Size");
             Skip_S2(12,                                         "CRC12");
             BS_End();
             Skip_XX(Surround_Size-4,                            "data");
-            Element_End();
+            Element_End0();
 
             //Filling
             Surround_Frames++;
@@ -912,23 +1109,26 @@
 
     FILLING_BEGIN();
         //Filling
-        LastSync_Offset=File_Offset+Buffer_Offset+Element_Size;
         if (IsSub && BitRate_Count.size()>1 && !Encoded_Library.empty())
-            Frame_Count_Valid=Frame_Count_Consecutive;
-        if (!Status[IsAccepted] && Frame_Count_Consecutive>=Frame_Count_Valid/4)
-            File__Tags_Helper::Accept("MPEG Audio");
-        if (!Status[IsFilled] && Frame_Count_Consecutive>=Frame_Count_Valid)
+            Frame_Count_Valid=Frame_Count;
+        if (!Status[IsFilled] && Frame_Count>=Frame_Count_Valid)
         {
             Fill("MPEG Audio");
 
             //Jumping
-            File__Tags_Helper::GoToFromEnd(16*1024, "MPEG-A");
-            LastSync_Offset=(int64u)-1;
+            if (!IsSub && MediaInfoLib::Config.ParseSpeed_Get()<1.0)
+            {
+                File__Tags_Helper::GoToFromEnd(16*1024, "MPEG-A");
+                LastSync_Offset=(int64u)-1;
+            }
         }
 
         //Detect Id3v1 tags inside a frame
         if (!IsSub && File_Offset+Buffer_Offset+(size_t)Element_Size>File_Size-File_EndTagSize)
+        {
+            Open_Buffer_Unsynch();
             File__Analyze::Data_GoTo(File_Size-File_EndTagSize, "Tags inside a frame, parsing the tags");
+        }
     FILLING_END();
 }
 
@@ -957,11 +1157,11 @@
         if (CC4(Xing_Header)==CC4("Xing") || CC4(Xing_Header)==CC4("Info"))
         {
             //This is a "tag"
-            Element_Info("Tag (Xing)");
+            Element_Info1("Tag (Xing)");
 
             //Parsing
-            Element_Begin("Xing");
-            Element_Begin("Xing header");
+            Element_Begin1("Xing");
+            Element_Begin1("Xing header");
             Skip_XX(Xing_Header_Offset,                         "Junk");
             int32u Flags;
             bool FrameCount, FileSize, TOC, Scale, Lame;
@@ -978,7 +1178,7 @@
                                    +(TOC?       100:0)    //TOC
                                    +(Scale?       4:0)    //Scale
                                    +(Lame?      348:0);   //Lame
-            Element_End();
+            Element_End0();
             //Element size
             if (Xing_Header_Size>Element_Size-Xing_Header_Offset)
                 return false; //Error tag size
@@ -998,9 +1198,9 @@
             if (Scale)
                 Get_B4 (Xing_Scale,                             "Scale");
             Ztring Lib;
-            Element_End();
+            Element_End0();
             Peek_Local(4, Lib);
-            if (Lame || Lib==_T("LAME") || Lib==_T("GOGO"))
+            if (Lame || Lib==__T("LAME") || Lib==__T("GOGO") || Lib==__T("L3.9"))
                 Header_Encoders_Lame();
 
             if (CC4(Xing_Header)==CC4("Info"))
@@ -1027,13 +1227,13 @@
         {
             //This is a "tag"
 
-            Element_Info("Tag (VBRI)");
+            Element_Info1("Tag (VBRI)");
 
             //Parsing
             int32u VBR_FileSize_Temp;
             int16u TableSize, TableScale, EntryBytes;
             Skip_XX(Fraunhofer_Header_Offset,                   "Junk");
-            Element_Begin("VBRI");
+            Element_Begin1("VBRI");
             Skip_C4(                                            "Sync");
             Skip_B2(                                            "Version");
             Skip_B2(                                            "Delay");
@@ -1044,19 +1244,19 @@
             Get_B2 (TableScale,                                 "TableScale");
             Get_B2 (EntryBytes,                                 "EntryBytes");
             Skip_B2(                                            "EntryFrames"); //Count of frames per entry
-            Element_Begin("Table");
+            Element_Begin1("Table");
                 for (int16u Pos=0; Pos<TableSize; Pos++)
                 {
                     switch (EntryBytes)
                     {
-                        case 1 : {Info_B1(Entry,                "Entry"); Param_Info (Entry*TableScale, " bytes");} break;
-                        case 2 : {Info_B2(Entry,                "Entry"); Param_Info (Entry*TableScale, " bytes");} break;
-                        case 4 : {Info_B4(Entry,                "Entry"); Param_Info (Entry*TableScale, " bytes");} break;
+                        case 1 : {Info_B1(Entry,                "Entry"); Param_Info2 (Entry*TableScale, " bytes");} break;
+                        case 2 : {Info_B2(Entry,                "Entry"); Param_Info2 (Entry*TableScale, " bytes");} break;
+                        case 4 : {Info_B4(Entry,                "Entry"); Param_Info2 (Entry*TableScale, " bytes");} break;
                         default: Skip_XX(EntryBytes,            "Entry");
                     }
                 }
-            Element_End();
-            Element_End();
+            Element_End0();
+            Element_End0();
             VBR_FileSize=VBR_FileSize_Temp;
 
             //Clearing Error detection
@@ -1079,15 +1279,15 @@
     Buffer_Pos=BufferS.find("LAME");
     if (Buffer_Pos!=std::string::npos && Buffer_Pos<=Element_Size-8)
     {
-        Element_Info("With tag (Lame)");
+        Element_Info1("With tag (Lame)");
         Element_Offset=Buffer_Pos;
         if (Element_Offset+20<=Element_Size)
             Get_Local(20, Encoded_Library,                      "Encoded_Library");
         else
             Get_Local( 8, Encoded_Library,                      "Encoded_Library");
-        Encoded_Library.Trim(_T('A'));
-        Encoded_Library.Trim(_T('U'));
-        Encoded_Library.Trim(_T('\xAA'));
+        Encoded_Library.Trim(__T('A'));
+        Encoded_Library.Trim(__T('U'));
+        Encoded_Library.Trim(__T('\xAA'));
         Element_Offset=0; //Reseting it
         return true;
     }
@@ -1096,7 +1296,7 @@
     Buffer_Pos=BufferS.find("RCA mp3PRO Encoder");
     if (Buffer_Pos!=std::string::npos && Buffer_Pos<Element_Size-23)
     {
-        Element_Info("With tag (RCA)");
+        Element_Info1("With tag (RCA)");
         Encoded_Library="RCA ";
         Encoded_Library+=Ztring((const char*)(Buffer+Buffer_Offset+18), 5);
         return true;
@@ -1106,7 +1306,7 @@
     Buffer_Pos=BufferS.find("THOMSON mp3PRO Encoder");
     if (Buffer_Pos!=std::string::npos && Buffer_Pos<Element_Size-29)
     {
-        Element_Info("With tag (Thomson)");
+        Element_Info1("With tag (Thomson)");
         Encoded_Library="Thomson ";
         Encoded_Library+=Ztring((const char*)(Buffer+Buffer_Offset+22), 6);
         return true;
@@ -1116,7 +1316,7 @@
     Buffer_Pos=BufferS.find("MPGE");
     if (Buffer_Pos!=std::string::npos)
     {
-        Element_Info("With tag (Gogo)");
+        Element_Info1("With tag (Gogo)");
         Encoded_Library="Gogo <3.0";
         return true;
     }
@@ -1125,7 +1325,7 @@
     Buffer_Pos=BufferS.find("GOGO");
     if (Buffer_Pos!=std::string::npos)
     {
-        Element_Info("With tag (Gogo)");
+        Element_Info1("With tag (Gogo)");
         Encoded_Library="Gogo >=3.0";
         return true;
     }
@@ -1136,25 +1336,27 @@
 void File_Mpega::Header_Encoders_Lame()
 {
     Peek_Local(8, Encoded_Library);
-    if (Encoded_Library>=_T("LAME3.90") && Element_IsNotFinished())
+    if (Encoded_Library.find(__T("L3.99"))==0)
+        Encoded_Library.insert(1, __T("AME")); //Ugly version string in Lame 3.99.1 "L3.99r1\0"
+    if ((Encoded_Library>=__T("LAME3.90")) && Element_IsNotFinished())
     {
-        int8u Flags, EncodingFlags, BitRate, StereoMode;
-        Param_Info(Ztring(_T("V "))+Ztring::ToZtring((100-Xing_Scale)/10));
-        Param_Info(Ztring(_T("q "))+Ztring::ToZtring((100-Xing_Scale)%10));
+        int8u Flags, lowpass, EncodingFlags, BitRate, StereoMode;
+        Param_Info1(Ztring(__T("V "))+Ztring::ToZtring((100-Xing_Scale)/10));
+        Param_Info1(Ztring(__T("q "))+Ztring::ToZtring((100-Xing_Scale)%10));
         Get_Local(9, Encoded_Library,                           "Encoded_Library");
         Get_B1 (Flags,                                          "Flags");
         if ((Flags&0xF0)<=0x20) //Rev. 0 or 1, http://gabriel.mp3-tech.org/mp3infotag.html and Rev. 2 was seen.
         {
-            Param_Info(Lame_Method[Flags&0x0F]);
+            Param_Info1(Lame_Method[Flags&0x0F]);
             BitRate_Mode=Lame_BitRate_Mode[Flags&0x0F];
             if ((Flags&0x0F)==1 || (Flags&0x0F)==8) //2 possible values for CBR
                 VBR_Frames=0;
         }
-        Info_B1(lowpass,                                        "Lowpass filter value"); Param_Info(lowpass*100, " Hz");
+        Get_B1 (lowpass,                                        "Lowpass filter value"); Param_Info2(lowpass*100, " Hz");
         Skip_B4(                                                "Peak signal amplitude");
         Skip_B2(                                                "Radio Replay Gain");
         Skip_B2(                                                "Audiophile Replay Gain");
-        Get_B1 (EncodingFlags,                                  "Encoding Flags"); Param_Info(Ztring(_T("ATH Type="))+Ztring::ToZtring(Flags&0x0F));
+        Get_B1 (EncodingFlags,                                  "Encoding Flags"); Param_Info1(Ztring(__T("ATH Type="))+Ztring::ToZtring(Flags&0x0F));
             Skip_Flags(EncodingFlags, 4,                        "nspsytune");
             Skip_Flags(EncodingFlags, 5,                        "nssafejoint");
             Skip_Flags(EncodingFlags, 6,                        "nogap (after)");
@@ -1174,36 +1376,36 @@
         Skip_B2(                                                "CRC-16 of Info Tag");
 
         FILLING_BEGIN();
-            Encoded_Library_Settings+=_T("-m ");
+            Encoded_Library_Settings+=__T("-m ");
             switch(StereoMode)
             {
-                case 0 : Encoded_Library_Settings+=_T("m"); break;
-                case 1 : Encoded_Library_Settings+=_T("s"); break;
-                case 2 : Encoded_Library_Settings+=_T("d"); break;
-                case 3 : Encoded_Library_Settings+=_T("j"); break;
-                case 4 : Encoded_Library_Settings+=_T("f"); break;
-                case 5 : Encoded_Library_Settings+=_T("a"); break;
-                case 6 : Encoded_Library_Settings+=_T("i"); break;
+                case 0 : Encoded_Library_Settings+=__T("m"); break;
+                case 1 : Encoded_Library_Settings+=__T("s"); break;
+                case 2 : Encoded_Library_Settings+=__T("d"); break;
+                case 3 : Encoded_Library_Settings+=__T("j"); break;
+                case 4 : Encoded_Library_Settings+=__T("f"); break;
+                case 5 : Encoded_Library_Settings+=__T("a"); break;
+                case 6 : Encoded_Library_Settings+=__T("i"); break;
                 default: ;
             }
             if (Xing_Scale<=100) //Xing_Scale is used for LAME quality
             {
-                Encoded_Library_Settings+=_T( " -V ")+Ztring::ToZtring((100-Xing_Scale)/10);
-                Encoded_Library_Settings+=_T( " -q ")+Ztring::ToZtring((100-Xing_Scale)%10);
+                Encoded_Library_Settings+=__T( " -V ")+Ztring::ToZtring((100-Xing_Scale)/10);
+                Encoded_Library_Settings+=__T( " -q ")+Ztring::ToZtring((100-Xing_Scale)%10);
             }
             if (lowpass)
-                Encoded_Library_Settings+=(Encoded_Library_Settings.empty()?_T("-lowpass "):_T(" -lowpass "))+((lowpass%10)?Ztring::ToZtring(((float)lowpass)/10, 1):Ztring::ToZtring(lowpass/10));
+                Encoded_Library_Settings+=(Encoded_Library_Settings.empty()?__T("-lowpass "):__T(" -lowpass "))+((lowpass%10)?Ztring::ToZtring(((float)lowpass)/10, 1):Ztring::ToZtring(lowpass/10));
             switch (Flags&0x0F)
             {
                 case  2 :
                 case  9 : //ABR
-                            Encoded_Library_Settings+=_T(" --abr"); break;
+                            Encoded_Library_Settings+=__T(" --abr"); break;
                 case  3 : //VBR (old/rh)
-                            Encoded_Library_Settings+=_T(" --vbr-old"); break;
+                            Encoded_Library_Settings+=__T(" --vbr-old"); break;
                 case  4 : //VBR (new/mtrh)
-                            Encoded_Library_Settings+=_T(" --vbr-new"); break;
+                            Encoded_Library_Settings+=__T(" --vbr-new"); break;
                 case  5 : //VBR (?/mt)
-                            Encoded_Library_Settings+=_T(" --vbr-mt"); break;
+                            Encoded_Library_Settings+=__T(" --vbr-mt"); break;
                 default : ;
             }
             if (BitRate!=0x00 && BitRate!=0xFF)
@@ -1212,18 +1414,18 @@
                 {
                     case  1 :
                     case  8 : //CBR
-                        Encoded_Library_Settings+=_T(" -b ")+Ztring::ToZtring(BitRate);
+                        Encoded_Library_Settings+=__T(" -b ")+Ztring::ToZtring(BitRate);
                         break;
                     case  2 :
                     case  9 : //ABR
                         BitRate_Nominal.From_Number(BitRate*1000);
-                        Encoded_Library_Settings+=_T(" ")+Ztring::ToZtring(BitRate);
+                        Encoded_Library_Settings+=__T(" ")+Ztring::ToZtring(BitRate);
                         break;
                     case  3 : //VBR (old/rh)
                     case  4 : //VBR (new/mtrh)
                     case  5 : //VBR (?/mt)
                         BitRate_Minimum.From_Number(BitRate*1000);
-                        Encoded_Library_Settings+=_T(" -b ")+Ztring::ToZtring(BitRate);
+                        Encoded_Library_Settings+=__T(" -b ")+Ztring::ToZtring(BitRate);
                         break;
                     default : ;
                 }
@@ -1314,13 +1516,13 @@
                         //10 last bytes
                         //int sum = get_final_sum(data);
                         //if (sum==0)
-                        //    return guess = _T("FhG (fastenc, low quality mode)");
+                        //    return guess = __T("FhG (fastenc, low quality mode)");
                         //else if (sum==10 * 0xFF)
-                        //    return guess = _T("FhG (l3enc)");
+                        //    return guess = __T("FhG (l3enc)");
                         //else if (sum==5 * 0x20)
-                        //    return guess = _T("FhG (fastenc, medium or high quality mode)");
+                        //    return guess = __T("FhG (fastenc, medium or high quality mode)");
                         //else
-                        //    return guess = _T("FhG (l3enc or fastenc)");
+                        //    return guess = __T("FhG (l3enc or fastenc)");
                     }
                     else
                     {
@@ -1332,7 +1534,7 @@
                 }
                 else //No padding
                 {
-                    if (BitRate_Mode.find(_T("VBR"))==0) //VBR
+                    if (BitRate_Mode.find(__T("VBR"))==0) //VBR
                         Encoded_Library="FhG (fastenc)";
                     else
                         Encoded_Library="FhG (ACM or producer pro)";
@@ -1347,7 +1549,7 @@
                 }
                 else //Joint Stereo not used
                 {
-                    if (BitRate_Mode.find(_T("VBR"))==0) //VBR
+                    if (BitRate_Mode.find(__T("VBR"))==0) //VBR
                         Encoded_Library="Lame (old)";
                     else //CBR
                     {
@@ -1364,12 +1566,12 @@
                             //if (data.av_reservoir < 40 && !data.vbr) //ISO based encoders are unable to properly use bit reservoir... average reservoir usage is about 10
                             //{
                             //    if (data.padding)
-                            //        return guess = _T("Blade");
+                            //        return guess = __T("Blade");
                             //    else
-                            //        return guess = _T("dist10 encoder or other encoder");
+                            //        return guess = __T("dist10 encoder or other encoder");
                             //}
                             //else
-                            //    return guess = _T("Gogo (before 3.0)");
+                            //    return guess = __T("Gogo (before 3.0)");
                         }
                     }
                 }

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Mpega.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Mpega.h Changed

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Opus.cpp Added

@@ -0,0 +1,197 @@
+// File_Opus - Info for Opus files
+// Copyright (C) 2012-2012 Lionel Duchateau, kurtnoise@free.fr
+// Copyright (C) 2012-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Note : the buffer must be given in ONE call
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_OPUS_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Audio/File_Opus.h"
+using namespace std;
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//---------------------------------------------------------------------------
+const char*  Opus_ChannelPositions[]=
+{
+    "",
+    "Front: C",
+    "Front: L R",
+    "Front: L C R",
+    "Front: L R,   Rear: L R",
+    "Front: L C R, Rear: L R",
+    "Front: L C R, Rear: L R, LFE",
+    "Front: L C R, Side: L R, Rear: C, LFE",
+    "Front: L C R, Side: L R, Rear: L R, LFE",
+};
+
+//---------------------------------------------------------------------------
+const char*  Opus_ChannelPositions2[]=
+{
+    "",
+    "1/0/0",
+    "2/0/0",
+    "2/1/0",
+    "2/2/0",
+    "3/2/0",
+    "3/2/1",
+    "3/2/2",
+    "3/2/3",
+};
+
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File_Opus::File_Opus()
+:File__Analyze()
+{
+    //Internal
+    Identification_Done=false;
+}
+
+//***************************************************************************
+// Buffer - Per element
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Opus::Header_Parse()
+{
+    //Filling
+    Header_Fill_Code(0, "Opus");
+    Header_Fill_Size(Element_Size);
+}
+
+//---------------------------------------------------------------------------
+void File_Opus::Data_Parse()
+{
+    //Parsing
+    if (Identification_Done)
+        Stream();
+    else
+        Identification();
+}
+
+//***************************************************************************
+// Elements
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Opus::Identification()
+{
+    Element_Name("Identification");
+
+    //Parsing
+    Ztring opus_version, Channels_Positions;
+    int8u Opus_version_id, ch_count, ch_map;
+    int16u preskip;
+    int32u sample_rate;
+    Get_Local(8,opus_version,                                   "opus_codec_id");
+    Get_L1 (Opus_version_id,                                    "opus_version_id");
+    Get_L1 (ch_count,                                           "channel_count");
+    Get_L2 (preskip,                                            "preskip");
+    Get_L4 (sample_rate,                                        "rate");
+    Skip_L2(                                                    "ouput_gain");
+    Get_L1 (ch_map,                                             "channel_map");
+    if (ch_map)
+    {
+        Skip_L1(                                                "Stream count (N)");
+        Skip_L1(                                                "Two-channel stream count (M)");
+        for (int8u Pos=0; Pos<ch_count; Pos++)
+            Skip_L1(                                            "Channel mapping");
+    }
+    if (Element_Offset<Element_Size)
+        Skip_XX(Element_Size-Element_Offset,                    "unknown");
+
+    //Filling
+    FILLING_BEGIN()
+        Accept("Opus");
+
+        Stream_Prepare(Stream_Audio);
+        Fill(Stream_Audio, 0, Audio_Format, "Opus");
+        Fill(Stream_Audio, 0, Audio_Codec, "Opus");
+
+        if (!opus_version.empty())
+        {
+            Fill(Stream_Audio, 0, Audio_SamplingRate, sample_rate?sample_rate:48000);
+            Fill(Stream_Audio, 0, Audio_Channel_s_, ch_count);
+        }
+
+        switch (ch_map)
+        {
+            case 0 : // Mono/Stereo
+                    if (ch_count>2)
+                        break; // Not in spec
+                    // else it is as Vorbis specs, no break
+            case 1 : // Vorbis order
+                    {
+                    Ztring ChannelPositions; ChannelPositions.From_Local(Opus_ChannelPositions[ch_count]);
+                    Ztring ChannelPositions2; ChannelPositions2.From_Local(Opus_ChannelPositions2[ch_count]);
+                    if (ChannelPositions!=Retrieve(Stream_Audio, 0, Audio_ChannelPositions))
+                        Fill(Stream_Audio, 0, Audio_ChannelPositions, ChannelPositions);
+                    if (ChannelPositions2!=Retrieve(Stream_Audio, 0, Audio_ChannelPositions_String2))
+                        Fill(Stream_Audio, 0, Audio_ChannelPositions_String2, ChannelPositions2);
+                    }
+            default: ; //Unknown
+        }
+
+    FILLING_END();
+
+    //Filling
+    Identification_Done=true;
+}
+
+//---------------------------------------------------------------------------
+void File_Opus::Stream()
+{
+    Element_Name("Stream");
+
+    Skip_XX(Element_Size,                                       "Data");
+
+    Finish("Opus");
+}
+
+//***************************************************************************
+// C++
+//***************************************************************************
+
+} //NameSpace
+
+#endif //MEDIAINFO_OPUS_YES

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Opus.h Added

@@ -0,0 +1,65 @@
+// File_Opus - Info for Opus files
+// Copyright (C) 2012-2012 Lionel Duchateau, kurtnoise@free.fr
+// Copyright (C) 2012-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Information about OPUS files
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_File_OpusH
+#define MediaInfo_File_OpusH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Class File_Opus
+//***************************************************************************
+
+class File_Opus : public File__Analyze
+{
+public :
+    File_Opus();
+
+private :
+    //Buffer - Per element
+    void Header_Parse();
+    void Data_Parse();
+
+    //Elements
+    void Identification();
+    void Stream();
+
+    //Temp
+    int8u Identification_Done;
+};
+
+} //NameSpace
+
+#endif

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Pcm.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Pcm.cpp Changed

@@ -1,36 +1,43 @@
 // File_Pcm - Info for PCM files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_PCM_YES)
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 #include "MediaInfo/Audio/File_Pcm.h"
+#if MEDIAINFO_DEMUX
+    #include "MediaInfo/MediaInfo_Config_MediaInfo.h"
+#endif //MEDIAINFO_DEMUX
 //---------------------------------------------------------------------------
 
 namespace MediaInfoLib
@@ -41,6 +48,15 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
+int32u Pcm_VOB_BitDepth[]=
+{
+    16,
+    20,
+    24,
+     0,
+};
+
+//---------------------------------------------------------------------------
 int32u Pcm_VOB_Frequency[]=
 {
     48000,
@@ -50,41 +66,66 @@
 };
 
 //---------------------------------------------------------------------------
-const char* Pcm_VOB_ChannelsPositions(int8u NumberOfChannels)
+const char* Pcm_VOB_ChannelsPositions(int8u channel_assignment)
 {
-    switch (NumberOfChannels)
+    switch (channel_assignment)
     {
         case  1 : return "Front: C";                                    //1 channel
-        case  2 : return "Front: L R";                                  //2 channels
-        case  3 : return "Front: L R, LFE";                             //3 channels (not sure)
-        case  4 : return "Front: L R, Side: L R";                       //4 channels
-        case  5 : return "Front: L R, Side: L R, LFE";                  //5 channels (not sure)
-        case  6 : return "Front: L C R, Side: L R, LFE";                //6 channels
-        case  7 : return "Front: L C R, Side: L R, Back: L R";          //7 channels
-        case  8 : return "Front: L C R, Side: L R, Back: L R, LFE";     //8 channels
+        case  3 : return "Front: L R";                                  //2 channels
+        case  4 : return "Front: L C R";                                //3 channels
+        case  5 : return "Front: L R, LFE";                             //3 channels
+        case  6 : return "Front: L C R, LFE";                           //4 channels
+        case  7 : return "Front: L R, Side: L R";                       //4 channels
+        case  8 : return "Front: L C R, Side: L R";                     //5 channels
+        case  9 : return "Front: L C R, Side: L R, LFE";                //6 channels
+        case 10 : return "Front: L C R, Side: L R, Back: L R";          //7 channels
+        case 11 : return "Front: L C R, Side: L R, Back: L R, LFE";     //8 channels
         default : return "";
     }
 }
 
 //---------------------------------------------------------------------------
-const char* Pcm_VOB_ChannelsPositions2(int8u NumberOfChannels)
+const char* Pcm_VOB_ChannelsPositions2(int8u channel_assignment)
 {
-    switch (NumberOfChannels)
+    switch (channel_assignment)
     {
         case  1 : return "1/0/0.0";                                     //1 channel
-        case  2 : return "2/0/0.0";                                     //2 channels
-        case  3 : return "3/0/0.1";                                     //3 channels (not sure)
-        case  4 : return "3/0/0.1";                                     //4 channels
-        case  5 : return "3/1/0.1";                                     //5 channels (not sure)
-        case  6 : return "3/2/0.1";                                     //6 channels
-        case  7 : return "3/2/1.1";                                     //7 channels
-        case  8 : return "3/2/2.1";                                     //8 channels
+        case  3 : return "2/0/0.0";                                     //2 channels
+        case  4 : return "3/0/0.0";                                     //3 channels
+        case  5 : return "2/0/0.1";                                     //3 channels
+        case  6 : return "3/0/0.1";                                     //4 channels
+        case  7 : return "2/2/0.0";                                     //4 channels
+        case  8 : return "3/2/0.0";                                     //5 channels
+        case  9 : return "3/2/0.1";                                     //6 channels
+        case 10 : return "3/2/2.0";                                     //7 channels
+        case 11 : return "3/2/2.1";                                     //8 channels
         default : return "";
     }
 }
 
 //---------------------------------------------------------------------------
-int32u Pcm_M2TS_Frequency[]=
+int8u Pcm_M2TS_channel_assignment[16]=
+{
+        0,
+        1,
+        0,
+        2,
+        3,
+        3,
+        4,
+        4,
+        5,
+        6,
+        7,
+        8,
+        0,
+        0,
+        0,
+        0,
+};
+
+//---------------------------------------------------------------------------
+int32u Pcm_M2TS_sampling_frequency[16]=
 {
         0,
     48000,
@@ -94,10 +135,18 @@
    192000,
         0,
         0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
 };
 
 //---------------------------------------------------------------------------
-int32u Pcm_M2TS_Resolution[]=
+int8u Pcm_M2TS_bits_per_sample[4]=
 {
         0,
        16,
@@ -112,8 +161,18 @@
 //---------------------------------------------------------------------------
 File_Pcm::File_Pcm()
 {
+    //Configuration
+    ParserName=__T("PCM");
+    #if MEDIAINFO_TRACE
+        Trace_Layers_Update(8); //Stream
+    #endif //MEDIAINFO_TRACE
+    IsRawStream=true;
+    PTS_DTS_Needed=true;
+
     //In
     BitDepth=0;
+    Channels=0;
+    IsRawPcm=true;
 }
 
 //***************************************************************************
@@ -123,70 +182,76 @@
 //---------------------------------------------------------------------------
 void File_Pcm::Streams_Fill()
 {
+    if (Count_Get(Stream_Audio)==0)
+    {
+        Stream_Prepare(Stream_Audio);
+        Fill(Stream_Audio, 0, Audio_Format, "PCM");
+        Fill(Stream_Audio, 0, Audio_Codec, "PCM");
+    }
+
     //Filling
     Ztring Firm, Endianness, Sign, ITU, Resolution;
-    if (0)
-        ;
-    else if (Codec==_T("EVOB"))             {Firm=_T("");       Endianness=_T("Big");    Sign=_T("Signed");   Resolution=_T("16");} //PCM Signed 16 bits Big Endian, Interleavement is for 2 samples*2 channels L0-1/L0-0/R0-1/R0-0/L1-1/L1-0/R1-1/R1-0/L0-2/R0-2/L1-2/R1-2, http://wiki.multimedia.cx/index.php?title=PCM
-    else if (Codec==_T("VOB"))              {Firm=_T("");       Endianness=_T("Big");    Sign=_T("Signed");   Resolution=_T("16");} //PCM Signed 16 bits Big Endian, Interleavement is for 2 samples*2 channels L0-1/L0-0/R0-1/R0-0/L1-1/L1-0/R1-1/R1-0/L0-2/R0-2/L1-2/R1-2, http://wiki.multimedia.cx/index.php?title=PCM
-    else if (Codec==_T("M2TS"))             {Firm=_T("");       Endianness=_T("Big");    Sign=_T("Signed");}                        //PCM Signed         Big Endian
-    else if (Codec==_T("A_PCM/INT/BIG"))    {Firm=_T("");       Endianness=_T("Big");}
-    else if (Codec==_T("A_PCM/INT/LITTLE")) {Firm=_T("");       Endianness=_T("Little");}
-    else if (Codec==_T("A_PCM/INT/FLOAT"))  {Firm=_T("");       Endianness=_T("Float");}
-    else if (Codec==_T("fl32"))             {                   Endianness=_T("Float");                       Resolution=_T("32");}
-    else if (Codec==_T("fl64"))             {                   Endianness=_T("Float");                       Resolution=_T("64");}
-    else if (Codec==_T("in24"))             {                   Endianness=_T("Big");    Sign=_T("Unsigned"); Resolution=_T("24");}
-    else if (Codec==_T("in32"))             {                   Endianness=_T("Big");    Sign=_T("Unsigned"); Resolution=_T("32");}
-    else if (Codec==_T("raw "))             {                   Endianness=_T("Little"); Sign=_T("Unsigned");}
-    else if (Codec==_T("twos"))             {                   Endianness=_T("Big");    Sign=_T("Signed");}
-    else if (Codec==_T("sowt"))             {                   Endianness=_T("Little"); Sign=_T("Signed");}
-    else if (Codec==_T("SWF ADPCM"))        {Firm=_T("SWF");}
-    else if (Codec==_T("1"))                {   if (BitDepth)
+         if (Codec==__T("EVOB"))             {Firm=__T("");       Endianness=__T("Big");    Sign=__T("Signed");}                        //PCM Signed 16 bits Big Endian, Interleavement is for 2 samples*2 channels L0-1/L0-0/R0-1/R0-0/L1-1/L1-0/R1-1/R1-0/L0-2/R0-2/L1-2/R1-2, http://wiki.multimedia.cx/index.php?title=PCM
+    else if (Codec==__T("VOB"))              {Firm=__T("");       Endianness=__T("Big");    Sign=__T("Signed");}                        //PCM Signed 16 bits Big Endian, Interleavement is for 2 samples*2 channels L0-1/L0-0/R0-1/R0-0/L1-1/L1-0/R1-1/R1-0/L0-2/R0-2/L1-2/R1-2, http://wiki.multimedia.cx/index.php?title=PCM
+    else if (Codec==__T("M2TS"))             {Firm=__T("");       Endianness=__T("Big");    Sign=__T("Signed");}                        //PCM Signed         Big Endian
+    else if (Codec==__T("A_PCM/INT/BIG"))    {Firm=__T("");       Endianness=__T("Big");}
+    else if (Codec==__T("A_PCM/INT/LITTLE")) {Firm=__T("");       Endianness=__T("Little");}
+    else if (Codec==__T("A_PCM/INT/FLOAT"))  {Firm=__T("");       Endianness=__T("Big");    Sign=__T("Float");}
+    else if (Codec==__T("fl32"))             {                   Endianness=__T("Big");    Sign=__T("Float");    Resolution=__T("32");}
+    else if (Codec==__T("fl64"))             {                   Endianness=__T("Big");    Sign=__T("Float");    Resolution=__T("64");}
+    else if (Codec==__T("in24"))             {                   Endianness=__T("Big");    Sign=__T("Unsigned"); Resolution=__T("24");}
+    else if (Codec==__T("in32"))             {                   Endianness=__T("Big");    Sign=__T("Unsigned"); Resolution=__T("32");}
+    else if (Codec==__T("lpcm"))             {                   Endianness=__T("Big");    Sign=__T("Unsigned");}
+    else if (Codec==__T("raw "))             {                   Endianness=__T("Little"); Sign=__T("Unsigned");}
+    else if (Codec==__T("twos"))             {                   Endianness=__T("Big");    Sign=__T("Signed");}
+    else if (Codec==__T("sowt"))             {                   Endianness=__T("Little"); Sign=__T("Signed");}
+    else if (Codec==__T("SWF ADPCM"))        {Firm=__T("SWF");}
+    else if (Codec==__T("1"))                {   if (BitDepth)
                                                 {
                                                     if (BitDepth>8)
-                                                    {           Endianness=_T("Little"); Sign=_T("Signed");}
+                                                    {           Endianness=__T("Little"); Sign=__T("Signed");}
                                                     else
-                                                    {                                    Sign=_T("Unsigned");}
+                                                    {                                    Sign=__T("Unsigned");}
                                                 }
                                             }
-    else if (Codec==_T("2"))                {Firm=_T("Microsoft");}
-    else if (Codec==_T("3"))                {                   Endianness=_T("Float");}
-    else if (Codec==_T("10"))               {Firm=_T("OKI");}
-    else if (Codec==_T("11"))               {Firm=_T("Intel");}
-    else if (Codec==_T("12"))               {Firm=_T("Mediaspace");}
-    else if (Codec==_T("13"))               {Firm=_T("Sierra");}
-    else if (Codec==_T("14"))               {Firm=_T("Antex");}
-    else if (Codec==_T("17"))               {Firm=_T("Dialogic");}
-    else if (Codec==_T("18"))               {Firm=_T("Mediavision");}
-    else if (Codec==_T("20"))               {Firm=_T("Yamaha");}
-    else if (Codec==_T("33"))               {Firm=_T("Antex");}
-    else if (Codec==_T("36"))               {Firm=_T("DSP Solution");}
-    else if (Codec==_T("38"))               {Firm=_T("Natural MicroSystems");}
-    else if (Codec==_T("39"))               {Firm=_T("Crystal Semiconductor");}
-    else if (Codec==_T("3B"))               {Firm=_T("Rockwell");}
-    else if (Codec==_T("40"))               {Firm=_T("Antex Electronics");}
-    else if (Codec==_T("42"))               {Firm=_T("IBM");}
-    else if (Codec==_T("45"))               {Firm=_T("Microsoft"); ITU=_T("G.726");}
-    else if (Codec==_T("64"))               {Firm=_T("Apicom"); ITU=_T("G.726");}
-    else if (Codec==_T("65"))               {Firm=_T("Apicom"); ITU=_T("G.722");}
-    else if (Codec==_T("85"))               {Firm=_T("DataFusion Systems"); ITU=_T("G.726");}
-    else if (Codec==_T("8B"))               {Firm=_T("Infocom"); ITU=_T("G.721");}
-    else if (Codec==_T("97"))               {Firm=_T("ZyXEL");}
-    else if (Codec==_T("100"))              {Firm=_T("Rhetorex");}
-    else if (Codec==_T("125"))              {Firm=_T("Sanyo");}
-    else if (Codec==_T("140"))              {Firm=_T("Dictaphone"); ITU=_T("G.726");}
-    else if (Codec==_T("170"))              {Firm=_T("Unisys");}
-    else if (Codec==_T("175"))              {Firm=_T("SyCom"); ITU=_T("G.726");}
-    else if (Codec==_T("178"))              {Firm=_T("Knownledge");}
-    else if (Codec==_T("200"))              {Firm=_T("Creative");}
-    else if (Codec==_T("210"))              {Firm=_T("Uher");}
-    else if (Codec==_T("285"))              {Firm=_T("Norcom Voice Systems");}
-    else if (Codec==_T("1001"))             {Firm=_T("Olivetti");}
-    else if (Codec==_T("1C03"))             {Firm=_T("Lucent"); ITU=_T("G.723");}
-    else if (Codec==_T("1C0C"))             {Firm=_T("Lucent"); ITU=_T("G.723");}
-    else if (Codec==_T("4243"))             {ITU=_T("G.726");}
-    else if (Codec==_T("A105"))             {ITU=_T("G.726");}
-    else if (Codec==_T("A107"))             {ITU=_T("G.726");}
+    else if (Codec==__T("2"))                {Firm=__T("Microsoft");}
+    else if (Codec==__T("3"))                {                   Endianness=__T("Float");}
+    else if (Codec==__T("10"))               {Firm=__T("OKI");}
+    else if (Codec==__T("11"))               {Firm=__T("Intel");}
+    else if (Codec==__T("12"))               {Firm=__T("Mediaspace");}
+    else if (Codec==__T("13"))               {Firm=__T("Sierra");}
+    else if (Codec==__T("14"))               {Firm=__T("Antex");}
+    else if (Codec==__T("17"))               {Firm=__T("Dialogic");}
+    else if (Codec==__T("18"))               {Firm=__T("Mediavision");}
+    else if (Codec==__T("20"))               {Firm=__T("Yamaha");}
+    else if (Codec==__T("33"))               {Firm=__T("Antex");}
+    else if (Codec==__T("36"))               {Firm=__T("DSP Solution");}
+    else if (Codec==__T("38"))               {Firm=__T("Natural MicroSystems");}
+    else if (Codec==__T("39"))               {Firm=__T("Crystal Semiconductor");}
+    else if (Codec==__T("3B"))               {Firm=__T("Rockwell");}
+    else if (Codec==__T("40"))               {Firm=__T("Antex Electronics");}
+    else if (Codec==__T("42"))               {Firm=__T("IBM");}
+    else if (Codec==__T("45"))               {Firm=__T("Microsoft"); ITU=__T("G.726");}
+    else if (Codec==__T("64"))               {Firm=__T("Apicom"); ITU=__T("G.726");}
+    else if (Codec==__T("65"))               {Firm=__T("Apicom"); ITU=__T("G.722");}
+    else if (Codec==__T("85"))               {Firm=__T("DataFusion Systems"); ITU=__T("G.726");}
+    else if (Codec==__T("8B"))               {Firm=__T("Infocom"); ITU=__T("G.721");}
+    else if (Codec==__T("97"))               {Firm=__T("ZyXEL");}
+    else if (Codec==__T("100"))              {Firm=__T("Rhetorex");}
+    else if (Codec==__T("125"))              {Firm=__T("Sanyo");}
+    else if (Codec==__T("140"))              {Firm=__T("Dictaphone"); ITU=__T("G.726");}
+    else if (Codec==__T("170"))              {Firm=__T("Unisys");}
+    else if (Codec==__T("175"))              {Firm=__T("SyCom"); ITU=__T("G.726");}
+    else if (Codec==__T("178"))              {Firm=__T("Knownledge");}
+    else if (Codec==__T("200"))              {Firm=__T("Creative");}
+    else if (Codec==__T("210"))              {Firm=__T("Uher");}
+    else if (Codec==__T("285"))              {Firm=__T("Norcom Voice Systems");}
+    else if (Codec==__T("1001"))             {Firm=__T("Olivetti");}
+    else if (Codec==__T("1C03"))             {Firm=__T("Lucent"); ITU=__T("G.723");}
+    else if (Codec==__T("1C0C"))             {Firm=__T("Lucent"); ITU=__T("G.723");}
+    else if (Codec==__T("4243"))             {ITU=__T("G.726");}
+    else if (Codec==__T("A105"))             {ITU=__T("G.726");}
+    else if (Codec==__T("A107"))             {ITU=__T("G.726");}
 
     Fill(Stream_Audio, 0, Audio_Codec_String, "PCM");
     Fill(Stream_Audio, 0, Audio_Codec_Family, "PCM");
@@ -219,8 +284,8 @@
         Fill(Stream_Audio, 0, Audio_Codec_Settings_ITU, ITU);
     }
     if (!Resolution.empty())
-        Fill(Stream_Audio, 0, Audio_Resolution, Resolution);
-    Fill(Stream_Audio, 0, Audio_BitRate_Mode, "CBR");
+        Fill(Stream_Audio, 0, Audio_BitDepth, Resolution);
+    Fill(Stream_Audio, 0, Audio_BitRate_Mode, "CBR", Unlimited, true, true);
 }
 
 //***************************************************************************
@@ -230,22 +295,10 @@
 //---------------------------------------------------------------------------
 void File_Pcm::Read_Buffer_Continue()
 {
-    if (Codec!=_T("VOB")
-     && Codec!=_T("EVOB")
-     && Codec!=_T("M2TS")) //No need of data
+    if (!Status[IsAccepted] && IsRawPcm) //No need of data
     {
-        //Filling
-        Accept("PCM");
-
-        if (Count_Get(Stream_Audio)==0)
-        {
-            Stream_Prepare(Stream_Audio);
-            Fill(Stream_Audio, 0, Audio_Format, "PCM");
-            Fill(Stream_Audio, 0, Audio_Codec, "PCM");
-        }
-
-        //Finished
-        Finish("PCM");
+        Accept();
+        Finish();
     }
 }
 
@@ -258,22 +311,39 @@
 {
     //Filling
     Header_Fill_Code(0, "Block");
-    Header_Fill_Size(Element_Size);
+    #if MEDIAINFO_DEMUX
+        if (Demux_UnpacketizeContainer && IsRawPcm && BitDepth && Channels)
+            Header_Fill_Size((Element_Size/(BitDepth*Channels/8))*(BitDepth*Channels/8)); //A complete sample
+        else
+    #endif //MEDIAINFO_DEMUX
+            Header_Fill_Size(Element_Size);
 }
 
 //---------------------------------------------------------------------------
 void File_Pcm::Data_Parse()
 {
+    Accept();
+
     //Parsing
-    if (Codec==_T("VOB") || Codec==_T("EVOB"))
+    if (Codec==__T("VOB") || Codec==__T("EVOB"))
         VOB();
-    if (Codec==_T("M2TS"))
+    else if (Codec==__T("M2TS"))
         M2TS();
     else
+    {
+        #if MEDIAINFO_DEMUX
+            if (Demux_UnpacketizeContainer && Demux_TotalBytes<=Buffer_TotalBytes+Buffer_Offset)
+            {
+                Demux_Offset=(size_t)Element_Size;
+                Demux_UnpacketizeContainer_Demux();
+            }
+        #endif //MEDIAINFO_DEMUX
         Skip_XX(Element_Size,                                   "Data"); //It is impossible to detect... Default is no detection, only filling
 
-    Accept("PCM");
-    Finish("PCM");
+        Accept();
+    }
+
+    Finish();
 }
 
 //***************************************************************************
@@ -284,37 +354,80 @@
 void File_Pcm::VOB()
 {
     //Parsing
-    int8u Frequency, NumberOfChannelsMinusOne;
+    int8u BitDepth, Frequency, NumberOfChannelsMinusOne;
     Skip_B1(                                                    "Frame number");
-    Skip_B2(                                                    "Unknown");
+    Skip_B2(                                                    "Bytes to skip (+1?)");
+    Skip_B1(                                                    "Unknown");
     BS_Begin();
-    Skip_S1(4,                                                  "Unknown");
-    Skip_S1(4,                                                  "Current frame");
-    Skip_S1(2,                                                  "Unknown");
-    Get_S1 (2, Frequency,                                       "Frequency");
+    Get_S1 (2, BitDepth,                                        "Bit depth"); Param_Info1(Pcm_VOB_BitDepth[BitDepth]);
+    Get_S1 (2, Frequency,                                       "Frequency"); Param_Info1(Pcm_VOB_Frequency[Frequency]);
     Skip_SB(                                                    "Unknown");
     Get_S1 (3, NumberOfChannelsMinusOne,                        "Number of channels (minus 1)");
     BS_End();
     Skip_B1(                                                    "Start code");
-    Skip_XX(Element_Size-Element_Offset,                        "Data");
 
-    FILLING_BEGIN();
-        Accept("PCM");
+    #if MEDIAINFO_DEMUX
+        if (Config->Demux_PCM_20bitTo16bit_Get() && BitDepth==1) //20-bit
+        {
+            int8u* Info=new int8u[(size_t)((Element_Size-6)*4/5)];
+            size_t Info_Offset=0;
+
+            while (Element_Offset+5*(NumberOfChannelsMinusOne+1)<=Element_Size)
+            {
+                size_t Buffer_Pos=Buffer_Offset+(size_t)Element_Offset;
+
+                std::memcpy(Info+Info_Offset, Buffer+Buffer_Pos, 4*(NumberOfChannelsMinusOne+1));
+
+                Info_Offset+=4*(NumberOfChannelsMinusOne+1);
+                Element_Offset+=5*(NumberOfChannelsMinusOne+1);
+            }
+            Element_Offset=6;
+
+            FrameInfo.PTS=FrameInfo.DTS;
+            if (Pcm_VOB_Frequency[Frequency])
+                FrameInfo.DUR=(Element_Size-6)/5*1000000000/Pcm_VOB_Frequency[Frequency];
+            Demux_random_access=true;
+            Element_Code=(int64u)-1;
+            Demux(Info, Info_Offset, ContentType_MainStream);
 
+            delete[] Info;
+
+            Skip_XX(Element_Size-6,                             "Data");
+        }
+        else
+        {
+            Demux_Offset=Buffer_Offset+(size_t)Element_Size;
+            Buffer_Offset+=6; //Header is dropped
+            Demux_UnpacketizeContainer_Demux();
+            Buffer_Offset-=6;
+        }
+    #endif //MEDIAINFO_DEMUX
+
+    Skip_XX(Element_Size-6,                                     "Data");
+
+    FILLING_BEGIN();
+        Frame_Count++;
+        Frame_Count_InThisBlock++;
+        if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+            Frame_Count_NotParsedIncluded++;
+        if (FrameInfo.DTS!=(int64u)-1 && FrameInfo.DUR!=(int64u)-1)
+        {
+            FrameInfo.DTS+=FrameInfo.DUR;
+            FrameInfo.PTS=FrameInfo.DTS;
+        }
         if (Count_Get(Stream_Audio)==0)
         {
             Stream_Prepare(Stream_Audio);
             Fill(Stream_Audio, 0, Audio_Format, "PCM");
             Fill(Stream_Audio, 0, Audio_Codec, "PCM");
-            Fill(Stream_Audio, 0, Audio_MuxingMode, "DVD-Video");
+            Fill(Stream_Audio, 0, Audio_BitDepth, Pcm_VOB_BitDepth[BitDepth]);
             Fill(Stream_Audio, 0, Audio_SamplingRate, Pcm_VOB_Frequency[Frequency]);
             Fill(Stream_Audio, 0, Audio_Channel_s_, NumberOfChannelsMinusOne+1);
             Fill(Stream_Audio, 0, Audio_ChannelPositions, Pcm_VOB_ChannelsPositions(NumberOfChannelsMinusOne+1));
             Fill(Stream_Audio, 0, Audio_ChannelPositions_String2, Pcm_VOB_ChannelsPositions2(NumberOfChannelsMinusOne+1));
             Fill(Stream_Audio, 0, Audio_BitRate, Pcm_VOB_Frequency[Frequency]*(NumberOfChannelsMinusOne+1)*16);
+            Fill(Stream_Audio, 0, Audio_BitRate_Mode, "CBR", Unlimited, true, true);
         }
-
-        Finish("PCM");
     FILLING_END();
 }
 
@@ -322,44 +435,44 @@
 void File_Pcm::M2TS()
 {
     //Parsing
-    int8u Unknown, Frequency, NumberOfChannels, Resolution;
-    Skip_B2(                                                    "Block size");
+    int16u  audio_data_payload_size;
+    int8u   channel_assignment, sampling_frequency, bits_per_sample;
+    Get_B2 (   audio_data_payload_size,                         "audio_data_payload_size");
     BS_Begin();
-    Get_S1 (2, Unknown,                                         "Unknown");
-    if (Unknown==0)
-    {
-        Get_S1 (2, NumberOfChannels,                            "Number of channels (plus 1?)");
-        if (NumberOfChannels)
-            NumberOfChannels--;
-    }
-    else
-    {
-        Get_S1 (2, NumberOfChannels,                            "Number of channels (minus 5)");
-        NumberOfChannels+=5;
-    }
-    Get_S1 (4, Frequency,                                       "Frequency");
-    Get_S1 (2, Resolution,                                      "Resolution");
-    Skip_S1(6,                                                  "Unknown");
+    Get_S1 (4, channel_assignment,                              "channel_assignment"); Param_Info2(Pcm_M2TS_channel_assignment[channel_assignment], " channel(s)");
+    Get_S1 (4, sampling_frequency,                              "sampling_frequency"); Param_Info2(Pcm_M2TS_sampling_frequency[sampling_frequency], " Hz");
+    Get_S1 (2, bits_per_sample,                                 "bits_per_sample"); Param_Info2(Pcm_M2TS_bits_per_sample[bits_per_sample], " bits");
+    Skip_SB(                                                    "start_flag");
+    Skip_S1(5,                                                  "reserved");
     BS_End();
-    Skip_XX(Element_Size-Element_Offset,                        "Data");
+    Skip_XX(audio_data_payload_size,                            "audio_data_payload");
 
-    FILLING_BEGIN();
+    FILLING_BEGIN_PRECISE();
         Accept("PCM");
 
         if (Count_Get(Stream_Audio)==0)
         {
+            int8u Channels=Pcm_M2TS_channel_assignment[channel_assignment];
             Stream_Prepare(Stream_Audio);
             Fill(Stream_Audio, 0, Audio_Format, "PCM");
             Fill(Stream_Audio, 0, Audio_Codec, "PCM");
             Fill(Stream_Audio, 0, Audio_MuxingMode, "Blu-ray");
-            Fill(Stream_Audio, 0, Audio_SamplingRate, Pcm_M2TS_Frequency[Frequency]);
-            Fill(Stream_Audio, 0, Audio_Resolution, Pcm_M2TS_Resolution[Resolution]);
-            Fill(Stream_Audio, 0, Audio_Channel_s_, NumberOfChannels);
-            Fill(Stream_Audio, 0, Audio_ChannelPositions, Pcm_VOB_ChannelsPositions(NumberOfChannels));
-            Fill(Stream_Audio, 0, Audio_ChannelPositions_String2, Pcm_VOB_ChannelsPositions2(NumberOfChannels));
-            if (NumberOfChannels%2)
-                NumberOfChannels++; //Always by pair
-            Fill(Stream_Audio, 0, Audio_BitRate, Pcm_M2TS_Frequency[Frequency]*(NumberOfChannels)*Pcm_M2TS_Resolution[Resolution]);
+            if (Channels)
+            {
+                if (Pcm_M2TS_sampling_frequency[sampling_frequency])
+                    Fill(Stream_Audio, 0, Audio_SamplingRate, Pcm_M2TS_sampling_frequency[sampling_frequency]);
+                if (Pcm_M2TS_bits_per_sample[bits_per_sample])
+                    Fill(Stream_Audio, 0, Audio_BitDepth, Pcm_M2TS_bits_per_sample[bits_per_sample]);
+                Fill(Stream_Audio, 0, Audio_Channel_s_, Channels);
+                Fill(Stream_Audio, 0, Audio_ChannelPositions, Pcm_VOB_ChannelsPositions(channel_assignment));
+                Fill(Stream_Audio, 0, Audio_ChannelPositions_String2, Pcm_VOB_ChannelsPositions2(channel_assignment));
+                if (Pcm_M2TS_sampling_frequency[sampling_frequency] && Pcm_M2TS_bits_per_sample[bits_per_sample])
+                {
+                    if (Channels%2)
+                        Fill(Stream_Audio, 0, Audio_BitRate_Encoded, Pcm_M2TS_sampling_frequency[sampling_frequency]*(Channels+1)*Pcm_M2TS_bits_per_sample[bits_per_sample]); //Always by pair
+                    Fill(Stream_Audio, 0, Audio_BitRate, Pcm_M2TS_sampling_frequency[sampling_frequency]*Channels*Pcm_M2TS_bits_per_sample[bits_per_sample]);
+                }
+            }
         }
 
         Finish("PCM");

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Pcm.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Pcm.h Changed

@@ -1,17 +1,17 @@
 // File_Pcm - Info for PCM files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -43,6 +43,8 @@
     //In
     ZenLib::Ztring  Codec;
     int16u          BitDepth;
+    int16u          Channels;
+    bool            IsRawPcm;
 
     //Constructor/Destructor
     File_Pcm();

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Ps2Audio.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Ps2Audio.cpp Changed

@@ -1,31 +1,35 @@
 // File_Ps2Audio - Info for PS2 Audio in MPEG files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_PS2A_YES)
 //---------------------------------------------------------------------------
 
@@ -52,7 +56,7 @@
         {
             case 0x53536264 :   SSbd(); break;
             case 0x53536864 :   SShd(); break;
-            default         :   Reject("PS2 Audio");
+            default         :   Element_Offset=Element_Size; Reject("PS2 Audio");
         }
     }
 }
@@ -66,12 +70,12 @@
         return;
     }
 
-    Element_Begin("SSbd (Body)");
+    Element_Begin1("SSbd (Body)");
         int32u Size;
         Skip_C4(                                                "ID");
         Get_L4 (Size,                                           "Size");
         Skip_XX(Element_Size-Element_Offset,                    "Data (Partial)");
-    Element_End();
+    Element_End0();
 
     FILLING_BEGIN();
         Fill(Stream_Audio, 0, Audio_StreamSize, Size);
@@ -85,7 +89,7 @@
 //---------------------------------------------------------------------------
 void File_Ps2Audio::SShd()
 {
-    Element_Begin("SShd (Header)", 0x18);
+    Element_Begin1("SShd (Header)");
         //Parsing
         int32u Size, Format, SamplingRate, Channels;
         Skip_C4(                                                "ID");
@@ -101,7 +105,7 @@
         Skip_L4(                                                "Bytes per channel");
         Skip_L4(                                                "Reserved");
         Skip_L4(                                                "Reserved");
-    Element_End();
+    Element_End0();
 
     FILLING_BEGIN();
         Accept("PS2 Audio");
@@ -112,8 +116,8 @@
         Ztring FormatS;
         switch(Format)
         {
-            case 0x00000001 : FormatS=_T("PCM"); break;
-            case 0x00000010 : FormatS=_T("ADPCM"); break;
+            case 0x00000001 : FormatS=__T("PCM"); break;
+            case 0x00000010 : FormatS=__T("ADPCM"); break;
             default         : ;
         }
         Fill(Stream_Audio, 0, Audio_Format, FormatS);

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Ps2Audio.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Ps2Audio.h Changed

@@ -1,17 +1,17 @@
 // File_Ps2Audio - Info for PS2 Audio in MPEG files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Rkau.cpp Added

@@ -0,0 +1,155 @@
+// File_Rkau - Info for RKAU  files
+// Copyright (C) 2011-2012 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2011-2012 Lionel Duchateau, kurtnoise@free.fr
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_RKAU_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Audio/File_Rkau.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File_Rkau::File_Rkau()
+:File__Analyze(), File__Tags_Helper()
+{
+    //File__Tags_Helper
+    Base=this;
+}
+
+//***************************************************************************
+// Streams management
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Rkau::Streams_Finish()
+{
+    //Filling
+    int64u CompressedSize=File_Size-TagsSize;
+    float32 CompressionRatio=((float32)UncompressedSize)/CompressedSize;
+
+    Fill(Stream_Audio, 0, Audio_StreamSize, CompressedSize);
+    Fill(Stream_Audio, 0, Audio_Compression_Ratio, CompressionRatio);
+    Fill(Stream_Audio, 0, Audio_BitRate_Mode, "VBR");
+
+    File__Tags_Helper::Streams_Finish();
+}
+
+//***************************************************************************
+// Buffer - File header
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_Rkau::FileHeader_Begin()
+{
+    if (!File__Tags_Helper::FileHeader_Begin())
+        return false;
+
+    //Synchro
+    if (Buffer_Offset+3>Buffer_Size)
+        return false;
+    if (CC3(Buffer+Buffer_Offset)!=0x524B41) //"RKA"
+    {
+        File__Tags_Helper::Reject("RKAU");
+        return false;
+    }
+
+    return true;
+}
+
+//---------------------------------------------------------------------------
+void File_Rkau::FileHeader_Parse()
+{
+    //Parsing
+    Ztring version;
+    int32u SampleRate, source_bytes;
+    int8u Channels, BitsPerSample, Quality, Flags;
+    bool joint_stereo, streaming, vrq_lossy_mode;
+
+    Skip_Local(3,                                               "Signature");
+    Get_Local (1, version,                                      "Version");
+    Get_L4 (source_bytes,                                       "SourceBytes");
+    Get_L4 (SampleRate,                                         "SampleRate");
+    Get_L1 (Channels,                                           "Channels");
+    Get_L1 (BitsPerSample,                                      "BitsPerSample");
+    Get_L1 (Quality,                                            "Quality");
+    Get_L1 (Flags,                                              "Flags");
+    Get_Flags (Flags, 0, joint_stereo,                          "JointStereo");
+    Get_Flags (Flags, 1, streaming,                             "Streaming");
+    Get_Flags (Flags, 2, vrq_lossy_mode,                        "VRQLossyMode");
+
+    FILLING_BEGIN();
+        if (SampleRate==0)
+            return;
+        Duration=(((int64u)source_bytes*1000)/4)/SampleRate;
+        if (Duration==0)
+            return;
+        UncompressedSize=Channels*(BitsPerSample/8);
+        if (UncompressedSize==0)
+            return;
+
+        //Filling data
+        File__Tags_Helper::Accept("RKAU");
+
+        File__Tags_Helper::Stream_Prepare(Stream_Audio);
+        Fill(Stream_Audio, 0, Audio_Format, "RK Audio");
+        Fill(Stream_Audio, 0, Audio_Codec, "Rkau");
+        Fill(Stream_Audio, 0, Audio_Encoded_Library, __T("1.0") + version);
+        Fill(Stream_Audio, 0, Audio_Compression_Mode, (Quality==0)?"Lossless":"Lossy");
+        Fill(Stream_Audio, 0, Audio_BitDepth, BitsPerSample);
+        Fill(Stream_Audio, 0, Audio_Channel_s_, Channels);
+        Fill(Stream_Audio, 0, Audio_SamplingRate, SampleRate);
+        Fill(Stream_Audio, 0, Audio_Duration, Duration);
+
+    FILLING_END();
+
+    //No more needed data
+    File__Tags_Helper::Finish("RKAU");
+}
+
+//***************************************************************************
+// C++
+//***************************************************************************
+
+} //NameSpace
+
+#endif //MEDIAINFO_RKAU_YES

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Rkau.h Added

@@ -0,0 +1,66 @@
+// File_Rkau - Info for RKAU files
+// Copyright (C) 2011-2012 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2011-2012 Lionel Duchateau, kurtnoise@free.fr
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Information about RKAU files
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_File_RkauH
+#define MediaInfo_File_RkauH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+#include "MediaInfo/Tag/File__Tags.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Class File_Rkau
+//***************************************************************************
+
+class File_Rkau : public File__Analyze, public File__Tags_Helper
+{
+public :
+    //Constructor/Destructor
+    File_Rkau();
+
+private :
+    //Streams management
+    void Streams_Finish();
+
+    //Buffer - File header
+    bool FileHeader_Begin();
+    void FileHeader_Parse();
+
+    //Buffer - Global
+    void Read_Buffer_Continue()                                                 {File__Tags_Helper::Read_Buffer_Continue();}
+
+    //Temp
+    int64u Duration;
+    int64u UncompressedSize;
+};
+
+} //NameSpace
+
+#endif

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_ScreamTracker3.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_ScreamTracker3.cpp Changed

@@ -1,31 +1,35 @@
 // File_ScreamTracker3 - Info for ScreamTracker3 files
-// Copyright (C) 2008-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WXMHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILXMY or FXMNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_S3M_YES)
 //---------------------------------------------------------------------------
 
@@ -115,7 +119,7 @@
         Fill(Stream_General, 0, General_Format, "Scream Tracker 3");
         Fill(Stream_General, 0, General_Track, SongName);
         if ((SoftwareVersionMajor&0xF0)==0x10)
-            Fill(Stream_General, 0, General_Encoded_Application, Ztring(_T("Scream Tracker ")+Ztring::ToZtring(SoftwareVersionMajor)+_T(".")+Ztring::ToZtring(SoftwareVersionMinor/16)+Ztring::ToZtring(SoftwareVersionMinor%16)));
+            Fill(Stream_General, 0, General_Encoded_Application, Ztring(__T("Scream Tracker ")+Ztring::ToZtring(SoftwareVersionMajor)+__T(".")+Ztring::ToZtring(SoftwareVersionMinor/16)+Ztring::ToZtring(SoftwareVersionMinor%16)));
         Fill(Stream_General, 0, "BPM", TS);
 
         Stream_Prepare(Stream_Audio);

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_ScreamTracker3.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_ScreamTracker3.h Changed

@@ -1,17 +1,17 @@
 // File_ScreamTracker3 - Info for ScreamTracker3 files
-// Copyright (C) 2008-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WXMHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILXMY or FXMNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Speex.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Speex.cpp Changed

@@ -1,17 +1,17 @@
 // File_Speex - Info for Speex files
-// Copyright (C) 2008-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,14 +22,18 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_SPEEX_YES)
 //---------------------------------------------------------------------------

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Speex.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Speex.h Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Tak.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Tak.cpp Changed

@@ -1,18 +1,18 @@
 // File_Tak - Info for Tak files
-// Copyright (C) 2009-2009 Lionel Duchateau, kurtnoise@free.fr
-// Copyright (C) 2009-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2009-2012 Lionel Duchateau, kurtnoise@free.fr
+// Copyright (C) 2009-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -23,14 +23,18 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_TAK_YES)
 //---------------------------------------------------------------------------
 
@@ -136,7 +140,7 @@
 void File_Tak::Data_Parse()
 {
     #define CASE_INFO(_NAME) \
-        case Elements::_NAME : Element_Info(#_NAME); _NAME(); break;
+        case Elements::_NAME : Element_Info1(#_NAME); _NAME(); break;
 
     //Parsing
     switch (Element_Code)
@@ -149,6 +153,8 @@
         CASE_INFO(PADDING);
         default : Skip_XX(Element_Size,                         "Data");
     }
+
+    Element_Offset=Element_Size;
 }
 
 //***************************************************************************
@@ -178,12 +184,12 @@
     Get_S1 ( 3, framesizecode,                                  "framesizecode");
     Skip_S1( 2,                                                 "unknown");
     BS_End();
-    Get_L4 (num_samples_hi,                                     "num_samples (hi)"); Param_Info((((int64u)num_samples_hi)<<2 | num_samples_lo), " samples");
-    Get_L3 (samplerate,                                         "samplerate"); Param_Info((samplerate/16)+6000, " Hz");
+    Get_L4 (num_samples_hi,                                     "num_samples (hi)"); Param_Info2((((int64u)num_samples_hi)<<2 | num_samples_lo), " samples");
+    Get_L3 (samplerate,                                         "samplerate"); Param_Info2((samplerate/16)+6000, " Hz");
     BS_Begin();
     Skip_S1( 4,                                                 "unknown");
-    Get_SB (    channels,                                       "channels"); Param_Info(channels?"Stereo":"Mono");
-    Get_S1 ( 2, samplesize,                                     "samplesize"); Param_Info(Tak_samplesize[samplesize]);
+    Get_SB (    channels,                                       "channels"); Param_Info1(channels?"Stereo":"Mono");
+    Get_S1 ( 2, samplesize,                                     "samplesize"); Param_Info1(Tak_samplesize[samplesize]);
     Skip_SB(                                                    "unknown");
     BS_End();
     Skip_L3(                                                    "crc");
@@ -206,7 +212,7 @@
         Fill(Stream_Audio, 0, Audio_SamplingRate, SamplingRate);
         Fill(Stream_Audio, 0, Audio_Channel_s_, channels?2:1);
         if (Tak_samplesize[samplesize])
-            Fill(Stream_Audio, 0, Audio_Resolution, Tak_samplesize[samplesize]);
+            Fill(Stream_Audio, 0, Audio_BitDepth, Tak_samplesize[samplesize]);
         Fill(Stream_Audio, 0, Audio_Duration, Samples*1000/SamplingRate);
     FILLING_END();
 }
@@ -219,10 +225,10 @@
     Get_L2 (num_seekpoints,                                     "num_seekpoints");
     Skip_L1 (                                                   "unknown");
     Skip_L1 (                                                   "seek interval");
-    Element_Begin("seekpoints");
+    Element_Begin1("seekpoints");
     for (int16u Pos=0; Pos<num_seekpoints; Pos++)
         Skip_L5 (                                               "seekpoint");
-    Element_End();
+    Element_End0();
     Skip_L3(                                                    "crc");
 }
 
@@ -278,18 +284,18 @@
     BS_End();
 
     FILLING_BEGIN();
-        Ztring Version=Ztring::ToZtring(Major)+_T('.')+Ztring::ToZtring(Minor)+_T('.')+Ztring::ToZtring(Revision);
-        Ztring Preset=_T("-p")+Ztring::ToZtring(Preset_lo);
+        Ztring Version=Ztring::ToZtring(Major)+__T('.')+Ztring::ToZtring(Minor)+__T('.')+Ztring::ToZtring(Revision);
+        Ztring Preset=__T("-p")+Ztring::ToZtring(Preset_lo);
         switch (Preset_hi)
         {
             case 0x00 :                 break;
-            case 0x01 : Preset+=_T('e'); break;
-            case 0x02 : Preset+=_T('m'); break;
-            default   : Preset+=_T('-')+Ztring::ToZtring(Preset_hi, 16); //Unknown
+            case 0x01 : Preset+=__T('e'); break;
+            case 0x02 : Preset+=__T('m'); break;
+            default   : Preset+=__T('-')+Ztring::ToZtring(Preset_hi, 16); //Unknown
         }
 
         Fill(Stream_Audio, 0, Audio_Encoded_Library, "TAK");
-        Fill(Stream_Audio, 0, Audio_Encoded_Library_String, _T("TAK ")+Version);
+        Fill(Stream_Audio, 0, Audio_Encoded_Library_String, __T("TAK ")+Version);
         Fill(Stream_Audio, 0, Audio_Encoded_Library_Name, "TAK");
         Fill(Stream_Audio, 0, Audio_Encoded_Library_Version, Version);
         Fill(Stream_Audio, 0, Audio_Encoded_Library_Settings, Preset);

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Tak.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Tak.h Changed

@@ -1,18 +1,18 @@
 // File_Tak - Info for Tak Audio files
 // Copyright (C) 2009-2009 Lionel Duchateau, kurtnoise@free.fr
-// Copyright (C) 2009-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2009-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Tta.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Tta.cpp Changed

@@ -1,17 +1,17 @@
 // File_Tta - Info for TTA  files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,14 +22,18 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_TTA_YES)
 //---------------------------------------------------------------------------
 
@@ -64,7 +68,7 @@
     float32 CompressionRatio=((float32)UncompressedSize)/CompressedSize;
 
     Fill(Stream_Audio, 0, Audio_StreamSize, CompressedSize);
-    Fill(Stream_Audio, 0, Audio_CompressionRatio, CompressionRatio);
+    Fill(Stream_Audio, 0, Audio_Compression_Ratio, CompressionRatio);
     Fill(Stream_Audio, 0, Audio_BitRate_Mode, "VBR");
 
     File__Tags_Helper::Streams_Finish();
@@ -122,7 +126,7 @@
         File__Tags_Helper::Stream_Prepare(Stream_Audio);
         Fill(Stream_Audio, 0, Audio_Format, "TTA");
         Fill(Stream_Audio, 0, Audio_Codec, "TTA ");
-        Fill(Stream_Audio, 0, Audio_Resolution, BitsPerSample);
+        Fill(Stream_Audio, 0, Audio_BitDepth, BitsPerSample);
         Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, Channels);
         Fill(Stream_Audio, StreamPos_Last, Audio_SamplingRate, SampleRate);
         Fill(Stream_Audio, 0, Audio_Duration, Duration);

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Tta.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Tta.h Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_TwinVQ.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_TwinVQ.cpp Changed

@@ -1,17 +1,17 @@
 // File_TwinVQ - Info for TwiVQ files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,14 +22,18 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_TWINVQ_YES)
 //---------------------------------------------------------------------------
 
@@ -129,7 +133,7 @@
 void File_TwinVQ::Data_Parse()
 {
     #define ELEMENT_CASE(_NAME, _DETAIL) \
-        case Elements::_NAME : Element_Info(_DETAIL); _NAME(); break;
+        case Elements::_NAME : Element_Info1(_DETAIL); _NAME(); break;
 
     //Parsing
     switch (Element_Code)

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_TwinVQ.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_TwinVQ.h Changed

@@ -1,17 +1,17 @@
 // File_TwinVQ - Info for TwinVQ files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Vorbis.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Vorbis.cpp Changed

@@ -1,17 +1,17 @@
 // File_Vorbis - Info for Vorbis files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,14 +22,18 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_VORBIS_YES)
 //---------------------------------------------------------------------------
 
@@ -43,15 +47,15 @@
 {
 
 //---------------------------------------------------------------------------
-int32u ilog(int32u Value)
+int8u ilog(int32u Value)
 {
-    int32u ToReturn=0;
+    int8u ToReturn=0;
     while(Value)
     {
         ToReturn++;
         Value>>=1;
     }
-    return(ToReturn);
+    return ToReturn;
 }
 
 //***************************************************************************
@@ -117,9 +121,9 @@
             Fill(Stream_Audio, StreamPos_Last, Audio_BitRate, BitRate_Nominal);
         if (BitRate_Minimum!=0 && BitRate_Minimum<0x80000000) //This is a signed value, and negative values are not OK
             Fill(Stream_Audio, StreamPos_Last, Audio_BitRate_Minimum, BitRate_Minimum);
-        if (BitRate_Maximum==0 && BitRate_Nominal!=0 && BitRate_Minimum==0)
+        if (BitRate_Nominal && BitRate_Maximum==BitRate_Nominal && BitRate_Nominal==BitRate_Minimum)
             Fill(Stream_Audio, StreamPos_Last, Audio_BitRate_Mode, "CBR");
-        else if (BitRate_Maximum>BitRate_Nominal*1.1 && BitRate_Minimum<BitRate_Nominal*0.9)
+        else
             Fill(Stream_Audio, StreamPos_Last, Audio_BitRate_Mode, "VBR");
         Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, Channels);
         Fill(Stream_Audio, StreamPos_Last, Audio_SamplingRate, SamplingRate);
@@ -140,60 +144,60 @@
     vorbis_codebook_count+=1;
     for (int Pos=0; Pos<vorbis_codebook_count; Pos++)
     {
-        Element_Begin("codebook");
-        Get_S3 (24, codebook,                                   "codebook");
+        Element_Begin1("codebook");
+        Get_T3 (24, codebook,                                   "codebook");
         if (codebook!=0x564342)
             return;
-        Get_BS (16, codebook_dimensions,                        "codebook_dimensions");
-        Get_BS (24, codebook_entries,                           "codebook_entries");
-        Get_BS (1, ordered,                                     "ordered");
+        Get_BT (16, codebook_dimensions,                        "codebook_dimensions");
+        Get_BT (24, codebook_entries,                           "codebook_entries");
+        Get_BT (1, ordered,                                     "ordered");
         if (!ordered)
         {
             int32u sparse;
-            Get_BS (1, sparse,                                  "sparse");
+            Get_BT (1, sparse,                                  "sparse");
             for (int32u Pos2=0; Pos2<codebook_entries; Pos2++)
             {
                 if (sparse)
                 {
                     int32u flag;
-                    Get_BS (1, flag,                            "flag");
+                    Get_BT (1, flag,                            "flag");
                     if (flag)
                     {
-                        Info_BS(5, length,                      "length");
+                        Info_BT(5, length,                      "length");
                     }
                 }
                 else
                 {
-                    Info_BS(5, length,                          "length");
+                    Info_BT(5, length,                          "length");
                 }
             }
         }
         else
         {
-            Skip_BS(5,                                          "length");
+            Skip_BT(5,                                          "length");
             int32u num;
             for(int32u i=0; i<codebook_entries; )
             {
-                Get_BS (ilog(codebook_entries-i), num,          "num");
+                Get_BT (ilog(codebook_entries-i), num,          "num");
                 for(int32u j=0; j<num && i<codebook_entries; j++, i++);
             }
         }
-        Get_BS (4, codebook_lookup_type,                        "codebook_lookup_type");
+        Get_BT (4, codebook_lookup_type,                        "codebook_lookup_type");
         if (codebook_lookup_type>2)
             return; //Not decodable
         if (codebook_lookup_type>0)
         {
-            int32u codebook_value_bits;
-            Info_BS(32, codebook_minimum_value,                 "codebook_minimum_value");
-            Info_BS(32, codebook_delta_value,                   "codebook_delta_value");
-            Get_BS ( 4, codebook_value_bits,                    "codebook_value_bits");
+            int8u codebook_value_bits;
+            Info_BT(32, codebook_minimum_value,                 "codebook_minimum_value");
+            Info_BT(32, codebook_delta_value,                   "codebook_delta_value");
+            Get_T1 ( 4, codebook_value_bits,                    "codebook_value_bits");
             codebook_value_bits++;
-            Info_BS( 1, codebook_sequence_p,                    "codebook_sequence_p");
+            Info_BT( 1, codebook_sequence_p,                    "codebook_sequence_p");
             int32s vals;
             if (codebook_lookup_type==1)
             {
                 vals=(int32u)floor(pow((float)codebook_entries,1.f/codebook_dimensions));
-                while(1)
+                for (;;)
                 {
                     int32u acc=1, acc1=1;
                     for(int32u i=0; i<codebook_dimensions; i++)
@@ -213,23 +217,24 @@
                 vals=codebook_entries*codebook_dimensions;
             int32u codebook_multiplicands;
             for(int i=0; i<vals; i++)
-                Get_BS (codebook_value_bits, codebook_multiplicands, "codebook_multiplicands");
+                Get_BT (codebook_value_bits, codebook_multiplicands, "codebook_multiplicands");
         }
-        Element_End();
+        Element_End0();
     }
 
     //Time domain transforms
     int32u vorbis_time_count;
-    Get_BS (6, vorbis_time_count,                               "vorbis_time_count");
+    Get_BT (6, vorbis_time_count,                               "vorbis_time_count");
     for (int32u Pos=0; Pos<vorbis_time_count+1; Pos++)
-        Skip_BS(16,                                             "zero");
+        Skip_BT(16,                                             "zero");
 
     //Floors
     int32u vorbis_floor_count;
-    Get_BS (6, vorbis_floor_count,                              "vorbis_floor_count");
+    Get_BT (6, vorbis_floor_count,                              "vorbis_floor_count");
     for (int32u Pos=0; Pos<vorbis_floor_count; Pos++)
     {
-        Info_BS(16, vorbis_floor_types,                         "vorbis_floor_types");
+        int16u vorbis_floor_types;
+        Get_T2(16, vorbis_floor_types,                          "vorbis_floor_types");
 
         FILLING_BEGIN();
             Fill(Stream_Audio, 0, Audio_Format_Settings_Floor, vorbis_floor_types);

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Vorbis.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Vorbis.h Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Wvpk.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Wvpk.cpp Changed

@@ -1,17 +1,17 @@
 // File_Wvpk - Info for WavPack files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,14 +22,18 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_WVPK_YES)
 //---------------------------------------------------------------------------
 
@@ -121,9 +125,6 @@
     FromMKV=false;
     FromMKV_CodecPrivateParsed=false;
 
-    //Temp - Global
-    Frame_Count=0;
-
     //Temp - Technical info
     total_samples_FirstFrame=(int32u)-1;
     block_index_FirstFrame=0;
@@ -155,7 +156,7 @@
         float32 CompressionRatio=((float32)UncompressedSize)/CompressedSize;
         Fill(Stream_Audio, 0, Audio_StreamSize, CompressedSize, 3, true);
         Fill(Stream_Audio, 0, Audio_Duration, Duration, 10, true);
-        Fill(Stream_Audio, 0, Audio_CompressionRatio, CompressionRatio, 3, true);
+        Fill(Stream_Audio, 0, Audio_Compression_Ratio, CompressionRatio, 3, true);
     }
 
     File__Tags_Helper::Streams_Finish();
@@ -201,46 +202,36 @@
         return true;
 
     //Synchronizing
-    while (Buffer_Offset+8<=Buffer_Size)
+    while (Buffer_Offset+4<=Buffer_Size)
     {
-        while (Buffer_Offset+8<=Buffer_Size
-            && CC4(Buffer+Buffer_Offset)!=CC4("wvpk"))
-        {
+        while (Buffer_Offset+4<=Buffer_Size && (Buffer[Buffer_Offset  ]!=0x77
+                                             || Buffer[Buffer_Offset+1]!=0x76
+                                             || Buffer[Buffer_Offset+2]!=0x70
+                                             || Buffer[Buffer_Offset+3]!=0x6B)) //"wvpk"
             Buffer_Offset++;
-        }
 
-        if (Buffer_Offset+8<=Buffer_Size)//Testing if size is coherant
+        if (Buffer_Offset+4<=Buffer_Size)//Testing if size is coherant
         {
             //Testing next start, to be sure
             size_t Size=LittleEndian2int32u(Buffer+Buffer_Offset+4)+8;
-            if (1)//File_Offset+Buffer_Offset+Size!=File_Size-File_EndTagSize)
-            {
-                if (Buffer_Offset+Size+8>Buffer_Size)
-                    return false; //Need more data
-
-                //Testing
-                if (CC4(Buffer+Buffer_Offset+Size)!=CC4("wvpk"))
-                    Buffer_Offset++;
-                else
-                    break; //while()
-            }
-            else
+            if (Buffer_Offset+Size+4>Buffer_Size)
+                return false; //Need more data
+
+            //Testing
+            if (Buffer[Buffer_Offset+Size  ]!=0x77
+             || Buffer[Buffer_Offset+Size+1]!=0x76
+             || Buffer[Buffer_Offset+Size+2]!=0x70
+             || Buffer[Buffer_Offset+Size+3]!=0x6B) //"wvpk"
                 Buffer_Offset++;
+            else
+                break; //while()
         }
     }
 
     //Parsing last bytes if needed
-    if (Buffer_Offset+8>Buffer_Size)
+    if (Buffer_Offset+4>Buffer_Size)
     {
-        if (Buffer_Offset+7==Buffer_Size && CC4(Buffer+Buffer_Offset)!=0x7776706B) //"wvpk"
-            Buffer_Offset++;
-        if (Buffer_Offset+6==Buffer_Size && CC4(Buffer+Buffer_Offset)!=0x7776706B) //"wvpk"
-            Buffer_Offset++;
-        if (Buffer_Offset+5==Buffer_Size && CC4(Buffer+Buffer_Offset)!=0x7776706B) //"wvpk"
-            Buffer_Offset++;
-        if (Buffer_Offset+4==Buffer_Size && CC4(Buffer+Buffer_Offset)!=0x7776706B) //"wvpk"
-            Buffer_Offset++;
-        if (Buffer_Offset+3==Buffer_Size && CC3(Buffer+Buffer_Offset)!=0x777670)   //"wv"
+        if (Buffer_Offset+3==Buffer_Size && CC3(Buffer+Buffer_Offset)!=0x777670)   //"wvp"
             Buffer_Offset++;
         if (Buffer_Offset+2==Buffer_Size && CC2(Buffer+Buffer_Offset)!=0x7776)     //"wv"
             Buffer_Offset++;
@@ -269,7 +260,10 @@
         return false;
 
     //Quick test of synchro
-    if (CC4(Buffer+Buffer_Offset)!=CC4("wvpk"))
+    if (Buffer[Buffer_Offset  ]!=0x77
+     || Buffer[Buffer_Offset+1]!=0x76
+     || Buffer[Buffer_Offset+2]!=0x70
+     || Buffer[Buffer_Offset+3]!=0x6B) //"wvpk"
         Synched=false;
 
     //We continue
@@ -332,7 +326,7 @@
     Frame_Count++;
 
     //Parsing
-    Element_Begin("Block Header");
+    Element_Begin1("Block Header");
     if (!FromMKV)
         Get_L2 (version,                                        "version");
     if (version/0x100==0x4)
@@ -388,7 +382,7 @@
                     Skip_Flags(flags, 23,                           "sampling rate");
                     Skip_Flags(flags, 24,                           "sampling rate");
                     Skip_Flags(flags, 25,                           "sampling rate");
-                    Skip_Flags(flags, 26,                           "sampling rate"); SamplingRate=(int8u)(((flags>>23)&0xF)); Param_Info(Wvpk_SamplingRate[SamplingRate]);
+                    Skip_Flags(flags, 26,                           "sampling rate"); SamplingRate=(int8u)(((flags>>23)&0xF)); Param_Info1(Wvpk_SamplingRate[SamplingRate]);
                     Skip_Flags(flags, 27,                           "reserved");
                     Skip_Flags(flags, 28,                           "reserved");
                     Skip_Flags(flags, 29,                           "use IIR for negative hybrid noise shaping");
@@ -403,7 +397,7 @@
                 Frame_Count--; //This is not a real frame
             }
             Skip_L4(                                                "crc");
-            Element_End();
+            Element_End0();
 
             int64u End=Element_Size;
             if (FromMKV && !(initial_block && final_block))
@@ -418,13 +412,13 @@
             int8u id;
             while (Element_Offset<End)
             {
-                Element_Begin();
+                Element_Begin0();
                 int32u word_size;
                 bool large, odd_size;
                 BS_Begin();
                 Get_SB (large,                                      "large");
                 Get_SB (odd_size,                                   "odd_size");
-                Get_S1 (6, id,                                      "id"); Element_Info(Wvpk_id(id));
+                Get_S1 (6, id,                                      "id"); Element_Info1(Wvpk_id(id));
                 BS_End();
                 if (large)
                 {
@@ -443,6 +437,7 @@
                 Element_Name(Ztring().From_CC1(id));
                 switch (id)
                 {
+                    case 0x07 : id_07(); break;
                     case 0x0D : id_0D(); break;
                     case 0x25 : id_25(); break;
                     default   : if (word_size)
@@ -450,7 +445,7 @@
                 }
                 if (odd_size)
                     Skip_XX(1,                                      "padding");
-                Element_End();
+                Element_End0();
             }
         }
     }
@@ -471,10 +466,10 @@
     Fill(Stream_Audio, 0, Audio_Format, "WavPack");
     Ztring Version_Minor=Ztring::ToZtring(version%0x100);
     if (Version_Minor.size()==1)
-        Version_Minor.insert(Version_Minor.begin(), _T('0'));
-    Fill(Stream_Audio, 0, Audio_Format_Profile, Ztring::ToZtring(version/0x100)+_T('.')+Version_Minor);
+        Version_Minor.insert(0, 1, __T('0'));
+    Fill(Stream_Audio, 0, Audio_Format_Profile, Ztring::ToZtring(version/0x100)+__T('.')+Version_Minor);
     Fill(Stream_Audio, 0, Audio_Codec, "Wavpack");
-    Fill(Stream_Audio, 0, Audio_Resolution, Wvpk_Resolution[(resolution1?1:0)*2+(resolution0?1:0)]);
+    Fill(Stream_Audio, 0, Audio_BitDepth, Wvpk_Resolution[(resolution1?1:0)*2+(resolution0?1:0)]);
     Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, num_channels?num_channels:(mono?1:2));
     if (channel_mask)
     {
@@ -482,30 +477,30 @@
         if (channel_mask&0x00C7)
         {
             int8u Count=0;
-            Channels_Positions+=_T("Front:");
+            Channels_Positions+=__T("Front:");
             if (channel_mask&0x0001)
             {
-                Channels_Positions+=_T(" L");
+                Channels_Positions+=__T(" L");
                 Count++;
             }
             if (channel_mask&0x0004)
             {
-                Channels_Positions+=_T(" C");
+                Channels_Positions+=__T(" C");
                 Count++;
             }
             if (channel_mask&0x0040)
             {
-                Channels_Positions+=_T(" C");
+                Channels_Positions+=__T(" C");
                 Count++;
             }
             if (channel_mask&0x0080)
             {
-                Channels_Positions+=_T(" C");
+                Channels_Positions+=__T(" C");
                 Count++;
             }
             if (channel_mask&0x0002)
             {
-                Channels_Positions+=_T(" R");
+                Channels_Positions+=__T(" R");
                 Count++;
             }
             Channels_Positions2+=Ztring::ToZtring(Count);
@@ -514,53 +509,53 @@
         {
             int8u Count=0;
             if (!Channels_Positions.empty())
-                Channels_Positions+=_T(", ");
-            Channels_Positions+=_T("Side:");
+                Channels_Positions+=__T(", ");
+            Channels_Positions+=__T("Side:");
             if (channel_mask&0x0200)
             {
-                Channels_Positions+=_T(" L");
+                Channels_Positions+=__T(" L");
                 Count++;
             }
             if (channel_mask&0x0400)
             {
-                Channels_Positions+=_T(" R");
+                Channels_Positions+=__T(" R");
                 Count++;
             }
-            Channels_Positions2+=_T('.')+Ztring::ToZtring(Count);
+            Channels_Positions2+=__T('.')+Ztring::ToZtring(Count);
         }
         else
-            Channels_Positions2+=_T("/0");
+            Channels_Positions2+=__T("/0");
         if (channel_mask&0x0130)
         {
             int8u Count=0;
             if (!Channels_Positions.empty())
-                Channels_Positions+=_T(", ");
-            Channels_Positions+=_T("Back:");
+                Channels_Positions+=__T(", ");
+            Channels_Positions+=__T("Back:");
             if (channel_mask&0x0010)
             {
-                Channels_Positions+=_T(" L");
+                Channels_Positions+=__T(" L");
                 Count++;
             }
             if (channel_mask&0x0100)
             {
-                Channels_Positions+=_T(" C");
+                Channels_Positions+=__T(" C");
                 Count++;
             }
             if (channel_mask&0x0020)
             {
-                Channels_Positions+=_T(" R");
+                Channels_Positions+=__T(" R");
                 Count++;
             }
-            Channels_Positions2+=_T('/')+Ztring::ToZtring(Count);
+            Channels_Positions2+=__T('/')+Ztring::ToZtring(Count);
         }
         else
-            Channels_Positions2+=_T("/0");
+            Channels_Positions2+=__T("/0");
         if (channel_mask&0x0008)
         {
             if (!Channels_Positions.empty())
-                Channels_Positions+=_T(", ");
-            Channels_Positions+=_T("LFE");
-            Channels_Positions2+=_T(".1");
+                Channels_Positions+=__T(", ");
+            Channels_Positions+=__T("LFE");
+            Channels_Positions2+=__T(".1");
         }
         Fill(Stream_Audio, 0, Audio_ChannelPositions, Channels_Positions);
         Fill(Stream_Audio, 0, Audio_ChannelPositions_String2, Channels_Positions2);
@@ -585,6 +580,18 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
+void File_Wvpk::id_07()
+{
+    //Parsing
+    Skip_XX(Size,                                               "Data (Not decoded yet)");
+
+    FILLING_BEGIN();
+        if (Retrieve(Stream_Audio, 0, Audio_Compression_Mode).empty())
+            Fill(Stream_Audio, 0, Audio_Compression_Mode, "Lossless");
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
 void File_Wvpk::id_0D()
 {
     //Parsing
@@ -663,57 +670,57 @@
 
     //Filling
     if (flags&0x000001)
-        Encoded_Library_Settings+=_T(" -?");
+        Encoded_Library_Settings+=__T(" -?");
     if (flags&0x000002)
-        Encoded_Library_Settings+=_T(" -f");
+        Encoded_Library_Settings+=__T(" -f");
     if (flags&0x000004)
-        Encoded_Library_Settings+=_T(" -?");
+        Encoded_Library_Settings+=__T(" -?");
     if (flags&0x000008)
-        Encoded_Library_Settings+=_T(" -h");
+        Encoded_Library_Settings+=__T(" -h");
     if (flags&0x000010)
-        Encoded_Library_Settings+=_T(" -hh");
+        Encoded_Library_Settings+=__T(" -hh");
     if (flags&0x000020)
-        Encoded_Library_Settings+=_T(" -?(bitrate is kbps, not bits/sample)");
+        Encoded_Library_Settings+=__T(" -?(bitrate is kbps, not bits/sample)");
     if (flags&0x000040)
-        Encoded_Library_Settings+=_T(" -?(automatic noise shaping)");
+        Encoded_Library_Settings+=__T(" -?(automatic noise shaping)");
     if (flags&0x000080)
-        Encoded_Library_Settings+=_T(" -sn");
+        Encoded_Library_Settings+=__T(" -sn");
     if (flags&0x000100)
-        Encoded_Library_Settings+=_T(" -jn");
+        Encoded_Library_Settings+=__T(" -jn");
     if (flags&0x000200)
-        Encoded_Library_Settings+=_T(" -use-dns");
+        Encoded_Library_Settings+=__T(" -use-dns");
     if (flags&0x000400)
-        Encoded_Library_Settings+=_T(" -e");
+        Encoded_Library_Settings+=__T(" -e");
     if (flags&0x000800)
-        Encoded_Library_Settings+=_T(" -c");
+        Encoded_Library_Settings+=__T(" -c");
     if (flags&0x001000)
-        Encoded_Library_Settings+=_T(" -cc");
+        Encoded_Library_Settings+=__T(" -cc");
     if (flags&0x002000)
-        Encoded_Library_Settings+=_T(" -?");
+        Encoded_Library_Settings+=__T(" -?");
     if (flags&0x004000)
-        Encoded_Library_Settings+=_T(" -?");
+        Encoded_Library_Settings+=__T(" -?");
     if (flags&0x008000)
-        Encoded_Library_Settings+=_T(" -n");
+        Encoded_Library_Settings+=__T(" -n");
     if (flags&0x010000)
-        Encoded_Library_Settings+=_T(" -?(lossy mode)");
+        Encoded_Library_Settings+=__T(" -?(lossy mode)");
     if (flags&0x020000)
     {
-        Encoded_Library_Settings+=_T(" -x");
+        Encoded_Library_Settings+=__T(" -x");
         if (extra)
             Encoded_Library_Settings+=Ztring::ToZtring(extra);
     }
     if (flags&0x04000)
-        Encoded_Library_Settings+=_T(" -?");
+        Encoded_Library_Settings+=__T(" -?");
     if (flags&0x080000)
-        Encoded_Library_Settings+=_T(" -m");
+        Encoded_Library_Settings+=__T(" -m");
     if (flags&0x100000)
-        Encoded_Library_Settings+=_T(" --merge-blocks");
+        Encoded_Library_Settings+=__T(" --merge-blocks");
     if (flags&0x200000)
-        Encoded_Library_Settings+=_T(" -?");
+        Encoded_Library_Settings+=__T(" -?");
     if (flags&0x400000)
-        Encoded_Library_Settings+=_T(" -?");
+        Encoded_Library_Settings+=__T(" -?");
     if (flags&0x800000)
-        Encoded_Library_Settings+=_T(" --optimize-mono");
+        Encoded_Library_Settings+=__T(" --optimize-mono");
     if (!Encoded_Library_Settings.empty())
         Encoded_Library_Settings.erase(Encoded_Library_Settings.begin());
 }

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Audio/File_Wvpk.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Audio/File_Wvpk.h Changed

@@ -1,17 +1,17 @@
 // File_Wvpk - Info for WavePack files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -42,7 +42,7 @@
 {
 public :
     //In
-    size_t Frame_Count_Valid;
+    int64u Frame_Count_Valid;
     bool   FromMKV;
     bool   FromMKV_CodecPrivateParsed;
 
@@ -69,12 +69,10 @@
     void Data_Parse_Fill();
 
     //Elements
+    void id_07();
     void id_0D();
     void id_25();
 
-    //Temp - Global
-    size_t Frame_Count;
-
     //Temp - Technical info
     int32u total_samples_FirstFrame;
     int32u block_index_FirstFrame;

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Duplicate/File__Duplicate_MpegTs.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Duplicate/File__Duplicate_MpegTs.cpp Changed

@@ -1,17 +1,17 @@
 // File__Duplicate_MpegTs - Duplication of some formats
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,14 +22,18 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_MPEGPS_YES) || defined(MEDIAINFO_MPEGTS_YES)
 //---------------------------------------------------------------------------
 
@@ -76,7 +80,7 @@
 bool File__Duplicate_MpegTs::Configure (const Ztring &Value, bool ToRemove)
 {
     //Form: "program_number"
-    if (Value.find(_T("program_number="))==0)
+    if (Value.find(__T("program_number="))==0)
     {
         int16u program_number=Ztring(Value.substr(15, std::string::npos)).To_int16u();
         if (ToRemove)
@@ -97,7 +101,7 @@
             PAT.begin()->second.ConfigurationHasChanged=true;
     }
     //Form: "program_map_PID"
-    else if (Value.find(_T("program_map_PID="))==0)
+    else if (Value.find(__T("program_map_PID="))==0)
     {
         int16u program_map_PID=Ztring(Value.substr(16, std::string::npos)).To_int16u();
         if (ToRemove)
@@ -118,7 +122,7 @@
             PMT[program_map_PID].ConfigurationHasChanged=true;
     }
     //Form: "elementary_PID"
-    else if (Value.find(_T("elementary_PID="))==0)
+    else if (Value.find(__T("elementary_PID="))==0)
     {
         int16u elementary_PID=Ztring(Value.substr(15, std::string::npos)).To_int16u();
         if (ToRemove)
@@ -240,7 +244,7 @@
     if (Wanted_program_numbers.find(StreamID)==Wanted_program_numbers.end()
      && Wanted_program_map_PIDs.find(elementary_PIDs_program_map_PIDs[StreamID])==Wanted_program_numbers.end())
     {
-        delete PMT[StreamID].Buffer; PMT[StreamID].Buffer=NULL;
+        delete[] PMT[StreamID].Buffer; PMT[StreamID].Buffer=NULL;
         return false;
     }
 
@@ -395,7 +399,7 @@
 
     //Copying
     if (ToModify.Buffer!=NULL && ToModify.Size<FromTS.Size)
-        {delete ToModify.Buffer; ToModify.Buffer=NULL;}
+        {delete[] ToModify.Buffer; ToModify.Buffer=NULL;}
     if (ToModify.Buffer==NULL)
         ToModify.Buffer=new int8u[FromTS.Size+(FromTS.Size/188)*4];
     std::memcpy(ToModify.Buffer, FromTS.Buffer, FromTS.Begin+8); //Only up to last_section_number included

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Duplicate/File__Duplicate_MpegTs.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Duplicate/File__Duplicate_MpegTs.h Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Duplicate/File__Duplicate__Base.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Duplicate/File__Duplicate__Base.cpp Changed

@@ -1,17 +1,17 @@
 // File__Duplicate__Base - Duplication of some formats
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,12 +22,16 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 #include "MediaInfo/Duplicate/File__Duplicate__Base.h"
 //---------------------------------------------------------------------------

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Duplicate/File__Duplicate__Base.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Duplicate/File__Duplicate__Base.h Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Duplicate/File__Duplicate__Writer.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Duplicate/File__Duplicate__Writer.cpp Changed

@@ -1,17 +1,17 @@
 // File__Duplicate__Writer - Duplication of some formats
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,12 +22,16 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 #include "MediaInfo/Duplicate/File__Duplicate__Writer.h"
 #include "MediaInfo/MediaInfo_Config.h"
@@ -76,9 +80,9 @@
     //Form: "memory://pointer:size"  <--Memory block is specified by user
     //WARNING: pointer must be in ***DECIMAL*** format.
     //Example: "memory://123456789:1316"
-    if (Target.find(_T("memory://"))==0 && Target.find(_T(":"), 9)!=std::string::npos)
+    if (Target.find(__T("memory://"))==0 && Target.find(__T(":"), 9)!=std::string::npos)
     {
-        size_t SemiColumn_Pos=Target.find(_T(":"), 9);
+        size_t SemiColumn_Pos=Target.find(__T(":"), 9);
         Ztring Address=Target.substr(9, SemiColumn_Pos-9);
         Ztring Size=Target.substr(SemiColumn_Pos+1);
         Method=method_buffer;
@@ -87,7 +91,7 @@
     }
 
     //Form: "file://filename" or     <--the exported filename is specified by user
-    else if (Target.find(_T("file://"))==0)
+    else if (Target.find(__T("file://"))==0)
     {
         Method=method_filename;
         File_Name=Target.substr(7, std::string::npos);

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Duplicate/File__Duplicate__Writer.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Duplicate/File__Duplicate__Writer.h Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Export/Export_Mpeg7.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Export/Export_Mpeg7.cpp Changed

@@ -1,30 +1,35 @@
 // File__Analyze - Base for analyze files
-// Copyright (C) 2009-2009 Jerome Martinez, Zen@MediaArea.net
+// Copyright (C) 2009-2012 Jerome Martinez, Zen@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #include "MediaInfo/Export/Export_Mpeg7.h"
 #include "MediaInfo/File__Analyse_Automatic.h"
 #include <ctime>
@@ -50,29 +55,29 @@
     if (MI.Count_Get(Stream_Image))
     {
         if (MI.Count_Get(Stream_Video) || MI.Count_Get(Stream_Audio))
-            return _T("Multimedia");
+            return __T("Multimedia");
         else
-            return _T("Image");
+            return __T("Image");
     }
     else if (MI.Count_Get(Stream_Video))
     {
         if (MI.Count_Get(Stream_Audio))
-            return _T("AudioVisual");
+            return __T("AudioVisual");
         else
-            return _T("Video");
+            return __T("Video");
     }
     else if (MI.Count_Get(Stream_Audio))
-        return _T("Audio");
+        return __T("Audio");
 
     //Not known
     const Ztring &Format=MI.Get(Stream_General, 0, General_Format);
-    if (Format==_T("AVI") || Format==_T("DV") || Format==_T("MPEG-4") || Format==_T("MPEG-PS") || Format==_T("MPEG-TS") || Format==_T("QuickTime") || Format==_T("Windows Media"))
-        return _T("Video");
-    if (Format==_T("MPEG Audio") || Format==_T("Wave"))
-        return _T("Audio");
-    if (Format==_T("BMP") || Format==_T("GIF") || Format==_T("JPEG") || Format==_T("JPEG 2000") || Format==_T("M-JPEG 2000") || Format==_T("PNG") || Format==_T("TIFF"))
-        return _T("Image");
-    return _T("Multimedia");
+    if (Format==__T("AVI") || Format==__T("DV") || Format==__T("MPEG-4") || Format==__T("MPEG-PS") || Format==__T("MPEG-TS") || Format==__T("QuickTime") || Format==__T("Windows Media"))
+        return __T("Video");
+    if (Format==__T("MPEG Audio") || Format==__T("Wave"))
+        return __T("Audio");
+    if (Format==__T("BMP") || Format==__T("GIF") || Format==__T("JPEG") || Format==__T("JPEG 2000") || Format==__T("JPEG 2000") || Format==__T("PNG") || Format==__T("TIFF"))
+        return __T("Image");
+    return __T("Multimedia");
 }
 
 //---------------------------------------------------------------------------
@@ -97,11 +102,11 @@
 
     //Not known
     const Ztring &Format=MI.Get(Stream_General, 0, General_Format);
-    if (Format==_T("AVI") || Format==_T("DV") || Format==_T("MPEG-4") || Format==_T("MPEG-PS") || Format==_T("MPEG-TS") || Format==_T("QuickTime") || Format==_T("Windows Media"))
+    if (Format==__T("AVI") || Format==__T("DV") || Format==__T("MPEG-4") || Format==__T("MPEG-PS") || Format==__T("MPEG-TS") || Format==__T("QuickTime") || Format==__T("Windows Media"))
         return 40200;
-    if (Format==_T("MPEG Audio") || Format==_T("Wave"))
+    if (Format==__T("MPEG Audio") || Format==__T("Wave"))
         return 10000;
-    if (Format==_T("BMP") || Format==_T("GIF") || Format==_T("JPEG") || Format==_T("JPEG 2000") || Format==_T("M-JPEG 2000") || Format==_T("PNG") || Format==_T("TIFF"))
+    if (Format==__T("BMP") || Format==__T("GIF") || Format==__T("JPEG") || Format==__T("JPEG 2000") || Format==__T("JPEG 2000") || Format==__T("PNG") || Format==__T("TIFF"))
         return 40100;
     return 500000;
 }
@@ -110,14 +115,14 @@
 {
     switch (termID/10000)
     {
-        case  1 : return _T("Audio");
-        case  2 : return _T("Audiovisual");
-        case  3 : return _T("Scene");
+        case  1 : return __T("Audio");
+        case  2 : return __T("Audiovisual");
+        case  3 : return __T("Scene");
         case  4 :   switch ((termID%10000)/100)
                     {
-                        case 1 : return _T("Image");
-                        case 2 : return _T("Video");
-                        case 3 : return _T("Graphics");
+                        case 1 : return __T("Image");
+                        case 2 : return __T("Video");
+                        case 3 : return __T("Graphics");
                     }
         case 50 : return Ztring(); //Unknown
         default : return Ztring();
@@ -129,17 +134,17 @@
 {
     const Ztring &Format=MI.Get(Stream_General, 0, General_Format);
 
-    if (Format==_T("MPEG Audio"))
+    if (Format==__T("MPEG Audio"))
     {
-        if (MI.Get(Stream_Audio, 0, Audio_Format_Profile).find(_T("2"))!=string::npos)
+        if (MI.Get(Stream_Audio, 0, Audio_Format_Profile).find(__T("2"))!=string::npos)
             return 500000; //mp2
-        if (MI.Get(Stream_Audio, 0, Audio_Format_Profile).find(_T("1"))!=string::npos)
+        if (MI.Get(Stream_Audio, 0, Audio_Format_Profile).find(__T("1"))!=string::npos)
             return 510000; //mp1
         return 0;
     }
-    if (Format==_T("Wave") && MI.Get(Stream_Audio, 0, Audio_Format_Profile)==_T("RF64"))
+    if (Format==__T("Wave") && MI.Get(Stream_General, 0, General_Format_Profile)==__T("RF64"))
         return 520000; //Wav (RF64)
-    if (Format==_T("Wave64"))
+    if (Format==__T("Wave64"))
         return 530000;
     return 0;
 }
@@ -149,42 +154,42 @@
 {
     const Ztring &Format=MI.Get(Stream_General, 0, General_Format);
 
-    if (Format==_T("AVI"))
+    if (Format==__T("AVI"))
         return 70000;
-    if (Format==_T("BMP"))
+    if (Format==__T("BMP"))
         return 110000;
-    if (Format==_T("GIF"))
+    if (Format==__T("GIF"))
         return 120000;
-    if (Format==_T("DV"))
+    if (Format==__T("DV"))
         return 60000;
-    if (Format==_T("JPEG"))
+    if (Format==__T("JPEG"))
         return 10000;
-    if (Format==_T("JPEG 2000") || Format==_T("M-JPEG 2000"))
+    if (Format==__T("JPEG 2000") || Format==__T("JPEG 2000"))
         return 20000;
-    if (Format==_T("MPEG Audio"))
-        return (MI.Get(Stream_Audio, 0, Audio_Format_Profile).find(_T("3"))!=string::npos)?40000:0;
-    if (Format==_T("MPEG-4"))
+    if (Format==__T("MPEG Audio"))
+        return (MI.Get(Stream_Audio, 0, Audio_Format_Profile).find(__T("3"))!=string::npos)?40000:0;
+    if (Format==__T("MPEG-4"))
         return 50000;
-    if (Format==_T("MPEG-PS"))
+    if (Format==__T("MPEG-PS"))
         return 30100;
-    if (Format==_T("MPEG-TS"))
+    if (Format==__T("MPEG-TS"))
         return 30200;
-    if (Format==_T("PNG"))
+    if (Format==__T("PNG"))
         return 150000;
-    if (Format==_T("QuickTime"))
+    if (Format==__T("QuickTime"))
         return 160000;
-    if (Format==_T("TIFF"))
+    if (Format==__T("TIFF"))
         return 180000;
-    if (Format==_T("Wave"))
+    if (Format==__T("Wave"))
     {
-        if (!MI.Get(Stream_Audio, 0, Audio_Format_Profile).empty())
-            return 00000;
+        if (!MI.Get(Stream_General, 0, General_Format_Profile).empty())
+            return Mpeg7_FileFormatCS_termID_MediaInfo(MI); //Out of specs
         else
             return 90000;
     }
-    if (Format==_T("Windows Media"))
+    if (Format==__T("Windows Media"))
         return 190000;
-    if (Format==_T("ZIP"))
+    if (Format==__T("ZIP"))
         return 100000;
 
     //Out of specs
@@ -195,38 +200,38 @@
 {
     switch (termID/10000)
     {
-        case  1 : return _T("jpeg");
-        case  2 : return _T("JPEG 2000");
+        case  1 : return __T("jpeg");
+        case  2 : return __T("JPEG 2000");
         case  3 :   switch ((termID%10000)/100)
                     {
-                        case 1 : return _T("mpeg-ps");
-                        case 2 : return _T("mpeg-ts");
-                        default: return _T("mpeg");
+                        case 1 : return __T("mpeg-ps");
+                        case 2 : return __T("mpeg-ts");
+                        default: return __T("mpeg");
                     }
-        case  4 : return _T("mp3");
-        case  5 : return _T("mp4");
-        case  6 : return _T("dv");
-        case  7 : return _T("avi");
-        case  8 : return _T("bdf");
-        case  9 : return _T("wav");
-        case 10 : return _T("zip");
-        case 11 : return _T("bmp");
-        case 12 : return _T("gif");
-        case 13 : return _T("photocd");
-        case 14 : return _T("ppm");
-        case 15 : return _T("png");
-        case 16 : return _T("quicktime");
-        case 17 : return _T("spiff");
-        case 18 : return _T("tiff");
-        case 19 : return _T("asf");
-        case 20 : return _T("iff");
-        case 21 : return _T("miff");
-        case 22 : return _T("pcx");
+        case  4 : return __T("mp3");
+        case  5 : return __T("mp4");
+        case  6 : return __T("dv");
+        case  7 : return __T("avi");
+        case  8 : return __T("bdf");
+        case  9 : return __T("wav");
+        case 10 : return __T("zip");
+        case 11 : return __T("bmp");
+        case 12 : return __T("gif");
+        case 13 : return __T("photocd");
+        case 14 : return __T("ppm");
+        case 15 : return __T("png");
+        case 16 : return __T("quicktime");
+        case 17 : return __T("spiff");
+        case 18 : return __T("tiff");
+        case 19 : return __T("asf");
+        case 20 : return __T("iff");
+        case 21 : return __T("miff");
+        case 22 : return __T("pcx");
         //Out of specs --> MediaInfo CS
-        case 50 : return _T("mp1");
-        case 51 : return _T("mp2");
-        case 52 : return _T("wav-rf64)");
-        case 53 : return _T("wave64");
+        case 50 : return __T("mp1");
+        case 51 : return __T("mp2");
+        case 52 : return __T("wav-rf64");
+        case 53 : return __T("wave64");
         default : return MI.Get(Stream_General, 0, General_Format);
     }
 }
@@ -238,60 +243,288 @@
     const Ztring &Version=MI.Get(Stream_Video, StreamPos, Video_Format_Version);
     const Ztring &Profile=MI.Get(Stream_Video, StreamPos, Video_Format_Profile);
 
-    if (Format==_T("MPEG Video"))
+    if (Format==__T("MPEG Video"))
     {
-        if (Version.find(_T("1"))!=string::npos)
+        if (Version.find(__T("1"))!=string::npos)
             return 10000;
-        if (Version.find(_T("2"))!=string::npos)
+        if (Version.find(__T("2"))!=string::npos)
         {
-            if (Profile.find(_T("Simple"))!=string::npos)
+            if (Profile.find(__T("Simple@"))!=string::npos)
             {
-                if (Profile.find(_T("Main"))!=string::npos)
+                if (Profile.find(__T("Main"))!=string::npos)
                     return 20101;
                 return 20100;
             }
-            if (Profile.find(_T("Main@"))!=string::npos)
+            if (Profile.find(__T("Main@"))!=string::npos)
             {
-                if (Profile.find(_T("Low"))!=string::npos)
+                if (Profile.find(__T("Low"))!=string::npos)
                     return 20201;
-                if (Profile.find(_T("@Main"))!=string::npos)
+                if (Profile.find(__T("@Main"))!=string::npos)
                     return 20202;
-                if (Profile.find(_T("High 1440"))!=string::npos)
+                if (Profile.find(__T("High 1440"))!=string::npos)
                     return 20203;
-                if (Profile.find(_T("High"))!=string::npos)
+                if (Profile.find(__T("High"))!=string::npos)
                     return 20204;
                 return 20200;
             }
-            if (Profile.find(_T("SNR Scalable"))!=string::npos)
+            if (Profile.find(__T("SNR Scalable@"))!=string::npos)
             {
-                if (Profile.find(_T("Low"))!=string::npos)
+                if (Profile.find(__T("Low"))!=string::npos)
                     return 20301;
-                if (Profile.find(_T("Main"))!=string::npos)
+                if (Profile.find(__T("Main"))!=string::npos)
                     return 20302;
                 return 20300;
             }
-            if (Profile.find(_T("Spatial Sclable"))!=string::npos)
+            if (Profile.find(__T("Spatial Sclable@"))!=string::npos)
             {
-                if (Profile.find(_T("Main"))!=string::npos)
+                if (Profile.find(__T("Main"))!=string::npos)
                     return 20401;
-                if (Profile.find(_T("High 1440"))!=string::npos)
+                if (Profile.find(__T("High 1440"))!=string::npos)
                     return 20402;
-                if (Profile.find(_T("High"))!=string::npos)
+                if (Profile.find(__T("High"))!=string::npos)
                     return 20403;
                 return 20400;
             }
-            if (Profile.find(_T("High"))!=string::npos)
+            if (Profile.find(__T("High@"))!=string::npos)
             {
-                if (Profile.find(_T("Main"))!=string::npos)
+                if (Profile.find(__T("Main"))!=string::npos)
                     return 20501;
-                if (Profile.find(_T("High 1440"))!=string::npos)
+                if (Profile.find(__T("High 1440"))!=string::npos)
                     return 20502;
-                if (Profile.find(_T("High"))!=string::npos)
+                if (Profile.find(__T("High"))!=string::npos)
                     return 20503;
                 return 20500;
             }
+            if (Profile.find(__T("Multi-view@"))!=string::npos)
+            {
+                if (Profile.find(__T("Main"))!=string::npos)
+                    return 20601;
+                return 20600;
+            }
+            if (Profile.find(__T("4:2:2@"))!=string::npos)
+            {
+                if (Profile.find(__T("Main"))!=string::npos)
+                    return 20701;
+                return 20700;
+            }
+            return 20000;
+        }
+    }
+    if (Format==__T("MPEG-4 Visual"))
+    {
+        if (Profile.find(__T("Simple@"))==0)
+        {
+            if (Profile.find(__T("L0"))!=string::npos)
+                return 30101;
+            if (Profile.find(__T("L1"))!=string::npos)
+                return 30102;
+            if (Profile.find(__T("L2"))!=string::npos)
+                return 30103;
+            if (Profile.find(__T("L3"))!=string::npos)
+                return 30104;
+            if (Profile.find(__T("L4"))!=string::npos)
+                return 30105;
+            if (Profile.find(__T("L5"))!=string::npos)
+                return 30106;
+            return 30100;
+        }
+        if (Profile.find(__T("Simple Scalable@"))==0)
+        {
+            if (Profile.find(__T("L1"))!=string::npos)
+                return 30201;
+            if (Profile.find(__T("L2"))!=string::npos)
+                return 30202;
+            if (Profile.find(__T("L3"))!=string::npos)
+                return 30203;
+            return 30200;
+        }
+        if (Profile.find(__T("Advanced Simple@"))==0)
+        {
+            if (Profile.find(__T("L0"))!=string::npos)
+                return 30301;
+            if (Profile.find(__T("L1"))!=string::npos)
+                return 30302;
+            if (Profile.find(__T("L2"))!=string::npos)
+                return 30303;
+            if (Profile.find(__T("L3"))!=string::npos)
+                return 30304;
+            if (Profile.find(__T("L4"))!=string::npos)
+                return 30305;
+            if (Profile.find(__T("L5"))!=string::npos)
+                return 30306;
+            return 30100;
+        }
+        if (Profile.find(__T("Core@"))==0)
+        {
+            if (Profile.find(__T("L1"))!=string::npos)
+                return 30401;
+            if (Profile.find(__T("L2"))!=string::npos)
+                return 30402;
+            return 30400;
+        }
+        if (Profile.find(__T("Core Scalable@"))==0)
+        {
+            if (Profile.find(__T("L1"))!=string::npos)
+                return 30501;
+            if (Profile.find(__T("L2"))!=string::npos)
+                return 30502;
+            if (Profile.find(__T("L3"))!=string::npos)
+                return 30503;
+            return 30500;
+        }
+        if (Profile.find(__T("Advanced Core@"))==0)
+        {
+            if (Profile.find(__T("L1"))!=string::npos)
+                return 30601;
+            if (Profile.find(__T("L2"))!=string::npos)
+                return 30602;
+            return 30600;
+        }
+        if (Profile.find(__T("Main@"))==0)
+        {
+            if (Profile.find(__T("L2"))!=string::npos)
+                return 30701;
+            if (Profile.find(__T("L3"))!=string::npos)
+                return 30702;
+            if (Profile.find(__T("L4"))!=string::npos)
+                return 30703;
+            return 30700;
+        }
+        if (Profile.find(__T("N-bit@"))==0)
+        {
+            if (Profile.find(__T("L2"))!=string::npos)
+                return 30801;
+            return 30800;
+        }
+        if (Profile.find(__T("Advanced Real Time Simple@"))==0)
+        {
+            if (Profile.find(__T("L1"))!=string::npos)
+                return 30901;
+            if (Profile.find(__T("L2"))!=string::npos)
+                return 30902;
+            if (Profile.find(__T("L3"))!=string::npos)
+                return 30903;
+            if (Profile.find(__T("L4"))!=string::npos)
+                return 30904;
+            return 30900;
+        }
+        if (Profile.find(__T("Advanced Coding Efficiency@"))==0)
+        {
+            if (Profile.find(__T("L1"))!=string::npos)
+                return 31001;
+            if (Profile.find(__T("L2"))!=string::npos)
+                return 31002;
+            if (Profile.find(__T("L3"))!=string::npos)
+                return 31003;
+            if (Profile.find(__T("L4"))!=string::npos)
+                return 31004;
+            return 31000;
+        }
+        if (Profile.find(__T("Simple Studio@"))==0)
+        {
+            if (Profile.find(__T("L1"))!=string::npos)
+                return 31101;
+            if (Profile.find(__T("L2"))!=string::npos)
+                return 31102;
+            if (Profile.find(__T("L3"))!=string::npos)
+                return 31103;
+            if (Profile.find(__T("L4"))!=string::npos)
+                return 31104;
+            return 31100;
+        }
+        if (Profile.find(__T("Core Studio@"))==0)
+        {
+            if (Profile.find(__T("L1"))!=string::npos)
+                return 31201;
+            if (Profile.find(__T("L2"))!=string::npos)
+                return 31202;
+            if (Profile.find(__T("L3"))!=string::npos)
+                return 31203;
+            if (Profile.find(__T("L4"))!=string::npos)
+                return 31204;
+            return 31200;
+        }
+        if (Profile.find(__T("Fine Granularity Scalable@"))==0)
+        {
+            if (Profile.find(__T("L0"))!=string::npos)
+                return 31301;
+            if (Profile.find(__T("L1"))!=string::npos)
+                return 31302;
+            if (Profile.find(__T("L2"))!=string::npos)
+                return 31303;
+            if (Profile.find(__T("L3"))!=string::npos)
+                return 31304;
+            if (Profile.find(__T("L4"))!=string::npos)
+                return 31305;
+            if (Profile.find(__T("L5"))!=string::npos)
+                return 31306;
+            return 31300;
+        }
+        if (Profile.find(__T("Simple Face Animation@"))==0)
+        {
+            if (Profile.find(__T("L1"))!=string::npos)
+                return 31401;
+            if (Profile.find(__T("L2"))!=string::npos)
+                return 31402;
+            return 31400;
+        }
+        if (Profile.find(__T("Simple FBA@"))==0)
+        {
+            if (Profile.find(__T("L1"))!=string::npos)
+                return 31501;
+            if (Profile.find(__T("L2"))!=string::npos)
+                return 31502;
+            return 31500;
+        }
+        if (Profile.find(__T("Basic Animated Texture@"))==0)
+        {
+            if (Profile.find(__T("L1"))!=string::npos)
+                return 31601;
+            if (Profile.find(__T("L2"))!=string::npos)
+                return 31602;
+            return 31600;
+        }
+        if (Profile.find(__T("Scalable Texture@"))==0)
+        {
+            if (Profile.find(__T("L1"))!=string::npos)
+                return 31701;
+            return 31700;
+        }
+        if (Profile.find(__T("Advanced Scalable Texture@"))==0)
+        {
+            if (Profile.find(__T("L1"))!=string::npos)
+                return 31801;
+            if (Profile.find(__T("L2"))!=string::npos)
+                return 31802;
+            if (Profile.find(__T("L3"))!=string::npos)
+                return 31803;
+            return 31800;
+        }
+        if (Profile.find(__T("Hybrid@"))==0)
+        {
+            if (Profile.find(__T("L1"))!=string::npos)
+                return 31901;
+            if (Profile.find(__T("L2"))!=string::npos)
+                return 31902;
+            return 31900;
         }
+        return 30000;
     }
+    if (Format==__T("JPEG"))
+        return 50000;
+    if (Format==__T("JPEG 2000"))
+    {
+        const Ztring &CodecID=MI.Get(Stream_Video, StreamPos, Video_CodecID);
+        if (CodecID==__T("mjp2"))
+            return 60100;
+        if (CodecID==__T("mjs2"))
+            return 60200;
+        return 60000;
+    }
+    if (Format==__T("H.261"))
+        return 70000;
+    if (Format==__T("H.263"))
+        return 80000;
 
     return 0;
 }
@@ -300,54 +533,196 @@
 {
     switch (termID/10000)
     {
-        case 1 : return _T("MPEG-1 Video");
+        case 1 : return __T("MPEG-1 Video");
         case 2 :    switch ((termID%10000)/100)
                     {
                         case 1 :    switch (termID%100)
                                     {
-                                        case 1 : return _T("MPEG-2 Video Simple Profile @ Main Level");
-                                        default: return _T("MPEG-2 Video Simple Profile");
+                                        case 1 : return __T("MPEG-2 Video Simple Profile @ Main Level");
+                                        default: return __T("MPEG-2 Video Simple Profile");
                                     }
                         case 2 :    switch (termID%100)
                                     {
-                                        case 1 : return _T("MPEG-2 Video Main Profile @ Low Level");
-                                        case 2 : return _T("MPEG-2 Video Main Profile @ Main Level");
-                                        case 3 : return _T("MPEG-2 Video Main Profile @ High 1440 Level");
-                                        case 4 : return _T("MPEG-2 Video Main Profile @ High Level");
-                                        default: return _T("MPEG-2 Video Main Profile");
+                                        case 1 : return __T("MPEG-2 Video Main Profile @ Low Level");
+                                        case 2 : return __T("MPEG-2 Video Main Profile @ Main Level");
+                                        case 3 : return __T("MPEG-2 Video Main Profile @ High 1440 Level");
+                                        case 4 : return __T("MPEG-2 Video Main Profile @ High Level");
+                                        default: return __T("MPEG-2 Video Main Profile");
                                     }
                         case 3 :    switch (termID%100)
                                     {
-                                        case 1 : return _T("MPEG-2 Video SNR Scalable Profile @ Low Level");
-                                        case 2 : return _T("MPEG-2 Video SNR Scalable Profile @ Main Level");
-                                        default: return _T("MPEG-2 Video SNR Scalable Profile");
+                                        case 1 : return __T("MPEG-2 Video SNR Scalable Profile @ Low Level");
+                                        case 2 : return __T("MPEG-2 Video SNR Scalable Profile @ Main Level");
+                                        default: return __T("MPEG-2 Video SNR Scalable Profile");
                                     }
                         case 4 :    switch (termID%100)
                                     {
-                                        case 1 : return _T("MPEG-2 Video Spatial Scalable Profile @ Main Level");
-                                        case 2 : return _T("MPEG-2 Video Spatial Scalable Profile @ High 1440 Level");
-                                        case 3 : return _T("MPEG-2 Video Spatial Scalable Profile @ High Level");
-                                        default: return _T("MPEG-2 Video Spatial Scalable Profile");
+                                        case 1 : return __T("MPEG-2 Video Spatial Scalable Profile @ Main Level");
+                                        case 2 : return __T("MPEG-2 Video Spatial Scalable Profile @ High 1440 Level");
+                                        case 3 : return __T("MPEG-2 Video Spatial Scalable Profile @ High Level");
+                                        default: return __T("MPEG-2 Video Spatial Scalable Profile");
                                     }
                         case 5 :    switch (termID%100)
                                     {
-                                        case 1 : return _T("MPEG-2 Video High Profile @ Main Level");
-                                        case 2 : return _T("MPEG-2 Video High Profile @ High 1440 Level");
-                                        case 3 : return _T("MPEG-2 Video High Profile @ High Level");
-                                        default: return _T("MPEG-2 Video High Profile");
+                                        case 1 : return __T("MPEG-2 Video High Profile @ Main Level");
+                                        case 2 : return __T("MPEG-2 Video High Profile @ High 1440 Level");
+                                        case 3 : return __T("MPEG-2 Video High Profile @ High Level");
+                                        default: return __T("MPEG-2 Video High Profile");
                                     }
                         case 6 :    switch (termID%100)
                                     {
-                                        case 1 : return _T("MPEG-2 Video Multiview Profile @ Main Level");
-                                        default: return _T("MPEG-2 Video Multiview Profile");
+                                        case 1 : return __T("MPEG-2 Video Multiview Profile @ Main Level");
+                                        default: return __T("MPEG-2 Video Multiview Profile");
                                     }
                         case 7 :    switch (termID%100)
                                     {
-                                        case 1 : return _T("MPEG-2 Video 4:2:2 Profile @ Main Level");
-                                        default: return _T("MPEG-2 Video 4:2:2 Profile");
+                                        case 1 : return __T("MPEG-2 Video 4:2:2 Profile @ Main Level");
+                                        default: return __T("MPEG-2 Video 4:2:2 Profile");
+                                    }
+                        default: return __T("MPEG-2 Video");
+                    }
+        case 3 :    switch ((termID%10000)/100)
+                    {
+                        case  1 :   switch (termID%100)
+                                    {
+                                        case 1 : return __T("MPEG-4 Visual Simple Profile @ Level 0");
+                                        case 2 : return __T("MPEG-4 Visual Simple Profile @ Level 1");
+                                        case 3 : return __T("MPEG-4 Visual Simple Profile @ Level 2");
+                                        case 4 : return __T("MPEG-4 Visual Simple Profile @ Level 3");
+                                        default: return __T("MPEG-4 Visual Simple Profile");
+                                    }
+                        case  2 :   switch (termID%100)
+                                    {
+                                        case 1 : return __T("MPEG-4 Visual Simple Scalable Profile @ Level 1");
+                                        case 2 : return __T("MPEG-4 Visual Simple Scalable Profile @ Level 2");
+                                        default: return __T("MPEG-4 Visual Simple Scalable Profile");
+                                    }
+                        case  3 :   switch (termID%100)
+                                    {
+                                        case 1 : return __T("MPEG-4 Advanced Visual Simple Profile @ Level 0");
+                                        case 2 : return __T("MPEG-4 Advanced Visual Simple Profile @ Level 1");
+                                        case 3 : return __T("MPEG-4 Advanced Visual Simple Profile @ Level 2");
+                                        case 4 : return __T("MPEG-4 Advanced Visual Simple Profile @ Level 3");
+                                        case 5 : return __T("MPEG-4 Advanced Visual Simple Profile @ Level 4");
+                                        case 6 : return __T("MPEG-4 Advanced Visual Simple Profile @ Level 5");
+                                        default: return __T("MPEG-4 Advanced Visual Simple Profile");
+                                    }
+                        case  4 :   switch (termID%100)
+                                    {
+                                        case 1 : return __T("MPEG-4 Visual Core Profile @ Level 1");
+                                        case 2 : return __T("MPEG-4 Visual Core Profile @ Level 2");
+                                        default: return __T("MPEG-4 Visual Core Profile");
+                                    }
+                        case  5 :   switch (termID%100)
+                                    {
+                                        case 1 : return __T("MPEG-4 Visual Core-Scalable Profile @ Level 1");
+                                        case 2 : return __T("MPEG-4 Visual Core-Scalable Profile @ Level 2");
+                                        case 3 : return __T("MPEG-4 Visual Core-Scalable Profile @ Level 3");
+                                        default: return __T("MPEG-4 Visual Core-Scalable Profile");
+                                    }
+                        case  6 :   switch (termID%100)
+                                    {
+                                        case 1 : return __T("MPEG-4 Visual AdvancedCore Profile @ Level 1");
+                                        case 2 : return __T("MPEG-4 Visual AdvancedCore Profile @ Level 2");
+                                        default: return __T("MPEG-4 Visual AdvancedCore Profile");
+                                    }
+                        case  7 :   switch (termID%100)
+                                    {
+                                        case 1 : return __T("MPEG-4 Visual Main Profile @ Level 2");
+                                        case 2 : return __T("MPEG-4 Visual Main Profile @ Level 3");
+                                        case 3 : return __T("MPEG-4 Visual Main Profile @ Level 4");
+                                        default: return __T("MPEG-4 Visual Main Profile");
+                                    }
+                        case  8 :   switch (termID%100)
+                                    {
+                                        case 1 : return __T("MPEG-4 Visual N-bit Profile @ Level 2");
+                                        default: return __T("MPEG-4 Visual Main Profile");
+                                    }
+                        case  9 :   switch (termID%100)
+                                    {
+                                        case 1 : return __T("MPEG-4 Visual Advanced Real Time Simple Profile @ Level 1");
+                                        case 2 : return __T("MPEG-4 Visual Advanced Real Time Simple Profile @ Level 2");
+                                        case 3 : return __T("MPEG-4 Visual Advanced Real Time Simple Profile @ Level 3");
+                                        case 4 : return __T("MPEG-4 Visual Advanced Real Time Simple Profile @ Level 4");
+                                        default: return __T("MPEG-4 Visual Advanced Real Time Simple Profile");
+                                    }
+                        case 10 :   switch (termID%100)
+                                    {
+                                        case 1 : return __T("MPEG-4 Visual Advanced Coding Efficiency Profile @ Level 1");
+                                        case 2 : return __T("MPEG-4 Visual Advanced Coding Efficiency Profile @ Level 2");
+                                        case 3 : return __T("MPEG-4 Visual Advanced Coding Efficiency Profile @ Level 3");
+                                        case 4 : return __T("MPEG-4 Visual Advanced Coding Efficiency Profile @ Level 4");
+                                        default: return __T("MPEG-4 Visual Advanced Coding Efficiency Profile");
+                                    }
+                        case 11 :   switch (termID%100)
+                                    {
+                                        case 1 : return __T("MPEG-4 Visual Simple Studio Profile @ Level 1");
+                                        case 2 : return __T("MPEG-4 Visual Simple Studio Profile @ Level 2");
+                                        case 3 : return __T("MPEG-4 Visual Simple Studio Profile @ Level 3");
+                                        case 4 : return __T("MPEG-4 Visual Simple Studio Profile @ Level 4");
+                                        default: return __T("MPEG-4 Visual Simple Studio Profile");
+                                    }
+                        case 12 :   switch (termID%100)
+                                    {
+                                        case 1 : return __T("MPEG-4 Visual Core Studio Profile @ Level 1");
+                                        case 2 : return __T("MPEG-4 Visual Core Studio Profile @ Level 2");
+                                        case 3 : return __T("MPEG-4 Visual Core Studio Profile @ Level 3");
+                                        case 4 : return __T("MPEG-4 Visual Core Studio Profile @ Level 4");
+                                        default: return __T("MPEG-4 Visual Core Studio Profile");
+                                    }
+                        case 13 :   switch (termID%100)
+                                    {
+                                        case 1 : return __T("MPEG-4 Visual Fine Granularity Scalable Profile @ Level 0");
+                                        case 2 : return __T("MPEG-4 Visual Fine Granularity Scalable Profile @ Level 1");
+                                        case 3 : return __T("MPEG-4 Visual Fine Granularity Scalable Profile @ Level 2");
+                                        case 4 : return __T("MPEG-4 Visual Fine Granularity Scalable Profile @ Level 3");
+                                        case 5 : return __T("MPEG-4 Visual Fine Granularity Scalable Profile @ Level 4");
+                                        case 6 : return __T("MPEG-4 Visual Fine Granularity Scalable Profile @ Level 5");
+                                        default: return __T("MPEG-4 Visual Fine Granularity Scalable Profile");
+                                    }
+                        case 14 :   switch (termID%100)
+                                    {
+                                        case 1 : return __T("MPEG-4 Simple Face Animation Profile @ Level 1");
+                                        case 2 : return __T("MPEG-4 Simple Face Animation Profile @ Level 2");
+                                        default: return __T("MPEG-4 Simple Face Animation Profile");
+                                    }
+                        case 15 :   switch (termID%100)
+                                    {
+                                        case 1 : return __T("MPEG-4 Simple FBA Profile @ Level 1");
+                                        case 2 : return __T("MPEG-4 Simple FBA Profile @ Level 2");
+                                        default: return __T("MPEG-4 Simple FBA Profile");
+                                    }
+                        case 16 :   switch (termID%100)
+                                    {
+                                        case 1 : return __T("MPEG-4 Basic Animated Texture Profile @ Level 1");
+                                        case 2 : return __T("MPEG-4 Basic Animated Texture Profile @ Level 2");
+                                        default: return __T("MPEG-4 Basic Animated Texture Profile");
+                                    }
+                        case 17 :   switch (termID%100)
+                                    {
+                                        case 1 : return __T("MPEG-4 Advanced Scalable Texture Profile @ Level 1");
+                                        default: return __T("MPEG-4 Advanced Scalable Texture Profile");
+                                    }
+                        case 18 :   switch (termID%100)
+                                    {
+                                        case 1 : return __T("MPEG-4 Visual Advanced Scalable Texture Profile @ Level 1");
+                                        case 2 : return __T("MPEG-4 Visual Advanced Scalable Texture Profile @ Level 2");
+                                        case 3 : return __T("MPEG-4 Visual Advanced Scalable Texture Profile @ Level 3");
+                                        default: return __T("MPEG-4 Visual Advanced Scalable Texture Profile");
+                                    }
+                        case 19 :   switch (termID%100)
+                                    {
+                                        case 1 : return __T("MPEG-4 Visual Hybrid Profile @ Level 1");
+                                        case 2 : return __T("MPEG-4 Visual Hybrid Profile @ Level 2");
+                                        default: return __T("MPEG-4 Visual Hybrid Profile");
                                     }
-                        default: return _T("MPEG-2 Video");
+                        default: return __T("MPEG-4 Visual");
                     }
+        case 4 :    return __T("JPEG");
+        case 5 :    return __T("MJPEG");
+        case 6 :    return __T("JPEG2000");
+        case 7 :    return __T("H261");
+        case 8 :    return __T("H263");
         default: return MI.Get(Stream_Video, StreamPos, Video_Format);
     }
 }
@@ -356,21 +731,21 @@
 Ztring Mpeg7_Visual_colorDomain(MediaInfo_Internal &MI, size_t StreamPos)
 {
     const Ztring &Colorimetry=MI.Get(Stream_Video, StreamPos, Video_Colorimetry);
-    if (Colorimetry.find(_T("4:"))!=string::npos)
-        return _T(" colorDomain=\"color\"");
-    if (Colorimetry==_T("Gray"))
-        return _T(" colorDomain=\"graylevel\"");
-    return _T("");
+    if (Colorimetry.find(__T("4:"))!=string::npos)
+        return __T(" colorDomain=\"color\"");
+    if (Colorimetry==__T("Gray"))
+        return __T(" colorDomain=\"graylevel\"");
+    return __T("");
 }
 
 //---------------------------------------------------------------------------
 int32u Mpeg7_SystemCS_termID(MediaInfo_Internal &MI, size_t StreamPos)
 {
-    if (MI.Get(Stream_Video, StreamPos, Video_Standard)==_T("PAL"))
+    if (MI.Get(Stream_Video, StreamPos, Video_Standard)==__T("PAL"))
         return 10000;
-    if (MI.Get(Stream_Video, StreamPos, Video_Standard)==_T("SECAM"))
+    if (MI.Get(Stream_Video, StreamPos, Video_Standard)==__T("SECAM"))
         return 20000;
-    if (MI.Get(Stream_Video, StreamPos, Video_Standard)==_T("NTSC"))
+    if (MI.Get(Stream_Video, StreamPos, Video_Standard)==__T("NTSC"))
         return 30000;
     return 0;
 }
@@ -379,9 +754,9 @@
 {
     switch (termID/10000)
     {
-        case  1 : return _T("PAL");
-        case  2 : return _T("SECAM");
-        case  3 : return _T("NTSC");
+        case  1 : return __T("PAL");
+        case  2 : return __T("SECAM");
+        case  3 : return __T("NTSC");
         default : return Ztring();
     }
 }
@@ -393,35 +768,35 @@
     const Ztring &Version=MI.Get(Stream_Audio, StreamPos, Audio_Format_Version);
     const Ztring &Profile=MI.Get(Stream_Audio, StreamPos, Audio_Format_Profile);
 
-    if (Format==_T("AC-3"))
+    if (Format==__T("AC-3"))
         return 10000;
-    if (Format==_T("DTS"))
+    if (Format==__T("DTS"))
         return 20000;
-    if (Format==_T("MPEG Audio"))
+    if (Format==__T("MPEG Audio"))
     {
-        if (Version.find(_T("1"))!=string::npos)
+        if (Version.find(__T("1"))!=string::npos)
         {
-            if (Profile.find(_T("1"))!=string::npos)
+            if (Profile.find(__T("1"))!=string::npos)
                 return 30100;
-            if (Profile.find(_T("2"))!=string::npos)
+            if (Profile.find(__T("2"))!=string::npos)
                 return 30200;
-            if (Profile.find(_T("3"))!=string::npos)
+            if (Profile.find(__T("3"))!=string::npos)
                 return 30300;
             return 30000;
         }
-        if (Version.find(_T("2"))!=string::npos)
+        if (Version.find(__T("2"))!=string::npos)
         {
-            if (Profile.find(_T("1"))!=string::npos)
+            if (Profile.find(__T("1"))!=string::npos)
                 return 40100;
-            if (Profile.find(_T("2"))!=string::npos)
+            if (Profile.find(__T("2"))!=string::npos)
                 return 40200;
-            if (Profile.find(_T("3"))!=string::npos)
+            if (Profile.find(__T("3"))!=string::npos)
                 return 40300;
             return 40000;
         }
         return 0;
     }
-    if (Format==_T("PCM"))
+    if (Format==__T("PCM"))
         return 80000;
 
     return 0;
@@ -431,34 +806,34 @@
 {
     switch (termID/10000)
     {
-        case 1 : return _T("AC3");
-        case 2 : return _T("DTS");
+        case 1 : return __T("AC3");
+        case 2 : return __T("DTS");
         case 3 :    switch ((termID%10000)/100)
                     {
-                        case 1 : return _T("MPEG-1 Audio Layer I");
-                        case 2 : return _T("MPEG-1 Audio Layer II");
-                        case 3 : return _T("MPEG-1 Audio Layer III");
-                        default: return _T("MPEG-1 Audio");
+                        case 1 : return __T("MPEG-1 Audio Layer I");
+                        case 2 : return __T("MPEG-1 Audio Layer II");
+                        case 3 : return __T("MPEG-1 Audio Layer III");
+                        default: return __T("MPEG-1 Audio");
                     }
         case 4 :    switch ((termID%10000)/100)
                     {
                         case 1 :    switch (termID%100)
                                     {
-                                        case 1 : return _T("MPEG-2 Audio Low Sampling Rate Layer I");
-                                        case 2 : return _T("MPEG-2 Audio Low Sampling Rate Layer II");
-                                        case 3 : return _T("MPEG-2 Audio Low Sampling Rate Layer III");
-                                        default: return _T("MPEG-2 Audio Low Sampling Rate");
+                                        case 1 : return __T("MPEG-2 Audio Low Sampling Rate Layer I");
+                                        case 2 : return __T("MPEG-2 Audio Low Sampling Rate Layer II");
+                                        case 3 : return __T("MPEG-2 Audio Low Sampling Rate Layer III");
+                                        default: return __T("MPEG-2 Audio Low Sampling Rate");
                                     }
                         case 2 :    switch (termID%100)
                                     {
-                                        case 1 : return _T("MPEG-2 Backward Compatible Multi-Channel Layer I");
-                                        case 2 : return _T("MPEG-2 Backward Compatible Multi-Channel Layer II");
-                                        case 3 : return _T("MPEG-2 Backward Compatible Multi-Channel Layer III");
-                                        default: return _T("MPEG-2 Backward Compatible Multi-Channel");
+                                        case 1 : return __T("MPEG-2 Backward Compatible Multi-Channel Layer I");
+                                        case 2 : return __T("MPEG-2 Backward Compatible Multi-Channel Layer II");
+                                        case 3 : return __T("MPEG-2 Backward Compatible Multi-Channel Layer III");
+                                        default: return __T("MPEG-2 Backward Compatible Multi-Channel");
                                     }
-                        default: return _T("MPEG-2 Audio");
+                        default: return __T("MPEG-2 Audio");
                     }
-        case 8 : return _T("Linear PCM");
+        case 8 : return __T("Linear PCM");
         default: return MI.Get(Stream_Audio, StreamPos, Video_Format);
     }
 }
@@ -468,13 +843,13 @@
 {
     const Ztring &Channels=MI.Get(Stream_Audio, StreamPos, Audio_Channel_s_);
     const Ztring &ChannelPositions2=MI.Get(Stream_Audio, StreamPos, Audio_ChannelPositions_String2);
-    if (Channels==_T("6") && ChannelPositions2==_T("3/2.1"))
+    if (Channels==__T("6") && ChannelPositions2==__T("3/2.1"))
         return 50000;
-    if (Channels==_T("8") && ChannelPositions2==_T("3/2/2.1"))
+    if (Channels==__T("8") && ChannelPositions2==__T("3/2/2.1"))
         return 60000;
-    if (Channels==_T("2"))
+    if (Channels==__T("2"))
         return 30000;
-    if (Channels==_T("1"))
+    if (Channels==__T("1"))
         return 20000;
     return 0;
 }
@@ -483,10 +858,10 @@
 {
     switch (termID/10000)
     {
-        case 2 : return _T("mono");
-        case 3 : return _T("stereo");
-        case 5 : return _T("Home theater 5.1");
-        case 6 : return _T("Movie theater");
+        case 2 : return __T("mono");
+        case 3 : return __T("stereo");
+        case 5 : return __T("Home theater 5.1");
+        case 6 : return __T("Movie theater");
         default: return Ztring();
     }
 }
@@ -495,19 +870,19 @@
 Ztring Mpeg7_AudioEmphasis(MediaInfo_Internal &MI, size_t StreamPos)
 {
     const Ztring &Emphasis=MI.Get(Stream_Audio, StreamPos, Audio_Format_Settings_Emphasis);
-    if (Emphasis==_T("50/15ms"))
-        return _T("50over15Microseconds");
-    if (Emphasis==_T("CCITT"))
-        return _T("ccittJ17");
-    if (Emphasis==_T("Reserved"))
-        return _T("reserved");
-    return _T("none");
+    if (Emphasis==__T("50/15ms"))
+        return __T("50over15Microseconds");
+    if (Emphasis==__T("CCITT"))
+        return __T("ccittJ17");
+    if (Emphasis==__T("Reserved"))
+        return __T("reserved");
+    return __T("none");
 }
 
 //---------------------------------------------------------------------------
 Ztring Mpeg7_MediaTimePoint(MediaInfo_Internal &MI)
 {
-    if (MI.Count_Get(Stream_Video)==1 && MI.Get(Stream_General, 0, General_Format)==_T("MPEG-PS"))
+    if (MI.Count_Get(Stream_Video)==1 && MI.Get(Stream_General, 0, General_Format)==__T("MPEG-PS"))
     {
         int64u Delay=(int64u)(MI.Get(Stream_Video, 0, Video_Delay).To_float64()*90);
         int64u Rate=90000;
@@ -522,16 +897,16 @@
         Ztring ToReturn;
         if (DD)
             ToReturn+=Ztring::ToZtring(DD);
-        ToReturn+=_T('T');
-        ToReturn+=(HH<10?_T("0"):_T(""))+Ztring::ToZtring(HH)+_T(':');
-        ToReturn+=(MM<10?_T("0"):_T(""))+Ztring::ToZtring(MM)+_T(':');
-        ToReturn+=(SS<10?_T("0"):_T(""))+Ztring::ToZtring(SS)+_T(':');
-        ToReturn+=Ztring::ToZtring(Delay)+_T('F');
+        ToReturn+=__T('T');
+        ToReturn+=(HH<10?__T("0"):__T(""))+Ztring::ToZtring(HH)+__T(':');
+        ToReturn+=(MM<10?__T("0"):__T(""))+Ztring::ToZtring(MM)+__T(':');
+        ToReturn+=(SS<10?__T("0"):__T(""))+Ztring::ToZtring(SS)+__T(':');
+        ToReturn+=Ztring::ToZtring(Delay)+__T('F');
         ToReturn+=Ztring::ToZtring(Rate);
         return ToReturn;
     }
 
-    //Default: In miliseconds
+    //Default: In milliseconds
     int64u Milliseconds=MI.Get(Stream_Video, 0, Video_Delay).To_int64u();
     int64u DD=Milliseconds/(24*60*60*1000);
     Milliseconds=Milliseconds%(24*60*60*1000);
@@ -545,11 +920,11 @@
     Ztring ToReturn;
     if (DD)
         ToReturn+=Ztring::ToZtring(DD);
-    ToReturn+=_T('T');
-    ToReturn+=(HH<10?_T("0"):_T(""))+Ztring::ToZtring(HH)+_T(':');
-    ToReturn+=(MM<10?_T("0"):_T(""))+Ztring::ToZtring(MM)+_T(':');
-    ToReturn+=(SS<10?_T("0"):_T(""))+Ztring::ToZtring(SS)+_T(':');
-    ToReturn+=Ztring::ToZtring(NN)+_T('F');
+    ToReturn+=__T('T');
+    ToReturn+=(HH<10?__T("0"):__T(""))+Ztring::ToZtring(HH)+__T(':');
+    ToReturn+=(MM<10?__T("0"):__T(""))+Ztring::ToZtring(MM)+__T(':');
+    ToReturn+=(SS<10?__T("0"):__T(""))+Ztring::ToZtring(SS)+__T(':');
+    ToReturn+=Ztring::ToZtring(NN)+__T('F');
     ToReturn+=Ztring::ToZtring(FF);
     return ToReturn;
 }
@@ -572,15 +947,15 @@
         int64u SS=FrameCount/FrameRate;
         FrameCount=FrameCount%FrameRate;
         Ztring ToReturn;
-        ToReturn+=_T('P');
+        ToReturn+=__T('P');
         if (DD)
-            ToReturn+=Ztring::ToZtring(DD)+_T('D');
-        ToReturn+=_T('T');
-        ToReturn+=Ztring::ToZtring(HH)+_T('H');
-        ToReturn+=Ztring::ToZtring(MM)+_T('M');
-        ToReturn+=Ztring::ToZtring(SS)+_T('S');
-        ToReturn+=Ztring::ToZtring(FrameCount)+_T('N');
-        ToReturn+=Ztring::ToZtring(FrameRate)+_T('F');
+            ToReturn+=Ztring::ToZtring(DD)+__T('D');
+        ToReturn+=__T('T');
+        ToReturn+=Ztring::ToZtring(HH)+__T('H');
+        ToReturn+=Ztring::ToZtring(MM)+__T('M');
+        ToReturn+=Ztring::ToZtring(SS)+__T('S');
+        ToReturn+=Ztring::ToZtring(FrameCount)+__T('N');
+        ToReturn+=Ztring::ToZtring(FrameRate)+__T('F');
         return ToReturn;
     }
 
@@ -599,19 +974,19 @@
         int64u SS=SamplingCount/SamplingRate;
         SamplingCount=SamplingCount%SamplingRate;
         Ztring ToReturn;
-        ToReturn+=_T('P');
+        ToReturn+=__T('P');
         if (DD)
-            ToReturn+=Ztring::ToZtring(DD)+_T('D');
-        ToReturn+=_T('T');
-        ToReturn+=Ztring::ToZtring(HH)+_T('H');
-        ToReturn+=Ztring::ToZtring(MM)+_T('M');
-        ToReturn+=Ztring::ToZtring(SS)+_T('S');
-        ToReturn+=Ztring::ToZtring(SamplingCount)+_T('N');
-        ToReturn+=Ztring::ToZtring(SamplingRate)+_T('F');
+            ToReturn+=Ztring::ToZtring(DD)+__T('D');
+        ToReturn+=__T('T');
+        ToReturn+=Ztring::ToZtring(HH)+__T('H');
+        ToReturn+=Ztring::ToZtring(MM)+__T('M');
+        ToReturn+=Ztring::ToZtring(SS)+__T('S');
+        ToReturn+=Ztring::ToZtring(SamplingCount)+__T('N');
+        ToReturn+=Ztring::ToZtring(SamplingRate)+__T('F');
         return ToReturn;
     }
 
-    //Default: In miliseconds
+    //Default: In milliseconds
     int64u Milliseconds=MI.Get(Stream_General, 0, General_Duration).To_int64u();
     int64u DD=Milliseconds/(24*60*60*1000);
     Milliseconds=Milliseconds%(24*60*60*1000);
@@ -623,15 +998,15 @@
     int64u NN=Milliseconds%1000;
     int64u FF=1000;
     Ztring ToReturn;
-    ToReturn+=_T('P');
+    ToReturn+=__T('P');
     if (DD)
-        ToReturn+=Ztring::ToZtring(DD)+_T('D');
-    ToReturn+=_T('T');
-    ToReturn+=Ztring::ToZtring(HH)+_T('H');
-    ToReturn+=Ztring::ToZtring(MM)+_T('M');
-    ToReturn+=Ztring::ToZtring(SS)+_T('S');
-    ToReturn+=Ztring::ToZtring(NN)+_T('N');
-    ToReturn+=Ztring::ToZtring(FF)+_T('F');
+        ToReturn+=Ztring::ToZtring(DD)+__T('D');
+    ToReturn+=__T('T');
+    ToReturn+=Ztring::ToZtring(HH)+__T('H');
+    ToReturn+=Ztring::ToZtring(MM)+__T('M');
+    ToReturn+=Ztring::ToZtring(SS)+__T('S');
+    ToReturn+=Ztring::ToZtring(NN)+__T('N');
+    ToReturn+=Ztring::ToZtring(FF)+__T('F');
     return ToReturn;
 }
 
@@ -656,110 +1031,110 @@
 //---------------------------------------------------------------------------
 Ztring Mpeg7_Transform_Visual(Ztring &ToReturn, MediaInfo_Internal &MI, size_t StreamPos)
 {
-    ToReturn+=_T("\t\t\t\t\t\t\t<mpeg7:VisualCoding>\n");
+    ToReturn+=__T("\t\t\t\t\t\t\t<mpeg7:VisualCoding>\n");
 
     //Format
-    ToReturn+=_T("\t\t\t\t\t\t\t\t<mpeg7:Format");
+    ToReturn+=__T("\t\t\t\t\t\t\t\t<mpeg7:Format");
     int32u VisualCodingFormatCS_termID=Mpeg7_VisualCodingFormatCS_termID(MI, StreamPos);
     if (VisualCodingFormatCS_termID)
     {
-        ToReturn+=_T(" href=\"urn:mpeg:mpeg7:cs:VisualCodingFormatCS:2001:");
+        ToReturn+=__T(" href=\"urn:mpeg:mpeg7:cs:VisualCodingFormatCS:2001:");
         ToReturn+=Ztring::ToZtring(VisualCodingFormatCS_termID/10000);
-        ToReturn+=_T("\"");
+        ToReturn+=__T("\"");
     }
     ToReturn+=Mpeg7_Visual_colorDomain(MI, StreamPos); //Algo puts empty string if not known
-    ToReturn+=_T(">\n");
-    ToReturn+=_T("\t\t\t\t\t\t\t\t\t<mpeg7:Name xml:lang=\"en\">"); ToReturn+=Mpeg7_VisualCodingFormatCS_Name((VisualCodingFormatCS_termID/10000)*10000, MI, StreamPos); ToReturn+=_T("</mpeg7:Name>\n");
+    ToReturn+=__T(">\n");
+    ToReturn+=__T("\t\t\t\t\t\t\t\t\t<mpeg7:Name xml:lang=\"en\">"); ToReturn+=Mpeg7_VisualCodingFormatCS_Name((VisualCodingFormatCS_termID/10000)*10000, MI, StreamPos); ToReturn+=__T("</mpeg7:Name>\n");
     if (VisualCodingFormatCS_termID%10000)
     {
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t<mpeg7:Term termID=\"");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t<mpeg7:Term termID=\"");
         ToReturn+=Ztring::ToZtring(VisualCodingFormatCS_termID/10000);
-        ToReturn+=_T(".");
+        ToReturn+=__T(".");
         ToReturn+=Ztring::ToZtring((VisualCodingFormatCS_termID%10000)/100);
-        ToReturn+=_T("\">\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t<mpeg7:Name xml:lang=\"en\">"); ToReturn+=Mpeg7_VisualCodingFormatCS_Name((VisualCodingFormatCS_termID/100)*100, MI, StreamPos); ToReturn+=_T("</mpeg7:Name>\n");
+        ToReturn+=__T("\">\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t<mpeg7:Name xml:lang=\"en\">"); ToReturn+=Mpeg7_VisualCodingFormatCS_Name((VisualCodingFormatCS_termID/100)*100, MI, StreamPos); ToReturn+=__T("</mpeg7:Name>\n");
         if (VisualCodingFormatCS_termID%100)
         {
-            ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t<mpeg7:Term termID=\"");
+            ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t<mpeg7:Term termID=\"");
             ToReturn+=Ztring::ToZtring(VisualCodingFormatCS_termID/10000);
-            ToReturn+=_T(".");
+            ToReturn+=__T(".");
             ToReturn+=Ztring::ToZtring((VisualCodingFormatCS_termID%10000)/100);
-            ToReturn+=_T(".");
+            ToReturn+=__T(".");
             ToReturn+=Ztring::ToZtring(VisualCodingFormatCS_termID%100);
-            ToReturn+=_T("\">\n");
-            ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Name xml:lang=\"en\">"); ToReturn+=Mpeg7_VisualCodingFormatCS_Name(VisualCodingFormatCS_termID, MI, StreamPos); ToReturn+=_T("</mpeg7:Name>\n");
-            ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t</mpeg7:Term>\n");
+            ToReturn+=__T("\">\n");
+            ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Name xml:lang=\"en\">"); ToReturn+=Mpeg7_VisualCodingFormatCS_Name(VisualCodingFormatCS_termID, MI, StreamPos); ToReturn+=__T("</mpeg7:Name>\n");
+            ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t</mpeg7:Term>\n");
         }
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t</mpeg7:Term>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t</mpeg7:Term>\n");
     }
-    ToReturn+=_T("\t\t\t\t\t\t\t\t</mpeg7:Format>\n");
+    ToReturn+=__T("\t\t\t\t\t\t\t\t</mpeg7:Format>\n");
 
     //Pixel
     if (!MI.Get(Stream_Video, 0, Video_PixelAspectRatio).empty()
      || !MI.Get(Stream_Video, 0, Video_Resolution).empty())
     {
-        ToReturn+=_T("\t\t\t\t\t\t\t\t<mpeg7:Pixel");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t<mpeg7:Pixel");
         if (!MI.Get(Stream_Video, 0, Video_PixelAspectRatio).empty())
         {
-            ToReturn+=_T(" aspectRatio=\"");
+            ToReturn+=__T(" aspectRatio=\"");
             ToReturn+=MI.Get(Stream_Video, 0, Video_PixelAspectRatio);
-            ToReturn+=_T("\"");
+            ToReturn+=__T("\"");
         }
         if (!MI.Get(Stream_Video, 0, Video_Resolution).empty())
         {
-            ToReturn+=_T(" bitsPer=\"");
+            ToReturn+=__T(" bitsPer=\"");
             ToReturn+=MI.Get(Stream_Video, 0, Video_Resolution);
-            ToReturn+=_T("\"");
+            ToReturn+=__T("\"");
         }
-        ToReturn+=_T("/>\n");
+        ToReturn+=__T("/>\n");
     }
 
     //Frame
-    ToReturn+=_T("\t\t\t\t\t\t\t\t<mpeg7:Frame aspectRatio=\"")+MI.Get(Stream_Video, 0, Video_DisplayAspectRatio); ToReturn+=_T("\" height=\""); ToReturn+=MI.Get(Stream_Video, 0, Video_Height); ToReturn+=_T("\" width=\""); ToReturn+=MI.Get(Stream_Video, 0, Video_Width); ToReturn+=_T("\" rate=\""); ToReturn+=MI.Get(Stream_Video, 0, Video_FrameRate); ToReturn+=_T("\" structure=\""); ToReturn+=MI.Get(Stream_Video, 0, Video_ScanType).MakeLowerCase(); ToReturn+=_T("\"/>\n");
+    ToReturn+=__T("\t\t\t\t\t\t\t\t<mpeg7:Frame aspectRatio=\"")+MI.Get(Stream_Video, 0, Video_DisplayAspectRatio); ToReturn+=__T("\" height=\""); ToReturn+=MI.Get(Stream_Video, 0, Video_Height); ToReturn+=__T("\" width=\""); ToReturn+=MI.Get(Stream_Video, 0, Video_Width); ToReturn+=__T("\" rate=\""); ToReturn+=MI.Get(Stream_Video, 0, Video_FrameRate); ToReturn+=__T("\" structure=\""); ToReturn+=MI.Get(Stream_Video, 0, Video_ScanType).MakeLowerCase(); ToReturn+=__T("\"/>\n");
 
     //Colorimetry
-    if (MI.Get(Stream_Video, StreamPos, Video_Colorimetry).find(_T("4:2:0"))!=string::npos)
+    if (MI.Get(Stream_Video, StreamPos, Video_Colorimetry).find(__T("4:2:0"))!=string::npos)
     {
-        ToReturn+=_T("\t\t\t\t\t\t\t\t<mpeg7:ColorSampling> \n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t<mpeg7:Lattice height=\"720\" width=\"486\"/>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t<mpeg7:Field temporalOrder=\"0\" positionalOrder=\"0\">\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t<mpeg7:Component>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Name>Luminance</mpeg7:Name>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Offset horizontal=\"0.0\" vertical=\"0.0\"/>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Period horizontal=\"1.0\" vertical=\"2.0\"/>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t</mpeg7:Component>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t<mpeg7:Component>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Name>ChrominanceBlueDifference</mpeg7:Name>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Offset horizontal=\"0.0\" vertical=\"0.5\"/>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Period horizontal=\"2.0\" vertical=\"4.0\"/>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t</mpeg7:Component>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t<mpeg7:Component>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Name>ChrominanceRedDifference</mpeg7:Name>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Offset horizontal=\"0.0\" vertical=\"0.5\"/>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Period horizontal=\"2.0\" vertical=\"4.0\"/>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t</mpeg7:Component>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t</mpeg7:Field>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t<mpeg7:Field temporalOrder=\"1\" positionalOrder=\"1\">\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t<mpeg7:Component>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Name>Luminance</mpeg7:Name>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Offset horizontal=\"0.0\" vertical=\"1.0\"/>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Period horizontal=\"1.0\" vertical=\"2.0\"/>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t</mpeg7:Component>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t<mpeg7:Component>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Name>ChrominanceBlueDifference</mpeg7:Name>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Offset horizontal=\"0.0\" vertical=\"2.5\"/>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Period horizontal=\"2.0\" vertical=\"4.0\"/>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t</mpeg7:Component>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t<mpeg7:Component>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Name>ChrominanceRedDifference</mpeg7:Name>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Offset horizontal=\"0.0\" vertical=\"2.5\"/>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Period horizontal=\"4.0\" vertical=\"2.0\"/>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t</mpeg7:Component>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t</mpeg7:Field>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t</mpeg7:ColorSampling>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t<mpeg7:ColorSampling> \n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t<mpeg7:Lattice height=\"720\" width=\"486\"/>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t<mpeg7:Field temporalOrder=\"0\" positionalOrder=\"0\">\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t<mpeg7:Component>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Name>Luminance</mpeg7:Name>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Offset horizontal=\"0.0\" vertical=\"0.0\"/>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Period horizontal=\"1.0\" vertical=\"2.0\"/>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t</mpeg7:Component>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t<mpeg7:Component>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Name>ChrominanceBlueDifference</mpeg7:Name>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Offset horizontal=\"0.0\" vertical=\"0.5\"/>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Period horizontal=\"2.0\" vertical=\"4.0\"/>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t</mpeg7:Component>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t<mpeg7:Component>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Name>ChrominanceRedDifference</mpeg7:Name>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Offset horizontal=\"0.0\" vertical=\"0.5\"/>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Period horizontal=\"2.0\" vertical=\"4.0\"/>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t</mpeg7:Component>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t</mpeg7:Field>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t<mpeg7:Field temporalOrder=\"1\" positionalOrder=\"1\">\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t<mpeg7:Component>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Name>Luminance</mpeg7:Name>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Offset horizontal=\"0.0\" vertical=\"1.0\"/>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Period horizontal=\"1.0\" vertical=\"2.0\"/>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t</mpeg7:Component>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t<mpeg7:Component>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Name>ChrominanceBlueDifference</mpeg7:Name>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Offset horizontal=\"0.0\" vertical=\"2.5\"/>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Period horizontal=\"2.0\" vertical=\"4.0\"/>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t</mpeg7:Component>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t<mpeg7:Component>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Name>ChrominanceRedDifference</mpeg7:Name>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Offset horizontal=\"0.0\" vertical=\"2.5\"/>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Period horizontal=\"4.0\" vertical=\"2.0\"/>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t</mpeg7:Component>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t</mpeg7:Field>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t</mpeg7:ColorSampling>\n");
     }
 
-    ToReturn+=_T("\t\t\t\t\t\t\t</mpeg7:VisualCoding>\n");
+    ToReturn+=__T("\t\t\t\t\t\t\t</mpeg7:VisualCoding>\n");
 
     return ToReturn;
 }
@@ -767,75 +1142,75 @@
 //---------------------------------------------------------------------------
 Ztring Mpeg7_Transform_Audio(Ztring &ToReturn, MediaInfo_Internal &MI, size_t StreamPos)
 {
-    ToReturn+=_T("\t\t\t\t\t\t\t<mpeg7:AudioCoding>\n");
+    ToReturn+=__T("\t\t\t\t\t\t\t<mpeg7:AudioCoding>\n");
 
     //Format
-    ToReturn+=_T("\t\t\t\t\t\t\t\t<mpeg7:Format");
+    ToReturn+=__T("\t\t\t\t\t\t\t\t<mpeg7:Format");
     int32u AudioCodingFormatCS_termID=Mpeg7_AudioCodingFormatCS_termID(MI, StreamPos);
     if (AudioCodingFormatCS_termID)
     {
-        ToReturn+=_T(" href=\"urn:mpeg:mpeg7:cs:AudioCodingFormatCS:2001:");
+        ToReturn+=__T(" href=\"urn:mpeg:mpeg7:cs:AudioCodingFormatCS:2001:");
         ToReturn+=Ztring::ToZtring(AudioCodingFormatCS_termID/10000);
-        ToReturn+=_T("\"");
+        ToReturn+=__T("\"");
     }
-    ToReturn+=_T(">\n");
-    ToReturn+=_T("\t\t\t\t\t\t\t\t\t<mpeg7:Name xml:lang=\"en\">"); ToReturn+=Mpeg7_AudioCodingFormatCS_Name((AudioCodingFormatCS_termID/10000)*10000, MI, StreamPos); ToReturn+=_T("</mpeg7:Name>\n");
+    ToReturn+=__T(">\n");
+    ToReturn+=__T("\t\t\t\t\t\t\t\t\t<mpeg7:Name xml:lang=\"en\">"); ToReturn+=Mpeg7_AudioCodingFormatCS_Name((AudioCodingFormatCS_termID/10000)*10000, MI, StreamPos); ToReturn+=__T("</mpeg7:Name>\n");
     if (AudioCodingFormatCS_termID%10000)
     {
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t<mpeg7:Term termID=\"");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t<mpeg7:Term termID=\"");
         ToReturn+=Ztring::ToZtring(AudioCodingFormatCS_termID/10000);
-        ToReturn+=_T(".");
+        ToReturn+=__T(".");
         ToReturn+=Ztring::ToZtring((AudioCodingFormatCS_termID%10000)/100);
-        ToReturn+=_T("\">\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t<mpeg7:Name xml:lang=\"en\">"); ToReturn+=Mpeg7_AudioCodingFormatCS_Name((AudioCodingFormatCS_termID/100)*100, MI, StreamPos); ToReturn+=_T("</mpeg7:Name>\n");
+        ToReturn+=__T("\">\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t<mpeg7:Name xml:lang=\"en\">"); ToReturn+=Mpeg7_AudioCodingFormatCS_Name((AudioCodingFormatCS_termID/100)*100, MI, StreamPos); ToReturn+=__T("</mpeg7:Name>\n");
         if (AudioCodingFormatCS_termID%100)
         {
-            ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t<mpeg7:Term termID=\"");
+            ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t<mpeg7:Term termID=\"");
             ToReturn+=Ztring::ToZtring(AudioCodingFormatCS_termID/10000);
-            ToReturn+=_T(".");
+            ToReturn+=__T(".");
             ToReturn+=Ztring::ToZtring((AudioCodingFormatCS_termID%10000)/100);
-            ToReturn+=_T(".");
+            ToReturn+=__T(".");
             ToReturn+=Ztring::ToZtring(AudioCodingFormatCS_termID%100);
-            ToReturn+=_T("\">\n");
-            ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Name xml:lang=\"en\">"); ToReturn+=Mpeg7_AudioCodingFormatCS_Name(AudioCodingFormatCS_termID, MI, StreamPos); ToReturn+=_T("</mpeg7:Name>\n");
-            ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t</mpeg7:Term>\n");
+            ToReturn+=__T("\">\n");
+            ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Name xml:lang=\"en\">"); ToReturn+=Mpeg7_AudioCodingFormatCS_Name(AudioCodingFormatCS_termID, MI, StreamPos); ToReturn+=__T("</mpeg7:Name>\n");
+            ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t</mpeg7:Term>\n");
         }
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t</mpeg7:Term>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t</mpeg7:Term>\n");
     }
-    ToReturn+=_T("\t\t\t\t\t\t\t\t</mpeg7:Format>\n");
+    ToReturn+=__T("\t\t\t\t\t\t\t\t</mpeg7:Format>\n");
 
     //AudioChannels
-    ToReturn+=_T("\t\t\t\t\t\t\t\t<mpeg7:AudioChannels>"); ToReturn+=MI.Get(Stream_Audio, StreamPos, Audio_Channel_s_); ToReturn+=_T("</mpeg7:AudioChannels>\n");
+    ToReturn+=__T("\t\t\t\t\t\t\t\t<mpeg7:AudioChannels>"); ToReturn+=MI.Get(Stream_Audio, StreamPos, Audio_Channel_s_); ToReturn+=__T("</mpeg7:AudioChannels>\n");
 
     //Sample
-    ToReturn+=_T("\t\t\t\t\t\t\t\t<mpeg7:Sample rate=\""); ToReturn+=MI.Get(Stream_Audio, StreamPos, Audio_SamplingRate); ToReturn+=_T("\""); if (!MI.Get(Stream_Audio, StreamPos, Audio_Resolution).empty()) {ToReturn+=_T(" bitsPer=\""); ToReturn+=MI.Get(Stream_Audio, StreamPos, Audio_Resolution); ToReturn+=_T("\"");} ToReturn+=_T("/>\n");
+    ToReturn+=__T("\t\t\t\t\t\t\t\t<mpeg7:Sample rate=\""); ToReturn+=MI.Get(Stream_Audio, StreamPos, Audio_SamplingRate); ToReturn+=__T("\""); if (!MI.Get(Stream_Audio, StreamPos, Audio_BitDepth).empty()) {ToReturn+=__T(" bitsPer=\""); ToReturn+=MI.Get(Stream_Audio, StreamPos, Audio_BitDepth); ToReturn+=__T("\"");} ToReturn+=__T("/>\n");
 
     //Emphasis
-    if (MI.Get(Stream_Audio, StreamPos, Audio_Format)==_T("MPEG Audio"))
-        ToReturn+=_T("\t\t\t\t\t\t\t\t<mpeg7:Emphasis>")+Mpeg7_AudioEmphasis(MI, StreamPos)+_T("</mpeg7:Emphasis>\n");
+    if (MI.Get(Stream_Audio, StreamPos, Audio_Format)==__T("MPEG Audio"))
+        ToReturn+=__T("\t\t\t\t\t\t\t\t<mpeg7:Emphasis>")+Mpeg7_AudioEmphasis(MI, StreamPos)+__T("</mpeg7:Emphasis>\n");
 
     //Presentation
     int32u AudioPresentationCS_termID=Mpeg7_AudioPresentationCS_termID(MI, StreamPos);
     if (AudioPresentationCS_termID)
     {
-        ToReturn+=_T("\t\t\t\t\t\t\t\t<mpeg7:Presentation href=\"urn:mpeg:mpeg7:cs:AudioPresentationCS:2001:");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t<mpeg7:Presentation href=\"urn:mpeg:mpeg7:cs:AudioPresentationCS:2001:");
         ToReturn+=Ztring::ToZtring(AudioPresentationCS_termID/10000);
         if (AudioPresentationCS_termID%10000)
         {
-            ToReturn+=_T(".");
+            ToReturn+=__T(".");
             ToReturn+=Ztring::ToZtring((AudioPresentationCS_termID%10000)/100);
             if (AudioPresentationCS_termID%100)
             {
-                ToReturn+=_T(".");
+                ToReturn+=__T(".");
                 ToReturn+=Ztring::ToZtring(AudioPresentationCS_termID%100);
             }
         }
-        ToReturn+=_T("\">\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t<mpeg7:Name>")+Mpeg7_AudioPresentationCS_Name(AudioPresentationCS_termID, MI, StreamPos)+_T("</mpeg7:Name>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t</mpeg7:Presentation>\n");
+        ToReturn+=__T("\">\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t<mpeg7:Name>")+Mpeg7_AudioPresentationCS_Name(AudioPresentationCS_termID, MI, StreamPos)+__T("</mpeg7:Name>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t</mpeg7:Presentation>\n");
     }
 
-    ToReturn+=_T("\t\t\t\t\t\t\t</mpeg7:AudioCoding>\n");
+    ToReturn+=__T("\t\t\t\t\t\t\t</mpeg7:AudioCoding>\n");
     return ToReturn;
 }
 
@@ -845,33 +1220,33 @@
     //Current date/time is ISO format
     time_t Time=time(NULL);
     Ztring TimeS; TimeS.Date_From_Seconds_1970((int32u)Time);
-    TimeS.FindAndReplace(_T("UTC "), _T(""));
-    TimeS.FindAndReplace(_T(" "), _T("T"));
-    TimeS+=_T("+00:00");
+    TimeS.FindAndReplace(__T("UTC "), __T(""));
+    TimeS.FindAndReplace(__T(" "), __T("T"));
+    TimeS+=__T("+00:00");
 
     Ztring ToReturn;
 
     //Mpeg7
-    ToReturn+=_T("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-    ToReturn+=_T("\n");
-    ToReturn+=_T("<mpeg7:Mpeg7 xmlns=\"urn:mpeg:mpeg7:schema:2004\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:mpeg7=\"urn:mpeg:mpeg7:schema:2004\" xsi:schemaLocation=\"urn:mpeg:mpeg7:schema:2004 http://standards.iso.org/ittf/PubliclyAvailableStandards/MPEG-7_schema_files/mpeg7-v2.xsd\">\n");
+    ToReturn+=__T("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+    ToReturn+=__T("\n");
+    ToReturn+=__T("<mpeg7:Mpeg7 xmlns=\"urn:mpeg:mpeg7:schema:2004\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:mpeg7=\"urn:mpeg:mpeg7:schema:2004\" xsi:schemaLocation=\"urn:mpeg:mpeg7:schema:2004 http://standards.iso.org/ittf/PubliclyAvailableStandards/MPEG-7_schema_files/mpeg7-v2.xsd\">\n");
 
     //Description - DescriptionMetadata
     {
-        ToReturn+=_T("\t<mpeg7:DescriptionMetadata>\n");
+        ToReturn+=__T("\t<mpeg7:DescriptionMetadata>\n");
         Ztring FileName=MI.Get(Stream_General, 0, General_FileName);
         Ztring Extension=MI.Get(Stream_General, 0, General_FileExtension);
         if (!Extension.empty())
-            FileName+=_T('.')+Extension;
+            FileName+=__T('.')+Extension;
         if (!FileName.empty())
-            ToReturn+=_T("\t\t<mpeg7:PrivateIdentifier>")+FileName+_T("</mpeg7:PrivateIdentifier>\n");
-        ToReturn+=_T("\t\t<mpeg7:CreationTime>")+TimeS+_T("</mpeg7:CreationTime>\n");
-        ToReturn+=_T("\t\t<mpeg7:Instrument>\n");
-        ToReturn+=_T("\t\t\t<mpeg7:Tool>\n");
-        ToReturn+=_T("\t\t\t\t<mpeg7:Name>")+MediaInfoLib::Config.Info_Version_Get()+_T("</mpeg7:Name>\n");
-        ToReturn+=_T("\t\t\t</mpeg7:Tool>\n");
-        ToReturn+=_T("\t\t</mpeg7:Instrument>\n");
-        ToReturn+=_T("\t</mpeg7:DescriptionMetadata>\n");
+            ToReturn+=__T("\t\t<mpeg7:PrivateIdentifier>")+FileName+__T("</mpeg7:PrivateIdentifier>\n");
+        ToReturn+=__T("\t\t<mpeg7:CreationTime>")+TimeS+__T("</mpeg7:CreationTime>\n");
+        ToReturn+=__T("\t\t<mpeg7:Instrument>\n");
+        ToReturn+=__T("\t\t\t<mpeg7:Tool>\n");
+        ToReturn+=__T("\t\t\t\t<mpeg7:Name>")+MediaInfoLib::Config.Info_Version_Get()+__T("</mpeg7:Name>\n");
+        ToReturn+=__T("\t\t\t</mpeg7:Tool>\n");
+        ToReturn+=__T("\t\t</mpeg7:Instrument>\n");
+        ToReturn+=__T("\t</mpeg7:DescriptionMetadata>\n");
     }
 
     //Description - CreationDescription
@@ -881,237 +1256,237 @@
      || !MI.Get(Stream_General, 0, General_Encoded_Library).empty()
      || !MI.Get(Stream_General, 0, General_Performer).empty())
     {
-        ToReturn+=_T("\t<mpeg7:Description xsi:type=\"CreationDescriptionType\">\n");
-        ToReturn+=_T("\t\t<mpeg7:CreationInformation>\n");
-        ToReturn+=_T("\t\t\t<mpeg7:Creation>\n");
+        ToReturn+=__T("\t<mpeg7:Description xsi:type=\"CreationDescriptionType\">\n");
+        ToReturn+=__T("\t\t<mpeg7:CreationInformation>\n");
+        ToReturn+=__T("\t\t\t<mpeg7:Creation>\n");
         if (!MI.Get(Stream_General, 0, General_Movie).empty())
-            ToReturn+=_T("\t\t\t\t<mpeg7:Title type=\"songTitle\">")+MI.Get(Stream_General, 0, General_Movie)+_T("</mpeg7:Title>\n");
+            ToReturn+=__T("\t\t\t\t<mpeg7:Title type=\"songTitle\">")+MI.Get(Stream_General, 0, General_Movie)+__T("</mpeg7:Title>\n");
         if (!MI.Get(Stream_General, 0, General_Track).empty())
-            ToReturn+=_T("\t\t\t\t<mpeg7:Title type=\"songTitle\">")+MI.Get(Stream_General, 0, General_Title)+_T("</mpeg7:Title>\n");
+            ToReturn+=__T("\t\t\t\t<mpeg7:Title type=\"songTitle\">")+MI.Get(Stream_General, 0, General_Title)+__T("</mpeg7:Title>\n");
         if (!MI.Get(Stream_General, 0, General_Album).empty())
-            ToReturn+=_T("\t\t\t\t<mpeg7:Title type=\"albumTitle\">")+MI.Get(Stream_General, 0, General_Album)+_T("</mpeg7:Title>\n");
+            ToReturn+=__T("\t\t\t\t<mpeg7:Title type=\"albumTitle\">")+MI.Get(Stream_General, 0, General_Album)+__T("</mpeg7:Title>\n");
         if (!MI.Get(Stream_General, 0, General_WrittenBy).empty())
         {
-            ToReturn+=_T("\t\t\t\t<mpeg7:Creator>\n");
-            ToReturn+=_T("\t\t\t\t\t<mpeg7:Role href=\"urn:mpeg:mpeg7:cs:RoleCS:2001:AUTHOR\"/>\n");
-            ToReturn+=_T("\t\t\t\t\t<mpeg7:Agent xsi:type=\"PersonGroupType\">\n");
-            ToReturn+=_T("\t\t\t\t\t\t<mpeg7:Name>")+MI.Get(Stream_General, 0, General_WrittenBy)+_T("</mpeg7:Name>\n");
-            ToReturn+=_T("\t\t\t\t\t</mpeg7:Agent>\n");
-            ToReturn+=_T("\t\t\t\t</mpeg7:Creator>\n");
+            ToReturn+=__T("\t\t\t\t<mpeg7:Creator>\n");
+            ToReturn+=__T("\t\t\t\t\t<mpeg7:Role href=\"urn:mpeg:mpeg7:cs:RoleCS:2001:AUTHOR\"/>\n");
+            ToReturn+=__T("\t\t\t\t\t<mpeg7:Agent xsi:type=\"PersonGroupType\">\n");
+            ToReturn+=__T("\t\t\t\t\t\t<mpeg7:Name>")+MI.Get(Stream_General, 0, General_WrittenBy)+__T("</mpeg7:Name>\n");
+            ToReturn+=__T("\t\t\t\t\t</mpeg7:Agent>\n");
+            ToReturn+=__T("\t\t\t\t</mpeg7:Creator>\n");
         }
         if (!MI.Get(Stream_General, 0, General_Performer).empty())
         {
-            ToReturn+=_T("\t\t\t\t<mpeg7:Creator>\n");
-            ToReturn+=_T("\t\t\t\t\t<mpeg7:Role href=\"urn:mpeg:mpeg7:cs:RoleCS:2001:PERFORMER\"/>\n");
-            ToReturn+=_T("\t\t\t\t\t<mpeg7:Agent xsi:type=\"PersonGroupType\">\n");
-            ToReturn+=_T("\t\t\t\t\t\t<mpeg7:Name>")+MI.Get(Stream_General, 0, General_Performer)+_T("</mpeg7:Name>\n");
-            ToReturn+=_T("\t\t\t\t\t</mpeg7:Agent>\n");
-            ToReturn+=_T("\t\t\t\t</mpeg7:Creator>\n");
+            ToReturn+=__T("\t\t\t\t<mpeg7:Creator>\n");
+            ToReturn+=__T("\t\t\t\t\t<mpeg7:Role href=\"urn:mpeg:mpeg7:cs:RoleCS:2001:PERFORMER\"/>\n");
+            ToReturn+=__T("\t\t\t\t\t<mpeg7:Agent xsi:type=\"PersonGroupType\">\n");
+            ToReturn+=__T("\t\t\t\t\t\t<mpeg7:Name>")+MI.Get(Stream_General, 0, General_Performer)+__T("</mpeg7:Name>\n");
+            ToReturn+=__T("\t\t\t\t\t</mpeg7:Agent>\n");
+            ToReturn+=__T("\t\t\t\t</mpeg7:Creator>\n");
         }
         if (!MI.Get(Stream_General, 0, General_ExecutiveProducer).empty())
         {
-            ToReturn+=_T("\t\t\t\t<mpeg7:Creator>\n");
-            ToReturn+=_T("\t\t\t\t\t<mpeg7:Role href=\"urn:mpeg:mpeg7:cs:RoleCS:2001:EXECUTIVE-PRODUCER\"/>\n");
-            ToReturn+=_T("\t\t\t\t\t<mpeg7:Agent xsi:type=\"PersonGroupType\">\n");
-            ToReturn+=_T("\t\t\t\t\t\t<mpeg7:Name>")+MI.Get(Stream_General, 0, General_ExecutiveProducer)+_T("</mpeg7:Name>\n");
-            ToReturn+=_T("\t\t\t\t\t</mpeg7:Agent>\n");
-            ToReturn+=_T("\t\t\t\t</mpeg7:Creator>\n");
+            ToReturn+=__T("\t\t\t\t<mpeg7:Creator>\n");
+            ToReturn+=__T("\t\t\t\t\t<mpeg7:Role href=\"urn:mpeg:mpeg7:cs:RoleCS:2001:EXECUTIVE-PRODUCER\"/>\n");
+            ToReturn+=__T("\t\t\t\t\t<mpeg7:Agent xsi:type=\"PersonGroupType\">\n");
+            ToReturn+=__T("\t\t\t\t\t\t<mpeg7:Name>")+MI.Get(Stream_General, 0, General_ExecutiveProducer)+__T("</mpeg7:Name>\n");
+            ToReturn+=__T("\t\t\t\t\t</mpeg7:Agent>\n");
+            ToReturn+=__T("\t\t\t\t</mpeg7:Creator>\n");
         }
         if (!MI.Get(Stream_General, 0, General_Producer).empty())
         {
-            ToReturn+=_T("\t\t\t\t<mpeg7:Creator>\n");
-            ToReturn+=_T("\t\t\t\t\t<mpeg7:Role href=\"urn:mpeg:mpeg7:cs:RoleCS:2001:PRODUCER\"/>\n");
-            ToReturn+=_T("\t\t\t\t\t<mpeg7:Agent xsi:type=\"PersonGroupType\">\n");
-            ToReturn+=_T("\t\t\t\t\t\t<mpeg7:Name>")+MI.Get(Stream_General, 0, General_Producer)+_T("</mpeg7:Name>\n");
-            ToReturn+=_T("\t\t\t\t\t</mpeg7:Agent>\n");
-            ToReturn+=_T("\t\t\t\t</mpeg7:Creator>\n");
+            ToReturn+=__T("\t\t\t\t<mpeg7:Creator>\n");
+            ToReturn+=__T("\t\t\t\t\t<mpeg7:Role href=\"urn:mpeg:mpeg7:cs:RoleCS:2001:PRODUCER\"/>\n");
+            ToReturn+=__T("\t\t\t\t\t<mpeg7:Agent xsi:type=\"PersonGroupType\">\n");
+            ToReturn+=__T("\t\t\t\t\t\t<mpeg7:Name>")+MI.Get(Stream_General, 0, General_Producer)+__T("</mpeg7:Name>\n");
+            ToReturn+=__T("\t\t\t\t\t</mpeg7:Agent>\n");
+            ToReturn+=__T("\t\t\t\t</mpeg7:Creator>\n");
         }
         if (!MI.Get(Stream_General, 0, General_Director).empty())
         {
-            ToReturn+=_T("\t\t\t\t<mpeg7:Creator>\n");
-            ToReturn+=_T("\t\t\t\t\t<mpeg7:Role href=\"urn:mpeg:mpeg7:cs:RoleCS:2001:PRODUCER\"/>\n");
-            ToReturn+=_T("\t\t\t\t\t<mpeg7:Agent xsi:type=\"PersonGroupType\">\n");
-            ToReturn+=_T("\t\t\t\t\t\t<mpeg7:Name>")+MI.Get(Stream_General, 0, General_Director)+_T("</mpeg7:Name>\n");
-            ToReturn+=_T("\t\t\t\t\t</mpeg7:Agent>\n");
-            ToReturn+=_T("\t\t\t\t</mpeg7:Creator>\n");
+            ToReturn+=__T("\t\t\t\t<mpeg7:Creator>\n");
+            ToReturn+=__T("\t\t\t\t\t<mpeg7:Role href=\"urn:mpeg:mpeg7:cs:RoleCS:2001:PRODUCER\"/>\n");
+            ToReturn+=__T("\t\t\t\t\t<mpeg7:Agent xsi:type=\"PersonGroupType\">\n");
+            ToReturn+=__T("\t\t\t\t\t\t<mpeg7:Name>")+MI.Get(Stream_General, 0, General_Director)+__T("</mpeg7:Name>\n");
+            ToReturn+=__T("\t\t\t\t\t</mpeg7:Agent>\n");
+            ToReturn+=__T("\t\t\t\t</mpeg7:Creator>\n");
         }
         if (!MI.Get(Stream_General, 0, General_Composer).empty())
         {
-            ToReturn+=_T("\t\t\t\t<mpeg7:Creator>\n");
-            ToReturn+=_T("\t\t\t\t\t<mpeg7:Role href=\"urn:mpeg:mpeg7:cs:RoleCS:2001:COMPOSER\"/>\n");
-            ToReturn+=_T("\t\t\t\t\t<mpeg7:Agent xsi:type=\"PersonGroupType\">\n");
-            ToReturn+=_T("\t\t\t\t\t\t<mpeg7:Name>")+MI.Get(Stream_General, 0, General_Composer)+_T("</mpeg7:Name>\n");
-            ToReturn+=_T("\t\t\t\t\t</mpeg7:Agent>\n");
-            ToReturn+=_T("\t\t\t\t</mpeg7:Creator>\n");
+            ToReturn+=__T("\t\t\t\t<mpeg7:Creator>\n");
+            ToReturn+=__T("\t\t\t\t\t<mpeg7:Role href=\"urn:mpeg:mpeg7:cs:RoleCS:2001:COMPOSER\"/>\n");
+            ToReturn+=__T("\t\t\t\t\t<mpeg7:Agent xsi:type=\"PersonGroupType\">\n");
+            ToReturn+=__T("\t\t\t\t\t\t<mpeg7:Name>")+MI.Get(Stream_General, 0, General_Composer)+__T("</mpeg7:Name>\n");
+            ToReturn+=__T("\t\t\t\t\t</mpeg7:Agent>\n");
+            ToReturn+=__T("\t\t\t\t</mpeg7:Creator>\n");
         }
         if (!MI.Get(Stream_General, 0, General_CostumeDesigner).empty())
         {
-            ToReturn+=_T("\t\t\t\t<mpeg7:Creator>\n");
-            ToReturn+=_T("\t\t\t\t\t<mpeg7:Role href=\"urn:mpeg:mpeg7:cs:RoleCS:2001:COSTUME-SUPERVISOR\"/>\n");
-            ToReturn+=_T("\t\t\t\t\t<mpeg7:Agent xsi:type=\"PersonGroupType\">\n");
-            ToReturn+=_T("\t\t\t\t\t\t<mpeg7:Name>")+MI.Get(Stream_General, 0, General_CostumeDesigner)+_T("</mpeg7:Name>\n");
-            ToReturn+=_T("\t\t\t\t\t</mpeg7:Agent>\n");
-            ToReturn+=_T("\t\t\t\t</mpeg7:Creator>\n");
+            ToReturn+=__T("\t\t\t\t<mpeg7:Creator>\n");
+            ToReturn+=__T("\t\t\t\t\t<mpeg7:Role href=\"urn:mpeg:mpeg7:cs:RoleCS:2001:COSTUME-SUPERVISOR\"/>\n");
+            ToReturn+=__T("\t\t\t\t\t<mpeg7:Agent xsi:type=\"PersonGroupType\">\n");
+            ToReturn+=__T("\t\t\t\t\t\t<mpeg7:Name>")+MI.Get(Stream_General, 0, General_CostumeDesigner)+__T("</mpeg7:Name>\n");
+            ToReturn+=__T("\t\t\t\t\t</mpeg7:Agent>\n");
+            ToReturn+=__T("\t\t\t\t</mpeg7:Creator>\n");
         }
         if (!MI.Get(Stream_General, 0, General_ProductionDesigner).empty())
         {
-            ToReturn+=_T("\t\t\t\t<mpeg7:Creator>\n");
-            ToReturn+=_T("\t\t\t\t\t<mpeg7:Role href=\"urn:mpeg:mpeg7:cs:RoleCS:2001:PRODUCTION-DESIGNER\"/>\n");
-            ToReturn+=_T("\t\t\t\t\t<mpeg7:Agent xsi:type=\"PersonGroupType\">\n");
-            ToReturn+=_T("\t\t\t\t\t\t<mpeg7:Name>")+MI.Get(Stream_General, 0, General_ProductionDesigner)+_T("</mpeg7:Name>\n");
-            ToReturn+=_T("\t\t\t\t\t</mpeg7:Agent>\n");
-            ToReturn+=_T("\t\t\t\t</mpeg7:Creator>\n");
+            ToReturn+=__T("\t\t\t\t<mpeg7:Creator>\n");
+            ToReturn+=__T("\t\t\t\t\t<mpeg7:Role href=\"urn:mpeg:mpeg7:cs:RoleCS:2001:PRODUCTION-DESIGNER\"/>\n");
+            ToReturn+=__T("\t\t\t\t\t<mpeg7:Agent xsi:type=\"PersonGroupType\">\n");
+            ToReturn+=__T("\t\t\t\t\t\t<mpeg7:Name>")+MI.Get(Stream_General, 0, General_ProductionDesigner)+__T("</mpeg7:Name>\n");
+            ToReturn+=__T("\t\t\t\t\t</mpeg7:Agent>\n");
+            ToReturn+=__T("\t\t\t\t</mpeg7:Creator>\n");
         }
         if (!MI.Get(Stream_General, 0, General_Publisher).empty())
         {
-            ToReturn+=_T("\t\t\t\t<mpeg7:Creator>\n");
-            ToReturn+=_T("\t\t\t\t\t<mpeg7:Role href=\"urn:mpeg:mpeg7:cs:RoleCS:2001:PUBLISHER\"/>\n");
-            ToReturn+=_T("\t\t\t\t\t<mpeg7:Agent xsi:type=\"PersonGroupType\">\n");
-            ToReturn+=_T("\t\t\t\t\t\t<mpeg7:Name>")+MI.Get(Stream_General, 0, General_Publisher)+_T("</mpeg7:Name>\n");
-            ToReturn+=_T("\t\t\t\t\t</mpeg7:Agent>\n");
-            ToReturn+=_T("\t\t\t\t</mpeg7:Creator>\n");
+            ToReturn+=__T("\t\t\t\t<mpeg7:Creator>\n");
+            ToReturn+=__T("\t\t\t\t\t<mpeg7:Role href=\"urn:mpeg:mpeg7:cs:RoleCS:2001:PUBLISHER\"/>\n");
+            ToReturn+=__T("\t\t\t\t\t<mpeg7:Agent xsi:type=\"PersonGroupType\">\n");
+            ToReturn+=__T("\t\t\t\t\t\t<mpeg7:Name>")+MI.Get(Stream_General, 0, General_Publisher)+__T("</mpeg7:Name>\n");
+            ToReturn+=__T("\t\t\t\t\t</mpeg7:Agent>\n");
+            ToReturn+=__T("\t\t\t\t</mpeg7:Creator>\n");
         }
         if (!MI.Get(Stream_General, 0, General_DistributedBy).empty())
         {
-            ToReturn+=_T("\t\t\t\t<mpeg7:Creator>\n");
-            ToReturn+=_T("\t\t\t\t\t<mpeg7:Role href=\"urn:mpeg:mpeg7:cs:RoleCS:2001:DISTRIBUTOR\"/>\n");
-            ToReturn+=_T("\t\t\t\t\t<mpeg7:Agent xsi:type=\"PersonGroupType\">\n");
-            ToReturn+=_T("\t\t\t\t\t\t<mpeg7:Name>")+MI.Get(Stream_General, 0, General_DistributedBy)+_T("</mpeg7:Name>\n");
-            ToReturn+=_T("\t\t\t\t\t</mpeg7:Agent>\n");
-            ToReturn+=_T("\t\t\t\t</mpeg7:Creator>\n");
+            ToReturn+=__T("\t\t\t\t<mpeg7:Creator>\n");
+            ToReturn+=__T("\t\t\t\t\t<mpeg7:Role href=\"urn:mpeg:mpeg7:cs:RoleCS:2001:DISTRIBUTOR\"/>\n");
+            ToReturn+=__T("\t\t\t\t\t<mpeg7:Agent xsi:type=\"PersonGroupType\">\n");
+            ToReturn+=__T("\t\t\t\t\t\t<mpeg7:Name>")+MI.Get(Stream_General, 0, General_DistributedBy)+__T("</mpeg7:Name>\n");
+            ToReturn+=__T("\t\t\t\t\t</mpeg7:Agent>\n");
+            ToReturn+=__T("\t\t\t\t</mpeg7:Creator>\n");
         }
         if (!MI.Get(Stream_General, 0, General_Encoded_Library).empty())
         {
-            ToReturn+=_T("\t\t\t\t<mpeg7:CreationTool>\n");
-            ToReturn+=_T("\t\t\t\t\t<mpeg7:Tool>\n");
-            ToReturn+=_T("\t\t\t\t\t\t<mpeg7:Name>")+MI.Get(Stream_General, 0, General_Encoded_Library)+_T("</mpeg7:Name>\n");
-            ToReturn+=_T("\t\t\t\t\t</mpeg7:Tool>\n");
-            ToReturn+=_T("\t\t\t\t</mpeg7:CreationTool>\n");
+            ToReturn+=__T("\t\t\t\t<mpeg7:CreationTool>\n");
+            ToReturn+=__T("\t\t\t\t\t<mpeg7:Tool>\n");
+            ToReturn+=__T("\t\t\t\t\t\t<mpeg7:Name>")+MI.Get(Stream_General, 0, General_Encoded_Library)+__T("</mpeg7:Name>\n");
+            ToReturn+=__T("\t\t\t\t\t</mpeg7:Tool>\n");
+            ToReturn+=__T("\t\t\t\t</mpeg7:CreationTool>\n");
         }
-        ToReturn+=_T("\t\t\t</mpeg7:Creation>\n");
-        ToReturn+=_T("\t\t</mpeg7:CreationInformation>\n");
-        ToReturn+=_T("\t</mpeg7:Description>\n");
+        ToReturn+=__T("\t\t\t</mpeg7:Creation>\n");
+        ToReturn+=__T("\t\t</mpeg7:CreationInformation>\n");
+        ToReturn+=__T("\t</mpeg7:Description>\n");
     }
 
     //Description - ContentEntity
-    ToReturn+=_T("\t<mpeg7:Description xsi:type=\"ContentEntityType\">\n");
+    ToReturn+=__T("\t<mpeg7:Description xsi:type=\"ContentEntityType\">\n");
 
     //MultimediaContent
-    ToReturn+=_T("\t\t<mpeg7:MultimediaContent xsi:type=\""); ToReturn+=Mpeg7_Type(MI); ToReturn+=_T("Type\">\n");
+    ToReturn+=__T("\t\t<mpeg7:MultimediaContent xsi:type=\""); ToReturn+=Mpeg7_Type(MI); ToReturn+=__T("Type\">\n");
 
     //(Type)
-    ToReturn+=_T("\t\t\t<mpeg7:"); ToReturn+=Mpeg7_Type(MI); ToReturn+=_T(">\n");
+    ToReturn+=__T("\t\t\t<mpeg7:"); ToReturn+=Mpeg7_Type(MI); ToReturn+=__T(">\n");
 
     //MediaFormat header
-    ToReturn+=_T("\t\t\t\t<mpeg7:MediaInformation>\n");
-    ToReturn+=_T("\t\t\t\t\t<mpeg7:MediaProfile>\n");
-    ToReturn+=_T("\t\t\t\t\t\t<mpeg7:MediaFormat>\n");
+    ToReturn+=__T("\t\t\t\t<mpeg7:MediaInformation>\n");
+    ToReturn+=__T("\t\t\t\t\t<mpeg7:MediaProfile>\n");
+    ToReturn+=__T("\t\t\t\t\t\t<mpeg7:MediaFormat>\n");
 
     //Content
-    ToReturn+=_T("\t\t\t\t\t\t\t<mpeg7:Content");
+    ToReturn+=__T("\t\t\t\t\t\t\t<mpeg7:Content");
     int32u ContentCS_termID=Mpeg7_ContentCS_termID(MI);
     if (ContentCS_termID>=500000) //Out of spec
-        ToReturn+=_T(" href=\"urn:x-mpeg7-mediainfo:cs:ContentCS:2009:");
+        ToReturn+=__T(" href=\"urn:x-mpeg7-mediainfo:cs:ContentCS:2009:");
     else
-        ToReturn+=_T(" href=\"urn:mpeg:mpeg7:cs:ContentCS:2001:");
+        ToReturn+=__T(" href=\"urn:mpeg:mpeg7:cs:ContentCS:2001:");
     ToReturn+=Ztring::ToZtring(ContentCS_termID/10000);
     if (ContentCS_termID%10000)
     {
-        ToReturn+=_T(".");
+        ToReturn+=__T(".");
         ToReturn+=Ztring::ToZtring((ContentCS_termID%10000)/100);
         if (ContentCS_termID%100)
         {
-            ToReturn+=_T(".");
+            ToReturn+=__T(".");
             ToReturn+=Ztring::ToZtring(ContentCS_termID%100);
         }
     }
-    ToReturn+=_T("\"");
-    ToReturn+=_T(">\n");
-    ToReturn+=_T("\t\t\t\t\t\t\t\t<mpeg7:Name xml:lang=\"en\">"); ToReturn+=Mpeg7_ContentCS_Name(ContentCS_termID, MI); ToReturn+=_T("</mpeg7:Name>\n");
-    ToReturn+=_T("\t\t\t\t\t\t\t</mpeg7:Content>\n");
+    ToReturn+=__T("\"");
+    ToReturn+=__T(">\n");
+    ToReturn+=__T("\t\t\t\t\t\t\t\t<mpeg7:Name xml:lang=\"en\">"); ToReturn+=Mpeg7_ContentCS_Name(ContentCS_termID, MI); ToReturn+=__T("</mpeg7:Name>\n");
+    ToReturn+=__T("\t\t\t\t\t\t\t</mpeg7:Content>\n");
 
     //FileFormat
     if (!MI.Get(Stream_General, 0, General_Format).empty())
     {
-        ToReturn+=_T("\t\t\t\t\t\t\t<mpeg7:FileFormat");
+        ToReturn+=__T("\t\t\t\t\t\t\t<mpeg7:FileFormat");
         int32u FileFormatCS_termID=Mpeg7_FileFormatCS_termID(MI);
         if (FileFormatCS_termID)
         {
             if (FileFormatCS_termID>=500000) //Out of spec
-                ToReturn+=_T(" href=\"urn:x-mpeg7-mediainfo:cs:FileFormatCS:2009:");
+                ToReturn+=__T(" href=\"urn:x-mpeg7-mediainfo:cs:FileFormatCS:2009:");
             else
-                ToReturn+=_T(" href=\"urn:mpeg:mpeg7:cs:FileFormatCS:2001:");
+                ToReturn+=__T(" href=\"urn:mpeg:mpeg7:cs:FileFormatCS:2001:");
             ToReturn+=Ztring::ToZtring(FileFormatCS_termID/10000);
-            ToReturn+=_T("\"");
+            ToReturn+=__T("\"");
         }
-        ToReturn+=_T(">\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t\t<mpeg7:Name xml:lang=\"en\">"); ToReturn+=Mpeg7_FileFormatCS_Name((FileFormatCS_termID/10000)*10000, MI); ToReturn+=_T("</mpeg7:Name>\n");
+        ToReturn+=__T(">\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t\t<mpeg7:Name xml:lang=\"en\">"); ToReturn+=Mpeg7_FileFormatCS_Name((FileFormatCS_termID/10000)*10000, MI); ToReturn+=__T("</mpeg7:Name>\n");
         if (FileFormatCS_termID%10000)
         {
-            ToReturn+=_T("\t\t\t\t\t\t\t\t\t<mpeg7:Term termID=\"");
+            ToReturn+=__T("\t\t\t\t\t\t\t\t\t<mpeg7:Term termID=\"");
             ToReturn+=Ztring::ToZtring(FileFormatCS_termID/10000);
-            ToReturn+=_T(".");
+            ToReturn+=__T(".");
             ToReturn+=Ztring::ToZtring((FileFormatCS_termID%10000)/100);
-            ToReturn+=_T("\">\n");
-            ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t<mpeg7:Name xml:lang=\"en\">"); ToReturn+=Mpeg7_FileFormatCS_Name((FileFormatCS_termID/100)*100, MI); ToReturn+=_T("</mpeg7:Name>\n");
+            ToReturn+=__T("\">\n");
+            ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t<mpeg7:Name xml:lang=\"en\">"); ToReturn+=Mpeg7_FileFormatCS_Name((FileFormatCS_termID/100)*100, MI); ToReturn+=__T("</mpeg7:Name>\n");
             if (FileFormatCS_termID%100)
             {
-                ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t<mpeg7:Term termID=\"");
+                ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t<mpeg7:Term termID=\"");
                 ToReturn+=Ztring::ToZtring(FileFormatCS_termID/10000);
-                ToReturn+=_T(".");
+                ToReturn+=__T(".");
                 ToReturn+=Ztring::ToZtring((FileFormatCS_termID%10000)/100);
-                ToReturn+=_T(".");
+                ToReturn+=__T(".");
                 ToReturn+=Ztring::ToZtring(FileFormatCS_termID%100);
-                ToReturn+=_T("\">\n");
-                ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Name xml:lang=\"en\">"); ToReturn+=Mpeg7_FileFormatCS_Name(FileFormatCS_termID, MI); ToReturn+=_T("</mpeg7:Name>\n");
-                ToReturn+=_T("\t\t\t\t\t\t\t\t\t\t</mpeg7:Term>\n");
+                ToReturn+=__T("\">\n");
+                ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t\t<mpeg7:Name xml:lang=\"en\">"); ToReturn+=Mpeg7_FileFormatCS_Name(FileFormatCS_termID, MI); ToReturn+=__T("</mpeg7:Name>\n");
+                ToReturn+=__T("\t\t\t\t\t\t\t\t\t\t</mpeg7:Term>\n");
             }
-            ToReturn+=_T("\t\t\t\t\t\t\t\t\t</mpeg7:Term>\n");
+            ToReturn+=__T("\t\t\t\t\t\t\t\t\t</mpeg7:Term>\n");
         }
-        ToReturn+=_T("\t\t\t\t\t\t\t</mpeg7:FileFormat>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t</mpeg7:FileFormat>\n");
     }
 
     //FileSize
-    ToReturn+=_T("\t\t\t\t\t\t\t<mpeg7:FileSize>"); ToReturn+=MI.Get(Stream_General, 0, General_FileSize); ToReturn+=_T("</mpeg7:FileSize>\n");
+    ToReturn+=__T("\t\t\t\t\t\t\t<mpeg7:FileSize>"); ToReturn+=MI.Get(Stream_General, 0, General_FileSize); ToReturn+=__T("</mpeg7:FileSize>\n");
 
     //System
     if (!MI.Get(Stream_Video, 0, Video_Standard).empty())
     {
-        ToReturn+=_T("\t\t\t\t\t\t\t<mpeg7:System");
+        ToReturn+=__T("\t\t\t\t\t\t\t<mpeg7:System");
         int32u SystemCS_termID=Mpeg7_SystemCS_termID(MI, 0); //2 video streams are not supported
         if (SystemCS_termID)
         {
-            ToReturn+=_T(" href=\"urn:mpeg:mpeg7:cs:SystemCS:2001:");
+            ToReturn+=__T(" href=\"urn:mpeg:mpeg7:cs:SystemCS:2001:");
             ToReturn+=Ztring::ToZtring(SystemCS_termID/10000);
             if (SystemCS_termID%10000)
             {
-                ToReturn+=_T(".");
+                ToReturn+=__T(".");
                 ToReturn+=Ztring::ToZtring((SystemCS_termID%10000)/100);
                 if (SystemCS_termID%100)
                 {
-                    ToReturn+=_T(".");
+                    ToReturn+=__T(".");
                     ToReturn+=Ztring::ToZtring(SystemCS_termID%100);
                 }
             }
-            ToReturn+=_T("\"");
+            ToReturn+=__T("\"");
         }
-        ToReturn+=_T(">\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t\t<mpeg7:Name xml:lang=\"en\">"); ToReturn+=Mpeg7_SystemCS_Name(SystemCS_termID); ToReturn+=_T("</mpeg7:Name>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t</mpeg7:System>\n");
+        ToReturn+=__T(">\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t\t<mpeg7:Name xml:lang=\"en\">"); ToReturn+=Mpeg7_SystemCS_Name(SystemCS_termID); ToReturn+=__T("</mpeg7:Name>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t</mpeg7:System>\n");
     }
 
     //BitRate
     if (!MI.Get(Stream_General, 0, General_OverallBitRate).empty())
     {
-        ToReturn+=_T("\t\t\t\t\t\t\t<mpeg7:BitRate");
+        ToReturn+=__T("\t\t\t\t\t\t\t<mpeg7:BitRate");
         bool IsCBR=true;
         bool IsVBR=true;
         for (size_t StreamKind=Stream_Video; StreamKind<=Stream_Audio; StreamKind++)
             for (size_t StreamPos=0; StreamPos<MI.Count_Get((stream_t)StreamKind); StreamPos++)
             {
-                if (IsCBR && MI.Get((stream_t)StreamKind, StreamPos, _T("BitRate_Mode"))==_T("VBR"))
+                if (IsCBR && MI.Get((stream_t)StreamKind, StreamPos, __T("BitRate_Mode"))==__T("VBR"))
                     IsCBR=false;
-                if (IsVBR && MI.Get((stream_t)StreamKind, StreamPos, _T("BitRate_Mode"))==_T("CBR"))
+                if (IsVBR && MI.Get((stream_t)StreamKind, StreamPos, __T("BitRate_Mode"))==__T("CBR"))
                     IsVBR=false;
             }
         if (IsCBR && IsVBR)
@@ -1120,10 +1495,10 @@
             IsVBR=false;
         }
         if (IsCBR)
-            ToReturn+=_T(" variable=\"false\"");
+            ToReturn+=__T(" variable=\"false\"");
         if (IsVBR)
-            ToReturn+=_T(" variable=\"true\"");
-        ToReturn+=_T(">"); ToReturn+=MI.Get(Stream_General, 0, General_OverallBitRate); ToReturn+=_T("</mpeg7:BitRate>\n");
+            ToReturn+=__T(" variable=\"true\"");
+        ToReturn+=__T(">"); ToReturn+=MI.Get(Stream_General, 0, General_OverallBitRate); ToReturn+=__T("</mpeg7:BitRate>\n");
     }
 
     //xxxCoding
@@ -1133,45 +1508,45 @@
         Mpeg7_Transform_Audio(ToReturn, MI, Pos);
 
     //MediaFormat header
-    ToReturn+=_T("\t\t\t\t\t\t</mpeg7:MediaFormat>\n");
+    ToReturn+=__T("\t\t\t\t\t\t</mpeg7:MediaFormat>\n");
 
     //MediaTranscodingHints, intraFrameDistance and anchorFrameDistance
     if (!MI.Get(Stream_Video, 0, Video_Format_Settings_GOP).empty())
     {
-        Ztring M=MI.Get(Stream_Video, 0, Video_Format_Settings_GOP).SubString(_T("M="), _T(","));
-        Ztring N=MI.Get(Stream_Video, 0, Video_Format_Settings_GOP).SubString(_T("N="), _T(""));
-        ToReturn+=_T("\t\t\t\t\t\t<mpeg7:MediaTranscodingHints>\n");
-        ToReturn+=_T("\t\t\t\t\t\t\t<mpeg7:CodingHints");
+        Ztring M=MI.Get(Stream_Video, 0, Video_Format_Settings_GOP).SubString(__T("M="), __T(","));
+        Ztring N=MI.Get(Stream_Video, 0, Video_Format_Settings_GOP).SubString(__T("N="), __T(""));
+        ToReturn+=__T("\t\t\t\t\t\t<mpeg7:MediaTranscodingHints>\n");
+        ToReturn+=__T("\t\t\t\t\t\t\t<mpeg7:CodingHints");
         if (!N.empty())
-            ToReturn+=_T(" intraFrameDistance=\"")+N;
+            ToReturn+=__T(" intraFrameDistance=\"")+N;
         if (!M.empty())
-            ToReturn+=_T("\" anchorFrameDistance=\"")+M;
-        ToReturn+=_T("\"/>\n");
-        ToReturn+=_T("\t\t\t\t\t\t</mpeg7:MediaTranscodingHints>\n");
+            ToReturn+=__T("\" anchorFrameDistance=\"")+M;
+        ToReturn+=__T("\"/>\n");
+        ToReturn+=__T("\t\t\t\t\t\t</mpeg7:MediaTranscodingHints>\n");
     }
 
-    ToReturn+=_T("\t\t\t\t\t</mpeg7:MediaProfile>\n");
-    ToReturn+=_T("\t\t\t\t</mpeg7:MediaInformation>\n");
+    ToReturn+=__T("\t\t\t\t\t</mpeg7:MediaProfile>\n");
+    ToReturn+=__T("\t\t\t\t</mpeg7:MediaInformation>\n");
 
     if (MI.Count_Get(Stream_Video)==1 || MI.Count_Get(Stream_Audio)==1)
     {
         //MediaTimePoint
-        ToReturn+=_T("\t\t\t\t<mpeg7:MediaTime>\n");
-        ToReturn+=_T("\t\t\t\t\t<mpeg7:MediaTimePoint>")+Mpeg7_MediaTimePoint(MI)+_T("</mpeg7:MediaTimePoint>\n");
+        ToReturn+=__T("\t\t\t\t<mpeg7:MediaTime>\n");
+        ToReturn+=__T("\t\t\t\t\t<mpeg7:MediaTimePoint>")+Mpeg7_MediaTimePoint(MI)+__T("</mpeg7:MediaTimePoint>\n");
 
         //MediaDuration
-        ToReturn+=_T("\t\t\t\t\t<mpeg7:MediaDuration>"); ToReturn+=Mpeg7_MediaDuration(MI); ToReturn+=_T("</mpeg7:MediaDuration>\n");
-        ToReturn+=_T("\t\t\t\t</mpeg7:MediaTime>\n");
+        ToReturn+=__T("\t\t\t\t\t<mpeg7:MediaDuration>"); ToReturn+=Mpeg7_MediaDuration(MI); ToReturn+=__T("</mpeg7:MediaDuration>\n");
+        ToReturn+=__T("\t\t\t\t</mpeg7:MediaTime>\n");
     }
 
     //Mpeg7 footer
-    ToReturn+=_T("\t\t\t</mpeg7:"); ToReturn+=Mpeg7_Type(MI); ToReturn+=_T(">\n");
-    ToReturn+=_T("\t\t</mpeg7:MultimediaContent>\n");
-    ToReturn+=_T("\t</mpeg7:Description>\n");
-    ToReturn+=_T("</mpeg7:Mpeg7>\n");
+    ToReturn+=__T("\t\t\t</mpeg7:"); ToReturn+=Mpeg7_Type(MI); ToReturn+=__T(">\n");
+    ToReturn+=__T("\t\t</mpeg7:MultimediaContent>\n");
+    ToReturn+=__T("\t</mpeg7:Description>\n");
+    ToReturn+=__T("</mpeg7:Mpeg7>\n");
 
     //Carriage return
-    ToReturn.FindAndReplace(_T("\n"), EOL, 0, Ztring_Recursive);
+    ToReturn.FindAndReplace(__T("\n"), EOL, 0, Ztring_Recursive);
 
     //Find and replace
     ZtringListList ToReplace=MediaInfoLib::Config.Inform_Replace_Get_All();

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Export/Export_Mpeg7.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Export/Export_Mpeg7.h Changed

@@ -1,17 +1,17 @@
 // Reader_File - All information about media files
-// Copyright (C) 2009-2009 Jerome Martinez, Zen@MediaArea.net
+// Copyright (C) 2009-2012 Jerome Martinez, Zen@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Export/Export_PBCore.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Export/Export_PBCore.cpp Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Export/Export_PBCore.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Export/Export_PBCore.h Changed

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Export/Export_reVTMD.cpp Added

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Export/Export_reVTMD.h Added

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/File_Dummy.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/File_Dummy.cpp Changed

@@ -1,31 +1,35 @@
 // File_Dummy - Fill with Name of tags
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_DUMMY_YES)
 //---------------------------------------------------------------------------
 
@@ -43,18 +47,18 @@
 //---------------------------------------------------------------------------
 void File_Dummy::FileHeader_Parse()
 {
-    File_Name=_T("D:\\Example\\"); File_Name+=KindOfDummy;
-         if (KindOfDummy==_T("Album"))
+    File_Name=__T("D:\\Example\\"); File_Name+=KindOfDummy;
+         if (KindOfDummy==__T("Album"))
     {
         Fill_Dummy_General();
         Fill_Dummy_Audio();
     }
-    else if (KindOfDummy==_T("Comic"))
+    else if (KindOfDummy==__T("Comic"))
     {
         Fill_Dummy_General();
         Fill_Dummy_Video();
     }
-    else if (KindOfDummy==_T("Movie"))
+    else if (KindOfDummy==__T("Movie"))
     {
         Fill_Dummy_General();
         Fill_Dummy_Video();
@@ -72,7 +76,7 @@
     }
     else
     {
-        File_Name=_T("D:\\WhatIsIt.mkv");
+        File_Name=__T("D:\\WhatIsIt.mkv");
         Fill(Stream_General, 0, General_Domain, "Starwars saga");
         Fill(Stream_General, 0, General_Movie, "Starwars 4");
         Fill(Stream_General, 0, General_Movie_More, "A new hope");
@@ -88,7 +92,7 @@
         Fill(Stream_Video, 0, Video_Width, "720");
         Fill(Stream_Video, 0, Video_Height, "320");
         Fill(Stream_Video, 0, Video_FrameRate, "24.976");
-        Fill(Stream_Video, 0, Video_Resolution, "8");
+        Fill(Stream_Video, 0, Video_BitDepth, "8");
         Fill(Stream_Video, 0, Video_Language, "en");
         Stream_Prepare(Stream_Audio);
         Fill(Stream_Audio, 0, Audio_Format, "AC-3");
@@ -128,7 +132,7 @@
     Fill(Stream_General, 0, General_Collection, "Collection");
     Fill(Stream_General, 0, General_Season, "Season");
     Fill(Stream_General, 0, General_Season_Position_Total, "Season/Position_Total");
-         if (KindOfDummy==_T("Album"))
+         if (KindOfDummy==__T("Album"))
     {
         Fill(Stream_General, 0, General_Album, "Album name");
         Fill(Stream_General, 0, General_Album_More, "More information about the album");
@@ -139,12 +143,12 @@
         Fill(Stream_General, 0, General_Track_Position, "Track/Position");
         Fill(Stream_General, 0, General_Track_More, "More information about the track");
     }
-    else if (KindOfDummy==_T("Comic"))
+    else if (KindOfDummy==__T("Comic"))
     {
         Fill(Stream_General, 0, General_Comic, "Comic name");
         Fill(Stream_General, 0, General_Comic_More, "More information about the comic");
     }
-    else //if (KindOfDummy==_T("Movie"))
+    else //if (KindOfDummy==__T("Movie"))
     {
         Fill(Stream_General, 0, General_Movie, "Movie name");
         Fill(Stream_General, 0, General_Movie_More, "More information about the movie");
@@ -243,17 +247,17 @@
     Fill(Stream_Video, 0, Video_BitRate_Mode, "BitRate_Mode");
     Fill(Stream_Video, 0, Video_Encoded_Library, "Encoded_Library");
     Fill(Stream_Video, 0, Video_Encoded_Library_Settings, "Encoded_Library_Settings");
-         if (KindOfDummy==_T("Album"))
+         if (KindOfDummy==__T("Album"))
     {
         Fill(Stream_Video, 0, Video_Width, "2000");
         Fill(Stream_Video, 0, Video_Height, "3000");
     }
-    else //if (KindOfDummy==_T("Movie"))
+    else //if (KindOfDummy==__T("Movie"))
     {
         Fill(Stream_Video, 0, Video_DisplayAspectRatio, "2");
         Fill(Stream_Video, 0, Video_FrameRate, "24.976");
         Fill(Stream_Video, 0, Video_FrameCount, "FrameCount");
-        Fill(Stream_Video, 0, Video_Resolution, "8");
+        Fill(Stream_Video, 0, Video_BitDepth, "8");
         Fill(Stream_Video, 0, Video_Bits__Pixel_Frame_, "Bits/(Pixel*Frame)");
         Fill(Stream_Video, 0, Video_Delay, "100");
         Fill(Stream_Video, 0, Video_Duration, "990000");
@@ -283,7 +287,7 @@
     Fill(Stream_Audio, 0, Audio_ChannelPositions, "ChannelPositions");
     Fill(Stream_Audio, 0, Audio_SamplingRate, "48000");
     Fill(Stream_Audio, 0, Audio_SamplingCount, "SamplingCount");
-    Fill(Stream_Audio, 0, Audio_Resolution, "Resolution");
+    Fill(Stream_Audio, 0, Audio_BitDepth, "BitDepth");
     Fill(Stream_Audio, 0, Audio_Delay, "10");
     Fill(Stream_Audio, 0, Audio_Duration, "100000");
     Fill(Stream_Audio, 0, Audio_Language, "fre");

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/File_Dummy.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/File_Dummy.h Changed

@@ -1,17 +1,17 @@
 // File_Dummy - Fill with Name of tags
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/File_Other.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/File_Other.cpp Changed

@@ -1,31 +1,35 @@
 // File_Other - Use magic number to detect only the format
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_OTHER_YES)
 //---------------------------------------------------------------------------
 
@@ -50,25 +54,25 @@
         return;
 
     Ztring Format;
-         if (CC4(Buffer)==0xC5C6CBC3) {Format=_T("RISC OS Chunk data");}
-    else if (CC4(Buffer)==0x110000EF) {Format=_T("RISC OS AIF executable");}
-    else if (CC4(Buffer)==CC4("Draw")) {Format=_T("RISC OS Draw");}
-    else if (CC4(Buffer)==CC4("FONT")) {Format=_T("RISC OS Font");}
-    else if (CC8(Buffer)==CC8("Maestro\r")) {Format=_T("RISC OS music file");}
-    else if (CC4(Buffer)==CC4("FC14")) {Format=_T("Amiga Future Composer");}
-    else if (CC4(Buffer)==CC4("SMOD")) {Format=_T("Amiga Future Composer");}
-    else if (CC4(Buffer)==CC4("AON4")) {Format=_T("Amiga Art Of Noise");}
-    else if (CC8(Buffer+1)==CC8("MUGICIAN")) {Format=_T("Amiga Mugician");}
-    else if (Buffer_Size>=66 && CC8(Buffer+58)==CC8("SIDMON I")) {Format=_T("Amiga Sidmon");}
-    else if (CC8(Buffer)==CC8("Synth4.0")) {Format=_T("Amiga Synthesis");}
-    else if (CC4(Buffer)==CC4("ARP.")) {Format=_T("Amiga Holy Noise");}
-    else if (CC4(Buffer)==CC4("BeEp")) {Format=_T("Amiga JamCracker");}
-    else if (CC4(Buffer)==CC4("COSO")) {Format=_T("Amiga Hippel-COSO");}
-    else if (CC3(Buffer)==CC3("LSX")) {Format=_T("Amiga LZX");}
-    else if (CC4(Buffer)==CC4("MOVI")) {Format=_T("Silicon Graphics movie");}
-    else if (CC4(Buffer+10)==CC4("Vivo")) {Format=_T("Vivo");}
-    else if (CC4(Buffer+1)==CC4("VRML")) {Format=_T("VRML");}
-    else if (CC5(Buffer)==CC5("HVQM4")) {Format=_T("GameCube Movie");}
+         if (CC4(Buffer)==0xC5C6CBC3) {Format=__T("RISC OS Chunk data");}
+    else if (CC4(Buffer)==0x110000EF) {Format=__T("RISC OS AIF executable");}
+    else if (CC4(Buffer)==CC4("Draw")) {Format=__T("RISC OS Draw");}
+    else if (CC4(Buffer)==CC4("FONT")) {Format=__T("RISC OS Font");}
+    else if (CC8(Buffer)==CC8("Maestro\r")) {Format=__T("RISC OS music file");}
+    else if (CC4(Buffer)==CC4("FC14")) {Format=__T("Amiga Future Composer");}
+    else if (CC4(Buffer)==CC4("SMOD")) {Format=__T("Amiga Future Composer");}
+    else if (CC4(Buffer)==CC4("AON4")) {Format=__T("Amiga Art Of Noise");}
+    else if (CC8(Buffer+1)==CC8("MUGICIAN")) {Format=__T("Amiga Mugician");}
+    else if (Buffer_Size>=66 && CC8(Buffer+58)==CC8("SIDMON I")) {Format=__T("Amiga Sidmon");}
+    else if (CC8(Buffer)==CC8("Synth4.0")) {Format=__T("Amiga Synthesis");}
+    else if (CC4(Buffer)==CC4("ARP.")) {Format=__T("Amiga Holy Noise");}
+    else if (CC4(Buffer)==CC4("BeEp")) {Format=__T("Amiga JamCracker");}
+    else if (CC4(Buffer)==CC4("COSO")) {Format=__T("Amiga Hippel-COSO");}
+    else if (CC3(Buffer)==CC3("LSX")) {Format=__T("Amiga LZX");}
+    else if (CC4(Buffer)==CC4("MOVI")) {Format=__T("Silicon Graphics movie");}
+    else if (CC4(Buffer+10)==CC4("Vivo")) {Format=__T("Vivo");}
+    else if (CC4(Buffer+1)==CC4("VRML")) {Format=__T("VRML");}
+    else if (CC5(Buffer)==CC5("HVQM4")) {Format=__T("GameCube Movie");}
     else if (CC8(Buffer)==CC8("KW-DIRAC"))
     {
         Accept("Dirac");
@@ -79,38 +83,38 @@
         Finish("Dirac");
         return;
     }
-    else if (CC5(Buffer)==CC5("ustar")) {Format=_T("Tar archive");}
+    else if (CC5(Buffer)==CC5("ustar")) {Format=__T("Tar archive");}
     //TODO: all archive magic numbers
-    else if (CC4(Buffer+1)==CC4("MSCB")) {Format=_T("MS Cabinet");}
-    else if (CC4(Buffer)==CC4(".snd")) {Format=_T("SUN Audio");}
-    else if (CC4(Buffer)==0x2E736400) {Format=_T("DEC Audio");}
-    else if (CC4(Buffer)==CC4("MThd")) {Format=_T("MIDI");}
-    else if (CC4(Buffer)==CC4("CTMF")) {Format=_T("CMF");}
-    else if (CC3(Buffer)==CC3("SBI")) {Format=_T("SoundBlaster");}
-    else if (CC4(Buffer)==CC4("EMOD")) {Format=_T("Ext. MOD");}
+    else if (CC4(Buffer+1)==CC4("MSCB")) {Format=__T("MS Cabinet");}
+    else if (CC4(Buffer)==CC4(".snd")) {Format=__T("SUN Audio");}
+    else if (CC4(Buffer)==0x2E736400) {Format=__T("DEC Audio");}
+    else if (CC4(Buffer)==CC4("MThd")) {Format=__T("MIDI");}
+    else if (CC4(Buffer)==CC4("CTMF")) {Format=__T("CMF");}
+    else if (CC3(Buffer)==CC3("SBI")) {Format=__T("SoundBlaster");}
+    else if (CC4(Buffer)==CC4("EMOD")) {Format=__T("Ext. MOD");}
     //TODO: Other Sound magic numbers
-    else if (CC7(Buffer)==CC7("BLENDER")) {Format=_T("Blender");}
-    else if (CC4(Buffer)==CC4("AC10")) {Format=_T("AutoCAD"); ;}
-    else if (CC2(Buffer)==0x1F9D) {Format=_T("Compress");}
-    else if (CC2(Buffer)==0x1F8B) {Format=_T("GZip");}
-    else if (CC2(Buffer)==0x1F1E) {Format=_T("Huffman");}
-    else if (CC3(Buffer)==CC3("BZh")) {Format=_T("BZip2");}
-    else if (CC2(Buffer)==CC2("BZ")) {Format=_T("BZip1");}
-    else if (CC3(Buffer)==CC3("NES")) {Format=_T("NES ROM");}
-    else if (Buffer_Size>=0x108 && CC4(Buffer+0x104)==0xCEED6666) {Format=_T("GameBoy");}
-    else if (Buffer_Size>=0x104 && CC4(Buffer+0x100)==CC4("SEGA")) {Format=_T("MegaDrive");}
-    else if (Buffer_Size>=0x284 && CC4(Buffer+0x280)==CC4("EAGN")) {Format=_T("SupeMegaDrive");}
-    else if (Buffer_Size>=0x284 && CC4(Buffer+0x280)==CC4("EAMG")) {Format=_T("SupeMegaDrive");}
-    else if (CC4(Buffer)==0x21068028) {Format=_T("Dreamcast");}
-    else if (CC4(Buffer)==CC4("LCDi")) {Format=_T("Dreamcast");}
-    else if (CC4(Buffer)==0x37804012) {Format=_T("Nintendo64");}
-    else if (CC8(Buffer)==CC8("PS-X EXE")) {Format=_T("Playstation");}
-    else if (CC4(Buffer)==CC4("LCDi")) {Format=_T("Dreamcast");}
-    else if (CC4(Buffer)==CC4("XBEH")) {Format=_T("X-Box");}
-    else if (CC4(Buffer)==CC4("XIP0")) {Format=_T("X-Box");}
-    else if (CC4(Buffer)==CC4("XTF0")) {Format=_T("X-Box");}
-    else if (CC2(Buffer)==0x8008) {Format=_T("Lynx");}
-    else if (CC7(Buffer)==CC7("\x01ZZZZZ\x01")) {Format=_T("");}
+    else if (CC7(Buffer)==CC7("BLENDER")) {Format=__T("Blender");}
+    else if (CC4(Buffer)==CC4("AC10")) {Format=__T("AutoCAD"); ;}
+    else if (CC2(Buffer)==0x1F9D) {Format=__T("Compress");}
+    else if (CC2(Buffer)==0x1F8B) {Format=__T("GZip");}
+    else if (CC2(Buffer)==0x1F1E) {Format=__T("Huffman");}
+    else if (CC3(Buffer)==CC3("BZh")) {Format=__T("BZip2");}
+    else if (CC2(Buffer)==CC2("BZ")) {Format=__T("BZip1");}
+    else if (CC3(Buffer)==CC3("NES")) {Format=__T("NES ROM");}
+    else if (Buffer_Size>=0x108 && CC4(Buffer+0x104)==0xCEED6666) {Format=__T("GameBoy");}
+    else if (Buffer_Size>=0x104 && CC4(Buffer+0x100)==CC4("SEGA")) {Format=__T("MegaDrive");}
+    else if (Buffer_Size>=0x284 && CC4(Buffer+0x280)==CC4("EAGN")) {Format=__T("SupeMegaDrive");}
+    else if (Buffer_Size>=0x284 && CC4(Buffer+0x280)==CC4("EAMG")) {Format=__T("SupeMegaDrive");}
+    else if (CC4(Buffer)==0x21068028) {Format=__T("Dreamcast");}
+    else if (CC4(Buffer)==CC4("LCDi")) {Format=__T("Dreamcast");}
+    else if (CC4(Buffer)==0x37804012) {Format=__T("Nintendo64");}
+    else if (CC8(Buffer)==CC8("PS-X EXE")) {Format=__T("Playstation");}
+    else if (CC4(Buffer)==CC4("LCDi")) {Format=__T("Dreamcast");}
+    else if (CC4(Buffer)==CC4("XBEH")) {Format=__T("X-Box");}
+    else if (CC4(Buffer)==CC4("XIP0")) {Format=__T("X-Box");}
+    else if (CC4(Buffer)==CC4("XTF0")) {Format=__T("X-Box");}
+    else if (CC2(Buffer)==0x8008) {Format=__T("Lynx");}
+    else if (CC7(Buffer)==CC7("\x01ZZZZZ\x01")) {Format=__T("");}
     else if (CC6(Buffer)==CC6("1\x0A\x0D""00:"))
     {
         Accept("SRT");
@@ -121,8 +125,8 @@
         Finish("SRT");
         return;
     }
-    else if (CC1(Buffer+0)==CC1("[") && CC1(Buffer+2)==CC1("S") && CC1(Buffer+22)==CC1("o") && CC1(Buffer+24)==CC1("]") //Unicode Text is : "[Script Info]
-          || CC1(Buffer+2)==CC1("[") && CC1(Buffer+4)==CC1("S") && CC1(Buffer+24)==CC1("o") && CC1(Buffer+26)==CC1("]"))
+    else if ((CC1(Buffer+0)==CC1("[") && CC1(Buffer+2)==CC1("S") && CC1(Buffer+22)==CC1("o") && CC1(Buffer+24)==CC1("]")) //Unicode Text is : "[Script Info]
+          || (CC1(Buffer+2)==CC1("[") && CC1(Buffer+4)==CC1("S") && CC1(Buffer+24)==CC1("o") && CC1(Buffer+26)==CC1("]")))
     {
         Accept("SSA");
 
@@ -132,8 +136,18 @@
         Finish("SSA");
         return;
     }
-    else if (CC4(Buffer)==CC4("RIFF") && CC4(Buffer+8)==CC4("AMV ")) {Format=_T("AMV");}
-    else if (CC4(Buffer)==0x414D5697) {Format=_T("MTV");}
+    else if (CC4(Buffer)==CC4("RIFF") && CC4(Buffer+8)==CC4("AMV ")) {Format=__T("AMV");}
+    else if (CC4(Buffer)==CC4("RIFF") && CC4(Buffer+8)==CC4("WEBP"))
+    {
+        Accept("WEBP");
+
+        Stream_Prepare(Stream_Image);
+        Fill(Stream_Image, 0, Image_Format, "WebP");
+
+        Finish("WEBP");
+        return;
+    }
+    else if (CC4(Buffer)==0x414D5697) {Format=__T("MTV");}
     else if (CC6(Buffer)==CC6("Z\0W\0F\0"))
     {
         Accept("ZWF");
@@ -156,17 +170,8 @@
         Finish("Shorten");
         return;
     }
-    else if (CC4(Buffer)==0x7442614B) //"tBaK"
-    {
-        Accept("TAK");
-
-        Stream_Prepare(Stream_Audio);
-        Fill(Stream_Audio, 0, Audio_Format, "TAK");
-
-        Finish("TAK");
-        return;
-    }
-    else if (CC4(Buffer)==CC4("")) {Format=_T("");}
+    else if (CC4(Buffer)==0x504C5646) {Format=__T("PlayLater Video");}
+    else if (CC4(Buffer)==CC4("")) {Format=__T("");}
 
     if (Format.empty())
     {

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/File_Other.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/File_Other.h Changed

@@ -1,17 +1,17 @@
 // File_Other - Use magic number to detect only the format
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/File_Unknown.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/File_Unknown.cpp Changed

@@ -1,31 +1,35 @@
 // File_Unknown - Empty container
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_UNKNOWN_YES)
 //---------------------------------------------------------------------------
 
@@ -47,6 +51,12 @@
     Finish("Unknown");
 }
 
+//---------------------------------------------------------------------------
+void File_Unknown::Read_Buffer_Continue()
+{
+    Skip_XX(Element_Size, "Unknown");
+}
+
 //***************************************************************************
 //
 //***************************************************************************

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/File_Unknown.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/File_Unknown.h Changed

@@ -1,17 +1,17 @@
 // File_Unknown - Empty container
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -44,6 +44,7 @@
 protected :
     //Buffer - Global
     void Read_Buffer_Init ();
+    void Read_Buffer_Continue ();
 };
 
 } //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/File__Analyse_Automatic.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/File__Analyse_Automatic.h Changed

@@ -1,19 +1,18 @@
 // Enums - Automaticly generated enums for MediaInfo
-// Copyright (C) 2008-2008 Jerome Martinez, Zen@MediaArea.net
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
 //
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
+// 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
+// any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
+// 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 Lesser 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
+// You should have received a copy of the GNU Library General Public License
+// along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -42,6 +41,7 @@
     Generic_Format_Commercial_IfAny,
     Generic_Format_Version,
     Generic_Format_Profile,
+    Generic_Format_Compression,
     Generic_Format_Settings,
     Generic_InternetMediaType,
     Generic_CodecID,
@@ -59,6 +59,11 @@
     Generic_Duration_String1,
     Generic_Duration_String2,
     Generic_Duration_String3,
+    Generic_Source_Duration,
+    Generic_Source_Duration_String,
+    Generic_Source_Duration_String1,
+    Generic_Source_Duration_String2,
+    Generic_Source_Duration_String3,
     Generic_BitRate_Mode,
     Generic_BitRate_Mode_String,
     Generic_BitRate,
@@ -69,12 +74,42 @@
     Generic_BitRate_Nominal_String,
     Generic_BitRate_Maximum,
     Generic_BitRate_Maximum_String,
+    Generic_BitRate_Encoded,
+    Generic_BitRate_Encoded_String,
+    Generic_FrameCount,
+    Generic_Source_FrameCount,
     Generic_ColorSpace,
     Generic_ChromaSubsampling,
     Generic_Resolution,
     Generic_Resolution_String,
     Generic_BitDepth,
     Generic_BitDepth_String,
+    Generic_Compression_Mode,
+    Generic_Compression_Mode_String,
+    Generic_Compression_Ratio,
+    Generic_Delay,
+    Generic_Delay_String,
+    Generic_Delay_String1,
+    Generic_Delay_String2,
+    Generic_Delay_String3,
+    Generic_Delay_String4,
+    Generic_Delay_Settings,
+    Generic_Delay_Source,
+    Generic_Delay_Source_String,
+    Generic_Delay_Original,
+    Generic_Delay_Original_String,
+    Generic_Delay_Original_String1,
+    Generic_Delay_Original_String2,
+    Generic_Delay_Original_String3,
+    Generic_Delay_Original_String4,
+    Generic_Delay_Original_Settings,
+    Generic_Delay_Original_Source,
+    Generic_Video_Delay,
+    Generic_Video_Delay_String,
+    Generic_Video_Delay_String1,
+    Generic_Video_Delay_String2,
+    Generic_Video_Delay_String3,
+    Generic_Video_Delay_String4,
     Generic_StreamSize,
     Generic_StreamSize_String,
     Generic_StreamSize_String1,
@@ -83,21 +118,51 @@
     Generic_StreamSize_String4,
     Generic_StreamSize_String5,
     Generic_StreamSize_Proportion,
+    Generic_Source_StreamSize,
+    Generic_Source_StreamSize_String,
+    Generic_Source_StreamSize_String1,
+    Generic_Source_StreamSize_String2,
+    Generic_Source_StreamSize_String3,
+    Generic_Source_StreamSize_String4,
+    Generic_Source_StreamSize_String5,
+    Generic_Source_StreamSize_Proportion,
+    Generic_StreamSize_Encoded,
+    Generic_StreamSize_Encoded_String,
+    Generic_StreamSize_Encoded_String1,
+    Generic_StreamSize_Encoded_String2,
+    Generic_StreamSize_Encoded_String3,
+    Generic_StreamSize_Encoded_String4,
+    Generic_StreamSize_Encoded_String5,
+    Generic_StreamSize_Encoded_Proportion,
+    Generic_Source_StreamSize_Encoded,
+    Generic_Source_StreamSize_Encoded_String,
+    Generic_Source_StreamSize_Encoded_String1,
+    Generic_Source_StreamSize_Encoded_String2,
+    Generic_Source_StreamSize_Encoded_String3,
+    Generic_Source_StreamSize_Encoded_String4,
+    Generic_Source_StreamSize_Encoded_String5,
+    Generic_Source_StreamSize_Encoded_Proportion,
+    Generic_Language,
+    Generic_ServiceName,
+    Generic_ServiceProvider,
 };
 
 //---------------------------------------------------------------------------
 enum general
 {
     General_Count,
+    General_Status,
     General_StreamCount,
     General_StreamKind,
     General_StreamKind_String,
     General_StreamKindID,
     General_StreamKindPos,
+    General_StreamOrder,
     General_Inform,
     General_ID,
     General_ID_String,
     General_UniqueID,
+    General_UniqueID_String,
     General_MenuID,
     General_MenuID_String,
     General_GeneralCount,
@@ -144,9 +209,11 @@
     General_Format_Commercial_IfAny,
     General_Format_Version,
     General_Format_Profile,
+    General_Format_Compression,
     General_Format_Settings,
     General_InternetMediaType,
     General_CodecID,
+    General_CodecID_String,
     General_CodecID_Info,
     General_CodecID_Hint,
     General_CodecID_Url,
@@ -198,6 +265,7 @@
     General_HeaderSize,
     General_DataSize,
     General_FooterSize,
+    General_IsStreamable,
     General_Album_ReplayGain_Gain,
     General_Album_ReplayGain_Gain_String,
     General_Album_ReplayGain_Peak,
@@ -217,6 +285,9 @@
     General_Album,
     General_Album_More,
     General_Album_Sort,
+    General_Album_Performer,
+    General_Album_Performer_Sort,
+    General_Album_Performer_Url,
     General_Comic,
     General_Comic_More,
     General_Comic_Position_Total,
@@ -229,12 +300,15 @@
     General_Track_Sort,
     General_Track_Position,
     General_Track_Position_Total,
+    General_Grouping,
     General_Chapter,
     General_SubTrack,
     General_Original_Album,
     General_Original_Movie,
     General_Original_Part,
     General_Original_Track,
+    General_Compilation,
+    General_Compilation_String,
     General_Performer,
     General_Performer_Sort,
     General_Performer_Url,
@@ -361,15 +435,18 @@
 enum video
 {
     Video_Count,
+    Video_Status,
     Video_StreamCount,
     Video_StreamKind,
     Video_StreamKind_String,
     Video_StreamKindID,
     Video_StreamKindPos,
+    Video_StreamOrder,
     Video_Inform,
     Video_ID,
     Video_ID_String,
     Video_UniqueID,
+    Video_UniqueID_String,
     Video_MenuID,
     Video_MenuID_String,
     Video_Format,
@@ -379,8 +456,10 @@
     Video_Format_Commercial_IfAny,
     Video_Format_Version,
     Video_Format_Profile,
+    Video_Format_Compression,
     Video_MultiView_BaseProfile,
     Video_MultiView_Count,
+    Video_MultiView_Layout,
     Video_Format_Settings,
     Video_Format_Settings_BVOP,
     Video_Format_Settings_BVOP_String,
@@ -399,9 +478,11 @@
     Video_Format_Settings_FrameMode,
     Video_Format_Settings_GOP,
     Video_Format_Settings_FrameStructures,
+    Video_Format_Settings_Wrapping,
     Video_InternetMediaType,
     Video_MuxingMode,
     Video_CodecID,
+    Video_CodecID_String,
     Video_CodecID_Info,
     Video_CodecID_Hint,
     Video_CodecID_Url,
@@ -430,11 +511,31 @@
     Video_Duration_String2,
     Video_Duration_String3,
     Video_Duration_String4,
+    Video_Duration_FirstFrame,
+    Video_Duration_FirstFrame_String,
+    Video_Duration_FirstFrame_String1,
+    Video_Duration_FirstFrame_String2,
+    Video_Duration_FirstFrame_String3,
     Video_Duration_LastFrame,
     Video_Duration_LastFrame_String,
     Video_Duration_LastFrame_String1,
     Video_Duration_LastFrame_String2,
     Video_Duration_LastFrame_String3,
+    Video_Source_Duration,
+    Video_Source_Duration_String,
+    Video_Source_Duration_String1,
+    Video_Source_Duration_String2,
+    Video_Source_Duration_String3,
+    Video_Source_Duration_FirstFrame,
+    Video_Source_Duration_FirstFrame_String,
+    Video_Source_Duration_FirstFrame_String1,
+    Video_Source_Duration_FirstFrame_String2,
+    Video_Source_Duration_FirstFrame_String3,
+    Video_Source_Duration_LastFrame,
+    Video_Source_Duration_LastFrame_String,
+    Video_Source_Duration_LastFrame_String1,
+    Video_Source_Duration_LastFrame_String2,
+    Video_Source_Duration_LastFrame_String3,
     Video_BitRate_Mode,
     Video_BitRate_Mode_String,
     Video_BitRate,
@@ -445,12 +546,18 @@
     Video_BitRate_Nominal_String,
     Video_BitRate_Maximum,
     Video_BitRate_Maximum_String,
+    Video_BitRate_Encoded,
+    Video_BitRate_Encoded_String,
     Video_Width,
     Video_Width_String,
+    Video_Width_Offset,
+    Video_Width_Offset_String,
     Video_Width_Original,
     Video_Width_Original_String,
     Video_Height,
     Video_Height_String,
+    Video_Height_Offset,
+    Video_Height_Offset_String,
     Video_Height_Original,
     Video_Height_Original_String,
     Video_PixelAspectRatio,
@@ -461,6 +568,9 @@
     Video_DisplayAspectRatio_String,
     Video_DisplayAspectRatio_Original,
     Video_DisplayAspectRatio_Original_String,
+    Video_ActiveFormatDescription,
+    Video_ActiveFormatDescription_String,
+    Video_ActiveFormatDescription_MuxingMode,
     Video_Rotation,
     Video_Rotation_String,
     Video_FrameRate_Mode,
@@ -478,6 +588,7 @@
     Video_FrameRate_Maximum,
     Video_FrameRate_Maximum_String,
     Video_FrameCount,
+    Video_Source_FrameCount,
     Video_Standard,
     Video_Resolution,
     Video_Resolution_String,
@@ -492,6 +603,9 @@
     Video_ScanOrder_String,
     Video_Interlacement,
     Video_Interlacement_String,
+    Video_Compression_Mode,
+    Video_Compression_Mode_String,
+    Video_Compression_Ratio,
     Video_Bits__Pixel_Frame_,
     Video_Delay,
     Video_Delay_String,
@@ -500,6 +614,8 @@
     Video_Delay_String3,
     Video_Delay_String4,
     Video_Delay_Settings,
+    Video_Delay_Source,
+    Video_Delay_Source_String,
     Video_Delay_Original,
     Video_Delay_Original_String,
     Video_Delay_Original_String1,
@@ -507,6 +623,7 @@
     Video_Delay_Original_String3,
     Video_Delay_Original_String4,
     Video_Delay_Original_Settings,
+    Video_Delay_Original_Source,
     Video_StreamSize,
     Video_StreamSize_String,
     Video_StreamSize_String1,
@@ -515,6 +632,30 @@
     Video_StreamSize_String4,
     Video_StreamSize_String5,
     Video_StreamSize_Proportion,
+    Video_Source_StreamSize,
+    Video_Source_StreamSize_String,
+    Video_Source_StreamSize_String1,
+    Video_Source_StreamSize_String2,
+    Video_Source_StreamSize_String3,
+    Video_Source_StreamSize_String4,
+    Video_Source_StreamSize_String5,
+    Video_Source_StreamSize_Proportion,
+    Video_StreamSize_Encoded,
+    Video_StreamSize_Encoded_String,
+    Video_StreamSize_Encoded_String1,
+    Video_StreamSize_Encoded_String2,
+    Video_StreamSize_Encoded_String3,
+    Video_StreamSize_Encoded_String4,
+    Video_StreamSize_Encoded_String5,
+    Video_StreamSize_Encoded_Proportion,
+    Video_Source_StreamSize_Encoded,
+    Video_Source_StreamSize_Encoded_String,
+    Video_Source_StreamSize_Encoded_String1,
+    Video_Source_StreamSize_Encoded_String2,
+    Video_Source_StreamSize_Encoded_String3,
+    Video_Source_StreamSize_Encoded_String4,
+    Video_Source_StreamSize_Encoded_String5,
+    Video_Source_StreamSize_Encoded_Proportion,
     Video_Alignment,
     Video_Alignment_String,
     Video_Title,
@@ -533,6 +674,10 @@
     Video_Language_String3,
     Video_Language_String4,
     Video_Language_More,
+    Video_Default,
+    Video_Default_String,
+    Video_Forced,
+    Video_Forced_String,
     Video_Encoded_Date,
     Video_Tagged_Date,
     Video_Encryption,
@@ -543,15 +688,18 @@
 enum audio
 {
     Audio_Count,
+    Audio_Status,
     Audio_StreamCount,
     Audio_StreamKind,
     Audio_StreamKind_String,
     Audio_StreamKindID,
     Audio_StreamKindPos,
+    Audio_StreamOrder,
     Audio_Inform,
     Audio_ID,
     Audio_ID_String,
     Audio_UniqueID,
+    Audio_UniqueID_String,
     Audio_MenuID,
     Audio_MenuID_String,
     Audio_Format,
@@ -561,6 +709,7 @@
     Audio_Format_Commercial_IfAny,
     Audio_Format_Version,
     Audio_Format_Profile,
+    Audio_Format_Compression,
     Audio_Format_Settings,
     Audio_Format_Settings_SBR,
     Audio_Format_Settings_SBR_String,
@@ -575,10 +724,12 @@
     Audio_Format_Settings_Sign,
     Audio_Format_Settings_Law,
     Audio_Format_Settings_ITU,
+    Audio_Format_Settings_Wrapping,
     Audio_InternetMediaType,
     Audio_MuxingMode,
     Audio_MuxingMode_MoreInfo,
     Audio_CodecID,
+    Audio_CodecID_String,
     Audio_CodecID_Info,
     Audio_CodecID_Hint,
     Audio_CodecID_Url,
@@ -604,6 +755,31 @@
     Audio_Duration_String1,
     Audio_Duration_String2,
     Audio_Duration_String3,
+    Audio_Duration_FirstFrame,
+    Audio_Duration_FirstFrame_String,
+    Audio_Duration_FirstFrame_String1,
+    Audio_Duration_FirstFrame_String2,
+    Audio_Duration_FirstFrame_String3,
+    Audio_Duration_LastFrame,
+    Audio_Duration_LastFrame_String,
+    Audio_Duration_LastFrame_String1,
+    Audio_Duration_LastFrame_String2,
+    Audio_Duration_LastFrame_String3,
+    Audio_Source_Duration,
+    Audio_Source_Duration_String,
+    Audio_Source_Duration_String1,
+    Audio_Source_Duration_String2,
+    Audio_Source_Duration_String3,
+    Audio_Source_Duration_FirstFrame,
+    Audio_Source_Duration_FirstFrame_String,
+    Audio_Source_Duration_FirstFrame_String1,
+    Audio_Source_Duration_FirstFrame_String2,
+    Audio_Source_Duration_FirstFrame_String3,
+    Audio_Source_Duration_LastFrame,
+    Audio_Source_Duration_LastFrame_String,
+    Audio_Source_Duration_LastFrame_String1,
+    Audio_Source_Duration_LastFrame_String2,
+    Audio_Source_Duration_LastFrame_String3,
     Audio_BitRate_Mode,
     Audio_BitRate_Mode_String,
     Audio_BitRate,
@@ -614,40 +790,57 @@
     Audio_BitRate_Nominal_String,
     Audio_BitRate_Maximum,
     Audio_BitRate_Maximum_String,
+    Audio_BitRate_Encoded,
+    Audio_BitRate_Encoded_String,
     Audio_Channel_s_,
     Audio_Channel_s__String,
     Audio_ChannelPositions,
     Audio_ChannelPositions_String2,
+    Audio_ChannelLayout,
     Audio_SamplingRate,
     Audio_SamplingRate_String,
     Audio_SamplingCount,
+    Audio_Source_SamplingCount,
+    Audio_FrameRate,
+    Audio_FrameRate_String,
     Audio_FrameCount,
+    Audio_Source_FrameCount,
     Audio_Resolution,
     Audio_Resolution_String,
     Audio_BitDepth,
     Audio_BitDepth_String,
-    Audio_CompressionRatio,
+    Audio_Compression_Mode,
+    Audio_Compression_Mode_String,
+    Audio_Compression_Ratio,
     Audio_Delay,
     Audio_Delay_String,
     Audio_Delay_String1,
     Audio_Delay_String2,
     Audio_Delay_String3,
+    Audio_Delay_String4,
+    Audio_Delay_Settings,
+    Audio_Delay_Source,
+    Audio_Delay_Source_String,
     Audio_Delay_Original,
     Audio_Delay_Original_String,
     Audio_Delay_Original_String1,
     Audio_Delay_Original_String2,
     Audio_Delay_Original_String3,
+    Audio_Delay_Original_String4,
     Audio_Delay_Original_Settings,
+    Audio_Delay_Original_Source,
     Audio_Video_Delay,
     Audio_Video_Delay_String,
     Audio_Video_Delay_String1,
     Audio_Video_Delay_String2,
     Audio_Video_Delay_String3,
+    Audio_Video_Delay_String4,
     Audio_Video0_Delay,
     Audio_Video0_Delay_String,
     Audio_Video0_Delay_String1,
     Audio_Video0_Delay_String2,
     Audio_Video0_Delay_String3,
+    Audio_Video0_Delay_String4,
     Audio_ReplayGain_Gain,
     Audio_ReplayGain_Gain_String,
     Audio_ReplayGain_Peak,
@@ -659,6 +852,30 @@
     Audio_StreamSize_String4,
     Audio_StreamSize_String5,
     Audio_StreamSize_Proportion,
+    Audio_Source_StreamSize,
+    Audio_Source_StreamSize_String,
+    Audio_Source_StreamSize_String1,
+    Audio_Source_StreamSize_String2,
+    Audio_Source_StreamSize_String3,
+    Audio_Source_StreamSize_String4,
+    Audio_Source_StreamSize_String5,
+    Audio_Source_StreamSize_Proportion,
+    Audio_StreamSize_Encoded,
+    Audio_StreamSize_Encoded_String,
+    Audio_StreamSize_Encoded_String1,
+    Audio_StreamSize_Encoded_String2,
+    Audio_StreamSize_Encoded_String3,
+    Audio_StreamSize_Encoded_String4,
+    Audio_StreamSize_Encoded_String5,
+    Audio_StreamSize_Encoded_Proportion,
+    Audio_Source_StreamSize_Encoded,
+    Audio_Source_StreamSize_Encoded_String,
+    Audio_Source_StreamSize_Encoded_String1,
+    Audio_Source_StreamSize_Encoded_String2,
+    Audio_Source_StreamSize_Encoded_String3,
+    Audio_Source_StreamSize_Encoded_String4,
+    Audio_Source_StreamSize_Encoded_String5,
+    Audio_Source_StreamSize_Encoded_Proportion,
     Audio_Alignment,
     Audio_Alignment_String,
     Audio_Interleave_VideoFrames,
@@ -680,6 +897,10 @@
     Audio_Language_String3,
     Audio_Language_String4,
     Audio_Language_More,
+    Audio_Default,
+    Audio_Default_String,
+    Audio_Forced,
+    Audio_Forced_String,
     Audio_Encoded_Date,
     Audio_Tagged_Date,
     Audio_Encryption,
@@ -689,15 +910,18 @@
 enum text
 {
     Text_Count,
+    Text_Status,
     Text_StreamCount,
     Text_StreamKind,
     Text_StreamKind_String,
     Text_StreamKindID,
     Text_StreamKindPos,
+    Text_StreamOrder,
     Text_Inform,
     Text_ID,
     Text_ID_String,
     Text_UniqueID,
+    Text_UniqueID_String,
     Text_MenuID,
     Text_MenuID_String,
     Text_Format,
@@ -707,11 +931,14 @@
     Text_Format_Commercial_IfAny,
     Text_Format_Version,
     Text_Format_Profile,
+    Text_Format_Compression,
     Text_Format_Settings,
+    Text_Format_Settings_Wrapping,
     Text_InternetMediaType,
     Text_MuxingMode,
     Text_MuxingMode_MoreInfo,
     Text_CodecID,
+    Text_CodecID_String,
     Text_CodecID_Info,
     Text_CodecID_Hint,
     Text_CodecID_Url,
@@ -727,6 +954,31 @@
     Text_Duration_String2,
     Text_Duration_String3,
     Text_Duration_String4,
+    Text_Duration_FirstFrame,
+    Text_Duration_FirstFrame_String,
+    Text_Duration_FirstFrame_String1,
+    Text_Duration_FirstFrame_String2,
+    Text_Duration_FirstFrame_String3,
+    Text_Duration_LastFrame,
+    Text_Duration_LastFrame_String,
+    Text_Duration_LastFrame_String1,
+    Text_Duration_LastFrame_String2,
+    Text_Duration_LastFrame_String3,
+    Text_Source_Duration,
+    Text_Source_Duration_String,
+    Text_Source_Duration_String1,
+    Text_Source_Duration_String2,
+    Text_Source_Duration_String3,
+    Text_Source_Duration_FirstFrame,
+    Text_Source_Duration_FirstFrame_String,
+    Text_Source_Duration_FirstFrame_String1,
+    Text_Source_Duration_FirstFrame_String2,
+    Text_Source_Duration_FirstFrame_String3,
+    Text_Source_Duration_LastFrame,
+    Text_Source_Duration_LastFrame_String,
+    Text_Source_Duration_LastFrame_String1,
+    Text_Source_Duration_LastFrame_String2,
+    Text_Source_Duration_LastFrame_String3,
     Text_BitRate_Mode,
     Text_BitRate_Mode_String,
     Text_BitRate,
@@ -737,6 +989,8 @@
     Text_BitRate_Nominal_String,
     Text_BitRate_Maximum,
     Text_BitRate_Maximum_String,
+    Text_BitRate_Encoded,
+    Text_BitRate_Encoded_String,
     Text_Width,
     Text_Width_String,
     Text_Height,
@@ -754,33 +1008,45 @@
     Text_FrameRate_Original,
     Text_FrameRate_Original_String,
     Text_FrameCount,
+    Text_Source_FrameCount,
     Text_ColorSpace,
     Text_ChromaSubsampling,
     Text_Resolution,
     Text_Resolution_String,
     Text_BitDepth,
     Text_BitDepth_String,
+    Text_Compression_Mode,
+    Text_Compression_Mode_String,
+    Text_Compression_Ratio,
     Text_Delay,
     Text_Delay_String,
     Text_Delay_String1,
     Text_Delay_String2,
     Text_Delay_String3,
+    Text_Delay_String4,
+    Text_Delay_Settings,
+    Text_Delay_Source,
+    Text_Delay_Source_String,
     Text_Delay_Original,
     Text_Delay_Original_String,
     Text_Delay_Original_String1,
     Text_Delay_Original_String2,
     Text_Delay_Original_String3,
+    Text_Delay_Original_String4,
     Text_Delay_Original_Settings,
+    Text_Delay_Original_Source,
     Text_Video_Delay,
     Text_Video_Delay_String,
     Text_Video_Delay_String1,
     Text_Video_Delay_String2,
     Text_Video_Delay_String3,
+    Text_Video_Delay_String4,
     Text_Video0_Delay,
     Text_Video0_Delay_String,
     Text_Video0_Delay_String1,
     Text_Video0_Delay_String2,
     Text_Video0_Delay_String3,
+    Text_Video0_Delay_String4,
     Text_StreamSize,
     Text_StreamSize_String,
     Text_StreamSize_String1,
@@ -789,6 +1055,30 @@
     Text_StreamSize_String4,
     Text_StreamSize_String5,
     Text_StreamSize_Proportion,
+    Text_Source_StreamSize,
+    Text_Source_StreamSize_String,
+    Text_Source_StreamSize_String1,
+    Text_Source_StreamSize_String2,
+    Text_Source_StreamSize_String3,
+    Text_Source_StreamSize_String4,
+    Text_Source_StreamSize_String5,
+    Text_Source_StreamSize_Proportion,
+    Text_StreamSize_Encoded,
+    Text_StreamSize_Encoded_String,
+    Text_StreamSize_Encoded_String1,
+    Text_StreamSize_Encoded_String2,
+    Text_StreamSize_Encoded_String3,
+    Text_StreamSize_Encoded_String4,
+    Text_StreamSize_Encoded_String5,
+    Text_StreamSize_Encoded_Proportion,
+    Text_Source_StreamSize_Encoded,
+    Text_Source_StreamSize_Encoded_String,
+    Text_Source_StreamSize_Encoded_String1,
+    Text_Source_StreamSize_Encoded_String2,
+    Text_Source_StreamSize_Encoded_String3,
+    Text_Source_StreamSize_Encoded_String4,
+    Text_Source_StreamSize_Encoded_String5,
+    Text_Source_StreamSize_Encoded_Proportion,
     Text_Title,
     Text_Encoded_Library,
     Text_Encoded_Library_String,
@@ -803,6 +1093,10 @@
     Text_Language_String3,
     Text_Language_String4,
     Text_Language_More,
+    Text_Default,
+    Text_Default_String,
+    Text_Forced,
+    Text_Forced_String,
     Text_Summary,
     Text_Encoded_Date,
     Text_Tagged_Date,
@@ -818,6 +1112,7 @@
     Chapters_StreamKind_String,
     Chapters_StreamKindID,
     Chapters_StreamKindPos,
+    Chapters_StreamOrder,
     Chapters_Inform,
     Chapters_ID,
     Chapters_ID_String,
@@ -833,23 +1128,34 @@
     Chapters_Codec_Url,
     Chapters_Total,
     Chapters_Title,
-    Chapters_Language,
     Chapters_Language_String,
+    Chapters_Language_String1,
+    Chapters_Language_String2,
+    Chapters_Language_String3,
+    Chapters_Language_String4,
+    Chapters_Language_More,
+    Chapters_Default,
+    Chapters_Default_String,
+    Chapters_Forced,
+    Chapters_Forced_String,
 };
 
 //---------------------------------------------------------------------------
 enum image
 {
     Image_Count,
+    Image_Status,
     Image_StreamCount,
     Image_StreamKind,
     Image_StreamKind_String,
     Image_StreamKindID,
     Image_StreamKindPos,
+    Image_StreamOrder,
     Image_Inform,
     Image_ID,
     Image_ID_String,
     Image_UniqueID,
+    Image_UniqueID_String,
     Image_MenuID,
     Image_MenuID_String,
     Image_Title,
@@ -860,9 +1166,12 @@
     Image_Format_Commercial_IfAny,
     Image_Format_Version,
     Image_Format_Profile,
+    Image_Format_Compression,
     Image_Format_Settings,
+    Image_Format_Settings_Wrapping,
     Image_InternetMediaType,
     Image_CodecID,
+    Image_CodecID_String,
     Image_CodecID_Info,
     Image_CodecID_Hint,
     Image_CodecID_Url,
@@ -874,14 +1183,33 @@
     Image_Codec_Url,
     Image_Width,
     Image_Width_String,
+    Image_Width_Offset,
+    Image_Width_Offset_String,
+    Image_Width_Original,
+    Image_Width_Original_String,
     Image_Height,
     Image_Height_String,
+    Image_Height_Offset,
+    Image_Height_Offset_String,
+    Image_Height_Original,
+    Image_Height_Original_String,
+    Image_PixelAspectRatio,
+    Image_PixelAspectRatio_String,
+    Image_PixelAspectRatio_Original,
+    Image_PixelAspectRatio_Original_String,
+    Image_DisplayAspectRatio,
+    Image_DisplayAspectRatio_String,
+    Image_DisplayAspectRatio_Original,
+    Image_DisplayAspectRatio_Original_String,
     Image_ColorSpace,
     Image_ChromaSubsampling,
     Image_Resolution,
     Image_Resolution_String,
     Image_BitDepth,
     Image_BitDepth_String,
+    Image_Compression_Mode,
+    Image_Compression_Mode_String,
+    Image_Compression_Ratio,
     Image_StreamSize,
     Image_StreamSize_String,
     Image_StreamSize_String1,
@@ -902,6 +1230,11 @@
     Image_Language_String2,
     Image_Language_String3,
     Image_Language_String4,
+    Image_Language_More,
+    Image_Default,
+    Image_Default_String,
+    Image_Forced,
+    Image_Forced_String,
     Image_Summary,
     Image_Encoded_Date,
     Image_Tagged_Date,
@@ -912,15 +1245,18 @@
 enum menu
 {
     Menu_Count,
+    Menu_Status,
     Menu_StreamCount,
     Menu_StreamKind,
     Menu_StreamKind_String,
     Menu_StreamKindID,
     Menu_StreamKindPos,
+    Menu_StreamOrder,
     Menu_Inform,
     Menu_ID,
     Menu_ID_String,
     Menu_UniqueID,
+    Menu_UniqueID_String,
     Menu_MenuID,
     Menu_MenuID_String,
     Menu_Format,
@@ -930,8 +1266,10 @@
     Menu_Format_Commercial_IfAny,
     Menu_Format_Version,
     Menu_Format_Profile,
+    Menu_Format_Compression,
     Menu_Format_Settings,
     Menu_CodecID,
+    Menu_CodecID_String,
     Menu_CodecID_Info,
     Menu_CodecID_Hint,
     Menu_CodecID_Url,
@@ -952,6 +1290,9 @@
     Menu_Delay_String1,
     Menu_Delay_String2,
     Menu_Delay_String3,
+    Menu_Delay_String4,
+    Menu_Delay_Settings,
+    Menu_Delay_Source,
     Menu_List_StreamKind,
     Menu_List_StreamPos,
     Menu_List,

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/File__Analyze.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/File__Analyze.cpp Changed

@@ -1,34 +1,47 @@
 // File__Analyze - Base for analyze files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #include "MediaInfo/File__Analyze.h"
 #include "MediaInfo/MediaInfo_Config_MediaInfo.h"
 #include "MediaInfo/MediaInfo_Config.h"
+#if MEDIAINFO_IBI
+    #if MEDIAINFO_SEEK
+        #include "MediaInfo/Multiple/File_Ibi.h"
+    #endif //MEDIAINFO_SEEK
+    #include "MediaInfo/Multiple/File_Ibi_Creation.h"
+#endif //MEDIAINFO_IBI
 #include <cstring>
+using namespace std;
+using namespace tinyxml2;
 //---------------------------------------------------------------------------
 
 namespace MediaInfoLib
@@ -46,34 +59,61 @@
 File__Analyze::File__Analyze ()
 :File__Base()
 {
-    //Details
+    //Info for speed optimization
     #if MEDIAINFO_TRACE
-        Config_DetailsLevel=MediaInfoLib::Config.DetailsLevel_Get();
-        Details_DoNotSave=false;
+        Config_Trace_Level=MediaInfoLib::Config.Trace_Level_Get();
+        Config_Trace_Layers=MediaInfoLib::Config.Trace_Layers_Get();
+        Config_Trace_Format=MediaInfoLib::Config.Trace_Format_Get();
+        Trace_DoNotSave=false;
+        Trace_Layers.set();
+        Trace_Layers_Update();
     #endif //MEDIAINFO_TRACE
+    Config_Demux=MediaInfoLib::Config.Demux_Get();
+    Config_LineSeparator=MediaInfoLib::Config.LineSeparator_Get();
     IsSub=false;
     IsRawStream=false;
 
     //In
     #if MEDIAINFO_EVENTS
         StreamIDs_Size=1;
-        StreamIDs_Width[0]=(int8u)-1;
+        ParserIDs[0]=0x0;
+        StreamIDs[0]=0;
+        StreamIDs_Width[0]=0;
     #endif //MEDIAINFO_EVENTS
+    #if MEDIAINFO_DEMUX
+        Demux_Level=1; //Frame
+        Demux_random_access=false;
+        Demux_UnpacketizeContainer=false;
+        Demux_IntermediateItemFound=true;
+        Demux_Offset=0;
+        Demux_TotalBytes=0;
+        Demux_EventWasSent_Accept_Specific=false;
+    #endif //MEDIAINFO_DEMUX
     PTS_DTS_Needed=false;
-    PTS_DTS_Offset_InThisBlock=0;
-    PCR=(int64u)-1;
-    PTS=(int64u)-1;
-    DTS=(int64u)-1;
+    PTS_Begin=(int64u)-1;
+    PTS_End=0;
+    DTS_Begin=(int64u)-1;
+    DTS_End=0;
 
     //Out
+    Frame_Count=0;
+    Frame_Count_Previous=0;
     Frame_Count_InThisBlock=0;
+    Field_Count=0;
+    Field_Count_Previous=0;
+    Field_Count_InThisBlock=0;
+    Frame_Count_NotParsedIncluded=(int64u)-1;
 
     //Configuration
     DataMustAlwaysBeComplete=true;
     MustUseAlternativeParser=false;
     MustSynchronize=false;
+    CA_system_ID_MustSkipSlices=false;
 
     //Buffer
+    #if MEDIAINFO_SEEK
+        Seek_Duration_Detected=false;
+    #endif //MEDIAINFO_SEEK
     Buffer=NULL;
     Buffer_Temp=NULL;
     Buffer_Size=0;
@@ -89,13 +129,20 @@
         Buffer_TotalBytes_FirstSynched_Max=MediaInfoLib::Config.FormatDetection_MaximumOffset_Get();
     else
         Buffer_TotalBytes_FirstSynched_Max=1024*1024;
+    if (Buffer_TotalBytes_FirstSynched_Max<(int64u)-1-64*1024*1024)
+        Buffer_TotalBytes_Fill_Max=Buffer_TotalBytes_FirstSynched_Max+64*1024*1024;
+    else
+        Buffer_TotalBytes_Fill_Max=(int64u)-1;
+    Buffer_PaddingBytes=0;
+    Stream_BitRateFromContainer=0;
 
     //EOF
-    EOF_AlreadyDetected=false;
+    EOF_AlreadyDetected=(MediaInfoLib::Config.ParseSpeed_Get()==1.0)?true:false;
 
     //Synchro
     MustParseTheHeaderFile=true;
     Synched=false;
+    MustExtendParsingDuration=false;
     Trusted=Error;
     Trusted_Multiplier=1;
 
@@ -114,7 +161,7 @@
     Element[0].UnTrusted=false;
     Element[0].IsComplete=false;
     #if MEDIAINFO_TRACE
-    if (Config_DetailsLevel!=0)
+    if (Config_Trace_Level!=0)
     {
         //ToShow part
         Element[0].ToShow.Name.clear();
@@ -127,7 +174,8 @@
     Element_Level=0;
 
     //BitStream
-    BS=new BitStream;
+    BS=new BitStream_Fast;
+    BT=new BitStream_LE;
 
     //Temp
     Status[IsAccepted]=false;
@@ -137,9 +185,15 @@
     ShouldContinueParsing=false;
 
     //Events data
-    #if MEDIAINFO_EVENTS
-        MpegPs_PES_FirstByte_IsAvailable=false;
-    #endif //MEDIAINFO_EVENTS
+    PES_FirstByte_IsAvailable=false;
+
+    Unsynch_Frame_Count=(int64u)-1;
+    #if MEDIAINFO_IBI
+        Config_Ibi_Create=false;
+        Ibi_SynchronizationOffset_Current=0;
+        Ibi_SynchronizationOffset_BeginOfFrame=0;
+        IbiStream=NULL;
+    #endif //MEDIAINFO_IBI
 }
 
 //---------------------------------------------------------------------------
@@ -150,6 +204,12 @@
 
     //BitStream
     delete BS; //BS=NULL;
+    delete BT; //BS=NULL;
+
+    #if MEDIAINFO_IBI
+        if (!IsSub)
+            delete IbiStream; //IbiStream=NULL;
+    #endif //MEDIAINFO_IBI
 }
 
 //***************************************************************************
@@ -176,9 +236,8 @@
     //Jump handling
     if (File_GoTo!=(int64u)-1)
     {
-        Synched=false;
+        Open_Buffer_Unsynch();
         File_GoTo=(int64u)-1;
-        Buffer_Clear();
     }
 
     //Configuring
@@ -186,6 +245,42 @@
         Buffer_TotalBytes_FirstSynched_Max=MediaInfoLib::Config.FormatDetection_MaximumOffset_Get();
     if (Config->File_IsSub_Get())
         IsSub=true;
+    #if MEDIAINFO_DEMUX
+        if (Demux_Level==1 && !IsSub && Config->Demux_Unpacketize_Get()) //If Demux_Level is Frame
+        {
+            Demux_Level=2; //Container
+            Demux_UnpacketizeContainer=true;
+        }
+    #endif //MEDIAINFO_DEMUX
+    #if MEDIAINFO_EVENTS
+        if (StreamIDs_Size && IsRawStream)
+            StreamIDs[StreamIDs_Size-1]=(int64u)-1;
+        if (!IsSub)
+        {
+            ZtringListList SubFile_IDs;
+            SubFile_IDs.Separator_Set(0, EOL);
+            SubFile_IDs.Separator_Set(1, __T(","));
+            SubFile_IDs.Write(Config->SubFile_IDs_Get());
+            if (!SubFile_IDs.empty())
+            {
+                StreamIDs_Size=1+SubFile_IDs.size();
+                StreamIDs[SubFile_IDs.size()]=IsRawStream?(int64u)-1:StreamIDs[0];
+                StreamIDs_Width[SubFile_IDs.size()]=StreamIDs_Width[0];
+                ParserIDs[SubFile_IDs.size()]=ParserIDs[0];
+                for (size_t Pos=0; Pos<SubFile_IDs.size(); Pos++)
+                {
+                    StreamIDs[Pos]=SubFile_IDs[Pos](0).To_int64u();
+                    StreamIDs_Width[Pos]=SubFile_IDs[Pos](1).To_int8u();
+                    ParserIDs[Pos]=SubFile_IDs[Pos](2).To_int8u();
+                }
+            }
+        }
+    #endif //MEDIAINFO_EVENTS
+    #if MEDIAINFO_IBI
+        if (!IsSub)
+            IbiStream=new ibi::stream;
+        Config_Ibi_Create=Config->Ibi_Create_Get() && Config->ParseSpeed==1.0;
+    #endif //MEDIAINFO_IBI
 }
 
 void File__Analyze::Open_Buffer_Init (File__Analyze* Sub)
@@ -205,9 +300,6 @@
     #else //MEDIAINFO_TRACE
         Sub->Init(Config);
     #endif //MEDIAINFO_TRACE
-    Sub->IsSub=true;
-    Sub->Open_Buffer_Init(File_Size_);
-
     #if MEDIAINFO_EVENTS
         Sub->ParserIDs[StreamIDs_Size]=Sub->ParserIDs[0];
         Sub->StreamIDs_Width[StreamIDs_Size]=Sub->StreamIDs_Width[0];
@@ -220,18 +312,20 @@
         Sub->StreamIDs[StreamIDs_Size-1]=Element_Code;
         Sub->StreamIDs_Size=StreamIDs_Size+1;
     #endif //MEDIAINFO_EVENTS
+    Sub->IsSub=true;
     Sub->File_Name_WithoutDemux=IsSub?File_Name_WithoutDemux:File_Name;
+    Sub->Open_Buffer_Init(File_Size_);
 }
 
 //---------------------------------------------------------------------------
 void File__Analyze::Open_Buffer_Continue (const int8u* ToAdd, size_t ToAdd_Size)
 {
-    Frame_Count_InThisBlock=0; //Out
+    Frame_Count_InThisBlock=0;
 
     //Integrity
     if (Status[IsFinished])
         return;
-    //{File F; F.Open(Ztring(_T("d:\\direct"))+Ztring::ToZtring((size_t)this, 16), File::Access_Write_Append); F.Write(ToAdd, ToAdd_Size);}
+    //{File F; F.Open(Ztring(__T("d:\\direct"))+Ztring::ToZtring((size_t)this, 16), File::Access_Write_Append); F.Write(ToAdd, ToAdd_Size);}
 
     //Demand to go elsewhere
     if (File_GoTo!=(int64u)-1)
@@ -243,12 +337,6 @@
             File_Offset+=ToAdd_Size;
             return; //No need of this piece of data
         }
-
-        //The needed offset is in the new buffer
-        ToAdd+=(size_t)(File_GoTo-File_Offset);
-        ToAdd_Size-=(size_t)(File_GoTo-File_Offset);
-        File_Offset=File_GoTo;
-        File_GoTo=(int64u)-1;
     }
 
     if (Buffer_Temp_Size) //There is buffered data from before
@@ -283,16 +371,28 @@
     }
 
     //Preparing
-    Buffer_Offset=0;
     Trusted=(Buffer_Size>2*8*1024?Buffer_Size/8/1024:2)*Trusted_Multiplier; //Never less than 2 acceptable errors
 
+    //Demand to go elsewhere
+    if (File_GoTo!=(int64u)-1)
+    {
+        //The needed offset is in the new buffer
+        Buffer_Offset+=(size_t)(File_GoTo-File_Offset);
+        File_GoTo=(int64u)-1;
+    }
+
     //Parsing
+    if (!IsSub)
+        Config->State_Set(((float)Buffer_TotalBytes)/Config->File_Size);
     if (Buffer_Size>=Buffer_MinimumSize || File_Offset+Buffer_Size==File_Size) //Parsing only if we have enough buffer
-        Open_Buffer_Continue_Loop();
-    Buffer_TotalBytes+=Buffer_Offset;
+        while (Open_Buffer_Continue_Loop());
 
     //Should parse again?
-    if ((File_GoTo==File_Size && File_Size!=(int64u)-1) || File_Offset+Buffer_Offset>=File_Size)
+    if (((File_GoTo==File_Size && File_Size!=(int64u)-1) || File_Offset+Buffer_Offset>=File_Size)
+       #if MEDIAINFO_DEMUX
+         && !Config->Demux_EventWasSent
+        #endif //MEDIAINFO_DEMUX
+         )
     {
         if (!BookMark_Code.empty())
             BookMark_Get();
@@ -301,7 +401,9 @@
         {
             Element_Show(); //If Element_Level is >0, we must show what is in the details buffer
             while (Element_Level>0)
-                Element_End(); //This is Finish, must flush
+                Element_End0(); //This is Finish, must flush
+            Buffer_Clear();
+            File_Offset=File_Size;
             ForceFinish();
             return;
         }
@@ -314,20 +416,17 @@
         {
             if (File_GoTo>=File_Size)
                 File_GoTo=File_Size;
-            File_Offset+=Buffer_Size;
             Buffer_Clear();
         }
         else
             File_Offset+=Buffer_Offset;
-        
+
         return;
     }
     if (Buffer_Offset>=Buffer_Size)
     {
         if (Buffer_Offset>Buffer_Size)
             File_GoTo=File_Offset+Buffer_Offset;
-        if (!Status[IsFinished])
-            File_Offset+=Buffer_Size;
         Buffer_Clear();
         return;
     }
@@ -335,28 +434,43 @@
     //Buffer handling
     if (Buffer_Offset!=Buffer_Size) //all is not used
     {
-        if (File_Offset+Buffer_Size>=File_Size) //No more data will come
+        if (File_Offset+Buffer_Size>=File_Size //No more data will come
+        #if MEDIAINFO_DEMUX
+         && !Config->Demux_EventWasSent
+        #endif //MEDIAINFO_DEMUX
+           )
         {
+                Buffer_TotalBytes+=Buffer_Size;
                 ForceFinish();
                 return;
         }
+
         if (Buffer_Temp_Size==0) //If there was no copy
         {
-            if (Buffer_Temp!=NULL && Buffer_Temp_Size_Max<ToAdd_Size-Buffer_Offset)
+            #if MEDIAINFO_DEMUX
+            if (!IsSub && Config->Demux_EventWasSent && Config->File_Buffer_Repeat_IsSupported && Buffer_Offset==0) //If there was no byte consumed
             {
-                delete[] Buffer_Temp; Buffer_Temp=NULL; Buffer_Temp_Size=0; Buffer_Temp_Size_Max=0;
+                Config->File_Buffer_Repeat=true;
             }
-            if (Buffer_Temp==NULL)
+            else
+            #endif //MEDIAINFO_DEMUX
             {
-                size_t Buffer_Temp_Size_Max_ToAdd=ToAdd_Size-Buffer_Offset>32768?ToAdd_Size-Buffer_Offset:32768;
-                if (Buffer_Temp_Size_Max_ToAdd<Buffer_Temp_Size_Max) Buffer_Temp_Size_Max_ToAdd=Buffer_Temp_Size_Max;
-                Buffer_Temp_Size_Max=Buffer_Temp_Size_Max_ToAdd;
-                Buffer_Temp=new int8u[Buffer_Temp_Size_Max];
+                if (Buffer_Temp!=NULL && Buffer_Temp_Size_Max<ToAdd_Size-Buffer_Offset)
+                {
+                    delete[] Buffer_Temp; Buffer_Temp=NULL; Buffer_Temp_Size=0; Buffer_Temp_Size_Max=0;
+                }
+                if (Buffer_Temp==NULL)
+                {
+                    size_t Buffer_Temp_Size_Max_ToAdd=ToAdd_Size-Buffer_Offset>32768?ToAdd_Size-Buffer_Offset:32768;
+                    if (Buffer_Temp_Size_Max_ToAdd<Buffer_Temp_Size_Max) Buffer_Temp_Size_Max_ToAdd=Buffer_Temp_Size_Max;
+                    Buffer_Temp_Size_Max=Buffer_Temp_Size_Max_ToAdd;
+                    Buffer_Temp=new int8u[Buffer_Temp_Size_Max];
+                }
+                Buffer_Temp_Size=ToAdd_Size-Buffer_Offset;
+                std::memcpy(Buffer_Temp, ToAdd+Buffer_Offset, Buffer_Temp_Size);
             }
-            Buffer_Temp_Size=ToAdd_Size-Buffer_Offset;
-            std::memcpy(Buffer_Temp, ToAdd+Buffer_Offset, Buffer_Temp_Size);
         }
-        else //Already a copy, just moving it
+        else if (Buffer_Offset) //Already a copy, just moving it
         {
             std::memmove(Buffer_Temp, Buffer_Temp+Buffer_Offset, Buffer_Size-Buffer_Offset);
             Buffer_Temp_Size=Buffer_Size-Buffer_Offset;
@@ -391,85 +505,179 @@
     if (Sub->File_GoTo!=(int64u)-1)
         Sub->File_GoTo=(int64u)-1;
     Sub->File_Offset=File_Offset+Buffer_Offset+Element_Offset;
+    if (Sub->File_Size!=File_Size)
+    {
+        for (size_t Pos=0; Pos<Sub->Element_Level; Pos++)
+            if (Sub->Element[Pos].Next==Sub->File_Size)
+                Sub->Element[Pos].Next=File_Size;
+        Sub->File_Size=File_Size;
+    }
     #if MEDIAINFO_TRACE
         Sub->Element_Level_Base=Element_Level_Base+Element_Level;
     #endif
 
-    //{File F; F.Open(Ztring(_T("d:\\direct"))+Ztring::ToZtring((size_t)this, 16), File::Access_Write_Append); F.Write(ToAdd, ToAdd_Size);}
+    //{File F; F.Open(Ztring(__T("d:\\direct"))+Ztring::ToZtring((size_t)this, 16), File::Access_Write_Append); F.Write(ToAdd, ToAdd_Size);}
 
     //Adaptating File_Offset
     if (Sub!=this && Sub->Buffer_Size<=Sub->File_Offset)
         Sub->File_Offset-=Sub->Buffer_Size;
 
     //Parsing
+    Sub->PES_FirstByte_IsAvailable=PES_FirstByte_IsAvailable;
+    Sub->PES_FirstByte_Value=PES_FirstByte_Value;
+    if (Sub->FrameInfo_Previous.DTS!=(int64u)-1)
+    {
+        if (Sub->Buffer_Size)
+            Sub->FrameInfo_Previous.Buffer_Offset=Sub->Buffer_Size;
+
+        Sub->FrameInfo_Next=Sub->FrameInfo;
+        Sub->FrameInfo=Sub->FrameInfo_Previous;
+        Sub->FrameInfo_Previous=frame_info();
+
+        Sub->Frame_Count_Previous=Sub->Frame_Count;
+        Sub->Field_Count_Previous=Sub->Field_Count;
+    }
+     if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+         Sub->Frame_Count_NotParsedIncluded=Frame_Count_NotParsedIncluded;
+    #if MEDIAINFO_DEMUX
+        bool Demux_EventWasSent_Save=Config->Demux_EventWasSent;
+        Config->Demux_EventWasSent=false;
+    #endif //MEDIAINFO_DEMUX
     Sub->Open_Buffer_Continue(ToAdd, ToAdd_Size);
+    #if MEDIAINFO_DEMUX
+        if (Demux_EventWasSent_Save)
+            Config->Demux_EventWasSent=true;
+    #endif //MEDIAINFO_DEMUX
+    if (Sub->Buffer_Size)
+    {
+        Sub->FrameInfo_Previous=Sub->FrameInfo;
+        Sub->FrameInfo=Sub->FrameInfo_Next;
+        Sub->FrameInfo_Next=frame_info();
+    }
 
     #if MEDIAINFO_TRACE
-        //Details handling
-        if (!Sub->Element[0].ToShow.Details.empty() && !Details_DoNotSave)
+        if (Trace_Activated)
         {
-            //Line separator
-            if (!Element[Element_Level].ToShow.Details.empty())
-                Element[Element_Level].ToShow.Details+=MediaInfoLib::Config.LineSeparator_Get();
-
-            //From Sub
-            while(Sub->Element_Level)
-                Sub->Element_End();
-            Element[Element_Level].ToShow.Details+=Sub->Element[0].ToShow.Details;
-            Sub->Element[0].ToShow.Details.clear();
+            //Details handling
+            if (!Sub->Element[0].ToShow.Details.empty() && !Trace_DoNotSave)
+            {
+                //Line separator
+                if (!Element[Element_Level].ToShow.Details.empty())
+                    Element[Element_Level].ToShow.Details+=Config_LineSeparator;
+
+                //From Sub
+                while(Sub->Element_Level)
+                    Sub->Element_End0();
+                Element[Element_Level].ToShow.Details+=Sub->Element[0].ToShow.Details;
+                Sub->Element[0].ToShow.Details.clear();
+            }
+            else
+                Element[Element_Level].ToShow.NoShow=true; //We don't want to show this item because there is no info in it
         }
-        else
-            Element[Element_Level].ToShow.NoShow=true; //We don't want to show this item because there is no info in it
     #endif
 }
 
 //---------------------------------------------------------------------------
-void File__Analyze::Open_Buffer_Continue_Loop ()
+bool File__Analyze::Open_Buffer_Continue_Loop ()
 {
     //Header
     if (MustParseTheHeaderFile)
     {
         if (!FileHeader_Manage())
-            return; //Wait for more data
+            return false; //Wait for more data
         if (Status[IsFinished] || File_GoTo!=(int64u)-1)
-            return; //Finish
+            return false; //Finish
     }
 
     //Parsing specific
-    Frame_Count_InThisBlock=0; //Out
     Element_Offset=0;
     Element_Size=Buffer_Size;
     Element[Element_Level].WaitForMoreData=false;
     Read_Buffer_Continue();
     if (Element_IsWaitingForMoreData())
-        return; //Wait for more data
+        return false; //Wait for more data
     Buffer_Offset+=(size_t)Element_Offset;
-    if (Status[IsFinished] && !ShouldContinueParsing || Buffer_Offset>=Buffer_Size || File_GoTo!=(int64u)-1)
-        return; //Finish
+    if ((Status[IsFinished] && !ShouldContinueParsing) || Buffer_Offset>Buffer_Size || File_GoTo!=(int64u)-1)
+        return false; //Finish
+    #if MEDIAINFO_DEMUX
+        if (Config->Demux_EventWasSent)
+            return false;
+    #endif //MEDIAINFO_DEMUX
 
     //Parsing;
     while (Buffer_Parse());
+    Buffer_TotalBytes+=Buffer_Offset;
+    #if MEDIAINFO_DEMUX
+        if (Config->Demux_EventWasSent)
+            return false;
+    #endif //MEDIAINFO_DEMUX
+
+    //Parsing specific
+    Read_Buffer_AfterParsing();
 
     //Handling of File_GoTo with already buffered data
     if (File_GoTo!=(int64u)-1 && File_GoTo>=File_Offset && File_GoTo<=File_Offset+Buffer_Size)
     {
-        Buffer_Offset=(size_t)(File_GoTo-File_Offset);
+        if (Buffer_Temp_Size==0) //If there was no copy
+        {
+            Buffer_Temp_Size=(size_t)(File_Offset+Buffer_Size-File_GoTo);
+            if (Buffer_Temp!=NULL && Buffer_Temp_Size_Max<Buffer_Temp_Size)
+            {
+                delete[] Buffer_Temp; Buffer_Temp=NULL; Buffer_Temp_Size=0; Buffer_Temp_Size_Max=0;
+            }
+            if (Buffer_Temp==NULL)
+            {
+                size_t Buffer_Temp_Size_Max_ToAdd=Buffer_Temp_Size>32768?Buffer_Temp_Size:32768;
+                if (Buffer_Temp_Size_Max_ToAdd<Buffer_Temp_Size_Max) Buffer_Temp_Size_Max_ToAdd=Buffer_Temp_Size_Max;
+                Buffer_Temp_Size_Max=Buffer_Temp_Size_Max_ToAdd;
+                Buffer_Temp=new int8u[Buffer_Temp_Size_Max];
+            }
+            std::memcpy(Buffer_Temp, Buffer+Buffer_Size-Buffer_Temp_Size, Buffer_Temp_Size);
+        }
+        else //Already a copy, just moving it
+        {
+            Buffer_Temp_Size=(size_t)(File_Offset+Buffer_Size-File_GoTo);
+            std::memmove(Buffer_Temp, Buffer+Buffer_Size-Buffer_Temp_Size, Buffer_Temp_Size);
+        }
+        File_Offset+=Buffer_Size-Buffer_Temp_Size;
+        Buffer=Buffer_Temp;
+        Buffer_Offset=0;
+        Buffer_Size=Buffer_Temp_Size;
         File_GoTo=(int64u)-1;
-        return Open_Buffer_Continue_Loop();
+        return true;
     }
 
     //Jumping to the end of the file if needed
-    if (!IsSub && !EOF_AlreadyDetected && MediaInfoLib::Config.ParseSpeed_Get()<1 && Count_Get(Stream_General))
+    if (!IsSub && !EOF_AlreadyDetected && Config->ParseSpeed<1 && Count_Get(Stream_General))
     {
         Element[Element_Level].WaitForMoreData=false;
         Detect_EOF();
         if ((File_GoTo!=(int64u)-1 && File_GoTo>File_Offset+Buffer_Offset) || (Status[IsFinished] && !ShouldContinueParsing))
         {
             EOF_AlreadyDetected=true;
-            return;
+            return false;
         }
     }
+
+    return false;
+}
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_SEEK
+size_t File__Analyze::Open_Buffer_Seek (size_t Method, int64u Value, int64u ID)
+{
+    #if MEDIAINFO_DEMUX
+        Config->Demux_EventWasSent=false;
+    #endif //MEDIAINFO_DEMUX
+
+    size_t ToReturn=Read_Buffer_Seek(Method, Value, ID);
+
+    if (File_GoTo!=(int64u)-1)
+        Buffer_Clear();
+
+    return ToReturn;
 }
+#endif //MEDIAINFO_SEEK
 
 //---------------------------------------------------------------------------
 void File__Analyze::Open_Buffer_Position_Set (int64u File_Offset_)
@@ -477,15 +685,27 @@
     if (File_Offset_==(int64u)-1)
         return;
 
-    File_Offset=File_Offset_;
+    File_Offset=File_Offset_-Buffer_Temp_Size;
     File_GoTo=(int64u)-1;
 }
 
 //---------------------------------------------------------------------------
 void File__Analyze::Open_Buffer_Unsynch ()
 {
-    Buffer_Clear();
-    Read_Buffer_Unsynched();
+    Status[IsFinished]=false;
+    FrameInfo=frame_info();
+    FrameInfo_Previous=frame_info();
+    FrameInfo_Next=frame_info();
+    Frame_Count_NotParsedIncluded=Unsynch_Frame_Count;
+    Unsynch_Frame_Count=(int64u)-1;
+    PTS_End=0;
+    DTS_End=0;
+    #if MEDIAINFO_DEMUX
+        Demux_IntermediateItemFound=true;
+        Demux_Offset=0;
+        Demux_TotalBytes=Buffer_TotalBytes;
+        Config->Demux_EventWasSent=false;
+    #endif //MEDIAINFO_DEMUX
 
     //Clearing duration
     if (Synched)
@@ -496,10 +716,26 @@
             for (size_t StreamPos=0; StreamPos<StreamPos_Count; StreamPos++)
                 Clear((stream_t)StreamKind, StreamPos, Fill_Parameter((stream_t)StreamKind, Generic_Duration));
         }
+    }
+
+    //if (Synched)
+    if (!MustSynchronize || (MustSynchronize && File_Offset_FirstSynched!=(int64u)-1)) //Synched at least once
+    {
         Synched=false;
+        Read_Buffer_Unsynched();
+        Ibi_Read_Buffer_Unsynched();
     }
+    Buffer_Clear();
+}
 
-    File_GoTo=(int64u)-1;
+//---------------------------------------------------------------------------
+void File__Analyze::Open_Buffer_Update ()
+{
+    Streams_Update();
+
+    Status[File__Analyze::IsUpdated]=false;
+    for (size_t Pos=File__Analyze::User_16; Pos<File__Analyze::User_16+16; Pos++)
+        Status[Pos]=false;
 }
 
 //---------------------------------------------------------------------------
@@ -514,13 +750,17 @@
 
     //Element must be Finish
     while (Element_Level>0)
-        Element_End();
+        Element_End0();
 
     //Buffer - Global
     Fill();
     if (!NoBufferModification)
     {
         ForceFinish();
+        #if MEDIAINFO_DEMUX
+            if (Config->Demux_EventWasSent)
+                return;
+        #endif //MEDIAINFO_DEMUX
         Buffer_Clear();
     }
 
@@ -530,10 +770,13 @@
     #endif //MEDIAINFO_TRACE
 
     #if MEDIAINFO_EVENTS
-        struct MediaInfo_Event_General_End_0 Event;
-        Event.EventCode=MediaInfo_EventCode_Create(MediaInfo_Parser_None, MediaInfo_Event_General_End, 0);
-        Event.Stream_Bytes_Analyzed=Buffer_TotalBytes;
-        Config->Event_Send((const int8u*)&Event, sizeof(MediaInfo_Event_General_End_0));
+        if (Status[IsAccepted])
+        {
+            struct MediaInfo_Event_General_End_0 Event;
+            Event.EventCode=MediaInfo_EventCode_Create(MediaInfo_Parser_None, MediaInfo_Event_General_End, 0);
+            Event.Stream_Bytes_Analyzed=Buffer_TotalBytes;
+            Config->Event_Send((const int8u*)&Event, sizeof(MediaInfo_Event_General_End_0));
+        }
     #endif //MEDIAINFO_EVENTS
 }
 
@@ -552,6 +795,75 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
+#if MEDIAINFO_SEEK
+size_t File__Analyze::Read_Buffer_Seek (size_t Method, int64u Value, int64u ID)
+{
+    #if MEDIAINFO_IBI
+        if (!IsSub)
+            return Ibi_Read_Buffer_Seek(Method, Value, ID);
+    #endif //MEDIAINFO_IBI
+
+    return (size_t)-1; //Not supported
+}
+#endif //MEDIAINFO_SEEK
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_SEEK
+size_t File__Analyze::Read_Buffer_Seek_OneFramePerFile (size_t Method, int64u Value, int64u ID)
+{
+    //Parsing
+    switch (Method)
+    {
+        case 0  :
+                    GoTo(Value);
+                    Open_Buffer_Unsynch();
+                    return 1;
+        case 1  :
+                    GoTo(File_Size*Value/10000);
+                    Open_Buffer_Unsynch();
+                    return 1;
+        case 2  :   //Timestamp
+                    if (Config->Demux_Rate_Get()==0)
+                        return (size_t)-1; //Not supported
+                    Value=float64_int64s(((float64)Value)/1000000000*Config->Demux_Rate_Get());
+        case 3  :   //FrameNumber
+                    {
+                    if (Value>=Config->File_Names.size())
+                        return 2; //Invalid value
+                    int64u Offset=0;
+                    for (size_t Pos=0; Pos<Value; Pos++)
+                        Offset+=Config->File_Sizes[Pos];
+                    GoTo(Offset);
+                    Open_Buffer_Unsynch();
+                    return 1;
+                    }
+        default :   return (size_t)-1; //Not supported
+    }
+}
+#endif //MEDIAINFO_SEEK
+
+//---------------------------------------------------------------------------
+void File__Analyze::Read_Buffer_Unsynched_OneFramePerFile()
+{
+    int64u GoTo=File_GoTo;
+    for (Frame_Count_NotParsedIncluded=0; Frame_Count_NotParsedIncluded<Config->File_Sizes.size(); Frame_Count_NotParsedIncluded++)
+    {
+        if (GoTo>=Config->File_Sizes[Frame_Count_NotParsedIncluded])
+            GoTo-=Config->File_Sizes[Frame_Count_NotParsedIncluded];
+        else
+            break;
+    }
+
+    #if MEDIAINFO_DEMUX
+        if (Config->Demux_Rate_Get())
+        {
+            FrameInfo.DTS=float64_int64s(Frame_Count_NotParsedIncluded*((float64)1000000000)/Config->Demux_Rate_Get());
+            FrameInfo.PTS=FrameInfo.DTS;
+        }
+    #endif //MEDIAINFO_DEMUX
+}
+
+//---------------------------------------------------------------------------
 bool File__Analyze::Buffer_Parse()
 {
     //End of this level?
@@ -559,15 +871,32 @@
     {
         //There is no loop handler, so we make the level down here
         while (Element_Level>0 && File_Offset+Buffer_Offset>=Element[Element_Level].Next)
-            Element_End(); //This is a buffer restart, must sync to Element level
+            Element_End0(); //This is a buffer restart, must sync to Element level
         if (File_Offset+Buffer_Offset==File_Size)
             return false; //End of file
         MustUseAlternativeParser=false; //Reset it if we go out of an element
     }
 
     //Synchro
-    if (MustSynchronize && !Synchro_Manage())
-        return false; //Wait for more data
+    if (MustSynchronize)
+        do
+        {
+            if (!Synchro_Manage())
+                return false; //Wait for more data
+        }
+        while (!Synched);
+    #if MEDIAINFO_DEMUX
+    else if (Demux_TotalBytes<=Buffer_TotalBytes+Buffer_Offset)
+    {
+        if (Demux_UnpacketizeContainer && !Demux_UnpacketizeContainer_Test())
+        {
+            Demux_Offset-=Buffer_Offset;
+            return false; //Wait for more data
+        }
+        if (Config->Demux_EventWasSent)
+            return false;
+    }
+    #endif //MEDIAINFO_DEMUX
 
     //Header
     if (!Header_Manage())
@@ -586,6 +915,10 @@
     //Buffer
     BS->Attach(NULL, 0);
     delete[] Buffer_Temp; Buffer_Temp=NULL;
+    if (!Status[IsFinished])
+        File_Offset+=Buffer_Size;
+    else
+        File_Offset=File_Size;
     Buffer_Size=0;
     Buffer_Temp_Size=0;
     Buffer_Offset=0;
@@ -615,7 +948,7 @@
         Buffer_Offset+=2;
         while(Buffer_Offset<Buffer_Size && Buffer[Buffer_Offset]!=0x00)
             Buffer_Offset+=2;
-        if (Buffer_Offset<Buffer_Size && Buffer[Buffer_Offset-1]==0x00 || Buffer_Offset>=Buffer_Size)
+        if ((Buffer_Offset<Buffer_Size && Buffer[Buffer_Offset-1]==0x00) || Buffer_Offset>=Buffer_Size)
             Buffer_Offset--;
     }
 
@@ -650,7 +983,7 @@
     int32u Magic4=Magic8>>32;
     int32u Magic3=Magic4>> 8;
     int16u Magic2=Magic4>>16;
-    if (Magic8==0x4B572D4449524143LL || Magic4==0x52494646 || Magic3==0x465753 || Magic3==0x464C56 || Magic4==0x7F454C46 || Magic4==0x44504730 || Magic4==0x3026B275 || Magic2==0x4D5A)
+    if (Magic8==0x4B572D4449524143LL || Magic4==0x52494646 || Magic3==0x465753 || Magic3==0x464C56 || Magic4==0x7F454C46 || Magic4==0x44504730 || Magic4==0x3026B275 || Magic2==0x4D5A || Magic4==0x1A45DFA3)
     {
         Reject();
         return false;
@@ -701,6 +1034,98 @@
     return true;
 }
 
+//---------------------------------------------------------------------------
+bool File__Analyze::FileHeader_Begin_XML(XMLDocument &Document)
+{
+    //Element_Size
+    if (File_Size<32 || File_Size>1024*1024)
+    {
+        Reject();
+        return false; //XML files are not expected to be so big
+    }
+
+    //Element_Size
+    if (Buffer_Size<File_Size)
+        return false; //Must wait for more data
+
+    //XML header
+    Ztring Data;
+         if ((Buffer[0]=='<'
+           && Buffer[1]=='?'
+           && Buffer[2]=='x'
+           && Buffer[3]=='m'
+           && Buffer[4]=='l')
+          || (Buffer[0]==0xEF
+           && Buffer[1]==0xBB
+           && Buffer[2]==0xBF
+           && Buffer[3]=='<'
+           && Buffer[4]=='?'
+           && Buffer[5]=='x'
+           && Buffer[6]=='m'
+           && Buffer[7]=='l'))
+        Data.From_UTF8((const char*)Buffer, Buffer_Size);
+    else if ((Buffer[0]=='<'
+           && Buffer[1]==0x00
+           && Buffer[2]=='?'
+           && Buffer[3]==0x00
+           && Buffer[4]=='x'
+           && Buffer[5]==0x00
+           && Buffer[6]=='m'
+           && Buffer[7]==0x00
+           && Buffer[8]=='l'
+           && Buffer[9]==0x00)
+          || (Buffer[0]==0xFF
+           && Buffer[1]==0xFE
+           && Buffer[2]=='<'
+           && Buffer[3]==0x00
+           && Buffer[4]=='?'
+           && Buffer[5]==0x00
+           && Buffer[6]=='x'
+           && Buffer[7]==0x00
+           && Buffer[8]=='m'
+           && Buffer[9]==0x00
+           && Buffer[10]=='l'
+           && Buffer[11]==0x00))
+        Data.From_UTF16LE((const char*)Buffer, Buffer_Size);
+    else if ((Buffer[0]==0x00
+           && Buffer[1]=='<'
+           && Buffer[2]==0x00
+           && Buffer[3]=='?'
+           && Buffer[4]==0x00
+           && Buffer[5]=='x'
+           && Buffer[6]==0x00
+           && Buffer[7]=='m'
+           && Buffer[8]==0x00
+           && Buffer[9]=='l')
+          || (Buffer[0]==0xFE
+           && Buffer[1]==0xFF
+           && Buffer[2]==0x00
+           && Buffer[3]=='<'
+           && Buffer[4]==0x00
+           && Buffer[5]=='?'
+           && Buffer[6]==0x00
+           && Buffer[7]=='x'
+           && Buffer[8]==0x00
+           && Buffer[9]=='m'
+           && Buffer[10]==0x00
+           && Buffer[11]=='l'))
+        Data.From_UTF16BE((const char*)Buffer, Buffer_Size);
+    else
+    {
+        Reject();
+        return false;
+    }
+
+    string DataUTF8=Data.To_UTF8();
+    if (Document.Parse(DataUTF8.c_str()))
+    {
+        Reject();
+        return false;
+    }
+
+    return true;
+}
+
 //***************************************************************************
 // Synchro
 //***************************************************************************
@@ -711,8 +1136,70 @@
     //Testing if synchro is OK
     if (Synched)
     {
+        if (!Synchro_Manage_Test())
+            return false;
+    }
+
+    //Trying to synchronize
+    if (!Synched)
+    {
+        //Buffer_TotalBytes_Fill_Max
+        if (!Status[IsFilled] && Buffer_TotalBytes>=Buffer_TotalBytes_Fill_Max)
+        {
+            Reject(); //There was a wrong detection
+            return false;
+        }
+        if (!Synchronize())
+        {
+            if (Status[IsFinished])
+                Finish(); //Finish
+            if (!IsSub && File_Offset_FirstSynched==(int64u)-1 && Buffer_TotalBytes+Buffer_Offset>=Buffer_TotalBytes_FirstSynched_Max)
+                Reject();
+            return false; //Wait for more data
+        }
+        Synched=true;
+        if (File_Offset_FirstSynched==(int64u)-1)
+        {
+            Synched_Init();
+            Buffer_TotalBytes_FirstSynched+=Buffer_TotalBytes+Buffer_Offset;
+            File_Offset_FirstSynched=File_Offset+Buffer_Offset;
+        }
+        #if MEDIAINFO_DEMUX
+            if (Config->Demux_EventWasSent)
+                return false;
+        #endif //MEDIAINFO_DEMUX
+        if (!Synchro_Manage_Test())
+            return false;
+    }
+
+    return true;
+}
+
+//---------------------------------------------------------------------------
+bool File__Analyze::Synchro_Manage_Test()
+{
+    //Testing if synchro is OK
+    if (Synched)
+    {
         if (!Synched_Test())
             return false;
+        #if MEDIAINFO_DEMUX
+            if (Synched && Demux_TotalBytes<=Buffer_TotalBytes+Buffer_Offset)
+            {
+                if (Demux_UnpacketizeContainer && !Demux_UnpacketizeContainer_Test())
+                {
+                    Demux_Offset-=Buffer_Offset;
+                    return false; //Wait for more data
+                }
+                if (Config->Demux_EventWasSent)
+                    return false;
+            }
+        #endif //MEDIAINFO_DEMUX
+        if ((FrameInfo_Next.DTS!=(int64u)-1 || FrameInfo_Next.PTS!=(int64u)-1) && Buffer_Offset+Element_Offset>=FrameInfo.Buffer_Offset)
+        {
+            FrameInfo=FrameInfo_Next;
+            FrameInfo_Next=frame_info();
+        }
         if (!Synched)
         {
             Element[Element_Level].IsComplete=true; //Else the trusting algo will think it
@@ -738,7 +1225,20 @@
             Buffer_TotalBytes_FirstSynched+=Buffer_TotalBytes+Buffer_Offset;
             File_Offset_FirstSynched=File_Offset+Buffer_Offset;
         }
-        return Synchro_Manage();
+        if (!Synched_Test())
+            return false;
+        #if MEDIAINFO_DEMUX
+            if (Synched && Demux_TotalBytes<=Buffer_TotalBytes+Buffer_Offset)
+            {
+                if (Demux_UnpacketizeContainer && !Demux_UnpacketizeContainer_Test())
+                {
+                    Demux_Offset-=Buffer_Offset;
+                    return false; //Wait for more data
+                }
+                if (Config->Demux_EventWasSent)
+                    return false;
+            }
+        #endif //MEDIAINFO_DEMUX
     }
 
     return true;
@@ -752,18 +1252,27 @@
 bool File__Analyze::FileHeader_Manage()
 {
     //From the parser
-    if (!FileHeader_Begin())
+    if (!Status[IsAccepted] && !FileHeader_Begin())
     {
         if (Status[IsFinished]) //Newest parsers set this bool if there is an error
             Reject();
+        if (File_Offset+Buffer_Size>=File_Size)
+            Reject();
         return false; //Wait for more data
     }
 
+    #if MEDIAINFO_DEMUX
+        if (Config->Demux_EventWasSent)
+            return false;
+    #endif //MEDIAINFO_DEMUX
+
     //From the parser
     Element_Size=Buffer_Size;
-    Element_Begin("File Header");
+    Element_Begin1("File Header");
     FileHeader_Parse();
-    Element_End();
+    if (Element_Offset==0)
+        Element_DoNotShow();
+    Element_End0();
     if (Status[IsFinished]) //Newest parsers set this bool if there is an error
     {
         Finish();
@@ -799,10 +1308,12 @@
         return false;
 
     //Header begin
+    Element_Size=Element[Element_Level].Next-(File_Offset+Buffer_Offset);
+    Element_Offset=0;
     if (!Header_Begin())
     {
         //Jumping to the end of the file if needed
-        if (!EOF_AlreadyDetected && MediaInfoLib::Config.ParseSpeed_Get()<1 && File_GoTo==(int64u)-1)
+        if (!EOF_AlreadyDetected && Config->ParseSpeed<1 && File_GoTo==(int64u)-1)
         {
             Element[Element_Level].WaitForMoreData=false;
             Detect_EOF();
@@ -825,11 +1336,11 @@
     if (Element_Size==0)
         return false;
     Element_Offset=0;
-    Element_Begin(); //Element
+    Element_Begin0(); //Element
     #if MEDIAINFO_TRACE
         Data_Level=Element_Level;
     #endif //MEDIAINFO_TRACE
-    Element_Begin("Header"); //Header
+    Element_Begin1("Header"); //Header
 
     //Header parsing
     Header_Parse();
@@ -837,16 +1348,33 @@
     //Testing the parser result
     if (Element[Element_Level].UnTrusted) //Problem
     {
+        Element[Element_Level].UnTrusted=false;
         Header_Fill_Code(0, "Problem");
-        Header_Fill_Size(Element_Size);
+        if (MustSynchronize)
+        {
+            //Unsynchronizing to the next byte
+            Element_Offset=1;
+            Header_Fill_Size(1);
+            Synched=false;
+        }
+        else
+        {
+            //Can not synchronize anymore in this block
+            Element_Offset=Element[Element_Level-2].Next-(File_Offset+Buffer_Offset);
+            Header_Fill_Size(Element_Offset);
+        }
     }
 
-    if (Element_IsWaitingForMoreData() || (DataMustAlwaysBeComplete && Element[Element_Level-1].Next>File_Offset+Buffer_Size)) //Wait or want to have a comple data chunk
+    if (Element_IsWaitingForMoreData() || ((DataMustAlwaysBeComplete && Element[Element_Level-1].Next>File_Offset+Buffer_Size) || File_GoTo!=(int64u)-1) //Wait or want to have a comple data chunk
+        #if MEDIAINFO_DEMUX
+            || (Config->Demux_EventWasSent)
+        #endif //MEDIAINFO_DEMUX
+    )
     {
         //The header is not complete, need more data
         Element[Element_Level].WaitForMoreData=true;
-        Element_End(); //Header
-        Element_End(); //Element
+        Element_End0(); //Header
+        Element_End0(); //Element
         return false;
     }
 
@@ -856,13 +1384,15 @@
 
     //ToShow
     #if MEDIAINFO_TRACE
-    if (Config_DetailsLevel!=0)
+    if (Trace_Activated)
     {
         if (Element[Element_Level-1].ToShow.Name.empty())
-            Element[Element_Level-1].ToShow.Name=_T("Unknown");
+            Element[Element_Level-1].ToShow.Name=__T("Unknown");
         Element[Element_Level].ToShow.Size=Element_Offset;
         Element[Element_Level].ToShow.Header_Size=0;
         Element[Element_Level-1].ToShow.Header_Size=Header_Size;
+        if (Element_Offset==0)
+            Element_DoNotShow();
     }
     #endif //MEDIAINFO_TRACE
 
@@ -884,7 +1414,7 @@
         Element[Element_Level-1].IsComplete=false;
     }
 
-    Element_End(); //Header
+    Element_End0(); //Header
     return true;
 }
 
@@ -904,7 +1434,7 @@
     Element[Element_Level-1].Code=Code;
 
     //ToShow
-    if (Config_DetailsLevel!=0)
+    if (Config_Trace_Level!=0)
     {
         Element_Level--;
         Element_Name(Name);
@@ -943,7 +1473,7 @@
 
     //ToShow
     #if MEDIAINFO_TRACE
-    if (Config_DetailsLevel!=0)
+    if (Trace_Activated)
     {
         Element[Element_Level-1].ToShow.Pos=File_Offset+Buffer_Offset;
         Element[Element_Level-1].ToShow.Size=Element[Element_Level-1].Next-(File_Offset+Buffer_Offset);
@@ -967,11 +1497,23 @@
         BS->Attach(NULL, 0); //Clear it
         //Element_Level=Element_Level_Save;
 
+
+        if ((FrameInfo_Next.DTS!=(int64u)-1 || FrameInfo_Next.PTS!=(int64u)-1) && (Buffer_Offset+Element_Offset>=FrameInfo.Buffer_Offset || Frame_Count>Frame_Count_Previous || Field_Count>Field_Count_Previous))
+        {
+            FrameInfo=FrameInfo_Next;
+            FrameInfo_Next=frame_info();
+
+            if (Frame_Count_Previous<Frame_Count)
+                Frame_Count_Previous=Frame_Count;
+            if (Field_Count_Previous<Field_Count)
+                Field_Count_Previous=Field_Count;
+        }
+
         //Testing the parser result
         if (Element_IsWaitingForMoreData())
         {
             //The data is not complete, need more data
-            Element_End(); //Element
+            Element_End0(); //Element
             Buffer_Offset-=(size_t)Header_Size;
             return false;
         }
@@ -979,29 +1521,35 @@
         Element[Element_Level].IsComplete=true;
     }
 
-    if (File_GoTo!=(int64u)-1)
+    //If no need of more
+    if (File_GoTo!=(int64u)-1 || (Status[IsFinished] && !ShouldContinueParsing))
+    {
+        if (!Element_WantNextLevel)
+            Element_End0(); //Element
         return false;
+    }
 
     //Next element
     if (!Element_WantNextLevel)
     {
         if (Element[Element_Level].Next<=File_Offset+Buffer_Size)
-            Element_Offset=(size_t)(Element[Element_Level].Next-File_Offset-Buffer_Offset);
+        {
+            if (Element_Offset<(size_t)(Element[Element_Level].Next-File_Offset-Buffer_Offset))
+                Element_Offset=(size_t)(Element[Element_Level].Next-File_Offset-Buffer_Offset);
+        }
         else if (!Status[IsFinished])
         {
             GoTo(Element[Element_Level].Next);
+            if (!Element_WantNextLevel)
+                Element_End0(); //Element
             return false;
         }
     }
     if (File_GoTo==(int64u)-1 && Buffer_Offset+Element_Offset>Buffer_Size && File_Offset!=File_Size)
-        GoTo(File_Offset+Buffer_Offset+Element_Offset); //Preparing to go far
-
-    //If no need of more
-    if (File_GoTo!=(int64u)-1 || (Status[IsFinished] && !ShouldContinueParsing))
     {
+        GoTo(File_Offset+Buffer_Offset+Element_Offset); //Preparing to go far
         if (!Element_WantNextLevel)
-            Element_End(); //Element
-        Element_Offset=0;
+            Element_End0(); //Element
         return false;
     }
 
@@ -1010,19 +1558,28 @@
     Element_Size=0;
     Element_Offset=0;
 
+    #if MEDIAINFO_DEMUX
+        if (Config->Demux_EventWasSent)
+        {
+            if (!Element_WantNextLevel)
+                Element_End0();
+            return false;
+        }
+    #endif //MEDIAINFO_DEMUX
+
     #if MEDIAINFO_TRACE
     if (Element_Level>0)
         Element[Element_Level-1].ToShow.NoShow=Element[Element_Level].ToShow.NoShow; //If data must not be shown, we hide the header too
     else
         Element[0].ToShow.NoShow=false; //This should never happen, but in case of
     #endif //MEDIAINFO_TRACE
-    Element_End(); //Element
+    Element_End0(); //Element
     if (Element_WantNextLevel)
         Element_Level++;
     Element[Element_Level].UnTrusted=false;
 
     //Jumping to the end of the file if needed
-    if (!EOF_AlreadyDetected && MediaInfoLib::Config.ParseSpeed_Get()<1 && File_GoTo==(int64u)-1)
+    if (!EOF_AlreadyDetected && Config->ParseSpeed<1 && File_GoTo==(int64u)-1)
     {
         Element[Element_Level].WaitForMoreData=false;
         Detect_EOF();
@@ -1055,7 +1612,7 @@
         return;
 
     if (ParserName)
-        Info(Ztring(ParserName)+_T(", accepted"));
+        Info(Ztring(ParserName)+__T(", accepted"));
 
     Accept(ParserName);
 }
@@ -1068,12 +1625,12 @@
     if (ShouldContinueParsing)
     {
         //if (ParserName)
-        //    Info(Ztring(ParserName)+_T(", wants to finish, but should continue parsing"));
+        //    Info(Ztring(ParserName)+__T(", wants to finish, but should continue parsing"));
         return;
     }
 
     if (ParserName)
-        Info(Ztring(ParserName)+_T(", finished"));
+        Info(Ztring(ParserName)+__T(", finished"));
 
     Finish();
 }
@@ -1088,44 +1645,33 @@
     Clear();
 
     if (ParserName)// && File_Offset+Buffer_Offset+Element_Size<File_Size)
-        Info(Ztring(ParserName)+_T(", rejected"));
+        Info(Ztring(ParserName)+__T(", rejected"));
 }
 #endif //MEDIAINFO_TRACE
 
 //---------------------------------------------------------------------------
 #if MEDIAINFO_TRACE
-void File__Analyze::Data_GoTo (int64u GoTo, const char* ParserName)
+void File__Analyze::Data_GoTo (int64u GoTo_, const char* ParserName)
 {
-    if (IsSub && MediaInfoLib::Config.ParseSpeed_Get()==1)
-        return;
-
     Element_Show();
 
-    if (GoTo==File_Size)
-    {
-        ForceFinish();
-        return;
-    }
-    if (File_GoTo!=(int64u)-1)
-        return; //Already done
-
     if (ShouldContinueParsing)
     {
         if (ParserName)
-            Info(Ztring(ParserName)+_T(", wants to go to somewhere, but should continue parsing"));
+            Info(Ztring(ParserName)+__T(", wants to go to somewhere, but should continue parsing"));
         return;
     }
 
     if (IsSub)
     {
         if (ParserName)
-            Info(Ztring(ParserName)+_T(", wants to go to somewhere, but is sub, waiting data"));
+            Info(Ztring(ParserName)+__T(", wants to go to somewhere, but is sub, waiting data"));
         return;
     }
 
-    Info(Ztring(ParserName)+_T(", jumping to offset ")+Ztring::ToZtring(GoTo, 16));
-    if (!IsSub)
-        File_GoTo=GoTo;
+    Info(Ztring(ParserName)+__T(", jumping to offset ")+Ztring::ToZtring(GoTo_, 16));
+    GoTo(GoTo_);
+    Element_End0();
 }
 #endif //MEDIAINFO_TRACE
 
@@ -1133,13 +1679,13 @@
 #if MEDIAINFO_TRACE
 void File__Analyze::Data_GoToFromEnd (int64u GoToFromEnd, const char* ParserName)
 {
-    if (IsSub && MediaInfoLib::Config.ParseSpeed_Get()==1)
+    if (IsSub && Config->ParseSpeed==1)
         return;
 
     if (GoToFromEnd>File_Size)
     {
         if (ParserName)
-            Info(Ztring(ParserName)+_T(", wants to go to somewhere, but not valid"));
+            Info(Ztring(ParserName)+__T(", wants to go to somewhere, but not valid"));
         return;
     }
 
@@ -1153,31 +1699,32 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
-Ztring Log_Offset (int64u OffsetToShow)
+#if MEDIAINFO_TRACE
+Ztring Log_Offset (int64u OffsetToShow, MediaInfo_Config::trace_Format Config_Trace_Format)
 {
     if (OffsetToShow==(int64u)-1)
-        return _T("         ");
+        return __T("         ");
     int64u Offset=OffsetToShow%0x100000000ULL; //Only 32 bits
     Ztring Pos1; Pos1.From_Number(Offset, 16);
     Ztring Pos2;
-    Pos2.resize(8-Pos1.size(), _T('0'));
+    Pos2.resize(8-Pos1.size(), __T('0'));
     Pos2+=Pos1;
     Pos2.MakeUpperCase();
-    switch (MediaInfoLib::Config.DetailsFormat_Get())
+    switch (Config_Trace_Format)
     {
-        case MediaInfo_Config::DetailsFormat_Tree       : Pos2+=_T(' '); break;
-        case MediaInfo_Config::DetailsFormat_CSV        : Pos2+=_T(','); break;
+        case MediaInfo_Config::Trace_Format_Tree        : Pos2+=__T(' '); break;
+        case MediaInfo_Config::Trace_Format_CSV         : Pos2+=__T(','); break;
         default                                         : ;
     }
     return Pos2;
 }
+#endif //MEDIAINFO_TRACE
 
 //---------------------------------------------------------------------------
 void File__Analyze::Element_Begin()
 {
     //Level
     Element_Level++;
-    Header_Size=0;
 
     //Element
     Element[Element_Level].Code=0;
@@ -1188,8 +1735,8 @@
 
     //ToShow
     #if MEDIAINFO_TRACE
-    Element[Element_Level].ToShow.Pos=File_Offset+Buffer_Offset+Element_Offset+BS->OffsetBeforeLastCall_Get(); //TODO: change this, used in Element_End()
-    if (Config_DetailsLevel!=0)
+    Element[Element_Level].ToShow.Pos=File_Offset+Buffer_Offset+Element_Offset+BS->OffsetBeforeLastCall_Get(); //TODO: change this, used in Element_End0()
+    if (Trace_Activated)
     {
         Element[Element_Level].ToShow.Size=Element[Element_Level].Next-(File_Offset+Buffer_Offset+Element_Offset+BS->OffsetBeforeLastCall_Get());
         Element[Element_Level].ToShow.Header_Size=0;
@@ -1203,28 +1750,21 @@
 
 //---------------------------------------------------------------------------
 #if MEDIAINFO_TRACE
-void File__Analyze::Element_Begin(const Ztring &Name, int64u Size)
+void File__Analyze::Element_Begin(const Ztring &Name)
 {
     //Level
     Element_Level++;
 
     //Element
     Element[Element_Level].Code=0;
-    if (Size==(int64u)-1)
-        Element[Element_Level].Next=Element[Element_Level-1].Next;
-    else
-    {
-        Element[Element_Level].Next=File_Offset+Buffer_Offset+Element_Offset+Size;
-        if (Element[Element_Level].Next>Element[Element_Level-1].Next)
-            Element[Element_Level].Next=Element[Element_Level-1].Next;
-    }
+    Element[Element_Level].Next=Element[Element_Level-1].Next;
     Element[Element_Level].WaitForMoreData=false;
     Element[Element_Level].UnTrusted=Element[Element_Level-1].UnTrusted;
     Element[Element_Level].IsComplete=Element[Element_Level-1].IsComplete;
 
     //ToShow
-    Element[Element_Level].ToShow.Pos=File_Offset+Buffer_Offset+Element_Offset+BS->OffsetBeforeLastCall_Get(); //TODO: change this, used in Element_End()
-    if (Config_DetailsLevel!=0)
+    Element[Element_Level].ToShow.Pos=File_Offset+Buffer_Offset+Element_Offset+BS->OffsetBeforeLastCall_Get(); //TODO: change this, used in Element_End0()
+    if (Trace_Activated)
     {
         Element[Element_Level].ToShow.Size=Element[Element_Level].Next-(File_Offset+Buffer_Offset+Element_Offset+BS->OffsetBeforeLastCall_Get());
         Element[Element_Level].ToShow.Header_Size=0;
@@ -1234,26 +1774,6 @@
         Element[Element_Level].ToShow.NoShow=false;
     }
 }
-#else //MEDIAINFO_TRACE
-void File__Analyze::Element_Begin(int64u Size)
-{
-    //Level
-    Element_Level++;
-
-    //Element
-    Element[Element_Level].Code=0;
-    if (Size==(int64u)-1)
-        Element[Element_Level].Next=Element[Element_Level-1].Next;
-    else
-    {
-        Element[Element_Level].Next=File_Offset+Buffer_Offset+Element_Offset+Size;
-        if (Element[Element_Level].Next>Element[Element_Level-1].Next)
-            Element[Element_Level].Next=Element[Element_Level-1].Next;
-    }
-    Element[Element_Level].WaitForMoreData=false;
-    Element[Element_Level].UnTrusted=Element[Element_Level-1].UnTrusted;
-    Element[Element_Level].IsComplete=Element[Element_Level-1].IsComplete;
-}
 #endif //MEDIAINFO_TRACE
 
 //---------------------------------------------------------------------------
@@ -1261,20 +1781,20 @@
 void File__Analyze::Element_Name(const Ztring &Name)
 {
     //ToShow
-    if (Config_DetailsLevel!=0)
+    if (Trace_Activated)
     {
         if (!Name.empty())
         {
             Ztring Name2=Name;
-            Name2.FindAndReplace(_T("\r\n"), _T("__"), 0, Ztring_Recursive);
-            Name2.FindAndReplace(_T("\r"), _T("_"), 0, Ztring_Recursive);
-            Name2.FindAndReplace(_T("\n"), _T("_"), 0, Ztring_Recursive);
-            if (Name2[0]==_T(' '))
-                Name2[0]=_T('_');
+            Name2.FindAndReplace(__T("\r\n"), __T("__"), 0, Ztring_Recursive);
+            Name2.FindAndReplace(__T("\r"), __T("_"), 0, Ztring_Recursive);
+            Name2.FindAndReplace(__T("\n"), __T("_"), 0, Ztring_Recursive);
+            if (Name2[0]==__T(' '))
+                Name2[0]=__T('_');
             Element[Element_Level].ToShow.Name=Name2;
         }
         else
-            Element[Element_Level].ToShow.Name=_T("(Empty)");
+            Element[Element_Level].ToShow.Name=__T("(Empty)");
     }
 }
 #endif //MEDIAINFO_TRACE
@@ -1284,22 +1804,22 @@
 void File__Analyze::Element_Info(const Ztring &Parameter)
 {
     //Coherancy
-    if (Config_DetailsLevel==0 || Element[Element_Level].ToShow.Details.size()>64*1024*1024)
+    if (Config_Trace_Level==0 || !(Trace_Layers.to_ulong()&Config_Trace_Layers.to_ulong()) || Element[Element_Level].ToShow.Details.size()>64*1024*1024)
         return;
 
     //Needed?
-    if (Config_DetailsLevel<=0.7)
+    if (Config_Trace_Level<=0.7)
         return;
 
     //ToShow
     Ztring Parameter2(Parameter);
-    Parameter2.FindAndReplace(_T("\r\n"), _T(" / "));
-    Parameter2.FindAndReplace(_T("\r"), _T(" / "));
-    Parameter2.FindAndReplace(_T("\n"), _T(" / "));
-    switch (MediaInfoLib::Config.DetailsFormat_Get())
+    Parameter2.FindAndReplace(__T("\r\n"), __T(" / "));
+    Parameter2.FindAndReplace(__T("\r"), __T(" / "));
+    Parameter2.FindAndReplace(__T("\n"), __T(" / "));
+    switch (Config_Trace_Format)
     {
-        case MediaInfo_Config::DetailsFormat_Tree       : Element[Element_Level].ToShow.Info+=_T(" - "); break;
-        case MediaInfo_Config::DetailsFormat_CSV        : Element[Element_Level].ToShow.Info+=_T(','); break;
+        case MediaInfo_Config::Trace_Format_Tree        :
+        case MediaInfo_Config::Trace_Format_CSV         : Element[Element_Level].ToShow.Info+=__T(" - "); break;
         default                                         : ;
     }
     Element[Element_Level].ToShow.Info+=Parameter2;
@@ -1308,18 +1828,10 @@
 
 //---------------------------------------------------------------------------
 #if MEDIAINFO_TRACE
-void File__Analyze::Element_End(const Ztring &Name, int64u Size)
+void File__Analyze::Element_End(const Ztring &Name)
 {
-    //Element
-    if (Size!=(int64u)-1)
-    {
-        Element[Element_Level].Next=Element[Element_Level].ToShow.Pos+Size; //TODO: change this
-        if (Element[Element_Level].Next>Element[Element_Level-1].Next)
-            Element[Element_Level].Next=Element[Element_Level-1].Next;
-    }
-
     //ToShow
-    if (Config_DetailsLevel!=0)
+    if (Trace_Activated)
     {
         Element[Element_Level].ToShow.Size=Element[Element_Level].Next-Element[Element_Level].ToShow.Pos;
         if (!Name.empty())
@@ -1328,27 +1840,8 @@
 
     Element_End_Common_Flush();
 }
-#else //MEDIAINFO_TRACE
-void File__Analyze::Element_End(int64u Size)
-{
-    //Element
-    if (Size!=(int64u)-1)
-    {
-        if (Element[Element_Level].Next>Element[Element_Level-1].Next)
-            Element[Element_Level].Next=Element[Element_Level-1].Next;
-    }
-
-    Element_End_Common_Flush();
-}
 #endif //MEDIAINFO_TRACE
 
-//---------------------------------------------------------------------------
-void File__Analyze::Element_End()
-{
-    Element_End_Common_Flush();
-}
-
-
 //***************************************************************************
 // Element - Common
 //***************************************************************************
@@ -1382,16 +1875,15 @@
 //---------------------------------------------------------------------------
 void File__Analyze::Element_End_Common_Flush_Details()
 {
-    Element[Element_Level].ToShow.NoShow=Element[Element_Level+1].ToShow.NoShow;
-    if (Config_DetailsLevel!=0)
+    if (Trace_Activated)
     {
-        if (!Element[Element_Level+1].WaitForMoreData && (Element[Element_Level+1].IsComplete || !Element[Element_Level+1].UnTrusted) && !Element[Element_Level+1].ToShow.NoShow)// && Config_DetailsLevel!=0 && Element[Element_Level].ToShow.Details.size()<=64*1024*1024)
+        if (!Element[Element_Level+1].WaitForMoreData && (Element[Element_Level+1].IsComplete || !Element[Element_Level+1].UnTrusted) && !Element[Element_Level+1].ToShow.NoShow)// && Config_Trace_Level!=0 && Element[Element_Level].ToShow.Details.size()<=64*1024*1024)
         {
             //Element
             if (!Element[Element_Level+1].ToShow.Name.empty())
             {
                 if (!Element[Element_Level].ToShow.Details.empty())
-                    Element[Element_Level].ToShow.Details+=MediaInfoLib::Config.LineSeparator_Get();
+                    Element[Element_Level].ToShow.Details+=Config_LineSeparator;
                 Element[Element_Level].ToShow.Details+=Element_End_Common_Flush_Build();
                 Element[Element_Level+1].ToShow.Name.clear();
             }
@@ -1400,7 +1892,7 @@
             if (!Element[Element_Level+1].ToShow.Details.empty())
             {
                 if (!Element[Element_Level].ToShow.Details.empty())
-                    Element[Element_Level].ToShow.Details+=MediaInfoLib::Config.LineSeparator_Get();
+                    Element[Element_Level].ToShow.Details+=Config_LineSeparator;
                 Element[Element_Level].ToShow.Details+=Element[Element_Level+1].ToShow.Details;
                 Element[Element_Level+1].ToShow.Details.clear();
             }
@@ -1416,19 +1908,19 @@
     Ztring ToReturn;
 
     //Show Offset
-    if (Config_DetailsLevel>0.7)
+    if (Config_Trace_Level>0.7)
     {
-        ToReturn+=Log_Offset(Element[Element_Level+1].ToShow.Pos);
+        ToReturn+=Log_Offset(Element[Element_Level+1].ToShow.Pos, Config_Trace_Format);
     }
 
     //Name
-    switch (MediaInfoLib::Config.DetailsFormat_Get())
+    switch (Config_Trace_Format)
     {
-        case MediaInfo_Config::DetailsFormat_Tree       : ToReturn.resize(ToReturn.size()+Element_Level_Base+Element_Level, _T(' ')); break;
-        case MediaInfo_Config::DetailsFormat_CSV        :
-                    ToReturn+=_T("G,");
+        case MediaInfo_Config::Trace_Format_Tree        : ToReturn.resize(ToReturn.size()+Element_Level_Base+Element_Level, __T(' ')); break;
+        case MediaInfo_Config::Trace_Format_CSV         :
+                    ToReturn+=__T("G,");
                     ToReturn+=Ztring::ToZtring(Element_Level_Base+Element_Level);
-                    ToReturn+=_T(',');
+                    ToReturn+=__T(',');
                     break;
         default                                         : ;
     }
@@ -1439,22 +1931,25 @@
     Element[Element_Level+1].ToShow.Info.clear();
 
     //Size
-    if (Config_DetailsLevel>0.3)
+    if (Config_Trace_Level>0.3)
     {
-        switch (MediaInfoLib::Config.DetailsFormat_Get())
+        switch (Config_Trace_Format)
         {
-            case MediaInfo_Config::DetailsFormat_Tree       :
-                    ToReturn+=_T(" (");
-                    ToReturn+=Ztring::ToZtring(Element[Element_Level+1].ToShow.Size);
-                    if (Element[Element_Level+1].ToShow.Header_Size>0)
-                    {
-                        ToReturn+=_T("/");
-                        ToReturn+=Ztring::ToZtring(Element[Element_Level+1].ToShow.Size-Element[Element_Level+1].ToShow.Header_Size);
-                    }
-                    ToReturn+=_T(" bytes)");
+            case MediaInfo_Config::Trace_Format_Tree        :
+                    ToReturn+=__T(" (");
+                    break;
+            case MediaInfo_Config::Trace_Format_CSV         :
+                    ToReturn+=__T(",(");
                     break;
             default                                         : ;
         }
+        ToReturn+=Ztring::ToZtring(Element[Element_Level+1].ToShow.Size);
+        if (Element[Element_Level+1].ToShow.Header_Size>0)
+        {
+            ToReturn+=__T("/");
+            ToReturn+=Ztring::ToZtring(Element[Element_Level+1].ToShow.Size-Element[Element_Level+1].ToShow.Header_Size);
+        }
+        ToReturn+=__T(" bytes)");
     }
 
     return ToReturn;
@@ -1478,7 +1973,7 @@
 #if MEDIAINFO_TRACE
 void File__Analyze::Param(const Ztring& Parameter, const Ztring& Value)
 {
-    if (Config_DetailsLevel==0)
+    if (Config_Trace_Level==0 || !(Trace_Layers.to_ulong()&Config_Trace_Layers.to_ulong()))
         return;
 
     //Position
@@ -1492,44 +1987,44 @@
 
     //Line separator
     if (!Element[Element_Level].ToShow.Details.empty())
-        Element[Element_Level].ToShow.Details+=MediaInfoLib::Config.LineSeparator_Get();
+        Element[Element_Level].ToShow.Details+=Config_LineSeparator;
 
     //Show Offset
-    if (Config_DetailsLevel>0.7)
+    if (Config_Trace_Level>0.7)
     {
-        Element[Element_Level].ToShow.Details+=Log_Offset(Pos==(int64u)-1?Pos:(File_Offset+Buffer_Offset+Pos));
+        Element[Element_Level].ToShow.Details+=Log_Offset(Pos==(int64u)-1?Pos:(File_Offset+Buffer_Offset+Pos), Config_Trace_Format);
     }
 
     //Show Parameter+Value
-    switch (MediaInfoLib::Config.DetailsFormat_Get())
+    switch (Config_Trace_Format)
     {
-        case MediaInfo_Config::DetailsFormat_Tree       :
+        case MediaInfo_Config::Trace_Format_Tree        :
                     {
                     //Show Parameter
                     Ztring Param; Param=Parameter;
                     if (Param.size()>Padding_Value) Param.resize(Padding_Value);
-                    Element[Element_Level].ToShow.Details.resize(Element[Element_Level].ToShow.Details.size()+Element_Level_Base+Element_Level, _T(' '));
+                    Element[Element_Level].ToShow.Details.resize(Element[Element_Level].ToShow.Details.size()+Element_Level_Base+Element_Level, __T(' '));
                     Element[Element_Level].ToShow.Details+=Param;
 
                     //Show Value
                     if (!Value.empty())
                     {
-                        Element[Element_Level].ToShow.Details+=_T(": ");
-                        Element[Element_Level].ToShow.Details.resize(Element[Element_Level].ToShow.Details.size()+Padding_Value-Param.size()-Element_Level+1, _T(' '));
+                        Element[Element_Level].ToShow.Details+=__T(": ");
+                        Element[Element_Level].ToShow.Details.resize(Element[Element_Level].ToShow.Details.size()+Padding_Value-Param.size()-Element_Level+1, __T(' '));
                         Ztring Value2(Value);
-                        Value2.FindAndReplace(_T("\r\n"), _T(" / "), 0, Ztring_Recursive);
-                        Value2.FindAndReplace(_T("\r"), _T(" / "), 0, Ztring_Recursive);
-                        Value2.FindAndReplace(_T("\n"), _T(" / "), 0, Ztring_Recursive);
+                        Value2.FindAndReplace(__T("\r\n"), __T(" / "), 0, Ztring_Recursive);
+                        Value2.FindAndReplace(__T("\r"), __T(" / "), 0, Ztring_Recursive);
+                        Value2.FindAndReplace(__T("\n"), __T(" / "), 0, Ztring_Recursive);
                         Element[Element_Level].ToShow.Details+=Value2;
                     }
                     }
                     break;
-        case MediaInfo_Config::DetailsFormat_CSV        :
-                    Element[Element_Level].ToShow.Details+=_T("T,");
+        case MediaInfo_Config::Trace_Format_CSV         :
+                    Element[Element_Level].ToShow.Details+=__T("T,");
                     Element[Element_Level].ToShow.Details+=Ztring::ToZtring(Element_Level_Base+Element_Level);
-                    Element[Element_Level].ToShow.Details+=_T(',');
+                    Element[Element_Level].ToShow.Details+=__T(',');
                     Element[Element_Level].ToShow.Details+=Parameter;
-                    Element[Element_Level].ToShow.Details+=_T(',');
+                    Element[Element_Level].ToShow.Details+=__T(',');
                     Element[Element_Level].ToShow.Details+=Value;
                     break;
         default                                         : ;
@@ -1545,7 +2040,7 @@
 #if MEDIAINFO_TRACE
 void File__Analyze::Info(const Ztring& Value, size_t Element_Level_Minus)
 {
-    if (MediaInfoLib::Config.DetailsFormat_Get()==MediaInfo_Config::DetailsFormat_CSV)
+    if (Config_Trace_Format==MediaInfo_Config::Trace_Format_CSV)
         return; //Do not display info
 
     //Handling a different level (only Element_Level_Minus to 1 is currently well supported)
@@ -1561,7 +2056,7 @@
         Element_Level_Final-=Element_Level_Minus;
     }
 
-    if (Config_DetailsLevel==0)
+    if (Config_Trace_Level==0 || !(Trace_Layers.to_ulong()&Config_Trace_Layers.to_ulong()))
         return;
 
     //Coherancy
@@ -1570,29 +2065,29 @@
 
     //Line separator
     if (!Element[Element_Level_Final].ToShow.Details.empty())
-        Element[Element_Level_Final].ToShow.Details+=MediaInfoLib::Config.LineSeparator_Get();
+        Element[Element_Level_Final].ToShow.Details+=Config_LineSeparator;
 
     //Preparing
-    Ztring ToShow; ToShow.resize(Element_Level_Final, _T(' '));
-    ToShow+=_T("---   ");
+    Ztring ToShow; ToShow.resize(Element_Level_Final, __T(' '));
+    ToShow+=__T("---   ");
     ToShow+=Value;
-    ToShow+=_T("   ---");
-    Ztring Separator; Separator.resize(Element_Level_Final, _T(' '));
-    Separator.resize(ToShow.size(), _T('-'));
+    ToShow+=__T("   ---");
+    Ztring Separator; Separator.resize(Element_Level_Final, __T(' '));
+    Separator.resize(ToShow.size(), __T('-'));
 
     //Show Offset
     Ztring Offset;
-    if (Config_DetailsLevel>0.7)
-        Offset=Log_Offset(File_Offset+Buffer_Offset+Element_Offset+BS->Offset_Get());
-    Offset.resize(Offset.size()+Element_Level_Base, _T(' '));
+    if (Config_Trace_Level>0.7)
+        Offset=Log_Offset(File_Offset+Buffer_Offset+Element_Offset+BS->Offset_Get(), Config_Trace_Format);
+    Offset.resize(Offset.size()+Element_Level_Base, __T(' '));
 
     //Show Value
     Element[Element_Level_Final].ToShow.Details+=Offset;
     Element[Element_Level_Final].ToShow.Details+=Separator;
-    Element[Element_Level_Final].ToShow.Details+=MediaInfoLib::Config.LineSeparator_Get();
+    Element[Element_Level_Final].ToShow.Details+=Config_LineSeparator;
     Element[Element_Level_Final].ToShow.Details+=Offset;
     Element[Element_Level_Final].ToShow.Details+=ToShow;
-    Element[Element_Level_Final].ToShow.Details+=MediaInfoLib::Config.LineSeparator_Get();
+    Element[Element_Level_Final].ToShow.Details+=Config_LineSeparator;
     Element[Element_Level_Final].ToShow.Details+=Offset;
     Element[Element_Level_Final].ToShow.Details+=Separator;
 }
@@ -1605,15 +2100,15 @@
     //Coherancy
     if (Element[Element_Level].UnTrusted)
         return;
-    if (Config_DetailsLevel==0 || Element[Element_Level].ToShow.Details.size()>64*1024*1024)
+    if (Config_Trace_Level==0 || !(Trace_Layers.to_ulong()&Config_Trace_Layers.to_ulong()) || Element[Element_Level].ToShow.Details.size()>64*1024*1024)
         return;
 
     //Needed?
-    if (Config_DetailsLevel<=0.7)
+    if (Config_Trace_Level<=0.7)
         return;
 
     //Filling
-    Element[Element_Level].ToShow.Details+=_T(" - ")+Text;
+    Element[Element_Level].ToShow.Details+=__T(" - ")+Text;
 }
 #endif //MEDIAINFO_TRACE
 
@@ -1656,28 +2151,29 @@
 void File__Analyze::Trusted_IsNot ()
 #endif //MEDIAINFO_TRACE
 {
+    Element_Offset=Element_Size;
+    BS->Attach(NULL, 0);
+
     if (!Element[Element_Level].UnTrusted)
     {
         #if MEDIAINFO_TRACE
             Param(Reason, 0);
         #endif //MEDIAINFO_TRACE
-        Element_Offset=Element_Size;
-        BS->Attach(NULL, 0);
 
         //Enough data?
         if (!Element[Element_Level].IsComplete)
         {
-            Element[Element_Level].WaitForMoreData=true;
+            Element_WaitForMoreData();
             return;
         }
 
         Element[Element_Level].UnTrusted=true;
         Synched=false;
-        if (Trusted>0)
+        if (!Status[IsFilled] && Trusted>0)
             Trusted--;
     }
 
-    if (Trusted==0)
+    if (Trusted==0 && !Status[IsAccepted])
         Reject();
 }
 
@@ -1688,26 +2184,34 @@
 //---------------------------------------------------------------------------
 #if MEDIAINFO_TRACE
 void File__Analyze::Accept (const char* ParserName_Char)
+#else //MEDIAINFO_TRACE
+void File__Analyze::Accept ()
+#endif //MEDIAINFO_TRACE
 {
     if (Status[IsAccepted] || Status[IsFinished])
         return;
 
-    if (ParserName.empty())
-        ParserName.From_Local(ParserName_Char);
+    #if MEDIAINFO_TRACE
+        if (ParserName.empty())
+            ParserName.From_Local(ParserName_Char);
 
-    if (!ParserName.empty())
-    {
-        bool MustElementBegin=Element_Level?true:false;
-        if (Element_Level>0)
-            Element_End(); //Element
-        Info(Ztring(ParserName)+_T(", accepted"));
-        if (MustElementBegin)
-            Element_Level++;
-    }
+        if (!ParserName.empty())
+        {
+            bool MustElementBegin=Element_Level?true:false;
+            if (Element_Level>0)
+                Element_End0(); //Element
+            Info(ParserName+__T(", accepted"));
+            if (MustElementBegin)
+                Element_Level++;
+        }
+    #endif //MEDIAINFO_TRACE
 
     Status[IsAccepted]=true;
-    //if (!IsSub)
+    if (Count_Get(Stream_General)==0)
+    {
         Stream_Prepare(Stream_General);
+        Streams_Accept();
+    }
 
     #if MEDIAINFO_EVENTS
         if (!IsSub)
@@ -1718,30 +2222,14 @@
             if (!ParserName.empty())
                 strncpy(Event.Name, ParserName.To_Local().c_str(), 15);
             Config->Event_Send((const int8u*)&Event, sizeof(MediaInfo_Event_General_Parser_Selected_0));
-        }
-    #endif //MEDIAINFO_EVENTS
-}
-#else //MEDIAINFO_TRACE
-void File__Analyze::Accept ()
-{
-    if (Status[IsAccepted] || Status[IsFinished])
-        return;
-
-    Status[IsAccepted]=true;
-    //if (!IsSub)
-        Stream_Prepare(Stream_General);
 
-    #if MEDIAINFO_EVENTS
-        if (!IsSub)
-        {
-            struct MediaInfo_Event_General_Parser_Selected_0 Event;
-            Event.EventCode=MediaInfo_EventCode_Create(MediaInfo_Parser_None, MediaInfo_Event_General_Parser_Selected, 0);
-            memset(Event.Name, 0, 16);
-            Config->Event_Send((const int8u*)&Event, sizeof(MediaInfo_Event_General_Parser_Selected_0));
+            #if MEDIAINFO_DEMUX
+                if (!Demux_EventWasSent_Accept_Specific && Config->NextPacket_Get() && Config->Event_CallBackFunction_IsSet())
+                    Config->Demux_EventWasSent=true;
+            #endif //MEDIAINFO_DEMUX
         }
     #endif //MEDIAINFO_EVENTS
 }
-#endif //MEDIAINFO_TRACE
 
 void File__Analyze::Accept (File__Analyze* Parser)
 {
@@ -1753,42 +2241,61 @@
 
 //---------------------------------------------------------------------------
 #if MEDIAINFO_TRACE
-void File__Analyze::Fill (const char* ParserName)
+void File__Analyze::Update (const char* ParserName_Char)
+#else //MEDIAINFO_TRACE
+void File__Analyze::Update ()
+#endif //MEDIAINFO_TRACE
 {
-    if (Status[IsFilled])
+    if (!Status[IsAccepted])
         return;
 
-    if (ParserName)
-    {
-        bool MustElementBegin=Element_Level?true:false;
-        if (Element_Level>0)
-            Element_End(); //Element
-        Info(Ztring(ParserName)+_T(", filling"));
-        if (MustElementBegin)
-            Element_Level++;
-    }
+    Open_Buffer_Update();
+}
 
-    if (Status[IsAccepted])
-    {
-        Streams_Fill();
-        Status[IsFilled]=true;
-        Status[IsUpdated]=true;
-    }
+void File__Analyze::Update (File__Analyze* Parser)
+{
+    if (Parser==NULL)
+        return;
+
+    Parser->Update();
 }
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_TRACE
+void File__Analyze::Fill (const char* ParserName_Char)
 #else //MEDIAINFO_TRACE
 void File__Analyze::Fill ()
+#endif //MEDIAINFO_TRACE
 {
-    if (Status[IsFilled])
+    if (!Status[IsAccepted] || Status[IsFilled] || Status[IsFinished])
         return;
 
-    if (Status[IsAccepted])
+    #if MEDIAINFO_TRACE
+        if (ParserName.empty())
+            ParserName.From_Local(ParserName_Char);
+
+        if (!ParserName.empty())
+        {
+            bool MustElementBegin=Element_Level?true:false;
+            if (Element_Level>0)
+                Element_End0(); //Element
+            Info(ParserName+__T(", filling"));
+            if (MustElementBegin)
+                Element_Level++;
+        }
+    #endif //MEDIAINFO_TRACE
+
+    Streams_Fill();
+    Status[IsFilled]=true;
+    Status[IsUpdated]=true;
+
+    //Instantaneous bitrate at the "fill" level
+    if (File_Size==(int64u)-1 && FrameInfo.PTS!=(int64u)-1 && PTS_Begin!=(int64u)-1 && FrameInfo.PTS-PTS_Begin && StreamKind_Last!=Stream_General && StreamKind_Last!=Stream_Max)
     {
-        Streams_Fill();
-        Status[IsFilled]=true;
-        Status[IsUpdated]=true;
+        Fill(StreamKind_Last, 0, "BitRate_Instantaneous", Buffer_TotalBytes*8*1000000000/(FrameInfo.PTS-PTS_Begin));
+        (*Stream_More)[StreamKind_Last][0](Ztring().From_Local("BitRate_Instantaneous"), Info_Options)=__T("N NI");
     }
 }
-#endif //MEDIAINFO_TRACE
 
 void File__Analyze::Fill (File__Analyze* Parser)
 {
@@ -1800,112 +2307,109 @@
 
 //---------------------------------------------------------------------------
 #if MEDIAINFO_TRACE
-void File__Analyze::Finish (const char* ParserName)
-{
-    if (MediaInfoLib::Config.ParseSpeed_Get()==1)
-        return;
-
-    ForceFinish(ParserName);
-}
+void File__Analyze::Finish (const char* ParserName_Char)
 #else //MEDIAINFO_TRACE
 void File__Analyze::Finish ()
+#endif //MEDIAINFO_TRACE
 {
-    if (MediaInfoLib::Config.ParseSpeed_Get()==1)
+    if (Status[IsFinished])
         return;
 
+    if (!ShouldContinueParsing && !Status[IsFilled])
+        Fill();
+
+    if (ShouldContinueParsing || Config->ParseSpeed==1)
+    {
+        #if MEDIAINFO_TRACE
+            if (!ParserName.empty())
+            {
+                bool MustElementBegin=Element_Level?true:false;
+                if (Element_Level>0)
+                    Element_End0(); //Element
+                //Info(Ztring(ParserName)+__T(", wants to finish, but should continue parsing"));
+                if (MustElementBegin)
+                    Element_Level++;
+            }
+        #endif //MEDIAINFO_TRACE
+
+        return;
+    }
+
     ForceFinish();
 }
-#endif //MEDIAINFO_TRACE
 
 void File__Analyze::Finish (File__Analyze* Parser)
 {
-    if (Parser==NULL)
-        return;
-
-    if (File_Offset+Buffer_Offset+Element_Size>=File_Size)
-    {
-        Element_Size=0;
-        Parser->Buffer_Offset=(size_t)(Parser->File_Size-Parser->File_Offset);
-    }
-
-    Parser->ForceFinish(); //The base parser wants, and is prepared to it, so nothing can be cancelled --> ForceFinish() instead of Finish()
+    ForceFinish(Parser); //The base parser wants, and is prepared to it, so nothing can be cancelled --> ForceFinish() instead of Finish()
 }
 
 //---------------------------------------------------------------------------
 #if MEDIAINFO_TRACE
 void File__Analyze::ForceFinish (const char* ParserName_Char)
+#else //MEDIAINFO_TRACE
+void File__Analyze::ForceFinish ()
+#endif //MEDIAINFO_TRACE
 {
-    if (ParserName.empty())
-        ParserName.From_Local(ParserName_Char);
+    if (Status[IsFinished])
+        return;
+
+    #if MEDIAINFO_TRACE
+        if (ParserName.empty())
+            ParserName.From_Local(ParserName_Char);
 
-    if (ShouldContinueParsing)
-    {
         if (!ParserName.empty())
         {
             bool MustElementBegin=Element_Level?true:false;
             if (Element_Level>0)
-                Element_End(); //Element
-            //Info(Ztring(ParserName)+_T(", wants to finish, but should continue parsing"));
+                Element_End0(); //Element
+            Info(ParserName+__T(", finished"));
             if (MustElementBegin)
                 Element_Level++;
         }
-        return;
-    }
-
-    if (Status[IsFinished])
-        return;
-
-    if (!ParserName.empty())
-    {
-        bool MustElementBegin=Element_Level?true:false;
-        if (Element_Level>0)
-            Element_End(); //Element
-        Info(ParserName+_T(", finished"));
-        if (MustElementBegin)
-            Element_Level++;
-    }
-
-    if (Status[IsAccepted])
-        Fill();
+    #endif //MEDIAINFO_TRACE
 
     if (Status[IsAccepted])
     {
-        Streams_Finish();
-        Streams_Finish_Global();
-    }
-
-    Status[IsFinished]=true;
-
-    //Real stream size
-    if (MediaInfoLib::Config.ParseSpeed_Get()==1 && IsRawStream)
-    {
-        Fill(StreamKind_Last, StreamPos_Last, "StreamSize", Buffer_TotalBytes, 10, true);
-    }
-}
-#else //MEDIAINFO_TRACE
-void File__Analyze::ForceFinish ()
-{
-    if (ShouldContinueParsing || Status[IsFinished])
-        return;
-
-    if (Status[IsAccepted])
         Fill();
-
-    if (Status[IsAccepted])
-    {
+        #if MEDIAINFO_DEMUX
+            if (Config->Demux_EventWasSent)
+                return;
+        #endif //MEDIAINFO_DEMUX
         Streams_Finish();
+        Ibi_Stream_Finish();
+        #if MEDIAINFO_DEMUX
+            if (Config->Demux_EventWasSent)
+                return;
+        #endif //MEDIAINFO_DEMUX
+        if (Status[IsUpdated])
+        {
+            Open_Buffer_Update();
+            if (IsSub)
+                Status[IsUpdated]=true; //We want that container merges the result
+            #if MEDIAINFO_DEMUX
+                if (Config->Demux_EventWasSent)
+                    return;
+            #endif //MEDIAINFO_DEMUX
+        }
         Streams_Finish_Global();
+        #if MEDIAINFO_DEMUX
+            if (Config->Demux_EventWasSent)
+                return;
+        #endif //MEDIAINFO_DEMUX
     }
 
     Status[IsFinished]=true;
 
     //Real stream size
-    if (MediaInfoLib::Config.ParseSpeed_Get()==1 && IsRawStream)
+    if (Config->ParseSpeed==1 && IsRawStream && Buffer_TotalBytes)
     {
-        Fill(StreamKind_Last, StreamPos_Last, "StreamSize", Buffer_TotalBytes, 10, true);
+        //Exception with text streams embedded in video
+        if (StreamKind_Last==Stream_Text)
+            StreamKind_Last=Stream_Video;
+
+        Fill(StreamKind_Last, 0, "StreamSize", Buffer_TotalBytes, 10, true);
     }
 }
-#endif //MEDIAINFO_TRACE
 
 void File__Analyze::ForceFinish (File__Analyze* Parser)
 {
@@ -1924,29 +2428,26 @@
 //---------------------------------------------------------------------------
 #if MEDIAINFO_TRACE
 void File__Analyze::Reject (const char* ParserName)
-{
-    Status[IsAccepted]=false;
-    Status[IsFinished]=true;
-    Clear();
-
-    if (ParserName)// && File_Offset+Buffer_Offset+Element_Size<File_Size)
-    {
-        bool MustElementBegin=Element_Level?true:false;
-        if (Element_Level>0)
-            Element_End(); //Element
-        Info(Ztring(ParserName)+_T(", rejected"));
-        if (MustElementBegin)
-            Element_Level++;
-    }
-}
 #else //MEDIAINFO_TRACE
 void File__Analyze::Reject ()
+#endif //MEDIAINFO_TRACE
 {
     Status[IsAccepted]=false;
     Status[IsFinished]=true;
     Clear();
+
+    #if MEDIAINFO_TRACE
+        if (ParserName)// && File_Offset+Buffer_Offset+Element_Size<File_Size)
+        {
+            bool MustElementBegin=Element_Level?true:false;
+            if (Element_Level>0)
+                Element_End0(); //Element
+            Info(Ztring(ParserName)+__T(", rejected"));
+            if (MustElementBegin)
+                Element_Level++;
+        }
+    #endif //MEDIAINFO_TRACE
 }
-#endif //MEDIAINFO_TRACE
 
 void File__Analyze::Reject (File__Analyze* Parser)
 {
@@ -1968,7 +2469,7 @@
 
     Element_Show();
 
-    if (IsSub && MediaInfoLib::Config.ParseSpeed_Get()==1)
+    if (IsSub && Config->ParseSpeed==1)
         return;
 
     if (GoTo==File_Size)
@@ -1979,8 +2480,6 @@
             ForceFinish();
         return;
     }
-    if (File_GoTo!=(int64u)-1)
-        return; //Already done
 
     if (ShouldContinueParsing)
     {
@@ -1988,8 +2487,8 @@
         {
             bool MustElementBegin=Element_Level?true:false;
             if (Element_Level>0)
-                Element_End(); //Element
-            Info(Ztring(ParserName)+_T(", wants to go to somewhere, but should continue parsing"));
+                Element_End0(); //Element
+            Info(Ztring(ParserName)+__T(", wants to go to somewhere, but should continue parsing"));
             if (MustElementBegin)
                 Element_Level++;
         }
@@ -2002,8 +2501,8 @@
         {
             bool MustElementBegin=Element_Level?true:false;
             if (Element_Level>0)
-                Element_End(); //Element
-            Info(Ztring(ParserName)+_T(", wants to go to somewhere, but is sub, waiting data"));
+                Element_End0(); //Element
+            Info(Ztring(ParserName)+__T(", wants to go to somewhere, but is sub, waiting data"));
             if (MustElementBegin)
                 Element_Level++;
         }
@@ -2014,15 +2513,13 @@
     {
         bool MustElementBegin=Element_Level?true:false;
         if (Element_Level>0)
-            Element_End(); //Element
-        Info(Ztring(ParserName)+_T(", jumping to offset ")+Ztring::ToZtring(GoTo, 16));
+            Element_End0(); //Element
+        Info(Ztring(ParserName)+__T(", jumping to offset ")+Ztring::ToZtring(GoTo, 16));
         if (MustElementBegin)
-            Element_Level++;
+            Element_Level++; //Element
     }
 
-    Open_Buffer_Unsynch();
-    if (!IsSub)
-        File_GoTo=GoTo;
+    File_GoTo=GoTo;
 
     #if MEDIAINFO_EVENTS
         struct MediaInfo_Event_General_Move_Request_0 Event;
@@ -2040,7 +2537,7 @@
         return;
     }
 
-    if (IsSub && MediaInfoLib::Config.ParseSpeed_Get()==1)
+    if (IsSub && Config->ParseSpeed==1)
         return;
 
     if (GoTo==File_Size)
@@ -2048,11 +2545,9 @@
         if (!BookMark_Code.empty())
             BookMark_Get();
         if (File_GoTo==(int64u)-1)
-            Finish();
+            ForceFinish();
         return;
     }
-    if (File_GoTo!=(int64u)-1)
-        return; //Already done
 
     if (ShouldContinueParsing)
     {
@@ -2064,9 +2559,7 @@
         return;
     }
 
-    Open_Buffer_Unsynch();
-    if (!IsSub)
-        File_GoTo=GoTo;
+    File_GoTo=GoTo;
 }
 #endif //MEDIAINFO_TRACE
 
@@ -2080,8 +2573,8 @@
         {
             bool MustElementBegin=Element_Level?true:false;
             if (Element_Level>0)
-                Element_End(); //Element
-            Info(Ztring(ParserName)+_T(", wants to go to somewhere, but not valid"));
+                Element_End0(); //Element
+            Info(Ztring(ParserName)+__T(", wants to go to somewhere, but not valid"));
             if (MustElementBegin)
                 Element_Level++;
         }
@@ -2180,13 +2673,25 @@
 
     //Line separator
     if (!Element[Element_Level].ToShow.Details.empty())
-        Element[Element_Level].ToShow.Details+=MediaInfoLib::Config.LineSeparator_Get();
+        Element[Element_Level].ToShow.Details+=Config_LineSeparator;
 
     //From Sub
     Element[Element_Level].ToShow.Details+=ToShow;
 }
 #endif //MEDIAINFO_TRACE
 
+#if MEDIAINFO_TRACE
+void File__Analyze::Trace_Layers_Update(size_t Layer)
+{
+    if (Layer!=(size_t)-1)
+    {
+        Trace_Layers.reset();
+        Trace_Layers.set(Layer);
+    }
+    Trace_Activated=(Config_Trace_Level!=0 && (Trace_Layers&Config_Trace_Layers)!=0);
+}
+#endif //MEDIAINFO_TRACE
+
 //***************************************************************************
 // Status
 //***************************************************************************
@@ -2239,9 +2744,12 @@
 
     Element_Show();
     while (Element_Level>0)
-        Element_End();
+        Element_End0();
     while (Element_Level<BookMark_Element_Level)
-        Element_Begin("Restarting parsing...", File_Size);
+    {
+        Element_Begin1("Restarting parsing...");
+        Element_WantNextLevel=true;
+    }
 
     for (size_t Pos=0; Pos<=Element_Level; Pos++)
     {
@@ -2266,22 +2774,34 @@
 //***************************************************************************
 // Demux
 //***************************************************************************
-
 #if MEDIAINFO_DEMUX
 void File__Analyze::Demux (const int8u* Buffer, size_t Buffer_Size, contenttype Content_Type)
 {
-    if (!MediaInfoLib::Config.Demux_Get())
+    if (!(Config_Demux&Demux_Level))
         return;
 
+    if (!Buffer_Size)
+        return;
+
+    #if MEDIAINFO_DEMUX && MEDIAINFO_SEEK
+        if (Config->Demux_IsSeeking)
+            return;
+    #endif //MEDIAINFO_SEEK
+
     #if MEDIAINFO_EVENTS
         //Demux
-        StreamIDs[StreamIDs_Size-1]=Element_Code;
-        struct MediaInfo_Event_Global_Demux_0 Event;
+        if (StreamIDs_Size)
+            StreamIDs[StreamIDs_Size-1]=Element_Code;
+        struct MediaInfo_Event_Global_Demux_3 Event;
         if (StreamIDs_Size && StreamIDs_Size<17)
-             Event.EventCode=MediaInfo_EventCode_Create(ParserIDs[StreamIDs_Size-1], MediaInfo_Event_Global_Demux, 0);
+             Event.EventCode=MediaInfo_EventCode_Create(ParserIDs[StreamIDs_Size-1], MediaInfo_Event_Global_Demux, 3);
         else
-             Event.EventCode=MediaInfo_EventCode_Create(0x00, MediaInfo_Event_Global_Demux, 0);
+             Event.EventCode=MediaInfo_EventCode_Create(0x00, MediaInfo_Event_Global_Demux, 3);
         Event.Stream_Offset=File_Offset+Buffer_Offset;
+        Event.PCR=FrameInfo.PCR;
+        Event.DTS=(FrameInfo.DTS==(int64u)-1?FrameInfo.PTS:FrameInfo.DTS);
+        Event.PTS=FrameInfo.PTS;
+        Event.DUR=FrameInfo.DUR;
         Event.StreamIDs_Size=StreamIDs_Size;
         Event.StreamIDs=(MediaInfo_int64u*)StreamIDs;
         Event.StreamIDs_Width=(MediaInfo_int8u*)StreamIDs_Width;
@@ -2289,10 +2809,340 @@
         Event.Content_Type=(int8u)Content_Type;
         Event.Content_Size=Buffer_Size;
         Event.Content=Buffer;
+        Event.Flags=0;
+        Event.FrameNumber=Frame_Count_NotParsedIncluded;
+        if (Demux_random_access)
+            Event.Flags|=0x1; //Bit 0
+        Config->Event_Send((const int8u*)&Event, sizeof(MediaInfo_Event_Global_Demux_3), IsSub?File_Name_WithoutDemux:File_Name);
+        Event.EventCode&=0xFFFFFF00; //Force to version 2
+        Event.EventCode|=0x00000002; //Force to version 2
+        Config->Event_Send((const int8u*)&Event, sizeof(MediaInfo_Event_Global_Demux_2), IsSub?File_Name_WithoutDemux:File_Name);
+        Event.EventCode&=0xFFFFFF00; //Force to version 1
+        Event.EventCode|=0x00000001; //Force to version 1
+        Config->Event_Send((const int8u*)&Event, sizeof(MediaInfo_Event_Global_Demux_1), IsSub?File_Name_WithoutDemux:File_Name);
+        Event.EventCode&=0xFFFFFF00; //Force to version 0
         Config->Event_Send((const int8u*)&Event, sizeof(MediaInfo_Event_Global_Demux_0), IsSub?File_Name_WithoutDemux:File_Name);
+        if (StreamIDs_Size)
+            StreamIDs[StreamIDs_Size-1]=(int64u)-1;
+        if (Config->NextPacket_Get())
+            Config->Demux_EventWasSent=true;
+        if (StreamIDs_Size)
+            StreamIDs[StreamIDs_Size-1]=(int64u)-1;
     #endif //MEDIAINFO_EVENTS
 }
 #endif //MEDIAINFO_DEMUX
 
-} //NameSpace
+#if MEDIAINFO_DEMUX
+void File__Analyze::Demux_UnpacketizeContainer_Demux (bool random_access)
+{
+    Demux_random_access=random_access;
+
+    if (StreamIDs_Size>=2)
+        Element_Code=StreamIDs[StreamIDs_Size-2];
+    StreamIDs_Size--;
+    Demux(Buffer+Buffer_Offset, Demux_Offset-Buffer_Offset, ContentType_MainStream);
+    StreamIDs_Size++;
+    if (StreamIDs_Size>=2)
+        StreamIDs[StreamIDs_Size-2]=Element_Code;
+    Demux_UnpacketizeContainer_Demux_Clear();
+}
+
+bool File__Analyze::Demux_UnpacketizeContainer_Test_OneFramePerFile ()
+{
+    if (Buffer_Size<Config->File_Sizes[Config->File_Names_Pos-1])
+    {
+        size_t* File_Buffer_Size_Hint_Pointer=Config->File_Buffer_Size_Hint_Pointer_Get();
+        if (File_Buffer_Size_Hint_Pointer)
+            (*File_Buffer_Size_Hint_Pointer)=(size_t)Config->File_Sizes[Config->File_Names_Pos-1];
+        return false;
+    }
+
+    if (Config->Demux_Rate_Get())
+    {
+        if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+            FrameInfo.DTS=float64_int64s(Frame_Count_NotParsedIncluded*1000000000/Config->Demux_Rate_Get());
+        else
+            FrameInfo.DTS=(int64u)-1;
+        FrameInfo.PTS=FrameInfo.DTS;
+        FrameInfo.DUR=float64_int64s(1000000000/Config->Demux_Rate_Get());
+    }
+    Demux_Offset=Buffer_Size;
+    Demux_UnpacketizeContainer_Demux();
+
+    return true;
+}
+
+void File__Analyze::Demux_UnpacketizeContainer_Demux_Clear ()
+{
+    Demux_TotalBytes=Buffer_TotalBytes+Demux_Offset;
+    Demux_Offset=0;
+    //if (Frame_Count || Field_Count)
+    //    Element_End0();
+    //Element_Begin1("Frame or Field");
+}
+#endif //MEDIAINFO_DEMUX
+
+//***************************************************************************
+// IBI
+//***************************************************************************
+#if MEDIAINFO_IBI
+void File__Analyze::Ibi_Read_Buffer_Unsynched ()
+{
+    Ibi_SynchronizationOffset_Current=(int64u)-1;
+
+    if (IbiStream==NULL)
+        return;
+
+    IbiStream->Unsynch();
+    for (size_t Pos=0; Pos<IbiStream->Infos.size(); Pos++)
+    {
+        if (File_GoTo==IbiStream->Infos[Pos].StreamOffset)
+        {
+            FrameInfo.DTS=(IbiStream->Infos[Pos].Dts!=(int64u)-1)?float64_int64s((((float64)IbiStream->Infos[Pos].Dts)*1000000000*IbiStream->DtsFrequencyDenominator/IbiStream->DtsFrequencyNumerator)):(int64u)-1;
+            Frame_Count_NotParsedIncluded=IbiStream->Infos[Pos].FrameNumber;
+            break;
+        }
+    }
+}
+
+size_t File__Analyze::Ibi_Read_Buffer_Seek (size_t Method, int64u Value, int64u ID)
+{
+    //Init
+    if (!Seek_Duration_Detected)
+    {
+        if (!IsSub)
+        {
+            //External IBI
+            std::string IbiFile=Config->Ibi_Get();
+            if (!IbiFile.empty())
+            {
+                IbiStream->Infos.clear(); //TODO: support IBI data from different inputs
+
+                File_Ibi MI;
+                Open_Buffer_Init(&MI, IbiFile.size());
+                MI.Ibi=new ibi;
+                MI.Open_Buffer_Continue((const int8u*)IbiFile.c_str(), IbiFile.size());
+                (*IbiStream)=(*MI.Ibi->Streams.begin()->second);
+            }
+        }
+
+        Seek_Duration_Detected=true;
+    }
+
+    //Parsing
+    switch (Method)
+    {
+        case 0  :
+                    #if MEDIAINFO_IBI
+                    {
+                    for (size_t Pos=0; Pos<IbiStream->Infos.size(); Pos++)
+                    {
+                        if (Value<=IbiStream->Infos[Pos].StreamOffset)
+                        {
+                            if (Value<IbiStream->Infos[Pos].StreamOffset && Pos)
+                                Pos--;
+
+                            //Checking continuity of Ibi
+                            if (!IbiStream->Infos[Pos].IsContinuous && Pos+1<IbiStream->Infos.size())
+                            {
+                                Config->Demux_IsSeeking=true;
+                                GoTo((IbiStream->Infos[Pos].StreamOffset+IbiStream->Infos[Pos+1].StreamOffset)/2);
+                                Open_Buffer_Unsynch();
+
+                                return 1;
+                            }
+
+                            Config->Demux_IsSeeking=false;
+
+                            GoTo(IbiStream->Infos[Pos].StreamOffset);
+                            Open_Buffer_Unsynch();
+
+                            return 1;
+                        }
+                    }
+
+                    if (IbiStream->Infos.empty())
+                    {
+                        GoTo(0);
+                        Open_Buffer_Unsynch();
+                    }
+                    else if (!IbiStream->Infos[IbiStream->Infos.size()-1].IsContinuous)
+                    {
+                        GoTo(IbiStream->Infos[IbiStream->Infos.size()-1].StreamOffset);
+                        Open_Buffer_Unsynch();
+                    }
+                    else
+                        return 2; //Invalid value
+                    return 1;
+                    }
+                    #else //MEDIAINFO_IBI
+                    return (size_t)-2; //Not supported / IBI disabled
+                    #endif //MEDIAINFO_IBI
+        case 1  :
+                    return Ibi_Read_Buffer_Seek(0, File_Size*Value/10000, ID);
+        case 2  :   //Timestamp
+                    #if MEDIAINFO_IBI
+                    {
+                    if (!(IbiStream->DtsFrequencyNumerator==1000000000 && IbiStream->DtsFrequencyDenominator==1))
+                    {
+                        float64 ValueF=(float64)Value;
+                        ValueF/=1000000000; //Value is in ns
+                        ValueF/=IbiStream->DtsFrequencyDenominator;
+                        ValueF*=IbiStream->DtsFrequencyNumerator;
+                        Value=float64_int64s(ValueF);
+                    }
+
+                    for (size_t Pos=0; Pos<IbiStream->Infos.size(); Pos++)
+                    {
+                        if (Value<=IbiStream->Infos[Pos].Dts)
+                        {
+                            if (Value<IbiStream->Infos[Pos].Dts && Pos)
+                                Pos--;
+
+                            //Checking continuity of Ibi
+                            if (!IbiStream->Infos[Pos].IsContinuous && Pos+1<IbiStream->Infos.size())
+                            {
+                                Config->Demux_IsSeeking=true;
+                                GoTo((IbiStream->Infos[Pos].StreamOffset+IbiStream->Infos[Pos+1].StreamOffset)/2);
+                                Open_Buffer_Unsynch();
+
+                                return 1;
+                            }
+
+                            Config->Demux_IsSeeking=false;
+
+                            GoTo(IbiStream->Infos[Pos].StreamOffset);
+                            Open_Buffer_Unsynch();
+
+                            return 1;
+                        }
+                    }
+
+                    if (IbiStream->Infos.empty())
+                    {
+                        GoTo(0);
+                        Open_Buffer_Unsynch();
+                    }
+                    else if (!IbiStream->Infos[IbiStream->Infos.size()-1].IsContinuous)
+                    {
+                        GoTo(IbiStream->Infos[IbiStream->Infos.size()-1].StreamOffset);
+                        Open_Buffer_Unsynch();
+                    }
+                    else
+                        return 2; //Invalid value
+                    return 1;
+                    }
+                    #else //MEDIAINFO_IBI
+                    return (size_t)-2; //Not supported / IBI disabled
+                    #endif //MEDIAINFO_IBI
+        case 3  :   //FrameNumber
+                    #if MEDIAINFO_IBI
+                    {
+                    for (size_t Pos=0; Pos<IbiStream->Infos.size(); Pos++)
+                    {
+                        if (Value<=IbiStream->Infos[Pos].FrameNumber)
+                        {
+                            if (Value<IbiStream->Infos[Pos].FrameNumber && Pos)
+                                Pos--;
+
+                            //Checking continuity of Ibi
+                            if (!IbiStream->Infos[Pos].IsContinuous && Pos+1<IbiStream->Infos.size())
+                            {
+                                Config->Demux_IsSeeking=true;
+                                GoTo((IbiStream->Infos[Pos].StreamOffset+IbiStream->Infos[Pos+1].StreamOffset)/2);
+                                Open_Buffer_Unsynch();
+
+                                return 1;
+                            }
 
+                            Config->Demux_IsSeeking=false;
+
+                            GoTo(IbiStream->Infos[Pos].StreamOffset);
+                            Open_Buffer_Unsynch();
+
+                            return 1;
+                        }
+                    }
+
+                    if (IbiStream->Infos.empty())
+                    {
+                        GoTo(0);
+                        Open_Buffer_Unsynch();
+                    }
+                    else if (!IbiStream->Infos[IbiStream->Infos.size()-1].IsContinuous)
+                    {
+                        GoTo(IbiStream->Infos[IbiStream->Infos.size()-1].StreamOffset);
+                        Open_Buffer_Unsynch();
+                    }
+                    else
+                        return 2; //Invalid value
+                    return 1;
+                    }
+                    #else //MEDIAINFO_IBI
+                    return (size_t)-2; //Not supported / IBI disabled
+                    #endif //MEDIAINFO_IBI
+        default :   return (size_t)-1; //Not supported
+    }
+}
+
+void File__Analyze::Ibi_Stream_Finish ()
+{
+    if (IsSub || IbiStream==NULL || IbiStream->Infos.empty())
+        return;
+
+    if (File_Offset+Buffer_Size==File_Size)
+    {
+        ibi::stream::info IbiInfo;
+        IbiInfo.StreamOffset=File_Offset+Buffer_Size;
+        IbiInfo.FrameNumber=Frame_Count_NotParsedIncluded;
+        IbiInfo.Dts=(FrameInfo.DTS!=(int64u)-1)?float64_int64s(((float64)FrameInfo.DTS)/1000000000*IbiStream->DtsFrequencyNumerator/IbiStream->DtsFrequencyDenominator):(int64u)-1;
+        IbiInfo.IsContinuous=true;
+        IbiStream->Add(IbiInfo);
+    }
+
+    if (Config_Ibi_Create)
+    {
+        ibi Ibi;
+        Ibi.Streams[(int64u)-1]=new ibi::stream(*IbiStream);
+
+        //IBI Creation
+        File_Ibi_Creation IbiCreation(Ibi);
+        Ztring IbiText=IbiCreation.Finish();
+        if (!IbiText.empty())
+            Fill(Stream_General, 0, "IBI", IbiText);
+    }
+}
+
+void File__Analyze::Ibi_Stream_Finish (int64u Numerator, int64u Denominator)
+{
+    if (IsSub || IbiStream==NULL)
+        return;
+
+    if (IbiStream->DtsFrequencyNumerator==1000000000 && IbiStream->DtsFrequencyDenominator==1 && !IbiStream->Infos.empty())
+    {
+        IbiStream->DtsFrequencyNumerator=Numerator;
+        IbiStream->DtsFrequencyDenominator=Denominator;
+        for (size_t Pos=0; Pos<IbiStream->Infos.size(); Pos++)
+            if (IbiStream->Infos[Pos].Dts!=(int64u)-1)
+                IbiStream->Infos[Pos].Dts=float64_int64s(((float64)IbiStream->Infos[Pos].Dts)/1000000000/Denominator*Numerator);
+    }
+}
+
+void File__Analyze::Ibi_Add ()
+{
+    if (IbiStream==NULL)
+        return;
+
+    ibi::stream::info IbiInfo;
+    IbiInfo.StreamOffset=IsSub?Ibi_SynchronizationOffset_Current:(File_Offset+Buffer_Offset);
+    IbiInfo.FrameNumber=Frame_Count_NotParsedIncluded;
+    IbiInfo.Dts=FrameInfo.DTS;
+    IbiStream->Add(IbiInfo);
+
+    if (Frame_Count_NotParsedIncluded==(int64u)-1)
+        Frame_Count_NotParsedIncluded=IbiStream->Infos[IbiStream->Infos_Pos-1].FrameNumber;
+}
+
+#endif //MEDIAINFO_IBI
+
+} //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/File__Analyze.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/File__Analyze.h Changed

@@ -1,17 +1,17 @@
 // File__Analysze - Base for analyze files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -26,11 +26,17 @@
 #include "MediaInfo/Setup.h"
 #include "MediaInfo/File__Base.h"
 #include "MediaInfo/File__Analyse_Automatic.h"
-#include "ZenLib/BitStream.h"
+#include "MediaInfo/MediaInfo_Config.h"
+#include "ZenLib/BitStream_Fast.h"
+#include "ZenLib/BitStream_LE.h"
 #include "ZenLib/int128u.h"
 #include "ZenLib/ZtringListList.h"
 #include <vector>
 #include <bitset>
+#if MEDIAINFO_IBI
+    #include "MediaInfo/Multiple/File_Ibi_Creation.h"
+#endif //MEDIAINFO_IBI
+#include "tinyxml2.h"
 using namespace ZenLib;
 //---------------------------------------------------------------------------
 
@@ -66,9 +72,14 @@
     void    Open_Buffer_Init        (File__Analyze* Sub, int64u File_Size);
     void    Open_Buffer_Continue    (                    const int8u* Buffer, size_t Buffer_Size);
     void    Open_Buffer_Continue    (File__Analyze* Sub, const int8u* Buffer, size_t Buffer_Size);
-    void    Open_Buffer_Continue    (File__Analyze* Sub, size_t Buffer_Size) {Open_Buffer_Continue(Sub, Buffer+Buffer_Offset+(size_t)Element_Offset, Buffer_Size); Element_Offset+=Buffer_Size;}
-    void    Open_Buffer_Continue    (File__Analyze* Sub) {Open_Buffer_Continue(Sub, Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)(Element_Size-Element_Offset)); Element_Offset=Element_Size;}
+    void    Open_Buffer_Continue    (File__Analyze* Sub, size_t Buffer_Size) {if (Element_Offset+Buffer_Size<=Element_Size) Open_Buffer_Continue(Sub, Buffer+Buffer_Offset+(size_t)Element_Offset, Buffer_Size); Element_Offset+=Buffer_Size;}
+    void    Open_Buffer_Continue    (File__Analyze* Sub) {if (Element_Offset<=Element_Size) Open_Buffer_Continue(Sub, Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)(Element_Size-Element_Offset)); Element_Offset=Element_Size;}
     void    Open_Buffer_Position_Set(int64u File_Offset);
+    #if MEDIAINFO_SEEK
+    size_t  Open_Buffer_Seek        (size_t Method, int64u Value, int64u ID);
+    #endif //MEDIAINFO_SEEK
+    void    Open_Buffer_Update      ();
+    void    Open_Buffer_Update      (File__Analyze* Sub);
     void    Open_Buffer_Unsynch     ();
     void    Open_Buffer_Finalize    (bool NoBufferModification=false);
     void    Open_Buffer_Finalize    (File__Analyze* Sub);
@@ -85,22 +96,60 @@
         int8u   StreamIDs_Width[16];
         int8u   ParserIDs[16];
     #endif //MEDIAINFO_EVENTS
+    #if MEDIAINFO_DEMUX
+        int8u   Demux_Level; //bit 0=frame, bit 1=container, bit 2=elementary (eg MPEG-TS), default with frame set
+        bool    Demux_random_access;
+        bool    Demux_UnpacketizeContainer;
+        bool    Demux_IntermediateItemFound;
+        size_t  Demux_Offset;
+        int64u  Demux_TotalBytes;
+    #endif //MEDIAINFO_DEMUX
     Ztring  File_Name_WithoutDemux;
     bool   PTS_DTS_Needed;
-    int64u PCR; //In nanoseconds
-    int64u PTS; //In nanoseconds
-    int64u DTS; //In nanoseconds
+    struct frame_info
+    {
+        int64u Buffer_Offset;
+        int64u PCR; //In nanoseconds
+        int64u PTS; //In nanoseconds
+        int64u DTS; //In nanoseconds
+        int64u DUR; //In nanoseconds
+
+        frame_info()
+        {
+            Buffer_Offset=0;
+            PCR=(int64u)-1;
+            PTS=(int64u)-1;
+            DTS=(int64u)-1;
+            DUR=(int64u)-1;
+        }
+    };
+    frame_info FrameInfo;
+    frame_info FrameInfo_Previous;
+    frame_info FrameInfo_Next;
 
     //Out
-    int64u PTS_DTS_Offset_InThisBlock; //In nanoseconds
-    size_t Frame_Count_InThisBlock;
+    int64u PTS_Begin;                  //In nanoseconds
+    int64u PTS_End;                    //In nanoseconds
+    int64u DTS_Begin;                  //In nanoseconds
+    int64u DTS_End;                    //In nanoseconds
+    int64u Frame_Count;
+    int64u Frame_Count_Previous;
+    int64u Frame_Count_InThisBlock;
+    int64u Field_Count;
+    int64u Field_Count_Previous;
+    int64u Field_Count_InThisBlock;
+    int64u Frame_Count_NotParsedIncluded;
+    bool   Synched;                    //Data is synched
+    bool   MustExtendParsingDuration;  //Data has some substreams difficult to detect (e.g. captions), must wait a bit before final filling
 
 protected :
     //***************************************************************************
     // Streams management
     //***************************************************************************
 
+    virtual void Streams_Accept()                                               {};
     virtual void Streams_Fill()                                                 {};
+    virtual void Streams_Update()                                               {};
     virtual void Streams_Finish()                                               {};
 
     //***************************************************************************
@@ -111,6 +160,7 @@
     virtual bool Synched_Test()   {return true;}; //Test is synchro is OK
     virtual void Synched_Init()   {}; //When synched, we can Init data
     bool Synchro_Manage();
+    bool Synchro_Manage_Test();
 
     //***************************************************************************
     // Buffer
@@ -119,8 +169,13 @@
     //Buffer
     virtual void Read_Buffer_Init ()          {}; //Temp, should be in File__Base caller
     virtual void Read_Buffer_Continue ()      {}; //Temp, should be in File__Base caller
-    virtual void Read_Buffer_Continue_Once () {}; //Temp, should be in File__Base caller
+    virtual void Read_Buffer_AfterParsing ()  {}; //Temp, should be in File__Base caller
+    #if MEDIAINFO_SEEK
+    virtual size_t Read_Buffer_Seek (size_t, int64u, int64u); //Temp, should be in File__Base caller
+    size_t Read_Buffer_Seek_OneFramePerFile (size_t, int64u, int64u);
+    #endif //MEDIAINFO_SEEK
     virtual void Read_Buffer_Unsynched ()     {}; //Temp, should be in File__Base caller
+    void Read_Buffer_Unsynched_OneFramePerFile ();
     virtual void Read_Buffer_Finalize ()      {}; //Temp, should be in File__Base caller
     bool Buffer_Parse();
 
@@ -199,9 +254,12 @@
 
     //Elements - Begin
     void Element_Begin ();
-    void Element_Begin (const Ztring &Name, int64u Size=(int64u)-1);
-    inline void Element_Begin (int64u Size) {Element_Begin(Ztring(), Size);}
-    inline void Element_Begin (const char *Name, int64u Size=(int64u)-1) {Element_Begin(Ztring().From_UTF8(Name), Size);}
+    void Element_Begin (const Ztring &Name);
+    inline void Element_Begin (const char *Name) {Element_Begin(Ztring().From_UTF8(Name));}
+    #define Element_Begin0() Element_Begin()
+    #define Element_Begin1(_NAME) Element_Begin(_NAME)
+    #define Element_Trace_Begin0() Element_Begin()
+    #define Element_Trace_Begin1(_NAME) Element_Begin(_NAME)
 
     //Elements - Name
     void Element_Name (const Ztring &Name);
@@ -220,18 +278,25 @@
     inline void Element_Info (int64s        Parameter, const char*   Measure=NULL) {Element_Info(Ztring::ToZtring(Parameter)+Ztring().From_UTF8(Measure));}
     inline void Element_Info (int64u        Parameter, const char*   Measure=NULL) {Element_Info(Ztring::ToZtring(Parameter)+Ztring().From_UTF8(Measure));}
     inline void Element_Info (int128u       Parameter, const char*   Measure=NULL) {Element_Info(Ztring::ToZtring(Parameter)+Ztring().From_UTF8(Measure));}
-    #ifdef NEED_SIZET
+    #ifdef SIZE_T_IS_LONG
     inline void Element_Info (size_t        Parameter, const char*   Measure=NULL) {Element_Info(Ztring::ToZtring(Parameter)+Ztring().From_UTF8(Measure));}
-    #endif //NEED_SIZET
+    #endif //SIZE_T_IS_LONG
     inline void Element_Info (float32       Parameter, int8u AfterComma=3, const char*   Measure=NULL) {Element_Info(Ztring::ToZtring(Parameter, AfterComma)+Ztring().From_UTF8(Measure));}
     inline void Element_Info (float64       Parameter, int8u AfterComma=3, const char*   Measure=NULL) {Element_Info(Ztring::ToZtring(Parameter, AfterComma)+Ztring().From_UTF8(Measure));}
+    #define Element_Info1(_A) Element_Info(_A)
+    #define Element_Info2(_A,_B) Element_Info(_A, _B)
+    #define Element_Info3(_A,_B,_C) Element_Info(_A, _B, _C)
+    #define Element_Info1C(_CONDITION,_A) if (_CONDITION) Element_Info(_A)
     inline void Element_Info_From_Milliseconds (int64u Parameter)                  {Element_Info(Ztring().Duration_From_Milliseconds(Parameter));}
 
     //Elements - End
-    void Element_End ();
-    void Element_End (const Ztring &Name, int64u Size=(int64u)-1);
-    inline void Element_End (int64u Size) {Element_End(Ztring(), Size);}
-    inline void Element_End (const char *Name, int64u Size=(int64u)-1) {Element_End(Ztring().From_UTF8(Name), Size);}
+    inline void Element_End () {Element_End_Common_Flush();}
+    void Element_End (const Ztring &Name);
+    inline void Element_End (const char *Name) {Element_End(Ztring().From_UTF8(Name));}
+    #define Element_End0() Element_End()
+    #define Element_End1(_NAME) Element_End(_NAME)
+    #define Element_Trace_End0() Element_End()
+    #define Element_Trace_End1(_NAME) Element_End(_NAME)
 
     //Elements - Preparation of element from external app
     void Element_Prepare (int64u Size);
@@ -256,7 +321,7 @@
             return Ztring().From_Local(Value, Value_Size);
     }
     #define VALUE(Value) \
-        Ztring::ToZtring(Value, 16).MakeUpperCase()+_T(" (")+Ztring::ToZtring(Value, 10).MakeUpperCase()+_T(")")
+        Ztring::ToZtring(Value).MakeUpperCase()+__T(" (0x")+Ztring::ToZtring(Value, 16).MakeUpperCase()+__T(")")
 
     //Param - Main
     void Param      (const Ztring &Parameter, const Ztring& Value);
@@ -265,25 +330,28 @@
     inline void Param      (const char*   Parameter, const char*   Value, size_t Value_Size=Unlimited, bool Utf8=true) {Param(Parameter, ToZtring(Value, Value_Size, Utf8));}
     inline void Param      (const char*   Parameter, const int8u*  Value, size_t Value_Size=Unlimited, bool Utf8=true) {Param(Parameter, (const char*)Value, Value_Size, Utf8);}
     inline void Param      (const char*   Parameter, bool   Value) {if (Value) Param(Parameter, "Yes"); else Param(Parameter, "No");}
-    inline void Param      (const char*   Parameter, int8u  Value) {Param(Parameter, VALUE(Value));}
-    inline void Param      (const char*   Parameter, int8s  Value) {Param(Parameter, VALUE(Value));}
-    inline void Param      (const char*   Parameter, int16u Value) {Param(Parameter, VALUE(Value));}
-    inline void Param      (const char*   Parameter, int16s Value) {Param(Parameter, VALUE(Value));}
-    inline void Param      (const char*   Parameter, int32u Value) {Param(Parameter, VALUE(Value));}
-    inline void Param      (const char*   Parameter, int32s Value) {Param(Parameter, VALUE(Value));}
-    inline void Param      (const char*   Parameter, int64u Value) {Param(Parameter, VALUE(Value));}
-    inline void Param      (const char*   Parameter, int64s Value) {Param(Parameter, VALUE(Value));}
-    inline void Param      (const char*   Parameter, int128u Value){Param(Parameter, VALUE(Value));}
+    inline void Param      (const char*   Parameter, int8u  Value) {Param(Parameter, Ztring::ToZtring(Value)+__T(" (0x")+Ztring().From_CC1(Value)+__T(")"));}
+    inline void Param      (const char*   Parameter, int8s  Value) {Param(Parameter, Ztring::ToZtring(Value)+__T(" (0x")+Ztring().From_CC1(Value)+__T(")"));}
+    inline void Param      (const char*   Parameter, int16u Value) {Param(Parameter, Ztring::ToZtring(Value)+__T(" (0x")+Ztring().From_CC2(Value)+__T(")"));}
+    inline void Param      (const char*   Parameter, int16s Value) {Param(Parameter, Ztring::ToZtring(Value)+__T(" (0x")+Ztring().From_CC2(Value)+__T(")"));}
+    inline void Param      (const char*   Parameter, int32u Value) {Param(Parameter, Ztring::ToZtring(Value)+__T(" (0x")+Ztring::ToZtring(Value, 16)+__T(")"));}
+    inline void Param      (const char*   Parameter, int32s Value) {Param(Parameter, Ztring::ToZtring(Value)+__T(" (0x")+Ztring::ToZtring(Value, 16)+__T(")"));}
+    inline void Param      (const char*   Parameter, int64u Value) {Param(Parameter, Ztring::ToZtring(Value)+__T(" (0x")+Ztring::ToZtring(Value, 16)+__T(")"));}
+    inline void Param      (const char*   Parameter, int64s Value) {Param(Parameter, Ztring::ToZtring(Value)+__T(" (0x")+Ztring::ToZtring(Value, 16)+__T(")"));}
+    inline void Param      (const char*   Parameter, int128u Value){Param(Parameter, Ztring::ToZtring(Value)+__T(" (0x")+Ztring::ToZtring(Value, 16)+__T(")"));}
     inline void Param_GUID (const char*   Parameter, int128u Value){Param(Parameter, Ztring().From_GUID(Value));}
     inline void Param_UUID (const char*   Parameter, int128u Value){Param(Parameter, Ztring().From_UUID(Value));}
-    #ifdef NEED_SIZET
-    inline void Param      (const char*   Parameter, size_t Value, intu Radix=16) {Param(Parameter, Ztring::ToZtring(Value, Radix).MakeUpperCase()+_T(" (")+Ztring::ToZtring(Value, 10).MakeUpperCase()+_T(")"));}
-    #endif //NEED_SIZET
+    #ifdef SIZE_T_IS_LONG
+    inline void Param      (const char*   Parameter, size_t Value, intu Radix=16) {Param(Parameter, Ztring::ToZtring(Value, Radix).MakeUpperCase()+__T(" (")+Ztring::ToZtring(Value, 10).MakeUpperCase()+__T(")"));}
+    #endif //SIZE_T_IS_LONG
     inline void Param      (const char*   Parameter, float32 Value, int8u AfterComma=3) {Param(Parameter, Ztring::ToZtring(Value, AfterComma));}
     inline void Param      (const char*   Parameter, float64 Value, int8u AfterComma=3) {Param(Parameter, Ztring::ToZtring(Value, AfterComma));}
     inline void Param      (const char*   Parameter, float80 Value, int8u AfterComma=3) {Param(Parameter, Ztring::ToZtring(Value, AfterComma));}
     inline void Param      (const int32u  Parameter, const Ztring& Value) {Param(Ztring().From_CC4(Parameter), Value);};
     inline void Param      (const int16u  Parameter, const Ztring& Value) {Param(Ztring().From_CC2(Parameter), Value);};
+    #define Param1(_A) Param_(_A)
+    #define Param2(_A,_B) Param(_A, _B)
+    #define Param3(_A,_B,_C) Param(_A, _B, _C)
 
     //Param - Info
     void Param_Info (const Ztring &Parameter);
@@ -300,9 +368,15 @@
     inline void Param_Info (float32       Parameter, int8u AfterComma=3, const char*   Measure=NULL) {Param_Info(Ztring::ToZtring(Parameter, AfterComma)+Ztring().From_UTF8(Measure));}
     inline void Param_Info (float64       Parameter, int8u AfterComma=3, const char*   Measure=NULL) {Param_Info(Ztring::ToZtring(Parameter, AfterComma)+Ztring().From_UTF8(Measure));}
     inline void Param_Info (float80       Parameter, int8u AfterComma=3, const char*   Measure=NULL) {Param_Info(Ztring::ToZtring(Parameter, AfterComma)+Ztring().From_UTF8(Measure));}
-    #ifdef NEED_SIZET
+    #ifdef SIZE_T_IS_LONG
     inline void Param_Info (size_t        Parameter, const char*   Measure=NULL) {Param_Info(Ztring::ToZtring(Parameter)+Ztring().From_UTF8(Measure));}
-    #endif //NEED_SIZET
+    #endif //SIZE_T_IS_LONG
+    #define Param_Info1(_A) Param_Info(_A)
+    #define Param_Info2(_A,_B) Param_Info(_A, _B)
+    #define Param_Info3(_A,_B,_C) Param_Info(_A, _B, _C)
+    #define Param_Info1C(_CONDITION,_A) if (_CONDITION) Param_Info(_A)
+    #define Param_Info2C(_CONDITION,_A,_B) if (_CONDITION) Param_Info(_A, _B)
+    #define Param_Info3C(_CONDITION,_A,_B,_C) if (_CONDITION) Param_Info(_A, _B, _C)
     inline void Param_Info_From_Milliseconds (int64u Parameter)                  {Param_Info(Ztring().Duration_From_Milliseconds(Parameter));}
 
     //***************************************************************************
@@ -418,6 +492,55 @@
     #define Info_LF8(_INFO, _NAME) float64 _INFO; Get_LF8(_INFO, _NAME)
 
     //***************************************************************************
+    // Little and Big Endian together
+    //***************************************************************************
+
+    void Get_D1  (int8u   &Info, const char* Name);
+    void Get_D2  (int16u  &Info, const char* Name);
+    void Get_D3  (int32u  &Info, const char* Name);
+    void Get_D4  (int32u  &Info, const char* Name);
+    void Get_D5  (int64u  &Info, const char* Name);
+    void Get_D6  (int64u  &Info, const char* Name);
+    void Get_D7  (int64u  &Info, const char* Name);
+    void Get_D8  (int64u  &Info, const char* Name);
+    void Get_D16 (int128u &Info, const char* Name);
+    void Get_DF4 (float32 &Info, const char* Name);
+    void Get_DF8 (float64 &Info, const char* Name);
+    void Peek_D1 (int8u   &Info);
+    void Peek_D2 (int16u  &Info);
+    void Peek_D3 (int32u  &Info);
+    void Peek_D4 (int32u  &Info);
+    void Peek_D5 (int64u  &Info);
+    void Peek_D6 (int64u  &Info);
+    void Peek_D7 (int64u  &Info);
+    void Peek_D8 (int64u  &Info);
+    void Peek_D16(int128u &Info);
+    void Peek_DF4(float32 &Info);
+    void Peek_DF8(float64 &Info);
+    void Skip_D1 (               const char* Name);
+    void Skip_D2 (               const char* Name);
+    void Skip_D3 (               const char* Name);
+    void Skip_D4 (               const char* Name);
+    void Skip_D5 (               const char* Name);
+    void Skip_D6 (               const char* Name);
+    void Skip_D7 (               const char* Name);
+    void Skip_D8 (               const char* Name);
+    void Skip_DF4(               const char* Name);
+    void Skip_DF8(               const char* Name);
+    void Skip_D16(               const char* Name);
+    #define Info_D1(_INFO, _NAME)  int8u   _INFO; Get_D1 (_INFO, _NAME)
+    #define Info_D2(_INFO, _NAME)  int16u  _INFO; Get_D2 (_INFO, _NAME)
+    #define Info_D3(_INFO, _NAME)  int32u  _INFO; Get_D3 (_INFO, _NAME)
+    #define Info_D4(_INFO, _NAME)  int32u  _INFO; Get_D4 (_INFO, _NAME)
+    #define Info_D5(_INFO, _NAME)  int64u  _INFO; Get_D5 (_INFO, _NAME)
+    #define Info_D6(_INFO, _NAME)  int64u  _INFO; Get_D6 (_INFO, _NAME)
+    #define Info_D7(_INFO, _NAME)  int64u  _INFO; Get_D7 (_INFO, _NAME)
+    #define Info_D8(_INFO, _NAME)  int64u  _INFO; Get_D8 (_INFO, _NAME)
+    #define Info_D16(_INFO, _NAME) int128u _INFO; Get_D16(_INFO, _NAME)
+    #define Info_DF4(_INFO, _NAME) float32 _INFO; Get_DF4(_INFO, _NAME)
+    #define Info_DF8(_INFO, _NAME) float64 _INFO; Get_DF8(_INFO, _NAME)
+
+    //***************************************************************************
     // GUID
     //***************************************************************************
 
@@ -480,9 +603,29 @@
     // Variable Length Code
     //***************************************************************************
 
-    void Get_VL (int32u Call(int8u Size, int32u ToCall), int32u &Info, const char* Name);
-    void Skip_VL(int32u Call(int8u Size, int32u ToCall),               const char* Name);
-    #define Info_VL(_CALL, _INFO, _NAME) int32u _INFO; Get_VL(_CALL, _INFO, _NAME)
+    struct vlc
+    {
+        int32u  value;
+        int8u   bit_increment;
+        int8s   mapped_to1;
+        int8s   mapped_to2;
+        int8s   mapped_to3;
+    };
+    struct vlc_fast
+    {
+        int8u*      Array;
+        int8u*      BitsToSkip;
+        const vlc*  Vlc;
+        int8u       Size;
+    };
+    #define VLC_END \
+        {(int32u)-1, (int8u)-1, 0, 0, 0}
+    void Get_VL_Prepare(vlc_fast &Vlc);
+    void Get_VL (const vlc Vlc[], size_t &Info, const char* Name);
+    void Get_VL (vlc_fast &Vlc, size_t &Info, const char* Name);
+    void Skip_VL(const vlc Vlc[], const char* Name);
+    void Skip_VL(vlc_fast &Vlc, const char* Name);
+    #define Info_VL(Vlc, Info, Name) size_t Info; Get_VL(Vlc, Info, Name)
 
     //***************************************************************************
     // Characters
@@ -519,6 +662,7 @@
 
     void Get_Local  (int64u Bytes, Ztring      &Info, const char* Name);
     void Get_ISO_8859_1(int64u Bytes, Ztring   &Info, const char* Name);
+    void Get_ISO_8859_2(int64u Bytes, Ztring   &Info, const char* Name);
     void Get_String (int64u Bytes, std::string &Info, const char* Name);
     void Get_UTF8   (int64u Bytes, Ztring      &Info, const char* Name);
     void Get_UTF16  (int64u Bytes, Ztring      &Info, const char* Name);
@@ -559,6 +703,8 @@
     void Get_Flags (int64u ValueToPut,          int8u &Info, const char* Name);
     void Skip_Flags(int64u Flags, size_t Order,              const char* Name);
     void Skip_Flags(int64u ValueToPut,                       const char* Name);
+    #define Get_FlagsM(_VALUE, _INFO, _NAME) Get_Flags(_VALUE, _INFO, _NAME)
+    #define Skip_FlagsM(_VALUE, _NAME) Skip_Flags(_VALUE, _NAME)
     #define Info_Flags(_FLAGS, _ORDER, _INFO, _NAME) bool _INFO; Get_Flags (_FLAGS, _ORDER, _INFO, _NAME)
 
     //***************************************************************************
@@ -619,7 +765,7 @@
                 Skip_SB(                                        _NAME); \
             else \
             { \
-                Element_Begin(_NAME); \
+                Element_Begin1(_NAME); \
                 Skip_SB(                                        _NAME); \
 
     #define TEST_SB_SKIP(_NAME) \
@@ -628,7 +774,7 @@
                 Skip_SB(                                        _NAME); \
             else \
             { \
-                Element_Begin(_NAME); \
+                Element_Begin1(_NAME); \
                 Skip_SB(                                        _NAME); \
 
     #define TESTELSE_SB_GET(_CODE, _NAME) \
@@ -636,18 +782,18 @@
             Peek_SB(_CODE); \
             if (_CODE) \
             { \
-                Element_Begin(_NAME); \
+                Element_Begin1(_NAME); \
                 Skip_SB(                                        _NAME); \
 
     #define TESTELSE_SB_SKIP(_NAME) \
         { \
             if (Peek_SB()) \
             { \
-                Element_Begin(_NAME); \
+                Element_Begin1(_NAME); \
                 Skip_SB(                                        _NAME); \
 
     #define TESTELSE_SB_ELSE(_NAME) \
-                Element_End(); \
+                Element_End0(); \
             } \
             else \
             { \
@@ -658,7 +804,104 @@
         } \
 
     #define TEST_SB_END() \
-                Element_End(); \
+                Element_End0(); \
+            } \
+        } \
+
+    //***************************************************************************
+    // BitStream (Little Endian)
+    //***************************************************************************
+
+    void Get_BT (size_t Bits, int32u  &Info, const char* Name);
+    void Get_TB (             bool    &Info, const char* Name);
+    bool Get_TB(                             const char* Name)  {bool Temp; Get_TB(Temp, Name); return Temp;}
+    void Get_T1 (size_t Bits, int8u   &Info, const char* Name);
+    void Get_T2 (size_t Bits, int16u  &Info, const char* Name);
+    void Get_T3 (size_t Bits, int32u  &Info, const char* Name);
+    void Get_T4 (size_t Bits, int32u  &Info, const char* Name);
+    void Get_T5 (size_t Bits, int64u  &Info, const char* Name);
+    void Get_T6 (size_t Bits, int64u  &Info, const char* Name);
+    void Get_T7 (size_t Bits, int64u  &Info, const char* Name);
+    void Get_T8 (size_t Bits, int64u  &Info, const char* Name);
+    void Peek_BT(size_t Bits, int32u  &Info);
+    void Peek_TB(              bool    &Info);
+    bool Peek_TB()                                              {bool Temp; Peek_TB(Temp); return Temp;}
+    void Peek_T1(size_t Bits, int8u   &Info);
+    void Peek_T2(size_t Bits, int16u  &Info);
+    void Peek_T3(size_t Bits, int32u  &Info);
+    void Peek_T4(size_t Bits, int32u  &Info);
+    void Peek_T5(size_t Bits, int64u  &Info);
+    void Peek_T6(size_t Bits, int64u  &Info);
+    void Peek_T7(size_t Bits, int64u  &Info);
+    void Peek_T8(size_t Bits, int64u  &Info);
+    void Skip_BT(size_t Bits,                const char* Name);
+    void Skip_TB(                            const char* Name);
+    void Skip_T1(size_t Bits,                const char* Name);
+    void Skip_T2(size_t Bits,                const char* Name);
+    void Skip_T3(size_t Bits,                const char* Name);
+    void Skip_T4(size_t Bits,                const char* Name);
+    void Skip_T5(size_t Bits,                const char* Name);
+    void Skip_T6(size_t Bits,                const char* Name);
+    void Skip_T7(size_t Bits,                const char* Name);
+    void Skip_T8(size_t Bits,                const char* Name);
+    #define Info_BT(_BITS, _INFO, _NAME) int32u  _INFO; Get_BT(_BITS, _INFO, _NAME)
+    #define Info_TB(_INFO, _NAME)        bool    _INFO; Get_TB(       _INFO, _NAME)
+    #define Info_T1(_BITS, _INFO, _NAME) int8u   _INFO; Get_T1(_BITS, _INFO, _NAME)
+    #define Info_T2(_BITS, _INFO, _NAME) int16u  _INFO; Get_T2(_BITS, _INFO, _NAME)
+    #define Info_T3(_BITS, _INFO, _NAME) int32u  _INFO; Get_T4(_BITS, _INFO, _NAME)
+    #define Info_T4(_BITS, _INFO, _NAME) int32u  _INFO; Get_T4(_BITS, _INFO, _NAME)
+    #define Info_T5(_BITS, _INFO, _NAME) int64u  _INFO; Get_T5(_BITS, _INFO, _NAME)
+    #define Info_T6(_BITS, _INFO, _NAME) int64u  _INFO; Get_T6(_BITS, _INFO, _NAME)
+    #define Info_T7(_BITS, _INFO, _NAME) int64u  _INFO; Get_T7(_BITS, _INFO, _NAME)
+    #define Info_T8(_BITS, _INFO, _NAME) int64u  _INFO; Get_T8(_BITS, _INFO, _NAME)
+
+    #define TEST_TB_GET(_CODE, _NAME) \
+        { \
+            Peek_TB(_CODE); \
+            if (!_CODE) \
+                Skip_TB(                                        _NAME); \
+            else \
+            { \
+                Element_Begin1(_NAME); \
+                Skip_TB(                                        _NAME); \
+
+    #define TEST_TB_SKIP(_NAME) \
+        { \
+            if (!Peek_TB()) \
+                Skip_TB(                                        _NAME); \
+            else \
+            { \
+                Element_Begin1(_NAME); \
+                Skip_TB(                                        _NAME); \
+
+    #define TESTELSE_TB_GET(_CODE, _NAME) \
+        { \
+            Peek_TB(_CODE); \
+            if (_CODE) \
+            { \
+                Element_Begin1(_NAME); \
+                Skip_TB(                                        _NAME); \
+
+    #define TESTELSE_TB_SKIP(_NAME) \
+        { \
+            if (Peek_TB()) \
+            { \
+                Element_Begin1(_NAME); \
+                Skip_TB(                                        _NAME); \
+
+    #define TESTELSE_TB_ELSE(_NAME) \
+                Element_End0(); \
+            } \
+            else \
+            { \
+                Skip_TB(                                        _NAME); \
+
+    #define TESTELSE_TB_END() \
+            } \
+        } \
+
+    #define TEST_TB_END() \
+                Element_End0(); \
             } \
         } \
 
@@ -680,8 +923,9 @@
     // Stream filling
     //***************************************************************************
 
-    //Before filling the stream, the stream must be prepared
-    size_t Stream_Prepare   (stream_t KindOfStream);
+    //Elements - Preparation of element from external app
+    size_t Stream_Prepare   (stream_t KindOfStream, size_t StreamPos=(size_t)-1);
+    size_t Stream_Erase     (stream_t KindOfStream, size_t StreamPos);
 
     //Fill with datas (with parameter as a size_t)
     void Fill (stream_t StreamKind, size_t StreamPos, size_t Parameter, const Ztring  &Value, bool Replace=false);
@@ -699,9 +943,9 @@
     inline void Fill (stream_t StreamKind, size_t StreamPos, size_t Parameter, float32        Value, int8u AfterComma=3, bool Replace=false) {Fill(StreamKind, StreamPos, Parameter, Ztring::ToZtring(Value, AfterComma), Replace);}
     inline void Fill (stream_t StreamKind, size_t StreamPos, size_t Parameter, float64        Value, int8u AfterComma=3, bool Replace=false) {Fill(StreamKind, StreamPos, Parameter, Ztring::ToZtring(Value, AfterComma), Replace);}
     inline void Fill (stream_t StreamKind, size_t StreamPos, size_t Parameter, float80        Value, int8u AfterComma=3, bool Replace=false) {Fill(StreamKind, StreamPos, Parameter, Ztring::ToZtring(Value, AfterComma), Replace);}
-    #ifdef NEED_SIZET
+    #ifdef SIZE_T_IS_LONG
     inline void Fill (stream_t StreamKind, size_t StreamPos, size_t Parameter, size_t         Value, int8u Radix=10, bool Replace=false) {Fill(StreamKind, StreamPos, Parameter, Ztring::ToZtring(Value, Radix).MakeUpperCase(), Replace);}
-    #endif //NEED_SIZET
+    #endif //SIZE_T_IS_LONG
     //Fill with datas
     void Fill (stream_t StreamKind, size_t StreamPos, const char* Parameter, const Ztring  &Value, bool Replace=false);
     inline void Fill (stream_t StreamKind, size_t StreamPos, const char* Parameter, const std::string &Value, bool Utf8=true, bool Replace=false) {if (Utf8) Fill(StreamKind, StreamPos, Parameter, Ztring().From_UTF8(Value.c_str(), Value.size())); else Fill(StreamKind, StreamPos, Parameter, Ztring().From_Local(Value.c_str(), Value.size()), Replace);}
@@ -718,9 +962,9 @@
     inline void Fill (stream_t StreamKind, size_t StreamPos, const char* Parameter, float32        Value, int8u AfterComma=3, bool Replace=false) {Fill(StreamKind, StreamPos, Parameter, Ztring::ToZtring(Value, AfterComma), Replace);}
     inline void Fill (stream_t StreamKind, size_t StreamPos, const char* Parameter, float64        Value, int8u AfterComma=3, bool Replace=false) {Fill(StreamKind, StreamPos, Parameter, Ztring::ToZtring(Value, AfterComma), Replace);}
     inline void Fill (stream_t StreamKind, size_t StreamPos, const char* Parameter, float80        Value, int8u AfterComma=3, bool Replace=false) {Fill(StreamKind, StreamPos, Parameter, Ztring::ToZtring(Value, AfterComma), Replace);}
-    #ifdef NEED_SIZET
+    #ifdef SIZE_T_IS_LONG
     inline void Fill (stream_t StreamKind, size_t StreamPos, const char* Parameter, size_t         Value, int8u Radix=10, bool Replace=false) {Fill(StreamKind, StreamPos, Parameter, Ztring::ToZtring(Value, Radix).MakeUpperCase(), Replace);}
-    #endif //NEED_SIZET
+    #endif //SIZE_T_IS_LONG
     ZtringListList Fill_Temp;
     void Fill_Flush ();
     size_t Fill_Parameter(stream_t StreamKind, generic StreamPos);
@@ -745,10 +989,12 @@
     void Accept        (File__Analyze* Parser);
     void Reject        (const char* ParserName=NULL);
     void Reject        (File__Analyze* Parser);
+    void Update        (const char* ParserName=NULL);
+    void Update        (File__Analyze* Parser);
     void Fill          (const char* ParserName=NULL);
     void Fill          (File__Analyze* Parser);
-    void Finish         (const char* ParserName=NULL);
-    void Finish         (File__Analyze* Parser);
+    void Finish        (const char* ParserName=NULL);
+    void Finish        (File__Analyze* Parser);
     void ForceFinish   (const char* ParserName=NULL);
     void ForceFinish   (File__Analyze* Parser);
     void GoTo          (int64u GoTo, const char* ParserName=NULL);
@@ -831,6 +1077,7 @@
 
     void Tags ();
     void Video_FrameRate_Rounding (size_t Pos, video Parameter);
+    void Video_BitRate_Rounding (size_t Pos, video Parameter);
     void Audio_BitRate_Rounding (size_t Pos, audio Parameter);
 
     //Utils - Finalize
@@ -847,9 +1094,13 @@
 
 protected :
     //Save for speed improvement
-    float Config_DetailsLevel;
-    bool  IsSub;
-    bool  IsRawStream;
+    float                           Config_Trace_Level;
+    std::bitset<32>                 Config_Trace_Layers;
+    MediaInfo_Config::trace_Format  Config_Trace_Format;
+    int8u                           Config_Demux;
+    Ztring                          Config_LineSeparator;
+    bool                            IsSub;
+    bool                            IsRawStream;
 
     //Configuration
     bool DataMustAlwaysBeComplete;  //Data must always be complete, else wait for more data
@@ -857,7 +1108,6 @@
 
     //Synchro
     bool MustParseTheHeaderFile;    //There is an header part, must parse it
-    bool Synched;                   //Data is synched
     size_t Trusted;
     size_t Trusted_Multiplier;
 
@@ -876,13 +1126,16 @@
     //***************************************************************************
 
     void Buffer_Clear(); //Clear the buffer
-    void Open_Buffer_Continue_Loop();
+    bool Open_Buffer_Continue_Loop();
 protected :
     //Buffer
     const int8u* Buffer;
 public : //TO CHANGE
     size_t Buffer_Size;
+    int64u Buffer_TotalBytes;
     int64u Buffer_TotalBytes_FirstSynched;
+    int64u Buffer_PaddingBytes;
+    float64 Stream_BitRateFromContainer;
 protected :
     int8u* Buffer_Temp;
     size_t Buffer_Temp_Size;
@@ -891,8 +1144,8 @@
     size_t Buffer_Offset_Temp; //Temporary usage in this parser
     size_t Buffer_MinimumSize;
     size_t Buffer_MaximumSize;
-    int64u Buffer_TotalBytes;
     int64u Buffer_TotalBytes_FirstSynched_Max;
+    int64u Buffer_TotalBytes_Fill_Max;
     friend class File__Tags_Helper;
 
     //***************************************************************************
@@ -900,7 +1153,12 @@
     //***************************************************************************
 
     bool FileHeader_Begin_0x000001();
+    bool FileHeader_Begin_XML(tinyxml2::XMLDocument &Document);
     bool Synchronize_0x000001();
+public:
+    static void Streams_Accept_TestContinuousFileNames_Static(ZtringList &File_Names, bool IsReferenced);
+protected:
+    void Streams_Accept_TestContinuousFileNames();
 
 private :
 
@@ -912,13 +1170,17 @@
     size_t Data_Level;              //Current level for Data ("Top level")
 
     //Element
-    BitStream* BS;                  //For conversion from bytes to bitstream
+    BitStream_Fast* BS;             //For conversion from bytes to bitstream
+    BitStream*      BT;             //For conversion from bytes to bitstream
 public : //TO CHANGE
     int64u Header_Size;             //Size of the header of the current element
     const Ztring &Details_Get() {return Element[0].ToShow.Details;} //Direct access to details
     void   Details_Clear();
 protected :
-    bool Details_DoNotSave;
+    bool Trace_DoNotSave;
+    bool Trace_Activated;
+    std::bitset<32> Trace_Layers;
+    void Trace_Layers_Update (size_t Layer=(size_t)-1);
 private :
 
     //Elements
@@ -983,11 +1245,25 @@
         User_16,
         User_17,
         User_18,
+        User_19,
+        User_20,
+        User_21,
+        User_22,
+        User_23,
+        User_24,
+        User_25,
+        User_26,
+        User_27,
+        User_28,
+        User_29,
+        User_30,
+        User_31,
     };
     bool ShouldContinueParsing;
 
     //Configuration
     bool MustSynchronize;
+    bool CA_system_ID_MustSkipSlices;
 
     //Demux
     enum contenttype
@@ -999,15 +1275,44 @@
     };
     #if MEDIAINFO_DEMUX
         void Demux (const int8u* Buffer, size_t Buffer_Size, contenttype ContentType);
+        virtual bool Demux_UnpacketizeContainer_Test() {return true;}
+        bool Demux_UnpacketizeContainer_Test_OneFramePerFile();
+        void Demux_UnpacketizeContainer_Demux(bool random_access=true);
+        void Demux_UnpacketizeContainer_Demux_Clear();
+        bool Demux_EventWasSent_Accept_Specific;
     #else //MEDIAINFO_DEMUX
         #define Demux(_A, _B, _C)
     #endif //MEDIAINFO_DEMUX
 
     //Events data
-    #if MEDIAINFO_EVENTS
-        bool    MpegPs_PES_FirstByte_IsAvailable;
-        bool    MpegPs_PES_FirstByte_Value;
-    #endif //MEDIAINFO_EVENTS
+    bool    PES_FirstByte_IsAvailable;
+    bool    PES_FirstByte_Value;
+
+    int64u  Unsynch_Frame_Count;
+
+    #if MEDIAINFO_SEEK
+    private:
+        bool Seek_Duration_Detected;
+    #endif //MEDIAINFO_SEEK
+
+    #if MEDIAINFO_IBI
+    public:
+        bool    Config_Ibi_Create;
+        int64u  Ibi_SynchronizationOffset_Current;
+        int64u  Ibi_SynchronizationOffset_BeginOfFrame;
+        ibi::stream* IbiStream;
+        size_t  Ibi_Read_Buffer_Seek        (size_t Method, int64u Value, int64u ID);
+        void    Ibi_Read_Buffer_Unsynched   ();
+        void    Ibi_Stream_Finish           ();
+        void    Ibi_Stream_Finish           (int64u Numerator, int64u Denominator); //Partial
+        void    Ibi_Add                     ();
+    #else //MEDIAINFO_IBI
+        size_t  Ibi_Read_Buffer_Seek        (size_t, int64u, int64u)            {return (size_t)-1;}
+        void    Ibi_Read_Buffer_Unsynched   ()                                  {}
+        void    Ibi_Stream_Finish           ()                                  {}
+        void    Ibi_Stream_Finish           (int64u, int64u)                    {}
+        void    Ibi_Add                     ()                                  {}
+    #endif //MEDIAINFO_IBI
 };
 
 //Helpers
@@ -1070,6 +1375,12 @@
                     } \
                     break; \
 
+#define ATOM_PARTIAL(_ATOM) \
+            case Elements::_ATOM : \
+                    if (Level==Element_Level) \
+                        _ATOM(); \
+                    break; \
+
 #define ATOM_DEFAULT(_ATOM) \
             default : \
                     if (Level==Element_Level) \
@@ -1095,16 +1406,16 @@
     case Elements::_ATOM : \
             if (Level==Element_Level) \
             { \
-                _ATOM(); \
                 Element_ThisIsAList(); \
+                _ATOM(); \
             } \
 
 #define LIST_DEFAULT(_ATOM) \
             default : \
             if (Level==Element_Level) \
             { \
-                _ATOM(); \
                 Element_ThisIsAList(); \
+                _ATOM(); \
             } \
 
 #define ATOM_END_DEFAULT \
@@ -1129,15 +1440,27 @@
     } \
     break; \
 
+#define LIST_DEFAULT_ALONE_BEGIN(_ATOM) \
+    if (Level!=Element_Level) \
+    { \
+        Level++; \
+        if (Level==Element_Level) \
+        { \
+            Element_ThisIsAList(); \
+            _ATOM(); \
+        } \
+
+#define LIST_DEFAULT_ALONE_END \
+    } \
+    break; \
+
 #define LIST_SKIP(_ATOM) \
     case Elements::_ATOM : \
             if (Level==Element_Level) \
             { \
-                _ATOM(); \
                 Element_ThisIsAList(); \
+                _ATOM(); \
             } \
-            if (Element_TotalSize_Get()>Element_Offset) \
-                Skip_XX(Element_TotalSize_Get()-Element_Offset, "Unknown"); \
             break; \

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/File__Analyze_Buffer.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/File__Analyze_Buffer.cpp Changed

@@ -1,29 +1,34 @@
 // File__Analyze - Base for analyze files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
 #if MEDIAINFO_TRACE
 //---------------------------------------------------------------------------
 #include "MediaInfo/File__Analyze.h"
@@ -107,10 +112,14 @@
 //---------------------------------------------------------------------------
 void File__Analyze::BS_Begin_LE()
 {
-    //Change the bitstream for Little Endian version
-    delete BS; BS=(BitStream*)new BitStream_LE();
-
-    BS_Begin();
+    if (Element_Offset>Element_Size)
+        Element_Offset=Element_Size;
+    size_t BS_Size;
+    if (Buffer_Offset+Element_Size<=Buffer_Size)
+        BS_Size=(size_t)(Element_Size-Element_Offset);
+    else
+        BS_Size=Buffer_Size-(Buffer_Offset+(size_t)Element_Offset);
+    BT->Attach(Buffer+Buffer_Offset+(size_t)Element_Offset, BS_Size);
 }
 
 //---------------------------------------------------------------------------
@@ -124,10 +133,9 @@
 //---------------------------------------------------------------------------
 void File__Analyze::BS_End_LE()
 {
-    BS_End();
-
-    //Change the bitstream for the normal one
-    delete BS; BS=new BitStream;
+    BT->Byte_Align();
+    Element_Offset+=BT->Offset_Get();
+    BT->Attach(NULL, 0);
 }
 
 //***************************************************************************
@@ -139,7 +147,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(1);
     Info=BigEndian2int8u(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
     Element_Offset+=1;
 }
 
@@ -148,7 +156,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(2);
     Info=BigEndian2int16u(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
     Element_Offset+=2;
 }
 
@@ -157,7 +165,15 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(3);
     Info=BigEndian2int24u(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated)
+    {
+        Ztring Pos1; Pos1.From_Number(Info, 16);
+        Ztring Temp;
+        Temp.resize(6-Pos1.size(), __T('0'));
+        Temp.append(Pos1);
+        Temp.MakeUpperCase();
+        Param(Name, Ztring::ToZtring(Info)+__T(" (0x")+Temp+__T(")"));
+    }
     Element_Offset+=3;
 }
 
@@ -166,7 +182,15 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(4);
     Info=BigEndian2int32u(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated)
+    {
+        Ztring Pos1; Pos1.From_Number(Info, 16);
+        Ztring Temp;
+        Temp.resize(8-Pos1.size(), __T('0'));
+        Temp.append(Pos1);
+        Temp.MakeUpperCase();
+        Param(Name, Ztring::ToZtring(Info)+__T(" (0x")+Temp+__T(")"));
+    }
     Element_Offset+=4;
 }
 
@@ -175,7 +199,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(5);
     Info=BigEndian2int40u(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
     Element_Offset+=5;
 }
 
@@ -184,7 +208,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(6);
     Info=BigEndian2int48u(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
     Element_Offset+=6;
 }
 
@@ -193,7 +217,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(7);
     Info=BigEndian2int56u(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
     Element_Offset+=7;
 }
 
@@ -202,7 +226,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(8);
     Info=BigEndian2int64u(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
     Element_Offset+=8;
 }
 
@@ -213,7 +237,7 @@
     //Info=BigEndian2int128u(Buffer+Buffer_Offset+(size_t)Element_Offset);
     Info.hi=BigEndian2int64u(Buffer+Buffer_Offset+(size_t)Element_Offset);
     Info.lo=BigEndian2int64u(Buffer+Buffer_Offset+(size_t)Element_Offset+8);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
     Element_Offset+=16;
 }
 
@@ -222,7 +246,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(4);
     Info=BigEndian2float32(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
     Element_Offset+=4;
 }
 
@@ -231,7 +255,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(8);
     Info=BigEndian2float64(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
     Element_Offset+=8;
 }
 
@@ -240,7 +264,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(10);
     Info=BigEndian2float80(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
     Element_Offset+=10;
 }
 
@@ -256,7 +280,7 @@
     if (Integer>=(1<<Bits)/2)
         Integer-=1<<Bits;
     Info=Integer+((float32)Fraction)/(1<<(32-Bits));
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
     Element_Offset+=4;
 }
 
@@ -327,7 +351,7 @@
 void File__Analyze::Skip_B1(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(1);
-    if (Config_DetailsLevel>0) Param(Name, BigEndian2int8u(Buffer+Buffer_Offset+(size_t)Element_Offset));
+    if (Trace_Activated) Param(Name, BigEndian2int8u(Buffer+Buffer_Offset+(size_t)Element_Offset));
     Element_Offset+=1;
 }
 
@@ -335,7 +359,7 @@
 void File__Analyze::Skip_B2(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(2);
-    if (Config_DetailsLevel>0) Param(Name, BigEndian2int16u(Buffer+Buffer_Offset+(size_t)Element_Offset));
+    if (Trace_Activated) Param(Name, BigEndian2int16u(Buffer+Buffer_Offset+(size_t)Element_Offset));
     Element_Offset+=2;
 }
 
@@ -343,7 +367,16 @@
 void File__Analyze::Skip_B3(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(3);
-    if (Config_DetailsLevel>0) Param(Name, BigEndian2int24u(Buffer+Buffer_Offset+(size_t)Element_Offset));
+    if (Trace_Activated)
+    {
+        int32u Info=BigEndian2int24u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+        Ztring Pos1; Pos1.From_Number(Info, 16);
+        Ztring Temp;
+        Temp.resize(6-Pos1.size(), __T('0'));
+        Temp.append(Pos1);
+        Temp.MakeUpperCase();
+        Param(Name, Ztring::ToZtring(Info)+__T(" (0x")+Temp+__T(")"));
+    }
     Element_Offset+=3;
 }
 
@@ -351,7 +384,16 @@
 void File__Analyze::Skip_B4(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(4);
-    if (Config_DetailsLevel>0) Param(Name, BigEndian2int32u(Buffer+Buffer_Offset+(size_t)Element_Offset));
+    if (Trace_Activated)
+    {
+        int32u Info=BigEndian2int32u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+        Ztring Pos1; Pos1.From_Number(Info, 16);
+        Ztring Temp;
+        Temp.resize(8-Pos1.size(), __T('0'));
+        Temp.append(Pos1);
+        Temp.MakeUpperCase();
+        Param(Name, Ztring::ToZtring(Info)+__T(" (0x")+Temp+__T(")"));
+    }
     Element_Offset+=4;
 }
 
@@ -359,7 +401,7 @@
 void File__Analyze::Skip_B5(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(5);
-    if (Config_DetailsLevel>0) Param(Name, BigEndian2int40u(Buffer+Buffer_Offset+(size_t)Element_Offset));
+    if (Trace_Activated) Param(Name, BigEndian2int40u(Buffer+Buffer_Offset+(size_t)Element_Offset));
     Element_Offset+=5;
 }
 
@@ -367,7 +409,7 @@
 void File__Analyze::Skip_B6(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(6);
-    if (Config_DetailsLevel>0) Param(Name, BigEndian2int48u(Buffer+Buffer_Offset+(size_t)Element_Offset));
+    if (Trace_Activated) Param(Name, BigEndian2int48u(Buffer+Buffer_Offset+(size_t)Element_Offset));
     Element_Offset+=6;
 }
 
@@ -375,7 +417,7 @@
 void File__Analyze::Skip_B7(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(7);
-    if (Config_DetailsLevel>0) Param(Name, BigEndian2int56u(Buffer+Buffer_Offset+(size_t)Element_Offset));
+    if (Trace_Activated) Param(Name, BigEndian2int56u(Buffer+Buffer_Offset+(size_t)Element_Offset));
     Element_Offset+=7;
 }
 
@@ -383,7 +425,7 @@
 void File__Analyze::Skip_B8(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(8);
-    if (Config_DetailsLevel>0) Param(Name, BigEndian2int64u(Buffer+Buffer_Offset+(size_t)Element_Offset));
+    if (Trace_Activated) Param(Name, BigEndian2int64u(Buffer+Buffer_Offset+(size_t)Element_Offset));
     Element_Offset+=8;
 }
 
@@ -391,7 +433,7 @@
 void File__Analyze::Skip_B16(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(16);
-    if (Config_DetailsLevel>0) Param(Name, BigEndian2int128u(Buffer+Buffer_Offset+(size_t)Element_Offset));
+    if (Trace_Activated) Param(Name, BigEndian2int128u(Buffer+Buffer_Offset+(size_t)Element_Offset));
     Element_Offset+=16;
 }
 
@@ -399,7 +441,7 @@
 void File__Analyze::Skip_BF4(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(4);
-    if (Config_DetailsLevel>0) Param(Name, BigEndian2float32(Buffer+Buffer_Offset+(size_t)Element_Offset));
+    if (Trace_Activated) Param(Name, BigEndian2float32(Buffer+Buffer_Offset+(size_t)Element_Offset));
     Element_Offset+=4;
 }
 
@@ -412,7 +454,7 @@
     int32u Fraction=BS->Get4(32-Bits);
     BS_End();
     Element_Offset-=4; //Because of BS_End()
-    if (Config_DetailsLevel>0) Param(Name, Integer+((float32)Fraction)/(1<<(32-Bits)));
+    if (Trace_Activated) Param(Name, Integer+((float32)Fraction)/(1<<(32-Bits)));
     Element_Offset+=4;
 }
 
@@ -425,7 +467,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(1);
     Info=LittleEndian2int8u(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
     Element_Offset+=1;
 }
 
@@ -434,7 +476,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(2);
     Info=LittleEndian2int16u(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
     Element_Offset+=2;
 }
 
@@ -443,7 +485,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(3);
     Info=LittleEndian2int24u(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
     Element_Offset+=3;
 }
 
@@ -452,7 +494,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(4);
     Info=LittleEndian2int32u(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
     Element_Offset+=4;
 }
 
@@ -461,7 +503,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(5);
     Info=LittleEndian2int40u(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
     Element_Offset+=5;
 }
 
@@ -470,7 +512,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(6);
     Info=LittleEndian2int48u(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
     Element_Offset+=6;
 }
 
@@ -479,7 +521,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(7);
     Info=LittleEndian2int56u(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
     Element_Offset+=7;
 }
 
@@ -488,7 +530,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(8);
     Info=LittleEndian2int64u(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
     Element_Offset+=8;
 }
 
@@ -499,7 +541,7 @@
     //Info=LittleEndian2int128u(Buffer+Buffer_Offset+(size_t)Element_Offset);
     Info.hi=LittleEndian2int64u(Buffer+Buffer_Offset+(size_t)Element_Offset);
     Info.lo=LittleEndian2int64u(Buffer+Buffer_Offset+(size_t)Element_Offset+8);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
     Element_Offset+=16;
 }
 
@@ -508,7 +550,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(4);
     Info=LittleEndian2float32(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
     Element_Offset+=4;
 }
 
@@ -517,7 +559,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(8);
     Info=LittleEndian2float64(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
     Element_Offset+=8;
 }
 
@@ -581,7 +623,7 @@
 void File__Analyze::Skip_L1(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(1);
-    if (Config_DetailsLevel>0) Param(Name, LittleEndian2int8u(Buffer+Buffer_Offset+(size_t)Element_Offset));
+    if (Trace_Activated) Param(Name, LittleEndian2int8u(Buffer+Buffer_Offset+(size_t)Element_Offset));
     Element_Offset+=1;
 }
 
@@ -589,7 +631,7 @@
 void File__Analyze::Skip_L2(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(2);
-    if (Config_DetailsLevel>0) Param(Name, LittleEndian2int16u(Buffer+Buffer_Offset+(size_t)Element_Offset));
+    if (Trace_Activated) Param(Name, LittleEndian2int16u(Buffer+Buffer_Offset+(size_t)Element_Offset));
     Element_Offset+=2;
 }
 
@@ -597,7 +639,16 @@
 void File__Analyze::Skip_L3(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(3);
-    if (Config_DetailsLevel>0) Param(Name, LittleEndian2int24u(Buffer+Buffer_Offset+(size_t)Element_Offset));
+    if (Trace_Activated)
+    {
+        int32u Info=LittleEndian2int24u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+        Ztring Pos1; Pos1.From_Number(Info, 16);
+        Ztring Temp;
+        Temp.resize(6-Pos1.size(), __T('0'));
+        Temp.append(Pos1);
+        Temp.MakeUpperCase();
+        Param(Name, Ztring::ToZtring(Info)+__T(" (0x")+Temp+__T(")"));
+    }
     Element_Offset+=3;
 }
 
@@ -605,7 +656,16 @@
 void File__Analyze::Skip_L4(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(4);
-    if (Config_DetailsLevel>0) Param(Name, LittleEndian2int32u(Buffer+Buffer_Offset+(size_t)Element_Offset));
+    if (Trace_Activated)
+    {
+        int32u Info=LittleEndian2int32u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+        Ztring Pos1; Pos1.From_Number(Info, 16);
+        Ztring Temp;
+        Temp.resize(8-Pos1.size(), __T('0'));
+        Temp.append(Pos1);
+        Temp.MakeUpperCase();
+        Param(Name, Ztring::ToZtring(Info)+__T(" (0x")+Temp+__T(")"));
+    }
     Element_Offset+=4;
 }
 
@@ -613,7 +673,7 @@
 void File__Analyze::Skip_L5(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(5);
-    if (Config_DetailsLevel>0) Param(Name, LittleEndian2int40u(Buffer+Buffer_Offset+(size_t)Element_Offset));
+    if (Trace_Activated) Param(Name, LittleEndian2int40u(Buffer+Buffer_Offset+(size_t)Element_Offset));
     Element_Offset+=5;
 }
 
@@ -621,7 +681,7 @@
 void File__Analyze::Skip_L6(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(6);
-    if (Config_DetailsLevel>0) Param(Name, LittleEndian2int48u(Buffer+Buffer_Offset+(size_t)Element_Offset));
+    if (Trace_Activated) Param(Name, LittleEndian2int48u(Buffer+Buffer_Offset+(size_t)Element_Offset));
     Element_Offset+=6;
 }
 
@@ -629,7 +689,7 @@
 void File__Analyze::Skip_L7(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(7);
-    if (Config_DetailsLevel>0) Param(Name, LittleEndian2int56u(Buffer+Buffer_Offset+(size_t)Element_Offset));
+    if (Trace_Activated) Param(Name, LittleEndian2int56u(Buffer+Buffer_Offset+(size_t)Element_Offset));
     Element_Offset+=7;
 }
 
@@ -637,7 +697,7 @@
 void File__Analyze::Skip_L8(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(8);
-    if (Config_DetailsLevel>0) Param(Name, LittleEndian2int64u(Buffer+Buffer_Offset+(size_t)Element_Offset));
+    if (Trace_Activated) Param(Name, LittleEndian2int64u(Buffer+Buffer_Offset+(size_t)Element_Offset));
     Element_Offset+=8;
 }
 
@@ -645,11 +705,262 @@
 void File__Analyze::Skip_L16(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(16);
-    if (Config_DetailsLevel>0) Param(Name, LittleEndian2int128u(Buffer+Buffer_Offset+(size_t)Element_Offset));
+    if (Trace_Activated) Param(Name, LittleEndian2int128u(Buffer+Buffer_Offset+(size_t)Element_Offset));
     Element_Offset+=16;
 }
 
 //***************************************************************************
+// Little and Big Endian together
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File__Analyze::Get_D1(int8u  &Info, const char* Name)
+{
+    INTEGRITY_SIZE_ATLEAST_INT(2);
+    Info=LittleEndian2int8u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+    if (Trace_Activated) Param(Name, Info);
+    Element_Offset+=2;
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Get_D2(int16u &Info, const char* Name)
+{
+    INTEGRITY_SIZE_ATLEAST_INT(4);
+    Info=LittleEndian2int16u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+    if (Trace_Activated) Param(Name, Info);
+    Element_Offset+=4;
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Get_D3(int32u &Info, const char* Name)
+{
+    INTEGRITY_SIZE_ATLEAST_INT(6);
+    Info=LittleEndian2int24u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+    if (Trace_Activated) Param(Name, Info);
+    Element_Offset+=6;
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Get_D4(int32u &Info, const char* Name)
+{
+    INTEGRITY_SIZE_ATLEAST_INT(8);
+    Info=LittleEndian2int32u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+    if (Trace_Activated) Param(Name, Info);
+    Element_Offset+=8;
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Get_D5(int64u &Info, const char* Name)
+{
+    INTEGRITY_SIZE_ATLEAST_INT(10);
+    Info=LittleEndian2int40u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+    if (Trace_Activated) Param(Name, Info);
+    Element_Offset+=10;
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Get_D6(int64u &Info, const char* Name)
+{
+    INTEGRITY_SIZE_ATLEAST_INT(12);
+    Info=LittleEndian2int48u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+    if (Trace_Activated) Param(Name, Info);
+    Element_Offset+=12;
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Get_D7(int64u &Info, const char* Name)
+{
+    INTEGRITY_SIZE_ATLEAST_INT(14);
+    Info=LittleEndian2int56u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+    if (Trace_Activated) Param(Name, Info);
+    Element_Offset+=14;
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Get_D8(int64u &Info, const char* Name)
+{
+    INTEGRITY_SIZE_ATLEAST_INT(16);
+    Info=LittleEndian2int64u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+    if (Trace_Activated) Param(Name, Info);
+    Element_Offset+=16;
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Get_D16(int128u &Info, const char* Name)
+{
+    INTEGRITY_SIZE_ATLEAST_INT(32);
+    //Info=LittleEndian2int128u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+    Info.hi=LittleEndian2int64u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+    Info.lo=LittleEndian2int64u(Buffer+Buffer_Offset+(size_t)Element_Offset+8);
+    if (Trace_Activated) Param(Name, Info);
+    Element_Offset+=32;
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Get_DF4(float32 &Info, const char* Name)
+{
+    INTEGRITY_SIZE_ATLEAST_INT(8);
+    Info=LittleEndian2float32(Buffer+Buffer_Offset+(size_t)Element_Offset);
+    if (Trace_Activated) Param(Name, Info);
+    Element_Offset+=8;
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Get_DF8(float64 &Info, const char* Name)
+{
+    INTEGRITY_SIZE_ATLEAST_INT(16);
+    Info=LittleEndian2float64(Buffer+Buffer_Offset+(size_t)Element_Offset);
+    if (Trace_Activated) Param(Name, Info);
+    Element_Offset+=16;
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Peek_D1(int8u  &Info)
+{
+    INTEGRITY_SIZE_ATLEAST_INT(8);
+    Info=LittleEndian2int8u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Peek_D2(int16u &Info)
+{
+    INTEGRITY_SIZE_ATLEAST_INT(4);
+    Info=LittleEndian2int16u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Peek_D3(int32u &Info)
+{
+    INTEGRITY_SIZE_ATLEAST_INT(6);
+    Info=LittleEndian2int24u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Peek_D4(int32u &Info)
+{
+    INTEGRITY_SIZE_ATLEAST_INT(8);
+    Info=LittleEndian2int32u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Peek_D5(int64u &Info)
+{
+    INTEGRITY_SIZE_ATLEAST_INT(10);
+    Info=LittleEndian2int40u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Peek_D6(int64u &Info)
+{
+    INTEGRITY_SIZE_ATLEAST_INT(12);
+    Info=LittleEndian2int48u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Peek_D7(int64u &Info)
+{
+    INTEGRITY_SIZE_ATLEAST_INT(14);
+    Info=LittleEndian2int56u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Peek_D8(int64u &Info)
+{
+    INTEGRITY_SIZE_ATLEAST_INT(16);
+    Info=LittleEndian2int64u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Skip_D1(const char* Name)
+{
+    INTEGRITY_SIZE_ATLEAST(2);
+    if (Trace_Activated) Param(Name, LittleEndian2int8u(Buffer+Buffer_Offset+(size_t)Element_Offset));
+    Element_Offset+=2;
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Skip_D2(const char* Name)
+{
+    INTEGRITY_SIZE_ATLEAST(4);
+    if (Trace_Activated) Param(Name, LittleEndian2int16u(Buffer+Buffer_Offset+(size_t)Element_Offset));
+    Element_Offset+=4;
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Skip_D3(const char* Name)
+{
+    INTEGRITY_SIZE_ATLEAST(6);
+    if (Trace_Activated)
+    {
+        int32u Info=LittleEndian2int24u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+        Ztring Pos1; Pos1.From_Number(Info, 16);
+        Ztring Temp;
+        Temp.resize(6-Pos1.size(), __T('0'));
+        Temp.append(Pos1);
+        Temp.MakeUpperCase();
+        Param(Name, Ztring::ToZtring(Info)+__T(" (0x")+Temp+__T(")"));
+    }
+    Element_Offset+=6;
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Skip_D4(const char* Name)
+{
+    INTEGRITY_SIZE_ATLEAST(8);
+    if (Trace_Activated)
+    {
+        int32u Info=LittleEndian2int32u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+        Ztring Pos1; Pos1.From_Number(Info, 16);
+        Ztring Temp;
+        Temp.resize(8-Pos1.size(), __T('0'));
+        Temp.append(Pos1);
+        Temp.MakeUpperCase();
+        Param(Name, Ztring::ToZtring(Info)+__T(" (0x")+Temp+__T(")"));
+    }
+    Element_Offset+=8;
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Skip_D5(const char* Name)
+{
+    INTEGRITY_SIZE_ATLEAST(10);
+    if (Trace_Activated) Param(Name, LittleEndian2int40u(Buffer+Buffer_Offset+(size_t)Element_Offset));
+    Element_Offset+=5;
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Skip_D6(const char* Name)
+{
+    INTEGRITY_SIZE_ATLEAST(12);
+    if (Trace_Activated) Param(Name, LittleEndian2int48u(Buffer+Buffer_Offset+(size_t)Element_Offset));
+    Element_Offset+=12;
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Skip_D7(const char* Name)
+{
+    INTEGRITY_SIZE_ATLEAST(14);
+    if (Trace_Activated) Param(Name, LittleEndian2int56u(Buffer+Buffer_Offset+(size_t)Element_Offset));
+    Element_Offset+=14;
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Skip_D8(const char* Name)
+{
+    INTEGRITY_SIZE_ATLEAST(16);
+    if (Trace_Activated) Param(Name, LittleEndian2int64u(Buffer+Buffer_Offset+(size_t)Element_Offset));
+    Element_Offset+=16;
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Skip_D16(const char* Name)
+{
+    INTEGRITY_SIZE_ATLEAST(32);
+    if (Trace_Activated) Param(Name, LittleEndian2int128u(Buffer+Buffer_Offset+(size_t)Element_Offset));
+    Element_Offset+=32;
+}
+
+//***************************************************************************
 // GUID
 //***************************************************************************
 
@@ -659,7 +970,7 @@
     INTEGRITY_SIZE_ATLEAST_INT(16);
     Info.hi=LittleEndian2int64u(Buffer+Buffer_Offset+(size_t)Element_Offset);
     Info.lo=BigEndian2int64u   (Buffer+Buffer_Offset+(size_t)Element_Offset+8);
-    if (Config_DetailsLevel>0) Param_GUID(Name, Info);
+    if (Trace_Activated) Param_GUID(Name, Info);
     Element_Offset+=16;
 }
 
@@ -667,7 +978,7 @@
 void File__Analyze::Skip_GUID(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(16);
-    if (Config_DetailsLevel>0) Param_GUID(Name, BigEndian2int128u(Buffer+Buffer_Offset+(size_t)Element_Offset));
+    if (Trace_Activated) Param_GUID(Name, BigEndian2int128u(Buffer+Buffer_Offset+(size_t)Element_Offset));
     Element_Offset+=16;
 }
 
@@ -681,7 +992,7 @@
     INTEGRITY_SIZE_ATLEAST_INT(16);
     Info.hi=BigEndian2int64u(Buffer+Buffer_Offset+(size_t)Element_Offset);
     Info.lo=BigEndian2int64u(Buffer+Buffer_Offset+(size_t)Element_Offset+8);
-    if (Config_DetailsLevel>0) Param_UUID(Name, Info);
+    if (Trace_Activated) Param_UUID(Name, Info);
     Element_Offset+=16;
 }
 
@@ -689,7 +1000,7 @@
 void File__Analyze::Skip_UUID(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(16);
-    if (Config_DetailsLevel>0) Param_UUID(Name, BigEndian2int128u(Buffer+Buffer_Offset+(size_t)Element_Offset));
+    if (Trace_Activated) Param_UUID(Name, BigEndian2int128u(Buffer+Buffer_Offset+(size_t)Element_Offset));
     Element_Offset+=16;
 }
 
@@ -705,7 +1016,7 @@
     if (Buffer[Buffer_Offset+(size_t)Element_Offset]==0xFF)
     {
         Info=File_Size-(File_Offset+Buffer_Offset+Element_Offset);
-        if (Config_DetailsLevel>0) Param(Name, "Unlimited");
+        if (Trace_Activated) Param(Name, "Unlimited");
         Element_Offset++;
         return;
     }
@@ -792,7 +1103,7 @@
                  break;
     }
 
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
     Element_Offset+=Size;
 }
 
@@ -884,7 +1195,7 @@
                  break;
     }
 
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
     Element_Offset+=Size;
 }
 
@@ -924,7 +1235,7 @@
         return; //Not enough space
     }
 
-    if (Config_DetailsLevel>0)
+    if (Trace_Activated)
     {
         Element_Offset-=Size;
         Param(Name, Info);
@@ -964,7 +1275,7 @@
         return; //Not enough space
     }
 
-    if (Config_DetailsLevel>0)
+    if (Trace_Activated)
     {
         Element_Offset-=Size;
         Param(Name, Info);
@@ -980,15 +1291,15 @@
 void File__Analyze::Get_SE(int32s &Info, const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST_BUFFER();
-    int LeadingZeroBits=0;
-    while(BS->Remain()>0 && BS->Get(1)==0)
+    int8u LeadingZeroBits=0;
+    while(BS->Remain()>0 && !BS->GetB())
         LeadingZeroBits++;
     INTEGRITY(LeadingZeroBits<=32, "(Problem)", 0)
-    double InfoD=pow((float)2, (float)LeadingZeroBits)-1+BS->Get(LeadingZeroBits);
+    double InfoD=pow((float)2, (float)LeadingZeroBits)-1+BS->Get4(LeadingZeroBits);
     INTEGRITY(InfoD<int32u(-1), "(Problem)", 0)
     Info=(int32s)(pow((double)-1, InfoD+1)*(int32u)ceil(InfoD/2));
 
-    if (Config_DetailsLevel>0)
+    if (Trace_Activated)
         Param(Name, Info);
 }
 
@@ -996,13 +1307,13 @@
 void File__Analyze::Skip_SE(const char* Name)
 {
     INTEGRITY(BS->Remain(), "Size is wrong", 0)
-    int LeadingZeroBits=0;
-    while(BS->Remain()>0 && BS->Get(1)==0)
+    int8u LeadingZeroBits=0;
+    while(BS->Remain()>0 && !BS->GetB())
         LeadingZeroBits++;
-    if (Config_DetailsLevel>0)
+    if (Trace_Activated)
     {
         INTEGRITY(LeadingZeroBits<=32, "(Problem)", 0)
-        double InfoD=pow((float)2, (float)LeadingZeroBits)-1+BS->Get(LeadingZeroBits);
+        double InfoD=pow((float)2, (float)LeadingZeroBits)-1+BS->Get4(LeadingZeroBits);
         INTEGRITY(InfoD<int32u(-1), "(Problem)", 0)
         Param(Name, (int32s)(pow(-1, InfoD+1)*(int32u)ceil(InfoD/2)));
     }
@@ -1014,14 +1325,14 @@
 void File__Analyze::Get_UE(int32u &Info, const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST_BUFFER();
-    int LeadingZeroBits=0;
-    while(BS->Remain()>0 && BS->Get(1)==0)
+    int8u LeadingZeroBits=0;
+    while(BS->Remain()>0 && !BS->GetB())
         LeadingZeroBits++;
     INTEGRITY(LeadingZeroBits<=32, "(Problem)", 0)
     double InfoD=pow(2, (float)LeadingZeroBits);
-    Info=(int32u)InfoD-1+BS->Get(LeadingZeroBits);
+    Info=(int32u)InfoD-1+BS->Get4(LeadingZeroBits);
 
-    if (Config_DetailsLevel>0)
+    if (Trace_Activated)
         Param(Name, Info);
 }
 
@@ -1029,14 +1340,14 @@
 void File__Analyze::Skip_UE(const char* Name)
 {
     INTEGRITY(BS->Remain(), "Size is wrong", 0)
-    int LeadingZeroBits=0;
-    while(BS->Remain()>0 && BS->Get(1)==0)
+    int8u LeadingZeroBits=0;
+    while(BS->Remain()>0 && !BS->GetB())
         LeadingZeroBits++;
-    if (Config_DetailsLevel>0)
+    if (Trace_Activated)
     {
         INTEGRITY(LeadingZeroBits<=32, "(Problem)", 0)
         double InfoD=pow(2, (float)LeadingZeroBits);
-        Param(Name, (int32u)InfoD-1+BS->Get(LeadingZeroBits));
+        Param(Name, (int32u)InfoD-1+BS->Get4(LeadingZeroBits));
     }
     else
         BS->Skip(LeadingZeroBits);
@@ -1069,7 +1380,7 @@
     if (Info!=0 && BS->Remain()>0 && BS->GetB()==1)
         Info=-Info;
 
-    if (Config_DetailsLevel>0)
+    if (Trace_Activated)
         Param(Name, Info);
 }
 
@@ -1099,7 +1410,7 @@
     }
     Info--;
 
-    if (Config_DetailsLevel>0)
+    if (Trace_Activated)
         Param(Name, Info);
 }
 
@@ -1115,44 +1426,111 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
-void File__Analyze::Get_VL(int32u Call(int8u Size, int32u ToCall), int32u &Info, const char* Name)
+void File__Analyze::Get_VL(const vlc Vlc[], size_t &Info, const char* Name)
 {
-    //Element size
     Info=0;
-    int32u Code=0;
-    int8u  Size=0;
-    do
+    int32u Value=0;
+
+    int8u CountOfBits=0;
+    for(;;)
     {
-        Size++;
-        INTEGRITY_INT(1<BS->Remain(), "Size is wrong", BS->Offset_Get())
-        Code=(Code<<1)|(BS->GetB()?1:0);
-        Info=Call(Size, Code);
-        if (Info!=(int32u)-1)
+        switch (Vlc[Info].bit_increment)
+        {
+            case 255 :
+                        Trusted_IsNot("Variable Length Code error");
+                        return;
+            default  : ;
+                        Value<<=Vlc[Info].bit_increment;
+                        Value|=BS->Get1(Vlc[Info].bit_increment);
+                        CountOfBits+=Vlc[Info].bit_increment;
+                        break;
+            case   1 :
+                        Value<<=1;
+                        if (BS->GetB())
+                            Value++;
+                        CountOfBits++;
+            case   0 :  ;
+        }
+
+        if (Value==Vlc[Info].value)
+        {
+            if (Trace_Activated)
+            {
+                Ztring ToDisplay=Ztring::ToZtring(Value, 2);
+                ToDisplay.insert(0, CountOfBits-ToDisplay.size(), __T('0'));
+                ToDisplay+=__T(" (")+Ztring::ToZtring(CountOfBits)+__T(" bits)");
+                Param(Name, ToDisplay);
+            }
+            return;
+        }
+        Info++;
+    }
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Get_VL_Prepare(vlc_fast &Vlc)
+{
+    Vlc.Array=new int8u[((size_t)1)<<Vlc.Size];
+    Vlc.BitsToSkip=new int8u[((size_t)1)<<Vlc.Size];
+    memset(Vlc.Array, 0xFF, ((size_t)1)<<Vlc.Size);
+    int8u  Increment=0;
+    int8u  Pos=0;
+    for(; ; Pos++)
+    {
+        if (Vlc.Vlc[Pos].bit_increment==255)
             break;
+        Increment+=Vlc.Vlc[Pos].bit_increment;
+        size_t Value=Vlc.Vlc[Pos].value<<(Vlc.Size-Increment);
+        size_t ToFill_Size=1<<(Vlc.Size-Increment);
+        for (size_t ToFill_Pos=0; ToFill_Pos<ToFill_Size; ToFill_Pos++)
+        {
+            Vlc.Array[Value+ToFill_Pos]=Pos;
+            Vlc.BitsToSkip[Value+ToFill_Pos]=Increment;
+        }
     }
-    while (Size<=32);
+    for (size_t Pos2=0; Pos2<(((size_t)1)<<Vlc.Size); Pos2++)
+        if (Vlc.Array[Pos2]==(int8u)-1)
+        {
+            Vlc.Array[Pos2]=Pos;
+            Vlc.BitsToSkip[Pos2]=(int8u)-1;
+        }
+}
 
-    //Integrity
-    if (Size>32)
+//---------------------------------------------------------------------------
+void File__Analyze::Get_VL(vlc_fast &Vlc, size_t &Info, const char* Name)
+{
+    if (BS->Remain()<Vlc.Size)
+    {
+        Get_VL(Vlc.Vlc, Info, Name);
+        return;
+    }
+
+    int32u Value=BS->Peek4(Vlc.Size);
+    Info=Vlc.Array[Value];
+
+    if (Vlc.BitsToSkip[Value]==(int8u)-1)
     {
         Trusted_IsNot("Variable Length Code error");
-        Info=0;
         return;
     }
 
-    if (Config_DetailsLevel>0)
+    if (Trace_Activated)
     {
-        Element_Offset-=Size;
-        Param(Name, Info);
-        Element_Offset+=Size;
+        Ztring ToDisplay=Ztring::ToZtring(Value, 2);
+        ToDisplay.insert(0, Vlc.Size-ToDisplay.size(), __T('0'));
+        ToDisplay.resize(Vlc.BitsToSkip[Value]);
+        ToDisplay+=__T(" (")+Ztring::ToZtring(Vlc.BitsToSkip[Value])+__T(" bits)");
+        Param(Name, ToDisplay);
     }
+
+    BS->Skip(Vlc.BitsToSkip[Value]);
 }
 
 //---------------------------------------------------------------------------
-void File__Analyze::Skip_VL(int32u Call(int8u Size, int32u ToCall), const char* Name)
+void File__Analyze::Skip_VL(const vlc Vlc[], const char* Name)
 {
-    int32u Info;
-    Get_VL(Call, Info, Name);
+    size_t Info;
+    Get_VL(Vlc, Info, Name);
 }
 
 //***************************************************************************
@@ -1164,7 +1542,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(1);
     Info=CC1(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 1);
+    if (Trace_Activated) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 1);
     Element_Offset+=1;
 }
 
@@ -1173,7 +1551,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(2);
     Info=CC2(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 2);
+    if (Trace_Activated) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 2);
     Element_Offset+=2;
 }
 
@@ -1182,7 +1560,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(3);
     Info=CC3(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 3);
+    if (Trace_Activated) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 3);
     Element_Offset+=3;
 }
 
@@ -1191,7 +1569,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(4);
     Info=CC4(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 4, false);
+    if (Trace_Activated) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 4, false);
     Element_Offset+=4;
 }
 
@@ -1200,7 +1578,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(5);
     Info=CC5(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 5);
+    if (Trace_Activated) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 5);
     Element_Offset+=5;
 }
 
@@ -1209,7 +1587,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(6);
     Info=CC6(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 6);
+    if (Trace_Activated) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 6);
     Element_Offset+=6;
 }
 
@@ -1218,7 +1596,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(7);
     Info=CC7(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 7);
+    if (Trace_Activated) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 7);
     Element_Offset+=7;
 }
 
@@ -1227,7 +1605,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_INT(8);
     Info=CC8(Buffer+Buffer_Offset+(size_t)Element_Offset);
-    if (Config_DetailsLevel>0) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 8);
+    if (Trace_Activated) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 8);
     Element_Offset+=8;
 }
 
@@ -1235,7 +1613,7 @@
 void File__Analyze::Skip_C1(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(1);
-    if (Config_DetailsLevel>0) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 1);
+    if (Trace_Activated) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 1);
     Element_Offset+=1;
 }
 
@@ -1243,7 +1621,7 @@
 void File__Analyze::Skip_C2(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(2);
-    if (Config_DetailsLevel>0) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 2);
+    if (Trace_Activated) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 2);
     Element_Offset+=2;
 }
 
@@ -1251,7 +1629,7 @@
 void File__Analyze::Skip_C3(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(3);
-    if (Config_DetailsLevel>0) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 3);
+    if (Trace_Activated) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 3);
     Element_Offset+=3;
 }
 
@@ -1259,7 +1637,7 @@
 void File__Analyze::Skip_C4(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(4);
-    if (Config_DetailsLevel>0) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 4);
+    if (Trace_Activated) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 4);
     Element_Offset+=4;
 }
 
@@ -1267,7 +1645,7 @@
 void File__Analyze::Skip_C5(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(5);
-    if (Config_DetailsLevel>0) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 5);
+    if (Trace_Activated) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 5);
     Element_Offset+=5;
 }
 
@@ -1275,7 +1653,7 @@
 void File__Analyze::Skip_C6(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(6);
-    if (Config_DetailsLevel>0) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 6);
+    if (Trace_Activated) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 6);
     Element_Offset+=6;
 }
 
@@ -1283,7 +1661,7 @@
 void File__Analyze::Skip_C7(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(7);
-    if (Config_DetailsLevel>0) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 7);
+    if (Trace_Activated) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 7);
     Element_Offset+=7;
 }
 
@@ -1291,7 +1669,7 @@
 void File__Analyze::Skip_C8(const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(8);
-    if (Config_DetailsLevel>0) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 8);
+    if (Trace_Activated) Param(Name, Buffer+Buffer_Offset+(size_t)Element_Offset, 8);
     Element_Offset+=8;
 }
 
@@ -1304,7 +1682,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_STRING(Bytes);
     Info.From_Local((const char*)(Buffer+Buffer_Offset+(size_t)Element_Offset), (size_t)Bytes);
-    if (Config_DetailsLevel>0 && Bytes) Param(Name, Info);
+    if (Trace_Activated && Bytes) Param(Name, Info);
     Element_Offset+=Bytes;
 }
 
@@ -1313,7 +1691,16 @@
 {
     INTEGRITY_SIZE_ATLEAST_STRING(Bytes);
     Info.From_ISO_8859_1((const char*)(Buffer+Buffer_Offset+(size_t)Element_Offset), (size_t)Bytes);
-    if (Config_DetailsLevel>0 && Bytes) Param(Name, Info);
+    if (Trace_Activated && Bytes) Param(Name, Info);
+    Element_Offset+=Bytes;
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Get_ISO_8859_2(int64u Bytes, Ztring &Info, const char* Name)
+{
+    INTEGRITY_SIZE_ATLEAST_STRING(Bytes);
+    Info.From_ISO_8859_2((const char*)(Buffer+Buffer_Offset+(size_t)Element_Offset), (size_t)Bytes);
+    if (Trace_Activated && Bytes) Param(Name, Info);
     Element_Offset+=Bytes;
 }
 
@@ -1322,7 +1709,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_STRING(Bytes);
     Info.assign((const char*)(Buffer+Buffer_Offset+(size_t)Element_Offset), (size_t)Bytes);
-    if (Config_DetailsLevel>0 && Bytes) Param(Name, Info);
+    if (Trace_Activated && Bytes) Param(Name, Info);
     Element_Offset+=Bytes;
 }
 
@@ -1345,7 +1732,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_STRING(Bytes);
     Info.From_UTF8((const char*)(Buffer+Buffer_Offset+(size_t)Element_Offset), (size_t)Bytes);
-    if (Config_DetailsLevel>0 && Bytes) Param(Name, Info);
+    if (Trace_Activated && Bytes) Param(Name, Info);
     Element_Offset+=Bytes;
 }
 
@@ -1354,7 +1741,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_STRING(Bytes);
     Info.From_UTF16((const char*)(Buffer+Buffer_Offset+(size_t)Element_Offset), (size_t)Bytes);
-    if (Config_DetailsLevel>0 && Bytes) Param(Name, Info);
+    if (Trace_Activated && Bytes) Param(Name, Info);
     Element_Offset+=Bytes;
 }
 
@@ -1363,7 +1750,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_STRING(Bytes);
     Info.From_UTF16BE((const char*)(Buffer+Buffer_Offset+(size_t)Element_Offset), (size_t)Bytes);
-    if (Config_DetailsLevel>0 && Bytes) Param(Name, Info);
+    if (Trace_Activated && Bytes) Param(Name, Info);
     Element_Offset+=Bytes;
 }
 
@@ -1372,7 +1759,7 @@
 {
     INTEGRITY_SIZE_ATLEAST_STRING(Bytes);
     Info.From_UTF16LE((const char*)(Buffer+Buffer_Offset+(size_t)Element_Offset), (size_t)Bytes);
-    if (Config_DetailsLevel>0 && Bytes) Param(Name, Info);
+    if (Trace_Activated && Bytes) Param(Name, Info);
     Element_Offset+=Bytes;
 }
 
@@ -1380,7 +1767,7 @@
 void File__Analyze::Skip_Local(int64u Bytes, const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(Bytes);
-    if (Config_DetailsLevel>0 && Bytes) Param(Name, Ztring().From_Local((const char*)(Buffer+Buffer_Offset+(size_t)Element_Offset), (size_t)Bytes));
+    if (Trace_Activated && Bytes) Param(Name, Ztring().From_Local((const char*)(Buffer+Buffer_Offset+(size_t)Element_Offset), (size_t)Bytes));
     Element_Offset+=Bytes;
 }
 
@@ -1388,7 +1775,7 @@
 void File__Analyze::Skip_String(int64u Bytes, const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(Bytes);
-    if (Config_DetailsLevel>0 && Bytes) Param(Name, Ztring().From_Local((const char*)(Buffer+Buffer_Offset+(size_t)Element_Offset), (size_t)Bytes));
+    if (Trace_Activated && Bytes) Param(Name, Ztring().From_Local((const char*)(Buffer+Buffer_Offset+(size_t)Element_Offset), (size_t)Bytes));
     Element_Offset+=Bytes;
 }
 
@@ -1396,7 +1783,7 @@
 void File__Analyze::Skip_UTF8(int64u Bytes, const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(Bytes);
-    if (Config_DetailsLevel>0 && Bytes) Param(Name, Ztring().From_UTF8((const char*)(Buffer+Buffer_Offset+(size_t)Element_Offset), (size_t)Bytes));
+    if (Trace_Activated && Bytes) Param(Name, Ztring().From_UTF8((const char*)(Buffer+Buffer_Offset+(size_t)Element_Offset), (size_t)Bytes));
     Element_Offset+=Bytes;
 }
 
@@ -1404,7 +1791,7 @@
 void File__Analyze::Skip_UTF16B(int64u Bytes, const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(Bytes);
-    if (Config_DetailsLevel>0 && Bytes) Param(Name, Ztring().From_UTF16BE((const char*)(Buffer+Buffer_Offset+(size_t)Element_Offset), (size_t)Bytes));
+    if (Trace_Activated && Bytes) Param(Name, Ztring().From_UTF16BE((const char*)(Buffer+Buffer_Offset+(size_t)Element_Offset), (size_t)Bytes));
     Element_Offset+=Bytes;
 }
 
@@ -1412,7 +1799,7 @@
 void File__Analyze::Skip_UTF16L(int64u Bytes, const char* Name)
 {
     INTEGRITY_SIZE_ATLEAST(Bytes);
-    if (Config_DetailsLevel>0 && Bytes) Param(Name, Ztring().From_UTF16LE((const char*)(Buffer+Buffer_Offset+(size_t)Element_Offset), (size_t)Bytes));
+    if (Trace_Activated && Bytes) Param(Name, Ztring().From_UTF16LE((const char*)(Buffer+Buffer_Offset+(size_t)Element_Offset), (size_t)Bytes));
     Element_Offset+=Bytes;
 }
 
@@ -1427,7 +1814,7 @@
     int8u Size=Buffer[Buffer_Offset+(size_t)Element_Offset];
     int8u Pad=(Size%2)?0:1;
     INTEGRITY_SIZE_ATLEAST(1+Size+Pad);
-    if (Config_DetailsLevel>0 && Size) Param(Name, Ztring().From_Local((const char*)(Buffer+Buffer_Offset+(size_t)Element_Offset+1), (size_t)Size));
+    if (Trace_Activated && Size) Param(Name, Ztring().From_Local((const char*)(Buffer+Buffer_Offset+(size_t)Element_Offset+1), (size_t)Size));
     Element_Offset+=1+Size+Pad;
 }
 
@@ -1438,8 +1825,11 @@
 //---------------------------------------------------------------------------
 void File__Analyze::Skip_XX(int64u Bytes, const char* Name)
 {
-    //INTEGRITY_SIZE_ATLEAST_INT(Bytes);
-    if (Config_DetailsLevel>0 && Bytes) Param(Name, Ztring("(")+Ztring::ToZtring(Bytes)+Ztring(" bytes)"));
+    if (Element_Offset+Bytes!=Element_TotalSize_Get()) //Exception for seek to end of the element
+    {
+        INTEGRITY_SIZE_ATLEAST(Bytes);
+    }
+    if (Trace_Activated && Bytes) Param(Name, Ztring("(")+Ztring::ToZtring(Bytes)+Ztring(" bytes)"));
     Element_Offset+=Bytes;
 }
 
@@ -1455,9 +1845,9 @@
     else
         Info=false;
 
-    Element_Begin();
-    if (Config_DetailsLevel>0) Param(Name, Info?"Yes":"No");
-    Element_End();
+    Element_Begin0();
+    if (Trace_Activated) Param(Name, Info?"Yes":"No");
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
@@ -1465,25 +1855,25 @@
 {
     Info=(int8u)ValueToPut;
 
-    Element_Begin();
-    if (Config_DetailsLevel>0) Param(Name, Info);
-    Element_End();
+    Element_Begin0();
+    if (Trace_Activated) Param(Name, Info);
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
 void File__Analyze::Skip_Flags(int64u Flags, size_t Order, const char* Name)
 {
-    Element_Begin();
-    if (Config_DetailsLevel>0) Param(Name, (Flags&((int64u)1<<Order))?"Yes":"No");
-    Element_End();
+    Element_Begin0();
+    if (Trace_Activated) Param(Name, (Flags&((int64u)1<<Order))?"Yes":"No");
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
 void File__Analyze::Skip_Flags(int64u ValueToPut, const char* Name)
 {
-    Element_Begin();
-    if (Config_DetailsLevel>0) Param(Name, ValueToPut);
-    Element_End();
+    Element_Begin0();
+    if (Trace_Activated) Param(Name, ValueToPut);
+    Element_End0();
 }
 
 //***************************************************************************
@@ -1494,8 +1884,8 @@
 void File__Analyze::Get_BS(size_t Bits, int32u &Info, const char* Name)
 {
     INTEGRITY_INT(Bits<=BS->Remain(), "Size is wrong", BS->Offset_Get())
-    Info=BS->Get(Bits);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    Info=BS->Get4(Bits);
+    if (Trace_Activated) Param(Name, Info);
 }
 
 //---------------------------------------------------------------------------
@@ -1503,7 +1893,7 @@
 {
     INTEGRITY_INT(1<=BS->Remain(), "Size is wrong", BS->Offset_Get())
     Info=BS->GetB();
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
 }
 
 //---------------------------------------------------------------------------
@@ -1511,7 +1901,11 @@
 {
     INTEGRITY_INT(Bits<=BS->Remain(), "Size is wrong", BS->Offset_Get())
     Info=BS->Get1(Bits);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated)
+    {
+        Param(Name, Info);
+        Param_Info(__T("(")+Ztring::ToZtring(Bits)+__T(" bits)"));
+    }
 }
 
 //---------------------------------------------------------------------------
@@ -1519,7 +1913,7 @@
 {
     INTEGRITY_INT(Bits<=BS->Remain(), "Size is wrong", BS->Offset_Get())
     Info=BS->Get2(Bits);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
 }
 
 //---------------------------------------------------------------------------
@@ -1527,7 +1921,7 @@
 {
     INTEGRITY_INT(Bits<=BS->Remain(), "Size is wrong", BS->Offset_Get())
     Info=BS->Get4(Bits);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
 }
 
 //---------------------------------------------------------------------------
@@ -1535,7 +1929,7 @@
 {
     INTEGRITY_INT(Bits<=BS->Remain(), "Size is wrong", BS->Offset_Get())
     Info=BS->Get4(Bits);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
 }
 
 //---------------------------------------------------------------------------
@@ -1543,7 +1937,7 @@
 {
     INTEGRITY_INT(Bits<=BS->Remain(), "Size is wrong", BS->Offset_Get())
     Info=BS->Get8(Bits);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
 }
 
 //---------------------------------------------------------------------------
@@ -1551,7 +1945,7 @@
 {
     INTEGRITY_INT(Bits<=BS->Remain(), "Size is wrong", BS->Offset_Get())
     Info=BS->Get8(Bits);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
 }
 
 //---------------------------------------------------------------------------
@@ -1559,7 +1953,7 @@
 {
     INTEGRITY_INT(Bits<=BS->Remain(), "Size is wrong", BS->Offset_Get())
     Info=BS->Get8(Bits);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
 }
 
 //---------------------------------------------------------------------------
@@ -1567,14 +1961,14 @@
 {
     INTEGRITY_INT(Bits<=BS->Remain(), "Size is wrong", BS->Offset_Get())
     Info=BS->Get8(Bits);
-    if (Config_DetailsLevel>0) Param(Name, Info);
+    if (Trace_Activated) Param(Name, Info);
 }
 
 //---------------------------------------------------------------------------
 void File__Analyze::Peek_BS(size_t Bits, int32u &Info)
 {
     INTEGRITY_INT(Bits<=BS->Remain(), "Size is wrong", BS->Offset_Get())
-    Info=BS->Peek(Bits);
+    Info=BS->Peek4(Bits);
 }
 
 //---------------------------------------------------------------------------
@@ -1599,6 +1993,13 @@
 }
 
 //---------------------------------------------------------------------------
+void File__Analyze::Peek_S3(size_t Bits, int32u &Info)
+{
+    INTEGRITY_INT(Bits<=BS->Remain(), "Size is wrong", BS->Offset_Get())
+    Info=BS->Peek4(Bits);
+}
+
+//---------------------------------------------------------------------------
 void File__Analyze::Peek_S4(size_t Bits, int32u &Info)
 {
     INTEGRITY_INT(Bits<=BS->Remain(), "Size is wrong", BS->Offset_Get())
@@ -1637,8 +2038,16 @@
 void File__Analyze::Skip_BS(size_t Bits, const char* Name)
 {
     INTEGRITY(Bits<=BS->Remain(), "Size is wrong", BS->Offset_Get())
-    if (Config_DetailsLevel>0)
-        Param(Name, BS->Get(Bits));
+    if (Trace_Activated)
+    {
+        if (Bits<=32) //TODO: in BitStream.h, handle >32 bit gets
+            Param(Name, BS->Get4(Bits));
+        else
+        {
+            Param(Name, "(Data)");
+            BS->Skip(Bits);
+        }
+    }
     else
         BS->Skip(Bits);
 }
@@ -1647,90 +2056,93 @@
 void File__Analyze::Skip_SB(              const char* Name)
 {
     INTEGRITY(1<=BS->Remain(), "Size is wrong", BS->Offset_Get())
-    if (Config_DetailsLevel>0)
+    if (Trace_Activated)
         Param(Name, BS->GetB());
     else
-        BS->SkipB();
+        BS->Skip(1);
 }
 
 //---------------------------------------------------------------------------
 void File__Analyze::Skip_S1(size_t Bits, const char* Name)
 {
     INTEGRITY(Bits<=BS->Remain(), "Size is wrong", BS->Offset_Get())
-    if (Config_DetailsLevel>0)
+    if (Trace_Activated)
+    {
         Param(Name, BS->Get1(Bits));
+        Param_Info(__T("(")+Ztring::ToZtring(Bits)+__T(" bits)"));
+    }
     else
-        BS->Skip1(Bits);
+        BS->Skip(Bits);
 }
 
 //---------------------------------------------------------------------------
 void File__Analyze::Skip_S2(size_t Bits, const char* Name)
 {
     INTEGRITY(Bits<=BS->Remain(), "Size is wrong", BS->Offset_Get())
-    if (Config_DetailsLevel>0)
+    if (Trace_Activated)
         Param(Name, BS->Get2(Bits));
     else
-        BS->Skip2(Bits);
+        BS->Skip(Bits);
 }
 
 //---------------------------------------------------------------------------
 void File__Analyze::Skip_S3(size_t Bits, const char* Name)
 {
     INTEGRITY(Bits<=BS->Remain(), "Size is wrong", BS->Offset_Get())
-    if (Config_DetailsLevel>0)
+    if (Trace_Activated)
         Param(Name, BS->Get4(Bits));
     else
-        BS->Skip4(Bits);
+        BS->Skip(Bits);
 }
 
 //---------------------------------------------------------------------------
 void File__Analyze::Skip_S4(size_t Bits, const char* Name)
 {
     INTEGRITY(Bits<=BS->Remain(), "Size is wrong", BS->Offset_Get())
-    if (Config_DetailsLevel>0)
+    if (Trace_Activated)
         Param(Name, BS->Get4(Bits));
     else
-        BS->Skip4(Bits);
+        BS->Skip(Bits);
 }
 
 //---------------------------------------------------------------------------
 void File__Analyze::Skip_S5(size_t Bits, const char* Name)
 {
     INTEGRITY(Bits<=BS->Remain(), "Size is wrong", BS->Offset_Get())
-    if (Config_DetailsLevel>0)
+    if (Trace_Activated)
         Param(Name, BS->Get8(Bits));
     else
-        BS->Skip8(Bits);
+        BS->Skip(Bits);
 }
 
 //---------------------------------------------------------------------------
 void File__Analyze::Skip_S6(size_t Bits, const char* Name)
 {
     INTEGRITY(Bits<=BS->Remain(), "Size is wrong", BS->Offset_Get())
-    if (Config_DetailsLevel>0)
+    if (Trace_Activated)
         Param(Name, BS->Get8(Bits));
     else
-        BS->Skip8(Bits);
+        BS->Skip(Bits);
 }
 
 //---------------------------------------------------------------------------
 void File__Analyze::Skip_S7(size_t Bits, const char* Name)
 {
     INTEGRITY(Bits<=BS->Remain(), "Size is wrong", BS->Offset_Get())
-    if (Config_DetailsLevel>0)
+    if (Trace_Activated)
         Param(Name, BS->Get8(Bits));
     else
-        BS->Skip8(Bits);
+        BS->Skip(Bits);
 }
 
 //---------------------------------------------------------------------------
 void File__Analyze::Skip_S8(size_t Bits, const char* Name)
 {
     INTEGRITY(Bits<=BS->Remain(), "Size is wrong", BS->Offset_Get())
-    if (Config_DetailsLevel>0)
+    if (Trace_Activated)
         Param(Name, BS->Get8(Bits));
     else
-        BS->Skip8(Bits);
+        BS->Skip(Bits);
 }
 
 //---------------------------------------------------------------------------
@@ -1781,6 +2193,274 @@
     }
 }
 
+//***************************************************************************
+// BitStream (Little Endian)
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File__Analyze::Get_BT(size_t Bits, int32u &Info, const char* Name)
+{
+    INTEGRITY_INT(Bits<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    Info=BT->Get(Bits);
+    if (Trace_Activated) Param(Name, Info);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Get_TB(             bool &Info, const char* Name)
+{
+    INTEGRITY_INT(1<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    Info=BT->GetB();
+    if (Trace_Activated) Param(Name, Info);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Get_T1(size_t Bits, int8u &Info, const char* Name)
+{
+    INTEGRITY_INT(Bits<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    Info=BT->Get1(Bits);
+    if (Trace_Activated)
+    {
+        Param(Name, Info);
+        Param_Info(__T("(")+Ztring::ToZtring(Bits)+__T(" bits)"));
+    }
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Get_T2(size_t Bits, int16u &Info, const char* Name)
+{
+    INTEGRITY_INT(Bits<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    Info=BT->Get2(Bits);
+    if (Trace_Activated) Param(Name, Info);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Get_T3(size_t Bits, int32u &Info, const char* Name)
+{
+    INTEGRITY_INT(Bits<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    Info=BT->Get4(Bits);
+    if (Trace_Activated) Param(Name, Info);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Get_T4(size_t Bits, int32u &Info, const char* Name)
+{
+    INTEGRITY_INT(Bits<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    Info=BT->Get4(Bits);
+    if (Trace_Activated) Param(Name, Info);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Get_T5(size_t Bits, int64u &Info, const char* Name)
+{
+    INTEGRITY_INT(Bits<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    Info=BT->Get8(Bits);
+    if (Trace_Activated) Param(Name, Info);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Get_T6(size_t Bits, int64u &Info, const char* Name)
+{
+    INTEGRITY_INT(Bits<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    Info=BT->Get8(Bits);
+    if (Trace_Activated) Param(Name, Info);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Get_T7(size_t Bits, int64u &Info, const char* Name)
+{
+    INTEGRITY_INT(Bits<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    Info=BT->Get8(Bits);
+    if (Trace_Activated) Param(Name, Info);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Get_T8(size_t Bits, int64u &Info, const char* Name)
+{
+    INTEGRITY_INT(Bits<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    Info=BT->Get8(Bits);
+    if (Trace_Activated) Param(Name, Info);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Peek_BT(size_t Bits, int32u &Info)
+{
+    INTEGRITY_INT(Bits<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    Info=BT->Peek(Bits);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Peek_TB(              bool &Info)
+{
+    INTEGRITY_INT(1<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    Info=BT->PeekB();
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Peek_T1(size_t Bits, int8u &Info)
+{
+    INTEGRITY_INT(Bits<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    Info=BT->Peek1(Bits);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Peek_T2(size_t Bits, int16u &Info)
+{
+    INTEGRITY_INT(Bits<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    Info=BT->Peek2(Bits);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Peek_T3(size_t Bits, int32u &Info)
+{
+    INTEGRITY_INT(Bits<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    Info=BT->Peek4(Bits);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Peek_T4(size_t Bits, int32u &Info)
+{
+    INTEGRITY_INT(Bits<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    Info=BT->Peek4(Bits);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Peek_T5(size_t Bits, int64u &Info)
+{
+    INTEGRITY_INT(Bits<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    Info=BT->Peek8(Bits);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Peek_T6(size_t Bits, int64u &Info)
+{
+    INTEGRITY_INT(Bits<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    Info=BT->Peek8(Bits);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Peek_T7(size_t Bits, int64u &Info)
+{
+    INTEGRITY_INT(Bits<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    Info=BT->Peek8(Bits);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Peek_T8(size_t Bits, int64u &Info)
+{
+    INTEGRITY_INT(Bits<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    Info=BT->Peek8(Bits);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Skip_BT(size_t Bits, const char* Name)
+{
+    INTEGRITY(Bits<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    if (Trace_Activated)
+    {
+        if (Bits<=32) //TODO: in BitStream.h, handle >32 bit gets
+            Param(Name, BT->Get(Bits));
+        else
+        {
+            Param(Name, "(Data)");
+            BT->Skip(Bits);
+        }
+    }
+    else
+        BT->Skip(Bits);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Skip_TB(              const char* Name)
+{
+    INTEGRITY(1<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    if (Trace_Activated)
+        Param(Name, BT->GetB());
+    else
+        BT->SkipB();
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Skip_T1(size_t Bits, const char* Name)
+{
+    INTEGRITY(Bits<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    if (Trace_Activated)
+    {
+        Param(Name, BT->Get1(Bits));
+        Param_Info(__T("(")+Ztring::ToZtring(Bits)+__T(" bits)"));
+    }
+    else
+        BT->Skip1(Bits);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Skip_T2(size_t Bits, const char* Name)
+{
+    INTEGRITY(Bits<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    if (Trace_Activated)
+        Param(Name, BT->Get2(Bits));
+    else
+        BT->Skip2(Bits);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Skip_T3(size_t Bits, const char* Name)
+{
+    INTEGRITY(Bits<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    if (Trace_Activated)
+        Param(Name, BT->Get4(Bits));
+    else
+        BT->Skip4(Bits);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Skip_T4(size_t Bits, const char* Name)
+{
+    INTEGRITY(Bits<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    if (Trace_Activated)
+        Param(Name, BT->Get4(Bits));
+    else
+        BT->Skip4(Bits);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Skip_T5(size_t Bits, const char* Name)
+{
+    INTEGRITY(Bits<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    if (Trace_Activated)
+        Param(Name, BT->Get8(Bits));
+    else
+        BT->Skip8(Bits);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Skip_T6(size_t Bits, const char* Name)
+{
+    INTEGRITY(Bits<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    if (Trace_Activated)
+        Param(Name, BT->Get8(Bits));
+    else
+        BT->Skip8(Bits);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Skip_T7(size_t Bits, const char* Name)
+{
+    INTEGRITY(Bits<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    if (Trace_Activated)
+        Param(Name, BT->Get8(Bits));
+    else
+        BT->Skip8(Bits);
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Skip_T8(size_t Bits, const char* Name)
+{
+    INTEGRITY(Bits<=BT->Remain(), "Size is wrong", BT->Offset_Get())
+    if (Trace_Activated)
+        Param(Name, BT->Get8(Bits));
+    else
+        BT->Skip8(Bits);
+}
+
 } //NameSpace
 #endif //MEDIAINFO_TRACE
-

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/File__Analyze_Buffer_MinimizeSize.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/File__Analyze_Buffer_MinimizeSize.cpp Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/File__Analyze_MinimizeSize.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/File__Analyze_MinimizeSize.h Changed

@@ -1,3 +1,27 @@
+// File__Analyze -
+// Copyright (C) 2009-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_File__AnalyzeMinimizeSizeH
+#define MediaInfo_File__AnalyzeMinimizeSizeH
+//---------------------------------------------------------------------------
+
 //***************************************************************************
 // Class File__Analyze
 //***************************************************************************
@@ -21,10 +45,15 @@
     void    Open_Buffer_Init        (File__Analyze* Sub, int64u File_Size);
     void    Open_Buffer_Continue    (                    const int8u* Buffer, size_t Buffer_Size);
     void    Open_Buffer_Continue    (File__Analyze* Sub, const int8u* Buffer, size_t Buffer_Size);
-    void    Open_Buffer_Continue    (File__Analyze* Sub, size_t Buffer_Size) {Open_Buffer_Continue(Sub, Buffer+Buffer_Offset+(size_t)Element_Offset, Buffer_Size); Element_Offset+=Buffer_Size;}
-    void    Open_Buffer_Continue    (File__Analyze* Sub) {Open_Buffer_Continue(Sub, Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)(Element_Size-Element_Offset)); Element_Offset=Element_Size;}
+    void    Open_Buffer_Continue    (File__Analyze* Sub, size_t Buffer_Size) {if (Element_Offset+Buffer_Size<=Element_Size) Open_Buffer_Continue(Sub, Buffer+Buffer_Offset+(size_t)Element_Offset, Buffer_Size); Element_Offset+=Buffer_Size;}
+    void    Open_Buffer_Continue    (File__Analyze* Sub) {if (Element_Offset<=Element_Size) Open_Buffer_Continue(Sub, Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)(Element_Size-Element_Offset)); Element_Offset=Element_Size;}
     void    Open_Buffer_Position_Set(int64u File_Offset);
+    #if MEDIAINFO_SEEK
+    size_t  Open_Buffer_Seek        (size_t Method, int64u Value, int64u ID);
+    #endif //MEDIAINFO_SEEK
     void    Open_Buffer_Unsynch     ();
+    void    Open_Buffer_Update      ();
+    void    Open_Buffer_Update      (File__Analyze* Sub);
     void    Open_Buffer_Finalize    (bool NoBufferModification=false);
     void    Open_Buffer_Finalize    (File__Analyze* Sub);
 
@@ -40,22 +69,60 @@
         int8u   StreamIDs_Width[16];
         int8u   ParserIDs[16];
     #endif //MEDIAINFO_EVENTS
+    #if MEDIAINFO_DEMUX
+        int8u   Demux_Level; //bit 0=frame, bit 1=container, bit 2=elementary (eg MPEG-TS), default with frame set
+        bool    Demux_random_access;
+        bool    Demux_UnpacketizeContainer;
+        bool    Demux_IntermediateItemFound;
+        size_t  Demux_Offset;
+        int64u  Demux_TotalBytes;
+    #endif //MEDIAINFO_DEMUX
     Ztring  File_Name_WithoutDemux;
     bool   PTS_DTS_Needed;
-    int64u PCR; //In nanoseconds
-    int64u PTS; //In nanoseconds
-    int64u DTS; //In nanoseconds
+    struct frame_info
+    {
+        int64u Buffer_Offset;
+        int64u PCR; //In nanoseconds
+        int64u PTS; //In nanoseconds
+        int64u DTS; //In nanoseconds
+        int64u DUR; //In nanoseconds
+
+        frame_info()
+        {
+            Buffer_Offset=0;
+            PCR=(int64u)-1;
+            PTS=(int64u)-1;
+            DTS=(int64u)-1;
+            DUR=(int64u)-1;
+        }
+    };
+    frame_info FrameInfo;
+    frame_info FrameInfo_Previous;
+    frame_info FrameInfo_Next;
 
     //Out
-    int64u PTS_DTS_Offset_InThisBlock; //In nanoseconds
-    size_t Frame_Count_InThisBlock;
+    int64u PTS_Begin;                  //In nanoseconds
+    int64u PTS_End;                    //In nanoseconds
+    int64u DTS_Begin;                  //In nanoseconds
+    int64u DTS_End;                    //In nanoseconds
+    int64u Frame_Count;
+    int64u Frame_Count_Previous;
+    int64u Frame_Count_InThisBlock;
+    int64u Field_Count;
+    int64u Field_Count_Previous;
+    int64u Field_Count_InThisBlock;
+    int64u Frame_Count_NotParsedIncluded;
+    bool   Synched;                    //Data is synched
+    bool   MustExtendParsingDuration;  //Data has some substreams difficult to detect (e.g. captions), must wait a bit before final filling
 
 protected :
     //***************************************************************************
     // Streams management
     //***************************************************************************
 
+    virtual void Streams_Accept()                                               {};
     virtual void Streams_Fill()                                                 {};
+    virtual void Streams_Update()                                               {};
     virtual void Streams_Finish()                                               {};
 
     //***************************************************************************
@@ -66,6 +133,7 @@
     virtual bool Synched_Test()   {return true;}; //Test is synchro is OK
     virtual void Synched_Init()   {}; //When synched, we can Init data
     bool Synchro_Manage();
+    bool Synchro_Manage_Test();
 
     //***************************************************************************
     // Buffer
@@ -74,8 +142,13 @@
     //Buffer
     virtual void Read_Buffer_Init ()          {}; //Temp, should be in File__Base caller
     virtual void Read_Buffer_Continue ()      {}; //Temp, should be in File__Base caller
-    virtual void Read_Buffer_Continue_Once () {}; //Temp, should be in File__Base caller
+    virtual void Read_Buffer_AfterParsing ()  {}; //Temp, should be in File__Base caller
+    #if MEDIAINFO_SEEK
+    virtual size_t Read_Buffer_Seek (size_t, int64u, int64u); //Temp, should be in File__Base caller
+    size_t Read_Buffer_Seek_OneFramePerFile (size_t, int64u, int64u);
+    #endif //MEDIAINFO_SEEK
     virtual void Read_Buffer_Unsynched ()     {}; //Temp, should be in File__Base caller
+    void Read_Buffer_Unsynched_OneFramePerFile ();
     virtual void Read_Buffer_Finalize ()      {}; //Temp, should be in File__Base caller
     bool Buffer_Parse();
 
@@ -159,38 +232,27 @@
 
     //Elements - Begin
     void Element_Begin ();
-    inline void Element_Begin (const Ztring &, int64u Size=(int64u)-1) {Element_Begin(Size);}
-    void Element_Begin (int64u Size);
-    inline void Element_Begin (const char *, int64u Size=(int64u)-1) {Element_Begin(Size);}
+    #define Element_Begin0() Element_Begin()
+    #define Element_Begin1(_NAME) Element_Begin()
+    #define Element_Trace_Begin0()
+    #define Element_Trace_Begin1(_NAME)
 
     //Elements - Name
     #define Element_Name(_A)
 
     //Elements - Info
-    inline void Element_Info (const Ztring &) {}
-    inline void Element_Info (const char*) {}
-    inline void Element_Info (const char*, const char* ) {}
-    inline void Element_Info (int8s      , const char* =NULL) {}
-    inline void Element_Info (int8u      , const char* =NULL) {}
-    inline void Element_Info (int16s     , const char* =NULL) {}
-    inline void Element_Info (int16u     , const char* =NULL) {}
-    inline void Element_Info (int32s     , const char* =NULL) {}
-    inline void Element_Info (int32u     , const char* =NULL) {}
-    inline void Element_Info (int64s     , const char* =NULL) {}
-    inline void Element_Info (int64u     , const char* =NULL) {}
-    inline void Element_Info (int128u    , const char* =NULL) {}
-    #ifdef NEED_SIZET
-    inline void Element_Info (size_t     , const char* =NULL) {}
-    #endif //NEED_SIZET
-    inline void Element_Info (float32    , int8u =3, const char* =NULL) {}
-    inline void Element_Info (float64    , int8u =3, const char* =NULL) {}
+    #define Element_Info1(_A)
+    #define Element_Info2(_A,_B)
+    #define Element_Info3(_A,_B,_C)
+    #define Element_Info1C(_CONDITION,_A)
     #define Element_Info_From_Milliseconds(_A)
 
     //Elements - End
-    void Element_End ();
-    inline void Element_End (const Ztring &, int64u Size=(int64u)-1) {Element_End(Size);}
-    void Element_End (int64u Size);
-    inline void Element_End (const char*   , int64u Size=(int64u)-1) {Element_End(Size);}
+    inline void Element_End () {Element_End_Common_Flush();}
+    #define Element_End0() Element_End()
+    #define Element_End1(_NAME) Element_End()
+    #define Element_Trace_End0()
+    #define Element_Trace_End1(_NAME)
 
     //Elements - Preparation of element from external app
     void Element_Prepare (int64u Size);
@@ -205,63 +267,19 @@
     // Param
     //***************************************************************************
 
-    //TODO: put this in Ztring()
-    Ztring ToZtring(const char* Value, size_t Value_Size=Unlimited, bool Utf8=true)
-    {
-        if (Utf8)
-            return Ztring().From_UTF8(Value, Value_Size);
-        else
-            return Ztring().From_Local(Value, Value_Size);
-    }
-    #define VALUE(Value) \
-        Ztring::ToZtring(Value, 16).MakeUpperCase()+_T(" (")+Ztring::ToZtring(Value, 10).MakeUpperCase()+_T(")")
-
     //Param - Main
-    inline void Param      (const Ztring &, const Ztring&) {}
-    inline void Param      (const char*, const Ztring&) {}
-    inline void Param      (const char*, const std::string&) {}
-    inline void Param      (const char*, const char*, size_t =Unlimited, bool =true) {}
-    inline void Param      (const char*, const int8u*, size_t =Unlimited, bool =true) {}
-    inline void Param      (const char*, bool) {}
-    inline void Param      (const char*, int8u) {}
-    inline void Param      (const char*, int8s) {}
-    inline void Param      (const char*, int16u) {}
-    inline void Param      (const char*, int16s) {}
-    inline void Param      (const char*, int32u) {}
-    inline void Param      (const char*, int32s) {}
-    inline void Param      (const char*, int64u) {}
-    inline void Param      (const char*, int64s) {}
-    inline void Param      (const char*, int128u) {}
-    inline void Param_GUID (const char*, int128u) {}
-    inline void Param_UUID (const char*, int128u) {}
-    #ifdef NEED_SIZET
-    inline void Param      (const char*, size_t, intu =16) {}
-    #endif //NEED_SIZET
-    inline void Param      (const char*, float32, intu =3) {}
-    inline void Param      (const char*, float64, intu =3) {}
-    inline void Param      (const char*, float80, intu =3)  {}
-    inline void Param      (const int32u, const Ztring&) {}
-    inline void Param      (const int16u, const Ztring&) {}
+    #define Param1(_A)
+    #define Param2(_A,_B)
+    #define Param3(_A,_B,_C)
 
     //Param - Info
-    inline void Param_Info (const Ztring &) {}
-    inline void Param_Info (const char*) {}
-    inline void Param_Info (const char*, const char*) {}
-    inline void Param_Info (int64u     , const char* =NULL) {}
-    inline void Param_Info (int64s     , const char* =NULL) {}
-    inline void Param_Info (int32u     , const char* =NULL) {}
-    inline void Param_Info (int32s     , const char* =NULL) {}
-    inline void Param_Info (int16u     , const char* =NULL) {}
-    inline void Param_Info (int16s     , const char* =NULL) {}
-    inline void Param_Info (int8u      , const char* =NULL) {}
-    inline void Param_Info (int8s      , const char* =NULL) {}
-    inline void Param_Info (float32    , int8u =3, const char* =NULL) {}
-    inline void Param_Info (float64    , int8u =3, const char* =NULL) {}
-    inline void Param_Info (float80    , int8u =3, const char* =NULL) {}
-    #ifdef NEED_SIZET
-    inline void Param_Info (size_t     , const char* =NULL) {}
-    #endif //NEED_SIZET
-    inline void Param_Info_From_Milliseconds (int64u) {}
+    #define Param_Info1(_A)
+    #define Param_Info2(_A,_B)
+    #define Param_Info3(_A,_B,_C)
+    #define Param_Info1C(_CONDITION,_A)
+    #define Param_Info2C(_CONDITION,_A,_B)
+    #define Param_Info3C(_CONDITION,_A,_B,_C)
+    #define Param_Info_From_Milliseconds(A)
 
     //***************************************************************************
     // Information
@@ -273,32 +291,32 @@
     // Big Endian (Integer, Float, Fixed-Point)
     //***************************************************************************
 
-    void Get_B1   (int8u   &Info);
-    void Get_B2   (int16u  &Info);
-    void Get_B3   (int32u  &Info);
-    void Get_B4   (int32u  &Info);
-    void Get_B5   (int64u  &Info);
-    void Get_B6   (int64u  &Info);
-    void Get_B7   (int64u  &Info);
-    void Get_B8   (int64u  &Info);
-    void Get_B16  (int128u &Info);
-    void Get_BF4  (float32 &Info);
-    void Get_BF8  (float64 &Info);
-    void Get_BF10 (float80 &Info);
-    void Get_BFP4 (size_t Bits, float32 &Info);
-    inline void Get_B1   (int8u   &Info, const char*) {Get_B1(Info);}
-    inline void Get_B2   (int16u  &Info, const char*) {Get_B2(Info);}
-    inline void Get_B3   (int32u  &Info, const char*) {Get_B3(Info);}
-    inline void Get_B4   (int32u  &Info, const char*) {Get_B4(Info);}
-    inline void Get_B5   (int64u  &Info, const char*) {Get_B5(Info);}
-    inline void Get_B6   (int64u  &Info, const char*) {Get_B6(Info);}
-    inline void Get_B7   (int64u  &Info, const char*) {Get_B7(Info);}
-    inline void Get_B8   (int64u  &Info, const char*) {Get_B8(Info);}
-    inline void Get_B16  (int128u &Info, const char*) {Get_B16(Info);}
-    inline void Get_BF4  (float32 &Info, const char*) {Get_BF4(Info);}
-    inline void Get_BF8  (float64 &Info, const char*) {Get_BF8(Info);}
-    inline void Get_BF10 (float80 &Info, const char*) {Get_BF10(Info);}
-    inline void Get_BFP4 (size_t Bits, float32 &Info, const char*) {Get_BFP4(Bits, Info);}
+    void Get_B1_   (int8u   &Info);
+    void Get_B2_   (int16u  &Info);
+    void Get_B3_   (int32u  &Info);
+    void Get_B4_   (int32u  &Info);
+    void Get_B5_   (int64u  &Info);
+    void Get_B6_   (int64u  &Info);
+    void Get_B7_   (int64u  &Info);
+    void Get_B8_   (int64u  &Info);
+    void Get_B16_  (int128u &Info);
+    void Get_BF4_  (float32 &Info);
+    void Get_BF8_  (float64 &Info);
+    void Get_BF10_ (float80 &Info);
+    void Get_BFP4_ (int8u  Bits, float32 &Info);
+    #define Get_B1(Info, Name) Get_B1_(Info)
+    #define Get_B2(Info, Name) Get_B2_(Info)
+    #define Get_B3(Info, Name) Get_B3_(Info)
+    #define Get_B4(Info, Name) Get_B4_(Info)
+    #define Get_B5(Info, Name) Get_B5_(Info)
+    #define Get_B6(Info, Name) Get_B6_(Info)
+    #define Get_B7(Info, Name) Get_B7_(Info)
+    #define Get_B8(Info, Name) Get_B8_(Info)
+    #define Get_B16(Info, Name) Get_B16_(Info)
+    #define Get_BF4(Info, Name) Get_BF4_(Info)
+    #define Get_BF8(Info, Name) Get_BF8_(Info)
+    #define Get_BF10(Info, Name) Get_BF10_(Info)
+    #define Get_BFP4(Bits, Info, Name) Get_BFP4_(Bits, Info)
     void Peek_B1  (int8u   &Info);
     void Peek_B2  (int16u  &Info);
     void Peek_B3  (int32u  &Info);
@@ -311,92 +329,170 @@
     void Peek_BF4 (float32 &Info);
     void Peek_BF8 (float64 &Info);
     void Peek_BF10(float64 &Info);
-    void Peek_BFP4(size_t Bits, float64 &Info);
-    inline void Skip_B1  (               const char*) {if (Element_Offset+1>Element_Size) {Trusted_IsNot(); return;} Element_Offset+=1;}
-    inline void Skip_B2  (               const char*) {if (Element_Offset+2>Element_Size) {Trusted_IsNot(); return;} Element_Offset+=2;}
-    inline void Skip_B3  (               const char*) {if (Element_Offset+3>Element_Size) {Trusted_IsNot(); return;} Element_Offset+=3;}
-    inline void Skip_B4  (               const char*) {if (Element_Offset+4>Element_Size) {Trusted_IsNot(); return;} Element_Offset+=4;}
-    inline void Skip_B5  (               const char*) {if (Element_Offset+5>Element_Size) {Trusted_IsNot(); return;} Element_Offset+=5;}
-    inline void Skip_B6  (               const char*) {if (Element_Offset+6>Element_Size) {Trusted_IsNot(); return;} Element_Offset+=6;}
-    inline void Skip_B7  (               const char*) {if (Element_Offset+7>Element_Size) {Trusted_IsNot(); return;} Element_Offset+=7;}
-    inline void Skip_B8  (               const char*) {if (Element_Offset+8>Element_Size) {Trusted_IsNot(); return;} Element_Offset+=8;}
-    inline void Skip_BF4 (               const char*) {if (Element_Offset+4>Element_Size) {Trusted_IsNot(); return;} Element_Offset+=4;}
-    inline void Skip_BF8 (               const char*) {if (Element_Offset+8>Element_Size) {Trusted_IsNot(); return;} Element_Offset+=8;}
-    inline void Skip_B16 (               const char*) {if (Element_Offset+16>Element_Size) {Trusted_IsNot(); return;} Element_Offset+=16;}
-    inline void Skip_BFP4(size_t,                     const char*) {if (Element_Offset+4>Element_Size) {Trusted_IsNot(); return;} Element_Offset+=4;};
-    #define Info_B1(_INFO, _NAME)   int8u   _INFO; Get_B1 (_INFO, _NAME)
-    #define Info_B2(_INFO, _NAME)   int16u  _INFO; Get_B2 (_INFO, _NAME)
-    #define Info_B3(_INFO, _NAME)   int32u  _INFO; Get_B3 (_INFO, _NAME)
-    #define Info_B4(_INFO, _NAME)   int32u  _INFO; Get_B4 (_INFO, _NAME)
-    #define Info_B5(_INFO, _NAME)   int64u  _INFO; Get_B5 (_INFO, _NAME)
-    #define Info_B6(_INFO, _NAME)   int64u  _INFO; Get_B6 (_INFO, _NAME)
-    #define Info_B7(_INFO, _NAME)   int64u  _INFO; Get_B7 (_INFO, _NAME)
-    #define Info_B8(_INFO, _NAME)   int64u  _INFO; Get_B8 (_INFO, _NAME)
-    #define Info_B16(_INFO, _NAME)  int128u _INFO; Get_B16(_INFO, _NAME)
-    #define Info_BF4(_INFO, _NAME)  float32 _INFO; Get_BF4(_INFO, _NAME)
-    #define Info_BF8(_INFO, _NAME)  float64 _INFO; Get_BF8(_INFO, _NAME)
-    #define Info_BF10(_INFO, _NAME) float80 _INFO; Get_BF8(_INFO, _NAME)
-    #define Info_BFP4(_BITS, _INFO, _NAME) float32 _INFO; Get_BFP4(_BITS, _INFO, _NAME)
+    void Peek_BFP4(int8u  Bits, float64 &Info);
+    #define Skip_B1(Name) Element_Offset++
+    #define Skip_B2(Name) Element_Offset+=2
+    #define Skip_B3(Name) Element_Offset+=3
+    #define Skip_B4(Name) Element_Offset+=4
+    #define Skip_B5(Name) Element_Offset+=5
+    #define Skip_B6(Name) Element_Offset+=6
+    #define Skip_B7(Name) Element_Offset+=7
+    #define Skip_B8(Name) Element_Offset+=8
+    #define Skip_BF4(Name) Element_Offset+=4
+    #define Skip_BF8(Name) Element_Offset+=8
+    #define Skip_B16(Name) Element_Offset+=16
+    #define Skip_BFP4(Size, Name) Element_Offset+=4
+    #define Info_B1(_INFO, _NAME)   Element_Offset++
+    #define Info_B2(_INFO, _NAME)   Element_Offset+=2
+    #define Info_B3(_INFO, _NAME)   Element_Offset+=3
+    #define Info_B4(_INFO, _NAME)   Element_Offset+=4
+    #define Info_B5(_INFO, _NAME)   Element_Offset+=5
+    #define Info_B6(_INFO, _NAME)   Element_Offset+=6
+    #define Info_B7(_INFO, _NAME)   Element_Offset+=7
+    #define Info_B8(_INFO, _NAME)   Element_Offset+=8
+    #define Info_B16(_INFO, _NAME)  Element_Offset+=16
+    #define Info_BF4(_INFO, _NAME)  Element_Offset+=4
+    #define Info_BF8(_INFO, _NAME)  Element_Offset+=8
+    #define Info_BF10(_INFO, _NAME) Element_Offset+=10
+    #define Info_BFP4(_BITS, _INFO, _NAME) Element_Offset+=4
 
     //***************************************************************************
     // Little Endian
     //***************************************************************************
 
-    void Get_L1  (int8u   &Info);
-    void Get_L2  (int16u  &Info);
-    void Get_L3  (int32u  &Info);
-    void Get_L4  (int32u  &Info);
-    void Get_L5  (int64u  &Info);
-    void Get_L6  (int64u  &Info);
-    void Get_L7  (int64u  &Info);
-    void Get_L8  (int64u  &Info);
-    void Get_L16 (int128u &Info);
-    void Get_LF4 (float32 &Info);
-    void Get_LF8 (float64 &Info);
-    inline void Get_L1  (int8u   &Info, const char*) {Get_L1(Info);}
-    inline void Get_L2  (int16u  &Info, const char*) {Get_L2(Info);}
-    inline void Get_L3  (int32u  &Info, const char*) {Get_L3(Info);}
-    inline void Get_L4  (int32u  &Info, const char*) {Get_L4(Info);}
-    inline void Get_L5  (int64u  &Info, const char*) {Get_L5(Info);}
-    inline void Get_L6  (int64u  &Info, const char*) {Get_L6(Info);}
-    inline void Get_L7  (int64u  &Info, const char*) {Get_L7(Info);}
-    inline void Get_L8  (int64u  &Info, const char*) {Get_L8(Info);}
-    inline void Get_L16 (int128u &Info, const char*) {Get_L16(Info);}
-    inline void Get_LF4 (float32 &Info, const char*) {Get_LF4(Info);}
-    inline void Get_LF8 (float64 &Info, const char*) {Get_LF8(Info);}
-    void Peek_L1 (int8u   &Info);
-    void Peek_L2 (int16u  &Info);
-    void Peek_L3 (int32u  &Info);
-    void Peek_L4 (int32u  &Info);
-    void Peek_L5 (int64u  &Info);
-    void Peek_L6 (int64u  &Info);
-    void Peek_L7 (int64u  &Info);
-    void Peek_L8 (int64u  &Info);
-    void Peek_L16(int128u &Info);
-    void Peek_LF4(float32 &Info);
-    void Peek_LF8(float64 &Info);
-    inline void Skip_L1  (               const char*) {if (Element_Offset+1>Element_Size) {Trusted_IsNot(); return;} Element_Offset+=1;}
-    inline void Skip_L2  (               const char*) {if (Element_Offset+2>Element_Size) {Trusted_IsNot(); return;} Element_Offset+=2;}
-    inline void Skip_L3  (               const char*) {if (Element_Offset+3>Element_Size) {Trusted_IsNot(); return;} Element_Offset+=3;}
-    inline void Skip_L4  (               const char*) {if (Element_Offset+4>Element_Size) {Trusted_IsNot(); return;} Element_Offset+=4;}
-    inline void Skip_L5  (               const char*) {if (Element_Offset+5>Element_Size) {Trusted_IsNot(); return;} Element_Offset+=5;}
-    inline void Skip_L6  (               const char*) {if (Element_Offset+6>Element_Size) {Trusted_IsNot(); return;} Element_Offset+=6;}
-    inline void Skip_L7  (               const char*) {if (Element_Offset+7>Element_Size) {Trusted_IsNot(); return;} Element_Offset+=7;}
-    inline void Skip_L8  (               const char*) {if (Element_Offset+8>Element_Size) {Trusted_IsNot(); return;} Element_Offset+=8;}
-    inline void Skip_LF4 (               const char*) {if (Element_Offset+4>Element_Size) {Trusted_IsNot(); return;} Element_Offset+=4;}
-    inline void Skip_LF8 (               const char*) {if (Element_Offset+8>Element_Size) {Trusted_IsNot(); return;} Element_Offset+=8;}
-    inline void Skip_L16 (               const char*) {if (Element_Offset+16>Element_Size) {Trusted_IsNot(); return;} Element_Offset+=16;}
-    #define Info_L1(_INFO, _NAME)  int8u   _INFO; Get_L1 (_INFO, _NAME)
-    #define Info_L2(_INFO, _NAME)  int16u  _INFO; Get_L2 (_INFO, _NAME)
-    #define Info_L3(_INFO, _NAME)  int32u  _INFO; Get_L3 (_INFO, _NAME)
-    #define Info_L4(_INFO, _NAME)  int32u  _INFO; Get_L4 (_INFO, _NAME)
-    #define Info_L5(_INFO, _NAME)  int64u  _INFO; Get_L5 (_INFO, _NAME)
-    #define Info_L6(_INFO, _NAME)  int64u  _INFO; Get_L6 (_INFO, _NAME)
-    #define Info_L7(_INFO, _NAME)  int64u  _INFO; Get_L7 (_INFO, _NAME)
-    #define Info_L8(_INFO, _NAME)  int64u  _INFO; Get_L8 (_INFO, _NAME)
-    #define Info_L16(_INFO, _NAME) int128u _INFO; Get_L16(_INFO, _NAME)
-    #define Info_LF4(_INFO, _NAME) float32 _INFO; Get_LF4(_INFO, _NAME)
-    #define Info_LF8(_INFO, _NAME) float64 _INFO; Get_LF8(_INFO, _NAME)
+    void Get_L1_   (int8u   &Info);
+    void Get_L2_   (int16u  &Info);
+    void Get_L3_   (int32u  &Info);
+    void Get_L4_   (int32u  &Info);
+    void Get_L5_   (int64u  &Info);
+    void Get_L6_   (int64u  &Info);
+    void Get_L7_   (int64u  &Info);
+    void Get_L8_   (int64u  &Info);
+    void Get_L16_  (int128u &Info);
+    void Get_LF4_  (float32 &Info);
+    void Get_LF8_  (float64 &Info);
+    void Get_LF10_ (float80 &Info);
+    void Get_LFP4_ (int8u  Bits, float32 &Info);
+    #define Get_L1(Info, Name) Get_L1_(Info)
+    #define Get_L2(Info, Name) Get_L2_(Info)
+    #define Get_L3(Info, Name) Get_L3_(Info)
+    #define Get_L4(Info, Name) Get_L4_(Info)
+    #define Get_L5(Info, Name) Get_L5_(Info)
+    #define Get_L6(Info, Name) Get_L6_(Info)
+    #define Get_L7(Info, Name) Get_L7_(Info)
+    #define Get_L8(Info, Name) Get_L8_(Info)
+    #define Get_L16(Info, Name) Get_L16_(Info)
+    #define Get_LF4(Info, Name) Get_LF4_(Info)
+    #define Get_LF8(Info, Name) Get_LF8_(Info)
+    #define Get_LF10(Info, Name) Get_LF10_(Info)
+    #define Get_LFP4(Bits, Info, Name) Get_LFP4_(Bits, Info)
+    void Peek_L1  (int8u   &Info);
+    void Peek_L2  (int16u  &Info);
+    void Peek_L3  (int32u  &Info);
+    void Peek_L4  (int32u  &Info);
+    void Peek_L5  (int64u  &Info);
+    void Peek_L6  (int64u  &Info);
+    void Peek_L7  (int64u  &Info);
+    void Peek_L8  (int64u  &Info);
+    void Peek_L16 (int128u &Info);
+    void Peek_LF4 (float32 &Info);
+    void Peek_LF8 (float64 &Info);
+    void Peek_LF10(float64 &Info);
+    void Peek_LFP4(int8u  Bits, float64 &Info);
+    #define Skip_L1(Name) Element_Offset++
+    #define Skip_L2(Name) Element_Offset+=2
+    #define Skip_L3(Name) Element_Offset+=3
+    #define Skip_L4(Name) Element_Offset+=4
+    #define Skip_L5(Name) Element_Offset+=5
+    #define Skip_L6(Name) Element_Offset+=6
+    #define Skip_L7(Name) Element_Offset+=7
+    #define Skip_L8(Name) Element_Offset+=8
+    #define Skip_LF4(Name) Element_Offset+=4
+    #define Skip_LF8(Name) Element_Offset+=8
+    #define Skip_L16(Name) Element_Offset+=16
+    #define Skip_LFP4(Size, Name) Element_Offset+=4
+    #define Info_L1(_INFO, _NAME)   Element_Offset++
+    #define Info_L2(_INFO, _NAME)   Element_Offset+=2
+    #define Info_L3(_INFO, _NAME)   Element_Offset+=3
+    #define Info_L4(_INFO, _NAME)   Element_Offset+=4
+    #define Info_L5(_INFO, _NAME)   Element_Offset+=5
+    #define Info_L6(_INFO, _NAME)   Element_Offset+=6
+    #define Info_L7(_INFO, _NAME)   Element_Offset+=7
+    #define Info_L8(_INFO, _NAME)   Element_Offset+=8
+    #define Info_L16(_INFO, _NAME)  Element_Offset+=16
+    #define Info_LF4(_INFO, _NAME)  Element_Offset+=4
+    #define Info_LF8(_INFO, _NAME)  Element_Offset+=8
+    #define Info_LF10(_INFO, _NAME) Element_Offset+=10
+    #define Info_LFP4(_LITS, _INFO, _NAME) Element_Offset+=4
+
+    //***************************************************************************
+    // Little and Big Endian together
+    //***************************************************************************
+
+    void Get_D1_   (int8u   &Info);
+    void Get_D2_   (int16u  &Info);
+    void Get_D3_   (int32u  &Info);
+    void Get_D4_   (int32u  &Info);
+    void Get_D5_   (int64u  &Info);
+    void Get_D6_   (int64u  &Info);
+    void Get_D7_   (int64u  &Info);
+    void Get_D8_   (int64u  &Info);
+    void Get_D16_  (int128u &Info);
+    void Get_DF4_  (float32 &Info);
+    void Get_DF8_  (float64 &Info);
+    void Get_DF10_ (float80 &Info);
+    void Get_DFP4_ (int8u  Bits, float32 &Info);
+    #define Get_D1(Info, Name) Get_D1_(Info)
+    #define Get_D2(Info, Name) Get_D2_(Info)
+    #define Get_D3(Info, Name) Get_D3_(Info)
+    #define Get_D4(Info, Name) Get_D4_(Info)
+    #define Get_D5(Info, Name) Get_D5_(Info)
+    #define Get_D6(Info, Name) Get_D6_(Info)
+    #define Get_D7(Info, Name) Get_D7_(Info)
+    #define Get_D8(Info, Name) Get_D8_(Info)
+    #define Get_D16(Info, Name) Get_D16_(Info)
+    #define Get_DF4(Info, Name) Get_DF4_(Info)
+    #define Get_DF8(Info, Name) Get_DF8_(Info)
+    #define Get_DF10(Info, Name) Get_DF10_(Info)
+    #define Get_DFP4(Bits, Info, Name) Get_DFP4_(Bits, Info)
+    void Peek_D1  (int8u   &Info);
+    void Peek_D2  (int16u  &Info);
+    void Peek_D3  (int32u  &Info);
+    void Peek_D4  (int32u  &Info);
+    void Peek_D5  (int64u  &Info);
+    void Peek_D6  (int64u  &Info);
+    void Peek_D7  (int64u  &Info);
+    void Peek_D8  (int64u  &Info);
+    void Peek_D16 (int128u &Info);
+    void Peek_DF4 (float32 &Info);
+    void Peek_DF8 (float64 &Info);
+    void Peek_DF10(float64 &Info);
+    void Peek_DFP4(int8u  Bits, float64 &Info);
+    #define Skip_D1(Name) Element_Offset++
+    #define Skip_D2(Name) Element_Offset+=2
+    #define Skip_D3(Name) Element_Offset+=3
+    #define Skip_D4(Name) Element_Offset+=4
+    #define Skip_D5(Name) Element_Offset+=5
+    #define Skip_D6(Name) Element_Offset+=6
+    #define Skip_D7(Name) Element_Offset+=7
+    #define Skip_D8(Name) Element_Offset+=8
+    #define Skip_DF4(Name) Element_Offset+=4
+    #define Skip_DF8(Name) Element_Offset+=8
+    #define Skip_D16(Name) Element_Offset+=16
+    #define Skip_DFP4(Size, Name) Element_Offset+=4
+    #define Info_D1(_INFO, _NAME)   Element_Offset++
+    #define Info_D2(_INFO, _NAME)   Element_Offset+=2
+    #define Info_D3(_INFO, _NAME)   Element_Offset+=3
+    #define Info_D4(_INFO, _NAME)   Element_Offset+=4
+    #define Info_D5(_INFO, _NAME)   Element_Offset+=5
+    #define Info_D6(_INFO, _NAME)   Element_Offset+=6
+    #define Info_D7(_INFO, _NAME)   Element_Offset+=7
+    #define Info_D8(_INFO, _NAME)   Element_Offset+=8
+    #define Info_D16(_INFO, _NAME)  Element_Offset+=16
+    #define Info_DF4(_INFO, _NAME)  Element_Offset+=4
+    #define Info_DF8(_INFO, _NAME)  Element_Offset+=8
+    #define Info_DF10(_INFO, _NAME) Element_Offset+=10
+    #define Info_DFP4(_DITS, _INFO, _NAME) Element_Offset+=4
 
     //***************************************************************************
     // GUID
@@ -477,11 +573,31 @@
     // Variable Length Code
     //***************************************************************************
 
-    void Get_VL (int32u Call(int8u Size, int32u ToCall), int32u &Info);
-    inline void Get_VL (int32u Call(int8u Size, int32u ToCall), int32u &Info, const char*) {Get_VL(Call, Info);};
-    void Skip_VL(int32u Call(int8u Size, int32u ToCall));
-    inline void Skip_VL(int32u Call(int8u Size, int32u ToCall),               const char*) {Skip_VL(Call);};
-    #define Info_VL(_CALL, _INFO, _NAME) int32u _INFO; Get_VL(_CALL, _INFO, _NAME)
+    struct vlc
+    {
+        int32u  value;
+        int8u   bit_increment;
+        int8s   mapped_to1;
+        int8s   mapped_to2;
+        int8s   mapped_to3;
+    };
+    struct vlc_fast
+    {
+        int8u*      Array;
+        int8u*      BitsToSkip;
+        const vlc*  Vlc;
+        int8u       Size;
+    };
+    #define VLC_END \
+        {(int32u)-1, (int8u)-1, 0, 0, 0}
+    void Get_VL_Prepare(vlc_fast &Vlc);
+    void Get_VL_ (const vlc Vlc[], size_t &Info);
+    void Get_VL_ (const vlc_fast &Vlc, size_t &Info);
+    #define Get_VL(Vlc, Info, Name) Get_VL_(Vlc, Info);
+    void Skip_VL_(const vlc Vlc[]);
+    void Skip_VL_(const vlc_fast &Vlc);
+    #define Skip_VL(Vlc, Name) Skip_VL_(Vlc);
+    #define Info_VL(Vlc, Info, Name) Skip_VL_(Vlc)
 
     //***************************************************************************
     // Characters
@@ -526,6 +642,7 @@
 
     void Get_Local  (int64u Bytes, Ztring      &Info);
     void Get_ISO_8859_1 (int64u Bytes, Ztring  &Info);
+    void Get_ISO_8859_2 (int64u Bytes, Ztring  &Info);
     void Get_String (int64u Bytes, std::string &Info);
     void Get_UTF8   (int64u Bytes, Ztring      &Info);
     void Get_UTF16  (int64u Bytes, Ztring      &Info);
@@ -533,6 +650,7 @@
     void Get_UTF16L (int64u Bytes, Ztring      &Info);
     inline void Get_Local  (int64u Bytes, Ztring      &Info, const char*) {Get_Local(Bytes, Info);}
     inline void Get_ISO_8859_1 (int64u Bytes, Ztring  &Info, const char*) {Get_ISO_8859_1(Bytes, Info);}
+    inline void Get_ISO_8859_2 (int64u Bytes, Ztring  &Info, const char*) {Get_ISO_8859_2(Bytes, Info);}
     inline void Get_String (int64u Bytes, std::string &Info, const char*) {Get_String(Bytes, Info);}
     inline void Get_UTF8   (int64u Bytes, Ztring      &Info, const char*) {Get_UTF8(Bytes, Info);}
     inline void Get_UTF16  (int64u Bytes, Ztring      &Info, const char*) {Get_UTF16(Bytes, Info);}
@@ -565,138 +683,256 @@
     // Unknown
     //***************************************************************************
 
-    inline void Skip_XX(int64u Bytes, const char*) {Element_Offset+=Bytes;}
+    void Skip_XX(int64u Bytes);
+    inline void Skip_XX(int64u Bytes, const char*) {Skip_XX(Bytes);}
 
     //***************************************************************************
     // Flags
     //***************************************************************************
 
-    void Get_Flags (int64u Flags, size_t Order, bool  &Info);
-    void Get_Flags (int64u ValueToPut,          int8u &Info);
-    inline void Get_Flags (int64u Flags, size_t Order, bool  &Info, const char*) {Get_Flags(Flags, Order, Info);}
-    inline void Get_Flags (int64u ValueToPut,          int8u &Info, const char*) {Get_Flags(ValueToPut, Info);}
-    inline void Skip_Flags(int64u, size_t,                          const char*) {}
-    inline void Skip_Flags(int64u,                                  const char*) {}
-    #define Info_Flags(_FLAGS, _ORDER, _INFO, _NAME) bool _INFO; Get_Flags (_FLAGS, _ORDER, _INFO, _NAME)
+    void Get_Flags_ (int64u Flags, size_t Order, bool  &Info);
+    void Get_FlagsM_ (int64u ValueToPut, int8u &Info); //Multiple
+    #define Get_Flags(_FLAGS, _ORDER, _INFO, _NAME) Get_Flags_(_FLAGS, _ORDER, _INFO)
+    #define Get_FlagsM(_VALUE, _INFO, _NAME) Get_FlagsM_(_VALUE, _INFO)
+    #define Skip_Flags(_FLAGS, _ORDER, _NAME)
+    #define Skip_FlagsM(_VALUE, _NAME)
+    #define Info_Flags(_FLAGS, _ORDER, _INFO, _NAME)
 
     //***************************************************************************
     // BitStream
     //***************************************************************************
 
-    void Get_BS (size_t Bits, int32u  &Info);
-    void Get_SB (             bool    &Info);
-    bool Get_SB ()                                              {bool Temp; Get_SB(Temp); return Temp;}
-    void Get_S1 (size_t Bits, int8u   &Info);
-    void Get_S2 (size_t Bits, int16u  &Info);
-    void Get_S3 (size_t Bits, int32u  &Info);
-    void Get_S4 (size_t Bits, int32u  &Info);
-    void Get_S5 (size_t Bits, int64u  &Info);
-    void Get_S6 (size_t Bits, int64u  &Info);
-    void Get_S7 (size_t Bits, int64u  &Info);
-    void Get_S8 (size_t Bits, int64u  &Info);
-    inline void Get_BS (size_t Bits, int32u  &Info, const char*) {Get_BS(Bits, Info);}
-    inline void Get_SB (             bool    &Info, const char*) {Get_SB(      Info);}
-    inline void Get_S1 (size_t Bits, int8u   &Info, const char*) {Get_S1(Bits, Info);}
-    inline void Get_S2 (size_t Bits, int16u  &Info, const char*) {Get_S2(Bits, Info);}
-    inline void Get_S3 (size_t Bits, int32u  &Info, const char*) {Get_S3(Bits, Info);}
-    inline void Get_S4 (size_t Bits, int32u  &Info, const char*) {Get_S4(Bits, Info);}
-    inline void Get_S5 (size_t Bits, int64u  &Info, const char*) {Get_S5(Bits, Info);}
-    inline void Get_S6 (size_t Bits, int64u  &Info, const char*) {Get_S6(Bits, Info);}
-    inline void Get_S7 (size_t Bits, int64u  &Info, const char*) {Get_S7(Bits, Info);}
-    inline void Get_S8 (size_t Bits, int64u  &Info, const char*) {Get_S8(Bits, Info);}
-    void Peek_BS(size_t Bits, int32u  &Info);
+    void Get_BS_ (int8u  Bits, int32u  &Info);
+    void Get_SB_ (             bool    &Info);
+    bool Get_SB_ ()                                              {return BS->GetB();}
+    void Get_S1_ (int8u  Bits, int8u   &Info);
+    void Get_S2_ (int8u  Bits, int16u  &Info);
+    void Get_S3_ (int8u  Bits, int32u  &Info);
+    void Get_S4_ (int8u  Bits, int32u  &Info);
+    void Get_S5_ (int8u  Bits, int64u  &Info);
+    void Get_S6_ (int8u  Bits, int64u  &Info);
+    void Get_S7_ (int8u  Bits, int64u  &Info);
+    void Get_S8_ (int8u  Bits, int64u  &Info);
+    #define Get_BS(Bits, Info, Name) Get_BS_(Bits, Info)
+    #define Get_SB(      Info, Name) Get_SB_(      Info)
+    #define Get_S1(Bits, Info, Name) Get_S1_(Bits, Info)
+    #define Get_S2(Bits, Info, Name) Get_S2_(Bits, Info)
+    #define Get_S3(Bits, Info, Name) Get_S3_(Bits, Info)
+    #define Get_S4(Bits, Info, Name) Get_S4_(Bits, Info)
+    #define Get_S5(Bits, Info, Name) Get_S5_(Bits, Info)
+    #define Get_S6(Bits, Info, Name) Get_S6_(Bits, Info)
+    #define Get_S7(Bits, Info, Name) Get_S7_(Bits, Info)
+    #define Get_S8(Bits, Info, Name) Get_S8_(Bits, Info)
+    void Peek_BS(int8u  Bits, int32u  &Info);
     void Peek_SB(              bool    &Info);
-    bool Peek_SB()                                              {bool Temp; Peek_SB(Temp); return Temp;}
-    void Peek_S1(size_t Bits, int8u   &Info);
-    void Peek_S2(size_t Bits, int16u  &Info);
-    void Peek_S3(size_t Bits, int32u  &Info);
-    void Peek_S4(size_t Bits, int32u  &Info);
-    void Peek_S5(size_t Bits, int64u  &Info);
-    void Peek_S6(size_t Bits, int64u  &Info);
-    void Peek_S7(size_t Bits, int64u  &Info);
-    void Peek_S8(size_t Bits, int64u  &Info);
-    void Skip_BS(size_t Bits);
-    void Skip_SB(           );
-    void Skip_S1(size_t Bits);
-    void Skip_S2(size_t Bits);
-    void Skip_S3(size_t Bits);
-    void Skip_S4(size_t Bits);
-    void Skip_S5(size_t Bits);
-    void Skip_S6(size_t Bits);
-    void Skip_S7(size_t Bits);
-    void Skip_S8(size_t Bits);
-    inline void Skip_BS(size_t Bits,                const char*) {BS->Skip8(Bits);}
-    inline void Skip_SB(                            const char*) {BS->Skip1(1);}
-    inline void Skip_S1(size_t Bits,                const char*) {BS->Skip1(Bits);}
-    inline void Skip_S2(size_t Bits,                const char*) {BS->Skip2(Bits);}
-    inline void Skip_S3(size_t Bits,                const char*) {BS->Skip4(Bits);}
-    inline void Skip_S4(size_t Bits,                const char*) {BS->Skip4(Bits);}
-    inline void Skip_S5(size_t Bits,                const char*) {BS->Skip8(Bits);}
-    inline void Skip_S6(size_t Bits,                const char*) {BS->Skip8(Bits);}
-    inline void Skip_S7(size_t Bits,                const char*) {BS->Skip8(Bits);}
-    inline void Skip_S8(size_t Bits,                const char*) {BS->Skip8(Bits);}
+    bool Peek_SB()                                              {return BS->PeekB();}
+    void Peek_S1(int8u  Bits, int8u   &Info);
+    void Peek_S2(int8u  Bits, int16u  &Info);
+    void Peek_S3(int8u  Bits, int32u  &Info);
+    void Peek_S4(int8u  Bits, int32u  &Info);
+    void Peek_S5(int8u  Bits, int64u  &Info);
+    void Peek_S6(int8u  Bits, int64u  &Info);
+    void Peek_S7(int8u  Bits, int64u  &Info);
+    void Peek_S8(int8u  Bits, int64u  &Info);
+    inline void Skip_BS_(size_t Bits) {BS->Skip(Bits);}
+    inline void Skip_SB_(           ) {BS->Skip(1);}
+    inline void Skip_S1_(int8u  Bits) {BS->Skip(Bits);}
+    inline void Skip_S2_(int8u  Bits) {BS->Skip(Bits);}
+    inline void Skip_S3_(int8u  Bits) {BS->Skip(Bits);}
+    inline void Skip_S4_(int8u  Bits) {BS->Skip(Bits);}
+    inline void Skip_S5_(int8u  Bits) {BS->Skip(Bits);}
+    inline void Skip_S6_(int8u  Bits) {BS->Skip(Bits);}
+    inline void Skip_S7_(int8u  Bits) {BS->Skip(Bits);}
+    inline void Skip_S8_(int8u  Bits) {BS->Skip(Bits);}
+    #define Skip_BS(Bits, Name) Skip_BS_(Bits)
+    #define Skip_SB(      Name) Skip_SB_()
+    #define Skip_S1(Bits, Name) Skip_S1_(Bits)
+    #define Skip_S2(Bits, Name) Skip_S2_(Bits)
+    #define Skip_S3(Bits, Name) Skip_S3_(Bits)
+    #define Skip_S4(Bits, Name) Skip_S4_(Bits)
+    #define Skip_S5(Bits, Name) Skip_S5_(Bits)
+    #define Skip_S6(Bits, Name) Skip_S6_(Bits)
+    #define Skip_S7(Bits, Name) Skip_S7_(Bits)
+    #define Skip_S8(Bits, Name) Skip_S8_(Bits)
     void Mark_0 ();
-    void Mark_0_NoTrustError (); //Use it for providing a warning instead of a non-trusting error
+    #define Mark_0_NoTrustError() Skip_SB_() //Use it for providing a warning instead of a non-trusting error
     void Mark_1 ();
-    void Mark_1_NoTrustError (); //Use it for providing a warning instead of a non-trusting error
-    #define Info_BS(_BITS, _INFO, _NAME) int32u  _INFO; Get_BS(_BITS, _INFO, _NAME)
-    #define Info_SB(_INFO, _NAME)        bool    _INFO; Get_SB(       _INFO, _NAME)
-    #define Info_S1(_BITS, _INFO, _NAME) int8u   _INFO; Get_S1(_BITS, _INFO, _NAME)
-    #define Info_S2(_BITS, _INFO, _NAME) int16u  _INFO; Get_S2(_BITS, _INFO, _NAME)
-    #define Info_S3(_BITS, _INFO, _NAME) int32u  _INFO; Get_S4(_BITS, _INFO, _NAME)
-    #define Info_S4(_BITS, _INFO, _NAME) int32u  _INFO; Get_S4(_BITS, _INFO, _NAME)
-    #define Info_S5(_BITS, _INFO, _NAME) int64u  _INFO; Get_S5(_BITS, _INFO, _NAME)
-    #define Info_S6(_BITS, _INFO, _NAME) int64u  _INFO; Get_S6(_BITS, _INFO, _NAME)
-    #define Info_S7(_BITS, _INFO, _NAME) int64u  _INFO; Get_S7(_BITS, _INFO, _NAME)
-    #define Info_S8(_BITS, _INFO, _NAME) int64u  _INFO; Get_S8(_BITS, _INFO, _NAME)
+    #define Mark_1_NoTrustError() Skip_SB_() //Use it for providing a warning instead of a non-trusting error
+    #define Info_BS(_BITS, _INFO, _NAME) Skip_BS_(_BITS)
+    #define Info_SB(_INFO, _NAME)        Skip_SB_(     )
+    #define Info_S1(_BITS, _INFO, _NAME) Skip_S1_(_BITS)
+    #define Info_S2(_BITS, _INFO, _NAME) Skip_S2_(_BITS)
+    #define Info_S3(_BITS, _INFO, _NAME) Skip_S3_(_BITS)
+    #define Info_S4(_BITS, _INFO, _NAME) Skip_S4_(_BITS)
+    #define Info_S5(_BITS, _INFO, _NAME) Skip_S5_(_BITS)
+    #define Info_S6(_BITS, _INFO, _NAME) Skip_S6_(_BITS)
+    #define Info_S7(_BITS, _INFO, _NAME) Skip_S7_(_BITS)
+    #define Info_S8(_BITS, _INFO, _NAME) Skip_S8_(_BITS)
 
     #define TEST_SB_GET(_CODE, _NAME) \
         { \
             Peek_SB(_CODE); \
             if (!_CODE) \
-                Skip_SB(                                        _NAME); \
+                Skip_SB_(); \
             else \
             { \
-                Element_Begin(_NAME); \
-                Skip_SB(                                        _NAME); \
+                Element_Begin0(); \
+                Skip_SB_(); \
 
     #define TEST_SB_SKIP(_NAME) \
         { \
             if (!Peek_SB()) \
-                Skip_SB(                                        _NAME); \
+                Skip_SB_(); \
             else \
             { \
-                Element_Begin(_NAME); \
-                Skip_SB(                                        _NAME); \
+                Element_Begin0(); \
+                Skip_SB_(); \
 
     #define TESTELSE_SB_GET(_CODE, _NAME) \
         { \
             Peek_SB(_CODE); \
             if (_CODE) \
             { \
-                Element_Begin(_NAME); \
-                Skip_SB(                                        _NAME); \
+                Element_Begin0(); \
+                Skip_SB_(); \
 
     #define TESTELSE_SB_SKIP(_NAME) \
         { \
             if (Peek_SB()) \
             { \
-                Element_Begin(_NAME); \
-                Skip_SB(                                        _NAME); \
+                Element_Begin0(); \
+                Skip_SB_(); \
 
     #define TESTELSE_SB_ELSE(_NAME) \
-                Element_End(); \
+                Element_End0(); \
             } \
             else \
             { \
-                Skip_SB(                                        _NAME); \
+                Skip_SB_(); \
 
     #define TESTELSE_SB_END() \
             } \
         } \
 
     #define TEST_SB_END() \
-                Element_End(); \
+                Element_End0(); \
+            } \
+        } \
+
+    //***************************************************************************
+    // BitStream (Little Endian)
+    //***************************************************************************
+
+    void Get_BT_ (int8u  Bits, int32u  &Info);
+    void Get_TB_ (             bool    &Info);
+    bool Get_TB_ ()                                              {bool Temp; Get_TB_(Temp); return Temp;}
+    void Get_T1_ (int8u  Bits, int8u   &Info);
+    void Get_T2_ (int8u  Bits, int16u  &Info);
+    void Get_T3_ (int8u  Bits, int32u  &Info);
+    void Get_T4_ (int8u  Bits, int32u  &Info);
+    void Get_T5_ (int8u  Bits, int64u  &Info);
+    void Get_T6_ (int8u  Bits, int64u  &Info);
+    void Get_T7_ (int8u  Bits, int64u  &Info);
+    void Get_T8_ (int8u  Bits, int64u  &Info);
+    #define Get_BT(Bits, Info, Name) Get_BT_(Bits, Info)
+    #define Get_TB(      Info, Name) Get_TB_(      Info)
+    #define Get_T1(Bits, Info, Name) Get_T1_(Bits, Info)
+    #define Get_T2(Bits, Info, Name) Get_T2_(Bits, Info)
+    #define Get_T3(Bits, Info, Name) Get_T3_(Bits, Info)
+    #define Get_T4(Bits, Info, Name) Get_T4_(Bits, Info)
+    #define Get_T5(Bits, Info, Name) Get_T5_(Bits, Info)
+    #define Get_T6(Bits, Info, Name) Get_T6_(Bits, Info)
+    #define Get_T7(Bits, Info, Name) Get_T7_(Bits, Info)
+    #define Get_T8(Bits, Info, Name) Get_T8_(Bits, Info)
+    void Peek_BT(int8u  Bits, int32u  &Info);
+    void Peek_TB(              bool    &Info);
+    bool Peek_TB()                                              {bool Temp; Peek_TB(Temp); return Temp;}
+    void Peek_T1(int8u  Bits, int8u   &Info);
+    void Peek_T2(int8u  Bits, int16u  &Info);
+    void Peek_T3(int8u  Bits, int32u  &Info);
+    void Peek_T4(int8u  Bits, int32u  &Info);
+    void Peek_T5(int8u  Bits, int64u  &Info);
+    void Peek_T6(int8u  Bits, int64u  &Info);
+    void Peek_T7(int8u  Bits, int64u  &Info);
+    void Peek_T8(int8u  Bits, int64u  &Info);
+    inline void Skip_BT_(size_t Bits) {BT->Skip(Bits);}
+    inline void Skip_TB_(           ) {BT->SkipB();}
+    inline void Skip_T1_(int8u  Bits) {BT->Skip1(Bits);}
+    inline void Skip_T2_(int8u  Bits) {BT->Skip2(Bits);}
+    inline void Skip_T3_(int8u  Bits) {BT->Skip4(Bits);}
+    inline void Skip_T4_(int8u  Bits) {BT->Skip4(Bits);}
+    inline void Skip_T5_(int8u  Bits) {BT->Skip8(Bits);}
+    inline void Skip_T6_(int8u  Bits) {BT->Skip8(Bits);}
+    inline void Skip_T7_(int8u  Bits) {BT->Skip8(Bits);}
+    inline void Skip_T8_(int8u  Bits) {BT->Skip8(Bits);}
+    #define Skip_BT(Bits, Name) Skip_BT_(Bits)
+    #define Skip_TB(      Name) Skip_TB_()
+    #define Skip_T1(Bits, Name) Skip_T1_(Bits)
+    #define Skip_T2(Bits, Name) Skip_T2_(Bits)
+    #define Skip_T3(Bits, Name) Skip_T3_(Bits)
+    #define Skip_T4(Bits, Name) Skip_T4_(Bits)
+    #define Skip_T5(Bits, Name) Skip_T5_(Bits)
+    #define Skip_T6(Bits, Name) Skip_T6_(Bits)
+    #define Skip_T7(Bits, Name) Skip_T7_(Bits)
+    #define Skip_T8(Bits, Name) Skip_T8_(Bits)
+    #define Info_BT(_BITS, _INFO, _NAME) Skip_BT_(_BITS)
+    #define Info_TB(_INFO, _NAME)        Skip_TB_(     )
+    #define Info_T1(_BITS, _INFO, _NAME) Skip_T1_(_BITS)
+    #define Info_T2(_BITS, _INFO, _NAME) Skip_T2_(_BITS)
+    #define Info_T3(_BITS, _INFO, _NAME) Skip_T3_(_BITS)
+    #define Info_T4(_BITS, _INFO, _NAME) Skip_T4_(_BITS)
+    #define Info_T5(_BITS, _INFO, _NAME) Skip_T5_(_BITS)
+    #define Info_T6(_BITS, _INFO, _NAME) Skip_T6_(_BITS)
+    #define Info_T7(_BITS, _INFO, _NAME) Skip_T7_(_BITS)
+    #define Info_T8(_BITS, _INFO, _NAME) Skip_T8_(_BITS)
+
+    #define TEST_TB_GET(_CODE, _NAME) \
+        { \
+            Peek_TB(_CODE); \
+            if (!_CODE) \
+                Skip_TB_(); \
+            else \
+            { \
+                Element_Begin0(); \
+                Skip_TB_(); \
+
+    #define TEST_TB_TKIP(_NAME) \
+        { \
+            if (!Peek_TB()) \
+                Skip_TB_(); \
+            else \
+            { \
+                Element_Begin0(); \
+                Skip_TB_(); \
+
+    #define TESTELSE_TB_GET(_CODE, _NAME) \
+        { \
+            Peek_TB(_CODE); \
+            if (_CODE) \
+            { \
+                Element_Begin0(); \
+                Skip_TB_(); \
+
+    #define TESTELSE_TB_TKIP(_NAME) \
+        { \
+            if (Peek_TB()) \
+            { \
+                Element_Begin0(); \
+                Skip_TB_(); \
+
+    #define TESTELSE_TB_ELSE(_NAME) \
+                Element_End0(); \
+            } \
+            else \
+            { \
+                Skip_TB_(); \
+
+    #define TESTELSE_TB_END() \
+            } \
+        } \
+
+    #define TEST_TB_END() \
+                Element_End0(); \
             } \
         } \
 
@@ -719,8 +955,9 @@
     // Stream filling
     //***************************************************************************
 
-    //Before filling the stream, the stream must be prepared
-    size_t Stream_Prepare   (stream_t KindOfStream);
+    //Elements - Preparation of element from external app
+    size_t Stream_Prepare   (stream_t KindOfStream, size_t StreamPos=(size_t)-1);
+    size_t Stream_Erase     (stream_t KindOfStream, size_t StreamPos);
 
     //Fill with datas (with parameter as a size_t)
     void Fill (stream_t StreamKind, size_t StreamPos, size_t Parameter, const Ztring  &Value, bool Replace=false);
@@ -738,9 +975,9 @@
     inline void Fill (stream_t StreamKind, size_t StreamPos, size_t Parameter, float32        Value, int8u AfterComma=3, bool Replace=false) {Fill(StreamKind, StreamPos, Parameter, Ztring::ToZtring(Value, AfterComma), Replace);}
     inline void Fill (stream_t StreamKind, size_t StreamPos, size_t Parameter, float64        Value, int8u AfterComma=3, bool Replace=false) {Fill(StreamKind, StreamPos, Parameter, Ztring::ToZtring(Value, AfterComma), Replace);}
     inline void Fill (stream_t StreamKind, size_t StreamPos, size_t Parameter, float80        Value, int8u AfterComma=3, bool Replace=false) {Fill(StreamKind, StreamPos, Parameter, Ztring::ToZtring(Value, AfterComma), Replace);}
-    #ifdef NEED_SIZET
+    #ifdef SIZE_T_IS_LONG
     inline void Fill (stream_t StreamKind, size_t StreamPos, size_t Parameter, size_t         Value, int8u Radix=10, bool Replace=false) {Fill(StreamKind, StreamPos, Parameter, Ztring::ToZtring(Value, Radix).MakeUpperCase(), Replace);}
-    #endif //NEED_SIZET
+    #endif //SIZE_T_IS_LONG
     //Fill with datas
     void Fill (stream_t StreamKind, size_t StreamPos, const char* Parameter, const Ztring  &Value, bool Replace=false);
     inline void Fill (stream_t StreamKind, size_t StreamPos, const char* Parameter, const std::string &Value, bool Utf8=true, bool Replace=false) {if (Utf8) Fill(StreamKind, StreamPos, Parameter, Ztring().From_UTF8(Value.c_str(), Value.size())); else Fill(StreamKind, StreamPos, Parameter, Ztring().From_Local(Value.c_str(), Value.size()), Replace);}
@@ -757,9 +994,9 @@
     inline void Fill (stream_t StreamKind, size_t StreamPos, const char* Parameter, float32        Value, int8u AfterComma=3, bool Replace=false) {Fill(StreamKind, StreamPos, Parameter, Ztring::ToZtring(Value, AfterComma), Replace);}
     inline void Fill (stream_t StreamKind, size_t StreamPos, const char* Parameter, float64        Value, int8u AfterComma=3, bool Replace=false) {Fill(StreamKind, StreamPos, Parameter, Ztring::ToZtring(Value, AfterComma), Replace);}
     inline void Fill (stream_t StreamKind, size_t StreamPos, const char* Parameter, float80        Value, int8u AfterComma=3, bool Replace=false) {Fill(StreamKind, StreamPos, Parameter, Ztring::ToZtring(Value, AfterComma), Replace);}
-    #ifdef NEED_SIZET
+    #ifdef SIZE_T_IS_LONG
     inline void Fill (stream_t StreamKind, size_t StreamPos, const char* Parameter, size_t         Value, int8u Radix=10, bool Replace=false) {Fill(StreamKind, StreamPos, Parameter, Ztring::ToZtring(Value, Radix).MakeUpperCase(), Replace);}
-    #endif //NEED_SIZET
+    #endif //SIZE_T_IS_LONG
     ZtringListList Fill_Temp;
     void Fill_Flush ();
     size_t Fill_Parameter(stream_t StreamKind, generic StreamPos);
@@ -789,6 +1026,9 @@
     void Fill          (const char*)                                            {Fill();}
     void Fill          ();
     void Fill          (File__Analyze* Parser);
+    void Update        (const char*)                                            {Fill();}
+    void Update        ();
+    void Update        (File__Analyze* Parser);
     void Finish        (const char*)                                            {Finish();}
     void Finish        ();
     void Finish        (File__Analyze* Parser);
@@ -878,6 +1118,7 @@
 
     void Tags ();
     void Video_FrameRate_Rounding (size_t Pos, video Parameter);
+    void Video_BitRate_Rounding (size_t Pos, video Parameter);
     void Audio_BitRate_Rounding (size_t Pos, audio Parameter);
 
     //Utils - Finalize
@@ -893,12 +1134,11 @@
     //***************************************************************************
 
 protected :
-    #if MEDIAINFO_TRACE
-        //Save for speed improvement
-        float Config_Details;
-    #endif //MEDIAINFO_TRACE
-    bool IsSub;
-    bool IsRawStream;
+    //Save for speed improvement
+    int8u           Config_Demux;
+    Ztring          Config_LineSeparator;
+    bool            IsSub;
+    bool            IsRawStream;
 
     //Configuration
     bool DataMustAlwaysBeComplete;  //Data must always be complete, else wait for more data
@@ -906,7 +1146,6 @@
 
     //Synchro
     bool MustParseTheHeaderFile;    //There is an header part, must parse it
-    bool Synched;                   //Data is synched
     size_t Trusted;
     size_t Trusted_Multiplier;
 
@@ -925,13 +1164,16 @@
     //***************************************************************************
 
     void Buffer_Clear(); //Clear the buffer
-    void Open_Buffer_Continue_Loop();
+    bool Open_Buffer_Continue_Loop();
 protected :
     //Buffer
     const int8u* Buffer;
 public : //TO CHANGE
     size_t Buffer_Size;
+    int64u Buffer_TotalBytes;
     int64u Buffer_TotalBytes_FirstSynched;
+    int64u Buffer_PaddingBytes;
+    float64 Stream_BitRateFromContainer;
 protected :
     int8u* Buffer_Temp;
     size_t Buffer_Temp_Size;
@@ -940,8 +1182,8 @@
     size_t Buffer_Offset_Temp; //Temporary usage in this parser
     size_t Buffer_MinimumSize;
     size_t Buffer_MaximumSize;
-    int64u Buffer_TotalBytes;
     int64u Buffer_TotalBytes_FirstSynched_Max;
+    int64u Buffer_TotalBytes_Fill_Max;
     friend class File__Tags_Helper;
 
     //***************************************************************************
@@ -949,7 +1191,12 @@
     //***************************************************************************
 
     bool FileHeader_Begin_0x000001();
+    bool FileHeader_Begin_XML(tinyxml2::XMLDocument &Document);
     bool Synchronize_0x000001();
+public:
+    static void Streams_Accept_TestContinuousFileNames_Static(ZtringList &File_Names, bool IsReferenced);
+protected:
+    void Streams_Accept_TestContinuousFileNames();
 
 private :
 
@@ -958,7 +1205,8 @@
     //***************************************************************************
 
     //Element
-    BitStream* BS;                  //For conversion from bytes to bitstream
+    BitStream_Fast* BS;             //For conversion from bytes to bitstream
+    BitStream*      BT;             //For conversion from bytes to bitstream (Little Endian)
 public : //TO CHANGE
     int64u Header_Size;             //Size of the header of the current element
 private :
@@ -1016,11 +1264,25 @@
         User_16,
         User_17,
         User_18,
+        User_19,
+        User_20,
+        User_21,
+        User_22,
+        User_23,
+        User_24,
+        User_25,
+        User_26,
+        User_27,
+        User_28,
+        User_29,
+        User_30,
+        User_31,
     };
     bool ShouldContinueParsing;
 
     //Configuration
     bool MustSynchronize;
+    bool CA_system_ID_MustSkipSlices;
 
     //Demux
     enum contenttype
@@ -1032,16 +1294,47 @@
     };
     #if MEDIAINFO_DEMUX
         void Demux (const int8u* Buffer, size_t Buffer_Size, contenttype ContentType);
+        virtual bool Demux_UnpacketizeContainer_Test() {return true;}
+        bool Demux_UnpacketizeContainer_Test_OneFramePerFile();
+        void Demux_UnpacketizeContainer_Demux(bool random_access=true);
+        void Demux_UnpacketizeContainer_Demux_Clear();
+        bool Demux_EventWasSent_Accept_Specific;
     #else //MEDIAINFO_DEMUX
         #define Demux(_A, _B, _C)
     #endif //MEDIAINFO_DEMUX
 
     //Events data
-    #if MEDIAINFO_EVENTS
-        bool    MpegPs_PES_FirstByte_IsAvailable;
-        bool    MpegPs_PES_FirstByte_Value;
-    #endif //MEDIAINFO_EVENTS
+    bool    PES_FirstByte_IsAvailable;
+    bool    PES_FirstByte_Value;
+
+    int64u  Unsynch_Frame_Count;
+
+    #if MEDIAINFO_SEEK
+    private:
+        bool Seek_Duration_Detected;
+    #endif //MEDIAINFO_SEEK
+
+    #if MEDIAINFO_IBI
+    public:
+        bool    Config_Ibi_Create;
+        int64u  Ibi_SynchronizationOffset_Current;
+        int64u  Ibi_SynchronizationOffset_BeginOfFrame;
+        ibi::stream* IbiStream;
+        size_t  Ibi_Read_Buffer_Seek        (size_t Method, int64u Value, int64u ID);
+        void    Ibi_Read_Buffer_Unsynched   ();
+        void    Ibi_Stream_Finish           ();
+        void    Ibi_Stream_Finish           (int64u Numerator, int64u Denominator); //Partial
+        void    Ibi_Add                     ();
+    #else //MEDIAINFO_IBI
+        size_t  Ibi_Read_Buffer_Seek        (size_t, int64u, int64u)            {return (size_t)-1;}
+        void    Ibi_Read_Buffer_Unsynched   ()                                  {}
+        void    Ibi_Stream_Finish           ()                                  {}
+        void    Ibi_Stream_Finish           (int64u, int64u)                    {}
+        void    Ibi_Add                     ()                                  {}
+    #endif //MEDIAINFO_IBI
 };
 
 //Helpers
 #define DETAILS_INFO(_DATA)
+
+#endif

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/File__Analyze_Streams.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/File__Analyze_Streams.cpp Changed

@@ -1,30 +1,35 @@
 // File__Analyze - Base for analyze files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #include "MediaInfo/File__Analyze.h"
 #include "MediaInfo/MediaInfo_Internal.h"
 #include "MediaInfo/MediaInfo_Config.h"
@@ -50,7 +55,7 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
-size_t File__Analyze::Stream_Prepare (stream_t KindOfStream)
+size_t File__Analyze::Stream_Prepare (stream_t KindOfStream, size_t StreamPos)
 {
     //Integrity
     if (!Status[IsAccepted] || KindOfStream>Stream_Max)
@@ -64,21 +69,31 @@
         return 0;
     }
 
-    //Add a stream
-    (*Stream)[KindOfStream].resize((*Stream)[KindOfStream].size()+1);
-    (*Stream_More)[KindOfStream].resize((*Stream_More)[KindOfStream].size()+1);
-
-    StreamKind_Last=KindOfStream;
-    StreamPos_Last=(*Stream)[KindOfStream].size()-1;
+    if (StreamPos>=Count_Get(KindOfStream))
+    {
+        //Add a stream
+        (*Stream)[KindOfStream].resize((*Stream)[KindOfStream].size()+1);
+        (*Stream_More)[KindOfStream].resize((*Stream_More)[KindOfStream].size()+1);
+        StreamKind_Last=KindOfStream;
+        StreamPos_Last=(*Stream)[KindOfStream].size()-1;
+    }
+    else
+    {
+        //Insert a stream
+        (*Stream)[KindOfStream].insert((*Stream)[KindOfStream].begin()+StreamPos, ZtringList());
+        (*Stream_More)[KindOfStream].insert((*Stream_More)[KindOfStream].begin()+StreamPos, ZtringListList());
+        StreamKind_Last=KindOfStream;
+        StreamPos_Last=StreamPos;
+    }
 
     //Filling basic info
     Fill(StreamKind_Last, StreamPos_Last, (size_t)General_Count, Count_Get(StreamKind_Last, StreamPos_Last));
     Fill(StreamKind_Last, StreamPos_Last, General_StreamKind, MediaInfoLib::Config.Info_Get(StreamKind_Last).Read(General_StreamKind, Info_Text));
     Fill(StreamKind_Last, StreamPos_Last, General_StreamKind_String, MediaInfoLib::Config.Language_Get(MediaInfoLib::Config.Info_Get(StreamKind_Last).Read(General_StreamKind, Info_Text)), true);
-    Fill(StreamKind_Last, StreamPos_Last, General_StreamKindID, StreamPos_Last);
-    for (size_t Pos=0; Pos<=StreamPos_Last; Pos++)
+    for (size_t Pos=0; Pos<Count_Get(KindOfStream); Pos++)
     {
         Fill(StreamKind_Last, Pos, General_StreamCount, Count_Get(StreamKind_Last), 10, true);
+        Fill(StreamKind_Last, Pos, General_StreamKindID, Pos, 10, true);
         if (Count_Get(StreamKind_Last)>1)
             Fill(StreamKind_Last, Pos, General_StreamKindPos, Pos+1, 10, true);
     }
@@ -89,25 +104,41 @@
         const Ztring& StreamKind_Text=Get(KindOfStream, 0, General_StreamKind, Info_Text);
         if (Count_Get(KindOfStream)>1)
         {
-            Ztring Temp;
-            Temp=Retrieve(Stream_General, 0, Ztring(StreamKind_Text+_T("_Codec_List")).To_Local().c_str())+_T(" / ");
-            Fill(Stream_General, 0, Ztring(StreamKind_Text+_T("_Codec_List")).To_Local().c_str(), Temp, true);
-            Temp=Retrieve(Stream_General, 0, Ztring(StreamKind_Text+_T("_Language_List")).To_Local().c_str())+_T(" / ");
-            Fill(Stream_General, 0, Ztring(StreamKind_Text+_T("_Language_List")).To_Local().c_str(), Temp, true);
-            Temp=Retrieve(Stream_General, 0, Ztring(StreamKind_Text+_T("_Format_List")).To_Local().c_str())+_T(" / ");
-            Fill(Stream_General, 0, Ztring(StreamKind_Text+_T("_Format_List")).To_Local().c_str(), Temp, true);
-            Temp=Retrieve(Stream_General, 0, Ztring(StreamKind_Text+_T("_Format_WithHint_List")).To_Local().c_str())+_T(" / ");
-            Fill(Stream_General, 0, Ztring(StreamKind_Text+_T("_Format_WithHint_List")).To_Local().c_str(), Temp, true);
+            ZtringList Temp; Temp.Separator_Set(0, __T(" / "));
+            Temp.Write(Retrieve(Stream_General, 0, Ztring(StreamKind_Text+__T("_Codec_List")).To_Local().c_str()));
+            if (StreamPos<Temp.size())
+                Temp.insert(Temp.begin()+StreamPos, Ztring());
+            else
+                Temp.push_back(Ztring());
+            Fill(Stream_General, 0, Ztring(StreamKind_Text+__T("_Codec_List")).To_Local().c_str(), Temp.Read(), true);
+            Temp.Write(Retrieve(Stream_General, 0, Ztring(StreamKind_Text+__T("_Language_List")).To_Local().c_str()));
+            if (StreamPos<Temp.size())
+                Temp.insert(Temp.begin()+StreamPos, Ztring());
+            else
+                Temp.push_back(Ztring());
+            Fill(Stream_General, 0, Ztring(StreamKind_Text+__T("_Language_List")).To_Local().c_str(), Temp.Read(), true);
+            Temp.Write(Retrieve(Stream_General, 0, Ztring(StreamKind_Text+__T("_Format_List")).To_Local().c_str()));
+            if (StreamPos<Temp.size())
+                Temp.insert(Temp.begin()+StreamPos, Ztring());
+            else
+                Temp.push_back(Ztring());
+            Fill(Stream_General, 0, Ztring(StreamKind_Text+__T("_Format_List")).To_Local().c_str(), Temp.Read(), true);
+            Temp.Write(Retrieve(Stream_General, 0, Ztring(StreamKind_Text+__T("_Format_WithHint_List")).To_Local().c_str()));
+            if (StreamPos<Temp.size())
+                Temp.insert(Temp.begin()+StreamPos, Ztring());
+            else
+                Temp.push_back(Ztring());
+            Fill(Stream_General, 0, Ztring(StreamKind_Text+__T("_Format_WithHint_List")).To_Local().c_str(), Temp.Read(), true);
         }
 
-        Fill(Stream_General, 0, Ztring(StreamKind_Text+_T("Count")).To_Local().c_str(), StreamPos_Last+1, 10, true);
+        Fill(Stream_General, 0, Ztring(StreamKind_Text+__T("Count")).To_Local().c_str(), Count_Get(KindOfStream), 10, true);
     }
 
     //File name and dates
     if (!IsSub && KindOfStream==Stream_General && File_Name.size()>0)
     {
         //File name
-        if (File_Name.find(_T("://"))==string::npos)
+        if (File_Name.find(__T("://"))==string::npos)
         {
             Fill (Stream_General, 0, General_CompleteName, File_Name);
             Fill (Stream_General, 0, General_FolderName, FileName::Path_Get(File_Name));
@@ -117,8 +148,8 @@
         else
         {
             Ztring FileName_Modified=File_Name;
-            size_t Begin=FileName_Modified.find(_T(':'), 6);
-            size_t End=FileName_Modified.find(_T('@'));
+            size_t Begin=FileName_Modified.find(__T(':'), 6);
+            size_t End=FileName_Modified.find(__T('@'));
             if (Begin!=string::npos && End!=string::npos && Begin<End)
                 FileName_Modified.erase(Begin, End-Begin);
             Fill (Stream_General, 0, General_CompleteName, FileName_Modified);
@@ -144,9 +175,35 @@
             Fill(StreamKind_Last, StreamPos_Last, Fill_Temp(Pos, 0).To_UTF8().c_str(), Fill_Temp(Pos, 1));
     Fill_Temp.clear();
 
+    return StreamPos_Last; //The position in the stream count
+}
+
+size_t File__Analyze::Stream_Erase (stream_t KindOfStream, size_t StreamPos)
+{
+    //Integrity
+    if (!Status[IsAccepted] || KindOfStream>Stream_Max || StreamPos>=Count_Get(KindOfStream))
+        return Error;
+
+    //Insert a stream
+    (*Stream)[KindOfStream].erase((*Stream)[KindOfStream].begin()+StreamPos);
+    (*Stream_More)[KindOfStream].erase((*Stream_More)[KindOfStream].begin()+StreamPos);
+
+    //Filling basic info
+    for (size_t Pos=0; Pos<Count_Get(KindOfStream); Pos++)
+    {
+        Fill(KindOfStream, Pos, General_StreamCount, Count_Get(StreamKind_Last), 10, true);
+        Fill(KindOfStream, Pos, General_StreamKindID, Pos, 10, true);
+        if (Count_Get(KindOfStream)>1)
+            Fill(KindOfStream, Pos, General_StreamKindPos, Pos+1, 10, true);
+    }
+
+    StreamKind_Last=Stream_Max;
+    StreamPos_Last=(size_t)-1;
+
     return (*Stream)[KindOfStream].size()-1; //The position in the stream count
 }
 
+
 //***************************************************************************
 // Filling
 //***************************************************************************
@@ -159,13 +216,13 @@
         return;
 
     //Handling values with \r\n inside
-    if (Value.find(_T('\r'))!=string::npos || Value.find(_T('\n'))!=string::npos)
+    if (Value.find(__T('\r'))!=string::npos || Value.find(__T('\n'))!=string::npos)
     {
         Ztring NewValue=Value;
-        NewValue.FindAndReplace(_T("\r\n"), _T(" / "), 0, Ztring_Recursive);
-        NewValue.FindAndReplace(_T("\r"), _T(" / "), 0, Ztring_Recursive);
-        NewValue.FindAndReplace(_T("\n"), _T(" / "), 0, Ztring_Recursive);
-        if (NewValue.size()>=3 && NewValue.rfind(_T(" / "))==NewValue.size()-3)
+        NewValue.FindAndReplace(__T("\r\n"), __T(" / "), 0, Ztring_Recursive);
+        NewValue.FindAndReplace(__T("\r"), __T(" / "), 0, Ztring_Recursive);
+        NewValue.FindAndReplace(__T("\n"), __T(" / "), 0, Ztring_Recursive);
+        if (NewValue.size()>=3 && NewValue.rfind(__T(" / "))==NewValue.size()-3)
             NewValue.resize(NewValue.size()-3);
         Fill(StreamKind, StreamPos, Parameter, NewValue, Replace);
         return;
@@ -187,6 +244,14 @@
     if (Parameter==Fill_Parameter(StreamKind, Generic_Format_Commercial_IfAny))
         Replace=true;
 
+    if (!Replace && Value.empty())
+        return;
+    if (Replace && Value.empty())
+    {
+        Clear(StreamKind, StreamPos, Parameter);
+        return;
+    }
+
     Ztring &Target=(*Stream)[StreamKind][StreamPos](Parameter);
     if (Target.empty() || Replace)
         Target=Value; //First value
@@ -198,8 +263,8 @@
     Status[IsUpdated]=true;
 
     //Deprecated
-    if (Parameter==Fill_Parameter(StreamKind, Generic_Resolution))
-        Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_BitDepth), Value, Replace);
+    if (Parameter==Fill_Parameter(StreamKind, Generic_BitDepth))
+        Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Resolution), Retrieve(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_BitDepth)), true);
     if (StreamKind==Stream_Video && Parameter==Video_Colorimetry)
         Fill(Stream_Video, StreamPos, Video_ChromaSubsampling, Value, Replace);
 
@@ -210,9 +275,9 @@
         float Height=Retrieve(Stream_Video, StreamPos, Video_Height            ).To_float32();
         if (DAR && Height && Width)
         {
-            if (Retrieve(Stream_Video, StreamPos, Video_DisplayAspectRatio)==_T("1.778"))
+            if (Retrieve(Stream_Video, StreamPos, Video_DisplayAspectRatio)==__T("1.778"))
                 DAR=((float)16)/9; //More exact value
-            if (Retrieve(Stream_Video, StreamPos, Video_DisplayAspectRatio)==_T("1.333"))
+            if (Retrieve(Stream_Video, StreamPos, Video_DisplayAspectRatio)==__T("1.333"))
                 DAR=((float)4)/3; //More exact value
             Fill(Stream_Video, StreamPos, Video_PixelAspectRatio, DAR/(((float32)Width)/Height));
         }
@@ -221,37 +286,37 @@
     if (StreamKind==Stream_Video && Parameter==Video_PixelAspectRatio && !Value.empty() && Retrieve(Stream_Video, StreamPos, Video_DisplayAspectRatio).empty())
     {
         float32 PAR   =Retrieve(Stream_Video, StreamPos, Video_PixelAspectRatio  ).To_float32();
-        if (PAR>(float32)12/(float32)11*0.99 && PAR<(float32)12/(float32)11*1.01)
+        if (PAR>(float32)12/(float32)11*0.999 && PAR<(float32)12/(float32)11*1.001)
             PAR=(float32)12/(float32)11;
-        if (PAR>(float32)10/(float32)11*0.99 && PAR<(float32)10/(float32)11*1.01)
+        if (PAR>(float32)10/(float32)11*0.999 && PAR<(float32)10/(float32)11*1.001)
             PAR=(float32)10/(float32)11;
-        if (PAR>(float32)16/(float32)11*0.99 && PAR<(float32)16/(float32)11*1.01)
+        if (PAR>(float32)16/(float32)11*0.999 && PAR<(float32)16/(float32)11*1.001)
             PAR=(float32)16/(float32)11;
-        if (PAR>(float32)40/(float32)33*0.99 && PAR<(float32)40/(float32)33*1.01)
+        if (PAR>(float32)40/(float32)33*0.999 && PAR<(float32)40/(float32)33*1.001)
             PAR=(float32)40/(float32)33;
-        if (PAR>(float32)24/(float32)11*0.99 && PAR<(float32)24/(float32)11*1.01)
+        if (PAR>(float32)24/(float32)11*0.999 && PAR<(float32)24/(float32)11*1.001)
             PAR=(float32)24/(float32)11;
-        if (PAR>(float32)20/(float32)11*0.99 && PAR<(float32)20/(float32)11*1.01)
+        if (PAR>(float32)20/(float32)11*0.999 && PAR<(float32)20/(float32)11*1.001)
             PAR=(float32)20/(float32)11;
-        if (PAR>(float32)32/(float32)11*0.99 && PAR<(float32)32/(float32)11*1.01)
+        if (PAR>(float32)32/(float32)11*0.999 && PAR<(float32)32/(float32)11*1.001)
             PAR=(float32)32/(float32)11;
-        if (PAR>(float32)80/(float32)33*0.99 && PAR<(float32)80/(float32)33*1.01)
+        if (PAR>(float32)80/(float32)33*0.999 && PAR<(float32)80/(float32)33*1.001)
             PAR=(float32)80/(float32)33;
-        if (PAR>(float32)18/(float32)11*0.99 && PAR<(float32)18/(float32)11*1.01)
+        if (PAR>(float32)18/(float32)11*0.999 && PAR<(float32)18/(float32)11*1.001)
             PAR=(float32)18/(float32)11;
-        if (PAR>(float32)15/(float32)11*0.99 && PAR<(float32)15/(float32)11*1.01)
+        if (PAR>(float32)15/(float32)11*0.999 && PAR<(float32)15/(float32)11*1.001)
             PAR=(float32)15/(float32)11;
-        if (PAR>(float32)64/(float32)33*0.99 && PAR<(float32)64/(float32)33*1.01)
+        if (PAR>(float32)64/(float32)33*0.999 && PAR<(float32)64/(float32)33*1.001)
             PAR=(float32)64/(float32)33;
-        if (PAR>(float32)160/(float32)99*0.99 && PAR<(float32)160/(float32)99*1.01)
+        if (PAR>(float32)160/(float32)99*0.999 && PAR<(float32)160/(float32)99*1.001)
             PAR=(float32)160/(float32)99;
-        if (PAR>(float32)4/(float32)3*0.99 && PAR<(float32)4/(float32)3*1.01)
+        if (PAR>(float32)4/(float32)3*0.999 && PAR<(float32)4/(float32)3*1.01)
             PAR=(float32)4/(float32)3;
-        if (PAR>(float32)3/(float32)2*0.99 && PAR<(float32)3/(float32)2*1.01)
+        if (PAR>(float32)3/(float32)2*0.999 && PAR<(float32)3/(float32)2*1.001)
             PAR=(float32)3/(float32)2;
-        if (PAR>(float32)2/(float32)1*0.99 && PAR<(float32)2/(float32)1*1.01)
+        if (PAR>(float32)2/(float32)1*0.999 && PAR<(float32)2/(float32)1*1.001)
             PAR=(float32)2;
-        if (PAR>(float32)59/(float32)54*0.99 && PAR<(float32)59/(float32)54*1.01)
+        if (PAR>(float32)59/(float32)54*0.999 && PAR<(float32)59/(float32)54*1.001)
             PAR=(float32)59/(float32)54;
         float32 Width =Retrieve(Stream_Video, StreamPos, Video_Width             ).To_float32();
         float32 Height=Retrieve(Stream_Video, StreamPos, Video_Height            ).To_float32();
@@ -259,6 +324,62 @@
             Fill(Stream_Video, StreamPos, Video_DisplayAspectRatio, ((float32)Width)/Height*PAR);
     }
 
+    if (StreamKind==Stream_Image && Parameter==Image_DisplayAspectRatio && !Value.empty() && Retrieve(Stream_Image, StreamPos, Image_PixelAspectRatio).empty())
+    {
+        float DAR   =Retrieve(Stream_Image, StreamPos, Image_DisplayAspectRatio).To_float32();
+        float Width =Retrieve(Stream_Image, StreamPos, Image_Width             ).To_float32();
+        float Height=Retrieve(Stream_Image, StreamPos, Image_Height            ).To_float32();
+        if (DAR && Height && Width)
+        {
+            if (Retrieve(Stream_Image, StreamPos, Image_DisplayAspectRatio)==__T("1.778"))
+                DAR=((float)16)/9; //More exact value
+            if (Retrieve(Stream_Image, StreamPos, Image_DisplayAspectRatio)==__T("1.333"))
+                DAR=((float)4)/3; //More exact value
+            Fill(Stream_Image, StreamPos, Image_PixelAspectRatio, DAR/(((float32)Width)/Height));
+        }
+    }
+
+    if (StreamKind==Stream_Image && Parameter==Image_PixelAspectRatio && !Value.empty() && Retrieve(Stream_Image, StreamPos, Image_DisplayAspectRatio).empty())
+    {
+        float32 PAR   =Retrieve(Stream_Image, StreamPos, Image_PixelAspectRatio  ).To_float32();
+        if (PAR>(float32)12/(float32)11*0.999 && PAR<(float32)12/(float32)11*1.001)
+            PAR=(float32)12/(float32)11;
+        if (PAR>(float32)10/(float32)11*0.999 && PAR<(float32)10/(float32)11*1.001)
+            PAR=(float32)10/(float32)11;
+        if (PAR>(float32)16/(float32)11*0.999 && PAR<(float32)16/(float32)11*1.001)
+            PAR=(float32)16/(float32)11;
+        if (PAR>(float32)40/(float32)33*0.999 && PAR<(float32)40/(float32)33*1.001)
+            PAR=(float32)40/(float32)33;
+        if (PAR>(float32)24/(float32)11*0.999 && PAR<(float32)24/(float32)11*1.001)
+            PAR=(float32)24/(float32)11;
+        if (PAR>(float32)20/(float32)11*0.999 && PAR<(float32)20/(float32)11*1.001)
+            PAR=(float32)20/(float32)11;
+        if (PAR>(float32)32/(float32)11*0.999 && PAR<(float32)32/(float32)11*1.001)
+            PAR=(float32)32/(float32)11;
+        if (PAR>(float32)80/(float32)33*0.999 && PAR<(float32)80/(float32)33*1.001)
+            PAR=(float32)80/(float32)33;
+        if (PAR>(float32)18/(float32)11*0.999 && PAR<(float32)18/(float32)11*1.001)
+            PAR=(float32)18/(float32)11;
+        if (PAR>(float32)15/(float32)11*0.999 && PAR<(float32)15/(float32)11*1.001)
+            PAR=(float32)15/(float32)11;
+        if (PAR>(float32)64/(float32)33*0.999 && PAR<(float32)64/(float32)33*1.001)
+            PAR=(float32)64/(float32)33;
+        if (PAR>(float32)160/(float32)99*0.999 && PAR<(float32)160/(float32)99*1.001)
+            PAR=(float32)160/(float32)99;
+        if (PAR>(float32)4/(float32)3*0.999 && PAR<(float32)4/(float32)3*1.01)
+            PAR=(float32)4/(float32)3;
+        if (PAR>(float32)3/(float32)2*0.999 && PAR<(float32)3/(float32)2*1.001)
+            PAR=(float32)3/(float32)2;
+        if (PAR>(float32)2/(float32)1*0.999 && PAR<(float32)2/(float32)1*1.001)
+            PAR=(float32)2;
+        if (PAR>(float32)59/(float32)54*0.999 && PAR<(float32)59/(float32)54*1.001)
+            PAR=(float32)59/(float32)54;
+        float32 Width =Retrieve(Stream_Image, StreamPos, Image_Width             ).To_float32();
+        float32 Height=Retrieve(Stream_Image, StreamPos, Image_Height            ).To_float32();
+        if (PAR && Height && Width)
+            Fill(Stream_Image, StreamPos, Image_DisplayAspectRatio, ((float32)Width)/Height*PAR);
+    }
+
     //Commercial name
     if (Parameter==Fill_Parameter(StreamKind, Generic_Format))
         Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Format_Commercial), Value);
@@ -267,91 +388,89 @@
 
     if (!IsSub)
     {
+        Ztring ParameterName=Retrieve(StreamKind, StreamPos, Parameter, Info_Name);
+
+        //Lists
+        if (StreamKind!=Stream_General &&  (ParameterName==__T("Codec/String")
+                                         || ParameterName==__T("Language/String")
+                                         || ParameterName==__T("Format")
+                                         || ParameterName==__T("CodecID/Hint")))
+        {
+            Ztring Temp1, Temp2;
+            for (size_t StreamPos_Local=0; StreamPos_Local<(*Stream)[StreamKind].size(); StreamPos_Local++)
+            {
+                if (ParameterName==__T("CodecID/Hint"))
+                    Temp1+=Retrieve(StreamKind, StreamPos_Local, Fill_Parameter(StreamKind, Generic_Format))+__T(" / ");
+                else
+                    Temp1+=Retrieve(StreamKind, StreamPos_Local, Parameter)+__T(" / ");
+                if (ParameterName==__T("Format")
+                 || ParameterName==__T("CodecID/Hint"))
+                {
+                    Temp2+=Retrieve(StreamKind, StreamPos_Local, Fill_Parameter(StreamKind, Generic_Format));
+                    if (!Retrieve(StreamKind, StreamPos_Local, Fill_Parameter(StreamKind, Generic_CodecID_Hint)).empty())
+                    {
+                        Temp2+=__T(" (");
+                        Temp2+=Retrieve(StreamKind, StreamPos_Local, Fill_Parameter(StreamKind, Generic_CodecID_Hint));
+                        Temp2+=__T(")");
+                    }
+                    Temp2+=__T(" / ");
+                }
+            }
+            if (!Temp1.empty())
+                Temp1.resize(Temp1.size()-3); //Delete extra " / "
+            if (!Temp2.empty())
+                Temp2.resize(Temp2.size()-3); //Delete extra " / "
+            Ztring StreamKind_Text=Get(StreamKind, 0, General_StreamKind, Info_Text);
+            if (ParameterName==__T("Codec/String"))
+                Fill(Stream_General, 0, Ztring(StreamKind_Text+__T("_Codec_List")).To_Local().c_str(), Temp1, true);
+            if (ParameterName==__T("Language/String"))
+                Fill(Stream_General, 0, Ztring(StreamKind_Text+__T("_Language_List")).To_Local().c_str(), Temp1, true);
+            if (ParameterName==__T("Format")
+             || ParameterName==__T("CodecID/Hint"))
+            {
+                Fill(Stream_General, 0, Ztring(StreamKind_Text+__T("_Format_List")).To_Local().c_str(), Temp1, true);
+                Fill(Stream_General, 0, Ztring(StreamKind_Text+__T("_Format_WithHint_List")).To_Local().c_str(), Temp2, true);
+            }
+        }
+
         //Human readable
         if (MediaInfoLib::Config.ReadByHuman_Get())
         {
             //Strings
             const Ztring &List_Measure_Value=MediaInfoLib::Config.Info_Get(StreamKind).Read(Parameter, Info_Measure);
-                 if (List_Measure_Value==_T(" byte"))
+                 if (List_Measure_Value==__T(" byte"))
                 FileSize_FileSize123(StreamKind, StreamPos, Parameter);
-            else if (List_Measure_Value==_T(" bps") || List_Measure_Value==_T(" Hz"))
+            else if (List_Measure_Value==__T(" bps") || List_Measure_Value==__T(" Hz"))
                 Kilo_Kilo123(StreamKind, StreamPos, Parameter);
-            else if (List_Measure_Value==_T(" ms"))
+            else if (List_Measure_Value==__T(" ms"))
                 Duration_Duration123(StreamKind, StreamPos, Parameter);
-            else if (List_Measure_Value==_T("Yes"))
+            else if (List_Measure_Value==__T("Yes"))
                 YesNo_YesNo(StreamKind, StreamPos, Parameter);
             else
                 Value_Value123(StreamKind, StreamPos, Parameter);
 
-            //Lists
-            if (StreamKind!=Stream_General)
-            {
-                const Ztring& Parameter_Text=MediaInfoLib::Config.Info_Get(StreamKind).Read(Parameter, Info_Name);
-                if (Parameter_Text==_T("Codec/String")
-                 || Parameter_Text==_T("Language/String")
-                 || Parameter_Text==_T("Format")
-                 || Parameter_Text==_T("CodecID/Hint"))
-                {
-                    Ztring Temp1, Temp2;
-                    for (size_t StreamPos_Local=0; StreamPos_Local<(*Stream)[StreamKind].size(); StreamPos_Local++)
-                    {
-                        if (Parameter_Text==_T("CodecID/Hint"))
-                            Temp1+=Retrieve(StreamKind, StreamPos_Local, Fill_Parameter(StreamKind, Generic_Format))+_T(" / ");
-                        else
-                            Temp1+=Retrieve(StreamKind, StreamPos_Local, Parameter)+_T(" / ");
-                        if (Parameter_Text==_T("Format")
-                         || Parameter_Text==_T("CodecID/Hint"))
-                        {
-                            Temp2+=Retrieve(StreamKind, StreamPos_Local, Fill_Parameter(StreamKind, Generic_Format));
-                            if (!Retrieve(StreamKind, StreamPos_Local, Fill_Parameter(StreamKind, Generic_CodecID_Hint)).empty())
-                            {
-                                Temp2+=_T(" (");
-                                Temp2+=Retrieve(StreamKind, StreamPos_Local, Fill_Parameter(StreamKind, Generic_CodecID_Hint));
-                                Temp2+=_T(")");
-                            }
-                            Temp2+=_T(" / ");
-                        }
-                    }
-                    if (!Temp1.empty())
-                        Temp1.resize(Temp1.size()-3); //Delete extra " / "
-                    if (!Temp2.empty())
-                        Temp2.resize(Temp2.size()-3); //Delete extra " / "
-                    Ztring StreamKind_Text=Get(StreamKind, 0, General_StreamKind, Info_Text);
-                    if (Parameter_Text==_T("Codec/String"))
-                        Fill(Stream_General, 0, Ztring(StreamKind_Text+_T("_Codec_List")).To_Local().c_str(), Temp1, true);
-                    if (Parameter_Text==_T("Language/String"))
-                        Fill(Stream_General, 0, Ztring(StreamKind_Text+_T("_Language_List")).To_Local().c_str(), Temp1, true);
-                    if (Parameter_Text==_T("Format")
-                     || Parameter_Text==_T("CodecID/Hint"))
-                    {
-                        Fill(Stream_General, 0, Ztring(StreamKind_Text+_T("_Format_List")).To_Local().c_str(), Temp1, true);
-                        Fill(Stream_General, 0, Ztring(StreamKind_Text+_T("_Format_WithHint_List")).To_Local().c_str(), Temp2, true);
-                    }
-                }
-            }
-
             //BitRate_Mode / OverallBitRate_Mode
-            if (Retrieve(StreamKind, StreamPos, Parameter, Info_Name)==(StreamKind==Stream_General?_T("OverallBitRate_Mode"):_T("BitRate_Mode")) && MediaInfoLib::Config.ReadByHuman_Get())
+            if (ParameterName==(StreamKind==Stream_General?__T("OverallBitRate_Mode"):__T("BitRate_Mode")) && MediaInfoLib::Config.ReadByHuman_Get())
             {
                 Clear(StreamKind, StreamPos, StreamKind==Stream_General?"OverallBitRate_Mode/String":"BitRate_Mode/String");
 
                 ZtringList List;
-                List.Separator_Set(0, _T(" / "));
+                List.Separator_Set(0, __T(" / "));
                 List.Write(Retrieve(StreamKind, StreamPos, Parameter));
 
                 //Per value
                 for (size_t Pos=0; Pos<List.size(); Pos++)
-                    List[Pos]=MediaInfoLib::Config.Language_Get(Ztring(_T("BitRate_Mode_"))+List[Pos]);
+                    List[Pos]=MediaInfoLib::Config.Language_Get(Ztring(__T("BitRate_Mode_"))+List[Pos]);
 
                 Ztring Translated=List.Read();
-                Fill(StreamKind, StreamPos, StreamKind==Stream_General?"OverallBitRate_Mode/String":"BitRate_Mode/String", Translated.find(_T("BitRate_Mode_"))?Translated:Value);
+                Fill(StreamKind, StreamPos, StreamKind==Stream_General?"OverallBitRate_Mode/String":"BitRate_Mode/String", Translated.find(__T("BitRate_Mode_"))?Translated:Value);
             }
 
             //Encoded_Library
-            if (Retrieve(StreamKind, StreamPos, Parameter, Info_Name)==_T("Encoded_Library")
-             || Retrieve(StreamKind, StreamPos, Parameter, Info_Name)==_T("Encoded_Library/Name")
-             || Retrieve(StreamKind, StreamPos, Parameter, Info_Name)==_T("Encoded_Library/Version")
-             || Retrieve(StreamKind, StreamPos, Parameter, Info_Name)==_T("Encoded_Library/Date"))
+            if (ParameterName==__T("Encoded_Library")
+             || ParameterName==__T("Encoded_Library/Name")
+             || ParameterName==__T("Encoded_Library/Version")
+             || ParameterName==__T("Encoded_Library/Date"))
             {
                 Ztring Name=Retrieve(StreamKind, StreamPos, "Encoded_Library/Name");
                 Ztring Version=Retrieve(StreamKind, StreamPos, "Encoded_Library/Version");
@@ -361,14 +480,14 @@
                     Ztring String=Name;
                     if (!Version.empty())
                     {
-                        String+=_T(" ");
+                        String+=__T(" ");
                         String+=Version;
                     }
                     if (!Date.empty())
                     {
-                        String+=_T(" (");
+                        String+=__T(" (");
                         String+=Date;
-                        String+=_T(")");
+                        String+=__T(")");
                     }
                     Fill(StreamKind, StreamPos, "Encoded_Library/String", String, true);
                 }
@@ -379,22 +498,22 @@
             //Format_Settings_Matrix
             if (StreamKind==Stream_Video && Parameter==Video_Format_Settings_Matrix)
             {
-                Ztring Translated=MediaInfoLib::Config.Language_Get(Ztring(_T("Format_Settings_Matrix_"))+Value);
-                Fill(Stream_Video, StreamPos, Video_Format_Settings_Matrix_String, Translated.find(_T("Format_Settings_Matrix_"))?Translated:Value, true);
+                Ztring Translated=MediaInfoLib::Config.Language_Get(Ztring(__T("Format_Settings_Matrix_"))+Value);
+                Fill(Stream_Video, StreamPos, Video_Format_Settings_Matrix_String, Translated.find(__T("Format_Settings_Matrix_"))?Translated:Value, Replace);
             }
 
             //Scan type
             if (StreamKind==Stream_Video && Parameter==Video_ScanType)
             {
-                Ztring Translated=MediaInfoLib::Config.Language_Get(Ztring(_T("Interlaced_"))+Value);
-                Fill(Stream_Video, StreamPos, Video_ScanType_String, Translated.find(_T("Interlaced_"))?Translated:Value, true);
+                Ztring Translated=MediaInfoLib::Config.Language_Get(Ztring(__T("Interlaced_"))+Value);
+                Fill(Stream_Video, StreamPos, Video_ScanType_String, Translated.find(__T("Interlaced_"))?Translated:Value, Replace);
             }
 
             //Scan order
             if (StreamKind==Stream_Video && Parameter==Video_ScanOrder)
             {
-                Ztring Translated=MediaInfoLib::Config.Language_Get(Ztring(_T("Interlaced_"))+Value);
-                Fill(Stream_Video, StreamPos, Video_ScanOrder_String, Translated.find(_T("Interlaced_"))?Translated:Value, true);
+                Ztring Translated=MediaInfoLib::Config.Language_Get(Ztring(__T("Interlaced_"))+Value);
+                Fill(Stream_Video, StreamPos, Video_ScanOrder_String, Translated.find(__T("Interlaced_"))?Translated:Value, Replace);
             }
 
             //Interlacement
@@ -402,9 +521,9 @@
             {
                 const Ztring &Z1=Retrieve(Stream_Video, StreamPos, Video_Interlacement);
                 if (Z1.size()==3)
-                    Fill(Stream_Video, StreamPos, Video_Interlacement_String, MediaInfoLib::Config.Language_Get(Ztring(_T("Interlaced_"))+Z1), true);
+                    Fill(Stream_Video, StreamPos, Video_Interlacement_String, MediaInfoLib::Config.Language_Get(Ztring(__T("Interlaced_"))+Z1), Replace);
                 else
-                    Fill(Stream_Video, StreamPos, Video_Interlacement_String, MediaInfoLib::Config.Language_Get(Z1), true);
+                    Fill(Stream_Video, StreamPos, Video_Interlacement_String, MediaInfoLib::Config.Language_Get(Z1), Replace);
                 if (Retrieve(Stream_Video, StreamPos, Video_Interlacement_String).empty())
                     Fill(Stream_Video, StreamPos, Video_Interlacement_String, Z1, true);
             }
@@ -412,51 +531,22 @@
             //FrameRate_Mode
             if (StreamKind==Stream_Video && Parameter==Video_FrameRate_Mode)
             {
-                Ztring Translated=MediaInfoLib::Config.Language_Get(Ztring(_T("FrameRate_Mode_"))+Value);
-                Fill(Stream_Video, StreamPos, Video_FrameRate_Mode_String, Translated.find(_T("FrameRate_Mode_"))?Translated:Value, true);
+                Ztring Translated=MediaInfoLib::Config.Language_Get(Ztring(__T("FrameRate_Mode_"))+Value);
+                Fill(Stream_Video, StreamPos, Video_FrameRate_Mode_String, Translated.find(__T("FrameRate_Mode_"))?Translated:Value, Replace);
             }
-        }
 
-        //Filling Lists & Counts
-        if (StreamKind!=Stream_General && (Retrieve(StreamKind, StreamPos, Parameter, Info_Name)==_T("Codec")
-                                        || Retrieve(StreamKind, StreamPos, Parameter, Info_Name)==_T("Language/String")
-                                        || Retrieve(StreamKind, StreamPos, Parameter, Info_Name)==_T("Format")
-                                        || Retrieve(StreamKind, StreamPos, Parameter, Info_Name)==_T("CodecID/Hint")
-            ))
-        {
-            const Ztring& StreamKind_Text=Get(StreamKind, 0, General_StreamKind, Info_Text);
-            Ztring Temp1, Temp2;
-            for (size_t Pos=0; Pos<Count_Get(StreamKind); Pos++)
+            //Compression_Mode
+            if (Parameter==Fill_Parameter(StreamKind, Generic_Compression_Mode))
             {
-                if (Retrieve(StreamKind, StreamPos, Parameter, Info_Name)==_T("Format")
-                 || Retrieve(StreamKind, StreamPos, Parameter, Info_Name)==_T("CodecID/Hint"))
-                {
-                    Temp1+=Retrieve(StreamKind, Pos, Fill_Parameter(StreamKind, Generic_Format))+_T(" / ");
-                    Temp2+=Retrieve(StreamKind, Pos, Fill_Parameter(StreamKind, Generic_Format));
-                    if (!Retrieve(StreamKind, Pos, Fill_Parameter(StreamKind, Generic_CodecID_Hint)).empty())
-                    {
-                        Temp2+=_T(" (");
-                        Temp2+=Retrieve(StreamKind, Pos, Fill_Parameter(StreamKind, Generic_CodecID_Hint));
-                        Temp2+=_T(")");
-                    }
-                    Temp2+=_T(" / ");
-                }
-                else
-                    Temp1+=Retrieve(StreamKind, Pos, Parameter)+_T(" / ");
+                Ztring Translated=MediaInfoLib::Config.Language_Get(Ztring(__T("Compression_Mode_"))+Value);
+                Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Compression_Mode_String), Translated.find(__T("Compression_Mode_"))?Translated:Value, Replace);
             }
-            Temp1.resize(Temp1.size()-3); //Removing last " / "
-            if (!Temp2.empty())
-                Temp2.resize(Temp2.size()-3); //Removing last " / "
 
-            if (Retrieve(StreamKind, StreamPos, Parameter, Info_Name)==_T("Codec"))
-                Fill(Stream_General, 0, Ztring(StreamKind_Text+_T("_Codec_List")).To_Local().c_str(), Temp1, true);
-            if (Retrieve(StreamKind, StreamPos, Parameter, Info_Name)==_T("Language/String"))
-                Fill(Stream_General, 0, Ztring(StreamKind_Text+_T("_Language_List")).To_Local().c_str(), Temp1, true);
-            if (Retrieve(StreamKind, StreamPos, Parameter, Info_Name)==_T("Format")
-             || Retrieve(StreamKind, StreamPos, Parameter, Info_Name)==_T("CodecID/Hint"))
+            //Delay_Source
+            if (Parameter==Fill_Parameter(StreamKind, Generic_Delay_Source))
             {
-                Fill(Stream_General, 0, Ztring(StreamKind_Text+_T("_Format_List")).To_Local().c_str(), Temp1, true);
-                Fill(Stream_General, 0, Ztring(StreamKind_Text+_T("_Format_WithHint_List")).To_Local().c_str(), Temp2, true);
+                Ztring Translated=MediaInfoLib::Config.Language_Get(Ztring(__T("Delay_Source_"))+Value);
+                Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Delay_Source_String), Translated.find(__T("Delay_Source_"))?Translated:Value, Replace);
             }
         }
 
@@ -465,16 +555,23 @@
             Fill(Stream_General, 0, General_Format, Value); //If not already filled, we are filling with the stream format
 
         //ID
-        if (Retrieve(StreamKind, StreamPos, Parameter, Info_Name)==_T("ID"))
-            Fill(StreamKind, StreamPos, General_ID_String, Value, true);
+        if (Parameter==General_ID)
+            Fill(StreamKind, StreamPos, General_ID_String, Value, Replace);
 
         //Format
-        if (Retrieve(StreamKind, StreamPos, Parameter, Info_Name)==_T("Format"))
+        if (Parameter==Fill_Parameter(StreamKind, Generic_Format))
         {
-            Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Format_Info), MediaInfoLib::Config.Format_Get(Retrieve(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Format)), InfoFormat_Info), true);
-            Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Format_Url) , MediaInfoLib::Config.Format_Get(Retrieve(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Format)), InfoFormat_Url ), true);
+            if ((Replace && !MediaInfoLib::Config.Format_Get(Retrieve(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Format)), InfoFormat_Info).empty()) || Retrieve(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Format_Info)).empty())
+                Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Format_Info), MediaInfoLib::Config.Format_Get(Retrieve(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Format)), InfoFormat_Info), true);
+            if ((Replace && !MediaInfoLib::Config.Format_Get(Retrieve(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Format)), InfoFormat_Url).empty()) || Retrieve(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Format_Url)).empty())
+                Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Format_Url) , MediaInfoLib::Config.Format_Get(Retrieve(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Format)), InfoFormat_Url), true);
             if (StreamKind!=Stream_Menu)
-                Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_InternetMediaType), MediaInfoLib::Config.Format_Get(Retrieve(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Format)), InfoFormat_InternetMediaType), true);
+            {
+                if ((Replace && !MediaInfoLib::Config.Format_Get(Retrieve(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Format)), InfoFormat_InternetMediaType).empty()) || Retrieve(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_InternetMediaType)).empty())
+                    Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_InternetMediaType), MediaInfoLib::Config.Format_Get(Retrieve(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Format)), InfoFormat_InternetMediaType), true);
+                if ((Replace && !MediaInfoLib::Config.Format_Get(Retrieve(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Format)), InfoFormat_Compression_Mode).empty()) || Retrieve(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Compression_Mode)).empty())
+                    Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Compression_Mode), MediaInfoLib::Config.Format_Get(Retrieve(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Format)), InfoFormat_Compression_Mode), true);
+            }
             if (StreamKind==Stream_General)
             {
                 Fill(Stream_General, 0, General_Format_Extensions, MediaInfoLib::Config.Format_Get(Value, InfoFormat_Extensions), true);
@@ -493,15 +590,15 @@
             (*Stream)[Stream_General][0](General_Codec_Settings)=Value;
 
         //Codec
-        if (Retrieve(StreamKind, StreamPos, Parameter, Info_Name)==_T("Codec"))
+        if (Parameter==Fill_Parameter(StreamKind, Generic_Codec))
         {
             const Ztring &C1=MediaInfoLib::Config.Codec_Get(Retrieve(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Codec)), InfoCodec_Name, (stream_t)StreamKind);
             if (C1.empty())
-                Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Codec_String), Value, StreamKind!=Stream_Menu); //Specific for Menu: multiple codecs
+                Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Codec_String), Value, true);
             else
             {
                 Ztring D=Retrieve(StreamKind, StreamPos, "Codec/Family");
-                Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Codec_String), C1, StreamKind!=Stream_Menu); //Specific for Menu: multiple codecs
+                Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Codec_String), C1, true);
                 Fill(StreamKind, StreamPos, "Codec/Family", MediaInfoLib::Config.Codec_Get(Retrieve(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Codec)), InfoCodec_KindofCodec, StreamKind), true);
                 Ztring B=Retrieve(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Codec));
                 Ztring C=MediaInfoLib::Config.Codec_Get(B, InfoCodec_KindofCodec, StreamKind);
@@ -511,12 +608,12 @@
         }
 
         //CodecID_Description
-        if (Retrieve(StreamKind, StreamPos, Parameter, Info_Name)==_T("CodecID/Info") && Retrieve(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_CodecID_Description))==Value)
+        if (Parameter==Fill_Parameter(StreamKind, Generic_CodecID_Info) && Retrieve(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_CodecID_Description))==Value)
             Clear(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_CodecID_Description));
 
         //BitRate from BitRate_Nominal
-        if (Retrieve(StreamKind, StreamPos, Parameter, Info_Name)==_T("BitRate")
-         || Retrieve(StreamKind, StreamPos, Parameter, Info_Name)==_T("BitRate_Nominal"))
+        if (Parameter==Fill_Parameter(StreamKind, Generic_BitRate)
+         || Parameter==Fill_Parameter(StreamKind, Generic_BitRate_Nominal))
         {
             float32 BitRate=Retrieve(StreamKind, StreamPos, "BitRate").To_float32();
             float32 BitRate_Nominal=Retrieve(StreamKind, StreamPos, "BitRate_Nominal").To_float32();
@@ -528,6 +625,20 @@
             }
         }
 
+        //BitRate from BitRate_Maximum
+        if (Parameter==Fill_Parameter(StreamKind, Generic_BitRate)
+         || Parameter==Fill_Parameter(StreamKind, Generic_BitRate_Maximum))
+        {
+            float32 BitRate=Retrieve(StreamKind, StreamPos, "BitRate").To_float32();
+            float32 BitRate_Maximum=Retrieve(StreamKind, StreamPos, "BitRate_Maximum").To_float32();
+            if (BitRate>BitRate_Maximum*0.99 && BitRate<BitRate_Maximum*1.01)
+            {
+                Ztring Temp=Retrieve(StreamKind, StreamPos, "BitRate_Maximum");
+                Clear(StreamKind, StreamPos, "BitRate_Maximum");
+                Fill(StreamKind, StreamPos, "BitRate", Temp, true);
+            }
+        }
+
         //File size
         if (StreamKind==Stream_General && Parameter==General_FileSize)
         {
@@ -563,11 +674,18 @@
         }
         if (StreamKind==Stream_Audio && Parameter==Audio_Delay && Count_Get(Stream_Video) && !Retrieve(Stream_Audio, StreamPos, Audio_Delay).empty() && !Retrieve(Stream_Video, 0, Video_Delay).empty())
         {
-            Fill(Stream_Audio, StreamPos, Audio_Video_Delay, Value.To_int64s()-Retrieve(Stream_Video, 0, Video_Delay).To_int64s(), 10, true);
-            if (Retrieve(Stream_Audio, StreamPos, Audio_Video_Delay).To_int64u()==0)
-                for (size_t Pos=Audio_Video_Delay+1; Pos<=Audio_Video_Delay+4; Pos++)
-                    if (Pos<(*Stream)[Stream_Audio][StreamPos].size())
-                        (*Stream)[Stream_Audio][StreamPos][Pos].clear();
+            if (Replace)
+                Clear(Stream_Audio, StreamPos, Audio_Video_Delay);
+            ZtringList AudioDelay; AudioDelay.Separator_Set(0, __T(" / ")); AudioDelay.Write(Retrieve(Stream_Audio, StreamPos, Audio_Delay));
+            ZtringList VideoDelay; VideoDelay.Separator_Set(0, __T(" / ")); VideoDelay.Write(Retrieve(Stream_Video, 0, Video_Delay));
+            if (AudioDelay.size()<=VideoDelay.size())
+            {
+                Fill(Stream_Audio, StreamPos, Audio_Video_Delay, AudioDelay(AudioDelay.size()-1).To_int64s()-VideoDelay(AudioDelay.size()-1).To_int64s(), 10);
+                if (VideoDelay.size()==1 && Retrieve(Stream_Audio, StreamPos, Audio_Video_Delay).To_int64u()==0)
+                    for (size_t Pos=Audio_Video_Delay+1; Pos<=Audio_Video_Delay+4; Pos++)
+                        if (Pos<(*Stream)[Stream_Audio][StreamPos].size())
+                            (*Stream)[Stream_Audio][StreamPos][Pos].clear();
+            }
         }
         if (StreamKind==Stream_Text && Parameter==Text_Delay && Count_Get(Stream_Video) && !Retrieve(Stream_Text, StreamPos, Text_Delay).empty() && !Retrieve(Stream_Video, 0, Video_Delay).empty())
         {
@@ -602,11 +720,18 @@
         }
         if (StreamKind==Stream_Audio && Parameter==Audio_Delay && Count_Get(Stream_Video) && !Retrieve(Stream_Audio, StreamPos, Audio_Delay).empty() && !Retrieve(Stream_Video, 0, Video_Delay).empty())
         {
-            Fill(Stream_Audio, StreamPos, Audio_Video0_Delay, Value.To_int64s()-Retrieve(Stream_Video, 0, Video_Delay).To_int64s(), 10, true);
-            if (Retrieve(Stream_Audio, StreamPos, Audio_Video0_Delay).To_int64u()==0)
-                for (size_t Pos=Audio_Video0_Delay+1; Pos<=Audio_Video0_Delay+4; Pos++)
-                    if (Pos<(*Stream)[Stream_Audio][StreamPos].size())
-                        (*Stream)[Stream_Audio][StreamPos][Pos].clear();
+            if (Replace)
+                Clear(Stream_Audio, StreamPos, Audio_Video0_Delay);
+            ZtringList AudioDelay; AudioDelay.Separator_Set(0, __T(" / ")); AudioDelay.Write(Retrieve(Stream_Audio, StreamPos, Audio_Delay));
+            ZtringList VideoDelay; VideoDelay.Separator_Set(0, __T(" / ")); VideoDelay.Write(Retrieve(Stream_Video, 0, Video_Delay));
+            if (AudioDelay.size()<=VideoDelay.size())
+            {
+                Fill(Stream_Audio, StreamPos, Audio_Video0_Delay, AudioDelay(AudioDelay.size()-1).To_int64s()-VideoDelay(AudioDelay.size()-1).To_int64s(), 10);
+                if (VideoDelay.size()==1 && Retrieve(Stream_Audio, StreamPos, Audio_Video0_Delay).To_int64u()==0)
+                    for (size_t Pos=Audio_Video0_Delay+1; Pos<=Audio_Video0_Delay+4; Pos++)
+                        if (Pos<(*Stream)[Stream_Audio][StreamPos].size())
+                            (*Stream)[Stream_Audio][StreamPos][Pos].clear();
+            }
         }
         if (StreamKind==Stream_Text && Parameter==Text_Delay && Count_Get(Stream_Video) && !Retrieve(Stream_Text, StreamPos, Text_Delay).empty() && !Retrieve(Stream_Video, 0, Video_Delay).empty())
         {
@@ -619,7 +744,7 @@
 
         //Language
         //-Find 2-digit language
-        if (Retrieve(StreamKind, StreamPos, Parameter, Info_Name)==_T("Language"))
+        if (Parameter==Fill_Parameter(StreamKind, Generic_Language))
         {
             //Removing old strings
             Clear(StreamKind, StreamPos, Parameter+1); //String
@@ -629,8 +754,8 @@
             Clear(StreamKind, StreamPos, Parameter+5); //String4
 
             ZtringListList Languages;
-            Languages.Separator_Set(0, _T(" / "));
-            Languages.Separator_Set(1, _T("-"));
+            Languages.Separator_Set(0, __T(" / "));
+            Languages.Separator_Set(1, __T("-"));
             Languages.Write((*Stream)[StreamKind][StreamPos][Parameter]);
 
             //Canonizing
@@ -643,8 +768,11 @@
                 {
                     Language_Orig=Languages[Pos][0];
                     Languages[Pos][0].MakeLowerCase();
-                    if (Languages[Pos][0].size()==3 && (Languages[Pos][0]==_T("mis") || Languages[Pos][0]==_T("und") || Languages[Pos][0]==_T("???") || Languages[Pos][0]==_T("   "))
-                     || Languages[Pos][0].size()==2 && Languages[Pos][0]==_T("  "))
+                    if ((Languages[Pos][0].size()==3 && (Languages[Pos][0]==__T("mis")
+                                                      || Languages[Pos][0]==__T("und")
+                                                      || Languages[Pos][0]==__T("???")
+                                                      || Languages[Pos][0]==__T("   ")))
+                     || (Languages[Pos][0].size()==2 && Languages[Pos][0]==__T("  ")))
                         Languages[Pos].clear();
                 }
 
@@ -655,38 +783,41 @@
                         Languages[Pos][0]=MediaInfoLib::Config.Iso639_1_Get(Languages[Pos][0]);
                     if (Languages[Pos][0].size()>3 && !MediaInfoLib::Config.Iso639_Find(Languages[Pos][0]).empty())
                         Languages[Pos][0]=MediaInfoLib::Config.Iso639_Find(Languages[Pos][0]);
-                    if (Languages[Pos][0].size()>3 && !MediaInfoLib::Config.Language_Get(_T("Language_")+Languages[Pos][0].substr(0, 2)).empty())
-                        Languages[Pos][0]=Languages[Pos][0].substr(0, 2);
                     if (Languages[Pos][0].size()>3)
                         Languages[Pos][0]=Language_Orig; //We failed to detect language, using the original version
                 }
-
-                //Country name
-                if (Languages[Pos].size()>=2)
-                    Languages[Pos][1].MakeLowerCase();
             }
 
             if (Languages.Read()!=Retrieve(StreamKind, StreamPos, Parameter))
                 Fill(StreamKind, StreamPos, Parameter, Languages.Read(), true);
             else
             {
-                ZtringList Language1; Language1.Separator_Set(0, _T(" / "));
-                ZtringList Language2; Language2.Separator_Set(0, _T(" / "));
-                ZtringList Language3; Language3.Separator_Set(0, _T(" / "));
-                ZtringList Language4; Language4.Separator_Set(0, _T(" / "));
+                ZtringList Language1; Language1.Separator_Set(0, __T(" / "));
+                ZtringList Language2; Language2.Separator_Set(0, __T(" / "));
+                ZtringList Language3; Language3.Separator_Set(0, __T(" / "));
+                ZtringList Language4; Language4.Separator_Set(0, __T(" / "));
 
                 for (size_t Pos=0; Pos<Languages.size(); Pos++)
                 {
                     if (Languages[Pos].size()>=1)
                     {
-                        Ztring Language_Translated=MediaInfoLib::Config.Language_Get(_T("Language_")+Languages[Pos][0]);
-                        if (Language_Translated.find(_T("Language_"))==0)
+                        Ztring Language_Translated=MediaInfoLib::Config.Language_Get(__T("Language_")+Languages[Pos][0]);
+                        if (Language_Translated.find(__T("Language_"))==0)
                             Language_Translated=Languages[Pos][0]; //No translation found
                         if (Languages[Pos].size()>=2)
                         {
-                            Language_Translated+=_T(" (");
-                            Language_Translated+=Ztring(Languages[Pos][1]).MakeUpperCase();
-                            Language_Translated+=_T(")");
+                            if (Languages[Pos].size()==2 && Languages[Pos][0].size()>=2 && Languages[Pos][0].size()<=3 && (Languages[Pos][1][0]&0xDF)>=__T('A') && (Languages[Pos][1][0]&0xDF)<=__T('Z') && (Languages[Pos][1][1]&0xDF)>=__T('A') && (Languages[Pos][1][1]&0xDF)<=__T('Z'))
+                            {
+                                Language_Translated+=__T(" (");
+                                Language_Translated+=Ztring(Languages[Pos][1]).MakeUpperCase();
+                                Language_Translated+=__T(")");
+                            }
+                            else
+                                for (size_t Pos2=1; Pos2<Languages[Pos].size(); Pos2++)
+                                {
+                                    Language_Translated+=__T('-'); //As the original string
+                                    Language_Translated+=Languages[Pos][Pos2];
+                                }
                         }
                         Language1.push_back(Language_Translated);
                         if (Languages[Pos][0].size()==2)
@@ -724,13 +855,13 @@
         }
 
         //ServiceName / ServiceProvider
-        if (Retrieve(StreamKind, StreamPos, Parameter, Info_Name)==_T("ServiceName")
-         || Retrieve(StreamKind, StreamPos, Parameter, Info_Name)==_T("ServiceProvider"))
+        if (Parameter==Fill_Parameter(StreamKind, Generic_ServiceName)
+         || Parameter==Fill_Parameter(StreamKind, Generic_ServiceProvider))
         {
-            if (Retrieve(StreamKind, StreamPos, Parameter).find(_T(" - "))==string::npos && (Retrieve(StreamKind, StreamPos, Parameter).find(_T(":"))==2 || Retrieve(StreamKind, StreamPos, Parameter).find(_T(":"))==3))
+            if (Retrieve(StreamKind, StreamPos, Parameter).find(__T(" - "))==string::npos && (Retrieve(StreamKind, StreamPos, Parameter).find(__T(":"))==2 || Retrieve(StreamKind, StreamPos, Parameter).find(__T(":"))==3))
             {
                 Ztring Temp=Retrieve(StreamKind, StreamPos, Parameter);
-                Temp.erase(0, Retrieve(StreamKind, StreamPos, Parameter).find(_T(":"))+1);
+                Temp.erase(0, Retrieve(StreamKind, StreamPos, Parameter).find(__T(":"))+1);
                 (*Stream)[StreamKind][StreamPos](Parameter)=Temp;
             }
         }
@@ -764,19 +895,19 @@
         {
             float F1=Retrieve(Stream_Video, StreamPos, Video_DisplayAspectRatio).To_float32();
             Ztring C1;
-                 if (0);
-            else if (F1>1.23 && F1<1.27) C1=_T("5:4");
-            else if (F1>1.30 && F1<1.37) C1=_T("4:3");
-            else if (F1>1.45 && F1<1.55) C1=_T("3:2");
-            else if (F1>1.70 && F1<1.85) C1=_T("16:9");
-            else if (F1>2.10 && F1<2.22) C1=_T("2.2:1");
-            else if (F1>2.23 && F1<2.30) C1=_T("2.25:1");
-            else if (F1>2.30 && F1<2.40) C1=_T("2.35:1");
-            else if (F1>2.37 && F1<2.45) C1=_T("2.40:1");
+                 if (F1>=(float)1.23 && F1<(float)1.27) C1=__T("5:4");
+            else if (F1>=(float)1.30 && F1<(float)1.37) C1=__T("4:3");
+            else if (F1>=(float)1.45 && F1<(float)1.55) C1=__T("3:2");
+            else if (F1>=(float)1.74 && F1<(float)1.82) C1=__T("16:9");
+            else if (F1>=(float)1.82 && F1<(float)1.88) C1=__T("1.85:1");
+            else if (F1>=(float)2.15 && F1<(float)2.22) C1=__T("2.2:1");
+            else if (F1>=(float)2.23 && F1<(float)2.30) C1=__T("2.25:1");
+            else if (F1>=(float)2.30 && F1<(float)2.37) C1=__T("2.35:1");
+            else if (F1>=(float)2.37 && F1<(float)2.45) C1=__T("2.40:1");
             else              C1.From_Number(F1);
-            C1.FindAndReplace(_T("."), MediaInfoLib::Config.Language_Get(_T("  Config_Text_FloatSeparator")));
-            if (MediaInfoLib::Config.Language_Get(_T("  Language_ISO639"))==_T("fr") && C1.find(_T(":1"))==string::npos)
-                C1.FindAndReplace(_T(":"), _T("/"));
+            C1.FindAndReplace(__T("."), MediaInfoLib::Config.Language_Get(__T("  Config_Text_FloatSeparator")));
+            if (MediaInfoLib::Config.Language_Get(__T("  Language_ISO639"))==__T("fr") && C1.find(__T(":1"))==string::npos)
+                C1.FindAndReplace(__T(":"), __T("/"));
             Fill(Stream_Video, StreamPos, Video_DisplayAspectRatio_String, C1, true);
         }
 
@@ -785,22 +916,64 @@
         {
             float F1=Retrieve(Stream_Video, StreamPos, Video_DisplayAspectRatio_Original).To_float32();
             Ztring C1;
-                 if (0);
-            else if (F1>1.23 && F1<1.27) C1=_T("5:4");
-            else if (F1>1.30 && F1<1.37) C1=_T("4:3");
-            else if (F1>1.45 && F1<1.55) C1=_T("3:2");
-            else if (F1>1.70 && F1<1.85) C1=_T("16:9");
-            else if (F1>2.10 && F1<2.22) C1=_T("2.2:1");
-            else if (F1>2.23 && F1<2.30) C1=_T("2.25:1");
-            else if (F1>2.30 && F1<2.40) C1=_T("2.35:1");
-            else if (F1>2.37 && F1<2.45) C1=_T("2.40:1");
+                 if (F1>=(float)1.23 && F1<(float)1.27) C1=__T("5:4");
+            else if (F1>=(float)1.30 && F1<(float)1.37) C1=__T("4:3");
+            else if (F1>=(float)1.45 && F1<(float)1.55) C1=__T("3:2");
+            else if (F1>=(float)1.74 && F1<(float)1.82) C1=__T("16:9");
+            else if (F1>=(float)1.82 && F1<(float)1.88) C1=__T("1.85:1");
+            else if (F1>=(float)2.15 && F1<(float)2.22) C1=__T("2.2:1");
+            else if (F1>=(float)2.23 && F1<(float)2.30) C1=__T("2.25:1");
+            else if (F1>=(float)2.30 && F1<(float)2.37) C1=__T("2.35:1");
+            else if (F1>=(float)2.37 && F1<(float)2.45) C1=__T("2.40:1");
             else              C1.From_Number(F1);
-            C1.FindAndReplace(_T("."), MediaInfoLib::Config.Language_Get(_T("  Config_Text_FloatSeparator")));
-            if (MediaInfoLib::Config.Language_Get(_T("  Language_ISO639"))==_T("fr") && C1.find(_T(":1"))==string::npos)
-                C1.FindAndReplace(_T(":"), _T("/"));
+            C1.FindAndReplace(__T("."), MediaInfoLib::Config.Language_Get(__T("  Config_Text_FloatSeparator")));
+            if (MediaInfoLib::Config.Language_Get(__T("  Language_ISO639"))==__T("fr") && C1.find(__T(":1"))==string::npos)
+                C1.FindAndReplace(__T(":"), __T("/"));
             Fill(Stream_Video, StreamPos, Video_DisplayAspectRatio_Original_String, C1, true);
         }
 
+        //Display Aspect Ratio and Pixel Aspect Ratio
+        if (StreamKind==Stream_Image && Parameter==Image_DisplayAspectRatio && !Value.empty())
+        {
+            float F1=Retrieve(Stream_Image, StreamPos, Image_DisplayAspectRatio).To_float32();
+            Ztring C1;
+                 if (F1>=(float)1.23 && F1<(float)1.27) C1=__T("5:4");
+            else if (F1>=(float)1.30 && F1<(float)1.37) C1=__T("4:3");
+            else if (F1>=(float)1.45 && F1<(float)1.55) C1=__T("3:2");
+            else if (F1>=(float)1.74 && F1<(float)1.82) C1=__T("16:9");
+            else if (F1>=(float)1.82 && F1<(float)1.88) C1=__T("1.85:1");
+            else if (F1>=(float)2.15 && F1<(float)2.22) C1=__T("2.2:1");
+            else if (F1>=(float)2.23 && F1<(float)2.30) C1=__T("2.25:1");
+            else if (F1>=(float)2.30 && F1<(float)2.37) C1=__T("2.35:1");
+            else if (F1>=(float)2.37 && F1<(float)2.45) C1=__T("2.40:1");
+            else              C1.From_Number(F1);
+            C1.FindAndReplace(__T("."), MediaInfoLib::Config.Language_Get(__T("  Config_Text_FloatSeparator")));
+            if (MediaInfoLib::Config.Language_Get(__T("  Language_ISO639"))==__T("fr") && C1.find(__T(":1"))==string::npos)
+                C1.FindAndReplace(__T(":"), __T("/"));
+            Fill(Stream_Image, StreamPos, Image_DisplayAspectRatio_String, C1, true);
+        }
+
+        //Original Display Aspect Ratio and Original Pixel Aspect Ratio
+        if (StreamKind==Stream_Image && Parameter==Image_DisplayAspectRatio_Original)
+        {
+            float F1=Retrieve(Stream_Image, StreamPos, Image_DisplayAspectRatio_Original).To_float32();
+            Ztring C1;
+                 if (F1>=(float)1.23 && F1<(float)1.27) C1=__T("5:4");
+            else if (F1>=(float)1.30 && F1<(float)1.37) C1=__T("4:3");
+            else if (F1>=(float)1.45 && F1<(float)1.55) C1=__T("3:2");
+            else if (F1>=(float)1.74 && F1<(float)1.82) C1=__T("16:9");
+            else if (F1>=(float)1.82 && F1<(float)1.88) C1=__T("1.85:1");
+            else if (F1>=(float)2.15 && F1<(float)2.22) C1=__T("2.2:1");
+            else if (F1>=(float)2.23 && F1<(float)2.30) C1=__T("2.25:1");
+            else if (F1>=(float)2.30 && F1<(float)2.37) C1=__T("2.35:1");
+            else if (F1>=(float)2.37 && F1<(float)2.45) C1=__T("2.40:1");
+            else              C1.From_Number(F1);
+            C1.FindAndReplace(__T("."), MediaInfoLib::Config.Language_Get(__T("  Config_Text_FloatSeparator")));
+            if (MediaInfoLib::Config.Language_Get(__T("  Language_ISO639"))==__T("fr") && C1.find(__T(":1"))==string::npos)
+                C1.FindAndReplace(__T(":"), __T("/"));
+            Fill(Stream_Image, StreamPos, Image_DisplayAspectRatio_Original_String, C1, true);
+        }
+
         //Bits/(Pixel*Frame)
         if (StreamKind==Stream_Video && (Parameter==Video_BitRate || Parameter==Video_BitRate_Nominal || Parameter==Video_Width || Parameter==Video_Height || Parameter==Video_FrameRate))
         {
@@ -815,14 +988,16 @@
         //Special audio cases
         if (StreamKind==Stream_Audio && Parameter==Audio_CodecID
          && Retrieve(Stream_Audio, StreamPos, Audio_Channel_s_).empty()
-         &&(Value==_T("samr")
-         || Value==_T("sawb")
-         || Value==_T("7A21")
-         || Value==_T("7A22"))
+         &&(Value==__T("samr")
+         || Value==__T("sawb")
+         || Value==__T("7A21")
+         || Value==__T("7A22"))
             )
             Fill(Stream_Audio, StreamPos, Audio_Channel_s_, 1, 10, true); //AMR is always with 1 channel
 
         //Well known bitrate values
+        if (StreamKind==Stream_Video && (Parameter==Video_BitRate || Parameter==Video_BitRate_Nominal))
+            Video_BitRate_Rounding(StreamPos, (video)Parameter);
         if (StreamKind==Stream_Audio && (Parameter==Audio_BitRate || Parameter==Audio_BitRate_Nominal))
             Audio_BitRate_Rounding(StreamPos, (audio)Parameter);
     }
@@ -836,13 +1011,13 @@
         return;
 
     //Handling values with \r\n inside
-    if (Value.find(_T('\r'))!=string::npos || Value.find(_T('\n'))!=string::npos)
+    if (Value.find(__T('\r'))!=string::npos || Value.find(__T('\n'))!=string::npos)
     {
         Ztring NewValue=Value;
-        NewValue.FindAndReplace(_T("\r\n"), _T(" / "), 0, Ztring_Recursive);
-        NewValue.FindAndReplace(_T("\r"), _T(" / "), 0, Ztring_Recursive);
-        NewValue.FindAndReplace(_T("\n"), _T(" / "), 0, Ztring_Recursive);
-        if (NewValue.size()>=3 && NewValue.rfind(_T(" / "))==NewValue.size()-3)
+        NewValue.FindAndReplace(__T("\r\n"), __T(" / "), 0, Ztring_Recursive);
+        NewValue.FindAndReplace(__T("\r"), __T(" / "), 0, Ztring_Recursive);
+        NewValue.FindAndReplace(__T("\n"), __T(" / "), 0, Ztring_Recursive);
+        if (NewValue.size()>=3 && NewValue.rfind(__T(" / "))==NewValue.size()-3)
             NewValue.resize(NewValue.size()-3);
         Fill(StreamKind, StreamPos, Parameter, NewValue, Replace);
         return;
@@ -851,8 +1026,16 @@
     //Handle Value before StreamKind
     if (StreamKind==Stream_Max || StreamPos>=(*Stream)[StreamKind].size())
     {
+        Ztring ParameterZ=Ztring().From_UTF8(Parameter);
+        if (Replace)
+            for (size_t Pos=0; Pos<Fill_Temp.size(); Pos++)
+                if (Fill_Temp[Pos](0)==ParameterZ)
+                {
+                    Fill_Temp.erase(Fill_Temp.begin()+Pos);
+                    Pos--;
+                }
         ZtringList NewList;
-        NewList.push_back(Ztring().From_UTF8(Parameter));
+        NewList.push_back(ParameterZ);
         NewList.push_back(Value);
         Fill_Temp.push_back(NewList);
         return; //No streams
@@ -871,19 +1054,19 @@
     {
         if (Replace)
         {
-            size_t Pos_ToReplace=(*Stream_More)[StreamKind][StreamPos].Find(Ztring().From_UTF8(Parameter), Info_Name);
+            size_t Pos_ToReplace=(*Stream_More)[StreamKind][StreamPos].Find(Ztring().From_ISO_8859_1(Parameter), Info_Name);
             if (Pos_ToReplace!=(size_t)-1)
                 (*Stream_More)[StreamKind][StreamPos].erase((*Stream_More)[StreamKind][StreamPos].begin()+Pos_ToReplace); //Empty value --> remove the line
         }
     }
     else
     {
-        Ztring &Target=(*Stream_More)[StreamKind][StreamPos](Ztring().From_Local(Parameter), Info_Text);
+        Ztring &Target=(*Stream_More)[StreamKind][StreamPos](Ztring().From_ISO_8859_1(Parameter), Info_Text);
         if (Target.empty() || Replace)
         {
             Target=Value; //First value
-            (*Stream_More)[StreamKind][StreamPos](Ztring().From_Local(Parameter), Info_Name_Text)=MediaInfoLib::Config.Language_Get(Ztring().From_Local(Parameter));
-            (*Stream_More)[StreamKind][StreamPos](Ztring().From_Local(Parameter), Info_Options)=_T("Y NT");
+            (*Stream_More)[StreamKind][StreamPos](Ztring().From_ISO_8859_1(Parameter), Info_Name_Text)=MediaInfoLib::Config.Language_Get(Ztring().From_Local(Parameter));
+            (*Stream_More)[StreamKind][StreamPos](Ztring().From_ISO_8859_1(Parameter), Info_Options)=__T("Y NT");
         }
         else
         {
@@ -1014,24 +1197,26 @@
         {
             //Strings
             const Ztring &List_Measure_Value=MediaInfoLib::Config.Info_Get(StreamKind).Read(Parameter, Info_Measure);
-                 if (List_Measure_Value==_T(" byte"))
+                 if (List_Measure_Value==__T(" byte"))
             {
-                for (size_t Pos=Parameter+1; Pos<=Parameter+5; Pos++)
+                const Ztring &Temp=MediaInfoLib::Config.Info_Get(StreamKind).Read(Parameter, Info_Name);
+                size_t List_Size=Temp.find(__T("StreamSize"))==string::npos?5:7; //for /String5, with percentage, and proportion
+                for (size_t Pos=Parameter+1; Pos<=Parameter+List_Size; Pos++)
                     if (Pos<(*Stream)[StreamKind][StreamPos].size())
                         (*Stream)[StreamKind][StreamPos][Pos].clear();
             }
-            else if (List_Measure_Value==_T(" bps") || List_Measure_Value==_T(" Hz"))
+            else if (List_Measure_Value==__T(" bps") || List_Measure_Value==__T(" Hz"))
             {
                 if (Parameter+1<(*Stream)[StreamKind][StreamPos].size())
                     (*Stream)[StreamKind][StreamPos][Parameter+1].clear();
             }
-            else if (List_Measure_Value==_T(" ms"))
+            else if (List_Measure_Value==__T(" ms"))
             {
                 for (size_t Pos=Parameter+1; Pos<=Parameter+4; Pos++)
                     if (Pos<(*Stream)[StreamKind][StreamPos].size())
                         (*Stream)[StreamKind][StreamPos][Pos].clear();
             }
-            else if (List_Measure_Value==_T("Yes"))
+            else if (List_Measure_Value==__T("Yes"))
             {
                 if (Parameter+1<(*Stream)[StreamKind][StreamPos].size())
                     (*Stream)[StreamKind][StreamPos][Parameter+1].clear();
@@ -1136,7 +1321,7 @@
 size_t File__Analyze::Merge(MediaInfo_Internal &ToAdd, stream_t StreamKind, size_t StreamPos_From, size_t StreamPos_To, bool)
 {
     size_t Pos_Count=ToAdd.Count_Get(StreamKind, StreamPos_From);
-    for (size_t Pos=0; Pos<Pos_Count; Pos++)
+    for (size_t Pos=General_Inform; Pos<Pos_Count; Pos++)
         if (!ToAdd.Get(StreamKind, StreamPos_From, Pos).empty())
             Fill(StreamKind, StreamPos_To, Ztring(ToAdd.Get((stream_t)StreamKind, StreamPos_From, Pos, Info_Name)).To_UTF8().c_str(), ToAdd.Get(StreamKind, StreamPos_From, Pos), true);
 
@@ -1165,7 +1350,7 @@
 size_t File__Analyze::Merge(File__Analyze &ToAdd, stream_t StreamKind, size_t StreamPos_From, size_t StreamPos_To, bool Erase)
 {
     //Integrity
-    if (&ToAdd==NULL || StreamKind>=Stream_Max || !ToAdd.Stream || StreamPos_From>=(*ToAdd.Stream)[StreamKind].size())
+    if (!Status[IsAccepted] || &ToAdd==NULL || StreamKind>=Stream_Max || !ToAdd.Stream || StreamPos_From>=(*ToAdd.Stream)[StreamKind].size())
         return 0;
 
     //Destination
@@ -1173,16 +1358,37 @@
         Stream_Prepare(StreamKind);
 
     //Specific stuff
-    Ztring Width_Temp, Height_Temp, PixelAspectRatio_Temp, DisplayAspectRatio_Temp, FrameRate_Temp, FrameRate_Mode_Temp;
+    Ztring Width_Temp, Height_Temp, PixelAspectRatio_Temp, DisplayAspectRatio_Temp, FrameRate_Temp, FrameRate_Mode_Temp, Delay_Temp, Delay_Source_Temp, Delay_Settings_Temp, Source_Temp, Source_Kind_Temp, Source_Info_Temp;
     if (StreamKind==Stream_Video)
     {
-        Width_Temp=Retrieve(Stream_Video, StreamPos_Last, Video_Width);
-        Height_Temp=Retrieve(Stream_Video, StreamPos_Last, Video_Height);
-        PixelAspectRatio_Temp=Retrieve(Stream_Video, StreamPos_Last, Video_PixelAspectRatio); //We want to keep the PixelAspectRatio_Temp of the video stream
-        DisplayAspectRatio_Temp=Retrieve(Stream_Video, StreamPos_Last, Video_DisplayAspectRatio); //We want to keep the DisplayAspectRatio_Temp of the video stream
-        FrameRate_Temp=Retrieve(Stream_Video, StreamPos_Last, Video_FrameRate); //We want to keep the FrameRate of AVI 120 fps
-        FrameRate_Mode_Temp=Retrieve(Stream_Video, StreamPos_Last, Video_FrameRate_Mode); //We want to keep the FrameRate_Mode of AVI 120 fps
+        Width_Temp=Retrieve(Stream_Video, StreamPos_To, Video_Width);
+        Height_Temp=Retrieve(Stream_Video, StreamPos_To, Video_Height);
+        PixelAspectRatio_Temp=Retrieve(Stream_Video, StreamPos_To, Video_PixelAspectRatio); //We want to keep the PixelAspectRatio_Temp of the video stream
+        DisplayAspectRatio_Temp=Retrieve(Stream_Video, StreamPos_To, Video_DisplayAspectRatio); //We want to keep the DisplayAspectRatio_Temp of the video stream
+        FrameRate_Temp=Retrieve(Stream_Video, StreamPos_To, Video_FrameRate); //We want to keep the FrameRate of AVI 120 fps
+        FrameRate_Mode_Temp=Retrieve(Stream_Video, StreamPos_To, Video_FrameRate_Mode); //We want to keep the FrameRate_Mode of AVI 120 fps
+    }
+    if (ToAdd.Retrieve(StreamKind, StreamPos_From, Fill_Parameter(StreamKind, Generic_Delay_Source))==__T("Container"))
+    {
+        Fill(StreamKind, StreamPos_To, "Delay_Original", Retrieve(StreamKind, StreamPos_To, "Delay"), true);
+        Clear(StreamKind, StreamPos_To, "Delay");
+        Fill(StreamKind, StreamPos_To, "Delay_Original_Source", Retrieve(StreamKind, StreamPos_To, "Delay_Source"), true);
+        Clear(StreamKind, StreamPos_To, "Delay_Source");
+        if (!ToAdd.Retrieve(StreamKind, StreamPos_To, "Format").empty()) //Exception: MPEG-4 TimeCode, settings are in the MPEG-4 header
+        {
+            Fill(StreamKind, StreamPos_To, "Delay_Original_Settings", Retrieve(StreamKind, StreamPos_To, "Delay_Settings"), true);
+            Clear(StreamKind, StreamPos_To, "Delay_Settings");
+        }
     }
+    else
+    {
+        Delay_Temp=Retrieve(StreamKind, StreamPos_To, "Delay"); //We want to keep the Delay from the stream
+        Delay_Settings_Temp=Retrieve(StreamKind, StreamPos_To, "Delay_Settings"); //We want to keep the Delay_Settings from the stream
+        Delay_Source_Temp=Retrieve(StreamKind, StreamPos_To, "Delay_Source"); //We want to keep the Delay_Source from the stream
+    }
+    Source_Temp=Retrieve(StreamKind, StreamPos_To, "Source");
+    Source_Kind_Temp=Retrieve(StreamKind, StreamPos_To, "Source_Kind");
+    Source_Info_Temp=Retrieve(StreamKind, StreamPos_To, "Source_Info");
 
     //Merging
     size_t Count=0;
@@ -1190,7 +1396,7 @@
     for (size_t Pos=General_Inform; Pos<Size; Pos++)
     {
         const Ztring &ToFill_Value=ToAdd.Get(StreamKind, StreamPos_From, Pos);
-        if (!ToFill_Value.empty() && (Erase || Get(StreamKind, StreamPos_From, Pos).empty()))
+        if (!ToFill_Value.empty() && (Erase || Get(StreamKind, StreamPos_To, Pos).empty()))
         {
             if (Pos<MediaInfoLib::Config.Info_Get(StreamKind).size())
                 Fill(StreamKind, StreamPos_To, Pos, ToFill_Value, true);
@@ -1203,51 +1409,61 @@
         }
     }
 
-    //Clearing
-    for (size_t Pos=Size-1; Pos>=General_Inform; Pos--) //Descendant because Clear() remove the unknown fields
-    {
-        const Ztring &ToFill_Value=ToAdd.Get(StreamKind, StreamPos_From, Pos);
-        if (!ToFill_Value.empty())
-            ToAdd.Clear(StreamKind, StreamPos_From, Pos);
-    }
-
     //Specific stuff
     if (StreamKind==Stream_Video)
     {
-        Ztring PixelAspectRatio_Original=Retrieve(Stream_Video, StreamPos_Last, Video_PixelAspectRatio);
-        Ztring DisplayAspectRatio_Original=Retrieve(Stream_Video, StreamPos_Last, Video_DisplayAspectRatio);
+        Ztring PixelAspectRatio_Original=Retrieve(Stream_Video, StreamPos_To, Video_PixelAspectRatio);
+        Ztring DisplayAspectRatio_Original=Retrieve(Stream_Video, StreamPos_To, Video_DisplayAspectRatio);
 
-        if (!Width_Temp.empty() && Width_Temp!=Retrieve(Stream_Video, StreamPos_Last, Video_Width))
+        if (!Width_Temp.empty() && Width_Temp!=Retrieve(Stream_Video, StreamPos_To, Video_Width))
         {
-            Fill(Stream_Video, StreamPos_Last, Video_Width_Original, (*Stream)[Stream_Video][StreamPos_Last][Video_Width], true);
-            Fill(Stream_Video, StreamPos_Last, Video_Width, Width_Temp, true);
+            Fill(Stream_Video, StreamPos_To, Video_Width_Original, (*Stream)[Stream_Video][StreamPos_To][Video_Width], true);
+            Fill(Stream_Video, StreamPos_To, Video_Width, Width_Temp, true);
         }
-        if (!Height_Temp.empty() && Height_Temp!=Retrieve(Stream_Video, StreamPos_Last, Video_Height))
+        if (!Height_Temp.empty() && Height_Temp!=Retrieve(Stream_Video, StreamPos_To, Video_Height))
         {
-            Fill(Stream_Video, StreamPos_Last, Video_Height_Original, (*Stream)[Stream_Video][StreamPos_Last][Video_Height], true);
-            Fill(Stream_Video, StreamPos_Last, Video_Height, Height_Temp, true);
+            Fill(Stream_Video, StreamPos_To, Video_Height_Original, (*Stream)[Stream_Video][StreamPos_To][Video_Height], true);
+            Fill(Stream_Video, StreamPos_To, Video_Height, Height_Temp, true);
         }
-        if (!PixelAspectRatio_Temp.empty() && PixelAspectRatio_Temp!=Retrieve(Stream_Video, StreamPos_Last, Video_PixelAspectRatio))
+        if (!PixelAspectRatio_Temp.empty() && PixelAspectRatio_Temp!=Retrieve(Stream_Video, StreamPos_To, Video_PixelAspectRatio))
         {
-            Fill(Stream_Video, StreamPos_Last, Video_PixelAspectRatio_Original, PixelAspectRatio_Original, true);
-            Fill(Stream_Video, StreamPos_Last, Video_PixelAspectRatio, PixelAspectRatio_Temp, true);
+            Fill(Stream_Video, StreamPos_To, Video_PixelAspectRatio_Original, PixelAspectRatio_Original, true);
+            Fill(Stream_Video, StreamPos_To, Video_PixelAspectRatio, PixelAspectRatio_Temp, true);
         }
         if (!DisplayAspectRatio_Temp.empty() && DisplayAspectRatio_Temp!=DisplayAspectRatio_Original)
         {
-            Fill(Stream_Video, StreamPos_Last, Video_DisplayAspectRatio_Original, DisplayAspectRatio_Original, true);
-            Fill(Stream_Video, StreamPos_Last, Video_DisplayAspectRatio, DisplayAspectRatio_Temp, true);
+            Fill(Stream_Video, StreamPos_To, Video_DisplayAspectRatio_Original, DisplayAspectRatio_Original, true);
+            Fill(Stream_Video, StreamPos_To, Video_DisplayAspectRatio, DisplayAspectRatio_Temp, true);
         }
-        if (!FrameRate_Temp.empty() && FrameRate_Temp!=Retrieve(Stream_Video, StreamPos_Last, Video_FrameRate))
+        if (!FrameRate_Temp.empty() && FrameRate_Temp!=Retrieve(Stream_Video, StreamPos_To, Video_FrameRate))
         {
-            Fill(Stream_Video, StreamPos_Last, Video_FrameRate_Original, (*Stream)[Stream_Video][StreamPos_Last][Video_FrameRate], true);
-            Fill(Stream_Video, StreamPos_Last, Video_FrameRate, FrameRate_Temp, true);
+            Fill(Stream_Video, StreamPos_To, Video_FrameRate_Original, (*Stream)[Stream_Video][StreamPos_To][Video_FrameRate], true);
+            Fill(Stream_Video, StreamPos_To, Video_FrameRate, FrameRate_Temp, true);
         }
-        if (!FrameRate_Mode_Temp.empty() && FrameRate_Mode_Temp!=Retrieve(Stream_Video, StreamPos_Last, Video_FrameRate_Mode))
+        if (!FrameRate_Mode_Temp.empty() && FrameRate_Mode_Temp!=Retrieve(Stream_Video, StreamPos_To, Video_FrameRate_Mode))
         {
-            Fill(Stream_Video, StreamPos_Last, Video_FrameRate_Mode_Original, (*Stream)[Stream_Video][StreamPos_Last][Video_FrameRate_Mode], true);
-            Fill(Stream_Video, StreamPos_Last, Video_FrameRate_Mode, FrameRate_Mode_Temp, true);
+            Fill(Stream_Video, StreamPos_To, Video_FrameRate_Mode_Original, (*Stream)[Stream_Video][StreamPos_To][Video_FrameRate_Mode], true);
+            Fill(Stream_Video, StreamPos_To, Video_FrameRate_Mode, FrameRate_Mode_Temp, true);
         }
     }
+    if (!Delay_Source_Temp.empty() && Delay_Source_Temp!=Retrieve(StreamKind, StreamPos_To, "Delay_Source"))
+    {
+        Fill(StreamKind, StreamPos_To, "Delay_Original", Retrieve(StreamKind, StreamPos_To, "Delay"), true);
+        Fill(StreamKind, StreamPos_To, "Delay", Delay_Temp, true);
+        Fill(StreamKind, StreamPos_To, "Delay_Original_Settings", Retrieve(StreamKind, StreamPos_To, "Delay_Settings"), true);
+        Fill(StreamKind, StreamPos_To, "Delay_Settings", Delay_Settings_Temp, true);
+        Fill(StreamKind, StreamPos_To, "Delay_Original_Source", Retrieve(StreamKind, StreamPos_To, "Delay_Source"), true);
+        Fill(StreamKind, StreamPos_To, "Delay_Source", Delay_Source_Temp, true);
+    }
+    if (!Source_Temp.empty() && Source_Temp!=Retrieve(StreamKind, StreamPos_To, "Source"))
+    {
+        Fill(StreamKind, StreamPos_To, "Source_Original", Retrieve(StreamKind, StreamPos_To, "Source"), true);
+        Fill(StreamKind, StreamPos_To, "Source", Source_Temp, true);
+        Fill(StreamKind, StreamPos_To, "Source_Original_Kind", Retrieve(StreamKind, StreamPos_To, "Source_Kind"), true);
+        Fill(StreamKind, StreamPos_To, "Source_Kind", Source_Info_Temp, true);
+        Fill(StreamKind, StreamPos_To, "Source_Original_Info", Retrieve(StreamKind, StreamPos_To, "Source_Info"), true);
+        Fill(StreamKind, StreamPos_To, "Source_Info", Source_Info_Temp, true);
+    }
 
     Fill(StreamKind, StreamPos_To, (size_t)General_Count, Count_Get(StreamKind, StreamPos_To), 10, true);
     return 1;
@@ -1274,21 +1490,37 @@
     else if (FrameRate>23.988*2 && FrameRate<=24.012*2) FrameRate=24.000*2;
     else if (FrameRate>24.988*2 && FrameRate<=25.012*2) FrameRate=25.000*2;
     else if (FrameRate>29.955*2 && FrameRate<=29.985*2) FrameRate=29.970*2;
-    else if (FrameRate>30.985*2 && FrameRate<=30.015*2) FrameRate=30.000*2;
+    else if (FrameRate>29.985*2 && FrameRate<=30.015*2) FrameRate=30.000*2;
 
     if (FrameRate!=FrameRate_Sav)
         Fill(Stream_Video, Pos, Parameter, FrameRate, 3, true);
 }
 
 //---------------------------------------------------------------------------
+void File__Analyze::Video_BitRate_Rounding(size_t Pos, video Parameter)
+{
+    const Ztring& Format=Retrieve(Stream_Video, Pos, Video_Format);
+    int32u BitRate=Retrieve(Stream_Video, Pos, Parameter).To_int32u();
+    int32u BitRate_Sav=BitRate;
+    if (Format==__T("AVC"))
+    {
+        if (BitRate>= 54942720 && BitRate<= 57185280) BitRate= 56064000; //AVC-INTRA50
+        if (BitRate>=111390720 && BitRate<=115937280) BitRate=113664000; //AVC-INTRA100
+    }
+
+    if (BitRate!=BitRate_Sav)
+        Fill(Stream_Video, Pos, Parameter, BitRate, 0, true);
+}
+
+//---------------------------------------------------------------------------
 void File__Analyze::Audio_BitRate_Rounding(size_t Pos, audio Parameter)
 {
     const Ztring& Format=Retrieve(Stream_Audio, Pos, Audio_Format);
     const Ztring& Codec=Retrieve(Stream_Audio, Pos, Audio_Codec);
     int32u BitRate=Retrieve(Stream_Audio, Pos, Parameter).To_int32u();
     int32u BitRate_Sav=BitRate;
-    if (MediaInfoLib::Config.Codec_Get(Codec, InfoCodec_KindofCodec, Stream_Audio).find(_T("MPEG-"))==0
-     || Retrieve(Stream_Audio, Pos, Audio_Codec_String).find(_T("MPEG-"))==0)
+    if (MediaInfoLib::Config.Codec_Get(Codec, InfoCodec_KindofCodec, Stream_Audio).find(__T("MPEG-"))==0
+     || Retrieve(Stream_Audio, Pos, Audio_Codec_String).find(__T("MPEG-"))==0)
     {
         if (BitRate>=   7500 && BitRate<=   8500) BitRate=   8000;
         if (BitRate>=  15000 && BitRate<=  17000) BitRate=  16000;
@@ -1314,11 +1546,11 @@
         if (BitRate>= 376320 && BitRate<= 391680) BitRate= 384000;
         if (BitRate>= 407680 && BitRate<= 424320) BitRate= 416000;
         if (BitRate>= 439040 && BitRate<= 456960) BitRate= 448000;
-        if (Retrieve(Stream_Audio, Pos, "BitRate_Mode")==_T("VBR"))
+        if (Retrieve(Stream_Audio, Pos, "BitRate_Mode")==__T("VBR"))
             BitRate=BitRate_Sav; //If VBR, we want the exact value
     }
 
-    else if (MediaInfoLib::Config.Codec_Get(Codec, InfoCodec_Name, Stream_Audio).find(_T("AC3"))==0)
+    else if (MediaInfoLib::Config.Codec_Get(Codec, InfoCodec_Name, Stream_Audio).find(__T("AC3"))==0)
     {
         if (BitRate>=  31000 && BitRate<=  33000) BitRate=  32000;
         if (BitRate>=  39000 && BitRate<=  41000) BitRate=  40000;
@@ -1341,7 +1573,7 @@
         if (BitRate>= 627200 && BitRate<= 652800) BitRate= 640000;
   }
 
-    else if (MediaInfoLib::Config.Codec_Get(Codec, InfoCodec_Name, Stream_Audio).find(_T("DTS"))==0)
+    else if (MediaInfoLib::Config.Codec_Get(Codec, InfoCodec_Name, Stream_Audio).find(__T("DTS"))==0)
     {
         if (BitRate>=  31000 && BitRate<=  33000) BitRate=  32000;
         if (BitRate>=  54000 && BitRate<=  58000) BitRate=  56000;
@@ -1374,7 +1606,7 @@
         if (BitRate>=3763200 && BitRate<=3916800) BitRate=3840000;
     }
 
-    else if (MediaInfoLib::Config.Codec_Get(Codec, InfoCodec_Name, Stream_Audio).find(_T("AAC"))==0)
+    else if (Codec.find(__T("AAC"))==0 || MediaInfoLib::Config.Codec_Get(Codec, InfoCodec_Name, Stream_Audio).find(__T("AAC"))==0)
     {
         if (BitRate>=  46000 && BitRate<=  50000) BitRate=  48000;
         if (BitRate>=  64827 && BitRate<=  67473) BitRate=  66150;
@@ -1393,7 +1625,7 @@
         if (BitRate>= 648270 && BitRate<= 674730) BitRate= 661500;
     }
 
-    else if (Codec==_T("PCM") || Codec==_T("QDM2") || MediaInfoLib::Config.Codec_Get(Codec, InfoCodec_Name, Stream_Audio).find(_T("PCM"))==0)
+    else if (Codec==__T("PCM") || Codec==__T("QDM2") || MediaInfoLib::Config.Codec_Get(Codec, InfoCodec_Name, Stream_Audio).find(__T("PCM"))==0)
     {
         if (BitRate>=  62720 && BitRate<=  65280) BitRate=  64000;
         if (BitRate>=  86436 && BitRate<=  89964) BitRate=  88200;
@@ -1410,13 +1642,15 @@
         if (BitRate>=1128960 && BitRate<=1175040) BitRate=1152000;
         if (BitRate>=1382976 && BitRate<=1439424) BitRate=1411200;
         if (BitRate>=1505280 && BitRate<=1566720) BitRate=1536000;
+        if (BitRate>=4515840 && BitRate<=4700160) BitRate=4608000;
+        if (BitRate>=6021120 && BitRate<=6266880) BitRate=6144000;
     }
 
-    else if (MediaInfoLib::Config.Codec_Get(Codec, InfoCodec_Name, Stream_Audio).find(_T("ADPCM"))==0
-          || MediaInfoLib::Config.Codec_Get(Codec, InfoCodec_Name, Stream_Audio).find(_T("U-Law"))==0
-          || MediaInfoLib::Config.Codec_Get(Codec, InfoCodec_KindofCodec, Stream_Audio)==_T("ADPCM")
-          || MediaInfoLib::Config.Codec_Get(Codec, InfoCodec_KindofCodec, Stream_Audio)==_T("U-Law")
-          || Format==_T("ADPCM"))
+    else if (MediaInfoLib::Config.Codec_Get(Codec, InfoCodec_Name, Stream_Audio).find(__T("ADPCM"))==0
+          || MediaInfoLib::Config.Codec_Get(Codec, InfoCodec_Name, Stream_Audio).find(__T("U-Law"))==0
+          || MediaInfoLib::Config.Codec_Get(Codec, InfoCodec_KindofCodec, Stream_Audio)==__T("ADPCM")
+          || MediaInfoLib::Config.Codec_Get(Codec, InfoCodec_KindofCodec, Stream_Audio)==__T("U-Law")
+          || Format==__T("ADPCM"))
     {
         if (BitRate>=  42000 && BitRate<=  46000) BitRate=  44100;
         if (BitRate>=  62720 && BitRate<=  65280) BitRate=  64000;
@@ -1477,12 +1711,12 @@
         Fill(Stream_General, 0, "Title/Url", Retrieve(Stream_General, 0, General_Track_Url));
 
     //-Genre
-    if (!Retrieve(Stream_General, 0, General_Genre).empty() && Retrieve(Stream_General, 0, General_Genre).size()<4 && Retrieve(Stream_General, 0, General_Genre)[0]>=_T('0') && Retrieve(Stream_General, 0, General_Genre)[0]<=_T('9'))
+    if (!Retrieve(Stream_General, 0, General_Genre).empty() && Retrieve(Stream_General, 0, General_Genre).size()<4 && Retrieve(Stream_General, 0, General_Genre)[0]>=__T('0') && Retrieve(Stream_General, 0, General_Genre)[0]<=__T('9'))
     {
         Ztring Genre;
-        if (Retrieve(Stream_General, 0, General_Genre).size()==1) Genre=Ztring(_T("Genre_00"))+Retrieve(Stream_General, 0, General_Genre);
-        if (Retrieve(Stream_General, 0, General_Genre).size()==2) Genre=Ztring(_T("Genre_0" ))+Retrieve(Stream_General, 0, General_Genre);
-        if (Retrieve(Stream_General, 0, General_Genre).size()==3) Genre=Ztring(_T("Genre_"  ))+Retrieve(Stream_General, 0, General_Genre);
+        if (Retrieve(Stream_General, 0, General_Genre).size()==1) Genre=Ztring(__T("Genre_00"))+Retrieve(Stream_General, 0, General_Genre);
+        if (Retrieve(Stream_General, 0, General_Genre).size()==2) Genre=Ztring(__T("Genre_0" ))+Retrieve(Stream_General, 0, General_Genre);
+        if (Retrieve(Stream_General, 0, General_Genre).size()==3) Genre=Ztring(__T("Genre_"  ))+Retrieve(Stream_General, 0, General_Genre);
         Fill(Stream_General, 0, "Genre", MediaInfoLib::Config.Language_Get(Genre), true);
     }
 }
@@ -1498,119 +1732,134 @@
     if (Retrieve(StreamKind, StreamPos, Parameter).empty())
         return;
 
-    int32s HH, MM, SS, MS;
-    Ztring DurationString1, DurationString2, DurationString3;
-    bool Negative=false;
-    MS=Retrieve(StreamKind, StreamPos, Parameter).To_int32s(); //en ms
+    //Clearing old data
+    Clear(StreamKind, StreamPos, Parameter+1);
+    Clear(StreamKind, StreamPos, Parameter+2);
+    Clear(StreamKind, StreamPos, Parameter+3);
+    Clear(StreamKind, StreamPos, Parameter+4);
 
-    if (MS<0)
-    {
-        Negative=true;
-        MS=-MS;
-    }
+    //Retrieving multiple values
+    ZtringList List;
+    List.Separator_Set(0, __T(" / "));
+    List.Write(Retrieve(StreamKind, StreamPos, Parameter));
 
-    //Hours
-    HH=MS/1000/60/60; //h
-    if (HH>0)
+    //Per value
+    for (size_t Pos=0; Pos<List.size(); Pos++)
     {
-        DurationString1+=Ztring::ToZtring(HH)+MediaInfoLib::Config.Language_Get(_T("h"));
-        DurationString2+=Ztring::ToZtring(HH)+MediaInfoLib::Config.Language_Get(_T("h"));
-        if (HH<10)
-            DurationString3+=Ztring(_T("0"))+Ztring::ToZtring(HH)+_T(":");
+        int32s HH, MM, SS, MS;
+        Ztring DurationString1, DurationString2, DurationString3;
+        bool Negative=false;
+        MS=List[Pos].To_int32s(); //in ms
+
+        if (MS<0)
+        {
+            Negative=true;
+            MS=-MS;
+        }
+
+        //Hours
+        HH=MS/1000/60/60; //h
+        if (HH>0)
+        {
+            DurationString1+=Ztring::ToZtring(HH)+MediaInfoLib::Config.Language_Get(__T("h"));
+            DurationString2+=Ztring::ToZtring(HH)+MediaInfoLib::Config.Language_Get(__T("h"));
+            if (HH<10)
+                DurationString3+=Ztring(__T("0"))+Ztring::ToZtring(HH)+__T(":");
+            else
+                DurationString3+=Ztring::ToZtring(HH)+__T(":");
+            MS-=HH*60*60*1000;
+        }
         else
-            DurationString3+=Ztring::ToZtring(HH)+_T(":");
-        MS-=HH*60*60*1000;
-    }
-    else
-    {
-        DurationString3+=_T("00:");
-    }
+        {
+            DurationString3+=__T("00:");
+        }
 
-    //Minutes
-    MM=MS/1000/60; //mn
-    if (MM>0 || HH>0)
-    {
-        if (DurationString1.size()>0)
-            DurationString1+=_T(" ");
-        DurationString1+=Ztring::ToZtring(MM)+MediaInfoLib::Config.Language_Get(_T("mn"));
-        if (DurationString2.size()<5)
+        //Minutes
+        MM=MS/1000/60; //mn
+        if (MM>0 || HH>0)
         {
-            if (DurationString2.size()>0)
-                DurationString2+=_T(" ");
-            DurationString2+=Ztring::ToZtring(MM)+MediaInfoLib::Config.Language_Get(_T("mn"));
+            if (DurationString1.size()>0)
+                DurationString1+=__T(" ");
+            DurationString1+=Ztring::ToZtring(MM)+MediaInfoLib::Config.Language_Get(__T("mn"));
+            if (DurationString2.size()<5)
+            {
+                if (DurationString2.size()>0)
+                    DurationString2+=__T(" ");
+                DurationString2+=Ztring::ToZtring(MM)+MediaInfoLib::Config.Language_Get(__T("mn"));
+            }
+            if (MM<10)
+                DurationString3+=Ztring(__T("0"))+Ztring::ToZtring(MM)+__T(":");
+            else
+                DurationString3+=Ztring::ToZtring(MM)+__T(":");
+            MS-=MM*60*1000;
         }
-        if (MM<10)
-            DurationString3+=Ztring(_T("0"))+Ztring::ToZtring(MM)+_T(":");
         else
-            DurationString3+=Ztring::ToZtring(MM)+_T(":");
-        MS-=MM*60*1000;
-    }
-    else
-    {
-        DurationString3+=_T("00:");
-    }
+        {
+            DurationString3+=__T("00:");
+        }
 
-    //Seconds
-    SS=MS/1000; //s
-    if (SS>0 || MM>0 || HH>0)
-    {
-        if (DurationString1.size()>0)
-            DurationString1+=_T(" ");
-        DurationString1+=Ztring::ToZtring(SS)+MediaInfoLib::Config.Language_Get(_T("s"));
-        if (DurationString2.size()<5)
-        {
-            if (DurationString2.size()>0)
-                DurationString2+=_T(" ");
-            DurationString2+=Ztring::ToZtring(SS)+MediaInfoLib::Config.Language_Get(_T("s"));
-        }
-        else if (DurationString2.size()==0)
-            DurationString2+=Ztring::ToZtring(SS)+MediaInfoLib::Config.Language_Get(_T("s"));
-        if (SS<10)
-            DurationString3+=Ztring(_T("0"))+Ztring::ToZtring(SS)+_T(".");
+        //Seconds
+        SS=MS/1000; //s
+        if (SS>0 || MM>0 || HH>0)
+        {
+            if (DurationString1.size()>0)
+                DurationString1+=__T(" ");
+            DurationString1+=Ztring::ToZtring(SS)+MediaInfoLib::Config.Language_Get(__T("s"));
+            if (DurationString2.size()<5)
+            {
+                if (DurationString2.size()>0)
+                    DurationString2+=__T(" ");
+                DurationString2+=Ztring::ToZtring(SS)+MediaInfoLib::Config.Language_Get(__T("s"));
+            }
+            else if (DurationString2.size()==0)
+                DurationString2+=Ztring::ToZtring(SS)+MediaInfoLib::Config.Language_Get(__T("s"));
+            if (SS<10)
+                DurationString3+=Ztring(__T("0"))+Ztring::ToZtring(SS)+__T(".");
+            else
+                DurationString3+=Ztring::ToZtring(SS)+__T(".");
+            MS-=SS*1000;
+        }
         else
-            DurationString3+=Ztring::ToZtring(SS)+_T(".");
-        MS-=SS*1000;
-    }
-    else
-    {
-        DurationString3+=_T("00.");
-    }
+        {
+            DurationString3+=__T("00.");
+        }
 
-    //Milliseconds
-    if (MS>0 || SS>0 || MM>0 || HH>0)
-    {
-        if (DurationString1.size()>0)
-            DurationString1+=_T(" ");
-        DurationString1+=Ztring::ToZtring(MS)+MediaInfoLib::Config.Language_Get(_T("ms"));
-        if (DurationString2.size()<5)
+        //Milliseconds
+        if (MS>0 || SS>0 || MM>0 || HH>0)
         {
-            if (DurationString2.size()>0)
-                DurationString2+=_T(" ");
-            DurationString2+=Ztring::ToZtring(MS)+MediaInfoLib::Config.Language_Get(_T("ms"));
+            if (DurationString1.size()>0)
+                DurationString1+=__T(" ");
+            DurationString1+=Ztring::ToZtring(MS)+MediaInfoLib::Config.Language_Get(__T("ms"));
+            if (DurationString2.size()<5)
+            {
+                if (DurationString2.size()>0)
+                    DurationString2+=__T(" ");
+                DurationString2+=Ztring::ToZtring(MS)+MediaInfoLib::Config.Language_Get(__T("ms"));
+            }
+            if (MS<10)
+                DurationString3+=Ztring(__T("00"))+Ztring::ToZtring(MS);
+            else if (MS<100)
+                DurationString3+=Ztring(__T("0"))+Ztring::ToZtring(MS);
+            else
+                DurationString3+=Ztring::ToZtring(MS);
         }
-        if (MS<10)
-            DurationString3+=Ztring(_T("00"))+Ztring::ToZtring(MS);
-        else if (MS<100)
-            DurationString3+=Ztring(_T("0"))+Ztring::ToZtring(MS);
         else
-            DurationString3+=Ztring::ToZtring(MS);
-    }
-    else
-    {
-        DurationString3+=_T("000");
-    }
+        {
+            DurationString3+=__T("000");
+        }
 
-    if (Negative)
-    {
-        DurationString1=Ztring(_T("-"))+DurationString1;
-        DurationString2=Ztring(_T("-"))+DurationString2;
-        DurationString3=Ztring(_T("-"))+DurationString3;
-    }
+        if (Negative)
+        {
+            DurationString1=Ztring(__T("-"))+DurationString1;
+            DurationString2=Ztring(__T("-"))+DurationString2;
+            DurationString3=Ztring(__T("-"))+DurationString3;
+        }
 
-    Fill(StreamKind, StreamPos, Parameter+1,  DurationString2, true); // /String
-    Fill(StreamKind, StreamPos, Parameter+2, DurationString1, true); // /String1
-    Fill(StreamKind, StreamPos, Parameter+3, DurationString2, true); // /String2
-    Fill(StreamKind, StreamPos, Parameter+4, DurationString3, true); // /String3
+        Fill(StreamKind, StreamPos, Parameter+1, DurationString2); // /String
+        Fill(StreamKind, StreamPos, Parameter+2, DurationString1); // /String1
+        Fill(StreamKind, StreamPos, Parameter+3, DurationString2); // /String2
+        Fill(StreamKind, StreamPos, Parameter+4, DurationString3); // /String3
+    }
 }
 
 //---------------------------------------------------------------------------
@@ -1652,22 +1901,41 @@
     Ztring Measure; bool MeasureIsAlwaysSame;
     switch (Pow3)
     {
-        case  0 : Measure=_T(" Byte"); MeasureIsAlwaysSame=false; break;
-        case  1 : Measure=_T(" KiB");  MeasureIsAlwaysSame=true;  break;
-        case  2 : Measure=_T(" MiB");  MeasureIsAlwaysSame=true;  break;
-        case  3 : Measure=_T(" GiB");  MeasureIsAlwaysSame=true;  break;
-        default : Measure=_T(" ?iB");  MeasureIsAlwaysSame=true;
+        case  0 : Measure=__T(" Byte"); MeasureIsAlwaysSame=false; break;
+        case  1 : Measure=__T(" KiB");  MeasureIsAlwaysSame=true;  break;
+        case  2 : Measure=__T(" MiB");  MeasureIsAlwaysSame=true;  break;
+        case  3 : Measure=__T(" GiB");  MeasureIsAlwaysSame=true;  break;
+        default : Measure=__T(" ?iB");  MeasureIsAlwaysSame=true;
     }
     Fill(StreamKind, StreamPos, Parameter+2, MediaInfoLib::Config.Language_Get(Ztring::ToZtring(F1,  0), Measure, MeasureIsAlwaysSame), true); // /String1
     Fill(StreamKind, StreamPos, Parameter+3, MediaInfoLib::Config.Language_Get(Ztring::ToZtring(F1, I2), Measure, MeasureIsAlwaysSame), true); // /String2
     Fill(StreamKind, StreamPos, Parameter+4, MediaInfoLib::Config.Language_Get(Ztring::ToZtring(F1, I3), Measure, MeasureIsAlwaysSame), true); // /String3
     Fill(StreamKind, StreamPos, Parameter+5, MediaInfoLib::Config.Language_Get(Ztring::ToZtring(F1, I4), Measure, MeasureIsAlwaysSame), true); // /String4
-    float F2=(float)Retrieve(StreamKind, StreamPos, Parameter).To_int64s(); //Video C++ 6 patch, should be int64u
-    if (File_Size>0 && File_Size<(int64u)-1 && Parameter==Fill_Parameter(StreamKind, Generic_StreamSize) && F2*100/File_Size<=100)
+    float64 F2=(float)Retrieve(StreamKind, StreamPos, Parameter).To_float64();
+    float64 File_Size_WithReferencedFiles=(float)Retrieve(Stream_General, 0, General_FileSize).To_float64();
+    if (File_Size_WithReferencedFiles>0 && Parameter==Fill_Parameter(StreamKind, Generic_StreamSize) && F2*100/File_Size_WithReferencedFiles<=100)
     {
-        Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_StreamSize_Proportion), F2/File_Size, 5, true);
-        Fill(StreamKind, StreamPos, Parameter+6, MediaInfoLib::Config.Language_Get(Ztring::ToZtring(F1, I3), Measure, MeasureIsAlwaysSame)+_T(" (")+Ztring::ToZtring(F2*100/File_Size, 0)+_T("%)"), true); // /String5
-        Fill(StreamKind, StreamPos, Parameter+1,  MediaInfoLib::Config.Language_Get(Ztring::ToZtring(F1, I3), Measure, MeasureIsAlwaysSame)+_T(" (")+Ztring::ToZtring(F2*100/File_Size, 0)+_T("%)"), true);
+        Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_StreamSize_Proportion), F2/File_Size_WithReferencedFiles, 5, true);
+        Fill(StreamKind, StreamPos, Parameter+6, MediaInfoLib::Config.Language_Get(Ztring::ToZtring(F1, I3), Measure, MeasureIsAlwaysSame)+__T(" (")+Ztring::ToZtring(F2*100/File_Size_WithReferencedFiles, 0)+__T("%)"), true); // /String5
+        Fill(StreamKind, StreamPos, Parameter+1,  MediaInfoLib::Config.Language_Get(Ztring::ToZtring(F1, I3), Measure, MeasureIsAlwaysSame)+__T(" (")+Ztring::ToZtring(F2*100/File_Size_WithReferencedFiles, 0)+__T("%)"), true);
+    }
+    else if (File_Size_WithReferencedFiles>0 && Parameter==Fill_Parameter(StreamKind, Generic_StreamSize_Encoded) && F2*100/File_Size_WithReferencedFiles<=100)
+    {
+        Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_StreamSize_Encoded_Proportion), F2/File_Size_WithReferencedFiles, 5, true);
+        Fill(StreamKind, StreamPos, Parameter+6, MediaInfoLib::Config.Language_Get(Ztring::ToZtring(F1, I3), Measure, MeasureIsAlwaysSame)+__T(" (")+Ztring::ToZtring(F2*100/File_Size_WithReferencedFiles, 0)+__T("%)"), true); // /String5
+        Fill(StreamKind, StreamPos, Parameter+1,  MediaInfoLib::Config.Language_Get(Ztring::ToZtring(F1, I3), Measure, MeasureIsAlwaysSame)+__T(" (")+Ztring::ToZtring(F2*100/File_Size_WithReferencedFiles, 0)+__T("%)"), true);
+    }
+    else if (File_Size_WithReferencedFiles>0 && Parameter==Fill_Parameter(StreamKind, Generic_Source_StreamSize) && F2*100/File_Size_WithReferencedFiles<=100)
+    {
+        Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Source_StreamSize_Proportion), F2/File_Size_WithReferencedFiles, 5, true);
+        Fill(StreamKind, StreamPos, Parameter+6, MediaInfoLib::Config.Language_Get(Ztring::ToZtring(F1, I3), Measure, MeasureIsAlwaysSame)+__T(" (")+Ztring::ToZtring(F2*100/File_Size_WithReferencedFiles, 0)+__T("%)"), true); // /String5
+        Fill(StreamKind, StreamPos, Parameter+1,  MediaInfoLib::Config.Language_Get(Ztring::ToZtring(F1, I3), Measure, MeasureIsAlwaysSame)+__T(" (")+Ztring::ToZtring(F2*100/File_Size_WithReferencedFiles, 0)+__T("%)"), true);
+    }
+    else if (File_Size_WithReferencedFiles>0 && Parameter==Fill_Parameter(StreamKind, Generic_Source_StreamSize_Encoded) && F2*100/File_Size_WithReferencedFiles<=100)
+    {
+        Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Source_StreamSize_Encoded_Proportion), F2/File_Size_WithReferencedFiles, 5, true);
+        Fill(StreamKind, StreamPos, Parameter+6, MediaInfoLib::Config.Language_Get(Ztring::ToZtring(F1, I3), Measure, MeasureIsAlwaysSame)+__T(" (")+Ztring::ToZtring(F2*100/File_Size_WithReferencedFiles, 0)+__T("%)"), true); // /String5
+        Fill(StreamKind, StreamPos, Parameter+1,  MediaInfoLib::Config.Language_Get(Ztring::ToZtring(F1, I3), Measure, MeasureIsAlwaysSame)+__T(" (")+Ztring::ToZtring(F2*100/File_Size_WithReferencedFiles, 0)+__T("%)"), true);
     }
     else
         Fill(StreamKind, StreamPos, Parameter+1,  MediaInfoLib::Config.Language_Get(Ztring::ToZtring(F1, I3), Measure, MeasureIsAlwaysSame), true);
@@ -1685,7 +1953,7 @@
 
     //Retrieving multiple values
     ZtringList List;
-    List.Separator_Set(0, _T(" / "));
+    List.Separator_Set(0, __T(" / "));
     List.Write(Retrieve(StreamKind, StreamPos, Parameter));
 
     //Per value
@@ -1694,7 +1962,7 @@
         int32u BitRate=List[Pos].To_int32u();
 
         //Text
-        if (BitRate==      0)
+        if (BitRate==0 && (List[Pos].empty() || List[Pos][0]>__T('9')))
         {
             Fill(StreamKind, StreamPos, Parameter+1, MediaInfoLib::Config.Language_Get(List[Pos]));
         }
@@ -1702,23 +1970,40 @@
         {
             //Well known values
             Ztring BitRateS;
-            if (BitRate==  11024) BitRateS=  "11.024";
-            if (BitRate==  11025) BitRateS=  "11.025";
-            if (BitRate==  22050) BitRateS=  "22.05";
-            if (BitRate==  44100) BitRateS=  "44.1";
-            if (BitRate==  66150) BitRateS=  "66.15";
-            if (BitRate==  88200) BitRateS=  "88.2";
-            if (BitRate== 132300) BitRateS= "132.3";
-            if (BitRate== 176400) BitRateS= "176.4";
-            if (BitRate== 264600) BitRateS= "264.6";
-            if (BitRate== 352800) BitRateS= "352.8";
-            if (BitRate== 529200) BitRateS= "529.2";
-            if (BitRate== 705600) BitRateS= "705.6";
-            if (BitRate==1411200) BitRateS="1411.2";
+            if (StreamKind==Stream_Audio)
+            {
+                if (Parameter==Audio_BitRate
+                 && (Retrieve(Stream_Audio, StreamPos, Audio_Format)==__T("PCM")
+                  || Retrieve(Stream_Audio, StreamPos, Audio_Format)==__T("ADPCM")
+                  || Retrieve(Stream_Audio, StreamPos, Audio_Format)==__T("U-Law")
+                  || Retrieve(Stream_Audio, StreamPos, Audio_Format)==__T("Qdesign 1")
+                  || Retrieve(Stream_Audio, StreamPos, Audio_Format)==__T("Qdesign 2")
+                  || Retrieve(Stream_Audio, StreamPos, Audio_Format)==__T("DTS")))
+                {
+                    if (BitRate==  66150) BitRateS=  "66.15";
+                    if (BitRate== 132300) BitRateS= "132.3";
+                    if (BitRate== 176400) BitRateS= "176.4";
+                    if (BitRate== 264600) BitRateS= "264.6";
+                    if (BitRate== 352800) BitRateS= "352.8";
+                    if (BitRate== 529200) BitRateS= "529.2";
+                    if (BitRate== 705600) BitRateS= "705.6";
+                    if (BitRate==1411200) BitRateS="1411.2";
+                }
+                if (Parameter==Audio_SamplingRate)
+                {
+                    if (BitRate==  11024) BitRateS=  "11.024";
+                    if (BitRate==  11025) BitRateS=  "11.025";
+                    if (BitRate==  22050) BitRateS=  "22.05";
+                    if (BitRate==  44100) BitRateS=  "44.1";
+                    if (BitRate==  88200) BitRateS=  "88.2";
+                    if (BitRate== 176400) BitRateS= "176.4";
+                    if (BitRate== 352800) BitRateS= "352.8";
+                }
+            }
             if (!BitRateS.empty())
             {
                 Ztring Measure=MediaInfoLib::Config.Info_Get(StreamKind).Read(Parameter, Info_Measure);
-                Measure.insert(1, _T("K"));
+                Measure.insert(1, __T("K"));
                 Fill(StreamKind, StreamPos, Parameter+1, MediaInfoLib::Config.Language_Get(BitRateS, Measure, true));
             }
             else
@@ -1727,16 +2012,16 @@
                 if (BitRate>10000000)
                 {
                     Ztring Measure=MediaInfoLib::Config.Info_Get(StreamKind).Read(Parameter, Info_Measure);
-                    Measure.insert(1, _T("M"));
+                    Measure.insert(1, __T("M"));
                     Fill(StreamKind, StreamPos, Parameter+1, MediaInfoLib::Config.Language_Get(Ztring::ToZtring(((float)BitRate)/1000000, BitRate>100000000?0:1), Measure, true));
                 }
                 else if (BitRate>10000)
                 {
                     Ztring Measure=MediaInfoLib::Config.Info_Get(StreamKind).Read(Parameter, Info_Measure);
-                    Measure.insert(1, _T("K"));
+                    Measure.insert(1, __T("K"));
                     Fill(StreamKind, StreamPos, Parameter+1, MediaInfoLib::Config.Language_Get(Ztring::ToZtring(((float)BitRate)/1000, BitRate>100000?0:1), Measure, true));
                 }
-                else if (BitRate>0)
+                else
                     Fill(StreamKind, StreamPos, Parameter+1, MediaInfoLib::Config.Language_Get(Ztring::ToZtring(BitRate), MediaInfoLib::Config.Info_Get(StreamKind).Read(Parameter, Info_Measure), true));
             }
         }
@@ -1755,7 +2040,7 @@
 
     //Retrieving multiple values
     ZtringList List;
-    List.Separator_Set(0, _T(" / "));
+    List.Separator_Set(0, __T(" / "));
     List.Write(Retrieve(StreamKind, StreamPos, Parameter));
 
     //Per value
@@ -1778,7 +2063,7 @@
 //---------------------------------------------------------------------------
 void File__Analyze::CodecID_Fill(const Ztring &Value, stream_t StreamKind, size_t StreamPos, infocodecid_format_t Format)
 {
-    Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_CodecID), Value, true);
+    Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_CodecID), Value);
     const Ztring &C1=MediaInfoLib::Config.CodecID_Get(StreamKind, Format, Value, InfoCodecID_Format);
     Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Format), C1.empty()?Value:C1, true);
     Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_CodecID_Info), MediaInfoLib::Config.CodecID_Get(StreamKind, Format, Value, InfoCodecID_Description), true);
@@ -1790,10 +2075,12 @@
     Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_ChromaSubsampling), MediaInfoLib::Config.CodecID_Get(StreamKind, Format, Value, InfoCodecID_ChromaSubsampling), true);
     if (Retrieve(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_BitDepth)).empty())
         Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_BitDepth), MediaInfoLib::Config.CodecID_Get(StreamKind, Format, Value, InfoCodecID_BitDepth), true);
+    if (Retrieve(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Compression_Mode)).empty())
+        Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Compression_Mode), MediaInfoLib::Config.CodecID_Get(StreamKind, Format, Value, InfoCodecID_Compression_Mode), true);
 
     //Specific cases
-    if (Value==_T("v210") || Value==_T("V210"))
-        Fill(Stream_Video, StreamPos, Video_Resolution, 10);
+    if (Value==__T("v210") || Value==__T("V210"))
+        Fill(Stream_Video, StreamPos, Video_BitDepth, 10);
 }
 
 //---------------------------------------------------------------------------
@@ -1835,6 +2122,8 @@
                                     case Generic_StreamSize_String4 : return General_StreamSize_String4;
                                     case Generic_StreamSize_String5 : return General_StreamSize_String5;
                                     case Generic_StreamSize_Proportion : return General_StreamSize_Proportion;
+                                    case Generic_ServiceName : return General_ServiceName;
+                                    case Generic_ServiceProvider : return General_ServiceProvider;
                                     default: return (size_t)-1;
                                 }
         case Stream_Video :
@@ -1864,6 +2153,11 @@
                                     case Generic_Duration_String1 : return Video_Duration_String1;
                                     case Generic_Duration_String2 : return Video_Duration_String2;
                                     case Generic_Duration_String3 : return Video_Duration_String3;
+                                    case Generic_Source_Duration : return Video_Source_Duration;
+                                    case Generic_Source_Duration_String : return Video_Source_Duration_String;
+                                    case Generic_Source_Duration_String1 : return Video_Source_Duration_String1;
+                                    case Generic_Source_Duration_String2 : return Video_Source_Duration_String2;
+                                    case Generic_Source_Duration_String3 : return Video_Source_Duration_String3;
                                     case Generic_BitRate_Mode : return Video_BitRate_Mode;
                                     case Generic_BitRate_Mode_String : return Video_BitRate_Mode_String;
                                     case Generic_BitRate : return Video_BitRate;
@@ -1874,12 +2168,36 @@
                                     case Generic_BitRate_Nominal_String : return Video_BitRate_Nominal_String;
                                     case Generic_BitRate_Maximum : return Video_BitRate_Maximum;
                                     case Generic_BitRate_Maximum_String : return Video_BitRate_Maximum_String;
+                                    case Generic_BitRate_Encoded : return Video_BitRate_Encoded;
+                                    case Generic_BitRate_Encoded_String : return Video_BitRate_Encoded_String;
+                                    case Generic_FrameCount : return Video_FrameCount;
+                                    case Generic_Source_FrameCount : return Video_Source_FrameCount;
                                     case Generic_ColorSpace : return Video_ColorSpace;
                                     case Generic_ChromaSubsampling : return Video_ChromaSubsampling;
                                     case Generic_Resolution : return Video_Resolution;
                                     case Generic_Resolution_String : return Video_Resolution_String;
                                     case Generic_BitDepth : return Video_BitDepth;
                                     case Generic_BitDepth_String : return Video_BitDepth_String;
+                                    case Generic_Compression_Mode : return Video_Compression_Mode;
+                                    case Generic_Compression_Mode_String : return Video_Compression_Mode_String;
+                                    case Generic_Compression_Ratio : return Video_Compression_Ratio;
+                                    case Generic_Delay : return Video_Delay;
+                                    case Generic_Delay_String : return Video_Delay_String;
+                                    case Generic_Delay_String1 : return Video_Delay_String1;
+                                    case Generic_Delay_String2 : return Video_Delay_String2;
+                                    case Generic_Delay_String3 : return Video_Delay_String3;
+                                    case Generic_Delay_String4 : return Video_Delay_String4;
+                                    case Generic_Delay_Settings : return Video_Delay_Settings;
+                                    case Generic_Delay_Source : return Video_Delay_Source;
+                                    case Generic_Delay_Source_String : return Video_Delay_Source_String;
+                                    case Generic_Delay_Original : return Video_Delay_Original;
+                                    case Generic_Delay_Original_String : return Video_Delay_Original_String;
+                                    case Generic_Delay_Original_String1 : return Video_Delay_Original_String1;
+                                    case Generic_Delay_Original_String2 : return Video_Delay_Original_String2;
+                                    case Generic_Delay_Original_String3 : return Video_Delay_Original_String3;
+                                    case Generic_Delay_Original_String4 : return Video_Delay_Original_String4;
+                                    case Generic_Delay_Original_Settings : return Video_Delay_Original_Settings;
+                                    case Generic_Delay_Original_Source : return Video_Delay_Original_Source;
                                     case Generic_StreamSize : return Video_StreamSize;
                                     case Generic_StreamSize_String : return Video_StreamSize_String;
                                     case Generic_StreamSize_String1 : return Video_StreamSize_String1;
@@ -1888,6 +2206,31 @@
                                     case Generic_StreamSize_String4 : return Video_StreamSize_String4;
                                     case Generic_StreamSize_String5 : return Video_StreamSize_String5;
                                     case Generic_StreamSize_Proportion : return Video_StreamSize_Proportion;
+                                    case Generic_StreamSize_Encoded : return Video_StreamSize_Encoded;
+                                    case Generic_StreamSize_Encoded_String : return Video_StreamSize_Encoded_String;
+                                    case Generic_StreamSize_Encoded_String1 : return Video_StreamSize_Encoded_String1;
+                                    case Generic_StreamSize_Encoded_String2 : return Video_StreamSize_Encoded_String2;
+                                    case Generic_StreamSize_Encoded_String3 : return Video_StreamSize_Encoded_String3;
+                                    case Generic_StreamSize_Encoded_String4 : return Video_StreamSize_Encoded_String4;
+                                    case Generic_StreamSize_Encoded_String5 : return Video_StreamSize_Encoded_String5;
+                                    case Generic_StreamSize_Encoded_Proportion : return Video_StreamSize_Encoded_Proportion;
+                                    case Generic_Source_StreamSize : return Video_Source_StreamSize;
+                                    case Generic_Source_StreamSize_String : return Video_Source_StreamSize_String;
+                                    case Generic_Source_StreamSize_String1 : return Video_Source_StreamSize_String1;
+                                    case Generic_Source_StreamSize_String2 : return Video_Source_StreamSize_String2;
+                                    case Generic_Source_StreamSize_String3 : return Video_Source_StreamSize_String3;
+                                    case Generic_Source_StreamSize_String4 : return Video_Source_StreamSize_String4;
+                                    case Generic_Source_StreamSize_String5 : return Video_Source_StreamSize_String5;
+                                    case Generic_Source_StreamSize_Proportion : return Video_Source_StreamSize_Proportion;
+                                    case Generic_Source_StreamSize_Encoded : return Video_Source_StreamSize_Encoded;
+                                    case Generic_Source_StreamSize_Encoded_String : return Video_Source_StreamSize_Encoded_String;
+                                    case Generic_Source_StreamSize_Encoded_String1 : return Video_Source_StreamSize_Encoded_String1;
+                                    case Generic_Source_StreamSize_Encoded_String2 : return Video_Source_StreamSize_Encoded_String2;
+                                    case Generic_Source_StreamSize_Encoded_String3 : return Video_Source_StreamSize_Encoded_String3;
+                                    case Generic_Source_StreamSize_Encoded_String4 : return Video_Source_StreamSize_Encoded_String4;
+                                    case Generic_Source_StreamSize_Encoded_String5 : return Video_Source_StreamSize_Encoded_String5;
+                                    case Generic_Source_StreamSize_Encoded_Proportion : return Video_Source_StreamSize_Encoded_Proportion;
+                                    case Generic_Language : return Video_Language;
                                     default: return (size_t)-1;
                                 }
         case Stream_Audio :
@@ -1917,6 +2260,11 @@
                                     case Generic_Duration_String1 : return Audio_Duration_String1;
                                     case Generic_Duration_String2 : return Audio_Duration_String2;
                                     case Generic_Duration_String3 : return Audio_Duration_String3;
+                                    case Generic_Source_Duration : return Audio_Source_Duration;
+                                    case Generic_Source_Duration_String : return Audio_Source_Duration_String;
+                                    case Generic_Source_Duration_String1 : return Audio_Source_Duration_String1;
+                                    case Generic_Source_Duration_String2 : return Audio_Source_Duration_String2;
+                                    case Generic_Source_Duration_String3 : return Audio_Source_Duration_String3;
                                     case Generic_BitRate_Mode : return Audio_BitRate_Mode;
                                     case Generic_BitRate_Mode_String : return Audio_BitRate_Mode_String;
                                     case Generic_BitRate : return Audio_BitRate;
@@ -1927,10 +2275,40 @@
                                     case Generic_BitRate_Nominal_String : return Audio_BitRate_Nominal_String;
                                     case Generic_BitRate_Maximum : return Audio_BitRate_Maximum;
                                     case Generic_BitRate_Maximum_String : return Audio_BitRate_Maximum_String;
+                                    case Generic_BitRate_Encoded : return Audio_BitRate_Encoded;
+                                    case Generic_BitRate_Encoded_String : return Audio_BitRate_Encoded_String;
+                                    case Generic_FrameCount : return Audio_FrameCount;
+                                    case Generic_Source_FrameCount : return Audio_Source_FrameCount;
                                     case Generic_Resolution : return Audio_Resolution;
                                     case Generic_Resolution_String : return Audio_Resolution_String;
                                     case Generic_BitDepth : return Audio_BitDepth;
                                     case Generic_BitDepth_String : return Audio_BitDepth_String;
+                                    case Generic_Compression_Mode : return Audio_Compression_Mode;
+                                    case Generic_Compression_Mode_String : return Audio_Compression_Mode_String;
+                                    case Generic_Compression_Ratio : return Audio_Compression_Ratio;
+                                    case Generic_Delay : return Audio_Delay;
+                                    case Generic_Delay_String : return Audio_Delay_String;
+                                    case Generic_Delay_String1 : return Audio_Delay_String1;
+                                    case Generic_Delay_String2 : return Audio_Delay_String2;
+                                    case Generic_Delay_String3 : return Audio_Delay_String3;
+                                    case Generic_Delay_String4 : return Audio_Delay_String4;
+                                    case Generic_Delay_Settings : return Audio_Delay_Settings;
+                                    case Generic_Delay_Source : return Audio_Delay_Source;
+                                    case Generic_Delay_Source_String : return Audio_Delay_Source_String;
+                                    case Generic_Delay_Original : return Audio_Delay_Original;
+                                    case Generic_Delay_Original_String : return Audio_Delay_Original_String;
+                                    case Generic_Delay_Original_String1 : return Audio_Delay_Original_String1;
+                                    case Generic_Delay_Original_String2 : return Audio_Delay_Original_String2;
+                                    case Generic_Delay_Original_String3 : return Audio_Delay_Original_String3;
+                                    case Generic_Delay_Original_String4 : return Audio_Delay_Original_String4;
+                                    case Generic_Delay_Original_Settings : return Audio_Delay_Original_Settings;
+                                    case Generic_Delay_Original_Source : return Audio_Delay_Original_Source;
+                                    case Generic_Video_Delay : return Audio_Video_Delay;
+                                    case Generic_Video_Delay_String : return Audio_Video_Delay_String;
+                                    case Generic_Video_Delay_String1 : return Audio_Video_Delay_String1;
+                                    case Generic_Video_Delay_String2 : return Audio_Video_Delay_String2;
+                                    case Generic_Video_Delay_String3 : return Audio_Video_Delay_String3;
+                                    case Generic_Video_Delay_String4 : return Audio_Video_Delay_String4;
                                     case Generic_StreamSize : return Audio_StreamSize;
                                     case Generic_StreamSize_String : return Audio_StreamSize_String;
                                     case Generic_StreamSize_String1 : return Audio_StreamSize_String1;
@@ -1939,6 +2317,31 @@
                                     case Generic_StreamSize_String4 : return Audio_StreamSize_String4;
                                     case Generic_StreamSize_String5 : return Audio_StreamSize_String5;
                                     case Generic_StreamSize_Proportion : return Audio_StreamSize_Proportion;
+                                    case Generic_StreamSize_Encoded : return Audio_StreamSize_Encoded;
+                                    case Generic_StreamSize_Encoded_String : return Audio_StreamSize_Encoded_String;
+                                    case Generic_StreamSize_Encoded_String1 : return Audio_StreamSize_Encoded_String1;
+                                    case Generic_StreamSize_Encoded_String2 : return Audio_StreamSize_Encoded_String2;
+                                    case Generic_StreamSize_Encoded_String3 : return Audio_StreamSize_Encoded_String3;
+                                    case Generic_StreamSize_Encoded_String4 : return Audio_StreamSize_Encoded_String4;
+                                    case Generic_StreamSize_Encoded_String5 : return Audio_StreamSize_Encoded_String5;
+                                    case Generic_StreamSize_Encoded_Proportion : return Audio_StreamSize_Encoded_Proportion;
+                                    case Generic_Source_StreamSize : return Audio_Source_StreamSize;
+                                    case Generic_Source_StreamSize_String : return Audio_Source_StreamSize_String;
+                                    case Generic_Source_StreamSize_String1 : return Audio_Source_StreamSize_String1;
+                                    case Generic_Source_StreamSize_String2 : return Audio_Source_StreamSize_String2;
+                                    case Generic_Source_StreamSize_String3 : return Audio_Source_StreamSize_String3;
+                                    case Generic_Source_StreamSize_String4 : return Audio_Source_StreamSize_String4;
+                                    case Generic_Source_StreamSize_String5 : return Audio_Source_StreamSize_String5;
+                                    case Generic_Source_StreamSize_Proportion : return Audio_Source_StreamSize_Proportion;
+                                    case Generic_Source_StreamSize_Encoded : return Audio_Source_StreamSize_Encoded;
+                                    case Generic_Source_StreamSize_Encoded_String : return Audio_Source_StreamSize_Encoded_String;
+                                    case Generic_Source_StreamSize_Encoded_String1 : return Audio_Source_StreamSize_Encoded_String1;
+                                    case Generic_Source_StreamSize_Encoded_String2 : return Audio_Source_StreamSize_Encoded_String2;
+                                    case Generic_Source_StreamSize_Encoded_String3 : return Audio_Source_StreamSize_Encoded_String3;
+                                    case Generic_Source_StreamSize_Encoded_String4 : return Audio_Source_StreamSize_Encoded_String4;
+                                    case Generic_Source_StreamSize_Encoded_String5 : return Audio_Source_StreamSize_Encoded_String5;
+                                    case Generic_Source_StreamSize_Encoded_Proportion : return Audio_Source_StreamSize_Encoded_Proportion;
+                                    case Generic_Language : return Audio_Language;
                                     default: return (size_t)-1;
                                 }
         case Stream_Text :
@@ -1968,6 +2371,11 @@
                                     case Generic_Duration_String1 : return Text_Duration_String1;
                                     case Generic_Duration_String2 : return Text_Duration_String2;
                                     case Generic_Duration_String3 : return Text_Duration_String3;
+                                    case Generic_Source_Duration : return Text_Source_Duration;
+                                    case Generic_Source_Duration_String : return Text_Source_Duration_String;
+                                    case Generic_Source_Duration_String1 : return Text_Source_Duration_String1;
+                                    case Generic_Source_Duration_String2 : return Text_Source_Duration_String2;
+                                    case Generic_Source_Duration_String3 : return Text_Source_Duration_String3;
                                     case Generic_BitRate_Mode : return Text_BitRate_Mode;
                                     case Generic_BitRate_Mode_String : return Text_BitRate_Mode_String;
                                     case Generic_BitRate : return Text_BitRate;
@@ -1978,12 +2386,42 @@
                                     case Generic_BitRate_Nominal_String : return Text_BitRate_Nominal_String;
                                     case Generic_BitRate_Maximum : return Text_BitRate_Maximum;
                                     case Generic_BitRate_Maximum_String : return Text_BitRate_Maximum_String;
+                                    case Generic_BitRate_Encoded : return Text_BitRate_Encoded;
+                                    case Generic_BitRate_Encoded_String : return Text_BitRate_Encoded_String;
+                                    case Generic_FrameCount : return Text_FrameCount;
+                                    case Generic_Source_FrameCount : return Text_Source_FrameCount;
                                     case Generic_ColorSpace : return Text_ColorSpace;
                                     case Generic_ChromaSubsampling : return Text_ChromaSubsampling;
                                     case Generic_Resolution : return Text_Resolution;
                                     case Generic_Resolution_String : return Text_Resolution_String;
                                     case Generic_BitDepth : return Text_BitDepth;
                                     case Generic_BitDepth_String : return Text_BitDepth_String;
+                                    case Generic_Compression_Mode : return Text_Compression_Mode;
+                                    case Generic_Compression_Mode_String : return Text_Compression_Mode_String;
+                                    case Generic_Compression_Ratio : return Text_Compression_Ratio;
+                                    case Generic_Delay : return Text_Delay;
+                                    case Generic_Delay_String : return Text_Delay_String;
+                                    case Generic_Delay_String1 : return Text_Delay_String1;
+                                    case Generic_Delay_String2 : return Text_Delay_String2;
+                                    case Generic_Delay_String3 : return Text_Delay_String3;
+                                    case Generic_Delay_String4 : return Text_Delay_String4;
+                                    case Generic_Delay_Settings : return Text_Delay_Settings;
+                                    case Generic_Delay_Source : return Text_Delay_Source;
+                                    case Generic_Delay_Source_String : return Text_Delay_Source_String;
+                                    case Generic_Delay_Original : return Text_Delay_Original;
+                                    case Generic_Delay_Original_String : return Text_Delay_Original_String;
+                                    case Generic_Delay_Original_String1 : return Text_Delay_Original_String1;
+                                    case Generic_Delay_Original_String2 : return Text_Delay_Original_String2;
+                                    case Generic_Delay_Original_String3 : return Text_Delay_Original_String3;
+                                    case Generic_Delay_Original_String4 : return Text_Delay_Original_String4;
+                                    case Generic_Delay_Original_Settings : return Text_Delay_Original_Settings;
+                                    case Generic_Delay_Original_Source : return Text_Delay_Original_Source;
+                                    case Generic_Video_Delay : return Text_Video_Delay;
+                                    case Generic_Video_Delay_String : return Text_Video_Delay_String;
+                                    case Generic_Video_Delay_String1 : return Text_Video_Delay_String1;
+                                    case Generic_Video_Delay_String2 : return Text_Video_Delay_String2;
+                                    case Generic_Video_Delay_String3 : return Text_Video_Delay_String3;
+                                    case Generic_Video_Delay_String4 : return Text_Video_Delay_String4;
                                     case Generic_StreamSize : return Text_StreamSize;
                                     case Generic_StreamSize_String : return Text_StreamSize_String;
                                     case Generic_StreamSize_String1 : return Text_StreamSize_String1;
@@ -1992,6 +2430,31 @@
                                     case Generic_StreamSize_String4 : return Text_StreamSize_String4;
                                     case Generic_StreamSize_String5 : return Text_StreamSize_String5;
                                     case Generic_StreamSize_Proportion : return Text_StreamSize_Proportion;
+                                    case Generic_StreamSize_Encoded : return Text_StreamSize_Encoded;
+                                    case Generic_StreamSize_Encoded_String : return Text_StreamSize_Encoded_String;
+                                    case Generic_StreamSize_Encoded_String1 : return Text_StreamSize_Encoded_String1;
+                                    case Generic_StreamSize_Encoded_String2 : return Text_StreamSize_Encoded_String2;
+                                    case Generic_StreamSize_Encoded_String3 : return Text_StreamSize_Encoded_String3;
+                                    case Generic_StreamSize_Encoded_String4 : return Text_StreamSize_Encoded_String4;
+                                    case Generic_StreamSize_Encoded_String5 : return Text_StreamSize_Encoded_String5;
+                                    case Generic_StreamSize_Encoded_Proportion : return Text_StreamSize_Encoded_Proportion;
+                                    case Generic_Source_StreamSize : return Text_Source_StreamSize;
+                                    case Generic_Source_StreamSize_String : return Text_Source_StreamSize_String;
+                                    case Generic_Source_StreamSize_String1 : return Text_Source_StreamSize_String1;
+                                    case Generic_Source_StreamSize_String2 : return Text_Source_StreamSize_String2;
+                                    case Generic_Source_StreamSize_String3 : return Text_Source_StreamSize_String3;
+                                    case Generic_Source_StreamSize_String4 : return Text_Source_StreamSize_String4;
+                                    case Generic_Source_StreamSize_String5 : return Text_Source_StreamSize_String5;
+                                    case Generic_Source_StreamSize_Proportion : return Text_Source_StreamSize_Proportion;
+                                    case Generic_Source_StreamSize_Encoded : return Text_Source_StreamSize_Encoded;
+                                    case Generic_Source_StreamSize_Encoded_String : return Text_Source_StreamSize_Encoded_String;
+                                    case Generic_Source_StreamSize_Encoded_String1 : return Text_Source_StreamSize_Encoded_String1;
+                                    case Generic_Source_StreamSize_Encoded_String2 : return Text_Source_StreamSize_Encoded_String2;
+                                    case Generic_Source_StreamSize_Encoded_String3 : return Text_Source_StreamSize_Encoded_String3;
+                                    case Generic_Source_StreamSize_Encoded_String4 : return Text_Source_StreamSize_Encoded_String4;
+                                    case Generic_Source_StreamSize_Encoded_String5 : return Text_Source_StreamSize_Encoded_String5;
+                                    case Generic_Source_StreamSize_Encoded_Proportion : return Text_Source_StreamSize_Encoded_Proportion;
+                                    case Generic_Language : return Text_Language;
                                     default: return (size_t)-1;
                                 }
         case Stream_Image :
@@ -2020,6 +2483,9 @@
                                     case Generic_Resolution_String : return Image_Resolution_String;
                                     case Generic_BitDepth : return Image_BitDepth;
                                     case Generic_BitDepth_String : return Image_BitDepth_String;
+                                    case Generic_Compression_Mode : return Image_Compression_Mode;
+                                    case Generic_Compression_Mode_String : return Image_Compression_Mode_String;
+                                    case Generic_Compression_Ratio : return Image_Compression_Ratio;
                                     case Generic_StreamSize : return Image_StreamSize;
                                     case Generic_StreamSize_String : return Image_StreamSize_String;
                                     case Generic_StreamSize_String1 : return Image_StreamSize_String1;
@@ -2028,6 +2494,7 @@
                                     case Generic_StreamSize_String4 : return Image_StreamSize_String4;
                                     case Generic_StreamSize_String5 : return Image_StreamSize_String5;
                                     case Generic_StreamSize_Proportion : return Image_StreamSize_Proportion;
+                                    case Generic_Language : return Image_Language;
                                     default: return (size_t)-1;
                                 }
         case Stream_Chapters : return (size_t)-1;
@@ -2056,6 +2523,9 @@
                                     case Generic_Duration_String1 : return Menu_Duration_String1;
                                     case Generic_Duration_String2 : return Menu_Duration_String2;
                                     case Generic_Duration_String3 : return Menu_Duration_String3;
+                                    case Generic_Language : return Menu_Language;
+                                    case Generic_ServiceName : return Menu_ServiceName;
+                                    case Generic_ServiceProvider : return Menu_ServiceProvider;
                                     default: return (size_t)-1;
                                 }
         default: return (size_t)-1;
@@ -2063,4 +2533,3 @@
 }
 
 } //NameSpace
-

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/File__Analyze_Streams_Finish.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/File__Analyze_Streams_Finish.cpp Changed

@@ -1,17 +1,17 @@
 // File__Analyze_Inform - Base for other files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,17 +22,26 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #include "ZenLib/Utils.h"
 #include "ZenLib/File.h"
 #include "ZenLib/FileName.h"
 #include "MediaInfo/File__Analyze.h"
+#include "MediaInfo/MediaInfo_Config_MediaInfo.h"
+#if MEDIAINFO_IBI
+    #include "MediaInfo/Multiple/File_Ibi.h"
+#endif //MEDIAINFO_IBI
 using namespace ZenLib;
 //---------------------------------------------------------------------------
 
@@ -49,6 +58,39 @@
     if (IsSub)
         return;
 
+    //Video Frame count
+    if (Count_Get(Stream_Video)==1 && Count_Get(Stream_Audio)==0 && Retrieve(Stream_Video, 0, Video_FrameCount).empty())
+    {
+        if (Frame_Count_NotParsedIncluded!=(int64u)-1 && File_Offset+Buffer_Size==File_Size)
+            Fill(Stream_Video, 0, Video_FrameCount, Frame_Count_NotParsedIncluded);
+        else if (Config->File_Names.size()>1)
+            Fill(Stream_Video, 0, Video_FrameCount, Config->File_Names.size());
+        #if MEDIAINFO_IBI
+        else
+        {
+            //External IBI
+            std::string IbiFile=Config->Ibi_Get();
+            if (!IbiFile.empty())
+            {
+                if (IbiStream)
+                    IbiStream->Infos.clear(); //TODO: support IBI data from different inputs
+                else
+                    IbiStream=new ibi::stream;
+
+                File_Ibi MI;
+                Open_Buffer_Init(&MI, IbiFile.size());
+                MI.Ibi=new ibi;
+                MI.Open_Buffer_Continue((const int8u*)IbiFile.c_str(), IbiFile.size());
+                if (!MI.Ibi->Streams.empty())
+                    (*IbiStream)=(*MI.Ibi->Streams.begin()->second);
+            }
+
+            if (IbiStream && !IbiStream->Infos.empty() && IbiStream->Infos[IbiStream->Infos.size()-1].IsContinuous && IbiStream->Infos[IbiStream->Infos.size()-1].FrameNumber!=(int64u)-1)
+                Fill(Stream_Video, 0, Video_FrameCount, IbiStream->Infos[IbiStream->Infos.size()-1].FrameNumber);
+        }
+        #endif //MEDIAINFO_IBI
+    }
+
     Streams_Finish_StreamOnly();
     Streams_Finish_StreamOnly();
     Streams_Finish_InterStreams();
@@ -60,6 +102,67 @@
 }
 
 //---------------------------------------------------------------------------
+void File__Analyze::Streams_Accept_TestContinuousFileNames_Static(ZtringList &File_Names, bool IsReferenced)
+{
+    if (File_Names.size()!=1)
+        return;
+
+    //Trying to detect continuous file names (e.g. video stream as an image or HLS)
+    FileName FileToTest(File_Names.Read(0));
+    Ztring FileToTest_Name=FileToTest.Name_Get();
+    size_t FileNameToTest_Pos=FileToTest_Name.size();
+    while (FileNameToTest_Pos && FileToTest_Name[FileNameToTest_Pos-1]>=__T('0') && FileToTest_Name[FileNameToTest_Pos-1]<=__T('9'))
+        FileNameToTest_Pos--;
+    if (FileNameToTest_Pos!=FileToTest_Name.size())
+    {
+        size_t Numbers_Size=FileToTest_Name.size()-FileNameToTest_Pos;
+        int64u Pos=Ztring(FileToTest_Name.substr(FileNameToTest_Pos)).To_int64u();
+        FileToTest_Name.resize(FileNameToTest_Pos);
+
+        for (;;)
+        {
+            Pos++;
+            Ztring Pos_Ztring; Pos_Ztring.From_Number(Pos);
+            if (Numbers_Size<Pos_Ztring.size())
+                break; //Not enough place for numbers
+            Pos_Ztring.insert(0, Numbers_Size-Pos_Ztring.size(), __T('0'));
+            Ztring Next=FileToTest.Path_Get()+PathSeparator+FileToTest_Name+Pos_Ztring+__T('.')+FileToTest.Extension_Get();
+            if (!File::Exists(Next))
+                break;
+            File_Names.push_back(Next);
+        }
+
+        if (!IsReferenced && File_Names.size()<24)
+            File_Names.resize(1); //Removing files, wrong detection
+    }
+}
+
+//---------------------------------------------------------------------------
+void File__Analyze::Streams_Accept_TestContinuousFileNames()
+{
+    if (Config->File_Names.size()!=1)
+        return;
+
+    Streams_Accept_TestContinuousFileNames_Static(Config->File_Names, Config->File_IsReferenced_Get());
+
+    if (Config->File_Names.size()==1)
+        return;
+
+    Config->File_Sizes.clear();
+    Config->File_Size=0;
+    for (size_t Pos=0; Pos<Config->File_Names.size(); Pos++)
+    {
+        int64u Size=File::Size_Get(Config->File_Names[Pos]);
+        Config->File_Sizes.push_back(Size);
+        Config->File_Size+=Size;
+    }
+
+    File_Size=Config->File_Size;
+    Element[0].Next=File_Size;
+    Fill (Stream_General, 0, General_FileSize, File_Size, 10, true);
+}
+
+//---------------------------------------------------------------------------
 void File__Analyze::Streams_Finish_StreamOnly()
 {
     //Generic
@@ -98,6 +201,24 @@
             Fill(StreamKind, Pos, "BitRate", StreamSize*8*1000/Duration, 0);
     }
 
+    //BitRate_Encoded from Duration and StreamSize_Encoded
+    if (StreamKind!=Stream_General && StreamKind!=Stream_Chapters && StreamKind!=Stream_Menu && Retrieve(StreamKind, Pos, Fill_Parameter(StreamKind, Generic_BitRate_Encoded)).empty() && !Retrieve(StreamKind, Pos, Fill_Parameter(StreamKind, Generic_StreamSize_Encoded)).empty() && !Retrieve(StreamKind, Pos, Fill_Parameter(StreamKind, Generic_Duration)).empty())
+    {
+        float64 Duration=0;
+        if (StreamKind==Stream_Video && !Retrieve(Stream_Video, Pos, Video_FrameCount).empty() && !Retrieve(Stream_Video, Pos, Video_FrameRate).empty())
+        {
+            int64u FrameCount=Retrieve(Stream_Video, Pos, Video_FrameCount).To_int64u();
+            float64 FrameRate=Retrieve(Stream_Video, Pos, Video_FrameRate).To_float64();
+            if (FrameCount && FrameRate)
+                Duration=FrameCount*1000/FrameRate; //More precise (example: 1 frame at 29.97 fps)
+        }
+        if (Duration==0)
+            Duration=Retrieve(StreamKind, Pos, Fill_Parameter(StreamKind, Generic_Duration)).To_float64();
+        int64u StreamSize_Encoded=Retrieve(StreamKind, Pos, Fill_Parameter(StreamKind, Generic_StreamSize_Encoded)).To_int64u();
+        if (Duration>0 && StreamSize_Encoded>0)
+            Fill(StreamKind, Pos, Fill_Parameter(StreamKind, Generic_BitRate_Encoded), StreamSize_Encoded*8*1000/Duration, 0);
+    }
+
     //Duration from Bitrate and StreamSize
     if (StreamKind!=Stream_Chapters && Retrieve(StreamKind, Pos, Fill_Parameter(StreamKind, Generic_Duration)).empty() && !Retrieve(StreamKind, Pos, Fill_Parameter(StreamKind, Generic_StreamSize)).empty() && !Retrieve(StreamKind, Pos, "BitRate").empty() && Count_Get(Stream_Video)+Count_Get(Stream_Audio)>1) //If only one stream, duration will be copied later, useful for exact bitrate calculation
     {
@@ -108,23 +229,38 @@
     }
 
     //StreamSize from BitRate and Duration
-    if (StreamKind!=Stream_Chapters && Retrieve(StreamKind, Pos, Fill_Parameter(StreamKind, Generic_StreamSize)).empty() && !Retrieve(StreamKind, Pos, "BitRate").empty() && !Retrieve(StreamKind, Pos, Fill_Parameter(StreamKind, Generic_Duration)).empty() && Retrieve(StreamKind, Pos, "BitRate").find(_T(" / "))==std::string::npos) //If not done the first time or by other routine
+    if (StreamKind!=Stream_Chapters && Retrieve(StreamKind, Pos, Fill_Parameter(StreamKind, Generic_StreamSize)).empty() && !Retrieve(StreamKind, Pos, "BitRate").empty() && !Retrieve(StreamKind, Pos, Fill_Parameter(StreamKind, Generic_Duration)).empty() && Retrieve(StreamKind, Pos, "BitRate").find(__T(" / "))==std::string::npos) //If not done the first time or by other routine
     {
         int64u BitRate=Retrieve(StreamKind, Pos, "BitRate").To_int64u();
         int64u Duration=Retrieve(StreamKind, Pos, Fill_Parameter(StreamKind, Generic_Duration)).To_int64u();
         if (BitRate>0 && Duration>0)
             Fill(StreamKind, Pos, Fill_Parameter(StreamKind, Generic_StreamSize), BitRate*Duration/8/1000);
     }
+
+    //Bit rate and maximum bit rate
+    if (!Retrieve(StreamKind, Pos, Fill_Parameter(StreamKind, Generic_BitRate)).empty() && Retrieve(StreamKind, Pos, Fill_Parameter(StreamKind, Generic_BitRate))==Retrieve(StreamKind, Pos, Fill_Parameter(StreamKind, Generic_BitRate_Maximum)))
+    {
+        Clear(StreamKind, Pos, Fill_Parameter(StreamKind, Generic_BitRate_Maximum));
+        if (Retrieve(StreamKind, Pos, Fill_Parameter(StreamKind, Generic_BitRate_Mode)).empty())
+            Fill(StreamKind, Pos, Fill_Parameter(StreamKind, Generic_BitRate_Mode), "CBR");
+    }
 }
 
 //---------------------------------------------------------------------------
-void File__Analyze::Streams_Finish_StreamOnly_General(size_t StreamPos)
+void File__Analyze::Streams_Finish_StreamOnly_General(size_t UNUSED(StreamPos))
 {
 }
 
 //---------------------------------------------------------------------------
 void File__Analyze::Streams_Finish_StreamOnly_Video(size_t Pos)
 {
+    //Frame count
+    if (Retrieve(Stream_Video, Pos, Video_FrameCount).empty() && Frame_Count_NotParsedIncluded!=(int64u)-1 && File_Offset+Buffer_Size==File_Size)
+    {
+        if (Count_Get(Stream_Video)==1 && Count_Get(Stream_Audio)==0)
+            Fill(Stream_Video, 0, Video_FrameCount, Frame_Count_NotParsedIncluded);
+    }
+
     //FrameCount from Duration and FrameRate
     if (Retrieve(Stream_Video, Pos, Video_FrameCount).empty())
     {
@@ -150,33 +286,28 @@
         Fill(Stream_Video, Pos, Video_PixelAspectRatio, 1.000);
 
     //Standard
-    if (Retrieve(Stream_Video, Pos, Video_Standard).empty() && (Retrieve(Stream_Video, Pos, Video_Width)==_T("720") || Retrieve(Stream_Video, Pos, Video_Width)==_T("704")))
+    if (Retrieve(Stream_Video, Pos, Video_Standard).empty() && (Retrieve(Stream_Video, Pos, Video_Width)==__T("720") || Retrieve(Stream_Video, Pos, Video_Width)==__T("704")))
     {
-             if (Retrieve(Stream_Video, Pos, Video_Height)==_T("576"))
+             if (Retrieve(Stream_Video, Pos, Video_Height)==__T("576"))
             Fill(Stream_Video, Pos, Video_Standard, "PAL");
-        else if (Retrieve(Stream_Video, Pos, Video_Height)==_T("480"))
+        else if (Retrieve(Stream_Video, Pos, Video_Height)==__T("486") || Retrieve(Stream_Video, Pos, Video_Height)==__T("480"))
             Fill(Stream_Video, Pos, Video_Standard, "NTSC");
     }
-    if (Retrieve(Stream_Video, Pos, Video_Standard).empty() && Retrieve(Stream_Video, Pos, Video_Width)==_T("352"))
+    if (Retrieve(Stream_Video, Pos, Video_Standard).empty() && Retrieve(Stream_Video, Pos, Video_Width)==__T("352"))
     {
-             if (Retrieve(Stream_Video, Pos, Video_Height)==_T("576") || Retrieve(Stream_Video, Pos, Video_Height)==_T("288"))
+             if (Retrieve(Stream_Video, Pos, Video_Height)==__T("576") || Retrieve(Stream_Video, Pos, Video_Height)==__T("288"))
             Fill(Stream_Video, Pos, Video_Standard, "PAL");
-        else if (Retrieve(Stream_Video, Pos, Video_Height)==_T("480") || Retrieve(Stream_Video, Pos, Video_Height)==_T("240"))
+        else if (Retrieve(Stream_Video, Pos, Video_Height)==__T("486") || Retrieve(Stream_Video, Pos, Video_Height)==__T("480") || Retrieve(Stream_Video, Pos, Video_Height)==__T("243") || Retrieve(Stream_Video, Pos, Video_Height)==__T("240"))
             Fill(Stream_Video, Pos, Video_Standard, "NTSC");
     }
 
-    //Known bitrates
-    if (Count_Get(Stream_Video)==1 && Count_Get(Stream_Audio)==0 && Retrieve(Stream_General, 0, General_Format)==_T("MXF"))
-    {
-        int32u BitRate=Retrieve(Stream_Video, 0, Video_BitRate).To_int32u();
-        int32u BitRate_Sav=BitRate;
-
-        if (BitRate>= 54942720 && BitRate<= 57185280) BitRate= 56064000; //AVC-INTRA50
-        if (BitRate>=111390720 && BitRate<=115937280) BitRate=113664000; //AVC-INTRA100
-
-        if (BitRate!=BitRate_Sav)
-            Fill(Stream_Video, 0, Video_BitRate, BitRate, 0, true);
-    }
+    //Known ScanTypes
+    if (Retrieve(Stream_Video, Pos, Video_ScanType).empty()
+     && (Retrieve(Stream_Video, Pos, Video_Format)==__T("RED")
+      || Retrieve(Stream_Video, Pos, Video_Format)==__T("CineForm")
+      || Retrieve(Stream_Video, Pos, Video_Format)==__T("DPX")
+      || Retrieve(Stream_Video, Pos, Video_Format)==__T("EXR")))
+            Fill(Stream_Video, Pos, Video_ScanType, "Progressive");
 }
 
 //---------------------------------------------------------------------------
@@ -190,7 +321,14 @@
             Duration=Retrieve(Stream_General, 0, General_Duration).To_int64s();
         float SamplingRate=Retrieve(Stream_Audio, Pos, Audio_SamplingRate).To_float32();
         if (Duration && SamplingRate)
-           Fill(Stream_Audio, Pos, Audio_SamplingCount, ((float64)Duration)/1000*SamplingRate, 0);
+            Fill(Stream_Audio, Pos, Audio_SamplingCount, ((float64)Duration)/1000*SamplingRate, 0);
+    }
+
+    //Frame count
+    if (Retrieve(Stream_Audio, Pos, Audio_FrameCount).empty() && Frame_Count_NotParsedIncluded!=(int64u)-1 && File_Offset+Buffer_Size==File_Size)
+    {
+        if (Count_Get(Stream_Video)==0 && Count_Get(Stream_Audio)==1)
+            Fill(Stream_Audio, 0, Audio_FrameCount, Frame_Count_NotParsedIncluded);
     }
 
     //Duration
@@ -202,7 +340,7 @@
     }
 
     //Stream size
-    if (Retrieve(Stream_Audio, Pos, Audio_StreamSize).empty() && !Retrieve(Stream_Audio, Pos, Audio_BitRate).empty() && !Retrieve(Stream_Audio, Pos, Audio_Duration).empty() && Retrieve(Stream_Audio, Pos, Audio_BitRate_Mode)==_T("CBR"))
+    if (Retrieve(Stream_Audio, Pos, Audio_StreamSize).empty() && !Retrieve(Stream_Audio, Pos, Audio_BitRate).empty() && !Retrieve(Stream_Audio, Pos, Audio_Duration).empty() && Retrieve(Stream_Audio, Pos, Audio_BitRate_Mode)==__T("CBR"))
     {
         int64u Duration=Retrieve(Stream_Audio, Pos, Audio_Duration).To_int64u();
         int64u BitRate=Retrieve(Stream_Audio, Pos, Audio_BitRate).To_int64u();
@@ -220,22 +358,22 @@
 }
 
 //---------------------------------------------------------------------------
-void File__Analyze::Streams_Finish_StreamOnly_Text(size_t Pos)
+void File__Analyze::Streams_Finish_StreamOnly_Text(size_t UNUSED(Pos))
 {
 }
 
 //---------------------------------------------------------------------------
-void File__Analyze::Streams_Finish_StreamOnly_Chapters(size_t StreamPos)
+void File__Analyze::Streams_Finish_StreamOnly_Chapters(size_t UNUSED(StreamPos))
 {
 }
 
 //---------------------------------------------------------------------------
-void File__Analyze::Streams_Finish_StreamOnly_Image(size_t StreamPos)
+void File__Analyze::Streams_Finish_StreamOnly_Image(size_t UNUSED(StreamPos))
 {
 }
 
 //---------------------------------------------------------------------------
-void File__Analyze::Streams_Finish_StreamOnly_Menu(size_t StreamPos)
+void File__Analyze::Streams_Finish_StreamOnly_Menu(size_t UNUSED(StreamPos))
 {
 }
 
@@ -274,10 +412,11 @@
             if (StreamKind!=Stream_Chapters && StreamKind!=Stream_Menu) //They have no big size, we never calculate them
                 for (size_t Pos=0; Pos<Count_Get((stream_t)StreamKind); Pos++)
                 {
-                    int64u StreamSize=Retrieve((stream_t)StreamKind, Pos, Fill_Parameter((stream_t)StreamKind, Generic_StreamSize)).To_int64u();
-                    if (StreamSize>0)
-                        StreamSize_Total+=StreamSize;
-                    else if (IsOK)
+                    if (!Retrieve((stream_t)StreamKind, Pos, Fill_Parameter((stream_t)StreamKind, Generic_StreamSize_Encoded)).empty())
+                        StreamSize_Total+=Retrieve((stream_t)StreamKind, Pos, Fill_Parameter((stream_t)StreamKind, Generic_StreamSize_Encoded)).To_int64u();
+                    else if (!Retrieve((stream_t)StreamKind, Pos, Fill_Parameter((stream_t)StreamKind, Generic_StreamSize)).empty())
+                        StreamSize_Total+=Retrieve((stream_t)StreamKind, Pos, Fill_Parameter((stream_t)StreamKind, Generic_StreamSize)).To_int64u();
+                    else
                         IsOK=false; //StreamSize not available for 1 stream, we can't calculate
                 }
         }
@@ -288,15 +427,27 @@
     }
 
     //OverallBitRate if we have one Audio stream with bitrate
-    if (Retrieve(Stream_General, 0, General_Duration).empty() && Retrieve(Stream_General, 0, General_OverallBitRate).empty() && Count_Get(Stream_Video)==0 && Count_Get(Stream_Audio)==1 && Retrieve(Stream_Audio, 0, Audio_BitRate).To_int64u()!=0)
+    if (Retrieve(Stream_General, 0, General_Duration).empty() && Retrieve(Stream_General, 0, General_OverallBitRate).empty() && Count_Get(Stream_Video)==0 && Count_Get(Stream_Audio)==1 && Retrieve(Stream_Audio, 0, Audio_BitRate).To_int64u()!=0 && (Retrieve(Stream_General, 0, General_Format)==Retrieve(Stream_Audio, 0, Audio_Format) || !Retrieve(Stream_General, 0, General_HeaderSize).empty()))
         Fill(Stream_General, 0, General_OverallBitRate, Retrieve(Stream_Audio, 0, Audio_BitRate));
 
     //OverallBitRate if Duration
     if (Retrieve(Stream_General, 0, General_OverallBitRate).empty() && Retrieve(Stream_General, 0, General_Duration).To_int64u()!=0 && !Retrieve(Stream_General, 0, General_FileSize).empty())
-        Fill(Stream_General, 0, General_OverallBitRate, Retrieve(Stream_General, 0, General_FileSize).To_int64u()*8*1000/Retrieve(Stream_General, 0, General_Duration).To_int64u());
+    {
+        float64 Duration=0;
+        if (Count_Get(Stream_Video)==1 && Retrieve(Stream_General, 0, General_Duration)==Retrieve(Stream_Video, 0, General_Duration) && !Retrieve(Stream_Video, 0, Video_FrameCount).empty() && !Retrieve(Stream_Video, 0, Video_FrameRate).empty())
+        {
+            int64u FrameCount=Retrieve(Stream_Video, 0, Video_FrameCount).To_int64u();
+            float64 FrameRate=Retrieve(Stream_Video, 0, Video_FrameRate).To_float64();
+            if (FrameCount && FrameRate)
+                Duration=FrameCount*1000/FrameRate; //More precise (example: 1 frame at 29.97 fps)
+        }
+        if (Duration==0)
+            Duration=Retrieve(Stream_General, 0, General_Duration).To_float64();
+        Fill(Stream_General, 0, General_OverallBitRate, Retrieve(Stream_General, 0, General_FileSize).To_int64u()*8*1000/Duration, 0);
+    }
 
     //Duration if OverallBitRate
-    if (Retrieve(Stream_General, 0, General_Duration).empty() && Retrieve(Stream_General, 0, General_OverallBitRate).To_int64u()!=0 && Retrieve(Stream_General, 0, General_OverallBitRate).find(_T(" / "))==std::string::npos)
+    if (Retrieve(Stream_General, 0, General_Duration).empty() && Retrieve(Stream_General, 0, General_OverallBitRate).To_int64u()!=0)
         Fill(Stream_General, 0, General_Duration, Retrieve(Stream_General, 0, General_FileSize).To_float64()*8*1000/Retrieve(Stream_General, 0, General_OverallBitRate).To_float64(), 0);
 
     //Video bitrate can be the nominal one if <4s (bitrate estimation is not enough precise
@@ -307,7 +458,7 @@
     }
 
     //Video bitrate if we have all audio bitrates and overal bitrate
-    if (Count_Get(Stream_Video)==1 && Retrieve(Stream_General, 0, General_OverallBitRate).size()>4 && Retrieve(Stream_Video, 0, Video_BitRate).empty() && Retrieve(Stream_General, 0, General_Duration).To_int64u()>=1000) //BitRate is > 10 000 and Duration>10s, to avoid strange behavior
+    if (Count_Get(Stream_Video)==1 && Retrieve(Stream_General, 0, General_OverallBitRate).size()>4 && Retrieve(Stream_Video, 0, Video_BitRate).empty() && Retrieve(Stream_Video, 0, Video_BitRate_Encoded).empty() && Retrieve(Stream_General, 0, General_Duration).To_int64u()>=1000) //BitRate is > 10 000 and Duration>10s, to avoid strange behavior
     {
         double GeneralBitRate_Ratio=0.98;  //Default container overhead=2%
         int32u GeneralBitRate_Minus=5000;  //5000 bps because of a "classic" stream overhead
@@ -318,7 +469,18 @@
         double TextBitRate_Ratio   =0.98;  //Default container overhead=2%
         int32u TextBitRate_Minus   =2000;  //2000 bps because of a "classic" stream overhead
         //Specific value depends of Container
-        if (Get(Stream_General, 0, _T("Format"))==_T("MPEG-TS"))
+        if (IsRawStream)
+        {
+            GeneralBitRate_Ratio=1;
+            GeneralBitRate_Minus=0;
+            VideoBitRate_Ratio  =1;
+            VideoBitRate_Minus  =0;
+            AudioBitRate_Ratio  =1;
+            AudioBitRate_Minus  =0;
+            TextBitRate_Ratio   =1;
+            TextBitRate_Minus   =0;
+        }
+        if (Get(Stream_General, 0, __T("Format"))==__T("MPEG-TS"))
         {
             GeneralBitRate_Ratio=0.98;
             GeneralBitRate_Minus=0;
@@ -329,7 +491,7 @@
             TextBitRate_Ratio   =0.96;
             TextBitRate_Minus   =0;
         }
-        if (Get(Stream_General, 0, _T("Format"))==_T("MPEG-PS"))
+        if (Get(Stream_General, 0, __T("Format"))==__T("MPEG-PS"))
         {
             GeneralBitRate_Ratio=0.99;
             GeneralBitRate_Minus=0;
@@ -340,7 +502,7 @@
             TextBitRate_Ratio   =0.99;
             TextBitRate_Minus   =0;
         }
-        if (MediaInfoLib::Config.Format_Get(Retrieve(Stream_General, 0, General_Format), InfoFormat_KindofFormat)==_T("MPEG-4"))
+        if (MediaInfoLib::Config.Format_Get(Retrieve(Stream_General, 0, General_Format), InfoFormat_KindofFormat)==__T("MPEG-4"))
         {
             GeneralBitRate_Ratio=1;
             GeneralBitRate_Minus=0;
@@ -351,7 +513,7 @@
             TextBitRate_Ratio   =1;
             TextBitRate_Minus   =0;
         }
-        if (Get(Stream_General, 0, _T("Format"))==_T("Matroska"))
+        if (Get(Stream_General, 0, __T("Format"))==__T("Matroska"))
         {
             GeneralBitRate_Ratio=0.99;
             GeneralBitRate_Minus=0;
@@ -368,15 +530,23 @@
         bool VideobitRateIsValid=true;
         for (size_t Pos=0; Pos<Count_Get(Stream_Audio); Pos++)
         {
-            float64 AudioBitRate=Retrieve(Stream_Audio, Pos, Audio_BitRate).To_float64();
-            if (AudioBitRate>0 && AudioBitRate_Ratio)
-                VideoBitRate-=AudioBitRate/AudioBitRate_Ratio+AudioBitRate_Minus;
+            float64 AudioBitRate=0;
+            if (!Retrieve(Stream_Audio, Pos, Audio_BitRate).empty() && Retrieve(Stream_Audio, Pos, Audio_BitRate)[0]<=__T('9')) //Note: quick test if it is a number
+                AudioBitRate=Retrieve(Stream_Audio, Pos, Audio_BitRate).To_float64();
+            else if (!Retrieve(Stream_Audio, Pos, Audio_BitRate_Encoded).empty() && Retrieve(Stream_Audio, Pos, Audio_BitRate_Encoded)[0]<=__T('9')) //Note: quick test if it is a number
+                AudioBitRate=Retrieve(Stream_Audio, Pos, Audio_BitRate_Encoded).To_float64();
             else
                 VideobitRateIsValid=false;
+            if (VideobitRateIsValid && AudioBitRate_Ratio)
+                VideoBitRate-=AudioBitRate/AudioBitRate_Ratio+AudioBitRate_Minus;
         }
         for (size_t Pos=0; Pos<Count_Get(Stream_Text); Pos++)
         {
-            float64 TextBitRate=Retrieve(Stream_Text, Pos, Text_BitRate).To_float64();
+            float64 TextBitRate;
+            if (Retrieve(Stream_Text, Pos, Text_BitRate_Encoded).empty())
+                TextBitRate=Retrieve(Stream_Text, Pos, Text_BitRate).To_float64();
+            else
+                TextBitRate=Retrieve(Stream_Text, Pos, Text_BitRate_Encoded).To_float64();
             if (TextBitRate_Ratio)
                 VideoBitRate-=TextBitRate/TextBitRate_Ratio+TextBitRate_Minus;
             else
@@ -388,9 +558,23 @@
             Fill(Stream_Video, 0, Video_BitRate, VideoBitRate, 0); //Default container overhead=2%
             if (Retrieve(Stream_Video, 0, Video_StreamSize).empty() && !Retrieve(Stream_Video, 0, Video_Duration).empty())
             {
-                int64u Duration=Retrieve(Stream_Video, 0, Video_Duration).To_int64u();
+                float64 Duration=0;
+                if (!Retrieve(Stream_Video, 0, Video_FrameCount).empty() && !Retrieve(Stream_Video, 0, Video_FrameRate).empty())
+                {
+                    int64u FrameCount=Retrieve(Stream_Video, 0, Video_FrameCount).To_int64u();
+                    float64 FrameRate=Retrieve(Stream_Video, 0, Video_FrameRate).To_float64();
+                    if (FrameCount && FrameRate)
+                        Duration=FrameCount*1000/FrameRate; //More precise (example: 1 frame at 29.97 fps)
+                }
+                if (Duration==0)
+                    Duration=Retrieve(Stream_Video, 0, Video_Duration).To_float64();
                 if (Duration)
-                    Fill(Stream_Video, 0, Video_StreamSize, VideoBitRate/8*Duration/1000, 0);
+                {
+                    int64u StreamSize=float64_int64s(VideoBitRate/8*Duration/1000);
+                    if (IsRawStream && File_Size!=(int64u)-1 && StreamSize>=File_Size*0.99)
+                        StreamSize=File_Size;
+                    Fill(Stream_Video, 0, Video_StreamSize, StreamSize);
+                }
             }
         }
     }
@@ -414,9 +598,33 @@
             Fill(Stream_General, 0, General_StreamSize, StreamSize);
     }
 
+    //General_OverallBitRate_Mode
+    if (Retrieve(Stream_General, 0, General_OverallBitRate_Mode).empty())
+    {
+        bool IsValid=false;
+        bool IsCBR=true;
+        bool IsVBR=false;
+        for (size_t StreamKind=Stream_General+1; StreamKind<Stream_Menu; StreamKind++)
+            for (size_t StreamPos=0; StreamPos<Count_Get((stream_t)StreamKind); StreamPos++)
+            {
+                if (!IsValid)
+                    IsValid=true;
+                if (Retrieve((stream_t)StreamKind, StreamPos, Fill_Parameter((stream_t)StreamKind, Generic_BitRate_Mode))!=__T("CBR"))
+                    IsCBR=false;
+                if (Retrieve((stream_t)StreamKind, StreamPos, Fill_Parameter((stream_t)StreamKind, Generic_BitRate_Mode))==__T("VBR"))
+                    IsVBR=true;
+            }
+        if (IsValid)
+        {
+            if (IsCBR)
+                Fill(Stream_General, 0, General_OverallBitRate_Mode, "CBR");
+            if (IsVBR)
+                Fill(Stream_General, 0, General_OverallBitRate_Mode, "VBR");
+        }
+    }
+
     //Tags
     Tags();
 }
 
 } //NameSpace
-

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/File__Base.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/File__Base.cpp Changed

@@ -1,30 +1,35 @@
 // File__Base - Base for other files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #include "MediaInfo/File__Base.h"
 #include "MediaInfo/MediaInfo_Config_MediaInfo.h"
 #include "ZenLib/File.h"
@@ -89,7 +94,7 @@
 {
     if (Config)
         return; //Already done
-        
+
     if (Stream_)
     {
         Stream=Stream_;
@@ -168,7 +173,9 @@
     size_t ParameterI=0;
 
     //Check integrity
-    if (StreamKind>=Stream_Max || StreamPos>=(*Stream)[StreamKind].size() || (ParameterI=MediaInfoLib::Config.Info_Get(StreamKind).Find(Parameter, KindOfSearch))==Error || KindOfInfo>=Info_Max)
+    if (StreamKind>=Stream_Max || StreamPos>=(*Stream)[StreamKind].size() || KindOfInfo>=Info_Max)
+        return MediaInfoLib::Config.EmptyString_Get();
+    if ((ParameterI=MediaInfoLib::Config.Info_Get(StreamKind).Find(Parameter, KindOfSearch))==Error)
     {
         ParameterI=(*Stream_More)[StreamKind][StreamPos].Find(Parameter, KindOfSearch);
         if (ParameterI==Error)
@@ -218,5 +225,3 @@
 }
 
 } //NameSpace
-
-

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/File__Base.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/File__Base.h Changed

@@ -1,17 +1,17 @@
 // File__Base - Base for other files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -27,6 +27,7 @@
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
 #include "MediaInfo/MediaInfo_Config.h"
 #include "ZenLib/ZtringListList.h"
 using namespace ZenLib;
@@ -58,11 +59,11 @@
 
     //Get information
     const Ztring &Get (stream_t StreamKind, size_t StreamNumber, size_t Parameter, info_t KindOfInfo=Info_Text);
-    const Ztring &Get (stream_t StreamKind, size_t StreamNumber, const Ztring &Parameter, info_t KindOfInfo=Info_Text, info_t KindOfSearch=Info_Name);
+    virtual const Ztring &Get (stream_t StreamKind, size_t StreamNumber, const Ztring &Parameter, info_t KindOfInfo=Info_Text, info_t KindOfSearch=Info_Name);
 
     //Set information
-    int           Set (stream_t StreamKind, size_t StreamNumber, size_t Parameter, const Ztring &ToSet, const Ztring &OldValue=_T(""));
-    int           Set (stream_t StreamKind, size_t StreamNumber, const Ztring &Parameter, const Ztring &ToSet, const Ztring &OldValue=_T(""));
+    int           Set (stream_t StreamKind, size_t StreamNumber, size_t Parameter, const Ztring &ToSet, const Ztring &OldValue=__T(""));
+    int           Set (stream_t StreamKind, size_t StreamNumber, const Ztring &Parameter, const Ztring &ToSet, const Ztring &OldValue=__T(""));
 
     //Output buffer
     virtual size_t Output_Buffer_Get (const String &) {return 0;};
@@ -119,6 +120,7 @@
 public :  //A virer
     friend class File__Analyze;
     friend class File__MultipleParsing;
+    friend class File__ReferenceFilesHelper;
 };
 
 } //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/File__Duplicate.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/File__Duplicate.cpp Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/File__Duplicate.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/File__Duplicate.h Changed

@@ -1,17 +1,17 @@
 // File__Extract - Extract of some formats
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/File__MultipleParsing.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/File__MultipleParsing.cpp Changed

@@ -1,37 +1,44 @@
 // File__MultipleParsing - Info for MultipleParsing files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #include "MediaInfo/File__MultipleParsing.h"
 //---------------------------------------------------------------------------
 // Multiple
 #if defined(MEDIAINFO_CDXA_YES)
     #include "MediaInfo/Multiple/File_Cdxa.h"
 #endif
+#if defined(MEDIAINFO_DCP_YES)
+    #include "MediaInfo/Multiple/File_Dcp.h"
+#endif
 #if defined(MEDIAINFO_DPG_YES)
     #include "MediaInfo/Multiple/File_Dpg.h"
 #endif
@@ -41,12 +48,21 @@
 #if defined(MEDIAINFO_DVDV_YES)
     #include "MediaInfo/Multiple/File_Dvdv.h"
 #endif
+#if defined(MEDIAINFO_DXW_YES)
+    #include "MediaInfo/Multiple/File_Dxw.h"
+#endif
 #if defined(MEDIAINFO_FLV_YES)
     #include "MediaInfo/Multiple/File_Flv.h"
 #endif
 #if defined(MEDIAINFO_GXF_YES)
     #include "MediaInfo/Multiple/File_Gxf.h"
 #endif
+#if defined(MEDIAINFO_HLS_YES)
+    #include "MediaInfo/Multiple/File_Hls.h"
+#endif
+#if defined(MEDIAINFO_ISM_YES)
+    #include "MediaInfo/Multiple/File_Ism.h"
+#endif
 #if defined(MEDIAINFO_IVF_YES)
     #include "MediaInfo/Multiple/File_Ivf.h"
 #endif
@@ -83,6 +99,9 @@
 #if defined(MEDIAINFO_RM_YES)
     #include "MediaInfo/Multiple/File_Rm.h"
 #endif
+#if defined(MEDIAINFO_SEQUENCEINFO_YES)
+    #include "MediaInfo/Multiple/File_SequenceInfo.h"
+#endif
 #if defined(MEDIAINFO_SKM_YES)
     #include "MediaInfo/Multiple/File_Skm.h"
 #endif
@@ -110,6 +129,9 @@
 #if defined(MEDIAINFO_FLIC_YES)
     #include "MediaInfo/Video/File_Flic.h"
 #endif
+#if defined(MEDIAINFO_H263_YES)
+    #include "MediaInfo/Video/File_H263.h"
+#endif
 #if defined(MEDIAINFO_MPEG4V_YES)
     #include "MediaInfo/Video/File_Mpeg4v.h"
 #endif
@@ -119,17 +141,23 @@
 #if defined(MEDIAINFO_VC1_YES)
     #include "MediaInfo/Video/File_Vc1.h"
 #endif
+#if defined(MEDIAINFO_VC3_YES)
+    #include "MediaInfo/Video/File_Vc3.h"
+#endif
+#if defined(MEDIAINFO_Y4M_YES)
+    #include "MediaInfo/Video/File_Y4m.h"
+#endif
 
 //---------------------------------------------------------------------------
 // Audio
+#if defined(MEDIAINFO_AAC_YES)
+    #include "MediaInfo/Audio/File_Aac.h"
+#endif
 #if defined(MEDIAINFO_AC3_YES)
     #include "MediaInfo/Audio/File_Ac3.h"
 #endif
-#if defined(MEDIAINFO_ADIF_YES)
-    #include "MediaInfo/Audio/File_Adif.h"
-#endif
-#if defined(MEDIAINFO_ADTS_YES)
-    #include "MediaInfo/Audio/File_Adts.h"
+#if defined(MEDIAINFO_AES3_YES)
+    #include "MediaInfo/Audio/File_Aes3.h"
 #endif
 #if defined(MEDIAINFO_ALS_YES)
     #include "MediaInfo/Audio/File_Als.h"
@@ -179,6 +207,9 @@
 #if defined(MEDIAINFO_PCM_YES)
     #include "MediaInfo/Audio/File_Pcm.h"
 #endif
+#if defined(MEDIAINFO_RKAU_YES)
+    #include "MediaInfo/Audio/File_Rkau.h"
+#endif
 #if defined(MEDIAINFO_S3M_YES)
     #include "MediaInfo/Audio/File_ScreamTracker3.h"
 #endif
@@ -218,12 +249,21 @@
 #if defined(MEDIAINFO_JPEG_YES)
     #include "MediaInfo/Image/File_Jpeg.h"
 #endif
+#if defined(MEDIAINFO_PCX_YES)
+    #include "MediaInfo/Image/File_Pcx.h"
+#endif
 #if defined(MEDIAINFO_PNG_YES)
     #include "MediaInfo/Image/File_Png.h"
 #endif
+#if defined(MEDIAINFO_PSD_YES)
+    #include "MediaInfo/Image/File_Psd.h"
+#endif
 #if defined(MEDIAINFO_TIFF_YES)
     #include "MediaInfo/Image/File_Tiff.h"
 #endif
+#if defined(MEDIAINFO_TIFF_YES)
+    #include "MediaInfo/Image/File_Tga.h"
+#endif
 
 //---------------------------------------------------------------------------
 // Archive
@@ -242,6 +282,9 @@
 #if defined(MEDIAINFO_GZIP_YES)
     #include "MediaInfo/Archive/File_Gzip.h"
 #endif
+#if defined(MEDIAINFO_ISO9660_YES)
+    #include "MediaInfo/Archive/File_Iso9660.h"
+#endif
 #if defined(MEDIAINFO_MZ_YES)
     #include "MediaInfo/Archive/File_Mz.h"
 #endif
@@ -292,7 +335,7 @@
 :File__Analyze()
 {
     #if MEDIAINFO_TRACE
-        Details_DoNotSave=true;
+        Trace_DoNotSave=true;
     #endif //MEDIAINFO_TRACE
 
     File__Analyze* Temp;
@@ -303,6 +346,9 @@
     #if defined(MEDIAINFO_CDXA_YES)
         Temp=new File_Cdxa(); Parser.push_back(Temp);
     #endif
+    #if defined(MEDIAINFO_DCP_YES)
+        Temp=new File_Dcp(); Parser.push_back(Temp);
+    #endif
     #if defined(MEDIAINFO_DPG_YES)
         Temp=new File_Dpg(); Parser.push_back(Temp);
     #endif
@@ -312,12 +358,21 @@
     #if defined(MEDIAINFO_DVDV_YES)
         Temp=new File_Dvdv(); Parser.push_back(Temp);
     #endif
+    #if defined(MEDIAINFO_DXW_YES)
+        Temp=new File_Dxw(); Parser.push_back(Temp);
+    #endif
     #if defined(MEDIAINFO_FLV_YES)
         Temp=new File_Flv(); Parser.push_back(Temp);
     #endif
     #if defined(MEDIAINFO_GXF_YES)
         Temp=new File_Gxf(); Parser.push_back(Temp);
     #endif
+    #if defined(MEDIAINFO_HLS_YES)
+        Temp=new File_Hls(); Parser.push_back(Temp);
+    #endif
+    #if defined(MEDIAINFO_ISM_YES)
+        Temp=new File_Ism(); Parser.push_back(Temp);
+    #endif
     #if defined(MEDIAINFO_IVF_YES)
         Temp=new File_Ivf(); Parser.push_back(Temp);
     #endif
@@ -357,6 +412,9 @@
     #if defined(MEDIAINFO_RM_YES)
         Temp=new File_Rm(); Parser.push_back(Temp);
     #endif
+    #if defined(MEDIAINFO_SEQUENCEINFO_YES)
+        Temp=new File_SequenceInfo(); Parser.push_back(Temp);
+    #endif
     #if defined(MEDIAINFO_SKM_YES)
         Temp=new File_Skm(); Parser.push_back(Temp);
     #endif
@@ -383,6 +441,9 @@
     #if defined(MEDIAINFO_FLIC_YES)
         Temp=new File_Flic(); Parser.push_back(Temp);
     #endif
+    #if defined(MEDIAINFO_H263_YES)
+        Temp=new File_H263(); Parser.push_back(Temp);
+    #endif
     #if defined(MEDIAINFO_MPEG4V_YES)
         Temp=new File_Mpeg4v(); Parser.push_back(Temp);
     #endif
@@ -392,16 +453,22 @@
     #if defined(MEDIAINFO_VC1_YES)
         Temp=new File_Vc1(); Parser.push_back(Temp);
     #endif
+    #if defined(MEDIAINFO_Y4M_YES)
+        Temp=new File_Y4m(); Parser.push_back(Temp);
+    #endif
 
     // Audio
+    #if defined(MEDIAINFO_AAC_YES)
+        Temp=new File_Aac(); ((File_Aac*)Temp)->Mode=File_Aac::Mode_ADIF; Parser.push_back(Temp);
+    #endif
+    #if defined(MEDIAINFO_AAC_YES)
+        Temp=new File_Aac(); ((File_Aac*)Temp)->Mode=File_Aac::Mode_ADTS; Parser.push_back(Temp);
+    #endif
     #if defined(MEDIAINFO_AC3_YES)
         Temp=new File_Ac3(); Parser.push_back(Temp);
     #endif
-    #if defined(MEDIAINFO_ADIF_YES)
-        Temp=new File_Adif(); Parser.push_back(Temp);
-    #endif
-    #if defined(MEDIAINFO_ADTS_YES)
-        Temp=new File_Adts(); Parser.push_back(Temp);
+    #if defined(MEDIAINFO_AES3_YES)
+        Temp=new File_Aes3(); Parser.push_back(Temp);
     #endif
     #if defined(MEDIAINFO_ALS_YES)
         Temp=new File_Als(); Parser.push_back(Temp);
@@ -445,6 +512,9 @@
     #if defined(MEDIAINFO_MPEGA_YES)
         Temp=new File_Mpega(); Parser.push_back(Temp);
     #endif
+    #if defined(MEDIAINFO_RKAU_YES)
+        Temp=new File_Rkau(); Parser.push_back(Temp);
+    #endif
     #if defined(MEDIAINFO_S3M_YES)
         Temp=new File_ScreamTracker3(); Parser.push_back(Temp);
     #endif
@@ -485,12 +555,21 @@
     #if defined(MEDIAINFO_JPEG_YES)
         Temp=new File_Jpeg(); Parser.push_back(Temp);
     #endif
+    #if defined(MEDIAINFO_PCX_YES)
+        Temp=new File_Pcx(); Parser.push_back(Temp);
+    #endif
     #if defined(MEDIAINFO_PNG_YES)
         Temp=new File_Png(); Parser.push_back(Temp);
     #endif
+    #if defined(MEDIAINFO_PSD_YES)
+        Temp=new File_Psd(); Parser.push_back(Temp);
+    #endif
     #if defined(MEDIAINFO_TIFF_YES)
         Temp=new File_Tiff(); Parser.push_back(Temp);
     #endif
+    #if defined(MEDIAINFO_TGA_YES)
+        Temp=new File_Tga(); Parser.push_back(Temp);
+    #endif
 
     // Archive
     #if defined(MEDIAINFO_7Z_YES)
@@ -508,6 +587,9 @@
     #if defined(MEDIAINFO_GZIP_YES)
         Temp=new File_Gzip(); Parser.push_back(Temp);
     #endif
+    #if defined(MEDIAINFO_ISO9660_YES)
+        Temp=new File_Iso9660(); Parser.push_back(Temp);
+    #endif
     #if defined(MEDIAINFO_MZ_YES)
         Temp=new File_Mz(); Parser.push_back(Temp);
     #endif
@@ -585,9 +667,9 @@
     for (size_t Pos=0; Pos<Parser.size(); Pos++)
     {
         //Parsing
-        Open_Buffer_Continue(Parser[Pos], Buffer+Buffer_Offset, (size_t)Element_Size);
+        Parser[Pos]->Open_Buffer_Continue(Buffer+Buffer_Offset, (size_t)Element_Size);
         if (File_Offset+Buffer_Size==File_Size)
-            Open_Buffer_Finalize(Parser[Pos]);
+            Parser[Pos]->Open_Buffer_Finalize();
 
         //Testing if the parser failed
         if (Parser[Pos]->Status[IsFinished] && !Parser[Pos]->Status[IsAccepted])
@@ -637,4 +719,3 @@
 }
 
 } //NameSpace
-

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/File__MultipleParsing.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/File__MultipleParsing.h Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Image/File_Bmp.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Image/File_Bmp.cpp Changed

@@ -1,17 +1,17 @@
 // File_Bmp - Info for Bitmap files
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -27,14 +27,18 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_BMP_YES)
 //---------------------------------------------------------------------------
 
@@ -94,13 +98,13 @@
 {
     //Parsing
     int32u Size, DIB_Size, Offset;
-    Element_Begin("File header", 14);
+    Element_Begin1("File header");
         Skip_C2(                                                "Magic");
         Get_L4 (Size,                                           "Size");
         Skip_L2(                                                "Reserved");
         Skip_L2(                                                "Reserved");
         Get_L4 (Offset,                                         "Offset of data");
-    Element_End();
+    Element_End0();
 
     FILLING_BEGIN();
         if (Size!=File_Size)
@@ -116,22 +120,24 @@
         Stream_Prepare(Stream_Image);
     FILLING_END();
 
-    Element_Begin("DIB header");
+    Element_Begin1("DIB header");
         Peek_L4 (DIB_Size);
         switch (DIB_Size)
         {
-            case  40 : BitmapInfoHeader(); break;
             case  12 : Skip_XX(DIB_Size-4,                      "OS/2 v1 header"); break;
+            case  40 : BitmapInfoHeader(); break;
+            case  52 : Skip_XX(DIB_Size-4,                      "BitmapV2Header"); break;
+            case  56 : Skip_XX(DIB_Size-4,                      "BitmapV3Header"); break;
             case  64 : Skip_XX(DIB_Size-4,                      "OS/2 v2 header"); break;
-            case 108 : Skip_XX(DIB_Size-4,                      "BitmapV4Header"); break;
+            case 108 : BitmapV4Header(); break;
             case 124 : Skip_XX(DIB_Size-4,                      "BitmapV5Header"); break;
             default  : Skip_XX(DIB_Size-4,                      "Unknown header");
             ;
         }
-    Element_End();
+    Element_End0();
 
     Skip_XX(Offset-Element_Offset,                              "Color palette");
-    Skip_XX(File_Size-Offset,                                   "Bitmap data");
+    Skip_XX(Element_Size-Offset,                                "Bitmap data");
 
     //No need of more
     Finish("BMP");
@@ -145,7 +151,7 @@
 void File_Bmp::BitmapInfoHeader()
 {
     //Parsing
-    Element_Begin("Bitmap Info header", 40);
+    Element_Begin1("Bitmap Info header");
     int32u Width, Height, CompressionMethod;
     int16u BitsPerPixel;
     Skip_L4(                                                    "Size");
@@ -153,22 +159,65 @@
     Get_L4 (Height,                                             "Height");
     Skip_L2(                                                    "Color planes");
     Get_L2 (BitsPerPixel,                                       "Bits per pixel");
-    Get_L4 (CompressionMethod,                                  "Compression method"); Param_Info(Bmp_CompressionMethod(CompressionMethod));
+    Get_L4 (CompressionMethod,                                  "Compression method"); Param_Info1(Bmp_CompressionMethod(CompressionMethod));
     Skip_L4(                                                    "Image size");
     Skip_L4(                                                    "Horizontal resolution");
     Skip_L4(                                                    "Vertical resolution");
     Skip_L4(                                                    "Number of colors in the color palette");
     Skip_L4(                                                    "Number of important colors used");
+    Element_End0();
 
     FILLING_BEGIN();
         Fill(Stream_Image, 0, Image_Width, Width);
         Fill(Stream_Image, 0, Image_Height, Height);
-        Fill(Stream_Image, 0, Image_Resolution, BitsPerPixel);
+        Fill(Stream_Image, 0, Image_BitDepth, BitsPerPixel);
         Fill(Stream_Image, 0, Image_Format, Bmp_CompressionMethod(CompressionMethod));
         Fill(Stream_Image, 0, Image_Codec, Bmp_CompressionMethod(CompressionMethod));
     FILLING_END();
 }
 
+
+void File_Bmp::BitmapV4Header()
+{
+    //Parsing
+    Element_Begin1("Bitmap V4 header");
+    int32u Width, Height, CompressionMethod;
+    int16u BitsPerPixel;
+    Skip_L4(                                                    "Size");
+    Get_L4 (Width,                                              "Width");
+    Get_L4 (Height,                                             "Height");
+    Skip_L2(                                                    "Color planes");
+    Get_L2 (BitsPerPixel,                                       "Bits per pixel");
+    Get_L4 (CompressionMethod,                                  "Compression method"); Param_Info1(Bmp_CompressionMethod(CompressionMethod));
+    Skip_L4(                                                    "Image size");
+    Skip_L4(                                                    "Horizontal resolution");
+    Skip_L4(                                                    "Vertical resolution");
+    Skip_L4(                                                    "Number of colors in the color palette");
+    Skip_L4(                                                    "Number of important colors used");
+    Skip_L4(                                                    "Red Channel bit mask");
+    Skip_L4(                                                    "Green Channel bit mask");
+    Skip_L4(                                                    "Blue Channel bit mask");
+    Skip_L4(                                                    "Alpha Channel bit mask");
+    Skip_L4(                                                    "Color Space endpoints");
+    Skip_L4(                                                    "Color Space endpoints");
+    Skip_L4(                                                    "Color Space endpoints");
+    Skip_L4(                                                    "Color Space endpoints");
+    Skip_L4(                                                    "Color Space endpoints");
+    Skip_L4(                                                    "Color Space endpoints");
+    Skip_L4(                                                    "Color Space endpoints");
+    Skip_L4(                                                    "Red Gamma");
+    Skip_L4(                                                    "Green Gamma");
+    Skip_L4(                                                    "Blue Gamma");
+    Element_End0();
+
+    FILLING_BEGIN();
+        Fill(Stream_Image, 0, Image_Width, Width);
+        Fill(Stream_Image, 0, Image_Height, Height);
+        Fill(Stream_Image, 0, Image_BitDepth, BitsPerPixel);
+        Fill(Stream_Image, 0, Image_Format, Bmp_CompressionMethod(CompressionMethod));
+        Fill(Stream_Image, 0, Image_Codec, Bmp_CompressionMethod(CompressionMethod));
+    FILLING_END();
+}
 } //NameSpace
 
 #endif

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Image/File_Bmp.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Image/File_Bmp.h Changed

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Image/File_Dpx.cpp Added

@@ -0,0 +1,851 @@
+// File_Dpx - Info for DPX (SMPTE 268M) files
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_DPX_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Image/File_Dpx.h"
+#include "MediaInfo/MediaInfo_Config_MediaInfo.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Infos
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+const char* DPX_Orientation[]=
+{
+    "Left to right, Top to bottom",
+    "Right to left, Top to bottom",
+    "Left to right, Bottom to top",
+    "Right to left, Bottom to top",
+    "Top to bottom, Left to right",
+    "Top to bottom, Right to left",
+    "Bottom to top, Left to right",
+    "Bottom to top, Right to left",
+    "Reserved for future use"
+};
+
+//---------------------------------------------------------------------------
+const char* DPX_Descriptors0[]=
+{
+    "User defined (or unspecified single component)",
+    "Red (R)",
+    "Green (G)",
+    "Blue (B)",
+    "Alpha (matte)",
+    "Luma (Y)",
+    "Color Difference (CB, CR, subsampled by two)",
+    "Depth (Z)",
+    "Composite video"
+};
+
+const char* DPX_Descriptors50[]=
+{
+    "R,G,B",
+    "R,G,B, Alpha (A)",
+    "A, B, G, R"
+};
+
+const char* DPX_Descriptors100[]=
+{
+    "CB, Y, CR, Y (4:2:2) ---- based on SMPTE 125M",
+    "CB, Y, A, CR, Y, A (4:2:2:4)",
+    "CB, Y, CR (4:4:4)",
+    "CB, Y, CR, A (4:4:4:4)"
+};
+
+const char* DPX_Descriptors150[]=
+{
+    "User-defined 2-component element",
+    "User-defined 3-component element",
+    "User-defined 4-component element",
+    "User-defined 5-component element",
+    "User-defined 6-component element",
+    "User-defined 7-component element",
+    "User-defined 8-component element"
+};
+
+const char* DPX_Descriptors(int8u i)
+{
+    if(i<10)
+        return DPX_Descriptors0[i];
+    if(i<50)
+        return "Reserved for future single components";
+    if(i<53)
+        return DPX_Descriptors50[i-50];
+    if(i<100)
+        return "Reserved for future RGB ++ formats";
+    if(i<104)
+        return DPX_Descriptors100[i-100];
+    if(i<150)
+        return "Reserved for future CBYCR ++ formats";
+    if(i<157)
+        return "Reserved for future single components";
+    return "Reserved for future formats";
+}
+
+//---------------------------------------------------------------------------
+const char* Mpegv_transfer_characteristics(int8u transfer_characteristics);
+const char* DPX_TransferCharacteristic(int8u TransferCharacteristic)
+{
+    switch (TransferCharacteristic)
+    {
+        case  1 : return "Printing density";
+        case  2 : return Mpegv_transfer_characteristics(8);             //Linear
+        case  3 : return "Logarithmic";                                 //Value not specified in specs
+        case  5 :                                                       //SMPTE 274M, for HDTV, mapped to BT.709
+        case  6 : return Mpegv_transfer_characteristics(1);             //BT.709
+        case  7 : return Mpegv_transfer_characteristics(5);             //BT.470 System B, BT.470 System G (typo in specs?)
+        case  8 : return Mpegv_transfer_characteristics(4);             //BT.470 System M (typo in specs?)
+        case  9 :                                                       //BT.601 (NTSC)
+        case 10 : return Mpegv_transfer_characteristics(6);             //BT.601 (PAL)
+        case 11 : return "Z (depth) - linear";
+        case 12 : return "Z (depth) - homogeneous";
+        default : return "";
+    }
+};
+
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+const char* Mpegv_colour_primaries(int8u colour_primaries);
+const char* DPX_ColorimetricSpecification(int8u ColorimetricSpecification)
+{
+    switch (ColorimetricSpecification)
+    {
+        case  1 : return "Printing density";
+        case  5 :                                                       //SMPTE 274M, for HDTV, mapped to BT.709
+        case  6 : return Mpegv_colour_primaries(1);                     //BT.709
+        case  7 : return Mpegv_colour_primaries(5);                     //BT.470 System B, BT.470 System G (typo in specs?), mapped to BT.601 PAL
+        case  8 : return Mpegv_colour_primaries(6);                     //BT.470 System M (typo in specs?), mapped to BT.601 NTSC
+        case  9 : return Mpegv_colour_primaries(6);                     //BT.601 NTSC
+        case 10 : return Mpegv_colour_primaries(5);                     //BT.601 PAL
+        default : return "";
+    }
+}
+
+//---------------------------------------------------------------------------
+const char* DPX_ValidBitDephs(int8u i)
+{
+    switch(i)
+    {
+        case 1  :
+        case 8  :
+        case 10 :
+        case 12 :
+        case 16 :
+                    return "integer";
+        case 32 :
+                    return "IEEE floating point (R32)";
+        case 64 :
+                    return "IEEE floating point (R64)";
+        default :
+                    return "invalid";
+    }
+}
+
+//---------------------------------------------------------------------------
+const char* DPX_ComponentDataPackingMethod[]=
+{
+    "Packed into 32-bit words",
+    "Filled to 32-bit words, method A",
+    "Filled to 32-bit words, method B",
+    "Reserved for future use",
+    "Reserved for future use",
+    "Reserved for future use",
+    "Reserved for future use",
+    "Reserved for future use"
+};
+
+//---------------------------------------------------------------------------
+const char* DPX_ComponentDataEncodingMethod[]=
+{
+    "No encoding applied",
+    "Run-length encoded",
+    "Reserved for future use",
+    "Reserved for future use",
+    "Reserved for future use",
+    "Reserved for future use",
+    "Reserved for future use",
+    "Reserved for future use"
+};
+
+//---------------------------------------------------------------------------
+const char* DPX_VideoSignalStandard0[]=
+{
+    "Undefined",
+    "NTSC",
+    "PAL",
+    "PAL-M",
+    "SECAM"
+};
+
+const char* DPX_VideoSignalStandard50[]=
+{
+    "YCBCR ITU-R 601-5 525-line, 2:1 interlace, 4:3 aspect ratio",
+    "YCBCR ITU-R 601-5 625-line, 2:1 interlace, 4:3 aspect ratio"
+};
+
+const char* DPX_VideoSignalStandard100[]=
+{
+    "YCBCR ITU-R 601-5 525-line, 2:1 interlace, 16:9 aspect ratio",
+    "YCBCR ITU-R 601-5 625-line, 2:1 interlace, 16:9 aspect ratio"
+};
+
+const char* DPX_VideoSignalStandard150[]=
+{
+    "YCBCR 1050-line, 2:1 interlace, 16:9 aspect ratio",
+    "YCBCR 1125-line, 2:1 interlace, 16:9 aspect ratio (SMPTE 274M)",
+    "YCBCR 1250-line, 2:1 interlace, 16:9 aspect ratio",
+    "YCBCR 1125-line, 2:1 interlace, 16:9 aspect ratio (SMPTE 240M)"
+};
+
+const char* DPX_VideoSignalStandard200[]=
+{
+    "YCBCR 525-line, 1:1 progressive, 16:9 aspect ratio",
+    "YCBCR 625-line, 1:1 progressive, 16:9 aspect ratio",
+    "YCBCR 750-line, 1:1 progressive, 16:9 aspect ratio (SMPTE 296M)",
+    "YCBCR 1125-line, 1:1 progressive, 16:9 aspect ratio (SMPTE 274M)"
+};
+
+const char* DPX_VideoSignalStandard(int8u i)
+{
+    if(i<5)
+        return DPX_VideoSignalStandard0[i];
+    if(i<50)
+        return "Reserved for other composite video";
+    if(i<52)
+        return DPX_VideoSignalStandard50[i-50];
+    if(i<100)
+        return "Reserved for future component video";
+    if(i<102)
+        return DPX_VideoSignalStandard100[i-100];
+    if(i<150)
+        return "Reserved for future widescreen";
+    if(i<154)
+        return DPX_VideoSignalStandard150[i-150];
+    if(i<200)
+        return "Reserved for future high-definition interlace";
+    if(i<204)
+        return DPX_VideoSignalStandard200[i-200];
+    return "Reserved for future high-definition progressive";
+}
+
+//***************************************************************************
+// Const
+//***************************************************************************
+
+enum Elements
+{
+    Pos_GenericSection,
+    Pos_IndustrySpecific,
+    Pos_UserDefined,
+    Pos_Padding,
+    Pos_ImageData,
+};
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File_Dpx::File_Dpx()
+:File__Analyze()
+{
+    //Configuration
+    ParserName=__T("DPX");
+}
+
+//***************************************************************************
+// Streams management
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Dpx::Streams_Accept()
+{
+    Fill(Stream_General, 0, General_Format, "DPX");
+    Fill(Stream_General, 0, General_Format_Version, Version==1?"Version 1":"Version 2");
+
+    if (!IsSub)
+    {
+        Streams_Accept_TestContinuousFileNames();
+
+        Stream_Prepare((Config->File_Names.size()>1 || Config->File_IsReferenced_Get())?Stream_Video:Stream_Image);
+        Fill(StreamKind_Last, StreamPos_Last, "StreamSize", File_Size);
+        if (StreamKind_Last==Stream_Video)
+            Fill(Stream_Video, StreamPos_Last, Video_FrameCount, Config->File_Names.size());
+    }
+    else
+        Stream_Prepare(Stream_Image);
+
+    //Configuration
+    Buffer_MaximumSize=64*1024*1024;
+    Frame_Count_NotParsedIncluded=0;
+}
+
+//***************************************************************************
+// Buffer
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_Dpx::FileHeader_Begin()
+{
+    //Element_Size
+    if (Buffer_Size<4)
+        return false; //Must wait for more data
+
+    int32u Magic=CC4(Buffer);
+    switch (Magic)
+    {
+        case 0x802A5FD7 :   //       (v1 Big)
+        case 0xD75F2A80 :   //       (v1 Little)
+        case 0x53445058 :   //"SPDX" (v2 Big)
+        case 0x58504453 :   //"XDPS" (v2 Little)
+                            break;
+        default         :
+                            Reject();
+                            return false;
+    }
+
+    //Generic Section size
+    if (Buffer_Size<28)
+        return false; //Must wait for more data
+    Sizes_Pos=Pos_GenericSection;
+    switch (Magic)
+    {
+        case 0x802A5FD7 :   //       (v1 Big)
+        case 0xD75F2A80 :   //       (v1 Little)
+                            Version=1;
+                            break;
+        case 0x58504453 :   //"XDPS" (v2 Little)
+        case 0x53445058 :   //"SPDX" (v2 Big)
+                            Version=2;
+                            break;
+        default         :   ;
+    }
+    switch (Magic)
+    {
+        case 0xD75F2A80 :   //       (v1 Little)
+        case 0x58504453 :   //"XDPS" (v2 Little)
+                            LittleEndian=true;
+                            break;
+        case 0x802A5FD7 :   //       (v1 Big)
+        case 0x53445058 :   //"SPDX" (v2 Big)
+                            LittleEndian=false;
+                            break;
+        default         :   ;
+    }
+
+    //All should be OK...
+    Accept();
+
+    return true;
+}
+
+//***************************************************************************
+// Buffer - Per element
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Dpx::Header_Parse()
+{
+    //Filling
+    Header_Fill_Code(Sizes_Pos); //We use Sizes_Pos as the unique key
+    if (Sizes.empty())
+    {
+        if (Element_Size<28)
+        {
+            Element_WaitForMoreData();
+            return;
+        }
+        int32u Size=LittleEndian?LittleEndian2int32u(Buffer+Buffer_Offset+24):BigEndian2int32u(Buffer+Buffer_Offset+24);
+        if (Size==(int32u)-1)
+            Size=LittleEndian?LittleEndian2int32u(Buffer+Buffer_Offset+4):BigEndian2int32u(Buffer+Buffer_Offset+4);
+        Header_Fill_Size(Size);
+    }
+    else
+        Header_Fill_Size(Sizes[Sizes_Pos]);
+}
+
+//---------------------------------------------------------------------------
+void File_Dpx::Data_Parse()
+{
+    if (Version==1)
+    {
+        switch (Element_Code)
+        {
+            case Pos_GenericSection   : GenericSectionHeader_v1(); break;
+            case Pos_IndustrySpecific : IndustrySpecificHeader_v1(); break;
+            case Pos_UserDefined      : UserDefinedHeader_v1(); break;
+            case Pos_Padding          : Padding(); break;
+            case Pos_ImageData        : ImageData(); break;
+            default                   : ;
+        }
+    }
+    else
+    {
+        switch (Element_Code)
+        {
+            case Pos_GenericSection   : GenericSectionHeader_v2(); break;
+            case Pos_IndustrySpecific : IndustrySpecificHeader_v2(); break;
+            case Pos_UserDefined      : UserDefinedHeader_v2(); break;
+            case Pos_Padding          : Padding(); break;
+            case Pos_ImageData        : ImageData(); break;
+            default                   : ;
+        }
+    }
+
+    do
+        Sizes_Pos++; //We go automaticly to the next block
+    while (Sizes_Pos<Sizes.size() && Sizes[Sizes_Pos]==0);
+    if (Sizes_Pos==Sizes.size())
+    {
+        Sizes.clear();
+        Sizes_Pos=0;
+
+        if (!Status[IsFilled])
+            Fill();
+        if (Config->ParseSpeed<1.0)
+            Finish();
+    }
+}
+
+//***************************************************************************
+// Elements
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Dpx::GenericSectionHeader_v1()
+{
+    Element_Name("Generic section header");
+
+    //Parsing
+    Element_Begin1("File information");
+    Ztring CreationDate, CreationTime;
+    int32u Size_Header, Size_Total, Size_Generic, Size_Industry, Size_User;
+    Skip_B4(                                                    "Magic number");
+    Get_X4 (Size_Header,                                        "Offset to image data");
+    Get_X4 (Size_Generic,                                       "Generic section header length");
+    Get_X4 (Size_Industry,                                      "Industry specific header length");
+    Get_X4 (Size_User,                                          "User-defined header length");
+    Get_X4 (Size_Total,                                         "Total image file size");
+    Skip_String(8,                                              "Version number of header format");
+    Skip_UTF8  (100,                                            "FileName");
+    Get_UTF8   (12,  CreationDate,                              "Creation Date");
+    Get_UTF8   (12,  CreationTime,                              "Creation Time");
+    Skip_XX(36,                                                 "Reserved for future use");
+    Element_End0();
+
+    Element_Begin1("Image information");
+    int8u ImageElements;
+    Info_B1(ImageOrientation,                                   "Image orientation"); Param_Info1(DPX_Orientation[ImageOrientation>8?8:ImageOrientation]);
+    Get_B1 (ImageElements,                                      "Number of image elements");
+    Skip_B2(                                                    "Unused");
+    if (ImageElements>8)
+        ImageElements=8;
+    for(int8u ImageElement=0; ImageElement<ImageElements; ImageElement++)
+        GenericSectionHeader_v1_ImageElement();
+    if (ImageElements!=8)
+        Skip_XX((8-ImageElements)*28,                           "Padding");
+    Skip_BFP4(9,                                                "White point - x");
+    Skip_BFP4(9,                                                "White point - y");
+    Skip_BFP4(9,                                                "Red primary chromaticity - x");
+    Skip_BFP4(9,                                                "Red primary chromaticity - u");
+    Skip_BFP4(9,                                                "Green primary chromaticity - x");
+    Skip_BFP4(9,                                                "Green primary chromaticity - y");
+    Skip_BFP4(9,                                                "Blue primary chromaticity - x");
+    Skip_BFP4(9,                                                "Blue primary chromaticity - y");
+    Skip_UTF8(200,                                              "Label text");
+    Skip_XX(28,                                                 "Reserved for future use");
+    Element_End0();
+
+    Element_Begin1("Image Data Format Information");
+    Skip_B1(                                                    "Data interleave");
+    Skip_B1(                                                    "Packing");
+    Skip_B1(                                                    "Data signed or unsigned");
+    Skip_B1(                                                    "Image sense");
+    Skip_B4(                                                    "End of line padding");
+    Skip_B4(                                                    "End of channel padding");
+    Skip_XX(20,                                                 "Reserved for future use");
+
+    Element_Begin1("Image Origination Information");
+    Skip_B4(                                                    "X offset");
+    Skip_B4(                                                    "Y offset");
+    Skip_UTF8  (100,                                            "FileName");
+    Get_UTF8   (12,  CreationDate,                              "Creation Date");
+    Get_UTF8   (12,  CreationTime,                              "Creation Time");
+    Skip_UTF8(64,                                               "Input device");
+    Skip_UTF8(32,                                               "Input device model number");
+    Skip_UTF8(32,                                               "Input device serial number");
+    Skip_BFP4(9,                                                "X input device pitch");
+    Skip_BFP4(9,                                                "Y input device pitch");
+    Skip_BFP4(9,                                                "Image gamma of capture device");
+    Skip_XX(40,                                                 "Reserved for future use");
+    Element_End0();
+
+    FILLING_BEGIN();
+        //Coherency tests
+        if (Size_Generic+Size_Industry+Size_User>Size_Header || Size_Header>Size_Total)
+        {
+            Reject();
+            return;
+        }
+
+        //Filling sizes
+        Sizes.push_back(Size_Header);
+        Sizes.push_back(Size_Industry);
+        Sizes.push_back(Size_User);
+        Sizes.push_back(Size_Header-(Size_Generic+Size_Industry+Size_User)); //Size of padding
+        Sizes.push_back(Size_Total-Size_Header); //Size of image
+
+        //Filling meta
+        if (Frame_Count==0)
+        {
+            Fill(Stream_General, 0, General_Encoded_Date, CreationDate+__T(' ')+CreationTime); //ToDo: transform it in UTC
+            Fill(StreamKind_Last, StreamPos_Last, "Encoded_Date", CreationDate+__T(' ')+CreationTime); //ToDo: transform it in UTC
+        }
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
+void File_Dpx::GenericSectionHeader_v1_ImageElement()
+{
+    Element_Begin1("image element");
+    int32u Width, Height;
+    Skip_B1(                                                    "Designator - Byte 0");
+    Skip_B1(                                                    "Designator - Byte 1");
+    Skip_B1(                                                    "Bits per pixel");
+    Skip_B1(                                                    "Unused");
+    Get_X4 (Width,                                              "Pixels per line");
+    Get_X4 (Height,                                             "Lines per image element");
+    Skip_BFP4(9,                                                "Minimum data value");
+    Skip_BFP4(9,                                                "Minimum quantity represented");
+    Skip_BFP4(9,                                                "Maximum data value");
+    Skip_BFP4(9,                                                "Maximum quantity represented");
+    Element_End0();
+
+    FILLING_BEGIN();
+        if (Frame_Count==0)
+        {
+            Fill(StreamKind_Last, StreamPos_Last, "Format", "DPX");
+            Fill(StreamKind_Last, StreamPos_Last, "Format_Version", "Version 1");
+            Fill(StreamKind_Last, StreamPos_Last, "Width", Width);
+            Fill(StreamKind_Last, StreamPos_Last, "Height", Height);
+        }
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
+void File_Dpx::GenericSectionHeader_v2()
+{
+    Element_Name("Generic section header");
+
+    //Parsing
+    Element_Begin1("File information");
+    std::string CreationDate, Creator, Project, Copyright;
+    int32u Size_Header, Size_Total, Size_Generic, Size_Industry, Size_User;
+    Skip_String(4,                                              "Magic number");
+    Get_X4 (Size_Header,                                        "Offset to image data");
+    Skip_String(8,                                              "Version number of header format");
+    Get_X4 (Size_Total,                                         "Total image file size");
+    Skip_B4(                                                    "Ditto Key");
+    Get_X4 (Size_Generic,                                       "Generic section header length");
+    Get_X4 (Size_Industry,                                      "Industry specific header length");
+    Get_X4 (Size_User,                                          "User-defined header length");
+    Skip_UTF8  (100,                                            "FileName");
+    Get_String (24,  CreationDate,                              "Creation Date");
+    Get_String (100, Creator,                                   "Creator");
+    Get_String (200, Project,                                   "Project");
+    Get_String (200, Copyright,                                 "Right to use or copyright statement");
+    Skip_B4(                                                    "Encryption key");
+    Skip_XX(104,                                                "Reserved for future use");
+    Element_End0();
+
+    Element_Begin1("Image information");
+    int32u Width, Height, PAR_H, PAR_V;
+    int16u ImageElements;
+    Info_B2(ImageOrientation,                                   "Image orientation");Param_Info1(DPX_Orientation[ImageOrientation]);
+    Get_X2 (ImageElements,                                      "Number of image elements");
+    if (ImageElements>8)
+        ImageElements=8;
+    Get_X4 (Width,                                              "Pixels per line");
+    Get_X4 (Height,                                             "Lines per image element");
+    for(int16u ImageElement=0; ImageElement<ImageElements; ImageElement++)
+        GenericSectionHeader_v2_ImageElement();
+    if (ImageElements!=8)
+        Skip_XX((8-ImageElements)*72,                           "Padding");
+    Skip_XX(52,                                                 "Reserved for future use");
+    Element_End0();
+
+    Element_Begin1("Image source information");
+    Skip_B4(                                                    "X Offset");
+    Skip_B4(                                                    "Y Offset");
+    Skip_BFP4(9,                                                "X center");
+    Skip_BFP4(9,                                                "Y center");
+    Skip_B4(                                                    "X original size");
+    Skip_B4(                                                    "Y original size");
+    Skip_UTF8(100,                                              "Source image filename");
+    Skip_UTF8(24,                                               "Source image date/time");
+    Skip_UTF8(32,                                               "Input device name");
+    Skip_UTF8(32,                                               "Input device serial number");
+    Element_Begin1("Border validity");
+    Skip_B2(                                                    "XL border");
+    Skip_B2(                                                    "XR border");
+    Skip_B2(                                                    "YT border");
+    Skip_B2(                                                    "YB border");
+    Element_End0();
+    Get_X4 (PAR_H,                                              "Pixel ratio : horizontal");
+    Get_X4 (PAR_V,                                              "Pixel ratio : vertical");
+
+    Element_Begin1("Additional source image information");
+    Skip_BFP4(9,                                                "X scanned size");
+    Skip_BFP4(9,                                                "Y scanned size");
+    Skip_XX(20,                                                 "Reserved for future use");
+    Element_End0();
+
+    FILLING_BEGIN();
+        //Coherency tests
+        if (Size_Generic==(int32u)-1)
+            Size_Generic=Element_Size;
+        if (Size_Industry==(int32u)-1)
+            Size_Industry=0;
+        if (Size_User==(int32u)-1)
+            Size_User=0;
+        if (Size_Generic+Size_Industry+Size_User>Size_Header || Size_Header>Size_Total)
+        {
+            Reject();
+            return;
+        }
+
+        //Filling sizes
+        Sizes.push_back(Size_Header);
+        Sizes.push_back(Size_Industry);
+        Sizes.push_back(Size_User);
+        Sizes.push_back(Size_Header-(Size_Generic+Size_Industry+Size_User)); //Size of padding
+        Sizes.push_back(Size_Total-Size_Header); //Size of image
+
+        //Filling meta
+        if (Frame_Count==0)
+        {
+            Fill(Stream_General, 0, General_Encoded_Date, CreationDate); //ToDo: transform it in UTC
+            Fill(StreamKind_Last, StreamPos_Last, "Encoded_Date", CreationDate); //ToDo: transform it in UTC
+            Fill(Stream_General, 0, General_Encoded_Library, Creator);
+            Fill(StreamKind_Last, StreamPos_Last, "Encoded_Library", Creator);
+            Fill(Stream_General, 0, "Project", Project); //ToDo: map to a MediaInfo field (which one?)
+            Fill(Stream_General, 0, General_Copyright, Copyright);
+
+            Fill(StreamKind_Last, StreamPos_Last, "Width", Width);
+            Fill(StreamKind_Last, StreamPos_Last, "Height", Height);
+            if (PAR_V && PAR_H!=(int32u)-1 && PAR_V!=(int32u)-1)
+                Fill(StreamKind_Last, StreamPos_Last, "PixelAspectRatio", ((float)PAR_H)/PAR_V);
+            else
+                Fill(StreamKind_Last, StreamPos_Last, "PixelAspectRatio", (float)1, 3);
+        }
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
+void File_Dpx::GenericSectionHeader_v2_ImageElement()
+{
+    Element_Begin1("image element");
+    int8u TransferCharacteristic, ColorimetricSpecification, BitDephs;
+    Info_B4(DataSign,                                           "Data sign");Param_Info1((DataSign==0?"unsigned":"signed"));
+    Skip_B4(                                                    "Reference low data code value");
+    Skip_BFP4(9,                                                "Reference low quantity represented");
+    Skip_B4(                                                    "Reference high data code value");
+    Skip_BFP4(9,                                                "Reference high quantity represented");
+    Info_B1(Descriptor,                                         "Descriptor");Param_Info1(DPX_Descriptors(Descriptor));
+    Get_B1 (TransferCharacteristic,                             "Transfer characteristic");Param_Info1(DPX_TransferCharacteristic(TransferCharacteristic));
+    Get_B1 (ColorimetricSpecification,                          "Colorimetric specification");Param_Info1(DPX_ColorimetricSpecification(ColorimetricSpecification));
+    Get_B1 (BitDephs,                                           "Bit depth");Param_Info1(DPX_ValidBitDephs(BitDephs));
+    Info_B2(ComponentDataPackingMethod,                         "Packing");Param_Info1((ComponentDataPackingMethod<8?DPX_ComponentDataPackingMethod[ComponentDataPackingMethod]:"invalid"));
+    Info_B2(ComponentDataEncodingMethod,                        "Encoding");Param_Info1((ComponentDataEncodingMethod<8?DPX_ComponentDataEncodingMethod[ComponentDataEncodingMethod]:"invalid"));
+    Skip_B4(                                                    "Offset to data");
+    Skip_B4(                                                    "End-of-line padding");
+    Skip_B4(                                                    "End-of-image padding");
+    Skip_UTF8(32,                                               "Description of image element");
+    Element_End0();
+
+    FILLING_BEGIN();
+        if (Frame_Count==0)
+        {
+            Fill(StreamKind_Last, StreamPos_Last, "Format", "DPX");
+            Fill(StreamKind_Last, StreamPos_Last, "Format_Version", "Version 2");
+            Fill(StreamKind_Last, StreamPos_Last, "BitDepth", BitDephs);
+            Fill(StreamKind_Last, StreamPos_Last, "colour_primaries", DPX_TransferCharacteristic(TransferCharacteristic));
+            Fill(StreamKind_Last, StreamPos_Last, "transfer_characteristics", DPX_ColorimetricSpecification(ColorimetricSpecification));
+        }
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
+void File_Dpx::IndustrySpecificHeader_v1()
+{
+    Element_Name("Motion picture industry specific header");
+
+    //Parsing
+    Element_Begin1("Motion-picture film information");
+    Skip_B1(                                                    "?");
+    Skip_B1(                                                    "?");
+    Skip_B1(                                                    "?");
+    Skip_B1(                                                    "?");
+    Skip_B4(                                                    "?");
+    Skip_B4(                                                    "?");
+    Skip_UTF8(32,                                               "?");
+    Skip_B4(                                                    "?");
+    Skip_B4(                                                    "?");
+    Skip_UTF8(32,                                               "?");
+    Skip_UTF8(200,                                              "?");
+    Skip_XX(740,                                                "Reserved for future use");
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Dpx::IndustrySpecificHeader_v2()
+{
+    Element_Name("Industry specific header");
+
+    //Parsing
+    Element_Begin1("Motion-picture film information");
+    Skip_String(2,                                              "Film mfg. ID code");
+    Skip_String(2,                                              "Film type");
+    Skip_String(2,                                              "Offset in perfs");
+    Skip_String(6,                                              "Prefix");
+    Skip_String(4,                                              "Count");
+    Skip_String(32,                                             "Format - e.g. Academy");
+    Skip_B4(                                                    "Frame position in sequence");
+    Skip_B4(                                                    "Sequence length (frames)");
+    Skip_B4(                                                    "Held count (1 = default)");
+    Skip_BFP4(9,                                                "Frame rate of original (frames/s)");
+    Skip_BFP4(9,                                                "Shutter angle of camera in degrees");
+    Skip_UTF8(32,                                               "Frame identification - e.g. keyframe");
+    Skip_UTF8(100,                                              "Slate information");
+    Skip_XX(56,                                                 "Reserved for future use");
+    Element_End0();
+
+    Element_Begin1("Television information");
+    Skip_B4(                                                    "SMPTE time code");
+    Skip_B4(                                                    "SMPTE user bits");
+    Info_B1(Interlace,                                          "Interlace");Param_Info1((Interlace==0?"noninterlaced":"2:1 interlace"));
+    Skip_B1(                                                    "Field number");
+    Info_B1(VideoSignalStandard,                                "Video signal standard");Param_Info1(DPX_VideoSignalStandard(VideoSignalStandard));
+    Skip_B1(                                                    "Zero");
+    Skip_BFP4(9,                                                "Horizontal sampling rate (Hz)");
+    Skip_BFP4(9,                                                "Vertical sampling rate (Hz)");
+    Skip_BFP4(9,                                                "Temporal sampling rate or frame rate (Hz)");
+    Skip_BFP4(9,                                                "Time offset from sync to first pixel (ms)");
+    Skip_BFP4(9,                                                "Gamma");
+    Skip_BFP4(9,                                                "Black level code value");
+    Skip_BFP4(9,                                                "Black gain");
+    Skip_BFP4(9,                                                "Breakpoint");
+    Skip_BFP4(9,                                                "Reference white level code value");
+    Skip_BFP4(9,                                                "Integration time (s)");
+    Skip_XX(76,                                                 "Reserved for future use");
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Dpx::UserDefinedHeader_v1()
+{
+    Element_Name("User defined header");
+
+    //Parsing
+    Skip_XX(Sizes[Pos_UserDefined],                             "Unknown");
+}
+
+//---------------------------------------------------------------------------
+void File_Dpx::UserDefinedHeader_v2()
+{
+    Element_Name("User defined header");
+
+    //Parsing
+    if (Sizes[Pos_UserDefined]<32)
+    {
+        //Not in spec
+        Skip_XX(Sizes[Pos_UserDefined],                         "Unknown");
+        return;
+    }
+    Skip_UTF8(32,                                               "User identification");
+    Skip_XX(Sizes[Pos_UserDefined]-32,                          "User defined");
+}
+
+//---------------------------------------------------------------------------
+void File_Dpx::Padding()
+{
+    Element_Name("Padding");
+
+    //Parsing
+    Skip_XX(Sizes[Pos_Padding],                                 "Padding");
+}
+
+//---------------------------------------------------------------------------
+void File_Dpx::ImageData()
+{
+    Element_Name("Image Data");
+
+    //Parsing
+    Skip_XX(Sizes[Pos_ImageData],                               "Data");
+
+    Frame_Count++;
+    if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+        Frame_Count_NotParsedIncluded++;
+}
+
+//***************************************************************************
+// Helpers
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Dpx::Get_X2(int16u &Info, const char* Name)
+{
+    if (LittleEndian)
+        Get_L2 (Info,                                           Name);
+    else
+        Get_B2 (Info,                                           Name);
+}
+
+//---------------------------------------------------------------------------
+void File_Dpx::Get_X4(int32u &Info, const char* Name)
+{
+    if (LittleEndian)
+        Get_L4 (Info,                                           Name);
+    else
+        Get_B4 (Info,                                           Name);
+}
+
+} //NameSpace
+
+#endif //MEDIAINFO_DPX_YES

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Image/File_Dpx.h Added

@@ -0,0 +1,94 @@
+// File_Dpx - Info for DPX (SMPTE 268M) files
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Information about DPX files
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_File_DpxH
+#define MediaInfo_File_DpxH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+#include <map>
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Class File_Dpx
+//***************************************************************************
+
+class File_Dpx : public File__Analyze
+{
+public :
+    //Constructor/Destructor
+    File_Dpx();
+
+private :
+    //Streams management
+    void Streams_Accept();
+
+    //Buffer - Demux
+    #if MEDIAINFO_DEMUX
+    bool Demux_UnpacketizeContainer_Test() {return Demux_UnpacketizeContainer_Test_OneFramePerFile();}
+    #endif //MEDIAINFO_DEMUX
+
+    //Buffer - File header
+    bool FileHeader_Begin();
+
+    //Buffer - Global
+    void Read_Buffer_Unsynched() {Read_Buffer_Unsynched_OneFramePerFile();}
+    #if MEDIAINFO_SEEK
+    size_t Read_Buffer_Seek (size_t Method, int64u Value, int64u ID) {return Read_Buffer_Seek_OneFramePerFile(Method, Value, ID);}
+    #endif //MEDIAINFO_SEEK
+
+    //Buffer - Per element
+    void Header_Parse();
+    void Data_Parse();
+
+    //Elements
+    void GenericSectionHeader_v1();
+    void GenericSectionHeader_v2();
+    void GenericSectionHeader_v1_ImageElement();
+    void GenericSectionHeader_v2_ImageElement();
+    void IndustrySpecificHeader_v1();
+    void IndustrySpecificHeader_v2();
+    void UserDefinedHeader_v1();
+    void UserDefinedHeader_v2();
+    void Padding();
+    void ImageData();
+
+    //Temp
+    std::vector<int32u> Sizes;
+    size_t              Sizes_Pos;
+    int8u               Version;
+    bool                LittleEndian;
+
+    //Helpers
+    void Get_X2 (int16u &Info, const char* Name);
+    void Get_X4 (int32u &Info, const char* Name);
+};
+
+} //NameSpace
+
+#endif

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Image/File_Exr.cpp Added

@@ -0,0 +1,350 @@
+// File_Exr - Info for EXR files
+// Copyright (C) 2011-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_EXR_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Image/File_Exr.h"
+#include "MediaInfo/MediaInfo_Config_MediaInfo.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Infos
+//***************************************************************************
+
+//***************************************************************************
+// Const
+//***************************************************************************
+
+enum Elements
+{
+    Pos_FileInformation,
+    Pos_GenericSection,
+    Pos_IndustrySpecific,
+    Pos_UserDefined,
+    Pos_Padding,
+    Pos_ImageData,
+};
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File_Exr::File_Exr()
+:File__Analyze()
+{
+    //Configuration
+    ParserName=__T("EXR");
+}
+
+//***************************************************************************
+// Streams management
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Exr::Streams_Accept()
+{
+    Fill(Stream_General, 0, General_Format, "EXR");
+
+    if (!IsSub)
+    {
+        Streams_Accept_TestContinuousFileNames();
+
+        Stream_Prepare((Config->File_Names.size()>1 || Config->File_IsReferenced_Get())?Stream_Video:Stream_Image);
+        Fill(StreamKind_Last, StreamPos_Last, "StreamSize", File_Size);
+        if (StreamKind_Last==Stream_Video)
+            Fill(Stream_Video, StreamPos_Last, Video_FrameCount, Config->File_Names.size());
+    }
+    else
+        Stream_Prepare(Stream_Image);
+
+    //Configuration
+    Buffer_MaximumSize=64*1024*1024;
+    Frame_Count_NotParsedIncluded=0;
+}
+
+//***************************************************************************
+// Buffer
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_Exr::FileHeader_Begin()
+{
+    //Element_Size
+    if (Buffer_Size<4)
+        return false; //Must wait for more data
+
+    if (CC4(Buffer)!=0x762F3101) //"v/1"+1
+    {
+        Reject();
+        return false;
+    }
+
+    //All should be OK...
+    Accept();
+
+    return true;
+}
+
+//***************************************************************************
+// Buffer - Per element
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_Exr::Header_Begin()
+{
+    //Header
+    if (Buffer_Offset+4>Buffer_Size)
+        return false;
+    if (CC4(Buffer+Buffer_Offset)==0x762F3101) //"v/1"+1
+        return Buffer_Offset+12<=Buffer_Size;
+
+    //Name
+    name_End=0;
+    while (Buffer_Offset+name_End<Buffer_Size)
+    {
+        if (Buffer[Buffer_Offset+name_End]=='\0')
+            break;
+        if (name_End==31)
+            break;
+        name_End++;
+    }
+    if (Buffer_Offset+name_End>=Buffer_Size)
+        return false;
+    if (name_End>=31)
+    {
+        Reject();
+        return false;
+    }
+    if (name_End==0)
+        return true;
+
+    //Type
+    type_End=0;
+    while (Buffer_Offset+name_End+1+type_End<Buffer_Size)
+    {
+        if (Buffer[Buffer_Offset+name_End+1+type_End]=='\0')
+            break;
+        if (type_End==31)
+            break;
+        type_End++;
+    }
+
+    if (Buffer_Offset+name_End+1+type_End>=Buffer_Size)
+        return false;
+    if (type_End>=31)
+    {
+        Reject();
+        return false;
+    }
+
+    if (Buffer_Offset+name_End+1+type_End+1+4>=Buffer_Size)
+        return false;
+
+    return true;
+}
+
+//---------------------------------------------------------------------------
+void File_Exr::Header_Parse()
+{
+    //Header
+    if (CC4(Buffer+Buffer_Offset)==0x762F3101) //"v/1"+1
+    {
+        //Filling
+        Header_Fill_Code(0, "File header");
+        Header_Fill_Size(12);
+        return;
+    }
+
+    //Image data
+    if (name_End==0)
+    {
+        //Filling
+        Header_Fill_Code(0, "Image data");
+        Header_Fill_Size(ImageData_End-(File_Offset+Buffer_Offset));
+        return;
+    }
+
+    int32u size;
+    Get_String(name_End, name,                                  "name");
+    Element_Offset++; //Null byte
+    Get_String(type_End, type,                                  "type");
+    Element_Offset++; //Null byte
+    Get_L4 (size,                                               "size");
+
+    //Filling
+    Header_Fill_Code(0, Ztring().From_Local(name.c_str()));
+    Header_Fill_Size(name_End+1+type_End+1+4+size);
+}
+
+//---------------------------------------------------------------------------
+void File_Exr::Data_Parse()
+{
+
+    if (CC4(Buffer+Buffer_Offset)==0x762F3101) //"v/1"+1 //Header
+        Header();
+    else if (name=="comments" && type=="string")
+        comments();
+    else if (name=="compression" && type=="compression" && Element_Size==1)
+        compression();
+    else if (name=="dataWindow" && type=="box2i" && Element_Size==16)
+        dataWindow();
+    else if (name=="displayWindow" && type=="box2i" && Element_Size==16)
+        displayWindow();
+    else if (name=="pixelAspectRatio" && type=="float" && Element_Size==4)
+        pixelAspectRatio();
+    else
+        Skip_XX(Element_Size,                                   "value");
+}
+
+//---------------------------------------------------------------------------
+void File_Exr::Header()
+{
+    //Parsing
+    int32u Flags;
+    int8u Version;
+    Skip_L4(                                                    "Magic number");
+    Get_L1 (Version,                                            "Version field");
+    Get_L3 (Flags,                                              "Flags");
+
+    //Filling
+    if (Frame_Count==0)
+    {
+        Fill(Stream_General, 0, General_Format_Version, __T("Version ")+Ztring::ToZtring(Version));
+        Fill(StreamKind_Last, 0, "Format", "EXR");
+        Fill(StreamKind_Last, 0, "Format_Version", __T("Version ")+Ztring::ToZtring(Version));
+        Fill(StreamKind_Last, 0, "Format_Profile", (Flags&0x02)?"Tile":"Line");
+    }
+    Frame_Count++;
+    if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+        Frame_Count_NotParsedIncluded++;
+    ImageData_End=File_Offset+Buffer_Offset+Config->File_Sizes[Config->File_Names_Pos-1];
+}
+
+//---------------------------------------------------------------------------
+void File_Exr::ImageData()
+{
+    Skip_XX(Element_Size,                                       "data");
+
+    if (!Status[IsFilled])
+        Fill();
+    if (Config->ParseSpeed<1.0)
+        Finish();
+}
+
+//---------------------------------------------------------------------------
+void File_Exr::comments ()
+{
+    //Parsing
+    Ztring value;
+    Get_Local(Element_Size, value,                              "value");
+
+    //Filling
+    if (Frame_Count==1)
+        Fill(StreamKind_Last, 0, General_Comment, value);
+}
+
+//---------------------------------------------------------------------------
+void File_Exr::compression ()
+{
+    //Parsing
+    int8u value;
+    Get_L1 (value,                                              "value");
+
+    //Filling
+    std::string Compression;
+    switch (value)
+    {
+        case 0x00 : Compression="raw"; break;
+        case 0x01 : Compression="RLZ"; break;
+        case 0x02 : Compression="ZIPS"; break;
+        case 0x03 : Compression="ZIP"; break;
+        case 0x04 : Compression="PIZ"; break;
+        case 0x05 : Compression="PXR24"; break;
+        case 0x06 : Compression="B44"; break;
+        case 0x07 : Compression="B44A"; break;
+        default   : ;
+    }
+
+    if (Frame_Count==1)
+        Fill(StreamKind_Last, 0, "Format_Compression", Compression.c_str());
+}
+
+//---------------------------------------------------------------------------
+void File_Exr::dataWindow ()
+{
+    //Parsing
+    int32u xMin, yMin, xMax, yMax;
+    Get_L4 (xMin,                                               "xMin");
+    Get_L4 (yMin,                                               "yMin");
+    Get_L4 (xMax,                                               "xMax");
+    Get_L4 (yMax,                                               "yMax");
+}
+
+//---------------------------------------------------------------------------
+void File_Exr::displayWindow ()
+{
+    //Parsing
+    int32u xMin, yMin, xMax, yMax;
+    Get_L4 (xMin,                                               "xMin");
+    Get_L4 (yMin,                                               "yMin");
+    Get_L4 (xMax,                                               "xMax");
+    Get_L4 (yMax,                                               "yMax");
+
+    //Filling
+    if (Frame_Count==1)
+    {
+        Fill(StreamKind_Last, 0, "Width", xMax-xMin+1);
+        Fill(StreamKind_Last, 0, "Height", yMax-yMin+1);
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Exr::pixelAspectRatio ()
+{
+    //Parsing
+    float value;
+    Get_LF4(value,                                              "value");
+
+    //Filling
+    if (Frame_Count==1)
+        Fill(StreamKind_Last, 0, "PixelAspectRatio", value?value:1, 3);
+}
+
+} //NameSpace
+
+#endif //MEDIAINFO_EXR_YES

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Image/File_Exr.h Added

@@ -0,0 +1,89 @@
+// File_Exr - Info for EXR files
+// Copyright (C) 2011-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Information about EXR files
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_File_ExrH
+#define MediaInfo_File_ExrH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+#include <map>
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Class File_Exr
+//***************************************************************************
+
+class File_Exr : public File__Analyze
+{
+public :
+    //Constructor/Destructor
+    File_Exr();
+
+private :
+    //Streams management
+    void Streams_Accept();
+
+    //Buffer - Demux
+    #if MEDIAINFO_DEMUX
+    bool Demux_UnpacketizeContainer_Test() {return Demux_UnpacketizeContainer_Test_OneFramePerFile();}
+    #endif //MEDIAINFO_DEMUX
+
+    //Buffer - File header
+    bool FileHeader_Begin();
+
+    //Buffer - Global
+    void Read_Buffer_Unsynched() {Read_Buffer_Unsynched_OneFramePerFile();}
+    #if MEDIAINFO_SEEK
+    size_t Read_Buffer_Seek (size_t Method, int64u Value, int64u ID) {return Read_Buffer_Seek_OneFramePerFile(Method, Value, ID);}
+    #endif //MEDIAINFO_SEEK
+
+    //Buffer - Per element
+    bool Header_Begin();
+    void Header_Parse();
+    void Data_Parse();
+
+    //Elements
+    void Header();
+    void ImageData();
+    void comments();
+    void compression();
+    void dataWindow();
+    void displayWindow();
+    void pixelAspectRatio();
+
+    //Temp
+    std::string         name;
+    std::string         type;
+    size_t              name_End;
+    size_t              type_End;
+    int64u              ImageData_End;
+};
+
+} //NameSpace
+
+#endif

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Image/File_Gif.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Image/File_Gif.cpp Changed

@@ -1,17 +1,17 @@
 // File_Gif - Info for GIF files
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,14 +22,18 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_GIF_YES)
 //---------------------------------------------------------------------------
 
@@ -83,13 +87,13 @@
     Get_SB (   GCT_Flag,                                        "Global Color Table Flag");
     Get_S1 (3, Resolution,                                      "Color Resolution");
     Get_SB (   Sort,                                            "Sort Flag to Global Color Table");
-    Get_S1 (3, GCT_Size,                                        "Size of Global Color Table"); Param_Info(Ztring::ToZtring((int16u)pow(2.0, 1+GCT_Size)));
+    Get_S1 (3, GCT_Size,                                        "Size of Global Color Table"); Param_Info1(Ztring::ToZtring((int16u)pow(2.0, 1+GCT_Size)));
     BS_End();
     Get_L1 (BackgroundColorIndex,                               "Background Color Index");
     Get_L1 (PixelAspectRatio,                                   "Pixel Aspect Ratio");
     if (GCT_Flag)
         Skip_XX((int16u)pow(2.0, 1+GCT_Size)*3,                 "Global Color Table");
-    Element_End();
+    Element_End0();
 
     FILLING_BEGIN();
         Accept("GIF");
@@ -97,9 +101,11 @@
         Stream_Prepare(Stream_Image);
         Fill(Stream_Image, 0, Image_Width, Width);
         Fill(Stream_Image, 0, Image_Height, Height);
-        Fill(Stream_Image, 0, Image_Format, _T("GIF"));
+        Fill(Stream_Image, 0, Image_Format, __T("GIF"));
         Fill(Stream_Image, 0, Image_Format_Profile, Version);
-        Fill(Stream_Image, 0, Image_Codec, _T("GIF")+Version);
+        Fill(Stream_Image, 0, Image_Codec, __T("GIF")+Version);
+        if (PixelAspectRatio)
+            Fill(Stream_Image, 0, Image_PixelAspectRatio, (((float)PixelAspectRatio)+15)/64);
 
         Finish("GIF");
     FILLING_END();

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Image/File_Gif.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Image/File_Gif.h Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Image/File_Ico.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Image/File_Ico.cpp Changed

@@ -1,31 +1,35 @@
 // File_Ico - Info for Icon files
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_ICO_YES)
 //---------------------------------------------------------------------------
 
@@ -61,7 +65,7 @@
         Fill(Stream_Image, StreamPos_Last, Image_Width, Streams[Pos].Width?Streams[Pos].Width:256);
         Fill(Stream_Image, StreamPos_Last, Image_Height, Streams[Pos].Height?Streams[Pos].Height:256);
         if (Type==1)
-            Fill(Stream_Image, StreamPos_Last, Image_Resolution,Streams[Pos].BitsPerPixel);
+            Fill(Stream_Image, StreamPos_Last, Image_BitDepth, Streams[Pos].BitsPerPixel);
         Fill(Stream_Image, StreamPos_Last, Image_StreamSize, Streams[Pos].Size);
     }
 }

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Image/File_Ico.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Image/File_Ico.h Changed

@@ -1,17 +1,17 @@
 // File_Ico - Info for Icon files
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Image/File_Jpeg.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Image/File_Jpeg.cpp Changed

@@ -1,17 +1,17 @@
 // File_Jpeg - Info for NewFormat files
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -29,21 +29,28 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_JPEG_YES)
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 #include "MediaInfo/Image/File_Jpeg.h"
+#include "MediaInfo/MediaInfo_Config_MediaInfo.h"
 #include "ZenLib/Utils.h"
+#include <vector>
 using namespace ZenLib;
+using namespace std;
 //---------------------------------------------------------------------------
 
 namespace MediaInfoLib
@@ -61,10 +68,18 @@
     const int16u SIZ =0xFF51; //JPEG 2000
     const int16u COD =0xFF52; //JPEG 2000
     const int16u COC =0xFF53; //JPEG 2000
+    const int16u TLM =0xFF55; //JPEG 2000
+    const int16u PLM =0xFF57; //JPEG 2000
+    const int16u PLT =0xFF58; //JPEG 2000
     const int16u QCD =0xFF5C; //JPEG 2000
     const int16u QCC =0xFF5D; //JPEG 2000
     const int16u RGN =0xFF5E; //JPEG 2000
+    const int16u PPM =0xFF60; //JPEG 2000
+    const int16u PPT =0xFF61; //JPEG 2000
+    const int16u CME =0xFF64; //JPEG 2000
     const int16u SOT =0xFF90; //JPEG 2000
+    const int16u SOP =0xFF91; //JPEG 2000
+    const int16u EPH =0xFF92; //JPEG 2000
     const int16u SOD =0xFF93; //JPEG 2000
     const int16u S0F0=0xFFC0;
     const int16u S0F1=0xFFC1;
@@ -131,6 +146,14 @@
     const int16u COM =0xFFFE;
 }
 
+//---------------------------------------------------------------------------
+// Borland C++ does not accept local template
+struct Jpeg_samplingfactor
+{
+    int8u Hi;
+    int8u Vi;
+};
+
 //***************************************************************************
 // Constructor/Destructor
 //***************************************************************************
@@ -138,14 +161,46 @@
 //---------------------------------------------------------------------------
 File_Jpeg::File_Jpeg()
 {
+    //Config
+    #if MEDIAINFO_TRACE
+        Trace_Layers_Update(8); //Stream
+    #endif //MEDIAINFO_TRACE
+    MustSynchronize=true;
+    IsRawStream=true;
+
     //In
     StreamKind=Stream_Image;
+    Interlaced=false;
 
     //Temp
     Height_Multiplier=1;
 }
 
 //***************************************************************************
+// Streams management
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Jpeg::Streams_Accept()
+{
+    if (!IsSub)
+    {
+        Streams_Accept_TestContinuousFileNames();
+
+        Stream_Prepare(Config->File_Names.size()>1?Stream_Video:StreamKind);
+        Fill(StreamKind_Last, StreamPos_Last, "StreamSize", File_Size);
+        if (StreamKind_Last==Stream_Video)
+            Fill(Stream_Video, StreamPos_Last, Video_FrameCount, Config->File_Names.size());
+    }
+    else
+        Stream_Prepare(StreamKind);
+
+    //Configuration
+    Buffer_MaximumSize=64*1024*1024;
+    Frame_Count_NotParsedIncluded=0;
+}
+
+//***************************************************************************
 // Static stuff
 //***************************************************************************
 
@@ -153,30 +208,106 @@
 bool File_Jpeg::FileHeader_Begin()
 {
     //Element_Size
-    if (Buffer_Size<2)
+    if (Buffer_Size<3)
         return false; //Must wait for more data
 
-    if (CC2(Buffer)!=Elements::SOI
-     && CC2(Buffer)!=Elements::SOC)
+    if (Buffer[2]!=0xFF
+     || (CC2(Buffer)!=Elements::SOI
+      && CC2(Buffer)!=Elements::SOC))
     {
         Reject("JPEG");
         return false;
     }
 
+    Accept();
+
     //All should be OK...
     return true;
 }
 
 //***************************************************************************
+// Buffer - Synchro
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_Jpeg::Synchronize()
+{
+    //Synchronizing
+    while(Buffer_Offset+2<=Buffer_Size && (Buffer[Buffer_Offset  ]!=0xFF
+                                        || Buffer[Buffer_Offset+1]==0x00))
+        Buffer_Offset++;
+
+    if (Buffer_Offset+1==Buffer_Size &&  Buffer[Buffer_Offset  ]!=0xFF)
+        Buffer_Offset++;
+
+    if (Buffer_Offset+2>Buffer_Size)
+        return false;
+
+    //Synched is OK
+    Synched=true;
+    return true;
+}
+
+//---------------------------------------------------------------------------
+bool File_Jpeg::Synched_Test()
+{
+    if (SOS_SOD_Parsed)
+        return true; ///No sync after SOD
+
+    //Must have enough buffer for having header
+    if (Buffer_Offset+2>Buffer_Size)
+        return false;
+
+    //Quick test of synchro
+    if (Buffer[Buffer_Offset]!=0xFF)
+    {
+        Synched=false;
+        return true;
+    }
+
+    //We continue
+    return true;
+}
+
+//---------------------------------------------------------------------------
+void File_Jpeg::Synched_Init()
+{
+    SOS_SOD_Parsed=false;
+}
+
+//***************************************************************************
+// Buffer - Global
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Jpeg::Read_Buffer_Unsynched()
+{
+    SOS_SOD_Parsed=false;
+
+    Read_Buffer_Unsynched_OneFramePerFile();
+}
+
+//***************************************************************************
 // Buffer - Per element
 //***************************************************************************
 
 //---------------------------------------------------------------------------
 void File_Jpeg::Header_Parse()
 {
+    if (SOS_SOD_Parsed)
+    {
+        Header_Fill_Code(0, "Data");
+        if (!Header_Parser_Fill_Size())
+        {
+            Element_WaitForMoreData();
+            return;
+        }
+        return;
+    }
+
     //Parsing
     int16u code, size;
-    Get_B2 (code,                                               "code");
+    Get_B2 (code,                                               "Marker");
     switch (code)
     {
         case Elements::TEM :
@@ -193,7 +324,7 @@
         case Elements::SOI  :
         case Elements::EOI  :
                     size=0; break;
-        default   : Get_B2 (size,                                  "size");
+        default   : Get_B2 (size,                               "Fl - Frame header length");
     }
 
     //Filling
@@ -202,12 +333,43 @@
 }
 
 //---------------------------------------------------------------------------
+bool File_Jpeg::Header_Parser_Fill_Size()
+{
+    //Look for next Sync word
+    if (Buffer_Offset_Temp==0) //Buffer_Offset_Temp is not 0 if Header_Parse_Fill_Size() has already parsed first frames
+        Buffer_Offset_Temp=Buffer_Offset;
+    while (Buffer_Offset_Temp+2<=Buffer_Size
+        && CC2(Buffer+Buffer_Offset_Temp)!=Elements::EOI)
+        Buffer_Offset_Temp++;
+
+    //Must wait more data?
+    if (Buffer_Offset_Temp+2>Buffer_Size)
+    {
+        if (/*FrameIsAlwaysComplete ||*/ File_Offset+Buffer_Size>=File_Size)
+            Buffer_Offset_Temp=Buffer_Size; //We are sure that the next bytes are a start
+        else
+            return false;
+    }
+
+    //OK, we continue
+    Header_Fill_Size(Buffer_Offset_Temp-Buffer_Offset);
+    Buffer_Offset_Temp=0;
+    return true;
+}
+
+//---------------------------------------------------------------------------
 void File_Jpeg::Data_Parse()
 {
     #define CASE_INFO(_NAME, _DETAIL) \
-        case Elements::_NAME : Element_Info(#_NAME); Element_Info(_DETAIL); _NAME(); break;
+        case Elements::_NAME : Element_Info1(#_NAME); Element_Info1(_DETAIL); _NAME(); break;
 
     //Parsing
+    if (SOS_SOD_Parsed)
+    {
+        Skip_XX(Element_Size,                                   "Data");
+        SOS_SOD_Parsed=false;
+        return;
+    }
     switch (Element_Code)
     {
         CASE_INFO(TEM ,                                         "TEM");
@@ -215,10 +377,18 @@
         CASE_INFO(SIZ ,                                         "Image and tile size"); //JPEG 2000
         CASE_INFO(COD ,                                         "Coding style default"); //JPEG 2000
         CASE_INFO(COC ,                                         "Coding style component"); //JPEG 2000
+        CASE_INFO(TLM ,                                         "Tile-part lengths, main header"); //JPEG 2000
+        CASE_INFO(PLM ,                                         "Packet length, main header"); //JPEG 2000
+        CASE_INFO(PLT ,                                         "Packet length, tile-part header"); //JPEG 2000
         CASE_INFO(QCD ,                                         "Quantization default"); //JPEG 2000
         CASE_INFO(QCC ,                                         "Quantization component "); //JPEG 2000
         CASE_INFO(RGN ,                                         "Region-of-interest"); //JPEG 2000
+        CASE_INFO(PPM ,                                         "Packed packet headers, main header"); //JPEG 2000
+        CASE_INFO(PPT ,                                         "Packed packet headers, tile-part header"); //JPEG 2000
+        CASE_INFO(CME ,                                         "Comment and extension"); //JPEG 2000
         CASE_INFO(SOT ,                                         "Start of tile-part"); //JPEG 2000
+        CASE_INFO(SOP ,                                         "Start of packet"); //JPEG 2000
+        CASE_INFO(EPH ,                                         "End of packet header"); //JPEG 2000
         CASE_INFO(SOD ,                                         "Start of data"); //JPEG 2000
         CASE_INFO(S0F0,                                         "Baseline DCT (Huffman)");
         CASE_INFO(S0F1,                                         "Extended sequential DCT (Huffman)");
@@ -283,7 +453,7 @@
         CASE_INFO(JPGC,                                         "JPG");
         CASE_INFO(JPGD,                                         "JPG");
         CASE_INFO(COM ,                                         "Comment");
-        default : Element_Info("Reserved");
+        default : Element_Info1("Reserved");
                   Skip_XX(Element_Size,                         "Data");
     }
 }
@@ -296,6 +466,9 @@
 void File_Jpeg::SIZ()
 {
     //Parsing
+    vector<float> SamplingFactors;
+    vector<int8u> BitDepths;
+    int8u SamplingFactors_Max=0;
     int32u Xsiz, Ysiz;
     int16u Count;
     Skip_B2(                                                    "Rsiz - Capability of the codestream");
@@ -310,27 +483,64 @@
     Get_B2 (Count,                                              "Components and initialize related arrays");
     for (int16u Pos=0; Pos<Count; Pos++)
     {
-        Element_Begin("Initialize related array");
+        Element_Begin1("Initialize related array");
+        int8u BitDepth, compSubsX, compSubsY;
         BS_Begin();
         Skip_SB(                                                "Signed");
-        Info_S1(7, BitDepth,                                    "BitDepth"); Element_Info(BitDepth);
+        Get_S1 (7, BitDepth,                                    "BitDepth"); Param_Info1(1+BitDepth); Element_Info1(1+BitDepth);
         BS_End();
-        Skip_B1(                                                "compSubsX");
-        Skip_B1(                                                "compSubsY");
-        Element_End();
+        Get_B1 (   compSubsX,                                   "compSubsX"); Element_Info1(compSubsX);
+        Get_B1 (   compSubsY,                                   "compSubsY"); Element_Info1(compSubsY);
+        Element_End0();
+
+        //Filling list of HiVi
+        if (compSubsX)
+        {
+            SamplingFactors.push_back(((float)compSubsY)/compSubsX);
+            if (((float)compSubsY)/compSubsX>SamplingFactors_Max)
+                SamplingFactors_Max=(int8u)((float)compSubsY)/compSubsX;
+        }
+
+        if (BitDepths.empty() || BitDepth!=BitDepths[0])
+            BitDepths.push_back(BitDepth);
     }
 
     FILLING_BEGIN_PRECISE();
-        Accept("JPEG 2000");
-
-        if (Count_Get(StreamKind)==0)
-            Stream_Prepare(StreamKind);
-        Fill(StreamKind, 0, Fill_Parameter(StreamKind, Generic_Format), StreamKind==Stream_Image?"JPEG 2000":"M-JPEG 2000");
-        Fill(StreamKind, 0, Fill_Parameter(StreamKind, Generic_Codec), StreamKind==Stream_Image?"JPEG 2000":"M-JPEG 2000");
-        if (StreamKind==Stream_Image)
-            Fill(Stream_Image, 0, Image_Codec_String, "JPEG 2000", Unlimited, true, true); //To Avoid automatic filling
-        Fill(StreamKind, 0, StreamKind==Stream_Image?(size_t)Image_Width:(size_t)Video_Width, Xsiz);
-        Fill(StreamKind, 0, StreamKind==Stream_Image?(size_t)Image_Height:(size_t)Video_Height, Ysiz);
+        if (Frame_Count==0 && Field_Count==0)
+        {
+            Accept("JPEG 2000");
+
+            if (Count_Get(StreamKind_Last)==0)
+                Stream_Prepare(StreamKind_Last);
+            Fill(StreamKind_Last, 0, Fill_Parameter(StreamKind_Last, Generic_Format), "JPEG 2000");
+            Fill(StreamKind_Last, 0, Fill_Parameter(StreamKind_Last, Generic_Codec), "JPEG 2000");
+            if (StreamKind_Last==Stream_Image)
+                Fill(Stream_Image, 0, Image_Codec_String, "JPEG 2000", Unlimited, true, true); //To Avoid automatic filling
+            Fill(StreamKind_Last, 0, StreamKind_Last==Stream_Image?(size_t)Image_Width:(size_t)Video_Width, Xsiz);
+            Fill(StreamKind_Last, 0, StreamKind_Last==Stream_Image?(size_t)Image_Height:(size_t)Video_Height, Ysiz*(Interlaced?2:1)); //If image is from interlaced content, must multiply height by 2
+
+            if (BitDepths.size()==1)
+                Fill(StreamKind_Last, 0, Fill_Parameter(StreamKind_Last, Generic_BitDepth), 1+BitDepths[0]);
+
+            //Chroma subsampling
+            if (SamplingFactors_Max)
+                while (SamplingFactors_Max<4)
+                {
+                    for (size_t Pos=0; Pos<SamplingFactors.size(); Pos++)
+                        SamplingFactors[Pos]*=2;
+                    SamplingFactors_Max*=2;
+                }
+            while (SamplingFactors.size()<3)
+                SamplingFactors.push_back(0);
+            Ztring ChromaSubsampling;
+            for (size_t Pos=0; Pos<SamplingFactors.size(); Pos++)
+                ChromaSubsampling+=Ztring::ToZtring(SamplingFactors[Pos], 0)+__T(':');
+            if (!ChromaSubsampling.empty())
+            {
+                ChromaSubsampling.resize(ChromaSubsampling.size()-1);
+                Fill(StreamKind_Last, 0, "ChromaSubsampling", ChromaSubsampling);
+            }
+        }
     FILLING_END();
 }
 
@@ -348,8 +558,8 @@
     Skip_B1(                                                    "Number of decomposition levels");
     Skip_B1(                                                    "Progression order");
     Get_B2 (Levels,                                             "Number of layers");
-    Info_B1(DimX,                                               "Code-blocks dimensions X (2^(n+2))"); Param_Info(1<<(DimX+2), " pixels");
-    Info_B1(DimY,                                               "Code-blocks dimensions Y (2^(n+2))"); Param_Info(1<<(DimY+2), " pixels");
+    Info_B1(DimX,                                               "Code-blocks dimensions X (2^(n+2))"); Param_Info2(1<<(DimX+2), " pixels");
+    Info_B1(DimY,                                               "Code-blocks dimensions Y (2^(n+2))"); Param_Info2(1<<(DimY+2), " pixels");
     Get_B1 (Style2,                                             "Style of the code-block coding passes");
         Skip_Flags(Style, 0,                                    "Selective arithmetic coding bypass");
         Skip_Flags(Style, 1,                                    "MQ states for all contexts");
@@ -367,21 +577,24 @@
         BS_End();
         for (int16u Pos=0; Pos<Levels; Pos++)
         {
-            Element_Begin("Decomposition level");
+            Element_Begin1("Decomposition level");
             BS_Begin();
             Skip_S1(4,                                          "decomposition level width");
             Skip_S1(4,                                          "decomposition level height");
             BS_End();
-            Element_End();
+            Element_End0();
         }
     }
 
     FILLING_BEGIN();
-        switch (MultipleComponentTransform)
+        if (Frame_Count==0 && Field_Count==0)
         {
-            case 0x01 : Fill(Stream_Image, 0, Image_Format_Profile, "Reversible"); break;
-            case 0x02 : Fill(Stream_Image, 0, Image_Format_Profile, "Irreversible"); break;
-            default   : ;
+            switch (MultipleComponentTransform)
+            {
+                case 0x01 : Fill(StreamKind_Last, 0, "Compression_Mode", "Lossless"); break;
+                case 0x02 : Fill(StreamKind_Last, 0, "Compression_Mode", "Lossy"); break;
+                default   : ;
+            }
         }
     FILLING_END();
 }
@@ -397,43 +610,100 @@
 //---------------------------------------------------------------------------
 void File_Jpeg::SOD()
 {
-    FILLING_BEGIN_PRECISE();
+    SOS_SOD_Parsed=true;
+    if (Interlaced)
+        Field_Count++;
+    if (!Interlaced && Field_Count%2==0)
+    {
+        Frame_Count++;
+        if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+            Frame_Count_NotParsedIncluded++;
+    }
+    if (Status[IsFilled])
+        Fill();
+    if (Config->ParseSpeed<1.0)
         Finish("JPEG 2000"); //No need of more
-    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
 void File_Jpeg::SOF_()
 {
     //Parsing
+    vector<Jpeg_samplingfactor> SamplingFactors;
     int16u Height, Width;
     int8u  Resolution, Count;
-    Get_B1 (Resolution,                                         "Resolution");
-    Get_B2 (Height,                                             "Height");
-    Get_B2 (Width,                                              "Width");
-    Get_B1 (Count,                                              "Number of image components in frame");
+    Get_B1 (Resolution,                                         "P - Sample precision");
+    Get_B2 (Height,                                             "Y - Number of lines");
+    Get_B2 (Width,                                              "X - Number of samples per line");
+    Get_B1 (Count,                                              "Nf - Number of image components in frame");
     for (int8u Pos=0; Pos<Count; Pos++)
     {
-        Skip_B1(                                                "Identifier");
-        Skip_B1(                                                "sampling factor");
-        Skip_B1(                                                "Quantization table destination selector");
+        Jpeg_samplingfactor SamplingFactor;
+        Element_Begin1("Component");
+        Info_B1(Ci,                                             "Ci - Component identifier"); Element_Info1(Ci);
+        BS_Begin();
+        Get_S1 (4, SamplingFactor.Hi,                           "Hi - Horizontal sampling factor"); Element_Info1(SamplingFactor.Hi);
+        Get_S1 (4, SamplingFactor.Vi,                           "Vi - Vertical sampling factor"); Element_Info1(SamplingFactor.Vi);
+        BS_End();
+        Skip_B1(                                                "Tqi - Quantization table destination selector");
+        Element_End0();
+
+        //Filling list of HiVi
+        SamplingFactors.push_back(SamplingFactor);
     }
 
     FILLING_BEGIN_PRECISE();
-        Accept("JPEG");
-
-        if (Count_Get(StreamKind)==0)
-            Stream_Prepare(StreamKind);
-        Fill(StreamKind, 0, StreamKind==Stream_Image?(size_t)Image_Format:(size_t)Video_Format, StreamKind==Stream_Image?"JPEG":"M-JPEG");
-        Fill(StreamKind, 0, StreamKind==Stream_Image?(size_t)Image_Codec:(size_t)Video_Codec, StreamKind==Stream_Image?"JPEG":"M-JPEG");
-        if (StreamKind==Stream_Image)
-            Fill(Stream_Image, 0, Image_Codec_String, "JPEG", Unlimited, true, true); //To Avoid automatic filling
-        if (StreamKind==Stream_Video)
-            Fill(Stream_Video, 0, Video_InternetMediaType, "video/JPEG", Unlimited, true, true);
-        Fill(Stream_Video, 0, Video_ColorSpace, "YUV");
-        Fill(StreamKind, 0, Fill_Parameter(StreamKind, Generic_Resolution), Resolution);
-        Fill(StreamKind, 0, StreamKind==Stream_Image?(size_t)Image_Height:(size_t)Video_Height, Height*Height_Multiplier);
-        Fill(StreamKind, 0, StreamKind==Stream_Image?(size_t)Image_Width:(size_t)Video_Width, Width);
+        if (Frame_Count==0 && Field_Count==0)
+        {
+            Accept("JPEG");
+
+            if (Count_Get(StreamKind_Last)==0)
+                Stream_Prepare(StreamKind_Last);
+            Fill(StreamKind_Last, 0, Fill_Parameter(StreamKind_Last, Generic_Format), "JPEG");
+            Fill(StreamKind_Last, 0, Fill_Parameter(StreamKind_Last, Generic_Codec), "JPEG");
+            if (StreamKind_Last==Stream_Image)
+                Fill(Stream_Image, 0, Image_Codec_String, "JPEG", Unlimited, true, true); //To Avoid automatic filling
+            if (StreamKind_Last==Stream_Video)
+                Fill(Stream_Video, 0, Video_InternetMediaType, "video/JPEG", Unlimited, true, true);
+            Fill(StreamKind_Last, 0, "ColorSpace", "YUV");
+            Fill(StreamKind_Last, 0, Fill_Parameter(StreamKind_Last, Generic_BitDepth), Resolution);
+            Fill(StreamKind_Last, 0, "Height", Height*Height_Multiplier);
+            Fill(StreamKind_Last, 0, "Width", Width);
+
+            //Chroma subsampling
+            if (SamplingFactors.size()==3 && SamplingFactors[1].Hi==1 && SamplingFactors[2].Hi==1 && SamplingFactors[1].Vi==1 && SamplingFactors[2].Vi==1)
+            {
+                string ChromaSubsampling;
+                switch (SamplingFactors[0].Hi)
+                {
+                    case 1 :
+                            switch (SamplingFactors[0].Vi)
+                            {
+                                case 1 : ChromaSubsampling="4:4:4"; break;
+                                default: ;
+                            }
+                            break;
+                    case 2 :
+                            switch (SamplingFactors[0].Vi)
+                            {
+                                case 1 : ChromaSubsampling="4:2:2"; break;
+                                case 2 : ChromaSubsampling="4:2:0"; break;
+                                default: ;
+                            }
+                            break;
+                    case 4 :
+                            switch (SamplingFactors[0].Vi)
+                            {
+                                case 1 : ChromaSubsampling="4:1:1"; break;
+                                default: ;
+                            }
+                            break;
+                    default: ;
+                }
+                if (!ChromaSubsampling.empty())
+                    Fill(StreamKind_Last, 0, "ChromaSubsampling", ChromaSubsampling);
+            }
+        }
     FILLING_END();
 }
 
@@ -453,6 +723,18 @@
     Skip_B1(                                                    "Successive approximation bit position");
 
     FILLING_BEGIN_PRECISE();
+    SOS_SOD_Parsed=true;
+    if (Interlaced)
+        Field_Count++;
+    if (!Interlaced && Field_Count%2==0)
+    {
+        Frame_Count++;
+        if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+            Frame_Count_NotParsedIncluded++;
+    }
+    if (Status[IsFilled])
+        Fill();
+    if (Config->ParseSpeed<1.0)
         Finish("JPEG"); //No need of more
     FILLING_END();
 }
@@ -477,7 +759,7 @@
 {
     //Parsing
     int8u  FieldOrder=(int8u)-1;
-    Element_Begin("AVI1");
+    Element_Begin1("AVI1");
         if (Element_Size==16-4)
         {
             Get_B1 (FieldOrder,                                     "Field Order");
@@ -490,15 +772,11 @@
             Skip_B4(                                                "Size of 1st Field");
             Skip_B4(                                                "Size of 2nd Field");
         }
-    Element_End();
+    Element_End0();
 
     FILLING_BEGIN();
-        if (!Status[IsAccepted])
+        if (Frame_Count==0 && Field_Count==0)
         {
-            Accept("JPEG");
-            if (Count_Get(Stream_Video)==0)
-                Stream_Prepare(Stream_Video);
-
             switch (FieldOrder)
             {
                 case 0x00 : Fill(Stream_Video, 0, Video_Interlacement, "PPF"); Fill(Stream_Video, 0, Video_ScanType, "Progressive"); break;
@@ -515,7 +793,7 @@
 {
     //Parsing
     Skip_B1(                                                    "Zero");
-    Element_Begin("JFIF");
+    Element_Begin1("JFIF");
         int16u Width, Height;
         int8u  Unit, ThumbailX, ThumbailY;
         Skip_B2(                                                "Version");
@@ -525,53 +803,53 @@
         Get_B1 (ThumbailX,                                      "Xthumbail");
         Get_B1 (ThumbailY,                                      "Ythumbail");
         Skip_XX(3*ThumbailX*ThumbailY,                          "RGB Thumbail");
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
 void File_Jpeg::APP0_JFFF()
 {
     Skip_B1(                                                    "Zero");
-    Element_Begin("Extension");
+    Element_Begin1("Extension");
         Skip_B1(                                                "extension_code"); //0x10 Thumbnail coded using JPEG, 0x11 Thumbnail stored using 1 byte/pixel, 0x13 Thumbnail stored using 3 bytes/pixel
         if (Element_Size>Element_Offset)
             Skip_XX(Element_Size-Element_Offset,                "extension_data");
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
 void File_Jpeg::APP0_JFFF_JPEG()
 {
     //Parsing
-    Element_Begin("Thumbail JPEG");
+    Element_Begin1("Thumbail JPEG");
         if (Element_Size>Element_Offset)
             Skip_XX(Element_Size-Element_Offset,                "Data");
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
 void File_Jpeg::APP0_JFFF_1B()
 {
     //Parsing
-    Element_Begin("Thumbail 1 byte per pixel");
+    Element_Begin1("Thumbail 1 byte per pixel");
         int8u  ThumbailX, ThumbailY;
         Get_B1 (ThumbailX,                                      "Xthumbail");
         Get_B1 (ThumbailY,                                      "Ythumbail");
         Skip_XX(768,                                            "Palette");
         Skip_XX(ThumbailX*ThumbailY,                            "Thumbail");
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
 void File_Jpeg::APP0_JFFF_3B()
 {
     //Parsing
-    Element_Begin("Thumbail 3 bytes per pixel");
+    Element_Begin1("Thumbail 3 bytes per pixel");
         int8u  ThumbailX, ThumbailY;
         Get_B1 (ThumbailX,                                      "Xthumbail");
         Get_B1 (ThumbailY,                                      "Ythumbail");
         Skip_XX(3*ThumbailX*ThumbailY,                          "RGB Thumbail");
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
@@ -584,7 +862,7 @@
     switch (Name)
     {
         case 0x457869660000LL : APP1_EXIF(); break; //"Exif\0\0"
-        default               : Skip_XX(Element_Size,           "Data");
+        default               : Skip_XX(Element_Size-Element_Offset, "Data");
     }
 }
 
@@ -592,14 +870,14 @@
 void File_Jpeg::APP1_EXIF()
 {
     //Parsing
-    Element_Begin("Exif");
+    Element_Begin1("Exif");
         int32u Alignment;
         Get_C4(Alignment,                                       "Alignment");
         if (Alignment==0x49492A00)
             Skip_B4(                                            "First_IFD");
         if (Alignment==0x4D4D2A00)
             Skip_L4(                                            "First_IFD");
-    Element_End();
+    Element_End0();
 }
 
 } //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Image/File_Jpeg.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Image/File_Jpeg.h Changed

@@ -1,17 +1,17 @@
 // File_Jpeg - Info for JPEG files
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -42,16 +42,37 @@
 public :
     //In
     stream_t StreamKind;
+    bool     Interlaced;
 
     //Constructor/Destructor
     File_Jpeg();
 
 private :
+    //Streams management
+    void Streams_Accept();
+
     //Buffer - File header
     bool FileHeader_Begin();
 
+    //Buffer - Synchro
+    bool Synchronize();
+    bool Synched_Test();
+    void Synched_Init();
+
+    //Buffer - Demux
+    #if MEDIAINFO_DEMUX
+    bool Demux_UnpacketizeContainer_Test() {return Demux_UnpacketizeContainer_Test_OneFramePerFile();}
+    #endif //MEDIAINFO_DEMUX
+
+    //Buffer - Global
+    void Read_Buffer_Unsynched();
+    #if MEDIAINFO_SEEK
+    size_t Read_Buffer_Seek (size_t Method, int64u Value, int64u ID) {return Read_Buffer_Seek_OneFramePerFile(Method, Value, ID);}
+    #endif //MEDIAINFO_SEEK
+
     //Buffer - Per element
     void Header_Parse();
+    bool Header_Parser_Fill_Size();
     void Data_Parse();
 
     //Elements
@@ -60,10 +81,18 @@
     void SIZ ();
     void COD ();
     void COC () {Skip_XX(Element_Size, "Data");}
+    void TLM () {Skip_XX(Element_Size, "Data");}
+    void PLM () {Skip_XX(Element_Size, "Data");}
+    void PLT () {Skip_XX(Element_Size, "Data");}
     void QCD ();
     void QCC () {Skip_XX(Element_Size, "Data");}
     void RGN () {Skip_XX(Element_Size, "Data");}
+    void PPM () {Skip_XX(Element_Size, "Data");}
+    void PPT () {Skip_XX(Element_Size, "Data");}
+    void CME () {Skip_XX(Element_Size, "Data");}
     void SOT () {Skip_XX(Element_Size, "Data");}
+    void SOP () {Skip_XX(Element_Size, "Data");}
+    void EPH () {Skip_XX(Element_Size, "Data");}
     void SOD ();
     void SOF_();
     void S0F0() {SOF_();};
@@ -139,6 +168,7 @@
 
     //Temp
     int8u Height_Multiplier;
+    bool  SOS_SOD_Parsed;
 };
 
 } //NameSpace

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Image/File_Pcx.cpp Added

@@ -0,0 +1,150 @@
+// File_Pcx - Info for PCX files
+// Copyright (C) 2012-2012 Lionel Duchateau, kurtnoise@free.fr
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+// PCX - Format
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// From http://courses.engr.illinois.edu/ece390/books/labmanual/graphics-pcx.html
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_PCX_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Image/File_Pcx.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Infos
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+const char* Pcx_VersionInfo(int16u Version)
+{
+    switch(Version)
+    {
+        case 0 : return "Paintbrush v2.5";
+        case 2 : return "Paintbrush v2.8 with palette information";
+        case 3 : return "Paintbrush v2.8 without palette information";
+        case 4 : return "Paintbrush/Windows";
+        case 5 : return "Paintbrush v3.0+";
+        default: return "";
+    }
+}
+
+//***************************************************************************
+// Static stuff
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_Pcx::FileHeader_Begin()
+{
+    //Element_Size
+    if (Buffer_Size<130) //Size of the header
+        return false; //Must wait for more data
+
+    if (Buffer[0]!=0x0A
+     || Buffer[1]>0x05
+     || Buffer[2]!=0x01
+     || !(Buffer[3]==1 || Buffer[3]==4 || Buffer[3]==8 || Buffer[3]==24))
+    {
+        Reject("PCX");
+        return false;
+    }
+
+    //All should be OK...
+    return true;
+}
+
+//***************************************************************************
+// File Header Information
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Pcx::Read_Buffer_Continue()
+{
+    //Parsing
+    int16u XMin, YMin, XMax, YMax, HorDPI, VertDPI, BytesPerLine, PaletteType, HScrSize, VScrSize;
+    int8u Manufacturer, Version, EncodingScheme, BitsPerPixel, ColorPlanes;
+
+    Get_L1 (Manufacturer,                                       "Manufacturer");
+    Get_L1 (Version,                                            "Version"); // 0,2,3,4,5
+    Get_L1 (EncodingScheme,                                     "EncodingScheme"); // RLE=1
+    Get_L1 (BitsPerPixel,                                       "Bits Per Pixel"); // 1,4,8,24
+    Get_L2 (XMin,                                               "Left margin of image");
+    Get_L2 (YMin,                                               "Upper margin of image");
+    Get_L2 (XMax,                                               "Right margin of image");
+    Get_L2 (YMax,                                               "Lower margin of image");
+    Get_L2 (HorDPI,                                             "Horizontal Resolution");
+    Get_L2 (VertDPI,                                            "Vertical Resolution");
+    Skip_XX(48,                                                 "Palette");
+    Skip_L1(                                                    "Reserved");
+    Get_L1 (ColorPlanes,                                        "ColorPlanes");
+    Get_L2 (BytesPerLine,                                       "BytesPerLine");
+    Get_L2 (PaletteType,                                        "PaletteType");
+    Get_L2 (HScrSize,                                           "Horizontal Screen Size");
+    Get_L2 (VScrSize,                                           "Vertical Screen Size");
+    Skip_XX(56,                                                 "Filler");
+
+
+    FILLING_BEGIN();
+        //Integrity tests
+        if (XMax<=XMin
+         || YMax<=YMin
+         || BytesPerLine<XMax-XMin)
+        {
+            Reject("PCX");
+            return;
+        }
+
+        Accept("PCX");
+        Stream_Prepare(Stream_Image);
+        Fill(Stream_Image, 0, Image_Format, "PCX");
+        Fill(Stream_Image, 0, Image_Format_Version, Pcx_VersionInfo(Version));
+        Fill(Stream_Image, 0, Image_Width, XMax-XMin);
+        Fill(Stream_Image, 0, Image_Height, YMax-YMin);
+        Fill(Stream_Image, 0, Image_BitDepth, BitsPerPixel);
+        Fill(Stream_Image, 0, "DPI", Ztring::ToZtring(VertDPI) + __T(" x ") + Ztring::ToZtring(HorDPI));
+        Finish("PCX");
+    FILLING_END();
+}
+
+
+} //NameSpace
+
+#endif

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Image/File_Pcx.h Added

@@ -0,0 +1,54 @@
+// File_Pcx - Info for CX files
+// Copyright (C) 2012-2012 Lionel Duchateau, kurtnoise@free.fr
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Information about PCX files
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_File_PcxH
+#define MediaInfo_File_PcxH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Class File_Pcx
+//***************************************************************************
+
+class File_Pcx : public File__Analyze
+{
+protected :
+    //Buffer - File header
+    bool FileHeader_Begin();
+
+    //Elements
+    void Read_Buffer_Continue();
+};
+
+} //NameSpace
+
+#endif
+

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Image/File_Png.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Image/File_Png.cpp Changed

@@ -1,17 +1,17 @@
 // File_Png - Info for PNG files
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -26,19 +26,24 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_PNG_YES)
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 #include "MediaInfo/Image/File_Png.h"
+#include "MediaInfo/MediaInfo_Config_MediaInfo.h"
 //---------------------------------------------------------------------------
 
 namespace MediaInfoLib
@@ -76,7 +81,47 @@
 }
 
 //***************************************************************************
-// Static stuff
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File_Png::File_Png()
+{
+    //Config
+    #if MEDIAINFO_TRACE
+        Trace_Layers_Update(8); //Stream
+    #endif //MEDIAINFO_TRACE
+    IsRawStream=true;
+
+    //Temp
+    Signature_Parsed=false;
+}
+
+//***************************************************************************
+// Streams management
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Png::Streams_Accept()
+{
+    if (!IsSub)
+    {
+        Streams_Accept_TestContinuousFileNames();
+
+        Stream_Prepare((Config->File_Names.size()>1 || Config->File_IsReferenced_Get())?Stream_Video:Stream_Image);
+        Fill(StreamKind_Last, StreamPos_Last, "StreamSize", File_Size);
+        if (StreamKind_Last==Stream_Video)
+            Fill(Stream_Video, StreamPos_Last, Video_FrameCount, Config->File_Names.size());
+    }
+    else
+        Stream_Prepare(StreamKind_Last);
+
+    //Configuration
+    Frame_Count_NotParsedIncluded=0;
+}
+
+//***************************************************************************
+// Header
 //***************************************************************************
 
 //---------------------------------------------------------------------------
@@ -86,64 +131,61 @@
     if (Buffer_Size<8)
         return false; //Must wait for more data
 
-    if (CC4(Buffer+4)!=0x0D0A1A0A)
+    if (CC4(Buffer+4)!=0x0D0A1A0A) //Byte order
     {
         Reject("PNG");
         return false;
     }
 
-    //All should be OK...
-    return true;
-}
+    switch (CC4(Buffer)) //Signature
+    {
+        case 0x89504E47 :
+            Accept("PNG");
 
-//***************************************************************************
-// Buffer - File header
-//***************************************************************************
+            Fill(Stream_General, 0, General_Format, "PNG");
+            Fill(StreamKind_Last, 0, Fill_Parameter(StreamKind_Last, Generic_Format), "PNG");
+            Fill(StreamKind_Last, 0, Fill_Parameter(StreamKind_Last, Generic_Codec), "PNG");
 
-//---------------------------------------------------------------------------
-void File_Png::FileHeader_Parse()
-{
-    //Parsing
-    int32u Signature;
-    Get_B4 (Signature,                                          "Signature");
-    Skip_B4(                                                    "ByteOrder");
+            break;
 
-    FILLING_BEGIN();
-        switch (Signature)
-        {
-            case 0x89504E47 :
-                Accept("PNG");
+        case 0x8A4E4E47 :
+            Accept("PNG");
 
-                Fill(Stream_General, 0, General_Format, "PNG");
+            Fill(Stream_General, 0, General_Format, "MNG");
+            Fill(StreamKind_Last, 0, Fill_Parameter(StreamKind_Last, Generic_Format), "MNG");
+            Fill(StreamKind_Last, 0, Fill_Parameter(StreamKind_Last, Generic_Codec), "MNG");
 
-                Stream_Prepare(Stream_Image);
+            Finish("PNG");
+            break;
 
-                break;
+        case 0x8B4A4E47 :
+            Accept("PNG");
 
-            case 0x8A4E4E47 :
-                Accept("PNG");
+            Fill(Stream_General, 0, General_Format, "JNG");
+            Fill(StreamKind_Last, 0, Fill_Parameter(StreamKind_Last, Generic_Format), "JNG");
+            Fill(StreamKind_Last, 0, Fill_Parameter(StreamKind_Last, Generic_Codec), "JNG");
 
-                Stream_Prepare(Stream_Image);
-                Fill(Stream_Image, 0, Image_Codec, "MNG");
-                Fill(Stream_Image, 0, Image_Format, "MNG");
+            Finish("PNG");
+            break;
 
-                Finish("PNG");
-                break;
+        default:
+            Reject("PNG");
+    }
 
-            case 0x8B4A4E47 :
-                Accept("PNG");
+    //All should be OK...
+    return true;
+}
 
-                Stream_Prepare(Stream_Image);
-                Fill(Stream_Image, 0, Image_Format, "JNG");
-                Fill(Stream_Image, 0, Image_Codec, "JNG");
+//***************************************************************************
+// Buffer - Global
+//***************************************************************************
 
-                Finish("PNG");
-                break;
+//---------------------------------------------------------------------------
+void File_Png::Read_Buffer_Unsynched()
+{
+    Signature_Parsed=false;
 
-            default:
-                Reject("PNG");
-        }
-    FILLING_END();
+    Read_Buffer_Unsynched_OneFramePerFile();
 }
 
 //***************************************************************************
@@ -153,6 +195,15 @@
 //---------------------------------------------------------------------------
 void File_Png::Header_Parse()
 {
+    if (!Signature_Parsed)
+    {
+        //Filling
+        Header_Fill_Size(8);
+        Header_Fill_Code(0, "File header");
+
+        return;
+    }
+
     //Parsing
     int32u Length, Chunk_Type;
     Get_B4 (Length,                                             "Length");
@@ -166,10 +217,16 @@
 //---------------------------------------------------------------------------
 void File_Png::Data_Parse()
 {
+    if (!Signature_Parsed)
+    {
+        Signature();
+        return;
+    }
+
     Element_Size-=4; //For CRC
 
     #define CASE_INFO(_NAME, _DETAIL) \
-        case Elements::_NAME : Element_Info(_DETAIL); _NAME(); break;
+        case Elements::_NAME : Element_Info1(_DETAIL); _NAME(); break;
 
     //Parsing
     switch (Element_Code)
@@ -190,6 +247,25 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
+void File_Png::Signature()
+{
+    //Parsing
+    Skip_B4(                                                    "Signature");
+    Skip_B4(                                                    "ByteOrder");
+
+    Frame_Count++;
+    if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+        Frame_Count_NotParsedIncluded++;
+    Signature_Parsed=true;
+}
+
+//---------------------------------------------------------------------------
+void File_Png::IEND()
+{
+    Signature_Parsed=false;
+}
+
+//---------------------------------------------------------------------------
 void File_Png::IHDR()
 {
     //Parsing
@@ -198,14 +274,14 @@
     Get_B4 (Width,                                              "Width");
     Get_B4 (Height,                                             "Height");
     Get_B1 (Bit_depth,                                          "Bit depth");
-    Get_B1 (Colour_type,                                        "Colour type"); Param_Info(Png_Colour_type(Colour_type));
+    Get_B1 (Colour_type,                                        "Colour type"); Param_Info1(Png_Colour_type(Colour_type));
     Get_B1 (Compression_method,                                 "Compression method");
     Skip_B1(                                                    "Filter method");
     Get_B1 (Interlace_method,                                   "Interlace method");
 
     FILLING_BEGIN_PRECISE();
-        Fill(Stream_Image, 0, Image_Width, Width);
-        Fill(Stream_Image, 0, Image_Height, Height);
+        Fill(StreamKind_Last, 0, "Width", Width);
+        Fill(StreamKind_Last, 0, "Height", Height);
         int8u Resolution;
         switch (Colour_type)
         {
@@ -217,12 +293,11 @@
             default: Resolution=0;
         }
         if (Resolution)
-            Fill(Stream_Image, 0, Image_Resolution, Resolution);
+            Fill(StreamKind_Last, 0, "BitDepth", Resolution);
         switch (Compression_method)
         {
             case 0 :
-                Fill(Stream_Image, 0, Image_Format, "LZ77");
-                Fill(Stream_Image, 0, Image_Codec,  "LZ77 variant");
+                Fill(StreamKind_Last, 0, "Format_Compression", "LZ77");
                 break;
             default: ;
         }
@@ -235,7 +310,10 @@
             default: ;
         }
 
-        Finish("PNG");
+    if (Status[IsFilled])
+        Fill();
+    if (Config->ParseSpeed<1.0)
+        Finish("PNG"); //No need of more
     FILLING_END();
 }

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Image/File_Png.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Image/File_Png.h Changed

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Image/File_Psd.cpp Added

@@ -0,0 +1,129 @@
+// File_Psd - Info for PSD files
+// Copyright (C) 2012-2012 Lionel Duchateau, kurtnoise@free.fr
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+// PSD - Format
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// From http://www.adobe.com/devnet-apps/photoshop/fileformatashtml/PhotoshopFileFormats.htm
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_PSD_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Image/File_Psd.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Infos
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+const char* Psd_ColorMode(int16u ColorMode)
+{
+    switch(ColorMode)
+    {
+        case 0 : return "Bitmap";
+        case 1 : return "Grayscale";
+        case 2 : return "Indexed";
+        case 3 : return "RGB";
+        case 4 : return "CMYK";
+        case 7 : return "Multichannel";
+        case 8 : return "Duotone";
+        case 9 : return "Lab";
+        default: return "";
+    }
+}
+
+//***************************************************************************
+// Static stuff
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_Psd::FileHeader_Begin()
+{
+    //Element_Size
+    if (Buffer_Size<4)
+        return false; //Must wait for more data
+
+    if (CC4(Buffer)!=0x38425053) //"8BPS"
+    {
+        Reject("PSD");
+        return false;
+    }
+
+    //All should be OK...
+    return true;
+}
+
+//***************************************************************************
+// File Header Information
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Psd::Read_Buffer_Continue()
+{
+    //Parsing
+    int32u Width, Height;
+    int16u BitsDepth, Version, channels, ColorMode;
+    Skip_C4(                                                    "Signature");
+    Get_B2 (Version,                                            "Version"); //  1 = PSD, 2 = PSB
+    Skip_B6(                                                    "Reserved");
+    Get_B2 (channels,                                           "channels"); // 1 to 56, including alpha channel
+    Get_B4 (Height,                                             "Height");
+    Get_B4 (Width,                                              "Width");
+    Get_B2 (BitsDepth,                                          "Depth"); // 1,8,16 or 32
+    Get_B2 (ColorMode,                                          "Color Mode"); Param_Info1(Psd_ColorMode(ColorMode));
+
+    FILLING_BEGIN();
+        Accept("PSD");
+        Stream_Prepare(Stream_Image);
+        Fill(Stream_Image, 0, Image_Format, Version==1?"PSD":"PSB");
+        Fill(Stream_Image, 0, Image_Format_Version, Version);
+        Fill(Stream_Image, 0, Image_ColorSpace, Psd_ColorMode(ColorMode));
+        Fill(Stream_Image, 0, Image_Width, Width);
+        Fill(Stream_Image, 0, Image_Height, Height);
+        Fill(Stream_Image, 0, Image_BitDepth, BitsDepth);
+        Finish("PSD");
+    FILLING_END();
+}
+
+
+} //NameSpace
+
+#endif

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Image/File_Psd.h Added

@@ -0,0 +1,54 @@
+// File_Psd - Info for PSD files
+// Copyright (C) 2012-2012 Lionel Duchateau, kurtnoise@free.fr
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Information about PSD files
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_File_PsdH
+#define MediaInfo_File_PsdH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Class File_Psd
+//***************************************************************************
+
+class File_Psd : public File__Analyze
+{
+protected :
+    //Buffer - File header
+    bool FileHeader_Begin();
+
+    //Elements
+    void Read_Buffer_Continue();
+};
+
+} //NameSpace
+
+#endif
+

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Image/File_Rle.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Image/File_Rle.cpp Changed

@@ -1,31 +1,35 @@
 // File_Rle - Info for RLE files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_RLE_YES)
 //---------------------------------------------------------------------------
 
@@ -45,7 +49,7 @@
 :File__Analyze()
 {
     //Configuration
-    ParserName=_T("RLE");
+    ParserName=__T("RLE");
 }
 
 //***************************************************************************

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Image/File_Rle.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Image/File_Rle.h Changed

@@ -1,17 +1,17 @@
 // File_Rle - Info for RLE files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Image/File_Tga.cpp Added

@@ -0,0 +1,312 @@
+// File_Tga - Info for TGA files
+// Copyright (C) 2011-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+// TGA - Format
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// From http://www.dca.fee.unicamp.br/~martino/disciplinas/ea978/tgaffs.pdf
+//
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_TGA_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Image/File_Tga.h"
+using namespace ZenLib;
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Info
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+const char* Tga_Image_Type_Compression(int8u Image_Type)
+{
+    switch (Image_Type)
+    {
+        case  1 : return "Color-mapped";
+        case  2 :
+        case  3 : return "Raw";
+        case  9 : return "Color-mapped + RLE";
+        case 10 :
+        case 11 : return "RLE";
+        case 32 :
+        case 33 : return "Huffman";
+        default : return "";
+    }
+}
+
+//---------------------------------------------------------------------------
+const char* Tga_Image_Type_ColorSpace(int8u Image_Type)
+{
+    switch (Image_Type)
+    {
+        case  1 :
+        case  2 :
+        case  9 :
+        case 10 :
+        case 32 :
+        case 33 : return "RGB";
+        case  3 :
+        case 11 : return "Y";
+        default : return "";
+    }
+}
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File_Tga::File_Tga()
+{
+    //Configuration
+    ParserName=__T("TGA");
+    Buffer_MaximumSize=64*1024*1024; //We need to load the complete file for footer check, choosing an high value for an image
+}
+
+//***************************************************************************
+// Streams management
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Tga::Streams_Fill()
+{
+    Fill(Stream_General, 0, General_Format, "TGA");
+    Fill(Stream_General, 0, General_Format_Version, __T("Version ")+Ztring::ToZtring(Version));
+    Fill(Stream_General, 0, General_Title, Image_ID);
+
+    Stream_Prepare(Stream_Image);
+    Fill(Stream_Image, 0, Image_Format, Tga_Image_Type_Compression(Image_Type));
+    Fill(Stream_Image, 0, Image_ColorSpace, Tga_Image_Type_ColorSpace(Image_Type));
+    Fill(Stream_Image, 0, Image_CodecID, Image_Type);
+    Fill(Stream_Image, 0, Image_Width, Image_Width_);
+    Fill(Stream_Image, 0, Image_Height, Image_Height_);
+    Fill(Stream_Image, 0, Image_BitDepth, Pixel_Depth);
+}
+
+//***************************************************************************
+// Buffer - File header
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_Tga::FileHeader_Begin()
+{
+    //Element_Size
+    if (Buffer_Size<File_Size)
+        return false; //Must wait for more data
+
+    //All should be OK...
+    return true;
+}
+
+//***************************************************************************
+// Buffer - Global
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Tga::Read_Buffer_Continue()
+{
+    //Parsing
+    Tga_File_Header();
+    Image_Color_Map_Data();
+    Tga_File_Footer();
+
+    FILLING_BEGIN();
+        //Coherency in case of no magic value
+        if (Version==1)
+        {
+            switch (Image_Type)
+            {
+                case   1 :  //Color mapped images
+                case   9 :  //Color mapped images, RLE
+                            if (Color_Map_Type!=1)
+                            {
+                                Reject();
+                                return;
+                            }
+                            break;
+                case   2 :  //True-color images
+                case  10 :  //True-color images, RLE
+                            if (Color_Map_Type)
+                            {
+                                Reject();
+                                return;
+                            }
+                            break;
+                case   3 :  //Black and White
+                case  11 :  //Black and White, RLE
+                            if (Color_Map_Type)
+                            {
+                                Reject();
+                                return;
+                            }
+                            break;
+                default  :  Reject();
+                            return;
+            }
+            switch (Color_Map_Type)
+            {
+                case   0 :
+                            if (First_Entry_Index || Color_map_Length || Color_map_Entry_Size)
+                            {
+                                Reject();
+                                return;
+                            }
+                            break;
+                case   1 :
+                            switch (Color_map_Entry_Size)
+                            {
+                                case  15 :
+                                case  16 :
+                                case  24 :
+                                case  32 :
+                                            break;
+                                default  :  Reject();
+                                            return;
+                                            ;
+                            }
+                            break;
+                default  :  Reject();
+                            return;
+            }
+            switch (Pixel_Depth)
+            {
+                case   8 :
+                case  16 :
+                case  24 :
+                case  32 :
+                            break;
+                default  :  Reject();
+                            return;
+                            ;
+            }
+        }
+
+        Accept();
+        Fill();
+        Finish();
+    FILLING_END();
+}
+
+//***************************************************************************
+// Elements
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Tga::Tga_File_Header()
+{
+    //Parsing
+    Element_Begin1("Tga File Header");
+    Get_L1 (ID_Length,                                          "ID Length");
+    Get_L1 (Color_Map_Type,                                     "Color Map Type");
+    Get_L1 (Image_Type,                                         "Image Type"); Param_Info1(Tga_Image_Type_Compression(Image_Type));
+    Element_End0();
+    Element_Begin1("Color Map Specification");
+        Get_L2 (First_Entry_Index,                              "First Entry Index");
+        Get_L2 (Color_map_Length,                               "Color map Length");
+        Get_L1 (Color_map_Entry_Size,                           "Color map Entry Size");
+    Element_End0();
+    Element_Begin1("Image Specification");
+        Skip_L2(                                                "X-origin of Image");
+        Skip_L2(                                                "Y-origin of Image");
+        Get_L2 (Image_Width_,                                   "Image Width");
+        Get_L2 (Image_Height_,                                  "Image Height");
+        Get_L1 (Pixel_Depth,                                    "Pixel Depth");
+        Get_L1 (Image_Descriptor,                               "Image Descriptor");
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Tga::Image_Color_Map_Data()
+{
+    Element_Begin1("Image/Color Map Data");
+    Get_Local(ID_Length, Image_ID,                              "Image ID");
+    if (Color_Map_Type==1)
+    {
+        int64u EntrySizeInBits=8;
+        if (Color_map_Entry_Size<24)
+            EntrySizeInBits=Color_map_Entry_Size/3;
+
+        Skip_XX(Color_map_Length*EntrySizeInBits/8,             "Color Map Data");
+
+    }
+    if (Element_Offset+26<Element_Size
+     && Buffer[Buffer_Size- 18]==0x54
+     && Buffer[Buffer_Size- 17]==0x52
+     && Buffer[Buffer_Size- 16]==0x55
+     && Buffer[Buffer_Size- 15]==0x45
+     && Buffer[Buffer_Size- 14]==0x56
+     && Buffer[Buffer_Size- 13]==0x49
+     && Buffer[Buffer_Size- 12]==0x53
+     && Buffer[Buffer_Size- 11]==0x49
+     && Buffer[Buffer_Size- 10]==0x4F
+     && Buffer[Buffer_Size-  9]==0x4E
+     && Buffer[Buffer_Size-  8]==0x2D
+     && Buffer[Buffer_Size-  7]==0x58
+     && Buffer[Buffer_Size-  6]==0x46
+     && Buffer[Buffer_Size-  5]==0x49
+     && Buffer[Buffer_Size-  4]==0x4C
+     && Buffer[Buffer_Size-  3]==0x45
+     && Buffer[Buffer_Size-  2]==0x2E
+     && Buffer[Buffer_Size-  1]==0x00)
+        Version=2;
+     else
+        Version=1;
+    Skip_XX(Element_Size-Element_Offset-(Version==2?26:0),      "Image Data");
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Tga::Tga_File_Footer()
+{
+    if (Version==1)
+        return; //No footer
+
+    Element_Begin1("Image/color Map Data");
+    Skip_L4(                                                    "Extension Area Offset");
+    Skip_L4(                                                    "Developer Directory Offset");
+    Skip_Local(16,                                              "Signature");
+    Skip_Local( 1,                                              "Reserved Character");
+    Skip_L1(                                                    "Binary Zero String Terminator");
+    Element_End0();
+}
+
+} //NameSpace
+
+#endif

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Image/File_Tga.h Added

@@ -0,0 +1,80 @@
+// File_Tga - Info for TGA files
+// Copyright (C) 2011-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Information about TGA files
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_File_TgaH
+#define MediaInfo_File_TgaH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Class File_Tga
+//***************************************************************************
+
+class File_Tga : public File__Analyze
+{
+public :
+    //Constructor/Destructor
+    File_Tga();
+
+private :
+    //Streams management
+    void Streams_Fill();
+
+    //Buffer - File header
+    bool FileHeader_Begin();
+
+    //Buffer - Global
+    void Read_Buffer_Continue ();
+
+    //Elements
+    void Tga_File_Header();
+    void Image_Color_Map_Data();
+    void Tga_File_Footer();
+
+    //Temp - File Header
+    int16u First_Entry_Index;
+    int16u Color_map_Length;
+    int16u Image_Width_;
+    int16u Image_Height_;
+    int8u  ID_Length;
+    int8u  Color_Map_Type;
+    int8u  Image_Type;
+    int8u  Color_map_Entry_Size;
+    int8u  Pixel_Depth;
+    int8u  Image_Descriptor;
+
+    //Temp - File Footer
+    Ztring Image_ID;
+    int8u Version;
+};
+
+} //NameSpace
+
+#endif

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Image/File_Tiff.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Image/File_Tiff.cpp Changed

@@ -1,17 +1,17 @@
 // File_Tiff - Info for TIFF files
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -21,20 +21,26 @@
 // TIFF - Format
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //
-// From http://www.fileformat.info/format/tiff/
-//
+// From
+// http://partners.adobe.com/public/developer/en/tiff/TIFF6.pdf
+// http://www.fileformat.info/format/tiff/
+// http://en.wikipedia.org/wiki/Tagged_Image_File_Format
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_TIFF_YES)
 //---------------------------------------------------------------------------
 
@@ -48,47 +54,505 @@
 {
 
 //***************************************************************************
-// Static stuff
+// Info
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+namespace Tiff_Tag
+{
+    const int16u ImageWidth                 = 256;
+    const int16u ImageLength                = 257;
+    const int16u BitsPerSample              = 258;
+    const int16u Compression                = 259;
+    const int16u PhotometricInterpretation  = 262;
+    const int16u ImageDescription           = 270;
+    const int16u SamplesPerPixel            = 277;
+    const int16u ExtraSamples               = 338;
+}
+
+//---------------------------------------------------------------------------
+const char* Tiff_Tag_Name(int32u Tag)
+{
+    switch (Tag)
+    {
+        case Tiff_Tag::ImageWidth                   : return "ImageWidth";
+        case Tiff_Tag::ImageLength                  : return "ImageLength";
+        case Tiff_Tag::BitsPerSample                : return "BitsPerSample";
+        case Tiff_Tag::Compression                  : return "Compression";
+        case Tiff_Tag::PhotometricInterpretation    : return "PhotometricInterpretation";
+        case Tiff_Tag::ImageDescription             : return "ImageDescription";
+        case Tiff_Tag::SamplesPerPixel              : return "SamplesPerPixel";
+        case Tiff_Tag::ExtraSamples                 : return "ExtraSamples";
+        default                                     : return "Unknown";
+    }
+}
+
+//---------------------------------------------------------------------------
+namespace Tiff_Type
+{
+    const int16u Byte       = 1;
+    const int16u Short      = 3;
+    const int16u Long       = 4;
+}
+
+//---------------------------------------------------------------------------
+const char* Tiff_Type_Name(int32u Type)
+{
+    switch (Type)
+    {
+        case Tiff_Type::Byte                        : return "Byte";
+        case Tiff_Type::Short                       : return "Short";
+        case Tiff_Type::Long                        : return "Long";
+        default                                     : return ""; //Unknown
+    }
+}
+
+//---------------------------------------------------------------------------
+const int8u Tiff_Type_Size(int32u Type)
+{
+    switch (Type)
+    {
+        case Tiff_Type::Byte                        : return 1;
+        case Tiff_Type::Short                       : return 2;
+        case Tiff_Type::Long                        : return 4;
+        default                                     : return 0; //Unknown
+    }
+}
+
+//---------------------------------------------------------------------------
+const char* Tiff_Compression(int32u Compression)
+{
+    switch (Compression)
+    {
+        case     1 : return "Raw";
+        case     2 : return "CCITT Group 3";
+        case     3 : return "CCITT T.4";
+        case     5 : return "LZW";
+        case     6 : return "JPEG";
+        case 32773 : return "PackBits";
+        default    : return ""; //Unknown
+    }
+}
+
+//---------------------------------------------------------------------------
+const char* Tiff_Compression_Mode(int32u Compression)
+{
+    switch (Compression)
+    {
+        case     1 :
+        case     2 :
+        case     3 :
+        case     5 :
+        case 32773 : return "Lossless";
+        default    : return ""; //Unknown or depends of the compresser (e.g. JPEG can be lossless or lossy)
+    }
+}
+
+//---------------------------------------------------------------------------
+const char* Tiff_PhotometricInterpretation(int32u PhotometricInterpretation)
+{
+    switch (PhotometricInterpretation)
+    {
+        case     0 :
+        case     1 : return "B/W or Grey scale";
+        case     2 : return "RGB";
+        case     3 : return "Palette";
+        case     4 : return "Transparency mask";
+        case     5 : return "CMYK";
+        case     6 : return "YCbCr";
+        case     8 : return "CIELAB";
+        default    : return ""; //Unknown
+    }
+}
+
+//---------------------------------------------------------------------------
+const char* Tiff_PhotometricInterpretation_ColorSpace (int32u PhotometricInterpretation)
+{
+    switch (PhotometricInterpretation)
+    {
+        case     0 :
+        case     1 : return "Y";
+        case     2 : return "RGB";
+        case     3 : return "RGB"; //Palette
+        case     4 : return "A"; //Transparency mask;
+        case     5 : return "CMYK";
+        case     6 : return "YUV"; //YCbCr
+        case     8 : return "CIELAB"; //What is it?
+        default    : return ""; //Unknown
+    }
+}
+
+const char* Tiff_ExtraSamples(int32u ExtraSamples)
+{
+    switch (ExtraSamples)
+    {
+        case     0 :
+        case     1 : return "Associated Alpha";
+        case     2 : return "Unassocieted Alpha";
+        default    : return ""; //Unknown
+    }
+}
+
+const char* Tiff_ExtraSamples_ColorSpace(int32u ExtraSamples)
+{
+    switch (ExtraSamples)
+    {
+        case     1 : return "A";
+        default    : return ""; //Unknown
+    }
+}
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File_Tiff::File_Tiff()
+{
+}
+
+//***************************************************************************
+// Buffer - File header
 //***************************************************************************
 
 //---------------------------------------------------------------------------
 bool File_Tiff::FileHeader_Begin()
 {
     //Element_Size
-    if (Buffer_Size<4)
+    /* Minimum header for a tiff file is 8 byte */
+    if (Buffer_Size<8)
         return false; //Must wait for more data
-    if (CC4(Buffer)!=0x49492A00 && CC4(Buffer)!=0x4D4D002A)
+    if (CC4(Buffer)==0x49492A00)
+        LittleEndian = true;
+    else if (CC4(Buffer)==0x4D4D002A)
+        LittleEndian = false;
+    else
     {
         Reject("TIFF");
         return false;
     }
 
     //All should be OK...
+    Accept("TIFF");
+    Fill(Stream_General, 0, General_Format, "TIFF");
     return true;
 }
 
+//---------------------------------------------------------------------------
+void File_Tiff::FileHeader_Parse()
+{
+    //The only IFD that is known at forehand is the first one, it's offset is placed byte 4-7 in the file.
+    int32u IFDOffset;
+    Skip_B4(                                                    "Magic");
+    Get_X4 (IFDOffset,                                          "IFDOffset");
+
+    FILLING_BEGIN();
+        //Initial IFD
+        GoTo(IFDOffset, "TIFF");
+    FILLING_END();
+}
+
 //***************************************************************************
-// Buffer - Global
+// Buffer - Per element
 //***************************************************************************
 
 //---------------------------------------------------------------------------
-void File_Tiff::Read_Buffer_Continue()
+void File_Tiff::Header_Parse()
 {
-    Skip_B4(                                                    "Magic");
-    Skip_XX(File_Size-4,                                        "Data");
+    //Handling remaining IFD data
+    if (!IfdItems.empty())
+    {
+        if (File_Offset+Buffer_Offset!=IfdItems.begin()->first)
+            IfdItems.clear(); //There was a problem during the seek, trashing remaining positions from last IFD
+        else
+        {
+            Header_Fill_Code(IfdItems.begin()->second.Tag, Tiff_Tag_Name(IfdItems.begin()->second.Tag));
+            Header_Fill_Size(Tiff_Type_Size(IfdItems.begin()->second.Type)*IfdItems.begin()->second.Count);
+            return;
+        }
+    }
 
-    FILLING_BEGIN();
-        Accept("TIFF");
+    /* A tiff images consist in principle of two types of blocks, IFD's and data blocks                       */
+    /* Each datablock, which could be a image, tiles, transperancy filter is described by one IFD.            */
+    /* These IFD's can be placed at any offset in the file and are linked in a chain fashion way.             */
+    /* where one IFD points out where the next IFD is placed                                                  */
+    /*                                                                                                        */
+    /* A creator of a tiff file must describe the "main image" in the first IFD, this means that a            */
+    /* reader, such this one, only need to read the first IFD in order to get the bitdepth, resolution etc.   */
+    /* of the main image.                                                                                     */
 
-        Stream_Prepare(Stream_Image);
-        Fill(Stream_Image, 0, Image_Format, "TIFF");
-        Fill(Stream_Image, 0, Image_Codec, "TIFF");
+    /* Read one IFD and print out the result */
 
-        //No more need data
-        Finish("TIFF");
-    FILLING_END();
+    /* Scan the tiff file for the IFD's (Image File Directory)                */
+    /* As long as the IFD offset to the next IFD in the file is not 0         */
+
+    /* Get number of directories for this IFD */
+    int16u NrOfDirectories;
+    Get_X2 (NrOfDirectories,                                    "NrOfDirectories");
+
+    //Filling
+    Header_Fill_Code(0xFFFFFFFF, "IFD"); //OxFFFFFFFF can not be a Tag, so using it as a magic value
+    Header_Fill_Size(2+12*((int64u)NrOfDirectories)+4); //2 for header + 12 per directory + 4 for next IFD offset
+}
+
+//---------------------------------------------------------------------------
+void File_Tiff::Data_Parse()
+{
+    int32u IFDOffset=0;
+    if (IfdItems.empty())
+    {
+        //Default values
+        Infos.clear();
+        Infos[Tiff_Tag::BitsPerSample]=__T("1");
+
+        //Parsing new IFD
+        while (Element_Offset+4<Element_Size)
+            Read_Directory();
+        Get_X4 (IFDOffset,                                          "IFDOffset");
+    }
+    else
+    {
+        //Handling remaining IFD data from a previous IFD
+        GetValueOffsetu(IfdItems.begin()->second); //Parsing the IFD item
+        IfdItems.erase(IfdItems.begin()->first); //Removing IFD item from the list of IFD items to parse
+    }
+
+    //Some items are not inside the directory, jumping to the offset
+    if (!IfdItems.empty())
+        GoTo(IfdItems.begin()->first, "TIFF");
+    else
+    {
+        //This IFD is finished, filling data then going to next IFD
+        Data_Parse_Fill();
+        if (IFDOffset)
+            GoTo(IFDOffset, "TIFF");
+        else
+            Finish(); //No more IFDs
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Tiff::Data_Parse_Fill()
+{
+    Stream_Prepare(Stream_Image);
+
+    infos::iterator Info;
+
+    //Width
+    Info=Infos.find(Tiff_Tag::ImageWidth);
+    if (Info!=Infos.end())
+        Fill(Stream_Image, StreamPos_Last, Image_Width, Info->second.Read());
+
+    //Height
+    Info=Infos.find(Tiff_Tag::ImageLength);
+    if (Info!=Infos.end())
+        Fill(Stream_Image, StreamPos_Last, Image_Height, Info->second.Read());
+
+    //BitsPerSample
+    Info=Infos.find(Tiff_Tag::BitsPerSample);
+    if (Info!=Infos.end())
+        Fill(Stream_Image, StreamPos_Last, Image_BitDepth, Info->second.Read());
+
+    //Compression
+    Info=Infos.find(Tiff_Tag::Compression);
+    if (Info!=Infos.end())
+    {
+        int32u Value=Info->second.Read().To_int32u();
+        Fill(Stream_Image, StreamPos_Last, Image_Format, Tiff_Compression(Value));
+        Fill(Stream_Image, StreamPos_Last, Image_Codec, Tiff_Compression(Value));
+        Fill(Stream_Image, StreamPos_Last, Image_Compression_Mode, Tiff_Compression_Mode(Value));
+    }
+
+    //PhotometricInterpretation
+    Info=Infos.find(Tiff_Tag::PhotometricInterpretation);
+    if (Info!=Infos.end())
+    {
+        int32u Value=Info->second.Read().To_int32u();
+        Fill(Stream_Image, StreamPos_Last, Image_ColorSpace, Tiff_PhotometricInterpretation_ColorSpace(Value));
+        //Note: should we differeniate between raw RGB and palette (also RGB actually...)
+    }
+
+    //ImageDescription
+    Info=Infos.find(Tiff_Tag::ImageDescription);
+    if (Info!=Infos.end())
+        Fill(Stream_Image, StreamPos_Last, Image_Title, Info->second.Read());
+
+    //ExtraSamples
+    Info=Infos.find(Tiff_Tag::ExtraSamples);
+    if (Info!=Infos.end())
+    {
+        Ztring ColorSpace=Retrieve(Stream_Image, StreamPos_Last, Image_ColorSpace);
+        ColorSpace+=Ztring().From_Local(Tiff_ExtraSamples_ColorSpace(Info->second.Read().To_int32u()));
+        Fill(Stream_Image, StreamPos_Last, Image_ColorSpace, ColorSpace, true);
+    }
+}
+
+//***************************************************************************
+// Elements
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Tiff::Read_Directory()
+{
+    /* Each directory consist of 4 fields */
+    /* Get information for this directory */
+    Element_Begin0();
+    ifditem   IfdItem;
+    Get_X2 (IfdItem.Tag,                                        "Tag"); Param_Info1(Tiff_Tag_Name(IfdItem.Tag));
+    Get_X2 (IfdItem.Type,                                       "Type"); Param_Info1(Tiff_Type_Name(IfdItem.Type));
+    Get_X4 (IfdItem.Count,                                      "Count");
+    Element_Name(Tiff_Tag_Name(IfdItem.Tag));
+
+    if (Tiff_Type_Size(IfdItem.Type)*IfdItem.Count<=4)
+    {
+        GetValueOffsetu(IfdItem);
+
+        /* Padding up, skip dummy bytes */
+        if (Tiff_Type_Size(IfdItem.Type)*IfdItem.Count<4)
+            Skip_XX(Tiff_Type_Size(IfdItem.Type)*IfdItem.Count, "Padding");
+    }
+    else
+    {
+        int32u IFDOffset;
+        Get_X4 (IFDOffset,                                      "IFDOffset");
+        IfdItems[IFDOffset]=IfdItem;
+    }
+    Element_End0();
+}
+
+//***************************************************************************
+// Helpers
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Tiff::Get_X2(int16u &Info, const char* Name)
+{
+    if (LittleEndian)
+        Get_L2 (Info,                                           Name);
+    else
+        Get_B2 (Info,                                           Name);
+}
+
+//---------------------------------------------------------------------------
+void File_Tiff::Get_X4(int32u &Info, const char* Name)
+{
+    if (LittleEndian)
+        Get_L4 (Info,                                           Name);
+    else
+        Get_B4 (Info,                                           Name);
+}
+
+//---------------------------------------------------------------------------
+void File_Tiff::GetValueOffsetu(ifditem &IfdItem)
+{
+    ZtringList &Info=Infos[IfdItem.Tag]; Info.clear(); Info.Separator_Set(0, __T(" / "));
+    const char* Name=Tiff_Tag_Name(IfdItem.Tag);
+
+    if (IfdItem.Count>=10)
+    {
+        //Too many data, we don't currently need it and we skip it
+        Skip_XX(Element_Size,                       Name);
+        Info.clear();
+        return;
+    }
+
+    switch (IfdItem.Type)
+    {
+        case 1:                /* 8-bit unsigned integer. */
+                for (int16u Pos=0; Pos<IfdItem.Count; Pos++)
+                {
+                    int8u Ret8;
+                    #if MEDIAINFO_TRACE
+                        if (LittleEndian)
+                            Get_L1 (Ret8,                       Name);
+                        else
+                            Get_B1 (Ret8,                       Name);
+                        Element_Info1(Ztring::ToZtring(Ret8));
+                    #else //MEDIAINFO_TRACE
+                        if (Element_Offset+1>Element_Size)
+                        {
+                            Trusted_IsNot();
+                            break;
+                        }
+                        if (LittleEndian)
+                            Ret8=LittleEndian2int8u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+                        else
+                            Ret8=BigEndian2int8u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+                        Element_Offset++;
+                    #endif //MEDIAINFO_TRACE
+                    Info.push_back(Ztring::ToZtring(Ret8));
+                }
+                break;
+
+        case 3:                /* 16-bit (2-byte) unsigned integer. */
+                for (int16u Pos=0; Pos<IfdItem.Count; Pos++)
+                {
+                    int16u Ret16;
+                    #if MEDIAINFO_TRACE
+                        if (LittleEndian)
+                            Get_L2 (Ret16,                      Name);
+                        else
+                            Get_B2 (Ret16,                      Name);
+                        switch (IfdItem.Tag)
+                        {
+                            case Tiff_Tag::Compression : Element_Info1(Tiff_Compression(Ret16)); break;
+                            case Tiff_Tag::PhotometricInterpretation : Element_Info1(Tiff_PhotometricInterpretation(Ret16)); break;
+                            default : Element_Info1(Ztring::ToZtring(Ret16));
+                        }
+                    #else //MEDIAINFO_TRACE
+                        if (Element_Offset+2>Element_Size)
+                        {
+                            Trusted_IsNot();
+                            break;
+                        }
+                        if (LittleEndian)
+                            Ret16=LittleEndian2int16u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+                        else
+                            Ret16=BigEndian2int16u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+                        Element_Offset+=2;
+                    #endif //MEDIAINFO_TRACE
+                    Info.push_back(Ztring::ToZtring(Ret16));
+                }
+                break;
+
+        case 4:                /* 32-bit (4-byte) unsigned integer */
+                for (int16u Pos=0; Pos<IfdItem.Count; Pos++)
+                {
+                    int32u Ret32;
+                    #if MEDIAINFO_TRACE
+                        if (LittleEndian)
+                            Get_L4 (Ret32,                      Name);
+                        else
+                            Get_B4 (Ret32,                      Name);
+                        Element_Info1(Ztring::ToZtring(Ret32));
+                    #else //MEDIAINFO_TRACE
+                        if (Element_Offset+4>Element_Size)
+                        {
+                            Trusted_IsNot();
+                            break;
+                        }
+                        if (LittleEndian)
+                            Ret32=LittleEndian2int16u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+                        else
+                            Ret32=BigEndian2int16u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+                        Element_Offset+=4;
+                    #endif //MEDIAINFO_TRACE
+                    Info.push_back(Ztring::ToZtring(Ret32));
+                }
+                break;
+
+        default:            //Unknown
+                {
+                    if (LittleEndian)
+                        Skip_L4(                                Name);
+                    else
+                        Skip_B4(                                Name);
+                    Info.clear(); //We actually do not know the type
+                }
+    }
 }
 
 } //NameSpace
 
 #endif
+

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Image/File_Tiff.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Image/File_Tiff.h Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/MediaInfo.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/MediaInfo.cpp Changed

@@ -1,31 +1,35 @@
 // MediaInfo - All info about media files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #include "MediaInfo/MediaInfo.h"
 #include "MediaInfo/MediaInfo_Internal.h"
 using namespace ZenLib;
@@ -41,19 +45,19 @@
 
 #if defined (MEDIAINFO_DEBUG_CONFIG) || defined (MEDIAINFO_DEBUG_BUFFER) || defined (MEDIAINFO_DEBUG_OUTPUT)
     #ifdef WINDOWS
-        const Char* MediaInfo_Debug_Name=_T("MediaInfo_Debug");
+        const Char* MediaInfo_Debug_Name=__T("MediaInfo_Debug");
     #else
-        const Char* MediaInfo_Debug_Name=_T("/tmp/MediaInfo_Debug");
+        const Char* MediaInfo_Debug_Name=__T("/tmp/MediaInfo_Debug");
     #endif
 #endif
 
 #ifdef MEDIAINFO_DEBUG_CONFIG
     #define MEDIAINFO_DEBUG_STATIC(_TOAPPEND) \
         { \
-            File F(Ztring(MediaInfo_Debug_Name)+_T(".Config.static.txt"), File::Access_Write_Append); \
+            File F(Ztring(MediaInfo_Debug_Name)+__T(".Config.static.txt"), File::Access_Write_Append); \
             Ztring Debug; \
             _TOAPPEND; \
-            Debug+=_T("\r\n"); \
+            Debug+=__T("\r\n"); \
             F.Write(Debug); \
             F.Close(); \
         }
@@ -91,9 +95,9 @@
 }
 
 //---------------------------------------------------------------------------
-size_t MediaInfo::Open (const int8u* Begin_, size_t Begin_Size_, const int8u*, size_t, int64u)
+size_t MediaInfo::Open (const int8u* Begin, size_t Begin_Size, const int8u* End, size_t End_Size, int64u File_Size)
 {
-    return ((MediaInfo_Internal*)Internal)->Open(Begin_, Begin_Size_);
+    return ((MediaInfo_Internal*)Internal)->Open(Begin, Begin_Size, End, End_Size, (File_Size<Begin_Size+End_Size)?(Begin_Size+End_Size):File_Size);
 }
 
 //---------------------------------------------------------------------------
@@ -121,6 +125,12 @@
 }
 
 //---------------------------------------------------------------------------
+size_t MediaInfo::Open_NextPacket ()
+{
+    return ((MediaInfo_Internal*)Internal)->Open_NextPacket().to_ulong();
+}
+
+//---------------------------------------------------------------------------
 size_t MediaInfo::Save()
 {
     return 0; //Not yet implemented
@@ -199,20 +209,20 @@
 //---------------------------------------------------------------------------
 String MediaInfo::Option_Static (const String &Option, const String &Value)
 {
-    MEDIAINFO_DEBUG_STATIC(Debug+=_T("Option_Static, Option=");Debug+=Ztring(Option);Debug+=_T(", Value=");Debug+=Ztring(Value);)
+    MEDIAINFO_DEBUG_STATIC(Debug+=__T("Option_Static, Option=");Debug+=Ztring(Option);Debug+=__T(", Value=");Debug+=Ztring(Value);)
     MediaInfoLib::Config.Init(); //Initialize Configuration
 
-         if (Option==_T("Info_Capacities"))
+    if (Option==__T("Info_Capacities"))
     {
-        return _T("Option disactivated for this version, will come back soon!");
+        return __T("Option disactivated for this version, will come back soon!");
         //MediaInfo_Internal MI;
         //return MI.Option(Option);
     }
-    else if (Option==_T("Info_Version"))
+    else if (Option==__T("Info_Version"))
     {
         Ztring ToReturn=MediaInfoLib::Config.Info_Version_Get();
         if (MediaInfo_Internal::LibraryIsModified())
-            ToReturn+=_T(" modified");
+            ToReturn+=__T(" modified");
         return ToReturn;
     }
     else
@@ -233,5 +243,3 @@
 }
 
 } //NameSpace
-
-

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/MediaInfo.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/MediaInfo.h Changed

@@ -1,17 +1,17 @@
 // MediaInfo - All information about media files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -111,6 +111,11 @@
         /// Open a stream and collect information about it (technical information and tags)
         /// @brief Open a stream (Finalize)
     size_t Open_Buffer_Finalize ();
+        /// If Open() is used in "PerPacket" mode, parse only one packet and return
+        /// @brief Read one packet (if "PerPacket" mode is set)
+        /// @return a bitfield \n
+        ///         bit 0: A packet was read
+    size_t Open_NextPacket ();
         /// (NOT IMPLEMENTED YET) Save the file opened before with Open() (modifications of tags)
         /// @brief (NOT IMPLEMENTED YET) Save the file
         /// @retval 0 failed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/MediaInfoList.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/MediaInfoList.cpp Changed

@@ -1,17 +1,17 @@
 // MediaInfoList - A list of MediaInfo
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -23,14 +23,18 @@
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(__BORLANDC__) && defined (_DEBUG)
     //Why? in Debug mode with release Wx Libs, wxAssert is not defined?
     void wxAssert (int, const wchar_t*, int, const wchar_t*, const wchar_t*){return;}
@@ -182,9 +186,9 @@
 //---------------------------------------------------------------------------
 String MediaInfoList::Get(size_t FilePos, stream_t KindOfStream, size_t StreamNumber, const String &Parameter, info_t KindOfInfo, info_t KindOfSearch)
 {
-    //TRACE(Trace+=_T("Get(L), CompleteName=");Trace+=Info[FilePos].Get(Stream_General, 0, _T("CompleteName")).c_str();)
-    //TRACE(Trace+=_T("Get(L), StreamKind=");Trace+=ZenLib::Ztring::ToZtring((int8u)KindOfStream);Trace+=_T(", StreamNumber=");Trace+=ZenLib::Ztring::ToZtring((int8u)StreamNumber);Trace+=_T(", Parameter=");Trace+=ZenLib::Ztring(Parameter);Trace+=_T(", KindOfInfo=");Trace+=ZenLib::Ztring::ToZtring((int8u)KindOfInfo);Trace+=_T(", KindOfSearch=");Trace+=ZenLib::Ztring::ToZtring((int8u)KindOfSearch);)
-    //TRACE(Trace+=_T("Get(L), will return ");Trace+=Info[FilePos].Get(KindOfStream, StreamNumber, Parameter, KindOfInfo, KindOfSearch).c_str();)
+    //TRACE(Trace+=__T("Get(L), CompleteName=");Trace+=Info[FilePos].Get(Stream_General, 0, __T("CompleteName")).c_str();)
+    //TRACE(Trace+=__T("Get(L), StreamKind=");Trace+=ZenLib::Ztring::ToZtring((int8u)KindOfStream);Trace+=__T(", StreamNumber=");Trace+=ZenLib::Ztring::ToZtring((int8u)StreamNumber);Trace+=__T(", Parameter=");Trace+=ZenLib::Ztring(Parameter);Trace+=__T(", KindOfInfo=");Trace+=ZenLib::Ztring::ToZtring((int8u)KindOfInfo);Trace+=__T(", KindOfSearch=");Trace+=ZenLib::Ztring::ToZtring((int8u)KindOfSearch);)
+    //TRACE(Trace+=__T("Get(L), will return ");Trace+=Info[FilePos].Get(KindOfStream, StreamNumber, Parameter, KindOfInfo, KindOfSearch).c_str();)
 
     return ((MediaInfoList_Internal*)Internal)->Get(FilePos, KindOfStream, StreamNumber, Parameter, KindOfInfo, KindOfSearch);
 }
@@ -253,4 +257,3 @@
 }
 
 } //NameSpace
-

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/MediaInfoList.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/MediaInfoList.h Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/MediaInfoList_Internal.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/MediaInfoList_Internal.cpp Changed

@@ -1,31 +1,35 @@
 // MediaInfoList_Internal - A list of MediaInfo
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #include "MediaInfoList_Internal.h"
 #include "MediaInfo/MediaInfo_Config.h"
 #include "ZenLib/ZtringListList.h"
@@ -53,14 +57,15 @@
 : Thread()
 {
     CriticalSectionLocker CSL(CS);
-    
+
     //Initialisation
     Info.reserve(Count_Init);
     for (size_t Pos=0; Pos<Info.size(); Pos++)
         Info[Pos]=NULL;
     ToParse_AlreadyDone=0;
     ToParse_Total=0;
-    
+	CountValid=0;
+
     //Threading
     BlockMethod=0;
     State=0;
@@ -90,49 +95,23 @@
 
     //Get all filenames
     ZtringList List;
-    if ((File_Name.size()>=7
-      && File_Name[0]==_T('h')
-      && File_Name[1]==_T('t')
-      && File_Name[2]==_T('t')
-      && File_Name[3]==_T('p')
-      && File_Name[4]==_T(':')
-      && File_Name[5]==_T('/')
-      && File_Name[6]==_T('/'))
-     || (File_Name.size()>=6
-      && File_Name[0]==_T('f')
-      && File_Name[1]==_T('t')
-      && File_Name[2]==_T('p')
-      && File_Name[3]==_T(':')
-      && File_Name[4]==_T('/')
-      && File_Name[5]==_T('/'))
-     || (File_Name.size()>=6
-      && File_Name[0]==_T('m')
-      && File_Name[1]==_T('m')
-      && File_Name[2]==_T('s')
-      && File_Name[3]==_T(':')
-      && File_Name[4]==_T('/')
-      && File_Name[5]==_T('/'))
-     || (File_Name.size()>=7
-      && File_Name[0]==_T('m')
-      && File_Name[1]==_T('m')
-      && File_Name[2]==_T('s')
-      && File_Name[3]==_T('h')
-      && File_Name[4]==_T(':')
-      && File_Name[5]==_T('/')
-      && File_Name[6]==_T('/')))
+    size_t Pos=File_Name.find(__T(':'));
+    if (Pos!=string::npos && Pos!=1)
         List.push_back(File_Name);
     else if (File::Exists(File_Name))
         List.push_back(File_Name);
     else
         List=Dir::GetAllFileNames(File_Name, (Options&FileOption_NoRecursive)?Dir::Nothing:Dir::Parse_SubDirs);
 
-    Reader_Directory::Directory_Cleanup(List);
+    #if defined(MEDIAINFO_DIRECTORY_YES)
+        Reader_Directory().Directory_Cleanup(List);
+    #endif //defined(MEDIAINFO_DIRECTORY_YES)
 
     //Registering files
     CS.Enter();
     if (ToParse.empty())
         CountValid=0;
-    for (ZtringList::iterator L=List.begin(); L!=List.end(); L++)
+    for (ZtringList::iterator L=List.begin(); L!=List.end(); ++L)
         ToParse.push(*L);
     ToParse_Total+=List.size();
     if (ToParse_Total)
@@ -165,16 +144,16 @@
     if (ToParse_Total==0)
         return;
 
-    while (1)
+    for (;;)
     {
         CS.Enter();
         if (!ToParse.empty())
         {
-            MediaInfo* MI=new MediaInfo();
-            for (std::map<String, String>::iterator Config_MediaInfo_Item=Config_MediaInfo_Items.begin(); Config_MediaInfo_Item!=Config_MediaInfo_Items.end(); Config_MediaInfo_Item++)
+            MediaInfo_Internal* MI=new MediaInfo_Internal();
+            for (std::map<String, String>::iterator Config_MediaInfo_Item=Config_MediaInfo_Items.begin(); Config_MediaInfo_Item!=Config_MediaInfo_Items.end(); ++Config_MediaInfo_Item)
                 MI->Option(Config_MediaInfo_Item->first, Config_MediaInfo_Item->second);
             if (BlockMethod==1)
-                MI->Option(_T("Thread"), _T("1"));
+                MI->Option(__T("Thread"), __T("1"));
             MI->Open(ToParse.front());
             if (BlockMethod==1)
             {
@@ -211,7 +190,7 @@
 //---------------------------------------------------------------------------
 size_t MediaInfoList_Internal::Open_Buffer_Init (int64u File_Size_, int64u File_Offset_)
 {
-    MediaInfo* MI=new MediaInfo();
+    MediaInfo_Internal* MI=new MediaInfo_Internal();
     MI->Open_Buffer_Init(File_Size_, File_Offset_);
 
     CriticalSectionLocker CSL(CS);
@@ -227,7 +206,7 @@
     if (FilePos>=Info.size() || Info[FilePos]==NULL)
         return 0;
 
-    return Info[FilePos]->Open_Buffer_Continue(ToAdd, ToAdd_Size);
+    return Info[FilePos]->Open_Buffer_Continue(ToAdd, ToAdd_Size).to_ulong();
 }
 
 //---------------------------------------------------------------------------
@@ -281,7 +260,7 @@
         delete Info[FilePos]; Info[FilePos]=NULL;
         Info.erase(Info.begin()+FilePos);
     }
-    
+
     ToParse_AlreadyDone=0;
     ToParse_Total=0;
 }
@@ -297,24 +276,24 @@
     {
         Ztring Retour;
         FilePos=0;
-        ZtringListList MediaInfo_Custom_View; MediaInfo_Custom_View.Write(Option(_T("Inform_Get")));
+        ZtringListList MediaInfo_Custom_View; MediaInfo_Custom_View.Write(Option(__T("Inform_Get")));
         bool XML=false;
-        if (MediaInfoLib::Config.Inform_Get()==_T("XML"))
+        if (MediaInfoLib::Config.Inform_Get()==__T("XML"))
             XML=true;
-        if (XML) Retour+=_T("<?xml version=\"1.0\" encoding=\"UTF-8\"?>")+MediaInfoLib::Config.LineSeparator_Get()+_T("<Mediainfo version=\"")+MediaInfoLib::Config.Info_Version_Get().SubString(_T(" v"), Ztring())+_T("\">")+MediaInfoLib::Config.LineSeparator_Get();
-        else Retour+=MediaInfo_Custom_View(Stream_Max+2, 1);//Page_Begin
+        if (XML) Retour+=__T("<?xml version=\"1.0\" encoding=\"UTF-8\"?>")+MediaInfoLib::Config.LineSeparator_Get()+__T("<Mediainfo version=\"")+MediaInfoLib::Config.Info_Version_Get().SubString(__T(" v"), Ztring())+__T("\">")+MediaInfoLib::Config.LineSeparator_Get();
+        else
+        Retour+=MediaInfo_Custom_View("Page_Begin");
         while (FilePos<Info.size())
         {
             Retour+=Inform(FilePos);
             if (FilePos<Info.size()-1)
             {
-                Retour+=MediaInfo_Custom_View(Stream_Max+3, 1);//Page_Middle
+                Retour+=MediaInfo_Custom_View("Page_Middle");
             }
             FilePos++;
         }
-        if (XML) Retour+=_T("</Mediainfo>")+MediaInfoLib::Config.LineSeparator_Get();
-        else Retour+=MediaInfo_Custom_View(Stream_Max+4, 1);//Page_End
-        //Retour.FindAndReplace(_T("\\n"),_T( "\n"), 0, Ztring_Recursive);
+        if (XML) Retour+=__T("</Mediainfo>")+MediaInfoLib::Config.LineSeparator_Get();
+        else Retour+=MediaInfo_Custom_View("Page_End");//
         return Retour.c_str();
     }
 
@@ -323,6 +302,8 @@
     if (FilePos>=Info.size() || Info[FilePos]==NULL || Info[FilePos]->Count_Get(Stream_General)==0)
         return MediaInfoLib::Config.EmptyString_Get();
 
+    Info[FilePos]->IsFirst=FilePos==0;
+    Info[FilePos]->IsLast=(FilePos+1)==Info.size();
     return Info[FilePos]->Inform();
 }
 
@@ -403,33 +384,33 @@
 {
     CriticalSectionLocker CSL(CS);
     Ztring OptionLower=Option; OptionLower.MakeLowerCase();
-         if (Option==_T(""))
-        return _T("");
-    else if (OptionLower==_T("manguage_update"))
+         if (Option==__T(""))
+        return __T("");
+    else if (OptionLower==__T("manguage_update"))
     {
         //Special case : Language_Update must update all MediaInfo classes
         for (unsigned int Pos=0; Pos<Info.size(); Pos++)
             if (Info[Pos])
-                Info[Pos]->Option(_T("language_update"), Value);
+                Info[Pos]->Option(__T("language_update"), Value);
 
-        return _T("");
+        return __T("");
     }
-    else if (OptionLower==_T("create_dummy"))
+    else if (OptionLower==__T("create_dummy"))
     {
         Info.resize(Info.size()+1);
-        Info[Info.size()-1]=new MediaInfo();
+        Info[Info.size()-1]=new MediaInfo_Internal();
         Info[Info.size()-1]->Option(Option, Value);
-        return _T("");
+        return __T("");
     }
-    else if (OptionLower==_T("thread"))
+    else if (OptionLower==__T("thread"))
     {
         BlockMethod=1;
-        return _T("");
+        return __T("");
     }
-    else if (OptionLower.find(_T("file_"))==0)
+    else if (OptionLower.find(__T("file_"))==0)
     {
         Config_MediaInfo_Items[Option]=Value;
-        return _T("");
+        return __T("");
     }
     else
         return MediaInfo::Option_Static(Option, Value);
@@ -471,4 +452,3 @@
 }
 
 } //NameSpace
-

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/MediaInfoList_Internal.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/MediaInfoList_Internal.h Changed

@@ -1,17 +1,17 @@
 // MediaInfoList_Internal - A list of MediaInfo
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -30,6 +30,7 @@
 
 //---------------------------------------------------------------------------
 #include "MediaInfo/MediaInfo.h"
+#include "MediaInfo/MediaInfo_Internal.h"
 #include "MediaInfo/MediaInfo_Config_MediaInfo.h"
 #include "ZenLib/Thread.h"
 #include "ZenLib/CriticalSection.h"
@@ -62,21 +63,21 @@
     String Get (size_t FilePos, stream_t StreamKind, size_t StreamNumber, const String &Parameter, info_t KindOfInfo=Info_Text, info_t KindOfSearch=Info_Name); //Get info, FilePos=File position, StreamKind=General video audio text chapter, StreamNumber=stream number, PosInStream=parameter you want, KindOfInfo=name text measure options name(language) measure(language) information how to, KindOfSearch=which Kind Of information Parameter must be searched?
 
     //Set
-    size_t Set (const String &ToSet, size_t FilePos, stream_t StreamKind, size_t StreamNumber, size_t Parameter, const String &OldValue=_T("")); //Get info, FilePos=File position, StreamKind=General video audio text chapter, StreamNumber=stream number, PosInStream=parameter you want, KindOfInfo=name, text, measure, options name(language) measure(language) information how to
-    size_t Set (const String &ToSet, size_t FilePos, stream_t StreamKind, size_t StreamNumber, const String &Parameter, const String &OldValue=_T("")); //Get info, FilePos=File position, StreamKind=General video audio text chapter, StreamNumber=stream number, PosInStream=parameter you want, KindOfInfo=name text measure options name (language) measure (language) information how to, KindOfSearch=which Kind Of information Parameter must be searched?
+    size_t Set (const String &ToSet, size_t FilePos, stream_t StreamKind, size_t StreamNumber, size_t Parameter, const String &OldValue=__T("")); //Get info, FilePos=File position, StreamKind=General video audio text chapter, StreamNumber=stream number, PosInStream=parameter you want, KindOfInfo=name, text, measure, options name(language) measure(language) information how to
+    size_t Set (const String &ToSet, size_t FilePos, stream_t StreamKind, size_t StreamNumber, const String &Parameter, const String &OldValue=__T("")); //Get info, FilePos=File position, StreamKind=General video audio text chapter, StreamNumber=stream number, PosInStream=parameter you want, KindOfInfo=name text measure options name (language) measure (language) information how to, KindOfSearch=which Kind Of information Parameter must be searched?
 
     //Output_Buffered
     char* Output_Buffer_Get (size_t File_Pos, size_t &Output_Buffer_Size);
 
     //Info
-    String        Option (const String &Option, const String &Value=String(_T("")));
-    static String Option_Static (const String &Option, const String &Value=String(_T("")));
-    size_t                  State_Get ();
-    size_t                  Count_Get (size_t FilePos, stream_t StreamKind, size_t StreamNumber=(size_t)-1);
-    size_t                  Count_Get ();
+    String      Option (const String &Option, const String &Value=String(__T("")));
+    static String Option_Static (const String &Option, const String &Value=String(__T("")));
+    size_t      State_Get ();
+    size_t      Count_Get (size_t FilePos, stream_t StreamKind, size_t StreamNumber=(size_t)-1);
+    size_t      Count_Get ();
 
 private :
-    std::vector<MediaInfo*> Info;
+    std::vector<MediaInfo_Internal*> Info;
     std::queue<String> ToParse;
     std::map<String, String> Config_MediaInfo_Items; //Config per file
     size_t  ToParse_AlreadyDone;

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/MediaInfo_Config.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/MediaInfo_Config.cpp Changed

@@ -1,17 +1,17 @@
 // MediaInfo_Config - Configuration class
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,18 +22,21 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 #include "MediaInfo/MediaInfo_Config.h"
 #include "ZenLib/ZtringListListF.h"
 #include "ZenLib/File.h"
 #include <algorithm>
-#include <iostream>
 using namespace ZenLib;
 using namespace std;
 //---------------------------------------------------------------------------
@@ -42,8 +45,8 @@
 {
 
 //---------------------------------------------------------------------------
-const Char*  MediaInfo_Version=_T("MediaInfoLib - v0.7.34");
-const Char*  MediaInfo_Url=_T("http://mediainfo.sourceforge.net");
+const Char*  MediaInfo_Version=__T("MediaInfoLib - v0.7.60");
+const Char*  MediaInfo_Url=__T("http://mediainfo.sourceforge.net");
       Ztring EmptyZtring;       //Use it when we can't return a reference to a true Ztring
 const Ztring EmptyZtring_Const; //Use it when we can't return a reference to a true Ztring, const version
 const ZtringListList EmptyZtringListList_Const; //Use it when we can't return a reference to a true ZtringListList, const version
@@ -105,7 +108,20 @@
 
     //Filling
     FormatDetection_MaximumOffset=0;
-    MpegTs_MaximumOffset=16*1024*1024;
+    #if MEDIAINFO_ADVANCED
+        VariableGopDetection_Occurences=4;
+        VariableGopDetection_GiveUp=false;
+        InitDataNotRepeated_Occurences=(int64u)-1; //Disabled by default
+        InitDataNotRepeated_GiveUp=false;
+    #endif //MEDIAINFO_ADVANCED
+    MpegTs_MaximumOffset=32*1024*1024;
+    MpegTs_MaximumScanDuration=16000000000LL;
+    MpegTs_ForceStreamDisplay=false;
+    #if MEDIAINFO_ADVANCED
+        MpegTs_VbrDetection_Delta=0;
+        MpegTs_VbrDetection_Occurences=4;
+        MpegTs_VbrDetection_GiveUp=false;
+    #endif //MEDIAINFO_ADVANCED
     Complete=0;
     BlockMethod=0;
     Internet=0;
@@ -118,17 +134,27 @@
     ShowFiles_TextOnly=1;
     ParseSpeed=(float32)0.5;
     Verbosity=(float32)0.5;
-    DetailsLevel=(float32)0.0;
-    DetailsFormat=DetailsFormat_Tree;
+    Trace_Level=(float32)0.0;
+    Trace_TimeSection_OnlyFirstOccurrence=false;
+    Trace_Format=Trace_Format_Tree;
     Language_Raw=false;
     ReadByHuman=true;
+    LegacyStreamDisplay=true;
     Demux=0;
     LineSeparator=EOL;
-    ColumnSeparator=_T(";");
-    TagSeparator=_T(" / ");
-    Quote=_T("\"");
-    DecimalPoint=_T(".");
+    ColumnSeparator=__T(";");
+    TagSeparator=__T(" / ");
+    Quote=__T("\"");
+    DecimalPoint=__T(".");
     ThousandsPoint=Ztring();
+    #if MEDIAINFO_EVENTS
+        Event_CallBackFunction=NULL;
+        Event_UserHandler=NULL;
+    #endif //MEDIAINFO_EVENTS
+    #if defined(MEDIAINFO_LIBCURL_YES)
+        Ssh_IgnoreSecurity=false;
+        Ssl_IgnoreSecurity=false;
+    #endif //defined(MEDIAINFO_LIBCURL_YES)
 
     CS.Leave();
 
@@ -141,15 +167,17 @@
 
 Ztring MediaInfo_Config::Option (const String &Option, const String &Value_Raw)
 {
+    SubFile_Config(Option)=Value_Raw;
+
     String Option_Lower(Option);
-    size_t Egal_Pos=Option_Lower.find(_T('='));
+    size_t Egal_Pos=Option_Lower.find(__T('='));
     if (Egal_Pos==string::npos)
         Egal_Pos=Option_Lower.size();
     transform(Option_Lower.begin(), Option_Lower.begin()+Egal_Pos, Option_Lower.begin(), (int(*)(int))tolower); //(int(*)(int)) is a patch for unix
 
     //Parsing pointer to a file
     Ztring Value;
-    if (Value_Raw.find(_T("file://"))==0)
+    if (Value_Raw.find(__T("file://"))==0)
     {
         //Open
         Ztring FileName(Value_Raw, 7, Ztring::npos);
@@ -178,27 +206,27 @@
     {
         return Ztring();
     }
-    else if (Option_Lower==_T("charset_config"))
+    else if (Option_Lower==__T("charset_config"))
     {
         return Ztring(); //Only used in DLL, no Library action
     }
-    else if (Option_Lower==_T("charset_output"))
+    else if (Option_Lower==__T("charset_output"))
     {
         return Ztring(); //Only used in DLL, no Library action
     }
-    else if (Option_Lower==_T("complete"))
+    else if (Option_Lower==__T("complete"))
     {
         Complete_Set(Value.To_int8u()?true:false);
         return Ztring();
     }
-    else if (Option_Lower==_T("complete_get"))
+    else if (Option_Lower==__T("complete_get"))
     {
         if (Complete_Get())
-            return _T("1");
+            return __T("1");
         else
             return Ztring();
     }
-    else if (Option_Lower==_T("blockmethod"))
+    else if (Option_Lower==__T("blockmethod"))
     {
         if (Value.empty())
             BlockMethod_Set(0);
@@ -206,14 +234,14 @@
             BlockMethod_Set(1);
         return Ztring();
     }
-    else if (Option_Lower==_T("blockmethod_get"))
+    else if (Option_Lower==__T("blockmethod_get"))
     {
         if (BlockMethod_Get())
-            return _T("1");
+            return __T("1");
         else
             return Ztring();
     }
-    else if (Option_Lower==_T("internet"))
+    else if (Option_Lower==__T("internet"))
     {
         if (Value.empty())
             Internet_Set(0);
@@ -221,32 +249,42 @@
             Internet_Set(1);
         return Ztring();
     }
-    else if (Option_Lower==_T("demux"))
+    else if (Option_Lower==__T("internet_get"))
     {
-        if (Value.empty())
-            Demux_Set(0);
-        else if (Value==_T("all"))
-            Demux_Set(2);
+        if (Internet_Get())
+            return __T("1");
         else
-            Demux_Set(1);
-        return Ztring();
+            return Ztring();
     }
-    else if (Option_Lower==_T("demux_unpacketize"))
+    else if (Option_Lower==__T("demux"))
     {
-        if (Value.empty())
-            Demux_Unpacketize_Set(false);
+        String Value_Lower(Value);
+        transform(Value_Lower.begin(), Value_Lower.end(), Value_Lower.begin(), (int(*)(int))tolower); //(int(*)(int)) is a patch for unix
+
+             if (Value_Lower==__T("all"))
+            Demux_Set(7);
+        else if (Value_Lower==__T("frame"))
+            Demux_Set(1);
+        else if (Value_Lower==__T("container"))
+            Demux_Set(2);
+        else if (Value_Lower==__T("elementary"))
+            Demux_Set(4);
         else
-            Demux_Unpacketize_Set(true);
+            Demux_Set(0);
         return Ztring();
     }
-    else if (Option_Lower==_T("internet_get"))
+    else if (Option_Lower==__T("demux_get"))
     {
-        if (Internet_Get())
-            return _T("1");
-        else
-            return Ztring();
+        switch (Demux_Get())
+        {
+            case 7 : return __T("All");
+            case 1 : return __T("Frame");
+            case 2 : return __T("Container");
+            case 4 : return __T("Elementary");
+            default: return Ztring();
+        }
     }
-    else if (Option_Lower==_T("multiplevalues"))
+    else if (Option_Lower==__T("multiplevalues"))
     {
         if (Value.empty())
             MultipleValues_Set(0);
@@ -254,14 +292,14 @@
             MultipleValues_Set(1);
         return Ztring();
     }
-    else if (Option_Lower==_T("multiplevalues_get"))
+    else if (Option_Lower==__T("multiplevalues_get"))
     {
         if (MultipleValues_Get())
-            return _T("1");
+            return __T("1");
         else
             return Ztring();
     }
-    else if (Option_Lower==_T("parseunknownextensions"))
+    else if (Option_Lower==__T("parseunknownextensions"))
     {
         if (Value.empty())
             ParseUnknownExtensions_Set(0);
@@ -269,194 +307,236 @@
             ParseUnknownExtensions_Set(1);
         return Ztring();
     }
-    else if (Option_Lower==_T("parseunknownextensions_get"))
+    else if (Option_Lower==__T("parseunknownextensions_get"))
     {
         if (ParseUnknownExtensions_Get())
-            return _T("1");
+            return __T("1");
         else
             return Ztring();
     }
-    else if (Option_Lower==_T("showfiles_set"))
+    else if (Option_Lower==__T("showfiles_set"))
     {
         ShowFiles_Set(Value.c_str());
         return Ztring();
     }
-    else if (Option_Lower==_T("readbyhuman"))
+    else if (Option_Lower==__T("readbyhuman"))
     {
         ReadByHuman_Set(Value.To_int8u()?true:false);
         return Ztring();
     }
-    else if (Option_Lower==_T("readbyhuman_get"))
+    else if (Option_Lower==__T("readbyhuman_get"))
+    {
+        return ReadByHuman_Get()?__T("1"):__T("0");
+    }
+    else if (Option_Lower==__T("legacystreamdisplay"))
     {
-        return ReadByHuman_Get()?_T("1"):_T("0");
+        LegacyStreamDisplay_Set(Value.To_int8u()?true:false);
+        return Ztring();
     }
-    else if (Option_Lower==_T("parsespeed"))
+    else if (Option_Lower==__T("legacystreamdisplay_get"))
+    {
+        return LegacyStreamDisplay_Get()?__T("1"):__T("0");
+    }
+    else if (Option_Lower==__T("parsespeed"))
     {
         ParseSpeed_Set(Value.To_float32());
         return Ztring();
     }
-    else if (Option_Lower==_T("parsespeed_get"))
+    else if (Option_Lower==__T("parsespeed_get"))
     {
         return Ztring::ToZtring(ParseSpeed_Get(), 3);
     }
-    else if (Option_Lower==_T("verbosity"))
+    else if (Option_Lower==__T("verbosity"))
     {
         Verbosity_Set(Value.To_float32());
         return Ztring();
     }
-    else if (Option_Lower==_T("verbosity_get"))
+    else if (Option_Lower==__T("verbosity_get"))
     {
         return Ztring::ToZtring(Verbosity_Get(), 3);
     }
-    else if (Option_Lower==_T("lineseparator"))
+    else if (Option_Lower==__T("lineseparator"))
     {
         LineSeparator_Set(Value);
         return Ztring();
     }
-    else if (Option_Lower==_T("lineseparator_get"))
+    else if (Option_Lower==__T("lineseparator_get"))
     {
         return LineSeparator_Get();
     }
-    else if (Option_Lower==_T("version"))
+    else if (Option_Lower==__T("version"))
     {
         Version_Set(Value);
         return Ztring();
     }
-    else if (Option_Lower==_T("version_get"))
+    else if (Option_Lower==__T("version_get"))
     {
         return Version_Get();
     }
-    else if (Option_Lower==_T("columnseparator"))
+    else if (Option_Lower==__T("columnseparator"))
     {
         ColumnSeparator_Set(Value);
         return Ztring();
     }
-    else if (Option_Lower==_T("columnseparator_get"))
+    else if (Option_Lower==__T("columnseparator_get"))
     {
         return ColumnSeparator_Get();
     }
-    else if (Option_Lower==_T("tagseparator"))
+    else if (Option_Lower==__T("tagseparator"))
     {
         TagSeparator_Set(Value);
         return Ztring();
     }
-    else if (Option_Lower==_T("tagseparator_get"))
+    else if (Option_Lower==__T("tagseparator_get"))
     {
         return TagSeparator_Get();
     }
-    else if (Option_Lower==_T("quote"))
+    else if (Option_Lower==__T("quote"))
     {
         Quote_Set(Value);
         return Ztring();
     }
-    else if (Option_Lower==_T("quote_get"))
+    else if (Option_Lower==__T("quote_get"))
     {
         return Quote_Get();
     }
-    else if (Option_Lower==_T("decimalpoint"))
+    else if (Option_Lower==__T("decimalpoint"))
     {
         DecimalPoint_Set(Value);
         return Ztring();
     }
-    else if (Option_Lower==_T("decimalpoint_get"))
+    else if (Option_Lower==__T("decimalpoint_get"))
     {
         return DecimalPoint_Get();
     }
-    else if (Option_Lower==_T("thousandspoint"))
+    else if (Option_Lower==__T("thousandspoint"))
     {
         ThousandsPoint_Set(Value);
         return Ztring();
     }
-    else if (Option_Lower==_T("thousandspoint_get"))
+    else if (Option_Lower==__T("thousandspoint_get"))
     {
         return ThousandsPoint_Get();
     }
-    else if (Option_Lower==_T("streammax"))
+    else if (Option_Lower==__T("streammax"))
     {
         ZtringListList StreamMax=Value.c_str();
         StreamMax_Set(StreamMax);
         return Ztring();
     }
-    else if (Option_Lower==_T("streammax_get"))
+    else if (Option_Lower==__T("streammax_get"))
     {
         return StreamMax_Get();
     }
-    else if (Option_Lower==_T("language"))
+    else if (Option_Lower==__T("language"))
     {
         ZtringListList Language=Value.c_str();
         Language_Set(Language);
         return Ztring();
     }
-    else if (Option_Lower==_T("language_get"))
+    else if (Option_Lower==__T("language_get"))
     {
         return Language_Get();
     }
-    else if (Option_Lower==_T("inform"))
+    else if (Option_Lower==__T("inform"))
     {
         Inform_Set(Value.c_str());
         return Ztring();
     }
-    else if (Option_Lower==_T("inform_get"))
+    else if (Option_Lower==__T("output"))
+    {
+        Inform_Set(Value.c_str());
+        return Ztring();
+    }
+    else if (Option_Lower==__T("inform_get"))
     {
         return Inform_Get();
     }
-    else if (Option_Lower==_T("inform_replace"))
+    else if (Option_Lower==__T("output_get"))
+    {
+        return Inform_Get();
+    }
+    else if (Option_Lower==__T("inform_replace"))
     {
         Inform_Replace_Set(Value.c_str());
         return Ztring();
     }
-    else if (Option_Lower==_T("inform_replace_get"))
+    else if (Option_Lower==__T("inform_replace_get"))
     {
         return Inform_Replace_Get();
     }
-    else if (Option_Lower==_T("details")) //Legacy for detailslevel
+    else if (Option_Lower==__T("details")) //Legacy for trace_level
+    {
+        return MediaInfo_Config::Option(__T("Trace_Level"), Value);
+    }
+    else if (Option_Lower==__T("details_get")) //Legacy for trace_level
+    {
+        return MediaInfo_Config::Option(__T("Trace_Level_Get"), Value);
+    }
+    else if (Option_Lower==__T("detailslevel")) //Legacy for trace_level
+    {
+        return MediaInfo_Config::Option(__T("Trace_Level"), Value);
+    }
+    else if (Option_Lower==__T("detailslevel_get")) //Legacy for trace_level
+    {
+        return MediaInfo_Config::Option(__T("Trace_Level_Get"), Value);
+    }
+    else if (Option_Lower==__T("trace_level"))
     {
-        DetailsLevel_Set(Value.To_float32());
+        Trace_Level_Set(Value);
         return Ztring();
     }
-    else if (Option_Lower==_T("details_get")) //Legacy for detailslevel
+    else if (Option_Lower==__T("trace_level_get"))
     {
-        return Ztring::ToZtring(DetailsLevel_Get());
+        return Ztring::ToZtring(Trace_Level_Get());
     }
-    else if (Option_Lower==_T("detailslevel"))
+    else if (Option_Lower==__T("trace_timesection_onlyfirstoccurrence"))
     {
-        DetailsLevel_Set(Value.To_float32());
+        Trace_TimeSection_OnlyFirstOccurrence_Set(Value.To_int64u()?true:false);
         return Ztring();
     }
-    else if (Option_Lower==_T("detailslevel_get"))
+    else if (Option_Lower==__T("trace_timesection_onlyfirstoccurrence_get"))
+    {
+        return Trace_TimeSection_OnlyFirstOccurrence_Get()?__T("1"):__T("0");
+    }
+    else if (Option_Lower==__T("detailsformat")) //Legacy for trace_format
+    {
+        return MediaInfo_Config::Option(__T("Trace_Format"), Value);
+    }
+    else if (Option_Lower==__T("detailsformat_get")) //Legacy for trace_format
     {
-        return Ztring::ToZtring(DetailsLevel_Get());
+        return MediaInfo_Config::Option(__T("Trace_Format_Get"), Value);
     }
-    else if (Option_Lower==_T("detailsformat"))
+    else if (Option_Lower==__T("trace_format"))
     {
         String NewValue_Lower(Value);
         transform(NewValue_Lower.begin(), NewValue_Lower.end(), NewValue_Lower.begin(), (int(*)(int))tolower); //(int(*)(int)) is a patch for unix
 
         CriticalSectionLocker CSL(CS);
-        if (NewValue_Lower==_T("csv"))
-            DetailsFormat_Set(DetailsFormat_CSV);
+        if (NewValue_Lower==__T("csv"))
+            Trace_Format_Set(Trace_Format_CSV);
         else
-            DetailsFormat_Set(DetailsFormat_Tree);
+            Trace_Format_Set(Trace_Format_Tree);
         return Ztring();
     }
-    else if (Option_Lower==_T("detailsformat_get"))
+    else if (Option_Lower==__T("trace_format_get"))
     {
-        switch (DetailsFormat_Get())
+        switch (Trace_Format_Get())
         {
-            case DetailsFormat_CSV : return _T("CSV");
-            default : return _T("Tree");
+            case Trace_Format_CSV : return __T("CSV");
+            default : return __T("Tree");
         }
     }
-    else if (Option_Lower==_T("detailsmodificator"))
+    else if (Option_Lower==__T("detailsmodificator"))
     {
-        DetailsModificator_Set(Value);
+        Trace_Modificator_Set(Value);
         return Ztring();
     }
-    else if (Option_Lower==_T("detailsmodificator_get"))
+    else if (Option_Lower==__T("detailsmodificator_get"))
     {
-        return DetailsModificator_Get(Value);
+        return Trace_Modificator_Get(Value);
     }
-    else if (Option_Lower==_T("info_parameters"))
+    else if (Option_Lower==__T("info_parameters"))
     {
         ZtringListList ToReturn=Info_Parameters_Get();
 
@@ -467,51 +547,310 @@
             if (!ToReturn(Pos, 1).empty())
             {
                 C1.resize(25, ' ');
-                ToReturn(Pos, 0)=C1 + _T(" :");
+                ToReturn(Pos, 0)=C1 + __T(" :");
             }
         }
 
         ToReturn.Separator_Set(0, LineSeparator_Get());
-        ToReturn.Separator_Set(1, _T(" "));
+        ToReturn.Separator_Set(1, __T(" "));
         ToReturn.Quote_Set(Ztring());
         return ToReturn.Read();
     }
-    else if (Option_Lower==_T("info_parameters_csv"))
+    else if (Option_Lower==__T("info_parameters_csv"))
     {
         return Info_Parameters_Get();
     }
-    else if (Option_Lower==_T("info_codecs"))
+    else if (Option_Lower==__T("info_codecs"))
     {
         return Info_Codecs_Get();
     }
-    else if (Option_Lower==_T("info_version"))
+    else if (Option_Lower==__T("info_version"))
     {
         return Info_Version_Get();
     }
-    else if (Option_Lower==_T("info_url"))
+    else if (Option_Lower==__T("info_url"))
     {
         return Info_Url_Get();
     }
-    else if (Option_Lower==_T("formatdetection_maximumoffset"))
+    else if (Option_Lower==__T("formatdetection_maximumoffset"))
+    {
+        FormatDetection_MaximumOffset_Set(Value==__T("-1")?(int64u)-1:((Ztring*)&Value)->To_int64u());
+        return Ztring();
+    }
+    else if (Option_Lower==__T("formatdetection_maximumoffset_get"))
+    {
+        return FormatDetection_MaximumOffset_Get()==(int64u)-1?Ztring(__T("-1")):Ztring::ToZtring(FormatDetection_MaximumOffset_Get());
+    }
+    else if (Option_Lower==__T("variablegopdetection_occurences"))
+    {
+        #if MEDIAINFO_ADVANCED
+            VariableGopDetection_Occurences_Set(Value.To_int64u());
+            return Ztring();
+        #else // MEDIAINFO_ADVANCED
+            return __T("advanced features are disabled due to compilation options");
+        #endif // MEDIAINFO_ADVANCED
+    }
+    else if (Option_Lower==__T("variablegopdetection_occurences_get"))
+    {
+        #if MEDIAINFO_ADVANCED
+            return Ztring::ToZtring(VariableGopDetection_Occurences_Get());
+        #else // MEDIAINFO_ADVANCED
+            return __T("advanced features are disabled due to compilation options");
+        #endif // MEDIAINFO_ADVANCED
+    }
+    else if (Option_Lower==__T("variablegopdetection_giveup"))
+    {
+        #if MEDIAINFO_ADVANCED
+            VariableGopDetection_GiveUp_Set(Value.To_int8u()?true:false);
+            return Ztring();
+        #else // MEDIAINFO_ADVANCED
+            return __T("advanced features are disabled due to compilation options");
+        #endif // MEDIAINFO_ADVANCED
+    }
+    else if (Option_Lower==__T("variablegopdetection_giveup_get"))
+    {
+        #if MEDIAINFO_ADVANCED
+            return VariableGopDetection_GiveUp_Get()?__T("1"):__T("0");
+        #else // MEDIAINFO_ADVANCED
+            return __T("advanced features are disabled due to compilation options");
+        #endif // MEDIAINFO_ADVANCED
+    }
+    else if (Option_Lower==__T("initdatanotrepeated_occurences"))
+    {
+        #if MEDIAINFO_ADVANCED
+            InitDataNotRepeated_Occurences_Set(Value.To_int64u());
+            return Ztring();
+        #else // MEDIAINFO_ADVANCED
+            return __T("advanced features are disabled due to compilation options");
+        #endif // MEDIAINFO_ADVANCED
+    }
+    else if (Option_Lower==__T("initdatanotrepeated_occurences_get"))
+    {
+        #if MEDIAINFO_ADVANCED
+            return Ztring::ToZtring(InitDataNotRepeated_Occurences_Get());
+        #else // MEDIAINFO_ADVANCED
+            return __T("advanced features are disabled due to compilation options");
+        #endif // MEDIAINFO_ADVANCED
+    }
+    else if (Option_Lower==__T("initdatanotrepeated_giveup"))
     {
-        FormatDetection_MaximumOffset_Set(Value==_T("-1")?(int64u)-1:((Ztring*)&Value)->To_int64u());
+        #if MEDIAINFO_ADVANCED
+            InitDataNotRepeated_GiveUp_Set(Value.To_int8u()?true:false);
+            return Ztring();
+        #else // MEDIAINFO_ADVANCED
+            return __T("advanced features are disabled due to compilation options");
+        #endif // MEDIAINFO_ADVANCED
+    }
+    else if (Option_Lower==__T("initdatanotrepeated_giveup_get"))
+    {
+        #if MEDIAINFO_ADVANCED
+            return InitDataNotRepeated_GiveUp_Get()?__T("1"):__T("0");
+        #else // MEDIAINFO_ADVANCED
+            return __T("advanced features are disabled due to compilation options");
+        #endif // MEDIAINFO_ADVANCED
+    }
+    else if (Option_Lower==__T("mpegts_maximumoffset"))
+    {
+        MpegTs_MaximumOffset_Set(Value==__T("-1")?(int64u)-1:((Ztring*)&Value)->To_int64u());
         return Ztring();
     }
-    else if (Option_Lower==_T("formatdetection_maximumoffset_get"))
+    else if (Option_Lower==__T("mpegts_maximumoffset_get"))
     {
-        return FormatDetection_MaximumOffset_Get()==(int64u)-1?Ztring(_T("-1")):Ztring::ToZtring(FormatDetection_MaximumOffset_Get());
+        return MpegTs_MaximumOffset_Get()==(int64u)-1?Ztring(__T("-1")):Ztring::ToZtring(MpegTs_MaximumOffset_Get());
     }
-    else if (Option_Lower==_T("mpegts_maximumoffset"))
+    else if (Option_Lower==__T("mpegts_vbrdetection_delta"))
     {
-        MpegTs_MaximumOffset_Set(Value==_T("-1")?(int64u)-1:((Ztring*)&Value)->To_int64u());
+        #if MEDIAINFO_ADVANCED
+            MpegTs_VbrDetection_Delta_Set(Value.To_float64());
+            return Ztring();
+        #else // MEDIAINFO_ADVANCED
+            return __T("advanced features are disabled due to compilation options");
+        #endif // MEDIAINFO_ADVANCED
         return Ztring();
     }
-    else if (Option_Lower==_T("mpegts_maximumoffset_get"))
+    else if (Option_Lower==__T("mpegts_vbrdetection_delta_get"))
     {
-        return MpegTs_MaximumOffset_Get()==(int64u)-1?Ztring(_T("-1")):Ztring::ToZtring(MpegTs_MaximumOffset_Get());
+        #if MEDIAINFO_ADVANCED
+            return Ztring::ToZtring(MpegTs_VbrDetection_Delta_Get(), 9);
+        #else // MEDIAINFO_ADVANCED
+            return __T("advanced features are disabled due to compilation options");
+        #endif // MEDIAINFO_ADVANCED
+    }
+    else if (Option_Lower==__T("mpegts_vbrdetection_occurences"))
+    {
+        #if MEDIAINFO_ADVANCED
+            MpegTs_VbrDetection_Occurences_Set(Value.To_int64u());
+            return Ztring();
+        #else // MEDIAINFO_ADVANCED
+            return __T("advanced features are disabled due to compilation options");
+        #endif // MEDIAINFO_ADVANCED
+    }
+    else if (Option_Lower==__T("mpegts_vbrdetection_occurences_get"))
+    {
+        #if MEDIAINFO_ADVANCED
+            return Ztring::ToZtring(MpegTs_VbrDetection_Occurences_Get());
+        #else // MEDIAINFO_ADVANCED
+            return __T("advanced features are disabled due to compilation options");
+        #endif // MEDIAINFO_ADVANCED
+    }
+    else if (Option_Lower==__T("mpegts_vbrdetection_giveup"))
+    {
+        #if MEDIAINFO_ADVANCED
+            MpegTs_VbrDetection_GiveUp_Set(Value.To_int8u()?true:false);
+            return Ztring();
+        #else // MEDIAINFO_ADVANCED
+            return __T("advanced features are disabled due to compilation options");
+        #endif // MEDIAINFO_ADVANCED
+    }
+    else if (Option_Lower==__T("mpegts_vbrdetection_giveup_get"))
+    {
+        #if MEDIAINFO_ADVANCED
+            return MpegTs_VbrDetection_GiveUp_Get()?__T("1"):__T("0");
+        #else // MEDIAINFO_ADVANCED
+            return __T("advanced features are disabled due to compilation options");
+        #endif // MEDIAINFO_ADVANCED
+    }
+    else if (Option_Lower==__T("mpegts_maximumscanduration"))
+    {
+        MpegTs_MaximumScanDuration_Set(float64_int64s((((Ztring*)&Value)->To_float64())*1000000000));
+        return Ztring();
+    }
+    else if (Option_Lower==__T("mpegts_maximumscanduration_get"))
+    {
+        return MpegTs_MaximumScanDuration_Get()==(int64u)-1?Ztring(__T("-1")):Ztring::ToZtring(MpegTs_MaximumOffset_Get());
+    }
+    else if (Option_Lower==__T("mpegts_forcestreamdisplay"))
+    {
+        MpegTs_ForceStreamDisplay_Set(Value.To_int8u()?true:false);
+        return Ztring();
+    }
+    else if (Option_Lower==__T("mpegts_forcestreamdisplay_get"))
+    {
+        return MpegTs_ForceStreamDisplay_Get()?__T("1"):__T("0");
+    }
+    else if (Option_Lower==__T("custommapping"))
+    {
+        CustomMapping_Set(Value);
+        return Ztring();
+    }
+    else if (Option_Lower==__T("event_callbackfunction"))
+    {
+        #if MEDIAINFO_EVENTS
+            return Event_CallBackFunction_Set(Value);
+        #else //MEDIAINFO_EVENTS
+            return __T("Event manager is disabled due to compilation options");
+        #endif //MEDIAINFO_EVENTS
+    }
+    else if (Option_Lower==__T("ssh_knownhostsfilename"))
+    {
+        #if defined(MEDIAINFO_LIBCURL_YES)
+            Ssh_KnownHostsFileName_Set(Value);
+            return Ztring();
+        #else // defined(MEDIAINFO_LIBCURL_YES)
+            return __T("Libcurl support is disabled due to compilation options");
+        #endif // defined(MEDIAINFO_LIBCURL_YES)
+    }
+    else if (Option_Lower==__T("ssh_publickeyfilename"))
+    {
+        #if defined(MEDIAINFO_LIBCURL_YES)
+            Ssh_PublicKeyFileName_Set(Value);
+            return Ztring();
+        #else // defined(MEDIAINFO_LIBCURL_YES)
+            return __T("Libcurl support is disabled due to compilation options");
+        #endif // defined(MEDIAINFO_LIBCURL_YES)
+    }
+    else if (Option_Lower==__T("ssh_privatekeyfilename"))
+    {
+        #if defined(MEDIAINFO_LIBCURL_YES)
+            Ssh_PrivateKeyFileName_Set(Value);
+            return Ztring();
+        #else // defined(MEDIAINFO_LIBCURL_YES)
+            return __T("Libcurl support is disabled due to compilation options");
+        #endif // defined(MEDIAINFO_LIBCURL_YES)
+    }
+    else if (Option_Lower==__T("ssh_ignoresecurity"))
+    {
+        #if defined(MEDIAINFO_LIBCURL_YES)
+            Ssh_IgnoreSecurity_Set(Value.empty() || Value.To_float32());
+            return Ztring();
+        #else // defined(MEDIAINFO_LIBCURL_YES)
+            return __T("Libcurl support is disabled due to compilation options");
+        #endif // defined(MEDIAINFO_LIBCURL_YES)
+    }
+    else if (Option_Lower==__T("ssl_certificatefilename"))
+    {
+        #if defined(MEDIAINFO_LIBCURL_YES)
+            Ssl_CertificateFileName_Set(Value);
+            return Ztring();
+        #else // defined(MEDIAINFO_LIBCURL_YES)
+            return __T("Libcurl support is disabled due to compilation options");
+        #endif // defined(MEDIAINFO_LIBCURL_YES)
+    }
+    else if (Option_Lower==__T("ssl_certificateFormat"))
+    {
+        #if defined(MEDIAINFO_LIBCURL_YES)
+            Ssl_CertificateFormat_Set(Value);
+            return Ztring();
+        #else // defined(MEDIAINFO_LIBCURL_YES)
+            return __T("Libcurl support is disabled due to compilation options");
+        #endif // defined(MEDIAINFO_LIBCURL_YES)
+    }
+    else if (Option_Lower==__T("ssl_privatekeyfilename"))
+    {
+        #if defined(MEDIAINFO_LIBCURL_YES)
+            Ssl_PrivateKeyFileName_Set(Value);
+            return Ztring();
+        #else // defined(MEDIAINFO_LIBCURL_YES)
+            return __T("Libcurl support is disabled due to compilation options");
+        #endif // defined(MEDIAINFO_LIBCURL_YES)
+    }
+    else if (Option_Lower==__T("ssl_privatekeyformat"))
+    {
+        #if defined(MEDIAINFO_LIBCURL_YES)
+            Ssl_PrivateKeyFormat_Set(Value);
+            return Ztring();
+        #else // defined(MEDIAINFO_LIBCURL_YES)
+            return __T("Libcurl support is disabled due to compilation options");
+        #endif // defined(MEDIAINFO_LIBCURL_YES)
+    }
+    else if (Option_Lower==__T("ssl_certificateauthorityfilename"))
+    {
+        #if defined(MEDIAINFO_LIBCURL_YES)
+            Ssl_CertificateAuthorityFileName_Set(Value);
+            return Ztring();
+        #else // defined(MEDIAINFO_LIBCURL_YES)
+            return __T("Libcurl support is disabled due to compilation options");
+        #endif // defined(MEDIAINFO_LIBCURL_YES)
+    }
+    else if (Option_Lower==__T("ssl_certificateauthoritypath"))
+    {
+        #if defined(MEDIAINFO_LIBCURL_YES)
+            Ssl_CertificateAuthorityPath_Set(Value);
+            return Ztring();
+        #else // defined(MEDIAINFO_LIBCURL_YES)
+            return __T("Libcurl support is disabled due to compilation options");
+        #endif // defined(MEDIAINFO_LIBCURL_YES)
+    }
+    else if (Option_Lower==__T("ssl_certificaterevocationlistfilename"))
+    {
+        #if defined(MEDIAINFO_LIBCURL_YES)
+            Ssl_CertificateRevocationListFileName_Set(Value);
+            return Ztring();
+        #else // defined(MEDIAINFO_LIBCURL_YES)
+            return __T("Libcurl support is disabled due to compilation options");
+        #endif // defined(MEDIAINFO_LIBCURL_YES)
+    }
+    else if (Option_Lower==__T("ssl_ignoresecurity"))
+    {
+        #if defined(MEDIAINFO_LIBCURL_YES)
+            Ssl_IgnoreSecurity_Set(Value.empty() || Value.To_float32());
+            return Ztring();
+        #else // defined(MEDIAINFO_LIBCURL_YES)
+            return __T("Libcurl support is disabled due to compilation options");
+        #endif // defined(MEDIAINFO_LIBCURL_YES)
     }
     else
-        return _T("Option not known");
+        return __T("Option not known");
 }
 
 //***************************************************************************
@@ -590,15 +929,15 @@
     for  (size_t Pos=0; Pos<NewShowFiles.size(); Pos++)
     {
         const Ztring& Object=NewShowFiles.Read(Pos, 0);
-             if (Object==_T("Nothing"))
+             if (Object==__T("Nothing"))
             ShowFiles_Nothing=NewShowFiles.Read(Pos, 1).empty()?1:0;
-        else if (Object==_T("VideoAudio"))
+        else if (Object==__T("VideoAudio"))
             ShowFiles_VideoAudio=NewShowFiles.Read(Pos, 1).empty()?1:0;
-        else if (Object==_T("VideoOnly"))
+        else if (Object==__T("VideoOnly"))
             ShowFiles_VideoOnly=NewShowFiles.Read(Pos, 1).empty()?1:0;
-        else if (Object==_T("AudioOnly"))
+        else if (Object==__T("AudioOnly"))
             ShowFiles_AudioOnly=NewShowFiles.Read(Pos, 1).empty()?1:0;
-        else if (Object==_T("TextOnly"))
+        else if (Object==__T("TextOnly"))
             ShowFiles_TextOnly=NewShowFiles.Read(Pos, 1).empty()?1:0;
     }
 }
@@ -673,33 +1012,87 @@
 }
 
 //---------------------------------------------------------------------------
-void MediaInfo_Config::DetailsLevel_Set (float NewValue)
+void MediaInfo_Config::LegacyStreamDisplay_Set (bool NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    LegacyStreamDisplay=NewValue;
+}
+
+bool MediaInfo_Config::LegacyStreamDisplay_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return LegacyStreamDisplay;
+}
+
+//---------------------------------------------------------------------------
+void MediaInfo_Config::Trace_Level_Set (const ZtringListList &NewTrace_Level)
+{
+    CriticalSectionLocker CSL(CS);
+
+    //Global
+    if (NewTrace_Level.size()==1 && NewTrace_Level[0].size()==1)
+    {
+        Trace_Level=NewTrace_Level[0][0].To_float32();
+        if (Trace_Layers.to_ulong()==0) //if not set to a specific layer
+            Trace_Layers.set();
+        return;
+    }
+
+    //Per item
+    else
+    {
+        Trace_Layers.reset();
+        for (size_t Pos=0; Pos<NewTrace_Level.size(); Pos++)
+        {
+            if (NewTrace_Level[Pos].size()==2)
+            {
+                if (NewTrace_Level[Pos][0]==__T("Container1"))
+                    Trace_Layers.set(0, NewTrace_Level[Pos][1].To_int64u()?true:false);
+            }
+        }
+    }
+}
+
+float32 MediaInfo_Config::Trace_Level_Get ()
 {
     CriticalSectionLocker CSL(CS);
-    DetailsLevel=NewValue;
+    return Trace_Level;
 }
 
-float32 MediaInfo_Config::DetailsLevel_Get ()
+std::bitset<32> MediaInfo_Config::Trace_Layers_Get ()
 {
     CriticalSectionLocker CSL(CS);
-    return DetailsLevel;
+    return Trace_Layers;
 }
 
 //---------------------------------------------------------------------------
-void MediaInfo_Config::DetailsFormat_Set (detailsFormat NewValue)
+void MediaInfo_Config::Trace_TimeSection_OnlyFirstOccurrence_Set (bool Value)
 {
     CriticalSectionLocker CSL(CS);
-    DetailsFormat=NewValue;
+    Trace_TimeSection_OnlyFirstOccurrence=Value;
 }
 
-MediaInfo_Config::detailsFormat MediaInfo_Config::DetailsFormat_Get ()
+bool MediaInfo_Config::Trace_TimeSection_OnlyFirstOccurrence_Get ()
 {
     CriticalSectionLocker CSL(CS);
-    return DetailsFormat;
+    return Trace_TimeSection_OnlyFirstOccurrence;
 }
 
 //---------------------------------------------------------------------------
-void MediaInfo_Config::DetailsModificator_Set (const ZtringList &NewValue)
+void MediaInfo_Config::Trace_Format_Set (trace_Format NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    Trace_Format=NewValue;
+}
+
+MediaInfo_Config::trace_Format MediaInfo_Config::Trace_Format_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return Trace_Format;
+}
+
+//---------------------------------------------------------------------------
+void MediaInfo_Config::Trace_Modificator_Set (const ZtringList &NewValue)
 {
     ZtringList List(NewValue);
     if (List.size()!=2)
@@ -707,15 +1100,15 @@
     transform(List[0].begin(), List[0].end(), List[0].begin(), (int(*)(int))tolower); //(int(*)(int)) is a patch for unix
 
     CriticalSectionLocker CSL(CS);
-    DetailsModificators[List[0]]=List[1]==_T("1");
+    Trace_Modificators[List[0]]=List[1]==__T("1");
 }
 
-Ztring MediaInfo_Config::DetailsModificator_Get (const Ztring &Value)
+Ztring MediaInfo_Config::Trace_Modificator_Get (const Ztring &Value)
 {
     CriticalSectionLocker CSL(CS);
-    std::map<Ztring, bool>::iterator ToReturn=DetailsModificators.find(Value);
-    if (ToReturn!=DetailsModificators.end())
-        return ToReturn->second?_T("1"):_T("0");
+    std::map<Ztring, bool>::iterator ToReturn=Trace_Modificators.find(Value);
+    if (ToReturn!=Trace_Modificators.end())
+        return ToReturn->second?__T("1"):__T("0");
     else
         return Ztring();
 }
@@ -734,19 +1127,6 @@
 }
 
 //---------------------------------------------------------------------------
-void MediaInfo_Config::Demux_Unpacketize_Set (bool NewValue)
-{
-    CriticalSectionLocker CSL(CS);
-    Demux_Unpacketize=NewValue;
-}
-
-bool MediaInfo_Config::Demux_Unpacketize_Get ()
-{
-    CriticalSectionLocker CSL(CS);
-    return Demux_Unpacketize;
-}
-
-//---------------------------------------------------------------------------
 void MediaInfo_Config::LineSeparator_Set (const Ztring &NewValue)
 {
     CriticalSectionLocker CSL(CS);
@@ -859,16 +1239,16 @@
 
     //Which language to choose?
     //-Raw
-         if (NewValue.size()==1 && NewValue[0].size()==1 && NewValue[0][0]==_T("raw"))
+         if (NewValue.size()==1 && NewValue[0].size()==1 && NewValue[0][0]==__T("raw"))
     {
         Language_Raw=true;
         Language.clear();
         //Exceptions
-        Language.Write(_T("  Config_Text_ColumnSize"), _T("32"));
-        Language.Write(_T("  Config_Text_Separator"), _T(" : "));
-        Language.Write(_T("  Config_Text_NumberTag"), _T(" #"));
-        Language.Write(_T("  Config_Text_FloatSeparator"), _T("."));
-        Language.Write(_T("  Config_Text_ThousandsSeparator"), Ztring());
+        Language.Write(__T("  Config_Text_ColumnSize"), __T("32"));
+        Language.Write(__T("  Config_Text_Separator"), __T(" : "));
+        Language.Write(__T("  Config_Text_NumberTag"), __T(" #"));
+        Language.Write(__T("  Config_Text_FloatSeparator"), __T("."));
+        Language.Write(__T("  Config_Text_ThousandsSeparator"), Ztring());
     }
     //-Add custom language to English language
     else
@@ -899,25 +1279,25 @@
     {
         //Strings - Info_Name_Text
         Ztring ToReplace=Info[StreamKind](Pos, Info_Name);
-        if (!Language_Raw && ToReplace.find(_T("/String"))!=Error)
+        if (!Language_Raw && ToReplace.find(__T("/String"))!=Error)
         {
-            ToReplace.FindAndReplace(_T("/String1"), Ztring());
-            ToReplace.FindAndReplace(_T("/String2"), Ztring());
-            ToReplace.FindAndReplace(_T("/String3"), Ztring());
-            ToReplace.FindAndReplace(_T("/String4"), Ztring());
-            ToReplace.FindAndReplace(_T("/String5"), Ztring());
-            ToReplace.FindAndReplace(_T("/String6"), Ztring());
-            ToReplace.FindAndReplace(_T("/String7"), Ztring());
-            ToReplace.FindAndReplace(_T("/String8"), Ztring());
-            ToReplace.FindAndReplace(_T("/String9"), Ztring());
-            ToReplace.FindAndReplace(_T("/String"),  Ztring());
+            ToReplace.FindAndReplace(__T("/String1"), Ztring());
+            ToReplace.FindAndReplace(__T("/String2"), Ztring());
+            ToReplace.FindAndReplace(__T("/String3"), Ztring());
+            ToReplace.FindAndReplace(__T("/String4"), Ztring());
+            ToReplace.FindAndReplace(__T("/String5"), Ztring());
+            ToReplace.FindAndReplace(__T("/String6"), Ztring());
+            ToReplace.FindAndReplace(__T("/String7"), Ztring());
+            ToReplace.FindAndReplace(__T("/String8"), Ztring());
+            ToReplace.FindAndReplace(__T("/String9"), Ztring());
+            ToReplace.FindAndReplace(__T("/String"),  Ztring());
         }
-        if (!Language_Raw && ToReplace.find(_T("/"))!=Error) //Complex values, like XXX/YYY --> We translate both XXX and YYY
+        if (!Language_Raw && ToReplace.find(__T("/"))!=Error) //Complex values, like XXX/YYY --> We translate both XXX and YYY
         {
-            Ztring ToReplace1=ToReplace.SubString(Ztring(), _T("/"));
-            Ztring ToReplace2=ToReplace.SubString(_T("/"), Ztring());
+            Ztring ToReplace1=ToReplace.SubString(Ztring(), __T("/"));
+            Ztring ToReplace2=ToReplace.SubString(__T("/"), Ztring());
             Info[StreamKind](Pos, Info_Name_Text)=Language.Get(ToReplace1);
-            Info[StreamKind](Pos, Info_Name_Text)+=_T("/");
+            Info[StreamKind](Pos, Info_Name_Text)+=__T("/");
             Info[StreamKind](Pos, Info_Name_Text)+=Language.Get(ToReplace2);
         }
         else
@@ -941,11 +1321,11 @@
 {
     CriticalSectionLocker CSL(CS);
 
-    if (Value.find(_T(" / "))==string::npos)
+    if (Value.find(__T(" / "))==string::npos)
         return Language.Get(Value);
 
     ZtringList List;
-    List.Separator_Set(0, _T(" / "));
+    List.Separator_Set(0, __T(" / "));
     List.Write(Value);
 
     //Per value
@@ -963,12 +1343,12 @@
         return EmptyString_Get();
 
     //Different Plurals are available or not?
-    if (Language_Get(Value+_T("1")).empty())
+    if (Language_Get(Value+__T("1")).empty())
     {
-        //if (Count==_T("0") || Count==_T("1"))
+        //if (Count==__T("0") || Count==__T("1"))
             return Count+Language_Get(Value);
         //else
-            //return Count+Language_Get(Value+_T("s"));
+            //return Count+Language_Get(Value+__T("s"));
     }
 
     //Detecting plural form for multiple plurals
@@ -979,7 +1359,7 @@
         //Polish has 2 plurial, Algorithm of Polish
         size_t CountI=Count.To_int32u();
         size_t Pos3=CountI/100;
-        int8u  Pos2=(int8u)((CountI-Pos3)/10);
+        int8u  Pos2=(int8u)((CountI-Pos3*100)/10);
         int8u  Pos1=(int8u)(CountI-Pos3*100-Pos2*10);
         if (Pos3==0)
         {
@@ -1036,21 +1416,21 @@
     Ztring DecimalPoint=Ztring().From_Number(0.0, 1).substr(1, 1); //Getting Decimal point
     size_t DotPos=ToReturn.find(DecimalPoint);
     if (DotPos!=string::npos)
-        ToReturn.FindAndReplace(DecimalPoint, Language_Get(_T("  Config_Text_FloatSeparator")), DotPos);
+        ToReturn.FindAndReplace(DecimalPoint, Language_Get(__T("  Config_Text_FloatSeparator")), DotPos);
     else
         DotPos=ToReturn.size();
     if (DotPos>3)
-        ToReturn.insert(DotPos-3, Language_Get(_T("  Config_Text_ThousandsSeparator")));
+        ToReturn.insert(DotPos-3, Language_Get(__T("  Config_Text_ThousandsSeparator")));
 
     //Selecting the form
          if (Form==0)
-        ToReturn =Language_Get(Value+_T("0")); //Only the translation
+        ToReturn =Language_Get(Value+__T("0")); //Only the translation
     else if (Form==1)
-        ToReturn+=Language_Get(Value+_T("1"));
+        ToReturn+=Language_Get(Value+__T("1"));
     else if (Form==2)
-        ToReturn+=Language_Get(Value+_T("2"));
+        ToReturn+=Language_Get(Value+__T("2"));
     else if (Form==3)
-        ToReturn+=Language_Get(Value+_T("3"));
+        ToReturn+=Language_Get(Value+__T("3"));
     else
         ToReturn+=Language_Get(Value);
     return ToReturn;
@@ -1059,16 +1439,16 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config::Inform_Set (const ZtringListList &NewValue)
 {
-    if (NewValue.Read(0, 0)==_T("Details"))
-        DetailsLevel_Set(NewValue.Read(0, 1).To_float32());
+    if (NewValue.Read(0, 0)==__T("Details"))
+        Trace_Level_Set(NewValue.Read(0, 1));
     else
     {
-        DetailsLevel_Set(0);
+        Trace_Level_Set(__T("0"));
 
         CriticalSectionLocker CSL(CS);
 
         //Inform
-        if (NewValue==_T("Summary"))
+        if (NewValue==__T("Summary"))
             MediaInfo_Config_Summary(Custom_View);
         else
             Custom_View=NewValue;
@@ -1079,7 +1459,7 @@
     //Parsing pointers to files in streams
     for (size_t Pos=0; Pos<Custom_View.size(); Pos++)
     {
-        if (Custom_View(Pos, 1).find(_T("file://"))==0)
+        if (Custom_View[Pos].size()>1 && Custom_View(Pos, 1).find(__T("file://"))==0)
         {
             //Open
             Ztring FileName(Custom_View(Pos, 1), 7, Ztring::npos);
@@ -1097,8 +1477,8 @@
             delete[] Buffer; //Buffer=NULL;
 
             //Merge
-            FromFile.FindAndReplace(_T("\r\n"), _T("\\r\\n"), 0, Ztring_Recursive);
-            FromFile.FindAndReplace(_T("\n"), _T("\\r\\n"), 0, Ztring_Recursive);
+            FromFile.FindAndReplace(__T("\r\n"), __T("\\r\\n"), 0, Ztring_Recursive);
+            FromFile.FindAndReplace(__T("\n"), __T("\\r\\n"), 0, Ztring_Recursive);
             Custom_View(Pos, 1)=FromFile;
         }
     }
@@ -1193,14 +1573,14 @@
     Ztring KindOfStreamS;
     switch (KindOfStream)
     {
-        case Stream_General  : KindOfStreamS=_T("G"); break;
-        case Stream_Video    : KindOfStreamS=_T("V"); break;
-        case Stream_Audio    : KindOfStreamS=_T("A"); break;
-        case Stream_Text     : KindOfStreamS=_T("T"); break;
-        case Stream_Image    : KindOfStreamS=_T("I"); break;
-        case Stream_Chapters : KindOfStreamS=_T("C"); break;
-        case Stream_Menu     : KindOfStreamS=_T("M"); break;
-        case Stream_Max      : KindOfStreamS=_T(" "); break;
+        case Stream_General  : KindOfStreamS=__T("G"); break;
+        case Stream_Video    : KindOfStreamS=__T("V"); break;
+        case Stream_Audio    : KindOfStreamS=__T("A"); break;
+        case Stream_Text     : KindOfStreamS=__T("T"); break;
+        case Stream_Image    : KindOfStreamS=__T("I"); break;
+        case Stream_Chapters : KindOfStreamS=__T("C"); break;
+        case Stream_Menu     : KindOfStreamS=__T("M"); break;
+        case Stream_Max      : KindOfStreamS=__T(" "); break;
     }
 
     return Codec.Get(Value, KindOfCodecInfo, KindOfStreamS, InfoCodec_KindOfStream);
@@ -1314,10 +1694,10 @@
     Ztring Value_Lower(Value);
     Value_Lower.MakeLowerCase();
 
-    for (Translation::iterator Trans=Info.begin(); Trans!=Info.end(); Trans++)
+    for (Translation::iterator Trans=Info.begin(); Trans!=Info.end(); ++Trans)
     {
         Trans->second.MakeLowerCase();
-        if (Trans->second==Value_Lower && Trans->first.find(_T("Language_"))==0)
+        if (Trans->second==Value_Lower && Trans->first.find(__T("Language_"))==0)
             return Trans->first.substr(9, string::npos);
     }
     return Ztring();
@@ -1419,7 +1799,7 @@
 
     for (size_t StreamKind=0; StreamKind<Stream_Max; StreamKind++)
     {
-        ToReturn(ToReturn_Pos, 0)=Info[StreamKind].Read(_T("StreamKind"), Info_Text);
+        ToReturn(ToReturn_Pos, 0)=Info[StreamKind].Read(__T("StreamKind"), Info_Text);
         ToReturn_Pos++;
         for (size_t Pos=0; Pos<Info[StreamKind].size(); Pos++)
             if (!Info[StreamKind].Read(Pos, Info_Name).empty())
@@ -1453,8 +1833,8 @@
     {
         ToReturn+=Temp->second.Read();
         ToReturn+=EOL;
-        Temp++;
-    }    
+        ++Temp;
+    }
 
     return ToReturn;
 }
@@ -1491,6 +1871,62 @@
     return FormatDetection_MaximumOffset;
 }
 
+#if MEDIAINFO_ADVANCED
+void MediaInfo_Config::VariableGopDetection_Occurences_Set (int64u Value)
+{
+    CriticalSectionLocker CSL(CS);
+    VariableGopDetection_Occurences=Value;
+}
+
+int64u MediaInfo_Config::VariableGopDetection_Occurences_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return VariableGopDetection_Occurences;
+}
+#endif // MEDIAINFO_ADVANCED
+
+#if MEDIAINFO_ADVANCED
+void MediaInfo_Config::VariableGopDetection_GiveUp_Set (bool Value)
+{
+    CriticalSectionLocker CSL(CS);
+    VariableGopDetection_GiveUp=Value;
+}
+
+bool MediaInfo_Config::VariableGopDetection_GiveUp_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return VariableGopDetection_GiveUp;
+}
+#endif // MEDIAINFO_ADVANCED
+
+#if MEDIAINFO_ADVANCED
+void MediaInfo_Config::InitDataNotRepeated_Occurences_Set (int64u Value)
+{
+    CriticalSectionLocker CSL(CS);
+    InitDataNotRepeated_Occurences=Value;
+}
+
+int64u MediaInfo_Config::InitDataNotRepeated_Occurences_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return InitDataNotRepeated_Occurences;
+}
+#endif // MEDIAINFO_ADVANCED
+
+#if MEDIAINFO_ADVANCED
+void MediaInfo_Config::InitDataNotRepeated_GiveUp_Set (bool Value)
+{
+    CriticalSectionLocker CSL(CS);
+    InitDataNotRepeated_GiveUp=Value;
+}
+
+bool MediaInfo_Config::InitDataNotRepeated_GiveUp_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return InitDataNotRepeated_GiveUp;
+}
+#endif // MEDIAINFO_ADVANCED
+
 void MediaInfo_Config::MpegTs_MaximumOffset_Set (int64u Value)
 {
     CriticalSectionLocker CSL(CS);
@@ -1503,5 +1939,365 @@
     return MpegTs_MaximumOffset;
 }
 
-} //NameSpace
+void MediaInfo_Config::MpegTs_MaximumScanDuration_Set (int64u Value)
+{
+    CriticalSectionLocker CSL(CS);
+    MpegTs_MaximumScanDuration=Value;
+}
+
+int64u MediaInfo_Config::MpegTs_MaximumScanDuration_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return MpegTs_MaximumScanDuration;
+}
+
+#if MEDIAINFO_ADVANCED
+void MediaInfo_Config::MpegTs_VbrDetection_Delta_Set (float64 Value)
+{
+    CriticalSectionLocker CSL(CS);
+    MpegTs_VbrDetection_Delta=Value;
+}
+
+float64 MediaInfo_Config::MpegTs_VbrDetection_Delta_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return MpegTs_VbrDetection_Delta;
+}
+#endif // MEDIAINFO_ADVANCED
+
+#if MEDIAINFO_ADVANCED
+void MediaInfo_Config::MpegTs_VbrDetection_Occurences_Set (int64u Value)
+{
+    CriticalSectionLocker CSL(CS);
+    MpegTs_VbrDetection_Occurences=Value;
+}
+
+int64u MediaInfo_Config::MpegTs_VbrDetection_Occurences_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return MpegTs_VbrDetection_Occurences;
+}
+#endif // MEDIAINFO_ADVANCED
+
+#if MEDIAINFO_ADVANCED
+void MediaInfo_Config::MpegTs_VbrDetection_GiveUp_Set (bool Value)
+{
+    CriticalSectionLocker CSL(CS);
+    MpegTs_VbrDetection_GiveUp=Value;
+}
+
+bool MediaInfo_Config::MpegTs_VbrDetection_GiveUp_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return MpegTs_VbrDetection_GiveUp;
+}
+#endif // MEDIAINFO_ADVANCED
+
+void MediaInfo_Config::MpegTs_ForceStreamDisplay_Set (bool Value)
+{
+    CriticalSectionLocker CSL(CS);
+    MpegTs_ForceStreamDisplay=Value;
+}
+
+bool MediaInfo_Config::MpegTs_ForceStreamDisplay_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return MpegTs_ForceStreamDisplay;
+}
+
+//***************************************************************************
+// SubFile
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+ZtringListList MediaInfo_Config::SubFile_Config_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+
+    return SubFile_Config;
+}
+
+//***************************************************************************
+// Custom mapping
+//***************************************************************************
+
+void MediaInfo_Config::CustomMapping_Set (const Ztring &Value)
+{
+    ZtringList List; List.Separator_Set(0, __T(","));
+    List.Write(Value);
+    if (List.size()==3)
+    {
+        CriticalSectionLocker CSL(CS);
+        CustomMapping[List[0]][List[1]]=List[2];
+    }
+}
+
+Ztring MediaInfo_Config::CustomMapping_Get (const Ztring &Format, const Ztring &Field)
+{
+    CriticalSectionLocker CSL(CS);
+    return CustomMapping[Format][Field];
+}
+
+bool MediaInfo_Config::CustomMapping_IsPresent(const Ztring &Format, const Ztring &Field)
+{
+    CriticalSectionLocker CSL(CS);
+    std::map<Ztring, std::map<Ztring, Ztring> >::iterator PerFormat=CustomMapping.find(Format);
+    if (PerFormat==CustomMapping.end())
+        return false;
+    std::map<Ztring, Ztring>::iterator PerField=PerFormat->second.find(Field);
+    if (PerField==PerFormat->second.end())
+        return false;
+    return true;
+}
+
+//***************************************************************************
+// Event
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_EVENTS
+bool MediaInfo_Config::Event_CallBackFunction_IsSet ()
+{
+    CriticalSectionLocker CSL(CS);
+
+    return Event_CallBackFunction?true:false;
+}
+#endif //MEDIAINFO_EVENTS
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_EVENTS
+Ztring MediaInfo_Config::Event_CallBackFunction_Set (const Ztring &Value)
+{
+    ZtringList List=Value;
+
+    CriticalSectionLocker CSL(CS);
 
+    if (List.empty())
+    {
+        Event_CallBackFunction=(MediaInfo_Event_CallBackFunction*)NULL;
+        Event_UserHandler=NULL;
+    }
+    else
+        for (size_t Pos=0; Pos<List.size(); Pos++)
+        {
+            if (List[Pos].find(__T("CallBack=memory://"))==0)
+                Event_CallBackFunction=(MediaInfo_Event_CallBackFunction*)Ztring(List[Pos].substr(18, std::string::npos)).To_int64u();
+            else if (List[Pos].find(__T("UserHandle=memory://"))==0)
+                Event_UserHandler=(void*)Ztring(List[Pos].substr(20, std::string::npos)).To_int64u();
+            else if (List[Pos].find(__T("UserHandler=memory://"))==0)
+                Event_UserHandler=(void*)Ztring(List[Pos].substr(21, std::string::npos)).To_int64u();
+            else
+                return("Problem during Event_CallBackFunction value parsing");
+        }
+
+    return Ztring();
+}
+#endif //MEDIAINFO_EVENTS
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_EVENTS
+Ztring MediaInfo_Config::Event_CallBackFunction_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+
+    return __T("CallBack=memory://")+Ztring::ToZtring((size_t)Event_CallBackFunction)+__T(";UserHandler=memory://")+Ztring::ToZtring((size_t)Event_UserHandler);
+}
+#endif //MEDIAINFO_EVENTS
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_EVENTS
+void MediaInfo_Config::Event_Send (const int8u* Data_Content, size_t Data_Size)
+{
+    CriticalSectionLocker CSL(CS);
+
+    if (Event_CallBackFunction)
+        Event_CallBackFunction ((unsigned char*)Data_Content, Data_Size, Event_UserHandler);
+}
+#endif //MEDIAINFO_EVENTS
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_EVENTS
+void MediaInfo_Config::Event_Send (const int8u* Data_Content, size_t Data_Size, const Ztring &File_Name)
+{
+    CriticalSectionLocker CSL(CS);
+
+    if (Event_CallBackFunction)
+        Event_CallBackFunction ((unsigned char*)Data_Content, Data_Size, Event_UserHandler);
+}
+#endif //MEDIAINFO_EVENTS
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_EVENTS
+void MediaInfo_Config::Log_Send (int8u Type, int8u Severity, int32u MessageCode, const Ztring &Message)
+{
+    struct MediaInfo_Event_Log_0 Event;
+    Event.EventCode=MediaInfo_EventCode_Create(MediaInfo_Parser_None, MediaInfo_Event_Log, 0);
+    Event.Type=Type;
+    Event.Severity=Severity;
+    Event.Reserved2=(int8u)-1;
+    Event.Reserved3=(int8u)-1;
+    Event.MessageCode=MessageCode;
+    Event.Reserved4=(int32u)-1;
+    wstring MessageU=Message.To_Unicode();
+    string MessageA=Message.To_Local();
+    Event.MessageStringU=MessageU.c_str();
+    Event.MessageStringA=MessageA.c_str();
+    Event_Send((const int8u*)&Event, sizeof(MediaInfo_Event_Log_0));
+}
+#endif //MEDIAINFO_EVENTS
+
+//***************************************************************************
+// Curl
+//***************************************************************************
+
+#if defined(MEDIAINFO_LIBCURL_YES)
+void MediaInfo_Config::Ssh_PublicKeyFileName_Set (const Ztring &Value)
+{
+    CriticalSectionLocker CSL(CS);
+    Ssh_PublicKeyFileName=Value;
+}
+
+Ztring MediaInfo_Config::Ssh_PublicKeyFileName_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return Ssh_PublicKeyFileName;
+}
+
+void MediaInfo_Config::Ssh_PrivateKeyFileName_Set (const Ztring &Value)
+{
+    CriticalSectionLocker CSL(CS);
+    Ssh_PrivateKeyFileName=Value;
+}
+
+Ztring MediaInfo_Config::Ssh_PrivateKeyFileName_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return Ssh_PrivateKeyFileName;
+}
+
+void MediaInfo_Config::Ssh_KnownHostsFileName_Set (const Ztring &Value)
+{
+    if (Value.empty())
+        return; //empty value means "disable security" for libcurl, not acceptable
+
+    CriticalSectionLocker CSL(CS);
+    Ssh_KnownHostsFileName=Value;
+}
+
+Ztring MediaInfo_Config::Ssh_KnownHostsFileName_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return Ssh_KnownHostsFileName;
+}
+
+void MediaInfo_Config::Ssh_IgnoreSecurity_Set (bool Value)
+{
+    CriticalSectionLocker CSL(CS);
+    Ssh_IgnoreSecurity=Value;
+}
+
+bool MediaInfo_Config::Ssh_IgnoreSecurity_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return Ssh_IgnoreSecurity;
+}
+
+void MediaInfo_Config::Ssl_CertificateFileName_Set (const Ztring &Value)
+{
+    CriticalSectionLocker CSL(CS);
+    Ssl_CertificateFileName=Value;
+}
+
+Ztring MediaInfo_Config::Ssl_CertificateFileName_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return Ssl_CertificateFileName;
+}
+
+void MediaInfo_Config::Ssl_CertificateFormat_Set (const Ztring &Value)
+{
+    CriticalSectionLocker CSL(CS);
+    Ssl_CertificateFormat=Value;
+}
+
+Ztring MediaInfo_Config::Ssl_CertificateFormat_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return Ssl_CertificateFormat;
+}
+
+void MediaInfo_Config::Ssl_PrivateKeyFileName_Set (const Ztring &Value)
+{
+    CriticalSectionLocker CSL(CS);
+    Ssl_PrivateKeyFileName=Value;
+}
+
+Ztring MediaInfo_Config::Ssl_PrivateKeyFileName_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return Ssl_PrivateKeyFileName;
+}
+
+void MediaInfo_Config::Ssl_PrivateKeyFormat_Set (const Ztring &Value)
+{
+    CriticalSectionLocker CSL(CS);
+    Ssl_PrivateKeyFormat=Value;
+}
+
+Ztring MediaInfo_Config::Ssl_PrivateKeyFormat_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return Ssl_PrivateKeyFormat;
+}
+
+void MediaInfo_Config::Ssl_CertificateAuthorityFileName_Set (const Ztring &Value)
+{
+    CriticalSectionLocker CSL(CS);
+    Ssl_CertificateAuthorityFileName=Value;
+}
+
+Ztring MediaInfo_Config::Ssl_CertificateAuthorityFileName_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return Ssl_CertificateAuthorityFileName;
+}
+
+void MediaInfo_Config::Ssl_CertificateAuthorityPath_Set (const Ztring &Value)
+{
+    CriticalSectionLocker CSL(CS);
+    Ssl_CertificateAuthorityPath=Value;
+}
+
+Ztring MediaInfo_Config::Ssl_CertificateAuthorityPath_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return Ssl_CertificateAuthorityPath;
+}
+
+void MediaInfo_Config::Ssl_CertificateRevocationListFileName_Set (const Ztring &Value)
+{
+    CriticalSectionLocker CSL(CS);
+    Ssl_CertificateRevocationListFileName=Value;
+}
+
+Ztring MediaInfo_Config::Ssl_CertificateRevocationListFileName_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return Ssl_CertificateRevocationListFileName;
+}
+
+void MediaInfo_Config::Ssl_IgnoreSecurity_Set (bool Value)
+{
+    CriticalSectionLocker CSL(CS);
+    Ssl_IgnoreSecurity=Value;
+}
+
+bool MediaInfo_Config::Ssl_IgnoreSecurity_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return Ssl_IgnoreSecurity;
+}
+
+#endif //defined(MEDIAINFO_LIBCURL_YES)
+
+} //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/MediaInfo_Config.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/MediaInfo_Config.h Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/MediaInfo_Config_Automatic.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/MediaInfo_Config_Automatic.cpp Changed

@@ -1,19 +1,19 @@
-// Helpers - Automaticly generated methods for MediaInfo
-// Copyright (C) 2005-2007 Jerome Martinez, Zen@MediaArea.net
+// File__Analyze - Base for analyze files
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
+// 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
+// any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
+// 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, see <http://www.gnu.org/licenses/>.
 //
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -25,6 +25,7 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/PreComp.h"
 #include "ZenLib/ZtringListList.h"
 #include "ZenLib/InfoMap.h"
 #include "ZenLib/Translation.h"
@@ -37,14 +38,14 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_DefaultLanguage (Translation &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
     "  Language_ISO639;en\n"
     "  Author_Email;Zen@mediaarea.net\n"
     "  Author_Name;Zen\n"
     "  Author_OldNames;Initial translator\n"
     "  Language_Name;English\n"
-    "  Config_Text_ColumnSize;32\n"
+    "  Config_Text_ColumnSize;40\n"
     "  Config_Text_Separator; : \n"
     "  Config_Text_NumberTag; #\n"
     "  Config_Text_FloatSeparator;.\n"
@@ -146,9 +147,9 @@
     " MiB; MiB\n"
     " Mib; Mib\n"
     " MiBps; MiBps\n"
-    " milisecond1; milisecond\n"
-    " milisecond2; miliseconds\n"
-    " milisecond3; miliseconds\n"
+    " millisecond1; millisecond\n"
+    " millisecond2; milliseconds\n"
+    " millisecond3; milliseconds\n"
     " minute1; minute\n"
     " minute2; minutes\n"
     " minute3; minutes\n"
@@ -185,6 +186,8 @@
     "About;About\n"
     "About_Hint;How to contact me and find last version\n"
     "Accompaniment;Accompaniment\n"
+    "ActiveFormatDescription;Active Format Description\n"
+    "ActiveFormatDescription_MuxingMode;Active Format Description, Muxing mode\n"
     "Actor;Actor\n"
     "Actor_Character;Character played\n"
     "Added_Date;Added date\n"
@@ -224,7 +227,9 @@
     "BitRate_Mode_CBR;Constant\n"
     "BitRate_Mode_VBR;Variable\n"
     "BitRate_Nominal;Nominal bit rate\n"
+    "BitRate_Encoded;Encoded bit rate\n"
     "Bits-(Pixel*Frame);Bits/(Pixel*Frame)\n"
+    "BufferSize;Buffer size\n"
     "Cancel;Cancel\n"
     "Channel(s);Channel(s)\n"
     "ChannelPositions;Channel positions\n"
@@ -273,9 +278,13 @@
     "colour_primaries;Color primaries\n"
     "Comment;Comment\n"
     "CommissionedBy;Commissioned by\n"
+    "Compilation;Compilation\n"
     "CompleteName;Complete name\n"
     "Composer;Composer\n"
-    "CompressionRatio;Compression ratio\n"
+    "Compression_Mode;Compression mode\n"
+    "Compression_Mode_Lossless;Lossless\n"
+    "Compression_Mode_Lossy;Lossy\n"
+    "Compression_Ratio;Compression ratio\n"
     "Conductor;Conductor\n"
     "Container and general information;Container and general information\n"
     "ContentType;ContentType\n"
@@ -296,6 +305,9 @@
     "Debug;Debug\n"
     "Decimal point;Decimal point\n"
     "Delay;Delay\n"
+    "Delay_Source;Delay, origin\n"
+    "Delay_Source_Container;Container\n"
+    "Delay_Source_Stream;Raw stream\n"
     "Delete;Delete\n"
     "Description;Description\n"
     "Digitized_Date;Digitized date\n"
@@ -334,7 +346,7 @@
     "File_Append;Append to the existing file (Warning : be careful to have the same parameters)\n"
     "File_Created_Date;File creation date\n"
     "File_Created_Date_Local;File creation date (local)\n"
-    "File_Hint;Select a multimedia file to study\n"
+    "File_Hint;Select a multimedia file to examine\n"
     "File_Modified_Date;File last modification date\n"
     "File_Modified_Date_Local;File last modification date (local)\n"
     "FileExtension;File extension\n"
@@ -342,11 +354,13 @@
     "FileSize;File size\n"
     "Folder;Folder\n"
     "Folder (R);Folder (R)\n"
-    "Folder (R)_Hint;Select a folder to study (with all folders recursively)\n"
+    "Folder (R)_Hint;Select a folder to examine (with all folders recursively)\n"
     "Folder (Recursively);Folder (Recursively)\n"
-    "Folder_Hint;Select a folder to study\n"
+    "Folder_Hint;Select a folder to examine\n"
     "FolderName;Folder name\n"
     "Format;Format\n"
+    "Format_Commercial;Commercial name\n"
+    "Format_Commercial_IfAny;Commercial name\n"
     "Format_Description;Format description\n"
     "Format_Info;Details for format\n"
     "Format_Profile;Format profile\n"
@@ -528,7 +542,7 @@
     "Genre_138;Black Metal\n"
     "Genre_139;Crossover\n"
     "Genre_140;Contemporary Christian\n"
-    "Genre_141;Christian Rock \n"
+    "Genre_141;Christian Rock\n"
     "Genre_142;Merengue\n"
     "Genre_143;Salsa\n"
     "Genre_144;Trash Metal\n"
@@ -536,6 +550,7 @@
     "Genre_146;JPop\n"
     "Genre_147;Synthpop\n"
     "Go to WebSite;Go to website\n"
+    "Grouping;Grouping\n"
     "h;h\n"
     "Header file;Create a header file\n"
     "Height;Height\n"
@@ -560,9 +575,11 @@
     "Interlaced_BFF;Bottom Field First\n"
     "Interlaced_PPF;Progressive\n"
     "Interlaced_Progressive;Progressive\n"
+    "Interleaved;Interleaved\n"
     "Interleave_Duration;Interleave, duration\n"
     "Interleave_Preload;Interleave, preload duration\n"
     "Interleave_VideoFrames;Interleave, duration\n"
+    "InternetMediaType;Internet media type\n"
     "IRCA;IRCA\n"
     "ISBN;ISBN\n"
     "ISRC;ISRC\n"
@@ -908,13 +925,20 @@
     "Sharpness;Sharpness\n"
     "Sheet;Sheet\n"
     "Sheet (Complete);Sheet (Complete)\n"
-    "Shell extension;Shell extension (in Explorer, right click there will be a MediaInfo option)\n"
+    "Shell extension;Explorer extension (in Windows Explorer, right click on a file, there will be a MediaInfo option)\n"
     "Shell extension, folder;For folders too\n"
-    "Shell InfoTip;Shell InfoTip (in Explorer, move the mouse over the file, info will be displayed)\n"
+    "Shell InfoTip;Explorer Tooltip (in Windows Explorer, move the mouse over the file, info will be displayed)\n"
     "Show menu;Show menu\n"
     "Show toolbar;Show toolbar\n"
     "Sort;Sorted by\n"
+    "SamplingCount;Samples count\n"
     "SoundEngineer;Sound engineer\n"
+    "Source;Source\n"
+    "Source_Duration;Source duration\n"
+    "Source_FrameCount;Source frame count\n"
+    "Source_SamplingCount;Source sample count\n"
+    "Source_StreamSize;Source stream size\n"
+    "Source_StreamSize_Encoded;Source encoded stream size\n"
     "Standard;Standard\n"
     "Stream;Stream\n"
     "Stream_MoreInfo;More information about the stream\n"
@@ -924,6 +948,7 @@
     "StreamKindID;Stream identifier\n"
     "StreamKindPos;Stream identifier\n"
     "StreamSize;Stream size\n"
+    "StreamSize_Encoded;Encoded stream size\n"
     "StreamSize_Proportion;Proportion of this stream\n"
     "Subject;Subject\n"
     "SubTrack;SubTrack\n"
@@ -959,12 +984,13 @@
     "Translator;Translator\n"
     "Tree;Tree\n"
     "Tree & Text;Tree & Text\n"
+    "UniqueID;Unique ID\n"
     "Unknown;Unknown\n"
     "Url;Url\n"
     "Video;Video\n"
     "Video stream(s);Video stream(s)\n"
     "Video_Codec_List;Codecs Video\n"
-    "Video_Delay;Video delay\n"
+    "Video_Delay;Delay relative to video\n"
     "Video_No;No video\n"
     "Video0_Delay;Video0 delay\n"
     "Video1;First video stream\n"
@@ -1000,127 +1026,143 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_Format (InfoMap &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
-    "AIFF;;;M;Riff;Apple/SGI;aiff aifc aif;audio/x-aiff\n"
+    "AIFF;;;M;Riff;Apple/SGI;aiff aifc aif;audio/x-aiff;\n"
     "AMV;;;M;Riff;Chinese hack of AVI;amv;;http://en.wikipedia.org/wiki/AMV_video_format\n"
-    "AVI;;;M;Riff;Audio Video Interleave;avi;video/vnd.avi\n"
-    "BDAV;;;M;Bdav;Blu-ray Video;m2ts\n"
-    "Blu-ray Clip info;;;M;Bdmv;;clpi\n"
-    "Blu-ray Index;;;M;Bdmv;;bdmv\n"
-    "Blu-ray Movie object;;;M;Bdmv;;bdmv\n"
-    "Blu-ray Playlist;;;M;Bdmv;;mpls\n"
-    "CDXA;;;M;Cdxa;;dat\n"
-    "DV;;;M;DvdDif;;dv dif;video/DV\n"
+    "AVI;;;M;Riff;Audio Video Interleave;avi;video/vnd.avi;\n"
+    "BDAV;;;M;Bdav;Blu-ray Video;m2ts;;\n"
+    "Blu-ray Clip info;;;M;Bdmv;;clpi;;\n"
+    "Blu-ray Index;;;M;Bdmv;;bdmv;;\n"
+    "Blu-ray Movie object;;;M;Bdmv;;bdmv;;\n"
+    "Blu-ray Playlist;;;M;Bdmv;;mpls;;\n"
+    "CDDA;;;M;Riff;;cda;;\n"
+    "CDXA;;;M;Cdxa;;dat;;\n"
+    "DV;;;M;DvdDif;;dv dif;video/DV;;Lossy\n"
     "DivX;;;M;Riff;Hack of AVI;divx;video/vnd.avi;http://www.divx.com\n"
-    "DPG;;;M;Dpg;Nintendo DS;dpg\n"
-    "DVD Video;;;M;Dvdv;;ifo\n"
+    "DPG;;;M;Dpg;Nintendo DS;dpg;;\n"
+    "DVD Video;;;M;Dvdv;;ifo;;\n"
     "Flash Video;;;M;Flv;;flv;application/x-shockwave-flash;http://www.macromedia.com/go/getflashplayer\n"
-    "GXF;;;M;Gxf;SMPTE 360M;gxf\n"
+    "GXF;;;M;Gxf;SMPTE 360M;gxf;;\n"
+    "HLS;;;M;Hls;;m3u8;\n"
     "Google Video;;;M;Riff;Hack of AVI;gvi;;http://video.google.com/playerdownload.html\n"
-    "LXF;;;M;Lxf;;lxf;video/lxf\n"
-    "Matroska;;;M;Mk;;mkv mka mks;;http://packs.matroska.org/\n"
-    "MPEG-PS;;;M;MpegPs;;mpeg mpg m2p vob pss;video/MP2P\n"
-    "MPEG-TS;;;M;MpegTs;;ts m2t m2s m4t m4s ts tp trp;video/MP2T\n"
-    "MPEG-4;;;M;Mpeg4;;mp4 m4v m4a m4p 3gpp 3gp 3gpp2 3g2 k3g jpm jpx mqv ismv isma f4v;video/mp4\n"
+    "ISM;Internet Streaming Media;;M;Ism;;ism;;\n"
+    "IVF;;;M;Ivf;;ivf;;\n"
+    "LXF;;;M;Lxf;;lxf;video/lxf;\n"
+    "Matroska;;;M;Mk;;mkv mk3d mka mks;;http://packs.matroska.org/\n"
+    "MPEG-PS;;;M;MpegPs;;mpeg mpg m2p vob pss;video/MP2P;\n"
+    "MPEG-TS;;;M;MpegTs;;ts m2t m2s m4t m4s ts tp trp;video/MP2T;\n"
+    "MPEG-4;;;M;Mpeg4;;mp4 m4v m4a m4b m4p 3gpp 3gp 3gpp2 3g2 k3g jpm jpx mqv ismv isma f4v;video/mp4;\n"
     "MTV;;;M;Other;Chinese hack of MPEG-1 layer 3;mtv;;http://en.wikipedia.org/wiki/Chinese_MP4/MTV_Player\n"
-    "MXF;;;M;Mxf;;mxf;application/mxf\n"
+    "MXF;;;M;Mxf;;mxf;application/mxf;\n"
     "NSV;;;M;Nsv;Nullsoft Streaming Video;nsv;;http://winamp.com\n"
-    "Ogg;;;M;Ogg;;ogg ogm;video/ogg;http://www.free-codecs.com/Ogg_DirectShow_Filters_download.htm\n"
+    "Ogg;;;M;Ogg;;ogg ogm opus;video/ogg;http://www.free-codecs.com/Ogg_DirectShow_Filters_download.htm\n"
     "QuickTime;;;M;Mpeg4;Original Apple specifications;mov qt;video/quicktime;http://www.apple.com/quicktime/download/standalone.html\n"
-    "RealMedia;;;M;Rm;;rm rmvb ra;application/vnd.rn-realmedia\n"
-    "RIFF-MMP;;;M;Riff;RIFF Multimedia Movie\n"
+    "RealMedia;;;M;Rm;;rm rmvb ra;application/vnd.rn-realmedia;\n"
+    "RIFF-MMP;;;M;Riff;RIFF Multimedia Movie;;;\n"
     "ShockWave;;;M;Swf;;swf;application/x-shockwave;http://www.macromedia.com/go/getflashplayer\n"
     "SKM;;;M;Skm;Sky Korean Mobilephone;skm;;http://www.isky.co.kr/html/cs/download.jsp\n"
-    "Windows Media;;;M;Wm;;asf wmv wma;video/x-ms-wmv\n"
+    "Windows Media;;;M;Wm;;asf wmv wma;video/x-ms-wmv;\n"
     "WebM;;;M;Mkv;;webm;video/webm;http://www.webmproject.org/\n"
     "AVC;;;V;Avc;Advanced Video Codec;avc h264;video/H264;http://developers.videolan.org/x264.html\n"
-    "AVS Video;;;V;AvsV;Audio Video Standart, Video part;;;http://www.avs.org.cn/\n"
-    "Dirac;;;V;Dirac;;drc;;http://diracvideo.org/\n"
-    "FLC;;;V;Flic;;fli flc;;http://www.chem.nott.ac.uk/flc.html\n"
-    "FLI;;;V;Flic;;fli flc;;http://www.chem.nott.ac.uk/flc.html\n"
-    "FLIC;;;V;Flic;;fli flc;;http://www.chem.nott.ac.uk/flc.html\n"
-    "H.261;;;V;;;h261;video/H261\n"
-    "H.263;;;V;;;h263;video/H263\n"
-    "M-JPEG;;;V;;;;video/JPEG\n"
-    "M-JPEG 2000;;;V;;;;video/MJ2\n"
-    "MPEG Video;;;V;Mpegv;;mpgv mpv mp1v m1v mp2v m2v;video/MPV\n"
-    "MPEG-4 Visual;;;V;Mpeg4;;m4v mp4v;video/MP4V-ES\n"
-    "Theora;;;V\n"
-    "VC-1;;;V;Vc1;;vc1;video/vc1\n"
-    "VP8;;;V;;;;;http://www.webmproject.org/\n"
-    "AAC;;;A;;Advanced Audio Codec;aac\n"
-    "AC-3;;;A;Ac3;Audio Coding 3;ac3\n"
-    "ADIF;;;A;Adif;Audio Data Interchange Format;aac\n"
-    "ADTS;;;A;Adts;Audio Data Transport Stream;aac\n"
-    "ALS;;;A;Als;MPEG-4 Audio Lossless Coding;als;;http://www.nue.tu-berlin.de/forschung/projekte/lossless/mp4als.html#downloads\n"
+    "AVS Video;;;V;AvsV;Audio Video Standart, Video part;;;http://www.avs.org.cn/;Lossy\n"
+    "Dirac;;;V;Dirac;;drc;;http://diracvideo.org/;Lossy\n"
+    "FFV1;;;V;;;;;;Lossless\n"
+    "FFV2;;;V;;;;;;Lossless\n"
+    "FLC;;;V;Flic;;fli flc;;http://www.chem.nott.ac.uk/flc.html;Lossy\n"
+    "FLI;;;V;Flic;;fli flc;;http://www.chem.nott.ac.uk/flc.html;Lossy\n"
+    "FLIC;;;V;Flic;;fli flc;;http://www.chem.nott.ac.uk/flc.html;Lossy\n"
+    "H.261;;;V;;;h261;video/H261;;Lossy\n"
+    "H.263;;;V;;;h263;video/H263;;Lossy\n"
+    "MPEG Video;;;V;Mpegv;;mpgv mpv mp1v m1v mp2v m2v;video/MPV;;Lossy\n"
+    "MPEG-4 Visual;;;V;Mpeg4;;m4v mp4v;video/MP4V-ES;;Lossy\n"
+    "Theora;;;V;;;;;http://www.theora.org/;Lossy\n"
+    "VC-1;;;V;Vc1;;vc1;video/vc1;;Lossy\n"
+    "YUV4MPEG2;;;V;Y4m;;y4m;;;Lossless\n"
+    "VP8;;;V;;;;;http://www.webmproject.org/;Lossy\n"
+    "YUV;;;V;;;;;;Lossless\n"
+    "AAC;;;A;;Advanced Audio Codec;aac;;;Lossy\n"
+    "AC-3;;;A;Ac3;Audio Coding 3;ac3;;;Lossy\n"
+    "ADIF;;;A;Adif;Audio Data Interchange Format;aac;;\n"
+    "ADTS;;;A;Adts;Audio Data Transport Stream;aac;;\n"
+    "ALS;;;A;Als;MPEG-4 Audio Lossless Coding;als;;http://www.nue.tu-berlin.de/forschung/projekte/lossless/mp4als.html#downloads;Lossless\n"
     "AMR;;;A;Amr;Adaptive Multi-Rate;amr;audio/AMR;http://www.apple.com/quicktime/download/standalone.html\n"
-    "Atrac;;;A;;;;audio/ATRAC\n"
-    "Atrac3;;;A;;;;audio/ATRAC3\n"
-    "AU;;;A;Au;uLaw/AU Audio File;au;audio/basic\n"
-    "DTS;;;A;Dts;Digital Theater Systems;dts\n"
-    "DTS-HD;;;A;Dts;Digital Theater Systems;dts\n"
-    "E-AC-3;;;A;Ac3;Audio Coding 3;dd+;audio/eac3\n"
-    "Extended Module;;;A;ExtendedModule;;xm\n"
+    "Atrac;;;A;;;;audio/ATRAC;;Lossy\n"
+    "Atrac3;;;A;;;;audio/ATRAC3;;Lossy\n"
+    "AU;;;A;Au;uLaw/AU Audio File;au;audio/basic;\n"
+    "DolbyE;;;A;Aes3;;dde\n"
+    "DTS;;;A;Dts;Digital Theater Systems;dts;;;Lossy\n"
+    "DTS-HD;;;A;Dts;Digital Theater Systems;dts;;;Lossy\n"
+    "E-AC-3;;;A;Ac3;Audio Coding 3;dd+ ec3;audio/eac3;;Lossy\n"
+    "Extended Module;;;A;ExtendedModule;;xm;;\n"
     "FLAC;;;A;Flac;Free Lossless Audio Codec;flac;;http://flac.sourceforge.net/\n"
-    "G.719;;;A;;;;audio/G719\n"
-    "G.722;;;A;;;;audio/G722\n"
-    "G.722.1;;;A;;;;audio/G7221\n"
-    "G.723;;;A;;;;audio/G723\n"
-    "G.729;;;A;;;;audio/G729\n"
-    "G.729.1;;;A;;;;audio/G7291\n"
-    "Impulse Tracker;;;A;ImpulseTracker;;it\n"
-    "LA;;;A;La;Lossless Audio Codec;la;;http://www.lossless-audio.com/\n"
-    "MIDI;;;A;Riff;RIFF Musical Instrument Digital Interface;midi mid kar;audio/midi\n"
-    "Module;;;A;Module;;mod\n"
-    "Monkey's Audio;;;A;Ape;;ape mac;;http://www.monkeysaudio.com/\n"
-    "MPEG Audio;;;A;Mpega;;m1a mpa1 mp1 m2a mpa2 mp2 mp3;audio/mpeg\n"
-    "Musepack SV7;;;A;Mpc;;mpc;;http://www.musepack.net\n"
-    "Musepack SV8;;;A;Mpc;;mp+;;http://www.musepack.net\n"
-    "QCELP;;;A;;;;audio/QCELP\n"
-    "RIFF-MIDI;;;A;Riff;RIFF Musical Instrument Digital Interface\n"
-    "Scream Tracker 3;;;A;S3m;;s3m\n"
-    "Shorten;;;A;;;shn;;http://etree.org/shnutils/shorten/\n"
-    "SLS;;;A;;MPEG-4 Scalable Lossless Coding;sls;;http://www.chiariglione.org/mpeg/technologies/mp04-sls/index.htm\n"
-    "Speex;;;A;;;;audio/speex\n"
-    "TAK;;;A;;;tak;;http://thbeck.de/Tak/Tak.html\n"
-    "TrueHD;;;A;Ac3;;dts\n"
+    "G.719;;;A;;;;audio/G719;;Lossy\n"
+    "G.722;;;A;;;;audio/G722;;Lossy\n"
+    "G.722.1;;;A;;;;audio/G7221;;Lossy\n"
+    "G.723;;;A;;;;audio/G723;;Lossy\n"
+    "G.729;;;A;;;;audio/G729;;Lossy\n"
+    "G.729.1;;;A;;;;audio/G7291;;Lossy\n"
+    "Impulse Tracker;;;A;ImpulseTracker;;it;;\n"
+    "LA;;;A;La;Lossless Audio Codec;la;;http://www.lossless-audio.com/;Lossless\n"
+    "MIDI;;;A;Riff;RIFF Musical Instrument Digital Interface;midi mid kar;audio/midi;\n"
+    "Module;;;A;Module;;mod;;\n"
+    "Monkey's Audio;;;A;Ape;;ape mac;;http://www.monkeysaudio.com/;Lossless\n"
+    "MPEG Audio;;;A;Mpega;;m1a mpa1 mp1 m2a mpa2 mp2 mp3;audio/mpeg;;Lossy\n"
+    "Musepack SV7;;;A;Mpc;;mpc;;http://www.musepack.net;Lossy\n"
+    "Musepack SV8;;;A;Mpc;;mp+;;http://www.musepack.net;Lossy\n"
+    "QCELP;;;A;;;;audio/QCELP;\n"
+    "RIFF-MIDI;;;A;Riff;RIFF Musical Instrument Digital Interface;;;\n"
+    "RKAU;RK Audio;;A;Rkau;;rka;;http://www.msoftware.co.nz\n"
+    "Scream Tracker 3;;;A;S3m;;s3m;;\n"
+    "Shorten;;;A;;;shn;;http://etree.org/shnutils/shorten/;Lossless\n"
+    "SLS;;;A;;MPEG-4 Scalable Lossless Coding;sls;;http://www.chiariglione.org/mpeg/technologies/mp04-sls/index.htm;Lossless\n"
+    "Speex;;;A;;;;audio/speex;http://www.speex.org/;Lossy\n"
+    "Opus;;;A;;;;audio/opus;http://opus-codec.org/;Lossy\n"
+    "TAK;;;A;;;tak;;http://thbeck.de/Tak/Tak.html;Lossless\n"
+    "TrueHD;;;A;Ac3;;dts;;;Lossless\n"
     "TwinVQ;;;A;TwinVQ;Transform domain Weighted INterleave Vector Quantization;vqf;;http://www.twinvq.org/english/index_en.html\n"
-    "Vorbis;;;A;;;;audio/vorbis\n"
-    "Wave;;;A;Riff;;wav;audio/vnd.wave\n"
-    "Wave64;;;A;Riff;;w64\n"
+    "Vorbis;;;A;;;;audio/vorbis;http://www.vorbis.com/;Lossy\n"
+    "Wave;;;A;Riff;;wav;audio/vnd.wave;\n"
+    "Wave64;;;A;Riff;;w64;;\n"
     "WavPack;;;A;Wvpk;;wv wvc;;http://www.wavpack.com\n"
-    "Bitmap;;;I;Bmp;;bmp;image/bmp\n"
-    "DIB;;;I;Riff;RIFF Device Independent Bitmap\n"
-    "GIF;;;I;Gif;Graphics Interchange Format;gif;image/gif\n"
-    "ICO;;;I;Ico;;ico;image/vnd.microsoft.icon\n"
-    "JNG;;;I;Jng;JPEG Network Graphic;jng\n"
-    "JPEG;;;I;Jpeg;;jpeg jpg jpe;image/jpeg\n"
-    "JPEG2000;;;I;Jpeg;;jp2;image/jp2;http://www.morgan-multimedia.com/JPEG2000/\n"
-    "LZ77;;;I\n"
-    "MNG;;;I;Mng;Multiple-Image Network Graphic;mng\n"
-    "PNG;;;I;Png;Portable Network Graphic;png;image/png\n"
-    "RIFF Palette;;;I;Riff;RIFF Palette\n"
-    "RLE;;;I;;Run-length encoding;rle\n"
-    "TIFF;;;I;Tiff;;tiff tif;image/tiff\n"
+    "Bitmap;;;I;Bmp;;bmp;image/bmp;;Lossless\n"
+    "DPX;;;I;Dpx;;dpx cin;;;Lossless\n"
+    "EXR;;;I;Exr;;exr;;;Lossless\n"
+    "DIB;;;I;Riff;RIFF Device Independent Bitmap;;;;Lossless\n"
+    "GIF;;;I;Gif;Graphics Interchange Format;gif;image/gif;;Lossless\n"
+    "ICO;;;I;Ico;;ico;image/vnd.microsoft.icon;;Lossless\n"
+    "JNG;;;I;Jng;JPEG Network Graphic;jng;;;Lossy\n"
+    "JPEG;;;I;Jpeg;;jpeg jpg jpe;image/jpeg;;Lossy\n"
+    "JPEG 2000;;;I;Jpeg;;jp2;image/jp2;http://www.morgan-multimedia.com/JPEG 2000/\n"
+    "LZ77;;;I;;;;;\n"
+    "MNG;;;I;Mng;Multiple-Image Network Graphic;mng;;;Lossless\n"
+    "PCX;;;I;pcx;Personal Computer eXchange;pcx;image/pcx;;Lossless\n"
+    "PNG;;;I;Png;Portable Network Graphic;png;image/png;;Lossless\n"
+    "PSD;;;I;Psd;Photoshop File Format;psd;image/psd;http://www.adobe.com/;Lossless\n"
+    "RIFF Palette;;;I;Riff;RIFF Palette;;;\n"
+    "RLE;;;I;;Run-length encoding;rle;;\n"
+    "TIFF;;;I;Tiff;;tiff tif;image/tiff;\n"
+    "TGA;;;I;Tga;;tga;image/tga;\n"
     "7-Zip;;;C;7z;;7z;;http://7-zip.org\n"
     "ACE;;;C;Ace;;ace;;http://winace.com\n"
-    "ELF;;;C;Elf;;so\n"
-    "MZ;;;C;Mz;;exe dll\n"
+    "ELF;;;C;Elf;;so;;\n"
+    "ISO 9660;;;C;Iso9660;;iso;;\n"
+    "MZ;;;C;Mz;;exe dll;;\n"
     "RAR;;;C;Rar;From Rarlabs;rar;application/x-rar-compressed;http://rarlabs.com\n"
     "ZIP;;;C;Zip;;zip;application/zip;http://winzip.com\n"
-    "Adobe encore DVD;;;T;Other;;txt;;http://www.adobe.fr/products/encore/\n"
-    "AQTitle;;;T;Other;;aqt;;http://www.volny.cz/aberka/czech/aqt.html\n"
-    "ASS;;;T;Other;;ssa;;http://ffdshow.sourceforge.net/tikiwiki/tiki-index.php?page=Getting+ffdshow\n"
-    "Captions 32;;;T;Other;;txt\n"
-    "Captions Inc;;;T;Other;;txt\n"
-    "CPC Captioning;;;T;Other;;txt;;http://www.cpcweb.com/Captioning/cap_software.htm\n"
-    "Cheeta;;;T;Other;;asc\n"
-    "SSA;;;T;Other;;ssa;;http://ffdshow.sourceforge.net/tikiwiki/tiki-index.php?page=Getting+ffdshow\n"
-    "SubRip;;;T;Other;;srt;;http://ffdshow.sourceforge.net/tikiwiki/tiki-index.php?page=Getting+ffdshow\n"
+    "Adobe encore DVD;;;T;Other;;txt;;http://www.adobe.fr/products/encore/;Lossless\n"
+    "AQTitle;;;T;Other;;aqt;;http://www.volny.cz/aberka/czech/aqt.html;Lossless\n"
+    "ASS;;;T;Other;;ssa;;http://ffdshow.sourceforge.net/tikiwiki/tiki-index.php?page=Getting+ffdshow;Lossless\n"
+    "Captions 32;;;T;Other;;txt;;;Lossless\n"
+    "Captions Inc;;;T;Other;;txt;;;Lossless\n"
+    "CPC Captioning;;;T;Other;;txt;;http://www.cpcweb.com/Captioning/cap_software.htm;Lossless\n"
+    "Cheeta;;;T;Other;;asc;;;Lossless\n"
+    "SSA;;;T;Other;;ssa;;http://ffdshow.sourceforge.net/tikiwiki/tiki-index.php?page=Getting+ffdshow;Lossless\n"
+    "SubRip;;;T;Other;;srt;;http://ffdshow.sourceforge.net/tikiwiki/tiki-index.php?page=Getting+ffdshow;Lossless\n"
     "Blender;;;O;Other;;blenders;;http://www.blender3d.com\n"
     "AutoCAD;;;O;Other;;;;http://www.autodesk.com\n"
-    "N19;;;T;N19;;stl\n"
+    "N19;;;T;N19;;stl;;;Lossless\n"
+    "PlayLater Video;;;V;Other;;;;http://www.playon.tv/playlater\n"
     ));
     Info.Separator_Set(0, ZenLib::EOL);
 }
@@ -1128,9 +1170,9 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_CodecID_General_Mpeg4 (InfoMap &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
-    "M4V ;MPEG-4\n"
+    "M4V ;MPEG-4;;;\n"
     "isom;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;Base Media\n"
     "iso2;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;Base Media\n"
     "mp41;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;Base Media / Version 1\n"
@@ -1153,6 +1195,7 @@
     "3gp9;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html\n"
     "CAQV;MPEG-4;;;http://world.casio.com/;Casio\n"
     "FACE;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;Facebook\n"
+    "isml;MPEG-4;IIS Smooth Streaming file format;;http://www.apple.com/quicktime/download/standalone.html;ISML\n"
     "JP20;MPEG-4;;;http://gpac.sourceforge.net/;JPEG 2000\n"
     "JPM ;MPEG-4;;;http://www.iso.org/;JPEG 2000 Compound Image\n"
     "JPX ;MPEG-4;;;http://www.iso.org/;JPEG 2000 w/ extensions\n"
@@ -1175,9 +1218,10 @@
     "mmp4;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;Mobile version\n"
     "mp71;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;ISO 14496-12 MPEG-7 meta data\n"
     "mp7b;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;ISO 14496-12 MPEG-7 meta data\n"
+    "piff;MPEG-4;Protected Interoperable File Format;;http://www.apple.com/quicktime/download/standalone.html;PIFF\n"
     "qt  ;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;QuickTime\n"
     "SDV ;MPEG-4;;;http://www.sdcard.org/;SD Memory Card Video\n"
-    "M4A ;MPEG-4;;;http://www.apple.com/itunes/;Apple AAC audio with iTunes info\n"
+    "M4A ;MPEG-4;;;http://www.apple.com/itunes/;Apple audio with iTunes info\n"
     "M4B ;MPEG-4;;;http://www.apple.com/itunes/;Apple audio with iTunes position\n"
     "M4P ;MPEG-4;;;http://www.apple.com/itunes/;AES encrypted audio\n"
     "M4VP;MPEG-4;;;http://www.apple.com/iphone/;Apple iPhone\n"
@@ -1194,7 +1238,7 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_CodecID_Video_Matroska (InfoMap &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
     "V_UNCOMPRESSED;RGB;;Raw uncompressed video frames\n"
     "V_DIRAC;Dirac;;;http://diracvideo.org/\n"
@@ -1210,6 +1254,7 @@
     "V_MPEG4/MS/V3;MPEG-4 Visual;MS MPEG-4 v3;MS MPEG-4 v3;http://ffdshow-tryout.sourceforge.net/\n"
     "V_MPEG1;MPEG Video;;MPEG 1 or 2 Video;http://ffdshow-tryout.sourceforge.net/\n"
     "V_MPEG2;MPEG Video;;MPEG 1 or 2 Video;http://ffdshow-tryout.sourceforge.net/\n"
+    "V_PRORES;ProRes;;;http://www.apple.com/quicktime/download/standalone.html\n"
     "V_REAL/RV10;RealVideo 1;;RealVideo 1.0 aka RealVideo 5;http://www.real.com\n"
     "V_REAL/RV20;RealVideo 2;;RealVideo 2.0 aka G2 and RealVideo G2+SVT;http://www.real.com\n"
     "V_REAL/RV30;RealVideo 3;;RealVideo 3.0 aka RealVideo 8;http://www.real.com\n"
@@ -1223,34 +1268,44 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_CodecID_Video_Mpeg4 (InfoMap &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
     "2vuy;YUV;;;;;;YUV;4:2:2\n"
+    "2Vuy;YUV;;;;;;YUV;4:2:2\n"
     "8BPS;RGB;;;;;;RGB;8:8:8\n"
     "ac16;YUV;;;;;;YUV;4:2:2\n"
     "ac32;YUV;;;;;;YUV;4:2:2\n"
     "acBG;YUV;;;;;;YUV;4:2:2\n"
-    "apch;ProRes;HQ;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2\n"
+    "apch;ProRes;;;http://www.apple.com/quicktime/download/standalone.html;High;;YUV;4:2:2\n"
     "apcn;ProRes;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2\n"
-    "avc1;AVC;;Advanced Video Coding;http://www.apple.com/quicktime/download/standalone.html\n"
-    "avcp;AVC;;Advanced Video Coding Parameters;http://www.apple.com/quicktime/download/standalone.html\n"
+    "apcs;ProRes;;;http://www.apple.com/quicktime/download/standalone.html;LT;;YUV;4:2:2\n"
+    "apco;ProRes;;;http://www.apple.com/quicktime/download/standalone.html;Proxy;;YUV;4:2:2\n"
+    "ap4c;ProRes;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:4:4\n"
+    "ap4h;ProRes;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:4:4\n"
+    "ai12;AVC;;Advanced Video Coding;http://ffdshow-tryout.sourceforge.net;;\n"
+    "ai15;AVC;;Advanced Video Coding;http://ffdshow-tryout.sourceforge.net;;\n"
+    "ai1q;AVC;;Advanced Video Coding;http://ffdshow-tryout.sourceforge.net;;\n"
+    "ai5q;AVC;;Advanced Video Coding;http://ffdshow-tryout.sourceforge.net;;\n"
+    "avc1;AVC;;Advanced Video Coding;http://www.apple.com/quicktime/download/standalone.html;;;\n"
+    "avcp;AVC;;Advanced Video Coding Parameters;http://www.apple.com/quicktime/download/standalone.html;;;\n"
     "AVdv;DV;;Avid;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2\n"
     "AVdn;VC-3;DNxHD;Avid;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2\n"
-    "avr ;M-JPEG\n"
+    "AVmp;MPEG Video;Avid IMX;;;;Version 2;;\n"
+    "avr ;JPEG;;;;;;\n"
     "b16g;Gray;;;;;;Y;16\n"
     "b32a;Gray/Alpha;;;;;;YA;16:16\n"
     "b48r;RGB;;;;;;RGB;16:16:16\n"
     "b64a;RGBA;;;;;;RGBA;16:16:16:16\n"
     "base;RGBA;;;;;;RGBA;16:16:16:16\n"
     "blit;RGBA;;;;;;RGBA;16:16:16:16\n"
-    "blnd;Alpha Compositor\n"
+    "blnd;Alpha Compositor;;;;;;\n"
     "blur;Blur;;;;;;CMYK\n"
-    "CFHD;Cineform;;CineForm High-Definition (HD) wavelet codec;http://www.cineform.com/\n"
-    "cmyk;CMYK\n"
-    "cvid;Cinepack;;;http://www.apple.com/quicktime/download/standalone.html\n"
-    "drac;Dirac;;Dirac Video Coder;http://www.bbc.co.uk/rd/projects/dirac/index.shtml\n"
-    "dslv;Cross Fade;;;http://www.apple.com/quicktime/download/standalone.html\n"
-    "DV10;Digital Voodoo;;Digital Voodoo 10 bit Uncompressed 4:2:2 codec;http://www.digitalvoodoo.net/\n"
+    "CFHD;CineForm;;CineForm High-Definition (HD) wavelet codec;http://www.cineform.com/;;;\n"
+    "cmyk;CMYK;;;;;;\n"
+    "cvid;Cinepack;;;http://www.apple.com/quicktime/download/standalone.html;;;\n"
+    "drac;Dirac;;Dirac Video Coder;http://www.bbc.co.uk/rd/projects/dirac/index.shtml;;;\n"
+    "dslv;Cross Fade;;;http://www.apple.com/quicktime/download/standalone.html;;;\n"
+    "DV10;Digital Voodoo;;Digital Voodoo 10 bit Uncompressed 4:2:2 codec;http://www.digitalvoodoo.net/;;;\n"
     "dv5n;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2\n"
     "dv5p;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2\n"
     "dvc ;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2\n"
@@ -1263,80 +1318,110 @@
     "dvh6;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2\n"
     "dvhp;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2\n"
     "dvhq;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2\n"
-    "DVOO;Digital Voodoo;;Digital Voodoo 8 bit Uncompressed 4:2:2 codec;http://www.digitalvoodoo.net/\n"
-    "DVOR;Digital Voodoo;;Digital Voodoo intermediate raw;http://www.digitalvoodoo.net/\n"
+    "DVOO;Digital Voodoo;;Digital Voodoo 8 bit Uncompressed 4:2:2 codec;http://www.digitalvoodoo.net/;;;\n"
+    "DVOR;Digital Voodoo;;Digital Voodoo intermediate raw;http://www.digitalvoodoo.net/;;;\n"
     "dvpp;DV;DVCPRO;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2\n"
-    "DVTV;Digital Voodoo;;Digital Voodoo intermediate 2vuy;http://www.digitalvoodoo.net/\n"
-    "DVVT;Digital Voodoo;;Digital Voodoo intermediate v210;http://www.digitalvoodoo.net/\n"
-    "encv;(Encrypted);;;http://www.apple.com/quicktime/download/standalone.html\n"
-    "gif ;M-GIF\n"
-    "h261;H.261;;;http://www.apple.com/quicktime/download/standalone.html\n"
-    "h263;H.263;;;http://www.apple.com/quicktime/download/standalone.html\n"
-    "h264;H.264;;;http://www.apple.com/quicktime/download/standalone.html\n"
-    "HD10;Digital Voodoo;;Digital Voodoo 10 bit Uncompressed 4:2:2 HD codec;http://www.digitalvoodoo.net/\n"
-    "hdv3;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2\n"
-    "icod;Intermediate Codec;Apple;;http://www.apple.com/quicktime/download/standalone.html\n"
+    "DVTV;Digital Voodoo;;Digital Voodoo intermediate 2vuy;http://www.digitalvoodoo.net/;;;\n"
+    "DVVT;Digital Voodoo;;Digital Voodoo intermediate v210;http://www.digitalvoodoo.net/;;;\n"
+    "encv;(Encrypted);;;http://www.apple.com/quicktime/download/standalone.html;;;\n"
+    "gif ;M-GIF;;;;;;\n"
+    "h261;H.261;;;http://www.apple.com/quicktime/download/standalone.html;;;\n"
+    "h263;H.263;;;http://www.apple.com/quicktime/download/standalone.html;;;\n"
+    "H263;H.263;;;http://www.apple.com/quicktime/download/standalone.html;;;\n"
+    "h264;H.264;;;http://www.apple.com/quicktime/download/standalone.html;;;\n"
+    "hcpa;ProRes;;;http://www.apple.com/quicktime/download/standalone.html;High;;YUV;4:2:2\n"
+    "HD10;Digital Voodoo;;Digital Voodoo 10 bit Uncompressed 4:2:2 HD codec;http://www.digitalvoodoo.net/;;;\n"
+    "hdv1;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "hdv2;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "hdv3;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "hdv4;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "hdv5;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "hdv6;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "hdv7;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "hdv8;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "hdv9;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "hdva;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "hdvb;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "hdvc;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "hdvd;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "hdve;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "hdvf;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "icod;Intermediate Codec;Apple;;http://www.apple.com/quicktime/download/standalone.html;;;\n"
     "j420;YUV;;;;;;YUV;4:2:0\n"
-    "jpeg;M-JPEG;;;http://www.apple.com/quicktime/download/standalone.html\n"
-    "kpcd;Photo CD\n"
-    "M105;Matrox;;;http://www.matrox.com/\n"
-    "mjp2;M-JPEG 2000\n"
-    "mjpa;M-JPEG\n"
-    "mjpb;M-JPEG\n"
-    "mp4v;MPEG-4 Visual\n"
-    "mx3n;MPEG Video\n"
-    "mx3p;MPEG Video\n"
+    "jpeg;JPEG;;;http://www.apple.com/quicktime/download/standalone.html;;;\n"
+    "kpcd;Photo CD;;;;;;\n"
+    "LMP2;MPEG Video;;;;;;YUV\n"
+    "M105;Matrox;;;http://www.matrox.com/;;;\n"
+    "MMES;MPEG Video;;;;;;YUV\n"
+    "mmes;MPEG Video;;;;;;YUV\n"
+    "mjp2;JPEG 2000;;;;;;\n"
+    "mjpa;JPEG;;;;;;\n"
+    "mjpb;JPEG;;;;;;\n"
+    "mp4v;MPEG-4 Visual;;;;;;\n"
+    "mpeg;MPEG Video;;;;;;\n"
+    "mx3n;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "mx3p;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "mx4n;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "mx4p;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "mx5n;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "mx5p;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
     "myuv;YUV;;;;;;YUV;4:2:0\n"
-    "ovc1;VC-1;;Smooth Streaming Media Video;http://alexzambelli.com/blog/2009/02/10/smooth-streaming-architecture/\n"
-    "png ;M-PNG\n"
-    "PNTG;MacPaint;;Apple MacPaint image format;http://www.apple.com/quicktime/download/standalone.html\n"
-    "rle ;RLE;;;http://www.apple.com/quicktime/download/standalone.html\n"
-    "rpza;Road Pizza;;;http://www.apple.com/quicktime/download/standalone.html\n"
-    "s263;H.263;;;http://www.apple.com/quicktime/download/standalone.html\n"
-    "Shr0;SheerVideo;;Generic SheerVideo codec;http://www.bitjazz.com/\n"
-    "Shr1;SheerVideo;;SheerVideo RGB;http://www.bitjazz.com/\n"
-    "Shr2;SheerVideo;;SheerVideo Y'CbCr[A] 4:4:4;http://www.bitjazz.com/\n"
-    "Shr3;SheerVideo;;SheerVideo Y'CbCr 4:2:2;http://www.bitjazz.com/\n"
-    "Shr4;SheerVideo;;SheerVideo Y'CbCr 4:2:2;http://www.bitjazz.com/\n"
-    "SV10;Sorenson;;Sorenson Media Video R1;http://www.apple.com/quicktime/download/standalone.html\n"
-    "SVQ1;Sorenson 1;;Sorenson Media Video 1 (Apple QuickTime 3);http://www.apple.com/quicktime/download/standalone.html\n"
-    "SVQ2;Sorenson 2;;Sorenson Media Video 2 (Apple QuickTime 4);http://www.apple.com/quicktime/download/standalone.html\n"
-    "SVQ3;Sorenson 3;;Sorenson Media Video 3 (Apple QuickTime 5);http://www.apple.com/quicktime/download/standalone.html\n"
+    "ncpa;ProRes;;;http://www.apple.com/quicktime/download/standalone.html;Normal;;YUV;4:2:2\n"
+    "ovc1;VC-1;;Smooth Streaming Media Video;http://alexzambelli.com/blog/2009/02/10/smooth-streaming-architecture/;;;\n"
+    "png ;PNG;;;;;;\n"
+    "PIM1;MPEG Video;;;;;;YUV\n"
+    "PIM2;MPEG Video;;;;;;YUV\n"
+    "PNTG;MacPaint;;Apple MacPaint image format;http://www.apple.com/quicktime/download/standalone.html;;;\n"
+    "rle ;RLE;;;http://www.apple.com/quicktime/download/standalone.html;;;\n"
+    "rpza;Road Pizza;;;http://www.apple.com/quicktime/download/standalone.html;;;\n"
+    "s263;H.263;;;http://www.apple.com/quicktime/download/standalone.html;;;\n"
+    "Shr0;SheerVideo;;Generic SheerVideo codec;http://www.bitjazz.com/;;;\n"
+    "Shr1;SheerVideo;;SheerVideo RGB;http://www.bitjazz.com/;;;\n"
+    "Shr2;SheerVideo;;SheerVideo Y'CbCr[A] 4:4:4;http://www.bitjazz.com/;;;\n"
+    "Shr3;SheerVideo;;SheerVideo Y'CbCr 4:2:2;http://www.bitjazz.com/;;;\n"
+    "Shr4;SheerVideo;;SheerVideo Y'CbCr 4:2:2;http://www.bitjazz.com/;;;\n"
+    "SV10;Sorenson;;Sorenson Media Video R1;http://www.apple.com/quicktime/download/standalone.html;;;\n"
+    "SVQ1;Sorenson 1;;Sorenson Media Video 1 (Apple QuickTime 3);http://www.apple.com/quicktime/download/standalone.html;;;\n"
+    "SVQ2;Sorenson 2;;Sorenson Media Video 2 (Apple QuickTime 4);http://www.apple.com/quicktime/download/standalone.html;;;\n"
+    "SVQ3;Sorenson 3;;Sorenson Media Video 3 (Apple QuickTime 5);http://www.apple.com/quicktime/download/standalone.html;;;\n"
     "v210;YUV;AJA Video Systems Xena;;;;;YUV;4:2:2\n"
     "vc-1;VC-1;;SMPTE VC-1;http://www.smpte.org/;;;YUV\n"
+    "WMV3;VC-1;WMV3;Windows Media Video 9;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;;;\n"
     "WRLE;Bitmap;;Windows BMP image format;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xd50;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xd51;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xd52;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xd53;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xd54;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xd55;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xd56;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xd57;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xd58;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xd59;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xd5a;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xd5b;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xd5c;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xd5d;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xd5e;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xd5f;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xdv0;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xdv1;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xdv2;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xdv3;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xdv4;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xdv5;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xdv6;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xdv7;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xdv8;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xdv9;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xdva;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xdvb;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xdvc;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xdvd;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xdve;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "xdvf;MPEG Video;XDCAM;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xd50;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xd51;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xd52;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xd53;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xd54;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xd55;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xd56;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xd57;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xd58;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xd59;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xd5a;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xd5b;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xd5c;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xd5d;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xd5e;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xd5f;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xdhd;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xdh2;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xdv0;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xdv1;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xdv2;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xdv3;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xdv4;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xdv5;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xdv6;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xdv7;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xdv8;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xdv9;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xdva;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xdvb;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xdvc;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xdvd;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xdve;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "xdvf;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
     "yuv2;YUV;;;;;;YUV;4:2:2\n"
     "yuvs;YUV;;;;;;YUV;4:2:2\n"
     "yuvu;YUV;;;;;;YUV;4:2:2\n"
@@ -1348,7 +1433,7 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_CodecID_Video_Real (InfoMap &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
     "RV10;RealVideo 1;;Based on H.263, Real Player 5;http://www.real.com\n"
     "RV13;RealVideo 1.3;;Based on H.263, Real Player 5;http://www.real.com\n"
@@ -1362,19 +1447,19 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_CodecID_Video_Riff (InfoMap &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
-    "0x00000000;RGB;;Basic Windows bitmap format. 1, 4 and 8 bpp versions are palettised. 16, 24 and 32bpp contain raw RGB samples;http://www.fourcc.org/indexrgb.htm\n"
-    "0x00000001;RLE;;Run length encoded 8bpp RGB image;http://www.fourcc.org/indexrgb.htm\n"
-    "0x00000002;RLE;;Run length encoded 4bpp RGB image;http://www.fourcc.org/indexrgb.htm\n"
-    "0x00000003;RGB;;Raw RGB with arbitrary sample packing within a pixel. Packing and precision of R, G and B components is determined by bit masks for each;http://www.fourcc.org/indexrgb.htm\n"
-    "1978;RGB;A.M.Paredes predictor;;http://www.pegasusimaging.com/cgi-bin/download2.cgi?LVIDB;;;RGB\n"
-    " BIT;RGB;;;;;;RGB\n"
-    " JPG;M-JPEG;;;;;;YUV;4:2:0\n"
-    " PNG;M-PNG;;;;;;RGB\n"
-    " RAW;RGB;;;http://www.fourcc.org/indexrgb.htm;;;RGB\n"
-    " raw;RGB;;;http://www.fourcc.org/indexrgb.htm;;;RGB\n"
-    " RGB;RGB;;;http://www.fourcc.org/indexrgb.htm;;;RGB\n"
+    "0x00000000;RGB;;Basic Windows bitmap format. 1, 4 and 8 bpp versions are palettised. 16, 24 and 32bpp contain raw RGB samples;http://www.fourcc.org/indexrgb.htm;;;;\n"
+    "0x00000001;RLE;;Run length encoded 8bpp RGB image;http://www.fourcc.org/indexrgb.htm;;;;\n"
+    "0x00000002;RLE;;Run length encoded 4bpp RGB image;http://www.fourcc.org/indexrgb.htm;;;;\n"
+    "0x00000003;RGB;;Raw RGB with arbitrary sample packing within a pixel. Packing and precision of R, G and B components is determined by bit masks for each;http://www.fourcc.org/indexrgb.htm;;;;\n"
+    "1978;RGB;A.M.Paredes predictor;;http://www.pegasusimaging.com/cgi-bin/download2.cgi?LVIDB;;;RGB;\n"
+    " BIT;RGB;;;;;;RGB;\n"
+    " JPG;JPEG;;;;;;YUV\n"
+    " PNG;PNG;;;;;;RGB;\n"
+    " RAW;RGB;;;http://www.fourcc.org/indexrgb.htm;;;RGB;\n"
+    " raw;RGB;;;http://www.fourcc.org/indexrgb.htm;;;RGB;\n"
+    " RGB;RGB;;;http://www.fourcc.org/indexrgb.htm;;;RGB;\n"
     " RL4;RLE;;;http://www.fourcc.org/indexrgb.htm;;;RGB;;4\n"
     " RL8;RLE;;;http://www.fourcc.org/indexrgb.htm;;;RGB;;8\n"
     "2VUY;YUV;Optibase VideoPump;;;;;YUV;4:2:2\n"
@@ -1387,61 +1472,63 @@
     "8BPS;RGB;Apple;;http://ffdshow-tryout.sourceforge.net/;;;RGBA\n"
     "AAS4;RLE;Autodesk;;http://mirror01.iptelecom.net.ua/~video/codecs/Autodesk.Animator.v1.11.Codec.exe;;;RGB\n"
     "AASC;RLE;Autodesk;;http://mirror01.iptelecom.net.ua/~video/codecs/Autodesk.Animator.v1.11.Codec.exe;;;RGB\n"
-    "ABYR;Kensigton low;Kensington;Low resolution, low frame rate (6fps) for digital cameras\n"
-    "ACTL;ACT-L2;Streambox;;http://www.streambox.com/products/act-L2_codec.htm\n"
-    "ADV1;WaveCodec;Loronix;;http://www.loronix.com/products/video_clips/wavecodec.asp\n"
-    "ADVJ;M-JPEG;Avid;;;;;YUV;4:2:0\n"
-    "AEIK;Indeo 3.2;;Vector Quantization\n"
+    "ABYR;Kensigton low;Kensington;Low resolution, low frame rate (6fps) for digital cameras;;;;\n"
+    "ACTL;ACT-L2;Streambox;;http://www.streambox.com/products/act-L2_codec.htm;;;\n"
+    "ADV1;WaveCodec;Loronix;;http://www.loronix.com/products/video_clips/wavecodec.asp;;;\n"
+    "ADVJ;JPEG;Avid;;;;;YUV\n"
+    "AEIK;Indeo 3.2;;Vector Quantization;;;;\n"
     "AEMI;MPEG Video;VideoONE;MPEG-1-I Capture;http://www.array.com;;;YUV;4:2:0\n"
-    "AFLC;FLC;Autodesk;;http://mirror01.iptelecom.net.ua/~video/codecs/Autodesk.Animator.v1.11.Codec.exe\n"
-    "AFLI;FLI;Autodesk;;http://mirror01.iptelecom.net.ua/~video/codecs/Autodesk.Animator.v1.11.Codec.exe\n"
-    "AHDV;Wavelet;CineForm HD;;http://www.cineform.com/products/ConnectHD.htm\n"
-    "AJPG;M-JPEG;;22fps for digital cameras;;;;YUV;4:2:0\n"
-    "ALPH;Ziracom;;Ziracom Digital Communications Inc.\n"
+    "AFLC;FLC;Autodesk;;http://mirror01.iptelecom.net.ua/~video/codecs/Autodesk.Animator.v1.11.Codec.exe;;;\n"
+    "AFLI;FLI;Autodesk;;http://mirror01.iptelecom.net.ua/~video/codecs/Autodesk.Animator.v1.11.Codec.exe;;;\n"
+    "AHDV;CineForm;CineForm HD;;http://www.cineform.com/products/ConnectHD.htm;;;\n"
+    "AJPG;JPEG;;22fps for digital cameras;;;;YUV\n"
+    "ALPH;Ziracom;;Ziracom Digital Communications Inc.;;;;\n"
+    "AMM2;AMV2 MT;AMV2 MT Video Codec Version 2;;http://amamaman.hp.infoseek.co.jp/english/amv2_e.html;;;\n"
     "AMPG;MPEG-1;VideoONE;;http://www.array.com;;;YUV;4:2:0\n"
-    "AMR ;AMR;;Speech codec\n"
-    "ANIM;RDX;Intel\n"
+    "AMR ;AMR;;Speech codec;;;;\n"
+    "AMV3;AMV3;AMV3 Video Codec Version 3;;http://amamaman.hp.infoseek.co.jp/english/amv2_e.html;;;YUV;4:2:0\n"
+    "ANIM;RDX;Intel;;;;;\n"
     "AP41;MPEG-4 Visual;AngelPotion;Hack of MS MPEG-4 v3;http://www.divxity.com/download/ap4v1-702.exe;;;YUV;4:2:0\n"
     "AP42;MPEG-4 Visual;AngelPotion;Hack of MS MPEG-4 v3;http://www.divxity.com/download/ap4v1-702.exe;;;YUV;4:2:0\n"
-    "ASLC;AlparySoft Lossless;;;http://www.free-codecs.com/download/Alparysoft_Lossless_Video_Codec.htm\n"
-    "ASV1;Asus 1;;;ftp://ftp.asuscom.de/pub/asuscom/treiber/vga/ASUS_VGA_TOOLS/asv2dec.zip\n"
-    "ASV2;Asus 2;;;ftp://ftp.asuscom.de/pub/asuscom/treiber/vga/ASUS_VGA_TOOLS/asv2dec.zip\n"
-    "ASVX;Asus X;;;ftp://ftp.asuscom.de/pub/asuscom/treiber/vga/ASUS_VGA_TOOLS/asv2dec.zip\n"
+    "ASLC;AlparySoft Lossless;;;http://www.free-codecs.com/download/Alparysoft_Lossless_Video_Codec.htm;;;\n"
+    "ASV1;Asus 1;;;ftp://ftp.asuscom.de/pub/asuscom/treiber/vga/ASUS_VGA_TOOLS/asv2dec.zip;;;\n"
+    "ASV2;Asus 2;;;ftp://ftp.asuscom.de/pub/asuscom/treiber/vga/ASUS_VGA_TOOLS/asv2dec.zip;;;\n"
+    "ASVX;Asus X;;;ftp://ftp.asuscom.de/pub/asuscom/treiber/vga/ASUS_VGA_TOOLS/asv2dec.zip;;;\n"
     "ATM4;MPEG-4 Visual;Nero;;http://www.nero.com;;;YUV;4:2:0\n"
     "AUR2;YUV;;Auravision Aura 2;;;;YUV;4:2:2\n"
     "AURA;YUV;;Auravision Aura 1;;;;YUV;4:1:1\n"
-    "AUVX;AUVX;;USH GmbH\n"
-    "AV1X;Avid 1:1;;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe\n"
+    "AUVX;AUVX;;USH GmbH;;;;\n"
+    "AV1X;Avid 1:1;;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;\n"
     "AVC1;AVC;;;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0\n"
     "avc1;AVC;;;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0\n"
-    "AVD1;DV;Avid;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;YUV\n"
-    "AVDJ;M-JPEG;Avid;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;YUV;4:2:0\n"
-    "AVDN;Avid HD;;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe\n"
-    "AVDV;DV;Avid;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;YUV\n"
-    "AVI1;M-JPEG;MainConcept;;;;;YUV;4:2:0\n"
-    "AVI2;M-JPEG;MainConcept;;;;;YUV;4:2:0\n"
-    "AVID;M-JPEG;Avid;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;YUV;4:2:0\n"
-    "AVIS;AviSynth;;Wrapper for AviSynth (Dummy);http://ffdshow-tryout.sourceforge.net/\n"
-    "AVMP;Avid IMX;;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe\n"
-    "AVR ;M-JPEG;Avid NuVista;Avid ABVB/NuVista M-JPEG with Alpha-channel;;;;YUV;4:2:0\n"
-    "AVRn;M-JPEG;Avid M-JPEG;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;YUV;4:2:0\n"
-    "AVRN;M-JPEG;Avid M-JPEG;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;YUV;4:2:0\n"
-    "AVUI;Avid;;Avid Meridien Uncompressed with Alpha-channel;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe\n"
-    "AVUP;Avid;;Avid 10bit Packed (Quick Time);http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe\n"
+    "AVD1;DV;Avid;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;YUV;\n"
+    "AVDJ;JPEG;Avid;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;YUV\n"
+    "AVDN;Avid HD;;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;;\n"
+    "AVDV;DV;Avid;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;YUV;\n"
+    "AVI1;JPEG;MainConcept;;;;;YUV\n"
+    "AVI2;JPEG;MainConcept;;;;;YUV\n"
+    "AVID;JPEG;Avid;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;YUV\n"
+    "AVIS;AviSynth;;Wrapper for AviSynth (Dummy);http://ffdshow-tryout.sourceforge.net/;;;;\n"
+    "AVMP;Avid IMX;;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;;\n"
+    "AVR ;JPEG;Avid NuVista;Avid ABVB/NuVista JPEG with Alpha-channel;;;;YUV\n"
+    "AVRn;JPEG;Avid JPEG;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;YUV\n"
+    "AVRN;JPEG;Avid JPEG;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;YUV\n"
+    "AVUI;Avid;;Avid Meridien Uncompressed with Alpha-channel;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;;\n"
+    "AVUP;Avid;;Avid 10bit Packed (Quick Time);http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;;\n"
     "AYUV;YUV;YUV;;;;;YUVA;4:4:4;8\n"
-    "AZPR;QuickTime;;;http://www.apple.com/quicktime/download/standalone.html\n"
-    "AZRP;QuickTime;;;http://www.apple.com/quicktime/download/standalone.html\n"
+    "AZPR;QuickTime;;;http://www.apple.com/quicktime/download/standalone.html;;;\n"
+    "AZRP;QuickTime;;;http://www.apple.com/quicktime/download/standalone.html;;;\n"
     "BGR ;RGB;RGB;;;;;RGB\n"
-    "BHIV;BeHere iVideo\n"
-    "BINK;Bink\n"
+    "BHIV;BeHere iVideo;;;;;;\n"
+    "BINK;Bink;;;;;;\n"
     "BIT ;RGB;RGB;;;;;RGB\n"
     "BITM;H.261;Microsoft;;;;;YUV\n"
     "BLOX;MPEG Video;Blox;;http://www.ii.uj.edu.pl/~jezabek/blox/blox-0.1.0b.zip;;;YUV;4:2:0\n"
     "BLZ0;MPEG-4 Visual;DivX;DivX for Blizzard Decoder Filter;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0\n"
-    "BT20;MediaStream;;Conexant ProSummer MediaStream\n"
-    "BTCV;Composite;;Conexant Composite Video\n"
-    "BTVC;Composite;;Conexant Composite Video\n"
-    "BW00;Wavelet;BergWave\n"
+    "BT20;MediaStream;;Conexant ProSummer MediaStream;;;;\n"
+    "BTCV;Composite;;Conexant Composite Video;;;;\n"
+    "BTVC;Composite;;Conexant Composite Video;;;;\n"
+    "BW00;Wavelet;BergWave;;;;;\n"
     "BW10;MPEG-1;Broadway;Data Translation Broadway MPEG Capture/Compression;;;;YUV\n"
     "BXBG;RGB;Boxx;;;;;RGB\n"
     "BXRG;RGB;Boxx;;;;;RGB\n"
@@ -1451,38 +1538,38 @@
     "CDV5;DV;Canopus;Canopus SD50/DVHD;http://www.cineform.com/products/ConnectHD.htm;;;YUV\n"
     "CDVC;DV;Canopus;Canopus DV (DV);http://www.cineform.com/products/ConnectHD.htm;;;YUV\n"
     "CDVH;DV;Canopus;Canopus SD50/DVHD;http://www.cineform.com/products/ConnectHD.htm;;;YUV\n"
-    "CFCC;M-JPEG;DPS Perception;Dummy format - only AVI header;;;;YUV;4:2:0\n"
-    "CFHD;CineForm HD;;CineForm 10-bit Visually Perfect HD (Wavelet)\n"
-    "CGDI;Camcorder;;Camcorder Video (MS Office 97)\n"
-    "CHAM;Champagne;;Winnov Caviara Champagne\n"
-    "CJPG;M-JPEG;Creative;Creative Video Blaster Webcam Go JPEG;;;;YUV;4:2:0\n"
+    "CFCC;JPEG;DPS Perception;Dummy format - only AVI header;;;;YUV\n"
+    "CFHD;CineForm;;CineForm 10-bit Visually Perfect HD (Wavelet);;;;\n"
+    "CGDI;Camcorder;;Camcorder Video (MS Office 97);;;;\n"
+    "CHAM;Champagne;;Winnov Caviara Champagne;;;;\n"
+    "CJPG;JPEG;Creative;Creative Video Blaster Webcam Go JPEG;;;;YUV\n"
     "CLJR;YUV;Cirrus Logic;Less than 8 bits per Y, U and V sample.;http://www.fourcc.org/indexyuv.htm;;;YUV;4:1:1\n"
-    "CLLC;Canopus;;Canopus LossLess\n"
+    "CLLC;Canopus;;Canopus LossLess;;;;\n"
     "CLPL;YUV;;Format similar to YV12 but including a level of indirection.;;;;YUV\n"
-    "CM10;MediaShow;;CyberLink Corporation;http://www.cyberlink.com\n"
-    "CMYK;CMYK;;Common Data Format in Printing\n"
+    "CM10;MediaShow;;CyberLink Corporation;http://www.cyberlink.com;;;\n"
+    "CMYK;CMYK;;Common Data Format in Printing;;;;\n"
     "COL0;MPEG-4 Visual;;Hacked MS MPEG-4 v3;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0\n"
     "COL1;MPEG-4 Visual;;Hacked MS MPEG-4 v3;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0\n"
     "CPLA;YUV;Weitek;;;;;YUV;4:2:0\n"
-    "CRAM;MS Video;;Microsoft Video 1\n"
-    "CSCD;CamStudio;;RenderSoft CamStudio lossless (LZO & GZIP compression)\n"
-    "CT10;TalkingShow;;CyberLink Corporation;http://www.cyberlink.com\n"
-    "CTRX;Citrix;;Citrix Scalable Video\n"
-    "CUVC;Canopus HQ;;Canopus HQ\n"
-    "CVID;Cinepack;;;http://www.cinepak.com/text.html\n"
-    "cvid;Cinepack;;;http://www.cinepak.com/text.html\n"
-    "CWLT;WLT;;Microsoft Color WLT DIB\n"
+    "CRAM;MS Video;;Microsoft Video 1;;;;\n"
+    "CSCD;CamStudio;;RenderSoft CamStudio lossless (LZO & GZIP compression);;;;\n"
+    "CT10;TalkingShow;;CyberLink Corporation;http://www.cyberlink.com;;;\n"
+    "CTRX;Citrix;;Citrix Scalable Video;;;;\n"
+    "CUVC;Canopus HQ;;Canopus HQ;;;;\n"
+    "CVID;Cinepack;;;http://www.cinepak.com/text.html;;;\n"
+    "cvid;Cinepack;;;http://www.cinepak.com/text.html;;;\n"
+    "CWLT;WLT;;Microsoft Color WLT DIB;;;;\n"
     "CYUV;YUV;Creative Labs;;http://www.fourcc.org/indexyuv.htm;;;YUV;4:2:2\n"
     "cyuv;YUV;;;http://www.fourcc.org/indexyuv.htm;;;YUV;4:2:2\n"
     "CYUY;YUV;ATI;;http://www.fourcc.org/indexyuv.htm;;;YUV;4:2:2\n"
-    "D261;H.261;DEC\n"
-    "D263;H.263;DEC\n"
+    "D261;H.261;DEC;;;;;\n"
+    "D263;H.263;DEC;;;;;\n"
     "DAVC;AVC;Dicas;;;;;YUV;4:2:0\n"
     "DC25;DV;MainConcept;;;;;YUV\n"
     "DCAP;DV;Pinnacle;;;;;YUV\n"
-    "DCL1;Data Connextion;;Conferencing\n"
-    "DCT0;WniWni\n"
-    "DFSC;VFW;;DebugMode FrameServer VFW\n"
+    "DCL1;Data Connextion;;Conferencing;;;;\n"
+    "DCT0;WniWni;;;;;;\n"
+    "DFSC;VFW;;DebugMode FrameServer VFW;;;;\n"
     "DIB ;RGB;;;;;;RGB\n"
     "DIV1;MPEG-4 Visual;FFMpeg;Hacked MS MPEG-4 V1;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0\n"
     "DIV2;MPEG-4 Visual;MS MPEG-4 1/2;;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0\n"
@@ -1492,11 +1579,11 @@
     "DIV6;MPEG-4 Visual;MS MPEG-4 v3;;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0\n"
     "DIVX;MPEG-4 Visual;DivX 4;Project Mayo;http://mediaarea.net/DIVX;;;YUV;4:2:0\n"
     "divx;MPEG-4 Visual;DivX;Mainly used by Google;http://www.divx.com;;;YUV;4:2:0\n"
-    "DJPG;M-JPEG;Broadway 101;Data Translation, Inc.;;;;YUV;4:2:0\n"
+    "DJPG;JPEG;Broadway 101;Data Translation, Inc.;;;;YUV\n"
     "DM4V;MPEG-4 Visual;Dicas;;;;;YUV;4:2:0\n"
-    "DMB1;M-JPEG;Rainbow;Matrox Rainbow Runner hardware compression;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.MJPG.v2.10.27.codec.exe;;;YUV;4:2:0\n"
-    "DMB2;M-JPEG;Paradigm;;;;;YUV;4:2:0\n"
-    "DMK2;V36 PDA;;ViewSonic V36 PDA Video\n"
+    "DMB1;JPEG;Rainbow;Matrox Rainbow Runner hardware compression;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.MJPG.v2.10.27.codec.exe;;;YUV\n"
+    "DMB2;JPEG;Paradigm;;;;;YUV\n"
+    "DMK2;V36 PDA;;ViewSonic V36 PDA Video;;;;\n"
     "DP02;MPEG-4 Visual;DynaPel;;;;;YUV;4:2:0\n"
     "DP16;YUV;Matsushita;With DPCM 6-bit compression;;;;YUV;4:1:1\n"
     "DP18;YUV;Matsushita;With DPCM 8-bit compression;;;;YUV;4:1:1\n"
@@ -1505,13 +1592,13 @@
     "DP96;YUV;Matsushita;With DPCM 6-bit compression;;;;YUV\n"
     "DP98;YUV;Matsushita;With DPCM 8-bit compression;;;;YUV\n"
     "DP9L;YUV;Matsushita;With DPCM 6-bit compression;;;;YUV\n"
-    "DPS0;M-JPEG;DPS Reality;Dummy format - only AVI header;;;;YUV;4:2:0\n"
-    "DPSC;M-JPEG;DPS PAR;Dummy format - only AVI header;;;;YUV;4:2:0\n"
+    "DPS0;JPEG;DPS Reality;Dummy format - only AVI header;;;;YUV\n"
+    "DPSC;JPEG;DPS PAR;Dummy format - only AVI header;;;;YUV\n"
     "DRWX;DV;Pinnacle;;;;;YUV\n"
     "DSVD;DV;Microsoft;;;;;YUV\n"
-    "DTMT;Media-100\n"
-    "DTNT;Media-100\n"
-    "DUCK;TrueMotion S;Duck Corporation\n"
+    "DTMT;Media-100;;;;;\n"
+    "DTNT;Media-100;;;;;\n"
+    "DUCK;TrueMotion S;Duck Corporation;;;;\n"
     "DV10;RGB;BlueFish;BlueFish444 (lossless RGBA, YUV 10-bit);;;;RGB\n"
     "DV25;DV;DVCPro;;;;;YUV\n"
     "dv25;DV;DVCPro;;;;;YUV\n"
@@ -1528,21 +1615,21 @@
     "DVL ;DV;Radius;;;;;YUV\n"
     "DVLP;DV;Radius;;;;;YUV\n"
     "DVMA;DV;Darim;;;;;YUV\n"
-    "DVNM;DVNM;;Matsushita Electric Industrial Co., Ltd.\n"
+    "DVNM;DVNM;;Matsushita Electric Industrial Co., Ltd.;;;;\n"
     "DVOR;RGB;BlueFish;BlueFish444 (lossless RGBA, YUV 10-bit);;;;RGB\n"
     "DVPN;DV;Apple;;;;;YUV\n"
     "DVPP;DV;Apple;;;;;YUV\n"
     "DVR ;MPEG Video;ASF;;;;;YUV;4:2:0\n"
-    "DVR1;Targa2000\n"
+    "DVR1;Targa2000;;;;;;\n"
     "DVRS;DV;DualMoon;;;;;YUV\n"
     "dvsd;DV;Sony;;;;;YUV\n"
     "dvsl;DV;Sony;;;;;YUV\n"
     "DVSL;DV;;;;;;YUV\n"
-    "DVX1;DVX 1 SP;;Lucent DVX1000SP Video Decoder\n"
-    "DVX2;DVX 2 S;;Lucent DVX2000S Video Decoder\n"
-    "DVX3;DVX 3 S;;Lucent DVX3000S Video Decoder\n"
+    "DVX1;DVX 1 SP;;Lucent DVX1000SP Video Decoder;;;;\n"
+    "DVX2;DVX 2 S;;Lucent DVX2000S Video Decoder;;;;\n"
+    "DVX3;DVX 3 S;;Lucent DVX3000S Video Decoder;;;;\n"
     "DX50;MPEG-4 Visual;DivX 5;;http://mediaarea.net/DX50;;;YUV;4:2:0\n"
-    "DXGM;EA GameVideo\n"
+    "DXGM;EA GameVideo;;;;;;\n"
     "DXT1;DirectX TC;;DirectX Compressed Texture (1bit alpha channel)\n"
     "DXT2;DirectX TC;;DirectX Compressed Texture\n"
     "DXT3;DirectX TC;;DirectX Compressed Texture (4bit alpha channel)\n"
@@ -1559,156 +1646,160 @@
     "ETV1;eTreppid 1;;eTreppid Video 1\n"
     "ETV2;eTreppid 2;;eTreppid Video 2\n"
     "ETVC;eTreppid C;;eTreppid Video C\n"
-    "FFDS;FFDS;;;http://ffdshow-tryout.sourceforge.net/\n"
-    "FFV1;FFV1;;;http://ffdshow-tryout.sourceforge.net/\n"
-    "FFVH;FFVH;;;http://ffdshow-tryout.sourceforge.net/\n"
-    "FLIC;FLI/FLC;Autodesk\n"
-    "FLJP;DField M-JPEG;;D-Vision Field Encoded M-JPEG with LSI (or Targa emulation)\n"
-    "FLV1;FFDS;;FFDShow supported;http://ffdshow-tryout.sourceforge.net/\n"
-    "FLV4;VP6;On2;;http://www.on2.com\n"
-    "FMJP;M-JPEG;D-Vision;;;;;YUV;4:2:0\n"
+    "FFDS;FFDS;;;http://ffdshow-tryout.sourceforge.net/;;;\n"
+    "FFV1;FFV1;;;http://ffdshow-tryout.sourceforge.net/;;;\n"
+    "FFV2;FFV2;;;http://ffdshow-tryout.sourceforge.net/;;;\n"
+    "FFVH;FFVH;;;http://ffdshow-tryout.sourceforge.net/;;;\n"
+    "FLIC;FLI/FLC;Autodesk;;;;;\n"
+    "FLJP;DField JPEG;;D-Vision Field Encoded JPEG with LSI (or Targa emulation);;;;\n"
+    "FLV1;Sorenson Spark;;;http://ffdshow-tryout.sourceforge.net/;;;\n"
+    "FLV4;VP6;On2;;http://ftp.pub.cri74.org/pub/win9x/video/codecs/VP6/vp6_vfw_codec.exe;Heightened Sharpness;;\n"
+    "FMJP;JPEG;D-Vision;;;;;YUV\n"
     "FMP4;MPEG-4 Visual;;;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0\n"
-    "FPS1;Fraps;;;http://www.fraps.com/\n"
-    "FRLE;M-JPEG;SoftLab-Nsk;SoftLab-NSK Y16 + Alpha RLE;;;;YUV;4:2:0\n"
-    "FRWA;M-JPEG;SoftLab-Nsk;SoftLab-NSK Vision Forward M-JPEG with Alpha-channel;;;;YUV;4:2:0\n"
-    "FRWD;M-JPEG;SoftLab-Nsk;SoftLab-NSK Vision Forward M-JPEG;;;;YUV;4:2:0\n"
-    "FRWT;M-JPEG;SoftLab-Nsk;SoftLab-NSK Vision Forward M-JPEG with Alpha-channel;;;;YUV;4:2:0\n"
-    "FRWU;M-JPEG;SoftLab-Nsk;SoftLab-NSK Vision Forward Uncompressed;;;;YUV;4:2:0\n"
-    "FVF1;Itered Fractal\n"
-    "FVFW;FVFW;;;http://ffdshow-tryout.sourceforge.net/\n"
-    "FXT1;3DFX\n"
-    "G2M2;GoToMeeting2;;Citrix Systems, Inc.;http://www.gotomeeting.com/\n"
-    "G2M3;GoToMeeting3;;Citrix Systems, Inc.;http://www.gotomeeting.com/\n"
-    "GEPJ;M-JPEG;White Pine;;;;;YUV;4:2:0\n"
-    "GJPG;Grand Tech GT891x\n"
-    "GLCC;GigaLink\n"
-    "GLZW;LZW;Gabest;;http://sourceforge.net/project/showfiles.php?group_id=82303&package_id=84358\n"
-    "GPEG;M-JPEG;Gabest;;http://sourceforge.net/project/showfiles.php?group_id=82303&package_id=84358;;;YUV;4:2:0\n"
-    "GPJM;M-JPEG;Pinnacle;;;;;YUV;4:2:0\n"
+    "FPS1;Fraps;;;http://www.fraps.com/;;;\n"
+    "FRLE;JPEG;SoftLab-Nsk;SoftLab-NSK Y16 + Alpha RLE;;;;YUV\n"
+    "FRWA;JPEG;SoftLab-Nsk;SoftLab-NSK Vision Forward JPEG with Alpha-channel;;;;YUV\n"
+    "FRWD;JPEG;SoftLab-Nsk;SoftLab-NSK Vision Forward JPEG;;;;YUV\n"
+    "FRWT;JPEG;SoftLab-Nsk;SoftLab-NSK Vision Forward JPEG with Alpha-channel;;;;YUV\n"
+    "FRWU;JPEG;SoftLab-Nsk;SoftLab-NSK Vision Forward Uncompressed;;;;YUV\n"
+    "FVF1;Itered Fractal;;;;;;\n"
+    "FVFW;FVFW;;;http://ffdshow-tryout.sourceforge.net/;;;\n"
+    "FXT1;3DFX;;;;;;\n"
+    "G2M2;GoToMeeting2;;Citrix Systems, Inc.;http://www.gotomeeting.com/;;;\n"
+    "G2M3;GoToMeeting3;;Citrix Systems, Inc.;http://www.gotomeeting.com/;;;\n"
+    "GEPJ;JPEG;White Pine;;;;;YUV\n"
+    "GJPG;Grand Tech GT891x;;;;;;\n"
+    "GLCC;GigaLink;;;;;;\n"
+    "GLZW;LZW;Gabest;;http://sourceforge.net/project/showfiles.php?group_id=82303&package_id=84358;;;\n"
+    "GMP4;GeoVision Advanced MPEG-4;;;http://www.geovision.com.tw/;;;\n"
+    "GM40;GeoVision Advanced MPEG-4;;;http://www.geovision.com.tw/;;;\n"
+    "GPEG;JPEG;Gabest;;http://sourceforge.net/project/showfiles.php?group_id=82303&package_id=84358;;;YUV\n"
+    "GPJM;JPEG;Pinnacle;;;;;YUV\n"
     "GREY;YUV;;Simple grayscale video;http://www.fourcc.org/indexyuv.htm;;;YUV\n"
-    "GWLT;MS GWLT;;Microsoft Greyscale WLT DIB\n"
-    "GXVE;ViVD V2;SoftMedia\n"
-    "H260;H.260\n"
-    "H261;H.261\n"
+    "GWLT;MS GWLT;;Microsoft Greyscale WLT DIB;;;;\n"
+    "GXVE;ViVD V2;SoftMedia;;;;;\n"
+    "H260;H.260;;;;;;\n"
+    "H261;H.261;;;;;;\n"
     "H262;MPEG Video;;;;;;YUV;4:2:0\n"
-    "H263;H.263\n"
-    "h263;H.263;;;http://www.apple.com/quicktime/download/standalone.html\n"
+    "H263;H.263;;;;;;\n"
+    "h263;H.263;;;http://www.apple.com/quicktime/download/standalone.html;;;\n"
     "H264;AVC;;;;;;YUV;4:2:0\n"
     "h264;AVC;;;;;;YUV;4:2:0\n"
-    "H265;H.265\n"
-    "H266;H.266\n"
-    "H267;H.267\n"
-    "H268;H.268\n"
-    "H269;H.263\n"
+    "H265;H.265;;;;;;\n"
+    "H266;H.266;;;;;;\n"
+    "H267;H.267;;;;;;\n"
+    "H268;H.268;;;;;;\n"
+    "H269;H.263;;;;;;\n"
     "HD10;RGB;BlueFish;BlueFish444 (lossless RGBA, YUV 10-bit);;;;RGB\n"
-    "HDX4;Jomigo HDX4\n"
-    "HFYU;Huffman\n"
-    "HMCR;Rendition;;Rendition Motion Compensation Format\n"
-    "HMRR;Rendition;;Rendition Motion Compensation Format\n"
-    "i263;H.263\n"
-    "I420;H.263\n"
-    "IAN ;Indeo 4\n"
-    "ICLB;CellB;;InSoft CellB Videoconferencing\n"
-    "IDM0;Wavelets 2;;IDM Motion Wavelets 2.0\n"
-    "IF09;H.261;Microsoft\n"
+    "HDX4;Jomigo HDX4;;;;;;\n"
+    "HFYU;Huffman;;;;;;\n"
+    "HMCR;Rendition;;Rendition Motion Compensation Format;;;;\n"
+    "HMRR;Rendition;;Rendition Motion Compensation Format;;;;\n"
+    "i263;H.263;;;;;;\n"
+    "I420;YUV;;8 bit Y plane followed by 8 bit 2x2 subsampled U and V planes.;;;;\n"
+    "IAN ;Indeo 4;;;;;;\n"
+    "ICLB;CellB;;InSoft CellB Videoconferencing;;;;\n"
+    "IDM0;Wavelets 2;;IDM Motion Wavelets 2.0;;;;\n"
+    "IF09;H.261;Microsoft;;;;;\n"
     "IFO9;YUV;Intel;;;;;YUV\n"
-    "IGOR;PowerDVD\n"
-    "IJPG;M-JPEG;Intergraph;;;;;YUV;4:2:0\n"
-    "ILVC;Layered Video;Intel\n"
-    "ILVR;H.263+\n"
-    "IMAC;MotionComp;;Intel hardware motion compensation.\n"
+    "IGOR;PowerDVD;;;;;;\n"
+    "IJPG;JPEG;Intergraph;;;;;YUV\n"
+    "ILVC;Layered Video;Intel;;;;;\n"
+    "ILVR;H.263+;;;;;;\n"
+    "IMAC;MotionComp;;Intel hardware motion compensation.;;;;\n"
     "IMC1;YUV;;As YV12, except the U and V planes each have the same stride as the Y plane;;;;YUV\n"
     "IMC2;YUV;;Similar to IMC1, except that the U and V lines are interleaved at half stride boundaries;;;;YUV\n"
     "IMC3;YUV;;As IMC1, except that U and V are swapped;;;;YUV\n"
     "IMC4;YUV;;As IMC2, except that U and V are swapped;;;;YUV\n"
     "IMG ;YUV;;;;;;YUV\n"
-    "IMJG;Accom M-JPEG;;Accom SphereOUS M-JPEG with Alpha-channel\n"
-    "IPDV;I-O DV;;I-O Data Device Giga AVI DV\n"
-    "IPJ2;M-JPEG2000;;Image Power JPEG2000\n"
-    "IR21;Indeo 2.1\n"
+    "IMJG;Accom JPEG;;Accom SphereOUS JPEG with Alpha-channel;;;;\n"
+    "IPDV;I-O DV;;I-O Data Device Giga AVI DV;;;\n"
+    "IPJ2;JPEG 2000;;Image Power JPEG 2000;;;\n"
+    "IR21;Indeo 2.1;;;;;\n"
     "IRAW;YUV;;;http://www.fourcc.org/indexyuv.htm;;;YUV\n"
-    "ISME;ISME;;Intel\n"
+    "ISME;ISME;;Intel;;;\n"
     "IUYV;YUV;;Lead 16bpp. Interlaced version of UYVY (line order 0, 2, 4,....,1, 3, 5....);;;;YUV\n"
-    "IV30;Indeo 3;;Intel Indeo Video 3\n"
-    "IV31;Indeo 3;;Intel Indeo Video 3.1\n"
-    "IV32;Indeo 3;;Intel Indeo Video 3.2\n"
-    "IV33;Indeo 3;;Intel Indeo Video 3.3\n"
-    "IV34;Indeo 3;;Intel Indeo Video 3.4\n"
-    "IV35;Indeo 3;;Intel Indeo Video 3.5\n"
-    "IV36;Indeo 3;;Intel Indeo Video 3.6\n"
-    "IV37;Indeo 3;;Intel Indeo Video 3.7\n"
-    "IV38;Indeo 3;;Intel Indeo Video 3.8\n"
-    "IV39;Indeo 3;;Intel Indeo Video 3.9\n"
-    "IV40;Indeo 4;;Intel Indeo Video 4.0\n"
-    "IV41;Indeo 4;;Intel Indeo Video 4.1\n"
-    "IV42;Indeo 4;;Intel Indeo Video 4.2\n"
-    "IV43;Indeo 4;;Intel Indeo Video 4.3\n"
-    "IV44;Indeo 4;;Intel Indeo Video 4.4\n"
-    "IV45;Indeo 4;;Intel Indeo Video 4.5\n"
-    "IV46;Indeo 4;;Intel Indeo Video 4.6\n"
-    "IV47;Indeo 4;;Intel Indeo Video 4.7\n"
-    "IV48;Indeo 4;;Intel Indeo Video 4.8\n"
-    "IV49;Indeo 4;;Intel Indeo Video 4.9\n"
-    "IV50;Indeo 4;;Intel Indeo Video 5.0 Wavelet;http://www.fourcc.org/indexyuv.htm\n"
+    "IV30;Indeo 3;;Intel Indeo Video 3;;;\n"
+    "IV31;Indeo 3;;Intel Indeo Video 3.1;;;\n"
+    "IV32;Indeo 3;;Intel Indeo Video 3.2;;;\n"
+    "IV33;Indeo 3;;Intel Indeo Video 3.3;;;\n"
+    "IV34;Indeo 3;;Intel Indeo Video 3.4;;;\n"
+    "IV35;Indeo 3;;Intel Indeo Video 3.5;;;\n"
+    "IV36;Indeo 3;;Intel Indeo Video 3.6;;;\n"
+    "IV37;Indeo 3;;Intel Indeo Video 3.7;;;\n"
+    "IV38;Indeo 3;;Intel Indeo Video 3.8;;;\n"
+    "IV39;Indeo 3;;Intel Indeo Video 3.9;;;\n"
+    "IV40;Indeo 4;;Intel Indeo Video 4.0;;;\n"
+    "IV41;Indeo 4;;Intel Indeo Video 4.1;;;\n"
+    "IV42;Indeo 4;;Intel Indeo Video 4.2;;;\n"
+    "IV43;Indeo 4;;Intel Indeo Video 4.3;;;\n"
+    "IV44;Indeo 4;;Intel Indeo Video 4.4;;;\n"
+    "IV45;Indeo 4;;Intel Indeo Video 4.5;;;\n"
+    "IV46;Indeo 4;;Intel Indeo Video 4.6;;;\n"
+    "IV47;Indeo 4;;Intel Indeo Video 4.7;;;\n"
+    "IV48;Indeo 4;;Intel Indeo Video 4.8;;;\n"
+    "IV49;Indeo 4;;Intel Indeo Video 4.9;;;\n"
+    "IV50;Indeo 4;;Intel Indeo Video 5.0 Wavelet;http://www.fourcc.org/indexyuv.htm;;\n"
     "IY41;YUV;;Lead 16bpp. Interlaced version of Y41P (line order 0, 2, 4,....,1, 3, 5....);http://www.fourcc.org/indexyuv.htm;;;YUV\n"
     "IYU1;YUV;;IEEE1394 12bpp. 12 bit format used in mode 2 of the IEEE 1394 Digital Camera 1.04 spec;http://www.fourcc.org/indexyuv.htm;;;YUV\n"
     "IYU2;YUV;;IEEE1394 24bpp. 24 bit format used in mode 2 of the IEEE 1394 Digital Camera 1.04 spec;;;;YUV\n"
     "IYUV;YUV;;Intel Indeo iYUV 4:2:0;;;;YUV\n"
-    "JBYR;Kensington;;Kensington Video;http://ffdshow-tryout.sourceforge.net/\n"
-    "JFIF;M-JPEG;;;;;;YUV;4:2:0\n"
-    "JPEG;M-JPEG;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:0\n"
-    "JPG;M-JPEG;;;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe;;;YUV;4:2:0\n"
-    "JPGL;M-JPEG;Pegasus;DIVIO JPEG Light for WebCams (Pegasus Lossless JPEG);;;;YUV;4:2:0\n"
-    "KMVC;Karl;;Karl Morton's Video (presumably);http://www.apple.com/quicktime/download/standalone.html\n"
-    "kpcd;Photo CD;;Kodak Photo CD\n"
-    "L261;H.261;Lead Technologies\n"
-    "L263;H.263+;Lead Technologies\n"
-    "LAGS;Lagarith\n"
-    "LBYR;Creative WebCam\n"
-    "LCMW;Lead CMW;;Lead Technologies Motion CMW\n"
-    "LCW2;Lead MCMW;;LEADTools MCMW 9Motion Wavelet;http://mirror01.iptelecom.net.ua/~video/codecs/LEAD.MCMP-M-JPEG.v1.016.codec.exe\n"
-    "LEAD;Lead Video\n"
-    "LGRY;Lead GrayScale\n"
-    "LIA1;Liafail;;Liafail, Inc.\n"
-    "LJ2K;M-JPEG2000;Lead;;http://mirror01.iptelecom.net.ua/~video/codecs/LEAD.MCMP-M-JPEG.v1.016.codec.exe\n"
-    "LJPG;M-JPEG;Lead;;http://mirror01.iptelecom.net.ua/~video/codecs/LEAD.MCMP-M-JPEG.v1.016.codec.exe;;;YUV;4:2:0\n"
-    "Ljpg;M-JPEG;Lead;;;;;YUV;4:2:0\n"
-    "LMP2;MPEG-PS;Lead\n"
-    "LOCO;LOCO;;Lossless\n"
-    "LSCR;Lead Screen capture\n"
-    "LSV0;LSV0;;Infinop Inc.\n"
-    "LSVC;Vmail;;Vianet Lighting Strike Vmail (Streaming)\n"
-    "LSVM;Vmail;;Vianet Lighting Strike Vmail (Streaming)\n"
-    "LSVW;Infinop;;Infinop Lightning Strike multiple bit rate video codec.\n"
-    "LSVX;Vmail;;Vianet Lightning Strike Video Codec\n"
-    "LZO1;LZO;;LZO compressed (lossless)\n"
+    "JBYR;Kensington;;Kensington Video;http://ffdshow-tryout.sourceforge.net/;;\n"
+    "JFIF;JPEG;;;;;;YUV\n"
+    "JPEG;JPEG;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
+    "JPG;JPEG;;;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe;;;YUV\n"
+    "JPGL;JPEG;Pegasus;DIVIO JPEG Light for WebCams (Pegasus Lossless JPEG);;;;YUV\n"
+    "KMVC;Karl;;Karl Morton's Video (presumably);http://www.apple.com/quicktime/download/standalone.html;;;\n"
+    "kpcd;Photo CD;;Kodak Photo CD;;;;\n"
+    "L261;H.261;Lead Technologies;;;;;\n"
+    "L263;H.263+;Lead Technologies;;;;;\n"
+    "LAGS;Lagarith;;;;;;\n"
+    "LBYR;Creative WebCam;;;;;;\n"
+    "LCMW;Lead CMW;;Lead Technologies Motion CMW;;;;\n"
+    "LCW2;Lead MCMW;;LEADTools MCMW 9Motion Wavelet;http://mirror01.iptelecom.net.ua/~video/codecs/LEAD.MCMP-JPEG.v1.016.codec.exe;;;\n"
+    "LEAD;Lead Video;;;;;;\n"
+    "LGRY;Lead GrayScale;;;;;;\n"
+    "LIA1;Liafail;;Liafail, Inc.;;;;\n"
+    "LJ2K;JPEG 2000;Lead;;http://mirror01.iptelecom.net.ua/~video/codecs/LEAD.MCMP-JPEG.v1.016.codec.exe;;;\n"
+    "LJPG;JPEG;Lead;;http://mirror01.iptelecom.net.ua/~video/codecs/LEAD.MCMP-JPEG.v1.016.codec.exe;;;YUV\n"
+    "Ljpg;JPEG;Lead;;;;;YUV\n"
+    "LMP2;MPEG-PS;Lead;;;;;\n"
+    "LOCO;LOCO;;Lossless;;;;\n"
+    "LSCR;Lead Screen capture;;;;;;\n"
+    "LSV0;LSV0;;Infinop Inc.;;;;\n"
+    "LSVC;Vmail;;Vianet Lighting Strike Vmail (Streaming);;;;\n"
+    "LSVM;Vmail;;Vianet Lighting Strike Vmail (Streaming);;;;\n"
+    "LSVW;Infinop;;Infinop Lightning Strike multiple bit rate video codec.;;;;\n"
+    "LSVX;Vmail;;Vianet Lightning Strike Video Codec;;;;\n"
+    "LZO1;LZO;;LZO compressed (lossless);;;;\n"
     "M101;YUV;Matrox;;;;;YUV\n"
-    "M261;H.261;Microsoft\n"
-    "M263;H.263;Microsoft\n"
+    "M261;H.261;Microsoft;;;;;\n"
+    "M263;H.263;Microsoft;;;;;\n"
     "M4CC;MPEG-4 Visual;ESS Divo;;;;;YUV;4:2:0\n"
     "M4S2;MPEG-4 Visual;Microsoft;;;;;YUV;4:2:0\n"
-    "MC12;ATI Motion;;ATI Motion Compensation Format\n"
-    "MC24;M-JPEG;MainConcept;;;;;YUV;4:2:0\n"
-    "MCAM;ATI Motion;;ATI Motion Compensation Format\n"
+    "MC12;ATI Motion;;ATI Motion Compensation Format;;;;\n"
+    "MC24;JPEG;MainConcept;;;;;YUV\n"
+    "MCAM;ATI Motion;;ATI Motion Compensation Format;;;;\n"
     "MCZM;RGB;;Theory MicroCosm Lossless 64bit RGB with Alpha-channel;;;;RGB\n"
-    "MDVD;MicroDVD;;Alex MicroDVD Video (hacked MS MPEG-4)\n"
+    "MDVD;MicroDVD;;Alex MicroDVD Video (hacked MS MPEG-4);;;;\n"
     "MDVF;DV;Pinnacle;Pinnacle DV/DV50/DVHD100;;;;YUV\n"
     "MHFY;YUV;;A.M.Paredes mhuffyYUV (LossLess);http://mirror01.iptelecom.net.ua/~video/codecs/Pinnacle.ReelTime.v2.5.software.only.codec.exe;;;YUV\n"
-    "MJ2C;M-JPEG2000;;Morgan Multimedia JPEG2000 Compression;http://mirror01.iptelecom.net.ua/~video/codecs/Pinnacle.ReelTime.v2.5.software.only.codec.exe\n"
-    "MJPA;M-JPEG;Pinacle;Pinnacle ReelTime MJPG hardware;http://mediaxw.sourceforge.net;;;YUV;4:2:0\n"
-    "MJPB;M-JPEG;Pinacle B;;;;;YUV;4:2:0\n"
-    "MJPG;M-JPEG;;;;;;YUV;4:2:0\n"
-    "mJPG;M-JPEG;IBM;Including Huffman Tables;;;;YUV;4:2:0\n"
-    "MJPX;M-JPEG;Pegasus;Pegasus PICVideo M-JPEG;;;;YUV;4:2:0\n"
-    "ML20;Webcam;;Mimic MSN Messenger Webcam\n"
+    "MJ2C;JPEG 2000;;Morgan Multimedia JPEG 2000 Compression;http://mirror01.iptelecom.net.ua/~video/codecs/Pinnacle.ReelTime.v2.5.software.only.codec.exe;;;\n"
+    "MJPA;JPEG;Pinacle;Pinnacle ReelTime MJPG hardware;http://mediaxw.sourceforge.net;;;YUV\n"
+    "MJPB;JPEG;Pinacle B;;;;;YUV\n"
+    "MJPG;JPEG;;;;;;YUV\n"
+    "mJPG;JPEG;IBM;Including Huffman Tables;;;;YUV\n"
+    "MJPX;JPEG;Pegasus;Pegasus PICVideo JPEG;;;;YUV\n"
+    "ML20;Webcam;;Mimic MSN Messenger Webcam;;;;\n"
+    "MLCY;MLC;;MLC Lossless Codec;http://www.linek.sk/mlc/;;;;;;Lossless\n"
     "MMES;MPEG Video;Matrox;I-frame;;;;YUV;4:2:0\n"
     "MMIF;MPEG Video;Matrox;I-frame;;;;YUV;4:2:0\n"
-    "MNVD;MindVid;;MindBend MindVid LossLess\n"
+    "MNVD;MindVid;;MindBend MindVid LossLess;;;;\n"
     "MP2V;MPEG Video;;Media Excel MPEG-2 Video;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0\n"
     "MP2v;MPEG Video;;MPEG-2 Video;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0\n"
-    "MP41;MPEG-4 Visual;Microsoft;Microsoft MPEG-4 v1 (pre-standard);http://ffdshow-tryout.sourceforge.net/\n"
-    "MP42;MPEG-4 Visual;Microsoft;Microsoft MPEG-4 v2 (pre-standard);http://www.apple.com/quicktime/download/standalone.html\n"
-    "MP43;MPEG-4 Visual;Microsoft;Microsoft MPEG-4 v3 (pre-standard)\n"
+    "MP41;MPEG-4 Visual;Microsoft;Microsoft MPEG-4 v1 (pre-standard);http://ffdshow-tryout.sourceforge.net/;;;\n"
+    "MP42;MPEG-4 Visual;Microsoft;Microsoft MPEG-4 v2 (pre-standard);http://www.apple.com/quicktime/download/standalone.html;;;\n"
+    "MP43;MPEG-4 Visual;Microsoft;Microsoft MPEG-4 v3 (pre-standard);;;;\n"
     "MP4S;MPEG-4 Visual;MS MPEG-4 v3;Microsoft MPEG-4 (Windows Media 7.0);;;;YUV;4:2:0\n"
     "MP4V;MPEG-4 Visual;;Apple QuickTime MPEG-4 native;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0\n"
     "MPEG;MPEG Video;;Chromatic MPEG 1 Video I Frame;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0\n"
@@ -1720,53 +1811,53 @@
     "MPG3;MPEG-4 Visual;FFmpeg DivX 3;(MPEG-4) MS MPEG-4 v3;;;;YUV;4:2:0\n"
     "MPG4;MPEG-4 Visual;MS MPEG-4 v1;Microsoft MPEG-4 v1;;;;YUV;4:2:0\n"
     "MPGI;MPEG Video;Sigma;Sigma Design MPEG-1 I-frame;;;;YUV;4:2:0\n"
-    "MPNG;M-PNG;;Motion PNG\n"
-    "MRCA;Mrcodec;;FAST Multimedia\n"
+    "MPNG;PNG;;Motion PNG;;;;\n"
+    "MRCA;Mrcodec;;FAST Multimedia;;;;\n"
     "MRLE;RLE;;Microsoft RLE;;;;RGB\n"
-    "MSS1;Screen Video;Windows;Windows Screen Video\n"
-    "MSS2;Windows Media;;Windows Media 9\n"
-    "MSUC;MSU;;MSU LossLess\n"
-    "MSUD;MSU;;MSU LossLess\n"
-    "MSV1;Microsoft Video 1;;Microsoft Video 1\n"
-    "MSVC;Microsoft Video 1;;Microsoft Video 1\n"
-    "MSZH;AVImszh;;Lossless (ZIP compression)\n"
-    "MTGA;TGA;;Motion TGA images (24, 32 bpp)\n"
-    "MTX1;M-JPEG;Matrox;;;;;YUV;4:2:0\n"
-    "MTX2;M-JPEG;Matrox;;;;;YUV;4:2:0\n"
-    "MTX3;M-JPEG;Matrox;;;;;YUV;4:2:0\n"
-    "MTX4;M-JPEG;Matrox;;;;;YUV;4:2:0\n"
-    "MTX5;M-JPEG;Matrox;;;;;YUV;4:2:0\n"
-    "MTX6;M-JPEG;Matrox;;;;;YUV;4:2:0\n"
-    "MTX7;M-JPEG;Matrox;;;;;YUV;4:2:0\n"
-    "MTX8;M-JPEG;Matrox;;;;;YUV;4:2:0\n"
-    "MTX9;M-JPEG;Matrox;;;;;YUV;4:2:0\n"
-    "MV10;Nokia;;Nokia Mobile Phones\n"
-    "MV11;Nokia;;Nokia Mobile Phones\n"
-    "MV12;MVI;;Motion Pixels (old)\n"
-    "MV99;Nokia;;Nokia Mobile Phones\n"
-    "MVC1;Nokia;;Nokia Mobile Phones\n"
-    "MVC2;Nokia;;Nokia Mobile Phones\n"
-    "MVC9;Nokia;;Nokia Mobile Phones\n"
-    "MVI1;MVI;;Motion Pixels MVI\n"
-    "MVI2;MVI;;Motion Pixels MVI\n"
-    "MWV1;Aware Motion Wavelets;;Aware Motion Wavelets\n"
+    "MSS1;Screen Video;Windows;Windows Screen Video;;;;\n"
+    "MSS2;Windows Media;;Windows Media 9;;;;\n"
+    "MSUC;MSU;;MSU LossLess;;;;\n"
+    "MSUD;MSU;;MSU LossLess;;;;\n"
+    "MSV1;Microsoft Video 1;;Microsoft Video 1;;;;\n"
+    "MSVC;Microsoft Video 1;;Microsoft Video 1;;;;\n"
+    "MSZH;AVImszh;;Lossless (ZIP compression);;;;\n"
+    "MTGA;TGA;;Motion TGA images (24, 32 bpp);;;;\n"
+    "MTX1;JPEG;Matrox;;;;;YUV\n"
+    "MTX2;JPEG;Matrox;;;;;YUV\n"
+    "MTX3;JPEG;Matrox;;;;;YUV\n"
+    "MTX4;JPEG;Matrox;;;;;YUV\n"
+    "MTX5;JPEG;Matrox;;;;;YUV\n"
+    "MTX6;JPEG;Matrox;;;;;YUV\n"
+    "MTX7;JPEG;Matrox;;;;;YUV\n"
+    "MTX8;JPEG;Matrox;;;;;YUV\n"
+    "MTX9;JPEG;Matrox;;;;;YUV\n"
+    "MV10;Nokia;;Nokia Mobile Phones;;;;\n"
+    "MV11;Nokia;;Nokia Mobile Phones;;;;\n"
+    "MV12;MVI;;Motion Pixels (old);;;;\n"
+    "MV99;Nokia;;Nokia Mobile Phones;;;;\n"
+    "MVC1;Nokia;;Nokia Mobile Phones;;;;\n"
+    "MVC2;Nokia;;Nokia Mobile Phones;;;;\n"
+    "MVC9;Nokia;;Nokia Mobile Phones;;;;\n"
+    "MVI1;MVI;;Motion Pixels MVI;;;;\n"
+    "MVI2;MVI;;Motion Pixels MVI;;;;\n"
+    "MWV1;Aware Motion Wavelets;;Aware Motion Wavelets;;;;\n"
     "MYUV;RGB;;Media-100 844/X Uncompressed;;;;RGB\n"
     "NAVI;MPEG-4 Visual;;nAVI video (hacked MS MPEG-4);;;;YUV;4:2:0\n"
     "NDIG;MPEG-4 Visual;Ahead;Ahead Nero Digital MPEG-4;;;;YUV;4:2:0\n"
-    "NHVU;Nvidia Texture;;Nvidia Texture Format (GEForce 3)\n"
+    "NHVU;Nvidia Texture;;Nvidia Texture Format (GEForce 3);;;;\n"
     "NO16;RGB;;Theory None16 64bit uncompressed Uncompressed;;;;RGB\n"
     "NT00;YUV;LightWave;NewTek LightWave HDTV YUV with Alpha-channel;;;;YUV\n"
-    "NTN1;NogaTech Video 1;;Nogatech Video Compression 1\n"
-    "NTN2;NogaTech Video 2;;Nogatech Video Compression 2 (GrabBee hardware coder)\n"
-    "NUV1;Nuppel;;NuppelVideo\n"
+    "NTN1;NogaTech Video 1;;Nogatech Video Compression 1;;;;\n"
+    "NTN2;NogaTech Video 2;;Nogatech Video Compression 2 (GrabBee hardware coder);;;;\n"
+    "NUV1;Nuppel;;NuppelVideo;;;;\n"
     "NV12;YUV;;8-bit Y plane followed by an interleaved U/V plane with 2x2 subsampling;;;;YUV\n"
     "NV21;YUV;;As NV12 with U and V reversed in the interleaved plane;;;;YUV\n"
-    "NVDS;Nvidia Texture;;Nvidia Texture Format\n"
-    "NVHS;Nvidia Texture;;Nvidia Texture Format (GeForce 3)\n"
-    "NVHU;Nvidia Texture;;Nvidia Texture Format\n"
-    "NVS0;Nvidia Texture;;Nvidia Texture Compression Format\n"
-    "NVS1;Nvidia Texture;;Nvidia Texture Compression Format\n"
-    "NVS2;Nvidia Texture;;Nvidia Texture Compression Format\n"
+    "NVDS;Nvidia Texture;;Nvidia Texture Format;;;;\n"
+    "NVHS;Nvidia Texture;;Nvidia Texture Format (GeForce 3);;;;\n"
+    "NVHU;Nvidia Texture;;Nvidia Texture Format;;;;\n"
+    "NVS0;Nvidia Texture;;Nvidia Texture Compression Format;;;;\n"
+    "NVS1;Nvidia Texture;;Nvidia Texture Compression Format;;;;\n"
+    "NVS2;Nvidia Texture;;Nvidia Texture Compression Format;;;;\n"
     "NVS3;Nvidia Texture;;Nvidia Texture Compression Format\n"
     "NVS4;Nvidia Texture;;Nvidia Texture Compression Format\n"
     "NVS5;Nvidia Texture;;Nvidia Texture Compression Format\n"
@@ -1783,31 +1874,31 @@
     "NVT6;Nvidia Texture;;Nvidia Texture Compression Format\n"
     "NVT7;Nvidia Texture;;Nvidia Texture Compression Format\n"
     "NVT8;Nvidia Texture;;Nvidia Texture Compression Format\n"
-    "NVT9;Nvidia Texture;;Nvidia Texture Compression Format\n"
+    "NVT9;Nvidia Texture;;Nvidia Texture Compression Format;;;;\n"
     "NY12;YUV;Nogatech;;;;;YUV\n"
     "NYUV;YUV;Nogatech;;;;;YUV\n"
-    "ONYX;VP7;On2;;http://www.on2.com/vp7.php3\n"
-    "PCLE;Studio400;Pinnacle\n"
+    "ONYX;VP7;On2;;http://www.on2.com/vp7.php3;;;\n"
+    "PCLE;Studio400;Pinnacle;;;;;\n"
     "PDVC;DV;Panasonic;;;;;YUV\n"
-    "PGVV;Radius Video Vision\n"
-    "PHMO;Photomotion;IBM\n"
-    "PIM1;M-JPEG;Pegasus;Pinnacle DC1000 hardware (MPEG compression);http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe;;;YUV;4:2:0\n"
-    "PIM2;M-JPEG;Pegasus;Pegasus Imaging;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe;;;YUV;4:2:0\n"
-    "PIMJ;M-JPEG;Pegasus;Pegasus Imaging PICvideo Lossless JPEG;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe;;;YUV;4:2:0\n"
-    "PIXL;M-JPEG;Miro;MiroVideo XL (M-JPEG);;;;YUV;4:2:0\n"
-    "PNG;M-PNG\n"
-    "PNG1;M-PNG;;Corecodec.org CorePNG\n"
-    "PVEZ;PowerEZ;;Horizons Technology PowerEZ\n"
+    "PGVV;Radius Video Vision;;;;;;\n"
+    "PHMO;Photomotion;IBM;;;;;\n"
+    "PIM1;JPEG;Pegasus;Pinnacle DC1000 hardware (MPEG compression);http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe;;;YUV\n"
+    "PIM2;JPEG;Pegasus;Pegasus Imaging;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe;;;YUV\n"
+    "PIMJ;JPEG;Pegasus;Pegasus Imaging PICvideo Lossless JPEG;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe;;;YUV\n"
+    "PIXL;JPEG;Miro;MiroVideo XL (JPEG);;;;YUV\n"
+    "PNG;PNG;;;;;;\n"
+    "PNG1;PNG;;Corecodec.org CorePNG;;;;\n"
+    "PVEZ;PowerEZ;;Horizons Technology PowerEZ;;;;\n"
     "PVMM;MPEG-4 Visual;Pegasus;PacketVideo Corporation MPEG-4;;;;YUV;4:2:0\n"
-    "PVW2;Wavelet;Pegasus;Pegasus Imaging Wavelet 2000\n"
-    "PVWV;Wavelet;Pegasus;Pegasus Imaging Wavelet 2000\n"
-    "PXLT;Pixlet;;Apple Pixlet (Wavelet)\n"
-    "Q1.0;QPEG 1.0;;Q-Team QPEG 1.0;http://www.q-team.de\n"
-    "Q1.1;QPEG 1.1;;Q-Team QPEG 1.1;http://www.q-team.de\n"
-    "QDGX;Apple GX;;Apple QuickDUncompressed GX\n"
-    "QDRW;Palettized Video;;Apple\n"
-    "QPEG;QPEG 1.1;;Q-Team QPEG 1.1\n"
-    "QPEQ;QPEG 1.1;;Q-Team QPEG 1.1\n"
+    "PVW2;Wavelet;Pegasus;Pegasus Imaging Wavelet 2000;;;;\n"
+    "PVWV;Wavelet;Pegasus;Pegasus Imaging Wavelet 2000;;;;\n"
+    "PXLT;Pixlet;;Apple Pixlet (Wavelet);;;;\n"
+    "Q1.0;QPEG 1.0;;Q-Team QPEG 1.0;http://www.q-team.de;;;\n"
+    "Q1.1;QPEG 1.1;;Q-Team QPEG 1.1;http://www.q-team.de;;;\n"
+    "QDGX;Apple GX;;Apple QuickDUncompressed GX;;;;\n"
+    "QDRW;Palettized Video;;Apple;;;;\n"
+    "QPEG;QPEG 1.1;;Q-Team QPEG 1.1;;;;\n"
+    "QPEQ;QPEG 1.1;;Q-Team QPEG 1.1;;;;\n"
     "R210;YUV;;BlackMagic YUV (Quick Time);;;;YUV\n"
     "R411;DV;Radius;Radius DV NTSC YUV;;;;YUV\n"
     "R420;DV;Radius;Radius DV PAL YUV;;;;YUV\n"
@@ -1824,77 +1915,77 @@
     "RGBQ;RGB;;Big Endian;;;;RGB 5:5:5;5:5:5\n"
     "RGBR;RGB;;Big Endian;;;;RGB 5:6:5;5:6:5\n"
     "RGBT;RGBA;;;http://www.fourcc.org/indexrgb.htm;;;RGBA\n"
-    "RIVA;Swizzled texture;;Nvidia\n"
+    "RIVA;Swizzled texture;;Nvidia;;;;\n"
     "RL4;RLE;;RLE 4bpp RGB;;;;RGB\n"
     "RL8;RLE;;RLE 8bpp RGB;;;;RGB\n"
     "RLE ;RLE;;RLE RGB with arbitrary sample packing within a pixel;http://www.fourcc.org/indexrgb.htm;;;RGB\n"
     "RLE4;RLE;;RLE 4bpp RGB;http://www.fourcc.org/indexrgb.htm;;;RGB\n"
     "RLE8;RLE;;RLE 8bpp RGB;http://www.fourcc.org/indexrgb.htm;;;RGB\n"
-    "RLND;Roland;;Roland Corporation\n"
+    "RLND;Roland;;Roland Corporation;;;;\n"
     "RMP4;MPEG-4 Visual;RealMagic;REALmagic MPEG-4 Video (Sigma Design, built on XviD);;;;YUV;4:2:0\n"
-    "ROQV;Id RoQ;;Id RoQ File Video Decoder\n"
-    "RT21;Intel Video 2.1;;Intel Real Time Video 2.1\n"
-    "RTV0;NewTek VideoToaster;;NewTek VideoToaster (dummy format - only AVI header)\n"
-    "RUD0;Rududu;;Rududu video\n"
-    "RV10;RealVideo 1;;H263, RealVideo 5;http://www.real.com\n"
-    "RV13;RealVideo 1;;H263, RealVideo 5;http://www.real.com\n"
-    "RV20;RealVideo 2;;H263, RealVideo 6;http://www.real.com\n"
-    "RV30;RealVideo 3;;Between H263 and H264, RealVideo 8;http://www.real.com\n"
-    "RV40;RealVideo 4;;H264, RealVideo 9;http://www.real.com\n"
-    "RVX ;RDX;;Intel RDX\n"
-    "S263;H.263;;;http://ffdshow-tryout.sourceforge.net/\n"
+    "ROQV;Id RoQ;;Id RoQ File Video Decoder;;;;\n"
+    "RT21;Intel Video 2.1;;Intel Real Time Video 2.1;;;;\n"
+    "RTV0;NewTek VideoToaster;;NewTek VideoToaster (dummy format - only AVI header);;;;\n"
+    "RUD0;Rududu;;Rududu video;;;;\n"
+    "RV10;RealVideo 1;;H263, RealVideo 5;http://www.real.com;;;\n"
+    "RV13;RealVideo 1;;H263, RealVideo 5;http://www.real.com;;;\n"
+    "RV20;RealVideo 2;;H263, RealVideo 6;http://www.real.com;;;\n"
+    "RV30;RealVideo 3;;Between H263 and H264, RealVideo 8;http://www.real.com;;;\n"
+    "RV40;RealVideo 4;;H264, RealVideo 9;http://www.real.com;;;\n"
+    "RVX ;RDX;;Intel RDX;;;;\n"
+    "S263;H.263;;;http://ffdshow-tryout.sourceforge.net/;;;\n"
     "S422;YUV;VideoCap C210;VideoCap C210;;;;YUV\n"
     "SAN3;MPEG-4 Visual;;Direct copy of DivX 3.11;;;;YUV;4:2:0\n"
-    "SANM;Smush v2;;LucasArts;http://www.lucasarts.com/\n"
-    "SCCD;SoftCam\n"
+    "SANM;Smush v2;;LucasArts;http://www.lucasarts.com/;;;\n"
+    "SCCD;SoftCam;;;;;;\n"
     "SDCC;DV;Sun;Sun Digital Camera;;;;YUV;4:1:1\n"
     "SEDG;MPEG-4 Visual;Samsung;Samsung MPEG-4;;;;YUV;4:2:0\n"
-    "SEG4;Cinepak;;;http://www.sega.com/\n"
-    "SEGA;Cinepak;;;http://www.sega.com/\n"
-    "SFMC;CrystalNet;;CrystalNet Surface Fitting Method\n"
-    "SHR0;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless)\n"
-    "SHR1;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless)\n"
-    "SHR2;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless)\n"
-    "SHR3;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless)\n"
-    "SHR4;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless)\n"
-    "SHR5;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless)\n"
-    "SHR6;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless)\n"
-    "SHR7;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless)\n"
-    "SIF1;SIF1;;;http://mysif.ru/SIF1_dd_Eng.htm\n"
-    "SJPG;M-JPEG;CuSeeMe;CuSeeMe;http://mirror01.iptelecom.net.ua/~video/codecs/CUseeMe.M-JPEG.CODEC.v1.17.exe;;;YUV;4:2:0\n"
+    "SEG4;Cinepak;;;http://www.sega.com/;;;\n"
+    "SEGA;Cinepak;;;http://www.sega.com/;;;\n"
+    "SFMC;CrystalNet;;CrystalNet Surface Fitting Method;;;;\n"
+    "SHR0;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless);;;;\n"
+    "SHR1;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless);;;;\n"
+    "SHR2;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless);;;;\n"
+    "SHR3;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless);;;;\n"
+    "SHR4;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless);;;;\n"
+    "SHR5;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless);;;;\n"
+    "SHR6;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless);;;;\n"
+    "SHR7;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless);;;;\n"
+    "SIF1;SIF1;;;http://mysif.ru/SIF1_dd_Eng.htm;;;\n"
+    "SJPG;JPEG;CuSeeMe;CuSeeMe;http://mirror01.iptelecom.net.ua/~video/codecs/CUseeMe.JPEG.CODEC.v1.17.exe;;;YUV\n"
     "SL25;DV;SoftLab DVCPro;SoftLab-NSK DVCPRO;;;;YUV;4:1:1\n"
     "SL50;DV;SoftLab DVCPro5;SoftLab-NSK ;;;;YUV;4:1:1\n"
     "SLDV;DV;SoftLab;SoftLab-NSK Forward DV Draw;;;;YUV;4:1:1\n"
     "SLIF;MPEG Video;SoftLab;SoftLab-NSK MPEG-2 I-frames;;;;YUV;4:2:0\n"
-    "SLMJ;M-JPEG;SoftLab;SoftLab-NSK Forward M-JPEG;;;;YUV;4:2:0\n"
-    "smc ;SMC;;Apple Graphics (SMC);http://www.apple.com/quicktime/download/standalone.html\n"
-    "SMSC;Radius\n"
-    "SMSD;Radius\n"
-    "SMSV;Wavelet Video;;WorldConnect Wavelet Streaming Video\n"
-    "SNOW;Snow;;;http://ffdshow-tryout.sourceforge.net/\n"
+    "SLMJ;JPEG;SoftLab;SoftLab-NSK Forward JPEG;;;;YUV\n"
+    "smc ;SMC;;Apple Graphics (SMC);http://www.apple.com/quicktime/download/standalone.html;;;\n"
+    "SMSC;Radius;;;;;;\n"
+    "SMSD;Radius;;;;;;\n"
+    "SMSV;Wavelet Video;;WorldConnect Wavelet Streaming Video;;;;\n"
+    "SNOW;Snow;;;http://ffdshow-tryout.sourceforge.net/;;;\n"
     "SP40;YUV;SunPlus;SunPlus YUV;;;;YUV\n"
-    "SP44;MegaCam;;SunPlus Aiptek MegaCam\n"
-    "SP53;MegaCam;;SunPlus Aiptek MegaCam\n"
-    "SP54;MegaCam;;SunPlus Aiptek MegaCam\n"
-    "SP55;MegaCam;;SunPlus Aiptek MegaCam\n"
-    "SP56;MegaCam;;SunPlus Aiptek MegaCam\n"
-    "SP57;MegaCam;;SunPlus Aiptek MegaCam\n"
-    "SP58;MegaCam;;SunPlus Aiptek MegaCam\n"
-    "SP61;MegaCam;;SunPlus Aiptek MegaCam\n"
-    "SPIG;Spigot;;Radius Spigot\n"
-    "SPLC;ACM audio;;Splash Studios ACM Audio\n"
-    "SPRK;Spark\n"
-    "SQZ2;VXTreme 2;;Microsoft VXTreme Video V2\n"
-    "STVA;ST Imager;;ST Microelectronics CMOS Imager Data (Bayer)\n"
-    "STVB;ST Imager;;ST Microelectronics CMOS Imager Data (Nudged Bayer)\n"
-    "STVC;ST Imager;;ST Microelectronics CMOS Imager Data (Bunched)\n"
-    "STVX;ST Imager;;ST Microelectronics CMOS Imager Data (Extended Data Format)\n"
-    "STVY;ST Imager;;ST Microelectronics CMOS Imager Data (Extended Data Format with Correction Data)\n"
-    "SV10;Sorenson;;Sorenson Media Video R1\n"
-    "SVQ1;Sorenson 1;;Sorenson Media Video 1 (Apple QuickTime 3)\n"
-    "SVQ2;Sorenson 2;;Sorenson Media Video 2 (Apple QuickTime 4)\n"
-    "SVQ3;Sorenson 3;;Sorenson Media Video 3 (Apple QuickTime 5)\n"
-    "SWC1;M-JPEG;MainConcept;MainConcept M-JPEG;;;;YUV;4:2:0\n"
+    "SP44;MegaCam;;SunPlus Aiptek MegaCam;;;;\n"
+    "SP53;MegaCam;;SunPlus Aiptek MegaCam;;;;\n"
+    "SP54;MegaCam;;SunPlus Aiptek MegaCam;;;;\n"
+    "SP55;MegaCam;;SunPlus Aiptek MegaCam;;;;\n"
+    "SP56;MegaCam;;SunPlus Aiptek MegaCam;;;;\n"
+    "SP57;MegaCam;;SunPlus Aiptek MegaCam;;;;\n"
+    "SP58;MegaCam;;SunPlus Aiptek MegaCam;;;;\n"
+    "SP61;MegaCam;;SunPlus Aiptek MegaCam;;;;\n"
+    "SPIG;Spigot;;Radius Spigot;;;;\n"
+    "SPLC;ACM audio;;Splash Studios ACM Audio;;;;\n"
+    "SPRK;Spark;;;;;;\n"
+    "SQZ2;VXTreme 2;;Microsoft VXTreme Video V2;;;;\n"
+    "STVA;ST Imager;;ST Microelectronics CMOS Imager Data (Bayer);;;;\n"
+    "STVB;ST Imager;;ST Microelectronics CMOS Imager Data (Nudged Bayer);;;;\n"
+    "STVC;ST Imager;;ST Microelectronics CMOS Imager Data (Bunched);;;;\n"
+    "STVX;ST Imager;;ST Microelectronics CMOS Imager Data (Extended Data Format);;;;\n"
+    "STVY;ST Imager;;ST Microelectronics CMOS Imager Data (Extended Data Format with Correction Data);;;;\n"
+    "SV10;Sorenson;;Sorenson Media Video R1;;;;\n"
+    "SVQ1;AVC;Sorenson 1;Sorenson Media Video 1 (Apple QuickTime 3);;;;\n"
+    "SVQ2;AVC;Sorenson 2;Sorenson Media Video 2 (Apple QuickTime 4);;;;\n"
+    "SVQ3;AVC;Sorenson 3;Sorenson Media Video 3 (Apple QuickTime 5);;;;\n"
+    "SWC1;JPEG;MainConcept;MainConcept JPEG;;;;YUV\n"
     "T420;YUV;Toshiba;Toshiba YUV 4:2:0;;;;YUV\n"
     "TGA ;TGA;Apple;Apple TGA (with Alpha-channel)\n"
     "THEO;Theora;;FFVFW Supported\n"
@@ -1912,116 +2003,124 @@
     "TRLE;Akula;;Akula Alpha Pro Custom AVI (LossLess)\n"
     "TSCC;TechSmith;;TechSmith Screen Capture\n"
     "tscc;TechSmith;;TechSmith Screen Capture\n"
-    "TV10;Tecomac;;Tecomac Low-Bit Rate\n"
-    "TVJP;Pinnacle/Truevision;;TrueVision Field Encoded M-JPEG (Targa emulation)\n"
-    "TVMJ;Pinnacle/Truevision;;Truevision TARGA M-JPEG Hardware (or Targa emulation)\n"
-    "TY0N;Trident;;Trident Decompression Driver\n"
-    "TY2C;Trident;;Trident Decompression Driver\n"
-    "TY2N;Trident;;Trident Decompression Driver\n"
+    "TV10;Tecomac;;Tecomac Low-Bit Rate;;;;\n"
+    "TVJP;Pinnacle/Truevision;;TrueVision Field Encoded JPEG (Targa emulation);;;;\n"
+    "TVMJ;Pinnacle/Truevision;;Truevision TARGA JPEG Hardware (or Targa emulation);;;;\n"
+    "TY0N;Trident;;Trident Decompression Driver;;;;\n"
+    "TY2C;Trident;;Trident Decompression Driver;;;;\n"
+    "TY2N;Trident;;Trident Decompression Driver;;;;\n"
     "U<Y ;YUV;Discreet;Discreet UC YUV 4:2:2:4 10 bit;;;;YUV\n"
     "U<YA;YUV;Discreet;Discreet UC YUV 4:2:2:4 10 bit (with Alpha-channel);;;;YUV\n"
-    "U263;H.263;UB;UB Video H.263/H.263+/H.263++ Decoder;http://eMajix.com\n"
-    "UCOD;ClearVideo;;ClearVideo (fractal compression-based)\n"
-    "ULTI;Ultimotion;;IBM Ultimotion\n"
+    "U263;H.263;UB;UB Video H.263/H.263+/H.263++ Decoder;http://eMajix.com;;;\n"
+    "UCOD;ClearVideo;;ClearVideo (fractal compression-based);;;;\n"
+    "ULRA;RGBA;Ut Video;Ut Video Lossless Codec;http://umezawa.dyndns.info/archive/utvideo;;;RGBA;4:4:4:4\n"
+    "ULRG;RGB;Ut Video;Ut Video Lossless Codec;http://umezawa.dyndns.info/archive/utvideo;;;RGB;4:4:4\n"
+    "ULTI;Ultimotion;;IBM Ultimotion;;;;\n"
+    "ULY0;YUV;Ut Video;Ut Video Lossless Codec;http://umezawa.dyndns.info/archive/utvideo;;;YUV;4:2:0\n"
+    "ULY2;YUV;Ut Video;Ut Video Lossless Codec;http://umezawa.dyndns.info/archive/utvideo;;;YUV;4:2:2\n"
     "UMP4;MPEG-4 Visual;UB;UB Video MPEG 4;http://www.fourcc.org/indexyuv.htm;;;YUV;4:2:0\n"
     "UYNV;YUV;;Nvidia 16bpp. A direct copy of UYVY registered by Nvidia to work around problems in some olds which did not like hardware which offered more than 2 UYVY surfaces.;http://www.fourcc.org/indexyuv.htm;;;YUV\n"
     "UYVP;YUV;;Evans & Sutherland 24bpp. YUV 4:2:2 extended precision 10-bits per component in U0Y0V0Y1 order;;;;YUV\n"
     "UYVU;YUV;SoftLab;SoftLab-NSK Forward YUV;http://www.fourcc.org/indexyuv.htm;;;YUV\n"
     "UYVY;YUV;;Uncompressed 16bpp. YUV 4:2:2 (Y sample at every pixel, U and V sampled at every second pixel horizontally on each line). A macropixel contains 2 pixels in 1 u_int32.;;;;YUV;4:2:2\n"
-    "V210;Optibase;;Optibase VideoPump 10-bit 4:2:2 Component YUV\n"
-    "V261;VX3000S;;Lucent VX3000S\n"
+    "V210;YUV;;Optibase VideoPump 10-bit 4:2:2 Component YUV;;;;\n"
+    "v210;YUV;AJA Video Systems Xena;;;;;YUV;4:2:2\n"
+    "V261;VX3000S;;Lucent VX3000S;;;;\n"
     "V422;YUV;Vitec;;;;;YUV;4:2:2\n"
     "V655;YUV;Vitec;Vitec Multimedia 16 bit YUV 4:2:2 (6:5:5) format;;;;YUV\n"
-    "VBLE;MarcFD VBLE;;MarcFD VBLE Lossless\n"
-    "VCR1;ATI Video 1;;ATI VCR 1.0\n"
-    "VCR2;ATI Video 2;;ATI VCR 2.0 (MPEG YV12)\n"
-    "VCR3;ATI Video 3;;ATI VCR 3.0\n"
-    "VCR4;ATI Video 4;;ATI VCR 4.0\n"
-    "VCR5;ATI Video 5;;ATI VCR 5.0\n"
-    "VCR6;ATI Video 6;;ATI VCR 6.0\n"
-    "VCR7;ATI Video 7;;ATI VCR 7.0\n"
-    "VCR8;ATI Video 8;;ATI VCR 8.0\n"
-    "VCR9;ATI Video 9;;ATI VCR 9.0\n"
-    "VCWV;Wavelet;;VideoCon\n"
+    "VBLE;MarcFD VBLE;;MarcFD VBLE Lossless;;;;\n"
+    "VCR1;ATI Video 1;;ATI VCR 1.0;;;;\n"
+    "VCR2;ATI Video 2;;ATI VCR 2.0 (MPEG YV12);;;;\n"
+    "VCR3;ATI Video 3;;ATI VCR 3.0;;;;\n"
+    "VCR4;ATI Video 4;;ATI VCR 4.0;;;;\n"
+    "VCR5;ATI Video 5;;ATI VCR 5.0;;;;\n"
+    "VCR6;ATI Video 6;;ATI VCR 6.0;;;;\n"
+    "VCR7;ATI Video 7;;ATI VCR 7.0;;;;\n"
+    "VCR8;ATI Video 8;;ATI VCR 8.0;;;;\n"
+    "VCR9;ATI Video 9;;ATI VCR 9.0;;;;\n"
+    "VCWV;Wavelet;;VideoCon;;;;\n"
     "VDCT;RGB;VideoMaker;Video Maker Pro DIB;;;;RGB\n"
-    "VDOM;VDOWave;;VDONet Wave\n"
-    "VDOW;VDOLive;;VDONet Live (H,263)\n"
-    "VDST;VirtualDub;;VirtualDub remote frameclient ICM driver\n"
+    "VDOM;VDOWave;;VDONet Wave;;;;\n"
+    "VDOW;VDOLive;;VDONet Live (H,263);;;;\n"
+    "VDST;VirtualDub;;VirtualDub remote frameclient ICM driver;;;;\n"
     "VDTZ;YUV;;VideoTizer / Darim Vision YUV;;;;YUV;4:2:2\n"
-    "VGPX;VGP;;Alaris VideoGramPixel\n"
+    "VGPX;VGP;;Alaris VideoGramPixel;;;;\n"
     "VIDM;MPEG-4 Visual;DivX 5 Pro;DivX 5.0 Pro Supported;;;;YUV;4:2:0\n"
-    "VIDS;Vitec;;Vitec Multimedia YUV 4:2:2;www.yks.ne.jp/~hori/\n"
-    "VIFP;VFAPI;;Virtual Frame API (VFAPI dummy format)\n"
-    "VIV1;H.263;Vivo\n"
-    "VIV2;H.263;Vivo\n"
-    "VIVO;H.263;Vivo\n"
-    "VIXL;M-JPEG;Miro XL;Miro Video XL;http://mirror01.iptelecom.net.ua/~video/codecs/miroVIDEO-XL.codec.v2.2.exe;;;YUV;4:2:0\n"
-    "VJPG;M-JPEG;;;;;;YUV;4:2:0\n"
-    "VLV1;Videologic\n"
-    "VMNC;Vmware;;;http://www.vmware.com/\n"
-    "VP30;VP3;On2\n"
-    "VP31;VP3;On2\n"
-    "VP40;VP4;On2\n"
-    "VP50;VP5;On2\n"
-    "VP60;VP6;On2\n"
-    "VP61;VP6.1;On2\n"
-    "VP62;VP6.2;On2;;http://ftp.pub.cri74.org/pub/win9x/video/codecs/VP6/vp6_vfw_codec.exe\n"
-    "VP70;VP7;On2\n"
-    "VP71;VP7;On2\n"
-    "VP72;VP7;On2\n"
+    "VIDS;Vitec;;Vitec Multimedia YUV 4:2:2;www.yks.ne.jp/~hori/;;;\n"
+    "VIFP;VFAPI;;Virtual Frame API (VFAPI dummy format);;;;\n"
+    "VIV1;H.263;Vivo;;;;;\n"
+    "VIV2;H.263;Vivo;;;;;\n"
+    "VIVO;H.263;Vivo;;;;;\n"
+    "VIXL;JPEG;Miro XL;Miro Video XL;http://mirror01.iptelecom.net.ua/~video/codecs/miroVIDEO-XL.codec.v2.2.exe;;;YUV\n"
+    "VJPG;JPEG;;;;;;YUV\n"
+    "VLV1;Videologic;;;;;;\n"
+    "VMNC;Vmware;;;http://www.vmware.com/;;;\n"
+    "VP30;VP3;On2;;;;;\n"
+    "VP31;VP3;On2;;;;;\n"
+    "VP32;VP3;On2;;;;;\n"
+    "VP40;VP4;On2;;;;;\n"
+    "VP50;VP5;On2;;;;;\n"
+    "VP60;VP6;On2;;http://ftp.pub.cri74.org/pub/win9x/video/codecs/VP6/vp6_vfw_codec.exe;Simple;;\n"
+    "VP61;VP6;On2;;http://ftp.pub.cri74.org/pub/win9x/video/codecs/VP6/vp6_vfw_codec.exe;Advanced;;\n"
+    "VP62;VP6;On2;;http://ftp.pub.cri74.org/pub/win9x/video/codecs/VP6/vp6_vfw_codec.exe;Heightened Sharpness;;\n"
+    "VP6A;VP6;On2;;http://ftp.pub.cri74.org/pub/win9x/video/codecs/VP6/vp6_vfw_codec.exe;Alpha;;\n"
+    "VP6F;VP6;On2;;http://ftp.pub.cri74.org/pub/win9x/video/codecs/VP6/vp6_vfw_codec.exe;Heightened Sharpness;;\n"
+    "VP70;VP7;On2;;;General;;\n"
+    "VP71;VP7;On2;;;Error Resilient;;\n"
+    "VP72;VP7;On2;;;;;\n"
     "VP80;VP8;;;http://www.webmproject.org;;;YUV;4:2:0\n"
-    "VQC1;Vector 1;;Vector-quantised 1 (high compression) http://eprints.ecs.soton.ac.uk/archive/00001310/01/VTC97-js.pdf\n"
-    "VQC2;Vector 2;;Vector-quantised 2 (high robustness against channel errors) http://eprints.ecs.soton.ac.uk/archive/00001310/01/VTC97-js.pdf\n"
-    "VQJP;VQ630;;Dual-mode digital camera\n"
-    "VQS4;VQ110;;DV camera\n"
+    "VQC1;Vector 1;;Vector-quantised 1 (high compression) http://eprints.ecs.soton.ac.uk/archive/00001310/01/VTC97-js.pdf;;;;\n"
+    "VQC2;Vector 2;;Vector-quantised 2 (high robustness against channel errors) http://eprints.ecs.soton.ac.uk/archive/00001310/01/VTC97-js.pdf;;;;\n"
+    "VQJP;VQ630;;Dual-mode digital camera;;;;\n"
+    "VQS4;VQ110;;DV camera;;;;\n"
     "VR21;YUV;BlckMagic;BlackMagic YUV (Quick Time);;;;YUV\n"
     "VSSH;AVC;Vanguard VSS;;;;;YUV;4:2:0\n"
-    "VSSV;Vanguard Video;Vanguard VSS\n"
+    "VSSV;Vanguard Video;Vanguard VSS;;;;;\n"
     "VSSW;AVC;Vanguard VSS;;;;;YUV;4:2:0\n"
-    "VTLP;GGP;;Alaris VideoGramPixel\n"
-    "VX1K;DVX 1 S;;Lucent VX1000S Video\n"
-    "VX2K;DVX 2 S;;Lucent VX2000S Video\n"
-    "VXSP;DVX 1 SP;;Lucent VX1000SP Video\n"
+    "VTLP;GGP;;Alaris VideoGramPixel;;;;\n"
+    "VX1K;DVX 1 S;;Lucent VX1000S Video;;;;\n"
+    "VX2K;DVX 2 S;;Lucent VX2000S Video;;;;\n"
+    "VXSP;DVX 1 SP;;Lucent VX1000SP Video;;;;\n"
     "VYU9;YUV;ATI;;;;;YUV\n"
     "VYUY;YUV;ATI;;;;;YUV\n"
-    "WBVC;W9960;;Winbond Electronics W9960\n"
-    "WHAM;Microsoft Video 1\n"
-    "WINX;Winnov\n"
-    "WJPG;M-JPEG;Winbond ;Winbond JPEG (AverMedia USB devices);;;;YUV;4:2:0\n"
-    "WMV1;WMV1;;Windows Media Video 7;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx\n"
-    "WMV2;WMV2;;Windows Media Video 8;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx\n"
-    "WMV3;VC-1;WMV3;Windows Media Video 9;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx\n"
-    "WMVA;VC-1;WMV;Windows Media Video;http://ffdshow-tryout.sourceforge.net/\n"
-    "WMVP;WMV3;;Windows Media Video V9\n"
-    "WNIX;WniWni;;WniWni\n"
-    "WNV1;WinNov;;WinNov Videum Hardware Compression;http://www.winnov.com/\n"
-    "WNVA;WinNov;;WinNov Videum Hardware Compression;http://www.winnov.com/\n"
+    "WBVC;W9960;;Winbond Electronics W9960;;;;\n"
+    "WHAM;Microsoft Video 1;;;;;;\n"
+    "WINX;Winnov;;;;;;\n"
+    "WJPG;JPEG;Winbond ;Winbond JPEG (AverMedia USB devices);;;;YUV\n"
+    "WMV1;WMV1;;Windows Media Video 7;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;;;\n"
+    "WMV2;WMV2;;Windows Media Video 8;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;;;\n"
+    "WMV3;VC-1;WMV3;Windows Media Video 9;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;;;\n"
+    "WMVA;VC-1;WMV;Windows Media Video;http://ffdshow-tryout.sourceforge.net/;;;\n"
+    "WMVP;WMV3;;Windows Media Video V9;;;;\n"
+    "WNIX;WniWni;;WniWni;;;;\n"
+    "WNV1;WinNov;;WinNov Videum Hardware Compression;http://www.winnov.com/;;;\n"
+    "WNVA;WinNov;;WinNov Videum Hardware Compression;http://www.winnov.com/;;;\n"
     "WRLE;RGB;Apple;Apple QuickTime BMP;;;;RGB\n"
-    "WRPR;AVideoTools;;VideoTools VideoServer Client (wrapper for AviSynth)\n"
-    "WV1F;;;;http://ffdshow-tryout.sourceforge.net/\n"
-    "WVC1;VC-1;Microsoft\n"
-    "WVLT;IllusionHope Wavelet 9/7;;IllusionHope Wavelet 9/7\n"
-    "WVP2;;;;http://ffdshow-tryout.sourceforge.net/\n"
-    "WZCD;iScan;;CORE Co. Ltd.\n"
-    "WZDC;iSnap;;CORE Co. Ltd.\n"
-    "X263;H.263;Xirlink\n"
-    "X264;AVC;;XiWave GNU GPL x264 MPEG-4\n"
-    "XJPG;M-JPEG;Xirlink;;;;;YUV;4:2:0\n"
-    "XLV0;NetXL Video;;NetXL Inc. XL Video Decoder\n"
+    "WRPR;AVideoTools;;VideoTools VideoServer Client (wrapper for AviSynth);;;;\n"
+    "WV1F;;;;http://ffdshow-tryout.sourceforge.net/;;;\n"
+    "WVC1;VC-1;Microsoft;;;;;\n"
+    "WVLT;IllusionHope Wavelet 9/7;;IllusionHope Wavelet 9/7;;;;\n"
+    "WVP2;;;;http://ffdshow-tryout.sourceforge.net/;;;\n"
+    "WZCD;iScan;;CORE Co. Ltd.;;;;\n"
+    "WZDC;iSnap;;CORE Co. Ltd.;;;;\n"
+    "X263;H.263;Xirlink;;;;;\n"
+    "X264;AVC;;XiWave GNU GPL x264 MPEG-4;;;;\n"
+    "XJPG;JPEG;Xirlink;;;;;YUV\n"
+    "XLV0;NetXL Video;;NetXL Inc. XL Video Decoder;;;;\n"
     "XMPG;MPEG Video;Xing;XING MPEG (I frame only);;;;YUV;4:2:0\n"
     "XVID;MPEG-4 Visual;XviD;;http://mediaarea.net/XVID;;;YUV;4:2:0\n"
     "XVIX;MPEG-4 Visual;XviD;Based on XviD MPEG-4;http://www.xvid.org/Downloads.15.0.html;;;YUV;4:2:0\n"
-    "XWV0;XiWave Video\n"
-    "XWV1;XiWave Video\n"
-    "XWV2;XiWave Video\n"
-    "XWV3;XiWave Video\n"
-    "XWV4;XiWave Video\n"
-    "XWV5;XiWave Video\n"
-    "XWV6;XiWave Video\n"
-    "XWV7;XiWave Video\n"
-    "XWV8;XiWave Video\n"
-    "XWV9;XiWave Video\n"
-    "XXAN;Origin VideoGame;;Used in Wing Commander 3 and 4\n"
+    "XWV0;XiWave Video;;;;;;\n"
+    "XWV1;XiWave Video;;;;;;\n"
+    "XWV2;XiWave Video;;;;;;\n"
+    "XWV3;XiWave Video;;;;;;\n"
+    "XWV4;XiWave Video;;;;;;\n"
+    "XWV5;XiWave Video;;;;;;\n"
+    "XWV6;XiWave Video;;;;;;\n"
+    "XWV7;XiWave Video;;;;;;\n"
+    "XWV8;XiWave Video;;;;;;\n"
+    "XWV9;XiWave Video;;;;;;\n"
+    "XXAN;Origin VideoGame;;Used in Wing Commander 3 and 4;;;;\n"
     "XYZP;YUV;;Extended PAL format XYZ palette;;;;YUV\n"
     "Y211;YUV;;Packed YUV format with Y sampled at every second pixel across each line and U and V sampled at every fourth pixel;;;;YUV\n"
     "Y216;YUV;Targa;Pinnacle TARGA CineWave YUV (Quick Time);;;;YUV\n"
@@ -2037,26 +2136,26 @@
     "Y800;GrayScale;;Simple grayscale video;;;;Y\n"
     "YC12;YUV;;Intel YUV12;http://www.fourcc.org/indexyuv.htm;;;YUV\n"
     "YCCK;YUV;;;;;;YUV\n"
-    "YMPG;MPEG-PS;;YMPEG Alpha (dummy for MPEG-2 compressor)\n"
+    "YMPG;MPEG-PS;;YMPEG Alpha (dummy for MPEG-2 compressor);;;;\n"
     "YU12;YUV;;ATI YV12 4:2:0 Planar;;;;YUV;4:2:0\n"
     "YU92;YUV;;Intel - YUV;;;;YUV\n"
     "YUNV;YUV;;A direct copy of YUY2 registered by Nvidia to work around problems in some olds which did not like hardware that offered more than 2 YUY2 surfaces;;;;YUV\n"
-    "YUV2;YUV;;Apple Component Video (YUV 4:2:2);http://www.apple.com/quicktime/download/standalone.html;;;YUV\n"
-    "YUV8;YUV;;Winnov Caviar YUV8 ;http://www.fourcc.org/indexyuv.htm;;;YUV\n"
-    "YUV9;YUV;;Intel YUV9;;;;YUV\n"
+    "YUV2;YUV;;Apple Component Video (YUV 4:2:2);http://www.apple.com/quicktime/download/standalone.html;;;YUV;\n"
+    "YUV8;YUV;;Winnov Caviar YUV8 ;http://www.fourcc.org/indexyuv.htm;;;YUV;\n"
+    "YUV9;YUV;;Intel YUV9;;;;YUV;\n"
     "YUVP;YUV;;YUV 4:2:2 extended precision 10-bits per component in Y0U0Y1V0 order;;;;YUV;4:2:2;10\n"
     "YUY2;YUV;;YUV 4:2:2 as for UYVY but with different component ordering within the u_int32 macropixel;http://www.fourcc.org/indexyuv.htm;;;YUV;4:2:2\n"
-    "YUYP;YUV;;Evans & Sutherland;;;;YUV\n"
-    "YUYV;YUV;;Canopus YUV format;http://www.fourcc.org/indexyuv.htm;;;YUV\n"
+    "YUYP;YUV;;Evans & Sutherland;;;;YUV;\n"
+    "YUYV;YUV;;Canopus YUV format;http://www.fourcc.org/indexyuv.htm;;;YUV;\n"
     "YV12;YUV;;ATI YVU12 4:2:0 Planar;http://www.fourcc.org/indexyuv.htm;;;YUV;4:2:0\n"
     "YV16;YUV;;Elecard YUV 4:2:2 Planar;;;;YUV;4:2:2\n"
-    "YV92;YUV;;Intel Smart Video Recorder YVU9;;;;YUV\n"
-    "YVU9;YUV;;Brooktree YVU9 Raw (YVU9 Planar);http://www.fourcc.org/indexyuv.htm;;;YUV\n"
+    "YV92;YUV;;Intel Smart Video Recorder YVU9;;;;YUV;\n"
+    "YVU9;YUV;;Brooktree YVU9 Raw (YVU9 Planar);http://www.fourcc.org/indexyuv.htm;;;YUV;\n"
     "YVYU;YUV;;YUV 4:2:2 as for UYVY but with different component ordering within the u_int32 macropixel;;;;YUV;4:2:2\n"
-    "ZLIB;AVIzlib;;Lossless (ZIP compression)\n"
-    "ZMBV;Zip;;Zip Motion Blocks Video\n"
-    "ZPEG;Video Zipper;;Metheus Video Zipper\n"
-    "ZYGO;ZyGo;;ZyGo Video\n"
+    "ZLIB;AVIzlib;;Lossless (ZIP compression);;;;;\n"
+    "ZMBV;Zip;;Zip Motion Blocks Video;;;;;\n"
+    "ZPEG;Video Zipper;;Metheus Video Zipper;;;;;\n"
+    "ZYGO;ZyGo;;ZyGo Video;;;;;\n"
     ));
     Info.Separator_Set(0, ZenLib::EOL);
 }
@@ -2064,20 +2163,21 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_CodecID_Audio_Matroska (InfoMap &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
     "A_MPEG/L1;MPEG Audio;MP1;;http://www.iis.fraunhofer.de/amm/index.html\n"
     "A_MPEG/L2;MPEG Audio;MP2;;http://www.iis.fraunhofer.de/amm/index.html\n"
     "A_MPEG/L3;MPEG Audio;MP3;;http://www.iis.fraunhofer.de/amm/index.html\n"
-    "A_PCM/INT/BIG;PCM\n"
-    "A_PCM/INT/LIT;PCM\n"
-    "A_PCM/FLOAT/IEEE;PCM\n"
-    "A_AC3;AC-3\n"
-    "A_AC3/BSID9;AC-3\n"
-    "A_AC3/BSID10;AC-3\n"
-    "A_DTS;DTS\n"
-    "A_EAC3;E-AC-3\n"
+    "A_PCM/INT/BIG;PCM;;\n"
+    "A_PCM/INT/LIT;PCM;;\n"
+    "A_PCM/FLOAT/IEEE;PCM;;\n"
+    "A_AC3;AC-3;;\n"
+    "A_AC3/BSID9;AC-3;;\n"
+    "A_AC3/BSID10;AC-3;;\n"
+    "A_DTS;DTS;;\n"
+    "A_EAC3;E-AC-3;;\n"
     "A_FLAC;Flac;;;http://flac.sourceforge.net\n"
+    "A_OPUS;Opus;;;http://opus-codec.org\n"
     "A_TTA1;TTA;;The True Audio Lossless Codec;http://true-audio.com\n"
     "A_VORBIS;Vorbis;;;http://www.vorbis.com\n"
     "A_WAVPACK4;WavPack;;;http://www.wavpack.com\n"
@@ -2087,19 +2187,20 @@
     "A_REAL/SIPR;G.729;;Real & Sipro Voice Codec;http://www.real.com\n"
     "A_REAL/RALF;RealAudio Lossless;;Real Audio Lossless Format;http://www.real.com\n"
     "A_REAL/ATRC;Atrac;;Real & Sony Atrac3 Codec;http://www.real.com\n"
-    "A_TRUEHD;TrueHD;;Dolby TrueHD;http://www.dolby.com/consumer/technology/trueHD.html\n"
+    "A_TRUEHD;TrueHD;;;http://www.dolby.com/consumer/technology/trueHD.html\n"
     "A_MLP;MLP;;Meridian Lossless Packing;http://www.meridian-audio.com\n"
-    "A_AAC;AAC\n"
-    "A_AAC/MPEG2/MAIN;AAC\n"
-    "A_AAC/MPEG2/LC;AAC\n"
-    "A_AAC/MPEG2/LC/SBR;AAC\n"
-    "A_AAC/MPEG2/SSR;AAC\n"
-    "A_AAC/MPEG4/MAIN;AAC\n"
-    "A_AAC/MPEG4/LC;AAC\n"
-    "A_AAC/MPEG4/LC/SBR;AAC\n"
-    "A_AAC/MPEG4/LC/SBR/PS;AAC\n"
+    "A_AAC;AAC;;\n"
+    "A_AAC/MPEG2/MAIN;AAC;;\n"
+    "A_AAC/MPEG2/LC;AAC;;\n"
+    "A_AAC/MPEG2/LC/SBR;AAC;;\n"
+    "A_AAC/MPEG2/SSR;AAC;;\n"
+    "A_AAC/MPEG4/MAIN;AAC;;\n"
+    "A_AAC/MPEG4/LC;AAC;;\n"
+    "A_AAC/MPEG4/LC/SBR;AAC;;\n"
+    "A_AAC/MPEG4/LC/SBR/PS;AAC;;\n"
     "A_AAC/MPEG4/SSR;AAC\n"
     "A_AAC/MPEG4/LTP;AAC\n"
+    "A_ALAC;ALAC;;Apple Lossless Audio Codec;http://www.apple.com/quicktime/download/standalone.html\n"
     ));
     Info.Separator_Set(0, ZenLib::EOL);
 }
@@ -2107,26 +2208,32 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_CodecID_Audio_Mpeg4 (InfoMap &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
-    ".mp3;MPEG Audio\n"
+    ".mp3;MPEG Audio;;;\n"
     "A104;AMR;;;http://www.apple.com/quicktime/download/standalone.html;Wide band\n"
-    "ac-3;AC-3\n"
-    "alac;ALAC;;Apple Lossless Format;http://www.apple.com/quicktime/download/standalone.html\n"
+    "ac-3;AC-3;;;\n"
+    "alac;ALAC;;Apple Lossless Audio Codec;http://www.apple.com/quicktime/download/standalone.html\n"
     "alaw;ADPCM;;;http://www.apple.com/quicktime/download/standalone.html\n"
+    "dtsc;DTS;;Digital Theater Systems;http://www.dts.com\n"
+    "dtsh;DTS;HRA;Digital Theater Systems High Res;http://www.dts.com\n"
+    "dtsl;DTS;MA;Digital Theater Systems Master Audio;http://www.dts.com\n"
+    "dtse;DTS;Express;;Digital Theater Systems Low Bitrate;http://www.dts.com\n"
     "dvca;PCM;;;http://www.apple.com/quicktime/download/standalone.html\n"
-    "ec-3;E-AC-3\n"
-    "enca;(Encrypted)\n"
+    "ec-3;E-AC-3;;;\n"
+    "enca;(Encrypted);;;\n"
     "fl32;PCM ; ;;http://www.apple.com/quicktime/download/standalone.html\n"
     "fl64;PCM;;;http://www.apple.com/quicktime/download/standalone.html\n"
     "ima4;ADPCM;;;http://www.apple.com/quicktime/download/standalone.html\n"
     "in24;PCM;;;http://www.apple.com/quicktime/download/standalone.html\n"
     "in32;PCM;;;http://www.apple.com/quicktime/download/standalone.html\n"
-    "MAC3;MACE 3\n"
-    "MAC6;MACE 6\n"
+    "lpcm;PCM;;;\n"
+    "MAC3;MACE 3;;;\n"
+    "MAC6;MACE 6;;;\n"
+    "nmos;Nellymoser;;;http://www.nellymoser.com/\n"
     "NONE;PCM;;;http://www.apple.com/quicktime/download/standalone.html\n"
     "owma;WMA Pro;;Smooth Streaming Media Audio;http://alexzambelli.com/blog/2009/02/10/smooth-streaming-architecture/\n"
-    "Qclp;QCELP;;Qualcomm PureVoice\n"
+    "Qclp;QCELP;;Qualcomm PureVoice;\n"
     "QDM1;QDesign 1;;QDesign Music 1;http://www.apple.com/quicktime/download/standalone.html\n"
     "QDM2;Qdesign 2;;QDesign Music 2;http://www.apple.com/quicktime/download/standalone.html\n"
     "QDMC;Qdesign 2;(Old);QDesign Music 2 (old version, rare);http://www.apple.com/quicktime/download/standalone.html\n"
@@ -2139,6 +2246,7 @@
     "twos;PCM;;;http://www.apple.com/quicktime/download/standalone.html\n"
     "ulaw;ADPCM;;;http://www.apple.com/quicktime/download/standalone.html\n"
     "vdva;PCM;;;http://www.apple.com/quicktime/download/standalone.html\n"
+    "WMA2;WMA;;Windows Media Audio;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;;Version 2\n"
     ));
     Info.Separator_Set(0, ZenLib::EOL);
 }
@@ -2146,21 +2254,21 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_CodecID_Audio_Real (InfoMap &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
     "14.4;VSELP;;Real Player 1;http://www.real.com\n"
     "14_4;VSELP;;Real Player 1;http://www.real.com\n"
     "28.8;G.728;;Real Player 2;http://www.real.com\n"
     "28_8;G.728;;Real Player 2;http://www.real.com\n"
     "atrc;Atrac;;Real Player 8;http://www.real.com\n"
-    "audio/X-MP3-draft-00;MPEG Audio\n"
-    "audio/x-ralf-mpeg4;RealAudio Lossless;;Real Audio Lossless Format, Real Player 10;http://www.real.com\n"
-    "audio/x-ralf-mpeg4-generic;RealAudio Lossless;;Real Audio Lossless Format, Real Player 10;http://www.real.com\n"
+    "audio/X-MP3-draft-00;MPEG Audio;;\n"
+    "audio/x-ralf-mpeg4;RealAudio Lossless;;Real Audio Lossless Format, Real Player 10;http://www.real.com;;;;;;Lossless\n"
+    "audio/x-ralf-mpeg4-generic;RealAudio Lossless;;Real Audio Lossless Format, Real Player 10;http://www.real.com;;;;;;Lossless\n"
     "cook;Cooker;;Based on G.722.1, Real Player 6;http://www.real.com\n"
     "dnet;AC-3;;Real Player 3;http://www.real.com\n"
     "lpcJ;VSELP;;Real Player 1;http://www.real.com\n"
-    "raac;AAC;;Real Player 9;http://www.real.com\n"
-    "racp;AAC;;Real Player 10;http://www.real.com\n"
+    "raac;AAC;;Real Player 9;http://www.real.com;LC\n"
+    "racp;AAC;;Real Player 10;http://www.real.com;HE-AAC\n"
     "rtrc;RealAudio 8;;;http://www.real.com\n"
     "sipr;ACELP;;Real Player 4;http://www.real.com\n"
     "whrl;RealAudio Multi-Channel;;Real Audio Multi-Channel;http://www.real.com\n"
@@ -2171,74 +2279,74 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_CodecID_Audio_Riff (InfoMap &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
-    "0\n"
-    "1;PCM;Microsoft;;http://www.microsoft.com/windows/\n"
-    "2;ADPCM;Microsoft;;http://www.microsoft.com/windows/\n"
+    "0;;;;\n"
+    "1;PCM;;;http://www.microsoft.com/windows/\n"
+    "2;ADPCM;;;http://www.microsoft.com/windows/\n"
     "3;PCM;IEEE ;;http://www.microsoft.com/windows/;Float\n"
-    "4;VSELP;Compaq\n"
-    "5;CVSD;IBM\n"
+    "4;VSELP;Compaq;;\n"
+    "5;CVSD;IBM;;\n"
     "6;ADPCM;CCITT;;http://www.microsoft.com/windows/;A-Law\n"
     "7;ADPCM;CCITT;;http://www.microsoft.com/windows/;U-Law\n"
-    "8;DTS;;Digital Theater Systems\n"
-    "9;DRM;Microsoft\n"
+    "8;DTS;;Digital Theater Systems;\n"
+    "9;DRM;Microsoft;;\n"
     "A;WMA;;Windows Media Audio;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;Voice\n"
     "C;MPEG Audio;;;;MPEG-2 5.1\n"
-    "10;ADPCM;OKI\n"
-    "11;ADPCM;Intel\n"
-    "12;ADPCM;Mediaspace\n"
-    "13;ADPCM;Sierra\n"
+    "10;ADPCM;OKI;;\n"
+    "11;ADPCM;Intel;;\n"
+    "12;ADPCM;Mediaspace;;\n"
+    "13;ADPCM;Sierra;;\n"
     "14;ADPCM;Antex;G.723\n"
-    "15;STD;DSP solutions\n"
-    "16;FIX;DSP solutions\n"
+    "15;STD;DSP solutions;\n"
+    "16;FIX;DSP solutions;\n"
     "17;ADPCM;Dialogic-OKI;;http://www.microsoft.com/windows/\n"
-    "18;ADPCM\n"
-    "19;CU;HP\n"
-    "1A;Dynamic Voice;HP\n"
-    "20;ADPCM;Yamaha\n"
-    "21;SONARC;Speech Compression\n"
+    "18;ADPCM;;\n"
+    "19;CU;HP;\n"
+    "1A;Dynamic Voice;HP;\n"
+    "20;ADPCM;Yamaha;\n"
+    "21;SONARC;Speech Compression;\n"
     "22;Truespeech;DSP Group;;http://www.microsoft.com/windows/\n"
-    "23;SC1;Echo Speech\n"
-    "24;AudioFile 36;Virtual Music \n"
+    "23;SC1;Echo Speech;\n"
+    "24;AudioFile 36;Virtual Music ;\n"
     "25;APTX;;Audio Processing Technology X\n"
-    "26;AudioFile 10;Virtual Music\n"
-    "27;Prosody 1612;Aculab plc\n"
-    "28;LRC;Merging Technologies\n"
-    "30;AC-2;Dolby Laboratories\n"
+    "26;AudioFile 10;Virtual Music;\n"
+    "27;Prosody 1612;Aculab plc;\n"
+    "28;LRC;Merging Technologies;\n"
+    "30;AC-2;Dolby Laboratories;\n"
     "31;GSM 6.10;Microsoft;;http://www.microsoft.com/windows/\n"
-    "32;Microsoft Audio\n"
-    "33;ADPCM;Antex\n"
-    "34;VQLPC;Control Ressources\n"
-    "35;REAL;DSP Solutions\n"
-    "36;ADPCM;DSP Solutions\n"
+    "32;Microsoft Audio;;\n"
+    "33;ADPCM;Antex;\n"
+    "34;VQLPC;Control Resources;\n"
+    "35;REAL;DSP Solutions;\n"
+    "36;ADPCM;DSP Solutions;\n"
     "37;CR10;;Control Resources 10\n"
-    "38;ADPCM;Natural MicroSystems VBX\n"
-    "39;ADPCM;Crystal Semiconductor IMA\n"
-    "3A;SC3;Echo Speech\n"
-    "3B;ADPCM;Rockwell\n"
-    "3C;DigiTalk;Rockwell DigiTalk\n"
+    "38;ADPCM;Natural MicroSystems VBX;\n"
+    "39;ADPCM;Crystal Semiconductor IMA;\n"
+    "3A;SC3;Echo Speech;\n"
+    "3B;ADPCM;Rockwell;\n"
+    "3C;DigiTalk;Rockwell DigiTalk;\n"
     "3D;Xebec;;Xebec Multimedia Solutions\n"
     "40;ADPCM;Antex Electronics;G.721\n"
     "41;CELP;Antex Electronics;G.728\n"
-    "42;G.723.1;Microsoft;;http://www.microsoft.com/windows/\n"
-    "42;ADPCM;;IBM\n"
-    "42;G.729;Microsoft\n"
-    "45;ADPCM;Microsoft;G.726;http://www.microsoft.com/windows/\n"
+    "42;G.723.1;Microsoft;;http://www.microsoft.com/windows/;\n"
+    "42;ADPCM;;IBM;;\n"
+    "42;G.729;Microsoft;;;\n"
+    "45;ADPCM;Microsoft;G.726;http://www.microsoft.com/windows/;\n"
     "50;MPEG Audio;;;http://www.iis.fraunhofer.de/amm/index.html;;Version 1\n"
     "51;MPEG Audio;;;http://www.iis.fraunhofer.de/amm/index.html;;Version 2\n"
-    "52;RT24;InSoft, Inc.\n"
-    "53;PAC;InSoft, Inc.\n"
-    "55;MPEG Audio;MP3;;http://www.iis.fraunhofer.de/amm/index.html\n"
-    "59;G.723;Lucent;G.723\n"
-    "60;Cirrus;;Cirrus Logic\n"
-    "61;PCM;ESS Technology\n"
-    "62;Voxware\n"
-    "63;Atrac;Canopus\n"
-    "64;ADPCM;APICOM;G.726\n"
-    "65;ADPCM;APICOM;G.722\n"
-    "66;DSAT;Microsoft\n"
-    "67;DSAT Display;Microsoft\n"
+    "52;RT24;InSoft, Inc.;;;\n"
+    "53;PAC;InSoft, Inc.;;;\n"
+    "55;MPEG Audio;MP3;;http://www.iis.fraunhofer.de/amm/index.html;\n"
+    "59;G.723;Lucent;G.723;;\n"
+    "60;Cirrus;;Cirrus Logic;;\n"
+    "61;PCM;ESS Technology;;;\n"
+    "62;Voxware;;;;\n"
+    "63;Atrac;Canopus;;;\n"
+    "64;ADPCM;APICOM;G.726;;\n"
+    "65;ADPCM;APICOM;G.722;;\n"
+    "66;DSAT;Microsoft;\n"
+    "67;DSAT Display;Microsoft;\n"
     "69;BYTE_ALIGNED;Voxware;;http://www.voxware.com/\n"
     "70;AC8;Voxware;;http://www.voxware.com/\n"
     "71;AC10;Voxware;;http://www.voxware.com/\n"
@@ -2250,79 +2358,79 @@
     "77;VR12;Voxware;;http://www.voxware.com/\n"
     "78;VR18;Voxware;;http://www.voxware.com/\n"
     "79;TQ40;Voxware;;http://www.voxware.com/\n"
-    "7A;SC3;Voxware\n"
-    "7B;SC3;Voxware\n"
-    "80;Softsound\n"
+    "7A;SC3;Voxware;\n"
+    "7B;SC3;Voxware;\n"
+    "80;Softsound;;\n"
     "81;TQ60;Voxware;;http://www.voxware.com/\n"
-    "82;MSRT24;Microsoft\n"
-    "83;G.729a;AT&T\n"
-    "84;MVI_MVI2;Motion Pixels\n"
+    "82;MSRT24;Microsoft;\n"
+    "83;G.729a;AT&T;\n"
+    "84;MVI_MVI2;Motion Pixels;\n"
     "85;ADPCM;DataFusion Systems;G.726\n"
-    "86;GSM 6.10;DataFusion Systems\n"
+    "86;GSM 6.10;DataFusion Systems;\n"
     "88;ISI AUDIO;;Iterated Systems AUDIO\n"
     "89;Onlive;;OnLive! Technologies\n"
-    "8A;SX20;Multitude\n"
-    "8B;ADPCM;Infocom ITS A/S\n"
-    "8C;G.729;Convedia Corporation\n"
+    "8A;SX20;Multitude;\n"
+    "8B;ADPCM;Infocom ITS A/S;\n"
+    "8C;G.729;Convedia Corporation;\n"
     "91;SBC24;;Siemens Business Communications Sys 24\n"
-    "92;AC-3;Sonic Foundry\n"
-    "93;G.723;MediaSonic\n"
-    "94;Prosody 8KBPS;Aculab plc\n"
-    "97;ADPCM;ZyXEL Communications\n"
-    "98;LPCBB;Philips Speech Processing\n"
-    "99;Packed;;Studer Professional Audio AG Packed\n"
-    "A0;PHONYTALK;Malden Electronics\n"
-    "A1;GSM;Racal Recorders\n"
-    "A2;G.720a;Racal Recorders\n"
-    "A3;G.723.1;Racal Recorders\n"
-    "A4;ACELP;Racal Recorders\n"
-    "B0;AAC;NEC Corporation\n"
-    "FF;AAC\n"
-    "100;ADPCM\n"
-    "101;IRAT;BeCubed\n"
+    "92;AC-3;Sonic Foundry;\n"
+    "93;G.723;MediaSonic;\n"
+    "94;Prosody 8KBPS;Aculab plc;\n"
+    "97;ADPCM;ZyXEL Communications;\n"
+    "98;LPCBB;Philips Speech Processing;;\n"
+    "99;Packed;;Studer Professional Audio AG Packed;\n"
+    "A0;PHONYTALK;Malden Electronics;;\n"
+    "A1;GSM;Racal Recorders;;\n"
+    "A2;G.720a;Racal Recorders;;\n"
+    "A3;G.723.1;Racal Recorders;;\n"
+    "A4;ACELP;Racal Recorders;;\n"
+    "B0;AAC;NEC Corporation;;\n"
+    "FF;AAC;;;\n"
+    "100;ADPCM;;;\n"
+    "101;IRAT;BeCubed;;\n"
     "102;ADPCM;IBM;;;A-law\n"
-    "103;ADPCM;IBM AVC\n"
-    "111;G.723;Vivo\n"
-    "112;SIREN;Vivo\n"
-    "120;CELP;Philips Speech Processing\n"
-    "121;Grundig;Philips Speech Processing\n"
-    "123;G.723;Digital Equipment Corporation\n"
-    "125;ADPCM\n"
+    "103;ADPCM;IBM AVC;;\n"
+    "111;G.723;Vivo;;\n"
+    "112;SIREN;Vivo;;\n"
+    "120;CELP;Philips Speech Processing;;\n"
+    "121;Grundig;Philips Speech Processing;;\n"
+    "123;G.723;Digital Equipment Corporation;;\n"
+    "125;ADPCM;;;\n"
     "130;ACELP;Sipro;;http://dividix.host.sk;.net\n"
     "131;ACELP;Sipro;;;4800\n"
     "132;ACELP;Sipro;;;8V3\n"
-    "133;G.729;Sipro\n"
-    "134;G.729a;Sipro\n"
-    "135;KELVIN;Sipro\n"
-    "135;AMR;VoiceAge Corporation\n"
-    "140;ADPCM;Dictaphone Corporation;G.726\n"
-    "140;CELP68;Dictaphone Corporation\n"
-    "140;CELP54;Dictaphone Corporation\n"
-    "150;PureVoice;Qualcomm\n"
-    "151;HalfRate;Qualcomm\n"
-    "155;TUBGSM;Ring Zero Systems\n"
+    "133;G.729;Sipro;;\n"
+    "134;G.729a;Sipro;;\n"
+    "135;KELVIN;Sipro;;\n"
+    "135;AMR;VoiceAge Corporation;;\n"
+    "140;ADPCM;Dictaphone Corporation;G.726;\n"
+    "140;CELP68;Dictaphone Corporation;;\n"
+    "140;CELP54;Dictaphone Corporation;;\n"
+    "150;PureVoice;Qualcomm;;\n"
+    "151;HalfRate;Qualcomm;;\n"
+    "155;TUBGSM;Ring Zero Systems;;\n"
     "160;WMA;;Windows Media Audio;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;;Version 1\n"
     "161;WMA;;Windows Media Audio;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;;Version 2\n"
     "162;WMA;;Windows Media Audio;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;Pro\n"
     "163;WMA;;Windows Media Audio;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;Lossless\n"
-    "170;ADPCM;Unisys Nap\n"
+    "170;ADPCM;Unisys Nap;;;\n"
     "171;ADPCM;Unisys Nap;;;U-law\n"
     "172;ADPCM;Unisys Nap;;;A-law\n"
-    "173;16K;Unisys Nap\n"
-    "174;G.700;SyCom Technologies\n"
-    "175;ADPCM;SyCom Technologies\n"
-    "176;CELP54;SyCom Technologies\n"
-    "177;CELP68;SyCom Technologies\n"
-    "178;ADPCM;Knowledge Adventure, Inc.\n"
-    "180;AAC;Fraunhofer IIS\n"
-    "190;DTS;;Digital Theater Systems\n"
-    "200;ADPCM;Creative Labs\n"
+    "173;16K;Unisys Nap;;;\n"
+    "174;G.700;SyCom Technologies;;;\n"
+    "175;ADPCM;SyCom Technologies;;;\n"
+    "176;CELP54;SyCom Technologies;;;\n"
+    "177;CELP68;SyCom Technologies;;;\n"
+    "178;ADPCM;Knowledge Adventure, Inc.;;;\n"
+    "180;AAC;Fraunhofer IIS;;;\n"
+    "190;DTS;;Digital Theater Systems;;\n"
+    "200;ADPCM;Creative Labs;;;\n"
     "202;Fast Speech 8;Creative Labs\n"
     "203;Fast Speech 10;Creative Labs\n"
     "210;ADPCM;UHER informatic GmbH\n"
     "215;ACM;Ulead\n"
     "216;ACM;Ulead\n"
-    "220;QuaterDeck\n"
+    "220;QuaterDeck;\n"
     "230;VC;;I-link VC\n"
     "240;RAW_SPORT;;Aureal\n"
     "241;AC-3;ESST\n"
@@ -2333,45 +2441,45 @@
     "271;SCY;Sony\n"
     "272;Atrac3;Sony\n"
     "273;SPC;Sony\n"
-    "280;Telum\n"
-    "281;TelumIA\n"
-    "285;ADPCM;Norcom Voice Systems\n"
-    "300;FM_TOWNS_SND;Fujitsu\n"
-    "350;Dev;Micronas Semiconductors, Inc.\n"
-    "351;CELP833;Micronas Semiconductors, Inc.\n"
-    "400;DIGITAL;Brooktree\n"
+    "280;Telum;;\n"
+    "281;TelumIA;;\n"
+    "285;ADPCM;Norcom Voice Systems;\n"
+    "300;FM_TOWNS_SND;Fujitsu;\n"
+    "350;Dev;Micronas Semiconductors, Inc.;\n"
+    "351;CELP833;Micronas Semiconductors, Inc.;\n"
+    "400;DIGITAL;Brooktree;\n"
     "401;Music Coder;Intel;;http://www.intel.com/\n"
     "402;IAC2;Ligos;;http://www.ligos.com\n"
     "450;Qdesign;;QDesign Music\n"
-    "500;VP7;;On2 VP7 Audio;http://www.on2.com/vp7.php3\n"
-    "501;VP6;;On2 VP7 Audio;http://www.on2.com/vp7.php3\n"
+    "500;VP7;;On2\n"
+    "501;VP6;;On2\n"
     "680;VM;;AT&T VME_VMPCM\n"
     "681;TPC;;AT&T TPC\n"
     "700;YMPEG;;YMPEG Alpha\n"
     "8AE;LiteWave;;ClearJump LiteWave\n"
-    "AAC;AAC\n"
-    "1000;GSM;Ing C. Olivetti & C., S.p.A.\n"
-    "1001;ADPCM;Ing C. Olivetti & C., S.p.A.\n"
-    "1002;CELP;Ing C. Olivetti & C., S.p.A.\n"
-    "1003;SBC;Ing C. Olivetti & C., S.p.A.\n"
-    "1004;OPR;Ing C. Olivetti & C., S.p.A.\n"
-    "1100;LH_CODEC;Lernout & Hauspie; Codec\n"
+    "AAC;AAC;;;\n"
+    "1000;GSM;Ing C. Olivetti & C., S.p.A.;;\n"
+    "1001;ADPCM;Ing C. Olivetti & C., S.p.A.;;\n"
+    "1002;CELP;Ing C. Olivetti & C., S.p.A.;;\n"
+    "1003;SBC;Ing C. Olivetti & C., S.p.A.;;\n"
+    "1004;OPR;Ing C. Olivetti & C., S.p.A.;;\n"
+    "1100;LH_CODEC;Lernout & Hauspie; Codec;\n"
     "1101;CELP;Lernout & Hauspie;;http://www.microsoft.com/windows/;4.8 kb/s\n"
     "1102;SBC;Lernout & Hauspie;;http://www.microsoft.com/windows/;8 kb/s\n"
     "1103;SBC;Lernout & Hauspie;;http://www.microsoft.com/windows/;12 kb/s\n"
     "1104;SBC;Lernout & Hauspie;;http://www.microsoft.com/windows/;16 kb/s\n"
-    "1400;Norris;;Norris Communications, Inc.\n"
-    "1401;ISIAudio\n"
-    "1500;MUSICOMPRESS;;Soundspace Music Compression\n"
-    "181C;RT24;VoxWare\n"
-    "181E;AX24000P;Lucent elemedia\n"
+    "1400;Norris;;Norris Communications, Inc.;\n"
+    "1401;ISIAudio;;;\n"
+    "1500;MUSICOMPRESS;;Soundspace Music Compression;\n"
+    "181C;RT24;VoxWare;;\n"
+    "181E;AX24000P;Lucent elemedia;;\n"
     "1971;SonicFoundry;;Lossless\n"
     "1C03;ADPCM;Lucent;G.723\n"
     "1C07;SX8300P;Lucent\n"
     "1C0C;ADPCM;Lucent;G.723\n"
     "1F03;DigiTalk;;CUseeMe (ex-Rocwell)\n"
     "1FC4;ALF2CD;NCT Soft\n"
-    "2000;AC-3\n"
+    "2000;AC-3;\n"
     "2001;DTS;;Digital Theater Systems\n"
     "2002;VSELP;;RealAudio 1/2 14.4\n"
     "2003;VSELP;;RealAudio 1/2 28.8\n"
@@ -2379,40 +2487,41 @@
     "2005;DNET;;RealAudio 3/4/5 Music (DNET)\n"
     "2006;AAC;;RealAudio 10 AAC (RAAC)\n"
     "2007;AAC;;RealAudio 10 AAC+ (RACP)\n"
-    "2048;Sonic\n"
+    "2048;Sonic;\n"
     "3313;AviSynth;;makeAVIS (fake AVI sound from AviSynth scripts)\n"
-    "4143;AAC;;Divio MPEG-4 AAC audio\n"
-    "4201;Nokia\n"
-    "4243;ADPCM;;G.726\n"
-    "43AC;Speex\n"
-    "564C;Vorbis\n"
-    "566F;Vorbis;;;http://www.vorbis.com\n"
-    "5756;WavPack;;;http://www.wavpack.com/\n"
+    "4143;AAC;;Divio MPEG-4 AAC audio;;\n"
+    "4201;Nokia;;;;\n"
+    "4243;ADPCM;;G.726;;\n"
+    "43AC;Speex;;;;\n"
+    "564C;Vorbis;;;;\n"
+    "566F;Vorbis;;;http://www.vorbis.com;\n"
+    "5756;WavPack;;;http://www.wavpack.com/;\n"
     "674F;Vorbis;;;http://www.vorbis.com;;Mode 1\n"
     "6750;Vorbis;;;http://www.vorbis.com;;Mode 2\n"
     "6751;Vorbis;;;http://www.vorbis.com;;Mode 3\n"
     "676F;Vorbis;;;http://www.vorbis.com;;Mode 1+\n"
     "6770;Vorbis;;;http://www.vorbis.com;;Mode 2+\n"
-    "6771;Vorbis;;;http://www.vorbis.com;;Mode 2+\n"
-    "7A21;AMR;;GSM-AMR (CBR, no SID);http://www.microsoft.com\n"
-    "7A22;AMR;;GSM-AMR (VBR, including SID);http://www.microsoft.com\n"
-    "A100;G.723.1\n"
-    "A101;AVQSBC\n"
-    "A102;ODSBC\n"
-    "A103;G729A\n"
-    "A104;AMR\n"
+    "6771;Vorbis;;;http://www.vorbis.com;;Mode 3+\n"
+    "8180;AAC\n"
+    "7A21;AMR;;GSM-AMR (CBR, no SID);http://www.microsoft.com;\n"
+    "7A22;AMR;;GSM-AMR (VBR, including SID);http://www.microsoft.com;\n"
+    "A100;G.723.1;;;;\n"
+    "A101;AVQSBC;;\n"
+    "A102;ODSBC;;\n"
+    "A103;G729A;;\n"
+    "A104;AMR;;\n"
     "A105;ADPCM;;G.726\n"
-    "A106;AAC\n"
+    "A106;AAC;;\n"
     "A107;ADPCM;;G.726\n"
     "A109;Speex;;;http://www.speex.org/\n"
     "DFAC;FrameServer;;DebugMode SonicFoundry Vegas FrameServer ACM Codec\n"
     "F1AC;FLAC;;Free Lossless Audio Codec\n"
-    "FFFE;Extensible\n"
-    "FFFF;In Development\n"
-    "58CB7144-23E9-BFAA-A119-FFFA01E4CE62;Atrac3\n"
-    "AD98D184-AAC3-11D0-A41C-00A0C9223196;VC\n"
-    "05589F81-C356-11CE-BF01-00AA0055595A;WaveFormatEx\n"
-    "518590A2-A184-11D0-8522-00C04FD9BAF3;DSound\n"
+    "FFFE;Extensible;;\n"
+    "FFFF;In Development;;\n"
+    "58CB7144-23E9-BFAA-A119-FFFA01E4CE62;Atrac3;;\n"
+    "AD98D184-AAC3-11D0-A41C-00A0C9223196;VC;;\n"
+    "05589F81-C356-11CE-BF01-00AA0055595A;WaveFormatEx;;\n"
+    "518590A2-A184-11D0-8522-00C04FD9BAF3;DSound;;\n"
     ));
     Info.Separator_Set(0, ZenLib::EOL);
 }
@@ -2420,7 +2529,7 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_CodecID_Text_Matroska (InfoMap &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
     "S_ASS;ASS;;Advanced Sub Station Alpha\n"
     "S_IMAGE/BMP;Bitmap;;Basic image based subtitle format\n"
@@ -2440,13 +2549,15 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_CodecID_Text_Mpeg4 (InfoMap &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
+    "c608;EIA-608\n"
+    "c708;EIA-708\n"
     "subp;VobSub;;The same subtitle format used on DVDs\n"
     "text;Apple text;;;http://www.apple.com/quicktime/download/standalone.html\n"
     "sbtl;Apple text;(iPhone);;http://www.apple.com/quicktime/download/standalone.html\n"
     "tx3g;Timed text;;;http://www.apple.com/quicktime/download/standalone.html\n"
-    "enct;(Encrypted)\n"
+    "enct;(Encrypted);;\n"
     ));
     Info.Separator_Set(0, ZenLib::EOL);
 }
@@ -2454,7 +2565,7 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_CodecID_Text_Riff (InfoMap &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
     "DXSB;DivX Subtitle;;Subtitle in AVI from DivX networks;http://www.divx.com\n"
     ));
@@ -2464,11 +2575,11 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_Codec (InfoMap &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
     " BIT;RGB;4CC;V;RGB;;Uncompressed\n"
-    " JPG;M-JPEG;4CC;V;M-JPEG\n"
-    " PNG;PNG;4CC;V;RGB\n"
+    " JPG;JPEG;4CC;V;JPEG;;\n"
+    " PNG;PNG;4CC;V;RGB;;\n"
     " RAW;RGB;4CC;V;RGB;;Uncompressed;http://www.fourcc.org/indexrgb.htm\n"
     " RGB;RGB;4CC;V;RGB;;Uncompressed. Basic Windows bitmap format. 1, 4 and 8 bpp versions are palettised. 16, 24 and 32bpp contain Uncompressed RGB samples.;http://www.fourcc.org/indexrgb.htm\n"
     " RL4;RGB;4CC;V;RGB;;RLE 4bpp;http://www.fourcc.org/indexrgb.htm\n"
@@ -2487,13 +2598,13 @@
     "ABYR;Kensigton low;4CC;V;;;Kensington (low resolution, low frame rate (6fps) for digital cameras)\n"
     "ACTL;ACT-L2;4CC;V;;;Streambox ACT-L2;http://www.streambox.com/products/act-L2_codec.htm\n"
     "ADV1;WaveCodec;4CC;V;Wavelet;;Loronix WaveCodec;http://www.loronix.com/products/video_clips/wavecodec.asp\n"
-    "ADVJ;Avid;4CC;V;M-JPEG;;Avid M-JPEG. Aka AVRn\n"
+    "ADVJ;Avid;4CC;V;JPEG;;Avid JPEG. Aka AVRn\n"
     "AEIK;Indeo 3.2;4CC;V;;;Intel Indeo Video 3.2 (Vector Quantization)\n"
     "AEMI;VideoONE;4CC;V;MPEG-V;;Array VideoONE MPEG-1-I Capture. Array's used for I frame only MPEG-1 AVI files;http://www.array.com\n"
     "AFLC;Autodesk;4CC;V;;;Autodesk Animator Studio FLI (256 color) (warning: this is a discoutinued product);http://mirror01.iptelecom.net.ua/~video/codecs/Autodesk.Animator.v1.11.Codec.exe\n"
     "AFLI;Autodesk;4CC;V;;;Autodesk Animator Studio FLI (256 color) (warning: this is a discoutinued product);http://mirror01.iptelecom.net.ua/~video/codecs/Autodesk.Animator.v1.11.Codec.exe\n"
-    "AHDV;CineForm HD;4CC;V;Wavelet;;CineForm 10-bit Visually Perfect HD (Wavelet);http://www.cineform.com/products/ConnectHD.htm\n"
-    "AJPG;M-JPEG;4CC;V;M-JPEG;;22fps JPEG-based for digital cameras\n"
+    "AHDV;CineForm;4CC;V;Wavelet;;CineForm 10-bit Visually Perfect HD (Wavelet);http://www.cineform.com/products/ConnectHD.htm\n"
+    "AJPG;JPEG;4CC;V;JPEG;;22fps JPEG-based for digital cameras\n"
     "ALPH;Ziracom;4CC;V;;;Ziracom Digital Communications Inc.\n"
     "AMPG;VideoONE;4CC;V;MPEG-1;;Array VideoONE MPEG;http://www.array.com\n"
     "AMR ;AMR;4CC;V;;;Speech codec\n"
@@ -2511,17 +2622,17 @@
     "AV1X;Avid 1:1;4CC;V;;;Avid 1:1x (Quick Time);http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe\n"
     "AVC1;AVC;4CC;V;AVC;;Advanced Video Codec;http://ffdshow-tryout.sourceforge.net/\n"
     "AVD1;Avid DV;4CC;V;DV;;Avid DV (Quick Time);http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe\n"
-    "AVDJ;Avid JFIF;4CC;V;M-JPEG;;Avid Meridien JFIF with Alpha-channel;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe\n"
+    "AVDJ;Avid JFIF;4CC;V;JPEG;;Avid Meridien JFIF with Alpha-channel;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe\n"
     "AVDN;Avid HD;4CC;V;;;Avid DNxHD (Quick Time);http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe\n"
     "AVDV;Avid DV;4CC;V;DV;;Avid DV;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe\n"
-    "AVI1;MainConcept;4CC;V;M-JPEG;;MainConcept M-JPEG\n"
-    "AVI2;MainConcept;4CC;V;M-JPEG;;MainConcept M-JPEG\n"
-    "AVID;Avid M-JPEG;4CC;V;M-JPEG;;Avid M-JPEG;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe\n"
+    "AVI1;MainConcept;4CC;V;JPEG;;MainConcept JPEG\n"
+    "AVI2;MainConcept;4CC;V;JPEG;;MainConcept JPEG\n"
+    "AVID;Avid JPEG;4CC;V;JPEG;;Avid JPEG;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe\n"
     "AVIS;AviSynth;4CC;V;;;Wrapper for AviSynth (Dummy);http://ffdshow-tryout.sourceforge.net/\n"
     "AVMP;Avid IMX;4CC;V;;;Avid IMX (Quick Time);http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe\n"
-    "AVR ;Avid NuVista;4CC;V;M-JPEG;;Avid ABVB/NuVista M-JPEG with Alpha-channel\n"
-    "AVRn;Avid M-JPEG;4CC;V;M-JPEG;;Avid M-JPEG;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe\n"
-    "AVRN;Avid M-JPEG;4CC;V;M-JPEG;;Avid M-JPEG;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe\n"
+    "AVR ;Avid NuVista;4CC;V;JPEG;;Avid ABVB/NuVista JPEG with Alpha-channel\n"
+    "AVRn;Avid JPEG;4CC;V;JPEG;;Avid JPEG;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe\n"
+    "AVRN;Avid JPEG;4CC;V;JPEG;;Avid JPEG;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe\n"
     "AVUI;Avid;4CC;V;;;Avid Meridien Uncompressed with Alpha-channel;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe\n"
     "AVUP;Avid;4CC;V;;;Avid 10bit Packed (Quick Time);http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe\n"
     "AYUV;YUV;4CC;V;YUV;;4:4:4 YUV (AYUV)\n"
@@ -2547,11 +2658,11 @@
     "CDV5;Canopus DV;4CC;V;DV;;Canopus SD50/DVHD;http://www.cineform.com/products/ConnectHD.htm\n"
     "CDVC;Canopus DV;4CC;V;DV;;Canopus DV (DV);http://www.cineform.com/products/ConnectHD.htm\n"
     "CDVH;Canopus DV;4CC;V;DV;;Canopus SD50/DVHD;http://www.cineform.com/products/ConnectHD.htm\n"
-    "CFCC;Perception;4CC;V;;;DPS Perception M-JPEG (dummy format - only AVI header)\n"
-    "CFHD;CineForm HD;4CC;V;;;CineForm 10-bit Visually Perfect HD (Wavelet)\n"
+    "CFCC;Perception;4CC;V;;;DPS Perception JPEG (dummy format - only AVI header)\n"
+    "CFHD;CineForm;4CC;V;;;CineForm 10-bit Visually Perfect HD (Wavelet)\n"
     "CGDI;Camcorder;4CC;V;;;Camcorder Video (MS Office 97)\n"
     "CHAM;Champagne;4CC;V;;;Winnov Caviara Champagne\n"
-    "CJPG;Creative M-JPEG;4CC;V;M-JPEG;;Creative Video Blaster Webcam Go JPEG\n"
+    "CJPG;Creative JPEG;4CC;V;JPEG;;Creative Video Blaster Webcam Go JPEG\n"
     "CLJR;YUV;4CC;V;YUV;;Cirrus Logic YUV 4:1:1;http://www.fourcc.org/indexyuv.htm\n"
     "CLLC;Canopus;4CC;V;;;Canopus LossLess\n"
     "CLPL;YUV;4CC;V;YUV;;Format similar to YV12 but including a level of indirection.\n"
@@ -2587,10 +2698,10 @@
     "DIV6;MS MPEG-4 v3;4CC;V;MPEG-4V;;MS MPEG-4 v3;http://ffdshow-tryout.sourceforge.net/\n"
     "DIVX;DivX 4;4CC;V;MPEG-4V;;Project Mayo DivX 4;http://www.divx.com\n"
     "divx;DivX;4CC;V;MPEG-4V;;Mainly used by Google;http://www.divx.com\n"
-    "DJPG;Broadway 101;4CC;V;M-JPEG;;Data Translation, Inc.\n"
+    "DJPG;Broadway 101;4CC;V;JPEG;;Data Translation, Inc.\n"
     "DM4V;Dicas;4CC;V;MPEG-4V;;Dicas MPEGable MPEG-4\n"
-    "DMB1;Rainbow;4CC;V;M-JPEG;;Matrox Rainbow Runner hardware compression;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.MJPG.v2.10.27.codec.exe\n"
-    "DMB2;Paradigm M-JPEG;4CC;V;M-JPEG;;M-JPEG used by Paradigm\n"
+    "DMB1;Rainbow;4CC;V;JPEG;;Matrox Rainbow Runner hardware compression;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.MJPG.v2.10.27.codec.exe\n"
+    "DMB2;Paradigm JPEG;4CC;V;JPEG;;JPEG used by Paradigm\n"
     "DMK2;V36 PDA;4CC;V;;;ViewSonic V36 PDA Video\n"
     "DP02;DynaPel;4CC;V;MPEG-4V;;DynaPel MPEG-4\n"
     "DP16;YUV411;4CC;V;YUV;;Matsushita Electric Industrial Co., Ltd. (With DPCM 6-bit compression)\n"
@@ -2600,8 +2711,8 @@
     "DP96;YVU9;4CC;V;YUV;;Matsushita Electric Industrial Co., Ltd. (With DPCM 6-bit compression)\n"
     "DP98;YVU9;4CC;V;YUV;;Matsushita Electric Industrial Co., Ltd. (With DPCM 8-bit compression)\n"
     "DP9L;YVU9;4CC;V;YUV;;Matsushita Electric Industrial Co., Ltd. (With DPCM 6-bit compression)\n"
-    "DPS0;DPS Reality;4CC;V;M-JPEG;;DPS Reality M-JPEG (dummy format - only AVI header)\n"
-    "DPSC;DPS PAR;4CC;V;M-JPEG;;DPS PAR M-JPEG (dummy format - only AVI header)\n"
+    "DPS0;DPS Reality;4CC;V;JPEG;;DPS Reality JPEG (dummy format - only AVI header)\n"
+    "DPSC;DPS PAR;4CC;V;JPEG;;DPS PAR JPEG (dummy format - only AVI header)\n"
     "DRWX;Pinnacle DV25;4CC;V;DV;;Pinnacle DV25\n"
     "DSVD;DV;4CC;V;DV;;Microsoft DirectShow DV\n"
     "DTMT;Media-100;4CC;V;;;Media-100\n"
@@ -2609,7 +2720,7 @@
     "DUCK;TrueMotion S;4CC;V;;;Duck Corporation True Motion S\n"
     "DV10;BlueFish;4CC;V;;;BlueFish444 (lossless RGBA, YUV 10-bit)\n"
     "DV25;DVCPro;4CC;V;DV;;Matrox DVCPRO\n"
-    "DV50;DVCPro5;4CC;V;DV;;Matrox \n"
+    "DV50;DVCPro5;4CC;V;DV;;Matrox\n"
     "DVAN;Pinnacle DV300;4CC;V;DV;;Pinnacle miroVideo DV300 SW only\n"
     "DVC ;Apple DV NTSC;4CC;V;DV;;Apple QuickTime DV (DVCPRO NTSC);http://www.apple.com/quicktime/download/standalone.html\n"
     "dvc ;Apple DV NTSC;4CC;V;DV;;Apple QuickTime DV (DVCPRO NTSC);http://www.apple.com/quicktime/download/standalone.html\n"
@@ -2660,32 +2771,32 @@
     "ETV1;eTreppid 1;4CC;V;;;eTreppid Video 1\n"
     "ETV2;eTreppid 2;4CC;V;;;eTreppid Video 2\n"
     "ETVC;eTreppid C;4CC;V;;;eTreppid Video C\n"
-    "FFDS;FFDS;4CC;V;;;FFDShow supported;http://ffdshow-tryout.sourceforge.net/\n"
-    "FFV1;FFV1;4CC;V;;;FFDShow supported;http://ffdshow-tryout.sourceforge.net/\n"
-    "FFVH;FFVH;4CC;V;;;FFDShow supported;http://ffdshow-tryout.sourceforge.net/\n"
+    "FFDS;FFDS;4CC;V;;;;http://ffdshow-tryout.sourceforge.net/\n"
+    "FFV1;FFV1;4CC;V;;;;http://ffdshow-tryout.sourceforge.net/\n"
+    "FFVH;FFVH;4CC;V;;;;http://ffdshow-tryout.sourceforge.net/\n"
     "FLIC;FLI/FLC;4CC;V;;;Autodesk FLI/FLC Animation\n"
-    "FLJP;DField M-JPEG;4CC;V;;;D-Vision Field Encoded M-JPEG with LSI (or Targa emulation)\n"
-    "FLV1;FFDS;4CC;V;;;FFDShow supported;http://ffdshow-tryout.sourceforge.net/\n"
+    "FLJP;DField JPEG;4CC;V;;;D-Vision Field Encoded JPEG with LSI (or Targa emulation)\n"
+    "FLV1;H.263;;4CC;V;;;;http://ffdshow-tryout.sourceforge.net/\n"
     "FLV4;VP6;4CC;V;;;Flash, On2 Technologies;http://www.on2.com\n"
-    "FMJP;D-Vision M-JPEG;4CC;V;;;D-Vision fieldbased ISO M-JPEG\n"
+    "FMJP;D-Vision JPEG;4CC;V;;;D-Vision fieldbased ISO JPEG\n"
     "FMP4;MPEG-4 Visual;4CC;V;MPEG-4V;;;http://ffdshow-tryout.sourceforge.net/\n"
     "FPS1;FRAPS;4CC;V;;;;http://www.fraps.com/\n"
-    "FRLE;SoftLab-Nsk M-JPEG;4CC;V;;;SoftLab-NSK Y16 + Alpha RLE\n"
-    "FRWA;SoftLab-Nsk M-JPEG (w Alpha);4CC;V;;;SoftLab-NSK Vision Forward M-JPEG with Alpha-channel\n"
-    "FRWD;SoftLab-Nsk M-JPEG;4CC;V;;;SoftLab-NSK Vision Forward M-JPEG\n"
-    "FRWT;SoftLab-Nsk M-JPEG;4CC;V;;;SoftLab-NSK Vision Forward M-JPEG with Alpha-channel\n"
-    "FRWU;SoftLab-Nsk M-JPEG;4CC;V;;;SoftLab-NSK Vision Forward Uncompressed\n"
+    "FRLE;SoftLab-Nsk JPEG;4CC;V;;;SoftLab-NSK Y16 + Alpha RLE\n"
+    "FRWA;SoftLab-Nsk JPEG (w Alpha);4CC;V;;;SoftLab-NSK Vision Forward JPEG with Alpha-channel\n"
+    "FRWD;SoftLab-Nsk JPEG;4CC;V;;;SoftLab-NSK Vision Forward JPEG\n"
+    "FRWT;SoftLab-Nsk JPEG;4CC;V;;;SoftLab-NSK Vision Forward JPEG with Alpha-channel\n"
+    "FRWU;SoftLab-Nsk JPEG;4CC;V;;;SoftLab-NSK Vision Forward Uncompressed\n"
     "FVF1;Itered Fractal;4CC;V;;;Iterated Systems Fractal Video Frame\n"
-    "FVFW;FVFW;4CC;V;;;FFDShow supported;http://ffdshow-tryout.sourceforge.net/\n"
+    "FVFW;FVFW;4CC;V;;;;http://ffdshow-tryout.sourceforge.net/\n"
     "FXT1;3DFX;4CC;V;;;3dfx Interactive, Inc.\n"
     "G2M2;GoToMeeting2;4CC;V;;;Citrix Systems, Inc.;http://www.gotomeeting.com/\n"
     "G2M3;GoToMeeting3;4CC;V;;;Citrix Systems, Inc.;http://www.gotomeeting.com/\n"
-    "GEPJ;White Pine M-JPEG;4CC;V;;;White Pine M-JPEG\n"
+    "GEPJ;White Pine JPEG;4CC;V;;;White Pine JPEG\n"
     "GJPG;Grand Tech GT891x;4CC;V;;;Grand Tech GT891x\n"
     "GLCC;GigaLink;4CC;V;;;GigaLink AV Capture\n"
     "GLZW;Gabest;4CC;V;;;Motion LZW by Gabest;http://sourceforge.net/project/showfiles.php?group_id=82303&package_id=84358\n"
-    "GPEG;Gabest;4CC;V;M-JPEG;;M-JPEG by Gabest (with floating point);http://sourceforge.net/project/showfiles.php?group_id=82303&package_id=84358\n"
-    "GPJM;Pinnacle M-JPEG;4CC;V;M-JPEG;;Pinnacle ReelTime M-JPEG\n"
+    "GPEG;Gabest;4CC;V;JPEG;;JPEG by Gabest (with floating point);http://sourceforge.net/project/showfiles.php?group_id=82303&package_id=84358\n"
+    "GPJM;Pinnacle JPEG;4CC;V;JPEG;;Pinnacle ReelTime JPEG\n"
     "GREY;YUV;4CC;V;YUV;;Simple grayscale video;http://www.fourcc.org/indexyuv.htm\n"
     "GWLT;MS GWLT;4CC;V;;;Microsoft Greyscale WLT DIB\n"
     "GXVE;ViVD V2;4CC;V;;;SoftMedia\n"
@@ -2706,14 +2817,14 @@
     "HMCR;Rendition;4CC;V;;;Rendition Motion Compensation Format\n"
     "HMRR;Rendition;4CC;V;;;Rendition Motion Compensation Format\n"
     "i263;Intel H.263;4CC;V;;;Intel H.263\n"
-    "I420;YUV;4CC;V;;;Intel Indeo 4 H.263\n"
+    "I420;YUV;4CC;V;;\n"
     "IAN ;Indeo 4;4CC;V;;;Intel Indeo 4\n"
     "ICLB;CellB;4CC;V;;;InSoft CellB Videoconferencing\n"
     "IDM0;Wavelets 2;4CC;V;;;IDM Motion Wavelets 2.0\n"
     "IF09;H.261;4CC;V;;;Microsoft H.261\n"
     "IFO9;YUV9;4CC;V;YUV;;Intel\n"
     "IGOR;PowerDVD;4CC;V;;;Power DVD\n"
-    "IJPG;Intergraph M-JPEG;4CC;V;M-JPEG;;Intergraph\n"
+    "IJPG;Intergraph JPEG;4CC;V;JPEG;;Intergraph\n"
     "ILVC;Layered Video;4CC;V;;;Intel Layered Video\n"
     "ILVR;H.263+;4CC;V;;;Intel H.263+\n"
     "IMAC;MotionComp;4CC;V;;;Intel hardware motion compensation.\n"
@@ -2721,10 +2832,10 @@
     "IMC2;YUV;4CC;V;YUV;;Similar to IMC1, except that the U and V lines are interleaved at half stride boundaries\n"
     "IMC3;YUV;4CC;V;YUV;;As IMC1, except that U and V are swapped\n"
     "IMC4;YUV;4CC;V;YUV;;As IMC2, except that U and V are swapped\n"
-    "IMG ;YUV;4CC;V;YUV\n"
-    "IMJG;Accom M-JPEG;4CC;V;;;Accom SphereOUS M-JPEG with Alpha-channel\n"
+    "IMG ;YUV;4CC;V;YUV;\n"
+    "IMJG;Accom JPEG;4CC;V;;;Accom SphereOUS JPEG with Alpha-channel\n"
     "IPDV;I-O DV;4CC;V;;;I-O Data Device Giga AVI DV\n"
-    "IPJ2;JPEG2000;4CC;V;;;Image Power JPEG2000\n"
+    "IPJ2;JPEG 2000;4CC;V;;;Image Power JPEG 2000\n"
     "IR21;Indeo 2.1;4CC;V;;;Intel Indeo 2.1\n"
     "IRAW;YUV;4CC;V;YUV;;Intel YUV Uncompressed;http://www.fourcc.org/indexyuv.htm\n"
     "ISME;ISME;4CC;V;;;Intel\n"
@@ -2755,11 +2866,11 @@
     "IYU2;YUV;4CC;V;YUV;;IEEE1394 24bpp. 24 bit format used in mode 2 of the IEEE 1394 Digital Camera 1.04 spec\n"
     "IYUV;YUV;4CC;V;YUV;;Intel Indeo iYUV 4:2:0\n"
     "JBYR;Kensington;4CC;V;;;Kensington Video;http://ffdshow-tryout.sourceforge.net/\n"
-    "JFIF;M-JPEG;4CC;V;M-JPEG;;FFDShow supported\n"
-    "JPEG;M-JPEG;4CC;V;M-JPEG;;JPEG compressed;http://www.apple.com/quicktime/download/standalone.html\n"
-    "jpeg;M-JPEG;4CC;V;M-JPEG;;JPEG compressed\n"
-    "JPG;M-JPEG;4CC;V;M-JPEG;;JPEG compressed;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe\n"
-    "JPGL;Pegasus M-JPEG;4CC;V;;;DIVIO JPEG Light for WebCams (Pegasus Lossless JPEG)\n"
+    "JFIF;JPEG;4CC;V;JPEG;;\n"
+    "JPEG;JPEG;4CC;V;JPEG;;JPEG compressed;http://www.apple.com/quicktime/download/standalone.html\n"
+    "jpeg;JPEG;4CC;V;JPEG;;JPEG compressed\n"
+    "JPG;JPEG;4CC;V;JPEG;;JPEG compressed;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe\n"
+    "JPGL;Pegasus JPEG;4CC;V;;;DIVIO JPEG Light for WebCams (Pegasus Lossless JPEG)\n"
     "KMVC;Karl;4CC;V;;;Karl Morton's Video (presumably);http://www.apple.com/quicktime/download/standalone.html\n"
     "kpcd;Photo CD;4CC;V;;;Kodak Photo CD\n"
     "L261;H.261;4CC;V;;;Lead Technologies H.261\n"
@@ -2767,13 +2878,13 @@
     "LAGS;Lagarith;4CC;V;;;Lagarith LossLess\n"
     "LBYR;Creative WebCam;4CC;V;;;Creative WebCam\n"
     "LCMW;Lead CMW;4CC;V;;;Lead Technologies Motion CMW\n"
-    "LCW2;Lead MCMW;4CC;V;;;LEADTools MCMW 9Motion Wavelet;http://mirror01.iptelecom.net.ua/~video/codecs/LEAD.MCMP-M-JPEG.v1.016.codec.exe\n"
+    "LCW2;Lead MCMW;4CC;V;;;LEADTools MCMW 9Motion Wavelet;http://mirror01.iptelecom.net.ua/~video/codecs/LEAD.MCMP-JPEG.v1.016.codec.exe\n"
     "LEAD;Lead Video;4CC;V;;;LEAD Video\n"
     "LGRY;Lead GrayScale;4CC;V;;;Lead Technologies Grayscale Image\n"
     "LIA1;Liafail;4CC;V;;;Liafail, Inc.\n"
-    "LJ2K;Lead JPEG2000;4CC;V;;;LEADTools JPEG2000;http://mirror01.iptelecom.net.ua/~video/codecs/LEAD.MCMP-M-JPEG.v1.016.codec.exe\n"
-    "LJPG;Lead M-JPEG;4CC;V;M-JPEG;;LEAD M-JPEG;http://mirror01.iptelecom.net.ua/~video/codecs/LEAD.MCMP-M-JPEG.v1.016.codec.exe\n"
-    "Ljpg;Lead M-JPEG;4CC;V;M-JPEG;;LEAD M-JPEG\n"
+    "LJ2K;Lead JPEG 2000;4CC;V;;;LEADTools JPEG 2000;http://mirror01.iptelecom.net.ua/~video/codecs/LEAD.MCMP-JPEG.v1.016.codec.exe\n"
+    "LJPG;Lead JPEG;4CC;V;JPEG;;LEAD JPEG;http://mirror01.iptelecom.net.ua/~video/codecs/LEAD.MCMP-JPEG.v1.016.codec.exe\n"
+    "Ljpg;Lead JPEG;4CC;V;JPEG;;LEAD JPEG\n"
     "LMP2;Lead MPEG-2;4CC;V;;;LEADTools MPEG-2\n"
     "LOCO;LOCO;4CC;V;;;LOCO Lossless\n"
     "LSCR;Lead Screen capture;4CC;V;;;LEAD Screen Capture\n"
@@ -2789,18 +2900,18 @@
     "M4CC;ESS Divo;4CC;V;MPEG-4V;;ESS MPEG-4 Divio\n"
     "M4S2;FFmpeg MPEG-4;4CC;V;;;Microsoft MPEG-4 (hacked MS MPEG-4)\n"
     "MC12;ATI Motion;4CC;V;;;ATI Motion Compensation Format\n"
-    "MC24;MainConcept M-JPEG;4CC;V;M-JPEG;;MainConcept M-JPEG\n"
+    "MC24;MainConcept JPEG;4CC;V;JPEG;;MainConcept JPEG\n"
     "MCAM;ATI Motion;4CC;V;;;ATI Motion Compensation Format\n"
     "MCZM;RGB;4CC;V;RGB;;Theory MicroCosm Lossless 64bit RGB with Alpha-channel\n"
     "MDVD;MicroDVD;4CC;V;;;Alex MicroDVD Video (hacked MS MPEG-4)\n"
     "MDVF;Pinnacle DV;4CC;V;DV;;Pinnacle DV/DV50/DVHD100\n"
     "MHFY;YUB;4CC;V;YUV;;A.M.Paredes mhuffyYUV (LossLess);http://mirror01.iptelecom.net.ua/~video/codecs/Pinnacle.ReelTime.v2.5.software.only.codec.exe\n"
-    "MJ2C;JPEG2000;4CC;V;;;Morgan Multimedia JPEG2000 Compression;http://mirror01.iptelecom.net.ua/~video/codecs/Pinnacle.ReelTime.v2.5.software.only.codec.exe\n"
-    "MJPA;Pinacle M-JPEG A;4CC;V;;;Pinnacle ReelTime MJPG hardware;http://mediaxw.sourceforge.net\n"
-    "MJPB;Pinacle M-JPEG B;4CC;V;M-JPEG;;M-JPEG\n"
-    "MJPG;M-JPEG;4CC;V;M-JPEG;;M-JPEG including Huffman Tables\n"
-    "mJPG;IBM M-JPEG (w Huffman);4CC;V;M-JPEG;;IBM M-JPEG including Huffman Tables\n"
-    "MJPX;Pegasus M-JPEG;4CC;V;;;Pegasus PICVideo M-JPEG\n"
+    "MJ2C;JPEG 2000;4CC;V;;;Morgan Multimedia JPEG 2000 Compression;http://mirror01.iptelecom.net.ua/~video/codecs/Pinnacle.ReelTime.v2.5.software.only.codec.exe\n"
+    "MJPA;Pinacle JPEG A;4CC;V;;;Pinnacle ReelTime MJPG hardware;http://mediaxw.sourceforge.net\n"
+    "MJPB;Pinacle JPEG B;4CC;V;JPEG;;JPEG\n"
+    "MJPG;JPEG;4CC;V;JPEG;;JPEG including Huffman Tables\n"
+    "mJPG;IBM JPEG (w Huffman);4CC;V;JPEG;;IBM JPEG including Huffman Tables\n"
+    "MJPX;Pegasus JPEG;4CC;V;;;Pegasus PICVideo JPEG\n"
     "ML20;Webcam;4CC;V;;;Mimic MSN Messenger Webcam\n"
     "MMES;Matrox MPEG-2;4CC;V;MPEG-V;;Matrox MPEG-2 I-frame\n"
     "MMIF;Matrox MPEG-2;4CC;V;MPEG-V;;Matrox MPEG-2 I-frame\n"
@@ -2837,15 +2948,15 @@
     "MSVC;Microsoft Video 1;4CC;V;;;Microsoft Video 1\n"
     "MSZH;AVImszh;4CC;V;;;Lossless (ZIP compression)\n"
     "MTGA;TGA;4CC;V;RGB;;Motion TGA images (24, 32 bpp)\n"
-    "MTX1;Matrox M-JPEG;4CC;V;M-JPEG;;Matrox M-JPEG\n"
-    "MTX2;Matrox M-JPEG;4CC;V;M-JPEG;;Matrox M-JPEG\n"
-    "MTX3;Matrox M-JPEG;4CC;V;M-JPEG;;Matrox M-JPEG\n"
-    "MTX4;Matrox M-JPEG;4CC;V;M-JPEG;;Matrox M-JPEG\n"
-    "MTX5;Matrox M-JPEG;4CC;V;M-JPEG;;Matrox M-JPEG\n"
-    "MTX6;Matrox M-JPEG;4CC;V;M-JPEG;;Matrox M-JPEG\n"
-    "MTX7;Matrox M-JPEG;4CC;V;M-JPEG;;Matrox M-JPEG\n"
-    "MTX8;Matrox M-JPEG;4CC;V;M-JPEG;;Matrox M-JPEG\n"
-    "MTX9;Matrox M-JPEG;4CC;V;M-JPEG;;Matrox M-JPEG\n"
+    "MTX1;Matrox JPEG;4CC;V;JPEG;;Matrox JPEG\n"
+    "MTX2;Matrox JPEG;4CC;V;JPEG;;Matrox JPEG\n"
+    "MTX3;Matrox JPEG;4CC;V;JPEG;;Matrox JPEG\n"
+    "MTX4;Matrox JPEG;4CC;V;JPEG;;Matrox JPEG\n"
+    "MTX5;Matrox JPEG;4CC;V;JPEG;;Matrox JPEG\n"
+    "MTX6;Matrox JPEG;4CC;V;JPEG;;Matrox JPEG\n"
+    "MTX7;Matrox JPEG;4CC;V;JPEG;;Matrox JPEG\n"
+    "MTX8;Matrox JPEG;4CC;V;JPEG;;Matrox JPEG\n"
+    "MTX9;Matrox JPEG;4CC;V;JPEG;;Matrox JPEG\n"
     "MV10;Nokia;4CC;V;;;Nokia Mobile Phones\n"
     "MV11;Nokia;4CC;V;;;Nokia Mobile Phones\n"
     "MV12;MVI;4CC;V;;;Motion Pixels (old)\n"
@@ -2897,11 +3008,11 @@
     "PDVC;Panasonic DV;4CC;V;DV;;Panasonic DV\n"
     "PGVV;Radius Video Vision;4CC;V;;;Radius Video Vision Telecast (adaptive JPEG)\n"
     "PHMO;Photomotion;4CC;V;;;IBM Photomotion\n"
-    "PIM1;Pegasus M-JPEG;4CC;V;M-JPEG;;Pinnacle DC1000 hardware (MPEG compression);http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe\n"
-    "PIM2;Pegasus M-JPEG;4CC;V;M-JPEG;;Pegasus Imaging;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe\n"
-    "PIMJ;Pegasus M-JPEG;4CC;V;M-JPEG;;Pegasus Imaging PICvideo Lossless JPEG;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe\n"
-    "PIXL;Miro M-JPEG;4CC;V;M-JPEG;;MiroVideo XL (M-JPEG)\n"
-    "PNG;PNG;4CC;V;RGB\n"
+    "PIM1;Pegasus JPEG;4CC;V;JPEG;;Pinnacle DC1000 hardware (MPEG compression);http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe\n"
+    "PIM2;Pegasus JPEG;4CC;V;JPEG;;Pegasus Imaging;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe\n"
+    "PIMJ;Pegasus JPEG;4CC;V;JPEG;;Pegasus Imaging PICvideo Lossless JPEG;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe\n"
+    "PIXL;Miro JPEG;4CC;V;JPEG;;MiroVideo XL (JPEG)\n"
+    "PNG;PNG;4CC;V;RGB;;\n"
     "PNG1;PNG;4CC;V;RGB;;Corecodec.org CorePNG\n"
     "PVEZ;PowerEZ;4CC;V;;;Horizons Technology PowerEZ\n"
     "PVMM;Pegasus MPEG-4;4CC;V;MPEG-4V;;PacketVideo Corporation MPEG-4\n"
@@ -2910,7 +3021,7 @@
     "PXLT;Pixlet;4CC;V;;;Apple Pixlet (Wavelet)\n"
     "Q1.0;QPEG 1.0;4CC;V;;;Q-Team QPEG 1.0;http://www.q-team.de\n"
     "Q1.1;QPEG 1.1;4CC;V;;;Q-Team QPEG 1.1;http://www.q-team.de\n"
-    "Qclp;QCLP;4CC;A\n"
+    "Qclp;QCLP;4CC;A;;;\n"
     "QDGX;Apple GX;4CC;V;;;Apple QuickDUncompressed GX\n"
     "QDM1;QDesign 1;4CC;A;;;QDesign Music 1\n"
     "QDM2;Qdesign 2;4CC;A;;;QDesign Music 2\n"
@@ -2959,10 +3070,10 @@
     "S263;S263;4CC;V;;;;http://ffdshow-tryout.sourceforge.net/\n"
     "S422;VideoCap C210;4CC;V;YUV;;VideoCap C210\n"
     "s422;VideoCap C210;4CC;V;YUV;;VideoCap C210\n"
-    "SAMR;AMR;4CC;A\n"
+    "SAMR;AMR;4CC;A;;;\n"
     "SAN3;SAN3;4CC;V;MPEG-4V;;Direct copy of DivX 3.11\n"
     "SANM;Smush v2;4CC;V;;;LucasArts;http://www.lucasarts.com/\n"
-    "SCCD;SoftCam;4CC;V\n"
+    "SCCD;SoftCam;4CC;V;;;\n"
     "SDCC;Sun DV;4CC;V;DV;;Sun Digital Camera\n"
     "SEDG;Samsung MPEG-4;4CC;V;MPEG-4V;;Samsung MPEG-4\n"
     "SEG4;Cinepak;4CC;V;;;;http://www.sega.com/\n"
@@ -2976,15 +3087,15 @@
     "SHR5;BitJazz SheerVideo;4CC;V;;;BitJazz SheerVideo (realtime lossless)\n"
     "SHR6;BitJazz SheerVideo;4CC;V;;;BitJazz SheerVideo (realtime lossless)\n"
     "SHR7;BitJazz SheerVideo;4CC;V;;;BitJazz SheerVideo (realtime lossless)\n"
-    "SJPG;CuSeeMe;4CC;V;M-JPEG;;CuSeeMe;http://mirror01.iptelecom.net.ua/~video/codecs/CUseeMe.M-JPEG.CODEC.v1.17.exe\n"
+    "SJPG;CuSeeMe;4CC;V;JPEG;;CuSeeMe;http://mirror01.iptelecom.net.ua/~video/codecs/CUseeMe.JPEG.CODEC.v1.17.exe\n"
     "SL25;SoftLab DVCPro;4CC;V;;;SoftLab-NSK DVCPRO\n"
     "SL50;SoftLab DVCPro5;4CC;V;;;SoftLab-NSK \n"
     "SLDV;SoftLab DV;4CC;V;;;SoftLab-NSK Forward DV Draw\n"
     "SLIF;SoftLab MPEG-2;4CC;V;MPEG-V;;SoftLab-NSK MPEG-2 I-frames\n"
-    "SLMJ;SoftLab M-JPEG;4CC;V;M-JPEG;;SoftLab-NSK Forward M-JPEG\n"
+    "SLMJ;SoftLab JPEG;4CC;V;JPEG;;SoftLab-NSK Forward JPEG\n"
     "smc ;SMC;4CC;V;;;Apple Graphics (SMC);http://www.apple.com/quicktime/download/standalone.html\n"
-    "SMSC;Radius;4CC;V\n"
-    "SMSD;Radius;4CC;V\n"
+    "SMSC;Radius;4CC;V;;;\n"
+    "SMSD;Radius;4CC;V;;;\n"
     "SMSV;Wavelet Video;4CC;V;;;WorldConnect Wavelet Streaming Video\n"
     "smsv;Wavelet Video;4CC;V;;;WorldConnect Wavelet Video\n"
     "SNOW;Snow;4CC;V;;;;http://ffdshow-tryout.sourceforge.net/\n"
@@ -2999,7 +3110,7 @@
     "SP61;MegaCam;4CC;V;;;SunPlus Aiptek MegaCam\n"
     "SPIG;Spigot;4CC;V;;;Radius Spigot\n"
     "SPLC;ACM audio;4CC;V;;;Splash Studios ACM Audio\n"
-    "SPRK;Spark;4CC;V\n"
+    "SPRK;Spark;4CC;V;;\n"
     "SQZ2;VXTreme 2;4CC;V;;;Microsoft VXTreme Video V2\n"
     "STVA;ST Imager;4CC;V;;;ST Microelectronics CMOS Imager Data (Bayer)\n"
     "STVB;ST Imager;4CC;V;;;ST Microelectronics CMOS Imager Data (Nudged Bayer)\n"
@@ -3011,7 +3122,7 @@
     "SVQ1;Sorenson 1;4CC;V;;;Sorenson Media Video 1 (Apple QuickTime 3)\n"
     "SVQ2;Sorenson 2;4CC;V;;;Sorenson Media Video 2 (Apple QuickTime 4)\n"
     "SVQ3;Sorenson 3;4CC;V;;;Sorenson Media Video 3 (Apple QuickTime 5)\n"
-    "SWC1;MainConcept M-JPEG;4CC;V;M-JPEG;;MainConcept M-JPEG\n"
+    "SWC1;MainConcept JPEG;4CC;V;JPEG;;MainConcept JPEG\n"
     "T420;Toshiba YUV;4CC;V;YUV;;Toshiba YUV 4:2:0\n"
     "TGA ;Apple TGA;4CC;V;;;Apple TGA (with Alpha-channel)\n"
     "THEO;Theora;4CC;V;;;FFVFW Supported\n"
@@ -3029,8 +3140,8 @@
     "TRLE;Akula;4CC;V;;;Akula Alpha Pro Custom AVI (LossLess)\n"
     "TSCC;TechSmith;4CC;V;;;TechSmith Screen Capture\n"
     "TV10;Tecomac;4CC;V;;;Tecomac Low-Bit Rate\n"
-    "TVJP;Pinnacle/Truevision;4CC;V;;;TrueVision Field Encoded M-JPEG (Targa emulation)\n"
-    "TVMJ;Pinnacle/Truevision;4CC;V;;;Truevision TARGA M-JPEG Hardware (or Targa emulation)\n"
+    "TVJP;Pinnacle/Truevision;4CC;V;;;TrueVision Field Encoded JPEG (Targa emulation)\n"
+    "TVMJ;Pinnacle/Truevision;4CC;V;;;Truevision TARGA JPEG Hardware (or Targa emulation)\n"
     "TY0N;Trident;4CC;V;;;Trident Decompression Driver\n"
     "TY2C;Trident;4CC;V;;;Trident Decompression Driver\n"
     "TY2N;Trident;4CC;V;;;Trident Decompression Driver\n"
@@ -3038,7 +3149,11 @@
     "U<YA;Discreet YUV;4CC;V;;;Discreet UC YUV 4:2:2:4 10 bit (with Alpha-channel)\n"
     "U263;UB H.263;4CC;V;;;UB Video H.263/H.263+/H.263++ Decoder;http://eMajix.com\n"
     "UCOD;ClearVideo;4CC;V;;;ClearVideo (fractal compression-based)\n"
+    "ULRA;RGBA;Ut Video;Ut Video Lossless Codec;http://umezawa.dyndns.info/archive/utvideo;;;RGBA;4:4:4:4\n"
+    "ULRG;RGB;Ut Video;Ut Video Lossless Codec;http://umezawa.dyndns.info/archive/utvideo;;;RGB;4:4:4\n"
     "ULTI;Ultimotion;4CC;V;;;IBM Ultimotion\n"
+    "ULY0;YUV;Ut Video;Ut Video Lossless Codec;http://umezawa.dyndns.info/archive/utvideo;;;YUV;4:2:2\n"
+    "ULY2;YUV;Ut Video;Ut Video Lossless Codec;http://umezawa.dyndns.info/archive/utvideo;;;YUV;4:2:0\n"
     "UMP4;UB MPEG-4;4CC;V;MPEG-4V;;UB Video MPEG 4;http://www.fourcc.org/indexyuv.htm\n"
     "UYNV;YUV;4CC;V;YUV;;Nvidia 16bpp. A direct copy of UYVY registered by Nvidia to work around problems in some olds which did not like hardware which offered more than 2 UYVY surfaces.;http://www.fourcc.org/indexyuv.htm\n"
     "UYVP;YUV;4CC;V;YUV;;Evans & Sutherland 24bpp. YCbCr 4:2:2 extended precision 10-bits per component in U0Y0V0Y1 order\n"
@@ -3071,17 +3186,20 @@
     "VIV1;H.263;4CC;V;;;Vivo H.263\n"
     "VIV2;H.263;4CC;V;;;Vivo H.263\n"
     "VIVO;H.263;4CC;V;;;Vivo H.263\n"
-    "VIXL;Miro XL;4CC;V;M-JPEG;;Miro Video XL;http://mirror01.iptelecom.net.ua/~video/codecs/miroVIDEO-XL.codec.v2.2.exe\n"
-    "VJPG;JPEG;4CC;V;M-JPEG\n"
-    "VLV1;Videologic;4CC;V\n"
+    "VIXL;Miro XL;4CC;V;JPEG;;Miro Video XL;http://mirror01.iptelecom.net.ua/~video/codecs/miroVIDEO-XL.codec.v2.2.exe\n"
+    "VJPG;JPEG;4CC;V;JPEG;;\n"
+    "VLV1;Videologic;4CC;V;;;\n"
     "VMNC;Vmware;4CC;V;;;;http://www.vmware.com/\n"
     "VP30;VP3;4CC;V;;;On2 VP3\n"
     "VP31;VP3;4CC;V;;;On2 VP3\n"
+    "VP32;VP3;4CC;V;;;On2 VP3\n"
     "VP40;VP4;4CC;V;;;On2 TrueCast VP4\n"
     "VP50;VP5;4CC;V;;;On2 TrueCast VP5\n"
     "VP60;VP6;4CC;V;;;On2 TrueCast VP6\n"
-    "VP61;VP6.1;4CC;V;;;On2 TrueCast VP6.1\n"
-    "VP62;VP6.2;4CC;V;;;On2 TrueCast VP6.2;http://ftp.pub.cri74.org/pub/win9x/video/codecs/VP6/vp6_vfw_codec.exe\n"
+    "VP61;VP6;4CC;V;;;On2 TrueCast VP6.1\n"
+    "VP62;VP6;4CC;V;;;On2 TrueCast VP6.2;http://ftp.pub.cri74.org/pub/win9x/video/codecs/VP6/vp6_vfw_codec.exe\n"
+    "VP6A;VP6;4CC;V;;;On2 TrueCast VP6.2;http://ftp.pub.cri74.org/pub/win9x/video/codecs/VP6/vp6_vfw_codec.exe\n"
+    "VP6F;VP6;4CC;V;;;On2 TrueCast VP6.2;http://ftp.pub.cri74.org/pub/win9x/video/codecs/VP6/vp6_vfw_codec.exe\n"
     "VP70;VP7;4CC;V;;;On2 TrueMotion VP7\n"
     "VP71;VP7;4CC;V;;;On2 TrueMotion VP7\n"
     "VP72;VP7;4CC;V;;;On2 TrueMotion VP7\n"
@@ -3100,9 +3218,9 @@
     "VYU9;YUV;4CC;V;YUV;;ATI YUV\n"
     "VYUY;YUV;4CC;V;YUV;;ATI Packed YUV Data\n"
     "WBVC;W9960;4CC;V;;;Winbond Electronics W9960\n"
-    "WHAM;Microsoft Video 1;4CC;V\n"
-    "WINX;Winnov;4CC;V\n"
-    "WJPG;Winbond M-JPEG;4CC;V;M-JPEG;;Winbond JPEG (AverMedia USB devices)\n"
+    "WHAM;Microsoft Video 1;4CC;V;;;\n"
+    "WINX;Winnov;4CC;V;;;\n"
+    "WJPG;Winbond JPEG;4CC;V;JPEG;;Winbond JPEG (AverMedia USB devices)\n"
     "WMV1;WMV1;4CC;V;;;Windows Media Video 7;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx\n"
     "WMV2;WMV2;4CC;V;;;Windows Media Video 8;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx\n"
     "WMV3;WMV3;4CC;V;VC-1;;Windows Media Video 9;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx\n"
@@ -3120,10 +3238,10 @@
     "WZCD;iScan;4CC;V;;;CORE Co. Ltd.\n"
     "WZDC;iSnap;4CC;V;;;CORE Co. Ltd.\n"
     "X263;H.263;4CC;V;;;Xirlink H.263\n"
-    "x263;Xirlink;4CC;V\n"
+    "x263;Xirlink;4CC;V;;;\n"
     "X264;AVC;4CC;V;AVC;;XiWave GNU GPL x264 MPEG-4\n"
     "x264;AVC;4CC;V;AVC;;XiWave GNU GPL x264 MPEG-4\n"
-    "XJPG;Xirlink;4CC;V;M-JPEG;;Xirlink, Inc.\n"
+    "XJPG;Xirlink;4CC;V;JPEG;;Xirlink, Inc.\n"
     "XLV0;NetXL Video;4CC;V;;;NetXL Inc. XL Video Decoder\n"
     "XMPG;Xing MPEG;4CC;V;MPEG-V;;XING MPEG (I frame only)\n"
     "XVID;XviD;4CC;V;MPEG-4V;;XviD project;http://www.xvid.org/Downloads.15.0.html\n"
@@ -3153,7 +3271,7 @@
     "Y8  ;GrayScale;4CC;V;;;Simple grayscale video\n"
     "Y800;GrayScale;4CC;V;;;Simple grayscale video\n"
     "YC12;YUV;4CC;V;YUV;;Intel YUV12;http://www.fourcc.org/indexyuv.htm\n"
-    "YCCK;YUV;4CC;V;YUV\n"
+    "YCCK;YUV;4CC;V;YUV;;\n"
     "YMPG;MPEG-2;4CC;V;MPEG-2;;YMPEG Alpha (dummy for MPEG-2 compressor)\n"
     "YU12;YUV;4CC;V;YUV;;ATI YV12 4:2:0 Planar\n"
     "YU92;YUV;4CC;V;YUV;;Intel - YUV\n"
@@ -3198,9 +3316,10 @@
     "A_AC3;AC3;Mk;A;AC3;;Dolby AC3\n"
     "A_AC3/BSID9;AC3;Mk;A;AC3;;Dolby AC3\n"
     "A_AC3/BSID10;AC3;Mk;A;AC3;;Dolby AC3\n"
-    "A_DTS;DTS;Mk;A;DTS\n"
+    "A_DTS;DTS;Mk;A;DTS;;\n"
     "A_EAC3;EAC3;Mk;A;EAC3;;Dolby Enhanced AC3\n"
     "A_FLAC;Flac;Mk;A;Flac;;;http://flac.sourceforge.net\n"
+    "A_OPUS;Opus;;;http://opus-codec.org\n"
     "A_TTA1;TTA;Mk;A;TTA;;The True Audio Lossless Codec;http://true-audio.com\n"
     "A_VORBIS;Vorbis;Mk;A;Vorbis;VBR;;http://www.vorbis.com\n"
     "A_WAVPACK4;WavPack;Mk;A;Real;VBR;;http://www.wavpack.com\n"
@@ -3210,7 +3329,7 @@
     "A_REAL/SIPR;RealAudio 4;Mk;A;Real;;Real & Sipro Voice Codec;http://www.real.com\n"
     "A_REAL/RALF;RealAudio Lossless;Mk;A;Real;;Real Audio Lossless Format;http://www.real.com\n"
     "A_REAL/ATRC;RealAudio Atrac3;Mk;A;Real;;Real & Sony Atrac3 Codec;http://www.real.com\n"
-    "A_AAC;AAC;Mk;A;AAC\n"
+    "A_AAC;AAC;Mk;A;AAC;;\n"
     "A_AAC/MPEG2/MAIN;AAC Main;Mk;A;AAC;;AAC Main\n"
     "A_AAC/MPEG2/LC;AAC LC;Mk;A;AAC;;AAC Low Complexity\n"
     "A_AAC/MPEG2/LC/SBR;AAC LC-SBR;Mk;A;AAC;;AAC Low Complexity with Spectral Band Replication\n"
@@ -3239,6 +3358,7 @@
     "atrc;Atrac;Real;A;;;Real & Sony Atrac3;http://www.real.com\n"
     "raac;AAC-LC;Real;A;AAC;;Real Audio 10 AAC LC;http://www.real.com\n"
     "racp;AAC-HE;Real;A;AAC;;Real Audio 10 AAC-HE;http://www.real.com\n"
+    "OPUS;Opus;Ogg;A;OPUS;;;http://opus-codec.org\n"
     "Vorbis;Vorbis;Ogg;A;Vorbis;;;http://www.vorbis.com\n"
     "Theora;Theora;Ogg;V;Theora;;;http://www.theora.com\n"
     "mp4a;AAC;4CC;A;AAC;;AAC (3GPP);http://www.apple.com/quicktime/download/standalone.html\n"
@@ -3266,35 +3386,35 @@
     "alaw;A-Law;4CC;A;ADPCM;;;http://www.apple.com/quicktime/download/standalone.html\n"
     "ulaw;U-Law;4CC;A;ADPCM;;;http://www.apple.com/quicktime/download/standalone.html\n"
     ".mp3;MPEG-1/2 L3;2CC;A;MPEG-A;;MPEG-1 or 2 layer 3;http://www.iis.fraunhofer.de/amm/index.html\n"
-    "MPEG-4 AAC main;AAC Main;Mp4v2;A;AAC\n"
-    "MPEG-4 AAC LC;AAC LC;Mp4v2;A;AAC\n"
-    "MPEG-4 AAC SSR;AAC SSR;Mp4v2;A;AAC\n"
-    "MPEG-4 AAC LTP;AAC LTP;Mp4v2;A;AAC\n"
+    "MPEG-4 AAC main;AAC Main;Mp4v2;A;AAC;;\n"
+    "MPEG-4 AAC LC;AAC LC;Mp4v2;A;AAC;;\n"
+    "MPEG-4 AAC SSR;AAC SSR;Mp4v2;A;AAC;;\n"
+    "MPEG-4 AAC LTP;AAC LTP;Mp4v2;A;AAC;;\n"
     "AVC;AVC;MediaInfo;V;AVC;;Advanced Video Codec;http://developers.videolan.org/x264.html\n"
-    "MPEG-1V;MPEG-1 Video;MediaInfo;V;MPEG-V\n"
-    "MPEG-2V;MPEG-2 Video;MediaInfo;V;MPEG-V\n"
-    "MPEG-4V;MPEG-4 Visual;MediaInfo;V;MPEG-4V\n"
-    "MPEG-1A;MPEG-1 Audio;MediaInfo;A;MPEG-A\n"
-    "MPEG-1A L1;MPEG-1 Audio Layer 1;MediaInfo;A;MPEG-A\n"
-    "MPEG-1A L2;MPEG-1 Audio Layer 2;MediaInfo;A;MPEG-A\n"
-    "MPEG-1A L3;MPEG-1 Audio Layer 3;MediaInfo;A;MPEG-A\n"
-    "MPEG-2A;MPEG-2 Audio;MediaInfo;A;MPEG-A\n"
-    "MPEG-2A L1;MPEG-2 Audio Layer 1;MediaInfo;A;MPEG-A\n"
-    "MPEG-2A L2;MPEG-2 Audio Layer 2;MediaInfo;A;MPEG-A\n"
-    "MPEG-2A L3;MPEG-2 Audio Layer 3;MediaInfo;A;MPEG-A\n"
-    "MPEG-2.5A;MPEG-2.5 Audio;MediaInfo;A;MPEG-A\n"
-    "MPEG-2.5A L1;MPEG-2.5 Audio Layer 1;MediaInfo;A;MPEG-A\n"
-    "MPEG-2.5A L2;MPEG-2.5 Audio Layer 2;MediaInfo;A;MPEG-A\n"
-    "MPEG-2.5A L3;MPEG-2.5 Audio Layer 3;MediaInfo;A;MPEG-A\n"
+    "MPEG-1V;MPEG-1 Video;MediaInfo;V;MPEG-V;;\n"
+    "MPEG-2V;MPEG-2 Video;MediaInfo;V;MPEG-V;;\n"
+    "MPEG-4V;MPEG-4 Visual;MediaInfo;V;MPEG-4V;;\n"
+    "MPEG-1A;MPEG-1 Audio;MediaInfo;A;MPEG-A;;\n"
+    "MPEG-1A L1;MPEG-1 Audio Layer 1;MediaInfo;A;MPEG-A;;\n"
+    "MPEG-1A L2;MPEG-1 Audio Layer 2;MediaInfo;A;MPEG-A;;\n"
+    "MPEG-1A L3;MPEG-1 Audio Layer 3;MediaInfo;A;MPEG-A;;\n"
+    "MPEG-2A;MPEG-2 Audio;MediaInfo;A;MPEG-A;;\n"
+    "MPEG-2A L1;MPEG-2 Audio Layer 1;MediaInfo;A;MPEG-A;;\n"
+    "MPEG-2A L2;MPEG-2 Audio Layer 2;MediaInfo;A;MPEG-A;;\n"
+    "MPEG-2A L3;MPEG-2 Audio Layer 3;MediaInfo;A;MPEG-A;;\n"
+    "MPEG-2.5A;MPEG-2.5 Audio;MediaInfo;A;MPEG-A;;;\n"
+    "MPEG-2.5A L1;MPEG-2.5 Audio Layer 1;MediaInfo;A;MPEG-A;;;\n"
+    "MPEG-2.5A L2;MPEG-2.5 Audio Layer 2;MediaInfo;A;MPEG-A;;;\n"
+    "MPEG-2.5A L3;MPEG-2.5 Audio Layer 3;MediaInfo;A;MPEG-A;;;\n"
     "APE;Monkey's Audio;MediaInfo;A;;;;http://www.monkeysaudio.com/\n"
     "ALS;ALS;MediaInfo;A;;;MPEG-4 Audio Lossless Coding;http://www.nue.tu-berlin.de/forschung/projekte/lossless/mp4als.html#downloads\n"
     "Vodei;Vodei MP;MediaInfo;V;;;Video On Demand Exploration Interface;http://www.vodei.com\n"
     "SWF ADPCM;ADPCM;MediaInfo;A;ADPCM;;ADPCM found in SWF/FLV files;http://www.adobe.com\n"
-    "AC3+;AC3+;MediaInfo;A;AC3;;Dolby Ehanced AC3\n"
-    "TrueHD;TrueHD;MediaInfo;A;AC3;;Dolby TrueHD (AC3 based)\n"
+    "AC3+;AC3+;MediaInfo;A;AC3;;Dolby Ehanced AC3;\n"
+    "TrueHD;TrueHD;MediaInfo;A;AC3;;Dolby TrueHD (AC3 based);\n"
     "VC-1;VC-1;MediaInfo;V;VC-1;;;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx\n"
     "LA;LA;MediaInfo;A;;;Lossless Audio Codec;la;http://www.lossless-audio.com/\n"
-    "0;Unknown;2CC;A\n"
+    "0;Unknown;2CC;A;;;;\n"
     "1;PCM;2CC;A;PCM;;Microsoft PCM;http://www.microsoft.com/windows/\n"
     "2;ADPCM;2CC;A;ADPCM;;Microsoft ADPCM;http://www.microsoft.com/windows/\n"
     "3;PCM;2CC;A;PCM;;IEEE FLOAT;http://www.microsoft.com/windows/\n"
@@ -3302,9 +3422,9 @@
     "5;CVSD;2CC;A;;;IBM CVSD\n"
     "6;A-Law;2CC;A;ADPCM;;CCITT A-Law;http://www.microsoft.com/windows/\n"
     "7;U-Law;2CC;A;ADPCM;;CCITT U-Law;http://www.microsoft.com/windows/\n"
-    "8;DTS;2CC;A;DTS\n"
+    "8;DTS;2CC;A;DTS;;\n"
     "9;DRM;2CC;A;;;Microsoft\n"
-    "A;WMSpeech;2CC;A\n"
+    "A;WMSpeech;2CC;A;;;\n"
     "C;MPEG2 5.1;2CC;A;;;MPEG2 5.1\n"
     "10;ADPCM;2CC;A;ADPCM;;OKI ADPCM\n"
     "11;ADPCM;2CC;A;ADPCM;;Intel ADPCM\n"
@@ -3314,7 +3434,7 @@
     "15;STD;2CC;A;;;DSP solutions Digi-STD\n"
     "16;FIX;2CC;A;;;DSP solutions Digi-FIX\n"
     "17;ADPCM;2CC;A;ADPCM;;Dialogic-OKI ADPCM;http://www.microsoft.com/windows/\n"
-    "18;ADPCM;2CC;A;ADPCM\n"
+    "18;ADPCM;2CC;A;ADPCM;;\n"
     "19;CU;2CC;A;;;HP CU_CODEC\n"
     "1A;Dynamic Voice;2CC;A;;;HP\n"
     "20;ADPCM;2CC;A;ADPCM;;Yamaha ADPCM\n"
@@ -3330,7 +3450,7 @@
     "31;GSM 6.10;2CC;A;;;Microsoft GSM 6.10;http://www.microsoft.com/windows/\n"
     "32;MSAUDIO;2CC;A;;;Microsoft Audio\n"
     "33;ADPCM;2CC;A;ADPCM;;Antex ADPCM\n"
-    "34;VQLPC;2CC;A;;;Control Ressources VQLPC\n"
+    "34;VQLPC;2CC;A;;;Control Resources VQLPC\n"
     "35;REAL;2CC;A;;;DSP Solutions Digi-REAL\n"
     "36;ADPCM;2CC;A;ADPCM;;DSP Solutions Digi-ADPCM\n"
     "37;CR10;2CC;A;;;Control Resources 10\n"
@@ -3354,7 +3474,7 @@
     "59;G723;2CC;A;;;Lucent G723\n"
     "60;Cirrus;2CC;A;;;Cirrus Logic\n"
     "61;PCM;2CC;A;;;ESS Technology PCM\n"
-    "62;Voxware;2CC;A\n"
+    "62;Voxware;2CC;A;;;\n"
     "63;ATRAC;2CC;A;;;Canopus ATRAC\n"
     "64;ADPCM;2CC;A;ADPCM;;APICOM G726 ADPCM\n"
     "65;ADPCM;2CC;A;ADPCM;;APICOM G722 ADPCM\n"
@@ -3373,7 +3493,7 @@
     "79;TQ40;2CC;A;;;Voxware TQ40;http://www.voxware.com/\n"
     "7A;SC3;2CC;A;;;Voxware\n"
     "7B;SC3;2CC;A;;;Voxware\n"
-    "80;Softsound;2CC;A\n"
+    "80;Softsound;2CC;A;;;\n"
     "81;TQ60;2CC;A;;;Voxware TQ60;http://www.voxware.com/\n"
     "82;MSRT24;2CC;A;;;Microsoft MSRT24\n"
     "83;G729A;2CC;A;;;AT&T G729A\n"
@@ -3398,8 +3518,8 @@
     "A3;G.723.1;2CC;A;;;Racal Recorders\n"
     "A4;ACELP;2CC;A;;;Racal Recorders\n"
     "B0;AAC;2CC;A;AAC;;NEC Corporation\n"
-    "FF;AAC;2CC;A;AAC\n"
-    "100;ADPCM;2CC;A;ADPCM\n"
+    "FF;AAC;2CC;A;AAC;;\n"
+    "100;ADPCM;2CC;A;ADPCM;;\n"
     "101;IRAT;2CC;A;;;BeCubed IRAT\n"
     "102;;2CC;A;;;IBM A-law\n"
     "103;;2CC;A;;;IBM AVC ADPCM\n"
@@ -3408,7 +3528,7 @@
     "120;CELP;2CC;A;;;Philips Speech Processing\n"
     "121;Grundig;2CC;A;;;Philips Speech Processing\n"
     "123;G723;2CC;A;;;Digital Equipment Corporation (DEC) G723\n"
-    "125;ADPCM;2CC;A;ADPCM\n"
+    "125;ADPCM;2CC;A;ADPCM;;\n"
     "130;ACEPL;2CC;A;;;Sipro ACEPL.net;http://dividix.host.sk\n"
     "131;ACELP4800;2CC;A;;;Sipro ACELP4800\n"
     "132;ACELP8V3;2CC;A;;;Sipro ACELP8V3\n"
@@ -3437,7 +3557,7 @@
     "177;CELP68;2CC;A;;;SyCom Technologies\n"
     "178;ADPCM;2CC;A;ADPCM;;Knowledge Adventure, Inc.\n"
     "180;AAC;2CC;A;;;Fraunhofer IIS\n"
-    "190;DTS;2CC;A\n"
+    "190;DTS;2CC;A;;\n"
     "200;ADPCM;2CC;A;ADPCM;;Creative Labs ADPCM\n"
     "202;FastSpeech8;2CC;A;;;Creative Labs Fast Speech 8\n"
     "203;FastSpeech10;2CC;A;;;Creative Labs Fast Speech 10\n"
@@ -3455,8 +3575,8 @@
     "271;SCY;2CC;A;;;Sony\n"
     "272;Atrac3;2CC;A;;;Sony\n"
     "273;SPC;2CC;A;;;Sony\n"
-    "280;Telum;2CC;A\n"
-    "281;TelumIA;2CC;A\n"
+    "280;Telum;2CC;A;;\n"
+    "281;TelumIA;2CC;A;;\n"
     "285;ADPCM;2CC;A;ADPCM;;Norcom Voice Systems\n"
     "300;FM_TOWNS_SND;2CC;A;;;Fujitsu FM_TOWNS_SND\n"
     "350;Dev;2CC;A;;;Micronas Semiconductors, Inc.\n"
@@ -3465,13 +3585,13 @@
     "401;Music Coder;2CC;A;;;Intel Music Coder;http://www.intel.com/\n"
     "402;IAC2;2CC;A;;;Ligos IAC2;http://www.ligos.com\n"
     "450;Qdesign;2CC;A;;;QDesign Music\n"
-    "500;VP7;2CC;A;;;On2 VP7 Audio;http://www.on2.com/vp7.php3\n"
-    "501;VP6;2CC;A;;;On2 VP7 Audio;http://www.on2.com/vp7.php3\n"
+    "500;VP7;2CC;A;;;On2\n"
+    "501;VP6;2CC;A;;;On2\n"
     "680;VMPCM;2CC;A;;;AT&T VME_VMPCM\n"
     "681;TPC;2CC;A;;;AT&T TPC\n"
     "700;YMPEG;2CC;A;;;YMPEG Alpha\n"
     "8AE;LiteWave;2CC;A;;;ClearJump LiteWave\n"
-    "AAC;AAC;2CC;A;AAC\n"
+    "AAC;AAC;2CC;A;AAC;;\n"
     "1000;GSM;2CC;A;;;Ing C. Olivetti & C., S.p.A. GSM\n"
     "1001;ADPCM;2CC;A;ADPCM;;Ing C. Olivetti & C., S.p.A. ADPCM\n"
     "1002;CELP;2CC;A;;;Ing C. Olivetti & C., S.p.A. CELP\n"
@@ -3503,10 +3623,10 @@
     "2007;AAC+;2CC;A;AAC;;RealAudio 10 AAC+ (RACP)\n"
     "3313;AviSynth;2CC;A;;;makeAVIS (fake AVI sound from AviSynth scripts)\n"
     "4143;AAC;2CC;A;AAC;;Divio MPEG-4 AAC audio\n"
-    "4201;Nokia;2CC;A\n"
+    "4201;Nokia;2CC;A;;\n"
     "4243;ADPCM;2CC;A;ADPCM;;G726\n"
-    "43AC;Lead Speech;2CC;A\n"
-    "564C;Lead Vorbis;2CC;A\n"
+    "43AC;Lead Speech;2CC;A;;\n"
+    "564C;Lead Vorbis;2CC;A;;;\n"
     "566F;Vorbis;2CC;A;Vorbis;;;http://www.vorbis.com\n"
     "5756;WavPack;2CC;A;;;;http://www.wavpack.com/\n"
     "674F;Vorbis;2CC;A;Vorbis;;Mode 1;http://www.vorbis.com\n"
@@ -3515,17 +3635,15 @@
     "676F;Vorbis;2CC;A;Vorbis;;Mode 1+;http://www.vorbis.com\n"
     "6770;Vorbis;2CC;A;Vorbis;;Mode 2+;http://www.vorbis.com\n"
     "6771;Vorbis;2CC;A;Vorbis;;Mode 2+;http://www.vorbis.com\n"
-    ";3COM NBX;2CC;A;;;3Com Corporation\n"
-    ";FAAD AAC;2CC;A\n"
     "7A21;AMR;2CC;A;;CBR;GSM-AMR (CBR, no SID);http://www.microsoft.com\n"
     "7A22;AMR;2CC;A;;VBR;GSM-AMR (VBR, including SID);http://www.microsoft.com\n"
-    "A100;G723.1;2CC;A\n"
-    "A101;AVQSBC;2CC;A\n"
-    "A102;ODSBC;2CC;A\n"
-    "A103;G729A;2CC;A\n"
-    "A104;AMR-WB;2CC;A\n"
+    "A100;G723.1;2CC;A;;;\n"
+    "A101;AVQSBC;2CC;A;;;\n"
+    "A102;ODSBC;2CC;A;;;\n"
+    "A103;G729A;2CC;A;;;\n"
+    "A104;AMR-WB;2CC;A;;;\n"
     "A105;ADPCM;2CC;A;ADPCM;;G726\n"
-    "A106;AAC;2CC;A\n"
+    "A106;AAC;2CC;A;;;\n"
     "A107;ADPCM;2CC;A;ADPCM;;G726\n"
     "A109;Speex;2CC;A;;;;http://www.speex.org/\n"
     "DFAC;FrameServer;2CC;A;;;DebugMode SonicFoundry Vegas FrameServer ACM Codec\n"
@@ -3545,7 +3663,7 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_Generic (ZtringListList &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
     "Format\n"
     "Format/Info\n"
@@ -3554,6 +3672,7 @@
     "Format_Commercial_IfAny\n"
     "Format_Version\n"
     "Format_Profile\n"
+    "Format_Compression\n"
     "Format_Settings\n"
     "InternetMediaType\n"
     "CodecID\n"
@@ -3571,6 +3690,11 @@
     "Duration/String1\n"
     "Duration/String2\n"
     "Duration/String3\n"
+    "Source_Duration\n"
+    "Source_Duration/String\n"
+    "Source_Duration/String1\n"
+    "Source_Duration/String2\n"
+    "Source_Duration/String3\n"
     "BitRate_Mode\n"
     "BitRate_Mode/String\n"
     "BitRate\n"
@@ -3581,12 +3705,42 @@
     "BitRate_Nominal/String\n"
     "BitRate_Maximum\n"
     "BitRate_Maximum/String\n"
+    "BitRate_Encoded\n"
+    "BitRate_Encoded/String\n"
+    "FrameCount\n"
+    "Source_FrameCount\n"
     "ColorSpace\n"
     "ChromaSubsampling\n"
     "Resolution\n"
     "Resolution/String\n"
     "BitDepth\n"
     "BitDepth/String\n"
+    "Compression_Mode\n"
+    "Compression_Mode/String\n"
+    "Compression_Ratio\n"
+    "Delay\n"
+    "Delay/String\n"
+    "Delay/String1\n"
+    "Delay/String2\n"
+    "Delay/String3\n"
+    "Delay/String4\n"
+    "Delay_Settings\n"
+    "Delay_Source\n"
+    "Delay_Source/String\n"
+    "Delay_Original\n"
+    "Delay_Original/String\n"
+    "Delay_Original/String1\n"
+    "Delay_Original/String2\n"
+    "Delay_Original/String3\n"
+    "Delay_Original/String4\n"
+    "Delay_Original_Settings\n"
+    "Delay_Original_Source\n"
+    "Video_Delay\n"
+    "Video_Delay/String\n"
+    "Video_Delay/String1\n"
+    "Video_Delay/String2\n"
+    "Video_Delay/String3\n"
+    "Video_Delay/String4\n"
     "StreamSize\n"
     "StreamSize/String\n"
     "StreamSize/String1\n"
@@ -3595,6 +3749,33 @@
     "StreamSize/String4\n"
     "StreamSize/String5\n"
     "StreamSize_Proportion\n"
+    "Source_StreamSize\n"
+    "Source_StreamSize/String\n"
+    "Source_StreamSize/String1\n"
+    "Source_StreamSize/String2\n"
+    "Source_StreamSize/String3\n"
+    "Source_StreamSize/String4\n"
+    "Source_StreamSize/String5\n"
+    "Source_StreamSize_Proportion\n"
+    "StreamSize_Encoded\n"
+    "StreamSize_Encoded/String\n"
+    "StreamSize_Encoded/String1\n"
+    "StreamSize_Encoded/String2\n"
+    "StreamSize_Encoded/String3\n"
+    "StreamSize_Encoded/String4\n"
+    "StreamSize_Encoded/String5\n"
+    "StreamSize_Encoded_Proportion\n"
+    "Source_StreamSize_Encoded\n"
+    "Source_StreamSize_Encoded/String\n"
+    "Source_StreamSize_Encoded/String1\n"
+    "Source_StreamSize_Encoded/String2\n"
+    "Source_StreamSize_Encoded/String3\n"
+    "Source_StreamSize_Encoded/String4\n"
+    "Source_StreamSize_Encoded/String5\n"
+    "Source_StreamSize_Encoded_Proportion\n"
+    "Language\n"
+    "ServiceName\n"
+    "ServiceProvider\n"
     ));
     Info.Separator_Set(0, ZenLib::EOL);
 }
@@ -3602,18 +3783,21 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_General (ZtringListList &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
     "Count;;;N NI;;;Number of objects available in this stream\n"
+    "Status;;;N NI;;;bit field (0=IsAccepted, 1=IsFilled, 2=IsUpdated, 3=IsFinished)\n"
     "StreamCount;;;N NI;;;Number of streams of this kind available\n"
     "StreamKind;General;;N NI;;;Stream type name\n"
     "StreamKind/String;;;N NI;;;Stream type name\n"
     "StreamKindID;;;N NI;;;Number of the stream (base=0)\n"
     "StreamKindPos;;;N NI;;;When multiple streams, number of the stream (base=1)\n"
+    "StreamOrder;;;N NI;;;Stream order in the file, whatever is the kind of stream (base=0)\n"
     "Inform;;;N NT;;;Last **Inform** call\n"
     "ID;;;N YI;;;The ID for this stream in this file\n"
     "ID/String;;;Y NT;;;The ID for this stream in this file\n"
     "UniqueID;;;N YI;;;The unique ID for this stream, should be copied with stream copy\n"
+    "UniqueID/String;;;Y NT;;;A unique ID for this stream, should be copied with stream copy\n"
     "MenuID;;;N YI;;;The menu ID for this stream in this file\n"
     "MenuID/String;;;Y NT;;;The menu ID for this stream in this file\n"
     "GeneralCount;1;;N NI;;;Number of general streams\n"
@@ -3660,9 +3844,11 @@
     "Format_Commercial_IfAny;;;Y NT;;;Commercial name used by vendor for theses setings if there is one\n"
     "Format_Version;;;Y NT;;;Version of this format\n"
     "Format_Profile;;;Y NT;;;Profile of the Format\n"
+    "Format_Compression;;;Y NT;;;Compression method used;\n"
     "Format_Settings;;;Y NT;;;Settings needed for decoder used\n"
     "InternetMediaType;;;N YT;;;Internet Media Type (aka MIME Type, Content-Type)\n"
-    "CodecID;;;Y YT;;;Codec ID (found in some containers)\n"
+    "CodecID;;;Y NT;;;Codec ID (found in some containers);\n"
+    "CodecID/String;;;Y NT;;;Codec ID (found in some containers);\n"
     "CodecID/Info;;;Y NT;;;Info about this codec\n"
     "CodecID/Hint;;;Y NT;;;A hint/popular name for this codec\n"
     "CodecID/Url;;;N NT;;;A link to more details about this codec ID\n"
@@ -3686,8 +3872,8 @@
     "Duration/String1;;;N NT;;;Play time in format : HHh MMmn SSs MMMms, XX omited if zero\n"
     "Duration/String2;;;N NT;;;Play time in format : XXx YYy only, YYy omited if zero\n"
     "Duration/String3;;;N NT;;;Play time in format : HH:MM:SS.MMM\n"
-    "Duration_Start;;;Y YT\n"
-    "Duration_End;;;Y YT\n"
+    "Duration_Start;;;Y YT;;\n"
+    "Duration_End;;;Y YT;;\n"
     "OverallBitRate_Mode;;;N YT;;;Bit rate mode of all streams (VBR, CBR)\n"
     "OverallBitRate_Mode/String;;;Y NT;;;Bit rate mode of all streams (Variable, Constant)\n"
     "OverallBitRate;; bps;N YF;;;Bit rate of all streams in bps\n"
@@ -3704,20 +3890,21 @@
     "Delay/String2;;;N NT;;;Delay with measurement\n"
     "Delay/String3;;;N NT;;;format : HH:MM:SS.MMM\n"
     "StreamSize;; byte;N YI;;;Stream size in bytes\n"
-    "StreamSize/String;;;N NT\n"
-    "StreamSize/String1;;;N NT\n"
-    "StreamSize/String2;;;N NT\n"
-    "StreamSize/String3;;;N NT\n"
-    "StreamSize/String4;;;N NT\n"
+    "StreamSize/String;;;N NT;;\n"
+    "StreamSize/String1;;;N NT;;\n"
+    "StreamSize/String2;;;N NT;;\n"
+    "StreamSize/String3;;;N NT;;\n"
+    "StreamSize/String4;;;N NT;;\n"
     "StreamSize/String5;;;N NT;;;With proportion\n"
     "StreamSize_Proportion;;;N NT;;;Stream size divided by file size\n"
-    "HeaderSize;;;N NI\n"
-    "DataSize;;;N NI\n"
-    "FooterSize;;;N NI\n"
+    "HeaderSize;;;N NI;;\n"
+    "DataSize;;;N NI;;\n"
+    "FooterSize;;;N NI;;\n"
+    "IsStreamable;;;N NT;;\n"
     "Album_ReplayGain_Gain;; dB;N YT;;;The gain to apply to reach 89dB SPL on playback\n"
-    "Album_ReplayGain_Gain/String;;;Y YT\n"
-    "Album_ReplayGain_Peak;;;Y YT;;;The maximum absolute peak value of the item\n"
-    "Encryption;;;Y YT\n"
+    "Album_ReplayGain_Gain/String;;;Y YT;;\n"
+    "Album_ReplayGain_Peak;;;Y YT;;;The maximum absolute peak value of the item;\n"
+    "Encryption;;;Y YT;;;;\n"
     "Title;;;N NT;;;(Generic)Title of file;;Title\n"
     "Title/More;;;N NT;;;(Generic)More info about the title of file;;Title\n"
     "Title/Url;;;N NT;;;(Generic)Url;;Title\n"
@@ -3733,6 +3920,9 @@
     "Album;;;Y YT;;;Name of an audio-album. Eg : The joshua tree;;Title\n"
     "Album/More;;;Y YT;;;More infos about the album;;Title\n"
     "Album/Sort;;;Y YT;;;;;Title\n"
+    "Album/Performer;;;Y YT;;;Album performer/artist of this file;;Entity\n"
+    "Album/Performer/Sort;;;Y YT;;;;;Entity\n"
+    "Album/Performer/Url;;;Y YT;;;Homepage of the album performer/artist;;Entity\n"
     "Comic;;;Y YT;;;Name of the comic.;;Title\n"
     "Comic/More;;;Y YT;;;;;Title\n"
     "Comic/Position_Total;;;Y YI;;;;;Title\n"
@@ -3745,12 +3935,15 @@
     "Track/Sort;;;Y YT;;;;;Title\n"
     "Track/Position;;;Y YI;;;Number of this track;;Title\n"
     "Track/Position_Total;;;Y YI;;;Place of this track, e.g. 3 of 15;;Title\n"
+    "Grouping;;;Y YT;;;iTunes grouping;;Title\n"
     "Chapter;;;Y YT;;;Name of the chapter.;;Title\n"
     "SubTrack;;;Y YT;;;Name of the subtrack.;;Title\n"
     "Original/Album;;;Y YT;;;Original name of album, serie...;;Title\n"
     "Original/Movie;;;Y YT;;;Original name of the movie;;Title\n"
     "Original/Part;;;Y YT;;;Original name of the part in the original support;;Title\n"
     "Original/Track;;;Y YT;;;Original name of the track in the original support;;Title\n"
+    "Compilation;;;Y YT;;;iTunes compilation;;Title\n"
+    "Compilation/String;;Yes;Y YT;;;iTunes compilation;;Title\n"
     "Performer;;;Y YT;;;Main performer/artist of this file;;Entity\n"
     "Performer/Sort;;;Y YT;;;;;Entity\n"
     "Performer/Url;;;Y YT;;;Homepage of the performer/artist;;Entity\n"
@@ -3869,8 +4062,8 @@
     "Played_First_Date;;;Y YT;;;The date, the owner first played an item;;Personal\n"
     "Played_Last_Date;;;Y YT;;;The date, the owner last played an item;;Personal\n"
     "Played_Count;;;Y YI;;;Number of times an item was played;;Personal\n"
-    "EPG_Positions_Begin;;;N NI\n"
-    "EPG_Positions_End;;;N NI\n"
+    "EPG_Positions_Begin;;;N NI;;;;\n"
+    "EPG_Positions_End;;;N NI;;;;\n"
     ));
     Info.Separator_Set(0, ZenLib::EOL);
 }
@@ -3878,18 +4071,21 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_Video (ZtringListList &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
     "Count;;;N NI;;;Number of objects available in this stream\n"
+    "Status;;;N NI;;;bit field (0=IsAccepted, 1=IsFilled, 2=IsUpdated, 3=IsFinished)\n"
     "StreamCount;;;N NI;;;Number of streams of this kind available\n"
     "StreamKind;Video;;N NI;;;Stream type name\n"
     "StreamKind/String;;;N NI;;;Stream type name\n"
     "StreamKindID;;;N NI;;;Number of the stream (base=0)\n"
     "StreamKindPos;;;N NI;;;When multiple streams, number of the stream (base=1)\n"
+    "StreamOrder;;;N NI;;;Stream order in the file, whatever is the kind of stream (base=0)\n"
     "Inform;;;N NT;;;Last **Inform** call\n"
     "ID;;;N YI;;;The ID for this stream in this file\n"
     "ID/String;;;Y NT;;;The ID for this stream in this file\n"
     "UniqueID;;;N YI;;;The unique ID for this stream, should be copied with stream copy\n"
+    "UniqueID/String;;;Y NT;;;A unique ID for this stream, should be copied with stream copy\n"
     "MenuID;;;N YI;;;The menu ID for this stream in this file\n"
     "MenuID/String;;;Y NT;;;The menu ID for this stream in this file\n"
     "Format;;;Y YT;;;Format used\n"
@@ -3899,15 +4095,17 @@
     "Format_Commercial_IfAny;;;Y NT;;;Commercial name used by vendor for theses setings if there is one\n"
     "Format_Version;;;Y NT;;;Version of this format\n"
     "Format_Profile;;;Y NT;;;Profile of the Format\n"
+    "Format_Compression;;;N YT;;;Compression mode of the Format\n"
     "MultiView_BaseProfile;;;Y NT;;;Multiview, profile of the base stream\n"
     "MultiView_Count;;;Y NT;;;Multiview, count of views\n"
+    "MultiView_Layout;;;Y NT;;;Multiview, how views are muxed in the container in case of it is not muxing in the stream\n"
     "Format_Settings;;;N NT;;;Settings needed for decoder used, summary\n"
     "Format_Settings_BVOP;;Yes;N YT;;;Settings needed for decoder used, detailled\n"
     "Format_Settings_BVOP/String;;;Y NT;;;Settings needed for decoder used, detailled\n"
     "Format_Settings_QPel;;Yes;N YT;;;Settings needed for decoder used, detailled\n"
     "Format_Settings_QPel/String;;;Y NT;;;Settings needed for decoder used, detailled\n"
     "Format_Settings_GMC;; warppoint;N YI;;;Settings needed for decoder used, detailled\n"
-    "Format_Settings_GMC/String;;;Y NT\n"
+    "Format_Settings_GMC/String;;;Y NT;;\n"
     "Format_Settings_Matrix;;;N YT;;;Settings needed for decoder used, detailled\n"
     "Format_Settings_Matrix/String;;;Y NT;;;Settings needed for decoder used, detailled\n"
     "Format_Settings_Matrix_Data;;;N NT;;;Matrix, in binary format encoded BASE64. Order = intra, non-intra, gray intra, gray non-intra\n"
@@ -3919,9 +4117,11 @@
     "Format_Settings_FrameMode;;;Y YT;;;Settings needed for decoder used, detailled\n"
     "Format_Settings_GOP;;;Y YT;;;Settings needed for decoder used, detailled (M=x N=y)\n"
     "Format_Settings_FrameStructures;;;Y YT;;;Settings needed for decoder used, detailled (Type of frame, and field/frame info)\n"
+    "Format_Settings_Wrapping;;;Y YT;;;Wrapping mode (Frame wrapped or Clip wrapped)\n"
     "InternetMediaType;;;N YT;;;Internet Media Type (aka MIME Type, Content-Type)\n"
     "MuxingMode;;;Y NT;;;How this file is muxed in the container\n"
-    "CodecID;;;Y YT;;;Codec ID (found in some containers)\n"
+    "CodecID;;;Y NT;;;Codec ID (found in some containers);\n"
+    "CodecID/String;;;Y NT;;;Codec ID (found in some containers);\n"
     "CodecID/Info;;;Y NT;;;Info on the codec\n"
     "CodecID/Hint;;;Y NT;;;Hint/popular name for this codec\n"
     "CodecID/Url;;;N NT;;;Homepage for more details about this codec\n"
@@ -3950,11 +4150,31 @@
     "Duration/String2;;;N NT;;;Play time in format : XXx YYy only, YYy omited if zero\n"
     "Duration/String3;;;N NT;;;Play time in format : HH:MM:SS.MMM\n"
     "Duration/String4;;;N NT;;;Play time in format : HH:MM:SS:FF (HH:MM:SS;FF for drop frame, if available)\n"
+    "Duration_FirstFrame;; ms;N YI;;;Duration of the first frame if it is longer than others, in ms\n"
+    "Duration_FirstFrame/String;;;Y NT;;;Duration of the first frame if it is longer than others, in format : XXx YYy only, YYy omited if zero\n"
+    "Duration_FirstFrame/String1;;;N NT;;;Duration of the first frame if it is longer than others, in format : HHh MMmn SSs MMMms, XX omited if zero\n"
+    "Duration_FirstFrame/String2;;;N NT;;;Duration of the first frame if it is longer than others, in format : XXx YYy only, YYy omited if zero\n"
+    "Duration_FirstFrame/String3;;;N NT;;;Duration of the first frame if it is longer than others, in format : HH:MM:SS.MMM\n"
     "Duration_LastFrame;; ms;N YI;;;Duration of the last frame if it is longer than others, in ms\n"
     "Duration_LastFrame/String;;;Y NT;;;Duration of the last frame if it is longer than others, in format : XXx YYy only, YYy omited if zero\n"
     "Duration_LastFrame/String1;;;N NT;;;Duration of the last frame if it is longer than others, in format : HHh MMmn SSs MMMms, XX omited if zero\n"
     "Duration_LastFrame/String2;;;N NT;;;Duration of the last frame if it is longer than others, in format : XXx YYy only, YYy omited if zero\n"
     "Duration_LastFrame/String3;;;N NT;;;Duration of the last frame if it is longer than others, in format : HH:MM:SS.MMM\n"
+    "Source_Duration;; ms;N YI;;;Source Play time of the stream;\n"
+    "Source_Duration/String;;;Y NT;;;Source Play time in format : XXx YYy only, YYy omited if zero;\n"
+    "Source_Duration/String1;;;N NT;;;Source Play time in format : HHh MMmn SSs MMMms, XX omited if zero;\n"
+    "Source_Duration/String2;;;N NT;;;Source Play time in format : XXx YYy only, YYy omited if zero;\n"
+    "Source_Duration/String3;;;N NT;;;Source Play time in format : HH:MM:SS.MMM;\n"
+    "Source_Duration_FirstFrame;; ms;N YI;;;Source Duration of the first frame if it is longer than others, in ms\n"
+    "Source_Duration_FirstFrame/String;;;Y NT;;;Source Duration of the first frame if it is longer than others, in format : XXx YYy only, YYy omited if zero\n"
+    "Source_Duration_FirstFrame/String1;;;N NT;;;Source Duration of the first frame if it is longer than others, in format : HHh MMmn SSs MMMms, XX omited if zero\n"
+    "Source_Duration_FirstFrame/String2;;;N NT;;;Source Duration of the first frame if it is longer than others, in format : XXx YYy only, YYy omited if zero\n"
+    "Source_Duration_FirstFrame/String3;;;N NT;;;Source Duration of the first frame if it is longer than others, in format : HH:MM:SS.MMM\n"
+    "Source_Duration_LastFrame;; ms;N YI;;;Source Duration of the last frame if it is longer than others, in ms\n"
+    "Source_Duration_LastFrame/String;;;Y NT;;;Source Duration of the last frame if it is longer than others, in format : XXx YYy only, YYy omited if zero\n"
+    "Source_Duration_LastFrame/String1;;;N NT;;;Source Duration of the last frame if it is longer than others, in format : HHh MMmn SSs MMMms, XX omited if zero\n"
+    "Source_Duration_LastFrame/String2;;;N NT;;;Source Duration of the last frame if it is longer than others, in format : XXx YYy only, YYy omited if zero\n"
+    "Source_Duration_LastFrame/String3;;;N NT;;;Source Duration of the last frame if it is longer than others, in format : HH:MM:SS.MMM\n"
     "BitRate_Mode;;;N YT;;;Bit rate mode (VBR, CBR)\n"
     "BitRate_Mode/String;;;Y NT;;;Bit rate mode (Variable, Cconstant)\n"
     "BitRate;; bps;N YF;;;Bit rate in bps\n"
@@ -3965,14 +4185,20 @@
     "BitRate_Nominal/String;;;Y NT;;;Nominal Bit rate (with measurement)\n"
     "BitRate_Maximum;; bps;N YF;;;Maximum Bit rate in bps\n"
     "BitRate_Maximum/String;;;Y NT;;;Maximum Bit rate (with measurement)\n"
-    "Width;; pixel;N YI;;;Width in pixel\n"
-    "Width/String;;;Y NT;;;Width with measurement (pixel)\n"
-    "Width_Original;; pixel;N YI;;;Original (in the raw stream) Width in pixel\n"
-    "Width_Original/String;;;Y NT;;;Original (in the raw stream) Width with measurement (pixel)\n"
-    "Height;; pixel;N YI;;;Original (in the raw stream) Height in pixel\n"
-    "Height/String;;;Y NT;;;Original (in the raw stream) Height with measurement (pixel)\n"
-    "Height_Original;; pixel;N YI;;;Height in pixel\n"
-    "Height_Original/String;;;Y NT;;;Height with measurement (pixel)\n"
+    "BitRate_Encoded;; bps;N YF;;;Encoded (with forced padding) bit rate in bps, if some container padding is present\n"
+    "BitRate_Encoded/String;;;Y NT;;;Encoded (with forced padding) bit rate (with measurement), if some container padding is present\n"
+    "Width;; pixel;N YI;;;Width (aperture size if present) in pixel\n"
+    "Width/String;;;Y NT;;;Width (aperture size if present) with measurement (pixel)\n"
+    "Width_Offset;; pixel;N YI;;;Offset between original width and displayed width (aperture size) in pixel\n"
+    "Width_Offset/String;;;N NT;;;Offset between original width and displayed width (aperture size)  in pixel\n"
+    "Width_Original;; pixel;N YI;;;Original (in the raw stream) width in pixel\n"
+    "Width_Original/String;;;Y NT;;;Original (in the raw stream) width with measurement (pixel)\n"
+    "Height;; pixel;N YI;;;Height (aperture size if present) in pixel\n"
+    "Height/String;;;Y NT;;;Height (aperture size if present) with measurement (pixel)\n"
+    "Height_Offset;; pixel;N YI;;;Offset between original height and displayed height (aperture size) in pixel\n"
+    "Height_Offset/String;;;N NT;;;Offset between original height and displayed height (aperture size)  in pixel\n"
+    "Height_Original;; pixel;N YI;;;Original (in the raw stream) height in pixel\n"
+    "Height_Original/String;;;Y NT;;;Original (in the raw stream) height with measurement (pixel)\n"
     "PixelAspectRatio;;;N YF;;;Pixel Aspect ratio\n"
     "PixelAspectRatio/String;;;N NT;;;Pixel Aspect ratio\n"
     "PixelAspectRatio_Original;;;N YF;;;Original (in the raw stream) Pixel Aspect ratio\n"
@@ -3981,6 +4207,9 @@
     "DisplayAspectRatio/String;;;Y NT;;;Display Aspect ratio\n"
     "DisplayAspectRatio_Original;;;N YF;;;Original (in the raw stream) Display Aspect ratio\n"
     "DisplayAspectRatio_Original/String;;;Y NT;;;Original (in the raw stream) Display Aspect ratio\n"
+    "ActiveFormatDescription;;;N YN;;;Active Format Description (AFD value)\n"
+    "ActiveFormatDescription/String;;;Y NT;;;Active Format Description (text)\n"
+    "ActiveFormatDescription_MuxingMode;;;N YT;;;Active Format Description (AFD value) muxing mode (Ancillary or Raw stream)\n"
     "Rotation;;;N YT;;;Rotation\n"
     "Rotation/String;;;Y NT;;;Rotation (if not horizontal)\n"
     "FrameRate_Mode;;;N YT;;;Frame rate mode (CFR, VFR)\n"
@@ -3998,64 +4227,99 @@
     "FrameRate_Maximum;; fps;N YF;;;Maximum Frames per second\n"
     "FrameRate_Maximum/String;;;Y NT;;;Maximum Frames per second (with measurement)\n"
     "FrameCount;;;N NI;;;Number of frames\n"
+    "Source_FrameCount;;;N NI;;;Source Number of frames\n"
     "Standard;;;Y NT;;;NTSC or PAL\n"
     "Resolution;; bit;N NI;;;Deprecated, do not use in new projects\n"
     "Resolution/String;;;N NT;;;Deprecated, do not use in new projects\n"
     "Colorimetry;;;N NT;;;Deprecated, do not use in new projects\n"
-    "ColorSpace;;;Y YT\n"
-    "ChromaSubsampling;;;Y YT\n"
-    "BitDepth;; bit;N YI;;;16/24/32 \n"
+    "ColorSpace;;;Y YT;;\n"
+    "ChromaSubsampling;;;Y YT;;\n"
+    "BitDepth;; bit;N YI;;;16/24/32\n"
     "BitDepth/String;;;Y NT;;;16/24/32 bits\n"
-    "ScanType;;;N YT\n"
-    "ScanType/String;;;Y NT\n"
-    "ScanOrder;;;N YT\n"
-    "ScanOrder/String;;;Y NT\n"
+    "ScanType;;;N YT;;\n"
+    "ScanType/String;;;Y NT;;\n"
+    "ScanOrder;;;N YT;;;\n"
+    "ScanOrder/String;;;Y NT;;;\n"
     "Interlacement;;;N NT;;;Deprecated, do not use in new projects\n"
     "Interlacement/String;;;N NT;;;Deprecated, do not use in new projects\n"
+    "Compression_Mode;;;N YT;;;Compression mode (Lossy or Lossless)\n"
+    "Compression_Mode/String;;;Y NT;;;Compression mode (Lossy or Lossless)\n"
+    "Compression_Ratio;;;Y YF;;;Current stream size divided by uncompressed stream size;\n"
     "Bits-(Pixel*Frame);;;Y YF;;;bits/(Pixel*Frame) (like Gordian Knot)\n"
     "Delay;; ms;N NI;;;Delay fixed in the stream (relative) IN MS\n"
     "Delay/String;;;N NT;;;Delay with measurement\n"
     "Delay/String1;;;N NT;;;Delay with measurement\n"
     "Delay/String2;;;N NT;;;Delay with measurement\n"
-    "Delay/String3;;;N NT;;;format : HH:MM:SS.MMM\n"
+    "Delay/String3;;;N NT;;;Delay in format : HH:MM:SS.MMM\n"
     "Delay/String4;;;N NT;;;Delay in format : HH:MM:SS:FF (HH:MM:SS;FF for drop frame, if available)\n"
     "Delay_Settings;;;N NT;;;Delay settings (in case of timecode for example)\n"
+    "Delay_Source;;;N NT;;;Delay source (Container or Stream or empty)\n"
+    "Delay_Source/String;;;N NT;;;Delay source (Container or Stream or empty)\n"
     "Delay_Original;; ms;N NI;;;Delay fixed in the raw stream (relative) IN MS\n"
     "Delay_Original/String;;;N NT;;;Delay with measurement\n"
     "Delay_Original/String1;;;N NT;;;Delay with measurement\n"
     "Delay_Original/String2;;;N NT;;;Delay with measurement\n"
-    "Delay_Original/String3;;;N NT;;;format : HH:MM:SS.MMM\n"
-    "Delay-Original/String4;;;N NT;;;Delay in format : HH:MM:SS:FF (HH:MM:SS;FF for drop frame, if available)\n"
-    "Delay_Original_Settings;;;N NT;;;Delay settings (in case of timecode for example)\n"
-    "StreamSize;; byte;N YI;;;Stream size in bytes\n"
-    "StreamSize/String;;;Y NT;;;Streamsize in with percentage value\n"
-    "StreamSize/String1;;;N NT;;;Streamsize with measurement\n"
-    "StreamSize/String2;;;N NT;;;Streamsize with measurement\n"
-    "StreamSize/String3;;;N NT;;;Streamsize with measurement\n"
-    "StreamSize/String4;;;N NT;;;Streamsize with measurement\n"
-    "StreamSize/String5;;;N NT;;;Streamsize in with percentage value\n"
-    "StreamSize_Proportion;;;N NT;;;Stream size divided by file size\n"
-    "Alignment;;;Y NT;;;How this stream file is aligned in the container\n"
-    "Alignment/String;;;N YT\n"
-    "Title;;;Y YI;;;Name of the track\n"
+    "Delay_Original/String3;;;N NT;;;Delay in format: HH:MM:SS.MMM;\n"
+    "Delay_Original/String4;;;N NT;;;Delay in format: HH:MM:SS:FF (HH:MM:SS;FF for drop frame, if available)\n"
+    "Delay_Original_Settings;;;N NT;;;Delay settings (in case of timecode for example);\n"
+    "Delay_Original_Source;;;N NT;;;Delay source (Stream or empty)\n"
+    "StreamSize;; byte;N YI;;;Streamsize in bytes;\n"
+    "StreamSize/String;;;Y NT;;;Streamsize in with percentage value;\n"
+    "StreamSize/String1;;;N NT;;;;\n"
+    "StreamSize/String2;;;N NT;;;;\n"
+    "StreamSize/String3;;;N NT;;;;\n"
+    "StreamSize/String4;;;N NT;;;;\n"
+    "StreamSize/String5;;;N NT;;;Streamsize in with percentage value;\n"
+    "StreamSize_Proportion;;;N NT;;;Stream size divided by file size;\n"
+    "Source_StreamSize;; byte;N YI;;;Source Streamsize in bytes;\n"
+    "Source_StreamSize/String;;;Y NT;;;Source Streamsize in with percentage value;\n"
+    "Source_StreamSize/String1;;;N NT;;;;\n"
+    "Source_StreamSize/String2;;;N NT;;;;\n"
+    "Source_StreamSize/String3;;;N NT;;;;\n"
+    "Source_StreamSize/String4;;;N NT;;;;\n"
+    "Source_StreamSize/String5;;;N NT;;;Source Streamsize in with percentage value;\n"
+    "Source_StreamSize_Proportion;;;N NT;;;Source Stream size divided by file size;\n"
+    "StreamSize_Encoded;; byte;N YI;;;Encoded Streamsize in bytes;\n"
+    "StreamSize_Encoded/String;;;Y NT;;;Encoded Streamsize in with percentage value;\n"
+    "StreamSize_Encoded/String1;;;N NT;;;;\n"
+    "StreamSize_Encoded/String2;;;N NT;;;;\n"
+    "StreamSize_Encoded/String3;;;N NT;;;;\n"
+    "StreamSize_Encoded/String4;;;N NT;;;;\n"
+    "StreamSize_Encoded/String5;;;N NT;;;Encoded Streamsize in with percentage value;\n"
+    "StreamSize_Encoded_Proportion;;;N NT;;;Encoded Stream size divided by file size;\n"
+    "Source_StreamSize_Encoded;; byte;N YI;;;Source Encoded Streamsize in bytes;\n"
+    "Source_StreamSize_Encoded/String;;;Y NT;;;Source Encoded Streamsize in with percentage value;\n"
+    "Source_StreamSize_Encoded/String1;;;N NT;;;;\n"
+    "Source_StreamSize_Encoded/String2;;;N NT;;;;\n"
+    "Source_StreamSize_Encoded/String3;;;N NT;;;;\n"
+    "Source_StreamSize_Encoded/String4;;;N NT;;;;\n"
+    "Source_StreamSize_Encoded/String5;;;N NT;;;Source Encoded Streamsize in with percentage value;\n"
+    "Source_StreamSize_Encoded_Proportion;;;N NT;;;Source Encoded Stream size divided by file size;\n"
+    "Alignment;;;Y NT;;;How this stream file is aligned in the container;\n"
+    "Alignment/String;;;N YT;;;;\n"
+    "Title;;;Y YI;;;Name of the track;\n"
     "Encoded_Application;;;Y YT;;;Software. Identifies the name of the software package used to create the file, such as Microsoft WaveEdit.;;Technical\n"
     "Encoded_Application/Url;;;N YT;;;Software. Identifies the name of the software package used to create the file, such as Microsoft WaveEdit.;;Technical\n"
-    "Encoded_Library;;;N YT;;;Software used to create the file\n"
-    "Encoded_Library/String;;;Y NT;;;Software used to create the file\n"
-    "Encoded_Library/Name;;;N NT;;;Info from the software\n"
-    "Encoded_Library/Version;;;N NT;;;Version of software\n"
-    "Encoded_Library/Date;;;N NT;;;Release date of software\n"
-    "Encoded_Library_Settings;;;Y YT;;;Parameters used by the software\n"
-    "Language;;;N YT;;;Language (2-letter ISO 639-1 if exists, else 3-letter ISO 639-2, and with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn)\n"
-    "Language/String;;;Y NT;;;Language (full)\n"
-    "Language/String1;;;N NT;;;Language (full)\n"
-    "Language/String2;;;N NT;;;Language (2-letter ISO 639-1 if exists, else empty)\n"
-    "Language/String3;;;N NT;;;Language (3-letter ISO 639-2 if exists, else empty)\n"
-    "Language/String4;;;N NT;;;Language (2-letter ISO 639-1 if exists with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn, else empty)\n"
-    "Language_More;;;Y YT;;;More info about Language (e.g. Director's Comment)\n"
+    "Encoded_Library;;;N YT;;;Software used to create the file;\n"
+    "Encoded_Library/String;;;Y NT;;;Software used to create the file;\n"
+    "Encoded_Library/Name;;;N NT;;;Info from the software;\n"
+    "Encoded_Library/Version;;;N NT;;;Version of software;\n"
+    "Encoded_Library/Date;;;N NT;;;Release date of software;\n"
+    "Encoded_Library_Settings;;;Y YT;;;Parameters used by the software;\n"
+    "Language;;;N YT;;;Language (2-letter ISO 639-1 if exists, else 3-letter ISO 639-2, and with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn);\n"
+    "Language/String;;;Y NT;;;Language (full);\n"
+    "Language/String1;;;N NT;;;Language (full);\n"
+    "Language/String2;;;N NT;;;Language (2-letter ISO 639-1 if exists, else empty);\n"
+    "Language/String3;;;N NT;;;Language (3-letter ISO 639-2 if exists, else empty);\n"
+    "Language/String4;;;N NT;;;Language (2-letter ISO 639-1 if exists with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn, else empty);\n"
+    "Language_More;;;Y YT;;;More info about Language (e.g. Director's Comment);\n"
+    "Default;;Yes;N YT;;;Set if that track should be used if no language found matches the user preference.\n"
+    "Default/String;;;Y NT;;;Set if that track should be used if no language found matches the user preference.\n"
+    "Forced;;Yes;N YT;;;Set if that track should be used if no language found matches the user preference.\n"
+    "Forced/String;;;Y NT;;;Set if that track should be used if no language found matches the user preference.\n"
     "Encoded_Date;;;Y YT;;;UTC time that the encoding of this item was completed began.;;Temporal\n"
     "Tagged_Date;;;Y YT;;;UTC time that the tags were done for this item.;;Temporal\n"
-    "Encryption;;;Y YT\n"
+    "Encryption;;;Y YT;;;;\n"
     "BufferSize;;;N YT;;;Defines the size of the buffer needed to decode the sequence.\n"
     ));
     Info.Separator_Set(0, ZenLib::EOL);
@@ -4064,149 +4328,225 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_Audio (ZtringListList &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
-    "Count;;;N NI;;;Number of objects available in this stream\n"
-    "StreamCount;;;N NI;;;Number of streams of this kind available\n"
-    "StreamKind;Audio;;N NI;;;Stream type name\n"
-    "StreamKind/String;;;N NI;;;Stream type name\n"
-    "StreamKindID;;;N NI;;;Number of the stream (base=0)\n"
-    "StreamKindPos;;;N NI;;;When multiple streams, number of the stream (base=1)\n"
-    "Inform;;;N NT;;;Last **Inform** call\n"
-    "ID;;;N YI;;;The ID of this stream in this file\n"
-    "ID/String;;;Y NT;;;The ID of this stream in this file\n"
-    "UniqueID;;;N YI;;;A unique ID for this stream, should be copied with stream copy\n"
-    "MenuID;;;N YI;;;The menu ID for this stream in this file\n"
-    "MenuID/String;;;Y NT;;;The menu ID for this stream in this file\n"
-    "Format;;;Y YT;;;Format used\n"
-    "Format/Info;;;Y NT;;;Info about the format\n"
-    "Format/Url;;;N NT;;;Homepage of this format\n"
-    "Format_Commercial;;;N NT;;;Commercial name used by vendor for theses setings or Format field if there is no difference\n"
-    "Format_Commercial_IfAny;;;Y NT;;;Commercial name used by vendor for theses setings if there is one\n"
-    "Format_Version;;;Y NT;;;Version of this format\n"
-    "Format_Profile;;;Y NT;;;Profile of this Format\n"
-    "Format_Settings;;;N NT;;;Settings needed for decoder used, summary\n"
-    "Format_Settings_SBR;;Yes;N YT\n"
-    "Format_Settings_SBR/String;;;Y NT\n"
-    "Format_Settings_PS;;Yes;N YT\n"
-    "Format_Settings_PS/String;;;Y NT\n"
-    "Format_Settings_Mode;;;Y YT\n"
-    "Format_Settings_ModeExtension;;;Y YT\n"
-    "Format_Settings_Emphasis;;;Y YT\n"
-    "Format_Settings_Floor;;;Y YT\n"
-    "Format_Settings_Firm;;;Y YT\n"
-    "Format_Settings_Endianness;;;Y YT\n"
-    "Format_Settings_Sign;;;Y YT\n"
-    "Format_Settings_Law;;;Y YT\n"
-    "Format_Settings_ITU;;;Y YT\n"
-    "InternetMediaType;;;N YT;;;Internet Media Type (aka MIME Type, Content-Type)\n"
-    "MuxingMode;;;Y NT;;;How this stream is muxed in the container\n"
-    "MuxingMode_MoreInfo;;;Y NT;;;More info (text) about the muxing mode\n"
-    "CodecID;;;Y YT;;;Codec ID (found in some containers)\n"
-    "CodecID/Info;;;Y NT;;;Info about codec ID\n"
-    "CodecID/Hint;;;Y NT;;;Hint/popular name for this codec ID\n"
-    "CodecID/Url;;;N NT;;;Homepage for more details about this codec ID\n"
-    "CodecID_Description;;;Y NT;;;Manual description given by the container\n"
-    "Codec;;;N NT;;;Deprecated, do not use in new projects\n"
-    "Codec/String;;;N NT;;;Deprecated, do not use in new projects\n"
-    "Codec/Family;;;N NT;;;Deprecated, do not use in new projects\n"
-    "Codec/Info;;;N NT;;;Deprecated, do not use in new projects\n"
-    "Codec/Url;;;N NT;;;Deprecated, do not use in new projects\n"
-    "Codec/CC;;;N NT;;;Deprecated, do not use in new projects\n"
-    "Codec_Description;;;N NT;;;Deprecated, do not use in new projects\n"
-    "Codec_Profile;;;N NT;;;Deprecated, do not use in new projects\n"
-    "Codec_Settings;;;N NT;;;Deprecated, do not use in new projects\n"
-    "Codec_Settings_Automatic;;;N NT;;;Deprecated, do not use in new projects\n"
-    "Codec_Settings_Floor;;;N NT;;;Deprecated, do not use in new projects\n"
-    "Codec_Settings_Firm;;;N NT;;;Deprecated, do not use in new projects\n"
-    "Codec_Settings_Endianness;;;N NT;;;Deprecated, do not use in new projects\n"
-    "Codec_Settings_Sign;;;N NT;;;Deprecated, do not use in new projects\n"
-    "Codec_Settings_Law;;;N NT;;;Deprecated, do not use in new projects\n"
-    "Codec_Settings_ITU;;;N NT;;;Deprecated, do not use in new projects\n"
-    "Duration;; ms;N YI;;;Play time of the stream\n"
-    "Duration/String;;;Y NT;;;Play time in format : XXx YYy only, YYy omited if zero\n"
-    "Duration/String1;;;N NT;;;Play time in format : HHh MMmn SSs MMMms, XX omited if zero\n"
-    "Duration/String2;;;N NT;;;Play time in format : XXx YYy only, YYy omited if zero\n"
-    "Duration/String3;;;N NT;;;Play time in format : HH:MM:SS.MMM\n"
-    "BitRate_Mode;;;N YT;;;Bit rate mode (VBR, CBR)\n"
-    "BitRate_Mode/String;;;Y NT;;;Bit rate mode (Constant, Variable)\n"
-    "BitRate;; bps;N YF;;;Bit rate in bps\n"
-    "BitRate/String;;;Y NT;;;Bit rate (with measurement)\n"
-    "BitRate_Minimum;; bps;N YF;;;Minimum Bit rate in bps\n"
-    "BitRate_Minimum/String;;;Y NT;;;Minimum Bit rate (with measurement)\n"
-    "BitRate_Nominal;; bps;N YF;;;Nominal Bit rate in bps\n"
-    "BitRate_Nominal/String;;;Y NT;;;Nominal Bit rate (with measurement)\n"
-    "BitRate_Maximum;; bps;N YF;;;Maximum Bit rate in bps\n"
-    "BitRate_Maximum/String;;;Y NT;;;Maximum Bit rate (with measurement)\n"
-    "Channel(s);; channel;N YF;;;Number of channels\n"
-    "Channel(s)/String;;;Y NT;;;Number of channels (with measurement)\n"
-    "ChannelPositions;;;Y YT;;;Position of channels\n"
-    "ChannelPositions/String2;;;N NT;;;Position of channels (x/y.z format)\n"
-    "SamplingRate;; Hz;N YF;;;Sampling rate\n"
-    "SamplingRate/String;;;Y NT;;;in KHz\n"
-    "SamplingCount;;;N NI;;;Sample count (based on sampling rate)\n"
-    "FrameCount;;;N NI;;;Frame count (a frame contains a count of samples depends of the format)\n"
-    "Resolution;; bit;N NI;;;Deprecated, do not use in new projects\n"
-    "Resolution/String;;;N NT;;;Deprecated, do not use in new projects\n"
-    "BitDepth;; bit;N YI;;;Resolution in bits (8, 16, 20, 24)\n"
-    "BitDepth/String;;;Y NT;;;Resolution in bits (8, 16, 20, 24)\n"
-    "CompressionRatio;;;Y YF;;;Current stream size divided by uncompressed stream size\n"
-    "Delay;; ms;N YI;;;Delay fixed in the stream (relative)\n"
-    "Delay/String;;;N NT;;;Delay in format : XXx YYy only, YYy omited if zero\n"
-    "Delay/String1;;;N NT;;;Delay in format : HHh MMmn SSs MMMms, XX omited if zero\n"
-    "Delay/String2;;;N NT;;;Delay in format : XXx YYy only, YYy omited if zero\n"
+    "Count;;;N NI;;;Number of objects available in this stream;\n"
+    "Status;;;N NI;;;bit field (0=IsAccepted, 1=IsFilled, 2=IsUpdated, 3=IsFinished)\n"
+    "StreamCount;;;N NI;;;Number of streams of this kind available;\n"
+    "StreamKind;Audio;;N NI;;;Stream type name;\n"
+    "StreamKind/String;;;N NI;;;Stream type name;\n"
+    "StreamKindID;;;N NI;;;Number of the stream (base=0);\n"
+    "StreamKindPos;;;N NI;;;When multiple streams, number of the stream (base=1);\n"
+    "StreamOrder;;;N NI;;;Stream order in the file, whatever is the kind of stream (base=0);\n"
+    "Inform;;;N NT;;;Last **Inform** call;\n"
+    "ID;;;N YI;;;The ID of this stream in this file;\n"
+    "ID/String;;;Y NT;;;The ID of this stream in this file;\n"
+    "UniqueID;;;N YI;;;A unique ID for this stream, should be copied with stream copy;\n"
+    "UniqueID/String;;;Y NT;;;A unique ID for this stream, should be copied with stream copy\n"
+    "MenuID;;;N YI;;;The menu ID for this stream in this file;\n"
+    "MenuID/String;;;Y NT;;;The menu ID for this stream in this file;\n"
+    "Format;;;Y YT;;;Format used;\n"
+    "Format/Info;;;Y NT;;;Info about the format;\n"
+    "Format/Url;;;N NT;;;Homepage of this format;\n"
+    "Format_Commercial;;;N NT;;;Commercial name used by vendor for theses setings or Format field if there is no difference;\n"
+    "Format_Commercial_IfAny;;;Y NT;;;Commercial name used by vendor for theses setings if there is one;\n"
+    "Format_Version;;;Y NT;;;Version of this format;\n"
+    "Format_Profile;;;Y NT;;;Profile of this Format;\n"
+    "Format_Compression;;;Y NT;;;Compression method used;\n"
+    "Format_Settings;;;N NT;;;Settings needed for decoder used, summary;\n"
+    "Format_Settings_SBR;;Yes;N YT;;;;\n"
+    "Format_Settings_SBR/String;;;N NT;;;;\n"
+    "Format_Settings_PS;;Yes;N YT;;;;\n"
+    "Format_Settings_PS/String;;;N NT;;;;\n"
+    "Format_Settings_Mode;;;Y YT;;;;\n"
+    "Format_Settings_ModeExtension;;;Y YT;;;;\n"
+    "Format_Settings_Emphasis;;;Y YT;;;;\n"
+    "Format_Settings_Floor;;;Y YT;;;;\n"
+    "Format_Settings_Firm;;;Y YT;;;;\n"
+    "Format_Settings_Endianness;;;Y YT;;;;\n"
+    "Format_Settings_Sign;;;Y YT;;;;\n"
+    "Format_Settings_Law;;;Y YT;;;;\n"
+    "Format_Settings_ITU;;;Y YT;;;;\n"
+    "Format_Settings_Wrapping;;;Y YT;;;Wrapping mode (Frame wrapped or Clip wrapped)\n"
+    "InternetMediaType;;;N YT;;;Internet Media Type (aka MIME Type, Content-Type);\n"
+    "MuxingMode;;;Y NT;;;How this stream is muxed in the container;\n"
+    "MuxingMode_MoreInfo;;;Y NT;;;More info (text) about the muxing mode;\n"
+    "CodecID;;;Y NT;;;Codec ID (found in some containers);\n"
+    "CodecID/String;;;Y NT;;;Codec ID (found in some containers);\n"
+    "CodecID/Info;;;Y NT;;;Info about codec ID;\n"
+    "CodecID/Hint;;;Y NT;;;Hint/popular name for this codec ID;\n"
+    "CodecID/Url;;;N NT;;;Homepage for more details about this codec ID;\n"
+    "CodecID_Description;;;Y NT;;;Manual description given by the container;\n"
+    "Codec;;;N NT;;;Deprecated, do not use in new projects;\n"
+    "Codec/String;;;N NT;;;Deprecated, do not use in new projects;\n"
+    "Codec/Family;;;N NT;;;Deprecated, do not use in new projects;\n"
+    "Codec/Info;;;N NT;;;Deprecated, do not use in new projects;\n"
+    "Codec/Url;;;N NT;;;Deprecated, do not use in new projects;\n"
+    "Codec/CC;;;N NT;;;Deprecated, do not use in new projects;\n"
+    "Codec_Description;;;N NT;;;Deprecated, do not use in new projects;\n"
+    "Codec_Profile;;;N NT;;;Deprecated, do not use in new projects;\n"
+    "Codec_Settings;;;N NT;;;Deprecated, do not use in new projects;\n"
+    "Codec_Settings_Automatic;;;N NT;;;Deprecated, do not use in new projects;\n"
+    "Codec_Settings_Floor;;;N NT;;;Deprecated, do not use in new projects;\n"
+    "Codec_Settings_Firm;;;N NT;;;Deprecated, do not use in new projects;\n"
+    "Codec_Settings_Endianness;;;N NT;;;Deprecated, do not use in new projects;\n"
+    "Codec_Settings_Sign;;;N NT;;;Deprecated, do not use in new projects;\n"
+    "Codec_Settings_Law;;;N NT;;;Deprecated, do not use in new projects;\n"
+    "Codec_Settings_ITU;;;N NT;;;Deprecated, do not use in new projects;\n"
+    "Duration;; ms;N YI;;;Play time of the stream;\n"
+    "Duration/String;;;Y NT;;;Play time in format : XXx YYy only, YYy omited if zero;\n"
+    "Duration/String1;;;N NT;;;Play time in format : HHh MMmn SSs MMMms, XX omited if zero;\n"
+    "Duration/String2;;;N NT;;;Play time in format : XXx YYy only, YYy omited if zero;\n"
+    "Duration/String3;;;N NT;;;Play time in format : HH:MM:SS.MMM;\n"
+    "Duration_FirstFrame;; ms;N YI;;;Duration of the first frame if it is longer than others, in ms\n"
+    "Duration_FirstFrame/String;;;Y NT;;;Duration of the first frame if it is longer than others, in format : XXx YYy only, YYy omited if zero\n"
+    "Duration_FirstFrame/String1;;;N NT;;;Duration of the first frame if it is longer than others, in format : HHh MMmn SSs MMMms, XX omited if zero\n"
+    "Duration_FirstFrame/String2;;;N NT;;;Duration of the first frame if it is longer than others, in format : XXx YYy only, YYy omited if zero\n"
+    "Duration_FirstFrame/String3;;;N NT;;;Duration of the first frame if it is longer than others, in format : HH:MM:SS.MMM\n"
+    "Duration_LastFrame;; ms;N YI;;;Duration of the last frame if it is longer than others, in ms\n"
+    "Duration_LastFrame/String;;;Y NT;;;Duration of the last frame if it is longer than others, in format : XXx YYy only, YYy omited if zero\n"
+    "Duration_LastFrame/String1;;;N NT;;;Duration of the last frame if it is longer than others, in format : HHh MMmn SSs MMMms, XX omited if zero\n"
+    "Duration_LastFrame/String2;;;N NT;;;Duration of the last frame if it is longer than others, in format : XXx YYy only, YYy omited if zero\n"
+    "Duration_LastFrame/String3;;;N NT;;;Duration of the last frame if it is longer than others, in format : HH:MM:SS.MMM\n"
+    "Source_Duration;; ms;N YI;;;Source Play time of the stream;\n"
+    "Source_Duration/String;;;Y NT;;;Source Play time in format : XXx YYy only, YYy omited if zero;\n"
+    "Source_Duration/String1;;;N NT;;;Source Play time in format : HHh MMmn SSs MMMms, XX omited if zero;\n"
+    "Source_Duration/String2;;;N NT;;;Source Play time in format : XXx YYy only, YYy omited if zero;\n"
+    "Source_Duration/String3;;;N NT;;;Source Play time in format : HH:MM:SS.MMM;\n"
+    "Source_Duration_FirstFrame;; ms;N YI;;;Source Duration of the first frame if it is longer than others, in ms\n"
+    "Source_Duration_FirstFrame/String;;;Y NT;;;Source Duration of the first frame if it is longer than others, in format : XXx YYy only, YYy omited if zero\n"
+    "Source_Duration_FirstFrame/String1;;;N NT;;;Source Duration of the first frame if it is longer than others, in format : HHh MMmn SSs MMMms, XX omited if zero\n"
+    "Source_Duration_FirstFrame/String2;;;N NT;;;Source Duration of the first frame if it is longer than others, in format : XXx YYy only, YYy omited if zero\n"
+    "Source_Duration_FirstFrame/String3;;;N NT;;;Source Duration of the first frame if it is longer than others, in format : HH:MM:SS.MMM\n"
+    "Source_Duration_LastFrame;; ms;N YI;;;Source Duration of the last frame if it is longer than others, in ms\n"
+    "Source_Duration_LastFrame/String;;;Y NT;;;Source Duration of the last frame if it is longer than others, in format : XXx YYy only, YYy omited if zero\n"
+    "Source_Duration_LastFrame/String1;;;N NT;;;Source Duration of the last frame if it is longer than others, in format : HHh MMmn SSs MMMms, XX omited if zero\n"
+    "Source_Duration_LastFrame/String2;;;N NT;;;Source Duration of the last frame if it is longer than others, in format : XXx YYy only, YYy omited if zero\n"
+    "Source_Duration_LastFrame/String3;;;N NT;;;Source Duration of the last frame if it is longer than others, in format : HH:MM:SS.MMM\n"
+    "BitRate_Mode;;;N YT;;;Bit rate mode (VBR, CBR);\n"
+    "BitRate_Mode/String;;;Y NT;;;Bit rate mode (Constant, Variable);\n"
+    "BitRate;; bps;N YF;;;Bit rate in bps;\n"
+    "BitRate/String;;;Y NT;;;Bit rate (with measurement);\n"
+    "BitRate_Minimum;; bps;N YF;;;Minimum Bit rate in bps;\n"
+    "BitRate_Minimum/String;;;Y NT;;;Minimum Bit rate (with measurement);\n"
+    "BitRate_Nominal;; bps;N YF;;;Nominal Bit rate in bps;\n"
+    "BitRate_Nominal/String;;;Y NT;;;Nominal Bit rate (with measurement);\n"
+    "BitRate_Maximum;; bps;N YF;;;Maximum Bit rate in bps;\n"
+    "BitRate_Maximum/String;;;Y NT;;;Maximum Bit rate (with measurement);\n"
+    "BitRate_Encoded;; bps;N YF;;;Encoded (with forced padding) bit rate in bps, if some container padding is present\n"
+    "BitRate_Encoded/String;;;Y NT;;;Encoded (with forced padding) bit rate (with measurement), if some container padding is present\n"
+    "Channel(s);; channel;N YF;;;Number of channels;\n"
+    "Channel(s)/String;;;Y NT;;;Number of channels (with measurement);\n"
+    "ChannelPositions;;;Y YT;;;Position of channels;\n"
+    "ChannelPositions/String2;;;N NT;;;Position of channels (x/y.z format);\n"
+    "ChannelLayout;;;N YT;;;Layout of channels (in the stream);\n"
+    "SamplingRate;; Hz;N YF;;;Sampling rate;\n"
+    "SamplingRate/String;;;Y NT;;;in KHz;\n"
+    "SamplingCount;;;N NI;;;Sample count (based on sampling rate);\n"
+    "Source_SamplingCount;;;N NI;;;Source Sample count (based on sampling rate);\n"
+    "FrameRate;; fps;N YF;;;Frames per second\n"
+    "FrameRate/String;;;N NT;;;Frames per second (with measurement)\n"
+    "FrameCount;;;N NI;;;Frame count (a frame contains a count of samples depends of the format);\n"
+    "Source_FrameCount;;;N NI;;;Source Frame count (a frame contains a count of samples depends of the format);\n"
+    "Resolution;; bit;N NI;;;Deprecated, do not use in new projects;\n"
+    "Resolution/String;;;N NT;;;Deprecated, do not use in new projects;\n"
+    "BitDepth;; bit;N YI;;;Resolution in bits (8, 16, 20, 24);\n"
+    "BitDepth/String;;;Y NT;;;Resolution in bits (8, 16, 20, 24);\n"
+    "Compression_Mode;;;N YT;;;Compression mode (Lossy or Lossless)\n"
+    "Compression_Mode/String;;;Y NT;;;Compression mode (Lossy or Lossless)\n"
+    "Compression_Ratio;;;Y YF;;;Current stream size divided by uncompressed stream size;\n"
+    "Delay;; ms;N NI;;;Delay fixed in the stream (relative) IN MS\n"
+    "Delay/String;;;N NT;;;Delay with measurement\n"
+    "Delay/String1;;;N NT;;;Delay with measurement\n"
+    "Delay/String2;;;N NT;;;Delay with measurement\n"
     "Delay/String3;;;N NT;;;Delay in format : HH:MM:SS.MMM\n"
+    "Delay/String4;;;N NT;;;Delay in format : HH:MM:SS:FF (HH:MM:SS;FF for drop frame, if available)\n"
+    "Delay_Settings;;;N NT;;;Delay settings (in case of timecode for example)\n"
+    "Delay_Source;;;N NT;;;Delay source (Container or Stream or empty)\n"
+    "Delay_Source/String;;;N NT;;;Delay source (Container or Stream or empty)\n"
     "Delay_Original;; ms;N NI;;;Delay fixed in the raw stream (relative) IN MS\n"
     "Delay_Original/String;;;N NT;;;Delay with measurement\n"
     "Delay_Original/String1;;;N NT;;;Delay with measurement\n"
     "Delay_Original/String2;;;N NT;;;Delay with measurement\n"
-    "Delay_Original/String3;;;N NT;;;format : HH:MM:SS.MMM\n"
-    "Delay_Original_Settings;;;N NT;;;Delay settings (in case of timecode for example)\n"
+    "Delay_Original/String3;;;N NT;;;Delay in format: HH:MM:SS.MMM;\n"
+    "Delay_Original/String4;;;N NT;;;Delay in format: HH:MM:SS:FF (HH:MM:SS;FF for drop frame, if available)\n"
+    "Delay_Original_Settings;;;N NT;;;Delay settings (in case of timecode for example);\n"
+    "Delay_Original_Source;;;N NT;;;Delay source (Stream or empty)\n"
     "Video_Delay;; ms;N NI;;;Delay fixed in the stream (absolute / video)\n"
-    "Video_Delay/String;;;Y NT\n"
-    "Video_Delay/String1;;;N NT\n"
-    "Video_Delay/String2;;;N NT\n"
-    "Video_Delay/String3;;;N NT\n"
+    "Video_Delay/String;;;Y NT;;\n"
+    "Video_Delay/String1;;;N NT;;\n"
+    "Video_Delay/String2;;;N NT;;\n"
+    "Video_Delay/String3;;;N NT;;\n"
+    "Video_Delay/String4;;;N NT;;\n"
     "Video0_Delay;; ms;N NI;;;Deprecated, do not use in new projects\n"
     "Video0_Delay/String;;;N NT;;;Deprecated, do not use in new projects\n"
     "Video0_Delay/String1;;;N NT;;;Deprecated, do not use in new projects\n"
     "Video0_Delay/String2;;;N NT;;;Deprecated, do not use in new projects\n"
     "Video0_Delay/String3;;;N NT;;;Deprecated, do not use in new projects\n"
-    "ReplayGain_Gain;; dB;N YT;;;The gain to apply to reach 89dB SPL on playback\n"
-    "ReplayGain_Gain/String;;;Y YT\n"
-    "ReplayGain_Peak;;;Y YT;;;The maximum absolute peak value of the item\n"
-    "StreamSize;; byte;N YI;;;Streamsize in bytes\n"
-    "StreamSize/String;;;Y NT;;;Streamsize in with percentage value\n"
-    "StreamSize/String1;;;N NT\n"
-    "StreamSize/String2;;;N NT\n"
-    "StreamSize/String3;;;N NT\n"
-    "StreamSize/String4;;;N NT\n"
-    "StreamSize/String5;;;N NT;;;Streamsize in with percentage value\n"
-    "StreamSize_Proportion;;;N NT;;;Stream size divided by file size\n"
-    "Alignment;;;N YT;;;How this stream file is aligned in the container\n"
-    "Alignment/String;;;Y NT;;;Where this stream file is aligned in the container\n"
-    "Interleave_VideoFrames;;;N YF;;;Between how many video frames the stream is inserted\n"
-    "Interleave_Duration;;;N YI;;;Between how much time (ms) the stream is inserted\n"
-    "Interleave_Duration/String;;;Y NT;;;Between how much time and video frames the stream is inserted (with measurement)\n"
-    "Interleave_Preload;;;N YI;;;How much time is buffered before the first video frame\n"
-    "Interleave_Preload/String;;;Y NT;;;How much time is buffered before the first video frame (with measurement)\n"
-    "Title;;;Y YI;;;Name of the track\n"
-    "Encoded_Library;;;N YT;;;Software used to create the file\n"
-    "Encoded_Library/String;;;Y NT;;;Software used to create the file\n"
-    "Encoded_Library/Name;;;N NT;;;Info from the software\n"
-    "Encoded_Library/Version;;;N NT;;;Version of software\n"
-    "Encoded_Library/Date;;;N NT;;;Release date of software\n"
-    "Encoded_Library_Settings;;;Y YT;;;Parameters used by the software\n"
-    "Language;;;N YT;;;Language (2-letter ISO 639-1 if exists, else 3-letter ISO 639-2, and with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn)\n"
-    "Language/String;;;Y NT;;;Language (full)\n"
-    "Language/String1;;;N NT;;;Language (full)\n"
-    "Language/String2;;;N NT;;;Language (2-letter ISO 639-1 if exists, else empty)\n"
-    "Language/String3;;;N NT;;;Language (3-letter ISO 639-2 if exists, else empty)\n"
-    "Language/String4;;;N NT;;;Language (2-letter ISO 639-1 if exists with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn, else empty)\n"
-    "Language_More;;;Y YT;;;More info about Language (e.g. Director's Comment)\n"
+    "Video0_Delay/String4;;;N NT;;;Deprecated, do not use in new projects\n"
+    "ReplayGain_Gain;; dB;N YT;;;The gain to apply to reach 89dB SPL on playback;\n"
+    "ReplayGain_Gain/String;;;Y YT;;;;\n"
+    "ReplayGain_Peak;;;Y YT;;;The maximum absolute peak value of the item;\n"
+    "StreamSize;; byte;N YI;;;Streamsize in bytes;\n"
+    "StreamSize/String;;;Y NT;;;Streamsize in with percentage value;\n"
+    "StreamSize/String1;;;N NT;;;;\n"
+    "StreamSize/String2;;;N NT;;;;\n"
+    "StreamSize/String3;;;N NT;;;;\n"
+    "StreamSize/String4;;;N NT;;;;\n"
+    "StreamSize/String5;;;N NT;;;Streamsize in with percentage value;\n"
+    "StreamSize_Proportion;;;N NT;;;Stream size divided by file size;\n"
+    "Source_StreamSize;; byte;N YI;;;Source Streamsize in bytes;\n"
+    "Source_StreamSize/String;;;Y NT;;;Source Streamsize in with percentage value;\n"
+    "Source_StreamSize/String1;;;N NT;;;;\n"
+    "Source_StreamSize/String2;;;N NT;;;;\n"
+    "Source_StreamSize/String3;;;N NT;;;;\n"
+    "Source_StreamSize/String4;;;N NT;;;;\n"
+    "Source_StreamSize/String5;;;N NT;;;Source Streamsize in with percentage value;\n"
+    "Source_StreamSize_Proportion;;;N NT;;;Source Stream size divided by file size;\n"
+    "StreamSize_Encoded;; byte;N YI;;;Encoded Streamsize in bytes;\n"
+    "StreamSize_Encoded/String;;;Y NT;;;Encoded Streamsize in with percentage value;\n"
+    "StreamSize_Encoded/String1;;;N NT;;;;\n"
+    "StreamSize_Encoded/String2;;;N NT;;;;\n"
+    "StreamSize_Encoded/String3;;;N NT;;;;\n"
+    "StreamSize_Encoded/String4;;;N NT;;;;\n"
+    "StreamSize_Encoded/String5;;;N NT;;;Encoded Streamsize in with percentage value;\n"
+    "StreamSize_Encoded_Proportion;;;N NT;;;Encoded Stream size divided by file size;\n"
+    "Source_StreamSize_Encoded;; byte;N YI;;;Source Encoded Streamsize in bytes;\n"
+    "Source_StreamSize_Encoded/String;;;Y NT;;;Source Encoded Streamsize in with percentage value;\n"
+    "Source_StreamSize_Encoded/String1;;;N NT;;;;\n"
+    "Source_StreamSize_Encoded/String2;;;N NT;;;;\n"
+    "Source_StreamSize_Encoded/String3;;;N NT;;;;\n"
+    "Source_StreamSize_Encoded/String4;;;N NT;;;;\n"
+    "Source_StreamSize_Encoded/String5;;;N NT;;;Source Encoded Streamsize in with percentage value;\n"
+    "Source_StreamSize_Encoded_Proportion;;;N NT;;;Source Encoded Stream size divided by file size;\n"
+    "Alignment;;;N YT;;;How this stream file is aligned in the container;\n"
+    "Alignment/String;;;Y NT;;;Where this stream file is aligned in the container;\n"
+    "Interleave_VideoFrames;;;N YF;;;Between how many video frames the stream is inserted;\n"
+    "Interleave_Duration;;;N YI;;;Between how much time (ms) the stream is inserted;\n"
+    "Interleave_Duration/String;;;Y NT;;;Between how much time and video frames the stream is inserted (with measurement);\n"
+    "Interleave_Preload;;;N YI;;;How much time is buffered before the first video frame;\n"
+    "Interleave_Preload/String;;;Y NT;;;How much time is buffered before the first video frame (with measurement);\n"
+    "Title;;;Y YI;;;Name of the track;\n"
+    "Encoded_Library;;;N YT;;;Software used to create the file;\n"
+    "Encoded_Library/String;;;Y NT;;;Software used to create the file;\n"
+    "Encoded_Library/Name;;;N NT;;;Info from the software;\n"
+    "Encoded_Library/Version;;;N NT;;;Version of software;\n"
+    "Encoded_Library/Date;;;N NT;;;Release date of software;\n"
+    "Encoded_Library_Settings;;;Y YT;;;Parameters used by the software;\n"
+    "Language;;;N YT;;;Language (2-letter ISO 639-1 if exists, else 3-letter ISO 639-2, and with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn);\n"
+    "Language/String;;;Y NT;;;Language (full);\n"
+    "Language/String1;;;N NT;;;Language (full);\n"
+    "Language/String2;;;N NT;;;Language (2-letter ISO 639-1 if exists, else empty);\n"
+    "Language/String3;;;N NT;;;Language (3-letter ISO 639-2 if exists, else empty);\n"
+    "Language/String4;;;N NT;;;Language (2-letter ISO 639-1 if exists with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn, else empty);\n"
+    "Language_More;;;Y YT;;;More info about Language (e.g. Director's Comment);\n"
+    "Default;;Yes;N YT;;;Set if that track should be used if no language found matches the user preference.\n"
+    "Default/String;;;Y NT;;;Set if that track should be used if no language found matches the user preference.\n"
+    "Forced;;Yes;N YT;;;Set if that track should be used if no language found matches the user preference.\n"
+    "Forced/String;;;Y NT;;;Set if that track should be used if no language found matches the user preference.\n"
     "Encoded_Date;;;Y YT;;;UTC time that the encoding of this item was completed began.;;Temporal\n"
     "Tagged_Date;;;Y YT;;;UTC time that the tags were done for this item.;;Temporal\n"
-    "Encryption;;;Y YT\n"
+    "Encryption;;;Y YT;;;;\n"
     ));
     Info.Separator_Set(0, ZenLib::EOL);
 }
@@ -4214,18 +4554,21 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_Text (ZtringListList &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
     "Count;;;N NI;;;Count of objects available in this stream\n"
+    "Status;;;N NI;;;bit field (0=IsAccepted, 1=IsFilled, 2=IsUpdated, 3=IsFinished)\n"
     "StreamCount;;;N NI;;;Count of streams of that kind available\n"
     "StreamKind;Text;;N NI;;;Stream type name\n"
     "StreamKind/String;;;N NI;;;Stream type name\n"
     "StreamKindID;;;N NI;;;Number of the stream (base=0)\n"
     "StreamKindPos;;;N NI;;;When multiple streams, number of the stream (base=1)\n"
+    "StreamOrder;;;N NI;;;Stream order in the file, whatever is the kind of stream (base=0)\n"
     "Inform;;;N NT;;;Last **Inform** call\n"
     "ID;;;N YI;;;A ID for this stream in this file\n"
     "ID/String;;;Y NT;;;A ID for this stream in this file\n"
     "UniqueID;;;N YI;;;A unique ID for this stream, should be copied with stream copy\n"
+    "UniqueID/String;;;Y NT;;;A unique ID for this stream, should be copied with stream copy\n"
     "MenuID;;;N YI;;;A menu ID for this stream in this file\n"
     "MenuID/String;;;Y NT;;;A menu ID for this stream in this file\n"
     "Format;;;Y YT;;;Format used\n"
@@ -4235,11 +4578,14 @@
     "Format_Commercial_IfAny;;;Y NT;;;Commercial name used by vendor for theses setings if there is one\n"
     "Format_Version;;;Y NT;;;Version of this format\n"
     "Format_Profile;;;Y NT;;;Profile of the Format\n"
+    "Format_Compression;;;Y NT;;;Compression method used;\n"
     "Format_Settings;;;Y NT;;;Settings needed for decoder used\n"
+    "Format_Settings_Wrapping;;;Y YT;;;Wrapping mode (Frame wrapped or Clip wrapped)\n"
     "InternetMediaType;;;N YT;;;Internet Media Type (aka MIME Type, Content-Type)\n"
     "MuxingMode;;;Y NT;;;How this stream is muxed in the container\n"
     "MuxingMode_MoreInfo;;;Y NT;;;More info (text) about the muxing mode\n"
-    "CodecID;;;Y YT;;;Codec ID (found in some containers)\n"
+    "CodecID;;;Y NT;;;Codec ID (found in some containers);\n"
+    "CodecID/String;;;Y NT;;;Codec ID (found in some containers);\n"
     "CodecID/Info;;;Y NT;;;Info about codec ID\n"
     "CodecID/Hint;;;Y NT;;;A hint for this codec ID\n"
     "CodecID/Url;;;N NT;;;A link for more details about this codec ID\n"
@@ -4255,6 +4601,31 @@
     "Duration/String2;;;N NT;;;Play time in format : XXx YYy only, YYy omited if zero\n"
     "Duration/String3;;;N NT;;;Play time in format : HH:MM:SS.MMM\n"
     "Duration/String4;;;N NT;;;Play time in format : HH:MM:SS:FF (HH:MM:SS;FF for drop frame, if available)\n"
+    "Duration_FirstFrame;; ms;N YI;;;Duration of the first frame if it is longer than others, in ms\n"
+    "Duration_FirstFrame/String;;;Y NT;;;Duration of the first frame if it is longer than others, in format : XXx YYy only, YYy omited if zero\n"
+    "Duration_FirstFrame/String1;;;N NT;;;Duration of the first frame if it is longer than others, in format : HHh MMmn SSs MMMms, XX omited if zero\n"
+    "Duration_FirstFrame/String2;;;N NT;;;Duration of the first frame if it is longer than others, in format : XXx YYy only, YYy omited if zero\n"
+    "Duration_FirstFrame/String3;;;N NT;;;Duration of the first frame if it is longer than others, in format : HH:MM:SS.MMM\n"
+    "Duration_LastFrame;; ms;N YI;;;Duration of the last frame if it is longer than others, in ms\n"
+    "Duration_LastFrame/String;;;Y NT;;;Duration of the last frame if it is longer than others, in format : XXx YYy only, YYy omited if zero\n"
+    "Duration_LastFrame/String1;;;N NT;;;Duration of the last frame if it is longer than others, in format : HHh MMmn SSs MMMms, XX omited if zero\n"
+    "Duration_LastFrame/String2;;;N NT;;;Duration of the last frame if it is longer than others, in format : XXx YYy only, YYy omited if zero\n"
+    "Duration_LastFrame/String3;;;N NT;;;Duration of the last frame if it is longer than others, in format : HH:MM:SS.MMM\n"
+    "Source_Duration;; ms;N YI;;;Source Play time of the stream;\n"
+    "Source_Duration/String;;;Y NT;;;Source Play time in format : XXx YYy only, YYy omited if zero;\n"
+    "Source_Duration/String1;;;N NT;;;Source Play time in format : HHh MMmn SSs MMMms, XX omited if zero;\n"
+    "Source_Duration/String2;;;N NT;;;Source Play time in format : XXx YYy only, YYy omited if zero;\n"
+    "Source_Duration/String3;;;N NT;;;Source Play time in format : HH:MM:SS.MMM;\n"
+    "Source_Duration_FirstFrame;; ms;N YI;;;Source Duration of the first frame if it is longer than others, in ms\n"
+    "Source_Duration_FirstFrame/String;;;Y NT;;;Source Duration of the first frame if it is longer than others, in format : XXx YYy only, YYy omited if zero\n"
+    "Source_Duration_FirstFrame/String1;;;N NT;;;Source Duration of the first frame if it is longer than others, in format : HHh MMmn SSs MMMms, XX omited if zero\n"
+    "Source_Duration_FirstFrame/String2;;;N NT;;;Source Duration of the first frame if it is longer than others, in format : XXx YYy only, YYy omited if zero\n"
+    "Source_Duration_FirstFrame/String3;;;N NT;;;Source Duration of the first frame if it is longer than others, in format : HH:MM:SS.MMM\n"
+    "Source_Duration_LastFrame;; ms;N YI;;;Source Duration of the last frame if it is longer than others, in ms\n"
+    "Source_Duration_LastFrame/String;;;Y NT;;;Source Duration of the last frame if it is longer than others, in format : XXx YYy only, YYy omited if zero\n"
+    "Source_Duration_LastFrame/String1;;;N NT;;;Source Duration of the last frame if it is longer than others, in format : HHh MMmn SSs MMMms, XX omited if zero\n"
+    "Source_Duration_LastFrame/String2;;;N NT;;;Source Duration of the last frame if it is longer than others, in format : XXx YYy only, YYy omited if zero\n"
+    "Source_Duration_LastFrame/String3;;;N NT;;;Source Duration of the last frame if it is longer than others, in format : HH:MM:SS.MMM\n"
     "BitRate_Mode;;;N YT;;;Bit rate mode (VBR, CBR)\n"
     "BitRate_Mode/String;;;Y NT;;;Bit rate mode (Constant, Variable)\n"
     "BitRate;; bps;N YF;;;Bit rate in bps\n"
@@ -4265,10 +4636,12 @@
     "BitRate_Nominal/String;;;Y NT;;;Nominal Bit rate (with measurement)\n"
     "BitRate_Maximum;; bps;N YF;;;Maximum Bit rate in bps\n"
     "BitRate_Maximum/String;;;Y NT;;;Maximum Bit rate (with measurement)\n"
+    "BitRate_Encoded;; bps;N YF;;;Encoded (with forced padding) bit rate in bps, if some container padding is present\n"
+    "BitRate_Encoded/String;;;Y NT;;;Encoded (with forced padding) bit rate (with measurement), if some container padding is present\n"
     "Width;; pixel;N YI;;;Width\n"
-    "Width/String;;;Y NT\n"
+    "Width/String;;;Y NT;;\n"
     "Height;; pixel;N YI;;;Height\n"
-    "Height/String;;;Y NT\n"
+    "Height/String;;;Y NT;;\n"
     "FrameRate_Mode;;;N YT;;;Frame rate mode (CFR, VFR)\n"
     "FrameRate_Mode/String;;;Y NT;;;Frame rate mode (Constant, Variable)\n"
     "FrameRate;; fps;N YF;;;Frames per second\n"
@@ -4282,41 +4655,77 @@
     "FrameRate_Original;; fps;N YF;;;Original (in the raw stream) Frames per second\n"
     "FrameRate_Original/String;;;Y NT;;;Original (in the raw stream) Frames per second (with measurement)\n"
     "FrameCount;;;N NI;;;Number of frames\n"
-    "ColorSpace;;;Y YT\n"
-    "ChromaSubsampling;;;Y YT\n"
+    "Source_FrameCount;;;N NI;;;Source Number of frames\n"
+    "ColorSpace;;;Y YT;;\n"
+    "ChromaSubsampling;;;Y YT;;\n"
     "Resolution;; bit;N NI;;;Deprecated, do not use in new projects\n"
     "Resolution/String;;;N NT;;;Deprecated, do not use in new projects\n"
-    "BitDepth;; bit;N YI\n"
-    "BitDepth/String;;;Y NT\n"
-    "Delay;; ms;N YI;;;Delay fixed in the stream (relative)\n"
-    "Delay/String;;;N NT\n"
-    "Delay/String1;;;N NT\n"
-    "Delay/String2;;;N NT\n"
-    "Delay/String3;;;N NT\n"
+    "BitDepth;; bit;N YI;;\n"
+    "BitDepth/String;;;Y NT;;\n"
+    "Compression_Mode;;;N YT;;;Compression mode (Lossy or Lossless)\n"
+    "Compression_Mode/String;;;Y NT;;;Compression mode (Lossy or Lossless)\n"
+    "Compression_Ratio;;;Y YF;;;Current stream size divided by uncompressed stream size;\n"
+    "Delay;; ms;N NI;;;Delay fixed in the stream (relative) IN MS\n"
+    "Delay/String;;;N NT;;;Delay with measurement\n"
+    "Delay/String1;;;N NT;;;Delay with measurement\n"
+    "Delay/String2;;;N NT;;;Delay with measurement\n"
+    "Delay/String3;;;N NT;;;Delay in format : HH:MM:SS.MMM\n"
+    "Delay/String4;;;N NT;;;Delay in format : HH:MM:SS:FF (HH:MM:SS;FF for drop frame, if available)\n"
+    "Delay_Settings;;;N NT;;;Delay settings (in case of timecode for example)\n"
+    "Delay_Source;;;N NT;;;Delay source (Container or Stream or empty)\n"
+    "Delay_Source/String;;;N NT;;;Delay source (Container or Stream or empty)\n"
     "Delay_Original;; ms;N NI;;;Delay fixed in the raw stream (relative) IN MS\n"
     "Delay_Original/String;;;N NT;;;Delay with measurement\n"
     "Delay_Original/String1;;;N NT;;;Delay with measurement\n"
     "Delay_Original/String2;;;N NT;;;Delay with measurement\n"
-    "Delay_Original/String3;;;N NT;;;format : HH:MM:SS.MMM\n"
-    "Delay_Original_Settings;;;N NT;;;Delay settings (in case of timecode for example)\n"
+    "Delay_Original/String3;;;N NT;;;Delay in format: HH:MM:SS.MMM;\n"
+    "Delay_Original/String4;;;N NT;;;Delay in format: HH:MM:SS:FF (HH:MM:SS;FF for drop frame, if available)\n"
+    "Delay_Original_Settings;;;N NT;;;Delay settings (in case of timecode for example);\n"
+    "Delay_Original_Source;;;N NT;;;Delay source (Stream or empty)\n"
     "Video_Delay;; ms;N NI;;;Delay fixed in the stream (absolute / video)\n"
-    "Video_Delay/String;;;Y NT\n"
-    "Video_Delay/String1;;;N NT\n"
-    "Video_Delay/String2;;;N NT\n"
-    "Video_Delay/String3;;;N NT\n"
-    "Video0_Delay;; ms;N NI;;;Deprecated\n"
-    "Video0_Delay/String;;;N NT;;;Deprecated\n"
-    "Video0_Delay/String1;;;N NT;;;Deprecated\n"
-    "Video0_Delay/String2;;;N NT;;;Deprecated\n"
-    "Video0_Delay/String3;;;N NT;;;Deprecated\n"
-    "StreamSize;; byte;N YI;;;Stream size in bytes\n"
-    "StreamSize/String;;;Y NT\n"
-    "StreamSize/String1;;;N NT\n"
-    "StreamSize/String2;;;N NT\n"
-    "StreamSize/String3;;;N NT\n"
-    "StreamSize/String4;;;N NT\n"
-    "StreamSize/String5;;;N NT;;;With proportion\n"
-    "StreamSize_Proportion;;;N NT;;;Stream size divided by file size\n"
+    "Video_Delay/String;;;Y NT;;\n"
+    "Video_Delay/String1;;;N NT;;\n"
+    "Video_Delay/String2;;;N NT;;\n"
+    "Video_Delay/String3;;;N NT;;\n"
+    "Video_Delay/String4;;;N NT;;\n"
+    "Video0_Delay;; ms;N NI;;;Deprecated, do not use in new projects\n"
+    "Video0_Delay/String;;;N NT;;;Deprecated, do not use in new projects\n"
+    "Video0_Delay/String1;;;N NT;;;Deprecated, do not use in new projects\n"
+    "Video0_Delay/String2;;;N NT;;;Deprecated, do not use in new projects\n"
+    "Video0_Delay/String3;;;N NT;;;Deprecated, do not use in new projects\n"
+    "Video0_Delay/String4;;;N NT;;;Deprecated, do not use in new projects\n"
+    "StreamSize;; byte;N YI;;;Streamsize in bytes;\n"
+    "StreamSize/String;;;Y NT;;;Streamsize in with percentage value;\n"
+    "StreamSize/String1;;;N NT;;;;\n"
+    "StreamSize/String2;;;N NT;;;;\n"
+    "StreamSize/String3;;;N NT;;;;\n"
+    "StreamSize/String4;;;N NT;;;;\n"
+    "StreamSize/String5;;;N NT;;;Streamsize in with percentage value;\n"
+    "StreamSize_Proportion;;;N NT;;;Stream size divided by file size;\n"
+    "Source_StreamSize;; byte;N YI;;;Source Streamsize in bytes;\n"
+    "Source_StreamSize/String;;;Y NT;;;Source Streamsize in with percentage value;\n"
+    "Source_StreamSize/String1;;;N NT;;;;\n"
+    "Source_StreamSize/String2;;;N NT;;;;\n"
+    "Source_StreamSize/String3;;;N NT;;;;\n"
+    "Source_StreamSize/String4;;;N NT;;;;\n"
+    "Source_StreamSize/String5;;;N NT;;;Source Streamsize in with percentage value;\n"
+    "Source_StreamSize_Proportion;;;N NT;;;Source Stream size divided by file size;\n"
+    "StreamSize_Encoded;; byte;N YI;;;Encoded Streamsize in bytes;\n"
+    "StreamSize_Encoded/String;;;Y NT;;;Encoded Streamsize in with percentage value;\n"
+    "StreamSize_Encoded/String1;;;N NT;;;;\n"
+    "StreamSize_Encoded/String2;;;N NT;;;;\n"
+    "StreamSize_Encoded/String3;;;N NT;;;;\n"
+    "StreamSize_Encoded/String4;;;N NT;;;;\n"
+    "StreamSize_Encoded/String5;;;N NT;;;Encoded Streamsize in with percentage value;\n"
+    "StreamSize_Encoded_Proportion;;;N NT;;;Encoded Stream size divided by file size;\n"
+    "Source_StreamSize_Encoded;; byte;N YI;;;Source Encoded Streamsize in bytes;\n"
+    "Source_StreamSize_Encoded/String;;;Y NT;;;Source Encoded Streamsize in with percentage value;\n"
+    "Source_StreamSize_Encoded/String1;;;N NT;;;;\n"
+    "Source_StreamSize_Encoded/String2;;;N NT;;;;\n"
+    "Source_StreamSize_Encoded/String3;;;N NT;;;;\n"
+    "Source_StreamSize_Encoded/String4;;;N NT;;;;\n"
+    "Source_StreamSize_Encoded/String5;;;N NT;;;Source Encoded Streamsize in with percentage value;\n"
+    "Source_StreamSize_Encoded_Proportion;;;N NT;;;Source Encoded Stream size divided by file size;\n"
     "Title;;;Y YI;;;Name of the track\n"
     "Encoded_Library;;;N YT;;;Software used to create the file\n"
     "Encoded_Library/String;;;Y NT;;;Software used to create the file\n"
@@ -4328,13 +4737,17 @@
     "Language/String;;;Y NT;;;Language (full)\n"
     "Language/String1;;;N NT;;;Language (full)\n"
     "Language/String2;;;N NT;;;Language (2-letter ISO 639-1 if exists, else empty)\n"
-    "Language/String3;;;N NT;;;Language (3-letter ISO 639-2 if exists, else empty)\n"
-    "Language/String4;;;N NT;;;Language (2-letter ISO 639-1 if exists with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn, else empty)\n"
-    "Language_More;;;Y YT;;;More info about Language (e.g. Director's Comment)\n"
-    "Summary;;;N NT\n"
+    "Language/String3;;;N NT;;;Language (3-letter ISO 639-2 if exists, else empty);\n"
+    "Language/String4;;;N NT;;;Language (2-letter ISO 639-1 if exists with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn, else empty);\n"
+    "Language_More;;;Y YT;;;More info about Language (e.g. Director's Comment);\n"
+    "Default;;Yes;N YT;;;Set if that track should be used if no language found matches the user preference.\n"
+    "Default/String;;;Y NT;;;Set if that track should be used if no language found matches the user preference.\n"
+    "Forced;;Yes;N YT;;;Set if that track should be used if no language found matches the user preference.\n"
+    "Forced/String;;;Y NT;;;Set if that track should be used if no language found matches the user preference.\n"
+    "Summary;;;N NT;;;;\n"
     "Encoded_Date;;;Y YT;;;The time that the encoding of this item was completed began.;;Temporal\n"
     "Tagged_Date;;;Y YT;;;The time that the tags were done for this item.;;Temporal\n"
-    "Encryption;;;Y YT\n"
+    "Encryption;;;Y YT;;;;\n"
     ));
     Info.Separator_Set(0, ZenLib::EOL);
 }
@@ -4342,7 +4755,7 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_Chapters (ZtringListList &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
     "Count;;;N NI;;;Count of objects available in this stream\n"
     "StreamCount;;;N NI;;;Count of streams of that kind available\n"
@@ -4350,6 +4763,7 @@
     "StreamKind/String;;;N NI;;;Stream type name\n"
     "StreamKindID;;;N NI;;;Number of the stream (base=0)\n"
     "StreamKindPos;;;N NI;;;When multiple streams, number of the stream (base=1)\n"
+    "StreamOrder;;;N NI;;;Stream order in the file, whatever is the kind of stream (base=0)\n"
     "Inform;;;N NT;;;Last **Inform** call\n"
     "ID;;;N YI;;;A ID for this stream in this file\n"
     "ID/String;;;Y NT;;;A ID for this stream in this file\n"
@@ -4365,8 +4779,16 @@
     "Codec/Url;;;Y YT;;;Deprecated\n"
     "Total;;;N YT;;;Total number of chapters\n"
     "Title;;;Y YI;;;Name of the track\n"
-    "Language;;;N YT;;;Language (2-letter ISO 639-1 if exists, else 3-letter ISO 639-2, and with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn)\n"
-    "Language/String;;;Y NT;;;Language (full)\n"
+    "Language/String;;;Y NT;;;Language (full);\n"
+    "Language/String1;;;N NT;;;Language (full);\n"
+    "Language/String2;;;N NT;;;Language (2-letter ISO 639-1 if exists, else empty);\n"
+    "Language/String3;;;N NT;;;Language (3-letter ISO 639-2 if exists, else empty);\n"
+    "Language/String4;;;N NT;;;Language (2-letter ISO 639-1 if exists with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn, else empty);\n"
+    "Language_More;;;Y YT;;;More info about Language (e.g. Director's Comment);\n"
+    "Default;;Yes;N YT;;;Set if that track should be used if no language found matches the user preference.\n"
+    "Default/String;;;Y NT;;;Set if that track should be used if no language found matches the user preference.\n"
+    "Forced;;Yes;N YT;;;Set if that track should be used if no language found matches the user preference.\n"
+    "Forced/String;;;Y NT;;;Set if that track should be used if no language found matches the user preference.\n"
     ));
     Info.Separator_Set(0, ZenLib::EOL);
 }
@@ -4374,18 +4796,21 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_Image (ZtringListList &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
     "Count;;;N YI;;;Count of objects available in this stream\n"
+    "Status;;;N NI;;;bit field (0=IsAccepted, 1=IsFilled, 2=IsUpdated, 3=IsFinished)\n"
     "StreamCount;;;N YI;;;Count of streams of that kind available\n"
     "StreamKind;Image;;N NI;;;Stream type name\n"
     "StreamKind/String;;;N NI;;;Stream type name\n"
     "StreamKindID;;;N NI;;;Number of the stream (base=0)\n"
     "StreamKindPos;;;N NI;;;When multiple streams, number of the stream (base=1)\n"
+    "StreamOrder;;;N NI;;;Stream order in the file, whatever is the kind of stream (base=0)\n"
     "Inform;;;N NT;;;Last **Inform** call\n"
     "ID;;;N YI;;;A ID for this stream in this file\n"
     "ID/String;;;Y NT;;;The ID for this stream in this file\n"
     "UniqueID;;;N YI;;;A unique ID for this stream, should be copied with stream copy\n"
+    "UniqueID/String;;;Y NT;;;A unique ID for this stream, should be copied with stream copy\n"
     "MenuID;;;N YI;;;The menu ID for this stream in this file\n"
     "MenuID/String;;;Y NT;;;The menu ID for this stream in this file\n"
     "Title;;;Y YI;;;Name of the track\n"
@@ -4396,9 +4821,12 @@
     "Format_Commercial_IfAny;;;Y NT;;;Commercial name used by vendor for theses setings if there is one\n"
     "Format_Version;;;Y NT;;;Version of this format\n"
     "Format_Profile;;;Y NT;;;Profile of the Format\n"
+    "Format_Compression;;;N YT;;;Compression mode of the Format\n"
     "Format_Settings;;;Y NT;;;Settings needed for decoder used\n"
+    "Format_Settings_Wrapping;;;Y YT;;;Wrapping mode (Frame wrapped or Clip wrapped)\n"
     "InternetMediaType;;;N YT;;;Internet Media Type (aka MIME Type, Content-Type)\n"
-    "CodecID;;;Y YT;;;Codec ID (found in some containers)\n"
+    "CodecID;;;Y NT;;;Codec ID (found in some containers);\n"
+    "CodecID/String;;;Y NT;;;Codec ID (found in some containers);\n"
     "CodecID/Info;;;Y NT;;;Info about codec ID\n"
     "CodecID/Hint;;;Y NT;;;A hint for this codec ID\n"
     "CodecID/Url;;;N NT;;;A link for more details about this codec ID\n"
@@ -4408,40 +4836,64 @@
     "Codec/Family;;;N NT;;;Deprecated, do not use in new projects\n"
     "Codec/Info;;;N NT;;;Deprecated, do not use in new projects\n"
     "Codec/Url;;;N NT;;;Deprecated, do not use in new projects\n"
-    "Width;; pixel;N YI;;;Width\n"
-    "Width/String;;;Y NT\n"
-    "Height;; pixel;N YI;;;Height\n"
-    "Height/String;;;Y NT\n"
-    "ColorSpace;;;Y YT\n"
-    "ChromaSubsampling;;;Y YT\n"
+    "Width;; pixel;N YI;;;Width (aperture size if present) in pixel\n"
+    "Width/String;;;Y NT;;;Width (aperture size if present) with measurement (pixel)\n"
+    "Width_Offset;; pixel;N YI;;;Offset between original width and displayed width (aperture size) in pixel\n"
+    "Width_Offset/String;;;N NT;;;Offset between original width and displayed width (aperture size)  in pixel\n"
+    "Width_Original;; pixel;N YI;;;Original (in the raw stream) width in pixel\n"
+    "Width_Original/String;;;Y NT;;;Original (in the raw stream) width with measurement (pixel)\n"
+    "Height;; pixel;N YI;;;Height (aperture size if present) in pixel\n"
+    "Height/String;;;Y NT;;;Height (aperture size if present) with measurement (pixel)\n"
+    "Height_Offset;; pixel;N YI;;;Offset between original height and displayed height (aperture size) in pixel\n"
+    "Height_Offset/String;;;N NT;;;Offset between original height and displayed height (aperture size)  in pixel\n"
+    "Height_Original;; pixel;N YI;;;Original (in the raw stream) height in pixel\n"
+    "Height_Original/String;;;Y NT;;;Original (in the raw stream) height with measurement (pixel)\n"
+    "PixelAspectRatio;;;N YF;;;Pixel Aspect ratio\n"
+    "PixelAspectRatio/String;;;N NT;;;Pixel Aspect ratio\n"
+    "PixelAspectRatio_Original;;;N YF;;;Original (in the raw stream) Pixel Aspect ratio\n"
+    "PixelAspectRatio_Original/String;;;N NT;;;Original (in the raw stream) Pixel Aspect ratio\n"
+    "DisplayAspectRatio;;;N YF;;;Display Aspect ratio\n"
+    "DisplayAspectRatio/String;;;Y NT;;;Display Aspect ratio\n"
+    "DisplayAspectRatio_Original;;;N YF;;;Original (in the raw stream) Display Aspect ratio\n"
+    "DisplayAspectRatio_Original/String;;;Y NT;;;Original (in the raw stream) Display Aspect ratio\n"
+    "ColorSpace;;;Y YT;;\n"
+    "ChromaSubsampling;;;Y YT;;\n"
     "Resolution;; bit;N NI;;;Deprecated, do not use in new projects\n"
     "Resolution/String;;;N NT;;;Deprecated, do not use in new projects\n"
-    "BitDepth;; bit;N YI\n"
-    "BitDepth/String;;;Y NT\n"
+    "BitDepth;; bit;N YI;;\n"
+    "BitDepth/String;;;Y NT;;\n"
+    "Compression_Mode;;;N YT;;;Compression mode (Lossy or Lossless)\n"
+    "Compression_Mode/String;;;Y NT;;;Compression mode (Lossy or Lossless)\n"
+    "Compression_Ratio;;;Y YF;;;Current stream size divided by uncompressed stream size;\n"
     "StreamSize;; byte;N YI;;;Stream size in bytes\n"
-    "StreamSize/String;;;Y NT\n"
-    "StreamSize/String1;;;N NT\n"
-    "StreamSize/String2;;;N NT\n"
-    "StreamSize/String3;;;N NT\n"
-    "StreamSize/String4;;;N NT\n"
-    "StreamSize/String5;;;N NT;;;With proportion\n"
-    "StreamSize_Proportion;;;N NT;;;Stream size divided by file size\n"
-    "Encoded_Library;;;N YT;;;Software used to create the file\n"
-    "Encoded_Library/String;;;Y NT;;;Software used to create the file\n"
-    "Encoded_Library/Name;;;N NT;;;Info from the software\n"
-    "Encoded_Library/Version;;;N NT;;;Version of software\n"
-    "Encoded_Library/Date;;;N NT;;;Release date of software\n"
-    "Encoded_Library_Settings;;;Y YT;;;Parameters used by the software\n"
-    "Language;;;N YT;;;Language (2-letter ISO 639-1 if exists, else 3-letter ISO 639-2, and with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn)\n"
-    "Language/String;;;Y NT;;;Language (full)\n"
-    "Language/String1;;;N NT;;;Language (full)\n"
-    "Language/String2;;;N NT;;;Language (2-letter ISO 639-1 if exists, else empty)\n"
-    "Language/String3;;;N NT;;;Language (3-letter ISO 639-2 if exists, else empty)\n"
-    "Language/String4;;;N NT;;;Language (2-letter ISO 639-1 if exists with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn, else empty)\n"
-    "Summary;;;N NT\n"
+    "StreamSize/String;;;Y NT;;\n"
+    "StreamSize/String1;;;N NT;;\n"
+    "StreamSize/String2;;;N NT;;\n"
+    "StreamSize/String3;;;N NT;;\n"
+    "StreamSize/String4;;;N NT;;\n"
+    "StreamSize/String5;;;N NT;;;With proportion;\n"
+    "StreamSize_Proportion;;;N NT;;;Stream size divided by file size;\n"
+    "Encoded_Library;;;N YT;;;Software used to create the file;\n"
+    "Encoded_Library/String;;;Y NT;;;Software used to create the file;\n"
+    "Encoded_Library/Name;;;N NT;;;Info from the software;\n"
+    "Encoded_Library/Version;;;N NT;;;Version of software;\n"
+    "Encoded_Library/Date;;;N NT;;;Release date of software;\n"
+    "Encoded_Library_Settings;;;Y YT;;;Parameters used by the software;\n"
+    "Language;;;N YT;;;Language (2-letter ISO 639-1 if exists, else 3-letter ISO 639-2, and with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn);\n"
+    "Language/String;;;Y NT;;;Language (full);\n"
+    "Language/String1;;;N NT;;;Language (full);\n"
+    "Language/String2;;;N NT;;;Language (2-letter ISO 639-1 if exists, else empty);\n"
+    "Language/String3;;;N NT;;;Language (3-letter ISO 639-2 if exists, else empty);\n"
+    "Language/String4;;;N NT;;;Language (2-letter ISO 639-1 if exists with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn, else empty);\n"
+    "Language_More;;;Y YT;;;More info about Language (e.g. Director's Comment);\n"
+    "Default;;Yes;N YT;;;Set if that track should be used if no language found matches the user preference.\n"
+    "Default/String;;;Y NT;;;Set if that track should be used if no language found matches the user preference.\n"
+    "Forced;;Yes;N YT;;;Set if that track should be used if no language found matches the user preference.\n"
+    "Forced/String;;;Y NT;;;Set if that track should be used if no language found matches the user preference.\n"
+    "Summary;;;N NT;;;;\n"
     "Encoded_Date;;;Y YT;;;The time that the encoding of this item was completed began.;;Temporal\n"
     "Tagged_Date;;;Y YT;;;The time that the tags were done for this item.;;Temporal\n"
-    "Encryption;;;Y YT\n"
+    "Encryption;;;Y YT;;;;\n"
     ));
     Info.Separator_Set(0, ZenLib::EOL);
 }
@@ -4449,18 +4901,21 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_Menu (ZtringListList &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
     "Count;;;N NI;;;Count of objects available in this stream\n"
+    "Status;;;N NI;;;bit field (0=IsAccepted, 1=IsFilled, 2=IsUpdated, 3=IsFinished)\n"
     "StreamCount;;;N NI;;;Count of streams of that kind available\n"
     "StreamKind;Menu;;N NI;;;Stream type name\n"
     "StreamKind/String;;;N NI;;;Stream type name\n"
     "StreamKindID;;;N NI;;;Number of the stream (base=0)\n"
     "StreamKindPos;;;N NI;;;When multiple streams, number of the stream (base=1)\n"
+    "StreamOrder;;;N NI;;;Stream order in the file, whatever is the kind of stream (base=0)\n"
     "Inform;;;N NT;;;Last **Inform** call\n"
     "ID;;;N YI;;;A ID for this stream in this file\n"
     "ID/String;;;Y NT;;;A ID for this stream in this file\n"
     "UniqueID;;;N YI;;;A unique ID for this stream, should be copied with stream copy\n"
+    "UniqueID/String;;;Y NT;;;A unique ID for this stream, should be copied with stream copy\n"
     "MenuID;;;N YI;;;A menu ID for this stream in this file\n"
     "MenuID/String;;;Y NT;;;A menu ID for this stream in this file\n"
     "Format;;;N YT;;;Format used\n"
@@ -4470,8 +4925,10 @@
     "Format_Commercial_IfAny;;;Y NT;;;Commercial name used by vendor for theses setings if there is one\n"
     "Format_Version;;;Y NT;;;Version of this format\n"
     "Format_Profile;;;Y NT;;;Profile of the Format\n"
+    "Format_Compression;;;Y NT;;;Compression method used;\n"
     "Format_Settings;;;Y NT;;;Settings needed for decoder used\n"
-    "CodecID;;;Y YT;;;Codec ID (found in some containers)\n"
+    "CodecID;;;Y NT;;;Codec ID (found in some containers);\n"
+    "CodecID/String;;;Y NT;;;Codec ID (found in some containers);\n"
     "CodecID/Info;;;Y NT;;;Info about this codec\n"
     "CodecID/Hint;;;Y NT;;;A hint/popular name for this codec\n"
     "CodecID/Url;;;N NT;;;A link to more details about this codec ID\n"
@@ -4485,13 +4942,16 @@
     "Duration/String1;;;N NT;;;Play time in format : HHh MMmn SSs MMMms, XX omited if zero\n"
     "Duration/String2;;;N NT;;;Play time in format : XXx YYy only, YYy omited if zero\n"
     "Duration/String3;;;N NT;;;Play time in format : HH:MM:SS.MMM\n"
-    "Duration_Start;;;Y YT\n"
-    "Duration_End;;;Y YT\n"
+    "Duration_Start;;;Y YT;;\n"
+    "Duration_End;;;Y YT;;\n"
     "Delay;; ms;N NI;;;Delay fixed in the stream (relative) IN MS\n"
     "Delay/String;;;N NT;;;Delay with measurement\n"
     "Delay/String1;;;N NT;;;Delay with measurement\n"
     "Delay/String2;;;N NT;;;Delay with measurement\n"
-    "Delay/String3;;;N NT;;;format : HH:MM:SS.MMM\n"
+    "Delay/String3;;;N NT;;;Delay in format : HH:MM:SS.MMM\n"
+    "Delay/String4;;;N NT;;;Delay in format : HH:MM:SS:FF (HH:MM:SS;FF for drop frame, if available)\n"
+    "Delay_Settings;;;N NT;;;Delay settings (in case of timecode for example)\n"
+    "Delay_Source;;;N NT;;;Delay source (Container or Stream or empty)\n"
     "List_StreamKind;;;N YT;;;List of programs available\n"
     "List_StreamPos;;;N YT;;;List of programs available\n"
     "List;;;N YT;;;List of programs available\n"
@@ -4499,11 +4959,11 @@
     "Title;;;Y YI;;;Name of this menu\n"
     "Language;;;N YT;;;Language (2-letter ISO 639-1 if exists, else 3-letter ISO 639-2, and with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn)\n"
     "Language/String;;;Y NT;;;Language (full)\n"
-    "Language/String1;;;N NT;;;Language (full)\n"
-    "Language/String2;;;N NT;;;Language (2-letter ISO 639-1 if exists, else empty)\n"
-    "Language/String3;;;N NT;;;Language (3-letter ISO 639-2 if exists, else empty)\n"
-    "Language/String4;;;N NT;;;Language (2-letter ISO 639-1 if exists with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn, else empty)\n"
-    "Language_More;;;Y YT;;;More info about Language (e.g. Director's Comment)\n"
+    "Language/String1;;;N NT;;;Language (full);\n"
+    "Language/String2;;;N NT;;;Language (2-letter ISO 639-1 if exists, else empty);\n"
+    "Language/String3;;;N NT;;;Language (3-letter ISO 639-2 if exists, else empty);\n"
+    "Language/String4;;;N NT;;;Language (2-letter ISO 639-1 if exists with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn, else empty);\n"
+    "Language_More;;;Y YT;;;More info about Language (e.g. Director's Comment);\n"
     "ServiceName;;;Y YT;;;;;Legal\n"
     "ServiceChannel;;;Y YT;;;;;Legal\n"
     "Service/Url;;;Y YT;;;;;Legal\n"
@@ -4514,8 +4974,8 @@
     "Original/NetworkName;;;Y YT;;;;;Legal\n"
     "Countries;;;Y YT;;;;;Legal\n"
     "TimeZones;;;Y YT;;;;;Legal\n"
-    "Chapters_Pos_Begin;;;N NI;;;Used by third-party developpers to know about the begining of the chapters list, to be used by Get(Stream_Menu, x, Pos), where Pos is an Integer between Chapters_Pos_Begin and Chapters_Pos_End\n"
-    "Chapters_Pos_End;;;N NI;;;Used by third-party developpers to know about the end of the chapters list (this position excluded)\n"
+    "Chapters_Pos_Begin;;;N NI;;;Used by third-party developers to know about the beginning of the chapters list, to be used by Get(Stream_Menu, x, Pos), where Pos is an Integer between Chapters_Pos_Begin and Chapters_Pos_End;\n"
+    "Chapters_Pos_End;;;N NI;;;Used by third-party developers to know about the end of the chapters list (this position excluded)\n"
     ));
     Info.Separator_Set(0, ZenLib::EOL);
 }
@@ -4523,7 +4983,7 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_Iso639_1 (InfoMap &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
     "aar;aa\n"
     "abk;ab\n"
@@ -4741,7 +5201,7 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_Iso639_2 (InfoMap &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
     "aa;aar\n"
     "ab;abk\n"
@@ -4959,7 +5419,7 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_Library_DivX (InfoMap &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
     "Main source;http://xmm.sourceforge.net/DivX5-6_Xvid_Bitstream_version.php\n"
     "413;5.0.0;UTC 2002-03-04\n"
@@ -5034,7 +5494,7 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_Library_XviD (InfoMap &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
     "Main source;http://xmm.sourceforge.net/DivX5-6_Xvid_Bitstream_version.php\n"
     "1;0.0.01;UTC 2002-10-17\n"
@@ -5095,7 +5555,7 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_Library_MainConcept_Avc (InfoMap &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
     "2.0.1889;2.0.1889;UTC 2006-01-11\n"
     ));
@@ -5105,7 +5565,7 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_Library_VorbisCom (InfoMap &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
     "Main source;http://wiki.hydrogenaudio.org/index.php?title=Recommended_Ogg_Vorbis\n"
     "Xiphophorus libVorbis I 20000508;1.0 Beta 1/2;UTC 2000-05-08\n"
@@ -5144,12 +5604,13 @@
 //---------------------------------------------------------------------------
 void MediaInfo_Config_Summary (ZtringListList &Info)
 {
-    Info.Separator_Set(0, _T("\n"));
+    Info.Separator_Set(0, __T("\n"));
     Info.Write(Ztring().From_UTF8(
     "General;[%Format%][ (%Format_Profile%)][ (%Format_Commercial_IfAny%)]$if(%Format%,$: $)%FileSize/String%[, %Duration/String%]\n"
     "Video;[%Language/String%, ][%BitRate/String%$if(%BitRate_Nominal/String%, \$%BitRate_Nominal/String%\$), ][%Width%*][%Height%][ (%DisplayAspectRatio/String%), ][$at$ %FrameRate/String%, ][%Format%][ (%CodecID/Hint%)][ (%Standard%)]$if(%MuxingMode%, \$%MuxingMode%\$)$if(%Format_Version%, \$%Format_Version%\$)$if(%Format_Profile%, \$%Format_Profile%\$)$if(%Format_Settings%, \$%Format_Settings%\$)[ (%Format_Commercial_IfAny%)]\n"
     "Audio;[%Language/String%, ][%BitRate/String%$if(%BitRate_Nominal/String%, \$%BitRate_Nominal/String%\$), ][%SamplingRate/String%, ][%BitDepth/String%, ][%Channel(s)/String%, ][%Format%][ (%CodecID/Hint%)]$if(%MuxingMode%, \$%MuxingMode%\$)$if(%Format_Version%, \$%Format_Version%\$)$if(%Format_Profile%, \$%Format_Profile%\$)$if(%Format_Settings%, \$%Format_Settings%\$)[ (%Format_Commercial_IfAny%)]\n"
-    "Text;[%Language/String%, ][%Format%][ (%Format_Commercial_IfAny%)]\n"
+    "Text;[%Language/String%, ][%Format%][ (%Format_Commercial_IfAny%)]$if(%MuxingMode%, \$%MuxingMode%\$)\n"
+    "Image;[%Language/String%, ][%Width%*][%Height%][ (%DisplayAspectRatio/String%)][, %Format%]\n"
     "Chapters;[%Language/String%, ]%Total% chapters[, %Format%][ (%Format_Commercial_IfAny%)]\n"
     ));
     Info.Separator_Set(0, ZenLib::EOL);

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/MediaInfo_Config_MediaInfo.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/MediaInfo_Config_MediaInfo.cpp Changed

@@ -1,33 +1,43 @@
 // MediaInfo_Config_MediaInfo - Configuration class
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
 #include "MediaInfo/MediaInfo_Config_MediaInfo.h"
 #include "ZenLib/ZtringListListF.h"
+#if MEDIAINFO_IBI
+    #include "base64.h"
+#endif //MEDIAINFO_IBI
 #include <algorithm>
+#if MEDIAINFO_DEMUX
+    #include <cmath>
+#endif //MEDIAINFO_DEMUX
 using namespace ZenLib;
 using namespace std;
 //---------------------------------------------------------------------------
@@ -35,6 +45,8 @@
 namespace MediaInfoLib
 {
 
+const size_t Buffer_NormalSize=/*188*7;//*/64*1024;
+
 //***************************************************************************
 // Info
 //***************************************************************************
@@ -43,20 +55,88 @@
 {
     FileIsSeekable=true;
     FileIsSub=false;
+    FileIsDetectingDuration=false;
+    FileIsReferenced=false;
     FileKeepInfo=false;
     FileStopAfterFilled=false;
-    File_Filter_HasChanged_=false;
+    FileStopSubStreamAfterFilled=false;
+    Audio_MergeMonoStreams=false;
+    File_Demux_Interleave=false;
+    File_ID_OnlyRoot=false;
+    File_TimeToLive=0;
+    File_Buffer_Size_Hint_Pointer=NULL;
+    #if MEDIAINFO_NEXTPACKET
+        NextPacket=false;
+    #endif //MEDIAINFO_NEXTPACKET
+    #if MEDIAINFO_FILTER
+        File_Filter_HasChanged_=false;
+    #endif //MEDIAINFO_FILTER
     #if MEDIAINFO_EVENTS
         Event_CallBackFunction=NULL;
         Event_UserHandler=NULL;
+        SubFile_StreamID=(int64u)-1;
+        ParseUndecodableFrames=false;
     #endif //MEDIAINFO_EVENTS
+    #if MEDIAINFO_DEMUX
+        Demux_ForceIds=false;
+        Demux_PCM_20bitTo16bit=false;
+        Demux_Unpacketize=false;
+        Demux_Rate=0;
+        Demux_FirstDts=(int64u)-1;
+        Demux_FirstFrameNumber=(int64u)-1;
+        Demux_InitData=0; //In Demux event
+    #endif //MEDIAINFO_DEMUX
+    #if MEDIAINFO_IBI
+        Ibi_Create=false;
+    #endif //MEDIAINFO_IBI
 
     //Specific
     File_MpegTs_ForceMenu=false;
     File_MpegTs_stream_type_Trust=true;
+    File_MpegTs_Atsc_transport_stream_id_Trust=true;
+    File_MpegTs_RealTime=false;
     File_Bdmv_ParseTargetedFile=true;
-    File_DvDif_Analysis=false;
+    #if defined(MEDIAINFO_DVDIF_YES)
+    File_DvDif_DisableAudioIfIsInContainer=false;
+    File_DvDif_IgnoreTransmittingFlags=false;
+    #endif //defined(MEDIAINFO_DVDIF_YES)
+    #if defined(MEDIAINFO_DVDIF_ANALYZE_YES)
+        File_DvDif_Analysis=false;
+    #endif //defined(MEDIAINFO_DVDIF_ANALYZE_YES)
+    #if MEDIAINFO_MACROBLOCKS
+        File_Macroblocks_Parse=false;
+    #endif //MEDIAINFO_MACROBLOCKS
+    File_GrowingFile_Delay=10;
+    #if defined(MEDIAINFO_LIBMMS_YES)
+        File_Mmsh_Describe_Only=false;
+    #endif //defined(MEDIAINFO_LIBMMS_YES)
+    File_Eia608_DisplayEmptyStream=false;
+    File_Eia708_DisplayEmptyStream=false;
     State=0;
+
+    //Internal to MediaInfo, not thread safe
+    File_Names_Pos=0;
+    File_Buffer=NULL;
+    File_Buffer_Size_Max=0;
+    File_Buffer_Size_ToRead=Buffer_NormalSize;
+    File_Buffer_Size=0;
+    File_Buffer_Repeat=false;
+    File_Buffer_Repeat_IsSupported=false;
+    File_IsGrowing=false;
+    File_IsNotGrowingAnymore=false;
+    File_Size=(int64u)-1;
+    ParseSpeed=MediaInfoLib::Config.ParseSpeed_Get();
+    #if MEDIAINFO_DEMUX
+        Demux_EventWasSent=false;
+        #if MEDIAINFO_SEEK
+           Demux_IsSeeking=false;
+        #endif //MEDIAINFO_SEEK
+    #endif //MEDIAINFO_DEMUX
+}
+
+MediaInfo_Config_MediaInfo::~MediaInfo_Config_MediaInfo()
+{
+    delete[] File_Buffer; //File_Buffer=NULL;
 }
 
 //***************************************************************************
@@ -65,132 +145,558 @@
 
 Ztring MediaInfo_Config_MediaInfo::Option (const String &Option, const String &Value)
 {
+    #if MEDIAINFO_EVENTS
+        SubFile_Config(Option)=Value;
+    #endif //MEDIAINFO_EVENTS
+
     String Option_Lower(Option);
-    size_t Egal_Pos=Option_Lower.find(_T('='));
+    size_t Egal_Pos=Option_Lower.find(__T('='));
     if (Egal_Pos==string::npos)
         Egal_Pos=Option_Lower.size();
     transform(Option_Lower.begin(), Option_Lower.begin()+Egal_Pos, Option_Lower.begin(), (int(*)(int))tolower); //(int(*)(int)) is a patch for unix
 
-    if (Option_Lower==_T("file_isseekable"))
+    if (Option_Lower==__T("file_isseekable"))
     {
-        File_IsSeekable_Set(!(Value==_T("0") || Value.empty()));
-        return _T("");
+        File_IsSeekable_Set(!(Value==__T("0") || Value.empty()));
+        return __T("");
     }
-    else if (Option_Lower==_T("file_isseekable_get"))
+    else if (Option_Lower==__T("file_isseekable_get"))
     {
         return File_IsSeekable_Get()?"1":"0";
     }
-    if (Option_Lower==_T("file_issub"))
+    if (Option_Lower==__T("file_issub"))
     {
-        File_IsSub_Set(!(Value==_T("0") || Value.empty()));
-        return _T("");
+        File_IsSub_Set(!(Value==__T("0") || Value.empty()));
+        return __T("");
     }
-    else if (Option_Lower==_T("file_issub_get"))
+    else if (Option_Lower==__T("file_issub_get"))
     {
         return File_IsSub_Get()?"1":"0";
     }
-    if (Option_Lower==_T("file_keepinfo"))
+    if (Option_Lower==__T("file_isdetectingduration"))
+    {
+        File_IsDetectingDuration_Set(!(Value==__T("0") || Value.empty()));
+        return __T("");
+    }
+    else if (Option_Lower==__T("file_isdetectingduration_get"))
     {
-        File_KeepInfo_Set(!(Value==_T("0") || Value.empty()));
-        return _T("");
+        return File_IsDetectingDuration_Get()?"1":"0";
     }
-    else if (Option_Lower==_T("file_keepinfo_get"))
+    if (Option_Lower==__T("file_isreferenced"))
+    {
+        File_IsReferenced_Set(!(Value==__T("0") || Value.empty()));
+        return __T("");
+    }
+    else if (Option_Lower==__T("file_isreferenced_get"))
+    {
+        return File_IsReferenced_Get()?"1":"0";
+    }
+    if (Option_Lower==__T("file_keepinfo"))
+    {
+        File_KeepInfo_Set(!(Value==__T("0") || Value.empty()));
+        return __T("");
+    }
+    else if (Option_Lower==__T("file_keepinfo_get"))
     {
         return File_KeepInfo_Get()?"1":"0";
     }
-    if (Option_Lower==_T("file_stopafterfilled"))
+    if (Option_Lower==__T("file_stopafterfilled"))
     {
-        File_StopAfterFilled_Set(!(Value==_T("0") || Value.empty()));
-        return _T("");
+        File_StopAfterFilled_Set(!(Value==__T("0") || Value.empty()));
+        return __T("");
     }
-    else if (Option_Lower==_T("file_stopafterfilled_get"))
+    else if (Option_Lower==__T("file_stopafterfilled_get"))
     {
         return File_StopAfterFilled_Get()?"1":"0";
     }
-    else if (Option_Lower==_T("file_forceparser"))
+    if (Option_Lower==__T("file_stopsubstreamafterfilled"))
+    {
+        File_StopSubStreamAfterFilled_Set(!(Value==__T("0") || Value.empty()));
+        return __T("");
+    }
+    else if (Option_Lower==__T("file_stopsubstreamafterfilled_get"))
+    {
+        return File_StopSubStreamAfterFilled_Get()?"1":"0";
+    }
+    if (Option_Lower==__T("file_audio_mergemonostreams"))
+    {
+        File_Audio_MergeMonoStreams_Set(!(Value==__T("0") || Value.empty()));
+        return __T("");
+    }
+    else if (Option_Lower==__T("file_audio_mergemonostreams_get"))
+    {
+        return File_Audio_MergeMonoStreams_Get()?"1":"0";
+    }
+    else if (Option_Lower==__T("file_demux_interleave"))
+    {
+        File_Demux_Interleave_Set(!(Value==__T("0") || Value.empty()));
+        return __T("");
+    }
+    else if (Option_Lower==__T("file_demux_interleave_get"))
+    {
+        return File_Demux_Interleave_Get()?"1":"0";
+    }
+    else if (Option_Lower==__T("file_id_onlyroot"))
+    {
+        File_ID_OnlyRoot_Set(!(Value==__T("0") || Value.empty()));
+        return __T("");
+    }
+    else if (Option_Lower==__T("file_id_onlyroot_get"))
+    {
+        return File_ID_OnlyRoot_Get()?"1":"0";
+    }
+    else if (Option_Lower==__T("file_filename"))
+    {
+        File_FileName_Set(Value);
+        return __T("");
+    }
+    else if (Option_Lower==__T("file_filename_get"))
+    {
+        return File_FileName_Get();
+    }
+    else if (Option_Lower==__T("file_filenameformat"))
+    {
+        File_FileNameFormat_Set(Value);
+        return __T("");
+    }
+    else if (Option_Lower==__T("file_filenameformat_get"))
+    {
+        return File_FileNameFormat_Get();
+    }
+    else if (Option_Lower==__T("file_timetolive"))
+    {
+        File_TimeToLive_Set(Ztring(Value).To_float64());
+        return __T("");
+    }
+    else if (Option_Lower==__T("file_timetolive_get"))
+    {
+        return Ztring::ToZtring(File_TimeToLive_Get(), 9);
+    }
+    else if (Option_Lower==__T("file_partial_begin"))
+    {
+        File_Partial_Begin_Set(Value);
+        return __T("");
+    }
+    else if (Option_Lower==__T("file_partial_begin_get"))
+    {
+        return File_Partial_Begin_Get();
+    }
+    else if (Option_Lower==__T("file_partial_end"))
+    {
+        File_Partial_End_Set(Value);
+        return __T("");
+    }
+    else if (Option_Lower==__T("file_partial_end_get"))
+    {
+        return File_Partial_End_Get();
+    }
+    else if (Option_Lower==__T("file_forceparser"))
     {
         File_ForceParser_Set(Value);
-        return _T("");
+        return __T("");
     }
-    else if (Option_Lower==_T("file_forceparser_get"))
+    else if (Option_Lower==__T("file_forceparser_get"))
     {
         return File_ForceParser_Get();
     }
-    else if (Option_Lower==_T("file_filter"))
+    else if (Option_Lower==__T("file_buffer_size_hint_pointer"))
+    {
+        File_Buffer_Size_Hint_Pointer_Set((size_t*)Ztring(Value).To_int64u());
+        return __T("");
+    }
+    else if (Option_Lower==__T("file_buffer_size_hint_pointer_get"))
     {
-        File_Filter_Set(Ztring(Value).To_int64u());
-        return _T("");
+        return Ztring::ToZtring((size_t)File_Buffer_Size_Hint_Pointer_Get());
     }
-    else if (Option_Lower==_T("file_filter_get"))
+    else if (Option_Lower==__T("file_filter"))
     {
-        return Ztring();//.From_Number(File_Filter_Get());
+        #if MEDIAINFO_FILTER
+            File_Filter_Set(Ztring(Value).To_int64u());
+            return __T("");
+        #else //MEDIAINFO_FILTER
+            return __T("Filter manager is disabled due to compilation options");
+        #endif //MEDIAINFO_FILTER
     }
-    else if (Option_Lower==_T("file_duplicate"))
+    else if (Option_Lower==__T("file_filter_get"))
     {
-        return File_Duplicate_Set(Value);
+        #if MEDIAINFO_FILTER
+            return Ztring();//.From_Number(File_Filter_Get());
+        #else //MEDIAINFO_FILTER
+            return __T("Filter manager is disabled due to compilation options");
+        #endif //MEDIAINFO_FILTER
     }
-    else if (Option_Lower==_T("file_duplicate_get"))
+    else if (Option_Lower==__T("file_duplicate"))
     {
-        //if (File_Duplicate_Get())
-            return _T("1");
-        //else
-        //    return _T("");
+        #if MEDIAINFO_DUPLICATE
+            return File_Duplicate_Set(Value);
+        #else //MEDIAINFO_DUPLICATE
+            return __T("Duplicate manager is disabled due to compilation options");
+        #endif //MEDIAINFO_DUPLICATE
     }
-    else if (Option_Lower==_T("file_mpegts_forcemenu"))
+    else if (Option_Lower==__T("file_duplicate_get"))
     {
-        File_MpegTs_ForceMenu_Set(!(Value==_T("0") || Value.empty()));
-        return _T("");
+        #if MEDIAINFO_DUPLICATE
+            //if (File_Duplicate_Get())
+                return __T("1");
+            //else
+            //    return __T("");
+        #else //MEDIAINFO_DUPLICATE
+            return __T("Duplicate manager is disabled due to compilation options");
+        #endif //MEDIAINFO_DUPLICATE
     }
-    else if (Option_Lower==_T("file_mpegts_forcemenu_get"))
+    else if (Option_Lower==__T("file_demux_forceids"))
+    {
+        #if MEDIAINFO_DEMUX
+            if (Value.empty())
+                Demux_ForceIds_Set(false);
+            else
+                Demux_ForceIds_Set(true);
+            return Ztring();
+        #else //MEDIAINFO_DEMUX
+            return __T("Demux manager is disabled due to compilation options");
+        #endif //MEDIAINFO_DEMUX
+    }
+    else if (Option_Lower==__T("file_demux_pcm_20bitto16bit"))
+    {
+        #if MEDIAINFO_DEMUX
+            if (Value.empty())
+                Demux_PCM_20bitTo16bit_Set(false);
+            else
+                Demux_PCM_20bitTo16bit_Set(true);
+            return Ztring();
+        #else //MEDIAINFO_DEMUX
+            return __T("Demux manager is disabled due to compilation options");
+        #endif //MEDIAINFO_DEMUX
+    }
+    else if (Option_Lower==__T("file_demux_unpacketize"))
+    {
+        #if MEDIAINFO_DEMUX
+            if (Value.empty())
+                Demux_Unpacketize_Set(false);
+            else
+                Demux_Unpacketize_Set(true);
+            return Ztring();
+        #else //MEDIAINFO_DEMUX
+            return __T("Demux manager is disabled due to compilation options");
+        #endif //MEDIAINFO_DEMUX
+    }
+    else if (Option_Lower==__T("file_demux_rate"))
+    {
+        #if MEDIAINFO_DEMUX
+            Demux_Rate_Set(Ztring(Value).To_float64());
+            return Ztring();
+        #else //MEDIAINFO_DEMUX
+            return __T("Demux manager is disabled due to compilation options");
+        #endif //MEDIAINFO_DEMUX
+    }
+    else if (Option_Lower==__T("file_demux_firstdts"))
+    {
+        #if MEDIAINFO_DEMUX
+            int64u ValueInt64u;
+            if (Value.find(__T(":"))!=string::npos)
+            {
+                Ztring ValueZ=Value;
+                ValueInt64u=0;
+                size_t Value_Pos=ValueZ.find(__T(":"));
+                if (Value_Pos==string::npos)
+                    Value_Pos=ValueZ.size();
+                ValueInt64u+=Ztring(ValueZ.substr(0, Value_Pos)).To_int64u()*60*60*1000*1000*1000;
+                ValueZ.erase(0, Value_Pos+1);
+                Value_Pos=ValueZ.find(__T(":"));
+                if (Value_Pos==string::npos)
+                    Value_Pos=ValueZ.size();
+                ValueInt64u+=Ztring(ValueZ.substr(0, Value_Pos)).To_int64u()*60*1000*1000*1000;
+                ValueZ.erase(0, Value_Pos+1);
+                Value_Pos=ValueZ.find(__T("."));
+                if (Value_Pos==string::npos)
+                    Value_Pos=ValueZ.size();
+                ValueInt64u+=Ztring(ValueZ.substr(0, Value_Pos)).To_int64u()*1000*1000*1000;
+                ValueZ.erase(0, Value_Pos+1);
+                if (!ValueZ.empty())
+                    ValueInt64u+=Ztring(ValueZ).To_int64u()*1000*1000*1000/(int64u)pow(10.0, (int)ValueZ.size());
+            }
+            else
+                ValueInt64u=Ztring(Value).To_int64u();
+            Demux_FirstDts_Set(ValueInt64u);
+            return Ztring();
+        #else //MEDIAINFO_DEMUX
+            return __T("Demux manager is disabled due to compilation options");
+        #endif //MEDIAINFO_DEMUX
+    }
+    else if (Option_Lower==__T("file_demux_firstframenumber"))
+    {
+        #if MEDIAINFO_DEMUX
+            Demux_FirstFrameNumber_Set(Ztring(Value).To_int64u());
+            return Ztring();
+        #else //MEDIAINFO_DEMUX
+            return __T("Demux manager is disabled due to compilation options");
+        #endif //MEDIAINFO_DEMUX
+    }
+    else if (Option_Lower==__T("file_demux_initdata"))
+    {
+        #if MEDIAINFO_DEMUX
+            Ztring Value_Lower(Value); Value_Lower.MakeLowerCase();
+                 if (Value_Lower==__T("event")) Demux_InitData_Set(0);
+            else if (Value_Lower==__T("field")) Demux_InitData_Set(1);
+            else return __T("Invalid value");
+            return Ztring();
+        #else //MEDIAINFO_DEMUX
+            return __T("Demux manager is disabled due to compilation options");
+        #endif //MEDIAINFO_DEMUX
+    }
+    else if (Option_Lower==__T("file_ibi"))
+    {
+        #if MEDIAINFO_IBI
+            Ibi_Set(Value);
+            return Ztring();
+        #else //MEDIAINFO_IBI
+            return __T("IBI support is disabled due to compilation options");
+        #endif //MEDIAINFO_IBI
+    }
+    else if (Option_Lower==__T("file_ibi_create"))
+    {
+        #if MEDIAINFO_IBI
+            if (Value.empty())
+                Ibi_Create_Set(false);
+            else
+                Ibi_Create_Set(true);
+            return Ztring();
+        #else //MEDIAINFO_IBI
+            return __T("IBI support is disabled due to compilation options");
+        #endif //MEDIAINFO_IBI
+    }
+    else if (Option_Lower==__T("file_nextpacket"))
+    {
+        #if MEDIAINFO_NEXTPACKET
+            if (Value.empty())
+                NextPacket_Set(false);
+            else
+                NextPacket_Set(true);
+            return Ztring();
+        #else //MEDIAINFO_NEXTPACKET
+            return __T("NextPacket manager is disabled due to compilation options");
+        #endif //MEDIAINFO_NEXTPACKET
+    }
+    else if (Option_Lower==__T("file_subfile_streamid_set"))
+    {
+        #if MEDIAINFO_EVENTS
+            SubFile_StreamID_Set(Value.empty()?(int64u)-1:Ztring(Value).To_int64u());
+            return Ztring();
+        #else //MEDIAINFO_EVENTS
+            return __T("Event manager is disabled due to compilation options");
+        #endif //MEDIAINFO_EVENTS
+    }
+    else if (Option_Lower==__T("file_subfile_ids_set"))
+    {
+        #if MEDIAINFO_EVENTS
+            SubFile_IDs_Set(Value);
+            return Ztring();
+        #else //MEDIAINFO_EVENTS
+            return __T("Event manager is disabled due to compilation options");
+        #endif //MEDIAINFO_EVENTS
+    }
+    else if (Option_Lower==__T("file_parseundecodableframes"))
+    {
+        #if MEDIAINFO_EVENTS
+            ParseUndecodableFrames_Set(!(Value==__T("0") || Value.empty()));
+            return Ztring();
+        #else //MEDIAINFO_EVENTS
+            return __T("Event manager is disabled due to compilation options");
+        #endif //MEDIAINFO_EVENTS
+    }
+    else if (Option_Lower==__T("file_mpegts_forcemenu"))
+    {
+        File_MpegTs_ForceMenu_Set(!(Value==__T("0") || Value.empty()));
+        return __T("");
+    }
+    else if (Option_Lower==__T("file_mpegts_forcemenu_get"))
     {
         return File_MpegTs_ForceMenu_Get()?"1":"0";
     }
-    else if (Option_Lower==_T("file_mpegts_stream_type_trust"))
+    else if (Option_Lower==__T("file_mpegts_stream_type_trust"))
     {
-        File_MpegTs_stream_type_Trust_Set(!(Value==_T("0") || Value.empty()));
-        return _T("");
+        File_MpegTs_stream_type_Trust_Set(!(Value==__T("0") || Value.empty()));
+        return __T("");
     }
-    else if (Option_Lower==_T("file_mpegts_stream_type_trust_get"))
+    else if (Option_Lower==__T("file_mpegts_stream_type_trust_get"))
     {
         return File_MpegTs_stream_type_Trust_Get()?"1":"0";
     }
-    else if (Option_Lower==_T("file_bdmv_parsetargetedfile"))
+    else if (Option_Lower==__T("file_mpegts_atsc_transport_stream_id_trust"))
+    {
+        File_MpegTs_Atsc_transport_stream_id_Trust_Set(!(Value==__T("0") || Value.empty()));
+        return __T("");
+    }
+    else if (Option_Lower==__T("file_mpegts_atsc_transport_stream_id_trust_get"))
+    {
+        return File_MpegTs_Atsc_transport_stream_id_Trust_Get()?"1":"0";
+    }
+    else if (Option_Lower==__T("file_mpegts_realtime"))
+    {
+        File_MpegTs_RealTime_Set(!(Value==__T("0") || Value.empty()));
+        return __T("");
+    }
+    else if (Option_Lower==__T("file_mpegts_realtime_get"))
     {
-        File_Bdmv_ParseTargetedFile_Set(!(Value==_T("0") || Value.empty()));
-        return _T("");
+        return File_MpegTs_RealTime_Get()?"1":"0";
     }
-    else if (Option_Lower==_T("file_bdmv_parsetargetedfile_get"))
+    else if (Option_Lower==__T("file_bdmv_parsetargetedfile"))
+    {
+        File_Bdmv_ParseTargetedFile_Set(!(Value==__T("0") || Value.empty()));
+        return __T("");
+    }
+    else if (Option_Lower==__T("file_bdmv_parsetargetedfile_get"))
     {
         return File_Bdmv_ParseTargetedFile_Get()?"1":"0";
     }
-    else if (Option_Lower==_T("file_dvdif_analysis"))
+    else if (Option_Lower==__T("file_dvdif_disableaudioifisincontainer"))
+    {
+        #if defined(MEDIAINFO_DVDIF_YES)
+            File_DvDif_DisableAudioIfIsInContainer_Set(!(Value==__T("0") || Value.empty()));
+            return __T("");
+        #else //defined(MEDIAINFO_DVDIF_YES)
+            return __T("DVDIF is disabled due to compilation options");
+        #endif //defined(MEDIAINFO_DVDIF_YES)
+    }
+    else if (Option_Lower==__T("file_dvdif_disableaudioifisincontainer_get"))
+    {
+        #if defined(MEDIAINFO_DVDIF_YES)
+            return File_DvDif_DisableAudioIfIsInContainer_Get()?"1":"0";
+        #else //defined(MEDIAINFO_DVDIF_YES)
+            return __T("DVDIF is disabled due to compilation options");
+        #endif //defined(MEDIAINFO_DVDIF_YES)
+    }
+    else if (Option_Lower==__T("file_dvdif_ignoretransmittingflags"))
+    {
+        #if defined(MEDIAINFO_DVDIF_YES)
+            File_DvDif_IgnoreTransmittingFlags_Set(!(Value==__T("0") || Value.empty()));
+            return __T("");
+        #else //defined(MEDIAINFO_DVDIF_YES)
+            return __T("DVDIF is disabled due to compilation options");
+        #endif //defined(MEDIAINFO_DVDIF_YES)
+    }
+    else if (Option_Lower==__T("file_dvdif_ignoretransmittingflags_get"))
+    {
+        #if defined(MEDIAINFO_DVDIF_YES)
+            return File_DvDif_IgnoreTransmittingFlags_Get()?"1":"0";
+        #else //defined(MEDIAINFO_DVDIF_YES)
+            return __T("DVDIF is disabled due to compilation options");
+        #endif //defined(MEDIAINFO_DVDIF_YES)
+    }
+    else if (Option_Lower==__T("file_dvdif_analysis"))
+    {
+        #if defined(MEDIAINFO_DVDIF_ANALYZE_YES)
+            File_DvDif_Analysis_Set(!(Value==__T("0") || Value.empty()));
+            return __T("");
+        #else //defined(MEDIAINFO_DVDIF_ANALYZE_YES)
+            return __T("DVDIF Analysis is disabled due to compilation options");
+        #endif //defined(MEDIAINFO_DVDIF_ANALYZE_YES)
+    }
+    else if (Option_Lower==__T("file_dvdif_analysis_get"))
+    {
+        #if defined(MEDIAINFO_DVDIF_ANALYZE_YES)
+            return File_DvDif_Analysis_Get()?"1":"0";
+        #else //defined(MEDIAINFO_DVDIF_ANALYZE_YES)
+            return __T("DVDIF Analysis is disabled due to compilation options");
+        #endif //defined(MEDIAINFO_DVDIF_ANALYZE_YES)
+    }
+    else if (Option_Lower==__T("file_macroblocks_parse"))
+    {
+        #if MEDIAINFO_MACROBLOCKS
+            File_Macroblocks_Parse_Set(!(Value==__T("0") || Value.empty()));
+            return __T("");
+        #else //MEDIAINFO_MACROBLOCKS
+            return __T("Macroblock parsing is disabled due to compilation options");
+        #endif //MEDIAINFO_MACROBLOCKS
+    }
+    else if (Option_Lower==__T("file_macroblocks_parse_get"))
     {
-        File_DvDif_Analysis_Set(!(Value==_T("0") || Value.empty()));
-        return _T("");
+        #if MEDIAINFO_MACROBLOCKS
+            return File_Macroblocks_Parse_Get()?"1":"0";
+        #else //MEDIAINFO_MACROBLOCKS
+            return __T("Macroblock parsing is disabled due to compilation options");
+        #endif //MEDIAINFO_MACROBLOCKS
     }
-    else if (Option_Lower==_T("file_dvdif_analysis_get"))
+    else if (Option_Lower==__T("file_growingfile_delay"))
     {
-        return File_DvDif_Analysis_Get()?"1":"0";
+        File_GrowingFile_Delay_Set(Ztring(Value).To_float64());
+        return Ztring();
     }
-    else if (Option_Lower==_T("file_curl"))
+    else if (Option_Lower==__T("file_growingfile_delay_get"))
     {
-        File_Curl_Set(Value);
-        return _T("");
+        return Ztring::ToZtring(File_GrowingFile_Delay_Get());
     }
-    else if (Option_Lower==_T("file_curl_get"))
+    else if (Option_Lower==__T("file_curl"))
     {
-        return File_Curl_Get(Value);
+        #if defined(MEDIAINFO_LIBCURL_YES)
+            File_Curl_Set(Value);
+            return __T("");
+        #else //defined(MEDIAINFO_LIBCURL_YES)
+            return __T("Libcurl support is disabled due to compilation options");
+        #endif //defined(MEDIAINFO_LIBCURL_YES)
     }
-    else if (Option_Lower==_T("file_event_callbackfunction"))
+    else if (Option_Lower.find(__T("file_curl,"))==0 || Option_Lower.find(__T("file_curl;"))==0)
+    {
+        #if defined(MEDIAINFO_LIBCURL_YES)
+            File_Curl_Set(Option.substr(10), Value);
+            return __T("");
+        #else //defined(MEDIAINFO_LIBCURL_YES)
+            return __T("Libcurl support is disabled due to compilation options");
+        #endif //defined(MEDIAINFO_LIBCURL_YES)
+    }
+    else if (Option_Lower==__T("file_curl_get"))
+    {
+        #if defined(MEDIAINFO_LIBCURL_YES)
+            return File_Curl_Get(Value);
+        #else //defined(MEDIAINFO_LIBCURL_YES)
+            return __T("Libcurl support is disabled due to compilation options");
+        #endif //defined(MEDIAINFO_LIBCURL_YES)
+    }
+    else if (Option_Lower==__T("file_mmsh_describe_only"))
+    {
+        #if defined(MEDIAINFO_LIBMMS_YES)
+            File_Mmsh_Describe_Only_Set(!(Value==__T("0") || Value.empty()));
+            return __T("");
+        #else //defined(MEDIAINFO_LIBMMS_YES)
+            return __T("Libmms support is disabled due to compilation options");
+        #endif //defined(MEDIAINFO_LIBMMS_YES)
+    }
+    else if (Option_Lower==__T("file_mmsh_describe_only_get"))
+    {
+        #if defined(MEDIAINFO_LIBMMS_YES)
+            return File_Mmsh_Describe_Only_Get()?"1":"0";
+        #else //defined(MEDIAINFO_LIBMMS_YES)
+            return __T("Libmms support is disabled due to compilation options");
+        #endif //defined(MEDIAINFO_LIBMMS_YES)
+    }
+    else if (Option_Lower==__T("file_eia708_displayemptystream"))
+    {
+        File_Eia708_DisplayEmptyStream_Set(!(Value==__T("0") || Value.empty()));
+        return __T("");
+    }
+    else if (Option_Lower==__T("file_eia708_displayemptystream_get"))
+    {
+        return File_Eia708_DisplayEmptyStream_Get()?"1":"0";
+    }
+    else if (Option_Lower==__T("file_eia608_displayemptystream"))
+    {
+        File_Eia608_DisplayEmptyStream_Set(!(Value==__T("0") || Value.empty()));
+        return __T("");
+    }
+    else if (Option_Lower==__T("file_eia608_displayemptystream_get"))
+    {
+        return File_Eia608_DisplayEmptyStream_Get()?"1":"0";
+    }
+    else if (Option_Lower==__T("file_event_callbackfunction"))
     {
         #if MEDIAINFO_EVENTS
             return Event_CallBackFunction_Set(Value);
         #else //MEDIAINFO_EVENTS
-            return _T("Event manager is disabled due to compilation options");
+            return __T("Event manager is disabled due to compilation options");
         #endif //MEDIAINFO_EVENTS
     }
     else
-        return _T("Option not known");
+        return __T("Option not known");
 }
 
 //***************************************************************************
@@ -198,215 +704,628 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
-void MediaInfo_Config_MediaInfo::File_IsSeekable_Set (bool NewValue)
+void MediaInfo_Config_MediaInfo::File_IsSeekable_Set (bool NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    FileIsSeekable=NewValue;
+}
+
+bool MediaInfo_Config_MediaInfo::File_IsSeekable_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return FileIsSeekable;
+}
+
+//***************************************************************************
+// File Is Sub
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void MediaInfo_Config_MediaInfo::File_IsSub_Set (bool NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    FileIsSub=NewValue;
+}
+
+bool MediaInfo_Config_MediaInfo::File_IsSub_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return FileIsSub;
+}
+
+//***************************************************************************
+// File Is Detecting Duration
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void MediaInfo_Config_MediaInfo::File_IsDetectingDuration_Set (bool NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    FileIsDetectingDuration=NewValue;
+}
+
+bool MediaInfo_Config_MediaInfo::File_IsDetectingDuration_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return FileIsDetectingDuration;
+}
+
+//***************************************************************************
+// File Is Referenced
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void MediaInfo_Config_MediaInfo::File_IsReferenced_Set (bool NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    FileIsReferenced=NewValue;
+}
+
+bool MediaInfo_Config_MediaInfo::File_IsReferenced_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return FileIsReferenced;
+}
+
+//***************************************************************************
+// File Keep Info
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void MediaInfo_Config_MediaInfo::File_KeepInfo_Set (bool NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    FileKeepInfo=NewValue;
+}
+
+bool MediaInfo_Config_MediaInfo::File_KeepInfo_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return FileKeepInfo;
+}
+
+//***************************************************************************
+// File Keep Info
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void MediaInfo_Config_MediaInfo::File_StopAfterFilled_Set (bool NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    FileStopAfterFilled=NewValue;
+}
+
+bool MediaInfo_Config_MediaInfo::File_StopAfterFilled_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return FileStopAfterFilled;
+}
+
+//---------------------------------------------------------------------------
+void MediaInfo_Config_MediaInfo::File_StopSubStreamAfterFilled_Set (bool NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    FileStopSubStreamAfterFilled=NewValue;
+}
+
+bool MediaInfo_Config_MediaInfo::File_StopSubStreamAfterFilled_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return FileStopSubStreamAfterFilled;
+}
+
+//---------------------------------------------------------------------------
+void MediaInfo_Config_MediaInfo::File_Audio_MergeMonoStreams_Set (bool NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    Audio_MergeMonoStreams=NewValue;
+}
+
+bool MediaInfo_Config_MediaInfo::File_Audio_MergeMonoStreams_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return Audio_MergeMonoStreams;
+}
+
+//---------------------------------------------------------------------------
+void MediaInfo_Config_MediaInfo::File_Demux_Interleave_Set (bool NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    File_Demux_Interleave=NewValue;
+}
+
+bool MediaInfo_Config_MediaInfo::File_Demux_Interleave_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return File_Demux_Interleave;
+}
+
+//---------------------------------------------------------------------------
+void MediaInfo_Config_MediaInfo::File_ID_OnlyRoot_Set (bool NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    File_ID_OnlyRoot=NewValue;
+}
+
+bool MediaInfo_Config_MediaInfo::File_ID_OnlyRoot_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return File_ID_OnlyRoot;
+}
+
+//***************************************************************************
+// File name from somewhere else
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void MediaInfo_Config_MediaInfo::File_FileName_Set (const Ztring &NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    File_FileName=NewValue;
+}
+
+Ztring MediaInfo_Config_MediaInfo::File_FileName_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return File_FileName;
+}
+
+//***************************************************************************
+// File name format
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void MediaInfo_Config_MediaInfo::File_FileNameFormat_Set (const Ztring &NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    File_FileNameFormat=NewValue;
+}
+
+Ztring MediaInfo_Config_MediaInfo::File_FileNameFormat_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return File_FileNameFormat;
+}
+
+//***************************************************************************
+// Time to live
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void MediaInfo_Config_MediaInfo::File_TimeToLive_Set (float64 NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    File_TimeToLive=NewValue;
+}
+
+float64 MediaInfo_Config_MediaInfo::File_TimeToLive_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return File_TimeToLive;
+}
+
+//***************************************************************************
+// Partial file (begin and end are cut)
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void MediaInfo_Config_MediaInfo::File_Partial_Begin_Set (const Ztring &NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    File_Partial_Begin=NewValue;
+}
+
+Ztring MediaInfo_Config_MediaInfo::File_Partial_Begin_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return File_Partial_Begin;
+}
+
+//---------------------------------------------------------------------------
+void MediaInfo_Config_MediaInfo::File_Partial_End_Set (const Ztring &NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    File_Partial_End=NewValue;
+}
+
+Ztring MediaInfo_Config_MediaInfo::File_Partial_End_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return File_Partial_End;
+}
+
+//***************************************************************************
+// Force Parser
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void MediaInfo_Config_MediaInfo::File_ForceParser_Set (const Ztring &NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    File_ForceParser=NewValue;
+}
+
+Ztring MediaInfo_Config_MediaInfo::File_ForceParser_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return File_ForceParser;
+}
+
+//***************************************************************************
+// File_Buffer_Size_Hint_Pointer
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void MediaInfo_Config_MediaInfo::File_Buffer_Size_Hint_Pointer_Set (size_t* NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    File_Buffer_Size_Hint_Pointer=NewValue;
+}
+
+size_t*  MediaInfo_Config_MediaInfo::File_Buffer_Size_Hint_Pointer_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return File_Buffer_Size_Hint_Pointer;
+}
+
+//***************************************************************************
+// Filter
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_FILTER
+void MediaInfo_Config_MediaInfo::File_Filter_Set (int64u NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    File_Filter_16[(int16u)NewValue]=true;
+    File_Filter_HasChanged_=true;
+}
+
+bool MediaInfo_Config_MediaInfo::File_Filter_Get (const int16u Value)
+{
+    CriticalSectionLocker CSL(CS);
+    //Test
+    bool Exists;
+    if (File_Filter_16.empty())
+        Exists=true;
+    else
+        Exists=(File_Filter_16.find(Value)!=File_Filter_16.end());
+    return Exists;
+}
+
+bool MediaInfo_Config_MediaInfo::File_Filter_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    bool Exist=!File_Filter_16.empty();
+    return Exist;
+}
+
+bool MediaInfo_Config_MediaInfo::File_Filter_HasChanged ()
+{
+    CriticalSectionLocker CSL(CS);
+    bool File_Filter_HasChanged_Temp=File_Filter_HasChanged_;
+    File_Filter_HasChanged_=false;
+    return File_Filter_HasChanged_Temp;
+}
+#endif //MEDIAINFO_FILTER
+
+//***************************************************************************
+// Duplicate
+//***************************************************************************
+
+#if MEDIAINFO_DUPLICATE
+Ztring MediaInfo_Config_MediaInfo::File_Duplicate_Set (const Ztring &Value_In)
+{
+    //Preparing for File__Duplicate...
+    CS.Enter();
+    File__Duplicate_List.push_back(Value_In);
+
+    //Handling Memory index
+    Ztring ToReturn;
+    ZtringList List=Value_In;
+    for (size_t Pos=0; Pos<List.size(); Pos++)
+    {
+        //Form= "(-)Data", if "-" the value will be removed
+        Ztring &Value=List[Pos];
+        bool ToRemove=false;
+        if (Value.find(__T('-'))==0)
+        {
+            Value.erase(Value.begin());
+            ToRemove=true;
+        }
+
+        //Testing if this is information about a target
+        if (List[Pos].find(__T("memory:"))==0 || List[Pos].find(__T("file:"))==0)
+        {
+            //Searching if already exist
+            size_t Memory_Pos=File__Duplicate_Memory_Indexes.Find(List[Pos]);
+            if (!ToRemove && Memory_Pos==Error)
+            {
+                //Does not exist yet (and adding is wanted)
+                Memory_Pos=File__Duplicate_Memory_Indexes.Find(__T(""));
+                if (Memory_Pos!=Error)
+                    File__Duplicate_Memory_Indexes[Memory_Pos]=List[Pos]; //A free place is found
+                else
+                {
+                    //Adding the place at the end
+                    Memory_Pos=File__Duplicate_Memory_Indexes.size();
+                    File__Duplicate_Memory_Indexes.push_back(List[Pos]);
+                }
+            }
+            else if (ToRemove)
+            {
+                //Exists yet but Removal is wanted
+                File__Duplicate_Memory_Indexes[Memory_Pos].clear();
+                Memory_Pos=(size_t)-1;
+            }
+
+            ToReturn+=__T(";")+Ztring().From_Number(Memory_Pos);
+        }
+    }
+    if (!ToReturn.empty())
+        ToReturn.erase(ToReturn.begin()); //Remove first ";"
+
+    CS.Leave();
+    File_IsSeekable_Set(false); //If duplication, we can not seek anymore
+
+    return ToReturn;
+}
+
+Ztring MediaInfo_Config_MediaInfo::File_Duplicate_Get (size_t AlreadyRead_Pos)
+{
+    CriticalSectionLocker CSL(CS);
+    if (AlreadyRead_Pos>=File__Duplicate_List.size())
+        return Ztring(); //Nothing or not more than the last time
+    Ztring Temp=File__Duplicate_List[AlreadyRead_Pos];
+    return Temp;
+}
+
+bool MediaInfo_Config_MediaInfo::File_Duplicate_Get_AlwaysNeeded (size_t AlreadyRead_Pos)
+{
+    CriticalSectionLocker CSL(CS);
+    bool Temp=AlreadyRead_Pos>=File__Duplicate_List.size();
+    return !Temp; //True if there is something to read
+}
+
+size_t MediaInfo_Config_MediaInfo::File__Duplicate_Memory_Indexes_Get (const Ztring &Value)
+{
+    CriticalSectionLocker CSL(CS);
+    return File__Duplicate_Memory_Indexes.Find(Value);
+}
+
+void MediaInfo_Config_MediaInfo::File__Duplicate_Memory_Indexes_Erase (const Ztring &Value)
+{
+    CriticalSectionLocker CSL(CS);
+    size_t Pos=File__Duplicate_Memory_Indexes.Find(Value);
+    if (Pos!=Error)
+        File__Duplicate_Memory_Indexes[Pos].clear();
+}
+#endif //MEDIAINFO_DUPLICATE
+
+//***************************************************************************
+// Demux
+//***************************************************************************
+
+#if MEDIAINFO_DEMUX
+//---------------------------------------------------------------------------
+void MediaInfo_Config_MediaInfo::Demux_ForceIds_Set (bool NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    Demux_ForceIds=NewValue;
+}
+
+bool MediaInfo_Config_MediaInfo::Demux_ForceIds_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return Demux_ForceIds;
+}
+
+//---------------------------------------------------------------------------
+void MediaInfo_Config_MediaInfo::Demux_PCM_20bitTo16bit_Set (bool NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    Demux_PCM_20bitTo16bit=NewValue;
+}
+
+bool MediaInfo_Config_MediaInfo::Demux_PCM_20bitTo16bit_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return Demux_PCM_20bitTo16bit;
+}
+
+//---------------------------------------------------------------------------
+void MediaInfo_Config_MediaInfo::Demux_Unpacketize_Set (bool NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    Demux_Unpacketize=NewValue;
+}
+
+bool MediaInfo_Config_MediaInfo::Demux_Unpacketize_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    return Demux_Unpacketize;
+}
+#endif //MEDIAINFO_DEMUX
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_DEMUX
+void MediaInfo_Config_MediaInfo::Demux_Rate_Set (float64 NewValue)
 {
     CriticalSectionLocker CSL(CS);
-    FileIsSeekable=NewValue;
+    Demux_Rate=NewValue;
 }
 
-bool MediaInfo_Config_MediaInfo::File_IsSeekable_Get ()
+float64 MediaInfo_Config_MediaInfo::Demux_Rate_Get ()
 {
     CriticalSectionLocker CSL(CS);
-    return FileIsSeekable;
+    return Demux_Rate;
 }
-
-//***************************************************************************
-// File Is Sub
-//***************************************************************************
+#endif //MEDIAINFO_DEMUX
 
 //---------------------------------------------------------------------------
-void MediaInfo_Config_MediaInfo::File_IsSub_Set (bool NewValue)
+#if MEDIAINFO_DEMUX
+void MediaInfo_Config_MediaInfo::Demux_FirstDts_Set (int64u NewValue)
 {
     CriticalSectionLocker CSL(CS);
-    FileIsSub=NewValue;
+    Demux_FirstDts=NewValue;
 }
 
-bool MediaInfo_Config_MediaInfo::File_IsSub_Get ()
+int64u MediaInfo_Config_MediaInfo::Demux_FirstDts_Get ()
 {
     CriticalSectionLocker CSL(CS);
-    return FileIsSub;
+    return Demux_FirstDts;
 }
-
-//***************************************************************************
-// File Keep Info
-//***************************************************************************
+#endif //MEDIAINFO_DEMUX
 
 //---------------------------------------------------------------------------
-void MediaInfo_Config_MediaInfo::File_KeepInfo_Set (bool NewValue)
+#if MEDIAINFO_DEMUX
+void MediaInfo_Config_MediaInfo::Demux_FirstFrameNumber_Set (int64u NewValue)
 {
     CriticalSectionLocker CSL(CS);
-    FileKeepInfo=NewValue;
+    Demux_FirstFrameNumber=NewValue;
 }
 
-bool MediaInfo_Config_MediaInfo::File_KeepInfo_Get ()
+int64u MediaInfo_Config_MediaInfo::Demux_FirstFrameNumber_Get ()
 {
     CriticalSectionLocker CSL(CS);
-    return FileKeepInfo;
+    return Demux_FirstFrameNumber;
 }
-
-//***************************************************************************
-// File Keep Info
-//***************************************************************************
+#endif //MEDIAINFO_DEMUX
 
 //---------------------------------------------------------------------------
-void MediaInfo_Config_MediaInfo::File_StopAfterFilled_Set (bool NewValue)
+#if MEDIAINFO_DEMUX
+void MediaInfo_Config_MediaInfo::Demux_InitData_Set (int8u NewValue)
 {
     CriticalSectionLocker CSL(CS);
-    FileStopAfterFilled=NewValue;
+    Demux_InitData=NewValue;
 }
 
-bool MediaInfo_Config_MediaInfo::File_StopAfterFilled_Get ()
+int8u MediaInfo_Config_MediaInfo::Demux_InitData_Get ()
 {
     CriticalSectionLocker CSL(CS);
-    return FileStopAfterFilled;
+    return Demux_InitData;
 }
+#endif //MEDIAINFO_DEMUX
 
 //***************************************************************************
-// Force Parser
+// IBI support
 //***************************************************************************
 
+#if MEDIAINFO_IBI
 //---------------------------------------------------------------------------
-void MediaInfo_Config_MediaInfo::File_ForceParser_Set (const Ztring &NewValue)
+void MediaInfo_Config_MediaInfo::Ibi_Set (const Ztring &Value)
 {
+    string Data_Base64=Value.To_UTF8();
+
     CriticalSectionLocker CSL(CS);
-    File_ForceParser=NewValue;
+    Ibi=Base64::decode(Data_Base64);
 }
 
-Ztring MediaInfo_Config_MediaInfo::File_ForceParser_Get ()
+string MediaInfo_Config_MediaInfo::Ibi_Get ()
 {
     CriticalSectionLocker CSL(CS);
-    return File_ForceParser;
+    return Ibi;
 }
-
-//***************************************************************************
-// Filter
-//***************************************************************************
-
 //---------------------------------------------------------------------------
-void MediaInfo_Config_MediaInfo::File_Filter_Set (int64u NewValue)
+void MediaInfo_Config_MediaInfo::Ibi_Create_Set (bool NewValue)
 {
     CriticalSectionLocker CSL(CS);
-    File_Filter_16[(int16u)NewValue]=true;
-    File_Filter_HasChanged_=true;
+    Ibi_Create=NewValue;
 }
 
-bool MediaInfo_Config_MediaInfo::File_Filter_Get (const int16u Value)
+bool MediaInfo_Config_MediaInfo::Ibi_Create_Get ()
 {
     CriticalSectionLocker CSL(CS);
-    //Test
-    bool Exists;
-    if (File_Filter_16.empty())
-        Exists=true;
-    else
-        Exists=(File_Filter_16.find(Value)!=File_Filter_16.end());
-    return Exists;
+    return Ibi_Create;
 }
+#endif //MEDIAINFO_IBI
 
-bool MediaInfo_Config_MediaInfo::File_Filter_Get ()
+//***************************************************************************
+// NextPacket
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_NEXTPACKET
+void MediaInfo_Config_MediaInfo::NextPacket_Set (bool NewValue)
 {
     CriticalSectionLocker CSL(CS);
-    bool Exist=!File_Filter_16.empty();
-    return Exist;
+    NextPacket=NewValue;
 }
 
-bool MediaInfo_Config_MediaInfo::File_Filter_HasChanged ()
+bool MediaInfo_Config_MediaInfo::NextPacket_Get ()
 {
     CriticalSectionLocker CSL(CS);
-    bool File_Filter_HasChanged_Temp=File_Filter_HasChanged_;
-    File_Filter_HasChanged_=false;
-    return File_Filter_HasChanged_Temp;
+    return NextPacket;
 }
+#endif //MEDIAINFO_NEXTPACKET
 
 //***************************************************************************
-// Duplicate
+// SubFile
 //***************************************************************************
 
-Ztring MediaInfo_Config_MediaInfo::File_Duplicate_Set (const Ztring &Value_In)
+#if MEDIAINFO_EVENTS
+//---------------------------------------------------------------------------
+ZtringListList MediaInfo_Config_MediaInfo::SubFile_Config_Get ()
 {
-    //Preparing for File__Duplicate...
-    CS.Enter();
-    File__Duplicate_List.push_back(Value_In);
+    CriticalSectionLocker CSL(CS);
 
-    //Handling Memory index
-    Ztring ToReturn;
-    ZtringList List=Value_In;
-    for (size_t Pos=0; Pos<List.size(); Pos++)
-    {
-        //Form= "(-)Data", if "-" the value will be removed
-        Ztring &Value=List[Pos];
-        bool ToRemove=false;
-        if (Value.find(_T('-'))==0)
-        {
-            Value.erase(Value.begin());
-            ToRemove=true;
-        }
+    return SubFile_Config;
+}
 
-        //Testing if this is information about a target
-        if (List[Pos].find(_T("memory:"))==0 || List[Pos].find(_T("file:"))==0)
-        {
-            //Searching if already exist
-            size_t Memory_Pos=File__Duplicate_Memory_Indexes.Find(List[Pos]);
-            if (!ToRemove && Memory_Pos==Error)
-            {
-                //Does not exist yet (and adding is wanted)
-                Memory_Pos=File__Duplicate_Memory_Indexes.Find(_T(""));
-                if (Memory_Pos!=Error)
-                    File__Duplicate_Memory_Indexes[Memory_Pos]=List[Pos]; //A free place is found
-                else
-                {
-                    //Adding the place at the end
-                    Memory_Pos=File__Duplicate_Memory_Indexes.size();
-                    File__Duplicate_Memory_Indexes.push_back(List[Pos]);
-                }
-            }
-            else if (ToRemove)
-            {
-                //Exists yet but Removal is wanted
-                File__Duplicate_Memory_Indexes[Memory_Pos].clear();
-                Memory_Pos=(size_t)-1;
-            }
+//---------------------------------------------------------------------------
+void MediaInfo_Config_MediaInfo::SubFile_StreamID_Set (int64u Value)
+{
+    CriticalSectionLocker CSL(CS);
 
-            ToReturn+=_T(";")+Ztring().From_Number(Memory_Pos);
-        }
-    }
-    if (!ToReturn.empty())
-        ToReturn.erase(ToReturn.begin()); //Remove first ";"
+    SubFile_StreamID=Value;
+}
 
-    CS.Leave();
-    File_IsSeekable_Set(false); //If duplication, we can not seek anymore
+//---------------------------------------------------------------------------
+int64u MediaInfo_Config_MediaInfo::SubFile_StreamID_Get ()
+{
+    CriticalSectionLocker CSL(CS);
 
-    return ToReturn;
+    return SubFile_StreamID;
 }
 
-Ztring MediaInfo_Config_MediaInfo::File_Duplicate_Get (size_t AlreadyRead_Pos)
+//---------------------------------------------------------------------------
+void MediaInfo_Config_MediaInfo::SubFile_IDs_Set (Ztring Value)
 {
     CriticalSectionLocker CSL(CS);
-    if (AlreadyRead_Pos>=File__Duplicate_List.size())
-        return Ztring(); //Nothing or not more than the last time
-    Ztring Temp=File__Duplicate_List[AlreadyRead_Pos];
-    return Temp;
+
+    SubFile_IDs=Value;
 }
 
-bool MediaInfo_Config_MediaInfo::File_Duplicate_Get_AlwaysNeeded (size_t AlreadyRead_Pos)
+//---------------------------------------------------------------------------
+Ztring MediaInfo_Config_MediaInfo::SubFile_IDs_Get ()
 {
     CriticalSectionLocker CSL(CS);
-    bool Temp=AlreadyRead_Pos>=File__Duplicate_List.size();
-    return !Temp; //True if there is something to read
+
+    return SubFile_IDs;
 }
+#endif //MEDIAINFO_EVENTS
 
-size_t MediaInfo_Config_MediaInfo::File__Duplicate_Memory_Indexes_Get (const Ztring &Value)
+//***************************************************************************
+// SubFile
+//***************************************************************************
+
+#if MEDIAINFO_EVENTS
+//---------------------------------------------------------------------------
+bool MediaInfo_Config_MediaInfo::ParseUndecodableFrames_Get ()
 {
     CriticalSectionLocker CSL(CS);
-    return File__Duplicate_Memory_Indexes.Find(Value);
+
+    return ParseUndecodableFrames;
 }
 
-void MediaInfo_Config_MediaInfo::File__Duplicate_Memory_Indexes_Erase (const Ztring &Value)
+//---------------------------------------------------------------------------
+void MediaInfo_Config_MediaInfo::ParseUndecodableFrames_Set (bool Value)
 {
     CriticalSectionLocker CSL(CS);
-    size_t Pos=File__Duplicate_Memory_Indexes.Find(Value);
-    if (Pos!=Error)
-        File__Duplicate_Memory_Indexes[Pos].clear();
+
+    ParseUndecodableFrames=Value;
 }
+#endif //MEDIAINFO_EVENTS
 
 //***************************************************************************
 // Event
@@ -438,9 +1357,11 @@
     else
         for (size_t Pos=0; Pos<List.size(); Pos++)
         {
-            if (List[Pos].find(_T("CallBack=memory://"))==0)
+            if (List[Pos].find(__T("CallBack=memory://"))==0)
                 Event_CallBackFunction=(MediaInfo_Event_CallBackFunction*)Ztring(List[Pos].substr(18, std::string::npos)).To_int64u();
-            else if (List[Pos].find(_T("UserHandler=memory://"))==0)
+            else if (List[Pos].find(__T("UserHandle=memory://"))==0)
+                Event_UserHandler=(void*)Ztring(List[Pos].substr(20, std::string::npos)).To_int64u();
+            else if (List[Pos].find(__T("UserHandler=memory://"))==0)
                 Event_UserHandler=(void*)Ztring(List[Pos].substr(21, std::string::npos)).To_int64u();
             else
                 return("Problem during Event_CallBackFunction value parsing");
@@ -452,6 +1373,16 @@
 
 //---------------------------------------------------------------------------
 #if MEDIAINFO_EVENTS
+Ztring MediaInfo_Config_MediaInfo::Event_CallBackFunction_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+
+    return __T("CallBack=memory://")+Ztring::ToZtring((size_t)Event_CallBackFunction)+__T(";UserHandler=memory://")+Ztring::ToZtring((size_t)Event_UserHandler);
+}
+#endif //MEDIAINFO_EVENTS
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_EVENTS
 void MediaInfo_Config_MediaInfo::Event_Send (const int8u* Data_Content, size_t Data_Size)
 {
     CriticalSectionLocker CSL(CS);
@@ -472,7 +1403,7 @@
     else
     {
         MediaInfo_Event_Generic* Event_Generic=(MediaInfo_Event_Generic*)Data_Content;
-        if ((Event_Generic->EventCode&0x00FFFF00)==(MediaInfo_Event_Global_Demux<<8))
+        if ((Event_Generic->EventCode&0x00FFFF03)==((MediaInfo_Event_Global_Demux<<8)|0x03)) //Demux version 3
         {
             if (!MediaInfoLib::Config.Demux_Get())
                 return;
@@ -483,30 +1414,29 @@
             MediaInfo_Event_Global_Demux_0* Event=(MediaInfo_Event_Global_Demux_0*)Data_Content;
 
             Ztring File_Name_Final(File_Name);
-            bool AddRawExtension=false;
-            for (size_t Pos=0; Pos<Event->StreamIDs_Size; Pos++)
+            if (Event->StreamIDs_Size==0)
+                File_Name_Final+=__T(".demux");
+            else for (size_t Pos=0; Pos<Event->StreamIDs_Size; Pos++)
             {
                 if (Event->StreamIDs_Width[Pos]==17)
                 {
                     Ztring ID;
                     ID.From_CC4((int32u)Event->StreamIDs[Pos]);
-                    File_Name_Final+=_T('.')+ID;
+                    File_Name_Final+=__T('.')+ID;
                 }
-                else if (Event->StreamIDs_Width[Pos] && Event->StreamIDs_Width[Pos]<=16)
+                else if (Event->StreamIDs_Width[Pos])
                 {
                     Ztring ID;
                     ID.From_Number(Event->StreamIDs[Pos], 16);
                     while (ID.size()<Event->StreamIDs_Width[Pos])
-                        ID.insert(0,  1, _T('0'));
+                        ID.insert(0,  1, __T('0'));
                     if (ID.size()>Event->StreamIDs_Width[Pos])
                         ID.erase(0, ID.size()-Event->StreamIDs_Width[Pos]);
-                    File_Name_Final+=_T('.')+ID;
+                    File_Name_Final+=__T('.')+ID;
                 }
                 else
-                    AddRawExtension=true;
+                    File_Name_Final+=__T(".raw");
             }
-            if (AddRawExtension)
-                File_Name_Final+=_T(".raw");
 
             File F;
             F.Open(File_Name_Final, File::Access_Write_Append);
@@ -550,6 +1480,36 @@
 }
 
 //---------------------------------------------------------------------------
+void MediaInfo_Config_MediaInfo::File_MpegTs_Atsc_transport_stream_id_Trust_Set (bool NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    File_MpegTs_Atsc_transport_stream_id_Trust=NewValue;
+}
+
+bool MediaInfo_Config_MediaInfo::File_MpegTs_Atsc_transport_stream_id_Trust_Get ()
+{
+    CS.Enter();
+    bool Temp=File_MpegTs_Atsc_transport_stream_id_Trust;
+    CS.Leave();
+    return Temp;
+}
+
+//---------------------------------------------------------------------------
+void MediaInfo_Config_MediaInfo::File_MpegTs_RealTime_Set (bool NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    File_MpegTs_RealTime=NewValue;
+}
+
+bool MediaInfo_Config_MediaInfo::File_MpegTs_RealTime_Get ()
+{
+    CS.Enter();
+    bool Temp=File_MpegTs_RealTime;
+    CS.Leave();
+    return Temp;
+}
+
+//---------------------------------------------------------------------------
 void MediaInfo_Config_MediaInfo::File_Bdmv_ParseTargetedFile_Set (bool NewValue)
 {
     CriticalSectionLocker CSL(CS);
@@ -564,6 +1524,39 @@
 }
 
 //---------------------------------------------------------------------------
+#if defined(MEDIAINFO_DVDIF_YES)
+void MediaInfo_Config_MediaInfo::File_DvDif_DisableAudioIfIsInContainer_Set (bool NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    File_DvDif_DisableAudioIfIsInContainer=NewValue;
+}
+
+bool MediaInfo_Config_MediaInfo::File_DvDif_DisableAudioIfIsInContainer_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    bool Temp=File_DvDif_DisableAudioIfIsInContainer;
+    return Temp;
+}
+#endif //defined(MEDIAINFO_DVDIF_YES)
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_DVDIF_YES)
+void MediaInfo_Config_MediaInfo::File_DvDif_IgnoreTransmittingFlags_Set (bool NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    File_DvDif_IgnoreTransmittingFlags=NewValue;
+}
+
+bool MediaInfo_Config_MediaInfo::File_DvDif_IgnoreTransmittingFlags_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    bool Temp=File_DvDif_IgnoreTransmittingFlags;
+    return Temp;
+}
+#endif //defined(MEDIAINFO_DVDIF_YES)
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_DVDIF_ANALYZE_YES)
 void MediaInfo_Config_MediaInfo::File_DvDif_Analysis_Set (bool NewValue)
 {
     CriticalSectionLocker CSL(CS);
@@ -576,13 +1569,45 @@
     bool Temp=File_DvDif_Analysis;
     return Temp;
 }
+#endif //defined(MEDIAINFO_DVDIF_ANALYZE_YES)
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_MACROBLOCKS
+void MediaInfo_Config_MediaInfo::File_Macroblocks_Parse_Set (bool NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    File_Macroblocks_Parse=NewValue;
+}
+
+bool MediaInfo_Config_MediaInfo::File_Macroblocks_Parse_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    bool Temp=File_Macroblocks_Parse;
+    return Temp;
+}
+#endif //MEDIAINFO_MACROBLOCKS
+
+//---------------------------------------------------------------------------
+void MediaInfo_Config_MediaInfo::File_GrowingFile_Delay_Set (float64 NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    File_GrowingFile_Delay=NewValue;
+}
+
+float64 MediaInfo_Config_MediaInfo::File_GrowingFile_Delay_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    float64 Temp=File_GrowingFile_Delay;
+    return Temp;
+}
 
 //---------------------------------------------------------------------------
+#if defined(MEDIAINFO_LIBCURL_YES)
 void MediaInfo_Config_MediaInfo::File_Curl_Set (const Ztring &NewValue)
 {
-    size_t Pos=NewValue.find(_T(','));
+    size_t Pos=NewValue.find(__T(','));
     if (Pos==string::npos)
-        Pos=NewValue.find(_T(';'));
+        Pos=NewValue.find(__T(';'));
     if (Pos!=string::npos)
     {
         Ztring Field=NewValue.substr(0, Pos); Field.MakeLowerCase();
@@ -592,11 +1617,67 @@
     }
 }
 
+void MediaInfo_Config_MediaInfo::File_Curl_Set (const Ztring &Field_, const Ztring &NewValue)
+{
+    Ztring Field=Field_; Field.MakeLowerCase();
+    CriticalSectionLocker CSL(CS);
+    Curl[Field]=NewValue;
+}
+
 Ztring MediaInfo_Config_MediaInfo::File_Curl_Get (const Ztring &Field_)
 {
     Ztring Field=Field_; Field.MakeLowerCase();
     CriticalSectionLocker CSL(CS);
-    return Curl[Field];
+    std::map<Ztring, Ztring>::iterator Value=Curl.find(Field);
+    if (Value==Curl.end())
+        return Ztring();
+    else
+        return Curl[Field];
+}
+#endif //defined(MEDIAINFO_LIBCURL_YES)
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_LIBMMS_YES)
+void MediaInfo_Config_MediaInfo::File_Mmsh_Describe_Only_Set (bool NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    File_Mmsh_Describe_Only=NewValue;
+}
+
+bool MediaInfo_Config_MediaInfo::File_Mmsh_Describe_Only_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    bool Temp=File_Mmsh_Describe_Only;
+    return Temp;
+}
+#endif //defined(MEDIAINFO_LIBMMS_YES)
+
+//---------------------------------------------------------------------------
+void MediaInfo_Config_MediaInfo::File_Eia608_DisplayEmptyStream_Set (bool NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    File_Eia608_DisplayEmptyStream=NewValue;
+}
+
+bool MediaInfo_Config_MediaInfo::File_Eia608_DisplayEmptyStream_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    bool Temp=File_Eia608_DisplayEmptyStream;
+    return Temp;
+}
+
+//---------------------------------------------------------------------------
+void MediaInfo_Config_MediaInfo::File_Eia708_DisplayEmptyStream_Set (bool NewValue)
+{
+    CriticalSectionLocker CSL(CS);
+    File_Eia708_DisplayEmptyStream=NewValue;
+}
+
+bool MediaInfo_Config_MediaInfo::File_Eia708_DisplayEmptyStream_Get ()
+{
+    CriticalSectionLocker CSL(CS);
+    bool Temp=File_Eia708_DisplayEmptyStream;
+    return Temp;
 }
 
 //***************************************************************************
@@ -618,4 +1699,3 @@
 }
 
 } //NameSpace
-

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/MediaInfo_Config_MediaInfo.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/MediaInfo_Config_MediaInfo.h Changed

@@ -1,17 +1,17 @@
 // MediaInfo_Config_MediaInfo - Configuration class
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -27,6 +27,7 @@
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
 #include "MediaInfo/MediaInfo_Internal_Const.h"
 #if MEDIAINFO_EVENTS
     #include "MediaInfo/MediaInfo_Config.h"
@@ -54,6 +55,7 @@
 public :
     //Constructor/Destructor
     MediaInfo_Config_MediaInfo();
+    ~MediaInfo_Config_MediaInfo();
 
     //General
     Ztring Option (const String &Option, const String &Value=Ztring());
@@ -64,85 +66,275 @@
     void          File_IsSub_Set (bool NewValue);
     bool          File_IsSub_Get ();
 
+    void          File_IsDetectingDuration_Set (bool NewValue);
+    bool          File_IsDetectingDuration_Get ();
+
+    void          File_IsReferenced_Set (bool NewValue);
+    bool          File_IsReferenced_Get ();
+
     void          File_KeepInfo_Set (bool NewValue);
     bool          File_KeepInfo_Get ();
 
     void          File_StopAfterFilled_Set (bool NewValue);
     bool          File_StopAfterFilled_Get ();
 
+    void          File_StopSubStreamAfterFilled_Set (bool NewValue);
+    bool          File_StopSubStreamAfterFilled_Get ();
+
+    void          File_Audio_MergeMonoStreams_Set (bool NewValue);
+    bool          File_Audio_MergeMonoStreams_Get ();
+
+    void          File_Demux_Interleave_Set (bool NewValue);
+    bool          File_Demux_Interleave_Get ();
+
+    void          File_ID_OnlyRoot_Set (bool NewValue);
+    bool          File_ID_OnlyRoot_Get ();
+
+    void          File_FileName_Set (const Ztring &NewValue);
+    Ztring        File_FileName_Get ();
+
+    void          File_FileNameFormat_Set (const Ztring &NewValue);
+    Ztring        File_FileNameFormat_Get ();
+
+    void          File_TimeToLive_Set (float64 NewValue);
+    float64       File_TimeToLive_Get ();
+
+    void          File_Partial_Begin_Set (const Ztring &NewValue);
+    Ztring        File_Partial_Begin_Get ();
+    void          File_Partial_End_Set (const Ztring &NewValue);
+    Ztring        File_Partial_End_Get ();
+
     void          File_ForceParser_Set (const Ztring &NewValue);
     Ztring        File_ForceParser_Get ();
 
+    void          File_Buffer_Size_Hint_Pointer_Set (size_t* NewValue);
+    size_t*       File_Buffer_Size_Hint_Pointer_Get ();
+
+    #if MEDIAINFO_NEXTPACKET
+    void          NextPacket_Set (bool NewValue);
+    bool          NextPacket_Get ();
+    #endif //MEDIAINFO_NEXTPACKET
+
+    #if MEDIAINFO_FILTER
     void          File_Filter_Set     (int64u NewValue);
     bool          File_Filter_Get     (const int16u  Value);
     bool          File_Filter_Get     ();
     bool          File_Filter_HasChanged();
+    #endif //MEDIAINFO_FILTER
 
+    #if MEDIAINFO_DUPLICATE
     Ztring        File_Duplicate_Set  (const Ztring &Value);
     Ztring        File_Duplicate_Get  (size_t AlreadyRead_Pos); //Requester must say how many Get() it already read
     bool          File_Duplicate_Get_AlwaysNeeded (size_t AlreadyRead_Pos); //Requester must say how many Get() it already read
+    #endif //MEDIAINFO_DEMUX
 
+    #if MEDIAINFO_DUPLICATE
     size_t        File__Duplicate_Memory_Indexes_Get (const Ztring &ToFind);
     void          File__Duplicate_Memory_Indexes_Erase (const Ztring &ToFind);
+    #endif //MEDIAINFO_DEMUX
+
+    #if MEDIAINFO_EVENTS
+    ZtringListList SubFile_Config_Get ();
+    void          SubFile_StreamID_Set(int64u Value);
+    int64u        SubFile_StreamID_Get();
+    void          SubFile_IDs_Set(Ztring Value);
+    Ztring        SubFile_IDs_Get();
+    #endif //MEDIAINFO_EVENTS
+
+    #if MEDIAINFO_EVENTS
+    bool          ParseUndecodableFrames_Get ();
+    void          ParseUndecodableFrames_Set (bool Value);
+    #endif //MEDIAINFO_EVENTS
 
     #if MEDIAINFO_EVENTS
     bool          Event_CallBackFunction_IsSet ();
     Ztring        Event_CallBackFunction_Set (const Ztring &Value);
+    Ztring        Event_CallBackFunction_Get ();
     void          Event_Send(const int8u* Data_Content, size_t Data_Size);
     void          Event_Send(const int8u* Data_Content, size_t Data_Size, const Ztring &File_Name);
-    #else //MEDIAINFO_EVENTS
-    bool          Event_CallBackFunction_IsSet () {return false;}
-    void          Event_Send(const int8u*, size_t) {};
-    void          Event_Send(const int8u*, size_t, const Ztring &) {};
     #endif //MEDIAINFO_EVENTS
 
+    #if MEDIAINFO_DEMUX
+    void          Demux_ForceIds_Set (bool NewValue);
+    bool          Demux_ForceIds_Get ();
+    void          Demux_PCM_20bitTo16bit_Set (bool NewValue);
+    bool          Demux_PCM_20bitTo16bit_Get ();
+    void          Demux_Unpacketize_Set (bool NewValue);
+    bool          Demux_Unpacketize_Get ();
+    void          Demux_Rate_Set (float64 NewValue);
+    float64       Demux_Rate_Get ();
+    void          Demux_FirstDts_Set (int64u NewValue);
+    int64u        Demux_FirstDts_Get ();
+    void          Demux_FirstFrameNumber_Set (int64u NewValue);
+    int64u        Demux_FirstFrameNumber_Get ();
+    void          Demux_InitData_Set (int8u NewValue);
+    int8u         Demux_InitData_Get ();
+    #endif //MEDIAINFO_DEMUX
+
+    #if MEDIAINFO_IBI
+    void          Ibi_Set (const Ztring &NewValue);
+    std::string   Ibi_Get ();
+    void          Ibi_Create_Set (bool NewValue);
+    bool          Ibi_Create_Get ();
+    #endif //MEDIAINFO_IBI
+
     //Specific
     void          File_MpegTs_ForceMenu_Set (bool NewValue);
     bool          File_MpegTs_ForceMenu_Get ();
     void          File_MpegTs_stream_type_Trust_Set (bool NewValue);
     bool          File_MpegTs_stream_type_Trust_Get ();
+    void          File_MpegTs_Atsc_transport_stream_id_Trust_Set (bool NewValue);
+    bool          File_MpegTs_Atsc_transport_stream_id_Trust_Get ();
+    void          File_MpegTs_RealTime_Set (bool NewValue);
+    bool          File_MpegTs_RealTime_Get ();
     void          File_Bdmv_ParseTargetedFile_Set (bool NewValue);
     bool          File_Bdmv_ParseTargetedFile_Get ();
+    #if defined(MEDIAINFO_DVDIF_YES)
+    void          File_DvDif_DisableAudioIfIsInContainer_Set (bool NewValue);
+    bool          File_DvDif_DisableAudioIfIsInContainer_Get ();
+    void          File_DvDif_IgnoreTransmittingFlags_Set (bool NewValue);
+    bool          File_DvDif_IgnoreTransmittingFlags_Get ();
+    #endif //defined(MEDIAINFO_DVDIF_YES)
+    #if defined(MEDIAINFO_DVDIF_ANALYZE_YES)
     void          File_DvDif_Analysis_Set (bool NewValue);
     bool          File_DvDif_Analysis_Get ();
+    #endif //defined(MEDIAINFO_DVDIF_ANALYZE_YES)
+    #if MEDIAINFO_MACROBLOCKS
+    void          File_Macroblocks_Parse_Set (bool NewValue);
+    bool          File_Macroblocks_Parse_Get ();
+    #endif //MEDIAINFO_MACROBLOCKS
+    void          File_GrowingFile_Delay_Set(float64 Value);
+    float64       File_GrowingFile_Delay_Get();
+    #if defined(MEDIAINFO_LIBCURL_YES)
     void          File_Curl_Set (const Ztring &NewValue);
+    void          File_Curl_Set (const Ztring &Field, const Ztring &NewValue);
     Ztring        File_Curl_Get (const Ztring &Field);
+    #endif //defined(MEDIAINFO_LIBCURL_YES)
+    #if defined(MEDIAINFO_LIBMMS_YES)
+    void          File_Mmsh_Describe_Only_Set (bool NewValue);
+    bool          File_Mmsh_Describe_Only_Get ();
+    #endif //defined(MEDIAINFO_LIBMMS_YES)
+    void          File_Eia608_DisplayEmptyStream_Set (bool NewValue);
+    bool          File_Eia608_DisplayEmptyStream_Get ();
+    void          File_Eia708_DisplayEmptyStream_Set (bool NewValue);
+    bool          File_Eia708_DisplayEmptyStream_Get ();
 
     //Analysis internal
     void          State_Set (float State);
     float         State_Get ();
 
+    //Internal to MediaInfo, not thread safe
+    ZtringList    File_Names;
+    std::vector<int64u> File_Sizes;
+    size_t        File_Names_Pos;
+    size_t        File_Buffer_Size_Max;
+    size_t        File_Buffer_Size_ToRead;
+    size_t        File_Buffer_Size;
+    int8u*        File_Buffer;
+    bool          File_Buffer_Repeat;
+    bool          File_Buffer_Repeat_IsSupported;
+    bool          File_IsGrowing;
+    bool          File_IsNotGrowingAnymore;
+    int64u        File_Current_Offset;
+    int64u        File_Current_Size;
+    int64u        File_Size;
+    float32       ParseSpeed;
+    #if MEDIAINFO_DEMUX
+    bool          Demux_EventWasSent;
+        #if MEDIAINFO_SEEK
+        bool      Demux_IsSeeking;
+        #endif //MEDIAINFO_SEEK
+    #endif //MEDIAINFO_DEMUX
+
 private :
     bool                    FileIsSeekable;
     bool                    FileIsSub;
+    bool                    FileIsDetectingDuration;
+    bool                    FileIsReferenced;
     bool                    FileKeepInfo;
     bool                    FileStopAfterFilled;
+    bool                    FileStopSubStreamAfterFilled;
+    bool                    Audio_MergeMonoStreams;
+    bool                    File_Demux_Interleave;
+    bool                    File_ID_OnlyRoot;
+    Ztring                  File_FileName;
+    Ztring                  File_FileNameFormat;
+    float64                 File_TimeToLive;
+    Ztring                  File_Partial_Begin;
+    Ztring                  File_Partial_End;
     Ztring                  File_ForceParser;
+    size_t*                 File_Buffer_Size_Hint_Pointer;
 
     //Extra
+    #if MEDIAINFO_NEXTPACKET
+    bool                    NextPacket;
+    #endif //MEDIAINFO_NEXTPACKET
+
+    #if MEDIAINFO_FILTER
     std::map<int16u, bool>  File_Filter_16;
     bool                    File_Filter_HasChanged_;
+    #endif //MEDIAINFO_FILTER
 
+    #if MEDIAINFO_DUPLICATE
     std::vector<Ztring>     File__Duplicate_List;
     ZtringList              File__Duplicate_Memory_Indexes;
+    #endif //MEDIAINFO_DUPLICATE
 
     //Event
     #if MEDIAINFO_EVENTS
     MediaInfo_Event_CallBackFunction* Event_CallBackFunction; //void Event_Handler(unsigned char* Data_Content, size_t Data_Size, void* UserHandler)
     void*                   Event_UserHandler;
+    ZtringListList          SubFile_Config;
+    int64u                  SubFile_StreamID;
+    bool                    ParseUndecodableFrames;
+    Ztring                  SubFile_IDs;
     #endif //MEDIAINFO_EVENTS
 
+    #if MEDIAINFO_DEMUX
+    bool                    Demux_ForceIds;
+    bool                    Demux_PCM_20bitTo16bit;
+    bool                    Demux_Unpacketize;
+    float64                 Demux_Rate;
+    int64u                  Demux_FirstDts;
+    int64u                  Demux_FirstFrameNumber;
+    int8u                   Demux_InitData;
+    #endif //MEDIAINFO_DEMUX
+
+    #if MEDIAINFO_IBI
+    std::string             Ibi;
+    bool                    Ibi_Create;
+    #endif //MEDIAINFO_IBI
+
     //Specific
     bool                    File_MpegTs_ForceMenu;
     bool                    File_MpegTs_stream_type_Trust;
+    bool                    File_MpegTs_Atsc_transport_stream_id_Trust;
+    bool                    File_MpegTs_RealTime;
     bool                    File_Bdmv_ParseTargetedFile;
+    #if defined(MEDIAINFO_DVDIF_YES)
+    bool                    File_DvDif_DisableAudioIfIsInContainer;
+    bool                    File_DvDif_IgnoreTransmittingFlags;
+    #endif //defined(MEDIAINFO_DVDIF_ANALYZE_YES)
+    #if defined(MEDIAINFO_DVDIF_YES)
     bool                    File_DvDif_Analysis;
+    #endif //defined(MEDIAINFO_DVDIF_ANALYZE_YES)
+    #if MEDIAINFO_MACROBLOCKS
+    bool                    File_Macroblocks_Parse;
+    #endif //MEDIAINFO_MACROBLOCKS
+    float64                 File_GrowingFile_Delay;
+    #if defined(MEDIAINFO_LIBMMS_YES)
+    bool                    File_Mmsh_Describe_Only;
+    #endif //defined(MEDIAINFO_LIBMMS_YES)
+    bool                    File_Eia608_DisplayEmptyStream;
+    bool                    File_Eia708_DisplayEmptyStream;
 
     //Analysis internal
     float                   State;
 
     //Generic
+    #if defined(MEDIAINFO_LIBCURL_YES)
     std::map<Ztring, Ztring> Curl;
+    #endif //defined(MEDIAINFO_LIBCURL_YES)
 
     ZenLib::CriticalSection CS;
 };
@@ -150,4 +342,3 @@
 } //NameSpace
 
 #endif
-

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/MediaInfo_Const.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/MediaInfo_Const.h Changed

@@ -1,17 +1,17 @@
 // MediaInfo_Config - Configuration class
-// Copyright (C) 2005-2007 Jerome Martinez, Zen@MediaArea.net
+// Copyright (C) 2005-2012 Jerome Martinez, Zen@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -121,8 +121,8 @@
 
 //---------------------------------------------------------------------------
 //Char types
-#undef  _T
-#define _T(__x)     __T(__x)
+#undef  __T
+#define __T(__x)     __T(__x)
 #if defined(UNICODE) || defined (_UNICODE)
     typedef wchar_t Char;
     #undef  __T

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/MediaInfo_Events.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/MediaInfo_Events.h Changed

@@ -1,3 +1,22 @@
+// MediaInfo_Events -
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
 /*Structures for MediaInfo events */
 
 #ifndef MediaInfo_EventsH
@@ -158,10 +177,12 @@
     #undef  MAXTYPE_INT
     #define MAXTYPE_INT 64
     typedef unsigned long long  MediaInfo_int64u;
+    typedef   signed long long  MediaInfo_int64s;
 #elif defined(__WIN32__) || defined(_WIN32)
     #undef  MAXTYPE_INT
     #define MAXTYPE_INT 64
     typedef unsigned __int64    MediaInfo_int64u;
+    typedef   signed __int64    MediaInfo_int64s;
 #else
     #pragma message This machine has no 64-bit integer type?
 #endif
@@ -208,6 +229,23 @@
 };
 
 /*-------------------------------------------------------------------------*/
+/* MediaInfo_Event_Log_0                                                   */
+#define MediaInfo_Event_Log 0x0F00
+struct MediaInfo_Event_Log_0
+{
+    MediaInfo_int32u        EventCode;
+    MediaInfo_int8u         Type;
+    MediaInfo_int8u         Severity;
+    MediaInfo_int8u         Reserved2;
+    MediaInfo_int8u         Reserved3;
+    MediaInfo_int32u        MessageCode;
+    MediaInfo_int32u        Reserved4;
+    const wchar_t*          MessageString;
+    const wchar_t*          MessageStringU;
+    const char*             MessageStringA;
+};
+
+/*-------------------------------------------------------------------------*/
 /* Demux                                                                   */
 #define MediaInfo_Event_Global_Demux 0xAF00
 enum MediaInfo_Event_Global_Demux_0_contenttype
@@ -221,6 +259,57 @@
 {
     MediaInfo_int32u        EventCode;
     MediaInfo_int64u        Stream_Offset;
+    MediaInfo_int64u        PCR;
+    MediaInfo_int64u        PTS;
+    MediaInfo_int64u        DTS;
+    size_t                  StreamIDs_Size;
+    MediaInfo_int64u*       StreamIDs;
+    MediaInfo_int8u*        StreamIDs_Width;
+    MediaInfo_int8u*        ParserIDs;
+    MediaInfo_int8u         Content_Type; /*MediaInfo_Event_Global_Demux_0_contenttype*/
+    size_t                  Content_Size;
+    const MediaInfo_int8u*  Content;
+};
+struct MediaInfo_Event_Global_Demux_1
+{
+    MediaInfo_int32u        EventCode;
+    MediaInfo_int64u        Stream_Offset;
+    MediaInfo_int64u        PCR;
+    MediaInfo_int64u        PTS;
+    MediaInfo_int64u        DTS;
+    size_t                  StreamIDs_Size;
+    MediaInfo_int64u*       StreamIDs;
+    MediaInfo_int8u*        StreamIDs_Width;
+    MediaInfo_int8u*        ParserIDs;
+    MediaInfo_int8u         Content_Type; /*MediaInfo_Event_Global_Demux_0_contenttype*/
+    size_t                  Content_Size;
+    const MediaInfo_int8u*  Content;
+    MediaInfo_int64u        DUR;
+};
+struct MediaInfo_Event_Global_Demux_2
+{
+    MediaInfo_int32u        EventCode;
+    MediaInfo_int64u        Stream_Offset;
+    MediaInfo_int64u        PCR;
+    MediaInfo_int64u        PTS;
+    MediaInfo_int64u        DTS;
+    size_t                  StreamIDs_Size;
+    MediaInfo_int64u*       StreamIDs;
+    MediaInfo_int8u*        StreamIDs_Width;
+    MediaInfo_int8u*        ParserIDs;
+    MediaInfo_int8u         Content_Type; /*MediaInfo_Event_Global_Demux_0_contenttype*/
+    size_t                  Content_Size;
+    const MediaInfo_int8u*  Content;
+    MediaInfo_int64u        DUR;
+    MediaInfo_int64u        Flags; /*bit0=random_access*/
+};
+struct MediaInfo_Event_Global_Demux_3
+{
+    MediaInfo_int32u        EventCode;
+    MediaInfo_int64u        Stream_Offset;
+    MediaInfo_int64u        PCR;
+    MediaInfo_int64u        PTS;
+    MediaInfo_int64u        DTS;
     size_t                  StreamIDs_Size;
     MediaInfo_int64u*       StreamIDs;
     MediaInfo_int8u*        StreamIDs_Width;
@@ -228,6 +317,31 @@
     MediaInfo_int8u         Content_Type; /*MediaInfo_Event_Global_Demux_0_contenttype*/
     size_t                  Content_Size;
     const MediaInfo_int8u*  Content;
+    MediaInfo_int64u        DUR;
+    MediaInfo_int64u        Flags; /*bit0=random_access*/
+    MediaInfo_int64u        FrameNumber;
+};
+
+/*-------------------------------------------------------------------------*/
+/* MediaInfo_Event_Video_SliceInfo_0                                       */
+#define MediaInfo_Event_Video_SliceInfo 0x7801
+struct MediaInfo_Event_Video_SliceInfo_0
+{
+    MediaInfo_int32u        EventCode;
+    MediaInfo_int64u        Stream_Offset;
+    MediaInfo_int64u        PCR;
+    MediaInfo_int64u        PTS;
+    MediaInfo_int64u        DTS;
+    MediaInfo_int64u        DUR;
+    size_t                  StreamIDs_Size;
+    MediaInfo_int64u*       StreamIDs;
+    MediaInfo_int8u*        StreamIDs_Width;
+    MediaInfo_int8u*        ParserIDs;
+    MediaInfo_int64u        FramePosition;
+    MediaInfo_int64u        FieldPosition;
+    MediaInfo_int64u        SlicePosition;
+    MediaInfo_int8u         SliceType;
+    MediaInfo_int64u        Flags;
 };
 
 /***************************************************************************/
@@ -281,6 +395,30 @@
     MediaInfo_int64u        Stream_Offset;
 };
 
+/*-------------------------------------------------------------------------*/
+/* SubFile_Start                                                           */
+#define MediaInfo_Event_General_SubFile_Start 0x7006
+struct MediaInfo_Event_General_SubFile_Start_0
+{
+    MediaInfo_int32u        EventCode;
+    size_t                  StreamIDs_Size;
+    MediaInfo_int64u*       StreamIDs;
+    MediaInfo_int8u*        StreamIDs_Width;
+    MediaInfo_int8u*        ParserIDs;
+    const char*             FileName_Relative;
+    const wchar_t*          FileName_Relative_Unicode;
+    const char*             FileName_Absolute;
+    const wchar_t*          FileName_Absolute_Unicode;
+};
+
+/*-------------------------------------------------------------------------*/
+/* SubFile_End                                                             */
+#define MediaInfo_Event_General_SubFile_End 0x7007
+struct MediaInfo_Event_General_SubFile_End_0
+{
+    MediaInfo_int32u        EventCode;
+};
+
 /***************************************************************************/
 /* MPEG-TS / BDAV / TSP                                                    */
 /***************************************************************************/
@@ -343,6 +481,7 @@
 /***************************************************************************/
 
 #define MediaInfo_Parser_Mpeg4          0x09
+#define MediaInfo_Parser_Mpeg4_Desc     0x71
 
 /***************************************************************************/
 /* MXF                                                                     */
@@ -375,6 +514,24 @@
 #define MediaInfo_Parser_Lxf            0x0E
 
 /***************************************************************************/
+/* HLS                                                                     */
+/***************************************************************************/
+
+#define MediaInfo_Parser_Hls            0x60
+
+/***************************************************************************/
+/* HLS Index                                                               */
+/***************************************************************************/
+
+#define MediaInfo_Parser_HlsIndex       0x61
+
+/***************************************************************************/
+/* Internet Streaming Media                                                */
+/***************************************************************************/
+
+#define MediaInfo_Parser_Ism            0x62
+
+/***************************************************************************/
 /* MPEG Video                                                              */
 /***************************************************************************/
 
@@ -387,6 +544,12 @@
 #define MediaInfo_Parser_Avc            0x81
 
 /***************************************************************************/
+/* VC-1                                                                    */
+/***************************************************************************/
+
+#define MediaInfo_Parser_Vc1            0x82
+
+/***************************************************************************/
 /* Active Format Description (AFD)                                         */
 /***************************************************************************/
 
@@ -399,12 +562,60 @@
 #define MediaInfo_Parser_BarData        0x84
 
 /***************************************************************************/
+/* MPEG-4 Visual                                                           */
+/***************************************************************************/
+
+#define MediaInfo_Parser_Mpeg4v         0x85
+
+/***************************************************************************/
 /* DTS                                                                     */
 /***************************************************************************/
 
 #define MediaInfo_Parser_Dts            0xA0
 
 /***************************************************************************/
+/* AC-3                                                                    */
+/***************************************************************************/
+
+#define MediaInfo_Parser_Ac3            0xA1
+
+/***************************************************************************/
+/* AAC                                                                     */
+/***************************************************************************/
+
+#define MediaInfo_Parser_Aac            0xA2
+
+/***************************************************************************/
+/* MPEG Audio                                                              */
+/***************************************************************************/
+
+#define MediaInfo_Parser_Mpega          0xA3
+
+/***************************************************************************/
+/* PCM                                                                     */
+/***************************************************************************/
+
+#define MediaInfo_Parser_Pcm            0xA4
+
+/***************************************************************************/
+/* AES-3                                                                   */
+/***************************************************************************/
+
+#define MediaInfo_Parser_Aes3           0xA5
+
+/***************************************************************************/
+/* Dolby E                                                                 */
+/***************************************************************************/
+
+#define MediaInfo_Parser_DolbyE         0xA6
+
+/***************************************************************************/
+/* Channel grouping intermediate module                                    */
+/***************************************************************************/
+
+#define MediaInfo_Parser_ChannelGrouping 0xA7
+
+/***************************************************************************/
 /* CEA-608 (formely IEA-608)                                               */
 /***************************************************************************/
 
@@ -441,4 +652,22 @@
 
 #define MediaInfo_Parser_Scte20         0xF5
 
+/***************************************************************************/
+/* DVB Subtitle                                                            */
+/***************************************************************************/
+
+#define MediaInfo_Parser_DvbSubtitle    0xF6
+
+/***************************************************************************/
+/* Teletext                                                                */
+/***************************************************************************/
+
+#define MediaInfo_Parser_Teletext       0xF7
+
+/***************************************************************************/
+/* SCC                                                                     */
+/***************************************************************************/
+
+#define MediaInfo_Parser_Scc            0xF8
+
 #endif //MediaInfo_EventsH

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/MediaInfo_Events_Internal.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/MediaInfo_Events_Internal.h Changed

@@ -1,4 +1,21 @@
-/*Helpers for MediaInfo events */
+// MediaInfo_Events -
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 #ifndef MediaInfo_Events_InternalH
 #define MediaInfo_Events_InternalH

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/MediaInfo_File.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/MediaInfo_File.cpp Changed

@@ -1,17 +1,17 @@
 // MediaInfo_Internal - All info about media files, different parser listing part
-// Copyright (C) 2006-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2006-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -24,15 +24,20 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #include "MediaInfo/MediaInfo_Internal.h"
+#include "MediaInfo/File__Analyze.h"
 #include "MediaInfo/Reader/Reader_File.h"
 //---------------------------------------------------------------------------
 
@@ -44,18 +49,33 @@
 #if defined(MEDIAINFO_CDXA_YES)
     #include "MediaInfo/Multiple/File_Cdxa.h"
 #endif
+#if defined(MEDIAINFO_DCP_YES)
+    #include "MediaInfo/Multiple/File_Dcp.h"
+#endif
 #if defined(MEDIAINFO_DVDIF_YES)
     #include "MediaInfo/Multiple/File_DvDif.h"
 #endif
 #if defined(MEDIAINFO_DVDV_YES)
     #include "MediaInfo/Multiple/File_Dvdv.h"
 #endif
+#if defined(MEDIAINFO_DXW_YES)
+    #include "MediaInfo/Multiple/File_Dxw.h"
+#endif
 #if defined(MEDIAINFO_FLV_YES)
     #include "MediaInfo/Multiple/File_Flv.h"
 #endif
 #if defined(MEDIAINFO_GXF_YES)
     #include "MediaInfo/Multiple/File_Gxf.h"
 #endif
+#if defined(MEDIAINFO_HLS_YES)
+    #include "MediaInfo/Multiple/File_Hls.h"
+#endif
+#if defined(MEDIAINFO_IBI_YES)
+    #include "MediaInfo/Multiple/File_Ibi.h"
+#endif
+#if defined(MEDIAINFO_ISM_YES)
+    #include "MediaInfo/Multiple/File_Ism.h"
+#endif
 #if defined(MEDIAINFO_IVF_YES)
     #include "MediaInfo/Multiple/File_Ivf.h"
 #endif
@@ -92,6 +112,9 @@
 #if defined(MEDIAINFO_RM_YES)
     #include "MediaInfo/Multiple/File_Rm.h"
 #endif
+#if defined(MEDIAINFO_SEQUENCEINFO_YES)
+    #include "MediaInfo/Multiple/File_SequenceInfo.h"
+#endif
 #if defined(MEDIAINFO_SKM_YES)
     #include "MediaInfo/Multiple/File_Skm.h"
 #endif
@@ -113,12 +136,18 @@
 #if defined(MEDIAINFO_AVC_YES)
     #include "MediaInfo/Video/File_Avc.h"
 #endif
+#if defined(MEDIAINFO_AVSV_YES)
+    #include "MediaInfo/Video/File_AvsV.h"
+#endif
 #if defined(MEDIAINFO_DIRAC_YES)
     #include "MediaInfo/Video/File_Dirac.h"
 #endif
 #if defined(MEDIAINFO_FLIC_YES)
     #include "MediaInfo/Video/File_Flic.h"
 #endif
+#if defined(MEDIAINFO_H263_YES)
+    #include "MediaInfo/Video/File_H263.h"
+#endif
 #if defined(MEDIAINFO_MPEG4V_YES)
     #include "MediaInfo/Video/File_Mpeg4v.h"
 #endif
@@ -128,20 +157,23 @@
 #if defined(MEDIAINFO_VC1_YES)
     #include "MediaInfo/Video/File_Vc1.h"
 #endif
-#if defined(MEDIAINFO_AVSV_YES)
-    #include "MediaInfo/Video/File_AvsV.h"
+#if defined(MEDIAINFO_VC3_YES)
+    #include "MediaInfo/Video/File_Vc3.h"
+#endif
+#if defined(MEDIAINFO_Y4M_YES)
+    #include "MediaInfo/Video/File_Y4m.h"
 #endif
 
 //---------------------------------------------------------------------------
 // Audio
+#if defined(MEDIAINFO_AAC_YES)
+    #include "MediaInfo/Audio/File_Aac.h"
+#endif
 #if defined(MEDIAINFO_AC3_YES)
     #include "MediaInfo/Audio/File_Ac3.h"
 #endif
-#if defined(MEDIAINFO_ADIF_YES)
-    #include "MediaInfo/Audio/File_Adif.h"
-#endif
-#if defined(MEDIAINFO_ADTS_YES)
-    #include "MediaInfo/Audio/File_Adts.h"
+#if defined(MEDIAINFO_AES3_YES)
+    #include "MediaInfo/Audio/File_Aes3.h"
 #endif
 #if defined(MEDIAINFO_ALS_YES)
     #include "MediaInfo/Audio/File_Als.h"
@@ -161,6 +193,9 @@
 #if defined(MEDIAINFO_DTS_YES)
     #include "MediaInfo/Audio/File_Dts.h"
 #endif
+#if defined(MEDIAINFO_DOLBYE_YES)
+    #include "MediaInfo/Audio/File_DolbyE.h"
+#endif
 #if defined(MEDIAINFO_FLAC_YES)
     #include "MediaInfo/Audio/File_Flac.h"
 #endif
@@ -188,12 +223,18 @@
 #if defined(MEDIAINFO_PCM_YES)
     #include "MediaInfo/Audio/File_Pcm.h"
 #endif
-#if defined(MEDIAINFO_S3M_YES)
-    #include "MediaInfo/Audio/File_ScreamTracker3.h"
-#endif
-#if defined(MEDIAINFO_TAK_YES)
-    #include "MediaInfo/Audio/File_Tak.h"
-#endif
+#if defined(MEDIAINFO_RKAU_YES)
+    #include "MediaInfo/Audio/File_Rkau.h"
+#endif
+#if defined(MEDIAINFO_S3M_YES)
+    #include "MediaInfo/Audio/File_ScreamTracker3.h"
+#endif
+#if defined(MEDIAINFO_RKAU_YES)
+    #include "MediaInfo/Audio/File_Rkau.h"
+#endif
+#if defined(MEDIAINFO_TAK_YES)
+    #include "MediaInfo/Audio/File_Tak.h"
+#endif
 #if defined(MEDIAINFO_TTA_YES)
     #include "MediaInfo/Audio/File_Tta.h"
 #endif
@@ -209,9 +250,15 @@
 
 //---------------------------------------------------------------------------
 // Text
+#if defined(MEDIAINFO_EIA608_YES)
+    #include "MediaInfo/Text/File_Eia608.h"
+#endif
 #if defined(MEDIAINFO_N19_YES)
     #include "MediaInfo/Text/File_N19.h"
 #endif
+#if defined(MEDIAINFO_SCC_YES)
+    #include "MediaInfo/Text/File_Scc.h"
+#endif
 #if defined(MEDIAINFO_OTHERTEXT_YES)
     #include "MediaInfo/Text/File_OtherText.h"
 #endif
@@ -221,6 +268,12 @@
 #if defined(MEDIAINFO_BMP_YES)
     #include "MediaInfo/Image/File_Bmp.h"
 #endif
+#if defined(MEDIAINFO_DPX_YES)
+    #include "MediaInfo/Image/File_Dpx.h"
+#endif
+#if defined(MEDIAINFO_EXR_YES)
+    #include "MediaInfo/Image/File_Exr.h"
+#endif
 #if defined(MEDIAINFO_GIF_YES)
     #include "MediaInfo/Image/File_Gif.h"
 #endif
@@ -230,12 +283,21 @@
 #if defined(MEDIAINFO_JPEG_YES)
     #include "MediaInfo/Image/File_Jpeg.h"
 #endif
+#if defined(MEDIAINFO_PCX_YES)
+    #include "MediaInfo/Image/File_Pcx.h"
+#endif
 #if defined(MEDIAINFO_PNG_YES)
     #include "MediaInfo/Image/File_Png.h"
 #endif
+#if defined(MEDIAINFO_PSD_YES)
+    #include "MediaInfo/Image/File_Psd.h"
+#endif
 #if defined(MEDIAINFO_TIFF_YES)
     #include "MediaInfo/Image/File_Tiff.h"
 #endif
+#if defined(MEDIAINFO_TGA_YES)
+    #include "MediaInfo/Image/File_Tga.h"
+#endif
 
 //---------------------------------------------------------------------------
 // Archive
@@ -254,6 +316,9 @@
 #if defined(MEDIAINFO_GZIP_YES)
     #include "MediaInfo/Archive/File_Gzip.h"
 #endif
+#if defined(MEDIAINFO_ISO9660_YES)
+    #include "MediaInfo/Archive/File_Iso9660.h"
+#endif
 #if defined(MEDIAINFO_MZ_YES)
     #include "MediaInfo/Archive/File_Mz.h"
 #endif
@@ -300,238 +365,296 @@
 
     // Multiple
     #if defined(MEDIAINFO_BDAV_YES)
-        else if (Parser==_T("Bdav"))       {Info=new File_MpegTs(); ((File_MpegTs*)Info)->BDAV_Size=4;}
+        else if (Parser==__T("Bdav"))       {Info=new File_MpegTs(); ((File_MpegTs*)Info)->BDAV_Size=4;}
     #endif
     #if defined(MEDIAINFO_BDMV_YES)
-        else if (Parser==_T("Bdmv"))        Info=new File_Bdmv();
+        else if (Parser==__T("Bdmv"))        Info=new File_Bdmv();
     #endif
     #if defined(MEDIAINFO_CDXA_YES)
-        else if (Parser==_T("Cdxa"))        Info=new File_Cdxa();
+        else if (Parser==__T("Cdxa"))        Info=new File_Cdxa();
+    #endif
+    #if defined(MEDIAINFO_DCP_YES)
+        else if (Parser==__T("Dcp"))         Info=new File_Dcp();
     #endif
     #if defined(MEDIAINFO_DVDIF_YES)
-        else if (Parser==_T("DvDif"))        Info=new File_DvDif();
+        else if (Parser==__T("DvDif"))        Info=new File_DvDif();
     #endif
     #if defined(MEDIAINFO_DVDV_YES)
-        else if (Parser==_T("Dvdv"))        Info=new File_Dvdv();
+        else if (Parser==__T("Dvdv"))        Info=new File_Dvdv();
+    #endif
+    #if defined(MEDIAINFO_DXW_YES)
+        else if (Parser==__T("Dxw"))         Info=new File_Dxw();
     #endif
     #if defined(MEDIAINFO_FLV_YES)
-        else if (Parser==_T("Flv"))         Info=new File_Flv();
+        else if (Parser==__T("Flv"))         Info=new File_Flv();
     #endif
     #if defined(MEDIAINFO_GXF_YES)
-        else if (Parser==_T("Gxf"))         Info=new File_Gxf();
+        else if (Parser==__T("Gxf"))         Info=new File_Gxf();
+    #endif
+    #if defined(MEDIAINFO_HLS_YES)
+        else if (Parser==__T("Hls"))         Info=new File_Hls();
     #endif
     #if defined(MEDIAINFO_IVF_YES)
-        else if (Parser==_T("Ivf"))         Info=new File_Ivf();
+        else if (Parser==__T("Ivf"))         Info=new File_Ivf();
+    #endif
+    #if defined(MEDIAINFO_ISM_YES)
+        else if (Parser==__T("Ism"))         Info=new File_Ism();
     #endif
     #if defined(MEDIAINFO_LXF_YES)
-        else if (Parser==_T("Lxf"))         Info=new File_Lxf();
+        else if (Parser==__T("Lxf"))         Info=new File_Lxf();
     #endif
     #if defined(MEDIAINFO_MK_YES)
-        else if (Parser==_T("Mk"))          Info=new File_Mk();
+        else if (Parser==__T("Mk"))          Info=new File_Mk();
     #endif
     #if defined(MEDIAINFO_MPEG4_YES)
-        else if (Parser==_T("Mpeg4"))       Info=new File_Mpeg4();
+        else if (Parser==__T("Mpeg4"))       Info=new File_Mpeg4();
     #endif
     #if defined(MEDIAINFO_MPEGPS_YES)
-        else if (Parser==_T("MpegPs"))      Info=new File_MpegPs();
+        else if (Parser==__T("MpegPs"))      Info=new File_MpegPs();
     #endif
     #if defined(MEDIAINFO_MPEGTS_YES)
-        else if (Parser==_T("MpegTs"))      Info=new File_MpegTs();
+        else if (Parser==__T("MpegTs"))      Info=new File_MpegTs();
     #endif
     #if defined(MEDIAINFO_MXF_YES)
-        else if (Parser==_T("Mxf"))         Info=new File_Mxf();
+        else if (Parser==__T("Mxf"))         Info=new File_Mxf();
     #endif
     #if defined(MEDIAINFO_NUT_YES)
-        else if (Parser==_T("Nut"))         Info=new File_Nut();
+        else if (Parser==__T("Nut"))         Info=new File_Nut();
     #endif
     #if defined(MEDIAINFO_OGG_YES)
-        else if (Parser==_T("Ogg"))         Info=new File_Ogg();
+        else if (Parser==__T("Ogg"))         Info=new File_Ogg();
     #endif
     #if defined(MEDIAINFO_P2_YES)
-        else if (Parser==_T("P2_Clip"))     Info=new File_P2_Clip();
+        else if (Parser==__T("P2_Clip"))     Info=new File_P2_Clip();
     #endif
     #if defined(MEDIAINFO_RIFF_YES)
-        else if (Parser==_T("Riff"))        Info=new File_Riff();
+        else if (Parser==__T("Riff"))        Info=new File_Riff();
     #endif
     #if defined(MEDIAINFO_RM_YES)
-        else if (Parser==_T("Rm"))          Info=new File_Rm();
+        else if (Parser==__T("Rm"))          Info=new File_Rm();
+    #endif
+    #if defined(MEDIAINFO_SEQUENCEINFO_YES)
+        else if (Parser==__T("SequenceInfo")) Info=new File_SequenceInfo();
     #endif
     #if defined(MEDIAINFO_SKM_YES)
-        else if (Parser==_T("Skm"))         Info=new File_Skm();
+        else if (Parser==__T("Skm"))         Info=new File_Skm();
     #endif
     #if defined(MEDIAINFO_SWF_YES)
-        else if (Parser==_T("Swf"))         Info=new File_Swf();
+        else if (Parser==__T("Swf"))         Info=new File_Swf();
     #endif
     #if defined(MEDIAINFO_WM_YES)
-        else if (Parser==_T("Wm"))          Info=new File_Wm();
+        else if (Parser==__T("Wm"))          Info=new File_Wm();
     #endif
     #if defined(MEDIAINFO_XDCAM_YES)
-        else if (Parser==_T("Xdcam_Clip"))   Info=new File_Xdcam_Clip();
+        else if (Parser==__T("Xdcam_Clip"))   Info=new File_Xdcam_Clip();
     #endif
     #if defined(MEDIAINFO_DPG_YES)
-        else if (Parser==_T("Dpg"))         Info=new File_Dpg();
+        else if (Parser==__T("Dpg"))         Info=new File_Dpg();
     #endif
 
     // Video
     #if defined(MEDIAINFO_AVC_YES)
-        else if (Parser==_T("Avc"))         Info=new File_Avc();
+        else if (Parser==__T("Avc"))         Info=new File_Avc();
+    #endif
+    #if defined(MEDIAINFO_AVSV_YES)
+        else if (Parser==__T("AvsV"))        Info=new File_AvsV();
     #endif
     #if defined(MEDIAINFO_DIRAC_YES)
-        else if (Parser==_T("Dirac"))       Info=new File_Dirac();
+        else if (Parser==__T("Dirac"))       Info=new File_Dirac();
     #endif
     #if defined(MEDIAINFO_FLIC_YES)
-        else if (Parser==_T("Flic"))        Info=new File_Flic();
+        else if (Parser==__T("Flic"))        Info=new File_Flic();
+    #endif
+    #if defined(MEDIAINFO_H263_YES)
+        else if (Parser==__T("H263"))        Info=new File_H263();
     #endif
     #if defined(MEDIAINFO_MPEG4V_YES)
-        else if (Parser==_T("Mpeg4v"))      Info=new File_Mpeg4v();
+        else if (Parser==__T("Mpeg4v"))      Info=new File_Mpeg4v();
     #endif
     #if defined(MEDIAINFO_MPEGV_YES)
-        else if (Parser==_T("Mpegv"))       Info=new File_Mpegv();
+        else if (Parser==__T("Mpegv"))       Info=new File_Mpegv();
     #endif
     #if defined(MEDIAINFO_VC1_YES)
-        else if (Parser==_T("Vc1"))         Info=new File_Vc1();
+        else if (Parser==__T("Vc1"))         Info=new File_Vc1();
     #endif
-    #if defined(MEDIAINFO_AVSV_YES)
-        else if (Parser==_T("AvsV"))        Info=new File_AvsV();
+    #if defined(MEDIAINFO_VC3_YES)
+        else if (Parser==__T("Vc3"))         Info=new File_Vc3();
+    #endif
+    #if defined(MEDIAINFO_Y4M_YES)
+        else if (Parser==__T("Y4m"))         Info=new File_Y4m();
     #endif
 
     // Audio
-    #if defined(MEDIAINFO_ADTS_YES)
-        else if (Parser==_T("Aac"))         Info=new File_Adts();
+    #if defined(MEDIAINFO_AAC_YES)
+        else if (Parser==__T("Aac"))         {Info=new File_Aac(); ((File_Aac*)Info)->Mode=File_Aac::Mode_ADIF;}
+    #endif
+    #if defined(MEDIAINFO_AAC_YES)
+        else if (Parser==__T("Aac"))         {Info=new File_Aac(); ((File_Aac*)Info)->Mode=File_Aac::Mode_ADTS;}
     #endif
     #if defined(MEDIAINFO_AC3_YES)
-        else if (Parser==_T("Ac3"))         Info=new File_Ac3();
+        else if (Parser==__T("Ac3"))         Info=new File_Ac3();
+    #endif
+    #if defined(MEDIAINFO_AES3_YES)
+        else if (Parser==__T("Aes3"))        Info=new File_Aes3();
     #endif
     #if defined(MEDIAINFO_ALS_YES)
-        else if (Parser==_T("Als"))         Info=new File_Als();
+        else if (Parser==__T("Als"))         Info=new File_Als();
     #endif
     #if defined(MEDIAINFO_AMR_YES)
-        else if (Parser==_T("Amr"))         Info=new File_Amr();
+        else if (Parser==__T("Amr"))         Info=new File_Amr();
     #endif
     #if defined(MEDIAINFO_AMV_YES)
-        else if (Parser==_T("Amv"))         Info=new File_Amv();
+        else if (Parser==__T("Amv"))         Info=new File_Amv();
     #endif
     #if defined(MEDIAINFO_APE_YES)
-        else if (Parser==_T("Ape"))         Info=new File_Ape();
+        else if (Parser==__T("Ape"))         Info=new File_Ape();
     #endif
     #if defined(MEDIAINFO_AU_YES)
-        else if (Parser==_T("Au"))          Info=new File_Au();
+        else if (Parser==__T("Au"))          Info=new File_Au();
     #endif
     #if defined(MEDIAINFO_DTS_YES)
-        else if (Parser==_T("Dts"))         Info=new File_Dts();
+        else if (Parser==__T("Dts"))         Info=new File_Dts();
+    #endif
+    #if defined(MEDIAINFO_DOLBYE_YES)
+        else if (Parser==__T("DolbyE"))      Info=new File_DolbyE();
     #endif
     #if defined(MEDIAINFO_FLAC_YES)
-        else if (Parser==_T("Flac"))        Info=new File_Flac();
+        else if (Parser==__T("Flac"))        Info=new File_Flac();
     #endif
     #if defined(MEDIAINFO_IT_YES)
-        else if (Parser==_T("It"))          Info=new File_ImpulseTracker();
+        else if (Parser==__T("It"))          Info=new File_ImpulseTracker();
     #endif
     #if defined(MEDIAINFO_LA_YES)
-        else if (Parser==_T("La"))          Info=new File_La();
+        else if (Parser==__T("La"))          Info=new File_La();
     #endif
     #if defined(MEDIAINFO_MIDI_YES)
-        else if (Parser==_T("Midi"))        Info=new File_Midi();
+        else if (Parser==__T("Midi"))        Info=new File_Midi();
     #endif
     #if defined(MEDIAINFO_MOD_YES)
-        else if (Parser==_T("Mod"))         Info=new File_Module();
+        else if (Parser==__T("Mod"))         Info=new File_Module();
     #endif
     #if defined(MEDIAINFO_MPC_YES)
-        else if (Parser==_T("Mpc"))         Info=new File_Mpc();
+        else if (Parser==__T("Mpc"))         Info=new File_Mpc();
     #endif
     #if defined(MEDIAINFO_MPCSV8_YES)
-        else if (Parser==_T("Mpc"))         Info=new File_MpcSv8();
+        else if (Parser==__T("Mpc"))         Info=new File_MpcSv8();
     #endif
     #if defined(MEDIAINFO_MPEGA_YES)
-        else if (Parser==_T("Mpega"))       Info=new File_Mpega();
+        else if (Parser==__T("Mpega"))       Info=new File_Mpega();
     #endif
     #if defined(MEDIAINFO_PCM_YES)
-        else if (Parser==_T("Pcm"))         Info=new File_Pcm();
+        //else if (Parser==__T("Pcm"))         Info=new File_Pcm();
     #endif
     #if defined(MEDIAINFO_AU_YES)
-        else if (Parser==_T("Au"))          Info=new File_Au();
+        else if (Parser==__T("Au"))          Info=new File_Au();
     #endif
+    #if defined(MEDIAINFO_RKAU_YES)
+        else if (Parser==__T("Rkau"))         Info=new File_Rkau();
+    #endif
     #if defined(MEDIAINFO_S3M_YES)
-        else if (Parser==_T("S3m"))         Info=new File_ScreamTracker3();
+        else if (Parser==__T("S3m"))         Info=new File_ScreamTracker3();
     #endif
     #if defined(MEDIAINFO_TAK_YES)
-        else if (Parser==_T("Tak"))         Info=new File_Tak();
+        else if (Parser==__T("Tak"))         Info=new File_Tak();
     #endif
     #if defined(MEDIAINFO_TTA_YES)
-        else if (Parser==_T("Tta"))         Info=new File_Tta();
+        else if (Parser==__T("Tta"))         Info=new File_Tta();
     #endif
     #if defined(MEDIAINFO_TWINVQ_YES)
-        else if (Parser==_T("TwinVQ"))      Info=new File_TwinVQ();
+        else if (Parser==__T("TwinVQ"))      Info=new File_TwinVQ();
     #endif
     #if defined(MEDIAINFO_WVPK_YES)
-        else if (Parser==_T("Wvpk"))        Info=new File_Wvpk();
+        else if (Parser==__T("Wvpk"))        Info=new File_Wvpk();
     #endif
     #if defined(MEDIAINFO_XM_YES)
-        else if (Parser==_T("Xm"))          Info=new File_ExtendedModule();
+        else if (Parser==__T("Xm"))          Info=new File_ExtendedModule();
     #endif
 
     // Text
+    #if defined(MEDIAINFO_EIA608_YES)
+        else if (Parser==__T("CEA-608"))     Info=new File_Eia608();
+        else if (Parser==__T("EIA-608"))     Info=new File_Eia608();
+    #endif
     #if defined(MEDIAINFO_OTHERTEXT_YES)
-        else if (Parser==_T("N19"))         Info=new File_N19();
+        else if (Parser==__T("N19"))         Info=new File_N19();
+    #endif
+    #if defined(MEDIAINFO_SCC_YES)
+        else if (Parser==__T("SCC"))         Info=new File_Scc();
     #endif
     #if defined(MEDIAINFO_OTHERTEXT_YES)
-        else if (Parser==_T("OtherText"))   Info=new File_OtherText();
+        else if (Parser==__T("OtherText"))   Info=new File_OtherText();
     #endif
 
     // Image
     #if defined(MEDIAINFO_GIF_YES)
-        else if (Parser==_T("Gif"))         Info=new File_Gif();
+        else if (Parser==__T("Gif"))         Info=new File_Gif();
     #endif
     #if defined(MEDIAINFO_BMP_YES)
-        else if (Parser==_T("Bmp"))         Info=new File_Bmp();
+        else if (Parser==__T("Bmp"))         Info=new File_Bmp();
+    #endif
+    #if defined(MEDIAINFO_DPX_YES)
+        else if (Parser==__T("Dpx"))         Info=new File_Dpx();
+    #endif
+    #if defined(MEDIAINFO_EXR_YES)
+        else if (Parser==__T("Exr"))         Info=new File_Exr();
     #endif
     #if defined(MEDIAINFO_ICO_YES)
-        else if (Parser==_T("Ico"))         Info=new File_Ico();
+        else if (Parser==__T("Ico"))         Info=new File_Ico();
     #endif
     #if defined(MEDIAINFO_JPEG_YES)
-        else if (Parser==_T("Jpeg"))        Info=new File_Jpeg();
+        else if (Parser==__T("Jpeg"))        Info=new File_Jpeg();
     #endif
+    #if defined(MEDIAINFO_PCX_YES)
+        else if (Parser==__T("PCX"))         Info=new File_Pcx();
+    #endif
     #if defined(MEDIAINFO_PNG_YES)
-        else if (Parser==_T("Png"))         Info=new File_Png();
+        else if (Parser==__T("Png"))         Info=new File_Png();
+    #endif
+    #if defined(MEDIAINFO_PSD_YES)
+        else if (Parser==__T("Psd"))         Info=new File_Psd();
     #endif
     #if defined(MEDIAINFO_TIFF_YES)
-        else if (Parser==_T("Tiff"))        Info=new File_Tiff();
+        else if (Parser==__T("Tiff"))        Info=new File_Tiff();
+    #endif
+    #if defined(MEDIAINFO_TGA_YES)
+        else if (Parser==__T("Tga"))         Info=new File_Tga();
     #endif
 
     // Archive
     #if defined(MEDIAINFO_7Z_YES)
-        else if (Parser==_T("7z"))          Info=new File_7z();
+        else if (Parser==__T("7z"))          Info=new File_7z();
     #endif
     #if defined(MEDIAINFO_ACE_YES)
-        else if (Parser==_T("Ace"))         Info=new File_Ace();
+        else if (Parser==__T("Ace"))         Info=new File_Ace();
     #endif
     #if defined(MEDIAINFO_BZIP2_YES)
-        else if (Parser==_T("Bzip2"))       Info=new File_Bzip2();
+        else if (Parser==__T("Bzip2"))       Info=new File_Bzip2();
     #endif
     #if defined(MEDIAINFO_ELF_YES)
-        else if (Parser==_T("Elf"))         Info=new File_Elf();
+        else if (Parser==__T("Elf"))         Info=new File_Elf();
     #endif
     #if defined(MEDIAINFO_GZIP_YES)
-        else if (Parser==_T("Gzip"))        Info=new File_Gzip();
+        else if (Parser==__T("Gzip"))        Info=new File_Gzip();
+    #endif
+    #if defined(MEDIAINFO_ISO9660_YES)
+        else if (Parser==__T("Iso9660"))     Info=new File_Iso9660();
     #endif
     #if defined(MEDIAINFO_MZ_YES)
-        else if (Parser==_T("Mz"))          Info=new File_Mz();
+        else if (Parser==__T("Mz"))          Info=new File_Mz();
     #endif
     #if defined(MEDIAINFO_RAR_YES)
-        else if (Parser==_T("Rar"))         Info=new File_Rar();
+        else if (Parser==__T("Rar"))         Info=new File_Rar();
     #endif
     #if defined(MEDIAINFO_TAR_YES)
-        else if (Parser==_T("Tar"))         Info=new File_Tar();
+        else if (Parser==__T("Tar"))         Info=new File_Tar();
     #endif
     #if defined(MEDIAINFO_ZIP_YES)
-        else if (Parser==_T("Zip"))         Info=new File_Zip();
+        else if (Parser==__T("Zip"))         Info=new File_Zip();
     #endif
 
     // Other
-    #if !defined(MEDIAINFO_OTHER_NO)
-        else if (Parser==_T("Other"))       Info=new File_Other();
-    #endif
-    #if !defined(MEDIAINFO_OTHER_NO)
-        else if (Parser==_T("Unknown"))     Info=new File_Unknown();
+    #if defined(MEDIAINFO_OTHER_YES)
+        else if (Parser==__T("Other"))       Info=new File_Other();
     #endif
 
     //No parser
@@ -542,261 +665,314 @@
 }
 
 //---------------------------------------------------------------------------
+#if !defined(MEDIAINFO_READER_NO)
 int MediaInfo_Internal::ListFormats(const String &File_Name)
 {
     // Multiple
     #if defined(MEDIAINFO_BDAV_YES)
-        delete Info; Info=new File_MpegTs(); ((File_MpegTs*)Info)->BDAV_Size=4; if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_MpegTs(); ((File_MpegTs*)Info)->BDAV_Size=4; if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_BDMV_YES)
-        delete Info; Info=new File_Bdmv();               if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Bdmv();               if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_CDXA_YES)
-        delete Info; Info=new File_Cdxa();               if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Cdxa();               if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
+    #endif
+    #if defined(MEDIAINFO_DCP_YES)
+        delete Info; Info=new File_Dcp();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_DVDIF_YES)
-        delete Info; Info=new File_DvDif();              if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_DvDif();              if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_DVDV_YES)
-        delete Info; Info=new File_Dvdv();               if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Dvdv();               if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
+    #endif
+    #if defined(MEDIAINFO_DXW_YES)
+        delete Info; Info=new File_Dxw();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_FLV_YES)
-        delete Info; Info=new File_Flv();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Flv();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_GXF_YES)
-        delete Info; Info=new File_Gxf();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Gxf();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
+    #endif
+    #if defined(MEDIAINFO_HLS_YES)
+        delete Info; Info=new File_Hls();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
+    #endif
+    #if defined(MEDIAINFO_IBI_YES)
+        delete Info; Info=new File_Ibi();                 if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
+    #endif
+    #if defined(MEDIAINFO_ISM_YES)
+        delete Info; Info=new File_Ism();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_IVF_YES)
-        delete Info; Info=new File_Ivf();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Ivf();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_LXF_YES)
-        delete Info; Info=new File_Lxf();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Lxf();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_MK_YES)
-        delete Info; Info=new File_Mk();                 if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Mk();                 if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_MPEG4_YES)
-        delete Info; Info=new File_Mpeg4();              if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Mpeg4();              if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_MPEGPS_YES)
-        delete Info; Info=new File_MpegPs();             if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_MpegPs();             if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_MPEGTS_YES)
-        delete Info; Info=new File_MpegTs();             if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_MpegTs();             if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_MPLI_YES)
-        delete Info; Info=new File_Mpli();               if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Mpli();               if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_MXF_YES)
-        delete Info; Info=new File_Mxf();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Mxf();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_NUT_YES)
-        delete Info; Info=new File_Nut();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Nut();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_OGG_YES)
-        delete Info; Info=new File_Ogg();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Ogg();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_P2_YES)
-        delete Info; Info=new File_P2_Clip();            if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_P2_Clip();            if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_RIFF_YES)
-        delete Info; Info=new File_Riff();               if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Riff();               if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_RM_YES)
-        delete Info; Info=new File_Rm();                 if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Rm();                 if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
+    #endif
+    #if defined(MEDIAINFO_SEQUENCEINFO_YES)
+        delete Info; Info=new File_SequenceInfo();       if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_SKM_YES)
-        delete Info; Info=new File_Skm();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Skm();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_SWF_YES)
-        delete Info; Info=new File_Swf();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Swf();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_TSP_YES)
-        delete Info; Info=new File_MpegTs(); ((File_MpegTs*)Info)->TSP_Size=16; if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_MpegTs(); ((File_MpegTs*)Info)->TSP_Size=16; if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_WM_YES)
-        delete Info; Info=new File_Wm();                 if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Wm();                 if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_XDCAM_YES)
-        delete Info; Info=new File_Xdcam_Clip();         if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Xdcam_Clip();         if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_DPG_YES)
-        delete Info; Info=new File_Dpg();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Dpg();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
 
     // Video
     #if defined(MEDIAINFO_AVC_YES)
-        delete Info; Info=new File_Avc();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Avc();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
+    #endif
+    #if defined(MEDIAINFO_AVSV_YES)
+        delete Info; Info=new File_AvsV();               if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_DIRAC_YES)
-        delete Info; Info=new File_Dirac();              if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Dirac();              if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_FLIC_YES)
-        delete Info; Info=new File_Flic();               if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Flic();               if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
+    #endif
+    #if defined(MEDIAINFO_H263_YES)
+        delete Info; Info=new File_H263();               if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_MPEG4V_YES)
-        delete Info; Info=new File_Mpeg4v();             if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Mpeg4v();             if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_MPEGV_YES)
-        delete Info; Info=new File_Mpegv();              if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Mpegv();              if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_VC1_YES)
-        delete Info; Info=new File_Vc1();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Vc1();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
-    #if defined(MEDIAINFO_AVSV_YES)
-        delete Info; Info=new File_AvsV();               if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+    #if defined(MEDIAINFO_VC3_YES)
+        delete Info; Info=new File_Vc3();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
+    #endif
+    #if defined(MEDIAINFO_Y4M_YES)
+        delete Info; Info=new File_Y4m();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
 
     // Audio
-    #if defined(MEDIAINFO_AC3_YES)
-        delete Info; Info=new File_Ac3();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+    #if defined(MEDIAINFO_AAC_YES)
+        delete Info; Info=new File_Aac();               if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
-    #if defined(MEDIAINFO_ADIF_YES)
-        delete Info; Info=new File_Adif();               if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+    #if defined(MEDIAINFO_AC3_YES)
+        delete Info; Info=new File_Ac3();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
-    #if defined(MEDIAINFO_ADTS_YES)
-        delete Info; Info=new File_Adts();               if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+    #if defined(MEDIAINFO_AES3_YES)
+        delete Info; Info=new File_Aes3();               if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_ALS_YES)
-        delete Info; Info=new File_Als();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Als();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_AMR_YES)
-        delete Info; Info=new File_Amr();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Amr();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_AMV_YES)
-        delete Info; Info=new File_Amv();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Amv();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_APE_YES)
-        delete Info; Info=new File_Ape();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Ape();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_AU_YES)
-        delete Info; Info=new File_Au();                 if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Au();                 if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_DTS_YES)
-        delete Info; Info=new File_Dts();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Dts();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
+    #endif
+    #if defined(MEDIAINFO_DOLBYE_YES)
+        delete Info; Info=new File_DolbyE();             if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_FLAC_YES)
-        delete Info; Info=new File_Flac();               if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Flac();               if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_IT_YES)
-        delete Info; Info=new File_ImpulseTracker();     if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_ImpulseTracker();     if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_LA_YES)
-        delete Info; Info=new File_La();                 if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_La();                 if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_MIDI_YES)
-        delete Info; Info=new File_Midi();               if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Midi();               if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_MOD_YES)
-        delete Info; Info=new File_Module();             if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Module();             if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_MPC_YES)
-        delete Info; Info=new File_Mpc();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Mpc();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_MPCSV8_YES)
-        delete Info; Info=new File_MpcSv8();             if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_MpcSv8();             if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_MPEGA_YES)
-        delete Info; Info=new File_Mpega();              if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Mpega();              if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_PCM_YES)
-      //delete Info; Info=new File_Pcm();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+      //delete Info; Info=new File_Pcm();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
+    #if defined(MEDIAINFO_RKAU_YES)
+        delete Info; Info=new File_Rkau();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
+    #endif
     #if defined(MEDIAINFO_TAK_YES)
-        delete Info; Info=new File_Tak();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Tak();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_S3M_YES)
-        delete Info; Info=new File_ScreamTracker3();     if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_ScreamTracker3();     if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_TTA_YES)
-        delete Info; Info=new File_Tta();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Tta();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_TWINVQ_YES)
-        delete Info; Info=new File_TwinVQ();             if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_TwinVQ();             if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_WVPK_YES)
-        delete Info; Info=new File_Wvpk();               if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Wvpk();               if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_XM_YES)
-        delete Info; Info=new File_ExtendedModule();     if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_ExtendedModule();     if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
 
     // Text
     #if defined(MEDIAINFO_N19_YES)
-        delete Info; Info=new File_N19();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_N19();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
+    #endif
+    #if defined(MEDIAINFO_SCC_YES)
+        delete Info; Info=new File_Scc();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_OTHERTEXT_YES)
-        delete Info; Info=new File_OtherText();          if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_OtherText();          if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
 
     // Image
     #if defined(MEDIAINFO_BMP_YES)
-        delete Info; Info=new File_Bmp();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Bmp();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
+    #endif
+    #if defined(MEDIAINFO_DPX_YES)
+        delete Info; Info=new File_Dpx();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_GIF_YES)
-        delete Info; Info=new File_Gif();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Gif();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_ICO_YES)
-        delete Info; Info=new File_Ico();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Ico();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_JPEG_YES)
-        delete Info; Info=new File_Jpeg();               if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Jpeg();               if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
+    #if defined(MEDIAINFO_PCX_YES)
+        delete Info; Info=new File_Pcx();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
+    #endif
     #if defined(MEDIAINFO_PNG_YES)
-        delete Info; Info=new File_Png();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Png();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
+    #endif
+    #if defined(MEDIAINFO_PSD_YES)
+        delete Info; Info=new File_Psd();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_TIFF_YES)
-        delete Info; Info=new File_Tiff();               if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Tiff();               if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
+    #endif
+    #if defined(MEDIAINFO_TGA_YES)
+        delete Info; Info=new File_Tga();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
 
     // Archive
     #if defined(MEDIAINFO_ACE_YES)
-        delete Info; Info=new File_Ace();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Ace();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_7Z_YES)
-        delete Info; Info=new File_7z();                 if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_7z();                 if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_BZIP2_YES)
-        delete Info; Info=new File_Bzip2();              if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Bzip2();              if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_ELF_YES)
-        delete Info; Info=new File_Elf();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Elf();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_GZIP_YES)
-        delete Info; Info=new File_Gzip();               if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Gzip();               if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
+    #endif
+    #if defined(MEDIAINFO_ISO9660_YES)
+        delete Info; Info=new File_Iso9660();            if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_MZ_YES)
-        delete Info; Info=new File_Mz();                 if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Mz();                 if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_RAR_YES)
-        delete Info; Info=new File_Rar();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Rar();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_TAR_YES)
-        delete Info; Info=new File_Tar();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Tar();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
     #if defined(MEDIAINFO_ZIP_YES)
-        delete Info; Info=new File_Zip();                if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Zip();                if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
 
     // Other
     #if !defined(MEDIAINFO_OTHER_NO)
-        delete Info; Info=new File_Other();              if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
-    #endif
-    #if !defined(MEDIAINFO_UNKNOWN_NO)
-        delete Info; Info=new File_Unknown();            if (Reader_File::Format_Test_PerParser(this, File_Name)>0) return 1;
+        delete Info; Info=new File_Other();              if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     #endif
+
+    // Default (empty)
+        delete Info; Info=new File_Unknown();            if (((Reader_File*)Reader)->Format_Test_PerParser(this, File_Name)>0) return 1;
     return 0;
 }
+#endif //!defined(MEDIAINFO_READER_NO)
 
 //---------------------------------------------------------------------------
 bool MediaInfo_Internal::LibraryIsModified ()
 {
     #if defined(MEDIAINFO_MULTI_NO) || defined(MEDIAINFO_VIDEO_NO) || defined(MEDIAINFO_AUDIO_NO) || defined(MEDIAINFO_TEXT_NO) || defined(MEDIAINFO_IMAGE_NO) || defined(MEDIAINFO_ARCHIVE_NO) \
-     || defined(MEDIAINFO_BDAV_NO) || defined(MEDIAINFO_MK_NO) || defined(MEDIAINFO_OGG_NO) || defined(MEDIAINFO_RIFF_NO) || defined(MEDIAINFO_MPEG4_NO) || defined(MEDIAINFO_MPEGPS_NO) || defined(MEDIAINFO_MPEGTS_NO) || defined(MEDIAINFO_FLV_NO) || defined(MEDIAINFO_GXF_NO) || defined(MEDIAINFO_IVF_NO) || defined(MEDIAINFO_LXF_NO) || defined(MEDIAINFO_SWF_NO) || defined(MEDIAINFO_MXF_NO) || defined(MEDIAINFO_NUT_NO) || defined(MEDIAINFO_WM_NO) || defined(MEDIAINFO_QT_NO) || defined(MEDIAINFO_RM_NO) || defined(MEDIAINFO_DVDIF_NO) || defined(MEDIAINFO_DVDV_NO) || defined(MEDIAINFO_CDXA_NO) || defined(MEDIAINFO_DPG_NO) || defined(MEDIAINFO_TSP_NO) \
-     || defined(MEDIAINFO_AVC_NO) || defined(MEDIAINFO_MPEG4V_NO) || defined(MEDIAINFO_MPEGV_NO) || defined(MEDIAINFO_FLIC_NO) || defined(MEDIAINFO_THEORA_NO) \
-     || defined(MEDIAINFO_AC3_NO) || defined(MEDIAINFO_ADIF_NO) || defined(MEDIAINFO_ADTS_NO) || defined(MEDIAINFO_AMR_NO) || defined(MEDIAINFO_DTS_NO) || defined(MEDIAINFO_FLAC_NO) || defined(MEDIAINFO_APE_NO) || defined(MEDIAINFO_MPC_NO) || defined(MEDIAINFO_MPCSV8_NO) || defined(MEDIAINFO_MPEGA_NO) || defined(MEDIAINFO_TWINVQ_NO) || defined(MEDIAINFO_XM_NO) || defined(MEDIAINFO_MOD_NO) || defined(MEDIAINFO_S3M_NO) || defined(MEDIAINFO_IT_NO) || defined(MEDIAINFO_AES3_NO) || defined(MEDIAINFO_SPEEX_NO) || defined(MEDIAINFO_TAK_NO) || defined(MEDIAINFO_PS2A_NO) \
+     || defined(MEDIAINFO_BDAV_NO) || defined(MEDIAINFO_MK_NO) || defined(MEDIAINFO_OGG_NO) || defined(MEDIAINFO_RIFF_NO) || defined(MEDIAINFO_MPEG4_NO) || defined(MEDIAINFO_MPEGPS_NO) || defined(MEDIAINFO_MPEGTS_NO) || defined(MEDIAINFO_DXW_NO) || defined(MEDIAINFO_FLV_NO) || defined(MEDIAINFO_GXF_NO) || defined(MEDIAINFO_HLS_NO) || defined(MEDIAINFO_ISM_NO) || defined(MEDIAINFO_IVF_NO) || defined(MEDIAINFO_LXF_NO) || defined(MEDIAINFO_SWF_NO) || defined(MEDIAINFO_MXF_NO) || defined(MEDIAINFO_NUT_NO) || defined(MEDIAINFO_WM_NO) || defined(MEDIAINFO_QT_NO) || defined(MEDIAINFO_RM_NO) || defined(MEDIAINFO_DVDIF_NO) || defined(MEDIAINFO_DVDV_NO) || defined(MEDIAINFO_CDXA_NO) || defined(MEDIAINFO_DPG_NO) || defined(MEDIAINFO_TSP_NO) \
+     || defined(MEDIAINFO_AVC_NO) || defined(MEDIAINFO_AVSV_NO) || defined(MEDIAINFO_MPEG4V_NO) || defined(MEDIAINFO_MPEGV_NO) || defined(MEDIAINFO_FLIC_NO) || defined(MEDIAINFO_THEORA_NO) || defined(MEDIAINFO_Y4M_NO) \
+     || defined(MEDIAINFO_AC3_NO) || defined(MEDIAINFO_ADIF_NO) || defined(MEDIAINFO_ADTS_NO) || defined(MEDIAINFO_AES3_NO) || defined(MEDIAINFO_AMR_NO) || defined(MEDIAINFO_DTS_NO) || defined(MEDIAINFO_DOLBYE_NO) || defined(MEDIAINFO_FLAC_NO) || defined(MEDIAINFO_APE_NO) || defined(MEDIAINFO_MPC_NO) || defined(MEDIAINFO_MPCSV8_NO) || defined(MEDIAINFO_MPEGA_NO) || defined(MEDIAINFO_TWINVQ_NO) || defined(MEDIAINFO_XM_NO) || defined(MEDIAINFO_MOD_NO) || defined(MEDIAINFO_S3M_NO) || defined(MEDIAINFO_IT_NO) || defined(MEDIAINFO_SPEEX_NO) || defined(MEDIAINFO_TAK_NO) || defined(MEDIAINFO_PS2A_NO) \
      || defined(MEDIAINFO_CMML_NO)  || defined(MEDIAINFO_KATE_NO)  || defined(MEDIAINFO_PGS_NO) || defined(MEDIAINFO_OTHERTEXT_NO) \
-     || defined(MEDIAINFO_PNG_NO) || defined(MEDIAINFO_JPEG_NO) || defined(MEDIAINFO_BMP_NO) || defined(MEDIAINFO_ICO_NO) || defined(MEDIAINFO_GIF_NO) || defined(MEDIAINFO_TIFF_NO) \
+     || defined(MEDIAINFO_BMP_NO) || defined(MEDIAINFO_DPX_NO) || defined(MEDIAINFO_EXR_NO) || defined(MEDIAINFO_GIF_NO) || defined(MEDIAINFO_ICO_NO) || defined(MEDIAINFO_JPEG_NO) || defined(MEDIAINFO_PNG_NO) || defined(MEDIAINFO_TGA_NO) || defined(MEDIAINFO_TIFF_NO) \
      || defined(MEDIAINFO_7Z_NO) || defined(MEDIAINFO_ZIP_NO) || defined(MEDIAINFO_RAR_NO) || defined(MEDIAINFO_ACE_NO) || defined(MEDIAINFO_ELF_NO) || defined(MEDIAINFO_MZ_NO) \
      || defined(MEDIAINFO_OTHER_NO) || defined(MEDIAINFO_DUMMY_NO)
         return true;
@@ -815,5 +991,3 @@
 }
 
 } //NameSpace
-
-

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/MediaInfo_Inform.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/MediaInfo_Inform.cpp Changed

@@ -1,17 +1,17 @@
 // MediaInfo_Inform - Base for other files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,19 +22,26 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #include "ZenLib/Utils.h"
 #include "MediaInfo/MediaInfo_Internal.h"
 #include "MediaInfo/MediaInfo_Config.h"
 #include "MediaInfo/Export/Export_Mpeg7.h"
+#include "MediaInfo/Export/Export_reVTMD.h"
 #include "MediaInfo/Export/Export_PBCore.h"
 #include "MediaInfo/File__Analyze.h"
+#include "base64.h"
 //---------------------------------------------------------------------------
 
 namespace MediaInfoLib
@@ -48,112 +55,126 @@
 Ztring MediaInfo_Internal::Inform()
 {
     CS.Enter();
-    if (Info)
-    {
-        Info->Status[File__Analyze::IsUpdated]=false;
-        for (size_t Pos=File__Analyze::User_16; Pos<File__Analyze::User_16+16; Pos++)
-            Info->Status[Pos]=false;
-    }
+    if (Info && Info->Status[File__Analyze::IsUpdated])
+        Info->Open_Buffer_Update();
     CS.Leave();
 
     #if MEDIAINFO_TRACE
-        if (MediaInfoLib::Config.DetailsLevel_Get() || MediaInfoLib::Config.Inform_Get()==_T("Details"))
+        if (MediaInfoLib::Config.Trace_Level_Get() || MediaInfoLib::Config.Inform_Get()==__T("Details"))
         {
             if (!Details.empty())
+            {
+                Ztring Content=Details;
+
                 return Details;
+            }
             else if (Info)
                 return Info->Details_Get();
         }
     #endif //MEDIAINFO_TRACE
 
-    if (MediaInfoLib::Config.Inform_Get()==_T("MPEG-7"))
+    if (MediaInfoLib::Config.Inform_Get()==__T("MPEG-7"))
         return Export_Mpeg7().Transform(*this);
-    if (MediaInfoLib::Config.Inform_Get()==_T("PBCore") || MediaInfoLib::Config.Inform_Get()==_T("PBCore_1.2"))
+    if (MediaInfoLib::Config.Inform_Get()==__T("PBCore") || MediaInfoLib::Config.Inform_Get()==__T("PBCore_1.2"))
         return Export_PBCore().Transform(*this);
+    if (MediaInfoLib::Config.Inform_Get()==__T("reVTMD"))
+        return __T("reVTMD is disabled due to its non-free licensing."); //return Export_reVTMD().Transform(*this);
 
     if (!(
-        MediaInfoLib::Config.Inform_Get(_T("General")).empty()
-     && MediaInfoLib::Config.Inform_Get(_T("Video")).empty()
-     && MediaInfoLib::Config.Inform_Get(_T("Audio")).empty()
-     && MediaInfoLib::Config.Inform_Get(_T("Text")).empty()
-     && MediaInfoLib::Config.Inform_Get(_T("Chapters")).empty()
-     && MediaInfoLib::Config.Inform_Get(_T("Image")).empty()
-     && MediaInfoLib::Config.Inform_Get(_T("Menu")).empty()
+        MediaInfoLib::Config.Inform_Get(__T("General")).empty()
+     && MediaInfoLib::Config.Inform_Get(__T("Video")).empty()
+     && MediaInfoLib::Config.Inform_Get(__T("Audio")).empty()
+     && MediaInfoLib::Config.Inform_Get(__T("Text")).empty()
+     && MediaInfoLib::Config.Inform_Get(__T("Chapters")).empty()
+     && MediaInfoLib::Config.Inform_Get(__T("Image")).empty()
+     && MediaInfoLib::Config.Inform_Get(__T("Menu")).empty()
      ))
     {
         Ztring Retour;
-        Retour+=MediaInfoLib::Config.Inform_Get(_T("File_Begin"));
-        Retour+=MediaInfoLib::Config.Inform_Get(_T("General_Begin"));
-        Retour+=Inform(Stream_General);
-        Retour+=MediaInfoLib::Config.Inform_Get(_T("General_End"));
+        Retour+=MediaInfoLib::Config.Inform_Get(__T("File_Begin"));
+        Retour+=MediaInfoLib::Config.Inform_Get(__T("General_Begin"));
+        Retour+=Inform(Stream_General, 0, false);
+        Retour+=MediaInfoLib::Config.Inform_Get(__T("General_End"));
         if (Count_Get(Stream_Video))
-            Retour+=MediaInfoLib::Config.Inform_Get(_T("Video_Begin"));
+            Retour+=MediaInfoLib::Config.Inform_Get(__T("Video_Begin"));
         for (size_t I1=0; I1<Count_Get(Stream_Video); I1++)
         {
-            Retour+=Inform(Stream_Video, I1);
+            Retour+=Inform(Stream_Video, I1, false);
             if (I1!=Count_Get(Stream_Video)-1)
-                Retour+=MediaInfoLib::Config.Inform_Get(_T("Video_Middle"));
+                Retour+=MediaInfoLib::Config.Inform_Get(__T("Video_Middle"));
         }
         if (Count_Get(Stream_Video))
-            Retour+=MediaInfoLib::Config.Inform_Get(_T("Video_End"));
+            Retour+=MediaInfoLib::Config.Inform_Get(__T("Video_End"));
         if (Count_Get(Stream_Audio))
-            Retour+=MediaInfoLib::Config.Inform_Get(_T("Audio_Begin"));
+            Retour+=MediaInfoLib::Config.Inform_Get(__T("Audio_Begin"));
         for (size_t I1=0; I1<Count_Get(Stream_Audio); I1++)
         {
-            Retour+=Inform(Stream_Audio, I1);
+            Retour+=Inform(Stream_Audio, I1, false);
             if (I1!=Count_Get(Stream_Audio)-1)
-                Retour+=MediaInfoLib::Config.Inform_Get(_T("Audio_Middle"));
+                Retour+=MediaInfoLib::Config.Inform_Get(__T("Audio_Middle"));
         }
         if (Count_Get(Stream_Audio))
-            Retour+=MediaInfoLib::Config.Inform_Get(_T("Audio_End"));
+            Retour+=MediaInfoLib::Config.Inform_Get(__T("Audio_End"));
         if (Count_Get(Stream_Text))
-            Retour+=MediaInfoLib::Config.Inform_Get(_T("Text_Begin"));
+            Retour+=MediaInfoLib::Config.Inform_Get(__T("Text_Begin"));
         for (size_t I1=0; I1<Count_Get(Stream_Text); I1++)
         {
-            Retour+=Inform(Stream_Text, I1);
+            Retour+=Inform(Stream_Text, I1, false);
             if (I1!=Count_Get(Stream_Text)-1)
-                Retour+=MediaInfoLib::Config.Inform_Get(_T("Text_Middle"));
+                Retour+=MediaInfoLib::Config.Inform_Get(__T("Text_Middle"));
         }
         if (Count_Get(Stream_Text))
-            Retour+=MediaInfoLib::Config.Inform_Get(_T("Text_End"));
+            Retour+=MediaInfoLib::Config.Inform_Get(__T("Text_End"));
         if (Count_Get(Stream_Chapters))
-            Retour+=MediaInfoLib::Config.Inform_Get(_T("Chapters_Begin"));
+            Retour+=MediaInfoLib::Config.Inform_Get(__T("Chapters_Begin"));
         for (size_t I1=0; I1<Count_Get(Stream_Chapters); I1++)
         {
-            Retour+=Inform(Stream_Chapters, I1);
+            Retour+=Inform(Stream_Chapters, I1, false);
             if (I1!=Count_Get(Stream_Chapters)-1)
-                Retour+=MediaInfoLib::Config.Inform_Get(_T("Chapters_Middle"));
+                Retour+=MediaInfoLib::Config.Inform_Get(__T("Chapters_Middle"));
         }
         if (Count_Get(Stream_Chapters))
-            Retour+=MediaInfoLib::Config.Inform_Get(_T("Chapters_End"));
+            Retour+=MediaInfoLib::Config.Inform_Get(__T("Chapters_End"));
         if (Count_Get(Stream_Image))
-            Retour+=MediaInfoLib::Config.Inform_Get(_T("Image_Begin"));
+            Retour+=MediaInfoLib::Config.Inform_Get(__T("Image_Begin"));
         for (size_t I1=0; I1<Count_Get(Stream_Image); I1++)
         {
-            Retour+=Inform(Stream_Image, I1);
+            Retour+=Inform(Stream_Image, I1, false);
             if (I1!=Count_Get(Stream_Image)-1)
-                Retour+=MediaInfoLib::Config.Inform_Get(_T("Image_Middle"));
+                Retour+=MediaInfoLib::Config.Inform_Get(__T("Image_Middle"));
         }
         if (Count_Get(Stream_Image))
-            Retour+=MediaInfoLib::Config.Inform_Get(_T("Image_End"));
+            Retour+=MediaInfoLib::Config.Inform_Get(__T("Image_End"));
         if (Count_Get(Stream_Menu))
-            Retour+=MediaInfoLib::Config.Inform_Get(_T("Menu_Begin"));
+            Retour+=MediaInfoLib::Config.Inform_Get(__T("Menu_Begin"));
         for (size_t I1=0; I1<Count_Get(Stream_Menu); I1++)
         {
-            Retour+=Inform(Stream_Menu, I1);
+            Retour+=Inform(Stream_Menu, I1, false);
             if (I1!=Count_Get(Stream_Menu)-1)
-                Retour+=MediaInfoLib::Config.Inform_Get(_T("Menu_Middle"));
+                Retour+=MediaInfoLib::Config.Inform_Get(__T("Menu_Middle"));
         }
         if (Count_Get(Stream_Menu))
-            Retour+=MediaInfoLib::Config.Inform_Get(_T("Menu_End"));
-        Retour+=MediaInfoLib::Config.Inform_Get(_T("File_End"));
-
-        Retour.FindAndReplace(_T("\\r\\n"), _T("\n"), 0, Ztring_Recursive);
-        Retour.FindAndReplace(_T("\\r"), _T("\n"), 0, Ztring_Recursive);
-        Retour.FindAndReplace(_T("\\n"), _T("\n"), 0, Ztring_Recursive);
-        Retour.FindAndReplace(_T("\r\n"), _T("\n"), 0, Ztring_Recursive);
-        Retour.FindAndReplace(_T("\r"), _T("\n"), 0, Ztring_Recursive);
-        Retour.FindAndReplace(_T("\n"), MediaInfoLib::Config.LineSeparator_Get(), 0, Ztring_Recursive);
+            Retour+=MediaInfoLib::Config.Inform_Get(__T("Menu_End"));
+        Retour+=MediaInfoLib::Config.Inform_Get(__T("File_End"));
+
+        Retour.FindAndReplace(__T("\\r\\n"), __T("\n"), 0, Ztring_Recursive);
+        Retour.FindAndReplace(__T("\\r"), __T("\n"), 0, Ztring_Recursive);
+        Retour.FindAndReplace(__T("\\n"), __T("\n"), 0, Ztring_Recursive);
+        Retour.FindAndReplace(__T("\r\n"), __T("\n"), 0, Ztring_Recursive);
+        Retour.FindAndReplace(__T("\r"), __T("\n"), 0, Ztring_Recursive);
+        Retour.FindAndReplace(__T("\n"), MediaInfoLib::Config.LineSeparator_Get(), 0, Ztring_Recursive);
+
+        //Special characters
+        Retour.FindAndReplace(__T("|SC1|"), __T("\\"), 0, Ztring_Recursive);
+        Retour.FindAndReplace(__T("|SC2|"), __T("["), 0, Ztring_Recursive);
+        Retour.FindAndReplace(__T("|SC3|"), __T("]"), 0, Ztring_Recursive);
+        Retour.FindAndReplace(__T("|SC4|"), __T(","), 0, Ztring_Recursive);
+        Retour.FindAndReplace(__T("|SC5|"), __T(";"), 0, Ztring_Recursive);
+        Retour.FindAndReplace(__T("|SC6|"), __T("("), 0, Ztring_Recursive);
+        Retour.FindAndReplace(__T("|SC7|"), __T(")"), 0, Ztring_Recursive);
+        Retour.FindAndReplace(__T("|SC8|"), __T(")"), 0, Ztring_Recursive);
+        Retour.FindAndReplace(__T("|SC9|"), __T("),"), 0, Ztring_Recursive);
+
         return Retour;
     }
 
@@ -161,13 +182,16 @@
     Ztring Retour;
     bool HTML=false;
     bool XML=false;
-    if (MediaInfoLib::Config.Inform_Get()==_T("HTML"))
+    bool CSV=false;
+    if (MediaInfoLib::Config.Inform_Get()==__T("HTML"))
         HTML=true;
-    if (MediaInfoLib::Config.Inform_Get()==_T("XML"))
+    if (MediaInfoLib::Config.Inform_Get()==__T("XML"))
         XML=true;
+    if (MediaInfoLib::Config.Inform_Get()==__T("CSV"))
+        CSV=true;
 
-    if (HTML) Retour+=_T("<html>\n\n<head>\n<META http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /></head>\n<body>\n");
-    if (XML)  Retour+=_T("<File>\n");
+    if (HTML) Retour+=__T("<html>\n\n<head>\n<META http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /></head>\n<body>\n");
+    if (XML)  Retour+=__T("<File>\n");
 
     for (size_t StreamKind=(size_t)Stream_General; StreamKind<Stream_Max; StreamKind++)
     {
@@ -175,143 +199,156 @@
         for (size_t StreamPos=0; StreamPos<(size_t)Count_Get((stream_t)StreamKind); StreamPos++)
         {
             //Pour chaque stream
-            if (HTML) Retour+=_T("<table width=\"100%\" border=\"0\" cellpadding=\"1\" cellspacing=\"2\" style=\"border:1px solid Navy\">\n<tr>\n    <td width=\"150\"><h2>");
-            if (XML) Retour+=_T("<track type=\"");
-            Ztring A=Get((stream_t)StreamKind, StreamPos, _T("StreamKind/String"));
-            Ztring B=Get((stream_t)StreamKind, StreamPos, _T("StreamKindPos"));
+            if (HTML) Retour+=__T("<table width=\"100%\" border=\"0\" cellpadding=\"1\" cellspacing=\"2\" style=\"border:1px solid Navy\">\n<tr>\n    <td width=\"150\"><h2>");
+            if (XML) Retour+=__T("<track type=\"");
+            Ztring A=Get((stream_t)StreamKind, StreamPos, __T("StreamKind/String"));
+            Ztring B=Get((stream_t)StreamKind, StreamPos, __T("StreamKindPos"));
             if (!XML && !B.empty())
             {
-                A+=MediaInfoLib::Config.Language_Get(_T("  Config_Text_NumberTag"));
+                if (CSV)
+                    A+=__T(",");
+                else
+                    A+=MediaInfoLib::Config.Language_Get(__T("  Config_Text_NumberTag"));
                 A+=B;
             }
             Retour+=A;
             if (XML)
             {
-                Retour+=_T("\"");
+                Retour+=__T("\"");
                 if (!B.empty())
                 {
-                    Retour+=_T(" streamid=\"");
+                    Retour+=__T(" streamid=\"");
                     Retour+=B;
-                    Retour+=_T("\"");
+                    Retour+=__T("\"");
                 }
             }
-            if (HTML) Retour+=_T("</h2></td>\n  </tr>");
-            if (XML) Retour+=_T(">");
+            if (HTML) Retour+=__T("</h2></td>\n  </tr>");
+            if (XML) Retour+=__T(">");
             Retour+=MediaInfoLib::Config.LineSeparator_Get();
-            Retour+=Inform((stream_t)StreamKind, StreamPos);
-            Retour.FindAndReplace(_T("\\"), _T("|SC1|"), 0, Ztring_Recursive);
-            if (HTML) Retour+=_T("</table>\n<br />");
-            if (XML) Retour+=_T("</track>\n");
+            Retour+=Inform((stream_t)StreamKind, StreamPos, false);
+            Retour.FindAndReplace(__T("\\"), __T("|SC1|"), 0, Ztring_Recursive);
+            if (HTML) Retour+=__T("</table>\n<br />");
+            if (XML) Retour+=__T("</track>\n");
             Retour+=MediaInfoLib::Config.LineSeparator_Get();
         }
     }
 
-    if (HTML) Retour+=_T("\n</body>\n</html>\n");
-    if (XML)  Retour+=_T("</File>\n");
+    if (HTML) Retour+=__T("\n</body>\n</html>\n");
+    if (XML)  Retour+=__T("</File>\n");
+
+    Retour.FindAndReplace(__T("\\r\\n"), __T("\n"), 0, Ztring_Recursive);
+    Retour.FindAndReplace(__T("\\r"), __T("\n"), 0, Ztring_Recursive);
+    Retour.FindAndReplace(__T("\\n"), __T("\n"), 0, Ztring_Recursive);
+    Retour.FindAndReplace(__T("\r\n"), __T("\n"), 0, Ztring_Recursive);
+    Retour.FindAndReplace(__T("\r"), __T("\n"), 0, Ztring_Recursive);
+    Retour.FindAndReplace(__T("\n"), MediaInfoLib::Config.LineSeparator_Get(), 0, Ztring_Recursive);
+
+    //Special characters
+    Retour.FindAndReplace(__T("|SC1|"), __T("\\"), 0, Ztring_Recursive);
+    Retour.FindAndReplace(__T("|SC2|"), __T("["), 0, Ztring_Recursive);
+    Retour.FindAndReplace(__T("|SC3|"), __T("]"), 0, Ztring_Recursive);
+    Retour.FindAndReplace(__T("|SC4|"), __T(","), 0, Ztring_Recursive);
+    Retour.FindAndReplace(__T("|SC5|"), __T(";"), 0, Ztring_Recursive);
+    Retour.FindAndReplace(__T("|SC6|"), __T("("), 0, Ztring_Recursive);
+    Retour.FindAndReplace(__T("|SC7|"), __T(")"), 0, Ztring_Recursive);
+    Retour.FindAndReplace(__T("|SC8|"), __T(")"), 0, Ztring_Recursive);
+    Retour.FindAndReplace(__T("|SC9|"), __T("),"), 0, Ztring_Recursive);
 
-    Retour.FindAndReplace(_T("\\r\\n"), _T("\n"), 0, Ztring_Recursive);
-    Retour.FindAndReplace(_T("\\r"), _T("\n"), 0, Ztring_Recursive);
-    Retour.FindAndReplace(_T("\\n"), _T("\n"), 0, Ztring_Recursive);
-    Retour.FindAndReplace(_T("\r\n"), _T("\n"), 0, Ztring_Recursive);
-    Retour.FindAndReplace(_T("\r"), _T("\n"), 0, Ztring_Recursive);
-    Retour.FindAndReplace(_T("\n"), MediaInfoLib::Config.LineSeparator_Get(), 0, Ztring_Recursive);
-    Retour.FindAndReplace(_T("|SC1|"), _T("\\"), 0, Ztring_Recursive);
     return Retour;
 }
 
 //---------------------------------------------------------------------------
-Ztring MediaInfo_Internal::Inform (stream_t StreamKind, size_t StreamPos)
+Ztring MediaInfo_Internal::Inform (stream_t StreamKind, size_t StreamPos, bool IsDirect)
 {
     //Integrity
     if (StreamKind>=Stream_Max || StreamPos>=Stream[StreamKind].size())
         return Ztring();
 
-    if (MediaInfoLib::Config.Inform_Get(_T("General")).empty()
-     && MediaInfoLib::Config.Inform_Get(_T("Video")).empty()
-     && MediaInfoLib::Config.Inform_Get(_T("Audio")).empty()
-     && MediaInfoLib::Config.Inform_Get(_T("Text")).empty()
-     && MediaInfoLib::Config.Inform_Get(_T("Chapters")).empty()
-     && MediaInfoLib::Config.Inform_Get(_T("Image")).empty()
-     && MediaInfoLib::Config.Inform_Get(_T("Menu")).empty())
+    if (MediaInfoLib::Config.Inform_Get(__T("General")).empty()
+     && MediaInfoLib::Config.Inform_Get(__T("Video")).empty()
+     && MediaInfoLib::Config.Inform_Get(__T("Audio")).empty()
+     && MediaInfoLib::Config.Inform_Get(__T("Text")).empty()
+     && MediaInfoLib::Config.Inform_Get(__T("Chapters")).empty()
+     && MediaInfoLib::Config.Inform_Get(__T("Image")).empty()
+     && MediaInfoLib::Config.Inform_Get(__T("Menu")).empty())
     {
         Ztring Retour;
         bool HTML=false;
         bool XML=false;
-        if (MediaInfoLib::Config.Inform_Get()==_T("HTML"))
+        bool CSV=false;
+        if (MediaInfoLib::Config.Inform_Get()==__T("HTML"))
             HTML=true;
-        if (MediaInfoLib::Config.Inform_Get()==_T("XML"))
+        if (MediaInfoLib::Config.Inform_Get()==__T("XML"))
             XML=true;
+        if (MediaInfoLib::Config.Inform_Get()==__T("CSV"))
+            CSV=true;
         size_t Size=Count_Get(StreamKind, StreamPos);
         for (size_t Champ_Pos=0; Champ_Pos<Size; Champ_Pos++)
         {
             //Pour chaque champ
             //Ztring A=Get((stream_t)4, 2, 0, Info_Measure_Text); // TODO Bug sinon? voir Ztring
             Ztring A=Get((stream_t)StreamKind, StreamPos, Champ_Pos, Info_Measure_Text); // TODO Bug sinon? voir Ztring
-            if ((MediaInfoLib::Config.Complete_Get() || Get((stream_t)StreamKind, StreamPos, Champ_Pos, Info_Options)[InfoOption_ShowInInform]==_T('Y')) && !Get((stream_t)StreamKind, StreamPos, Champ_Pos, Info_Text).empty())
+            if ((MediaInfoLib::Config.Complete_Get() || Get((stream_t)StreamKind, StreamPos, Champ_Pos, Info_Options)[InfoOption_ShowInInform]==__T('Y')) && !Get((stream_t)StreamKind, StreamPos, Champ_Pos, Info_Text).empty())
             {
                 Ztring Nom=Get((stream_t)StreamKind, StreamPos, Champ_Pos, Info_Name_Text);
                 if (Nom.empty())
                     Nom=Get((stream_t)StreamKind, StreamPos, Champ_Pos, Info_Name); //Texte n'existe pas
-                if (!HTML && !XML)
+                if (!HTML && !XML && !CSV)
                 {
-                     int8u Nom_Size=MediaInfoLib::Config.Language_Get(_T("  Config_Text_ColumnSize")).To_int8u();
+                     int8u Nom_Size=MediaInfoLib::Config.Language_Get(__T("  Config_Text_ColumnSize")).To_int8u();
                      if (Nom_Size==0)
                         Nom_Size=32; //Default
                      Nom.resize(Nom_Size, ' ');
                 }
                 Ztring Valeur=Get((stream_t)StreamKind, StreamPos, Champ_Pos, Info_Text);
-                Valeur.FindAndReplace(_T("\\"), _T("|SC1|"), 0, Ztring_Recursive);
+                Valeur.FindAndReplace(__T("\\"), __T("|SC1|"), 0, Ztring_Recursive);
                 if (HTML)
                 {
-                    Retour+=_T("  <tr>\n    <td><i>");
+                    Retour+=__T("  <tr>\n    <td><i>");
                     Retour+=Nom;
-                    Retour+=_T(" :</i></td>\n    <td colspan=\"3\">");
+                    Retour+=__T(" :</i></td>\n    <td colspan=\"3\">");
                     Retour+=Valeur;
-                    Retour+=_T("</td>\n  </tr>");
+                    Retour+=__T("</td>\n  </tr>");
                 }
                 else if (XML)
                 {
-                    if (Nom.operator()(0)>='0' && Nom.operator()(0)<='9')
-                        Nom.insert(Nom.begin(), _T('_'));
-                    Nom.FindAndReplace(_T(" "), _T("_"), 0, Ztring_Recursive);
-                    Nom.FindAndReplace(_T("/"), _T("_"), 0, Ztring_Recursive);
-                    Nom.FindAndReplace(_T("("), _T("_"), 0, Ztring_Recursive);
-                    Nom.FindAndReplace(_T(")"), _T("_"), 0, Ztring_Recursive);
-                    Nom.FindAndReplace(_T("*"), _T("_"), 0, Ztring_Recursive);
-                    Nom.FindAndReplace(_T(","), _T("_"), 0, Ztring_Recursive);
-                    Nom.FindAndReplace(_T(":"), _T("_"), 0, Ztring_Recursive);
-                    Nom.FindAndReplace(_T("@"), _T("_"), 0, Ztring_Recursive);
-                    if (Nom.empty())
-                        Nom="Unknown";
-                    Valeur.FindAndReplace(_T("\""), _T("&quot;"), 0, Ztring_Recursive);
-                    Valeur.FindAndReplace(_T("&"), _T("&amp;"), 0, Ztring_Recursive);
-                    Valeur.FindAndReplace(_T("<"), _T("&lt;"), 0, Ztring_Recursive);
-                    Valeur.FindAndReplace(_T(">"), _T("&gt;"), 0, Ztring_Recursive);
-                    Retour+=_T("<");
+                    Nom=Xml_Name_Escape(Nom);
+                    size_t Modified;
+                    Xml_Content_Escape_Modifying(Valeur, Modified);
+
+                    Retour+=__T("<");
                     Retour+=Nom;
-                    Retour+=_T(">");
+                    if (Modified==1) //Base64
+                        Retour+=__T(" dt:dt=\"binary.base64\"");
+                    Retour+=__T(">");
                     Retour+=Valeur;
-                    Retour+=_T("</");
+                    Retour+=__T("</");
                     Retour+=Nom;
-                    Retour+=_T(">");
+                    Retour+=__T(">");
+                }
+                else if (CSV)
+                {
+                    Retour+=Nom;
+                    Retour+=__T(",");
+                    Retour+=Valeur;
                 }
                 else
-                    Retour+=Nom + MediaInfoLib::Config.Language_Get(_T("  Config_Text_Separator")) + Valeur;
+                    Retour+=Nom + MediaInfoLib::Config.Language_Get(__T("  Config_Text_Separator")) + Valeur;
                 Retour+=MediaInfoLib::Config.LineSeparator_Get();
             }
         }
 
-        Retour.FindAndReplace(_T("\\r\\n"), _T("\n"), 0, Ztring_Recursive);
-        Retour.FindAndReplace(_T("\\r"), _T("\n"), 0, Ztring_Recursive);
-        Retour.FindAndReplace(_T("\\n"), _T("\n"), 0, Ztring_Recursive);
-        Retour.FindAndReplace(_T("\r\n"), _T("\n"), 0, Ztring_Recursive);
-        Retour.FindAndReplace(_T("\r"), _T("\n"), 0, Ztring_Recursive);
-        Retour.FindAndReplace(_T("\n"), MediaInfoLib::Config.LineSeparator_Get(), 0, Ztring_Recursive);
-        Retour.FindAndReplace(_T("|SC1|"), _T("\\"), 0, Ztring_Recursive);
+        Retour.FindAndReplace(__T("\\r\\n"), __T("\n"), 0, Ztring_Recursive);
+        Retour.FindAndReplace(__T("\\r"), __T("\n"), 0, Ztring_Recursive);
+        Retour.FindAndReplace(__T("\\n"), __T("\n"), 0, Ztring_Recursive);
+        Retour.FindAndReplace(__T("\r\n"), __T("\n"), 0, Ztring_Recursive);
+        Retour.FindAndReplace(__T("\r"), __T("\n"), 0, Ztring_Recursive);
+        Retour.FindAndReplace(__T("\n"), MediaInfoLib::Config.LineSeparator_Get(), 0, Ztring_Recursive);
+        Retour.FindAndReplace(__T("|SC1|"), __T("\\"), 0, Ztring_Recursive);
         return Retour;
     }
 
-    Ztring Retour=MediaInfoLib::Config.Inform_Get(Get(StreamKind, 0, _T("StreamKind"), Info_Text));
+    Ztring Retour=MediaInfoLib::Config.Inform_Get(Get(StreamKind, 0, __T("StreamKind"), Info_Text));
     ZtringList Info;
 
     if (StreamKind>=Stream_Max)
@@ -319,23 +356,23 @@
     Info=Stream[StreamKind][StreamPos];
 
     //Special characters
-    Retour.FindAndReplace(_T("\\\\"), _T("|SC1|"), 0, Ztring_Recursive);
-    Retour.FindAndReplace(_T("\\["), _T("|SC2|"), 0, Ztring_Recursive);
-    Retour.FindAndReplace(_T("\\]"), _T("|SC3|"), 0, Ztring_Recursive);
-    Retour.FindAndReplace(_T("\\,"), _T("|SC4|"), 0, Ztring_Recursive);
-    Retour.FindAndReplace(_T("\\;"), _T("|SC5|"), 0, Ztring_Recursive);
-    Retour.FindAndReplace(_T("\$"), _T("|SC6|"), 0, Ztring_Recursive);
-    Retour.FindAndReplace(_T("\$"), _T("|SC7|"), 0, Ztring_Recursive);
+    Retour.FindAndReplace(__T("\\\\"), __T("|SC1|"), 0, Ztring_Recursive);
+    Retour.FindAndReplace(__T("\\["), __T("|SC2|"), 0, Ztring_Recursive);
+    Retour.FindAndReplace(__T("\\]"), __T("|SC3|"), 0, Ztring_Recursive);
+    Retour.FindAndReplace(__T("\\,"), __T("|SC4|"), 0, Ztring_Recursive);
+    Retour.FindAndReplace(__T("\\;"), __T("|SC5|"), 0, Ztring_Recursive);
+    Retour.FindAndReplace(__T("\$"), __T("|SC6|"), 0, Ztring_Recursive);
+    Retour.FindAndReplace(__T("\$"), __T("|SC7|"), 0, Ztring_Recursive);
 
     //Gestion $xx$
     size_t PosX=0;
-    while (Retour.find(_T("$"), PosX)!=(size_t)-1)
+    while (Retour.find(__T("$"), PosX)!=(size_t)-1)
     {
-        PosX=Retour.find(_T("$"), PosX);
-        if (Retour.size()>PosX+2 && !(Retour(PosX+1)==_T('i') && Retour(PosX+2)==_T('f') && Retour(PosX+3)==_T('('))) //To keep out "%" without any signification, or "$if(..."
+        PosX=Retour.find(__T("$"), PosX);
+        if (Retour.size()>PosX+2 && !(Retour(PosX+1)==__T('i') && Retour(PosX+2)==__T('f') && Retour(PosX+3)==__T('('))) //To keep out "%" without any signification, or "$if(..."
         {
-            Ztring ARemplacer=Ztring(_T("$")+Retour.SubString(_T("$"), _T("$"), PosX))+_T("$");
-            Ztring RemplacerPar=MediaInfoLib::Config.Language_Get(Retour.SubString(_T("$"), _T("$"), PosX)); //TODO : case sensitive
+            Ztring ARemplacer=Ztring(__T("$")+Retour.SubString(__T("$"), __T("$"), PosX))+__T("$");
+            Ztring RemplacerPar=MediaInfoLib::Config.Language_Get(Retour.SubString(__T("$"), __T("$"), PosX)); //TODO : case sensitive
             Retour.FindAndReplace(ARemplacer, RemplacerPar);
         }
         else
@@ -343,14 +380,14 @@
     }
 
     //Gestion $if()
-    size_t Position=Retour.find(_T("$if("));
+    size_t Position=Retour.find(__T("$if("));
     while (Position!=Error && Position>0)
     {
         ZtringList Elements;
         size_t Elements_Index;
-        Elements.Separator_Set(0, _T(","));
-        Elements.Write(Retour.SubString(_T("$if("), _T(")"), Position));
-        Elements(0)=Elements(0).SubString(_T("%"), _T("%"));
+        Elements.Separator_Set(0, __T(","));
+        Elements.Write(Retour.SubString(__T("$if("), __T(")"), Position));
+        Elements(0)=Elements(0).SubString(__T("%"), __T("%"));
 
         //Test if there is something to replace
         size_t Pos=MediaInfoLib::Config.Info_Get(StreamKind).Find(Elements(0));
@@ -365,26 +402,26 @@
             Elements_Index=2;
 
         //Replace
-        while (Elements(Elements_Index).SubString(_T("%"), _T("%")).size()>0)
+        while (Elements(Elements_Index).SubString(__T("%"), __T("%")).size()>0)
         {
-            Ztring ToReplace=Elements(Elements_Index).SubString(_T("%"), _T("%"));
+            Ztring ToReplace=Elements(Elements_Index).SubString(__T("%"), __T("%"));
             Ztring ReplacedBy=Info(MediaInfoLib::Config.Info_Get(StreamKind).Find(ToReplace));
-            ToReplace=Ztring(_T("%"))+ToReplace+Ztring(_T("%"));
+            ToReplace=Ztring(__T("%"))+ToReplace+Ztring(__T("%"));
             Elements(Elements_Index).FindAndReplace(ToReplace, ReplacedBy);
         }
 
-        Ztring ToReplace=Ztring(_T("$if("))+Retour.SubString(_T("$if("), _T(")"), Position)+_T(")");
+        Ztring ToReplace=Ztring(__T("$if("))+Retour.SubString(__T("$if("), __T(")"), Position)+__T(")");
         Retour.FindAndReplace(ToReplace, Elements(Elements_Index));
-        Position=Retour.find(_T("$if("));
+        Position=Retour.find(__T("$if("));
     }
 
     //Gestion []
-    while (!Retour.SubString(_T("["), _T("]")).empty())
+    while (!Retour.SubString(__T("["), __T("]")).empty())
     {
-        Ztring Crochets=Retour.SubString(_T("["), _T("]"));
-        Ztring ValueToFind=Crochets.SubString(_T("%"), _T("%"));
+        Ztring Crochets=Retour.SubString(__T("["), __T("]"));
+        Ztring ValueToFind=Crochets.SubString(__T("%"), __T("%"));
         size_t ValueToFind_Pos=MediaInfoLib::Config.Info_Get(StreamKind).Find(ValueToFind);
-        Ztring ARemplacer=Ztring(_T("[")+Crochets+_T("]"));
+        Ztring ARemplacer=Ztring(__T("[")+Crochets+__T("]"));
         if (ValueToFind_Pos!=Error)
         {
             Ztring RemplacerPar=Info(ValueToFind_Pos);
@@ -394,8 +431,8 @@
             {
                 //Formate l'interieur
                 Ztring ATraiter=Crochets;
-                Ztring Crochets_ARemplacer=Ztring(_T("%")+ATraiter.SubString(_T("%"), _T("%")))+_T("%");
-                Ztring Crochets_RemplacerPar=Info(MediaInfoLib::Config.Info_Get(StreamKind).Find(ATraiter.SubString(_T("%"), _T("%"))));
+                Ztring Crochets_ARemplacer=Ztring(__T("%")+ATraiter.SubString(__T("%"), __T("%")))+__T("%");
+                Ztring Crochets_RemplacerPar=Info(MediaInfoLib::Config.Info_Get(StreamKind).Find(ATraiter.SubString(__T("%"), __T("%"))));
                 ATraiter.FindAndReplace(Crochets_ARemplacer, Crochets_RemplacerPar);
                 Retour.FindAndReplace(ARemplacer, ATraiter);
             }
@@ -406,39 +443,44 @@
 
     //Gestion %xxx%
     PosX=0;
-    while (Retour.find(_T("%"), PosX)!=(size_t)-1)
+    while (Retour.find(__T("%"), PosX)!=(size_t)-1)
     {
-        PosX=Retour.find(_T("%"), PosX);
-        if (Retour.size()>PosX+2 && Retour[PosX+1]>=_T('A') && Retour[PosX+1]<=_T('Z')) //To keep out "%" without any signification
+        PosX=Retour.find(__T("%"), PosX);
+        if (Retour.size()>PosX+2 && Retour[PosX+1]>=__T('A') && Retour[PosX+1]<=__T('Z')) //To keep out "%" without any signification
         {
-            Ztring ARemplacer=Ztring(_T("%")+Retour.SubString(_T("%"), _T("%"), PosX))+_T("%");
-            Ztring RemplacerPar=Get(StreamKind, StreamPos, Retour.SubString(_T("%"), _T("%"), PosX));
-            RemplacerPar.FindAndReplace(_T("),"), _T("|SC9|"), 0, Ztring_Recursive);
-            RemplacerPar.FindAndReplace(_T(")"), _T("|SC8|"), 0, Ztring_Recursive);
+            Ztring ARemplacer=Ztring(__T("%")+Retour.SubString(__T("%"), __T("%"), PosX))+__T("%");
+            Ztring RemplacerPar=Get(StreamKind, StreamPos, Retour.SubString(__T("%"), __T("%"), PosX));
+            RemplacerPar.FindAndReplace(__T("\\"), __T("|SC1|"), 0, Ztring_Recursive);
+            RemplacerPar.FindAndReplace(__T("),"), __T("|SC9|"), 0, Ztring_Recursive);
+            RemplacerPar.FindAndReplace(__T(")"), __T("|SC8|"), 0, Ztring_Recursive);
             Retour.FindAndReplace(ARemplacer, RemplacerPar);
         }
         else
             PosX++;
     }
 
+    //Retour=__T("<table width=\"100%\" border=\"0\" cellpadding=\"1\" cellspacing=\"2\" style=\"border:1px solid Navy\">\n<tr>\n    <td width=\"150\">Video #0</td>\n  </tr>\r\n  <tr>\n    <td><i>Codec :</i></td>\n    <td colspan=\"3\">WMV1</td>\n  </tr>\r\n  <tr>\n    <td><i>Codec/Info :</i></td>\n    <td colspan=\"3\">Windows Media Video 7</td>\n  </tr>\r\n  <tr>\n    <td><i>Width :</i></td>\n    <td colspan=\"3\">200 pixels</td>\n  </tr>\r\n  <tr>\n    <td><i>Height :</i></td>\n    <td colspan=\"3\">150 pixels</td>\n  </tr>\r\n  <tr>\n    <td><i>Aspect ratio :</i></td>\n    <td colspan=\"3\">4/3</td>\n  </tr>\r\n  <tr>\n    <td><i>Resolution :</i></td>\n    <td colspan=\"3\">24 bits</td>\n  </tr>\r\n</table>\n");
+    Retour.FindAndReplace(__T("\\r\\n"), __T("\n"), 0, Ztring_Recursive);
+    Retour.FindAndReplace(__T("\\r"), __T("\n"), 0, Ztring_Recursive);
+    Retour.FindAndReplace(__T("\\n"), __T("\n"), 0, Ztring_Recursive);
+    Retour.FindAndReplace(__T("\r\n"), __T("\n"), 0, Ztring_Recursive);
+    Retour.FindAndReplace(__T("\r"), __T("\n"), 0, Ztring_Recursive);
+    Retour.FindAndReplace(__T("\n"), MediaInfoLib::Config.LineSeparator_Get(), 0, Ztring_Recursive);
+
     //Special characters
-    Retour.FindAndReplace(_T("|SC1|"), _T("\\"), 0, Ztring_Recursive);
-    Retour.FindAndReplace(_T("|SC2|"), _T("["), 0, Ztring_Recursive);
-    Retour.FindAndReplace(_T("|SC3|"), _T("]"), 0, Ztring_Recursive);
-    Retour.FindAndReplace(_T("|SC4|"), _T(","), 0, Ztring_Recursive);
-    Retour.FindAndReplace(_T("|SC5|"), _T(";"), 0, Ztring_Recursive);
-    Retour.FindAndReplace(_T("|SC6|"), _T("("), 0, Ztring_Recursive);
-    Retour.FindAndReplace(_T("|SC7|"), _T(")"), 0, Ztring_Recursive);
-    Retour.FindAndReplace(_T("|SC8|"), _T(")"), 0, Ztring_Recursive);
-    Retour.FindAndReplace(_T("|SC9|"), _T("),"), 0, Ztring_Recursive);
-
-    //Retour=_T("<table width=\"100%\" border=\"0\" cellpadding=\"1\" cellspacing=\"2\" style=\"border:1px solid Navy\">\n<tr>\n    <td width=\"150\">Video #0</td>\n  </tr>\r\n  <tr>\n    <td><i>Codec :</i></td>\n    <td colspan=\"3\">WMV1</td>\n  </tr>\r\n  <tr>\n    <td><i>Codec/Info :</i></td>\n    <td colspan=\"3\">Windows Media Video 7</td>\n  </tr>\r\n  <tr>\n    <td><i>Width :</i></td>\n    <td colspan=\"3\">200 pixels</td>\n  </tr>\r\n  <tr>\n    <td><i>Height :</i></td>\n    <td colspan=\"3\">150 pixels</td>\n  </tr>\r\n  <tr>\n    <td><i>Aspect ratio :</i></td>\n    <td colspan=\"3\">4/3</td>\n  </tr>\r\n  <tr>\n    <td><i>Resolution :</i></td>\n    <td colspan=\"3\">24 bits</td>\n  </tr>\r\n</table>\n");
-    Retour.FindAndReplace(_T("\\r\\n"), _T("\n"), 0, Ztring_Recursive);
-    Retour.FindAndReplace(_T("\\r"), _T("\n"), 0, Ztring_Recursive);
-    Retour.FindAndReplace(_T("\\n"), _T("\n"), 0, Ztring_Recursive);
-    Retour.FindAndReplace(_T("\r\n"), _T("\n"), 0, Ztring_Recursive);
-    Retour.FindAndReplace(_T("\r"), _T("\n"), 0, Ztring_Recursive);
-    Retour.FindAndReplace(_T("\n"), MediaInfoLib::Config.LineSeparator_Get(), 0, Ztring_Recursive);
+    if (IsDirect)
+    {
+        Retour.FindAndReplace(__T("|SC1|"), __T("\\"), 0, Ztring_Recursive);
+        Retour.FindAndReplace(__T("|SC2|"), __T("["), 0, Ztring_Recursive);
+        Retour.FindAndReplace(__T("|SC3|"), __T("]"), 0, Ztring_Recursive);
+        Retour.FindAndReplace(__T("|SC4|"), __T(","), 0, Ztring_Recursive);
+        Retour.FindAndReplace(__T("|SC5|"), __T(";"), 0, Ztring_Recursive);
+        Retour.FindAndReplace(__T("|SC6|"), __T("("), 0, Ztring_Recursive);
+        Retour.FindAndReplace(__T("|SC7|"), __T(")"), 0, Ztring_Recursive);
+        Retour.FindAndReplace(__T("|SC8|"), __T(")"), 0, Ztring_Recursive);
+        Retour.FindAndReplace(__T("|SC9|"), __T("),"), 0, Ztring_Recursive);
+    }
+
     return Retour;
 }
 
@@ -446,29 +488,148 @@
 void MediaInfo_Internal::Traiter(Ztring &C)
 {
     //$if(%a%,zezeze%a%,rrere)
-    size_t Position=C.find(_T("$if("));
+    size_t Position=C.find(__T("$if("));
     while (Position>0)
     {
         //Recuperation de la chaine entiere
         Ztring Total;
         Ztring ARemplacer;
         ZtringList Total1;
-        Total1.Separator_Set(0, _T("),"));
-        Total=C.SubString(_T("$if("), _T(")"), Position);
-        ARemplacer=Ztring(_T("$if(")+Total+_T(")"));
+        Total1.Separator_Set(0, __T("),"));
+        Total=C.SubString(__T("$if("), __T(")"), Position);
+        ARemplacer=Ztring(__T("$if(")+Total+__T(")"));
         Total1.Write(Total);
         if (Total1(0).empty()) //mettre champ2
             C.FindAndReplace(ARemplacer, Total1(2), Position);
         else
             C.FindAndReplace(ARemplacer, Total1(1), Position);
-        Position=C.find(_T("$if("), Position);
+        Position=C.find(__T("$if("), Position);
     }
 
     //reformatage
-    C.FindAndReplace(_T("|SC8|"), _T(")"), 0, Ztring_Recursive);
-    C.FindAndReplace(_T("|SC9|"), _T("),"), 0, Ztring_Recursive);
-    //C.FindAndReplace(_T("\\r\\n"), _T("\n"), 0, Ztring_Recursive);
+    C.FindAndReplace(__T("|SC8|"), __T(")"), 0, Ztring_Recursive);
+    C.FindAndReplace(__T("|SC9|"), __T("),"), 0, Ztring_Recursive);
+    //C.FindAndReplace(__T("\\r\\n"), __T("\n"), 0, Ztring_Recursive);
 }
 
-} //NameSpace
+//---------------------------------------------------------------------------
+Ztring MediaInfo_Internal::Xml_Name_Escape (const Ztring &Name)
+{
+    Ztring ToReturn(Name);
+
+    if (ToReturn.operator()(0)>='0' && ToReturn.operator()(0)<='9')
+        ToReturn.insert(0, 1, __T('_'));
+    ToReturn.FindAndReplace(__T(" "), __T("_"), 0, Ztring_Recursive);
+    ToReturn.FindAndReplace(__T("/"), __T("_"), 0, Ztring_Recursive);
+    ToReturn.FindAndReplace(__T("("), __T("_"), 0, Ztring_Recursive);
+    ToReturn.FindAndReplace(__T(")"), __T("_"), 0, Ztring_Recursive);
+    ToReturn.FindAndReplace(__T("*"), __T("_"), 0, Ztring_Recursive);
+    ToReturn.FindAndReplace(__T(","), __T("_"), 0, Ztring_Recursive);
+    ToReturn.FindAndReplace(__T(":"), __T("_"), 0, Ztring_Recursive);
+    ToReturn.FindAndReplace(__T("@"), __T("_"), 0, Ztring_Recursive);
+    size_t ToReturn_Pos=0;
+    while (ToReturn_Pos<ToReturn.size())
+    {
+        if (!(ToReturn[ToReturn_Pos]>=__T('A') && ToReturn[ToReturn_Pos]<=__T('Z'))
+         && !(ToReturn[ToReturn_Pos]>=__T('a') && ToReturn[ToReturn_Pos]<=__T('z'))
+         && !(ToReturn[ToReturn_Pos]>=__T('0') && ToReturn[ToReturn_Pos]<=__T('9'))
+         && !(ToReturn[ToReturn_Pos]==__T('_')))
+            ToReturn.erase(ToReturn_Pos, 1);
+        else
+            ToReturn_Pos++;
+    }
+    if (ToReturn.empty())
+        ToReturn="Unknown";
+
+    return ToReturn;
+}
+
+//---------------------------------------------------------------------------
+Ztring MediaInfo_Internal::Xml_Content_Escape (const Ztring &Content, size_t &Modified)
+{
+    Ztring ToReturn(Content);
+    return Xml_Content_Escape_Modifying(ToReturn, Modified);
+}
 
+//---------------------------------------------------------------------------
+size_t Xml_Content_Escape_MustEscape(const Ztring &Content)
+{
+    size_t Pos=0;
+    size_t Size=Content.size();
+    for (; Pos<Size; Pos++)
+    {
+        switch (Content[Pos])
+        {
+            case __T('\"'):
+            case __T('&') :
+            case __T('\''):
+            case __T('<') :
+            case __T('>') :
+                            return Pos;
+            default      :
+                            if (Content[Pos]<0x20)
+                                return Pos;
+        }
+    }
+
+    return Pos;
+}
+Ztring &MediaInfo_Internal::Xml_Content_Escape_Modifying (Ztring &Content, size_t &Modified)
+{
+    size_t Pos=Xml_Content_Escape_MustEscape(Content);
+    Ztring Content_Save=Content;
+    Modified=0;
+    if (Pos>=Content.size())
+        return Content;
+
+    for (; Pos<Content.size(); Pos++)
+    {
+        switch (Content[Pos])
+        {
+            case __T('\"'):
+                            Content[Pos]=__T('&');
+                            Content.insert(Pos+1, __T("quot;"));
+                            Pos+=5;
+                            break;
+            case __T('&'):
+                            Content[Pos]=__T('&');
+                            Content.insert(Pos+1, __T("amp;"));
+                            Pos+=4;
+                            break;
+            case __T('\''):
+                            Content[Pos]=__T('&');
+                            Content.insert(Pos+1, __T("apos;"));
+                            Pos+=5;
+                            break;
+            case __T('<'):
+                            Content[Pos]=__T('&');
+                            Content.insert(Pos+1, __T("lt;"));
+                            Pos+=3;
+                            break;
+            case __T('>'):
+                            Content[Pos]=__T('&');
+                            Content.insert(Pos+1, __T("gt;"));
+                            Pos+=3;
+                            break;
+            default:
+                        if (Content[Pos]<0x20)
+                        {
+                            /* Is still invalid XML
+                            Ztring Character=__T("#x")+Ztring::ToZtring(Content[Pos]/16, 16)+Ztring::ToZtring(Content[Pos]%16, 16)+__T(";");
+                            Content[Pos]=__T('&');
+                            Content.insert(Pos+1, Character);
+                            Pos+=5;
+                            */
+                            string Content_Utf8=Content_Save.To_UTF8(); //TODO: shouldn't we never convert to Unicode?
+                            string Content_Base64=Base64::encode(Content_Utf8);
+                            Content.From_UTF8(Content_Base64);
+                            Modified=1; //Base64
+                            Pos=Content.size(); //End
+                        }
+        }
+    }
+
+    return Content;
+}
+
+} //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/MediaInfo_Internal.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/MediaInfo_Internal.cpp Changed

@@ -1,31 +1,35 @@
 // MediaInfo_Internal - All info about media files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #include "MediaInfo/MediaInfo_Internal.h"
 #include "MediaInfo/MediaInfo_Config.h"
 #include "MediaInfo/File__Analyze.h"
@@ -44,6 +48,14 @@
 #if defined(MEDIAINFO_LIBMMS_YES)
     #include "MediaInfo/Reader/Reader_libmms.h"
 #endif
+#include <cmath>
+#ifdef MEDIAINFO_DEBUG_WARNING_GET
+    #include <iostream>
+#endif //MEDIAINFO_DEBUG_WARNING_GET
+#ifdef MEDIAINFO_DEBUG_BUFFER
+    #include "ZenLib/FileName.h"
+    #include <cstring>
+#endif //MEDIAINFO_DEBUG_BUFFER
 using namespace ZenLib;
 using namespace std;
 //---------------------------------------------------------------------------
@@ -58,9 +70,9 @@
 
 #if defined (MEDIAINFO_DEBUG_CONFIG) || defined (MEDIAINFO_DEBUG_BUFFER) || defined (MEDIAINFO_DEBUG_OUTPUT)
     #ifdef WINDOWS
-        const Char* MediaInfo_Debug_Name=_T("MediaInfo_Debug");
+        const Char* MediaInfo_Debug_Name=__T("MediaInfo_Debug");
     #else
-        const Char* MediaInfo_Debug_Name=_T("/tmp/MediaInfo_Debug");
+        const Char* MediaInfo_Debug_Name=__T("/tmp/MediaInfo_Debug");
     #endif
 #endif
 
@@ -69,9 +81,23 @@
         { \
             Ztring Debug; \
             _TOAPPEND; \
-            Debug+=_T("\r\n"); \
+            Debug+=__T("\r\n"); \
             if (!Debug_Config.Opened_Get()) \
-                Debug_Config.Create(Ztring(MediaInfo_Debug_Name)+_T(".")+Ztring::ToZtring((size_t)this, 16)+_T(".Config.txt")); \
+            { \
+                if (File_Names.empty()) \
+                    Debug_Config.Create(Ztring(MediaInfo_Debug_Name)+__T(".")+Ztring::ToZtring((size_t)this, 16)+__T(".Config.txt")); \
+                else \
+                { \
+                    Ztring File_Temp; \
+                    if (File_Names[0].rfind(__T('\\'))!=string::npos) \
+                        File_Temp=File_Names[0].substr(File_Names[0].rfind(__T('\\'))+1, string::npos); \
+                    else if (File_Names[0].rfind(__T('/'))!=string::npos) \
+                        File_Temp=File_Names[0].substr(File_Names[0].rfind(__T('/'))+1, string::npos); \
+                    else \
+                        File_Temp=File_Names[0]; \
+                    Debug_Config.Create(Ztring(MediaInfo_Debug_Name)+__T(".")+Ztring::ToZtring((size_t)this, 16)+__T(".")+File_Temp+__T(".Config.txt")); \
+                } \
+            } \
             Debug_Config.Write(Debug); \
         }
 #else // MEDIAINFO_DEBUG_CONFIG
@@ -119,9 +145,33 @@
         { \
             if (!Debug_Buffer_Stream.Opened_Get()) \
             { \
-                Debug_Buffer_Stream.Create(Ztring(MediaInfo_Debug_Name)+_T(".")+Ztring::ToZtring((size_t)this, 16)+_T(".Buffer.Stream.0000000000000000")); \
+                if (File_Names.empty()) \
+                    Debug_Buffer_Stream.Create(Ztring(MediaInfo_Debug_Name)+__T(".")+Ztring::ToZtring((size_t)this, 16)+__T(".Buffer.Stream.0000000000000000")); \
+                else \
+                { \
+                    Ztring File_Temp; \
+                    if (File_Names[0].rfind(__T('\\'))!=string::npos) \
+                        File_Temp=File_Names[0].substr(File_Names[0].rfind(__T('\\'))+1, string::npos); \
+                    else if (File_Names[0].rfind(__T('/'))!=string::npos) \
+                        File_Temp=File_Names[0].substr(File_Names[0].rfind(__T('/'))+1, string::npos); \
+                    else \
+                        File_Temp=File_Names[0]; \
+                    Debug_Buffer_Stream.Create(Ztring(MediaInfo_Debug_Name)+__T(".")+Ztring::ToZtring((size_t)this, 16)+__T(".")+File_Temp+__T(".Buffer.Stream.0000000000000000")); \
+                } \
                 Debug_Buffer_Stream_Order=0; \
-                Debug_Buffer_Sizes.Create(Ztring(MediaInfo_Debug_Name)+_T(".")+Ztring::ToZtring((size_t)this, 16)+_T(".Buffer.Sizes.0000000000000000")); \
+                if (File_Names.empty()) \
+                    Debug_Buffer_Sizes.Create(Ztring(MediaInfo_Debug_Name)+__T(".")+Ztring::ToZtring((size_t)this, 16)+__T(".Buffer.Sizes.0000000000000000")); \
+                else \
+                { \
+                    Ztring File_Temp; \
+                    if (File_Names[0].rfind(__T('\\'))!=string::npos) \
+                        File_Temp=File_Names[0].substr(File_Names[0].rfind(__T('\\'))+1, string::npos); \
+                    else if (File_Names[0].rfind(__T('/'))!=string::npos) \
+                        File_Temp=File_Names[0].substr(File_Names[0].rfind(__T('/'))+1, string::npos); \
+                    else \
+                        File_Temp=File_Names[0]; \
+                    Debug_Buffer_Sizes.Create(Ztring(MediaInfo_Debug_Name)+__T(".")+Ztring::ToZtring((size_t)this, 16)+__T(".")+File_Temp+__T(".Buffer.Sizes.0000000000000000")); \
+                } \
                 Debug_Buffer_Sizes_Count=0; \
             } \
             Debug_Buffer_Stream.Write(_BUFFER, _SIZE); \
@@ -133,14 +183,14 @@
                 Debug_Buffer_Sizes.Close(); \
                 Ztring Before=Ztring::ToZtring(Debug_Buffer_Stream_Order-1); \
                 while (Before.size()<16) \
-                    Before.insert(0, 1, _T('0')); \
+                    Before.insert(0, 1, __T('0')); \
                 Ztring Next=Ztring::ToZtring(Debug_Buffer_Stream_Order+1); \
                 while (Next.size()<16) \
-                    Next.insert(0, 1, _T('0')); \
-                Debug_Buffer_Stream.Create(Ztring(MediaInfo_Debug_Name)+_T(".")+Ztring::ToZtring((size_t)this, 16)+_T(".Buffer.Stream.")+Next); \
-                Debug_Buffer_Sizes.Create(Ztring(MediaInfo_Debug_Name)+_T(".")+Ztring::ToZtring((size_t)this, 16)+_T(".Buffer.Sizes.")+Next); \
-                File::Delete(Ztring(MediaInfo_Debug_Name)+_T(".")+Ztring::ToZtring((size_t)this, 16)+_T(".Buffer.Stream.")+Before); \
-                File::Delete(Ztring(MediaInfo_Debug_Name)+_T(".")+Ztring::ToZtring((size_t)this, 16)+_T(".Buffer.Sizes.")+Before); \
+                    Next.insert(0, 1, __T('0')); \
+                Debug_Buffer_Stream.Create(Ztring(MediaInfo_Debug_Name)+__T(".")+Ztring::ToZtring((size_t)this, 16)+__T(".Buffer.Stream.")+Next); \
+                Debug_Buffer_Sizes.Create(Ztring(MediaInfo_Debug_Name)+__T(".")+Ztring::ToZtring((size_t)this, 16)+__T(".Buffer.Sizes.")+Next); \
+                File::Delete(Ztring(MediaInfo_Debug_Name)+__T(".")+Ztring::ToZtring((size_t)this, 16)+__T(".Buffer.Stream.")+Before); \
+                File::Delete(Ztring(MediaInfo_Debug_Name)+__T(".")+Ztring::ToZtring((size_t)this, 16)+__T(".Buffer.Sizes.")+Before); \
                 Debug_Buffer_Stream_Order++; \
                 Debug_Buffer_Sizes_Count=0; \
             } \
@@ -152,7 +202,7 @@
 #ifdef MEDIAINFO_DEBUG_OUTPUT
     #define MEDIAINFO_DEBUG_OUTPUT_INIT(_VALUE, _DEBUGB) \
         { \
-            if (OptionLower==_T("file_duplicate")) \
+            if (OptionLower==__T("file_duplicate")) \
             { \
                 size_t Pos=(size_t)ToReturn2.To_int64u(); \
                 if (Pos>=Debug_Output_Pos_Stream.size()) \
@@ -162,7 +212,7 @@
                     Debug_Output_Pos_Sizes.resize(Pos+1); \
                     Debug_Output_Pos_Sizes[Pos]=new File(); \
                     Debug_Output_Pos_Pointer.resize(Pos+1); \
-                    Debug_Output_Pos_Pointer[Pos]=(void*)Ztring(Value).SubString(_T("memory:/""/"), _T(":")).To_int64u(); \
+                    Debug_Output_Pos_Pointer[Pos]=(void*)Ztring(Value).SubString(__T("memory://"), __T(":")).To_int64u(); \
                 } \
             } \
             EXECUTE_STRING(_VALUE, _DEBUGB) \
@@ -176,15 +226,15 @@
     #define MEDIAINFO_DEBUG_OUTPUT_VALUE(_VALUE, _METHOD) \
         { \
             size_t ByteCount=Info->Output_Buffer_Get(Value); \
-            void* ValueH=(void*)Ztring(Value).SubString(_T("memory:/""/"), _T(":")).To_int64u(); \
+            void* ValueH=(void*)Ztring(Value).SubString(__T("memory://"), __T(":")).To_int64u(); \
             map<void*, File>::iterator F_Stream=Debug_Output_Value_Stream.find(ValueH); \
             if (F_Stream!=Debug_Output_Value_Stream.end()) \
             { \
                 map<void*, File>::iterator F_Sizes=Debug_Output_Value_Stream.find(ValueH); \
                 if (!F_Stream->second.Opened_Get()) \
                 { \
-                    F_Stream->second.Create(Ztring(MediaInfo_Debug_Name)+_T(".")+Ztring::ToZtring((size_t)this, 16)+_T(".Output.")+Ztring::ToZtring((size_t)ValueH, 16)+_T(".Stream")); \
-                    F_Sizes->second.Create(Ztring(MediaInfo_Debug_Name)+_T(".")+Ztring::ToZtring((size_t)this, 16)+_T(".Output.")+Ztring::ToZtring((size_t)ValueH, 16)+_T(".Sizes")); \
+                    F_Stream->second.Create(Ztring(MediaInfo_Debug_Name)+__T(".")+Ztring::ToZtring((size_t)this, 16)+__T(".Output.")+Ztring::ToZtring((size_t)ValueH, 16)+__T(".Stream")); \
+                    F_Sizes->second.Create(Ztring(MediaInfo_Debug_Name)+__T(".")+Ztring::ToZtring((size_t)this, 16)+__T(".Output.")+Ztring::ToZtring((size_t)ValueH, 16)+__T(".Sizes")); \
                 } \
                 F_Stream->second.Write((int8u*)ValueH, ByteCount); \
                 F_Sizes->second.Write((int8u*)&ByteCount, sizeof(ByteCount)); \
@@ -204,8 +254,8 @@
             { \
                 if (!Debug_Output_Pos_Stream[_POS]->Opened_Get()) \
                 { \
-                    Debug_Output_Pos_Stream[_POS]->Create(Ztring(MediaInfo_Debug_Name)+_T(".")+Ztring::ToZtring((size_t)this, 16)+_T(".Output.")+Ztring::ToZtring(Pos, 16)+_T(".Stream")); \
-                    Debug_Output_Pos_Sizes[_POS]->Create(Ztring(MediaInfo_Debug_Name)+_T(".")+Ztring::ToZtring((size_t)this, 16)+_T(".Output.")+Ztring::ToZtring(Pos, 16)+_T(".Sizes")); \
+                    Debug_Output_Pos_Stream[_POS]->Create(Ztring(MediaInfo_Debug_Name)+__T(".")+Ztring::ToZtring((size_t)this, 16)+__T(".Output.")+Ztring::ToZtring(Pos, 16)+__T(".Stream")); \
+                    Debug_Output_Pos_Sizes[_POS]->Create(Ztring(MediaInfo_Debug_Name)+__T(".")+Ztring::ToZtring((size_t)this, 16)+__T(".Output.")+Ztring::ToZtring(Pos, 16)+__T(".Sizes")); \
                 } \
                 Debug_Output_Pos_Stream[_POS]->Write((int8u*)Debug_Output_Pos_Pointer[_POS], ByteCount); \
                 Debug_Output_Pos_Sizes[_POS]->Write((int8u*)&ByteCount, sizeof(ByteCount)); \
@@ -230,17 +280,24 @@
 {
     CriticalSectionLocker CSL(CS);
 
-    MEDIAINFO_DEBUG_CONFIG_TEXT(Debug+=_T("Construction");)
+    MEDIAINFO_DEBUG_CONFIG_TEXT(Debug+=__T("Construction");)
 
     MediaInfoLib::Config.Init(); //Initialize Configuration
 
     BlockMethod=BlockMethod_Local;
     Info=NULL;
+    #if !defined(MEDIAINFO_READER_NO)
+        Reader=NULL;
+    #endif //!defined(MEDIAINFO_READER_NO)
     Info_IsMultipleParsing=false;
 
     Stream.resize(Stream_Max);
     Stream_More.resize(Stream_Max);
-    
+
+    //Position in a MediaInfoList class
+    IsFirst=true;
+    IsLast=true;
+
     //Threading
     BlockMethod=0;
     IsInThread=false;
@@ -253,9 +310,12 @@
 
     CriticalSectionLocker CSL(CS);
 
-    MEDIAINFO_DEBUG_CONFIG_TEXT(Debug+=_T("Destruction");)
+    MEDIAINFO_DEBUG_CONFIG_TEXT(Debug+=__T("Destruction");)
 
     delete Info; //Info=NULL;
+    #if !defined(MEDIAINFO_READER_NO)
+        delete Reader; //Reader=NULL;
+    #endif //!defined(MEDIAINFO_READER_NO)
     #ifdef MEDIAINFO_DEBUG_OUTPUT
         for (size_t Pos=0; Pos<Debug_Output_Pos_Stream.size(); Pos++)
         {
@@ -272,9 +332,24 @@
 //---------------------------------------------------------------------------
 size_t MediaInfo_Internal::Open(const String &File_Name_)
 {
+    Close();
+
     CS.Enter();
-    MEDIAINFO_DEBUG_CONFIG_TEXT(Debug+=_T("Open, File=");Debug+=Ztring(File_Name_).c_str();)
-    File_Name=File_Name_;
+    MEDIAINFO_DEBUG_CONFIG_TEXT(Debug+=__T("Open, File=");Debug+=Ztring(File_Name_).c_str();)
+    Config.File_Names.clear();
+    if (Config.File_FileNameFormat_Get()==__T("CSV"))
+    {
+        Config.File_Names.Separator_Set(0, __T(","));
+        Config.File_Names.Write(File_Name_);
+    }
+    else if (!File_Name_.empty())
+        Config.File_Names.push_back(File_Name_);
+    if (Config.File_Names.empty())
+    {
+        CS.Leave();
+        return 0;
+    }
+    Config.File_Names_Pos=1;
     CS.Leave();
 
     //Parsing
@@ -298,57 +373,100 @@
 void MediaInfo_Internal::Entry()
 {
     CS.Enter();
-    MEDIAINFO_DEBUG_CONFIG_TEXT(Debug+=_T("Entry");)
+    MEDIAINFO_DEBUG_CONFIG_TEXT(Debug+=__T("Entry");)
     Config.State_Set(0);
     CS.Leave();
 
-        if (0);
-    #if defined(MEDIAINFO_LIBCURL_YES)
-        else if ((File_Name.size()>=7
-          && File_Name[0]==_T('h')
-          && File_Name[1]==_T('t')
-          && File_Name[2]==_T('t')
-          && File_Name[3]==_T('p')
-          && File_Name[4]==_T(':')
-          && File_Name[5]==_T('/')
-          && File_Name[6]==_T('/'))
-         || (File_Name.size()>=6
-          && File_Name[0]==_T('f')
-          && File_Name[1]==_T('t')
-          && File_Name[2]==_T('p')
-          && File_Name[3]==_T(':')
-          && File_Name[4]==_T('/')
-          && File_Name[5]==_T('/')))
-            Reader_libcurl::Format_Test(this, File_Name);
-    #endif //MEDIAINFO_LIBCURL_YES
-
-    #if defined(MEDIAINFO_LIBMMS_YES)
-        else if ((File_Name.size()>=6
-          && File_Name[0]==_T('m')
-          && File_Name[1]==_T('m')
-          && File_Name[2]==_T('s')
-          && File_Name[3]==_T(':')
-          && File_Name[4]==_T('/')
-          && File_Name[5]==_T('/'))
-         || (File_Name.size()>=7
-          && File_Name[0]==_T('m')
-          && File_Name[1]==_T('m')
-          && File_Name[2]==_T('s')
-          && File_Name[3]==_T('h')
-          && File_Name[4]==_T(':')
-          && File_Name[5]==_T('/')
-          && File_Name[6]==_T('/')))
-            Reader_libmms::Format_Test(this, File_Name);
-    #endif //MEDIAINFO_LIBMMS_YES
+    if ((Config.File_Names[0].size()>=6
+        && Config.File_Names[0][0]==__T('m')
+        && Config.File_Names[0][1]==__T('m')
+        && Config.File_Names[0][2]==__T('s')
+        && Config.File_Names[0][3]==__T(':')
+        && Config.File_Names[0][4]==__T('/')
+        && Config.File_Names[0][5]==__T('/'))
+        || (Config.File_Names[0].size()>=7
+        && Config.File_Names[0][0]==__T('m')
+        && Config.File_Names[0][1]==__T('m')
+        && Config.File_Names[0][2]==__T('s')
+        && Config.File_Names[0][3]==__T('h')
+        && Config.File_Names[0][4]==__T(':')
+        && Config.File_Names[0][5]==__T('/')
+        && Config.File_Names[0][6]==__T('/')))
+        #if defined(MEDIAINFO_LIBMMS_YES)
+            Reader_libmms().Format_Test(this, Config.File_Names[0]);
+        #else //MEDIAINFO_LIBMMS_YES
+            {
+            #if MEDIAINFO_EVENTS
+                struct MediaInfo_Event_Log_0 Event;
+                Event.EventCode=MediaInfo_EventCode_Create(MediaInfo_Parser_None, MediaInfo_Event_Log, 0);
+                Event.Type=0xC0;
+                Event.Severity=0xFF;
+                Event.MessageCode=0;
+                Event.MessageStringU=L"Libmms cupport is disabled due to compilation options";
+                Event.MessageStringA="Libmms cupport is disabled due to compilation options";
+                MediaInfoLib::Config.Event_Send((const int8u*)&Event, sizeof(MediaInfo_Event_Log_0));
+            #endif //MEDIAINFO_EVENTS
+            }
+        #endif //MEDIAINFO_LIBMMS_YES
+
+    else if (Config.File_Names[0].find(__T("://"))!=string::npos)
+        #if defined(MEDIAINFO_LIBCURL_YES)
+        {
+            CS.Enter();
+            if (Reader)
+            {
+                CS.Leave();
+                return; //There is a problem
+            }
+            Reader=new Reader_libcurl();
+            CS.Leave();
+
+            Reader->Format_Test(this, Config.File_Names[0]);
+
+            #if MEDIAINFO_NEXTPACKET
+                if (Config.NextPacket_Get())
+                    return;
+            #endif //MEDIAINFO_NEXTPACKET
+        }
+        #else //MEDIAINFO_LIBCURL_YES
+            {
+            #if MEDIAINFO_EVENTS
+                struct MediaInfo_Event_Log_0 Event;
+                Event.EventCode=MediaInfo_EventCode_Create(MediaInfo_Parser_None, MediaInfo_Event_Log, 0);
+                Event.Type=0xC0;
+                Event.Severity=0xFF;
+                Event.MessageCode=0;
+                Event.MessageStringU=L"Libcurl support is disabled due to compilation options";
+                Event.MessageStringA="Libcurl support is disabled due to compilation options";
+                MediaInfoLib::Config.Event_Send((const int8u*)&Event, sizeof(MediaInfo_Event_Log_0));
+            #endif //MEDIAINFO_EVENTS
+            }
+        #endif //MEDIAINFO_LIBCURL_YES
 
     #if defined(MEDIAINFO_DIRECTORY_YES)
-        else if (Dir::Exists(File_Name))
-            Reader_Directory::Format_Test(this, File_Name);
+        else if (Dir::Exists(Config.File_Names[0]))
+            Reader_Directory().Format_Test(this, Config.File_Names[0]);
     #endif //MEDIAINFO_DIRECTORY_YES
 
     #if defined(MEDIAINFO_FILE_YES)
-        else if (File::Exists(File_Name))
-            Reader_File::Format_Test(this, File_Name);
+        else if (File::Exists(Config.File_Names[0]))
+        {
+            CS.Enter();
+            if (Reader)
+            {
+                CS.Leave();
+                return; //There is a problem
+            }
+            Reader=new Reader_File();
+            CS.Leave();
+
+            Reader->Format_Test(this, Config.File_Names[0]);
+
+            #if MEDIAINFO_NEXTPACKET
+                if (Config.NextPacket_Get())
+                    return;
+            #endif //MEDIAINFO_NEXTPACKET
+        }
     #endif //MEDIAINFO_FILE_YES
 
     CS.Enter();
@@ -357,10 +475,15 @@
 }
 
 //---------------------------------------------------------------------------
-size_t MediaInfo_Internal::Open (const int8u* Begin, size_t Begin_Size, const int8u*, size_t, int64u File_Size)
+size_t MediaInfo_Internal::Open (const int8u* Begin, size_t Begin_Size, const int8u* End, size_t End_Size, int64u File_Size)
 {
     Open_Buffer_Init(File_Size);
     Open_Buffer_Continue(Begin, Begin_Size);
+    if (End && Begin_Size+End_Size<=File_Size)
+    {
+        Open_Buffer_Init(File_Size, File_Size-End_Size);
+        Open_Buffer_Continue(End, End_Size);
+    }
     Open_Buffer_Finalize();
 
     return 1;
@@ -378,7 +501,7 @@
             SelectFromExtension(Config.File_ForceParser_Get());
             CS.Enter();
         }
-        else
+        if (Info==NULL)
         {
             Info=new File__MultipleParsing;
             Info_IsMultipleParsing=true;
@@ -399,20 +522,29 @@
 //---------------------------------------------------------------------------
 size_t MediaInfo_Internal::Open_Buffer_Init (int64u File_Size_, int64u File_Offset_)
 {
-    MEDIAINFO_DEBUG_CONFIG_TEXT(Debug+=_T("Open_Buffer_Init, File_Size=");Debug+=Ztring::ToZtring(File_Size_);Debug+=_T(", File_Offset=");Debug+=Ztring::ToZtring(File_Offset_);)
+    MEDIAINFO_DEBUG_CONFIG_TEXT(Debug+=__T("Open_Buffer_Init, File_Size=");Debug+=Ztring::ToZtring(File_Size_);Debug+=__T(", File_Offset=");Debug+=Ztring::ToZtring(File_Offset_);)
+    #ifdef MEDIAINFO_DEBUG_BUFFER
+        if (Info && File_Offset_>Info->File_Offset)
+        {
+            size_t Temp_Size=(size_t)(File_Offset_-Info->File_Offset);
+            int8u* Temp=new int8u[Temp_Size];
+            std::memset(Temp, 0xCC, Temp_Size);
+            MEDIAINFO_DEBUG_BUFFER_SAVE(Temp, Temp_Size);
+            delete[] Temp;
+        }
+    #endif //MEDIAINFO_DEBUG_BUFFER
 
-    if (Info==NULL)
+    if (Info==NULL || File_Size_!=(int64u)-1)
         Open_Buffer_Init(File_Size_);
 
     if (File_Offset_!=(int64u)-1 && Info)
     {
         CriticalSectionLocker CSL(CS);
         Info->Open_Buffer_Position_Set(File_Offset_);
-        //Info->Open_Buffer_Unsynch();
     }
 
     #if MEDIAINFO_EVENTS
-        if (Info->Status[File__Analyze::IsAccepted])
+        if (Info && Info->Status[File__Analyze::IsAccepted])
         {
             struct MediaInfo_Event_General_Move_Done_0 Event;
             Event.EventCode=MediaInfo_EventCode_Create(MediaInfo_Parser_None, MediaInfo_Event_General_Move_Done, 0);
@@ -428,7 +560,19 @@
         }
     #endif //MEDIAINFO_EVENTS
 
-    EXECUTE_SIZE_T(1, Debug+=_T("Open_Buffer_Init, will return 1");)
+    EXECUTE_SIZE_T(1, Debug+=__T("Open_Buffer_Init, will return 1");)
+}
+
+//---------------------------------------------------------------------------
+void MediaInfo_Internal::Open_Buffer_Unsynch ()
+{
+    MEDIAINFO_DEBUG_CONFIG_TEXT(Debug+=__T("Open_Buffer_Unsynch");)
+
+    if (Info==NULL)
+        return;
+
+    CriticalSectionLocker CSL(CS);
+    Info->Open_Buffer_Unsynch();
 }
 
 //---------------------------------------------------------------------------
@@ -456,7 +600,7 @@
     {
         Info->Open_Buffer_Finalize(true);
         Info->File_GoTo=(int64u)-1;
-        MEDIAINFO_DEBUG_CONFIG_TEXT(Debug+=_T("Open_Buffer_Continue, will return 0");)
+        MEDIAINFO_DEBUG_CONFIG_TEXT(Debug+=__T("Open_Buffer_Continue, will return 0");)
         return 0;
     }
 
@@ -469,9 +613,6 @@
         Info->File_GoTo=(int64u)-1;
     }
 
-    if (!Info->Status[File__Analyze::IsFilled] && Info->Status[File__Analyze::IsUpdated])
-        Info->Status[File__Analyze::IsUpdated]=false; //No updated info until IsFilled is set
-
     return Info->Status;
     #endif
 }
@@ -481,11 +622,16 @@
 {
     CriticalSectionLocker CSL(CS);
     if (Info==NULL)
-        return 0;
+        return (int64u)-1;
 
-    return Info->File_GoTo;
+    if (Info->File_GoTo==(int64u)-1
+     || (Info->File_GoTo>=Info->File_Offset && Info->File_GoTo<Info->File_Offset+0x10000)) //If jump is tiny, this is not worth the performance cost due to seek
+        return (int64u)-1;
+    else
+        return Info->File_GoTo;
 }
 
+//---------------------------------------------------------------------------
 bool MediaInfo_Internal::Open_Buffer_Position_Set(int64u File_Offset)
 {
     CriticalSectionLocker CSL(CS);
@@ -498,22 +644,77 @@
 }
 
 //---------------------------------------------------------------------------
+#if MEDIAINFO_SEEK
+size_t MediaInfo_Internal::Open_Buffer_Seek (size_t Method, int64u Value, int64u ID)
+{
+    CriticalSectionLocker CSL(CS);
+    if (Info==NULL)
+        return false;
+
+    return Info->Open_Buffer_Seek(Method, Value, ID);
+}
+#endif //MEDIAINFO_SEEK
+
+//---------------------------------------------------------------------------
 size_t MediaInfo_Internal::Open_Buffer_Finalize ()
 {
+    CS.Enter();
+    if (Info && Info->Status[File__Analyze::IsUpdated])
+    {
+        Info->Open_Buffer_Update();
+        Info->Status[File__Analyze::IsUpdated]=false;
+        for (size_t Pos=File__Analyze::User_16; Pos<File__Analyze::User_16+16; Pos++)
+            Info->Status[Pos]=false;
+    }
+    CS.Leave();
+
     CriticalSectionLocker CSL(CS);
-    MEDIAINFO_DEBUG_CONFIG_TEXT(Debug+=_T("Open_Buffer_Finalize");)
+    MEDIAINFO_DEBUG_CONFIG_TEXT(Debug+=__T("Open_Buffer_Finalize");)
     if (Info==NULL)
         return 0;
 
     Info->Open_Buffer_Finalize();
+    #if MEDIAINFO_DEMUX
+        if (Config.Demux_EventWasSent)
+            return 0;
+    #endif //MEDIAINFO_DEMUX
 
     //Cleanup
     if (!Config.File_IsSub_Get() && !Config.File_KeepInfo_Get()) //We need info for the calling parser
     {
         delete Info; Info=NULL;
     }
+    if (Config.File_Names_Pos>=Config.File_Names.size())
+    {
+        delete[] Config.File_Buffer; Config.File_Buffer=NULL; Config.File_Buffer_Size=0; Config.File_Buffer_Size_Max=0;
+    }
 
-    EXECUTE_SIZE_T(1, Debug+=_T("Open_Buffer_Finalize, will return 1"))
+    EXECUTE_SIZE_T(1, Debug+=__T("Open_Buffer_Finalize, will return 1"))
+}
+
+//---------------------------------------------------------------------------
+std::bitset<32> MediaInfo_Internal::Open_NextPacket ()
+{
+    CriticalSectionLocker CSL(CS);
+
+    bool Demux_EventWasSent=false;
+    if (Info==NULL || !Info->Status[File__Analyze::IsFinished])
+    {
+        #if !defined(MEDIAINFO_READER_NO)
+            if (Reader)
+            {
+                CS.Leave();
+                Demux_EventWasSent=(Reader->Format_Test_PerParser_Continue(this)==2);
+                CS.Enter();
+            }
+        #endif //defined(MEDIAINFO_READER_NO)
+    }
+
+    std::bitset<32> ToReturn=Info==NULL?std::bitset<32>(0x0F):Info->Status;
+    if (Demux_EventWasSent)
+        ToReturn[8]=true; //bit 8 is for the reception of a frame
+
+    return ToReturn;
 }
 
 //---------------------------------------------------------------------------
@@ -527,12 +728,15 @@
     }
 
     CriticalSectionLocker CSL(CS);
-    MEDIAINFO_DEBUG_CONFIG_TEXT(Debug+=_T("Close");)
+    MEDIAINFO_DEBUG_CONFIG_TEXT(Debug+=__T("Close");)
     Stream.clear();
     Stream.resize(Stream_Max);
     Stream_More.clear();
     Stream_More.resize(Stream_Max);
     delete Info; Info=NULL;
+    #if !defined(MEDIAINFO_READER_NO)
+        delete Reader; Reader=NULL;
+    #endif //defined(MEDIAINFO_READER_NO)
 }
 
 //***************************************************************************
@@ -556,10 +760,11 @@
 Ztring MediaInfo_Internal::Get(stream_t StreamKind, size_t StreamPos, size_t Parameter, info_t KindOfInfo)
 {
     CriticalSectionLocker CSL(CS);
-    MEDIAINFO_DEBUG_CONFIG_TEXT(Debug+=_T("Get, StreamKind=");Debug+=Ztring::ToZtring((size_t)StreamKind);Debug+=_T(", StreamPos=");Debug+=Ztring::ToZtring(StreamPos);Debug+=_T(", Parameter=");Debug+=Ztring::ToZtring(Parameter);)
+    MEDIAINFO_DEBUG_CONFIG_TEXT(Debug+=__T("Get, StreamKind=");Debug+=Ztring::ToZtring((size_t)StreamKind);Debug+=__T(", StreamPos=");Debug+=Ztring::ToZtring(StreamPos);Debug+=__T(", Parameter=");Debug+=Ztring::ToZtring(Parameter);)
 
-    if (Info)
+    if (Info && Info->Status[File__Analyze::IsUpdated])
     {
+        Info->Open_Buffer_Update();
         Info->Status[File__Analyze::IsUpdated]=false;
         for (size_t Pos=File__Analyze::User_16; Pos<File__Analyze::User_16+16; Pos++)
             Info->Status[Pos]=false;
@@ -573,68 +778,71 @@
     {
         //Optimization : KindOfInfo>Info_Text is in static lists
         if (KindOfInfo!=Info_Text)
-            EXECUTE_STRING(MediaInfoLib::Config.Info_Get(StreamKind, Parameter, KindOfInfo), Debug+=_T("Get, will return ");Debug+=ToReturn;) //look for static information only
+            EXECUTE_STRING(MediaInfoLib::Config.Info_Get(StreamKind, Parameter, KindOfInfo), Debug+=__T("Get, will return ");Debug+=ToReturn;) //look for static information only
         else if (Parameter<Stream[StreamKind][StreamPos].size())
-            EXECUTE_STRING(Stream[StreamKind][StreamPos][Parameter], Debug+=_T("Get, will return ");Debug+=ToReturn;)
+            EXECUTE_STRING(Stream[StreamKind][StreamPos][Parameter], Debug+=__T("Get, will return ");Debug+=ToReturn;)
         else
-            EXECUTE_STRING(MediaInfoLib::Config.EmptyString_Get(), Debug+=_T("Get, will return ");Debug+=ToReturn;) //This parameter is known, but not filled
+            EXECUTE_STRING(MediaInfoLib::Config.EmptyString_Get(), Debug+=__T("Get, will return ");Debug+=ToReturn;) //This parameter is known, but not filled
     }
     else
-        EXECUTE_STRING(Stream_More[StreamKind][StreamPos][Parameter-MediaInfoLib::Config.Info_Get(StreamKind).size()](KindOfInfo), Debug+=_T("Get, will return ");Debug+=ToReturn;)
+        EXECUTE_STRING(Stream_More[StreamKind][StreamPos][Parameter-MediaInfoLib::Config.Info_Get(StreamKind).size()](KindOfInfo), Debug+=__T("Get, will return ");Debug+=ToReturn;)
 }
 
 //---------------------------------------------------------------------------
 Ztring MediaInfo_Internal::Get(stream_t StreamKind, size_t StreamPos, const String &Parameter, info_t KindOfInfo, info_t KindOfSearch)
 {
     //Legacy
-    if (Parameter.find(_T("_String"))!=Error)
+    if (Parameter.find(__T("_String"))!=Error)
     {
         Ztring S1=Parameter;
-        S1.FindAndReplace(_T("_String"), _T("/String"));
+        S1.FindAndReplace(__T("_String"), __T("/String"));
         return Get(StreamKind, StreamPos, S1, KindOfInfo, KindOfSearch);
     }
-    if (Parameter==_T("Channels"))
-        return Get(StreamKind, StreamPos, _T("Channel(s)"), KindOfInfo, KindOfSearch);
-    if (Parameter==_T("Artist"))
-        return Get(StreamKind, StreamPos, _T("Performer"), KindOfInfo, KindOfSearch);
-    if (Parameter==_T("AspectRatio"))
-        return Get(StreamKind, StreamPos, _T("DisplayAspectRatio"), KindOfInfo, KindOfSearch);
-    if (Parameter==_T("AspectRatio/String"))
-        return Get(StreamKind, StreamPos, _T("DisplayAspectRatio/String"), KindOfInfo, KindOfSearch);
-    if (Parameter==_T("Chroma"))
-        return Get(StreamKind, StreamPos, _T("Colorimetry"), KindOfInfo, KindOfSearch);
-    if (Parameter==_T("PlayTime"))
-        return Get(StreamKind, StreamPos, _T("Duration"), KindOfInfo, KindOfSearch);
-    if (Parameter==_T("PlayTime/String"))
-        return Get(StreamKind, StreamPos, _T("Duration/String"), KindOfInfo, KindOfSearch);
-    if (Parameter==_T("PlayTime/String1"))
-        return Get(StreamKind, StreamPos, _T("Duration/String1"), KindOfInfo, KindOfSearch);
-    if (Parameter==_T("PlayTime/String2"))
-        return Get(StreamKind, StreamPos, _T("Duration/String2"), KindOfInfo, KindOfSearch);
-    if (Parameter==_T("PlayTime/String3"))
-        return Get(StreamKind, StreamPos, _T("Duration/String3"), KindOfInfo, KindOfSearch);
-    if (StreamKind==Stream_General && Parameter==_T("BitRate"))
-        return Get(Stream_General, StreamPos, _T("OverallBitRate"), KindOfInfo, KindOfSearch);
-    if (StreamKind==Stream_General && Parameter==_T("BitRate/String"))
-        return Get(Stream_General, StreamPos, _T("OverallBitRate/String"), KindOfInfo, KindOfSearch);
-    if (StreamKind==Stream_General && Parameter==_T("BitRate_Minimum"))
-        return Get(Stream_General, StreamPos, _T("OverallBitRate_Minimum"), KindOfInfo, KindOfSearch);
-    if (StreamKind==Stream_General && Parameter==_T("BitRate_Minimum/String"))
-        return Get(Stream_General, StreamPos, _T("OverallBitRate_Minimum/String"), KindOfInfo, KindOfSearch);
-    if (StreamKind==Stream_General && Parameter==_T("BitRate_Nominal"))
-        return Get(Stream_General, StreamPos, _T("OverallBitRate_Nominal"), KindOfInfo, KindOfSearch);
-    if (StreamKind==Stream_General && Parameter==_T("BitRate_Nominal/String"))
-        return Get(Stream_General, StreamPos, _T("OverallBitRate_Nominal/String"), KindOfInfo, KindOfSearch);
-    if (StreamKind==Stream_General && Parameter==_T("BitRate_Maximum"))
-        return Get(Stream_General, StreamPos, _T("OverallBitRate_Maximum"), KindOfInfo, KindOfSearch);
-    if (StreamKind==Stream_General && Parameter==_T("BitRate_Maximum/String"))
-        return Get(Stream_General, StreamPos, _T("OverallBitRate_Maximum/String"), KindOfInfo, KindOfSearch);
+    if (Parameter==__T("Channels"))
+        return Get(StreamKind, StreamPos, __T("Channel(s)"), KindOfInfo, KindOfSearch);
+    if (Parameter==__T("Artist"))
+        return Get(StreamKind, StreamPos, __T("Performer"), KindOfInfo, KindOfSearch);
+    if (Parameter==__T("AspectRatio"))
+        return Get(StreamKind, StreamPos, __T("DisplayAspectRatio"), KindOfInfo, KindOfSearch);
+    if (Parameter==__T("AspectRatio/String"))
+        return Get(StreamKind, StreamPos, __T("DisplayAspectRatio/String"), KindOfInfo, KindOfSearch);
+    if (Parameter==__T("Chroma"))
+        return Get(StreamKind, StreamPos, __T("Colorimetry"), KindOfInfo, KindOfSearch);
+    if (Parameter==__T("PlayTime"))
+        return Get(StreamKind, StreamPos, __T("Duration"), KindOfInfo, KindOfSearch);
+    if (Parameter==__T("PlayTime/String"))
+        return Get(StreamKind, StreamPos, __T("Duration/String"), KindOfInfo, KindOfSearch);
+    if (Parameter==__T("PlayTime/String1"))
+        return Get(StreamKind, StreamPos, __T("Duration/String1"), KindOfInfo, KindOfSearch);
+    if (Parameter==__T("PlayTime/String2"))
+        return Get(StreamKind, StreamPos, __T("Duration/String2"), KindOfInfo, KindOfSearch);
+    if (Parameter==__T("PlayTime/String3"))
+        return Get(StreamKind, StreamPos, __T("Duration/String3"), KindOfInfo, KindOfSearch);
+    if (StreamKind==Stream_General && Parameter==__T("BitRate"))
+        return Get(Stream_General, StreamPos, __T("OverallBitRate"), KindOfInfo, KindOfSearch);
+    if (StreamKind==Stream_General && Parameter==__T("BitRate/String"))
+        return Get(Stream_General, StreamPos, __T("OverallBitRate/String"), KindOfInfo, KindOfSearch);
+    if (StreamKind==Stream_General && Parameter==__T("BitRate_Minimum"))
+        return Get(Stream_General, StreamPos, __T("OverallBitRate_Minimum"), KindOfInfo, KindOfSearch);
+    if (StreamKind==Stream_General && Parameter==__T("BitRate_Minimum/String"))
+        return Get(Stream_General, StreamPos, __T("OverallBitRate_Minimum/String"), KindOfInfo, KindOfSearch);
+    if (StreamKind==Stream_General && Parameter==__T("BitRate_Nominal"))
+        return Get(Stream_General, StreamPos, __T("OverallBitRate_Nominal"), KindOfInfo, KindOfSearch);
+    if (StreamKind==Stream_General && Parameter==__T("BitRate_Nominal/String"))
+        return Get(Stream_General, StreamPos, __T("OverallBitRate_Nominal/String"), KindOfInfo, KindOfSearch);
+    if (StreamKind==Stream_General && Parameter==__T("BitRate_Maximum"))
+        return Get(Stream_General, StreamPos, __T("OverallBitRate_Maximum"), KindOfInfo, KindOfSearch);
+    if (StreamKind==Stream_General && Parameter==__T("BitRate_Maximum/String"))
+        return Get(Stream_General, StreamPos, __T("OverallBitRate_Maximum/String"), KindOfInfo, KindOfSearch);
+    if (Parameter==__T("AFD"))
+        return Get(StreamKind, StreamPos, __T("ActiveFormatDescription"), KindOfInfo, KindOfSearch);
 
     CS.Enter();
-    MEDIAINFO_DEBUG_CONFIG_TEXT(Debug+=_T("Get, StreamKind=");Debug+=Ztring::ToZtring((size_t)StreamKind);Debug+=_T(", StreamKind=");Debug+=Ztring::ToZtring(StreamPos);Debug+=_T(", Parameter=");Debug+=Ztring(Parameter);)
+    MEDIAINFO_DEBUG_CONFIG_TEXT(Debug+=__T("Get, StreamKind=");Debug+=Ztring::ToZtring((size_t)StreamKind);Debug+=__T(", StreamKind=");Debug+=Ztring::ToZtring(StreamPos);Debug+=__T(", Parameter=");Debug+=Ztring(Parameter);)
 
-    if (Info)
+    if (Info && Info->Status[File__Analyze::IsUpdated])
     {
+        Info->Open_Buffer_Update();
         Info->Status[File__Analyze::IsUpdated]=false;
         for (size_t Pos=File__Analyze::User_16; Pos<File__Analyze::User_16+16; Pos++)
             Info->Status[Pos]=false;
@@ -644,17 +852,17 @@
     if (StreamKind>=Stream_Max || StreamPos>=Stream[StreamKind].size() || KindOfInfo>=Info_Max)
     {
         CS.Leave();
-        EXECUTE_STRING(MediaInfoLib::Config.EmptyString_Get(), Debug+=_T("Get, will return empty string");) //Parameter is unknown
+        EXECUTE_STRING(MediaInfoLib::Config.EmptyString_Get(), Debug+=__T("Get, stream and/or pos is invalid will return empty string");) //Parameter is unknown
     }
 
     //Special cases
     //-Inform for a stream
-    if (Parameter==_T("Inform"))
+    if (Parameter==__T("Inform"))
     {
         CS.Leave();
-        Ztring InformZtring=Inform(StreamKind, StreamPos);
+        Ztring InformZtring=Inform(StreamKind, StreamPos, true);
         CS.Enter();
-        size_t Pos=MediaInfoLib::Config.Info_Get(StreamKind).Find(_T("Inform"));
+        size_t Pos=MediaInfoLib::Config.Info_Get(StreamKind).Find(__T("Inform"));
         if (Pos!=Error)
             Stream[StreamKind][StreamPos](Pos)=InformZtring;
     }
@@ -666,8 +874,13 @@
         ParameterI=Stream_More[StreamKind][StreamPos].Find(Parameter, KindOfSearch);
         if (ParameterI==Error)
         {
+            #ifdef MEDIAINFO_DEBUG_WARNING_GET
+                if (Ztring(Parameter)!=__T("SCTE35_PID")) //TODO: define a special interface for parser-specific parameters
+                    std::cerr<<"MediaInfo: Warning, Get(), parameter \""<<Ztring(Parameter).To_Local()<<"\""<<std::endl;
+            #endif //MEDIAINFO_DEBUG_WARNING_GET
+
             CS.Leave();
-            EXECUTE_STRING(MediaInfoLib::Config.EmptyString_Get(), Debug+=_T("Get, will return empty string");) //Parameter is unknown
+            EXECUTE_STRING(MediaInfoLib::Config.EmptyString_Get(), Debug+=__T("Get, parameter is unknown, will return empty string");) //Parameter is unknown
         }
         CS.Leave();
         CriticalSectionLocker CSL(CS);
@@ -676,7 +889,7 @@
 
     CS.Leave();
 
-    EXECUTE_STRING(Get(StreamKind, StreamPos, ParameterI, KindOfInfo), Debug+=_T("Get, will return ");Debug+=ToReturn;)
+    EXECUTE_STRING(Get(StreamKind, StreamPos, ParameterI, KindOfInfo), Debug+=__T("Get, will return ");Debug+=ToReturn;)
 }
 
 //***************************************************************************
@@ -735,60 +948,152 @@
 String MediaInfo_Internal::Option (const String &Option, const String &Value)
 {
     CriticalSectionLocker CSL(CS);
-    MEDIAINFO_DEBUG_CONFIG_TEXT(Debug+=_T("Option, Option=");Debug+=Ztring(Option);Debug+=_T(", Value=");Debug+=Ztring(Value);)
+    MEDIAINFO_DEBUG_CONFIG_TEXT(Debug+=__T("Option, Option=");Debug+=Ztring(Option);Debug+=__T(", Value=");Debug+=Ztring(Value);)
     Ztring OptionLower=Option; OptionLower.MakeLowerCase();
          if (Option.empty())
-        return _T("");
-    else if (OptionLower==_T("language_update"))
+        return __T("");
+    else if (OptionLower==__T("language_update"))
     {
-        if (!Info || Info->Get(Stream_General, 0, _T("CompleteName"))==_T(""))
-            return _T("");
+        if (!Info || Info->Get(Stream_General, 0, __T("CompleteName"))==__T(""))
+            return __T("");
 
         ZtringListList Language=Value.c_str();
         MediaInfoLib::Config.Language_Set(Language);
 
-        return _T("");
+        return __T("");
     }
-    else if (OptionLower==_T("create_dummy"))
+    else if (OptionLower==__T("create_dummy"))
     {
         CreateDummy (Value);
         delete Info; Info=NULL;
-        return _T("");
+        return __T("");
     }
-    else if (OptionLower==_T("thread"))
+    else if (OptionLower==__T("thread"))
     {
         BlockMethod=1;
-        return _T("");
+        return __T("");
     }
-    else if (Option==_T("info_capacities"))
+    else if (Option==__T("info_capacities"))
     {
-        return _T("Option removed");
+        return __T("Option removed");
     }
     #if MEDIAINFO_TRACE
-    else if (OptionLower.find(_T("file_details_clear"))==0)
+    else if (OptionLower.find(__T("file_details_clear"))==0)
     {
         if (Info)
             Info->Details_Clear();
 
-        return _T("");
+        return __T("");
     }
     #endif //MEDIAINFO_TRACE
-    else if (OptionLower.find(_T("file_"))==0)
+    else if (OptionLower.find(__T("file_seek"))==0)
+    {
+        #if MEDIAINFO_SEEK
+            if (Reader==NULL)
+                return __T("Error: Reader pointer is empty");
+
+            size_t Method=(size_t)-1;
+            int64u SeekValue=(int64u)-1;
+            int64u ID=(int64u)-1;
+
+            ZtringList List; List.Separator_Set(0, __T(","));
+            List.Write(Value);
+            for (size_t Pos=0; Pos<List.size(); Pos++)
+            {
+                if (!List[Pos].empty() && List[Pos].find(__T('%'))==List[Pos].size()-1)
+                {
+                    Method=1;
+                    SeekValue=(int64u)(Ztring(List[Pos]).To_float32()*100);
+                }
+                else if (!List[Pos].empty() && List[Pos].find_first_not_of(__T("0123456789"))==string::npos)
+                {
+                    Method=0;
+                    SeekValue=Ztring(List[Pos]).To_int64u();
+                }
+                else if (!List[Pos].empty() && List[Pos].find(__T("Frame="))!=string::npos)
+                {
+                    Method=3;
+                    Ztring FrameNumberZ=List[Pos].substr(List[Pos].find(__T("Frame="))+6, string::npos);
+                    SeekValue=FrameNumberZ.To_int64u();
+                }
+                else if (!List[Pos].empty() && List[Pos].find(__T(":"))!=string::npos)
+                {
+                    Method=2;
+                    Ztring ValueZ=List[Pos];
+                    SeekValue=0;
+                    size_t Value_Pos=ValueZ.find(__T(":"));
+                    if (Value_Pos==string::npos)
+                        Value_Pos=ValueZ.size();
+                    SeekValue+=Ztring(ValueZ.substr(0, Value_Pos)).To_int64u()*60*60*1000*1000*1000;
+                    ValueZ.erase(0, Value_Pos+1);
+                    Value_Pos=ValueZ.find(__T(":"));
+                    if (Value_Pos==string::npos)
+                        Value_Pos=ValueZ.size();
+                    SeekValue+=Ztring(ValueZ.substr(0, Value_Pos)).To_int64u()*60*1000*1000*1000;
+                    ValueZ.erase(0, Value_Pos+1);
+                    Value_Pos=ValueZ.find(__T("."));
+                    if (Value_Pos==string::npos)
+                        Value_Pos=ValueZ.size();
+                    SeekValue+=Ztring(ValueZ.substr(0, Value_Pos)).To_int64u()*1000*1000*1000;
+                    ValueZ.erase(0, Value_Pos+1);
+                    if (!ValueZ.empty())
+                        SeekValue+=Ztring(ValueZ).To_int64u()*1000*1000*1000/(int64u)pow(10.0, (int)ValueZ.size());
+                }
+                else if (!List[Pos].empty() && List[Pos].find(__T("ID="))!=string::npos)
+                {
+                    Ztring IDZ=List[Pos].substr(List[Pos].find(__T("ID="))+3, string::npos);
+                    ID=IDZ.To_int64u();
+                }
+            }
+
+            CS.Leave();
+            size_t Result=Reader->Format_Test_PerParser_Seek(this, Method, SeekValue, ID);
+            CS.Enter();
+            switch (Result)
+            {
+                case 1  : return __T("");
+                case 2  : return __T("Invalid value");
+                #if MEDIAINFO_IBI
+                case 3  : return __T("Feature not supported / IBI file not provided");
+                case 4  : return __T("Problem during IBI file parsing");
+                #endif //MEDIAINFO_IBI
+                case 5  : return __T("Invalid ID");
+                case 6  : return __T("Internal error");
+                #if !MEDIAINFO_IBI
+                case (size_t)-2 : return __T("Feature not supported / IBI support disabled due to compilation options");
+                #endif //MEDIAINFO_IBI
+                case (size_t)-1 : return __T("Feature not supported");
+                default : return __T("Unknown error");
+            }
+        #else //MEDIAINFO_SEEK
+            return __T("Seek manager is disabled due to compilation options");
+        #endif //MEDIAINFO_SEEK
+    }
+    else if (OptionLower.find(__T("file_"))==0)
     {
         Ztring ToReturn2=Config.Option(Option, Value);
         if (Info)
             Info->Option_Manage();
 
-        MEDIAINFO_DEBUG_OUTPUT_INIT(ToReturn2, Debug+=_T("Option, will return ");Debug+=ToReturn;)
+        MEDIAINFO_DEBUG_OUTPUT_INIT(ToReturn2, Debug+=__T("Option, will return ");Debug+=ToReturn;)
     }
     else
-        EXECUTE_STRING(MediaInfoLib::Config.Option(Option, Value), Debug+=_T("Option, will return ");Debug+=ToReturn;)
+        EXECUTE_STRING(MediaInfoLib::Config.Option(Option, Value), Debug+=__T("Option, will return ");Debug+=ToReturn;)
 }
 
 //---------------------------------------------------------------------------
 size_t MediaInfo_Internal::Count_Get (stream_t StreamKind, size_t StreamPos)
 {
     CriticalSectionLocker CSL(CS);
+
+    if (Info && Info->Status[File__Analyze::IsUpdated])
+    {
+        Info->Open_Buffer_Update();
+        Info->Status[File__Analyze::IsUpdated]=false;
+        for (size_t Pos=File__Analyze::User_16; Pos<File__Analyze::User_16+16; Pos++)
+            Info->Status[Pos]=false;
+    }
+
     //Integrity
     if (StreamKind>=Stream_Max)
         return 0;
@@ -813,5 +1118,3 @@
 }
 
 } //NameSpace
-
-

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/MediaInfo_Internal.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/MediaInfo_Internal.h Changed

@@ -1,17 +1,17 @@
 // MediaInfo_Internal - All information about media files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -28,11 +28,12 @@
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
-// For developper: you can disable or enable traces
+// For developer: you can disable or enable traces
 //#define MEDIAINFO_DEBUG_CONFIG
 //#define MEDIAINFO_DEBUG_BUFFER
 //#define MEDIAINFO_DEBUG_OUTPUT
-// For developper: customization of traces
+//#define MEDIAINFO_DEBUG_WARNING_GET
+// For developer: customization of traces
 #ifdef MEDIAINFO_DEBUG_BUFFER
     const size_t MEDIAINFO_DEBUG_BUFFER_SAVE_FileSize=128*1024*1024;
 #endif //MEDIAINFO_DEBUG_BUFFER
@@ -58,6 +59,7 @@
 
 class File__Analyze;
 class Internet__Base;
+class Reader__Base;
 
 //***************************************************************************
 /// @brief MediaInfo_Internal
@@ -79,43 +81,58 @@
     std::bitset<32> Open_Buffer_Continue (const ZenLib::int8u* Buffer, size_t Buffer_Size);
     ZenLib::int64u Open_Buffer_Continue_GoTo_Get ();
     bool   Open_Buffer_Position_Set(int64u File_Offset);
+    #if MEDIAINFO_SEEK
+    size_t Open_Buffer_Seek        (size_t Method, int64u Value, int64u ID);
+    #endif //MEDIAINFO_SEEK
+    void    Open_Buffer_Unsynch     ();
     size_t Open_Buffer_Finalize ();
+    std::bitset<32> Open_NextPacket ();
     void Close ();
 
     //General information
     Ztring  Inform ();
-    Ztring  Inform (stream_t StreamKind, size_t StreamNumber=0); //All about only a specific stream
+    Ztring  Inform (stream_t StreamKind, size_t StreamNumber, bool IsDirect); //All about only a specific stream
 
     //Get
     Ztring Get (stream_t StreamKind, size_t StreamNumber, size_t Parameter, info_t InfoKind=Info_Text);
     Ztring Get (stream_t StreamKind, size_t StreamNumber, const String &Parameter, info_t InfoKind=Info_Text, info_t SearchKind=Info_Name);
 
     //Set
-    size_t Set (const String &ToSet, stream_t StreamKind, size_t StreamNumber, size_t Parameter, const String &OldValue=_T(""));
-    size_t Set (const String &ToSet, stream_t StreamKind, size_t StreamNumber, const String &Parameter, const String &OldValue=_T(""));
+    size_t Set (const String &ToSet, stream_t StreamKind, size_t StreamNumber, size_t Parameter, const String &OldValue=__T(""));
+    size_t Set (const String &ToSet, stream_t StreamKind, size_t StreamNumber, const String &Parameter, const String &OldValue=__T(""));
 
     //Output_Buffered
     size_t Output_Buffer_Get (const String &Value);
     size_t Output_Buffer_Get (size_t Pos);
 
     //Info
-    String Option (const String &Option, const String &Value=_T(""));
+    String Option (const String &Option, const String &Value=__T(""));
     size_t State_Get ();
     size_t Count_Get (stream_t StreamKind, size_t StreamNumber=(size_t)-1);
 
+    //Position in a MediaInfoList class
+    bool    IsFirst;
+    bool    IsLast;
+
     //Internal
     static bool LibraryIsModified(); //Is the library has been modified? (#defines...)
 
 private :
     friend class File_Bdmv;  //Theses classes need access to internal structure for optimization. There is recursivity with theses formats
     friend class File_Cdxa;  //Theses classes need access to internal structure for optimization. There is recursivity with theses formats
+    friend class File_Lxf;   //Theses classes need access to internal structure for optimization. There is recursivity with theses formats
     friend class File_Mpeg4; //Theses classes need access to internal structure for optimization. There is recursivity with theses formats
+    friend class File_MpegTs;//Theses classes need access to internal structure for optimization. There is recursivity with theses formats
+    friend class File_MpegPs;//Theses classes need access to internal structure for optimization. There is recursivity with theses formats
     friend class File_Mxf;   //Theses classes need access to internal structure for optimization. There is recursivity with theses formats
+    friend class File__ReferenceFilesHelper; //Theses classes need access to internal structure for optimization. There is recursivity with theses formats
 
     //Parsing handles
     File__Analyze*  Info;
     Internet__Base* Internet;
-    Ztring          File_Name;
+    #if !defined(MEDIAINFO_READER_NO)
+        Reader__Base*   Reader;
+    #endif //defined(MEDIAINFO_READER_NO)
 
     //Helpers
     void CreateDummy (const String& Value); //Create dummy Information
@@ -132,9 +149,17 @@
 
 public :
     bool SelectFromExtension (const String &Parser); //Select File_* from the parser name
-    int  ListFormats(const String &File_Name=String());
+    #if !defined(MEDIAINFO_READER_NO)
+        int  ListFormats(const String &File_Name=String());
+    #else //!defined(MEDIAINFO_READER_NO)
+        int  ListFormats(const String &File_Name=String()) {return 0;}
+    #endif //!defined(MEDIAINFO_READER_NO)
     MediaInfo_Config_MediaInfo Config;
 
+    Ztring Xml_Name_Escape(const Ztring &Name);
+    Ztring Xml_Content_Escape(const Ztring &Content, size_t &Modified);
+    Ztring &Xml_Content_Escape_Modifying(Ztring &Content, size_t &Modified);
+
 private :
     //Threading
     size_t  BlockMethod; //Open() return: 0=immedialtly, 1=after local info, 2=when user interaction is needed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/MediaInfo_Internal_Const.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/MediaInfo_Internal_Const.h Changed

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Ancillary.cpp Added

@@ -0,0 +1,469 @@
+// File_Ancillary - Info for Ancillary (SMPTE ST291) streams
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_ANCILLARY_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Multiple/File_Ancillary.h"
+#if defined(MEDIAINFO_CDP_YES)
+    #include "MediaInfo/Text/File_Cdp.h"
+#endif
+#if MEDIAINFO_EVENTS
+    #include "MediaInfo/MediaInfo_Events.h"
+#endif //MEDIAINFO_EVENTS
+#include <cstring>
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+namespace MediaInfoLib
+{
+//---------------------------------------------------------------------------
+
+//***************************************************************************
+// Infos
+//***************************************************************************
+
+const char* Ancillary_DataID(int8u DataID, int8u SecondaryDataID)
+{
+         if (DataID==0x00)
+        return "Undefined format";
+    else if (DataID<=0x03)
+        return "Reserved";
+    else if (DataID<=0x0F)
+        return "Reserved for 8-bit applications";
+    else if (DataID<=0x3F)
+        return "Reserved";
+    else if (DataID==0x41)
+    {
+        //SMPTE 2016-3-2007
+        switch (SecondaryDataID)
+        {
+            case 0x05 : return "Bar Data";
+            default   : return "Internationally registered";
+        }
+    }
+    else if (DataID==0x45)
+    {
+        //SMPTE 2020-1-2008
+        switch (SecondaryDataID)
+        {
+            case 0x01 : return "Audio Metadata - No association";
+            case 0x02 : return "Audio Metadata - Channels 1/2";
+            case 0x03 : return "Audio Metadata - Channels 3/4";
+            case 0x04 : return "Audio Metadata - Channels 5/6";
+            case 0x05 : return "Audio Metadata - Channels 7/8";
+            case 0x06 : return "Audio Metadata - Channels 9/10";
+            case 0x07 : return "Audio Metadata - Channels 11/12";
+            case 0x08 : return "Audio Metadata - Channels 13/14";
+            case 0x09 : return "Audio Metadata - Channels 15/16";
+            default   : return "SMPTE 2020-1-2008?";
+        }
+    }
+    else if (DataID<=0x4F)
+        return "Internationally registered";
+    else if (DataID<=0x5F)
+        return "Reserved";
+    else if (DataID==0x60)
+        return "Ancillary time code"; //RP188
+    else if (DataID==0x61)
+    {
+        switch (SecondaryDataID)
+        {
+            case 0x01 : return "EIA-708 (CDP)";
+            case 0x02 : return "EIA-608";
+            default   : return "S334-1-2007 Defined data services?";
+        }
+    }
+    else if (DataID==0x62)
+    {
+        switch (SecondaryDataID)
+        {
+            case 0x01 : return "Program description";
+            case 0x02 : return "Data broadcast";
+            case 0x03 : return "VBI data";
+            default   : return "S334-1-2007 Variable-format data services?";
+        }
+    }
+    else if (DataID<=0x7F)
+        return "Internationally registered";
+    else if (DataID==0x80)
+        return "Ancillary packet marked for deletion";
+    else if (DataID<=0x83)
+        return "Reserved";
+    else if (DataID==0x84)
+        return "Optional ancillary packet data end marker";
+    else if (DataID<=0x87)
+        return "Reserved";
+    else if (DataID==0x88)
+        return "Optional ancillary packet data start marker";
+    else if (DataID<=0x9F)
+        return "Reserved";
+    else if (DataID<=0xBF)
+        return "Internationally registered";
+    else if (DataID<=0xCF)
+        return "User application";
+    else if (DataID<=0xDF)
+        return "Internationally registered";
+    else
+        return "Internationally registered";
+}
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File_Ancillary::File_Ancillary()
+:File__Analyze()
+{
+    //Configuration
+    ParserName=__T("Ancillary");
+
+    //In
+    WithTenBit=false;
+    WithChecksum=false;
+    HasBFrames=false;
+    InDecodingOrder=false;
+    AspectRatio=0;
+    FrameRate=0;
+
+    //Temp
+    Cdp_Parser=NULL;
+}
+
+//---------------------------------------------------------------------------
+File_Ancillary::~File_Ancillary()
+{
+    delete Cdp_Parser; //Cdp_Parser=NULL;
+    for (size_t Pos=0; Pos<Cdp_Data.size(); Pos++)
+        delete Cdp_Data[Pos]; //Cdp_Data[Pos]=NULL;
+    for (size_t Pos=0; Pos<AfdBarData_Data.size(); Pos++)
+        delete AfdBarData_Data[Pos]; //AfdBarData_Data[Pos]=NULL;
+}
+
+//---------------------------------------------------------------------------
+void File_Ancillary::Streams_Finish()
+{
+    #if defined(MEDIAINFO_CDP_YES)
+        if (Cdp_Parser && !Cdp_Parser->Status[IsFinished] && Cdp_Parser->Status[IsAccepted])
+        {
+            Finish(Cdp_Parser);
+            for (size_t StreamPos=0; StreamPos<Cdp_Parser->Count_Get(Stream_Text); StreamPos++)
+            {
+                Merge(*Cdp_Parser, Stream_Text, StreamPos, StreamPos);
+                Ztring MuxingMode=Cdp_Parser->Retrieve(Stream_Text, StreamPos, "MuxingMode");
+                Fill(Stream_Text, StreamPos, "MuxingMode", __T("Ancillary data / ")+MuxingMode, true);
+            }
+        }
+    #endif //defined(MEDIAINFO_CDP_YES)
+}
+
+//***************************************************************************
+// Buffer - Synchro
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_Ancillary::Synchronize()
+{
+    //Synchronizing
+    while (Buffer_Offset+6<=Buffer_Size && ( Buffer[Buffer_Offset  ]!=0x00
+                                         ||  Buffer[Buffer_Offset+ 1]!=0xFF
+                                         ||  Buffer[Buffer_Offset+ 2]!=0xFF))
+        Buffer_Offset++;
+
+    if (!Status[IsAccepted])
+    {
+        Accept();
+
+        Fill(Stream_General, 0, General_Format, "Ancillary");
+    }
+
+    //Synched is OK
+    return true;
+}
+
+//---------------------------------------------------------------------------
+bool File_Ancillary::Synched_Test()
+{
+    Synchronize(); //This is not always in synch directly, there may be some garbage
+
+    //Must have enough buffer for having header
+    if (Buffer_Offset+6>Buffer_Size)
+        return false;
+
+    //Quick test of synchro
+    if (CC3(Buffer+Buffer_Offset)!=0x00FFFF)
+        Synched=false;
+
+    //We continue
+    return true;
+}
+
+//***************************************************************************
+// Buffer - Global
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Ancillary::Read_Buffer_Continue()
+{
+    if (!Cdp_Data.empty() && AspectRatio && FrameRate)
+    {
+        ((File_Cdp*)Cdp_Parser)->AspectRatio=AspectRatio;
+        for (size_t Pos=0; Pos<Cdp_Data.size(); Pos++)
+        {
+            if (Cdp_Parser->PTS_DTS_Needed)
+                Cdp_Parser->FrameInfo.DTS=FrameInfo.DTS-(Cdp_Data.size()-Pos)*FrameInfo.DUR;
+            Open_Buffer_Continue(Cdp_Parser, Cdp_Data[Pos]->Data, Cdp_Data[Pos]->Size);
+            delete Cdp_Data[Pos]; //Cdp_Data[0]=NULL;
+        }
+        Cdp_Data.clear();
+    }
+
+    if (Element_Size==0)
+    {
+        //Keeping only one, TODO: parse it without video stream
+        for (size_t Pos=1; Pos<AfdBarData_Data.size(); Pos++)
+            delete AfdBarData_Data[Pos]; //AfdBarData_Data[0]=NULL;
+        if (!AfdBarData_Data.empty())
+            AfdBarData_Data.resize(1);
+
+        return;
+    }
+
+    if (!Status[IsAccepted] && !MustSynchronize)
+        Accept();
+}
+
+//---------------------------------------------------------------------------
+void File_Ancillary::Read_Buffer_AfterParsing()
+{
+    Buffer_Offset=Buffer_Size; //This is per frame
+}
+
+//---------------------------------------------------------------------------
+void File_Ancillary::Read_Buffer_Unsynched()
+{
+    #if defined(MEDIAINFO_CDP_YES)
+        for (size_t Pos=0; Pos<Cdp_Data.size(); Pos++)
+            delete Cdp_Data[Pos]; //Cdp_Data[Pos]=NULL;
+        Cdp_Data.clear();
+        if (Cdp_Parser)
+            Cdp_Parser->Open_Buffer_Unsynch();
+    #endif //defined(MEDIAINFO_CDP_YES)
+    #if defined(MEDIAINFO_AFDBARDATA_YES)
+        for (size_t Pos=0; Pos<AfdBarData_Data.size(); Pos++)
+            delete AfdBarData_Data[Pos]; //AfdBarData_Data[Pos]=NULL;
+        AfdBarData_Data.clear();
+    #endif //defined(MEDIAINFO_AFDBARDATA_YES)
+    AspectRatio=0;
+}
+//***************************************************************************
+// Buffer - Per element
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Ancillary::Header_Parse()
+{
+    //Parsing
+    if (MustSynchronize)
+    {
+        if (WithTenBit)
+        {
+            Skip_L2(                                            "Ancillary data flag");
+            Skip_L2(                                            "Ancillary data flag");
+            Skip_L2(                                            "Ancillary data flag");
+        }
+        else
+        {
+            Skip_L1(                                            "Ancillary data flag");
+            Skip_L1(                                            "Ancillary data flag");
+            Skip_L1(                                            "Ancillary data flag");
+        }
+    }
+    Get_L1 (DataID,                                             "Data ID");
+    if (WithTenBit)
+        Skip_L1(                                                "Parity+Unused"); //even:1, odd:2
+    Get_L1 (SecondaryDataID,                                    "Secondary Data ID"); Param_Info1(Ancillary_DataID(DataID, SecondaryDataID));
+    if (WithTenBit)
+        Skip_L1(                                                "Parity+Unused"); //even:1, odd:2
+    Get_L1 (DataCount,                                          "Data count");
+    if (WithTenBit)
+        Skip_L1(                                                "Parity+Unused"); //even:1, odd:2
+
+    //Test (in some container formats, Cheksum is present sometimes)
+    bool WithChecksum_Temp=WithChecksum;
+    if (!MustSynchronize && !WithChecksum && (size_t)((3+DataCount+1)*(WithTenBit?2:1))==Buffer_Size)
+        WithChecksum_Temp=true;
+
+    //Filling
+    Header_Fill_Code((((int16u)DataID)<<8)|SecondaryDataID, Ztring().From_CC1(DataID)+__T('-')+Ztring().From_CC1(SecondaryDataID));
+    Header_Fill_Size(((MustSynchronize?3:0)+3+DataCount+(WithChecksum_Temp?1:0))*(WithTenBit?2:1));
+}
+
+//---------------------------------------------------------------------------
+void File_Ancillary::Data_Parse()
+{
+    Element_Info1(Ancillary_DataID(DataID, SecondaryDataID));
+
+    //Buffer
+    int8u* Payload=new int8u[DataCount];
+    for(int8u Pos=0; Pos<DataCount; Pos++)
+    {
+        Get_L1 (Payload[Pos],                                   "Data");
+        if (WithTenBit)
+            Skip_L1(                                            "Parity+Unused"); //even:1, odd:2
+    }
+
+    //Parsing
+    if (WithChecksum)
+        Skip_L1(                                                "Checksum");
+    if (WithTenBit)
+        Skip_L1(                                                "Parity+Unused"); //even:1, odd:2
+
+    FILLING_BEGIN();
+        switch (DataID)
+        {
+            case 0x41 : // (from SMPTE 2016-3)
+                        switch (SecondaryDataID)
+                        {
+                            case 0x05 : //Bar Data (from SMPTE 2016-3), saving data for future use
+                                        #if defined(MEDIAINFO_AFDBARDATA_YES)
+                                        {
+                                            buffered_data* AfdBarData=new buffered_data;
+                                            AfdBarData->Data=new int8u[(size_t)DataCount];
+                                            std::memcpy(AfdBarData->Data, Payload, (size_t)DataCount);
+                                            AfdBarData->Size=(size_t)DataCount;
+                                            AfdBarData_Data.push_back(AfdBarData);
+                                        }
+                                        #endif //MEDIAINFO_AFDBARDATA_YES
+                                        break;
+                            default   : ;
+                            ;
+                        }
+                        break;
+            case 0x45 : // (from SMPTE 2020-1)
+                        switch (SecondaryDataID)
+                        {
+                            case 0x01 : //No association
+                            case 0x02 : //Channel pair 1/2
+                            case 0x03 : //Channel pair 3/4
+                            case 0x04 : //Channel pair 5/6
+                            case 0x05 : //Channel pair 7/8
+                            case 0x06 : //Channel pair 9/10
+                            case 0x07 : //Channel pair 11/12
+                            case 0x08 : //Channel pair 13/14
+                            case 0x09 : //Channel pair 15/16
+                                        break;
+                            default   : ;
+                            ;
+                        }
+                        break;
+            case 0x61 : //Defined data services (from SMPTE 334-1)
+                        switch (SecondaryDataID)
+                        {
+                            case 0x01 : //CDP (from SMPTE 334-1)
+                                        #if defined(MEDIAINFO_CDP_YES)
+                                        {
+                                            if (Cdp_Parser==NULL)
+                                            {
+                                                Cdp_Parser=new File_Cdp;
+                                                Open_Buffer_Init(Cdp_Parser);
+                                            }
+                                            Demux(Payload, (size_t)DataCount, ContentType_MainStream);
+                                            if (InDecodingOrder || (!HasBFrames && AspectRatio && FrameRate))
+                                            {
+                                                if (!Cdp_Parser->Status[IsFinished])
+                                                {
+                                                    if (Cdp_Parser->PTS_DTS_Needed)
+                                                        Cdp_Parser->FrameInfo.DTS=FrameInfo.DTS;
+                                                    ((File_Cdp*)Cdp_Parser)->AspectRatio=AspectRatio;
+                                                    Open_Buffer_Continue(Cdp_Parser, Payload, (size_t)DataCount);
+                                                }
+                                            }
+                                            else
+                                            {
+                                                //Saving data for future use
+                                                buffered_data* Cdp=new buffered_data;
+                                                Cdp->Data=new int8u[(size_t)DataCount];
+                                                std::memcpy(Cdp->Data, Payload, (size_t)DataCount);
+                                                Cdp->Size=(size_t)DataCount;
+                                                Cdp_Data.push_back(Cdp);
+                                            }
+                                        }
+                                        #endif //MEDIAINFO_CDP_YES
+                                        break;
+                            case 0x02 : //CEA-608 (from SMPTE 334-1)
+                                        #if defined(MEDIAINFO_EIA608_YES)
+                                        if (DataCount==3) //This must be 3-byte data
+                                        {
+                                            //CEA-608 in video presentation order
+                                        }
+                                        #endif //MEDIAINFO_EIA608_YES
+                                        break;
+                            default   : ;
+                            ;
+                        }
+                        break;
+            case 0x62 : //Variable-format data services (from SMPTE 334-1)
+                        switch (SecondaryDataID)
+                        {
+                            case 0x01 : //Program description (from SMPTE 334-1),
+                                        break;
+                            case 0x02 : //Data broadcast (from SMPTE 334-1)
+                                        break;
+                            case 0x03 : //VBI data (from SMPTE 334-1)
+                                        break;
+                            default   : ;
+                            ;
+                        }
+                        break;
+            default   : ;
+        }
+
+        Frame_Count++;
+        Frame_Count_InThisBlock++;
+        if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+            Frame_Count_NotParsedIncluded++;
+    FILLING_END();
+
+    delete[] Payload; //Payload=NULL
+}
+
+//***************************************************************************
+// C++
+//***************************************************************************
+
+} //NameSpace
+
+#endif //MEDIAINFO_ANCILLARY_YES
+

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Ancillary.h Added

@@ -0,0 +1,107 @@
+// File_Ancillary - Info for Ancillary (SMPTE ST291) streams
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Information about Ancillary data (SMPTE ST291)
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_AncillaryH
+#define MediaInfo_AncillaryH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+#include <vector>
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Class File_Ancillary
+//***************************************************************************
+
+class File_Ancillary : public File__Analyze
+{
+public :
+    //In
+    bool    WithTenBit;
+    bool    WithChecksum;
+    bool    HasBFrames;
+    bool    InDecodingOrder;
+    float64 AspectRatio;
+    float64 FrameRate;
+
+    //In/Out
+    struct buffered_data
+    {
+        size_t Size;
+        int8u* Data;
+
+        buffered_data()
+        {
+            Size=0;
+            Data=NULL;
+        }
+
+        ~buffered_data()
+        {
+            delete[] Data; //Data=NULL;
+        }
+    };
+    #if defined(MEDIAINFO_CDP_YES)
+        std::vector<buffered_data*> Cdp_Data;
+        File__Analyze*  Cdp_Parser;
+    #endif //defined(MEDIAINFO_CDP_YES)
+    #if defined(MEDIAINFO_AFDBARDATA_YES)
+        std::vector<buffered_data*> AfdBarData_Data;
+    #endif //defined(MEDIAINFO_AFDBARDATA_YES)
+
+    //Constructor/Destructor
+    File_Ancillary();
+    ~File_Ancillary();
+
+private :
+    //Streams management
+    void Streams_Finish();
+
+    //Buffer - Synchro
+    bool Synchronize();
+    bool Synched_Test();
+
+    //Buffer - Global
+    void Read_Buffer_Continue();
+    void Read_Buffer_AfterParsing();
+    void Read_Buffer_Unsynched();
+
+    //Buffer - Per element
+    void Header_Parse();
+    void Data_Parse();
+
+    //Temp
+    int8u DataID;
+    int8u SecondaryDataID;
+    int8u DataCount;
+};
+
+} //NameSpace
+
+#endif
+

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Bdmv.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Bdmv.cpp Changed

@@ -1,31 +1,35 @@
 // File_Mpls - Info for Blu-ray Movie files
-// Copyright (C) 2009-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2009-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_BDMV_YES)
 //---------------------------------------------------------------------------
 
@@ -424,7 +428,7 @@
 //---------------------------------------------------------------------------
 const char* Mpls_playback_type[]=
 {
-    "Sequencial",
+    "Sequential",
     "Random",
     "Shuffle",
     "",
@@ -450,9 +454,9 @@
 {
     Ztring Temp;
     Temp.From_Number(Number);
-    Temp+=_T(" (0x");
+    Temp+=__T(" (0x");
     Temp+=Ztring::ToZtring(Number, 16);
-    Temp+=_T(")");
+    Temp+=__T(")");
     return Temp;
 }
 
@@ -463,7 +467,8 @@
 //---------------------------------------------------------------------------
 bool File_Bdmv::FileHeader_Begin()
 {
-    if (File_Name.find(Ztring(1, PathSeparator)+_T("BDMV"))+5==File_Name.size()) //Blu-ray directory
+    size_t BDMV_Pos=File_Name.find(Ztring(1, PathSeparator)+__T("BDMV"));
+    if (BDMV_Pos!=string::npos && BDMV_Pos+5==File_Name.size()) //Blu-ray directory
         return true;
 
     //Element_Size
@@ -495,7 +500,8 @@
 //---------------------------------------------------------------------------
 void File_Bdmv::Read_Buffer_Continue()
 {
-    if (File_Name.find(Ztring(1, PathSeparator)+_T("BDMV"))+5==File_Name.size()) //Blu-ray directory
+    size_t BDMV_Pos=File_Name.find(Ztring(1, PathSeparator)+__T("BDMV"));
+    if (BDMV_Pos!=string::npos && BDMV_Pos+5==File_Name.size()) //Blu-ray directory
     {
         BDMV();
         return;
@@ -510,12 +516,12 @@
     //Parsing
     int32u type_indicator;
     int16u version_numberH;
-    Element_Begin("Header");
+    Element_Begin1("Header");
     Get_C4 (type_indicator,                                     "type_indicator");
     Data_Accept("Blu-ray");
     Get_C2 (version_numberH,                                    "version_number (High)");
     Skip_C2(                                                    "version_number (Low)");
-    Element_End();
+    Element_End0();
 
     FILLING_BEGIN();
         Accept("BDMV");
@@ -531,7 +537,7 @@
 
     if (version_numberH==0x3031 || version_numberH==0x3032) //Version 1 or 2
     {
-        Element_Begin("Offsets");
+        Element_Begin1("Offsets");
         Types[0x28]=0; //First object
         for (size_t Start_Adress_Pos=1; Start_Adress_Pos<9; Start_Adress_Pos++)
         {
@@ -539,16 +545,16 @@
             Get_B4 (Start_Adress,                               Bdmv_Type(type_indicator, Start_Adress_Pos));
             Types[Start_Adress]=Start_Adress_Pos;
         }
-        Element_End();
+        Element_End0();
 
-        for (std::map<int32u, size_t>::iterator Type=Types.begin(); Type!=Types.end(); Type++)
+        for (std::map<int32u, size_t>::iterator Type=Types.begin(); Type!=Types.end(); ++Type)
         {
             if (Type->first>=Element_Offset) //If valid
             {
                 if (Type->first>Element_Offset)
                     Skip_XX(Type->first-Element_Offset,         "unknown");
 
-                Element_Begin(Bdmv_Type(type_indicator, Type->second));
+                Element_Begin1(Bdmv_Type(type_indicator, Type->second));
                 int32u length;
                 Get_B4 (length,                                 "length");
                 int64u End=Element_Offset+length;
@@ -593,7 +599,7 @@
                 }
                 if (End>Element_Offset)
                     Skip_XX(End-Element_Offset,                 "Unknown");
-                Element_End();
+                Element_End0();
             }
         }
 
@@ -614,7 +620,7 @@
     Accept("BDMV");
 
     //Searching the longest playlist
-    ZtringList List=Dir::GetAllFileNames(File_Name+PathSeparator+_T("PLAYLIST")+PathSeparator+_T("*.mpls"), Dir::Include_Files);
+    ZtringList List=Dir::GetAllFileNames(File_Name+PathSeparator+__T("PLAYLIST")+PathSeparator+__T("*.mpls"), Dir::Include_Files);
     std::vector<MediaInfo_Internal*> MIs;
     MIs.resize(List.size());
     size_t MaxDuration_Pos=(size_t)-1;
@@ -624,7 +630,7 @@
         for (size_t Pos=0; Pos<MIs.size(); Pos++)
         {
             MIs[Pos]=new MediaInfo_Internal();
-            MIs[Pos]->Option(_T("File_Bdmv_ParseTargetedFile"), _T("0"));
+            MIs[Pos]->Option(__T("File_Bdmv_ParseTargetedFile"), __T("0"));
             MIs[Pos]->Open(List[Pos]);
             int64u Duration=Ztring(MIs[Pos]->Get(Stream_General, 0, General_Duration)).To_int64u();
             if (Duration>MaxDuration)
@@ -634,7 +640,7 @@
             }
         }
     }
-    
+
     if (MaxDuration_Pos!=(size_t)-1)
     {
         //Merging
@@ -659,11 +665,11 @@
     MIs.clear();
 
     //Detecting some directories
-    if (Dir::Exists(File_Name+PathSeparator+_T("BDSVM"))
-     || Dir::Exists(File_Name+PathSeparator+_T("SLYVM"))
-     || Dir::Exists(File_Name+PathSeparator+_T("ANYVM")))
+    if (Dir::Exists(File_Name+PathSeparator+__T("BDSVM"))
+     || Dir::Exists(File_Name+PathSeparator+__T("SLYVM"))
+     || Dir::Exists(File_Name+PathSeparator+__T("ANYVM")))
         Fill(Stream_General, 0, General_Format_Profile, "BD+");
-    if (Dir::Exists(File_Name+PathSeparator+_T("BDJO")) && !Dir::GetAllFileNames(File_Name+PathSeparator+_T("BDJO")).empty())
+    if (Dir::Exists(File_Name+PathSeparator+__T("BDJO")) && !Dir::GetAllFileNames(File_Name+PathSeparator+__T("BDJO")).empty())
         Fill(Stream_General, 0, General_Format_Profile, "BD-Java");
 
     //Filling
@@ -674,7 +680,7 @@
     if (FileName::Extension_Get(File_Name).empty())
         Fill(Stream_General, 0, General_FileName, FileName::Name_Get(File_Name), true);
     else
-        Fill(Stream_General, 0, General_FileName, FileName::Name_Get(File_Name)+_T('.')+FileName::Extension_Get(File_Name), true);
+        Fill(Stream_General, 0, General_FileName, FileName::Name_Get(File_Name)+__T('.')+FileName::Extension_Get(File_Name), true);
     File_Name.clear();
 
     Finish("BDMV");
@@ -686,24 +692,24 @@
     //Retrieving data from the M2TS file
     std::map<int16u, stream_t> PIDs_StreamKind;
     std::map<int16u, size_t> PIDs_StreamPos;
-    if (Config->File_Bdmv_ParseTargetedFile_Get() && File_Name.size()>10)
+    if (Config->File_Bdmv_ParseTargetedFile_Get() && File_Name.size()>10+1+7)
     {
         Ztring file=File_Name.substr(File_Name.size()-10, 5);
         Ztring M2TS_File=File_Name;
-        M2TS_File.resize(M2TS_File.size()-10-1-7);
-        M2TS_File+=_T("STREAM");
+        M2TS_File.resize(M2TS_File.size()-(10+1+7));
+        M2TS_File+=__T("STREAM");
         M2TS_File+=PathSeparator;
         M2TS_File+=file;
-        M2TS_File+=_T(".m2ts");
+        M2TS_File+=__T(".m2ts");
 
         MediaInfo_Internal MI;
-        MI.Option(_T("File_Bdmv_ParseTargetedFile"), _T("0"));
+        MI.Option(__T("File_Bdmv_ParseTargetedFile"), __T("0"));
         if (MI.Open(M2TS_File))
         {
             Merge(MI);
             for (size_t StreamKind=Stream_General+1; StreamKind<Stream_Max; StreamKind++)
                 for (size_t StreamPos=0; StreamPos<Count_Get((stream_t)StreamKind); StreamPos++)
-                    Fill((stream_t)StreamKind, StreamPos, "Source", file+_T(".m2ts"));
+                    Fill((stream_t)StreamKind, StreamPos, "Source", file+__T(".m2ts"));
         }
 
         //Retrieving PID mapping
@@ -729,7 +735,7 @@
         Skip_B1(                                                "Unknown");
         for (int16u Pos=0; Pos<number_of_streams_in_ps; Pos++)
         {
-            Element_Begin("Stream");
+            Element_Begin1("Stream");
             int16u stream_PID;
             int8u  Stream_Length;
             Get_B2 (stream_PID,                                 "stream_PID");
@@ -742,7 +748,7 @@
                 StreamKind_Last=PID_StreamKind->second;
                 StreamPos_Last=PIDs_StreamPos.find(stream_PID)->second;
             }
-            Get_B1 (stream_type,                                "Stream type"); Param_Info(Clpi_Format(stream_type)); Element_Info(Clpi_Format(stream_type));
+            Get_B1 (stream_type,                                "Stream type"); Param_Info1(Clpi_Format(stream_type)); Element_Info1(Clpi_Format(stream_type));
             switch (Clpi_Type(stream_type))
             {
                 case Stream_Video : StreamCodingInfo_Video(); break;
@@ -753,7 +759,7 @@
 
             if (Stream_End-Element_Offset)
                 Skip_XX(Stream_End-Element_Offset,              "Unknown");
-            Element_End();
+            Element_End0();
 
             FILLING_BEGIN();
                 if (StreamKind_Last!=Stream_Max)
@@ -772,19 +778,19 @@
     int16u ID2;
     int32u Length;
 };
-typedef std::map<int32u, entry> entries; //Key is the start adress
+typedef std::map<int32u, entry> entries; //Key is the start address
 
 //---------------------------------------------------------------------------
 void File_Bdmv::Clpi_ExtensionData()
 {
-    entries Entries; //Key is the start adress
+    entries Entries; //Key is the start address
 
     int32u Base_Pos=(int32u)Element_Offset-4;
 
     int8u number_of_ext_data_entries;
     Skip_B4(                                                    "Unknown");
     Skip_B3(                                                    "Unknown");
-    Element_Begin("Offsets");
+    Element_Begin1("Offsets");
     Get_B1 (number_of_ext_data_entries,                         "number_of_ext_data_entries");
     for (size_t Start_Adress_Pos=0; Start_Adress_Pos<number_of_ext_data_entries; Start_Adress_Pos++)
     {
@@ -798,16 +804,16 @@
         Entries[Base_Pos+Start_Adress].ID2=ID2;
         Entries[Base_Pos+Start_Adress].Length=Length;
     }
-    Element_End();
+    Element_End0();
 
-    for (entries::iterator Entry=Entries.begin(); Entry!=Entries.end(); Entry++)
+    for (entries::iterator Entry=Entries.begin(); Entry!=Entries.end(); ++Entry)
     {
         if (Entry->first>=Element_Offset) //If valid
         {
             if (Entry->first>Element_Offset)
                 Skip_XX(Entry->first-Element_Offset, "unknown");
 
-            Element_Begin("Entry");
+            Element_Begin1("Entry");
             int32u length;
             Get_B4 (length,                                 "length");
             int64u End=Element_Offset+length;
@@ -824,7 +830,7 @@
             }
             if (End>Element_Offset)
                 Skip_XX(End-Element_Offset,                 "Unknown");
-            Element_End();
+            Element_End0();
         }
     }
 
@@ -845,31 +851,34 @@
 {
     //Parsing
     int16u number_of_Titles;
-    Element_Begin("FirstPlayback", 12);
+    Element_Begin1("FirstPlayback");
         BS_Begin();
-        Info_S1( 2, FirstPlayback_object_type,                  "object_type"); Param_Info(Indx_object_type[FirstPlayback_object_type]);
+        int8u FirstPlayback_object_type;
+        Get_S1 ( 2, FirstPlayback_object_type,                  "object_type"); Param_Info1(Indx_object_type[FirstPlayback_object_type]);
         Skip_S4(30,                                             "reserved");
         BS_End();
         Indx_Indexes_Index(FirstPlayback_object_type);
-    Element_End();
-    Element_Begin("TopMenu", 12); {
+    Element_End0();
+    Element_Begin1("TopMenu");
         BS_Begin();
-        Info_S1( 2, TopMenu_object_type,                        "object_type"); Param_Info(Indx_object_type[TopMenu_object_type]);
+        int8u TopMenu_object_type;
+        Get_S1 ( 2, TopMenu_object_type,                        "object_type"); Param_Info1(Indx_object_type[TopMenu_object_type]);
         Skip_S4(30,                                             "reserved");
         BS_End();
         Indx_Indexes_Index(TopMenu_object_type);
-    Element_End(); }
+    Element_End0();
     Get_B2 (number_of_Titles,                                   "number_of_Titles");
     for (int16u Pos=0; Pos<number_of_Titles; Pos++)
     {
-        Element_Begin("Title", 12);
+        Element_Begin1("Title");
         BS_Begin();
-        Info_S1( 2, Title_object_type,                          "object_type"); Param_Info(Indx_object_type[Title_object_type]);
-        Info_S1( 2, Title_title_search,                         "title_search"); Param_Info(Indx_title_search[Title_title_search]);
+        int8u Title_object_type;
+        Get_S1 ( 2, Title_object_type,                          "object_type"); Param_Info1(Indx_object_type[Title_object_type]);
+        Info_S1( 2, Title_title_search,                         "title_search"); Param_Info1(Indx_title_search[Title_title_search]);
         Skip_S4(28,                                             "reserved");
         BS_End();
         Indx_Indexes_Index(Title_object_type);
-        Element_End();
+        Element_End0();
     }
 }
 
@@ -877,20 +886,20 @@
 void File_Bdmv::Indx_Indexes_Index(int8u object_type)
 {
     BS_Begin();
-    Info_S1( 2, playback_type,                                  "playback_type"); Param_Info(Indx_playback_type[object_type][playback_type]);
+    Info_S1( 2, playback_type,                                  "playback_type"); Param_Info1(Indx_playback_type[object_type][playback_type]);
     Skip_S2(14,                                                 "reserved");
     BS_End();
     switch (object_type)
     {
         case 1 : //HDMV
                 {
-                Info_B2(id_ref,                                 "id_ref"); Element_Info(id_ref);
+                Info_B2(id_ref,                                 "id_ref"); Element_Info1(id_ref);
                 Skip_B4(                                        "reserved");
                 }
                 break;
         case 2 : //BD-J
                 {
-                Info_Local(5, id_ref,                           "id_ref"); Element_Info(id_ref);
+                Info_Local(5, id_ref,                           "id_ref"); Element_Info1(id_ref);
                 Skip_B1(                                        "reserved");
                 }
                 break;
@@ -903,7 +912,7 @@
 void File_Bdmv::Indx_ExtensionData()
 {
     //Parsing
-    std::map<int32u, int32u> exts; //Key is the start adress, value is length
+    std::map<int32u, int32u> exts; //Key is the start address, value is length
     int64u Base_Offset=Element_Offset-4; //Size is included
     int8u number_of_ext_data_entries;
     Skip_B4(                                                    "data_block_start_adress");
@@ -911,28 +920,28 @@
     Get_B1 (number_of_ext_data_entries,                         "number_of_ext_data_entries");
     for (int16u Pos=0; Pos<number_of_ext_data_entries; Pos++)
     {
-        Element_Begin("ext_data_entry");
+        Element_Begin1("ext_data_entry");
         int32u ext_data_start_adress, ext_data_length;
         Skip_B2(                                                "ID1 (AVCHD)");
         Skip_B2(                                                "ID2 (Version)");
         Get_B4 (ext_data_start_adress,                          "ext_data_start_adress");
         Get_B4 (ext_data_length,                                "ext_data_length");
-        Element_End();
+        Element_End0();
         exts[ext_data_start_adress]=ext_data_length;
     }
 
-    for (std::map<int32u, int32u>::iterator ext=exts.begin(); ext!=exts.end(); ext++)
+    for (std::map<int32u, int32u>::iterator ext=exts.begin(); ext!=exts.end(); ++ext)
     {
         if (Base_Offset+ext->first>=Element_Offset)
         {
             if (Base_Offset+ext->first>Element_Offset)
                 Skip_XX(ext->first-Element_Offset,              "Unknown");
 
-            Element_Begin();
+            Element_Begin0();
             int64u End=Element_Offset+ext->second;
 
             int32u type_indicator;
-            Get_C4(type_indicator,                              "type_indicator"); Element_Info(Ztring().From_CC4(type_indicator));
+            Get_C4(type_indicator,                              "type_indicator"); Element_Info1(Ztring().From_CC4(type_indicator));
             switch (type_indicator)
             {
                 case 0x49444558 : Indx_ExtensionData_IDEX(); break;
@@ -941,7 +950,7 @@
             }
             if (End>Element_Offset)
                 Skip_XX(End-Element_Offset,                     "Unknown");
-            Element_End();
+            Element_End0();
         }
     }
 }
@@ -977,7 +986,7 @@
 //---------------------------------------------------------------------------
 void File_Bdmv::Indx_ExtensionData_IDEX_UIAppInfoAVCHD()
 {
-    Element_Begin("UIAppInfoAVCHD");
+    Element_Begin1("UIAppInfoAVCHD");
 
     //Parsing
     int32u length, length2;
@@ -998,31 +1007,31 @@
     Get_B1 (AVCHD_name_length,                                  "AVCHD_name_length");
     Skip_Local(AVCHD_name_length,                               "AVCHD_name");
     Skip_XX(255-AVCHD_name_length,                              "AVCHD_name (junk)");
-    Element_Begin("additional data");
+    Element_Begin1("additional data");
     Get_B4 (length2,                                            "length2");
     Skip_XX(length2,                                            "reserved");
-    Element_End(4+length2);
+    Element_End0();
 
-    Element_End(4+length);
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
 void File_Bdmv::Indx_ExtensionData_IDEX_TableOfPlayLists()
 {
-    Element_Begin("TableOfPlayLists");
+    Element_Begin1("TableOfPlayLists");
 
     //Parsing
     int32u length;
     Get_B4 (length,                                             "length");
     Skip_XX(length,                                             "unknown");
 
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
 void File_Bdmv::Indx_ExtensionData_IDEX_MakersPrivateData()
 {
-    Element_Begin("MakersPrivateData");
+    Element_Begin1("MakersPrivateData");
 
     //Parsing
     int64u Base_Offset=Element_Offset-4; //Size is included
@@ -1034,12 +1043,12 @@
     Get_B1 (number_of_maker_entries,                            "number_of_maker_entries");
     for (int8u Pos=0; Pos<number_of_maker_entries; Pos++)
     {
-        Element_Begin("maker_entry");
+        Element_Begin1("maker_entry");
         Skip_B2(                                                "maker_ID");
         Skip_B2(                                                "maker_model_code");
         Skip_B4(                                                "mpd_start_adress");
         Skip_B4(                                                "mpd_length");
-        Element_End();
+        Element_End0();
     }
 
     if (datablock_start_adress)
@@ -1049,7 +1058,7 @@
         Skip_XX(length-datablock_start_adress,                  "Unknown");
     }
 
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
@@ -1061,24 +1070,24 @@
     Get_B2 (number_of_mobjs,                                    "number_of_mobj");
     for (int16u mobjs_Pos=0; mobjs_Pos<number_of_mobjs; mobjs_Pos++)
     {
-        Element_Begin("mobj");
+        Element_Begin1("mobj");
         int16u number_of_navigation_commands;
         BS_Begin();
-        Info_SB(resume,                                         "resume"); Param_Info(resume?"suspend":"discard");
-        Info_SB(menu_call,                                      "menu_call"); Param_Info(menu_call?"enable":"disable");
-        Info_SB(title_search,                                   "title_search"); Param_Info(title_search?"enable":"disable");
+        Info_SB(resume,                                         "resume"); Param_Info1(resume?"suspend":"discard");
+        Info_SB(menu_call,                                      "menu_call"); Param_Info1(menu_call?"enable":"disable");
+        Info_SB(title_search,                                   "title_search"); Param_Info1(title_search?"enable":"disable");
         Skip_BS(13,                                             "reserved");
         BS_End();
         Get_B2 (number_of_navigation_commands,                  "number_of_navigation_commands");
         for (int16u navigation_command_Pos=0; navigation_command_Pos<number_of_navigation_commands; navigation_command_Pos++)
         {
-            Element_Begin("navigation_command");
+            Element_Begin1("navigation_command");
             Skip_B4(                                            "opcode");
             Skip_B4(                                            "destination");
             Skip_B4(                                            "source");
-            Element_End();
+            Element_End0();
         }
-        Element_End();
+        Element_End0();
     }
 }
 
@@ -1094,7 +1103,7 @@
     Skip_B1(                                                    "unknown");
     BS_Begin();
     Skip_S1(6,                                                  "unknown");
-    Info_S2(2, playback_type,                                   "playback_type"); Param_Info(Mpls_playback_type[playback_type]);
+    Info_S2(2, playback_type,                                   "playback_type"); Param_Info1(Mpls_playback_type[playback_type]);
     BS_End();
     Skip_B2(                                                    "playback_count");
     Skip_B4(                                                    "user_operation_mask_code 1");
@@ -1124,21 +1133,22 @@
 
     for (int16u SubPath_Pos=0; SubPath_Pos<number_of_SubPaths; SubPath_Pos++)
     {
-        Element_Begin("SubPath");
+        Element_Begin1("SubPath");
         int32u SubPath_length;
         int16u number_of_SubPlayItems;
+        int8u  SubPath_type;
         Get_B4 (SubPath_length,                                 "length");
         int64u SubPath_End=Element_Offset+SubPath_length;
         Skip_B1(                                                "Unknown");
-        Skip_B1(                                                "SubPath_type");
+        Get_B1 (SubPath_type,                                   "SubPath_type");
         Skip_B2(                                                "repeat");
         Get_B2 (number_of_SubPlayItems,                         "number_of_SubPlayItems");
-        for (int16u SubPlayItem=0; SubPlayItem<number_of_SubPlayItems; SubPlayItem++)
-            Mpls_PlayList_SubPlayItem();
+        for (int16u Pos=0; Pos<number_of_SubPlayItems; Pos++)
+            Mpls_PlayList_SubPlayItem(SubPath_type, Pos);
 
         if (SubPath_End>Element_Offset)
             Skip_XX(SubPath_End-Element_Offset,                 "unknown");
-        Element_End(2+SubPath_length);
+        Element_End0();
     }
 
     FILLING_BEGIN();
@@ -1153,54 +1163,75 @@
 //---------------------------------------------------------------------------
 void File_Bdmv::Mpls_PlayList_PlayItem()
 {
-    Element_Begin("PlayItem");
+    Element_Begin1("PlayItem");
     Ztring Clip_Information_file_name;
+    int32u Time_In, Time_Out;
     int16u length;
     Get_B2 (length,                                         "length");
     int64u End=Element_Offset+length;
-    Get_Local (5, Clip_Information_file_name,               "Clip_Information_file_name"); Element_Info(Clip_Information_file_name);
+    Get_Local (5, Clip_Information_file_name,               "Clip_Information_file_name"); Element_Info1(Clip_Information_file_name);
     Skip_Local(4,                                           "Clip_codec_identifier");
     Skip_B2(                                                "unknown");
     Skip_B1(                                                "Unknown");
-    Info_B4(Time_In,                                        "Time (In)"); Param_Info((float32)Time_In/45000);
-    Info_B4(Time_Out,                                       "Time (Out)"); Param_Info((float32)Time_Out/45000);
+    Get_B4 (Time_In,                                        "Time (In)"); Param_Info1((float32)Time_In/45000);
+    Get_B4 (Time_Out,                                       "Time (Out)"); Param_Info1((float32)Time_Out/45000);
     Skip_B4(                                                "UO1");
     Skip_B4(                                                "UO2");
     Skip_B4(                                                "An?");
 
+    Mpls_PlayList_PlayItem_Duration=Time_Out-Time_In;
     if (Time_Out>Time_In)
-        Mpls_PlayList_Duration+=Time_Out-Time_In;
+        Mpls_PlayList_Duration+=Mpls_PlayList_PlayItem_Duration;
+
+    std::vector<size_t> StreamCount_Before;
+    for (size_t StreamKind=Stream_General; StreamKind<Stream_Max; StreamKind++)
+        StreamCount_Before.push_back(Count_Get((stream_t)StreamKind));
 
     Mpls_PlayList_PlayItem_STN_table();
 
-    if (!File_Name.empty())
+    if (Clip_Information_file_names.find(Clip_Information_file_name)==Clip_Information_file_names.end() && File_Name.size()>10+1+8)
     {
         Ztring CLPI_File=File_Name;
-        CLPI_File.resize(CLPI_File.size()-10-1-8);
-        CLPI_File+=_T("CLIPINF");
+        CLPI_File.resize(CLPI_File.size()-(10+1+8));
+        CLPI_File+=__T("CLIPINF");
         CLPI_File+=PathSeparator;
         CLPI_File+=Clip_Information_file_name;
-        CLPI_File+=_T(".clpi");
+        CLPI_File+=__T(".clpi");
 
         MediaInfo_Internal MI;
-        MI.Option(_T("File_Bdmv_ParseTargetedFile"), Config->File_Bdmv_ParseTargetedFile_Get()?_T("1"):_T("0"));
+        MI.Option(__T("File_Bdmv_ParseTargetedFile"), Config->File_Bdmv_ParseTargetedFile_Get()?__T("1"):__T("0"));
         if (MI.Open(CLPI_File))
-            Merge(MI, Stream_Video, 0, 0);
+        {
+            for (size_t StreamKind=Stream_General+1; StreamKind<Stream_Max; StreamKind++)
+                for (size_t StreamPos=0; StreamPos<MI.Count_Get((stream_t)StreamKind); StreamPos++)
+                {
+                    while (StreamCount_Before[StreamKind]+StreamPos>=Count_Get((stream_t)StreamKind))
+                        Stream_Prepare((stream_t)StreamKind);
+                    Merge(MI, (stream_t)StreamKind, StreamPos, StreamCount_Before[StreamKind]+StreamPos);
+                }
+        }
+
+        Clip_Information_file_names.insert(Clip_Information_file_name);
     }
 
     if (End>Element_Offset)
         Skip_XX(End-Element_Offset,                             "unknown");
-    Element_End(2+length);
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
 void File_Bdmv::Mpls_PlayList_PlayItem_STN_table()
 {
-    Element_Begin("STN");
+    Element_Begin1("STN");
 
     int16u length;
     Get_B2 (length,                                         "length");
     int64u End=Element_Offset+length;
+    if (End>Element_Size)
+    {
+        Skip_XX(Element_Size-Element_Offset,                "Problem");
+        return;
+    }
     Skip_B2(                                                "unknown");
     Skip_B1(                                                "Vi");
     Skip_B1(                                                "Au");
@@ -1217,7 +1248,7 @@
 
     while (Element_Offset+16<=End)
     {
-        Element_Begin();
+        Element_Begin0();
         Ztring language;
         int16u mPID;
         int8u IDs_length;
@@ -1229,7 +1260,7 @@
         Skip_B2(                                            "sPID");
         Get_B1 (IDs_length,                                 "length");
         int64u IDs_End=Element_Offset+IDs_length;
-        Get_B1 (stream_type,                                "stream_type"); Param_Info(Clpi_Format(stream_type)); Element_Info(Clpi_Format(stream_type));
+        Get_B1 (stream_type,                                "stream_type"); Param_Info1(Clpi_Format(stream_type)); Element_Info1(Clpi_Format(stream_type));
         switch (Clpi_Type(stream_type))
         {
             case Stream_Video : Mpls_PlayList_PlayItem_STN_table_Video(); break;
@@ -1237,11 +1268,11 @@
             case Stream_Text  : Mpls_PlayList_PlayItem_STN_table_Text() ; break;
             default           : StreamKind_Last=Stream_Max;
         }
-        Get_Local(3, language,                              "language"); Element_Info(language);
+        Get_Local(3, language,                              "language"); Element_Info1(language);
 
         if (IDs_End-Element_Offset)
             Skip_XX(IDs_End-Element_Offset,                 "unknown");
-        Element_End();
+        Element_End0();
 
         FILLING_BEGIN();
             if (StreamKind_Last!=Stream_Max)
@@ -1252,13 +1283,14 @@
                     Fill(StreamKind_Last, StreamPos_Last, General_ID_String, Bdmv_Decimal_Hexa(mPID), true);
                 }
                 Fill(StreamKind_Last, StreamPos_Last, "Language", language);
+                Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Duration), Mpls_PlayList_PlayItem_Duration/45);
             }
         FILLING_END();
     }
 
     if (End>Element_Offset)
         Skip_XX(End-Element_Offset,                             "unknown");
-    Element_End(2+length);
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
@@ -1267,8 +1299,8 @@
     //Parsing
     int8u Format, FrameRate;
     BS_Begin();
-    Get_S1 (4, Format,                                          "format"); Param_Info(Clpi_Video_Format[Format]);
-    Get_S1 (4, FrameRate,                                       "frame_rate"); Param_Info(Clpi_Video_FrameRate[FrameRate]);
+    Get_S1 (4, Format,                                          "format"); Param_Info1(Clpi_Video_Format[Format]);
+    Get_S1 (4, FrameRate,                                       "frame_rate"); Param_Info1(Clpi_Video_FrameRate[FrameRate]);
     BS_End();
 
     FILLING_BEGIN();
@@ -1291,8 +1323,8 @@
     //Parsing
     int8u Channels, SamplingRate;
     BS_Begin();
-    Get_S1 (4, Channels,                                        "channel_layout"); Param_Info(Clpi_Audio_Channels[Channels]);
-    Get_S1 (4, SamplingRate,                                    "sampling_rate"); Param_Info(Clpi_Audio_SamplingRate[SamplingRate]);
+    Get_S1 (4, Channels,                                        "channel_layout"); Param_Info1(Clpi_Audio_Channels[Channels]);
+    Get_S1 (4, SamplingRate,                                    "sampling_rate"); Param_Info1(Clpi_Audio_SamplingRate[SamplingRate]);
     BS_End();
 
     FILLING_BEGIN();
@@ -1320,55 +1352,58 @@
 }
 
 //---------------------------------------------------------------------------
-void File_Bdmv::Mpls_PlayList_SubPlayItem()
+void File_Bdmv::Mpls_PlayList_SubPlayItem(int8u SubPath_type, int16u Pos)
 {
-    Element_Begin("SubPlayItem");
+    Element_Begin1("SubPlayItem");
     Ztring Clip_Information_file_name;
     int16u length;
     Get_B2 (length,                                             "length");
     int64u End=Element_Offset+length;
-    Get_Local (5, Clip_Information_file_name,                   "Clip_Information_file_name"); Element_Info(Clip_Information_file_name);
+    Get_Local (5, Clip_Information_file_name,                   "Clip_Information_file_name"); Element_Info1(Clip_Information_file_name);
     Skip_Local(4,                                               "Clip_codec_identifier");
     Skip_B4(                                                    "unknown");
     Skip_B1(                                                    "unknown");
-    Info_B4(Time_In,                                            "time (in)"); Param_Info((float32)Time_In/45000);
-    Info_B4(Time_Out,                                           "time (out)"); Param_Info((float32)Time_Out/45000);
+    Info_B4(Time_In,                                            "time (in)"); Param_Info1((float32)Time_In/45000);
+    Info_B4(Time_Out,                                           "time (out)"); Param_Info1((float32)Time_Out/45000);
     Skip_B2(                                                    "sync PI");
     Skip_B4(                                                    "sync PTS");
 
     if (End>Element_Offset)
         Skip_XX(End-Element_Offset,                             "unknown");
-    Element_End(2+length);
+    Element_End0();
 
     FILLING_BEGIN();
-        if (Mpls_PlayList_IsParsed)
+        if (SubPath_type==8 && Pos!=(int16u)-1) //MVC
         {
-            if (!File_Name.empty())
+            if (File_Name.size()>=10+1+8)
             {
                 Ztring CLPI_File=File_Name;
-                CLPI_File.resize(CLPI_File.size()-10-1-8);
-                CLPI_File+=_T("CLIPINF");
+                CLPI_File.resize(CLPI_File.size()-(10+1+8));
+                CLPI_File+=__T("CLIPINF");
                 CLPI_File+=PathSeparator;
                 CLPI_File+=Clip_Information_file_name;
-                CLPI_File+=_T(".clpi");
+                CLPI_File+=__T(".clpi");
 
                 MediaInfo_Internal MI;
-                MI.Option(_T("File_Bdmv_ParseTargetedFile"), Config->File_Bdmv_ParseTargetedFile_Get()?_T("1"):_T("0"));
+                MI.Option(__T("File_Bdmv_ParseTargetedFile"), Config->File_Bdmv_ParseTargetedFile_Get()?__T("1"):__T("0"));
                 if (MI.Open(CLPI_File))
                 {
-                    Ztring ID=Retrieve(Stream_Video, 0, Video_ID);
-                    Ztring ID_String=Retrieve(Stream_Video, 0, Video_ID_String);
-                    Ztring Format_Profile=Retrieve(Stream_Video, 0, Video_Format_Profile);
-                    Ztring BitRate=Retrieve(Stream_Video, 0, Video_BitRate);
-                    Ztring Source=Retrieve(Stream_Video, 0, "Source");
-                    Fill(Stream_Video, 0, Video_ID, MI.Get(Stream_Video, 0, Video_ID)+_T(" / ")+ID, true);
-                    Fill(Stream_Video, 0, Video_ID_String, MI.Get(Stream_Video, 0, Video_ID_String)+_T(" / ")+ID_String, true);
-                    if (!Format_Profile.empty())
-                        Fill(Stream_Video, 0, Video_Format_Profile, MI.Get(Stream_Video, 0, Video_Format_Profile)+_T(" / ")+Format_Profile, true);
-                    if (!BitRate.empty())
-                        Fill(Stream_Video, 0, Video_BitRate, Ztring::ToZtring(BitRate.To_int32u()+MI.Get(Stream_Video, 0, Video_BitRate).To_int32u())+_T(" / ")+BitRate, true);
-                    if (!Source.empty())
-                        Fill(Stream_Video, 0, "Source", Clip_Information_file_name +_T(".m2ts / ")+Source, true);
+                    if (MI.Count_Get(Stream_Video))
+                    {
+                        Ztring ID=Retrieve(Stream_Video, Pos, Video_ID);
+                        Ztring ID_String=Retrieve(Stream_Video, Pos, Video_ID_String);
+                        Ztring Format_Profile=Retrieve(Stream_Video, Pos, Video_Format_Profile);
+                        Ztring BitRate=Retrieve(Stream_Video, Pos, Video_BitRate);
+                        Ztring Source=Retrieve(Stream_Video, Pos, "Source");
+                        Fill(Stream_Video, Pos, Video_ID, MI.Get(Stream_Video, 0, Video_ID)+__T(" / ")+ID, true);
+                        Fill(Stream_Video, Pos, Video_ID_String, MI.Get(Stream_Video, 0, Video_ID_String)+__T(" / ")+ID_String, true);
+                        if (!Format_Profile.empty())
+                            Fill(Stream_Video, Pos, Video_Format_Profile, MI.Get(Stream_Video, 0, Video_Format_Profile)+__T(" / ")+Format_Profile, true);
+                        if (!BitRate.empty())
+                            Fill(Stream_Video, Pos, Video_BitRate, Ztring::ToZtring(BitRate.To_int32u()+MI.Get(Stream_Video, 0, Video_BitRate).To_int32u())+__T(" / ")+BitRate, true);
+                        if (!Source.empty())
+                            Fill(Stream_Video, Pos, "Source", Clip_Information_file_name +__T(".m2ts / ")+Source, true);
+                    }
                 }
             }
         }
@@ -1387,10 +1422,10 @@
     Get_B2 (count,                                              "count");
     for (int16u Pos=0; Pos<count; Pos++)
     {
-        Element_Begin("Mark");
+        Element_Begin1("Mark");
         int8u type;
         Skip_B1(                                                "unknown");
-        Get_B1 (type,                                           "type"); Param_Info(Mpls_PlayListMarks_Mark_type(type));
+        Get_B1 (type,                                           "type"); Param_Info1(Mpls_PlayListMarks_Mark_type(type));
         switch (type)
         {
             case 1 : //entry-mark
@@ -1399,7 +1434,7 @@
                     int32u time;
                     int16u stream_file_index;
                     Get_B2 (stream_file_index,                  "stream_file_index");
-                    Get_B4 (time,                               "time"); Param_Info(time/45, " milliseconds");
+                    Get_B4 (time,                               "time"); Param_Info2(time/45, " milliseconds");
                     Skip_B2(                                    "unknown");
                     Skip_B4(                                    "unknown");
 
@@ -1408,7 +1443,7 @@
                             time_Pos0=time;
                         if (stream_file_index==0 && type==1) //We currently handle only the first file
                         {
-                            Fill(Stream_Menu, 0, Ztring().Duration_From_Milliseconds((int64u)((time-time_Pos0)/45)).To_UTF8().c_str(), _T("Chapter ")+Ztring::ToZtring(time_Pos));
+                            Fill(Stream_Menu, 0, Ztring().Duration_From_Milliseconds((int64u)((time-time_Pos0)/45)).To_UTF8().c_str(), __T("Chapter ")+Ztring::ToZtring(time_Pos));
                             time_Pos++;
                         }
                     FILLING_END();
@@ -1417,7 +1452,7 @@
             default:
                     Skip_XX(12,                                 "unknwon");
         }
-        Element_End();
+        Element_End0();
     }
 
     Fill(Stream_Menu, StreamPos_Last, Menu_Chapters_Pos_End, Count_Get(Stream_Menu, StreamPos_Last), 10, true);
@@ -1426,14 +1461,14 @@
 //---------------------------------------------------------------------------
 void File_Bdmv::Mpls_ExtensionData()
 {
-    entries Entries; //Key is the start adress
+    entries Entries; //Key is the start address
 
     int32u Base_Pos=(int32u)Element_Offset-4;
 
     int8u number_of_ext_data_entries;
     Skip_B4(                                                    "Unknown");
     Skip_B3(                                                    "Unknown");
-    Element_Begin("Offsets");
+    Element_Begin1("Offsets");
     Get_B1 (number_of_ext_data_entries,                         "number_of_ext_data_entries");
     for (size_t Start_Adress_Pos=0; Start_Adress_Pos<number_of_ext_data_entries; Start_Adress_Pos++)
     {
@@ -1447,16 +1482,16 @@
         Entries[Base_Pos+Start_Adress].ID2=ID2;
         Entries[Base_Pos+Start_Adress].Length=Length;
     }
-    Element_End();
+    Element_End0();
 
-    for (entries::iterator Entry=Entries.begin(); Entry!=Entries.end(); Entry++)
+    for (entries::iterator Entry=Entries.begin(); Entry!=Entries.end(); ++Entry)
     {
         if (Entry->first>=Element_Offset) //If valid
         {
             if (Entry->first>Element_Offset)
                 Skip_XX(Entry->first-Element_Offset,            "unknown");
 
-            Element_Begin("Entry");
+            Element_Begin1("Entry");
             int64u End=Element_Offset+Entry->second.Length;
             switch (Entry->second.ID1)
             {
@@ -1480,7 +1515,7 @@
             }
             if (End>Element_Offset)
                 Skip_XX(End-Element_Offset,                     "Unknown");
-            Element_End();
+            Element_End0();
         }
     }
 
@@ -1491,16 +1526,16 @@
 //---------------------------------------------------------------------------
 void File_Bdmv::Mpls_ExtensionData_SubPath_entries()
 {
-    Element_Begin("SubPath_entries");
+    Element_Begin1("SubPath_entries");
     int32u length;
     int16u number_of_SubPath_extensions;
     int8u SubPath_type;
     Get_B4 (length,                                             "length");
     int64u End=Element_Offset+length;
     Get_B2 (number_of_SubPath_extensions,                       "number_of_SubPath_extensions");
-    for (int8u SubPath_extension=0; SubPath_extension<number_of_SubPath_extensions+Mpls_PlayList_number_of_SubPaths; SubPath_extension++)
+    for (int8u SubPath_extension=0; SubPath_extension<number_of_SubPath_extensions; SubPath_extension++)
     {
-        Element_Begin("SubPath_extension");
+        Element_Begin1("SubPath_extension");
         int32u SubPath_extension_length;
         Get_B4 (SubPath_extension_length,                       "length");
         int64u SubPath_extension_End=Element_Offset+SubPath_extension_length;
@@ -1514,17 +1549,17 @@
                         Skip_B3(                                "Unknown");
                         Get_B1 (number_of_SubPlayItems,         "number_of_SubPlayItems");
                         for (int8u Pos=0; Pos<number_of_SubPlayItems; Pos++)
-                            Mpls_PlayList_SubPlayItem();
+                            Mpls_PlayList_SubPlayItem(SubPath_type, Pos);
                         }
             default   : ;
         }
         if (SubPath_extension_End-Element_Offset)
             Skip_XX(SubPath_extension_End-Element_Offset,       "Padding");
-        Element_End();
+        Element_End0();
     }
     if (End-Element_Offset)
         Skip_XX(End-Element_Offset,                             "Padding");
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
@@ -1533,9 +1568,9 @@
     //Parsing
     int8u Format, FrameRate, AspectRatio;
     BS_Begin();
-    Get_S1 (4, Format,                                          "Format"); Param_Info(Clpi_Video_Format[Format]);
-    Get_S1 (4, FrameRate,                                       "Frame rate"); Param_Info(Clpi_Video_FrameRate[FrameRate]);
-    Get_S1 (4, AspectRatio,                                     "Aspect ratio"); Param_Info(Clpi_Video_AspectRatio[AspectRatio]);
+    Get_S1 (4, Format,                                          "Format"); Param_Info1(Clpi_Video_Format[Format]);
+    Get_S1 (4, FrameRate,                                       "Frame rate"); Param_Info1(Clpi_Video_FrameRate[FrameRate]);
+    Get_S1 (4, AspectRatio,                                     "Aspect ratio"); Param_Info1(Clpi_Video_AspectRatio[AspectRatio]);
     Skip_BS(4,                                                  "Reserved");
     BS_End();
 
@@ -1564,10 +1599,10 @@
     //Parsing
     int8u Channels, SamplingRate;
     BS_Begin();
-    Get_S1 (4, Channels,                                        "Channel layout"); Param_Info(Clpi_Audio_Channels[Channels]);
-    Get_S1 (4, SamplingRate,                                    "Sampling Rate"); Param_Info(Clpi_Audio_SamplingRate[SamplingRate]);
+    Get_S1 (4, Channels,                                        "Channel layout"); Param_Info1(Clpi_Audio_Channels[Channels]);
+    Get_S1 (4, SamplingRate,                                    "Sampling Rate"); Param_Info1(Clpi_Audio_SamplingRate[SamplingRate]);
     BS_End();
-    Info_Local(3, Language,                                     "Language"); Element_Info(Language);
+    Info_Local(3, Language,                                     "Language"); Element_Info1(Language);
 
     FILLING_BEGIN();
         if (StreamKind_Last==Stream_Max)
@@ -1590,7 +1625,7 @@
     //Parsing
     if (stream_type==0x92) //Subtitle
         Skip_B1(                                                "Unknown");
-    Info_Local(3, Language,                                     "Language"); Element_Info(Language);
+    Info_Local(3, Language,                                     "Language"); Element_Info1(Language);
 
     FILLING_BEGIN();
         if (StreamKind_Last==Stream_Max)

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Bdmv.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Bdmv.h Changed

@@ -1,17 +1,17 @@
 // File_Bdmv - Info for Blu-ray Movie files
-// Copyright (C) 2009-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2009-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -28,6 +28,7 @@
 
 //---------------------------------------------------------------------------
 #include "MediaInfo/File__Analyze.h"
+#include <set>
 //---------------------------------------------------------------------------
 
 namespace MediaInfoLib
@@ -69,7 +70,7 @@
     void Mpls_PlayList_PlayItem_STN_table_Video();
     void Mpls_PlayList_PlayItem_STN_table_Audio();
     void Mpls_PlayList_PlayItem_STN_table_Text();
-    void Mpls_PlayList_SubPlayItem();
+    void Mpls_PlayList_SubPlayItem(int8u SubPath_type, int16u Pos);
     void Mpls_PlayListMarks();
     void Mpls_ExtensionData();
     void Mpls_ExtensionData_SubPath_entries();
@@ -79,10 +80,12 @@
 
     //Temp
     int8u stream_type;
-    std::map<int32u, size_t> Types; //Key is the start adress
+    std::map<int32u, size_t> Types; //Key is the start address
     int64u Mpls_PlayList_Duration;
+    int64u Mpls_PlayList_PlayItem_Duration;
     int16u Mpls_PlayList_number_of_SubPaths;
     bool   Mpls_PlayList_IsParsed;
+    std::set<Ztring> Clip_Information_file_names;
 };
 
 } //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Cdxa.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Cdxa.cpp Changed

@@ -1,31 +1,35 @@
 // File_Cdxa - Info for CDXA files
-// Copyright (C) 2004-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2004-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_CDXA_YES)
 //---------------------------------------------------------------------------
 
@@ -67,7 +71,7 @@
 :File__Analyze()
 {
     //Configuration
-    ParserName=_T("CDXA");
+    ParserName=__T("CDXA");
     #if MEDIAINFO_EVENTS
         ParserIDs[0]=MediaInfo_Parser_Cdxa;
         StreamIDs_Width[0]=0;
@@ -164,8 +168,8 @@
     FILLING_BEGIN();
         Accept("CDXA");
         MI=new MediaInfo_Internal;
-        MI->Option(_T("FormatDetection_MaximumOffset"), _T("1048576"));
-        //MI->Option(_T("File_IsSub"), _T("1"));
+        MI->Option(__T("FormatDetection_MaximumOffset"), __T("1048576"));
+        //MI->Option(__T("File_IsSub"), __T("1"));
         MI->Open_Buffer_Init(File_Size, File_Offset+Buffer_Offset);
     FILLING_END();
 }
@@ -229,7 +233,7 @@
         Merge(*(MI->Info));
         Merge(*(MI->Info), Stream_General, 0, 0);
         const Ztring &Format=Retrieve(Stream_General, 0, General_Format);
-        Fill(Stream_General, 0, General_Format, (Ztring(_T("CDXA/"))+Format).c_str(), Unlimited, true);
+        Fill(Stream_General, 0, General_Format, (Ztring(__T("CDXA/"))+Format).c_str(), Unlimited, true);
         Clear(Stream_General, 0, General_Duration);
         Clear(Stream_Video, 0, Video_Duration);
     }
@@ -300,7 +304,7 @@
 
     //Details
     #if MEDIAINFO_TRACE
-    if (MediaInfoLib::Config.DetailsLevel_Get())
+    if (Config_Trace_Level)
     {
         if (!MI->Inform().empty())
             Element_Show_Add(MI->Inform());

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Cdxa.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Cdxa.h Changed

@@ -1,17 +1,17 @@
 // File_Cdxa - Info for CDXA files
-// Copyright (C) 2004-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2004-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -59,7 +59,7 @@
     //Buffer - Synchro
     bool Synchronize();
     bool Synched_Test();
-    
+
     //Buffer - Per element
     void Header_Parse();
     void Data_Parse();

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Dcp.cpp Added

@@ -0,0 +1,182 @@
+// File_Dcp - Info for DCP (XML) files
+// Copyright (C) 2011-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_DCP_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Multiple/File_Dcp.h"
+#include "MediaInfo/MediaInfo.h"
+#include "MediaInfo/MediaInfo_Internal.h"
+#include "MediaInfo/Multiple/File__ReferenceFilesHelper.h"
+#include "ZenLib/Dir.h"
+#include "ZenLib/FileName.h"
+#include "tinyxml2.h"
+using namespace tinyxml2;
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File_Dcp::File_Dcp()
+:File__Analyze()
+{
+    #if MEDIAINFO_EVENTS
+        ParserIDs[0]=MediaInfo_Parser_None; //TODO
+        StreamIDs_Width[0]=sizeof(size_t)*2;
+    #endif //MEDIAINFO_EVENTS
+    #if MEDIAINFO_DEMUX
+        Demux_EventWasSent_Accept_Specific=true;
+    #endif //MEDIAINFO_DEMUX
+
+    //Temp
+    ReferenceFiles=NULL;
+}
+
+//---------------------------------------------------------------------------
+File_Dcp::~File_Dcp()
+{
+    delete ReferenceFiles; //ReferenceFiles=NULL;
+}
+
+//***************************************************************************
+// Streams management
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Dcp::Streams_Finish()
+{
+    if (ReferenceFiles==NULL)
+        return;
+
+    ReferenceFiles->ParseReferences();
+}
+
+//***************************************************************************
+// Buffer - Global
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_SEEK
+size_t File_Dcp::Read_Buffer_Seek (size_t Method, int64u Value, int64u ID)
+{
+    if (ReferenceFiles==NULL)
+        return 0;
+
+    return ReferenceFiles->Read_Buffer_Seek(Method, Value, ID);
+}
+#endif //MEDIAINFO_SEEK
+
+//***************************************************************************
+// Buffer - File header
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_Dcp::FileHeader_Begin()
+{
+    XMLDocument document;
+    if (!FileHeader_Begin_XML(document))
+       return false;
+
+    {
+        std::string NameSpace;
+        XMLElement* AssetMap=document.FirstChildElement("AssetMap");
+        if (AssetMap==NULL)
+        {
+            NameSpace="am:";
+            AssetMap=document.FirstChildElement((NameSpace+"AssetMap").c_str());
+        }
+        if (AssetMap)
+        {
+            Accept("Dcp");
+            Fill(Stream_General, 0, General_Format, "DCP");
+            Fill(Stream_General, 0, General_Format_Version, NameSpace=="am:"?"SMPTE":"Interop");
+
+            ReferenceFiles=new File__ReferenceFilesHelper(this, Config);
+
+            XMLElement* IssueDate=AssetMap->FirstChildElement((NameSpace+"IssueDate").c_str());
+            if (IssueDate)
+                Fill(Stream_General, 0, General_Encoded_Date, IssueDate->GetText());
+            XMLElement* Issuer=AssetMap->FirstChildElement((NameSpace+"Issuer").c_str());
+            if (Issuer)
+                Fill(Stream_General, 0, General_EncodedBy, Issuer->GetText());
+            XMLElement* Creator=AssetMap->FirstChildElement((NameSpace+"Creator").c_str());
+            if (Creator)
+                Fill(Stream_General, 0, General_Encoded_Library, Creator->GetText());
+
+            XMLElement* AssetList=AssetMap->FirstChildElement((NameSpace+"AssetList").c_str());
+            if (AssetList)
+            {
+                XMLElement* Asset=AssetList->FirstChildElement((NameSpace+"Asset").c_str());
+                while (Asset)
+                {
+                    XMLElement* ChunkList=Asset->FirstChildElement((NameSpace+"ChunkList").c_str());
+                    if (ChunkList)
+                    {
+                        XMLElement* Chunk=ChunkList->FirstChildElement((NameSpace+"Chunk").c_str());
+                        if (Chunk)
+                        {
+                            XMLElement* Path=Chunk->FirstChildElement((NameSpace+"Path").c_str());
+                            if (Path)
+                            {
+                                File__ReferenceFilesHelper::reference ReferenceFile;
+                                ReferenceFile.FileNames.push_back(Path->GetText());
+                                ReferenceFile.StreamID=ReferenceFiles->References.size()+1;
+                                ReferenceFiles->References.push_back(ReferenceFile);
+                            }
+                        }
+                    }
+
+                    Asset=Asset->NextSiblingElement();
+                }
+            }
+        }
+        else
+        {
+            Reject("Dcp");
+            return false;
+        }
+    }
+
+    //All should be OK...
+    return true;
+}
+
+} //NameSpace
+
+#endif //MEDIAINFO_P2_YES
+

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Dcp.h Added

@@ -0,0 +1,69 @@
+// File_Dcp - Info for DCP (XML) files
+// Copyright (C) 2011-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Information about DCP files
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_File_DcpH
+#define MediaInfo_File_DcpH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+#include <vector>
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+class File__ReferenceFilesHelper;
+
+//***************************************************************************
+// Class File_Dcp
+//***************************************************************************
+
+class File_Dcp : public File__Analyze
+{
+public :
+    //Constructor/Destructor
+    File_Dcp();
+    ~File_Dcp();
+
+private :
+    //Streams management
+    void Streams_Finish ();
+
+    //Buffer - Global
+    #if MEDIAINFO_SEEK
+    size_t Read_Buffer_Seek (size_t Method, int64u Value, int64u ID);
+    #endif //MEDIAINFO_SEEK
+
+    //Buffer - File header
+    bool FileHeader_Begin();
+
+    //Temp
+    File__ReferenceFilesHelper*     ReferenceFiles;
+};
+
+} //NameSpace
+
+#endif
+

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Dpg.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Dpg.cpp Changed

@@ -1,17 +1,17 @@
 // File_Dpg - Info for DPG files
-// Copyright (C) 2009-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2009-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -25,14 +25,18 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_DPG_YES)
 //---------------------------------------------------------------------------
 
@@ -95,7 +99,7 @@
     int32u  FrameCount, FrameRate, SamplingRate;
     Skip_C4(                                                    "Signature");
     Get_L4 (FrameCount,                                         "Frame count");
-    Get_L4 (FrameRate,                                          "Frame rate"); Param_Info(FrameRate/0x100, " fps");
+    Get_L4 (FrameRate,                                          "Frame rate"); Param_Info2(FrameRate/0x100, " fps");
     Get_L4 (SamplingRate,                                       "Sampling rate");
     Skip_L4(                                                    "0x00000000");
     Get_L4 (Audio_Offset,                                       "Audio Offset");
@@ -153,6 +157,7 @@
                 Merge(*Parser, Stream_Audio, 0, 0);
                 #if defined(MEDIAINFO_MPEGV_YES)
                     Audio_Size=0;
+                    Open_Buffer_Unsynch();
                     Data_GoTo(Video_Offset, "DPG");
                     delete Parser; Parser=new File_Mpegv();
                     Open_Buffer_Init(Parser);

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Dpg.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Dpg.h Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_DvDif.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_DvDif.cpp Changed

@@ -1,31 +1,35 @@
 // File_DvDif - Info for DV-DIF files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_DVDIF_YES)
 //---------------------------------------------------------------------------
 
@@ -35,6 +39,9 @@
     #include "MediaInfo/Text/File_Eia608.h"
 #endif
 #include "MediaInfo/MediaInfo_Config_MediaInfo.h"
+#if MEDIAINFO_SEEK
+    #include "MediaInfo/MediaInfo_Internal.h"
+#endif //MEDIAINFO_SEEK
 //---------------------------------------------------------------------------
 
 namespace MediaInfoLib
@@ -71,14 +78,14 @@
 //---------------------------------------------------------------------------
 const char*  Dv_Disp[]=
 {
-    "4/3",
-    "",
-    "16/9",
-    "Letterbox",
+    "4/3",                              //S306M, S314M
+    "16/9",                             //S306M
+    "16/9",                             //S306M, S314M
+    "4/3",                              //Which spec?
     "",
     "",
     "",
-    "16/9",
+    "16/9 or 4/3 depends of ssyb AP3", //Which spec?
 };
 
 //---------------------------------------------------------------------------
@@ -102,7 +109,7 @@
 };
 
 //---------------------------------------------------------------------------
-const int32u  Dv_Audio_Resolution[]=
+const int32u  Dv_Audio_BitDepth[]=
 {
     16,
     12,
@@ -127,7 +134,7 @@
 const char*  Dv_Pair[]=
 {
     "One pair of channels",
-    "Independant channels",
+    "Independent channels",
 };
 
 //---------------------------------------------------------------------------
@@ -236,29 +243,20 @@
     Buffer_TotalBytes_FirstSynched_Max=64*1024;
 
     //In
-    Frame_Count_Valid=48; //(DV100 is up to 48 DIF sequences)
+    Frame_Count_Valid=2;
     AuxToAnalyze=0x00; //No Aux to analyze
     IgnoreAudio=false;
 
     //Temp
-    FrameCount=0;
     FrameSize_Theory=0;
     Duration=0;
     TimeCode_First=(int64u)-1;
-    SCT=(int8u)-1;
-    SCT_Old=4; //Video
-    DBN_Olds[0]=0;
-    DBN_Olds[1]=1; //SubCode
-    DBN_Olds[2]=2; //Vaux
-    DBN_Olds[3]=8; //Audio
-    DBN_Olds[4]=134; //Video
-    DBN_Olds[5]=0;
-    DBN_Olds[6]=0;
-    DBN_Olds[7]=0;
+    Synched_Test_Reset();
     DSF_IsValid=false;
     APT=0xFF; //Impossible
     video_source_stype=0xFF;
     audio_source_stype=0xFF;
+    ssyb_AP3=0xFF;
     TF1=false; //Valid by default, for direct analyze
     TF2=false; //Valid by default, for direct analyze
     TF3=false; //Valid by default, for direct analyze
@@ -268,6 +266,10 @@
     video_sourcecontrol_IsParsed=false;
     audio_locked=false;
 
+    #if MEDIAINFO_SEEK
+        Duration_Detected=false;
+    #endif //MEDIAINFO_SEEK
+
     #ifdef MEDIAINFO_DVDIF_ANALYZE_YES
     Analyze_Activated=false;
     video_source_Detected=false;
@@ -297,6 +299,9 @@
 //---------------------------------------------------------------------------
 File_DvDif::~File_DvDif()
 {
+    for (size_t Pos=0; Pos<Streams_Audio.size(); Pos++)
+        delete Streams_Audio[Pos];
+
     #if defined(MEDIAINFO_EIA608_YES)
         for (size_t Pos=0; Pos<CC_Parsers.size(); Pos++)
             delete CC_Parsers[Pos]; //CC_Parsers[Pos]=NULL;
@@ -307,59 +312,6 @@
 }
 
 //***************************************************************************
-// Buffer - File header
-//***************************************************************************
-
-//---------------------------------------------------------------------------
-bool File_DvDif::FileHeader_Begin()
-{
-    //Must have enough buffer for having header
-    if (Buffer_Size<8)
-        return false; //Must wait for more data
-
-    //False positives detection: detect some headers from other files, DV parser is not smart enough
-    if (CC4(Buffer)==0x52494646  //RIFF
-     || CC4(Buffer+4)==0x66747970  //ftyp
-     || CC4(Buffer+4)==0x66726565  //free
-     || CC4(Buffer+4)==0x6D646174  //mdat
-     || CC4(Buffer+4)==0x6D646174  //moov
-     || CC4(Buffer+4)==0x736B6970  //skip
-     || CC4(Buffer+4)==0x77696465  //wide
-     || CC4(Buffer)==0x060E2B34) //MXF begin
-    {
-        Finish();
-        return false;
-    }
-
-    //All should be OK...
-    return true;
-}
-
-//***************************************************************************
-// Buffer - Synchro
-//***************************************************************************
-
-//---------------------------------------------------------------------------
-bool File_DvDif::Synchronize()
-{
-    while (Buffer_Offset+8*80<=Buffer_Size //8 blocks
-        && !((CC3(Buffer+Buffer_Offset+0*80)&0xE0F0FF)==0x000000   //Header 0
-          && (CC3(Buffer+Buffer_Offset+1*80)&0xE0F0FF)==0x200000   //Subcode 0
-          && (CC3(Buffer+Buffer_Offset+2*80)&0xE0F0FF)==0x200001   //Subcode 1
-          && (CC3(Buffer+Buffer_Offset+3*80)&0xE0F0FF)==0x400000   //VAUX 0
-          && (CC3(Buffer+Buffer_Offset+4*80)&0xE0F0FF)==0x400001   //VAUX 1
-          && (CC3(Buffer+Buffer_Offset+5*80)&0xE0F0FF)==0x400002   //VAUX 2
-          && (CC3(Buffer+Buffer_Offset+6*80)&0xE0F0FF)==0x600000   //Audio 0
-          && (CC3(Buffer+Buffer_Offset+7*80)&0xE0F0FF)==0x800000)) //Video 0
-            Buffer_Offset++;
-
-    if (Buffer_Offset+8*80>Buffer_Size)
-        return false;
-
-    return true;
-}
-
-//***************************************************************************
 // Streams management
 //***************************************************************************
 
@@ -371,9 +323,9 @@
     Stream_Prepare(Stream_Video);
     Fill(Stream_Video, 0, Video_Format, "DV");
     Fill(Stream_Video, 0, Video_Codec, "DV");
-    Fill(Stream_Video, 0, Video_BitRate_Mode, "CBR");
     Fill(Stream_Video, 0, Video_Standard, system?"PAL":"NTSC");
-    Fill(Stream_Video, 0, Video_Resolution, 8);
+    Fill(Stream_Video, 0, Video_BitDepth, 8);
+    bool IsHd=false;
     switch (video_source_stype)
     {
         case 0x00 :
@@ -385,10 +337,12 @@
         case 0x15 :
                     Fill(Stream_Video, 0, Video_Width, system?1440:1280);
                     Fill(Stream_Video, 0, Video_Height, video_source_stype==0x14?1080:1035);
+                    IsHd=true;
                     break;
         case 0x18 :
                     Fill(Stream_Video, 0, Video_Width, 960);
                     Fill(Stream_Video, 0, Video_Height, 720);
+                    IsHd=true;
                     break;
         default   : ;
     }
@@ -412,6 +366,15 @@
                 default   : ;
             }
         }
+        else if (Interlaced)
+        {
+            Fill(Stream_Video, 0, Video_ScanType, "Interlaced");
+            if (FieldOrder_FF)
+                Fill(Stream_Video, 0, Video_ScanOrder, FieldOrder_FS?"BFF":"TFF");
+            else
+                Fill(Stream_Video, 0, Video_ScanOrder, FieldOrder_FS?"Bottom field only":"Top field only");
+            Fill(Stream_Video, 0, Video_Interlacement, "Interlaced");
+        }
         else
         {
             Fill(Stream_Video, 0, Video_ScanType, Interlaced?"Interlaced":"Progressive");
@@ -421,8 +384,14 @@
         {
             case 0 :
             case 4 : Fill(Stream_Video, 0, Video_DisplayAspectRatio, 4.0/3.0, 3, true); break;
-            case 2 :
-            case 7 : Fill(Stream_Video, 0, Video_DisplayAspectRatio, 16.0/9.0, 3, true); break;
+            case 1 :
+            case 2 : Fill(Stream_Video, 0, Video_DisplayAspectRatio, 16.0/9.0, 3, true); break;
+            case 7 : switch (ssyb_AP3)
+                     {
+                        case 0 : Fill(Stream_Video, 0, Video_DisplayAspectRatio, 16.0/9.0, 3, true); break;
+                        case 7 : Fill(Stream_Video, 0, Video_DisplayAspectRatio, 4.0/3.0, 3, true); break;
+                        default: ; //No indication of aspect ratio?
+                     }
             default: ;
         }
     }
@@ -453,10 +422,9 @@
     else //DV 50 Mbps and 100 Mbps
         Fill(Stream_Video, 0, Video_Colorimetry, "4:2:2");
 
-    if (FrameSize_Theory)
+    if (FrameSize_Theory && !IsHd)
     {
-        float64 OverallBitRate=FrameSize_Theory*(DSF?25.000:29.970)*8;
-        if (OverallBitRate>27360000 && OverallBitRate<=30240000) OverallBitRate=DSF?28800000:28771229;
+        float64 OverallBitRate=FrameSize_Theory*(DSF?((float64)25.000):((float64)30000/1001))*8;
         if (FSC_WasSet)
         {
             if (FSP_WasNotSet)
@@ -466,42 +434,95 @@
         }
         if (OverallBitRate)
         {
-            Fill(Stream_General, 0, General_OverallBitRate, OverallBitRate, 0);
+            if (IsSub)
+                Fill(Stream_Video, 0, Video_BitRate_Encoded, OverallBitRate, 0);
+            else
+                Fill(Stream_General, 0, General_OverallBitRate, OverallBitRate, 0);
             Fill(Stream_Video, 0, (FSC_WasSet && FSP_WasNotSet)?Video_BitRate_Maximum:Video_BitRate, OverallBitRate*134/150*76/80, 0); //134 Video DIF from 150 DIF, 76 bytes from 80 byte DIF
         }
     }
 
-    for (size_t Pos=0; Pos<Streams_Audio.size(); Pos++)
+    if (!Config->File_DvDif_DisableAudioIfIsInContainer_Get())
+        for (size_t Pos=0; Pos<Streams_Audio.size(); Pos++)
+        {
+            Stream_Prepare(Stream_Audio);
+            for (std::map<std::string, Ztring>::iterator Info=Streams_Audio[Pos]->Infos.begin(); Info!=Streams_Audio[Pos]->Infos.end(); ++Info)
+                Fill(Stream_Audio, StreamPos_Last, Info->first.c_str(), Info->second, true);
+            Fill(Stream_Audio, StreamPos_Last, Audio_BitRate_Encoded, 0);
+        }
+
+    if (Stream_BitRateFromContainer && Retrieve(Stream_Video, 0, Video_BitRate).empty())
     {
-        Stream_Prepare(Stream_Audio);
-        for (std::map<std::string, Ztring>::iterator Info=Streams_Audio[Pos]->Infos.begin(); Info!=Streams_Audio[Pos]->Infos.end(); Info++)
-            Fill(Stream_Audio, StreamPos_Last, Info->first.c_str(), Info->second, true);
+        if (Stream_BitRateFromContainer>=28800000*0.98 && Stream_BitRateFromContainer<=28800000*1.02)
+        {
+            Fill(Stream_Video, 0, Video_BitRate, ((float64)28800000)*134/150*76/80, 0);
+            Fill(Stream_Video, 0, Video_BitRate_Encoded, 28800000);
+        }
+        if (Stream_BitRateFromContainer>=57600000*0.98 && Stream_BitRateFromContainer<=57600000*1.02)
+        {
+            Fill(Stream_Video, 0, Video_BitRate, ((float64)57600000)*134/150*76/80, 0);
+            Fill(Stream_Video, 0, Video_BitRate_Encoded, 57600000);
+        }
+        if (Stream_BitRateFromContainer>=115200000*0.98 && Stream_BitRateFromContainer<=115200000*1.02)
+        {
+            Fill(Stream_Video, 0, Video_BitRate, ((float64)115200000)*134/150*76/80, 0);
+            Fill(Stream_Video, 0, Video_BitRate_Encoded, 115200000);
+        }
     }
-    
+
     //Library settings
     Fill(Stream_Video, 0, Video_Encoded_Library_Settings, Encoded_Library_Settings);
 
     //Profile
-    if (FSC_WasSet)
+    if (FSC_WasSet || IsHd)
     {
-        if (FSP_WasNotSet)
+        if (FSP_WasNotSet || IsHd)
         {
             Fill(Stream_General, 0, General_Format_Commercial_IfAny, "DVCPRO HD");
             Fill(Stream_Video, 0, Video_Format_Commercial_IfAny, "DVCPRO HD");
-            Fill(Stream_Video, 0, Video_Resolution, 10, 10, true); //MXF files say that DVCPRO HD are 10 bits, exact?
-            Fill(Stream_Video, 0, Video_BitRate_Mode, "VBR", Unlimited, true, true);
+            Fill(Stream_Video, 0, Video_BitDepth, 10, 10, true); //MXF files say that DVCPRO HD are 10 bits, exact?
         }
         else
         {
             Fill(Stream_General, 0, General_Format_Commercial_IfAny, "DVCPRO 50");
             Fill(Stream_Video, 0, Video_Format_Commercial_IfAny, "DVCPRO 50");
+            Fill(Stream_Video, 0, Video_BitRate_Mode, "CBR");
         }
     }
-    else if (audio_locked || (Retrieve(Stream_Video, 0, Video_Standard)==_T("PAL") && Retrieve(Stream_Video, 0, Video_Colorimetry)==_T("4:1:1")))
+    else if (audio_locked || (Retrieve(Stream_Video, 0, Video_Standard)==__T("PAL") && Retrieve(Stream_Video, 0, Video_Colorimetry)==__T("4:1:1")))
     {
         Fill(Stream_General, 0, General_Format_Commercial_IfAny, "DVCPRO");
         Fill(Stream_Video, 0, Video_Format_Commercial_IfAny, "DVCPRO");
+        Fill(Stream_Video, 0, Video_BitRate_Mode, "CBR");
+    }
+    else
+        Fill(Stream_Video, 0, Video_BitRate_Mode, "CBR");
+
+    //Delay
+    if (TimeCode_First!=(int64u)-1)
+    {
+        Fill(Stream_Video, 0, Video_Delay, TimeCode_First);
+        Fill(Stream_Video, 0, Video_Delay_Source, "Stream");
+        for (size_t Pos=0; Pos<Count_Get(Stream_Audio); Pos++)
+        {
+            Fill(Stream_Audio, Pos, Audio_Delay, TimeCode_First);
+            Fill(Stream_Audio, Pos, Audio_Delay_Source, "Stream");
+        }
     }
+
+    #if defined(MEDIAINFO_EIA608_YES)
+        for (size_t Pos=0; Pos<CC_Parsers.size(); Pos++)
+            if (CC_Parsers[Pos] && CC_Parsers[Pos]->Status[IsAccepted])
+            {
+                Finish(CC_Parsers[Pos]);
+                for (size_t Pos2=0; Pos2<CC_Parsers[Pos]->Count_Get(Stream_Text); Pos2++)
+                {
+                    Stream_Prepare(Stream_Text);
+                    Merge(*CC_Parsers[Pos], Stream_Text, Pos2, StreamPos_Last);
+                    Fill(Stream_Text, StreamPos_Last, Text_ID, CC_Parsers[Pos]->Retrieve(Stream_Text, Pos2, Text_ID), true);
+                }
+            }
+    #endif //defined(MEDIAINFO_EIA608_YES)
 }
 
 //---------------------------------------------------------------------------
@@ -509,37 +530,19 @@
 {
     if (!Recorded_Date_Date.empty())
     {
+        Ztring Recorded_Date(Recorded_Date_Date);
         if (Recorded_Date_Time.size()>4)
         {
-            Recorded_Date_Time.resize(Recorded_Date_Time.size()-4); //Keep out milliseconds
-            Recorded_Date_Date+=_T(" ");
-            Recorded_Date_Date+=Recorded_Date_Time;
+            Recorded_Date+=__T(" ");
+            Recorded_Date+=Recorded_Date_Time;
         }
         if (Count_Get(Stream_General)==0)
             Stream_Prepare(Stream_General);
-        Fill(Stream_General, 0, General_Recorded_Date, Recorded_Date_Date);
+        Fill(Stream_General, 0, General_Recorded_Date, Recorded_Date, true);
     }
     if (!IsSub && Duration)
         Fill(Stream_General, 0, General_Duration, Duration);
 
-    //Delay
-    if (TimeCode_First!=(int64u)-1)
-    {
-        Fill(Stream_Video, 0, Video_Delay, TimeCode_First);
-        for (size_t Pos=0; Pos<Count_Get(Stream_Audio); Pos++)
-            Fill(Stream_Audio, Pos, Audio_Delay, TimeCode_First);
-    }
-
-    #if defined(MEDIAINFO_EIA608_YES)
-        for (size_t Pos=0; Pos<CC_Parsers.size(); Pos++)
-            if (CC_Parsers[Pos] && CC_Parsers[Pos]->Status[IsFilled])
-            {
-                CC_Parsers[Pos]->Finish();
-                Merge(*CC_Parsers[Pos]);
-                Fill(Stream_Text, StreamPos_Last, Text_ID, Pos);
-            }
-    #endif
-
     #ifdef MEDIAINFO_DVDIF_ANALYZE_YES
         if (Config->File_DvDif_Analysis_Get())
         {
@@ -552,6 +555,351 @@
 }
 
 //***************************************************************************
+// Buffer - File header
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_DvDif::FileHeader_Begin()
+{
+    //Must have enough buffer for having header
+    if (Buffer_Size<8)
+        return false; //Must wait for more data
+
+    //False positives detection: detect some headers from other files, DV parser is not smart enough
+    if (CC4(Buffer)==0x52494646  //RIFF
+     || CC4(Buffer+4)==0x66747970  //ftyp
+     || CC4(Buffer+4)==0x66726565  //free
+     || CC4(Buffer+4)==0x6D646174  //mdat
+     || CC4(Buffer+4)==0x6D6F6F76  //moov
+     || CC4(Buffer+4)==0x736B6970  //skip
+     || CC4(Buffer+4)==0x77696465  //wide
+     || CC4(Buffer)==0x060E2B34) //MXF begin
+    {
+        Finish();
+        return false;
+    }
+
+    //All should be OK...
+    return true;
+}
+
+//***************************************************************************
+// Buffer - Synchro
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_DvDif::Synchronize()
+{
+    if (AuxToAnalyze)
+    {
+        Accept();
+        return true;
+    }
+
+    while (Buffer_Offset+8*80<=Buffer_Size //8 blocks
+        && !((Buffer[Buffer_Offset+0*80]&0xE0)==0x00 && (Buffer[Buffer_Offset+0*80+1]&0xF0)==0x00 && Buffer[Buffer_Offset+0*80+2]==0x00   //Header 0
+          && (Buffer[Buffer_Offset+1*80]&0xE0)==0x20 && (Buffer[Buffer_Offset+1*80+1]&0xF0)==0x00 && Buffer[Buffer_Offset+1*80+2]==0x00   //Subcode 0
+          && (Buffer[Buffer_Offset+2*80]&0xE0)==0x20 && (Buffer[Buffer_Offset+2*80+1]&0xF0)==0x00 && Buffer[Buffer_Offset+2*80+2]==0x01   //Subcode 1
+          && (Buffer[Buffer_Offset+3*80]&0xE0)==0x40 && (Buffer[Buffer_Offset+3*80+1]&0xF0)==0x00 && Buffer[Buffer_Offset+3*80+2]==0x00   //VAUX 0
+          && (Buffer[Buffer_Offset+4*80]&0xE0)==0x40 && (Buffer[Buffer_Offset+4*80+1]&0xF0)==0x00 && Buffer[Buffer_Offset+4*80+2]==0x01   //VAUX 1
+          && (Buffer[Buffer_Offset+5*80]&0xE0)==0x40 && (Buffer[Buffer_Offset+5*80+1]&0xF0)==0x00 && Buffer[Buffer_Offset+5*80+2]==0x02   //VAUX 2
+          && (Buffer[Buffer_Offset+6*80]&0xE0)==0x60 && (Buffer[Buffer_Offset+6*80+1]&0xF0)==0x00 && Buffer[Buffer_Offset+6*80+2]==0x00   //Audio 0
+          && (Buffer[Buffer_Offset+7*80]&0xE0)==0x80 && (Buffer[Buffer_Offset+7*80+1]&0xF0)==0x00 && Buffer[Buffer_Offset+7*80+2]==0x00)) //Video 0
+            Buffer_Offset++;
+
+    if (Buffer_Offset+8*80>Buffer_Size)
+        return false;
+
+    if (!Status[IsAccepted])
+        Accept();
+
+    return true;
+}
+
+//---------------------------------------------------------------------------
+bool File_DvDif::Synched_Test()
+{
+    if (AuxToAnalyze)
+        return true;
+
+    //Must have enough buffer for having header
+    if (Buffer_Offset+80>Buffer_Size)
+        return false;
+
+    //NULL blocks
+    if (Buffer[Buffer_Offset  ]==0x00
+     && Buffer[Buffer_Offset+1]==0x00
+     && Buffer[Buffer_Offset+2]==0x00)
+        return true;
+
+    SCT =(Buffer[Buffer_Offset  ]&0xE0)>>5;
+    DBN = Buffer[Buffer_Offset+2];
+
+    //DIF Sequence Numbers
+    if (DSF_IsValid)
+    {
+        if (Dseq_Old!=Dseq)
+        {
+            if (Dseq==0
+             && !(!DSF && Dseq_Old==9)
+             && !( DSF && Dseq_Old==11))
+            {
+                if (!Status[IsAccepted])
+                    Trusted_IsNot("Wrong order");
+                else
+                    Synched_Test_Reset();
+            }
+            Dseq_Old=Dseq;
+        }
+    }
+
+    //DIF Block Numbers
+    if (SCT!=(int8u)-1)
+    {
+        int8u Number=DBN_Olds[SCT]+1;
+        switch (SCT)
+        {
+            case 0 : //Header
+                        if (SCT_Old!=4
+                         || DBN!=0)
+                        {
+                            if (!Status[IsAccepted])
+                                Trusted_IsNot("Wrong order");
+                            else
+                                Synched_Test_Reset();
+                        }
+                        break;
+            case 1 : //Subcode
+                        if (!((DBN==0 && SCT_Old==0) || (DBN!=0 && SCT_Old==1))
+                         || (Number!=DBN && !(Number==2 && DBN==0)))
+                        {
+                            if (!Status[IsAccepted])
+                                Trusted_IsNot("Wrong order");
+                            else
+                                Synched_Test_Reset();
+                        }
+                        break;
+            case 2 : //VAUX
+                        if (!((DBN==0 && SCT_Old==1) || (DBN!=0 && SCT_Old==2))
+                         || (Number!=DBN && !(Number==3 && DBN==0)))
+                        {
+                            if (!Status[IsAccepted])
+                                Trusted_IsNot("Wrong order");
+                            else
+                                Synched_Test_Reset();
+                        }
+                        break;
+            case 3 : //Audio
+                        if (!((DBN==0 && SCT_Old==2) || (DBN!=0 && SCT_Old==4))
+                         || (Number!=DBN && !(Number==9 && DBN==0)))
+                        {
+                            if (!Status[IsAccepted])
+                                Trusted_IsNot("Wrong order");
+                            else
+                                Synched_Test_Reset();
+                        }
+                        break;
+            case 4 : //Video
+                        if (!(SCT_Old==3 || SCT_Old==4)
+                         || (Number!=DBN && !(Number==135 && DBN==0)))
+                        {
+                            if (!Status[IsAccepted])
+                                Trusted_IsNot("Wrong order");
+                            else
+                                Synched_Test_Reset();
+                        }
+                        break;
+            default: ;
+        }
+
+        if (SCT!=(int8u)-1)
+        {
+            SCT_Old=SCT;
+            DBN_Olds[SCT]=DBN;
+        }
+    }
+
+    //We continue
+    return true;
+}
+
+//---------------------------------------------------------------------------
+void File_DvDif::Synched_Test_Reset()
+{
+    //Temp
+    SCT=(int8u)-1;
+    SCT_Old=4; //Video
+    DBN_Olds[0]=0;
+    DBN_Olds[1]=1; //SubCode
+    DBN_Olds[2]=2; //Vaux
+    DBN_Olds[3]=8; //Audio
+    DBN_Olds[4]=134; //Video
+    DBN_Olds[5]=0;
+    DBN_Olds[6]=0;
+    DBN_Olds[7]=0;
+
+    //Synch
+    Synched=false;
+}
+
+//---------------------------------------------------------------------------
+void File_DvDif::Synched_Init()
+{
+    //FrameInfo
+    if (FrameInfo.DTS==(int64u)-1)
+        FrameInfo.DTS=0; //No DTS in container
+    if (FrameInfo.PTS==(int64u)-1)
+        FrameInfo.PTS=0; //No PTS in container
+    if (Frame_Count_NotParsedIncluded==(int64u)-1)
+        Frame_Count_NotParsedIncluded=0; //No Frame_Count_NotParsedIncluded in the container
+}
+
+//***************************************************************************
+// Buffer - Demux
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_DEMUX
+bool File_DvDif::Demux_UnpacketizeContainer_Test()
+{
+    //Must have enough buffer for having header
+    if (Buffer_Offset+8*80>Buffer_Size)
+        return false;
+
+    if ((Buffer[Buffer_Offset]&0xE0)==0x00   //Speed up the parsing
+     && (CC3(Buffer+Buffer_Offset+0*80)&0xE0FCFF)==0x000400   //Header 0 (with FSC==false and FSP==true)
+     && (CC3(Buffer+Buffer_Offset+1*80)&0xE0F0FF)==0x200000   //Subcode 0
+     && (CC3(Buffer+Buffer_Offset+2*80)&0xE0F0FF)==0x200001   //Subcode 1
+     && (CC3(Buffer+Buffer_Offset+3*80)&0xE0F0FF)==0x400000   //VAUX 0
+     && (CC3(Buffer+Buffer_Offset+4*80)&0xE0F0FF)==0x400001   //VAUX 1
+     && (CC3(Buffer+Buffer_Offset+5*80)&0xE0F0FF)==0x400002   //VAUX 2
+     && (CC3(Buffer+Buffer_Offset+6*80)&0xE0F0FF)==0x600000   //Audio 0
+     && (CC3(Buffer+Buffer_Offset+7*80)&0xE0F0FF)==0x800000)  //Video 0
+    {
+        if (Demux_Offset==0)
+        {
+            Demux_Offset=Buffer_Offset+1;
+        }
+
+        while (Demux_Offset+8*80<=Buffer_Size //8 blocks
+            && !((Buffer[Demux_Offset]&0xE0)==0x00   //Speed up the parsing
+              && (CC3(Buffer+Demux_Offset+0*80)&0xE0FCFF)==0x000400   //Header 0 (with FSC==false and FSP==true)
+              && (CC3(Buffer+Demux_Offset+1*80)&0xE0F0FF)==0x200000   //Subcode 0
+              && (CC3(Buffer+Demux_Offset+2*80)&0xE0F0FF)==0x200001   //Subcode 1
+              && (CC3(Buffer+Demux_Offset+3*80)&0xE0F0FF)==0x400000   //VAUX 0
+              && (CC3(Buffer+Demux_Offset+4*80)&0xE0F0FF)==0x400001   //VAUX 1
+              && (CC3(Buffer+Demux_Offset+5*80)&0xE0F0FF)==0x400002   //VAUX 2
+              && (CC3(Buffer+Demux_Offset+6*80)&0xE0F0FF)==0x600000   //Audio 0
+              && (CC3(Buffer+Demux_Offset+7*80)&0xE0F0FF)==0x800000)) //Video 0
+                Demux_Offset++;
+
+        if (Demux_Offset+8*80>Buffer_Size && File_Offset+Buffer_Size!=File_Size)
+            return false; //No complete frame
+        if (Demux_Offset+8*80>Buffer_Size && File_Offset+Buffer_Size==File_Size)
+            Demux_Offset=(size_t)(File_Size-File_Offset); //Using the complete buffer (no next sync)
+
+        Demux_UnpacketizeContainer_Demux();
+    }
+
+    return true;
+}
+#endif //MEDIAINFO_DEMUX
+
+//***************************************************************************
+// Buffer - Global
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_DvDif::Read_Buffer_Unsynched()
+{
+    Synched_Test_Reset();
+        if (!IsSub && File_GoTo!=(int64u)-1 && (Frame_Count
+    #if MEDIAINFO_SEEK
+          || Duration_Detected
+    #endif //MEDIAINFO_SEEK
+          ) && !FSP_WasNotSet)
+    {
+        int64u BytesPerFrame=12000*(DSF?12:10);
+        if (FSC_WasSet)
+            BytesPerFrame*=2;
+        Frame_Count_NotParsedIncluded=File_GoTo/BytesPerFrame;
+        FrameInfo.PTS=FrameInfo.DTS=float64_int64s(Frame_Count_NotParsedIncluded/(DSF?25.000:(30.000*1000/1001))*1000000000);
+    }
+}
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_SEEK
+size_t File_DvDif::Read_Buffer_Seek (size_t Method, int64u Value, int64u /*ID*/)
+{
+    //Init
+    if (!Duration_Detected)
+    {
+        MediaInfo_Internal MI;
+        MI.Option(__T("File_KeepInfo"), __T("1"));
+        Ztring ParseSpeed_Save=MI.Option(__T("ParseSpeed_Get"), __T(""));
+        Ztring Demux_Save=MI.Option(__T("Demux_Get"), __T(""));
+        MI.Option(__T("ParseSpeed"), __T("0"));
+        MI.Option(__T("Demux"), Ztring());
+        size_t MiOpenResult=MI.Open(File_Name);
+        MI.Option(__T("ParseSpeed"), ParseSpeed_Save); //This is a global value, need to reset it. TODO: local value
+        MI.Option(__T("Demux"), Demux_Save); //This is a global value, need to reset it. TODO: local value
+        if (!MiOpenResult || MI.Get(Stream_General, 0, General_Format)!=__T("DV"))
+            return 0;
+
+        TotalFrames=Ztring(MI.Get(Stream_Video, 0, Video_FrameCount)).To_int64u();
+        int64u VideoBitRate=Ztring(MI.Get(Stream_Video, 0, Video_BitRate)).To_int64u();
+        if (VideoBitRate==0 || VideoBitRate>=50000000)
+        {
+            FSC_WasSet=true;
+            FSP_WasNotSet=true;
+        }
+        else if (VideoBitRate>=30000000)
+            FSC_WasSet=true;
+        float32 FrameRate=Ztring(MI.Get(Stream_Video, 0, Video_FrameRate)).To_float32();
+        if (FrameRate>=24.0 && FrameRate<26.0)
+            DSF=system=true;
+        if (FrameRate>=29.0 && FrameRate<31.0)
+            DSF=system=false;
+        Duration_Detected=true;
+    }
+
+    //Parsing
+    switch (Method)
+    {
+        case 0  :
+                    GoTo(Value);
+                    Open_Buffer_Unsynch();
+                    return 1;
+        case 1  :
+                    GoTo(File_Size*Value/10000);
+                    Open_Buffer_Unsynch();
+                    return 1;
+        case 2  :   //Timestamp
+                    {
+                        //We transform TimeStamp to a frame number
+                        Value=float64_int64s(((float64)Value)*(DSF?25.000:(30.000*1000/1001))/1000000000);
+                    }
+                    //No break;
+        case 3  :   //FrameNumber
+                    if (!FSP_WasNotSet)
+                    {
+                        int64u BytesPerFrame=12000*(DSF?12:10);
+                        if (FSC_WasSet)
+                            BytesPerFrame*=2;
+                        GoTo(BytesPerFrame*Value);
+                        Open_Buffer_Unsynch();
+                        Frame_Count_NotParsedIncluded=Value;
+                        FrameInfo.PTS=FrameInfo.DTS=float64_int64s(Frame_Count_NotParsedIncluded/(DSF?25.000:(30.000*1000/1001))*1000000000);
+                        return 1;
+                    }
+                    else
+                        return (size_t)-1; //Not supported
+        default :   return (size_t)-1; //Not supported
+    }
+}
+#endif //MEDIAINFO_SEEK
+
+//***************************************************************************
 // Buffer
 //***************************************************************************
 
@@ -586,7 +934,7 @@
     //Parsing
     BS_Begin();
     //0
-    Get_S1 (3, SCT,                                             "SCT - Section Type"); Param_Info(Dv_sct[SCT]);
+    Get_S1 (3, SCT,                                             "SCT - Section Type"); Param_Info1(Dv_sct[SCT]);
     Skip_SB(                                                    "Res - Reserved");
     Skip_S1(4,                                                  "Arb - Arbitrary bits");
     //1
@@ -626,7 +974,7 @@
         Header_Fill_Size(80);
         return;
     }
-    
+
     //Parsing
     SCT =(Buffer[Buffer_Offset  ]&0xE0)>>5;
     Dseq=(Buffer[Buffer_Offset+1]&0xF0)>>4;
@@ -643,6 +991,12 @@
 //---------------------------------------------------------------------------
 void File_DvDif::Data_Parse()
 {
+    if (Element_Code==(int64u)-1)
+    {
+        Skip_XX(Element_Size,                                   "Junk");
+        return;
+    }
+
     //Config
     if (SCT!=(int8u)-1)
     {
@@ -659,67 +1013,7 @@
         return;
     }
 
-    if (Element_Code==(int64u)-1)
-    {
-        Skip_XX(Element_Size,                                   "Junk");
-        return;
-    }
-
-    //Integrity
-    if (!Status[IsAccepted])
-    {
-        //DIF Sequence Numbers
-        if (DSF_IsValid)
-        {
-            if (Dseq_Old!=Dseq)
-            {
-                if (Dseq==0
-                 && !(!DSF && Dseq_Old==9)
-                 && !( DSF && Dseq_Old==11))
-                    Trusted_IsNot("Wrong order");
-                Dseq_Old=Dseq;
-            }
-        }
-
-        //DIF Block Numbers
-        if (Element_Code>=8)
-            return;    
-        int8u Number=DBN_Olds[(size_t)Element_Code]+1;
-        switch (SCT)
-        {
-            case 0 : //Header
-                        if (SCT_Old!=4
-                         || DBN!=0)
-                            Trusted_IsNot("Wrong order");
-                        break;
-            case 1 : //Subcode
-                        if (!((DBN==0 && SCT_Old==0) || (DBN!=0 && SCT_Old==1))
-                         || Number!=DBN && !(Number==2 && DBN==0))
-                            Trusted_IsNot("Wrong order");
-                        break;
-            case 2 : //VAUX
-                        if (!((DBN==0 && SCT_Old==1) || (DBN!=0 && SCT_Old==2))
-                         || Number!=DBN && !(Number==3 && DBN==0))
-                            Trusted_IsNot("Wrong order");
-                        break;
-            case 3 : //Audio
-                        if (!((DBN==0 && SCT_Old==2) || (DBN!=0 && SCT_Old==4))
-                         || Number!=DBN && !(Number==9 && DBN==0))
-                            Trusted_IsNot("Wrong order");
-                        break;
-            case 4 : //Video
-                        if (!(SCT_Old==3 || SCT_Old==4)
-                         || Number!=DBN && !(Number==135 && DBN==0))
-                            Trusted_IsNot("Wrong order");
-                        break;
-            default: ;
-        }
-        SCT_Old=SCT;
-        if (SCT<8)
-            DBN_Olds[SCT]=DBN;
-    }
-
-    Element_Info(DBN);
+    Element_Info1(DBN);
 
     switch (SCT)
     {
@@ -769,6 +1063,13 @@
     BS_End();
     Skip_XX(72,                                                 "Reserved"); //Should be filled with 0xFF
 
+    if (Config->File_DvDif_IgnoreTransmittingFlags_Get())
+    {
+        TF1=false;
+        TF2=false;
+        TF3=false;
+    }
+
     FILLING_BEGIN();
         DSF_IsValid=true;
         Dseq_Old=DSF?11:9;
@@ -781,8 +1082,6 @@
             TF2=false;
             TF3=false;
         }
-
-        FrameCount++;
     FILLING_END();
 }
 #else //MEDIAINFO_TRACE
@@ -799,6 +1098,13 @@
     TF2=(Buffer[Buffer_Offset+3]&0x80)?true:false;
     TF3=(Buffer[Buffer_Offset+4]&0x80)?true:false;
 
+    if (Config->File_DvDif_IgnoreTransmittingFlags_Get())
+    {
+        TF1=false;
+        TF2=false;
+        TF3=false;
+    }
+
     FILLING_BEGIN();
         DSF_IsValid=true;
         Dseq_Old=DSF?11:9;
@@ -811,8 +1117,6 @@
             TF2=false;
             TF3=false;
         }
-
-        FrameCount++;
     FILLING_END();
 }
 #endif //MEDIAINFO_TRACE
@@ -846,14 +1150,19 @@
 //---------------------------------------------------------------------------
 void File_DvDif::Subcode_Ssyb(int8u syb_num)
 {
-    Element_Begin("ssyb");
+    Element_Begin1("ssyb");
 
     //Parsing
     BS_Begin();
     //ID0-ID1
     Skip_SB(                                                    "FR - Identification of half of channel"); //1=first half, 0=second
     if (syb_num==0)
-        Skip_S1( 3,                                             "AP3 - Subcode application ID");
+    {
+        if (FSC==false)
+            Get_S1 ( 3, ssyb_AP3,                               "AP3 - Subcode application ID");
+        else
+            Skip_S1( 3,                                         "AP3 - Subcode application ID");
+    }
     else if (DBN==1 && syb_num==5)
         Skip_S1(3,                                              "APT - track application ID");
     else
@@ -866,7 +1175,7 @@
     //PC0-PC4
     Element();
 
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
@@ -932,7 +1241,7 @@
                 if (!IsSub)
                     Fill(Stream_General, 0, General_Format, "DV");
             }
-            if (!Status[IsFilled] && FrameCount>=Frame_Count_Valid)
+            if (!Status[IsFilled] && Frame_Count>=Frame_Count_Valid)
                 #ifdef MEDIAINFO_DVDIF_ANALYZE_YES
                 {
                     if (Config->File_DvDif_Analysis_Get())
@@ -950,7 +1259,7 @@
 //---------------------------------------------------------------------------
 void File_DvDif::Element()
 {
-    Element_Begin();
+    Element_Begin0();
     int8u PackType;
     if (AuxToAnalyze==0x00)
         Get_B1 (PackType,                                       "Pack Type");
@@ -960,6 +1269,7 @@
     switch(PackType)
     {
         case 0x13 : timecode(); break;
+        case 0x14 : binary_group(); break;
         case 0x50 : audio_source(); break;
         case 0x51 : audio_sourcecontrol(); break;
         case 0x52 : audio_recdate(); break;
@@ -976,10 +1286,39 @@
         default   : Element_Name(Ztring().From_Number(PackType, 16));
                     Skip_B4(                                    "Unknown");
     }
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
+void File_DvDif::binary_group()
+{
+    Element_Name("binary_group");
+
+    if (Buffer[Buffer_Offset+(size_t)Element_Offset  ]==0xFF
+     && Buffer[Buffer_Offset+(size_t)Element_Offset+1]==0xFF
+     && Buffer[Buffer_Offset+(size_t)Element_Offset+2]==0xFF
+     && Buffer[Buffer_Offset+(size_t)Element_Offset+3]==0xFF
+    )
+    {
+        Skip_XX(4,                                              "All one");
+        return;
+    }
+
+    //Parsing
+    BS_Begin();
+    Skip_S1(4,                                                  "Binary group 2");
+    Skip_S1(4,                                                  "Binary group 1");
+    Skip_S1(4,                                                  "Binary group 4");
+    Skip_S1(4,                                                  "Binary group 3");
+    Skip_S1(4,                                                  "Binary group 6");
+    Skip_S1(4,                                                  "Binary group 5");
+    Skip_S1(4,                                                  "Binary group 8");
+    Skip_S1(4,                                                  "Binary group 7");
+    BS_End();
+}
+
+
+//---------------------------------------------------------------------------
 void File_DvDif::timecode()
 {
     Element_Name("timecode");
@@ -1045,7 +1384,7 @@
     MilliSeconds+=Temp*10*60*60*1000;
     Get_S1 (4, Temp,                                            "Hours (Units)");
     MilliSeconds+=Temp*60*60*1000;
-    Element_Info(Ztring().Duration_From_Milliseconds(MilliSeconds+((DSF_IsValid && Frames!=45)?((int64u)(Frames/(DSF?25.000:29.970)*1000)):0)));
+    Element_Info1(Ztring().Duration_From_Milliseconds(MilliSeconds+((DSF_IsValid && Frames!=45)?((int64u)(Frames/(DSF?25.000:29.970)*1000)):0)));
     BS_End();
 
     if (TimeCode_First==(int64u)-1 && MilliSeconds!=167185000) //if all bits are set to 1, this is not a valid timestamp
@@ -1075,24 +1414,24 @@
     Skip_S1(6,                                                  "AF - Samples in this frame");
 
     //PC2
-    Info_S1(1, StereoMode,                                      "SM - Stereo mode"); Param_Info(Dv_StereoMode[StereoMode]);
-    Info_S1(2, ChannelsPerBlock,                                "CHN - Channels per block"); Param_Info(Dv_ChannelsPerBlock[ChannelsPerBlock]);
-    Info_S1(1, Pair,                                            "PA - Pair"); Param_Info(Dv_Pair[Pair]);
+    Info_S1(1, StereoMode,                                      "SM - Stereo mode"); Param_Info1(Dv_StereoMode[StereoMode]);
+    Info_S1(2, ChannelsPerBlock,                                "CHN - Channels per block"); Param_Info1(Dv_ChannelsPerBlock[ChannelsPerBlock]);
+    Info_S1(1, Pair,                                            "PA - Pair"); Param_Info1(Dv_Pair[Pair]);
     Skip_S1(4,                                                  "AM - Audio mode");
 
     Skip_SB(                                                    "Reserved");
     Skip_SB(                                                    "ML - Multi-language");
     Skip_SB(                                                    "50/60");
-    Get_S1 (5, audio_source_stype,                              "STYPE - audio blocks per video frame"); Param_Info(audio_source_stype==0?"2 channels":(audio_source_stype==2?"4 channels":"Unknown")); //0=25 Mbps, 2=50 Mbps
+    Get_S1 (5, audio_source_stype,                              "STYPE - audio blocks per video frame"); Param_Info1(audio_source_stype==0?"2 channels":(audio_source_stype==2?"4 channels":"Unknown")); //0=25 Mbps, 2=50 Mbps
 
     Skip_SB(                                                    "EF - Emphasis off");
     Skip_SB(                                                    "TC - Time constant of emphasis");
-    Get_S1 (3, SamplingRate,                                    "SMP - Sampling rate"); Param_Info(Dv_Audio_SamplingRate[SamplingRate]);
-    Get_S1 (3, Resolution,                                      "QU - Resolution"); Param_Info(Dv_Audio_Resolution[Resolution]);
+    Get_S1 (3, SamplingRate,                                    "SMP - Sampling rate"); Param_Info1(Dv_Audio_SamplingRate[SamplingRate]);
+    Get_S1 (3, Resolution,                                      "QU - Resolution"); Param_Info1(Dv_Audio_BitDepth[Resolution]);
     BS_End();
 
     FILLING_BEGIN();
-        if (!IgnoreAudio && (FrameCount==1 || AuxToAnalyze)) //Only the first time
+        if (!IgnoreAudio && (Frame_Count==1 || AuxToAnalyze)) //Only the first time
         {
             //Calculating the count of audio
             size_t Audio_Count=1;
@@ -1109,13 +1448,13 @@
                 if (Streams_Audio[Pos]==NULL)
                     Streams_Audio[Pos]=new stream;
                 Streams_Audio[Pos]->Infos["ID"].From_Number(Pos);
-                Streams_Audio[Pos]->Infos["Format"]=_T("PCM");
-                Streams_Audio[Pos]->Infos["Codec"]=_T("PCM");
-                Streams_Audio[Pos]->Infos["BitRate_Mode"]=_T("CBR");
+                Streams_Audio[Pos]->Infos["Format"]=__T("PCM");
+                Streams_Audio[Pos]->Infos["Codec"]=__T("PCM");
+                Streams_Audio[Pos]->Infos["BitRate_Mode"]=__T("CBR");
                 Streams_Audio[Pos]->Infos["Channel(s)"].From_Number(audio_source_stype==3?1:2);
                 Streams_Audio[Pos]->Infos["SamplingRate"].From_Number(Dv_Audio_SamplingRate[SamplingRate]);
-                Streams_Audio[Pos]->Infos["Resolution"].From_Number(Dv_Audio_Resolution[Resolution]);
-                Streams_Audio[Pos]->Infos["BitRate"].From_Number((audio_source_stype==3?1:2)*Dv_Audio_SamplingRate[SamplingRate]*Dv_Audio_Resolution[Resolution]);
+                Streams_Audio[Pos]->Infos["BitDepth"].From_Number(Dv_Audio_BitDepth[Resolution]);
+                Streams_Audio[Pos]->Infos["BitRate"].From_Number((audio_source_stype==3?1:2)*Dv_Audio_SamplingRate[SamplingRate]*Dv_Audio_BitDepth[Resolution]);
             }
         }
     FILLING_END();
@@ -1135,10 +1474,10 @@
     BS_Begin();
 
     //PC1
-    Info_S1(2, CopyGenerationManagementSystem,                  "CGMS - Copy generation management system"); Param_Info(Dv_CopyGenerationManagementSystem[CopyGenerationManagementSystem]);
-    Info_S1(2, InputType,                                       "ISR - Input type"); Param_Info(Dv_InputType[InputType]);
-    Info_S1(2, CompressionTimes,                                "CMP - Compression times"); Param_Info(Dv_CompressionTimes[CompressionTimes]);
-    Info_S1(2, Emphasis,                                        "EFC - Emphasis"); Param_Info(Dv_Emphasis[Emphasis]);
+    Info_S1(2, CopyGenerationManagementSystem,                  "CGMS - Copy generation management system"); Param_Info1(Dv_CopyGenerationManagementSystem[CopyGenerationManagementSystem]);
+    Info_S1(2, InputType,                                       "ISR - Input type"); Param_Info1(Dv_InputType[InputType]);
+    Info_S1(2, CompressionTimes,                                "CMP - Compression times"); Param_Info1(Dv_CompressionTimes[CompressionTimes]);
+    Info_S1(2, Emphasis,                                        "EFC - Emphasis"); Param_Info1(Dv_Emphasis[Emphasis]);
 
     //PC2
     Skip_SB(                                                    "REC S Non-recording start point");
@@ -1221,10 +1560,16 @@
     Skip_B1(                                                    "TUN/VISC");
 
     FILLING_BEGIN();
-        if (!Status[IsAccepted] && (FrameCount==1 || AuxToAnalyze) && Count_Get(Stream_Video)==0) //Only the first time
+        if (FSC==false && FSP==true && Dseq==0)
         {
-            if (!system)
-                Frame_Count_Valid=Frame_Count_Valid*10/12; //NTSC is only 10 DIF sequence per frame
+            Frame_Count++;
+            if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+                Frame_Count_NotParsedIncluded++;
+            FrameInfo.DUR=float64_int64s(((float64)1000000000)/(DSF?25.000:29.970));
+            if (FrameInfo.DTS!=(int64u)-1)
+                FrameInfo.DTS+=FrameInfo.DUR;
+            if (FrameInfo.PTS!=(int64u)-1)
+                FrameInfo.PTS+=FrameInfo.DUR;
         }
     FILLING_END();
 }
@@ -1242,7 +1587,7 @@
 
     BS_Begin();
     //PC1
-    Info_S1(2, CopyGenerationManagementSystem,                  "CGMS - Copy generation management system"); Param_Info(Dv_CopyGenerationManagementSystem[CopyGenerationManagementSystem]);
+    Info_S1(2, CopyGenerationManagementSystem,                  "CGMS - Copy generation management system"); Param_Info1(Dv_CopyGenerationManagementSystem[CopyGenerationManagementSystem]);
     Skip_S1(2,                                                  "ISR");
     Skip_S1(2,                                                  "CMP");
     Skip_S2(2,                                                  "SS");
@@ -1252,11 +1597,11 @@
     Skip_SB(                                                    "Reserved");
     Skip_S1(2,                                                  "REC M");
     Skip_SB(                                                    "Reserved");
-    Get_S1 (3, aspect,                                          "DISP - Aspect ratio"); Param_Info(Dv_Disp[aspect]);
+    Get_S1 (3, aspect,                                          "DISP - Aspect ratio"); Param_Info1(Dv_Disp[aspect]);
 
     //PC3
-    Skip_SB(                                                    "FF - Frame/Field"); //1=Frame, 0=Field
-    Skip_SB(                                                    "FS - First/second field"); //0=Field 2, 1=Field 1, if FF=0 x is output twice, if FF=1, Field x fisrst, other second
+    Get_SB (   FieldOrder_FF,                                   "FF - Frame/Field"); //1=Frame, 0=Field
+    Get_SB (   FieldOrder_FS,                                   "FS - First/second field"); //0=Field 2, 1=Field 1, if FF=0 x is output twice, if FF=1, Field x fisrst, other second
     Skip_SB(                                                    "FC - Frame Change"); //0=Same picture as before
     Get_SB (   Interlaced,                                      "IL - Interlaced"); //1=Interlaced
     Skip_SB(                                                    "SF");
@@ -1315,8 +1660,11 @@
         if (CC_Parsers.empty())
         {
             CC_Parsers.resize(2);
-            for (size_t Pos=0; Pos<2; Pos++)
+            for (int8u Pos=0; Pos<2; Pos++)
+            {
                 CC_Parsers[Pos]=new File_Eia608();
+                ((File_Eia608*)CC_Parsers[Pos])->cc_type=Pos;
+            }
             Frame_Count_Valid*=10; //More frames
         }
         if (Dseq==0) //CC are duplicated for each DIF sequence!
@@ -1340,23 +1688,24 @@
 
     //Parsing
     BS_Begin();
+    int8u ae_mode, wb_mode, white_balance, fcm;
     Mark_1_NoTrustError();
     Mark_1_NoTrustError();
     Skip_S1(6,                                                  "iris");
-    Info_S1(4, ae_mode,                                         "ae mode"); Param_Info(Dv_consumer_camera_1_ae_mode[ae_mode]);
+    Get_S1 (4, ae_mode,                                         "ae mode"); Param_Info1(Dv_consumer_camera_1_ae_mode[ae_mode]);
     Skip_S1(4,                                                  "agc(Automatic Gain Control)");
-    Info_S1(3, wb_mode,                                         "wb mode (white balance mode)"); Param_Info(Dv_consumer_camera_1_wb_mode[wb_mode]);
-    Info_S1(5, white_balance,                                   "white balance"); Param_Info(Dv_consumer_camera_1_white_balance(white_balance));
-    Info_S1(1, fcm,                                             "fcm (Focus mode)"); Param_Info(Dv_consumer_camera_1_fcm[fcm]);
+    Get_S1 (3, wb_mode,                                         "wb mode (white balance mode)"); Param_Info1(Dv_consumer_camera_1_wb_mode[wb_mode]);
+    Get_S1 (5, white_balance,                                   "white balance"); Param_Info1(Dv_consumer_camera_1_white_balance(white_balance));
+    Get_S1 (1, fcm,                                             "fcm (Focus mode)"); Param_Info1(Dv_consumer_camera_1_fcm[fcm]);
     Skip_S1(7,                                                  "focus (focal point)");
     BS_End();
 
     if (Encoded_Library_Settings.empty())
     {
-        if (ae_mode<0x0F) Encoded_Library_Settings+=_T("ae mode=")+Ztring(Dv_consumer_camera_1_ae_mode[ae_mode])+_T(" / ");
-        if (wb_mode<0x08) Encoded_Library_Settings+=_T("wb mode=")+Ztring(Dv_consumer_camera_1_wb_mode[wb_mode])+_T(" / ");
-        if (wb_mode<0x1F) Encoded_Library_Settings+=_T("white balance=")+Ztring(Dv_consumer_camera_1_white_balance(white_balance))+_T(" / ");
-                          Encoded_Library_Settings+=_T("fcm=")+Ztring(Dv_consumer_camera_1_fcm[fcm]);
+        if (ae_mode<0x0F) Encoded_Library_Settings+=__T("ae mode=")+Ztring(Dv_consumer_camera_1_ae_mode[ae_mode])+__T(" / ");
+        if (wb_mode<0x08) Encoded_Library_Settings+=__T("wb mode=")+Ztring(Dv_consumer_camera_1_wb_mode[wb_mode])+__T(" / ");
+        if (wb_mode<0x1F) Encoded_Library_Settings+=__T("white balance=")+Ztring(Dv_consumer_camera_1_white_balance(white_balance))+__T(" / ");
+                          Encoded_Library_Settings+=__T("fcm=")+Ztring(Dv_consumer_camera_1_fcm[fcm]);
     }
 }
 
@@ -1377,7 +1726,7 @@
     Skip_S1(8,                                                  "focal length");
     Skip_S1(1,                                                  "zen");
     Info_S1(3, zoom_U,                                          "units of e-zoom");
-    Info_S1(4, zoom_D,                                          "1/10 of e-zoom"); if (zoom_D!=0xF) Param_Info(_T("zoom=")+Ztring().From_Number(zoom_U+((float32)zoom_U)/10, 2));
+    Info_S1(4, zoom_D,                                          "1/10 of e-zoom"); /*if (zoom_D!=0xF)*/ Param_Info1(__T("zoom=")+Ztring().From_Number(zoom_U+((float32)zoom_U)/10, 2));
     BS_End();
 }
 
@@ -1412,7 +1761,7 @@
     Get_S1 (4, Temp,                                            "Year (Units)");
     Year+=Temp;
     Year+=Year<25?2000:1900;
-    Element_Info(Ztring::ToZtring(Year)+_T("-")+Ztring::ToZtring(Month)+_T("-")+Ztring::ToZtring(Day));
+    Element_Info1(Ztring::ToZtring(Year)+__T("-")+Ztring::ToZtring(Month)+__T("-")+Ztring::ToZtring(Day));
 
     BS_End();
 
@@ -1420,13 +1769,13 @@
         return Ztring(); //If all bits are set to 1, this is invalid
     Ztring MonthString;
     if (Month<10)
-        MonthString=_T("0");
+        MonthString=__T("0");
     MonthString+=Ztring::ToZtring(Month);
     Ztring DayString;
     if (Day<10)
-        DayString=_T("0");
+        DayString=__T("0");
     DayString+=Ztring::ToZtring(Day);
-    return Ztring::ToZtring(Year)+_T("-")+MonthString+_T("-")+DayString;
+    return Ztring::ToZtring(Year)+__T("-")+MonthString+__T("-")+DayString;
 }
 
 //---------------------------------------------------------------------------
@@ -1477,7 +1826,7 @@
     Time+=Temp*10*60*60*1000;
     Get_S1 (4, Temp,                                            "Hours (Units)");
     Time+=Temp*60*60*1000;
-    Element_Info(Ztring().Duration_From_Milliseconds(Time));
+    Element_Info1(Ztring().Duration_From_Milliseconds(Time));
 
     BS_End();

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_DvDif.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_DvDif.h Changed

@@ -1,17 +1,17 @@
 // File_DvDif - Info for DVD objects (IFO) files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -41,7 +41,7 @@
 {
 public :
     //In
-    size_t Frame_Count_Valid;
+    int64u Frame_Count_Valid;
     int8u  AuxToAnalyze; //Only Aux must be parsed
     bool   IgnoreAudio;
 
@@ -57,13 +57,25 @@
     //Buffer - File header
     bool FileHeader_Begin();
 
+    //Buffer - Synchro
+    bool Synchronize();
+    bool Synched_Test();
+    void Synched_Test_Reset();
+    void Synched_Init();
+
+    //Buffer - Demux
+    #if MEDIAINFO_DEMUX
+    bool Demux_UnpacketizeContainer_Test();
+    #endif //MEDIAINFO_DEMUX
+
     //Buffer - Global
     #ifdef MEDIAINFO_DVDIF_ANALYZE_YES
     void Read_Buffer_Continue();
     #endif //MEDIAINFO_DVDIF_ANALYZE_YES
-
-    //Buffer - Synchro
-    bool Synchronize();
+    void Read_Buffer_Unsynched();
+    #if MEDIAINFO_SEEK
+    size_t Read_Buffer_Seek (size_t Method, int64u Value, int64u ID);
+    #endif //MEDIAINFO_SEEK
 
     //Buffer
     void Header_Parse();
@@ -80,6 +92,7 @@
     //Elements - Sub
     void Element();
     void timecode();
+    void binary_group();
     void audio_source();
     void audio_sourcecontrol();
     void audio_recdate();
@@ -110,7 +123,6 @@
     Ztring Recorded_Date_Date;
     Ztring Recorded_Date_Time;
     Ztring Encoded_Library_Settings;
-    size_t FrameCount;
     int64u Duration;
     int64u TimeCode_First;
     int64u FrameSize_Theory; //The size of a frame
@@ -131,6 +143,9 @@
     bool   TF2;
     bool   TF3;
     int8u  aspect;
+    int8u  ssyb_AP3;
+    bool   FieldOrder_FF;
+    bool   FieldOrder_FS;
     bool   Interlaced;
     bool   system;
     bool   FSC_WasSet;
@@ -138,6 +153,11 @@
     bool   video_sourcecontrol_IsParsed;
     bool   audio_locked;
 
+    #if MEDIAINFO_SEEK
+        bool            Duration_Detected;
+        int64u          TotalFrames;
+    #endif //MEDIAINFO_SEEK
+
     #ifdef MEDIAINFO_DVDIF_ANALYZE_YES
     bool Analyze_Activated;
     bool video_source_Detected;

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_DvDif_Analysis.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_DvDif_Analysis.cpp Changed

@@ -1,31 +1,35 @@
 // File_DvDif - Info for DV-DIF files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_DVDIF_YES) && defined(MEDIAINFO_DVDIF_ANALYZE_YES)
 //---------------------------------------------------------------------------
 
@@ -49,8 +53,8 @@
         if (Config->File_DvDif_Analysis_Get())
             Analyze_Activated=true;
         else
-            return;    
-    }       
+            return;
+    }
 
     //Errors stats
     while (Buffer_Offset+80<=Buffer_Size)
@@ -383,10 +387,10 @@
                     //Audio errors
                     if (Buffer[Buffer_Offset+8]==0x80)
                     {
-                        if (QU==0 && Buffer[Buffer_Offset+ 9]==0x00  //16-bit 0x8000
-                         || QU==1 && Buffer[Buffer_Offset+10]==0x00  //12-bit 0x800
-                         || QU==(int8u)-1 && (Buffer[Buffer_Offset+ 9]==0x00 && Buffer[Buffer_Offset+10]==0x80 && Buffer[Buffer_Offset+11]==0x00
-                                           || Buffer[Buffer_Offset+ 9]==0x80 && Buffer[Buffer_Offset+10]==0x00)) //In case of QU is not already detected
+                        if ((QU==0 && Buffer[Buffer_Offset+ 9]==0x00)  //16-bit 0x8000
+                         || (QU==1 && Buffer[Buffer_Offset+10]==0x00)  //12-bit 0x800
+                         || (QU==(int8u)-1 && ((Buffer[Buffer_Offset+ 9]==0x00 && Buffer[Buffer_Offset+10]==0x80 && Buffer[Buffer_Offset+11]==0x00)
+                                            || (Buffer[Buffer_Offset+ 9]==0x80 && Buffer[Buffer_Offset+10]==0x00)))) //In case of QU is not already detected
                         {
                             if (Audio_Errors.empty())
                                 Audio_Errors.resize(16);
@@ -464,8 +468,8 @@
         if (Config->File_DvDif_Analysis_Get())
             Analyze_Activated=true;
         else
-            return;    
-    }       
+            return;
+    }
 
     bool Errors_AreDetected=false;
     bool Infos_AreDetected=false;
@@ -499,14 +503,14 @@
         //Frame number
         Ztring Frame_Number_Padded=Ztring::ToZtring(Speed_FrameCount-1);
         if (Frame_Number_Padded.size()<8)
-            Frame_Number_Padded.insert(Frame_Number_Padded.begin(), 8-Frame_Number_Padded.size(), _T(' '));
+            Frame_Number_Padded.insert(0, 8-Frame_Number_Padded.size(), __T(' '));
         Errors_Stats_Line+=Frame_Number_Padded;
-        Errors_Stats_Line+=_T('\t');
+        Errors_Stats_Line+=__T('\t');
 
         //Time Offset
         float64 Time_Offset=(Speed_FrameCount-1)*1000/FrameRate;
         Errors_Stats_Line+=Ztring().Duration_From_Milliseconds((int64u)Time_Offset);
-        Errors_Stats_Line+=_T('\t');
+        Errors_Stats_Line+=__T('\t');
 
         //Timecode
         if (Speed_TimeCode_Current.IsValid)
@@ -515,17 +519,17 @@
             Speed_TimeCodeZ_Current.clear();
             Speed_TimeCodeZ_Current.reserve(12);
             Speed_TimeCodeZ_Current.reserve(11);
-            Speed_TimeCodeZ_Current+=_T('0')+Speed_TimeCode_Current.Time.Hours  /10;
-            Speed_TimeCodeZ_Current+=_T('0')+Speed_TimeCode_Current.Time.Hours  %10;
-            Speed_TimeCodeZ_Current+=_T(':');
-            Speed_TimeCodeZ_Current+=_T('0')+Speed_TimeCode_Current.Time.Minutes/10;
-            Speed_TimeCodeZ_Current+=_T('0')+Speed_TimeCode_Current.Time.Minutes%10;
-            Speed_TimeCodeZ_Current+=_T(':');
-            Speed_TimeCodeZ_Current+=_T('0')+Speed_TimeCode_Current.Time.Seconds/10;
-            Speed_TimeCodeZ_Current+=_T('0')+Speed_TimeCode_Current.Time.Seconds%10;
-            Speed_TimeCodeZ_Current+=(!DSF && Speed_TimeCode_Current.Time.DropFrame)?_T(';'):_T(':');
-            Speed_TimeCodeZ_Current+=_T('0')+Speed_TimeCode_Current.Time.Frames /10;
-            Speed_TimeCodeZ_Current+=_T('0')+Speed_TimeCode_Current.Time.Frames %10;
+            Speed_TimeCodeZ_Current+=__T('0')+Speed_TimeCode_Current.Time.Hours  /10;
+            Speed_TimeCodeZ_Current+=__T('0')+Speed_TimeCode_Current.Time.Hours  %10;
+            Speed_TimeCodeZ_Current+=__T(':');
+            Speed_TimeCodeZ_Current+=__T('0')+Speed_TimeCode_Current.Time.Minutes/10;
+            Speed_TimeCodeZ_Current+=__T('0')+Speed_TimeCode_Current.Time.Minutes%10;
+            Speed_TimeCodeZ_Current+=__T(':');
+            Speed_TimeCodeZ_Current+=__T('0')+Speed_TimeCode_Current.Time.Seconds/10;
+            Speed_TimeCodeZ_Current+=__T('0')+Speed_TimeCode_Current.Time.Seconds%10;
+            Speed_TimeCodeZ_Current+=(!DSF && Speed_TimeCode_Current.Time.DropFrame)?__T(';'):__T(':');
+            Speed_TimeCodeZ_Current+=__T('0')+Speed_TimeCode_Current.Time.Frames /10;
+            Speed_TimeCodeZ_Current+=__T('0')+Speed_TimeCode_Current.Time.Frames %10;
             Errors_Stats_Line+=Speed_TimeCodeZ_Current;
             if (Speed_TimeCodeZ.empty())
             {
@@ -552,14 +556,14 @@
         }
         else
         {
-            Errors_Stats_Line+=_T("XX:XX:XX:XX");
+            Errors_Stats_Line+=__T("XX:XX:XX:XX");
             #if MEDIAINFO_EVENTS
                 Event.TimeCode|=0x7FFFF<<8;
                 //Event.TimeCode|=Speed_TimeCode_Current.Time.DropFrame<<7;
                 Event.TimeCode|=0x3F;
             #endif //MEDIAINFO_EVENTS
         }
-        Errors_Stats_Line+=_T('\t');
+        Errors_Stats_Line+=__T('\t');
 
         //Timecode order coherency
         if (!Speed_TimeCode_IsValid && Speed_TimeCode_Current.IsValid
@@ -575,14 +579,13 @@
          && Speed_TimeCode_Current.Time.Minutes==Speed_TimeCode_Last.Time.Minutes
          && Speed_TimeCode_Current.Time.Hours  ==Speed_TimeCode_Last.Time.Hours)
         {
-            Errors_Stats_Line+=_T('R');
+            Errors_Stats_Line+=__T('R');
             #if MEDIAINFO_EVENTS
                 Event.TimeCode|=1<<31;
             #endif //MEDIAINFO_EVENTS
             if (Speed_TimeCode_Current.Time.Hours
              || Speed_TimeCode_Current.Time.Seconds
-             || Speed_TimeCode_Current.Time.Minutes
-             || Speed_TimeCode_Current.Time.Hours)
+             || Speed_TimeCode_Current.Time.Minutes)
                 Errors_AreDetected=true;
         }
         else if (Speed_TimeCode_IsValid && Speed_TimeCode_Current.IsValid && Speed_TimeCode_Current_Theory.IsValid
@@ -598,7 +601,7 @@
             Speed_TimeCodeZ[Speed_TimeCodeZ_Pos-1].Last.FramePos=Speed_FrameCount-1;
             Speed_TimeCodeZ[Speed_TimeCodeZ_Pos-1].Last.TimeCode=Speed_TimeCodeZ_Last;
 
-            Errors_Stats_Line+=_T('N');
+            Errors_Stats_Line+=__T('N');
             #if MEDIAINFO_EVENTS
                 Event.TimeCode|=1<<30;
             #endif //MEDIAINFO_EVENTS
@@ -607,8 +610,8 @@
             Errors_AreDetected=true;
         }
         else
-            Errors_Stats_Line+=_T(' ');
-        Errors_Stats_Line+=_T('\t');
+            Errors_Stats_Line+=__T(' ');
+        Errors_Stats_Line+=__T('\t');
 
         //RecDate/RecTime
         if (Speed_RecDate_Current.IsValid)
@@ -616,15 +619,15 @@
             Speed_RecDateZ_Last=Speed_RecDateZ_Current;
             Speed_RecDateZ_Current.clear();
             Speed_RecDateZ_Current.reserve(10);
-            Speed_RecDateZ_Current+=Speed_RecDate_Current.Years<75?_T("20"):_T("19");
-            Speed_RecDateZ_Current+=_T('0')+Speed_RecDate_Current.Years  /10;
-            Speed_RecDateZ_Current+=_T('0')+Speed_RecDate_Current.Years  %10;
-            Speed_RecDateZ_Current+=_T('-');
-            Speed_RecDateZ_Current+=_T('0')+Speed_RecDate_Current.Months /10;
-            Speed_RecDateZ_Current+=_T('0')+Speed_RecDate_Current.Months %10;
-            Speed_RecDateZ_Current+=_T('-');
-            Speed_RecDateZ_Current+=_T('0')+Speed_RecDate_Current.Days   /10;
-            Speed_RecDateZ_Current+=_T('0')+Speed_RecDate_Current.Days   %10;
+            Speed_RecDateZ_Current+=Speed_RecDate_Current.Years<75?__T("20"):__T("19");
+            Speed_RecDateZ_Current+=__T('0')+Speed_RecDate_Current.Years  /10;
+            Speed_RecDateZ_Current+=__T('0')+Speed_RecDate_Current.Years  %10;
+            Speed_RecDateZ_Current+=__T('-');
+            Speed_RecDateZ_Current+=__T('0')+Speed_RecDate_Current.Months /10;
+            Speed_RecDateZ_Current+=__T('0')+Speed_RecDate_Current.Months %10;
+            Speed_RecDateZ_Current+=__T('-');
+            Speed_RecDateZ_Current+=__T('0')+Speed_RecDate_Current.Days   /10;
+            Speed_RecDateZ_Current+=__T('0')+Speed_RecDate_Current.Days   %10;
             Errors_Stats_Line+=Speed_RecDateZ_Current;
             if (Speed_RecZ.empty())
             {
@@ -648,27 +651,27 @@
         }
         else
         {
-            Errors_Stats_Line+=_T("XXXX-XX-XX");
+            Errors_Stats_Line+=__T("XXXX-XX-XX");
             #if MEDIAINFO_EVENTS
                 Event.RecordedDateTime1|=0x7F<<17;
                 Event.RecordedDateTime2|=0x0F<<12;
                 Event.RecordedDateTime2|=0x1F<<8;
             #endif //MEDIAINFO_EVENTS
         }
-        Errors_Stats_Line+=_T(" ");
+        Errors_Stats_Line+=__T(" ");
         if (Speed_RecTime_Current.IsValid)
         {
             Speed_RecTimeZ_Last=Speed_RecTimeZ_Current;
             Speed_RecTimeZ_Current.clear();
             Speed_RecTimeZ_Current.reserve(12);
-            Speed_RecTimeZ_Current+=_T('0')+Speed_RecTime_Current.Time.Hours  /10;
-            Speed_RecTimeZ_Current+=_T('0')+Speed_RecTime_Current.Time.Hours  %10;
-            Speed_RecTimeZ_Current+=_T(':');
-            Speed_RecTimeZ_Current+=_T('0')+Speed_RecTime_Current.Time.Minutes/10;
-            Speed_RecTimeZ_Current+=_T('0')+Speed_RecTime_Current.Time.Minutes%10;
-            Speed_RecTimeZ_Current+=_T(':');
-            Speed_RecTimeZ_Current+=_T('0')+Speed_RecTime_Current.Time.Seconds/10;
-            Speed_RecTimeZ_Current+=_T('0')+Speed_RecTime_Current.Time.Seconds%10;
+            Speed_RecTimeZ_Current+=__T('0')+Speed_RecTime_Current.Time.Hours  /10;
+            Speed_RecTimeZ_Current+=__T('0')+Speed_RecTime_Current.Time.Hours  %10;
+            Speed_RecTimeZ_Current+=__T(':');
+            Speed_RecTimeZ_Current+=__T('0')+Speed_RecTime_Current.Time.Minutes/10;
+            Speed_RecTimeZ_Current+=__T('0')+Speed_RecTime_Current.Time.Minutes%10;
+            Speed_RecTimeZ_Current+=__T(':');
+            Speed_RecTimeZ_Current+=__T('0')+Speed_RecTime_Current.Time.Seconds/10;
+            Speed_RecTimeZ_Current+=__T('0')+Speed_RecTime_Current.Time.Seconds%10;
             #if MEDIAINFO_EVENTS
                 int32u Seconds=Speed_RecTime_Current.Time.Hours  *60*60
                              + Speed_RecTime_Current.Time.Minutes   *60
@@ -684,17 +687,17 @@
                     Milliseconds=Speed_RecTime_Current.Time.Frames*(DSF?40:33);
                 else
                     Milliseconds=Speed_RecTime_Current.Time.Frames*33;
-                Speed_RecTimeZ_Current+=_T('.');
-                Speed_RecTimeZ_Current+=_T('0')+(Char)(Milliseconds/100);
-                Speed_RecTimeZ_Current+=_T('0')+(Char)((Milliseconds%100)/10);
-                Speed_RecTimeZ_Current+=_T('0')+(Char)(Milliseconds%10);
+                Speed_RecTimeZ_Current+=__T('.');
+                Speed_RecTimeZ_Current+=__T('0')+(Char)(Milliseconds/100);
+                Speed_RecTimeZ_Current+=__T('0')+(Char)((Milliseconds%100)/10);
+                Speed_RecTimeZ_Current+=__T('0')+(Char)(Milliseconds%10);
                 #if MEDIAINFO_EVENTS
                     Event.RecordedDateTime2|=Speed_RecTime_Current.Time.Frames;
                 #endif //MEDIAINFO_EVENTS
             }
             else
             {
-                Speed_RecTimeZ_Current+=_T("    ");
+                Speed_RecTimeZ_Current+=__T("    ");
                 #if MEDIAINFO_EVENTS
                     Event.RecordedDateTime2|=0x7F;
                 #endif //MEDIAINFO_EVENTS
@@ -718,13 +721,13 @@
         }
         else
         {
-            Errors_Stats_Line+=_T("XX:XX:XX.XXX");
+            Errors_Stats_Line+=__T("XX:XX:XX.XXX");
             #if MEDIAINFO_EVENTS
                 Event.RecordedDateTime1|=0x1FFFF;
                 Event.RecordedDateTime2|=0x7F;
             #endif //MEDIAINFO_EVENTS
         }
-        Errors_Stats_Line+=_T('\t');
+        Errors_Stats_Line+=__T('\t');
 
         //RecDate/RecTime coherency, Rec start/end
         bool RecTime_Disrupted=false;
@@ -745,7 +748,7 @@
             Speed_RecZ[Speed_RecZ_Pos-1].Last.Date=Speed_RecDateZ_Last;
             Speed_RecZ[Speed_RecZ_Pos-1].Last.Time=Speed_RecTimeZ_Last;
 
-            Errors_Stats_Line+=_T('N');
+            Errors_Stats_Line+=__T('N');
             #if MEDIAINFO_EVENTS
                 Event.RecordedDateTime1|=1<<30;
             #endif //MEDIAINFO_EVENTS
@@ -756,8 +759,8 @@
             }
         }
         else
-            Errors_Stats_Line+=_T(' ');
-        Errors_Stats_Line+=_T('\t');
+            Errors_Stats_Line+=__T(' ');
+        Errors_Stats_Line+=__T('\t');
 
         //Speed_Arb_Current
         if (Speed_Arb_Current.IsValid)
@@ -779,8 +782,8 @@
             Speed_Arb_Current.Value=Biggest_Pos;
         }
         else
-            Errors_Stats_Line+=_T('X');
-        Errors_Stats_Line+=_T('\t');
+            Errors_Stats_Line+=__T('X');
+        Errors_Stats_Line+=__T('\t');
 
         //Speed_Arb_Current coherency
         if (!Speed_Arb_IsValid && Speed_Arb_Current.IsValid && Speed_Arb_Current.Value!=0)
@@ -789,7 +792,7 @@
          && Speed_Arb_Current.Value ==Speed_Arb_Last.Value
          && Speed_Arb_Current.Value!=0xF)
         {
-            Errors_Stats_Line+=_T('R');
+            Errors_Stats_Line+=__T('R');
             #if MEDIAINFO_EVENTS
                 Event.Arb|=1<<7;
             #endif //MEDIAINFO_EVENTS
@@ -801,7 +804,7 @@
         else if (Speed_Arb_IsValid && Speed_Arb_Current.IsValid && Speed_Arb_Current_Theory.IsValid
               && Speed_Arb_Current.Value   != Speed_Arb_Current_Theory.Value)
         {
-            Errors_Stats_Line+=_T('N');
+            Errors_Stats_Line+=__T('N');
             #if MEDIAINFO_EVENTS
                 Event.Arb|=1<<6;
             #endif //MEDIAINFO_EVENTS
@@ -809,34 +812,34 @@
             Arb_AreDetected=true;
         }
         else
-            Errors_Stats_Line+=_T(' ');
-        Errors_Stats_Line+=_T('\t');
+            Errors_Stats_Line+=__T(' ');
+        Errors_Stats_Line+=__T('\t');
 
         //Start
         if (REC_IsValid && !REC_ST)
         {
-            Errors_Stats_Line+=_T('S');
+            Errors_Stats_Line+=__T('S');
             #if MEDIAINFO_EVENTS
                 Event.RecordedDateTime1|=1<<29;
             #endif //MEDIAINFO_EVENTS
             Infos_AreDetected=true;
         }
         else
-            Errors_Stats_Line+=_T(' ');
-        Errors_Stats_Line+=_T('\t');
+            Errors_Stats_Line+=__T(' ');
+        Errors_Stats_Line+=__T('\t');
 
         //End
         if (REC_IsValid && !REC_END)
         {
-            Errors_Stats_Line+=_T('E');
+            Errors_Stats_Line+=__T('E');
             #if MEDIAINFO_EVENTS
                 Event.RecordedDateTime1|=1<<28;
             #endif //MEDIAINFO_EVENTS
             Infos_AreDetected=true;
         }
         else
-            Errors_Stats_Line+=_T(' ');
-        Errors_Stats_Line+=_T('\t');
+            Errors_Stats_Line+=__T(' ');
+        Errors_Stats_Line+=__T('\t');
 
         //TimeStamp (RecDate/RecTime and TimeCode together)
         if (TimeCode_Disrupted || RecTime_Disrupted)
@@ -863,8 +866,8 @@
                     size_t Audio_Errors_Count=0;
                     size_t Pos_Begin=(Channel%2)*(QU_System?6:5);
                     size_t Pos_End=(Channel%2+1)*(QU_System?6:5);
-                    if (Channel>=2 && !QU_FSC
-                     || Channel< 2 &&  QU_FSC)
+                    if ((Channel>=2 && !QU_FSC)
+                     || (Channel< 2 &&  QU_FSC))
                         Pos_End=Pos_Begin; //Not here
                     if (!Audio_Invalids.empty())
                         for (size_t Pos=Pos_Begin; Pos<Pos_End; Pos++)
@@ -894,7 +897,7 @@
                 Stats_Total_WithoutArb++;
             }
             Stats[1]++;
-            Errors_Stats_Line+=_T('1');
+            Errors_Stats_Line+=__T('1');
 
             size_t Video_STA_Errors_Count=0;
             Ztring Video_STA_Errors_Details;
@@ -905,11 +908,11 @@
                     Video_STA_Errors_Count+=Video_STA_Errors[Pos];
                     Ztring Video_STA_Errors_Count_Padded=Ztring::ToZtring(Video_STA_Errors[Pos]);
                     if (Video_STA_Errors_Count_Padded.size()<8)
-                        Video_STA_Errors_Count_Padded.insert(Video_STA_Errors_Count_Padded.begin(), 8-Video_STA_Errors_Count_Padded.size(), _T(' '));
+                        Video_STA_Errors_Count_Padded.insert(0, 8-Video_STA_Errors_Count_Padded.size(), __T(' '));
                     Video_STA_Errors_Details+=Video_STA_Errors_Count_Padded;
-                    Video_STA_Errors_Details+=_T(" \"");
+                    Video_STA_Errors_Details+=__T(" \"");
                     Video_STA_Errors_Details+=Ztring::ToZtring(Pos, 16);
-                    Video_STA_Errors_Details+=_T("\" errors, ");
+                    Video_STA_Errors_Details+=__T("\" errors, ");
                     if (Video_STA_Errors_Total.empty())
                         Video_STA_Errors_Total.resize(16);
                     Video_STA_Errors_Total[Pos]+=Video_STA_Errors[Pos];
@@ -919,18 +922,18 @@
             {
                 Ztring Video_STA_Errors_Count_Padded=Ztring::ToZtring(((float)Video_STA_Errors_Count)*100/((DSF_IsValid && DSF)?1500:1350)*(QU_FSC?2:1), 2);
                 if (Video_STA_Errors_Count_Padded.size()<5)
-                    Video_STA_Errors_Count_Padded.insert(Video_STA_Errors_Count_Padded.begin(), 5-Video_STA_Errors_Count_Padded.size(), _T(' '));
-                Errors_Stats_Line_Details+=Video_STA_Errors_Count_Padded+_T("%");
+                    Video_STA_Errors_Count_Padded.insert(0, 5-Video_STA_Errors_Count_Padded.size(), __T(' '));
+                Errors_Stats_Line_Details+=Video_STA_Errors_Count_Padded+__T("%");
                 Video_STA_Errors_Details.resize(Video_STA_Errors_Details.size()-2);
-                Errors_Stats_Line_Details+=_T(" (")+Video_STA_Errors_Details+_T(")");
+                Errors_Stats_Line_Details+=__T(" (")+Video_STA_Errors_Details+__T(")");
                 Speed_FrameCount_Video_STA_Errors++;
                 Errors_AreDetected=true;
             }
         }
         else
-            Errors_Stats_Line+=_T(' ');
-        Errors_Stats_Line+=_T('\t');
-        Errors_Stats_Line_Details+=_T('\t');
+            Errors_Stats_Line+=__T(' ');
+        Errors_Stats_Line+=__T('\t');
+        Errors_Stats_Line_Details+=__T('\t');
 
         //Error 2: Audio errors
         if (QU!=(int8u)-1 && (!Audio_Invalids.empty() || !Audio_Errors.empty()))
@@ -944,8 +947,8 @@
                 Ztring Audio_Errors_Details;
                 size_t Pos_Begin=(Channel%2)*(QU_System?6:5);
                 size_t Pos_End=(Channel%2+1)*(QU_System?6:5);
-                if (Channel>=2 && !QU_FSC
-                 || Channel< 2 &&  QU_FSC
+                if ((Channel>=2 && !QU_FSC)
+                 || (Channel< 2 &&  QU_FSC)
                  || !CH_IsPresent[Channel])
                     Pos_End=Pos_Begin; //Not here
                 for (size_t Pos=Pos_Begin; Pos<Pos_End; Pos++)
@@ -955,11 +958,11 @@
                         Audio_Errors_Count+=Audio_Errors[Pos];
                         Ztring Audio_Errors_Count_Padded=Ztring::ToZtring(Audio_Errors[Pos]);
                         if (Audio_Errors_Count_Padded.size()<2)
-                            Audio_Errors_Count_Padded.insert(Audio_Errors_Count_Padded.begin(), 2-Audio_Errors_Count_Padded.size(), _T(' '));
+                            Audio_Errors_Count_Padded.insert(0, 2-Audio_Errors_Count_Padded.size(), __T(' '));
                         Audio_Errors_Details+=Audio_Errors_Count_Padded;
-                        Audio_Errors_Details+=_T(" Dseq=");
+                        Audio_Errors_Details+=__T(" Dseq=");
                         Audio_Errors_Details+=Ztring::ToZtring(Pos, 16);
-                        Audio_Errors_Details+=_T(", ");
+                        Audio_Errors_Details+=__T(", ");
                         if (Audio_Errors_Total.empty())
                         {
                             Audio_Errors_Total.resize(8);
@@ -980,22 +983,22 @@
                             Stats_Total_WithoutArb++;
                         }
                         Stats[2]++;
-                        Errors_Stats_Line+=_T('2');
+                        Errors_Stats_Line+=__T('2');
                     }
 
                     Ztring Audio_Errors_Count_Padded=Ztring::ToZtring(((float)Audio_Errors_Count)*100/((DSF_IsValid && DSF)?54:45)*(QU_FSC?2:1), 2);
                     if (Audio_Errors_Count_Padded.size()<2)
-                        Audio_Errors_Count_Padded.insert(Audio_Errors_Count_Padded.begin(), 2-Audio_Errors_Count_Padded.size(), _T(' '));
+                        Audio_Errors_Count_Padded.insert(0, 2-Audio_Errors_Count_Padded.size(), __T(' '));
                     if (ErrorsAreAlreadyDetected)
-                        Errors_Stats_Line_Details+=_T(", ");
+                        Errors_Stats_Line_Details+=__T(", ");
                     if (Audio_Errors_Count<(size_t)((QU_System?6:5)*9))
                     {
-                        Errors_Stats_Line_Details+=_T("CH")+Ztring::ToZtring(Channel+1)+_T(": ")+Audio_Errors_Count_Padded+_T("%");
+                        Errors_Stats_Line_Details+=__T("CH")+Ztring::ToZtring(Channel+1)+__T(": ")+Audio_Errors_Count_Padded+__T("%");
                         Audio_Errors_Details.resize(Audio_Errors_Details.size()-2);
-                        Errors_Stats_Line_Details+=_T(" (")+Audio_Errors_Details+_T(")");
+                        Errors_Stats_Line_Details+=__T(" (")+Audio_Errors_Details+__T(")");
                     }
                     else
-                        Errors_Stats_Line_Details+=_T("CH")+Ztring::ToZtring(Channel+1)+_T(": no valid DIF");
+                        Errors_Stats_Line_Details+=__T("CH")+Ztring::ToZtring(Channel+1)+__T(": no valid DIF");
 
                     Speed_FrameCount_Audio_Errors[Channel]++;
                     ErrorsAreAlreadyDetected=true;
@@ -1003,12 +1006,12 @@
                 }
             }
             if (!ErrorsAreAlreadyDetected)
-                Errors_Stats_Line+=_T(' ');
+                Errors_Stats_Line+=__T(' ');
         }
         else
-            Errors_Stats_Line+=_T(' ');
-        Errors_Stats_Line+=_T('\t');
-        Errors_Stats_Line_Details+=_T('\t');
+            Errors_Stats_Line+=__T(' ');
+        Errors_Stats_Line+=__T('\t');
+        Errors_Stats_Line_Details+=__T('\t');
 
         //Error 3: Timecode incoherency
         if (Speed_TimeCode_Current.MultipleValues)
@@ -1020,15 +1023,15 @@
                 Stats_Total_WithoutArb++;
             }
             Stats[3]++;
-            Errors_Stats_Line+=_T('3');
-            Errors_Stats_Line_Details+=_T("Timecode incoherency, first detected value is used");
+            Errors_Stats_Line+=__T('3');
+            Errors_Stats_Line_Details+=__T("Timecode incoherency, first detected value is used");
             Speed_FrameCount_Timecode_Incoherency++;
             Errors_AreDetected=true;
         }
         else
-            Errors_Stats_Line+=_T(' ');
-        Errors_Stats_Line+=_T('\t');
-        Errors_Stats_Line_Details+=_T('\t');
+            Errors_Stats_Line+=__T(' ');
+        Errors_Stats_Line+=__T('\t');
+        Errors_Stats_Line_Details+=__T('\t');
 
         //Error 4: DIF order incoherency
         if (Speed_Contains_NULL)
@@ -1040,15 +1043,15 @@
                 Stats_Total_WithoutArb++;
             }
             Stats[4]++;
-            Errors_Stats_Line+=_T('4');
-            Errors_Stats_Line_Details+=Ztring::ToZtring(Speed_Contains_NULL)+_T(" NULL DIFs");
+            Errors_Stats_Line+=__T('4');
+            Errors_Stats_Line_Details+=Ztring::ToZtring(Speed_Contains_NULL)+__T(" NULL DIFs");
             Speed_FrameCount_Contains_NULL++;
             Errors_AreDetected=true;
         }
         else
-            Errors_Stats_Line+=_T(' ');
-        Errors_Stats_Line+=_T('\t');
-        Errors_Stats_Line_Details+=_T('\t');
+            Errors_Stats_Line+=__T(' ');
+        Errors_Stats_Line+=__T('\t');
+        Errors_Stats_Line_Details+=__T('\t');
 
         //Error 5: Speed_Arb_Current incoherency
         if (Speed_Arb_Current.MultipleValues)
@@ -1059,15 +1062,15 @@
                 Stats_Total++;
             }
             Stats[5]++;
-            Errors_Stats_Line+=_T('5');
+            Errors_Stats_Line+=__T('5');
             Ztring Arb_Errors;
             for (size_t Pos=0; Pos<16; Pos++)
                 if (Speed_Arb_Current.Value_Counters[Pos])
                 {
                     Arb_Errors+=Ztring::ToZtring(Speed_Arb_Current.Value_Counters[Pos]);
-                    Arb_Errors+=_T(" Arb bit=\"");
+                    Arb_Errors+=__T(" Arb bit=\"");
                     Arb_Errors+=Ztring::ToZtring(Pos, 16);
-                    Arb_Errors+=_T("\", ");
+                    Arb_Errors+=__T("\", ");
                 }
             if (Arb_Errors.size()>2)
             {
@@ -1078,9 +1081,9 @@
             Arb_AreDetected=true;
         }
         else
-            Errors_Stats_Line+=_T(' ');
-        Errors_Stats_Line+=_T('\t');
-        Errors_Stats_Line_Details+=_T('\t');
+            Errors_Stats_Line+=__T(' ');
+        Errors_Stats_Line+=__T('\t');
+        Errors_Stats_Line_Details+=__T('\t');
 
         //Error 6:
         if (Mpeg4_stts && Mpeg4_stts_Pos<Mpeg4_stts->size() && Speed_FrameCount-1>=Mpeg4_stts->at(Mpeg4_stts_Pos).Pos_Begin && Speed_FrameCount-1<Mpeg4_stts->at(Mpeg4_stts_Pos).Pos_End)
@@ -1092,45 +1095,45 @@
                 Stats_Total_WithoutArb++;
             }
             Stats[6]++;
-            Errors_Stats_Line+=_T('6');
-            Errors_Stats_Line_Details+=_T("stts flucuation");
+            Errors_Stats_Line+=__T('6');
+            Errors_Stats_Line_Details+=__T("stts flucuation");
             Speed_FrameCount_Stts_Fluctuation++;
             Errors_AreDetected=true;
         }
         else
-            Errors_Stats_Line+=_T(' ');
-        Errors_Stats_Line+=_T('\t');
-        Errors_Stats_Line_Details+=_T('\t');
+            Errors_Stats_Line+=__T(' ');
+        Errors_Stats_Line+=__T('\t');
+        Errors_Stats_Line_Details+=__T('\t');
 
         //Error 7:
-            Errors_Stats_Line+=_T(' ');
-        Errors_Stats_Line+=_T('\t');
-        Errors_Stats_Line_Details+=_T('\t');
+            Errors_Stats_Line+=__T(' ');
+        Errors_Stats_Line+=__T('\t');
+        Errors_Stats_Line_Details+=__T('\t');
 
         //Error 8:
-            Errors_Stats_Line+=_T(' ');
-        Errors_Stats_Line+=_T('\t');
-        Errors_Stats_Line_Details+=_T('\t');
+            Errors_Stats_Line+=__T(' ');
+        Errors_Stats_Line+=__T('\t');
+        Errors_Stats_Line_Details+=__T('\t');
 
         //Error 9:
-            Errors_Stats_Line+=_T(' ');
-        Errors_Stats_Line+=_T('\t');
-        Errors_Stats_Line_Details+=_T('\t');
+            Errors_Stats_Line+=__T(' ');
+        Errors_Stats_Line+=__T('\t');
+        Errors_Stats_Line_Details+=__T('\t');
 
         //Error 0:
-            Errors_Stats_Line+=_T(' ');
-        Errors_Stats_Line+=_T('\t');
-        Errors_Stats_Line_Details+=_T('\t');
+            Errors_Stats_Line+=__T(' ');
+        Errors_Stats_Line+=__T('\t');
+        Errors_Stats_Line_Details+=__T('\t');
 
         //Filling the main text if needed
         {
+            #if MEDIAINFO_EVENTS
             if (!Config->Event_CallBackFunction_IsSet())
             {
                 Errors_Stats_10+=Errors_Stats_Line;
                 Errors_Stats_10+=Errors_Stats_Line_Details;
-                Errors_Stats_10+=_T("&");
+                Errors_Stats_10+=__T("&");
             }
-            #if MEDIAINFO_EVENTS
                 Event.Verbosity=10;
             #endif //MEDIAINFO_EVENTS
         }
@@ -1140,13 +1143,13 @@
          || Infos_AreDetected
          || Arb_AreDetected)
         {
+            #if MEDIAINFO_EVENTS
             if (!Config->Event_CallBackFunction_IsSet())
             {
                 Errors_Stats_09+=Errors_Stats_Line;
                 Errors_Stats_09+=Errors_Stats_Line_Details;
-                Errors_Stats_09+=_T("&");
+                Errors_Stats_09+=__T("&");
             }
-            #if MEDIAINFO_EVENTS
                 Event.Verbosity=9;
             #endif //MEDIAINFO_EVENTS
 
@@ -1155,13 +1158,13 @@
              || Errors_AreDetected
              || Infos_AreDetected)
             {
+                #if MEDIAINFO_EVENTS
                 if (!Config->Event_CallBackFunction_IsSet())
                 {
                     Errors_Stats_05+=Errors_Stats_Line;
                     Errors_Stats_05+=Errors_Stats_Line_Details;
-                    Errors_Stats_05+=_T("&");
+                    Errors_Stats_05+=__T("&");
                 }
-                #if MEDIAINFO_EVENTS
                     Event.Verbosity=5;
                 #endif //MEDIAINFO_EVENTS
 
@@ -1169,13 +1172,13 @@
                  || Status[IsFinished]
                  || Errors_AreDetected)
                 {
+                    #if MEDIAINFO_EVENTS
                     if (!Config->Event_CallBackFunction_IsSet())
                     {
                         Errors_Stats_03+=Errors_Stats_Line;
                         Errors_Stats_03+=Errors_Stats_Line_Details;
-                        Errors_Stats_03+=_T("&");
+                        Errors_Stats_03+=__T("&");
                     }
-                    #if MEDIAINFO_EVENTS
                         Event.Verbosity=3;
                     #endif //MEDIAINFO_EVENTS
                 }
@@ -1279,9 +1282,9 @@
     Speed_Contains_NULL=0;
     Frame_AtLeast1DIF=true;
     if (Buffer_Offset+2>=Buffer_Size
-     || Buffer[Buffer_Offset  ]==0x00
-     && Buffer[Buffer_Offset+1]==0x00
-     && Buffer[Buffer_Offset+2]==0x00)
+     || (Buffer[Buffer_Offset  ]==0x00
+      && Buffer[Buffer_Offset+1]==0x00
+      && Buffer[Buffer_Offset+2]==0x00))
         Frame_AtLeast1DIF=false;
     Video_STA_Errors.clear();
     Audio_Errors.clear();
@@ -1296,8 +1299,8 @@
         if (Config->File_DvDif_Analysis_Get())
             Analyze_Activated=true;
         else
-            return;    
-    }       
+            return;
+    }
 
     //Preparing next frame
     Speed_FrameCount--;
@@ -1307,19 +1310,19 @@
 
     //Frames
     if (Speed_FrameCount)
-        Errors_Stats_End_Lines+=_T("Frame Count: ")+Ztring::ToZtring(Speed_FrameCount)+_T('&');
+        Errors_Stats_End_Lines+=__T("Frame Count: ")+Ztring::ToZtring(Speed_FrameCount)+__T('&');
 
     //One block
     if (!Errors_Stats_End_Lines.empty())
     {
         Errors_Stats_End_05+=Errors_Stats_End_Lines;
-        Errors_Stats_End_05+=_T('&');
+        Errors_Stats_End_05+=__T('&');
         Errors_Stats_End_Lines.clear();
     }
 
     //Error 1: Video error concealment
     if (Speed_FrameCount_Video_STA_Errors)
-        Errors_Stats_End_Lines+=_T("Frame count with video error concealment: ")+Ztring::ToZtring(Speed_FrameCount_Video_STA_Errors)+_T(" frames &");
+        Errors_Stats_End_Lines+=__T("Frame count with video error concealment: ")+Ztring::ToZtring(Speed_FrameCount_Video_STA_Errors)+__T(" frames &");
     if (!Video_STA_Errors_Total.empty())
     {
         Ztring Errors_Details;
@@ -1331,22 +1334,22 @@
                 Errors_Count+=Video_STA_Errors_Total[Pos];
                 Ztring Errors_Count_Padded=Ztring::ToZtring(Video_STA_Errors_Total[Pos]);
                 if (Errors_Count_Padded.size()<8)
-                    Errors_Count_Padded.insert(Errors_Count_Padded.begin(), 8-Errors_Count_Padded.size(), _T(' '));
+                    Errors_Count_Padded.insert(0, 8-Errors_Count_Padded.size(), __T(' '));
                 Errors_Details+=Errors_Count_Padded;
-                Errors_Details+=_T(" \"");
+                Errors_Details+=__T(" \"");
                 Errors_Details+=Ztring::ToZtring(Pos, 16);
-                Errors_Details+=_T("\" errors, ");
+                Errors_Details+=__T("\" errors, ");
             }
         }
         if (Errors_Details.size()>2)
         {
-            Errors_Stats_End_Lines+=_T("Total video error concealment: ");
+            Errors_Stats_End_Lines+=__T("Total video error concealment: ");
             Ztring Errors_Count_Padded=Ztring::ToZtring(Errors_Count);
             if (Errors_Count_Padded.size()<8)
-                Errors_Count_Padded.insert(Errors_Count_Padded.begin(), 8-Errors_Count_Padded.size(), _T(' '));
-            Errors_Stats_End_Lines+=_T(" ")+Errors_Count_Padded+_T(" errors");
+                Errors_Count_Padded.insert(0, 8-Errors_Count_Padded.size(), __T(' '));
+            Errors_Stats_End_Lines+=__T(" ")+Errors_Count_Padded+__T(" errors");
             Errors_Details.resize(Errors_Details.size()-2);
-            Errors_Stats_End_Lines+=_T(" (")+Errors_Details+_T(")")+_T('&');
+            Errors_Stats_End_Lines+=__T(" (")+Errors_Details+__T(")")+__T('&');
         }
     }
 
@@ -1356,7 +1359,7 @@
         for (size_t Channel=0; Channel<8; Channel++)
         {
             if (Speed_FrameCount_Audio_Errors[Channel])
-                Errors_Stats_End_Lines+=_T("Frame count with CH")+Ztring::ToZtring(Channel+1)+_T(" audio error code: ")+Ztring::ToZtring(Speed_FrameCount_Audio_Errors[Channel])+_T(" frames &");
+                Errors_Stats_End_Lines+=__T("Frame count with CH")+Ztring::ToZtring(Channel+1)+__T(" audio error code: ")+Ztring::ToZtring(Speed_FrameCount_Audio_Errors[Channel])+__T(" frames &");
 
             Ztring Errors_Details;
             size_t Errors_Count=0;
@@ -1367,49 +1370,49 @@
                     Errors_Count+=Audio_Errors_Total[Channel][Pos];
                     Ztring Errors_Count_Padded=Ztring::ToZtring(Audio_Errors_Total[Channel][Pos]);
                     if (Errors_Count_Padded.size()<8)
-                        Errors_Count_Padded.insert(Errors_Count_Padded.begin(), 8-Errors_Count_Padded.size(), _T(' '));
+                        Errors_Count_Padded.insert(0, 8-Errors_Count_Padded.size(), __T(' '));
                     Errors_Details+=Errors_Count_Padded;
-                    Errors_Details+=_T(" Dseq=");
+                    Errors_Details+=__T(" Dseq=");
                     Errors_Details+=Ztring::ToZtring(Pos, 16);
-                    Errors_Details+=_T(", ");
+                    Errors_Details+=__T(", ");
                 }
             }
             if (Errors_Details.size()>2)
             {
-                Errors_Stats_End_Lines+=_T("Total audio error code for CH")+Ztring::ToZtring(Channel+1)+_T(": ");
+                Errors_Stats_End_Lines+=__T("Total audio error code for CH")+Ztring::ToZtring(Channel+1)+__T(": ");
                 Ztring Errors_Count_Padded=Ztring::ToZtring(Errors_Count);
                 if (Errors_Count_Padded.size()<8)
-                    Errors_Count_Padded.insert(Errors_Count_Padded.begin(), 8-Errors_Count_Padded.size(), _T(' '));
-                Errors_Stats_End_Lines+=_T(" ")+Errors_Count_Padded+_T(" errors");
+                    Errors_Count_Padded.insert(0, 8-Errors_Count_Padded.size(), __T(' '));
+                Errors_Stats_End_Lines+=__T(" ")+Errors_Count_Padded+__T(" errors");
                 Errors_Details.resize(Errors_Details.size()-2);
-                Errors_Stats_End_Lines+=_T(" (")+Errors_Details+_T(")")+_T('&');
+                Errors_Stats_End_Lines+=__T(" (")+Errors_Details+__T(")")+__T('&');
             }
         }
     }
 
     //Error 3: Timecode incoherency
     if (Speed_FrameCount_Timecode_Incoherency)
-        Errors_Stats_End_Lines+=_T("Frame count with DV timecode incoherency: ")+Ztring::ToZtring(Speed_FrameCount_Timecode_Incoherency)+_T(" frames &");
+        Errors_Stats_End_Lines+=__T("Frame count with DV timecode incoherency: ")+Ztring::ToZtring(Speed_FrameCount_Timecode_Incoherency)+__T(" frames &");
 
     //Error 4: DIF incohereny
     if (Speed_FrameCount_Contains_NULL)
-        Errors_Stats_End_Lines+=_T("Frame count with DIF incoherency: ")+Ztring::ToZtring(Speed_FrameCount_Contains_NULL)+_T(" frames &");
+        Errors_Stats_End_Lines+=__T("Frame count with DIF incoherency: ")+Ztring::ToZtring(Speed_FrameCount_Contains_NULL)+__T(" frames &");
 
     //Error 5: Arbitrary bit inconsistency
     if (Speed_FrameCount_Arb_Incoherency)
-        Errors_Stats_End_Lines+=_T("Frame count with Arbitrary bit inconsistency: ")+Ztring::ToZtring(Speed_FrameCount_Arb_Incoherency)+_T(" frames &");
+        Errors_Stats_End_Lines+=__T("Frame count with Arbitrary bit inconsistency: ")+Ztring::ToZtring(Speed_FrameCount_Arb_Incoherency)+__T(" frames &");
 
     //Error 6: Stts fluctuation
     if (Speed_FrameCount_Stts_Fluctuation)
-        Errors_Stats_End_Lines+=_T("Frame count with stts fluctuation: ")+Ztring::ToZtring(Speed_FrameCount_Stts_Fluctuation)+_T(" frames &");
+        Errors_Stats_End_Lines+=__T("Frame count with stts fluctuation: ")+Ztring::ToZtring(Speed_FrameCount_Stts_Fluctuation)+__T(" frames &");
 
     //One block
     if (!Errors_Stats_End_Lines.empty())
     {
         Errors_Stats_End_03+=Errors_Stats_End_Lines;
-        Errors_Stats_End_03+=_T('&');
+        Errors_Stats_End_03+=__T('&');
         Errors_Stats_End_05+=Errors_Stats_End_Lines;
-        Errors_Stats_End_05+=_T('&');
+        Errors_Stats_End_05+=__T('&');
         Errors_Stats_End_Lines.clear();
     }
 
@@ -1424,7 +1427,7 @@
             Speed_TimeStampsZ[Speed_TimeStampsZ_Pos].Last.FramePos=Speed_FrameCount;
             Speed_TimeStampsZ[Speed_TimeStampsZ_Pos].Last.TimeCode=Speed_TimeCodeZ_Current;
             if (Speed_TimeStampsZ[Speed_TimeStampsZ_Pos].Last.FramePos-(Speed_TimeStampsZ_Pos?Speed_TimeStampsZ[Speed_TimeStampsZ_Pos-1].Last.FramePos:0)==1) //Only one frame, the "Last" part is not filled
-                Speed_TimeStampsZ[Speed_TimeStampsZ_Pos].Last.TimeCode=Speed_TimeStampsZ[Speed_TimeStampsZ_Pos].First.TimeCode; 
+                Speed_TimeStampsZ[Speed_TimeStampsZ_Pos].Last.TimeCode=Speed_TimeStampsZ[Speed_TimeStampsZ_Pos].First.TimeCode;
             Speed_TimeStampsZ[Speed_TimeStampsZ_Pos].Last.Date=Speed_RecDateZ_Current;
             Speed_TimeStampsZ[Speed_TimeStampsZ_Pos].Last.Time=Speed_RecTimeZ_Current;
             if (Speed_TimeStampsZ[Speed_TimeStampsZ_Pos].Last.FramePos-(Speed_TimeStampsZ_Pos?Speed_TimeStampsZ[Speed_TimeStampsZ_Pos-1].Last.FramePos:0)==1)
@@ -1445,52 +1448,52 @@
             if (FrameRate==29.970 && Speed_TimeCode_Current.IsValid && !Speed_TimeCode_Current.Time.DropFrame)
                 FrameRate=30.000;
 
-            Errors_Stats_End_Lines+=_T("Absolute time\tDV timecode range        \tRecorded date/time range                         \tFrame range&");
+            Errors_Stats_End_Lines+=__T("Absolute time\tDV timecode range        \tRecorded date/time range                         \tFrame range&");
             for (size_t Pos=0; Pos<Speed_TimeStampsZ.size(); Pos++)
             {
                 //Time
                 float64 Time_Offset=(Pos?Speed_TimeStampsZ[Pos-1].Last.FramePos:0)*1000/FrameRate;
                 Errors_Stats_End_Lines+=Ztring().Duration_From_Milliseconds((int64u)Time_Offset);
 
-                Errors_Stats_End_Lines+=_T("\t");
+                Errors_Stats_End_Lines+=__T("\t");
 
                 //TimeCode_range
-                Errors_Stats_End_Lines+=Speed_TimeStampsZ[Pos].First.TimeCode.empty()?Ztring(_T("XX:XX:XX:XX")):Speed_TimeStampsZ[Pos].First.TimeCode;
+                Errors_Stats_End_Lines+=Speed_TimeStampsZ[Pos].First.TimeCode.empty()?Ztring(__T("XX:XX:XX:XX")):Speed_TimeStampsZ[Pos].First.TimeCode;
 
-                Errors_Stats_End_Lines+=_T(" - ");
+                Errors_Stats_End_Lines+=__T(" - ");
 
-                Errors_Stats_End_Lines+=Speed_TimeStampsZ[Pos].Last.TimeCode.empty()?Ztring(_T("XX:XX:XX:XX")):Speed_TimeStampsZ[Pos].Last.TimeCode;
+                Errors_Stats_End_Lines+=Speed_TimeStampsZ[Pos].Last.TimeCode.empty()?Ztring(__T("XX:XX:XX:XX")):Speed_TimeStampsZ[Pos].Last.TimeCode;
 
-                Errors_Stats_End_Lines+=_T("\t");
+                Errors_Stats_End_Lines+=__T("\t");
 
                 //Recorded date/time_range
-                Errors_Stats_End_Lines+=Speed_TimeStampsZ[Pos].First.Date.empty()?Ztring(_T("XXXX-XX-XX")):Speed_TimeStampsZ[Pos].First.Date;
-                Errors_Stats_End_Lines+=_T(' ');
-                Errors_Stats_End_Lines+=Speed_TimeStampsZ[Pos].First.Time.empty()?Ztring(_T("XX:XX:XX:XX")):Speed_TimeStampsZ[Pos].First.Time;
+                Errors_Stats_End_Lines+=Speed_TimeStampsZ[Pos].First.Date.empty()?Ztring(__T("XXXX-XX-XX")):Speed_TimeStampsZ[Pos].First.Date;
+                Errors_Stats_End_Lines+=__T(' ');
+                Errors_Stats_End_Lines+=Speed_TimeStampsZ[Pos].First.Time.empty()?Ztring(__T("XX:XX:XX:XX")):Speed_TimeStampsZ[Pos].First.Time;
 
-                Errors_Stats_End_Lines+=_T(" - ");
+                Errors_Stats_End_Lines+=__T(" - ");
 
-                Errors_Stats_End_Lines+=Speed_TimeStampsZ[Pos].Last.Date.empty()?Ztring(_T("XXXX-XX-XX")):Speed_TimeStampsZ[Pos].Last.Date;
-                Errors_Stats_End_Lines+=_T(' ');
-                Errors_Stats_End_Lines+=Speed_TimeStampsZ[Pos].Last.Time.empty()?Ztring(_T("XX:XX:XX:XX")):Speed_TimeStampsZ[Pos].Last.Time;
+                Errors_Stats_End_Lines+=Speed_TimeStampsZ[Pos].Last.Date.empty()?Ztring(__T("XXXX-XX-XX")):Speed_TimeStampsZ[Pos].Last.Date;
+                Errors_Stats_End_Lines+=__T(' ');
+                Errors_Stats_End_Lines+=Speed_TimeStampsZ[Pos].Last.Time.empty()?Ztring(__T("XX:XX:XX:XX")):Speed_TimeStampsZ[Pos].Last.Time;
 
-                Errors_Stats_End_Lines+=_T("\t");
+                Errors_Stats_End_Lines+=__T("\t");
 
                 //Frame range
                 int64u Start=Pos?Speed_TimeStampsZ[Pos-1].Last.FramePos:0;
                 Ztring Start_Padded=Ztring::ToZtring(Start);
                 if (Start_Padded.size()<8)
-                    Start_Padded.insert(Start_Padded.begin(), 8-Start_Padded.size(), _T(' '));
-                
+                    Start_Padded.insert(0, 8-Start_Padded.size(), __T(' '));
+
                 Errors_Stats_End_Lines+=Start_Padded;
 
                 int64u End=Speed_TimeStampsZ[Pos].Last.FramePos-1;
                 Ztring End_Padded=Ztring::ToZtring(End);
                 if (End_Padded.size()<8)
-                    End_Padded.insert(End_Padded.begin(), 8-End_Padded.size(), _T(' '));
-                Errors_Stats_End_Lines+=_T(" - ")+End_Padded;
+                    End_Padded.insert(0, 8-End_Padded.size(), __T(' '));
+                Errors_Stats_End_Lines+=__T(" - ")+End_Padded;
 
-                Errors_Stats_End_Lines+=_T('&');
+                Errors_Stats_End_Lines+=__T('&');
             }
         }
     }
@@ -1499,76 +1502,76 @@
     if (!Errors_Stats_End_Lines.empty())
     {
         Errors_Stats_End_05+=Errors_Stats_End_Lines;
-        Errors_Stats_End_05+=_T('&');
+        Errors_Stats_End_05+=__T('&');
         Errors_Stats_End_Lines.clear();
     }
 
     //Stats
     if (Stats_Total)
     {
-        Errors_Stats_End_Lines+=_T("Percent of frames with Error: ");
+        Errors_Stats_End_Lines+=__T("Percent of frames with Error: ");
         Errors_Stats_End_Lines+=Ztring::ToZtring(((float)Stats_Total_WithoutArb*100)/Speed_FrameCount, 2);
-        Errors_Stats_End_Lines+=_T("%");
-        Errors_Stats_End_Lines+=_T('&');
-        Errors_Stats_End_Lines+=_T("Percent of frames with Error (including Arbitrary bit inconsistency): ");
+        Errors_Stats_End_Lines+=__T("%");
+        Errors_Stats_End_Lines+=__T('&');
+        Errors_Stats_End_Lines+=__T("Percent of frames with Error (including Arbitrary bit inconsistency): ");
         Errors_Stats_End_Lines+=Ztring::ToZtring(((float)Stats_Total*100)/Speed_FrameCount, 2);
-        Errors_Stats_End_Lines+=_T("%");
-        Errors_Stats_End_Lines+=_T('&');
+        Errors_Stats_End_Lines+=__T("%");
+        Errors_Stats_End_Lines+=__T('&');
 
         if (Stats[1])
         {
-            Errors_Stats_End_Lines+=_T("Percent of frames with Video Error Concealment: ");
+            Errors_Stats_End_Lines+=__T("Percent of frames with Video Error Concealment: ");
             Errors_Stats_End_Lines+=Ztring::ToZtring(((float)Stats[1]*100)/Speed_FrameCount, 2);
-            Errors_Stats_End_Lines+=_T("%");
-            Errors_Stats_End_Lines+=_T('&');
+            Errors_Stats_End_Lines+=__T("%");
+            Errors_Stats_End_Lines+=__T('&');
         }
 
         if (Stats[2])
         {
-            Errors_Stats_End_Lines+=_T("Percent of frames with Audio Errors: ");
+            Errors_Stats_End_Lines+=__T("Percent of frames with Audio Errors: ");
             Errors_Stats_End_Lines+=Ztring::ToZtring(((float)Stats[2]*100)/Speed_FrameCount, 2);
-            Errors_Stats_End_Lines+=_T("%");
-            Errors_Stats_End_Lines+=_T('&');
+            Errors_Stats_End_Lines+=__T("%");
+            Errors_Stats_End_Lines+=__T('&');
         }
 
         if (Stats[3])
         {
-            Errors_Stats_End_Lines+=_T("Percent of frames with Timecode Incoherency: ");
+            Errors_Stats_End_Lines+=__T("Percent of frames with Timecode Incoherency: ");
             Errors_Stats_End_Lines+=Ztring::ToZtring(((float)Stats[3]*100)/Speed_FrameCount, 2);
-            Errors_Stats_End_Lines+=_T("%");
-            Errors_Stats_End_Lines+=_T('&');
+            Errors_Stats_End_Lines+=__T("%");
+            Errors_Stats_End_Lines+=__T('&');
         }
 
         if (Stats[4])
         {
-            Errors_Stats_End_Lines+=_T("Percent of frames with DIF Incoherency: ");
+            Errors_Stats_End_Lines+=__T("Percent of frames with DIF Incoherency: ");
             Errors_Stats_End_Lines+=Ztring::ToZtring(((float)Stats[4]*100)/Speed_FrameCount, 2);
-            Errors_Stats_End_Lines+=_T("%");
-            Errors_Stats_End_Lines+=_T('&');
+            Errors_Stats_End_Lines+=__T("%");
+            Errors_Stats_End_Lines+=__T('&');
         }
 
         if (Stats[5])
         {
-            Errors_Stats_End_Lines+=_T("Percent of frames with Arbitrary bit inconsistency: ");
+            Errors_Stats_End_Lines+=__T("Percent of frames with Arbitrary bit inconsistency: ");
             Errors_Stats_End_Lines+=Ztring::ToZtring(((float)Stats[5]*100)/Speed_FrameCount, 2);
-            Errors_Stats_End_Lines+=_T("%");
-            Errors_Stats_End_Lines+=_T('&');
+            Errors_Stats_End_Lines+=__T("%");
+            Errors_Stats_End_Lines+=__T('&');
         }
 
         if (Stats[6])
         {
-            Errors_Stats_End_Lines+=_T("Percent of frames with Stts Fluctuation: ");
+            Errors_Stats_End_Lines+=__T("Percent of frames with Stts Fluctuation: ");
             Errors_Stats_End_Lines+=Ztring::ToZtring(((float)Stats[6]*100)/Speed_FrameCount, 2);
-            Errors_Stats_End_Lines+=_T("%");
-            Errors_Stats_End_Lines+=_T('&');
+            Errors_Stats_End_Lines+=__T("%");
+            Errors_Stats_End_Lines+=__T('&');
         }
     }
-    
+
     //One block
     if (!Errors_Stats_End_Lines.empty())
     {
         Errors_Stats_End_05+=Errors_Stats_End_Lines;
-        Errors_Stats_End_05+=_T('&');
+        Errors_Stats_End_05+=__T('&');
         Errors_Stats_End_Lines.clear();
     }
 
@@ -1580,23 +1583,23 @@
 
     if (Errors_Stats_End_03.empty())
     {
-        Errors_Stats_End_03+=_T("No identified errors");
-        Errors_Stats_End_05+=_T("&&No identified errors");
+        Errors_Stats_End_03+=__T("No identified errors");
+        Errors_Stats_End_05+=__T("&&No identified errors");
     }
 
     //Filling
     if (Count_Get(Stream_Video)==0)
         Stream_Prepare(Stream_Video);
     Fill(Stream_Video, 0, "Errors_Stats_Begin", "Frame # \tAbsolute time\tDV timecode\tN\tRecorded date/time     \tN\tA\tN\tS\tE\t1\t2\t3\t4\t5\t6\t7\t8\t9\t0\t1\t2\t3\t4\t5\t6\t7\t8\t9\t0");
-    (*Stream_More)[Stream_Video][0](Ztring().From_Local("Errors_Stats_Begin"), Info_Options)=_T("N NT");
+    (*Stream_More)[Stream_Video][0](Ztring().From_Local("Errors_Stats_Begin"), Info_Options)=__T("N NT");
     Fill(Stream_Video, 0, "Errors_Stats_03", Errors_Stats_03);
-    (*Stream_More)[Stream_Video][0](Ztring().From_Local("Errors_Stats_03"), Info_Options)=_T("N NT");
+    (*Stream_More)[Stream_Video][0](Ztring().From_Local("Errors_Stats_03"), Info_Options)=__T("N NT");
     Fill(Stream_Video, 0, "Errors_Stats_05", Errors_Stats_05);
-    (*Stream_More)[Stream_Video][0](Ztring().From_Local("Errors_Stats_05"), Info_Options)=_T("N NT");
+    (*Stream_More)[Stream_Video][0](Ztring().From_Local("Errors_Stats_05"), Info_Options)=__T("N NT");
     Fill(Stream_Video, 0, "Errors_Stats_09", Errors_Stats_09);
-    (*Stream_More)[Stream_Video][0](Ztring().From_Local("Errors_Stats_09"), Info_Options)=_T("N NT");
+    (*Stream_More)[Stream_Video][0](Ztring().From_Local("Errors_Stats_09"), Info_Options)=__T("N NT");
     Fill(Stream_Video, 0, "Errors_Stats_10", Errors_Stats_10);
-    (*Stream_More)[Stream_Video][0](Ztring().From_Local("Errors_Stats_10"), Info_Options)=_T("N NT");
+    (*Stream_More)[Stream_Video][0](Ztring().From_Local("Errors_Stats_10"), Info_Options)=__T("N NT");
     if (MediaInfoLib::Config.Verbosity_Get()>=(float32)1.0)
         Fill(Stream_Video, 0, "Errors_Stats", Errors_Stats_10);
     else if (MediaInfoLib::Config.Verbosity_Get()>=(float32)0.5)
@@ -1605,18 +1608,18 @@
         Fill(Stream_Video, 0, "Errors_Stats", Errors_Stats_05);
     else
         Fill(Stream_Video, 0, "Errors_Stats", Errors_Stats_03);
-    (*Stream_More)[Stream_Video][0](Ztring().From_Local("Errors_Stats"), Info_Options)=_T("N NT");
+    (*Stream_More)[Stream_Video][0](Ztring().From_Local("Errors_Stats"), Info_Options)=__T("N NT");
     Fill(Stream_Video, 0, "Errors_Stats_End_03", Errors_Stats_End_03);
-    (*Stream_More)[Stream_Video][0](Ztring().From_Local("Errors_Stats_End_03"), Info_Options)=_T("N NT");
+    (*Stream_More)[Stream_Video][0](Ztring().From_Local("Errors_Stats_End_03"), Info_Options)=__T("N NT");
     Fill(Stream_Video, 0, "Errors_Stats_End_05", Errors_Stats_End_05);
-    (*Stream_More)[Stream_Video][0](Ztring().From_Local("Errors_Stats_End_05"), Info_Options)=_T("N NT");
+    (*Stream_More)[Stream_Video][0](Ztring().From_Local("Errors_Stats_End_05"), Info_Options)=__T("N NT");
     if (MediaInfoLib::Config.Verbosity_Get()>=(float32)0.5)
         Fill(Stream_Video, 0, "Errors_Stats_End", Errors_Stats_End_05);
     else
         Fill(Stream_Video, 0, "Errors_Stats_End", Errors_Stats_End_03);
-    (*Stream_More)[Stream_Video][0](Ztring().From_Local("Errors_Stats_End"), Info_Options)=_T("N NT");
+    (*Stream_More)[Stream_Video][0](Ztring().From_Local("Errors_Stats_End"), Info_Options)=__T("N NT");
     Fill(Stream_Video, 0, "FrameCount_Speed", Speed_FrameCount);
-    (*Stream_More)[Stream_Video][0](Ztring().From_Local("FrameCount_Speed"), Info_Options)=_T("N NT");
+    (*Stream_More)[Stream_Video][0](Ztring().From_Local("FrameCount_Speed"), Info_Options)=__T("N NT");
 }
 
 } //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Dvdv.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Dvdv.cpp Changed

@@ -1,17 +1,17 @@
 // File_Dvdv - Info for DVD objects (IFO) files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -27,14 +27,18 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #include <vector>
 #ifdef SS
    #undef SS //Solaris defines this somewhere
@@ -339,11 +343,11 @@
 // Elements
 //***************************************************************************
 
-#define SUBELEMENT(_BYTES, _ELEMENT) \
+#define SUBELEMENT(_ELEMENT) \
     { \
-        Element_Begin(#_ELEMENT, _BYTES); \
+        Element_Begin1(#_ELEMENT); \
         _ELEMENT(); \
-        Element_End(); \
+        Element_End0(); \
     } \
 
 //---------------------------------------------------------------------------
@@ -351,12 +355,12 @@
 {
     int32u Sector_Pointer_LastSector, Sector_Pointer_TT_SRPT, Sector_Pointer_VMGM_PGCI_UT, Sector_Pointer_VMG_PTL_MAIT, Sector_Pointer_VMG_VTS_ATRT, Sector_Pointer_VMG_TXTDT_MG, Sector_Pointer_VMGM_C_ADT, Sector_Pointer_VMGM_VOBU_ADMAP;
     int16u Version, Audio_Count, Text_Count;
-    Element_Info("DVD Video - VMG");
-    Element_Begin("Header", 0x100);
-        Info_B4(LastSector,                                     "Last sector of VMG set (last sector of BUP)"); Param_Info((LastSector+1)*2048, " bytes");
+    Element_Info1("DVD Video - VMG");
+    Element_Begin1("Header");
+        Info_B4(LastSector,                                     "Last sector of VMG set (last sector of BUP)"); Param_Info2((LastSector+1)*2048, " bytes");
         Skip_XX(12,                                             "Unknown");
         Get_B4 (Sector_Pointer_LastSector,                      "last sector of IFO");
-        Get_B2 (Version,                                        "version number"); Param_Info(Ztring::ToZtring((Version&0x00F0)>>4)+_T(".")+Ztring::ToZtring(Version&0x000F));
+        Get_B2 (Version,                                        "version number"); Param_Info1(Ztring::ToZtring((Version&0x00F0)>>4)+__T(".")+Ztring::ToZtring(Version&0x000F));
         Info_B4(Category,                                       "VMG category");
         Skip_B2(                                                "number of volumes");
         Skip_B2(                                                "volume number");
@@ -378,40 +382,40 @@
         Get_B4 (Sector_Pointer_VMGM_C_ADT,                      "sector pointer to VMGM_C_ADT (menu cell address table)");
         Get_B4 (Sector_Pointer_VMGM_VOBU_ADMAP,                 "sector pointer to VMGM_VOBU_ADMAP (menu VOBU address map)");
         Skip_XX(32,                                             "Unknown");
-    Element_End();
+    Element_End0();
 
     //-VTSM
     VTS_Attributes_AreHere=true;
-    Element_Begin("VMGM (VMG for Menu)", 0x100);
-        Element_Begin("Video streams", 1*2);
-            Element_Info(1, " streams");
-            SUBELEMENT(2, Video)
-        Element_End();
-        Element_Begin("Audio streams", 8*8);
+    Element_Begin1("VMGM (VMG for Menu)");
+        Element_Begin1("Video streams");
+            Element_Info2(1, " streams");
+            SUBELEMENT(Video)
+        Element_End0();
+        Element_Begin1("Audio streams");
             Get_B2 (Audio_Count,                                "number of audio streams in VMGM_VOBS");
-            Element_Info(Audio_Count, " streams");
+            Element_Info2(Audio_Count, " streams");
             for (int16u Pos=0; Pos<8; Pos++)
             {
                 if (Pos<Audio_Count)
-                    SUBELEMENT(8, Audio)
+                    SUBELEMENT(Audio)
                 else
                     Skip_XX(8,                                  "Reserved for Audio");
             }
             Skip_XX(16,                                         "Unknown");
-        Element_End();
-        Element_Begin("Text streams", 1*6);
+        Element_End0();
+        Element_Begin1("Text streams");
             Get_B2 (Text_Count,                                 "number of subpicture streams in VMGM_VOBS");
-            Element_Info(Text_Count, " streams");
+            Element_Info2(Text_Count, " streams");
             for (int16u Pos=0; Pos<1; Pos++)
             {
                 if (Pos<Text_Count)
-                    SUBELEMENT(6, Text)
+                    SUBELEMENT(Text)
                 else
                     Skip_XX(6,                                  "Reserved for Text");
             }
             Skip_XX(164,                                        "Unknown");
-        Element_End();
-    Element_End();
+        Element_End0();
+    Element_End0();
     Skip_XX(2048-Element_Offset,                                "Junk");
 
     //Filling
@@ -444,18 +448,21 @@
     //Parsing
     int32u Sector_Pointer_LastSector, Sector_Pointer_VTS_PTT_SRPT, Sector_Pointer_VTS_PGCI, Sector_Pointer_VTSM_PGCI_UT, Sector_Pointer_VTS_TMAPTI, Sector_Pointer_VTSM_C_ADT, Sector_Pointer_VTSM_VOBU_ADMAP, Sector_Pointer_VTS_C_ADT, Sector_Pointer_VTS_VOBU_ADMAP;
     int16u Version, Audio_Count, Text_Count;
-    Element_Info("DVD Video - VTS (Video Title Set)");
-    Element_Begin("Header", 0x100);
-        Info_B4(LastSector,                                     "Last sector of Title set (last sector of BUP)"); Param_Info((LastSector+1)*2048, " bytes");
+    Element_Info1("DVD Video - VTS (Video Title Set)");
+    Element_Begin1("Header");
+        Info_B4(LastSector,                                     "Last sector of Title set (last sector of BUP)"); Param_Info2((LastSector+1)*2048, " bytes");
         Skip_XX(12,                                             "Unknown");
         Get_B4 (Sector_Pointer_LastSector,                      "last sector of IFO");
-        Get_B2 (Version,                                        "version number"); Param_Info(Ztring::ToZtring((Version&0x00F0)>>4)+_T(".")+Ztring::ToZtring(Version&0x000F));
-        Info_B4(Category,                                       "VTS category"); if (Category<2) Param_Info(IFO_VTS_Category[Category]);
+        Get_B2 (Version,                                        "version number"); Param_Info1(Ztring::ToZtring((Version&0x00F0)>>4)+__T(".")+Ztring::ToZtring(Version&0x000F));
+        Info_B4(Category,                                       "VTS category");
+        #if MEDIAINFO_TRACE
+            if (Category<2) Param_Info1(IFO_VTS_Category[Category]);
+        #endif //MEDIAINFO_TRACE
         Skip_XX(90,                                             "Unknown");
         Skip_B4(                                                "end byte address of VTS_MAT");
         Skip_XX(60,                                             "Unknown");
-        Info_B4(StartSector_Menu,                               "start sector of Menu VOB"); Param_Info((StartSector_Menu+1)*2048, " bytes");
-        Info_B4(StartSector_Title,                              "start sector of Title Vob"); Param_Info((StartSector_Title+1)*2048, " bytes");
+        Info_B4(StartSector_Menu,                               "start sector of Menu VOB"); Param_Info2((StartSector_Menu+1)*2048, " bytes");
+        Info_B4(StartSector_Title,                              "start sector of Title Vob"); Param_Info2((StartSector_Title+1)*2048, " bytes");
         Get_B4 (Sector_Pointer_VTS_PTT_SRPT,                    "sector pointer to VTS_PTT_SRPT (Table of Titles and Chapters)");
         Get_B4 (Sector_Pointer_VTS_PGCI,                        "sector pointer to VTS_PGCI (Title Program Chain table)");
         Get_B4 (Sector_Pointer_VTSM_PGCI_UT,                    "sector pointer to VTSM_PGCI_UT (Menu Program Chain table)");
@@ -465,82 +472,82 @@
         Get_B4 (Sector_Pointer_VTS_C_ADT,                       "sector pointer to VTS_C_ADT (Title set cell address table)");
         Get_B4 (Sector_Pointer_VTS_VOBU_ADMAP,                  "sector pointer to VTS_VOBU_ADMAP (Title set VOBU address map)");
         Skip_XX(24,                                             "Unknown");
-    Element_End();
+    Element_End0();
 
     //-VTSM
-    Element_Begin("VTSM (VTS for Menu, Vob 0)", 0x100);
-        Element_Begin("Video streams", 1*2);
-            Element_Info(1, " streams");
-            SUBELEMENT(2, Video)
-        Element_End();
-        Element_Begin("Audio streams", 8*8);
+    Element_Begin1("VTSM (VTS for Menu, Vob 0)");
+        Element_Begin1("Video streams");
+            Element_Info2(1, " streams");
+            SUBELEMENT(Video)
+        Element_End0();
+        Element_Begin1("Audio streams");
             Get_B2 (Audio_Count,                                "number of audio streams in VTSM_VOBS");
-            Element_Info(Audio_Count, " streams");
+            Element_Info2(Audio_Count, " streams");
             for (int16u Pos=0; Pos<8; Pos++)
             {
                 if (Pos<Audio_Count)
-                    SUBELEMENT(8, Audio)
+                    SUBELEMENT(Audio)
                 else
                     Skip_XX(8,                                  "Reserved for Audio");
             }
             Skip_XX(16,                                         "Unknown");
-        Element_End();
-        Element_Begin("Text streams", 1*6);
+        Element_End0();
+        Element_Begin1("Text streams");
             Get_B2 (Text_Count,                                 "number of subpicture streams in VTSM_VOBS");
-            Element_Info(Text_Count, " streams");
+            Element_Info2(Text_Count, " streams");
             for (int16u Pos=0; Pos<1; Pos++)
             {
                 if (Pos<Text_Count)
-                    SUBELEMENT(6, Text)
+                    SUBELEMENT(Text)
                 else
                     Skip_XX(6,                                  "Reserved for Text");
             }
             Skip_XX(164,                                        "Unknown");
-        Element_End();
-    Element_End();
+        Element_End0();
+    Element_End0();
 
     //-VTS
     VTS_Attributes_AreHere=true;
-    Element_Begin("VTS (VTS for movie, Vob 1-9)", 0x1D8);
-        Element_Begin("Video streams", 1*2);
-            Element_Info(1, " streams");
-            SUBELEMENT(2, Video)
-        Element_End();
-        Element_Begin("Audio streams", 8*8);
+    Element_Begin1("VTS (VTS for movie, Vob 1-9)");
+        Element_Begin1("Video streams");
+            Element_Info2(1, " streams");
+            SUBELEMENT(Video)
+        Element_End0();
+        Element_Begin1("Audio streams");
             Get_B2 (Audio_Count,                                "number of audio streams in VMGM_VOBS");
-            Element_Info(Audio_Count, " streams");
+            Element_Info2(Audio_Count, " streams");
             for (int16u Pos=0; Pos<8; Pos++)
             {
                 if (Pos<Audio_Count)
-                    SUBELEMENT(8, Audio)
+                    SUBELEMENT(Audio)
                 else
                     Skip_XX(8,                                  "Reserved for Audio");
             }
             Skip_XX(16,                                         "Unknown");
-        Element_End();
-        Element_Begin("Text streams", 32*6);
+        Element_End0();
+        Element_Begin1("Text streams");
             Get_B2 (Text_Count,                                 "number of subpicture streams in VMGM_VOBS");
-            Element_Info(Text_Count, " streams");
+            Element_Info2(Text_Count, " streams");
             for (int16u Pos=0; Pos<32; Pos++)
             {
                 if (Pos<Text_Count)
-                    SUBELEMENT(6, Text)
+                    SUBELEMENT(Text)
                 else
                     Skip_XX(6,                                  "Reserved for Text");
             }
             Skip_XX(2,                                          "Unknown");
-        Element_End();
-        Element_Begin("MultiChannel Info", 8*24);
-            Element_Info(Audio_Count, " streams");
+        Element_End0();
+        Element_Begin1("MultiChannel Info");
+            Element_Info2(Audio_Count, " streams");
             for (int16u Pos=0; Pos<8; Pos++)
             {
                 if (Pos<Audio_Count)
-                    SUBELEMENT(24, MultiChannel)
+                    SUBELEMENT(MultiChannel)
                 else
                     Skip_XX(24,                                 "Reserved for multichannel extension");
             }
-        Element_End();
-    Element_End();
+        Element_End0();
+    Element_End0();
     Skip_XX(2048-Element_Offset,                                "Junk");
 
     //Filling
@@ -549,6 +556,8 @@
 
         if (Version>0x001F)
             return;
+        if (Sector_Pointer_LastSector==(int32u)-1 || Sector_Pointer_LastSector+1>File_Size/2048)
+            Sector_Pointer_LastSector=(int32u)(File_Size/2048);
         Sectors.resize(Sector_Pointer_LastSector+1);
         if (Sector_Pointer_VTS_PTT_SRPT<=Sector_Pointer_LastSector)
             Sectors[Sector_Pointer_VTS_PTT_SRPT]=Sector_VTS_PTT_SRPT;
@@ -575,17 +584,17 @@
     //Parsing
     int32u Codec, Standard, AspectRatio, Resolution, BitRate_Mode;
     BS_Begin();
-    Get_BS (2, Codec,                                           "Coding mode"); Param_Info(IFO_CodecV[Codec]);
-    Get_BS (2, Standard,                                        "Standard"); Param_Info(IFO_Standard[Standard]);
-    Get_BS (2, AspectRatio,                                     "Aspect ratio"); Param_Info(IFO_AspectRatio[AspectRatio]);
-    Info_BS(1, Pan,                                             "Automatic Pan/Scan"); Param_Info(Pan?"No":"Yes");
-    Info_BS(1, Letter,                                          "Automatic Letterbox"); Param_Info(Letter?"No":"Yes");
+    Get_BS (2, Codec,                                           "Coding mode"); Param_Info1(IFO_CodecV[Codec]);
+    Get_BS (2, Standard,                                        "Standard"); Param_Info1(IFO_Standard[Standard]);
+    Get_BS (2, AspectRatio,                                     "Aspect ratio"); Param_Info1(IFO_AspectRatio[AspectRatio]);
+    Info_BS(1, Pan,                                             "Automatic Pan/Scan"); Param_Info1(Pan?"No":"Yes");
+    Info_BS(1, Letter,                                          "Automatic Letterbox"); Param_Info1(Letter?"No":"Yes");
     Skip_BS(1,                                                  "CC for line 21 field 1 in GOP (NTSC only)");
     Skip_BS(1,                                                  "CC for line 21 field 2 in GOP (NTSC only)");
-    Get_BS (3, Resolution,                                      "Resolution"); Param_Info(Ztring::ToZtring(IFO_Width[Resolution])+_T("x")+Ztring::ToZtring(IFO_Height[Standard][Resolution]));
-    Info_BS(1, Letterboxed,                                     "Letterboxed"); Param_Info(Letter?"Yes":"No");
-    Get_BS (1, BitRate_Mode,                                    "Bitrate mode"); Param_Info(IFO_BitRate_Mode[BitRate_Mode]);
-    Info_BS(1, Camera,                                          "Camera/Film"); Param_Info(Letter?"Film":"Camera");
+    Get_BS (3, Resolution,                                      "Resolution"); Param_Info1(Ztring::ToZtring(IFO_Width[Resolution])+__T("x")+Ztring::ToZtring(IFO_Height[Standard][Resolution]));
+    Info_BS(1, Letterboxed,                                     "Letterboxed"); Param_Info1(Letter?"Yes":"No");
+    Get_BS (1, BitRate_Mode,                                    "Bitrate mode"); Param_Info1(IFO_BitRate_Mode[BitRate_Mode]);
+    Info_BS(1, Camera,                                          "Camera/Film"); Param_Info1(Letter?"Film":"Camera");
     BS_End();
 
     //Filling
@@ -601,8 +610,8 @@
             Fill(Stream_Video, StreamPos_Last, Video_DisplayAspectRatio, IFO_AspectRatio[AspectRatio], 3, true);
             Fill(Stream_Video, StreamPos_Last, Video_FrameRate, IFO_FrameRate[Standard]);
             Fill(Stream_Video, StreamPos_Last, Video_BitRate_Mode, IFO_BitRate_Mode[BitRate_Mode]);
-            Fill(Stream_Video, StreamPos_Last, General_ID, _T("224"));
-            Fill(Stream_Video, StreamPos_Last, General_ID_String, _T("224 (0xE0)"), Unlimited, true);
+            Fill(Stream_Video, StreamPos_Last, General_ID, __T("224"));
+            Fill(Stream_Video, StreamPos_Last, General_ID_String, __T("224 (0xE0)"), Unlimited, true);
         }
     FILLING_END();
 }
@@ -615,20 +624,20 @@
     int32u Codec, LanguageType, Mode, Resolution, SamplingRate, Channels;
     int8u Language_Extension, ChannelsK=(int8u)-1;
     BS_Begin();
-    Get_BS (3, Codec,                                           "Coding mode"); Param_Info(IFO_CodecA[Codec]);
-    Info_BS(1, MultiChannel,                                    "Multichannel extension present"); Param_Info(MultiChannel?"Yes":"No");
-    Get_BS (2, LanguageType,                                    "Language type"); Param_Info(LanguageType==1?"2CC":"Unknown");
-    Get_BS (2, Mode,                                            "Application mode"); Param_Info(IFO_ModeA[Mode]);
-    Get_BS (2, Resolution,                                      "Resolution"); if (Codec==2 || Codec==3) Param_Info(IFO_ResolutionA[Resolution]); else if (Codec==4) Param_Info(Mode?"DRC":"No DRC");
-    Get_BS (2, SamplingRate,                                    "Sampling rate"); Param_Info(Ztring::ToZtring(IFO_SamplingRate[SamplingRate]));
-    Get_BS (4, Channels,                                        "Channels"); Param_Info(Channels+1, " channels");
+    Get_BS (3, Codec,                                           "Coding mode"); Param_Info1(IFO_CodecA[Codec]);
+    Info_BS(1, MultiChannel,                                    "Multichannel extension present"); Param_Info1(MultiChannel?"Yes":"No");
+    Get_BS (2, LanguageType,                                    "Language type"); Param_Info1(LanguageType==1?"2CC":"Unknown");
+    Get_BS (2, Mode,                                            "Application mode"); Param_Info1(IFO_ModeA[Mode]);
+    Get_BS (2, Resolution,                                      "Resolution"); Param_Info1C((Codec==2 || Codec==3), IFO_ResolutionA[Resolution]); Param_Info1C((Codec==4), Mode?"DRC":"No DRC");
+    Get_BS (2, SamplingRate,                                    "Sampling rate"); Param_Info1(Ztring::ToZtring(IFO_SamplingRate[SamplingRate]));
+    Get_BS (4, Channels,                                        "Channels"); Param_Info2(Channels+1, " channels");
     BS_End();
     Get_Local(3, Language,                                      "Language code");
     if (!Language.empty() && Language[0]>=0x80)
         Language.clear(); //this is 0xFF...
-    if (Language==_T("iw"))
-        Language=_T("he"); //Hebrew patch, is "iw" in DVDs
-    Get_B1 (Language_Extension,                                 "Language extension"); if (Language_Extension<8) Param_Info(IFO_Language_MoreA[Language_Extension]);
+    if (Language==__T("iw"))
+        Language=__T("he"); //Hebrew patch, is "iw" in DVDs
+    Get_B1 (Language_Extension,                                 "Language extension"); Param_Info1C((Language_Extension<8), IFO_Language_MoreA[Language_Extension]);
     Skip_B1(                                                    "Unknown");
     switch (Mode)
     {
@@ -638,11 +647,11 @@
             Skip_BS(1,                                          "Zero");
             Get_S1 (3, ChannelsK,                               "Channels");
                 #ifdef MEDIAINFO_AC3_YES
-                    Param_Info(AC3_ChannelPositions[ChannelsK]);
+                    Param_Info1(AC3_ChannelPositions[ChannelsK]);
                 #endif //MEDIAINFO_AC3_YES
             Skip_BS(2,                                          "Version");
-            Info_BS(1, MC,                                      "MC intro present"); Param_Info(MC?"Yes":"No");
-            Info_BS(1, Duet,                                    "Duet"); Param_Info(Duet?"Duet":"Solo");
+            Info_BS(1, MC,                                      "MC intro present"); Param_Info1(MC?"Yes":"No");
+            Info_BS(1, Duet,                                    "Duet"); Param_Info1(Duet?"Duet":"Solo");
             BS_End();
             }
             break;
@@ -650,7 +659,7 @@
             {
             BS_Begin();
             Skip_BS(4,                                          "Reserved");
-            Info_BS(1, DolbyDecode,                             "Suitable for Dolby surround decoding"); Param_Info(DolbyDecode?"Yes":"No");
+            Info_BS(1, DolbyDecode,                             "Suitable for Dolby surround decoding"); Param_Info1(DolbyDecode?"Yes":"No");
             Skip_BS(3,                                          "Reserved");
             BS_End();
             }
@@ -672,9 +681,9 @@
             Fill(Stream_Audio, StreamPos_Last, Audio_SamplingRate, IFO_SamplingRate[SamplingRate]);
             Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, Channels+1);
             if (Codec==3)
-                Fill(Stream_Audio, StreamPos_Last, Audio_Resolution, IFO_ResolutionA[Resolution]);
+                Fill(Stream_Audio, StreamPos_Last, Audio_BitDepth, IFO_ResolutionA[Resolution]);
             else if (Codec==4 && Mode)
-                Fill(Stream_Audio, StreamPos_Last, Audio_Resolution, "DRC");
+                Fill(Stream_Audio, StreamPos_Last, Audio_BitDepth, "DRC");
             Fill(Stream_Audio, StreamPos_Last, Audio_Language, Language);
             if (Language_Extension<8)
                 Fill(Stream_Audio, StreamPos_Last, Audio_Language_More, IFO_Language_MoreA[Language_Extension]);
@@ -697,17 +706,17 @@
     int32u Codec, LanguageType;
     int8u Language_Extension;
     BS_Begin();
-    Get_BS (3, Codec,                                           "Coding mode"); Param_Info(IFO_CodecT[Codec]);
+    Get_BS (3, Codec,                                           "Coding mode"); Param_Info1(IFO_CodecT[Codec]);
     Skip_BS(3,                                                  "Reserved");
-    Get_BS (2, LanguageType,                                    "Language type"); Param_Info(LanguageType==1?"2CC":"Unknown");
+    Get_BS (2, LanguageType,                                    "Language type"); Param_Info1(LanguageType==1?"2CC":"Unknown");
     BS_End();
     Skip_B1(                                                    "Reserved");
     Get_Local(3, Language,                                      "Language code");
     if (!Language.empty() && Language[0]>=0x80)
         Language.clear(); //this is 0xFF...
-    if (Language==_T("iw"))
-        Language=_T("he"); //Hebrew patch, is "iw" in DVDs
-    Get_B1 (Language_Extension,                                 "Language extension"); if (Language_Extension<16) Param_Info(IFO_Language_MoreT[Language_Extension]);
+    if (Language==__T("iw"))
+        Language=__T("he"); //Hebrew patch, is "iw" in DVDs
+    Get_B1 (Language_Extension,                                 "Language extension"); Param_Info1C((Language_Extension<16), IFO_Language_MoreT[Language_Extension]);
 
     //Filling
     FILLING_BEGIN();
@@ -715,7 +724,7 @@
         {
             Stream_Prepare(Stream_Text);
             Fill(Stream_Text, StreamPos_Last, Text_Format, IFO_Format_T[Codec]);
-            Fill(Stream_Text, StreamPos_Last, Text_Resolution, IFO_Resolution_T[Codec]);
+            Fill(Stream_Text, StreamPos_Last, Text_BitDepth, IFO_Resolution_T[Codec]);
             Fill(Stream_Text, StreamPos_Last, Text_Codec, IFO_CodecT[Codec]);
             Fill(Stream_Text, StreamPos_Last, Text_Language, Language);
 
@@ -730,35 +739,35 @@
 {
     //Parsing
     BS_Begin();
-    Element_Begin("ACH0", 1);
+    Element_Begin1("ACH0");
         Skip_BS(7,                                              "Reserved");
         Skip_BS(1,                                              "ACH0 Guide Melody exists");
-    Element_End();
-    Element_Begin("ACH1", 1);
+    Element_End0();
+    Element_Begin1("ACH1");
         Skip_BS(7,                                              "Reserved");
         Skip_BS(1,                                              "ACH1 Guide Melody exists");
-    Element_End();
-    Element_Begin("ACH2", 1);
+    Element_End0();
+    Element_Begin1("ACH2");
         Skip_BS(4,                                              "Reserved");
         Skip_BS(1,                                              "ACH2 Guide Vocal 1 exists");
         Skip_BS(1,                                              "ACH2 Guide Vocal 2 exists");
         Skip_BS(1,                                              "ACH2 Guide Melody 1 exists");
         Skip_BS(1,                                              "ACH2 Guide Melody 2 exists");
-    Element_End();
-    Element_Begin("ACH3", 1);
+    Element_End0();
+    Element_Begin1("ACH3");
         Skip_BS(4,                                              "Reserved");
         Skip_BS(1,                                              "ACH3 Guide Vocal 1 exists");
         Skip_BS(1,                                              "ACH3 Guide Vocal 2 exists");
         Skip_BS(1,                                              "ACH3 Guide Melody A exists");
         Skip_BS(1,                                              "ACH3 Sound Effect A exists");
-    Element_End();
-    Element_Begin("ACH4", 1);
+    Element_End0();
+    Element_Begin1("ACH4");
         Skip_BS(4,                                              "Reserved");
         Skip_BS(1,                                              "ACH4 Guide Vocal 1 exists");
         Skip_BS(1,                                              "ACH4 Guide Vocal 2 exists");
         Skip_BS(1,                                              "ACH4 Guide Melody B exists");
         Skip_BS(1,                                              "ACH4 Sound Effect B exists");
-    Element_End();
+    Element_End0();
     BS_End();
     Skip_XX(19,                                                 "Unknown");
 }
@@ -825,30 +834,30 @@
 
     //Parsing
     int32u Element_RealSize;
-    Element_Begin("Header", 8);
+    Element_Begin1("Header");
         Skip_B2(                                                "Count of elements");
         Skip_B2(                                                "Unknown");
         Get_B4 (Element_RealSize,                               "End address");
         Element_RealSize++; //Last byte
-    Element_End();
-    Element_Begin("Extra data");
+    Element_End0();
+    Element_Begin1("Extra data");
         int32u Offset;
         Get_B4 (Offset,                                         "Offset of first element");
         int64u Extra_Size=Offset-Element_Offset;
         if (Extra_Size>0)
             Skip_XX(Extra_Size,                                 "Extra data (Unknown)");
-    Element_End(Extra_Size);
+    Element_End0();
 
     //For each chapter
     while (Element_Offset<Element_RealSize)
     {
         //VTS_PTT
         int16u PGCN, PGN;
-        Element_Begin(4);
+        Element_Begin0();
         Get_B2 (PGCN,                                           "Program Chain (PGCN)");
         Get_B2 (PGN,                                            "Program (PGN)");
-        Element_Name("Chapter"); Element_Info(Ztring::ToZtring(PGCN)); Element_Info(Ztring::ToZtring(PGN));
-        Element_End();
+        Element_Name("Chapter"); Element_Info1(Ztring::ToZtring(PGCN)); Element_Info1(Ztring::ToZtring(PGN));
+        Element_End0();
     }
 }
 
@@ -859,25 +868,25 @@
 
     //Parsing
     int32u EndAddress;
-    Element_Begin("Header");
+    Element_Begin1("Header");
         int32u Offset;
         Skip_B2(                                                "Number of Program Chains");
         Skip_B2(                                                "Reserved");
         Get_B4 (EndAddress,                                     "End address");
         if (EndAddress>=Element_Size)
             EndAddress=(int32u)Element_Size-1;
-        Element_Begin("PGC category", 4);
+        Element_Begin1("PGC category");
             BS_Begin();
             Skip_BS(1,                                          "entry PGC");
             Skip_BS(7,                                          "title number");
             BS_End();
             Skip_B1(                                            "Unknown");
             Skip_B2(                                            "parental management mask");
-        Element_End();
+        Element_End0();
         Get_B4 (Offset,                                         "offset to VTS_PGC - relative to VTS_PGCI");
         if (Offset-16>0)
             Skip_XX(Offset-16,                                  "Unknown");
-    Element_End(Offset);
+    Element_End0();
 
     //For each Program
     //DETAILLEVEL_SET(1.0);
@@ -894,7 +903,7 @@
 
     //Parsing
     int16u LU_Count;
-    Element_Begin("Header");
+    Element_Begin1("Header");
         int32u EndAddress, Offset;
         int8u Flags;
         Get_B2 (LU_Count,                                       "Number of Language Units");
@@ -912,26 +921,26 @@
         Get_B4 (Offset,                                         "Offset to VTSM_LU relative to VTSM_PGCI_UT");
         if (Offset-16>0)
             Skip_XX(Offset-16,                                  "Unknown");
-    Element_End(Offset);
+    Element_End0();
 
     for (int16u LU_Pos=0; LU_Pos<LU_Count; LU_Pos++)
     {
-        Element_Begin("Language Unit");
+        Element_Begin1("Language Unit");
         int32u LU_Size;
         int16u PGC_Count;
-        Element_Begin("Header");
+        Element_Begin1("Header");
             Get_B2 (PGC_Count,                                  "Number of Program Chains");
             Skip_B2(                                            "Reserved");
             Get_B4 (LU_Size,                                    "end address (last byte of last PGC in this LU) relative to VTSM_LU");
             LU_Size++; //Last byte
-            Element_Begin("PGC category", 4);
+            Element_Begin1("PGC category");
                 int32u EntryPGC;
                 BS_Begin();
                 Get_BS (1, EntryPGC,                            "Entry PGC");
                 Skip_BS(3,                                      "Unknown");
                 if (EntryPGC)
                 {
-                    Info_BS(4, MenuType,                        "menu type"); Param_Info(IFO_MenuType[MenuType]);
+                    Info_BS(4, MenuType,                        "menu type"); Param_Info1(IFO_MenuType[MenuType]);
                 }
                 else
                 {
@@ -940,15 +949,15 @@
                 BS_End();
                 Skip_B1(                                        "Unknown");
                 Skip_B2(                                        "parental management mask");
-            Element_End();
+            Element_End0();
             Get_B4 (Offset,                                     "offset to VTSM_PGC relative to VTSM_LU");
             if (Offset-16>0)
                 Skip_XX(Offset-16,                              "Unknown");
-        Element_End();
+        Element_End0();
         for (int16u PGC_Pos=0; PGC_Pos<PGC_Count; PGC_Pos++)
             PGC(Element_Offset);
 
-        Element_End();
+        Element_End0();
     }
 }
 
@@ -958,7 +967,7 @@
     Element_Name("Time map");
 
     //Parsing
-    Element_Begin("Header", 8);
+    Element_Begin1("Header");
         int32u EndAddress, Offset;
         Skip_B2(                                                "Number of program chains");
         Skip_B2(                                                "Reserved");
@@ -968,13 +977,13 @@
         Get_B4 (Offset,                                         "Offset to VTS_TMAP 1");
         if (Offset-12>0)
             Skip_XX(Offset-12,                                  "Unknown");
-    Element_End();
+    Element_End0();
 
     //DETAILLEVEL_SET(1.0);
     while (Element_Offset<=EndAddress)
     {
         //VTS_TMAP
-        Element_Begin("Time Map");
+        Element_Begin1("Time Map");
         //std::vector<size_t> Sector_Times;
         int8u Sector_Times_SecondsPerTime;
         int16u Count;
@@ -985,17 +994,17 @@
         BS_Begin();
         for (int16u Pos=0; Pos<Count; Pos++)
         {
-            Element_Begin("Sector Offset", 4);
+            Element_Begin1("Sector Offset");
             int32u SectorOffset;
             Skip_BS( 1,                                         "discontinuous with previous");
             Get_BS (31, SectorOffset,                           "Sector offset within VOBS of nearest VOBU");
-            //Get_B4 (Sector_Times[Pos],                          Sector offset within VOBS of nearest VOBU);// Param_Info(Ztring().Duration_From_Milliseconds((Pos+1)*Sectors_Times_SecondsPerTime[Program_Pos]));
+            //Get_B4 (Sector_Times[Pos],                          Sector offset within VOBS of nearest VOBU);// Param_Info1(Ztring().Duration_From_Milliseconds((Pos+1)*Sectors_Times_SecondsPerTime[Program_Pos]));
             //Sector_Times[Pos]&=0x7FFFFFFF; //bit 31 is set if VOBU time codes are discontinuous with previous
-            Element_Info(SectorOffset);
-            Element_End();
+            Element_Info1(SectorOffset);
+            Element_End0();
         }
         BS_End();
-        Element_End();
+        Element_End0();
 
         //Filling
         //Sectors_Times.push_back(Sector_Times);
@@ -1010,25 +1019,25 @@
 
     //Parsing
     int32u EndAddress;
-    Element_Begin("Header", 8);
+    Element_Begin1("Header");
         Skip_B2(                                                "Number of cells");
         Skip_B2(                                                "Reserved");
         Get_B4 (EndAddress,                                     "End address");
         if (EndAddress>=Element_Size)
             EndAddress=(int32u)Element_Size-1;
-    Element_End();
+    Element_End0();
 
     //DETAILLEVEL_SET(1.0);
     while (Element_Offset<=EndAddress)
     {
         //ADT
-        Element_Begin("Entry", 12);
+        Element_Begin1("Entry");
         Skip_B2(                                                "VOBidn");
         Skip_B1(                                                "CELLidn");
         Skip_B1(                                                "Unknown");
         Skip_B4(                                                "Starting sector within VOB");
         Skip_B4(                                                "Ending sector within VOB");
-        Element_End();
+        Element_End0();
     }
 }
 
@@ -1039,11 +1048,11 @@
 
     //Parsing
     int32u EndAddress;
-    Element_Begin("Header", 4);
+    Element_Begin1("Header");
         Get_B4 (EndAddress,                                     "End address");
         if (EndAddress>=Element_Size)
             EndAddress=(int32u)Element_Size-1;
-    Element_End();
+    Element_End0();
 
     //DETAILLEVEL_SET(1.0);
     while (Element_Offset<=EndAddress)
@@ -1060,28 +1069,28 @@
 
     //Parsing
     int32u EndAddress;
-    Element_Begin("Header", 8);
+    Element_Begin1("Header");
         Skip_B2(                                                "Number of cells");
         Skip_B2(                                                "Reserved");
         Get_B4 (EndAddress,                                     "End address");
         if (EndAddress>=Element_Size)
             EndAddress=(int32u)Element_Size-1;
-    Element_End();
+    Element_End0();
 
     //DETAILLEVEL_SET(1.0);
     while (Element_Offset<=EndAddress)
     {
         //ADT
-        Element_Begin("Entry", 12);
+        Element_Begin1("Entry");
         int32u Start, End;
         int16u VOBidn;
         int8u CELLidn;
         Get_B2 (VOBidn,                                         "VOBidn");
         Get_B1 (CELLidn,                                        "CELLidn");
         Skip_B1(                                                "Unknown");
-        Get_B4 (Start,                                          "Starting sector within VOB"); Param_Info(Time_ADT(Start));
-        Get_B4 (End,                                            "Ending sector within VOB"); Param_Info(Time_ADT(End));
-        Element_End();
+        Get_B4 (Start,                                          "Starting sector within VOB"); Param_Info1(Time_ADT(Start));
+        Get_B4 (End,                                            "Ending sector within VOB"); Param_Info1(Time_ADT(End));
+        Element_End0();
 
         //Filling
         FILLING_BEGIN();
@@ -1097,11 +1106,11 @@
 
     //Parsing
     int32u EndAddress;
-    Element_Begin("Header", 4);
+    Element_Begin1("Header");
         Get_B4 (EndAddress,                                     "End address");
         if (EndAddress>=Element_Size)
             EndAddress=(int32u)Element_Size-1;
-    Element_End();
+    Element_End0();
 
     //DETAILLEVEL_SET(1.0);
     while (Element_Offset<Element_Size)
@@ -1157,26 +1166,29 @@
     */
 }
 
-void File_Dvdv::Time_BCD(const Ztring &Name)
+void File_Dvdv::Get_Duration(int64u  &Duration, const Ztring &Name)
 {
     int32u FrameRate, FF;
     int8u HH, MM, SS;
-    Element_Begin(Name, 4);
-        Get_B1 (HH,                                     "hh (BCD)");
-        Get_B1 (MM,                                     "mm (BCD)");
-        Get_B1 (SS,                                     "ss (BCD)");
+    Element_Begin1(Name);
+        Get_B1 (HH,                                     "Hours (BCD)");
+        Get_B1 (MM,                                     "Minutes (BCD)");
+        Get_B1 (SS,                                     "Seconds (BCD)");
         BS_Begin();
-        Get_BS (2, FrameRate,                           "framerate (BCD)"); Param_Info(IFO_PlaybackTime_FrameRate[FrameRate], " fps");
-        Get_BS (6, FF,                                  "ff (BCD)");
+        Get_BS (2, FrameRate,                           "Frame rate"); Param_Info2(IFO_PlaybackTime_FrameRate[FrameRate], " fps");
+        Get_BS (6, FF,                                  "Frames (BCD)");
         BS_End();
-        Time_String=Ztring::ToZtring(HH, 16)+_T(":") //BCD
-                  + Ztring::ToZtring(MM, 16)+_T(":") //BCD
-                  + Ztring::ToZtring(SS, 16)+_T(".") //BCD
-                  + Ztring::ToZtring(Ztring::ToZtring(FF, 16).To_int32u()*1000/IFO_PlaybackTime_FrameRate[FrameRate], 10); //BCD
-        Element_Info(Time_String);
-    Element_End();
+
+        Duration= Ztring::ToZtring(HH, 16).To_int64u() * 60 * 60 * 1000 //BCD
+                + Ztring::ToZtring(MM, 16).To_int64u()      * 60 * 1000 //BCD
+                + Ztring::ToZtring(SS, 16).To_int64u()           * 1000 //BCD
+                + Ztring::ToZtring(FF, 16).To_int64u()           * 1000/IFO_PlaybackTime_FrameRate[FrameRate]; //BCD
+
+        Element_Info1(Ztring::ToZtring(Duration));
+    Element_End0();
 }
 
+
 void File_Dvdv::PGC(int64u Offset, bool Title)
 {
         vector<int8u> Stream_Control_Audio;
@@ -1184,18 +1196,21 @@
         vector<int8u> Stream_Control_SubPicture_Wide;
         vector<int8u> Stream_Control_SubPicture_Letterbox;
         vector<int8u> Stream_Control_SubPicture_PanScan;
+        vector<int64u> CellDurations;
+        vector<int8u> ProgramMap;
 
         //VTS_PGC
-        Element_Begin("PGC");
+        Element_Begin1("PGC");
         int16u commands, program_map, cell_playback, cell_position;
         int8u Program_Count;
-        Element_Begin("Header", 236);
+        Element_Begin1("Header");
             int32u Flags;
             int8u Cells;
+            int64u TotalDuration;
             Skip_B2(                                            "Unknown");
             Get_B1 (Program_Count,                              "number of programs");
             Get_B1 (Cells,                                      "number of cells");
-            Time_BCD("playback time");
+            Get_Duration(TotalDuration,                         "Duration");
             Get_B4 (Flags,                                      "prohibited user ops");
                 /*Skip_Flags(Flags,  0,                           "Time play or search");
                 Skip_Flags(Flags,  1, PTT play or search);
@@ -1222,6 +1237,7 @@
                 Skip_Flags(Flags, 22, Angle change);
                 Skip_Flags(Flags, 23, Karaoke audio mix change);
                 Skip_Flags(Flags, 24, Video presentation mode change);
+                */
                 /*
                 Skip_Flags(Flags,  0, Video presentation mode change);
                 Skip_Flags(Flags,  1, Karaoke audio mix change);
@@ -1249,11 +1265,11 @@
                 Skip_Flags(Flags, 23, PTT play or search);
                 Skip_Flags(Flags, 24,                               Time play or search);
                 */
-            Element_Begin("Audio Stream Controls", 8*2);
+            Element_Begin1("Audio Stream Controls");
             for (size_t Pos=0; Pos<8; Pos++)
             {
-                Element_Begin("Audio Stream Control", 2);
-                Element_Info(Ztring::ToZtring(Pos));
+                Element_Begin1("Audio Stream Control");
+                Element_Info1(Ztring::ToZtring(Pos));
                 int8u Number;
                 bool  Available;
                 BS_Begin();
@@ -1261,7 +1277,7 @@
                 Get_S1 (7, Number,                              "Stream number");
                 BS_End();
                 Skip_B1(                                        "Reserved");
-                Element_End();
+                Element_End0();
                 if (Available)
                     Stream_Control_Audio.push_back(Number);
 
@@ -1271,23 +1287,23 @@
                         Stream_Prepare(Stream_Audio);
 
                     int8u ToAdd=0;
-                    if (Retrieve(Stream_Audio, Pos, Audio_Format)==_T("AC-3"))
+                    if (Retrieve(Stream_Audio, Pos, Audio_Format)==__T("AC-3"))
                         ToAdd=0x80;
-                    if (Retrieve(Stream_Audio, Pos, Audio_Format)==_T("DTS"))
+                    if (Retrieve(Stream_Audio, Pos, Audio_Format)==__T("DTS"))
                         ToAdd=0x88;
-                    if (Retrieve(Stream_Audio, Pos, Audio_Format)==_T("LPCM"))
+                    if (Retrieve(Stream_Audio, Pos, Audio_Format)==__T("LPCM"))
                         ToAdd=0xA0;
-                    Ztring ID_String; ID_String.From_Number(ToAdd+Number); ID_String+=_T(" (0x"); ID_String+=Ztring::ToZtring(ToAdd+Number, 16); ID_String+=_T(")");
+                    Ztring ID_String; ID_String.From_Number(ToAdd+Number); ID_String+=__T(" (0x"); ID_String+=Ztring::ToZtring(ToAdd+Number, 16); ID_String+=__T(")");
                     Fill(Stream_Audio, Pos, Audio_ID, ID_String);
                     Fill(Stream_Audio, Pos, Audio_ID_String, ID_String, true);
                 }
             }
-            Element_End();
-            Element_Begin("Subpicture Stream Controls", 32*4);
+            Element_End0();
+            Element_Begin1("Subpicture Stream Controls");
             for (size_t Pos=0; Pos<32; Pos++)
             {
-                Element_Begin("Subpicture Stream Control", 4);
-                Element_Info(Ztring::ToZtring(Pos));
+                Element_Begin1("Subpicture Stream Control");
+                Element_Info1(Ztring::ToZtring(Pos));
                 int8u Number_43, Number_Wide, Number_Letterbox, Number_PanScan;
                 bool  Available;
                 BS_Begin();
@@ -1297,7 +1313,7 @@
                 Get_B1 (Number_Wide,                            "Stream number for Wide");
                 Get_B1 (Number_Letterbox,                       "Stream number for Letterbox");
                 Get_B1 (Number_PanScan,                         "Stream number for Pan&Scan");
-                Element_End();
+                Element_End0();
                 if (Available)
                 {
                     Stream_Control_SubPicture_43.push_back(Number_43);
@@ -1311,35 +1327,42 @@
                     while (Pos>Count_Get(Stream_Text))
                         Stream_Prepare(Stream_Text);
 
-                    Ztring ID_String; ID_String.From_Number(0x20+Number_Wide); ID_String+=_T(" (0x"); ID_String+=Ztring::ToZtring(0x20+Number_Wide, 16); ID_String+=_T(")");
+                    Ztring ID_String; ID_String.From_Number(0x20+Number_Wide); ID_String+=__T(" (0x"); ID_String+=Ztring::ToZtring(0x20+Number_Wide, 16); ID_String+=__T(")");
                     Fill(Stream_Text, Pos, Text_ID, ID_String);
                     Fill(Stream_Text, Pos, Text_ID_String, ID_String, true);
                 }
             }
-            Element_End();
+            Element_End0();
             Skip_B2(                                            "next PGCN");
             Skip_B2(                                            "previous PGCN");
             Skip_B2(                                            "goup PGCN");
             Skip_B1(                                            "PGC still time - 255=infinite");
             Skip_B1(                                            "PG playback mode");
-            Element_Begin("palette", 16*4);
+            Element_Begin1("palette");
             for (int Pos=0; Pos<16; Pos++)
             {
                 Skip_B4(                                        "palette (0 - Y - Cr - Cb)");
             }
-            Element_End();
+            Element_End0();
             Get_B2 (commands,                                   "offset within PGC to commands");
             Get_B2 (program_map,                                "offset within PGC to program map");
             Get_B2 (cell_playback,                              "offset within PGC to cell playback information table");
             Get_B2 (cell_position,                              "offset within PGC to cell position information table");
-        Element_End();
+        Element_End0();
 
         //commands
         if (commands>0)
         {
             if (Element_Offset<Offset+commands)
+            {
+                if (Offset+commands>Element_Size)
+                {
+                    Skip_XX(Element_Size-Element_Offset,            "Unknown");
+                    return;
+                }
                 Skip_XX(Offset+commands-Element_Offset,             "Unknown");
-            Element_Begin("commands");
+            }
+            Element_Begin1("commands");
             int16u PreCommands_Count, PostCommands_Count, CellCommands_Count, EndAdress;
             Get_B2 (PreCommands_Count,                          "Number of pre commands");
             Get_B2 (PostCommands_Count,                         "Number of post commands");
@@ -1347,38 +1370,38 @@
             Get_B2 (EndAdress,                                  "End address relative to command table");
             if (PreCommands_Count>0)
             {
-                Element_Begin("Pre commands", PreCommands_Count*8);
+                Element_Begin1("Pre commands");
                     for (int16u Pos=0; Pos<PreCommands_Count; Pos++)
                     {
-                        Element_Begin("Pre command", 8);
+                        Element_Begin1("Pre command");
                         Skip_XX(8,                              "Pre command");
-                        Element_End();
+                        Element_End0();
                     }
-                Element_End();
+                Element_End0();
             }
             if (PostCommands_Count>0)
             {
-                Element_Begin("Post commands", PreCommands_Count*8);
-                    for (int16u Pos=0; Pos<PreCommands_Count; Pos++)
+                Element_Begin1("Post commands");
+                    for (int16u Pos=0; Pos<PostCommands_Count; Pos++)
                     {
-                        Element_Begin("Post command", 8);
+                        Element_Begin1("Post command");
                         Skip_XX(8,                              "Post command");
-                        Element_End();
+                        Element_End0();
                     }
-                Element_End();
+                Element_End0();
             }
             if (CellCommands_Count>0)
             {
-                Element_Begin("Cell commands", PreCommands_Count*8);
-                    for (int16u Pos=0; Pos<PreCommands_Count; Pos++)
+                Element_Begin1("Cell commands");
+                    for (int16u Pos=0; Pos<CellCommands_Count; Pos++)
                     {
-                        Element_Begin("Cell command", 8);
+                        Element_Begin1("Cell command");
                         Skip_XX(8,                              "Cell command");
-                        Element_End();
+                        Element_End0();
                     }
-                Element_End();
+                Element_End0();
             }
-            Element_End(EndAdress+1);
+            Element_End0();
         }
 
         //program map
@@ -1386,14 +1409,17 @@
         {
             if (Element_Offset<Offset+program_map)
                 Skip_XX(Offset+program_map-Element_Offset,          "Unknown");
-            Element_Begin("program map", Program_Count*1);
+            Element_Begin1("program map");
             for (int8u Pos=0; Pos<Program_Count; Pos++)
             {
-                Element_Begin("Entry", 8);
-                Skip_B1(                                        "Entry cell number");
-                Element_End();
+                Element_Begin1("Entry");
+                int8u entry;
+                Get_B1( entry,  "Entry cell number");
+                ProgramMap.push_back(entry);
+                //Skip_B1(                                        "Entry cell number");
+                Element_End0();
             }
-            Element_End();
+            Element_End0();
         }
 
         //cell playback
@@ -1401,20 +1427,23 @@
         {
             if (Element_Offset<Offset+cell_playback)
                 Skip_XX(Offset+cell_playback-Element_Offset,        "Unknown");
-            Element_Begin("cell playback", Cells*24);
+            Element_Begin1("cell playback");
             for (int8u Pos=0; Pos<Cells; Pos++)
             {
-                Element_Begin("cell", 24);
+                int64u CellDuration;
+                Element_Begin1("cell");
                 Skip_XX(4,                                      "ToDo");
-                Time_BCD("Time");
+                Get_Duration(CellDuration,                      "Time");
                 Skip_B4(                                        "first VOBU start sector");
                 Skip_B4(                                        "first ILVU end sector");
                 Skip_B4(                                        "last VOBU start sector");
                 Skip_B4(                                        "last VOBU end sector");
-                Element_Info(Ztring::ToZtring(Pos)); Element_Info(Time_String);
-                Element_End();
+                Element_Info1(Ztring::ToZtring(Pos)); Element_Info1(Ztring::ToZtring(CellDuration));
+                Element_End0();
+
+                CellDurations.push_back(CellDuration);
             }
-            Element_End();
+            Element_End0();
         }
 
         //cell position
@@ -1422,24 +1451,47 @@
         {
             if (Element_Offset<Offset+cell_position)
                 Skip_XX(Offset+cell_position-Element_Offset,        "Unknown");
-            Element_Begin("cell position", Cells*4);
+            Element_Begin1("cell position");
             for (int8u Pos=0; Pos<Cells; Pos++)
             {
-                Element_Begin("cell", 4);
+                Element_Begin1("cell");
                 Skip_B2(                                        "VOBid");
                 Skip_B1(                                        "reserved");
                 Skip_B1(                                        "Cell id");
-                Element_End();
+                Element_End0();
             }
-            Element_End();
+            Element_End0();
         }
 
-        Element_End(Element_Offset-Offset);
+        Element_End0();
 
-        //FILLING_BEGIN();
+        FILLING_BEGIN();
             if (Title)
             {
                 Stream_Prepare(Stream_Menu);
+
+                int64u ProgramTotalDuration=0;
+                Fill(Stream_Menu, StreamPos_Last, Menu_Chapters_Pos_Begin, Count_Get(Stream_Menu, StreamPos_Last), 10, true);
+                for (int8u Pos=0; Pos<ProgramMap.size(); Pos++)
+                {
+                    Fill(StreamKind_Last, StreamPos_Last, Ztring().Duration_From_Milliseconds(ProgramTotalDuration).To_Local().c_str(), Ztring(__T("Chapter "))+Ztring::ToZtring(Pos+1));
+
+                    int8u End;
+                    if (Pos+1>=Program_Count)
+                        End=Cells+1;
+                    else
+                        End=ProgramMap[Pos+1];
+
+                    int64u ProgramDuration=0;
+                    if (Pos<ProgramMap.size())
+                        for (int8u CellPos=ProgramMap[Pos]; CellPos<End; CellPos++)
+                            if (CellPos && CellPos<=CellDurations.size())
+                                ProgramDuration+=CellDurations[CellPos-1];
+                    ProgramTotalDuration+=ProgramDuration;
+                }
+                Fill(Stream_Menu, StreamPos_Last, Menu_Chapters_Pos_End, Count_Get(Stream_Menu, StreamPos_Last), 10, true);
+                Fill(Stream_Menu, StreamPos_Last, Menu_Duration, TotalDuration);
+
                 for (size_t Pos=0; Pos<Stream_Control_Audio.size(); Pos++)
                 {
                     Fill(StreamKind_Last, StreamPos_Last, "List (Audio)", Stream_Control_Audio[Pos]);
@@ -1461,7 +1513,7 @@
                     Fill(StreamKind_Last, StreamPos_Last, "List (Subtitles Pan&Scan)", Stream_Control_SubPicture_PanScan[Pos]);
                 }
             }
-        //FILLING_END();
+        FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -1489,7 +1541,7 @@
 
     //Parsing
     int32u EndAddress;
-    Element_Begin("Header");
+    Element_Begin1("Header");
         int32u Offset;
         Skip_B4(                                                "Number of title sets");
         Get_B4 (EndAddress,                                     "End address");
@@ -1498,23 +1550,23 @@
         Get_B4 (Offset,                                         "Offset to VTSM_LU relative to VTSM_PGCI_UT");
         if (Offset-12>0)
             Skip_XX(Offset-12,                                  "Unknown");
-    Element_End(Offset);
+    Element_End0();
 
     while (Element_Offset<=EndAddress)
     {
-        Element_Begin("VTS_ATRT");
-            Element_Begin("Header", 4);
+        Element_Begin1("VTS_ATRT");
+            Element_Begin1("Header");
                 int32u Size;
-                Get_B4 (Size,                                   "End adress");
+                Get_B4 (Size,                                   "End address");
                 Size++; //Last byte
-            Element_End();
-            Element_Begin("Copy of VTS Category", 4);
+            Element_End0();
+            Element_Begin1("Copy of VTS Category");
                 Skip_B4(                                        "VTS Category");
-            Element_End();
-            Element_Begin("Copy of VTS attributes", Size-8);
+            Element_End0();
+            Element_Begin1("Copy of VTS attributes");
                 Skip_XX(Size-8,                                 "VTS attributes");
-            Element_End();
-        Element_End(Size);
+            Element_End0();
+        Element_End0();
     }
 }
 
@@ -1539,4 +1591,3 @@
 } //NameSpace
 
 #endif //MEDIAINFO_DVDV_YES
-

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Dvdv.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Dvdv.h Changed

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Dxw.cpp Added

@@ -0,0 +1,211 @@
+// File_Dxw - Info for DXW files
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_DXW_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Multiple/File_Dxw.h"
+#include "MediaInfo/MediaInfo.h"
+#include "MediaInfo/MediaInfo_Internal.h"
+#include "MediaInfo/Multiple/File__ReferenceFilesHelper.h"
+#include "ZenLib/Dir.h"
+#include "ZenLib/FileName.h"
+#include "ZenLib/Format/Http/Http_Utils.h"
+#include "tinyxml2.h"
+using namespace tinyxml2;
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File_Dxw::File_Dxw()
+:File__Analyze()
+{
+    #if MEDIAINFO_EVENTS
+        ParserIDs[0]=MediaInfo_Parser_None; //TODO
+        StreamIDs_Width[0]=sizeof(size_t)*2;
+    #endif //MEDIAINFO_EVENTS
+    #if MEDIAINFO_DEMUX
+        Demux_EventWasSent_Accept_Specific=true;
+    #endif //MEDIAINFO_DEMUX
+
+    //Temp
+    ReferenceFiles=NULL;
+}
+
+//---------------------------------------------------------------------------
+File_Dxw::~File_Dxw()
+{
+    delete ReferenceFiles; //ReferenceFiles=NULL;
+}
+
+//***************************************************************************
+// Streams management
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Dxw::Streams_Finish()
+{
+    if (ReferenceFiles==NULL)
+        return;
+
+    ReferenceFiles->ParseReferences();
+}
+
+//***************************************************************************
+// Buffer - Global
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_SEEK
+size_t File_Dxw::Read_Buffer_Seek (size_t Method, int64u Value, int64u ID)
+{
+    if (ReferenceFiles==NULL)
+        return 0;
+
+    return ReferenceFiles->Read_Buffer_Seek(Method, Value, ID);
+}
+#endif //MEDIAINFO_SEEK
+
+//***************************************************************************
+// Buffer - File header
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_Dxw::FileHeader_Begin()
+{
+    XMLDocument document;
+    if (!FileHeader_Begin_XML(document))
+       return false;
+
+    {
+        XMLElement* Root=document.FirstChildElement("indexFile");
+        if (Root)
+        {
+            const char* Attribute=Root->Attribute("xmlns");
+            if (Attribute==NULL || Ztring().From_UTF8(Attribute)!=__T("urn:digimetrics-xml-wrapper"))
+            {
+                Reject("DXW");
+                return false;
+            }
+
+            Accept("DXW");
+            Fill(Stream_General, 0, General_Format, "DXW");
+
+            ReferenceFiles=new File__ReferenceFilesHelper(this, Config);
+
+            XMLElement* Track=Root->FirstChildElement();
+            while (Track)
+            {
+                if (string(Track->Value())=="clip")
+                {
+                    File__ReferenceFilesHelper::reference ReferenceFile;
+
+                    Attribute=Track->Attribute("file");
+                    if (Attribute)
+                    {
+                        ReferenceFile.FileNames.push_back(Ztring().From_UTF8(Attribute));
+
+                        Attribute=Track->Attribute("type");
+                        if (Attribute)
+                        {
+                            Ztring StreamKind; StreamKind.From_UTF8(Attribute);
+                            if (StreamKind==__T("video"))
+                                 ReferenceFile.StreamKind=Stream_Video;
+                            if (StreamKind==__T("audio"))
+                                 ReferenceFile.StreamKind=Stream_Audio;
+                            if (StreamKind==__T("data"))
+                                 ReferenceFile.StreamKind=Stream_Text; //Not sure this is a right mapping, but this is only used when file is missing
+                        }
+
+                        ReferenceFile.StreamID=ReferenceFiles->References.size()+1;
+                    }
+
+                    Attribute=Track->Attribute("framerate");
+                    if (Attribute)
+                    {
+                        ReferenceFile.FrameRate=Ztring().From_UTF8(Attribute).To_float64();
+
+                        Attribute=Track->Attribute("type");
+                        if (Attribute)
+                        {
+                            Ztring StreamKind; StreamKind.From_UTF8(Attribute);
+                            if (StreamKind==__T("video"))
+                                 ReferenceFile.StreamKind=Stream_Video;
+                            if (StreamKind==__T("audio"))
+                                 ReferenceFile.StreamKind=Stream_Audio;
+                            if (StreamKind==__T("data"))
+                                 ReferenceFile.StreamKind=Stream_Text; //Not sure this is a right mapping, but this is only used when file is missing
+                        }
+
+                        XMLElement* Frame=Track->FirstChildElement();
+                        while (Frame)
+                        {
+                            if (string(Frame->Value())=="frame")
+                            {
+                                Attribute=Frame->Attribute("file");
+                                if (Attribute)
+                                    ReferenceFile.FileNames.push_back(Ztring().From_UTF8(Attribute));
+                            }
+
+                            Frame=Frame->NextSiblingElement();
+                        }
+                    }
+
+                    ReferenceFile.StreamID=ReferenceFiles->References.size()+1;
+                    ReferenceFiles->References.push_back(ReferenceFile);
+                }
+
+                Track=Track->NextSiblingElement();
+            }
+        }
+        else
+        {
+            Reject("DXW");
+            return false;
+        }
+    }
+
+    //All should be OK...
+    return true;
+}
+
+} //NameSpace
+
+#endif //MEDIAINFO_DXW_YES
+

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Dxw.h Added

@@ -0,0 +1,69 @@
+// File_Dxw - Info for DXW files
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Information about DXW files
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_File_DxwH
+#define MediaInfo_File_DxwH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+#include <vector>
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+class File__ReferenceFilesHelper;
+
+//***************************************************************************
+// Class File_Dxw
+//***************************************************************************
+
+class File_Dxw : public File__Analyze
+{
+public :
+    //Constructor/Destructor
+    File_Dxw();
+    ~File_Dxw();
+
+private :
+    //Streams management
+    void Streams_Finish ();
+
+    //Buffer - Global
+    #if MEDIAINFO_SEEK
+    size_t Read_Buffer_Seek (size_t Method, int64u Value, int64u ID);
+    #endif //MEDIAINFO_SEEK
+
+    //Buffer - File header
+    bool FileHeader_Begin();
+
+    //Temp
+    File__ReferenceFilesHelper*     ReferenceFiles;
+};
+
+} //NameSpace
+
+#endif
+

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Flv.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Flv.cpp Changed

@@ -1,17 +1,17 @@
 // File_Flv - Info for Flash files
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -28,14 +28,18 @@
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_FLV_YES)
 //---------------------------------------------------------------------------
 
@@ -44,8 +48,8 @@
 #if defined(MEDIAINFO_AVC_YES)
     #include "MediaInfo/Video/File_Avc.h"
 #endif
-#if defined(MEDIAINFO_MPEG4_YES)
-    #include "MediaInfo/Audio/File_Mpeg4_AudioSpecificConfig.h"
+#if defined(MEDIAINFO_AAC_YES)
+    #include "MediaInfo/Audio/File_Aac.h"
 #endif
 #if defined(MEDIAINFO_MPEGA_YES)
     #include "MediaInfo/Audio/File_Mpega.h"
@@ -53,6 +57,7 @@
 #if defined(MEDIAINFO_RM_YES)
     #include "MediaInfo/Multiple/File_Rm.h"
 #endif
+#include "MediaInfo/MediaInfo_Config_MediaInfo.h"
 #if MEDIAINFO_EVENTS
     #include "MediaInfo/MediaInfo_Events.h"
 #endif //MEDIAINFO_EVENTS
@@ -90,8 +95,8 @@
     "ADPCM",
     "MPEG Audio",
     "PCM",
-    "Nellymoser",
-    "Nellymoser",
+    "Nellymoser", //16 KHz
+    "Nellymoser", //8 KHz
     "Nellymoser",
     "ADPCM",
     "ADPCM",
@@ -100,7 +105,7 @@
     "Speex",
     "",
     "",
-    "MPEG Audio",
+    "MPEG Audio", //8 KHz
     "",
 };
 
@@ -108,7 +113,7 @@
 {
     "",
     "",
-    "Version 1 / Layer 3",
+    "Layer 3",
     "",
     "",
     "",
@@ -120,7 +125,7 @@
     "",
     "",
     "",
-    "Layer 3",
+    "Layer 3", //8 KHz
     "",
 };
 
@@ -144,11 +149,31 @@
     "",
 };
 
+const char* Flv_CodecID_Hint_Audio[]=
+{
+    "",
+    "",
+    "MP3",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "MP3", //8 KHz
+    "",
+};
+
 const char* Flv_Format_Video[]=
 {
     "",
     "",
-    "H.263",
+    "Sorenson Spark",
     "Screen video",
     "VP6",
     "VP6",
@@ -204,6 +229,26 @@
     "",
 };
 
+const char* Flv_CodecID_Hint_Video[]=
+{
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+    "",
+};
+
 const char* Flv_H263_PictureSize[]=
 {
     "custom, 1 byte",
@@ -380,24 +425,24 @@
 :File__Analyze()
 {
     //Configuration
-    ParserName=_T("FLV");
+    ParserName=__T("FLV");
     #if MEDIAINFO_EVENTS
         ParserIDs[0]=MediaInfo_Parser_Flv;
         StreamIDs_Width[0]=2;
     #endif //MEDIAINFO_EVENTS
+    #if MEDIAINFO_DEMUX
+        Demux_Level=2; //Container
+    #endif //MEDIAINFO_DEMUX
 
     //Internal
     Stream.resize(3); //Null, Video, Audio
 
     //Temp
     Searching_Duration=false;
+    MetaData_NotTrustable=false;
     PreviousTagSize=(int32u)-1;
     meta_filesize=(int64u)-1;
     meta_duration=0;
-    FirstFrame_Time=(int32u)-1;
-    FirstFrame_Type=(int8u)-1;
-    LastFrame_Time=(int32u)-1;
-    LastFrame_Type=(int8u)-1;
 }
 
 //***************************************************************************
@@ -405,8 +450,15 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
-void File_Flv::Streams_Finish()
+void File_Flv::Streams_Fill()
 {
+    //Coherency
+    if (Count_Get(Stream_Video) && Count_Get(Stream_Audio) && !Retrieve(Stream_Video, 0, Video_BitRate).empty() && Retrieve(Stream_Audio, 0, Audio_BitRate).empty())
+    {
+        Fill(Stream_General, 0, General_OverallBitRate, Retrieve(Stream_Video, 0, Video_BitRate));
+        Clear(Stream_Video, 0, Video_BitRate);
+    }
+
     //Trying to detect VFR
     std::vector<int64u> video_stream_FrameRate_Between;
     for (size_t Pos=1; Pos<video_stream_FrameRate.size(); Pos++)
@@ -435,35 +487,49 @@
     //Parsers
     if (Stream[Stream_Video].Parser!=NULL)
     {
-        Finish(Stream[Stream_Video].Parser);
+        Fill(Stream[Stream_Video].Parser);
         Merge(*Stream[Stream_Video].Parser, Stream_Video, 0, 0);
     }
     if (Stream[Stream_Audio].Parser!=NULL)
     {
-        Finish(Stream[Stream_Audio].Parser);
+        Fill(Stream[Stream_Audio].Parser);
         Merge(*Stream[Stream_Audio].Parser, Stream_Audio, 0, 0);
 
         //Special case: AAC
-        if (Retrieve(Stream_Audio, 0, Audio_Format)==_T("AAC")
-         || Retrieve(Stream_Audio, 0, Audio_Format)==_T("MPEG Audio")
-         || Retrieve(Stream_Audio, 0, Audio_Format)==_T("Vorbis"))
-            Clear(Stream_Audio, 0, Audio_Resolution); //Resolution is not valid for AAC / MPEG Audio / Vorbis
+        if (Retrieve(Stream_Audio, 0, Audio_Format)==__T("AAC")
+         || Retrieve(Stream_Audio, 0, Audio_Format)==__T("MPEG Audio")
+         || Retrieve(Stream_Audio, 0, Audio_Format)==__T("Vorbis"))
+            Clear(Stream_Audio, 0, Audio_BitDepth); //Resolution is not valid for AAC / MPEG Audio / Vorbis
     }
 
     //Delay
     if (Stream[Stream_Video].Delay!=(int32u)-1)
+    {
         Fill(Stream_Video, 0, Video_Delay, Stream[Stream_Video].Delay+Retrieve(Stream_Video, 0, Video_Delay).To_int32u(), 10, true);
+        Fill(Stream_Video, 0, Video_Delay_Source, "Container");
+    }
     if (Stream[Stream_Audio].Delay!=(int32u)-1)
+    {
         Fill(Stream_Audio, 0, Audio_Delay, Stream[Stream_Audio].Delay+Retrieve(Stream_Audio, 0, Audio_Delay).To_int32u(), 10, true);
+        Fill(Stream_Audio, 0, Audio_Delay_Source, "Container");
+    }
+}
 
+//---------------------------------------------------------------------------
+void File_Flv::Streams_Finish()
+{
     //Duration
-    int64u Duration_Final=(int64u)meta_duration;
+    //if (meta_duration)
+    //    Fill(Stream_General, 0, General_Duration, meta_duration, 10, true);
+    Streams_Finish_PerStream(Stream_Video);
+    Streams_Finish_PerStream(Stream_Audio);
+
+    /*
     float64 FrameRate=Retrieve(Stream_Video, 0, Video_FrameRate).To_float64();
     if (LastFrame_Time!=(int32u)-1 && FirstFrame_Time!=(int32u)-1)
         Duration_Final=LastFrame_Time-FirstFrame_Time+((LastFrame_Type==9 && FrameRate)?((int64u)(1000/FrameRate)):0);
     if (Duration_Final)
     {
-        Fill(Stream_General, 0, General_Duration, Duration_Final, 10, true);
         if (Count_Get(Stream_Video))
             Fill(Stream_Video, 0, Video_Duration, Duration_Final, 10, true);
         if (Count_Get(Stream_Audio))
@@ -487,21 +553,55 @@
                 Clear(Stream_Video, 0, Video_BitRate);
         }
     }
+    */
+
+    if (Stream[Stream_Video].Parser!=NULL)
+    {
+        Finish(Stream[Stream_Video].Parser);
+        Merge(*Stream[Stream_Video].Parser, Stream_Video, 0, 0);
+    }
+    if (Stream[Stream_Audio].Parser!=NULL)
+    {
+        Finish(Stream[Stream_Audio].Parser);
+        Merge(*Stream[Stream_Audio].Parser, Stream_Audio, 0, 0);
+    }
+
+    if (Retrieve(Stream_General, 0, General_Duration).empty() && Retrieve(Stream_Video, 0, Video_Duration).empty() && meta_duration)
+        Fill(Stream_General, 0, General_Duration, meta_duration, 0, true);
 
     //Purge what is not needed anymore
     if (!File_Name.empty()) //Only if this is not a buffer, with buffer we can have more data
         Stream.clear();
 }
 
+//---------------------------------------------------------------------------
+void File_Flv::Streams_Finish_PerStream(stream_t StreamKind)
+{
+    if (Stream[StreamKind].TimeStamp!=(int32u)-1)
+    {
+        //Calculating the last timestamp (last block included)
+        if (!Stream[StreamKind].Durations.empty())
+        {
+            int64u Durations_Total=0;
+            for (size_t Pos=0; Pos<Stream[StreamKind].Durations.size(); Pos++)
+                Durations_Total+=Stream[StreamKind].Durations[Pos];
+            int32u Duration_Average=float32_int32s(((float32)Durations_Total)/Stream[StreamKind].Durations.size());
+            Stream[StreamKind].TimeStamp+=Duration_Average;
+        }
+
+        Fill(StreamKind, 0, "Duration", Stream[StreamKind].TimeStamp, 10, true);
+    }
+}
+
 //***************************************************************************
-// Buffer
+// Buffer - File header
 //***************************************************************************
 
 //---------------------------------------------------------------------------
 void File_Flv::FileHeader_Parse()
 {
     //Parsing
-    Element_Begin("FLV header");
+    Element_Begin1("FLV header");
     std::string Signature;
     int32u Size;
     int8u  Version, Flags;
@@ -513,7 +613,7 @@
     Get_B4 (Size,                                               "Size");
     if (Size>9)
         Skip_XX(Size-9,                                         "Unknown");
-    Element_End();
+    Element_End0();
 
     FILLING_BEGIN();
         //Integrity
@@ -527,6 +627,12 @@
         Accept();
 
         Fill(Stream_General, 0, General_Format, "Flash Video");
+        if (!video_stream_Count && !audio_stream_Count)
+        {
+            //TODO: quick and awful hack for a file having both bools unset, should detect directly the streams
+            video_stream_Count=true;
+            audio_stream_Count=true;
+        }
         if (video_stream_Count)
         {
             Stream_Prepare(Stream_Video);
@@ -545,6 +651,64 @@
     FILLING_END();
 }
 
+//***************************************************************************
+// Buffer - Synchro
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_Flv::Synchronize()
+{
+    //Synchronizing
+    while (Buffer_Offset+15<=Buffer_Size)
+    {
+        if (Buffer[Buffer_Offset+4]==0x08 || Buffer[Buffer_Offset+4]==0x09)
+        {
+            int32u BodyLength=BigEndian2int24u(Buffer+Buffer_Offset+5);
+            if (File_Offset+Buffer_Offset+15+BodyLength==File_Size)
+                break; //Last block
+            if (File_Offset+Buffer_Offset+15+BodyLength<File_Size)
+            {
+                if (Buffer_Offset+15+BodyLength+15>Buffer_Size)
+                    return false; //Need more data
+
+                if (Buffer[Buffer_Offset+15+BodyLength+4]==0x08 || Buffer[Buffer_Offset+15+BodyLength+4]==0x09)
+                    break;
+            }
+        }
+
+        Buffer_Offset++;
+    }
+
+    //Parsing last bytes if needed
+    if (Buffer_Offset+15>Buffer_Size)
+        return false;
+
+    //Synched
+    return true;
+}
+
+//***************************************************************************
+// Buffer - Global
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Flv::Read_Buffer_Unsynched()
+{
+    if (!Searching_Duration) //If Searching_Duration, we are looking for end in inverse order, no timestamp reset
+    {
+        Stream[Stream_Video].TimeStamp=(int32u)-1;
+        if (Stream[Stream_Video].Parser)
+            Stream[Stream_Video].Parser->Open_Buffer_Unsynch();
+        Stream[Stream_Audio].TimeStamp=(int32u)-1;
+        if (Stream[Stream_Audio].Parser)
+            Stream[Stream_Audio].Parser->Open_Buffer_Unsynch();
+    }
+}
+
+//***************************************************************************
+// Buffer - Per element
+//***************************************************************************
+
 //---------------------------------------------------------------------------
 void File_Flv::Header_Parse()
 {
@@ -566,23 +730,34 @@
     {
         int32u Timestamp_Base;
         int8u  Timestamp_Extended;
-        Get_B1 (Type,                                           "Type"); //Param_Info(Type<19?Flv_Type[Type]:_T("Unknown"));
+        Get_B1 (Type,                                           "Type"); //Param_Info1(Type<19?Flv_Type[Type]:__T("Unknown"));
         Get_B3 (BodyLength,                                     "BodyLength");
         Get_B3 (Timestamp_Base,                                 "Timestamp_Base"); //in ms
         Get_B1 (Timestamp_Extended,                             "Timestamp_Extended"); //TimeStamp = Timestamp_Extended*0x01000000+Timestamp_Base
         Skip_B3(                                                "StreamID");
 
-        //Filling
-        Time=(((int32u)Timestamp_Extended)<<24)|Timestamp_Base;
-        if (FirstFrame_Time==(int32u)-1 && (Type==0x08 || Type==0x09))
+        // For audio, check if it's just an audio config.
+        bool Skip_Timestamps=false;
+        if (Type==0x08)
         {
-            FirstFrame_Time=Time;
-            FirstFrame_Type=Type;
+            int16u  Format_Info;
+            Peek_B2(Format_Info);
+            int8u   Format=(Format_Info>>12)&0x0F;
+            if (Format==10 && (Format_Info&0xFF)==0) // AAC sequence header
+                Skip_Timestamps=true;
         }
-        if (File_Offset+Buffer_Offset+Element_Offset+BodyLength+4==File_Size && Time!=0)
+
+        //Filling
+        if ((Type==0x08 && !Skip_Timestamps) || Type==0x09)
         {
-            LastFrame_Time=Time;
-            LastFrame_Type=Type;
+            Time=(((int32u)Timestamp_Extended)<<24)|Timestamp_Base;
+            stream_t StreamKind=(Type==0x08)?Stream_Audio:Stream_Video;
+            if (Stream[StreamKind].Delay==(int32u)-1)
+                Stream[StreamKind].Delay=Time;
+            else if (Stream[StreamKind].TimeStamp!=(int32u)-1 && Time>Stream[StreamKind].TimeStamp)
+                Stream[StreamKind].Durations.push_back(Time-Stream[StreamKind].TimeStamp);
+            if (!Searching_Duration || Stream[StreamKind].TimeStamp==(int32u)-1)
+                Stream[StreamKind].TimeStamp=Time;
         }
     }
     else
@@ -606,7 +781,18 @@
         case 0x09 : video(); break;
         case 0x12 : meta(); break;
         case 0xFA : Rm(); break;
-        case (int64u)-1 : GoTo(File_Size-PreviousTagSize-8, "FLV"); return; //When searching the last frame
+        case (int64u)-1 :   //When searching the last frame
+                            if (PreviousTagSize>File_Size)
+                            {
+                                //There is a problem, trying to sync
+                                Searching_Duration=false;
+                                MustSynchronize=true;
+                                Buffer_TotalBytes_FirstSynched_Max=File_Size;
+                                GoToFromEnd(65536);
+                                return;
+                            }
+                            GoTo(File_Size-PreviousTagSize-8, "FLV");
+                            return;
         default : if (Searching_Duration)
                   {
                     Finish(); //This is surely a bad en of file, don't try anymore
@@ -615,16 +801,33 @@
 
     }
 
-    if (!video_stream_Count && !audio_stream_Count && video_stream_FrameRate_Detected && MediaInfoLib::Config.ParseSpeed_Get()<1) //All streams are parsed
+    if (Searching_Duration && !MustSynchronize)
     {
-        if (!Searching_Duration && (meta_filesize==(int64u)-1 || meta_filesize==0 || meta_filesize==File_Size) && Element_Code!=0x00 &&!MediaInfoLib::Config.ParseSpeed_Get()!=1)
+        if ((((Count_Get(Stream_Video)==0 || Stream[Stream_Video].TimeStamp!=(int32u)-1)
+           && (Count_Get(Stream_Audio)==0 || Stream[Stream_Audio].TimeStamp!=(int32u)-1))
+          || (File_Size>65536*2 && File_Offset+Buffer_Offset-Header_Size-PreviousTagSize-4<File_Size-65536))
+         && Config->ParseSpeed<1)
+            Finish();
+        else if (Element_Code==0xFA) //RM metadata have a malformed PreviousTagSize, always
         {
-            //Trying to find the last frame for duration
-            Searching_Duration=true;
-            GoToFromEnd(4, "FLV");
+            //Trying to sync
+            Searching_Duration=false;
+            MustSynchronize=true;
+            Buffer_TotalBytes_FirstSynched_Max=File_Size;
+            GoToFromEnd(Header_Size+Element_Size+65536);
+            return;
         }
         else
-            Finish();
+            GoTo(File_Offset+Buffer_Offset-Header_Size-PreviousTagSize-4);
+    }
+    else if (!video_stream_Count && !audio_stream_Count && video_stream_FrameRate_Detected && File_Offset+65536*2<File_Size && MediaInfoLib::Config.ParseSpeed_Get()<1) //All streams are parsed
+    {
+        Fill();
+
+        //Trying to find the last frame for duration
+        Read_Buffer_Unsynched(); //This is not synched yet, so we call directly this method instead of Open_Buffer_Unsynched
+        GoToFromEnd(4, "FLV");
+        Searching_Duration=true;
     }
 }
 
@@ -637,7 +840,7 @@
 {
     Element_Name("Video");
     Stream[Stream_Video].PacketCount++;
-    Element_Info(Stream[Stream_Video].PacketCount);
+    Element_Info1(Stream[Stream_Video].PacketCount);
 
     //Handling FrameRate
     if (!video_stream_FrameRate_Detected)
@@ -648,36 +851,26 @@
             video_stream_FrameRate_Detected=true;
     }
 
-    //Needed?
-    if (!video_stream_Count)
-        return; //No more need of Video stream
-
     if (Element_Size==0) //Header says that video is present, but there is only one null packet
     {
-        Element_Info("Null");
+        Element_Info1("Null");
         return;
     }
 
-    //Delay
-    if (Stream[Stream_Video].Delay==(int32u)-1)
-        Stream[Stream_Video].Delay=Time;
-
     Demux(Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)(Element_Size-Element_Offset), ContentType_MainStream);
 
+    //Needed?
+    if (!video_stream_Count && Config->ParseSpeed<1)
+        return; //No more need of Video stream
+
     //Parsing
     int8u Codec, FrameType;
-    Element_Begin("Stream header");
+    Element_Begin1("Stream header");
     BS_Begin();
-    Get_S1 (4, FrameType,                                       "frameType"); Param_Info(Flv_FrameType[FrameType]);
-    Get_S1 (4, Codec,                                           "codecID"); Param_Info(Flv_Codec_Video[Codec]); Element_Info(Flv_Codec_Video[Codec]);
+    Get_S1 (4, FrameType,                                       "frameType"); Param_Info1(Flv_FrameType[FrameType]);
+    Get_S1 (4, Codec,                                           "codecID"); Param_Info1(Flv_Codec_Video[Codec]); Element_Info1(Flv_Codec_Video[Codec]);
     BS_End();
-    Element_End();
-
-    if (Stream[Stream_Video].PacketCount==60) //2s
-    {
-        video_stream_Count=false;
-        return;
-    }
+    Element_End0();
 
     FILLING_BEGIN();
         //Filling
@@ -690,6 +883,9 @@
                 Fill(Stream_Video, 0, Video_Format, Flv_Format_Video[Codec]);
                 Fill(Stream_Video, 0, Video_Format_Profile, Flv_Format_Profile_Video[Codec]);
                 Fill(Stream_Video, 0, Video_Codec, Flv_Codec_Video[Codec]);
+                Fill(Stream_Video, 0, Video_CodecID, Codec);
+                Fill(Stream_Video, 0, Video_CodecID_Hint, Flv_CodecID_Hint_Video[Codec]);
+                Fill(Stream_Video, 0, Video_BitDepth, 8); //FLV is not known to support another bit depth
             }
         }
 
@@ -721,7 +917,7 @@
     if (Version>1)
         return;
     Skip_S1( 8,                                                 "TemporalReference");
-    Get_S1 ( 3, PictureSize,                                    "PictureSize"); Param_Info(Flv_H263_PictureSize[PictureSize]);
+    Get_S1 ( 3, PictureSize,                                    "PictureSize"); Param_Info1(Flv_H263_PictureSize[PictureSize]);
     switch (PictureSize)
     {
         case 0 :
@@ -739,7 +935,7 @@
                 Height=Flv_H263_WidthHeight[PictureSize][1];
             }
     }
-    Get_S1 ( 2, PictureType,                                    "PictureSize"); Param_Info(Flv_H263_PictureType[PictureType]);
+    Get_S1 ( 2, PictureType,                                    "PictureSize"); Param_Info1(Flv_H263_PictureType[PictureType]);
     Skip_SB(                                                    "DeblockingFlag");
     Skip_S1( 5,                                                 "Quantizer");
     Get_SB (    ExtraInformationFlag,                           "ExtraInformationFlag");
@@ -763,9 +959,9 @@
     //Parsing
     int16u Width, Height;
     BS_Begin();
-    Info_S1( 4, BlockWidth,                                     "BlockWidth"); Param_Info((BlockWidth+1)*16);
+    Info_S1( 4, BlockWidth,                                     "BlockWidth"); Param_Info1((BlockWidth+1)*16);
     Get_S2 (12, Width,                                          "ImageWidth");
-    Info_S1( 4, BlockHeight,                                    "BlockHeight"); Param_Info((BlockHeight+1)*16);
+    Info_S1( 4, BlockHeight,                                    "BlockHeight"); Param_Info1((BlockHeight+1)*16);
     Get_S2 (12, Height,                                         "ImageHeight");
     if (Version==2)
     {
@@ -795,9 +991,9 @@
     Get_S1 ( 4, VerticalAdjustment,                             "VerticalAdjustment");
     if (WithAlpha)
         Skip_S3(24,                                             "OffsetToAlpha");
-    Get_SB (    FrameMode,                                      "FrameMode"); Param_Info(Flv_VP6_FrameMode[FrameMode]);
+    Get_SB (    FrameMode,                                      "FrameMode"); Param_Info1(Flv_VP6_FrameMode[FrameMode]);
     Skip_S1( 6,                                                 "Quantization");
-    Get_SB (    Marker,                                         "Marker"); Param_Info(Flv_VP6_Marker[Marker]);
+    Get_SB (    Marker,                                         "Marker"); Param_Info1(Flv_VP6_Marker[Marker]);
     BS_End();
     if (FrameMode)
     {
@@ -816,8 +1012,8 @@
             Skip_B2(                                            "Offset");
         Skip_B1(                                                "MacroBlock_Height");
         Skip_B1(                                                "MacroBlock_Width");
-        Get_B1 (Height,                                         "Height"); Param_Info(Ztring::ToZtring(Height*16)+_T(" pixels"));
-        Get_B1 (Width,                                          "Width"); Param_Info(Ztring::ToZtring(Width*16)+_T(" pixels"));
+        Get_B1 (Height,                                         "Height"); Param_Info1(Ztring::ToZtring(Height*16)+__T(" pixels"));
+        Get_B1 (Width,                                          "Width"); Param_Info1(Ztring::ToZtring(Width*16)+__T(" pixels"));
 
         FILLING_BEGIN();
             if (Width && Height)
@@ -834,8 +1030,8 @@
 void File_Flv::video_AVC()
 {
     int8u AVCPacketType;
-    Get_B1 (AVCPacketType,                                      "AVCPacketType"); Param_Info(Flv_AVCPacketType(AVCPacketType));
-    Info_B3(CompositionTime,                                    "CompositionTime"); Param_Info(Ztring::ToZtring((int32s)(CompositionTime+0xFF000000)));
+    Get_B1 (AVCPacketType,                                      "AVCPacketType"); Param_Info1(Flv_AVCPacketType(AVCPacketType));
+    Info_B3(CompositionTime,                                    "CompositionTime"); Param_Info1(Ztring::ToZtring((int32s)(CompositionTime+0xFF000000)));
 
     switch (AVCPacketType)
     {
@@ -870,7 +1066,7 @@
                     Open_Buffer_Continue(Stream[Stream_Video].Parser);
 
                     //Disabling this stream
-                    if (Stream[Stream_Video].Parser->File_GoTo!=(int64u)-1 || Stream[Stream_Video].Parser->Count_Get(Stream_Video)>0)
+                    if (Stream[Stream_Video].Parser->File_GoTo!=(int64u)-1 || Stream[Stream_Video].Parser->Count_Get(Stream_Video)>0 || (Config->ParseSpeed<1.0 && Stream[Stream_Video].PacketCount>=300))
                          video_stream_Count=false;
                 #else
                     Skip_XX(Element_Size-Element_Offset,        "AVC Data");
@@ -886,35 +1082,31 @@
 {
     Element_Name("Audio");
     Stream[Stream_Audio].PacketCount++;
-    Element_Info(Stream[Stream_Audio].PacketCount);
-
-    //Needed?
-    if (!audio_stream_Count)
-        return; //No more need of Audio stream
+    Element_Info1(Stream[Stream_Audio].PacketCount);
 
     if (Element_Size==0) //Header says that audio is present, but there is only one null packet
     {
-        Element_Info("Null");
+        Element_Info1("Null");
         return;
     }
 
-    //Delay
-    if (Stream[Stream_Audio].Delay==(int32u)-1)
-        Stream[Stream_Audio].Delay=Time;
+    Demux(Buffer+Buffer_Offset+(size_t)Element_Offset+1, (size_t)(Element_Size-Element_Offset-1), ContentType_MainStream);
 
-    Demux(Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)(Element_Size-Element_Offset), ContentType_MainStream);
+    //Needed?
+    if (!audio_stream_Count && Config->ParseSpeed<1)
+        return; //No more need of Audio stream
 
     //Parsing
     int8u  codec, sampling_rate;
     bool   is_16bit, is_stereo;
-    Element_Begin("Stream header");
+    Element_Begin1("Stream header");
     BS_Begin();
-    Get_S1 (4, codec,                                           "codec"); Param_Info(Flv_Codec_Audio[codec]); Element_Info(Flv_Codec_Audio[codec]);
-    Get_S1 (2, sampling_rate,                                   "sampling_rate"); Param_Info(Ztring::ToZtring(Flv_SamplingRate[sampling_rate])+_T(" Hz"));
-    Get_SB (   is_16bit,                                        "is_16bit"); Param_Info(Ztring::ToZtring(Flv_Resolution[is_16bit])+_T(" bits"));
-    Get_SB (   is_stereo,                                       "is_stereo"); Param_Info(Ztring::ToZtring(Flv_Channels[is_stereo])+_T(" channel(s)"));
+    Get_S1 (4, codec,                                           "codec"); Param_Info1(Flv_Codec_Audio[codec]); Element_Info1(Flv_Codec_Audio[codec]);
+    Get_S1 (2, sampling_rate,                                   "sampling_rate"); Param_Info1(Ztring::ToZtring(Flv_SamplingRate[sampling_rate])+__T(" Hz"));
+    Get_SB (   is_16bit,                                        "is_16bit"); Param_Info1(Ztring::ToZtring(Flv_Resolution[is_16bit])+__T(" bits"));
+    Get_SB (   is_stereo,                                       "is_stereo"); Param_Info1(Ztring::ToZtring(Flv_Channels[is_stereo])+__T(" channel(s)"));
     BS_End();
-    Element_End();
+    Element_End0();
 
     //Special case
     if (codec==5) //Nellymoser 8kHz mono
@@ -923,12 +1115,6 @@
         is_stereo=false; //Mono forced
     }
 
-    if (Stream[Stream_Audio].PacketCount==60) //2s
-    {
-        audio_stream_Count=false;
-        return;
-    }
-
     FILLING_BEGIN();
         if (Retrieve(Stream_Audio, 0, Audio_Format).empty())
         {
@@ -936,12 +1122,15 @@
             if (Count_Get(Stream_Audio)==0)
                 Stream_Prepare(Stream_Audio);
             Fill(Stream_Audio, 0, Audio_Channel_s_, Flv_Channels[is_stereo], 10, true);
-            Fill(Stream_Audio, 0, Audio_Resolution, Flv_Resolution[is_16bit], 10, true);
+            if (codec!=2 && codec!=10 && codec!=14) //MPEG Audio and AAC are not fixed bit depth
+                Fill(Stream_Audio, 0, Audio_BitDepth, Flv_Resolution[is_16bit], 10, true);
             if (sampling_rate<4)
                 Fill(Stream_Audio, 0, Audio_SamplingRate, Flv_SamplingRate[sampling_rate], 10, true);
             Fill(Stream_Audio, 0, Audio_Format, Flv_Format_Audio[codec]);
             Fill(Stream_Audio, 0, Audio_Format_Profile, Flv_Format_Profile_Audio[codec]);
             Fill(Stream_Audio, 0, Audio_Codec, Flv_Codec_Audio[codec]);
+            Fill(Stream_Audio, 0, Audio_CodecID, codec);
+            Fill(Stream_Audio, 0, Audio_CodecID_Hint, Flv_CodecID_Hint_Audio[codec]);
             if (codec==1)
             {
                 //ADPCM
@@ -989,7 +1178,7 @@
 void File_Flv::audio_AAC()
 {
     int8u AACPacketType;
-    Get_B1 (AACPacketType,                                      "AACPacketType"); Param_Info(Flv_AACPacketType(AACPacketType));
+    Get_B1 (AACPacketType,                                      "AACPacketType"); Param_Info1(Flv_AACPacketType(AACPacketType));
 
     switch (AACPacketType)
     {
@@ -997,23 +1186,23 @@
                 #if defined(MEDIAINFO_MPEG4_YES)
                     if (Stream[Stream_Audio].Parser==NULL)
                     {
-                        Stream[Stream_Audio].Parser=new File_Mpeg4_AudioSpecificConfig;
+                        Stream[Stream_Audio].Parser=new File_Aac;
+                        ((File_Aac*)Stream[Stream_Audio].Parser)->Mode=File_Aac::Mode_AudioSpecificConfig;
                         Open_Buffer_Init(Stream[Stream_Audio].Parser);
                     }
 
                     //Parsing
                     Open_Buffer_Continue(Stream[Stream_Audio].Parser);
-
-                    //Disabling this stream
-                    audio_stream_Count=false;
                 #else
                     Skip_XX(Element_Size-Element_Offset,        "AAC Data");
                     audio_stream_Count=false; //Unable to parse it
                 #endif
                 break;
         case 1 :
-                Skip_XX(Element_Size-Element_Offset,            "AAC Data");
-                audio_stream_Count=false; //Unable to parse it
+                //Parsing
+                Open_Buffer_Continue(Stream[Stream_Audio].Parser);
+
+                audio_stream_Count=false; //No need of more
                 break;
         default: Skip_XX(Element_Size-Element_Offset,           "Unknown");
                 audio_stream_Count=false; //Unable to parse it
@@ -1028,6 +1217,18 @@
     //Parsing
     meta_Level=0;
     meta_SCRIPTDATAOBJECT();
+
+    if (MetaData_NotTrustable)
+    {
+        meta_duration=0;
+        Clear(Stream_Video, 0, Video_StreamSize);
+        Clear(Stream_Video, 0, Video_BitRate);
+        Clear(Stream_Video, 0, Video_Bits__Pixel_Frame_);
+        Clear(Stream_Audio, 0, Audio_StreamSize);
+        Clear(Stream_Audio, 0, Audio_BitRate);
+        Clear(Stream_General, 0, General_Duration);
+        Clear(Stream_General, 0, General_OverallBitRate);
+    }
 }
 
 //---------------------------------------------------------------------------
@@ -1044,22 +1245,26 @@
 {
     std::string StringData;
     int16u StringLength;
-    Element_Begin();
+    Element_Begin0();
     Get_B2 (StringLength,                                       "StringLength");
     Get_String(StringLength, StringData,                        "StringData");
     Element_Name(StringData.c_str());
 
     //Parsing Value
     meta_SCRIPTDATAVALUE(StringData);
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
 void File_Flv::meta_SCRIPTDATAVALUE(const std::string &StringData)
 {
+    std::string StringDataModified(StringData);
+    if (!StringDataModified.empty() && StringDataModified[0]==__T('_'))
+        StringDataModified.erase(StringDataModified.begin());
+
     //Parsing
     int8u Type;
-    Get_B1 (Type,                                               "Type"); if (Type<0x12) Param_Info(Flv_TagType[Type]);
+    Get_B1 (Type,                                               "Type"); Param_Info1C((Type<0x12), Flv_TagType[Type]);
     switch (Type)
     {
         case 0x00 : //DOUBLE --> 64 bits Big endian float
@@ -1071,37 +1276,48 @@
                 std::string ToFill;
                 Ztring ValueS;
                 stream_t StreamKind=Stream_General;
-                     if (0) ;
-                else if (StringData=="width") {ToFill="Width"; StreamKind=Stream_Video; ValueS.From_Number(Value, 0); video_stream_Count=true;} //1 file with FrameRate tag and video stream but no video present tag
-                else if (StringData=="height") {ToFill="Height"; StreamKind=Stream_Video; ValueS.From_Number(Value, 0); video_stream_Count=true;} //1 file with FrameRate tag and video stream but no video present tag
-                else if (StringData=="duration") meta_duration=Value*1000;
-                else if (StringData=="audiodatarate") {ToFill="BitRate"; StreamKind=Stream_Audio; ValueS.From_Number(Value*1000, 0);}
-                else if (StringData=="framerate") {ToFill="FrameRate"; StreamKind=Stream_Video; ValueS.From_Number(Value, 3); video_stream_FrameRate_Detected=true; video_stream_Count=true;} //1 file with FrameRate tag and video stream but no video present tag
-                else if (StringData=="videoframerate") {ToFill="FrameRate"; StreamKind=Stream_Video; ValueS.From_Number(Value, 3); video_stream_FrameRate_Detected=true; video_stream_Count=true;} //1 file with FrameRate tag and video stream but no video present tag
-                else if (StringData=="datasize") {}
-                else if (StringData=="lasttimestamp") {}
-                else if (StringData=="filesize") {meta_filesize=(int64u)Value;}
-                else if (StringData=="audiosize") {ToFill="StreamSize"; StreamKind=Stream_Audio; ValueS.From_Number(Value, 0);}
-                else if (StringData=="videosize") {ToFill="StreamSize"; StreamKind=Stream_Video; ValueS.From_Number(Value, 0); video_stream_Count=true;} //1 file with FrameRate tag and video stream but no video present tag
-                else if (StringData=="videodatarate") {ToFill="BitRate"; StreamKind=Stream_Video; ValueS.From_Number(Value*1000, 0); video_stream_Count=true;} //1 file with FrameRate tag and video stream but no video present tag
-                else if (StringData=="lastkeyframetimestamp") {}
-                else if (StringData=="lastkeyframelocation") {}
-                else if (StringData=="videocodecid") {; video_stream_Count=true;} //1 file with FrameRate tag and video stream but no video present tag
-                else if (StringData=="audiocodecid") {}
-                else if (StringData=="audiodelay") {ToFill="Delay"; StreamKind=Stream_Audio; if (Value>0) ValueS.From_Number(Value*1000, 0);}
-                else if (StringData=="canSeekToEnd") {}
-                else if (StringData=="keyframes_times") {}
-                else if (StringData=="keyframes_filepositions") {}
-                else if (StringData=="audiosamplerate") {ToFill="SamplingRate"; StreamKind=Stream_Audio; if (Value>0) ValueS.From_Number(Value, 0);}
-                else if (StringData=="audiosamplesize") {ToFill="Resolution"; StreamKind=Stream_Audio; if (Value>0) ValueS.From_Number(Value, 0);}
-                else if (StringData=="totalduration") {ToFill="Duration"; StreamKind=Stream_General; ValueS.From_Number(Value*1000, 0);}
-                else if (StringData=="totaldatarate") {ToFill="OverallBitRate"; StreamKind=Stream_General; ValueS.From_Number(Value*1000, 0);}
-                else if (StringData=="bytelength") {} //TODO: should test in order to see if file is complete
-                else {StreamKind=Stream_General; ToFill=StringData; ValueS.From_Number(Value);}
-                if (!ValueS.empty()) Element_Info(ValueS);
-                Fill(StreamKind, 0, ToFill.c_str(), ValueS);
-                if (ToFill=="FrameRate")
-                    Fill(StreamKind, 0, "FrameRate_Mode", "CFR");
+                     if (StringDataModified=="width") {ToFill="Width"; StreamKind=Stream_Video; ValueS.From_Number(Value, 0); video_stream_Count=true;} //1 file with FrameRate tag and video stream but no video present tag
+                else if (StringDataModified=="height") {ToFill="Height"; StreamKind=Stream_Video; ValueS.From_Number(Value, 0); video_stream_Count=true;} //1 file with FrameRate tag and video stream but no video present tag
+                else if (StringDataModified=="duration") meta_duration=Value*1000;
+                else if (StringDataModified=="audiodatarate") {ToFill="BitRate"; StreamKind=Stream_Audio; ValueS.From_Number(Value*1000, 0);}
+                else if (StringDataModified=="framerate") {ToFill="FrameRate"; StreamKind=Stream_Video; ValueS.From_Number(Value, 3); video_stream_FrameRate_Detected=true; video_stream_Count=true;} //1 file with FrameRate tag and video stream but no video present tag
+                else if (StringDataModified=="videoframerate") {ToFill="FrameRate"; StreamKind=Stream_Video; ValueS.From_Number(Value, 3); video_stream_FrameRate_Detected=true; video_stream_Count=true;} //1 file with FrameRate tag and video stream but no video present tag
+                else if (StringDataModified=="filesize") {meta_filesize=(int64u)Value;}
+                else if (StringDataModified=="audiosize") {ToFill="StreamSize"; StreamKind=Stream_Audio; ValueS.From_Number(Value, 0); if (Value>File_Size) MetaData_NotTrustable=true;}
+                else if (StringDataModified=="videosize") {ToFill="StreamSize"; StreamKind=Stream_Video; ValueS.From_Number(Value, 0); if (Value>File_Size) MetaData_NotTrustable=true; video_stream_Count=true;} //1 file with FrameRate tag and video stream but no video present tag
+                else if (StringDataModified=="videodatarate") {ToFill="BitRate"; StreamKind=Stream_Video; ValueS.From_Number(Value*1000, 0); video_stream_Count=true;} //1 file with FrameRate tag and video stream but no video present tag
+                else if (StringDataModified=="videocodecid") {; video_stream_Count=true;} //1 file with FrameRate tag and video stream but no video present tag
+                else if (StringDataModified=="audiodelay") {ToFill="Delay"; StreamKind=Stream_Audio; if (Value>0) ValueS.From_Number(Value*1000, 0);}
+                else if (StringDataModified=="audiosamplerate") {ToFill="SamplingRate"; StreamKind=Stream_Audio; if (Value>0) ValueS.From_Number(Value, 0);}
+                else if (StringDataModified=="audiosamplesize") {ToFill="BitDepth"; StreamKind=Stream_Audio; if (Value>0) ValueS.From_Number(Value, 0);}
+                else if (StringDataModified=="totalduration") {ToFill="Duration"; StreamKind=Stream_General; ValueS.From_Number(Value*1000, 0);}
+                else if (StringDataModified=="totaldatarate") {ToFill="OverallBitRate"; StreamKind=Stream_General; ValueS.From_Number(Value*1000, 0);}
+                else if (StringDataModified=="totalframes") {ToFill="FrameCount"; StreamKind=Stream_Video; ValueS.From_Number(Value*1000, 0);}
+                else if (StringDataModified=="bytelength") {if (File_Size!=Value) MetaData_NotTrustable=true;}
+                else if (!(StringDataModified=="datasize"
+                       || StringDataModified=="lasttimestamp"
+                       || StringDataModified=="lastkeyframetimestamp"
+                       || StringDataModified=="lastkeyframelocation"
+                       || StringDataModified=="canSeekToEnd"
+                       || StringDataModified=="keyframes_times"
+                       || StringDataModified=="keyframes_filepositions"
+                       || StringDataModified=="aacaot"
+                       || StringDataModified=="audiochannels"
+                       || StringDataModified=="audiocodecid"
+                       || StringDataModified=="avclevel"
+                       || StringDataModified=="avcprofile"
+                       || StringDataModified=="moovPosition")) {StreamKind=Stream_General; ToFill=StringData; ValueS.From_Number(Value);}
+                #if MEDIAINFO_TRACE
+                    if (ValueS.empty())
+                        ValueS.From_Number(Value, 0);
+                    Element_Info1(ValueS);
+                #endif //MEDIAINFO_TRACE
+                if (!ToFill.empty())
+                {
+                    Fill(StreamKind, 0, ToFill.c_str(), ValueS, true);
+                    if (ToFill=="FrameRate")
+                        Fill(StreamKind, 0, "FrameRate_Mode", "CFR", Unlimited, true, true);
+                }
             }
             break;
         case 0x01 : //UI8
@@ -1109,20 +1325,19 @@
                 int8u Value;
                 Get_B1 (Value,                                  "Value");
                 std::string ToFill;
-                     if (0) ;
-                else if (StringData=="haskeyframes") {}
-                else if (StringData=="hasKeyframes") {}
-                else if (StringData=="hasVideo") {}
-                else if (StringData=="stereo") {}
-                else if (StringData=="canSeekToEnd") {}
-                else if (StringData=="hasAudio") {}
-                else if (StringData=="hasmetadata") {}
-                else if (StringData=="hasMetadata") {}
-                else if (StringData=="hasCuePoints") {}
-                else if (StringData=="canseekontime") {}
+                     if (StringDataModified=="haskeyframes") {}
+                else if (StringDataModified=="hasKeyframes") {}
+                else if (StringDataModified=="hasVideo") {}
+                else if (StringDataModified=="stereo") {}
+                else if (StringDataModified=="canSeekToEnd") {}
+                else if (StringDataModified=="hasAudio") {}
+                else if (StringDataModified=="hasmetadata") {}
+                else if (StringDataModified=="hasMetadata") {}
+                else if (StringDataModified=="hasCuePoints") {}
+                else if (StringDataModified=="canseekontime") {}
                 else {ToFill=StringData;}
-                Element_Info(Value);
-                Fill(Stream_General, 0, ToFill.c_str(), Value?"Yes":"No");
+                Element_Info1(Value);
+                Fill(Stream_General, 0, ToFill.c_str(), Value?"Yes":"No", Unlimited, true, true);
             }
             break;
         case 0x02 : //SCRIPTDATASTRING
@@ -1135,25 +1350,29 @@
                     Get_UTF8(Value_Size, Value,                 "Value");
                     size_t ToFill=(size_t)-1;
                     std::string ToFillS;
-                         if (0) ;
-                    else if (StringData=="creator") {ToFill=General_Encoded_Application;}
-                    else if (StringData=="creationdate") {ToFill=General_Encoded_Date; Value.Date_From_String(Value.To_UTF8().c_str());}
-                    else if (StringData=="encoder") {ToFill=General_Encoded_Application;}
-                    else if (StringData=="Encoded_With") {ToFill=General_Encoded_Application;}
-                    else if (StringData=="Encoded_By") {ToFill=General_Encoded_Application;}
-                    else if (StringData=="metadatacreator") {ToFill=General_Tagged_Application;}
-                    else if (StringData=="sourcedata") {}
-                    else
+                         if (StringDataModified=="creator") {ToFill=General_Encoded_Application;}
+                    else if (StringDataModified=="creationdate") {ToFill=General_Encoded_Date; Value.Date_From_String(Value.To_UTF8().c_str());}
+                    else if (StringDataModified=="encoder") {ToFill=General_Encoded_Application;}
+                    else if (StringDataModified=="Encoded_With") {ToFill=General_Encoded_Application;}
+                    else if (StringDataModified=="Encoded_By") {ToFill=General_Encoded_Application;}
+                    else if (StringDataModified=="metadatacreator") {ToFill=General_Tagged_Application;}
+                    else if (StringDataModified=="creation_time") {ToFill=General_Encoded_Date; Value.insert(0, __T("UTC "));}
+                    else if (StringDataModified=="sourcedata") {}
+                    else if (StringDataModified=="audiocodecid") {}
+                    else if (StringDataModified=="videocodecid") {}
+                    else if (!(StringDataModified=="major_brand"
+                            || StringDataModified=="minor_version"
+                            || StringDataModified=="compatible_brands"))
                         ToFillS=StringData;
-                    if (Value.find(_T('\r'))!=std::string::npos)
-                        Value.resize(Value.find(_T('\r')));
-                    if (Value.find(_T('\n'))!=std::string::npos)
-                        Value.resize(Value.find(_T('\n')));
-                    Element_Info(Value);
+                    if (Value.find(__T('\r'))!=std::string::npos)
+                        Value.resize(Value.find(__T('\r')));
+                    if (Value.find(__T('\n'))!=std::string::npos)
+                        Value.resize(Value.find(__T('\n')));
+                    Element_Info1(Value);
                     if (ToFill!=(size_t)-1)
-                        Fill(Stream_General, 0, ToFill, Value);
+                        Fill(Stream_General, 0, ToFill, Value, true);
                     else if (!ToFillS.empty())
-                        Fill(Stream_General, 0, StringData.c_str(), Value);
+                        Fill(Stream_General, 0, StringData.c_str(), Value, true);
                 }
             }
             break;
@@ -1168,12 +1387,12 @@
                 {
                     if (Element_Offset>=Element_Size)
                         break;
-                    Element_Begin();
+                    Element_Begin0();
                     Get_B2 (StringLength2,                          "StringLength2");
                     Get_String(StringLength2, StringData2,          "StringData2");
                     Element_Name(StringData2.empty()?"EndOfObject":StringData2.c_str());
                     meta_SCRIPTDATAVALUE(StringData+'_'+StringData2);
-                    Element_End();
+                    Element_End0();
                 }
                 meta_Level--;
             }
@@ -1186,9 +1405,9 @@
                 {
                     Ztring Value;
                     Get_Local(Value_Size, Value,                "Value");
-                    if (Value==_T("unknown")) Value.clear();
-                    if (!Value.empty()) Element_Info(Value);
-                    Fill(Stream_General, 0, StringData.c_str(), Value);
+                    if (Value==__T("unknown")) Value.clear();
+                    Element_Info1C((!Value.empty()), Value);
+                    Fill(Stream_General, 0, StringData.c_str(), Value, true);
                 }
             }
             break;
@@ -1200,15 +1419,15 @@
             {
                 int16u Value;
                 Get_B2 (Value,                                  "Value");
-                Element_Info(Value);
-                Fill(Stream_General, 0, StringData.c_str(), Value);
+                Element_Info1(Value);
+                Fill(Stream_General, 0, StringData.c_str(), Value, true);
             }
             break;
         case 0x08 : //SCRIPTDATAVARIABLE[ECMAArrayLength]
             {
                 int32u ECMAArrayLength;
                 Get_B4 (ECMAArrayLength,                        "ECMAArrayLength");
-                Element_Info(Ztring::ToZtring(ECMAArrayLength)+_T(" elements"));
+                Element_Info1(Ztring::ToZtring(ECMAArrayLength)+__T(" elements"));
                 for (int32u Pos=0; Pos<ECMAArrayLength; Pos++)
                 {
                     meta_SCRIPTDATAVARIABLE();
@@ -1218,7 +1437,7 @@
             }
             break;
         case 0x09 :
-            Element_Info("EndOfObject");
+            Element_Info1("EndOfObject");
             meta_LevelFinished[meta_Level]=true;
             break;
         case 0x0A : //SCRIPTDATAVARIABLE[n]
@@ -1236,14 +1455,13 @@
                 Get_BF8(Value,                                 "Value");
                 Ztring ValueS;
                 ValueS.Date_From_Seconds_1970((int32u)(Value/1000));
-                Param_Info(ValueS);
+                Param_Info1(ValueS);
                 Skip_B2(                                        "Local_Offset_Minutes");
                 std::string ToFill;
-                     if (0) ;
-                else if (StringData=="metadatadate") {ToFill="Tagged_Date";}
+                     if (StringData=="metadatadate") {ToFill="Tagged_Date";}
                 else {ToFill=StringData;}
-                Element_Info(ValueS);
-                Fill(Stream_General, 0, ToFill.c_str(), ValueS);
+                Element_Info1(ValueS);
+                Fill(Stream_General, 0, ToFill.c_str(), ValueS, true);
             }
             break;
         case 0x0C : //SCRIPTDATALONGSTRING
@@ -1256,22 +1474,21 @@
                     Ztring Value;
                     Get_UTF16B(Value_Size, Value,               "Value");
                     std::string ToFill;
-                         if (0) ;
-                    else if (StringData=="creator") {ToFill="Encoded_Application";}
+                         if (StringData=="creator") {ToFill="Encoded_Application";}
                     else if (StringData=="liveXML") {}
                     else if (StringData=="metadatacreator") {ToFill="Tagged_Application";}
                     else if (StringData=="creationdate") {ToFill="Encoded_Date"; Value.Date_From_String(Value.To_UTF8().c_str());}
                     else {ToFill=StringData;}
-                    Element_Info(Value);
+                    Element_Info1(Value);
                     if (!ToFill.empty())
-                        Fill(Stream_General, 0, ToFill.c_str(), Value);
+                        Fill(Stream_General, 0, ToFill.c_str(), Value, true);
                 }
             }
             break;
         case 0x11 : //AMF3 data
             {
                 int32u TypeCode;
-                Get_B4 (TypeCode,                               "AMF3 type code"); if (TypeCode<0x0D) Param_Info(Flv_Amf3Type[TypeCode]);
+                Get_B4 (TypeCode,                               "AMF3 type code"); Param_Info1C((TypeCode<0x0D), Flv_Amf3Type[TypeCode]);
                 switch (TypeCode)
                 {
                     case 0x00 : //undefined

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Flv.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Flv.h Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Gxf.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Gxf.cpp Changed

@@ -1,36 +1,44 @@
 // File_Gxf - Info for GXF (SMPTE 360M) files
-// Copyright (C) 2010-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_GXF_YES)
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 #include "MediaInfo/Multiple/File_Gxf.h"
+#include "MediaInfo/Multiple/File_Gxf_TimeCode.h"
+#if defined(MEDIAINFO_DVDIF_YES)
+    #include "MediaInfo/Multiple/File_DvDif.h"
+#endif
 #if defined(MEDIAINFO_RIFF_YES)
     #include "MediaInfo/Multiple/File_Riff.h"
 #endif
@@ -43,9 +51,14 @@
 #if defined(MEDIAINFO_AC3_YES)
     #include "MediaInfo/Audio/File_Ac3.h"
 #endif
+#if defined(MEDIAINFO_AES3_YES)
+    #include "MediaInfo/Audio/File_ChannelGrouping.h"
+#endif
 #if MEDIAINFO_EVENTS
     #include "MediaInfo/MediaInfo_Events.h"
 #endif //MEDIAINFO_EVENTS
+#include "MediaInfo/MediaInfo_Config_MediaInfo.h"
+#include "ZenLib/Utils.h"
 //---------------------------------------------------------------------------
 
 namespace MediaInfoLib
@@ -88,8 +101,8 @@
 {
     switch (Type)
     {
-        case  3 : return "M-JPEG"; //525 lines
-        case  4 : return "M-JPEG"; //625 lines
+        case  3 : return "JPEG"; //525 lines
+        case  4 : return "JPEG"; //625 lines
         case  7 : return "SMPTE 12M"; //525 lines
         case  8 : return "SMPTE 12M"; //625 lines
         case  9 : return "PCM"; //24-bit
@@ -228,35 +241,50 @@
 :File__Analyze()
 {
     //Configuration
-    ParserName=_T("GXF");
+    ParserName=__T("GXF");
     #if MEDIAINFO_EVENTS
         ParserIDs[0]=MediaInfo_Parser_Gxf;
         StreamIDs_Width[0]=2;
     #endif //MEDIAINFO_EVENTS
+    #if MEDIAINFO_DEMUX
+        Demux_Level=2; //Container
+    #endif //MEDIAINFO_DEMUX
     MustSynchronize=true;
     Buffer_TotalBytes_FirstSynched_Max=64*1024;
+    Buffer_TotalBytes_Fill_Max=(int64u)-1; //Disabling this feature for this format, this is done in the parser
+    #if MEDIAINFO_DEMUX
+        Demux_EventWasSent_Accept_Specific=true;
+    #endif //MEDIAINFO_DEMUX
 
     //Temp
-    Material_Fields_FieldsPerFrame=(int8u)-1;
+    Material_Fields_FieldsPerFrame=1; //Progressive by default
     Parsers_Count=0;
     AncillaryData_StreamID=(int8u)-1;
     Material_Fields_First_IsValid=false;
     Material_Fields_Last_IsValid=false;
     Material_File_Size_IsValid=false;
     UMF_File=NULL;
+    #if defined(MEDIAINFO_ANCILLARY_YES)
+        Ancillary=NULL;
+    #endif //defined(MEDIAINFO_ANCILLARY_YES)
     SizeToAnalyze=16*1024*1024;
+    Audio_Count=0;
+    Element_Code=0x00; //Element_Code is used as a test for pre-existing parsing, it must be initialized
+
+    #if MEDIAINFO_DEMUX
+        Demux_HeaderParsed=false;
+    #endif //MEDIAINFO_DEMUX
+    #if MEDIAINFO_SEEK
+        Flt_FieldPerEntry=(int32u)-1;
+        IFrame_IsParsed=false;
+    #endif //MEDIAINFO_SEEK
 }
 
 //---------------------------------------------------------------------------
 File_Gxf::~File_Gxf()
 {
-    //In
-    for (size_t Pos=0; Pos<Cdp_Data.size(); Pos++)
-        delete Cdp_Data[Pos]; //Cdp_Data[Pos]=NULL;
-    for (size_t Pos=0; Pos<AfdBarData_Data.size(); Pos++)
-        delete AfdBarData_Data[Pos]; //AfdBarData_Data[Pos]=NULL;
-
     //Temp
+    delete Ancillary; //Ancillary=NULL;
     delete UMF_File; //UMF_File=NULL;
 }
 
@@ -273,25 +301,25 @@
         if (Gxf_MediaTypes_StreamKind(Streams[StreamID].MediaType)==Stream_Video)
         {
             Ztring Title=Streams[StreamID].MediaName;
-            size_t Title_Extension_Offset=Title.find(_T(".M0"));
+            size_t Title_Extension_Offset=Title.find(__T(".M0"));
             if (Title_Extension_Offset==std::string::npos || Title_Extension_Offset!=Title.size()-3)
-                Title_Extension_Offset=Title.find(_T(".H0"));
+                Title_Extension_Offset=Title.find(__T(".H0"));
             if (Title_Extension_Offset!=std::string::npos && Title_Extension_Offset==Title.size()-3)
             {
                 Title.resize(Title.size()-3);
                 Streams[StreamID].MediaName=Title;
             }
         }
-        if (Gxf_MediaTypes_StreamKind(Streams[StreamID].MediaType)==Stream_Audio)
+        if (Gxf_MediaTypes_StreamKind(Streams[StreamID].MediaType)==Stream_Audio && Config->File_Audio_MergeMonoStreams_Get())
         {
             Ztring Title=Streams[StreamID].MediaName;
-            size_t Title_Extension_Offset=Title.find(_T(".A0"));
+            size_t Title_Extension_Offset=Title.find(__T(".A0"));
             if (Title_Extension_Offset!=std::string::npos && Title_Extension_Offset==Title.size()-3)
             {
                 Title.resize(Title.size()-3);
                 for (size_t StreamID2=StreamID+1; StreamID2<Streams.size(); StreamID2++)
                 {
-                    if (Streams[StreamID2].MediaName==Title+_T(".A")+Ztring::ToZtring(StreamID2-StreamID))
+                    if (Streams[StreamID2].MediaName==Title+__T(".A")+Ztring::ToZtring(StreamID2-StreamID))
                     {
                         Streams[StreamID].MediaName=Title;
                         if (Streams[StreamID].Parser && Streams[StreamID2].Parser)
@@ -313,13 +341,16 @@
         Streams_Finish_PerStream(StreamID, Streams[StreamID]);
 
     //Global
-    if (Material_Fields_First_IsValid && Material_Fields_Last_IsValid && Material_Fields_FieldsPerFrame!=(int8u)-1)
+    if (Material_Fields_First_IsValid && Material_Fields_Last_IsValid && Material_Fields_Last-Material_Fields_First)
     {
-        Fill(Stream_Video, 0, Video_FrameCount, (Material_Fields_Last-Material_Fields_First)/(Material_Fields_FieldsPerFrame==2?2:1));
+        int64u FrameCount=(Material_Fields_Last+1-Material_Fields_First)/Material_Fields_FieldsPerFrame;
+        Fill(Stream_Video, 0, Video_FrameCount, FrameCount);
+        if (Gxf_FrameRate(Streams[0x00].FrameRate_Code))
+            Fill(Stream_Video, 0, Video_Duration, ((float64)FrameCount)/Gxf_FrameRate(Streams[0x00].FrameRate_Code)*1000, 0); //In milliseconds
 
         //We trust more the MPEG Video bitrate thant the rest
         //TODO: Chech why there is incohenrency (mainly about Material File size info in the sample)
-        if (Retrieve(Stream_Video, 0, Video_Format)==_T("MPEG Video"))
+        if (Retrieve(Stream_Video, 0, Video_Format)==__T("MPEG Video"))
             Fill(Stream_Video, 0, Video_BitRate, Retrieve(Stream_Video, 0, Video_BitRate_Nominal));
     }
     if (Material_File_Size_IsValid)
@@ -335,41 +366,137 @@
         return;
 
     //By the parser
-    if (Temp.Parser && Temp.Parser->Status[IsFilled])
+    if (Temp.Parser && Temp.Parser->Status[IsAccepted])
     {
         StreamKind_Last=Stream_Max;
         StreamPos_Last=(size_t)-1;
+        if (Config->ParseSpeed<=1.0)
+        {
+            Fill(Temp.Parser);
+            Temp.Parser->Open_Buffer_Unsynch();
+        }
         Finish(Temp.Parser);
-        Merge(*Temp.Parser);
 
-        //Special cases
-        if (Temp.Parser->Count_Get(Stream_Video) && Temp.Parser->Count_Get(Stream_Text))
+        //Video
+        bool IsTimeCode=false;
+        for (std::map<int8u, int64u>::iterator TimeCode=TimeCodes.begin(); TimeCode!=TimeCodes.end(); ++TimeCode)
+            if (StreamID==TimeCode->first)
+                IsTimeCode=true;
+        if (!IsTimeCode && Temp.DisplayInfo)
         {
-            //Video and Text are together
-            size_t Parser_Text_Count=Temp.Parser->Count_Get(Stream_Text);
-            for (size_t Parser_Text_Pos=0; Parser_Text_Pos<Parser_Text_Count; Parser_Text_Pos++)
+            if (Temp.Parser->Count_Get(Stream_Video))
             {
-                size_t Text_Pos=Count_Get(Stream_Text)-Parser_Text_Count+Parser_Text_Pos;
-                Ztring MuxingMode=Retrieve(Stream_Text, Text_Pos, "MuxingMode");
-                Fill(Stream_Text, Text_Pos, "MuxingMode", _T("Ancillary data / ")+MuxingMode, true);
-                if (!IsSub)
-                    Fill(Stream_Text, Text_Pos, "MuxingMode_MoreInfo", _T("Muxed in Video #")+Ztring().From_Number(Temp.StreamPos+1));
-                Fill(Stream_Video, Count_Get(Stream_Video)-1, General_ID, StreamID);
-                Ztring ID=Retrieve(Stream_Text, Text_Pos, Text_ID);
-                Fill(Stream_Text, Text_Pos, Text_ID, Ztring::ToZtring(AncillaryData_StreamID)+_T("-")+ID, true);
-                Fill(Stream_Text, Text_Pos, Text_ID_String, Ztring::ToZtring(AncillaryData_StreamID)+_T("-")+ID, true);
-                Fill(Stream_Text, Text_Pos, Text_Delay, Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_Delay), true);
+                Stream_Prepare(Stream_Video);
+
+                if (TimeCodes.empty())
+                {
+                    Fill(Stream_Video, StreamPos_Last, Video_Delay, ((float64)(Material_Fields_First/Material_Fields_FieldsPerFrame))/Gxf_FrameRate(Streams[0x00].FrameRate_Code)*1000, 0);
+                    Fill(Stream_Video, StreamPos_Last, Video_Delay_Source, "Container");
+                }
+                else
+                    for (std::map<int8u, int64u>::iterator TimeCode=TimeCodes.begin(); TimeCode!=TimeCodes.end(); ++TimeCode)
+                    {
+                        int64u TimeCode_First=((File_Gxf_TimeCode*)Streams[TimeCode->first].Parser)->TimeCode_First;
+                        if (TimeCode_First==(int64u)-1)
+                            TimeCode_First=TimeCode->second;
+                        if (TimeCode_First!=(int64u)-1)
+                        {
+                            Fill(Stream_Video, StreamPos_Last, Video_Delay, TimeCode_First, 0);
+                            Fill(Stream_Video, StreamPos_Last, Video_Delay_Source, "Container");
+                        }
+                    }
+
+                Merge(*Temp.Parser, Stream_Video, 0, StreamPos_Last);
+
+                Fill(Stream_Video, StreamPos_Last, Video_ID, StreamID, 10, true);
+                Fill(Stream_Video, StreamPos_Last, "Title", Temp.MediaName);
+
+                //Special cases
+                if (Temp.Parser->Count_Get(Stream_Text))
+                {
+                    //Video and Text are together
+                    size_t Parser_Text_Count=Temp.Parser->Count_Get(Stream_Text);
+                    for (size_t Parser_Text_Pos=0; Parser_Text_Pos<Parser_Text_Count; Parser_Text_Pos++)
+                    {
+                        Stream_Prepare(Stream_Text);
+                        Merge(*Temp.Parser, Stream_Text, Parser_Text_Pos, StreamPos_Last);
+                        Ztring ID=Retrieve(Stream_Text, StreamPos_Last, Text_ID);
+                        Fill(Stream_Text, StreamPos_Last, Text_ID, Ztring::ToZtring(AncillaryData_StreamID)+__T("-")+ID, true);
+                        Fill(Stream_Text, StreamPos_Last, Text_ID_String, Ztring::ToZtring(AncillaryData_StreamID)+__T("-")+ID, true);
+                        Fill(Stream_Text, StreamPos_Last, Text_Delay, Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_Delay), true);
+                        Fill(Stream_Text, StreamPos_Last, Text_Delay_Source, Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_Delay_Source), true);
+                        Fill(Stream_Text, StreamPos_Last, Text_Delay_Original, Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_Delay_Original), true);
+                        Fill(Stream_Text, StreamPos_Last, Text_Delay_Original_Source, Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_Delay_Original_Source), true);
+                    }
+
+                    StreamKind_Last=Stream_Video;
+                    StreamPos_Last=Count_Get(Stream_Video)-1;
+                }
             }
 
-            StreamKind_Last=Stream_Video;
-            StreamPos_Last=Count_Get(Stream_Video)-1;
-        }
+            //Audio
+            for (size_t Pos=0; Pos<Temp.Parser->Count_Get(Stream_Audio); Pos++)
+            {
+                Stream_Prepare(Stream_Audio);
 
-        //Metadata
-        if (StreamKind_Last!=Stream_Max)
-        {
-            Fill(StreamKind_Last, StreamPos_Last, General_ID, StreamID, 10, true);
-            Fill(StreamKind_Last, StreamPos_Last, "Title", Temp.MediaName);
+                if (TimeCodes.empty())
+                {
+                    Fill(Stream_Audio, StreamPos_Last, Audio_Delay, ((float64)(Material_Fields_First/Material_Fields_FieldsPerFrame))/Gxf_FrameRate(Streams[0x00].FrameRate_Code)*1000, 0);
+                    Fill(Stream_Audio, StreamPos_Last, Audio_Delay_Source, "Container");
+                }
+                else
+                    for (std::map<int8u, int64u>::iterator TimeCode=TimeCodes.begin(); TimeCode!=TimeCodes.end(); ++TimeCode)
+                    {
+                        int64u TimeCode_First=((File_Gxf_TimeCode*)Streams[TimeCode->first].Parser)->TimeCode_First;
+                        if (TimeCode_First==(int64u)-1)
+                            TimeCode_First=TimeCode->second;
+                        Fill(Stream_Audio, StreamPos_Last, Audio_Delay, TimeCode_First, 0);
+                        Fill(Stream_Audio, StreamPos_Last, Audio_Delay_Source, "Container");
+                    }
+
+                Merge(*Temp.Parser, Stream_Audio, Pos, StreamPos_Last, false);
+
+                Ztring ID=Ztring::ToZtring(StreamID);
+                if (Temp.IsChannelGrouping)
+                    ID+=__T(" / ")+Ztring::ToZtring(StreamID+1); //Second half of the channel grouping
+                Ztring ID_String=ID;
+                if (!Retrieve(Stream_Audio, StreamPos_Last, Audio_ID).empty())
+                {
+                    ID+=__T('-')+Retrieve(Stream_Audio, StreamPos_Last, Audio_ID);
+                    ID_String+=__T('-')+Retrieve(Stream_Audio, StreamPos_Last, Audio_ID_String);
+                }
+                Fill(Stream_Audio, StreamPos_Last, Audio_ID, ID, true);
+                Fill(Stream_Audio, StreamPos_Last, Audio_ID_String, ID_String, true);
+                Fill(Stream_Audio, StreamPos_Last, "Title", Temp.MediaName);
+                if (Temp.IsChannelGrouping)
+                    Fill(StreamKind_Last, StreamPos_Last, "Title", Streams[StreamID+1].MediaName); //Second half of the channel grouping
+
+                for (std::map<std::string, Ztring>::iterator Info=Temp.Infos.begin(); Info!=Temp.Infos.end(); ++Info)
+                    if (Retrieve(Stream_Audio, StreamPos_Last, Info->first.c_str()).empty())
+                        Fill(Stream_Audio, StreamPos_Last, Info->first.c_str(), Info->second);
+            }
+
+            //Text
+            if (Temp.Parser->Count_Get(Stream_Text))
+            {
+                size_t Parser_Text_Count=Temp.Parser->Count_Get(Stream_Text);
+                for (size_t Parser_Text_Pos=0; Parser_Text_Pos<Parser_Text_Count; Parser_Text_Pos++)
+                {
+                    Stream_Prepare(Stream_Text);
+                    Merge(*Temp.Parser, Stream_Text, Parser_Text_Pos, StreamPos_Last);
+                    Ztring ID=Retrieve(Stream_Text, StreamPos_Last, Text_ID);
+                    Fill(Stream_Text, StreamPos_Last, Text_ID, Ztring::ToZtring(AncillaryData_StreamID)+__T("-")+ID, true);
+                    Fill(Stream_Text, StreamPos_Last, Text_ID_String, Ztring::ToZtring(AncillaryData_StreamID)+__T("-")+ID, true);
+                    Fill(Stream_Text, StreamPos_Last, Text_Delay, Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_Delay), true);
+                    Fill(Stream_Text, StreamPos_Last, Text_Delay_Source, Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_Delay_Source), true);
+                    Fill(Stream_Text, StreamPos_Last, Text_Delay_Original, Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_Delay_Original), true);
+                    Fill(Stream_Text, StreamPos_Last, Text_Delay_Original_Source, Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_Delay_Original_Source), true);
+                    Fill(Stream_Text, StreamPos_Last, "Title", Temp.MediaName);
+                }
+
+                StreamKind_Last=Stream_Max;
+                StreamPos_Last=(size_t)-1;
+            }
         }
     }
 }
@@ -384,25 +511,38 @@
     //Synchronizing
     while (Buffer_Offset+16<=Buffer_Size)
     {
-        while (Buffer_Offset+16<=Buffer_Size)
+        while (Buffer_Offset+16<=Buffer_Size && (Buffer[Buffer_Offset  ]!=0x00
+                                              || Buffer[Buffer_Offset+1]!=0x00
+                                              || Buffer[Buffer_Offset+2]!=0x00
+                                              || Buffer[Buffer_Offset+3]!=0x00
+                                              || Buffer[Buffer_Offset+4]!=0x01
+                                              || Buffer[Buffer_Offset+14]!=0xE1
+                                              || Buffer[Buffer_Offset+15]!=0xE2))
         {
-            if (CC5(Buffer+Buffer_Offset   )==0x0000000001
-             && CC2(Buffer+Buffer_Offset+14)==0xE1E2)
-                break;
-            Buffer_Offset++;
+            Buffer_Offset+=4;
+            while (Buffer_Offset<Buffer_Size && Buffer[Buffer_Offset]!=0x00)
+                Buffer_Offset+=4;
+            for (int8u Pos=0; Pos<3; Pos++)
+                if (Buffer_Offset>=Buffer_Size || Buffer[Buffer_Offset-1]==0x00)
+                    Buffer_Offset--;
         }
 
         if (Buffer_Offset+16<=Buffer_Size) //Testing if size is coherant
         {
             //Retrieving some info
-            int32u Size=CC4(Buffer+Buffer_Offset+6);
+            int32u Size=BigEndian2int32u(Buffer+Buffer_Offset+6);
 
             //Testing
             if (Buffer_Offset+Size+16>Buffer_Size)
                 return false; //Need more data
-            if (CC5(Buffer+Buffer_Offset+Size   )!=0x0000000001
-             || CC2(Buffer+Buffer_Offset+Size+14)!=0xE1E2)
-                Buffer_Offset++;
+            if (Buffer[Buffer_Offset+Size  ]!=0x00
+             || Buffer[Buffer_Offset+Size+1]!=0x00
+             || Buffer[Buffer_Offset+Size+2]!=0x00
+             || Buffer[Buffer_Offset+Size+3]!=0x00
+             || Buffer[Buffer_Offset+Size+4]!=0x01
+             || Buffer[Buffer_Offset+Size+14]!=0xE1
+             || Buffer[Buffer_Offset+Size+15]!=0xE2)
+                 Buffer_Offset++;
             else
                 break;
         }
@@ -413,7 +553,7 @@
     {
         return false;
     }
-    
+
     if (!Status[IsAccepted])
     {
         Accept("GXF");
@@ -453,10 +593,121 @@
 }
 
 //***************************************************************************
+// Buffer - Global
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Gxf::Read_Buffer_Unsynched()
+{
+    for (size_t Pos=0; Pos<Streams.size(); Pos++)
+        if (Streams[Pos].Parser)
+            Streams[Pos].Parser->Open_Buffer_Unsynch();
+
+    #if MEDIAINFO_SEEK
+        IFrame_IsParsed=false;
+    #endif //MEDIAINFO_SEEK
+}
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_SEEK
+size_t File_Gxf::Read_Buffer_Seek (size_t Method, int64u Value, int64u)
+{
+    //Parsing
+    switch (Method)
+    {
+        case 0  :   Open_Buffer_Unsynch(); GoTo(Value); return 1;
+        case 1  :   Open_Buffer_Unsynch(); GoTo(File_Size*Value/10000); return 1;
+        case 2  :   //Timestamp
+                    {
+                        //We transform TimeStamp to a frame number
+                        if (Streams.empty() || Gxf_FrameRate(Streams[0x00].FrameRate_Code)==0)
+                            return (size_t)-1; //Not supported
+
+                        int64u Delay=0;
+                        if (TimeCodes.empty())
+                        {
+                            if (Material_Fields_First_IsValid)
+                                Delay=float64_int64s(((float64)(Material_Fields_First/Material_Fields_FieldsPerFrame))/Gxf_FrameRate(Streams[0x00].FrameRate_Code)*1000000000);
+                            else
+                                Delay=0;
+                        }
+                        else
+                        {
+                            for (std::map<int8u, int64u>::iterator TimeCode=TimeCodes.begin(); TimeCode!=TimeCodes.end(); ++TimeCode)
+                            {
+                                int64u TimeCode_First=((File_Gxf_TimeCode*)Streams[TimeCode->first].Parser)->TimeCode_First;
+                                if (TimeCode_First==(int64u)-1)
+                                    TimeCode_First=TimeCode->second;
+                                if (TimeCode_First==(int64u)-1)
+                                    Delay=0;
+                                else
+                                {
+                                    Delay=TimeCode_First*1000000;
+                                    break;
+                                }
+                            }
+                        }
+
+                        if (Value<Delay)
+                            Value=0;
+                        else
+                            Value=float64_int64s(((float64)(Value-Delay))/1000000000*Gxf_FrameRate(Streams[0x00].FrameRate_Code));
+                    }
+                    //No break;
+        case 3  :   //FrameNumber
+                    {
+                    if (Seeks.empty())
+                        return (size_t)-1; //Not supported
+
+                    //Search previous I-Frame
+                    if (UMF_File && ((File_Umf*)UMF_File)->GopSize!=(int64u)-1)
+                    {
+                        Value/=((File_Umf*)UMF_File)->GopSize;
+                        Value*=((File_Umf*)UMF_File)->GopSize;
+                    }
+                    Value*=Material_Fields_FieldsPerFrame;
+
+                    for (size_t Pos=0; Pos<Seeks.size(); Pos++)
+                    {
+                        if (Material_Fields_First+Value<=Seeks[Pos].FrameNumber)
+                        {
+                            if (Material_Fields_First+Value<Seeks[Pos].FrameNumber && Pos)
+                                Pos--;
+                            Open_Buffer_Unsynch();
+                            GoTo(((int64u)Seeks[Pos].StreamOffset)*1024);
+
+                            return 1;
+                        }
+                    }
+
+                    return 2; //Invalid value
+                    }
+        default :   return (size_t)-1; //Not supported
+    }
+}
+#endif //MEDIAINFO_SEEK
+
+//***************************************************************************
 // Buffer - Per element
 //***************************************************************************
 
 //---------------------------------------------------------------------------
+bool File_Gxf::Header_Begin()
+{
+    #if MEDIAINFO_DEMUX
+        //Handling of multiple frames in one block
+        if (Element_Code==0xBF && Config->Demux_Unpacketize_Get()) //media block
+        {
+            Open_Buffer_Continue(Streams[TrackNumber].Parser, Buffer+Buffer_Offset, 0);
+            if (Config->Demux_EventWasSent)
+                return false;
+        }
+    #endif //MEDIAINFO_DEMUX
+
+    return true;
+}
+
+//---------------------------------------------------------------------------
 void File_Gxf::Header_Parse()
 {
     //Parsing
@@ -471,11 +722,26 @@
     //Filling
     Header_Fill_Size(PacketLength);
     Header_Fill_Code(PacketType);
+
+    #if MEDIAINFO_DEMUX
+        if (!Demux_HeaderParsed)
+        {
+            if (PacketType==0xBF) //media
+            {
+                if (Config->NextPacket_Get() && Config->Event_CallBackFunction_IsSet())
+                    Config->Demux_EventWasSent=true; //First set is to indicate the user that header is parsed
+                Demux_HeaderParsed=true;
+            }
+        }
+    #endif //MEDIAINFO_DEMUX
 }
 
 //---------------------------------------------------------------------------
 void File_Gxf::Data_Parse()
 {
+    //Counting
+    Frame_Count++;
+
     switch (Element_Code)
     {
         case 0x00 : Finish("GXF"); break;
@@ -495,7 +761,7 @@
 
     //Parsing
     int8u Version;
-    Element_Begin("Preamble");
+    Element_Begin1("Preamble");
         BS_Begin();
         Mark_1();
         Mark_1();
@@ -503,9 +769,9 @@
         Get_S1(5, Version,                                      "Version");
         BS_End();
         Skip_B1(                                                "Reserved");
-    Element_End();
+    Element_End0();
 
-    Element_Begin("Material Data");
+    Element_Begin1("Material Data");
         int16u SectionLength;
         Get_B2 (SectionLength,                                  "Section Length");
         if (Element_Offset+SectionLength>=Element_Size)
@@ -513,7 +779,7 @@
         int64u Material_Data_End=Element_Offset+SectionLength;
         while (Element_Offset<Material_Data_End)
         {
-            Element_Begin("Tag");
+            Element_Begin1("Tag");
             int8u Tag, DataLength;
             Get_B1(Tag,                                         "Tag");
             Get_B1(DataLength,                                  "Data Length");
@@ -530,8 +796,13 @@
                 case 0x41 : //First field of material in stream
                             if (DataLength==4)
                             {
-                                Get_B4 (Material_Fields_First,  "Content");
-                                Material_Fields_First_IsValid=true;
+                                if (Material_Fields_First_IsValid)
+                                    Skip_B4(                    "Content");
+                                else
+                                {
+                                    Get_B4 (Material_Fields_First, "Content");
+                                    Material_Fields_First_IsValid=true;
+                                }
                             }
                             else
                                 Skip_XX(DataLength,             "Unknown");
@@ -539,8 +810,13 @@
                 case 0x42 : //Last field of material in stream
                             if (DataLength==4)
                             {
-                                Get_B4 (Material_Fields_Last,   "Content");
-                                Material_Fields_Last_IsValid=true;
+                                if (Material_Fields_Last_IsValid)
+                                    Skip_B4(                    "Content");
+                                else
+                                {
+                                    Get_B4 (Material_Fields_Last, "Content");
+                                    Material_Fields_Last_IsValid=true;
+                                }
                             }
                             else
                                 Skip_XX(DataLength,             "Unknown");
@@ -592,32 +868,35 @@
                             break;
                 default   : Skip_XX(DataLength,                 "Unknown");
             }
-            Element_End();
+            Element_End0();
         }
-    Element_End();
+    Element_End0();
 
-    Element_Begin("Track Description");
+    Element_Begin1("Track Description");
+        int32u Stream_Video_FrameRate_Code=(int32u)-1, Stream_Video_FieldsPerFrame_Code=(int32u)-1;
         Get_B2 (SectionLength,                                  "Section Length");
         if (Element_Offset+SectionLength>=Element_Size)
             SectionLength=(int16u)(Element_Size-Element_Offset);
         int64u Track_Data_End=Element_Offset+SectionLength;
         while (Element_Offset<Track_Data_End)
         {
-            Element_Begin("Track");
+            Element_Begin1("Track");
             int16u TrackLength;
             int8u  MediaType, TrackID;
-            Get_B1 (MediaType,                                  "Media type"); Param_Info(Gxf_MediaTypes(MediaType&0x7F));
+            Get_B1 (MediaType,                                  "Media type"); Param_Info1(Gxf_MediaTypes(MediaType&0x7F));
             Get_B1 (TrackID,                                    "Track ID");
             Get_B2 (TrackLength,                                "Track Length");
             if (Element_Offset+TrackLength>=Track_Data_End)
                 TrackLength=(int16u)(Track_Data_End-Element_Offset);
             int64u Track_End=Element_Offset+TrackLength;
-            Element_Info(TrackID&0x3F);
-            Element_Info(Gxf_MediaTypes(MediaType&0x7F));
+            Element_Info1(TrackID&0x3F);
+            Element_Info1(Gxf_MediaTypes(MediaType&0x7F));
 
             FILLING_BEGIN();
                 MediaType&=0x7F; //Remove the last bit
                 TrackID&=0x3F; //Remove the 2 last bits
+                Streams[TrackID].MediaType=MediaType;
+                Streams[TrackID].TrackID=TrackID;
                 if (Streams[TrackID].Parser==NULL)
                 {
                     Streams[TrackID].MediaType=MediaType;
@@ -629,15 +908,34 @@
                     #endif //MEDIAINFO_DEMUX
                     switch (MediaType)
                     {
+                        case  3 :
+                        case  4 :  //JPEG
+                                    Streams[TrackID].Parser=new File__Analyze; //Filling with following data
+                                    Open_Buffer_Init(Streams[TrackID].Parser);
+                                    Streams[TrackID].Parser->Accept();
+                                    Streams[TrackID].Parser->Fill();
+                                    Streams[TrackID].Parser->Stream_Prepare(Stream_Video);
+                                    Streams[TrackID].Parser->Fill(Stream_Video, 0, Video_Format, "JPEG");
+                                    break;
+                        case  7 :
+                        case  8 :
+                        case 24 :  //TimeCode
+                                    Streams[TrackID].Parser=new File_Gxf_TimeCode;
+                                    Open_Buffer_Init(Streams[TrackID].Parser);
+                                    Parsers_Count++;
+                                    Streams[TrackID].Searching_Payload=true;
+                                    TimeCodes[TrackID]=(int64u)-1;
+                                    break;
                         case  9 :
                         case 10 :
-                        case 18 :  //PCM
                                     Streams[TrackID].Parser=new File__Analyze; //Filling with following data
                                     Open_Buffer_Init(Streams[TrackID].Parser);
                                     Streams[TrackID].Parser->Accept();
                                     Streams[TrackID].Parser->Fill();
                                     Streams[TrackID].Parser->Stream_Prepare(Stream_Audio);
                                     Streams[TrackID].Parser->Fill(Stream_Audio, 0, Audio_Format, "PCM");
+                                    Streams[TrackID].Parser->Fill(Stream_Audio, 0, Audio_Format_Settings_Endianness, "Little");
+                                    Audio_Count++;
                                     break;
                         case 11 :
                         case 12 :
@@ -645,8 +943,8 @@
                         case 22 :
                         case 23 :   //MPEG Video
                                     Streams[TrackID].Parser=new File_Mpegv();
-                                    ((File_Mpegv*)Streams[TrackID].Parser)->Cdp_Data=&Cdp_Data;
-                                    ((File_Mpegv*)Streams[TrackID].Parser)->AfdBarData_Data=&AfdBarData_Data;
+                                    ((File_Mpegv*)Streams[TrackID].Parser)->FrameIsAlwaysComplete=true;
+                                    ((File_Mpegv*)Streams[TrackID].Parser)->Ancillary=&Ancillary;
                                     Open_Buffer_Init(Streams[TrackID].Parser);
                                     Parsers_Count++;
                                     Streams[TrackID].Searching_Payload=true;
@@ -654,25 +952,36 @@
                         case 13 :
                         case 14 :
                         case 15 :
-                        case 16 :   /*Streams[TrackID].Parser=new File_DvDif(); Parsers_Count++; break;*/
-                        case 17 :   //AC-3
-                                    Streams[TrackID].Parser=new File__Analyze; //Filling with following data
+                        case 16 :   //DV
+                                    Streams[TrackID].Parser=new File_DvDif();
                                     Open_Buffer_Init(Streams[TrackID].Parser);
-                                    Streams[TrackID].Parser->Accept();
-                                    Streams[TrackID].Parser->Fill();
-                                    Streams[TrackID].Parser->Stream_Prepare(Stream_Audio);
-                                    Streams[TrackID].Parser->Fill(Stream_Audio, 0, Audio_Format, "AC-3");
+                                    Parsers_Count++;
+                                    Streams[TrackID].Searching_Payload=true;
+                                    break;
+                        case 17 :   //AC-3 in AES3 (half)
+                        case 18 :   //Dolby E in AES3 (half)
+                                    Streams[TrackID].Parser=ChooseParser_ChannelGrouping(TrackID);
+                                    if (Streams[TrackID].Parser)
+                                    {
+                                        Open_Buffer_Init(Streams[TrackID].Parser);
+                                        Parsers_Count++;
+                                        Streams[TrackID].Searching_Payload=true;
+                                    }
+                                    Audio_Count++;
                                     break;
                         case 21 :   //Ancillary Metadata
                                     Streams[TrackID].Parser=new File_Riff();
-                                    ((File_Riff*)Streams[TrackID].Parser)->Cdp_Data=&Cdp_Data;
-                                    ((File_Riff*)Streams[TrackID].Parser)->AfdBarData_Data=&AfdBarData_Data;
+                                    ((File_Riff*)Streams[TrackID].Parser)->Ancillary=&Ancillary;
                                     Open_Buffer_Init(Streams[TrackID].Parser);
                                     Parsers_Count++;
                                     Streams[TrackID].Searching_Payload=true;
-                                    if (SizeToAnalyze<4*16*1024*1024)
-                                        SizeToAnalyze*=4; //4x more, to be sure to find captions
+                                    Ancillary=new File_Ancillary;
+                                    Ancillary->WithTenBit=true;
+                                    Ancillary->WithChecksum=true;
+                                    Open_Buffer_Init(Ancillary);
                                     AncillaryData_StreamID=TrackID;
+                                    if (SizeToAnalyze<8*16*1024*1024)
+                                        SizeToAnalyze*=8; //10x more, to be sure to find captions
                                     break;
                         default :   ;
                     }
@@ -684,11 +993,11 @@
                         {
                             case  9 :
                             case 18 :   //24-bit
-                                        Streams[TrackID].Parser->Fill(Stream_Audio, 0, Audio_Resolution, 24);
+                                        Streams[TrackID].Infos["BitDepth"].From_Number(24);
                                         break;
                             case 10 :
                             case 17 :   //16-bit
-                                        Streams[TrackID].Parser->Fill(Stream_Audio, 0, Audio_Resolution, 16);
+                                        Streams[TrackID].Infos["BitDepth"].From_Number(16);
                                         break;
                             default : ;
                         }
@@ -698,7 +1007,10 @@
                         {
                             case  9 :
                             case 10 :   //Mono
-                                        Streams[TrackID].Parser->Fill(Stream_Audio, 0, Audio_Channel_s_, 1);
+                                        Streams[TrackID].Infos["Channel(s)"].From_Number(1);
+                                        break;
+                            case 18 :   //Stereo
+                                        Streams[TrackID].Infos["Channel(s)"].From_Number(2);
                                         break;
                             default : ;
                         }
@@ -708,8 +1020,9 @@
                         {
                             case  9 :
                             case 10 :
-                            case 17 :   //48000
-                                        Streams[TrackID].Parser->Fill(Stream_Audio, 0, Audio_SamplingRate, 48000);
+                            case 17 :
+                            case 18 :   //48000
+                                        Streams[TrackID].Infos["SamplingRate"].From_Number(48000);
                                         break;
                             default : ;
                         }
@@ -717,12 +1030,14 @@
                         //Bit rate
                         switch (MediaType)
                         {
-                            case  9 :
-                            case 17 :   //Mono, 48 KHz, 24-bit (or padded up to 24-bit)
-                                        Streams[TrackID].Parser->Fill(Stream_Audio, 0, Audio_BitRate, 1*48000*24);
+                            case  9 :   //Mono, 48 KHz, 24-bit (or padded up to 24-bit)
+                                        Streams[TrackID].Infos["BitRate"].From_Number(1*48000*24);
                                         break;
                             case 10 :   //Mono, 48 KHz, 16-bit
-                                        Streams[TrackID].Parser->Fill(Stream_Audio, 0, Audio_BitRate, 1*48000*16);
+                                        Streams[TrackID].Infos["BitRate"].From_Number(1*48000*16);
+                                        break;
+                            case 18 :   //Stereo, 48 KHz, 24-bit (or padded up to 24-bit)
+                                        Streams[TrackID].Infos["BitRate"].From_Number(2*48000*24);
                                         break;
                             default : ;
                         }
@@ -730,9 +1045,13 @@
                 }
             FILLING_END();
 
+            int8u Hours=(int8u)-1, Minutes=(int8u)-1, Seconds=(int8u)-1, Fields=(int8u)-1;
+            bool  Invalid=true, DropFrame=true;
+            bool  TimeCode_Parsed=false;
+
             while (Element_Offset<Track_End)
             {
-                Element_Begin("Tag");
+                Element_Begin1("Tag");
                 int8u Tag, DataLength;
                 Get_B1(Tag,                                     "Tag");
                 Get_B1(DataLength,                              "Data Length");
@@ -757,22 +1076,24 @@
                                         Skip_B2(                "Byte size of each ancillary data field");
                                         Skip_B2(                "Byte size of the ancillary data media packet in 256 byte units");
                                     }
-                                    if (MediaType==7 || MediaType==8 || MediaType==24)
+                                    else if (MediaType==7 || MediaType==8 || MediaType==24)
                                     {
                                         //TimeCode
-                                        Skip_B1(                "Frame");
-                                        Skip_B1(                "Second");
-                                        Skip_B1(                "Minute");
+                                        Get_B1 (Fields,         "Fields");
+                                        Get_B1 (Seconds,        "Second");
+                                        Get_B1 (Minutes,        "Minute");
                                         BS_Begin();
-                                        Skip_SB(                "Invalid");
+                                        Get_SB (   Invalid,     "Invalid");
                                         Skip_SB(                "Color frame");
-                                        Skip_SB(                "Drop frame");
-                                        Skip_S1(5,              "Hour");
+                                        Get_SB (   DropFrame,   "Drop frame");
+                                        Get_S1 (5, Hours,       "Hour");
                                         BS_End();
                                         Skip_B1(                "User bits");
                                         Skip_B1(                "User bits");
                                         Skip_B1(                "User bits");
                                         Skip_B1(                "User bits");
+                                        if (!Invalid)
+                                            TimeCode_Parsed=true;
                                     }
                                     else
                                         Skip_B8(                "Content");
@@ -792,7 +1113,12 @@
                     case 0x50 : //Frame rate
                                 if (DataLength==4)
                                 {
-                                    Get_B4 (Streams[TrackID].FrameRate_Code, "Content"); Param_Info(Gxf_FrameRate(Streams[TrackID].FrameRate_Code)); Element_Info(Gxf_FrameRate(Streams[TrackID].FrameRate_Code));
+                                    Get_B4 (Streams[TrackID].FrameRate_Code, "Content"); Param_Info1(Gxf_FrameRate(Streams[TrackID].FrameRate_Code)); Element_Info1(Gxf_FrameRate(Streams[TrackID].FrameRate_Code));
+                                    for (std::map<int8u, int64u>::iterator TimeCode=TimeCodes.begin(); TimeCode!=TimeCodes.end(); ++TimeCode)
+                                        if (TrackID==TimeCode->first)
+                                            ((File_Gxf_TimeCode*)Streams[TrackID].Parser)->FrameRate_Code=Streams[0x00].FrameRate_Code;
+                                    if (Gxf_MediaTypes_StreamKind(MediaType)==Stream_Video)
+                                        Stream_Video_FrameRate_Code=Streams[TrackID].FrameRate_Code;
                                 }
                                 else
                                     Skip_XX(DataLength,         "Unknown");
@@ -800,7 +1126,7 @@
                     case 0x51 : //Lines per frame
                                 if (DataLength==4)
                                 {
-                                    Get_B4 (Streams[TrackID].LinesPerFrame_Code, "Content"); Param_Info(Gxf_LinesPerFrame_Height(Streams[TrackID].LinesPerFrame_Code)); Element_Info(Gxf_LinesPerFrame_Height(Streams[TrackID].LinesPerFrame_Code));
+                                    Get_B4 (Streams[TrackID].LinesPerFrame_Code, "Content"); Param_Info1(Gxf_LinesPerFrame_Height(Streams[TrackID].LinesPerFrame_Code)); Element_Info1(Gxf_LinesPerFrame_Height(Streams[TrackID].LinesPerFrame_Code));
                                 }
                                 else
                                     Skip_XX(DataLength,         "Unknown");
@@ -808,22 +1134,75 @@
                     case 0x52 : //Fields per frame
                                 if (DataLength==4)
                                 {
-                                    Get_B4 (Streams[TrackID].FieldsPerFrame_Code, "Content"); Param_Info(Gxf_FieldsPerFrame(Streams[TrackID].FieldsPerFrame_Code)); Element_Info(Gxf_FieldsPerFrame(Streams[TrackID].FieldsPerFrame_Code));
+                                    Get_B4 (Streams[TrackID].FieldsPerFrame_Code, "Content"); Param_Info1(Gxf_FieldsPerFrame(Streams[TrackID].FieldsPerFrame_Code)); Element_Info1(Gxf_FieldsPerFrame(Streams[TrackID].FieldsPerFrame_Code));
                                     if (Gxf_MediaTypes_StreamKind(MediaType)==Stream_Video)
+                                    {
+                                        Stream_Video_FieldsPerFrame_Code=Streams[TrackID].FieldsPerFrame_Code;
                                         Material_Fields_FieldsPerFrame=Streams[TrackID].FieldsPerFrame_Code;
+                                    }
+                                    for (std::map<int8u, int64u>::iterator TimeCode=TimeCodes.begin(); TimeCode!=TimeCodes.end(); ++TimeCode)
+                                        if (TrackID==TimeCode->first)
+                                            ((File_Gxf_TimeCode*)Streams[TrackID].Parser)->FieldsPerFrame_Code=Streams[0x00].FieldsPerFrame_Code;
                                 }
                                 else
                                     Skip_XX(DataLength,         "Unknown");
                                 break;
                     default   : Skip_XX(DataLength,             "Unknown");
                 }
-                Element_End();
+                Element_End0();
+            }
+            Element_End0();
+
+            //Test on TimeCode
+            if (TimeCode_Parsed && !Invalid)
+            {
+                std::map<int8u, int64u>::iterator TimeCode=TimeCodes.find(TrackID);
+                if (TimeCode==TimeCodes.end() || TimeCode->second==(int64u)-1)
+                {
+                    float64 FrameRate=Gxf_FrameRate(Streams[TrackID].FrameRate_Code);
+                    TimeCodes[TrackID]=Hours  *60*60*1000
+                                      +Minutes   *60*1000
+                                      +Seconds      *1000;
+                    if (!FrameRate)
+                    {
+                        //Time code frame rate is missing, using the video frame rate
+                        for (size_t Pos=0; Pos<Streams.size(); Pos++)
+                            if (Streams[Pos].FrameRate_Code!=(int32u)-1)
+                            {
+                                FrameRate=Gxf_FrameRate(Streams[Pos].FrameRate_Code);
+                                break;
+                            }
+                    }
+                    if (FrameRate)
+                        float64_int64s(Fields*1000/(FrameRate*2));
+                }
             }
-            Element_End();
         }
-    Element_End();
+    Element_End0();
     if (Element_Offset<Element_Size)
         Skip_XX(Element_Size-Element_Offset,                    "Padding");
+
+    //Filling missing frame rates for PCM
+    for (size_t TrackID=0; TrackID<Streams.size(); TrackID++)
+    {
+        if (Gxf_FrameRate(Streams[TrackID].FrameRate_Code)==0)
+        {
+            Streams[TrackID].FrameRate_Code=Stream_Video_FrameRate_Code;
+            Streams[TrackID].FieldsPerFrame_Code=Stream_Video_FieldsPerFrame_Code;
+        }
+        if (Material_Fields_First_IsValid && Gxf_MediaTypes_StreamKind(Streams[TrackID].MediaType)==Stream_Audio) //In case of offset, MediaFieldNumber-Material_Fields_First is not well rounded
+        {
+            float64 Temp=((float64)Material_Fields_First/Streams[TrackID].FieldsPerFrame_Code)/Gxf_FrameRate(Streams[TrackID].FrameRate_Code);
+            Temp*=48000; //TODO: find where this piece of info is available
+            Temp/=32768;
+            Temp-=(int64u)(Temp);
+            if (Temp)
+            {
+                Temp=((float64)32768)/48000*(1-Temp); //Duration of the first frame not counted
+                Streams[TrackID].FirstFrameDuration=float64_int64s(Temp*1000000000);
+            }
+        }
+    }
 }
 
 //---------------------------------------------------------------------------
@@ -832,11 +1211,12 @@
     Element_Name("media");
 
     //Parsing
-    int8u TrackNumber;
-    Element_Begin("Preamble");
-        Skip_B1(                                                "Media type");
+    int32u  MediaFieldNumber;
+    int8u   MediaType;
+    Element_Begin1("Preamble");
+        Get_B1 (MediaType,                                      "Media type");
         Get_B1 (TrackNumber,                                    "Track number");
-        Skip_B4(                                                "Media field number");
+        Get_B4 (MediaFieldNumber,                               "Media field number");
         Skip_B1(                                                "Field information");
         Skip_B1(                                                "Field information");
         Skip_B1(                                                "Field information");
@@ -845,24 +1225,118 @@
         Skip_B1(                                                "Flags");
         Skip_B1(                                                "Reserved");
         TrackNumber&=0x3F;
-    Element_End();
-    Element_Info(TrackNumber);
+    Element_End0();
+    Element_Info1(TrackNumber);
+
+    //Managing audio 32768-sample DTS synchro
+    if (Gxf_MediaTypes_StreamKind(MediaType)==Stream_Audio && MediaFieldNumber==Material_Fields_First && Gxf_FrameRate(Streams[TrackNumber].FrameRate_Code) && Streams[TrackNumber].FirstFrameDuration)
+    {
+        float64 Temp=((float64)MediaFieldNumber/Material_Fields_FieldsPerFrame)/Gxf_FrameRate(Streams[TrackNumber].FrameRate_Code);
+        Temp*=48000; //TODO: find where this piece of info is available
+        Temp/=32768;
+        Temp-=(int64u)(Temp);
+        Temp*=(Element_Size-Element_Offset);
+        int64u ByteOffset=(int64u)Temp;
+        int64u SampleSize=(Element_Size-Element_Offset)/32768;
+        ByteOffset/=SampleSize; //Need to be in sync with sample size
+        ByteOffset*=SampleSize;
+        Element_Offset+=ByteOffset;
+    }
+
+    #if MEDIAINFO_SEEK
+        if (!IFrame_IsParsed)
+        {
+            if (UMF_File && ((File_Umf*)UMF_File)->GopSize!=(int64u)-1)
+                IFrame_IsParsed=(((MediaFieldNumber-(Material_Fields_First_IsValid?Material_Fields_First:0))/Material_Fields_FieldsPerFrame)%((File_Umf*)UMF_File)->GopSize)==0;
+            else if (Gxf_MediaTypes_StreamKind(Streams[TrackNumber].MediaType)==Stream_Video)
+                IFrame_IsParsed=true;
+        }
+    #endif //MEDIAINFO_SEEK
 
     #if MEDIAINFO_DEMUX
-        Element_Code=TrackNumber;
-        Demux(Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)(Element_Size-Element_Offset), ContentType_MainStream);
+            if (Streams[TrackNumber].MediaType!=8) //Not a TimeCode stream
+            {
+                Element_Code=TrackNumber;
+                int64u TimeCode_First=0;
+                if (!TimeCodes.empty())
+                {
+                    TimeCode_First=((File_Gxf_TimeCode*)Streams[TimeCodes.begin()->first].Parser)->TimeCode_First;
+                    if (TimeCode_First==(int64u)-1)
+                        TimeCode_First=TimeCodes.begin()->second;
+                }
+                if (TimeCode_First!=(int64u)-1)
+                    TimeCode_First*=1000000;
+                if (Gxf_MediaTypes_StreamKind(Streams[TrackNumber].MediaType)==Stream_Video)
+                {
+                    if (Gxf_FrameRate(Streams[TrackNumber].FrameRate_Code))
+                    {
+                        FrameInfo.DTS=TimeCode_First+float64_int64s(((float64)MediaFieldNumber-(Material_Fields_First_IsValid?Material_Fields_First:0))/Material_Fields_FieldsPerFrame*1000000000/Gxf_FrameRate(Streams[TrackNumber].FrameRate_Code));
+                        FrameInfo.PTS=(int64u)-1;
+                        FrameInfo.DUR=float64_int64s(((float64)1000000000)/Gxf_FrameRate(Streams[TrackNumber].FrameRate_Code));
+                    }
+                    else
+                        FrameInfo.DTS=FrameInfo.PTS=FrameInfo.DUR=(int64u)-1;
+                    if (MediaFieldNumber-(Material_Fields_First_IsValid?Material_Fields_First:0)==0)
+                        Demux_random_access=true;
+                    else
+                    {
+                        if (UMF_File && ((File_Umf*)UMF_File)->GopSize!=(int64u)-1)
+                            Demux_random_access=(((MediaFieldNumber-(Material_Fields_First_IsValid?Material_Fields_First:0))/Material_Fields_FieldsPerFrame)%((File_Umf*)UMF_File)->GopSize)==0;
+                        else
+                            Demux_random_access=false;
+                    }
+                }
+                else if (Gxf_MediaTypes_StreamKind(Streams[TrackNumber].MediaType)==Stream_Audio)
+                {
+                    if (Gxf_FrameRate(Streams[TrackNumber].FrameRate_Code))
+                    {
+                        Frame_Count_NotParsedIncluded=(int64u)((MediaFieldNumber-(Material_Fields_First_IsValid?Material_Fields_First:0))/Gxf_FrameRate(Streams[TrackNumber].FrameRate_Code)*48000/32768/Material_Fields_FieldsPerFrame); //A block is 32768 samples at 48 KHz
+                        FrameInfo.PTS=TimeCode_First+Frame_Count_NotParsedIncluded*1000000000*32768/48000; //A block is 32768 samples at 48 KHz
+                        if (Material_Fields_First_IsValid && MediaFieldNumber!=Material_Fields_First && Streams[TrackNumber].FirstFrameDuration) //In case of offset, MediaFieldNumber-Material_Fields_First is not well rounded
+                        {
+                            FrameInfo.PTS+=Streams[TrackNumber].FirstFrameDuration;
+                            Frame_Count_NotParsedIncluded++;
+                        }
+                        FrameInfo.DTS=FrameInfo.PTS;
+                    }
+                    else
+                        FrameInfo.DTS=FrameInfo.PTS=(int64u)-1;
+                    FrameInfo.DUR=float64_int64s(((float64)1000000000)*32768/48000);
+                    Demux_random_access=true;
+                }
+                else
+                {
+                    if (Gxf_FrameRate(Streams[0x00].FrameRate_Code))
+                        FrameInfo.DTS=FrameInfo.PTS=TimeCode_First+float64_int64s(((float64)(MediaFieldNumber-(Material_Fields_First_IsValid?Material_Fields_First:0)))*1000000000/Gxf_FrameRate(Streams[0x00].FrameRate_Code)/Material_Fields_FieldsPerFrame);
+                    else
+                        FrameInfo.DTS=FrameInfo.PTS=(int64u)-1;
+                    FrameInfo.DUR=(int64u)-1;
+                    Demux_random_access=true;
+                }
+                #if MEDIAINFO_SEEK
+                    if (Gxf_MediaTypes_StreamKind(Streams[TrackNumber].MediaType)!=Stream_Video || IFrame_IsParsed)
+                #endif //MEDIAINFO_SEEK
+                {
+                    if (Gxf_MediaTypes_StreamKind(Streams[TrackNumber].MediaType)!=Stream_Audio)
+                        Frame_Count_NotParsedIncluded=(MediaFieldNumber-(Material_Fields_First_IsValid?Material_Fields_First:0))/Material_Fields_FieldsPerFrame;
+                    Demux_Level=(Streams[TrackNumber].Parser && (Streams[TrackNumber].Parser->Demux_UnpacketizeContainer || Streams[TrackNumber].Parser->Demux_Level==2))?4:2; //Intermediate (D-10 Audio) / Container
+                    Demux(Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)(Element_Size-Element_Offset), ContentType_MainStream);
+                }
+                Element_Code=0xBF; //media
+            }
     #endif //MEDIAINFO_DEMUX
 
     //Needed?
     if (!Streams[TrackNumber].Searching_Payload)
     {
-        Skip_XX(Element_Size,                                   "data");
-        Element_DoNotShow();
+        Skip_XX(Element_Size-Element_Offset,                    "data");
+        //Element_DoNotShow();
         return;
     }
 
     if (Streams[TrackNumber].Parser)
     {
+        Streams[TrackNumber].Parser->FrameInfo.DTS=FrameInfo.DTS;
         Open_Buffer_Continue(Streams[TrackNumber].Parser, Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)(Element_Size-Element_Offset));
         if (MediaInfoLib::Config.ParseSpeed_Get()<1 && Streams[TrackNumber].Parser->Status[IsFilled])
         {
@@ -891,11 +1365,21 @@
 
     //Parsing
     int32u Entries;
-    Skip_L4(                                                    "Number of fields per FLT entry");
+    #if MEDIAINFO_SEEK
+        Get_L4 (Flt_FieldPerEntry,                              "Number of fields per FLT entry");
+    #else //MEDIAINFO_SEEK
+        Skip_L4(                                                "Number of fields per FLT entry");
+    #endif //MEDIAINFO_SEEK
     Get_L4 (Entries,                                            "Number of FLT entries");
     for (size_t Pos=0; Pos<Entries; Pos++)
     {
-        Skip_L4(                                                "Offset to fields");
+        #if MEDIAINFO_SEEK
+            int32u Offset;
+            Get_L4 (Offset,                                     "Offset to fields");
+            Flt_Offsets.push_back(Offset);
+        #else //MEDIAINFO_SEEK
+            Skip_L4(                                            "Offset to fields");
+        #endif //MEDIAINFO_SEEK
         if (Element_Offset==Element_Size)
             break;
     }
@@ -908,10 +1392,10 @@
 
     //Parsing
     int32u PayloadDataLength;
-    Element_Begin("Preamble");
+    Element_Begin1("Preamble");
         Skip_B1(                                                "First/last packet flag");
         Get_B4 (PayloadDataLength,                              "Payload data length");
-    Element_End();
+    Element_End0();
 
     if (UMF_File==NULL)
     {
@@ -919,6 +1403,23 @@
         Open_Buffer_Init(UMF_File);
     }
     Open_Buffer_Continue(UMF_File, Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)(Element_Size-Element_Offset));
+
+    #if MEDIAINFO_SEEK
+    if (Seeks.empty() && Flt_FieldPerEntry!=(int32u)-1 && ((File_Umf*)UMF_File)->GopSize!=(int64u)-1)
+        {
+            size_t NextIFrame=0;
+            for (size_t Pos=0; Pos<Flt_Offsets.size(); Pos++)
+                if (Pos*Flt_FieldPerEntry>=NextIFrame)
+                {
+                    seek Seek;
+                    Seek.FrameNumber=(Material_Fields_First_IsValid?Material_Fields_First:0)+Pos*Flt_FieldPerEntry;
+                    Seek.StreamOffset=Flt_Offsets[Pos];
+                    Seeks.push_back(Seek);
+                    NextIFrame+=(size_t)((File_Umf*)UMF_File)->GopSize*Material_Fields_FieldsPerFrame;
+                }
+            Flt_Offsets.clear();
+        }
+    #endif //MEDIAINFO_SEEK
 }
 
 //***************************************************************************
@@ -934,6 +1435,45 @@
     }
 }
 
+//---------------------------------------------------------------------------
+File__Analyze* File_Gxf::ChooseParser_ChannelGrouping(int8u TrackID)
+{
+    File_ChannelGrouping* Parser;
+    if (Audio_Count%2)
+    {
+        if (!Streams[TrackID-1].IsChannelGrouping)
+            return NULL; //Not a channel grouping
+
+        Parser=new File_ChannelGrouping;
+        Parser->Channel_Pos=1;
+        Parser->Common=((File_ChannelGrouping*)Streams[TrackID-1].Parser)->Common;
+        Parser->StreamID=TrackID-1;
+        Streams[TrackID].DisplayInfo=false;
+    }
+    else
+    {
+        Parser=new File_ChannelGrouping;
+        Parser->Channel_Pos=0;
+        //if (Descriptor->second.Infos.find("SamplingRate")!=Descriptor->second.Infos.end())
+        Parser->SampleRate=48000; //TODO: find where this piece of info is avaialble
+        Streams[TrackID].IsChannelGrouping=true;
+    }
+    Parser->Channel_Total=2;
+    Parser->Endianness='L';
+    Parser->ByteDepth=3;
+    Parser->IsAes3=true;
+
+    #if MEDIAINFO_DEMUX
+        if (Demux_UnpacketizeContainer)
+        {
+            Parser->Demux_Level=2; //Container
+            Parser->Demux_UnpacketizeContainer=true;
+        }
+    #endif //MEDIAINFO_DEMUX
+
+    return Parser;
+}
+
 } //NameSpace
 
 #endif //MEDIAINFO_GXF_YES

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Gxf.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Gxf.h Changed

@@ -1,17 +1,17 @@
 // File_Gxf - Info for GXF (SMPTE 360M) files
-// Copyright (C) 2010-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -30,9 +30,9 @@
 
 //---------------------------------------------------------------------------
 #include "MediaInfo/File__Analyze.h"
-#if defined(MEDIAINFO_CDP_YES)
-    #include "MediaInfo/Multiple/File_Riff.h"
-#endif //MEDIAINFO_CDP_YES
+#if defined(MEDIAINFO_ANCILLARY_YES)
+    #include <MediaInfo/Multiple/File_Ancillary.h>
+#endif //defined(MEDIAINFO_ANCILLARY_YES)
 #include <map>
 //---------------------------------------------------------------------------
 
@@ -50,14 +50,6 @@
     File_Gxf();
     ~File_Gxf();
 
-    //In
-    #if defined(MEDIAINFO_CDP_YES)
-        std::vector<File_Riff::buffered_data*> Cdp_Data;
-    #endif //MEDIAINFO_CDP_YES
-    #if defined(MEDIAINFO_AFDBARDATA_YES)
-        std::vector<File_Riff::buffered_data*> AfdBarData_Data;
-    #endif //MEDIAINFO_AFDBARDATA_YES
-
 private :
     //Streams management
     void Streams_Finish();
@@ -66,7 +58,14 @@
     bool Synchronize();
     bool Synched_Test();
 
+    //Buffer - Global
+    void Read_Buffer_Unsynched();
+    #if MEDIAINFO_SEEK
+    size_t Read_Buffer_Seek (size_t Method, int64u Value, int64u ID);
+    #endif //MEDIAINFO_SEEK
+
     //Buffer - Per element
+    bool Header_Begin();
     void Header_Parse();
     void Data_Parse();
 
@@ -78,12 +77,16 @@
     void UMF_file();
 
     //Temp - Global
+    #if defined(MEDIAINFO_ANCILLARY_YES)
+        File_Ancillary* Ancillary;
+    #endif //defined(MEDIAINFO_ANCILLARY_YES)
     int32u Material_Fields_First;
     int32u Material_Fields_Last;
     int32u Material_File_Size;
     int32u Material_Fields_FieldsPerFrame;
     int8u  Parsers_Count;
     int8u  AncillaryData_StreamID;
+    std::map<int8u, int64u> TimeCodes; //Key is StreamID
     bool   Material_Fields_First_IsValid;
     bool   Material_Fields_Last_IsValid;
     bool   Material_File_Size_IsValid;
@@ -92,6 +95,7 @@
     struct stream
     {
         File__Analyze* Parser;
+        int64u FirstFrameDuration; //In case of audio, indicates the duration of the first frame
         stream_t StreamKind;
         size_t StreamPos;
         int32u TimeStamp_Start;
@@ -104,11 +108,15 @@
         bool   Searching_Payload;
         bool   Searching_TimeStamp_Start;
         bool   Searching_TimeStamp_End;
+        bool   IsChannelGrouping;
+        bool   DisplayInfo; //In case of channel grouping, info is about the complete (2*half) stream, so second stream info must not be used
         Ztring MediaName;
+        std::map<std::string, Ztring> Infos;
 
         stream()
         {
             Parser=NULL;
+            FirstFrameDuration=0;
             StreamKind=Stream_Max;
             StreamPos=(size_t)-1;
             Searching_Payload=false;
@@ -119,6 +127,8 @@
             FieldsPerFrame_Code=(int32u)-1;
             MediaType=(int8u)-1;
             TrackID=(int8u)-1;
+            IsChannelGrouping=false;
+            DisplayInfo=true;
         }
         ~stream()
         {
@@ -128,10 +138,29 @@
     std::vector<stream> Streams;
     File__Analyze*      UMF_File;
     int64u              SizeToAnalyze; //Total size of a chunk to analyse, it may be changed by the parser
+    int8u               Audio_Count;
+    int8u               TrackNumber;
 
     //File__Analyze helpers
     void Streams_Finish_PerStream(size_t StreamID, stream &Temp);
     void Detect_EOF();
+    File__Analyze* ChooseParser_ChannelGrouping(int8u TrackID);
+
+    #if MEDIAINFO_DEMUX
+        bool Demux_HeaderParsed;
+    #endif //MEDIAINFO_DEMUX
+
+    #if MEDIAINFO_SEEK
+        int32u Flt_FieldPerEntry;
+        std::vector<int32u> Flt_Offsets; //In 1024-byte
+        struct seek
+        {
+            int64u FrameNumber;
+            int32u StreamOffset; //In 1024-byte
+        };
+        std::vector<seek> Seeks;
+        bool IFrame_IsParsed;
+    #endif //MEDIAINFO_SEEK
 };
 
 } //NameSpace

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Gxf_TimeCode.cpp Added

@@ -0,0 +1,207 @@
+// File_Gxf_TimeCode - Info for GXF (SMPTE 360M) files
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_GXF_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Multiple/File_Gxf_TimeCode.h"
+#include "MediaInfo/MediaInfo_Config_MediaInfo.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Constants
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+extern double Gxf_FrameRate(int32u Content);
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File_Gxf_TimeCode::File_Gxf_TimeCode()
+:File__Analyze()
+{
+    //Configuration
+    ParserName=__T("GXF");
+    #if MEDIAINFO_EVENTS
+        ParserIDs[0]=MediaInfo_Parser_Gxf;
+        StreamIDs_Width[0]=2;
+    #endif //MEDIAINFO_EVENTS
+    #if MEDIAINFO_DEMUX
+        Demux_Level=2; //Container
+    #endif //MEDIAINFO_DEMUX
+
+    //In
+    FrameRate_Code=(int32u)-1;
+    FieldsPerFrame_Code=(int32u)-1;
+
+    //Out
+    TimeCode_First=(int64u)-1;
+}
+
+//---------------------------------------------------------------------------
+File_Gxf_TimeCode::~File_Gxf_TimeCode()
+{
+}
+
+//***************************************************************************
+// Streams management
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Gxf_TimeCode::Streams_Fill()
+{
+    Stream_Prepare(Stream_Video);
+    Fill(Stream_Video, 0, Video_Delay, TimeCode_First);
+    Fill(Stream_Video, 0, Video_Delay_Source, "Container");
+
+    Stream_Prepare(Stream_Audio);
+    Fill(Stream_Audio, 0, Audio_Delay, TimeCode_First);
+    Fill(Stream_Audio, 0, Audio_Delay_Source, "Container");
+}
+
+//***************************************************************************
+// Buffer - Global
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Gxf_TimeCode::Read_Buffer_Continue()
+{
+    if (Element_Size!=4096)
+    {
+        Skip_XX(Element_Size,                                   "Data");
+        return;
+    }
+
+    //Reading bitmap first (validity of first byte is at the end)
+    Element_Offset=504*8;
+    Element_Begin1("Validity");
+    int8u Validity[504];
+    BS_Begin_LE(); //is Little Endian
+    for (size_t Pos=0; Pos<504; Pos++)
+    {
+        bool Validity_Bit;
+        Get_TB (Validity_Bit,                                   "Bit");
+        Validity[Pos]=Validity_Bit?1:0;
+    }
+    BS_End_LE();
+    Skip_B1(                                                    "Pad");
+    Element_End0();
+
+    //Parsing
+    Element_Offset=0;
+    for (size_t Pos=0; Pos<504; Pos++)
+    {
+        if (Validity[Pos])
+        {
+            Element_Begin1("TimeCode");
+            int8u Frames_Units, Frames_Tens, Seconds_Units, Seconds_Tens, Minutes_Units, Minutes_Tens, Hours_Units, Hours_Tens;
+            bool  DropFrame;
+            BS_Begin();
+
+            Skip_S1(4,                                          "BG1");
+            Get_S1 (4, Frames_Units,                            "Frames (Units)");
+
+            Skip_S1(4,                                          "BG2");
+            Skip_SB(                                            "CF - Color fame");
+            Get_SB (   DropFrame,                               "DP - Drop frame");
+            Get_S1 (2, Frames_Tens,                             "Frames (Tens)");
+
+            Skip_S1(4,                                          "BG3");
+            Get_S1 (4, Seconds_Units,                           "Seconds (Units)");
+
+            Skip_S1(4,                                          "BG4");
+            Skip_SB(                                            "FM - Frame Mark");
+            Get_S1 (3, Seconds_Tens,                            "Seconds (Tens)");
+
+            Skip_S1(4,                                          "BG5");
+            Get_S1 (4, Minutes_Units,                           "Minutes (Units)");
+
+            Skip_S1(4,                                          "BG6");
+            Skip_SB(                                            "BGF0");
+            Get_S1 (3, Minutes_Tens,                            "Minutes (Tens)");
+
+            Skip_S1(4,                                          "BG7");
+            Get_S1 (4, Hours_Units,                             "Hours (Units)");
+
+            Skip_S1(4,                                          "BG8");
+            Skip_SB(                                            "BGF2");
+            Skip_SB(                                            "BGF1");
+            Get_S1 (2, Hours_Tens,                              "Hours (Tens)");
+
+            int64u TimeCode_Ms=(int64u)(Hours_Tens     *10*60*60*1000
+                                      + Hours_Units       *60*60*1000
+                                      + Minutes_Tens      *10*60*1000
+                                      + Minutes_Units        *60*1000
+                                      + Seconds_Tens         *10*1000
+                                      + Seconds_Units           *1000
+                                      + (Gxf_FrameRate(FrameRate_Code)==0?0:((Frames_Tens*10+Frames_Units)*1000/float64_int32s(Gxf_FrameRate(FrameRate_Code)/(Gxf_FrameRate(FrameRate_Code)>30?2:1)))));
+
+            Element_Info1(Ztring().Duration_From_Milliseconds(TimeCode_Ms));
+
+            BS_End();
+            Element_End0();
+
+            FILLING_BEGIN();
+                if (TimeCode_First==(int64u)-1)
+                    TimeCode_First=TimeCode_Ms;
+            FILLING_END();
+        }
+        else
+            Skip_XX(8,                                              "Junk");
+    }
+
+    //bitmap, already parsed
+    Element_Offset+=64;
+
+    FILLING_BEGIN();
+    if (!Status[IsFilled] && TimeCode_First!=(int64u)-1)
+    {
+        Accept();
+        Fill();
+
+        if (MediaInfoLib::Config.ParseSpeed_Get()<1)
+            Finish();
+    }
+
+    FILLING_END();
+}
+
+} //NameSpace
+
+#endif //MEDIAINFO_GXF_YES

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Gxf_TimeCode.h Added

@@ -0,0 +1,70 @@
+// File_Gxf - Info for GXF (SMPTE 360M) files
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Information about GXF files
+// SMPTE 360M - General Exchange Format
+// SMPTE RDD 14-2007 - General Exchange Format-2
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_File_Gxf_TimeCodeH
+#define MediaInfo_File_Gxf_TimeCodeH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+#if defined(MEDIAINFO_ANCILLARY_YES)
+    #include <MediaInfo/Multiple/File_Ancillary.h>
+#endif //defined(MEDIAINFO_ANCILLARY_YES)
+#include "MediaInfo/TimeCode.h"
+#include <map>
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Class File_Gxf_TimeCode
+//***************************************************************************
+
+class File_Gxf_TimeCode : public File__Analyze
+{
+public :
+    //In
+    int32u FrameRate_Code;
+    int32u FieldsPerFrame_Code;
+
+    //Out
+    int64u TimeCode_First;
+
+    //Constructor/Destructor
+    File_Gxf_TimeCode();
+    ~File_Gxf_TimeCode();
+private :
+    //Streams management
+    void Streams_Fill();
+
+    //Buffer - Global
+    void Read_Buffer_Continue ();
+};
+
+} //NameSpace
+
+#endif

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Hls.cpp Added

@@ -0,0 +1,198 @@
+// File_Hls - Info for HLS files
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_HLS_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Multiple/File_Hls.h"
+#include "MediaInfo/MediaInfo.h"
+#include "MediaInfo/MediaInfo_Internal.h"
+#include "MediaInfo/Multiple/File__ReferenceFilesHelper.h"
+#include "ZenLib/Dir.h"
+#include "ZenLib/FileName.h"
+#include "ZenLib/ZtringList.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File_Hls::File_Hls()
+:File__Analyze()
+{
+    #if MEDIAINFO_EVENTS
+        ParserIDs[0]=MediaInfo_Parser_Hls;
+        StreamIDs_Width[0]=0;
+    #endif //MEDIAINFO_EVENTS
+    #if MEDIAINFO_DEMUX
+        Demux_EventWasSent_Accept_Specific=true;
+    #endif //MEDIAINFO_DEMUX
+
+    //Temp
+    ReferenceFiles=NULL;
+}
+
+//---------------------------------------------------------------------------
+File_Hls::~File_Hls()
+{
+    delete ReferenceFiles; //ReferenceFiles=NULL;
+}
+
+//***************************************************************************
+// Streams management
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Hls::Streams_Finish()
+{
+    if (ReferenceFiles==NULL)
+        return;
+
+    ReferenceFiles->ParseReferences();
+}
+
+//***************************************************************************
+// Buffer - Global
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_SEEK
+size_t File_Hls::Read_Buffer_Seek (size_t Method, int64u Value, int64u ID)
+{
+    if (ReferenceFiles==NULL)
+        return 0;
+
+    return ReferenceFiles->Read_Buffer_Seek(Method, Value, ID);
+}
+#endif //MEDIAINFO_SEEK
+
+//***************************************************************************
+// Buffer - File header
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_Hls::FileHeader_Begin()
+{
+    //Element_Size
+    if (File_Size>1024*1024 || File_Size<10)
+    {
+        Reject("HLS");
+        return false; //HLS files are not big
+    }
+
+    if (Buffer_Size<File_Size)
+        return false; //Wait for complete file
+
+    Ztring Document; Document.From_UTF8((char*)Buffer, Buffer_Size);
+    ZtringList Lines;
+    size_t LinesSeparator_Pos=Document.find_first_of(__T("\r\n"));
+    if (LinesSeparator_Pos>File_Size-1)
+    {
+        Reject("HLS");
+        return false;
+    }
+    Ztring LinesSeparator;
+    if (Document[LinesSeparator_Pos]==__T('\r') && Document[LinesSeparator_Pos+1]==__T('\n'))
+        LinesSeparator=__T("\r\n");
+    else if (Document[LinesSeparator_Pos]==__T('\r'))
+        LinesSeparator=__T("\r");
+    else if (Document[LinesSeparator_Pos]==__T('\n'))
+        LinesSeparator=__T("\n");
+    else
+    {
+        Reject("HLS");
+        return false;
+    }
+    Lines.Separator_Set(0, LinesSeparator);
+    Lines.Write(Document);
+
+    if (Lines(0)!=__T("#EXTM3U"))
+    {
+        Reject("HLS");
+        return false;
+    }
+
+    Accept("HLS");
+    Fill(Stream_General, 0, General_Format, "HLS");
+
+    ReferenceFiles=new File__ReferenceFilesHelper(this, Config);
+
+    File__ReferenceFilesHelper::reference ReferenceFile;
+
+    bool IsGroup=false;
+    for (size_t Line=0; Line<Lines.size(); Line++)
+    {
+        if (!Lines[Line].empty())
+        {
+            if (Lines[Line].find(__T("#EXT-X-STREAM-INF"))==0)
+                IsGroup=true;
+            else if (Lines[Line][0]==__T('#'))
+                ;
+            else
+            {
+                if (IsGroup)
+                {
+                    File__ReferenceFilesHelper::reference ReferenceStream;
+                    ReferenceStream.FileNames.push_back(Lines[Line]);
+                    ReferenceStream.StreamID=ReferenceFiles->References.size()+1;
+                    ReferenceFiles->References.push_back(ReferenceStream);
+                    IsGroup=false;
+                    #if MEDIAINFO_EVENTS
+                        ParserIDs[0]=MediaInfo_Parser_HlsIndex;
+                        StreamIDs_Width[0]=sizeof(size_t)*2;
+                    #endif //MEDIAINFO_EVENTS
+                }
+                else
+                    ReferenceFile.FileNames.push_back(Lines[Line]);
+            }
+        }
+    }
+
+    if (ReferenceFiles->References.empty())
+    {
+        ReferenceFiles->References.push_back(ReferenceFile);
+        ReferenceFiles->TestContinuousFileNames=true;
+    }
+
+    //All should be OK...
+    return true;
+}
+
+} //NameSpace
+
+#endif //MEDIAINFO_HLS_YES
+

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Hls.h Added

@@ -0,0 +1,69 @@
+// File_Hls - Info for HLS files
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Information about HLS files
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_File_HlsH
+#define MediaInfo_File_HlsH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+#include <vector>
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+class File__ReferenceFilesHelper;
+
+//***************************************************************************
+// Class File_Hls
+//***************************************************************************
+
+class File_Hls : public File__Analyze
+{
+public :
+    //Constructor/Destructor
+    File_Hls();
+    ~File_Hls();
+
+private :
+    //Streams management
+    void Streams_Finish ();
+
+    //Buffer - Global
+    #if MEDIAINFO_SEEK
+    size_t Read_Buffer_Seek (size_t Method, int64u Value, int64u ID);
+    #endif //MEDIAINFO_SEEK
+
+    //Buffer - File header
+    bool FileHeader_Begin();
+
+    //Temp
+    File__ReferenceFilesHelper*     ReferenceFiles;
+};
+
+} //NameSpace
+
+#endif
+

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Ibi.cpp Added

@@ -0,0 +1,765 @@
+// File_Mk - Info for Ibi files
+// Copyright (C) 2011-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_IBI
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Multiple/File_Ibi.h"
+#include "MediaInfo/MediaInfo_Config_MediaInfo.h"
+#include <zlib.h>
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File_Ibi::File_Ibi()
+:File__Analyze()
+{
+    //Configuration
+    #if MEDIAINFO_DEMUX
+        Demux_Level=2; //Container
+    #endif //MEDIAINFO_DEMUX
+    DataMustAlwaysBeComplete=false;
+
+    //In
+    Ibi=NULL;
+
+    //Temp
+    Ibi_MustDelete=false;
+}
+
+//---------------------------------------------------------------------------
+File_Ibi::~File_Ibi()
+{
+    if (Ibi_MustDelete)
+        delete Ibi; //Ibi=NULL;
+}
+
+//***************************************************************************
+// Get information
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+const Ztring &File_Ibi::Get (stream_t /*StreamKind*/, size_t /*StreamNumber*/, const Ztring &Parameter, info_t /*KindOfInfo*/, info_t /*KindOfSearch*/)
+{
+    ibi::streams::iterator IbiStream_Temp=Ibi->Streams.begin(); //TODO: management of multiple streams
+    if (IbiStream_Temp!=Ibi->Streams.end() && !IbiStream_Temp->second->Infos.empty())
+    {
+        int64u FrameNumber=Parameter.To_int64u();
+
+        for (size_t Pos=0; Pos<IbiStream_Temp->second->Infos.size()-1; Pos++)
+            if (IbiStream_Temp->second->Infos[Pos].FrameNumber==FrameNumber || IbiStream_Temp->second->Infos[Pos+1].FrameNumber>FrameNumber)
+            {
+                Get_Temp=__T("StreamOffset=")+Ztring::ToZtring(IbiStream_Temp->second->Infos[Pos].StreamOffset)
+                       + __T(" / FrameNumber=")+Ztring::ToZtring(IbiStream_Temp->second->Infos[Pos].FrameNumber)
+                       + __T(" / Dts=")+Ztring::ToZtring(IbiStream_Temp->second->Infos[Pos].Dts);
+                return Get_Temp;
+            }
+    }
+
+    //Can not be found
+    Get_Temp.clear();
+    return Get_Temp;
+}
+
+//***************************************************************************
+// Streams management
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Ibi::Streams_Accept()
+{
+    Fill(Stream_General, 0, General_Format, "Ibi");
+
+    if (Ibi==NULL)
+    {
+        Ibi=new ibi();
+        Ibi_MustDelete=true;
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Ibi::Streams_Finish()
+{
+    Config->File_KeepInfo_Set(true); //In order to let Get() available
+
+    for (ibi::streams::iterator IbiStream_Temp=Ibi->Streams.begin(); IbiStream_Temp!=Ibi->Streams.end(); ++IbiStream_Temp)
+    {
+        Stream_Prepare(Stream_Video);
+        Fill(Stream_Video, StreamPos_Last, General_ID, IbiStream_Temp->first);
+    }
+}
+
+//***************************************************************************
+// Buffer
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Ibi::Header_Parse()
+{
+    //Test of zero padding
+    int8u Null;
+    Peek_B1(Null);
+    if (Null==0x00)
+    {
+        Skip_B1(                                                "Zero byte");
+        Header_Fill_Code((int32u)-1); //Should be (int64u)-1 but Borland C++ does not like this
+        Header_Fill_Size(1);
+        return;
+    }
+
+    //Parsing
+    int64u Name, Size;
+    Get_EB (Name,                                               "Name");
+    Get_EB (Size,                                               "Size");
+
+    //Filling
+    Header_Fill_Code(Name, Ztring().From_Number(Name, 16));
+    Header_Fill_Size(Element_Offset+Size);
+}
+
+//---------------------------------------------------------------------------
+namespace Elements
+{
+    //Common
+    const int64u Zero=(int32u)-1; //Should be (int64u)-1 but Borland C++ does not like this
+    const int64u CRC32=0x3F;
+    const int64u Void=0x6C;
+
+    //EBML
+    const int64u Ebml=0xA45DFA3;
+    const int64u Ebml_Version=0x286;
+    const int64u Ebml_ReadVersion=0x2F7;
+    const int64u Ebml_MaxIDLength=0x2F2;
+    const int64u Ebml_MaxSizeLength=0x2F3;
+    const int64u Ebml_DocType=0x282;
+    const int64u Ebml_DocTypeVersion=0x287;
+    const int64u Ebml_DocTypeReadVersion=0x285;
+
+    //Segment
+    const int64u Stream=0x01;
+    const int64u Stream_Header=0x01;
+    const int64u Stream_ByteOffset=0x02;
+    const int64u Stream_FrameNumber=0x03;
+    const int64u Stream_Dts=0x04;
+    const int64u CompressedIndex=0x02;
+}
+
+//---------------------------------------------------------------------------
+void File_Ibi::Data_Parse()
+{
+    #define LIS2(_ATOM, _NAME) \
+        case Elements::_ATOM : \
+                if (Level==Element_Level) \
+                { \
+                    Element_Name(_NAME); \
+                    _ATOM(); \
+                    Element_ThisIsAList(); \
+                } \
+
+    #define ATO2(_ATOM, _NAME) \
+                case Elements::_ATOM : \
+                        if (Level==Element_Level) \
+                        { \
+                            if (Element_IsComplete_Get()) \
+                            { \
+                                Element_Name(_NAME); \
+                                _ATOM(); \
+                            } \
+                            else \
+                            { \
+                                Element_WaitForMoreData(); \
+                                return; \
+                            } \
+                        } \
+                        break; \
+
+    #define ATOM_END_MK \
+        ATOM(Zero) \
+        ATOM(CRC32) \
+        ATOM(Void) \
+        ATOM_END
+
+    //Parsing
+    DATA_BEGIN
+    LIST(Ebml)
+        ATOM_BEGIN
+        ATOM(Ebml_Version)
+        ATOM(Ebml_ReadVersion)
+        ATOM(Ebml_MaxIDLength)
+        ATOM(Ebml_MaxSizeLength)
+        ATOM(Ebml_DocType)
+        ATOM(Ebml_DocTypeVersion)
+        ATOM(Ebml_DocTypeReadVersion)
+        ATOM_END_MK
+    LIST(Stream)
+        ATOM_BEGIN
+            ATOM(Stream_Header)
+            ATOM(Stream_ByteOffset)
+            ATOM(Stream_FrameNumber)
+            ATOM(Stream_Dts)
+        ATOM_END_MK
+    ATOM(CompressedIndex)
+    DATA_DEFAULT
+        Finish("Ibi");
+    DATA_END_DEFAULT
+}
+
+//***************************************************************************
+// Elements
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Ibi::Zero()
+{
+    Element_Name("ZeroPadding");
+}
+
+//---------------------------------------------------------------------------
+void File_Ibi::CRC32()
+{
+    Element_Name("CRC32");
+
+    //Parsing
+    UInteger_Info();
+}
+
+//---------------------------------------------------------------------------
+void File_Ibi::Void()
+{
+    Element_Name("Void");
+
+    //Parsing
+    UInteger_Info();
+}
+
+//---------------------------------------------------------------------------
+void File_Ibi::Ebml()
+{
+    Element_Name("Ebml");
+}
+
+//---------------------------------------------------------------------------
+void File_Ibi::Ebml_Version()
+{
+    Element_Name("Version");
+
+    //Parsing
+    UInteger_Info();
+}
+
+//---------------------------------------------------------------------------
+void File_Ibi::Ebml_ReadVersion()
+{
+    Element_Name("ReadVersion");
+
+    //Parsing
+    UInteger_Info();
+}
+
+//---------------------------------------------------------------------------
+void File_Ibi::Ebml_MaxIDLength()
+{
+    Element_Name("MaxIDLength");
+
+    //Parsing
+    UInteger_Info();
+}
+
+//---------------------------------------------------------------------------
+void File_Ibi::Ebml_MaxSizeLength()
+{
+    Element_Name("MaxSizeLength");
+
+    //Parsing
+    UInteger_Info();
+}
+
+//---------------------------------------------------------------------------
+void File_Ibi::Ebml_DocType()
+{
+    Element_Name("DocType");
+
+    //Parsing
+    Ztring Data;
+    Get_Local(Element_Size, Data,                               "Data"); Element_Info1(Data);
+
+    //Filling
+    FILLING_BEGIN();
+
+        if (Data==__T("MediaInfo Index"))
+            Accept("Ibi");
+        else
+        {
+            Reject("Ibi");
+            return;
+        }
+
+        Buffer_MaximumSize=8*1024*1024;
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
+void File_Ibi::Ebml_DocTypeVersion()
+{
+    Element_Name("DocTypeVersion");
+
+    //Parsing
+    UInteger_Info();
+}
+
+//---------------------------------------------------------------------------
+void File_Ibi::Ebml_DocTypeReadVersion()
+{
+    Element_Name("DocTypeReadVersion");
+
+    //Parsing
+    UInteger_Info();
+}
+
+//---------------------------------------------------------------------------
+void File_Ibi::Stream()
+{
+    Element_Name("Stream");
+
+    ID_Current=(int64u)-1;
+}
+
+void File_Ibi::Stream_Header()
+{
+    Element_Name("Stream Header");
+    Get_EB (ID_Current,                                         "ID");
+
+    FILLING_BEGIN();
+        if (Ibi)
+        {
+            //Filling information for ID after data
+            ibi::streams::iterator IbiStream_Temp=Ibi->Streams.find((int64u)-1);
+            if (IbiStream_Temp!=Ibi->Streams.end())
+            {
+                Ibi->Streams[ID_Current]=IbiStream_Temp->second;
+                Ibi->Streams.erase(IbiStream_Temp);
+            }
+        }
+    FILLING_END();
+}
+
+void File_Ibi::Stream_ByteOffset()
+{
+    Element_Name("Byte Offset");
+
+    //Parsing
+    size_t Pos=0;
+    int64u Offset=0;
+    while (Element_Offset<Element_Size)
+    {
+        int64u Item;
+        Get_EB (Item,                                           "Item");
+        Offset+=Item;
+        Param_Info1(Pos);
+        Param_Info1(Ztring::ToZtring(Offset)+__T(" (0x")+Ztring::ToZtring(Offset, 16)+__T(')'));
+
+        FILLING_BEGIN();
+            if (Ibi)
+            {
+                //Filling information for ID after data
+                if (Ibi->Streams[ID_Current]==NULL)
+                    Ibi->Streams[ID_Current]=new ibi::stream();
+                if (Pos>=Ibi->Streams[ID_Current]->Infos.size())
+                {
+                    Ibi->Streams[ID_Current]->Infos.push_back(ibi::stream::info());
+                    Ibi->Streams[ID_Current]->Infos[Pos].IsContinuous=true; //default
+                }
+                Ibi->Streams[ID_Current]->Infos[Pos].StreamOffset=Offset;
+                Pos++;
+            }
+        FILLING_END();
+    }
+}
+
+void File_Ibi::Stream_FrameNumber()
+{
+    Element_Name("Frame Number");
+
+    //Parsing
+    size_t Pos=0;
+    int64u Offset=0;
+    while (Element_Offset<Element_Size)
+    {
+        int64u Item;
+        Get_EB (Item,                                           "Item");
+        Offset+=Item;
+        Param_Info1(Pos);
+        Param_Info1(Ztring::ToZtring(Offset)+__T(" (0x")+Ztring::ToZtring(Offset, 16)+__T(')'));
+
+        FILLING_BEGIN();
+            if (Ibi)
+            {
+                //Filling information for ID after data
+                if (Ibi->Streams[ID_Current]==NULL)
+                    Ibi->Streams[ID_Current]=new ibi::stream();
+                if (Pos>=Ibi->Streams[ID_Current]->Infos.size())
+                {
+                    Ibi->Streams[ID_Current]->Infos.push_back(ibi::stream::info());
+                    Ibi->Streams[ID_Current]->Infos[Pos].IsContinuous=true; //default
+                }
+                Ibi->Streams[ID_Current]->Infos[Pos].FrameNumber=Offset;
+                Pos++;
+            }
+        FILLING_END();
+    }
+}
+
+void File_Ibi::Stream_Dts()
+{
+    Element_Name("DTS");
+
+    //Parsing
+    int64u Item;
+    Get_EB (Item,                                               "DtsFrequencyNumerator");
+    FILLING_BEGIN();
+        if (Ibi)
+            Ibi->Streams[ID_Current]->DtsFrequencyNumerator=Item;
+    FILLING_END();
+    Get_EB (Item,                                               "DtsFrequencyDenominator");
+    FILLING_BEGIN();
+        if (Ibi)
+        {
+            Ibi->Streams[ID_Current]->DtsFrequencyDenominator=Item;
+
+            //Handling of previous inverted Numerator/Denominator
+            if (Ibi->Streams[ID_Current]->DtsFrequencyNumerator<Ibi->Streams[ID_Current]->DtsFrequencyDenominator)
+                std::swap(Ibi->Streams[ID_Current]->DtsFrequencyNumerator, Ibi->Streams[ID_Current]->DtsFrequencyDenominator);
+        }
+    FILLING_END();
+
+    size_t Pos=0;
+    int64u Offset=0;
+    while (Element_Offset<Element_Size)
+    {
+        int64u Item;
+        Get_EB (Item,                                           "Item");
+        Offset+=Item;
+        Param_Info1(Pos);
+        Param_Info1(Ztring::ToZtring(Offset)+__T(" (0x")+Ztring::ToZtring(Offset, 16)+__T(')'));
+
+        FILLING_BEGIN();
+            if (Ibi)
+            {
+                //Filling information for ID after data
+                if (Ibi->Streams[ID_Current]==NULL)
+                    Ibi->Streams[ID_Current]=new ibi::stream();
+                if (Pos>=Ibi->Streams[ID_Current]->Infos.size())
+                {
+                    Ibi->Streams[ID_Current]->Infos.push_back(ibi::stream::info());
+                    Ibi->Streams[ID_Current]->Infos[Pos].IsContinuous=true; //default
+                }
+                Ibi->Streams[ID_Current]->Infos[Pos].Dts=Offset;
+                Pos++;
+            }
+        FILLING_END();
+    }
+}
+
+void File_Ibi::CompressedIndex()
+{
+    Element_Name("Compressed Index");
+    int64u UncompressedSize;
+    Get_EB (UncompressedSize,                                   "Uncompressed size");
+
+    //Sizes
+    unsigned long Source_Size=(unsigned long)(Element_Size-Element_Offset);
+    unsigned long Dest_Size=(unsigned long)UncompressedSize;
+
+    //Uncompressing
+    int8u* Dest=new int8u[Dest_Size];
+    if (uncompress((Bytef*)Dest, &Dest_Size, (const Bytef*)Buffer+Buffer_Offset+(size_t)Element_Offset, Source_Size)<0)
+    {
+        Skip_XX(Element_Size-Element_Offset,                    "Problem during the decompression");
+        delete[] Dest; //Dest=NULL;
+        return;
+    }
+
+    //Exiting this element
+    Skip_XX(Element_Size-Element_Offset,                        "Will be parsed");
+
+    //Configuring buffer
+    const int8u* Buffer_Sav=Buffer;
+    size_t Buffer_Size_Sav=Buffer_Size;
+    int8u* Buffer_Temp_Sav=Buffer_Temp;
+    size_t Buffer_Temp_Size_Sav=Buffer_Temp_Size;
+    size_t Buffer_Offset_Sav=Buffer_Offset;
+    size_t Buffer_Offset_Temp_Sav=Buffer_Offset_Temp;
+    Buffer=NULL;
+    Buffer_Size=0;
+    Buffer_Temp=NULL;
+    Buffer_Temp_Size=0;
+    Buffer_Offset=0;
+    Buffer_Offset_Temp=0;
+
+    //Configuring level
+    std::vector<int64u> Element_Sizes_Sav;
+    size_t Element_Level_Sav=Element_Level;
+    while(Element_Level)
+    {
+        Element_Sizes_Sav.push_back(Element_TotalSize_Get());
+        Element_End0();
+    }
+
+    //Configuring file size
+    int64u File_Size_Sav=File_Size;
+    if (File_Size<File_Offset+Buffer_Offset+Element_Offset+Dest_Size)
+        File_Size=File_Offset+Buffer_Offset+Element_Offset+Dest_Size;
+    Element_Level++;
+    Header_Fill_Size(File_Size);
+    Element_Level--;
+
+    //Parsing
+    Open_Buffer_Continue(Dest, Dest_Size);
+    delete[] Dest; //Dest=NULL;
+
+    //Resetting file size
+    File_Size=File_Size_Sav;
+    while(Element_Level)
+        Element_End0();
+    Element_Level++;
+    Header_Fill_Size(File_Size);
+    Element_Level--;
+
+    //Configuring level
+    while(Element_Level<Element_Level_Sav)
+    {
+        Element_Begin0();
+        Element_Begin0();
+        Header_Fill_Size(Element_Sizes_Sav[0]);
+        Element_End0();
+    }
+
+    //Resetting buffer
+    Buffer=Buffer_Sav;
+    Buffer_Size=Buffer_Size_Sav;
+    Buffer_Temp=Buffer_Temp_Sav;
+    Buffer_Temp_Size=Buffer_Temp_Size_Sav;
+    Buffer_Offset=Buffer_Offset_Sav;
+    Buffer_Offset_Temp=Buffer_Offset_Temp_Sav;
+}
+
+//***************************************************************************
+// Data
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Ibi::UInteger_Info()
+{
+    switch (Element_Size)
+    {
+        case 1 :
+                {
+                    Info_B1(Data,                               "Data"); Element_Info1(Data);
+                    return;
+                }
+        case 2 :
+                {
+                    Info_B2(Data,                               "Data"); Element_Info1(Data);
+                    return;
+                }
+        case 3 :
+                {
+                    Info_B3(Data,                               "Data"); Element_Info1(Data);
+                    return;
+                }
+        case 4 :
+                {
+                    Info_B4(Data,                               "Data"); Element_Info1(Data);
+                    return;
+                }
+        case 5 :
+                {
+                    Info_B5(Data,                               "Data"); Element_Info1(Data);
+                    return;
+                }
+        case 6 :
+                {
+                    Info_B6(Data,                               "Data"); Element_Info1(Data);
+                    return;
+                }
+        case 7 :
+                {
+                    Info_B7(Data,                               "Data"); Element_Info1(Data);
+                    return;
+                }
+        case 8 :
+                {
+                    Info_B8(Data,                               "Data"); Element_Info1(Data);
+                    return;
+                }
+        case 16:
+                {
+                    Info_B16(Data,                              "Data"); Element_Info1(Data);
+                    return;
+                }
+        default : Skip_XX(Element_Size,                         "Data");
+    }
+}
+
+//---------------------------------------------------------------------------
+int64u File_Ibi::UInteger_Get()
+{
+    switch (Element_Size)
+    {
+        case 1 :
+                {
+                    int8u Data;
+                    Get_B1 (Data,                               "Data"); Element_Info1(Data);
+                    return Data;
+                }
+        case 2 :
+                {
+                    int16u Data;
+                    Get_B2 (Data,                               "Data"); Element_Info1(Data);
+                    return Data;
+                }
+        case 3 :
+                {
+                    int32u Data;
+                    Get_B3 (Data,                               "Data"); Element_Info1(Data);
+                    return Data;
+                }
+        case 4 :
+                {
+                    int32u Data;
+                    Get_B4 (Data,                               "Data"); Element_Info1(Data);
+                    return Data;
+                }
+        case 5 :
+                {
+                    int64u Data;
+                    Get_B5 (Data,                               "Data"); Element_Info1(Data);
+                    return Data;
+                }
+        case 6 :
+                {
+                    int64u Data;
+                    Get_B6 (Data,                               "Data"); Element_Info1(Data);
+                    return Data;
+                }
+        case 7 :
+                {
+                    int64u Data;
+                    Get_B7 (Data,                               "Data"); Element_Info1(Data);
+                    return Data;
+                }
+        case 8 :
+                {
+                    int64u Data;
+                    Get_B8 (Data,                               "Data"); Element_Info1(Data);
+                    return Data;
+                }
+        default :   Skip_XX(Element_Size,                       "Data");
+                    return 0;
+    }
+}
+
+//---------------------------------------------------------------------------
+int128u File_Ibi::UInteger16_Get()
+{
+    switch (Element_Size)
+    {
+        case 1 :
+                {
+                    int8u Data;
+                    Get_B1 (Data,                               "Data"); Element_Info1(Data);
+                    return Data;
+                }
+        case 2 :
+                {
+                    int16u Data;
+                    Get_B2 (Data,                               "Data"); Element_Info1(Data);
+                    return Data;
+                }
+        case 3 :
+                {
+                    int32u Data;
+                    Get_B3 (Data,                               "Data"); Element_Info1(Data);
+                    return Data;
+                }
+        case 4 :
+                {
+                    int32u Data;
+                    Get_B4 (Data,                               "Data"); Element_Info1(Data);
+                    return Data;
+                }
+        case 5 :
+                {
+                    int64u Data;
+                    Get_B5 (Data,                               "Data"); Element_Info1(Data);
+                    return Data;
+                }
+        case 6 :
+                {
+                    int64u Data;
+                    Get_B6 (Data,                               "Data"); Element_Info1(Data);
+                    return Data;
+                }
+        case 7 :
+                {
+                    int64u Data;
+                    Get_B7 (Data,                               "Data"); Element_Info1(Data);
+                    return Data;
+                }
+        case 8 :
+                {
+                    int64u Data;
+                    Get_B8 (Data,                               "Data"); Element_Info1(Data);
+                    return Data;
+                }
+        case 16:
+                {
+                    int128u Data;
+                    Get_B16(Data,                               "Data"); Element_Info1(Data);
+                    return Data;
+                }
+        default :   Skip_XX(Element_Size,                       "Data");
+                    return 0;
+    }
+}
+
+} //NameSpace
+
+#endif //MEDIAINFO_IBI_YES
+

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Ibi.h Added

@@ -0,0 +1,95 @@
+// File_Mk - Info for Ibi Video/Audio files
+// Copyright (C) 2011-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Information about Ibi files
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_File_IbiH
+#define MediaInfo_File_IbiH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+#include <map>
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Classe File_Ibi
+//***************************************************************************
+
+class File_Ibi : public File__Analyze
+{
+public :
+    File_Ibi();
+    ~File_Ibi();
+
+    //In
+    ibi* Ibi;
+
+private :
+    //Get information
+    const Ztring &Get (stream_t StreamKind, size_t StreamNumber, const Ztring &Parameter, info_t KindOfInfo=Info_Text, info_t KindOfSearch=Info_Name);
+
+    //Streams management
+    void Streams_Accept();
+    void Streams_Finish();
+
+    //Buffer - Element
+    void Header_Parse();
+    void Data_Parse();
+
+    //Elements
+    void Zero();
+    void CRC32();
+    void Void();
+    void Ebml();
+    void Ebml_Version();
+    void Ebml_ReadVersion();
+    void Ebml_MaxIDLength();
+    void Ebml_MaxSizeLength();
+    void Ebml_DocType();
+    void Ebml_DocTypeVersion();
+    void Ebml_DocTypeReadVersion();
+    void Stream();
+    void Stream_Header();
+    void Stream_ByteOffset();
+    void Stream_FrameNumber();
+    void Stream_Dts();
+    void CompressedIndex();
+
+    //Data
+    int64u   UInteger_Get();
+    int128u  UInteger16_Get();
+    void     UInteger_Info();
+
+    //Temp
+    Ztring  Get_Temp;
+    int64u  ID_Current;
+    bool    Ibi_MustDelete;
+};
+
+} //NameSpace
+
+#endif
+

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Ibi_Creation.cpp Added

@@ -0,0 +1,451 @@
+// File_Ibi_Creation - Creation of Ibi files
+// Copyright (C) 2011-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_IBI
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Multiple/File_Ibi_Creation.h"
+#include <cstring>
+#include <zlib.h>
+#include "base64.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Ibi structure
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+ibi::ibi()
+{
+}
+
+//---------------------------------------------------------------------------
+ibi::~ibi()
+{
+    for (streams::iterator Stream=Streams.begin(); Stream!=Streams.end(); ++Stream)
+        delete Stream->second; //Stream->second=NULL;
+}
+
+//---------------------------------------------------------------------------
+void ibi::stream::Add (const info &Info)
+{
+    if (!IsSynchronized)
+    {
+        //Searching the right insertion point
+        for (Infos_Pos=0; Infos_Pos<Infos.size(); Infos_Pos++)
+            if (Info.StreamOffset<Infos[Infos_Pos].StreamOffset)
+                break;
+    }
+
+    //Testing if new data is same as current insertion point
+    if (Infos_Pos && Infos[Infos_Pos-1].FrameNumber==Info.FrameNumber && Info.FrameNumber!=(int64u)-1)
+    {
+        IsSynchronized=true;
+        return;
+    }
+    if (Infos_Pos && Info.Dts==Infos[Infos_Pos-1].Dts && Info.Dts!=(int64u)-1)
+    {
+        //Duplicate, updating it (in case of new frame count)
+        if (Infos_Pos && Info.FrameNumber!=(int64u)-1 && Info.FrameNumber<Infos[Infos_Pos-1].FrameNumber)
+        {
+            Infos[Infos_Pos-1].FrameNumber=Info.FrameNumber;
+            Infos[Infos_Pos-1].Dts=Info.Dts;
+        }
+
+        IsSynchronized=true;
+        return;
+    }
+    if (Infos_Pos && Info.StreamOffset==Infos[Infos_Pos-1].StreamOffset)
+    {
+        //Duplicate, updating it (in case of new frame count)
+        if (Infos_Pos && Info.FrameNumber!=(int64u)-1 && Info.FrameNumber<Infos[Infos_Pos-1].FrameNumber)
+        {
+            Infos[Infos_Pos-1].FrameNumber=Info.FrameNumber;
+            Infos[Infos_Pos-1].Dts=Info.Dts;
+        }
+
+        IsSynchronized=true;
+        return;
+    }
+
+    //Previous item
+    if (IsSynchronized && Infos_Pos)
+    {
+        Infos[Infos_Pos-1].IsContinuous=true;
+        IsContinuous=true;
+
+        IsModified=true;
+    }
+    IsSynchronized=true;
+
+    //Testing if new data is same as next insertion point
+    if (Infos_Pos<Infos.size() && Infos[Infos_Pos].FrameNumber==Info.FrameNumber && Info.FrameNumber!=(int64u)-1)
+    {
+        Infos_Pos++;
+
+        IsSynchronized=true;
+        return;
+    }
+    if (Infos_Pos<Infos.size() && Info.Dts==Infos[Infos_Pos].Dts && Info.Dts!=(int64u)-1)
+    {
+        Infos_Pos++;
+
+        IsSynchronized=true;
+        return;
+    }
+    if (Infos_Pos<Infos.size() && Info.StreamOffset==Infos[Infos_Pos].StreamOffset)
+    {
+        //Duplicate, updating it (in case of new frame count)
+        if (IsSynchronized && Info.FrameNumber!=(int64u)-1)
+            Infos[Infos_Pos].FrameNumber=Info.FrameNumber;
+
+        Infos_Pos++;
+
+        IsSynchronized=true;
+        return;
+    }
+
+    Infos.insert(Infos.begin()+Infos_Pos, Info);
+    Infos_Pos++;
+
+    IsModified=true;
+}
+
+//---------------------------------------------------------------------------
+void ibi::stream::Unsynch ()
+{
+    Infos_Pos=0;
+    IsModified=false;
+    IsContinuous=false;
+    IsSynchronized=false;
+}
+
+//***************************************************************************
+// Utils
+//***************************************************************************
+
+size_t int64u2Ebml(int8u* List, int64u Value)
+{
+    //1 byte
+    if (Value<=126) //2^7-2
+    {
+        if (List)
+        {
+            List[0]=0x80|((int8u)Value);
+        }
+        return 1;
+    }
+
+    //2 bytes
+    if (Value<=16382) //2^14-2
+    {
+        if (List)
+        {
+            List[0]=0x40|((int8u)(Value>>8));
+            List[1]=(int8u)Value;
+        }
+        return 2;
+    }
+
+    //3 bytes
+    if (Value<=2097150) //2^21-2
+    {
+        if (List)
+        {
+            List[0]=0x20|((int8u)(Value>>16));
+            List[1]=(int8u)(Value>>8);
+            List[2]=(int8u)Value;
+        }
+        return 3;
+    }
+
+    //4 bytes
+    if (Value<=268435454) //2^28-2
+    {
+        if (List)
+        {
+            List[0]=0x10|((int8u)(Value>>24));
+            List[1]=(int8u)(Value>>16);
+            List[2]=(int8u)(Value>>8);
+            List[3]=(int8u)Value;
+        }
+        return 4;
+    }
+
+    //5 bytes
+    if (Value<=34359738366LL) //2^35-2
+    {
+        if (List)
+        {
+            List[0]=0x08|((int8u)(Value>>32));
+            List[1]=(int8u)(Value>>24);
+            List[2]=(int8u)(Value>>16);
+            List[3]=(int8u)(Value>>8);
+            List[4]=(int8u)Value;
+        }
+        return 5;
+    }
+
+    //6 bytes
+    if (Value<=4398046511102LL) //2^42-2
+    {
+        if (List)
+        {
+            List[0]=0x04|((int8u)(Value>>40));
+            List[1]=(int8u)(Value>>32);
+            List[2]=(int8u)(Value>>24);
+            List[3]=(int8u)(Value>>16);
+            List[4]=(int8u)(Value>>8);
+            List[5]=(int8u)Value;
+        }
+        return 6;
+    }
+
+    //7 bytes
+    if (Value<=562949953421310LL) //2^49-2
+    {
+        if (List)
+        {
+            List[0]=0x02|((int8u)(Value>>48));
+            List[1]=(int8u)(Value>>40);
+            List[2]=(int8u)(Value>>32);
+            List[3]=(int8u)(Value>>24);
+            List[4]=(int8u)(Value>>16);
+            List[5]=(int8u)(Value>>8);
+            List[6]=(int8u)Value;
+        }
+        return 7;
+    }
+
+    //8 bytes
+    if (Value<=72057594037927934LL) //2^56-2
+    {
+        if (List)
+        {
+            List[0]=0x01;
+            List[1]=(int8u)(Value>>56);
+            List[2]=(int8u)(Value>>40);
+            List[3]=(int8u)(Value>>32);
+            List[4]=(int8u)(Value>>24);
+            List[5]=(int8u)(Value>>16);
+            List[6]=(int8u)(Value>>8);
+            List[7]=(int8u)Value;
+        }
+        return 8;
+    }
+
+    if (List)
+        List[0]=0xFF;
+    return 1;
+}
+
+size_t EbmlBlock(int8u* List, size_t List_MaxSize, int64u Code, int8u* Content, size_t Content_Size)
+{
+    if (Content_Size==0)
+        return 0;
+
+    size_t Code_EbmlSize=int64u2Ebml(NULL, Code);
+    size_t Content_EbmlSize=int64u2Ebml(NULL, Content_Size);
+
+    if (List && Code_EbmlSize+Content_EbmlSize+Content_Size>List_MaxSize)
+        return 0;
+
+    if (List)
+    {
+        List+=int64u2Ebml(List, Code);
+        List+=int64u2Ebml(List, Content_Size);
+        std::memcpy(List, Content, Content_Size); List+=Content_Size;//Content
+    }
+
+    return Code_EbmlSize+Content_EbmlSize+Content_Size;
+}
+
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File_Ibi_Creation::File_Ibi_Creation()
+{
+}
+
+//---------------------------------------------------------------------------
+File_Ibi_Creation::~File_Ibi_Creation()
+{
+    for (size_t Pos=0; Pos<Buffers.size(); Pos++)
+        delete Buffers[Pos];
+}
+
+//***************************************************************************
+// Helpers
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Ibi_Creation::Set(const ibi &Ibi)
+{
+    for (ibi::streams::const_iterator IbiStream_Temp=Ibi.Streams.begin(); IbiStream_Temp!=Ibi.Streams.end(); ++IbiStream_Temp)
+        Add(IbiStream_Temp->first, *IbiStream_Temp->second);
+}
+
+//---------------------------------------------------------------------------
+void File_Ibi_Creation::Add(int64u ID, const ibi::stream &Stream)
+{
+    //Useful?
+    if (Stream.Infos.empty())
+        return;
+
+    //Header
+    int8u* IbiHeader;
+    size_t IbiHeader_Offset=0;
+    if (ID!=(int64u)-1)
+    {
+        IbiHeader=new int8u[int64u2Ebml(NULL, ID)];
+        IbiHeader_Offset+=int64u2Ebml(IbiHeader, ID);
+    }
+    else
+        IbiHeader=NULL;
+
+    //Init - Byte Offset
+    int8u* IbiByteOffset=new int8u[8*Stream.Infos.size()];
+    size_t IbiByteOffset_Offset=0;
+
+    //Init - Frame Number
+    int8u* IbiFrameNumber=new int8u[8*Stream.Infos.size()];
+    size_t IbiFrameNumber_Offset=0;
+
+    //Init - DTS
+    int8u* IbiDts=new int8u[8*Stream.Infos.size()];
+    size_t IbiDts_Offset=0;
+    IbiDts_Offset+=int64u2Ebml(IbiDts+IbiDts_Offset, Stream.DtsFrequencyNumerator);
+    IbiDts_Offset+=int64u2Ebml(IbiDts+IbiDts_Offset, Stream.DtsFrequencyDenominator);
+
+    //Per item
+    for (size_t Pos=0; Pos<Stream.Infos.size(); Pos++)
+    {
+        IbiByteOffset_Offset+=int64u2Ebml(IbiByteOffset+IbiByteOffset_Offset, Stream.Infos[Pos].StreamOffset-(Pos?Stream.Infos[Pos-1].StreamOffset:0));
+        IbiFrameNumber_Offset+=int64u2Ebml(IbiFrameNumber+IbiFrameNumber_Offset, Stream.Infos[Pos].FrameNumber-(Pos?Stream.Infos[Pos-1].FrameNumber:0));
+        IbiDts_Offset+=int64u2Ebml(IbiDts+IbiDts_Offset, Stream.Infos[Pos].Dts-(Pos?Stream.Infos[Pos-1].Dts:0));
+    }
+
+    //Sizes
+    size_t IbiHeader_EbmlSize=EbmlBlock(NULL, 0, 0x01, NULL, IbiHeader_Offset);
+    size_t IbiByteOffset_EbmlSize=EbmlBlock(NULL, 0, 0x02, NULL, IbiByteOffset_Offset);
+    size_t IbiFrameNumber_EbmlSize=EbmlBlock(NULL, 0, 0x03, NULL, IbiFrameNumber_Offset);
+    size_t IbiDts_EbmlSize=EbmlBlock(NULL, 0, 0x04, NULL, IbiDts_Offset);
+
+    //Buffer
+    buffer* Buffer=new buffer;
+    Buffer->Content=new int8u[1+int64u2Ebml(NULL, IbiHeader_EbmlSize+IbiByteOffset_EbmlSize+IbiFrameNumber_EbmlSize+IbiDts_EbmlSize)+IbiHeader_EbmlSize+IbiByteOffset_EbmlSize+IbiFrameNumber_EbmlSize+IbiDts_EbmlSize];
+    Buffer->Size+=int64u2Ebml(Buffer->Content+Buffer->Size, 0x01);              //Stream
+    Buffer->Size+=int64u2Ebml(Buffer->Content+Buffer->Size, IbiHeader_EbmlSize+IbiByteOffset_EbmlSize+IbiFrameNumber_EbmlSize+IbiDts_EbmlSize);     //Size
+    Buffer->Size+=EbmlBlock(Buffer->Content+Buffer->Size, IbiHeader_EbmlSize, 0x01, IbiHeader, IbiHeader_Offset); //IbiHeader
+    Buffer->Size+=EbmlBlock(Buffer->Content+Buffer->Size, IbiByteOffset_EbmlSize, 0x02, IbiByteOffset, IbiByteOffset_Offset); //ByteOffset
+    Buffer->Size+=EbmlBlock(Buffer->Content+Buffer->Size, IbiFrameNumber_EbmlSize, 0x03, IbiFrameNumber, IbiFrameNumber_Offset); //FrameNumber
+    Buffer->Size+=EbmlBlock(Buffer->Content+Buffer->Size, IbiDts_EbmlSize, 0x04, IbiDts, IbiDts_Offset); //Dts
+
+    Buffers.push_back(Buffer);
+}
+
+Ztring File_Ibi_Creation::Finish()
+{
+    //Test
+    if (Buffers.empty())
+        return Ztring();
+
+    //Size computing
+    size_t Size=4+1+2+1+15+2+1+1; //Header size
+    for (size_t Pos=0; Pos<Buffers.size(); Pos++)
+        Size+=Buffers[Pos]->Size;
+
+    //Buffer creation
+    int8u* Main=new int8u[Size];
+    size_t Main_Offset=0;
+
+    //Header
+    Main_Offset+=int64u2Ebml(Main+Main_Offset, 0x0A45DFA3);                 //EBML
+    Main_Offset+=int64u2Ebml(Main+Main_Offset, 2+1+15+2+1+1);               //Size (Code + Size + Content, twice)
+    Main_Offset+=int64u2Ebml(Main+Main_Offset, 0x0282);                     //DocType
+    Main_Offset+=int64u2Ebml(Main+Main_Offset, 15);                         //Size
+    std::memcpy(Main+Main_Offset, "MediaInfo Index", 15); Main_Offset+=15;  //Content
+    Main_Offset+=int64u2Ebml(Main+Main_Offset, 0x0285);                     //DocTypeReadVersion
+    Main_Offset+=int64u2Ebml(Main+Main_Offset, 1);                          //Size
+    Main[Main_Offset]=0x01; Main_Offset+=1;                                 //Content
+
+    //for each stream
+    for (size_t Pos=0; Pos<Buffers.size(); Pos++)
+    {
+        std::memcpy(Main+Main_Offset, Buffers[Pos]->Content, Buffers[Pos]->Size);
+        Main_Offset+=Buffers[Pos]->Size;
+    }
+
+
+
+    //Compressed
+    buffer Buffer;
+    int8u* Compressed=new int8u[Main_Offset];
+    unsigned long Compressed_OffsetWihtoutHeader=(unsigned long)Main_Offset;
+    if (compress2(Compressed, &Compressed_OffsetWihtoutHeader, Main, (unsigned long)Main_Offset, Z_BEST_COMPRESSION)==Z_OK && Compressed_OffsetWihtoutHeader+100<Main_Offset)
+    {
+        size_t Header_Offset=4+1+2+1+15+2+1+1; //Same header
+        Header_Offset+=int64u2Ebml(Main+Header_Offset, 0x02);                   //Compressed index
+        Header_Offset+=int64u2Ebml(Main+Header_Offset, int64u2Ebml(NULL, Main_Offset)+Compressed_OffsetWihtoutHeader); //Size
+        Header_Offset+=int64u2Ebml(Main+Header_Offset, Main_Offset);            //Uncompressed size
+
+        //Filling
+        Buffer.Size=Header_Offset+Compressed_OffsetWihtoutHeader;
+        Buffer.Content=new int8u[Buffer.Size];
+        std::memcpy(Buffer.Content, Main, Header_Offset); //Same header + Compressed index header
+        std::memcpy(Buffer.Content+Header_Offset, Compressed, Compressed_OffsetWihtoutHeader); //Same header
+    }
+    else
+    {
+        //Filling
+        Buffer.Size=Main_Offset;
+        Buffer.Content=new int8u[Buffer.Size];
+        std::memcpy(Buffer.Content, Main, Main_Offset);
+    }
+
+    std::string Data_Raw((const char*)Buffer.Content, Buffer.Size);
+    std::string Data_Base64(Base64::encode(Data_Raw));
+
+    return Ztring().From_UTF8(Data_Base64);
+}
+
+} //NameSpace
+
+#endif //MEDIAINFO_IBI_YES
+

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Ibi_Creation.h Added

@@ -0,0 +1,129 @@
+// File_Ibi_Creation - Creation of Ibi files
+// Copyright (C) 2011-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Information about Ibi files
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_File_Ibi_CreationH
+#define MediaInfo_File_Ibi_CreationH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "ZenLib/Ztring.h"
+#include <map>
+#include <vector>
+using namespace ZenLib;
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Ibi structure
+//***************************************************************************
+
+struct ibi
+{
+    struct stream
+    {
+        int64u DtsFrequencyNumerator;
+        int64u DtsFrequencyDenominator;
+        struct info
+        {
+            int64u StreamOffset;
+            int64u FrameNumber;
+            int64u Dts;
+            bool   IsContinuous;
+
+            info()
+            {
+                StreamOffset=(int64u)-1;
+                FrameNumber=(int64u)-1;
+                Dts=(int64u)-1;
+                IsContinuous=false;
+            }
+        };
+        std::vector<info>   Infos;
+        size_t              Infos_Pos;
+        bool                IsContinuous;
+        bool                IsModified;
+        bool                IsSynchronized;
+
+        stream()
+        {
+            DtsFrequencyNumerator=1000000000; //nanosecond
+            DtsFrequencyDenominator=1;
+            Infos_Pos=0;
+            IsContinuous=false;
+            IsModified=false;
+            IsSynchronized=false;
+        }
+
+        void Add (const info &Info);
+        void Unsynch();
+    };
+    typedef std::map<int64u, stream*>   streams;
+    streams                             Streams;
+
+    //Constructor/Destructor
+    ibi();
+    ~ibi();
+};
+
+//***************************************************************************
+// File_Ibi_Creation class
+//***************************************************************************
+
+class File_Ibi_Creation
+{
+public :
+    File_Ibi_Creation();
+    File_Ibi_Creation(const ibi &Ibi) {Set(Ibi);}
+    ~File_Ibi_Creation();
+
+    void Set(const ibi &Ibi);
+    void Add(int64u ID, const ibi::stream &Stream);
+    Ztring Finish();
+
+private :
+    struct buffer
+    {
+        int8u* Content;
+        size_t Size;
+
+        buffer()
+        {
+            Content=NULL;
+            Size=0;
+        }
+
+        ~buffer()
+        {
+            delete[] Content; //Content=NULL;
+        }
+    };
+    std::vector<buffer*> Buffers;
+};
+
+} //NameSpace
+
+#endif
+

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Ism.cpp Added

@@ -0,0 +1,202 @@
+// File_Ism - Info for ISM files
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_ISM_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Multiple/File_Ism.h"
+#include <set>
+#include "MediaInfo/MediaInfo.h"
+#include "MediaInfo/MediaInfo_Internal.h"
+#include "MediaInfo/Multiple/File__ReferenceFilesHelper.h"
+#include "ZenLib/Dir.h"
+#include "ZenLib/FileName.h"
+#include "ZenLib/Format/Http/Http_Utils.h"
+#include "tinyxml2.h"
+using namespace tinyxml2;
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File_Ism::File_Ism()
+:File__Analyze()
+{
+    #if MEDIAINFO_EVENTS
+        ParserIDs[0]=MediaInfo_Parser_Ism;
+        StreamIDs_Width[0]=sizeof(size_t)*2;
+    #endif //MEDIAINFO_EVENTS
+    #if MEDIAINFO_DEMUX
+        Demux_EventWasSent_Accept_Specific=true;
+    #endif //MEDIAINFO_DEMUX
+
+    //Temp
+    ReferenceFiles=NULL;
+}
+
+//---------------------------------------------------------------------------
+File_Ism::~File_Ism()
+{
+    delete ReferenceFiles; //ReferenceFiles=NULL;
+}
+
+//***************************************************************************
+// Streams management
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Ism::Streams_Finish()
+{
+    if (ReferenceFiles==NULL)
+        return;
+
+    ReferenceFiles->ParseReferences();
+}
+
+//***************************************************************************
+// Buffer - Global
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_SEEK
+size_t File_Ism::Read_Buffer_Seek (size_t Method, int64u Value, int64u ID)
+{
+    if (ReferenceFiles==NULL)
+        return 0;
+
+    return ReferenceFiles->Read_Buffer_Seek(Method, Value, ID);
+}
+#endif //MEDIAINFO_SEEK
+
+//***************************************************************************
+// Buffer - File header
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_Ism::FileHeader_Begin()
+{
+    XMLDocument document;
+    if (!FileHeader_Begin_XML(document))
+       return false;
+
+    {
+        XMLElement* Root=document.FirstChildElement("smil");
+        if (Root)
+        {
+            Accept("ISM");
+            Fill(Stream_General, 0, General_Format, "ISM");
+
+            ReferenceFiles=new File__ReferenceFilesHelper(this, Config);
+
+            std::set<Ztring> FileNames;
+
+            XMLElement* Body=Root->FirstChildElement();
+            while (Body)
+            {
+                if (string(Body->Value())=="body")
+                {
+                    XMLElement* Switch=Body->FirstChildElement();
+                    while (Switch)
+                    {
+                        if (string(Switch->Value())=="switch")
+                        {
+                            XMLElement* Stream=Switch->FirstChildElement();
+                            while (Stream)
+                            {
+                                if (string(Stream->Value())=="video" || string(Stream->Value())=="audio")
+                                {
+                                    File__ReferenceFilesHelper::reference ReferenceFile;
+
+                                    if (string(Stream->Value())=="video")
+                                        ReferenceFile.StreamKind=Stream_Video;
+                                    if (string(Stream->Value())=="audio")
+                                        ReferenceFile.StreamKind=Stream_Audio;
+
+                                    const char* Attribute=Stream->Attribute("src");
+                                    if (Attribute)
+                                        ReferenceFile.FileNames.push_back(Ztring().From_UTF8(Attribute));
+
+                                    XMLElement* Param=Stream->FirstChildElement();
+                                    while (Param)
+                                    {
+                                        if (string(Param->Value())=="param")
+                                        {
+                                            Attribute=Param->Attribute("name");
+                                            if (Attribute && Ztring().From_UTF8(Attribute)==__T("trackID"))
+                                            {
+                                                Attribute=Param->Attribute("value");
+                                                if (Attribute)
+                                                    ReferenceFile.StreamID=Ztring().From_UTF8(Attribute).To_int64u();
+                                            }
+                                        }
+                                        Param=Param->NextSiblingElement();
+                                    }
+
+                                    if (!ReferenceFile.FileNames.empty() && !ReferenceFile.FileNames[0].empty() && FileNames.find(ReferenceFile.FileNames[0])==FileNames.end())
+                                    {
+                                        ReferenceFiles->References.push_back(ReferenceFile);
+                                        FileNames.insert(ReferenceFile.FileNames[0]);
+                                    }
+                                }
+
+                                Stream=Stream->NextSiblingElement();
+                            }
+                        }
+
+                        Switch=Switch->NextSiblingElement();
+                    }
+                }
+
+                Body=Body->NextSiblingElement();
+            }
+        }
+        else
+        {
+            Reject("ISM");
+            return false;
+        }
+    }
+
+    //All should be OK...
+    return true;
+}
+
+} //NameSpace
+
+#endif //MEDIAINFO_ISM_YES
+

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Ism.h Added

@@ -0,0 +1,68 @@
+// File_Ism - Info for DXW files
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Information about DXW files
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_File_IsmH
+#define MediaInfo_File_IsmH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+class File__ReferenceFilesHelper;
+
+//***************************************************************************
+// Class File_Ism
+//***************************************************************************
+
+class File_Ism : public File__Analyze
+{
+public :
+    //Constructor/Destructor
+    File_Ism();
+    ~File_Ism();
+
+private :
+    //Streams management
+    void Streams_Finish ();
+
+    //Buffer - Global
+    #if MEDIAINFO_SEEK
+    size_t Read_Buffer_Seek (size_t Method, int64u Value, int64u ID);
+    #endif //MEDIAINFO_SEEK
+
+    //Buffer - File header
+    bool FileHeader_Begin();
+
+    //Temp
+    File__ReferenceFilesHelper*     ReferenceFiles;
+};
+
+} //NameSpace
+
+#endif
+

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Ivf.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Ivf.cpp Changed

@@ -1,18 +1,18 @@
 // File_Ivf - Info for Ivf files
-// Copyright (C) 2006-2010 MediaArea.net SARL, Info@MediaArea.net
-// Copyright (C) 2010 Lionel DUCHATEAU, kurtnoise at free dot fr
+// Copyright (C) 2010-2012 Lionel Duchateau, kurtnoise@free.fr
+// Copyright (C) 2006-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -24,14 +24,18 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_IVF_YES)
 //---------------------------------------------------------------------------
 
@@ -62,7 +66,7 @@
 void File_Ivf::FileHeader_Parse()
 {
     //Parsing
-    int32u frame_rate_num, frame_rate_den, frame_count, unused, fourcc;
+    int32u frame_rate_num, frame_rate_den, frame_count, fourcc;
     int16u version, header_size, width, height;
 
     Skip_C4 (                                                   "Signature");
@@ -78,10 +82,29 @@
             Get_L4 (frame_rate_num,                             "FrameRate Numerator");
             Get_L4 (frame_rate_den,                             "FrameRate Denominator");
             Get_L4 (frame_count,                                "Frame Count");
-            Get_L4 (unused,                                     "Unused");
+            Skip_L4(                                            "Unused");
             if (header_size-32)
                 Skip_XX(header_size-32,                         "Unknown");
         }
+        else
+        {
+            fourcc=0x00000000;
+            width=0;
+            height=0;
+            frame_rate_num=0;
+            frame_rate_den=0;
+            frame_count=0;
+        }
+    }
+    else
+    {
+        header_size=0;
+        fourcc=0x00000000;
+        width=0;
+        height=0;
+        frame_rate_num=0;
+        frame_rate_den=0;
+        frame_count=0;
     }
 
     FILLING_BEGIN();

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Ivf.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Ivf.h Changed

@@ -1,18 +1,18 @@
 // File_Ivf - Info for Ivf files
-// Copyright (C) 2004-2010 MediaArea.net SARL, Info@MediaArea.net
-// Copyright (C) 2010 Lionel DUCHATEAU, kurtnoise at free dot fr
+// Copyright (C) 2004-2012 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2010 Lionel Duchateau, kurtnoise at free dot fr
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -42,7 +42,7 @@
 {
 public :
     //In
-    size_t Frame_Count_Valid;
+    int64u Frame_Count_Valid;
 private :
     //Buffer
     bool FileHeader_Begin();

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Lxf.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Lxf.cpp Changed

@@ -1,31 +1,35 @@
 // File_Lxf - Info for LXF files
-// Copyright (C) 2006-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2006-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_LXF_YES)
 //---------------------------------------------------------------------------
 
@@ -34,17 +38,57 @@
 #if defined(MEDIAINFO_DVDIF_YES)
     #include "MediaInfo/Multiple/File_DvDif.h"
 #endif
+#if defined(MEDIAINFO_AVC_YES)
+    #include "MediaInfo/Video/File_Avc.h"
+#endif
 #if defined(MEDIAINFO_MPEGV_YES)
     #include "MediaInfo/Video/File_Mpegv.h"
 #endif
+#if defined(MEDIAINFO_ANCILLARY_YES)
+    #include "MediaInfo/Multiple/File_Ancillary.h"
+#endif //defined(MEDIAINFO_ANCILLARY_YES)
 #if MEDIAINFO_EVENTS
     #include "MediaInfo/MediaInfo_Events.h"
 #endif //MEDIAINFO_EVENTS
+#include "MediaInfo/MediaInfo_Config_MediaInfo.h"
+#include <bitset>
+#include <MediaInfo/MediaInfo_Internal.h>
+using namespace std;
 //---------------------------------------------------------------------------
 
 namespace MediaInfoLib
 {
 
+const char* Lxf_Format_Video[16]=
+{
+    "JPEG",
+    "MPEG Video", //Version 1
+    "MPEG Video", //Version 2, 4:2:0
+    "MPEG Video", //Version 2, 4:2:2
+    "DV", //25 Mbps 4:1:1 or 4:2:0
+    "DV", //DVCPRO
+    "DV", //DVCPRO 50 / HD
+    "RGB", //RGB uncompressed
+    "Gray", //Gray uncompressed
+    "MPEG Video", //Version 2, 4:2:2, GOP=9
+    "AVC",
+    "AVC",
+    "AVC",
+    "AVC",
+    "",
+    "",
+};
+
+const char* Lxf_PictureType[4]=
+{
+    "I", //Closed
+    "I", //Open
+    "P",
+    "B",
+};
+
+extern const float32 Mpegv_frame_rate[]; //In Video/File_Mpegv.cpp
+
 //***************************************************************************
 // Constructor/Destructor
 //***************************************************************************
@@ -54,18 +98,35 @@
 :File__Analyze()
 {
     //Configuration
-    ParserName=_T("LXF");
+    ParserName=__T("LXF");
     #if MEDIAINFO_EVENTS
         ParserIDs[0]=MediaInfo_Parser_Lxf;
         StreamIDs_Width[0]=4; //2 numbers for Code, 2 numbers for subcode
     #endif //MEDIAINFO_EVENTS
+    #if MEDIAINFO_DEMUX
+        Demux_Level=2; //Container
+    #endif //MEDIAINFO_DEMUX
     MustSynchronize=true;
+    Buffer_TotalBytes_Fill_Max=(int64u)-1; //Disabling this feature for this format, this is done in the parser
+    #if MEDIAINFO_DEMUX
+        Demux_EventWasSent_Accept_Specific=true;
+    #endif //MEDIAINFO_DEMUX
 
     //Temp
-    Frame_Count=0;
     LookingForLastFrame=false;
     Stream_Count=0;
     Info_General_StreamSize=0;
+    Video_Sizes_Pos=(size_t)-1;
+    Audio_Sizes_Pos=(size_t)-1;
+
+    //Seek
+    #if MEDIAINFO_SEEK
+        SeekRequest=(int64u)-1;
+    #endif //MEDIAINFO_SEEK
+    FrameRate=0;
+    TimeStamp_Rate=720000;
+    Duration_Detected=false;
+    LastAudio_BufferOffset=(int64u)-1;
 }
 
 //***************************************************************************
@@ -75,28 +136,71 @@
 //---------------------------------------------------------------------------
 void File_Lxf::Streams_Fill()
 {
+    Fill(Stream_General, 0, General_Format_Version, __T("Version "+Ztring::ToZtring(Version)));
+
     for (size_t Pos=0; Pos<Videos.size(); Pos++)
-        Streams_Fill_PerStream(Videos[Pos].Parser);
+        Streams_Fill_PerStream(Videos[Pos].Parser, 1, Pos);
     for (size_t Pos=0; Pos<Audios.size(); Pos++)
-        Streams_Fill_PerStream(Audios[Pos].Parser);
+        Streams_Fill_PerStream(Audios[Pos].Parser, 2, Pos);
+
+    if (!Videos.empty())
+        Fill(Stream_Video, 0, Video_CodecID, VideoFormat);
 }
 
 //---------------------------------------------------------------------------
-void File_Lxf::Streams_Fill_PerStream(File__Analyze* Parser)
+void File_Lxf::Streams_Fill_PerStream(File__Analyze* Parser, size_t Container_StreamKind, size_t Parser_Pos)
 {
     if (Parser==NULL)
         return;
 
-    Merge(*Parser);
+    Fill(Parser);
+    if (Parser->Count_Get(Stream_Audio) && Config->File_Audio_MergeMonoStreams_Get())
+    {
+        if (Count_Get(Stream_Audio)==0)
+        {
+            Merge(*Parser);
+            Fill(Stream_Audio, 0, Audio_Channel_s_, Audio_Sizes.size(), 10, true);
+            int64u BitRate=Retrieve(Stream_Audio, 0, Audio_BitRate).To_int64u();
+            Fill(Stream_Audio, 0, Audio_BitRate, BitRate*Audio_Sizes.size(), 10, true);
+            #if MEDIAINFO_DEMUX
+                if (Config->Demux_ForceIds_Get())
+                {
+                    for (size_t Audio_Pos=0; Audio_Pos<Audio_Sizes.size(); Audio_Pos++)
+                        Fill(StreamKind_Last, StreamPos_Last, General_ID, 0x200+Audio_Pos);
+                }
+            #endif //MEDIAINFO_DEMUX
+        }
+    }
+    else
+    {
+        Merge(*Parser);
+        #if MEDIAINFO_DEMUX
+            if (Config->Demux_ForceIds_Get())
+                for (size_t StreamKind=Stream_General+1; StreamKind<Stream_Max; StreamKind++)
+                    for (size_t StreamPos=0; StreamPos<Parser->Count_Get((stream_t)StreamKind); StreamPos++)
+                    {
+                        Ztring ID=Ztring::ToZtring(0x100*Container_StreamKind+Parser_Pos);
+                        if (!Parser->Retrieve((stream_t)StreamKind, StreamPos, General_ID).empty())
+                            ID+=__T('-')+Parser->Retrieve((stream_t)StreamKind, StreamPos, General_ID);
+                        Fill((stream_t)StreamKind, Count_Get((stream_t)StreamKind)-Parser->Count_Get((stream_t)StreamKind)+StreamPos, General_ID, ID, true);
+                    }
+        #endif //MEDIAINFO_DEMUX
+    }
 }
 
 //---------------------------------------------------------------------------
 void File_Lxf::Streams_Finish()
 {
-    if (Audios_Header.TimeStamp_Begin!=(int64u)-1)
+    if (Videos[1].Parser && Count_Get(Stream_Text)==0) //TODO: better handling of fill/finish
     {
-        int64u Duration=float64_int64s(((float64)(Audios_Header.TimeStamp_End-Audios_Header.TimeStamp_Begin))/720);
-        int64u FrameCount=float64_int64s(((float64)(Audios_Header.TimeStamp_End-Audios_Header.TimeStamp_Begin))/Audios_Header.Duration);
+        Finish(Videos[1].Parser);
+        Streams_Fill_PerStream(Videos[1].Parser, Stream_Video, 1);
+    }
+
+    if (Audios_Header.TimeStamp_End!=(int64u)-1 && Audios_Header.TimeStamp_Begin!=(int64u)-1 && Audios_Header.Duration_First!=(int64u)-1)
+    {
+        int64u Duration=float64_int64s(((float64)(Audios_Header.TimeStamp_End-Audios_Header.TimeStamp_Begin))/TimeStamp_Rate*1000);
+        int64u FrameCount=float64_int64s(((float64)(Audios_Header.TimeStamp_End-Audios_Header.TimeStamp_Begin))/Audios_Header.Duration_First);
         for (size_t Pos=0; Pos<Count_Get(Stream_Audio); Pos++)
         {
             Fill(Stream_Audio, Pos, Audio_Duration, Duration);
@@ -104,12 +208,13 @@
         }
         Info_General_StreamSize+=FrameCount*0x48;
     }
-    if (Videos_Header.TimeStamp_Begin!=(int64u)-1)
+    if (Videos_Header.TimeStamp_End!=(int64u)-1 && Videos_Header.TimeStamp_Begin!=(int64u)-1)
     {
-        int64u Duration=float64_int64s(((float64)(Videos_Header.TimeStamp_End-Videos_Header.TimeStamp_Begin))/720);
+        int64u Duration=float64_int64s(((float64)(Videos_Header.TimeStamp_End-Videos_Header.TimeStamp_Begin))/TimeStamp_Rate*1000);
         int64u FrameCount=float64_int64s(((float64)(Videos_Header.TimeStamp_End-Videos_Header.TimeStamp_Begin))/Videos_Header.Duration);
-        for (size_t Pos=0; Pos<Count_Get(Stream_Video); Pos++)
-            Fill(Stream_Video, Pos, Video_Duration, Duration);
+        if (Duration)
+            for (size_t Pos=0; Pos<Count_Get(Stream_Video); Pos++)
+                Fill(Stream_Video, Pos, Video_Duration, Duration, 10, true);
         Info_General_StreamSize+=FrameCount*0x48;
 
         if (Count_Get(Stream_Video)==1 && Retrieve(Stream_Video, 0, Video_BitRate).empty())
@@ -120,9 +225,9 @@
             for (size_t Pos=0; Pos<Audios.size(); Pos++)
                 if (Audios[Pos].BytesPerFrame!=(int64u)-1)
                     Info_General_StreamSize+=Audios[Pos].BytesPerFrame*Retrieve(Stream_Audio, Pos, Audio_FrameCount).To_int64u();
-            int64u BitRate=(File_Size-Info_General_StreamSize)*8*1000/Duration;
             Fill(Stream_General, 0, General_StreamSize, Info_General_StreamSize);
-            Fill(Stream_Video, 0, Video_StreamSize, File_Size-Info_General_StreamSize);
+            if (Info_General_StreamSize<File_Size)
+                Fill(Stream_Video, 0, Video_StreamSize, File_Size-Info_General_StreamSize);
         }
     }
 }
@@ -135,15 +240,35 @@
 bool File_Lxf::Synchronize()
 {
     //Synchronizing
-    while (Buffer_Offset+8<=Buffer_Size
-        && CC8(Buffer+Buffer_Offset)!=0x4C45495443480000LL)
-        Buffer_Offset++;
+    while (Buffer_Offset+20<=Buffer_Size && ( Buffer[Buffer_Offset  ]!=0x4C
+                                          ||  Buffer[Buffer_Offset+ 1]!=0x45
+                                          ||  Buffer[Buffer_Offset+ 2]!=0x49
+                                          ||  Buffer[Buffer_Offset+ 3]!=0x54
+                                          ||  Buffer[Buffer_Offset+ 4]!=0x43
+                                          ||  Buffer[Buffer_Offset+ 5]!=0x48
+                                          ||  Buffer[Buffer_Offset+ 6]!=0x00
+                                          ||  Buffer[Buffer_Offset+ 7]!=0x00
+    #if MEDIAINFO_SEEK
+                                          || (Buffer[Buffer_Offset+16]!=0x02 && Buffer[Buffer_Offset+16]!=0x00)
+    #endif //MEDIAINFO_SEEK
+                                         ))
+    {
+        Buffer_Offset+=6+2;
+        while (Buffer_Offset<Buffer_Size && Buffer[Buffer_Offset]!=0x00)
+            Buffer_Offset+=2;
+        if (Buffer_Offset>=Buffer_Size || Buffer[Buffer_Offset-1]==0x00)
+            Buffer_Offset--;
+        Buffer_Offset-=6;
+    }
 
     //Parsing last bytes if needed
-    if (Buffer_Offset+8>Buffer_Size)
+    if (Buffer_Offset+20>Buffer_Size)
     {
-        if (Buffer_Offset+8==Buffer_Size && CC8(Buffer+Buffer_Offset)!=0x4C45495443480000LL)
-            Buffer_Offset++;
+        while (Buffer_Offset+8>Buffer_Size)
+            if (Buffer_Offset+8==Buffer_Size && CC8(Buffer+Buffer_Offset)!=0x4C45495443480000LL)
+                Buffer_Offset++;
+            else
+                break;
         if (Buffer_Offset+7==Buffer_Size && CC7(Buffer+Buffer_Offset)!=0x4C454954434800LL)
             Buffer_Offset++;
         if (Buffer_Offset+6==Buffer_Size && CC6(Buffer+Buffer_Offset)!=0x4C4549544348LL)
@@ -166,8 +291,45 @@
         Accept();
 
         Fill(Stream_General, 0, General_Format, "LXF");
+
+        File_Buffer_Size_Hint_Pointer=Config->File_Buffer_Size_Hint_Pointer_Get();
+        Buffer_MaximumSize=16*1024*1024;
     }
 
+    #if MEDIAINFO_SEEK
+        //TimeStamp
+        if (SeekRequest!=(int64u)-1)
+        {
+            if (TimeOffsets.find(File_Offset+Buffer_Offset)==TimeOffsets.end()) //Not already saved
+            {
+                if (Buffer_Offset+0x48>=Buffer_Size)
+                    return false;
+                int32u Type       =LittleEndian2int32u(Buffer+Buffer_Offset+16);
+                if (Type==0) //Video
+                {
+                    //Filling with the new frame
+                    Version=LittleEndian2int32u(Buffer+Buffer_Offset+8);
+                    int64u TimeStamp, Duration;
+                    switch (Version)
+                    {
+                        case 0 : TimeStamp  =LittleEndian2int32u(Buffer+Buffer_Offset+24);
+                                 Duration   =LittleEndian2int32u(Buffer+Buffer_Offset+28);
+                                 break;
+                        case 1 : TimeStamp  =LittleEndian2int64u(Buffer+Buffer_Offset+24);
+                                 Duration   =LittleEndian2int64u(Buffer+Buffer_Offset+32);
+                                 break;
+                        default: TimeStamp=Duration=0;
+                    }
+                    int8u  PictureType=(LittleEndian2int8u (Buffer+Buffer_Offset+42)&0xC0)>>6;
+                    TimeOffsets[File_Offset+Buffer_Offset]=stream_header(TimeStamp, TimeStamp+Duration, Duration, PictureType);
+                    SeekRequest_Divider=2;
+                }
+            }
+            if (Read_Buffer_Seek(2, (int64u)-1, (int64u)-1))
+                return false;
+        }
+    #endif //MEDIAINFO_SEEK
+
     //Synched is OK
     return true;
 }
@@ -175,6 +337,11 @@
 //---------------------------------------------------------------------------
 bool File_Lxf::Synched_Test()
 {
+    if (Video_Sizes_Pos<Video_Sizes.size())
+        return true;
+    if (Audio_Sizes_Pos<Audio_Sizes.size())
+        return true;
+
     //Must have enough buffer for having header
     if (Buffer_Offset+16>Buffer_Size)
         return false;
@@ -188,111 +355,374 @@
 }
 
 //***************************************************************************
+// Buffer - Global
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Lxf::Read_Buffer_Unsynched()
+{
+    Video_Sizes.clear();
+    Audio_Sizes.clear();
+    LastAudio_BufferOffset=(int64u)-1;
+    LastAudio_TimeOffset=stream_header();
+    Video_Sizes_Pos=(size_t)-1;
+    Audio_Sizes_Pos=(size_t)-1;
+    Videos_Header.TimeStamp_End=(int64u)-1;
+    Audios_Header.TimeStamp_End=(int64u)-1;
+
+    for (size_t Pos=0; Pos<Audios.size(); Pos++)
+        if (Audios[Pos].Parser)
+            Audios[Pos].Parser->Open_Buffer_Unsynch();
+    for (size_t Pos=0; Pos<Videos.size(); Pos++)
+        if (Videos[Pos].Parser)
+            Videos[Pos].Parser->Open_Buffer_Unsynch();
+}
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_SEEK
+size_t File_Lxf::Read_Buffer_Seek (size_t Method, int64u Value, int64u)
+{
+    //Init
+    if (!Duration_Detected)
+    {
+        MediaInfo_Internal MI;
+        MI.Option(__T("File_KeepInfo"), __T("1"));
+        Ztring ParseSpeed_Save=MI.Option(__T("ParseSpeed_Get"), __T(""));
+        Ztring Demux_Save=MI.Option(__T("Demux_Get"), __T(""));
+        MI.Option(__T("ParseSpeed"), __T("0"));
+        MI.Option(__T("Demux"), Ztring());
+        size_t MiOpenResult=MI.Open(File_Name);
+        MI.Option(__T("ParseSpeed"), ParseSpeed_Save); //This is a global value, need to reset it. TODO: local value
+        MI.Option(__T("Demux"), Demux_Save); //This is a global value, need to reset it. TODO: local value
+        if (!MiOpenResult || MI.Get(Stream_General, 0, General_Format)!=__T("LXF"))
+            return 0;
+        for (time_offsets::iterator TimeOffset=((File_Lxf*)MI.Info)->TimeOffsets.begin(); TimeOffset!=((File_Lxf*)MI.Info)->TimeOffsets.end(); ++TimeOffset)
+            TimeOffsets[TimeOffset->first]=TimeOffset->second;
+        int64u Duration=float64_int64s(Ztring(MI.Get(Stream_General, 0, __T("Duration"))).To_float64()*TimeStamp_Rate/1000);
+        TimeOffsets[File_Size]=stream_header(Duration, Duration, 0, (int8u)-1);
+        SeekRequest_Divider=2;
+        Duration_Detected=true;
+    }
+
+    //Parsing
+    switch (Method)
+    {
+        case 0  :   Open_Buffer_Unsynch(); GoTo(Value); return 1;
+        case 1  :   Open_Buffer_Unsynch(); GoTo(File_Size*Value/10000); return 1;
+        case 3  :   //Frame
+                    {
+                        if (FrameRate==0 && Videos_Header.TimeStamp_End!=(int64u)-1 && Videos_Header.TimeStamp_End-Videos_Header.TimeStamp_Begin!=0)
+                            FrameRate=TimeStamp_Rate/(Videos_Header.TimeStamp_End-Videos_Header.TimeStamp_Begin);
+                        if (FrameRate==0)
+                            return (size_t)-1; //Not supported
+                        float64 TimeStamp=((float64)Value)/FrameRate;
+                        Value=float64_int64s(TimeStamp*1000000000); // In nanoseconds
+                    }
+        case 2  :   //Timestamp
+                    {
+                    if (Value!=(int64u)-1)
+                    {
+                        Value=float64_int64s((float64)Value*TimeStamp_Rate/1000000000); //Convert in LXF unit
+                        time_offsets::iterator End=TimeOffsets.end();
+                        --End;
+                        if (Value>=End->second.TimeStamp_End)
+                            return 2; //Higher than total size
+                        SeekRequest=Value;
+                    }
+
+                    //Looking if we already have the timestamp
+                    int64u SeekRequest_Mini=SeekRequest; if (SeekRequest_Mini>1000000) SeekRequest_Mini-=float64_int64s(TimeStamp_Rate/1000); //-1ms
+                    int64u SeekRequest_Maxi=SeekRequest+float64_int64s(TimeStamp_Rate/1000); //+1ms
+                    for (time_offsets::iterator TimeOffset=TimeOffsets.begin(); TimeOffset!=TimeOffsets.end(); ++TimeOffset)
+                    {
+                        if (TimeOffset->second.TimeStamp_Begin<=SeekRequest_Maxi && TimeOffset->second.TimeStamp_End>=SeekRequest_Mini) //If it is found in a frame we know
+                        {
+                            //Looking for the corresponding I-Frame
+                            while (TimeOffset->second.PictureType&0x2 && TimeOffset!=TimeOffsets.begin()) //Not an I-Frame (and not fisrt frame)
+                            {
+                                time_offsets::iterator Previous=TimeOffset;
+                                --Previous;
+                                if (Previous->second.TimeStamp_End!=TimeOffset->second.TimeStamp_Begin) //Testing if the previous frame is not known.
+                                {
+                                    SeekRequest=TimeOffset->second.TimeStamp_Begin-(float64_int64s(TimeStamp_Rate/1000)+1); //1ms+1, so we are sure to not synch on the current frame again
+                                    Open_Buffer_Unsynch();
+                                    GoTo((Previous->first+TimeOffset->first)/2);
+                                    return 1; //Looking for previous frame
+
+                                }
+                                TimeOffset=Previous;
+                            }
+
+                            //We got the right I-Frame
+                            if (Value==0)
+                            {
+                                for (size_t Pos=0; Pos<Videos.size(); Pos++)
+                                    if (Videos[Pos].Parser)
+                                        Videos[Pos].Parser->Unsynch_Frame_Count=0;
+                            }
+                            Open_Buffer_Unsynch();
+                            GoTo(TimeOffset->first);
+                            SeekRequest=(int64u)-1;
+                            return 1;
+                        }
+
+                        if (TimeOffset->second.TimeStamp_Begin>SeekRequest_Maxi) //Testing if too far
+                        {
+                            time_offsets::iterator Previous=TimeOffset; --Previous;
+                            int64u ReferenceOffset;
+                            if (File_Offset+Buffer_Offset==TimeOffset->first && TimeOffset->second.TimeStamp_Begin>SeekRequest) //If current frame is already too far
+                                ReferenceOffset=File_Offset+Buffer_Offset;
+                            else
+                                ReferenceOffset=TimeOffset->first;
+                            if (SeekRequest_Divider==0)
+                            {
+                                SeekRequest=Previous->second.TimeStamp_Begin-(float64_int64s(TimeStamp_Rate/1000)+1); //1ms+1, so we are sure to not synch on the current frame again
+                                ReferenceOffset=Previous->first;
+                                --Previous;
+                                SeekRequest_Divider=2;
+                            }
+                            Open_Buffer_Unsynch();
+                            GoTo(Previous->first+(ReferenceOffset-Previous->first)/SeekRequest_Divider);
+                            SeekRequest_Divider*=2;
+                            return 1;
+                        }
+                    }
+                    }
+                    return 0;
+        default :   return (size_t)-1;
+    }
+}
+#endif //MEDIAINFO_SEEK
+
+//***************************************************************************
 // Buffer - Per element
 //***************************************************************************
 
 //---------------------------------------------------------------------------
+bool File_Lxf::Header_Begin()
+{
+    if (Buffer_Offset+16>Buffer_Size)
+        return false;
+
+    return true;
+}
+
+//---------------------------------------------------------------------------
 void File_Lxf::Header_Parse()
 {
-    //parsing
-    int64u Code, BlockSize;
+    while (Video_Sizes_Pos<Video_Sizes.size() && Video_Sizes[Video_Sizes_Pos]==0)
+        Video_Sizes_Pos++;
+    if (Video_Sizes_Pos<Video_Sizes.size())
+    {
+        //Filling
+        Header_Fill_Code(0x010100+Video_Sizes_Pos, __T("Stream"));
+        Header_Fill_Size(Video_Sizes[Video_Sizes_Pos]);
+        Video_Sizes_Pos++;
+        return;
+    }
+    while (Audio_Sizes_Pos<Audio_Sizes.size() && Audio_Sizes[Audio_Sizes_Pos]==0)
+        Audio_Sizes_Pos++;
+    if (Audio_Sizes_Pos<Audio_Sizes.size())
+    {
+        //Filling
+        Header_Fill_Code(0x010200+Audio_Sizes_Pos, __T("Stream"));
+        Header_Fill_Size(Audio_Sizes[Audio_Sizes_Pos]);
+        Audio_Sizes_Pos++;
+        return;
+    }
+
+    //Parsing
+    int64u BlockSize=0, TimeStamp=0, Duration=0;
+    int32u HeaderSize, Type;
     Skip_C8(                                                    "Signature");
-    Skip_L4(                                                    "Always 0x00000001");
-    Skip_L4(                                                    "Always 0x00000048 (header size?)");
-    Get_L8 (Code,                                               "Code");
-    switch(Code)
+    Get_L4 (Version,                                            "Version"); //0=start and duration are in field, 1=in 27 MHz values
+    Get_L4 (HeaderSize,                                         "Header size");
+    if (Element_Size<HeaderSize)
+    {
+        Element_WaitForMoreData();
+        return;
+    }
+    if (Version>1)
+    {
+        //Filling
+        Header_Fill_Code(0, "Unknown");
+        Header_Fill_Size(HeaderSize);
+        Synched=false;
+        return;
+    }
+    Get_L4 (Type,                                               "Type");
+    Skip_L4(                                                    "Stream ID");
+    switch (Version)
+    {
+        case 0 :
+                    {
+                    int32u TimeStamp4, Duration4;
+                    Get_L4 (TimeStamp4,                         "TimeStamp");
+                    TimeStamp=TimeStamp4;
+                    Param_Info3(((float64)TimeStamp4)/TimeStamp_Rate, 3, " s");
+                    FrameInfo.DTS=float64_int64s(((float64)TimeStamp)*1000000000/TimeStamp_Rate);
+                    Get_L4 (Duration4,                          "Duration");
+                    Duration=Duration4;
+                    Param_Info3(((float64)Duration)/TimeStamp_Rate, 3, " s");
+                    FrameInfo.DUR=float64_int64s(((float64)Duration)*1000000000/TimeStamp_Rate);
+                    }
+                    break;
+        case 1 :
+                    Get_L8 (TimeStamp,                          "TimeStamp"); Param_Info3(((float64)TimeStamp)/720000, 3, " s"); FrameInfo.DTS=float64_int64s(((float64)TimeStamp)*1000000/720);
+                    Get_L8 (Duration,                           "Duration"); Param_Info3(((float64)Duration)/720000, 3, " s"); FrameInfo.DUR=float64_int64s(((float64)Duration)*1000000/720);
+                    break;
+        default:    ;
+    }
+    switch(Type)
     {
         case 0  :   //Video
                     {
-                    Sizes.resize(2);
-                    int64u Size;
-                    BlockSize=0;
-
-                    Info_L8(TimeStamp,                          "TimeStamp"); Param_Info(((float64)TimeStamp)/720, 3, " ms");
-                    Info_L8(Duration,                           "Duration"); Param_Info(((float64)Duration)/720, 3, " ms");
-                    Skip_L4(                                    "Always same in data");
-                    Get_L8(Size,                                "Block size");
-                    Sizes[1]=Size;
+                    Video_Sizes.resize(3);
+                    int32u Size;
+                    int8u GOP_M, PictureType;
+                    BS_Begin_LE();
+                    Get_T1 (4, VideoFormat,                     "Format"); Param_Info1(Lxf_Format_Video[VideoFormat]);
+                    Skip_T1(7,                                  "GOP (N)");
+                    Get_T1 (3, GOP_M,                           "GOP (M)");
+                    Info_T1(8, BitRate,                         "Bit rate"); Param_Info2(BitRate*1000000, " bps");
+                    Get_T1 (2, PictureType,                     "Picture type"); Param_Info1(Lxf_PictureType[PictureType]);
+                    BS_End_LE();
+                    Skip_L1(                                    "Reserved");
+                    Get_L4(Size,                                "Video data size");
+                    Skip_L4(                                    "Zero");
+                    Video_Sizes[2]=Size;
+                    BlockSize+=Size;
+                    Get_L4(Size,                                "VBI data size");
+                    Video_Sizes[1]=Size;
                     BlockSize+=Size;
-                    Get_L8(Size,                                "Block size");
-                    Sizes[0]=Size;
+                    Skip_L4(                                    "Zero");
+                    Get_L4(Size,                                "Meta data size");
+                    Video_Sizes[0]=Size;
                     BlockSize+=Size;
-                    Skip_L4(                                    "? (Always zero)");
-                    Info_L8(Reverse,                            "Reverse TimeStamp"); Param_Info(((float64)Reverse)/720, 3, " ms");
                     if (Videos_Header.TimeStamp_Begin==(int64u)-1)
                         Videos_Header.TimeStamp_Begin=TimeStamp;
                     Videos_Header.TimeStamp_End=TimeStamp+Duration;
                     Videos_Header.Duration=Duration;
+                    if (TimeStamp==LastAudio_TimeOffset.TimeStamp_Begin)
+                        TimeOffsets[LastAudio_BufferOffset]=stream_header(TimeStamp, TimeStamp+Duration, Duration, PictureType);
+                    else
+                        TimeOffsets[File_Offset+Buffer_Offset]=stream_header(TimeStamp, TimeStamp+Duration, Duration, PictureType);
+                    int64u PTS_Computing=TimeStamp;
+                    #if MEDIAINFO_DEMUX
+                        switch (PictureType)
+                        {
+                            case 2 :
+                            case 3 : Demux_random_access=false; break; //P-Frame, B-Frame
+                            default: Demux_random_access=true ;        //I-Frame
+                        }
+                    #endif //MEDIAINFO_DEMUX
+                    if (GOP_M>1) //With B-frames
+                    {
+                        switch (PictureType)
+                        {
+                            case 2 : PTS_Computing+=GOP_M*Duration; break; //P-Frame
+                            case 3 :                                break; //B-Frame
+                            default: PTS_Computing+=Duration;              //I-Frame
+                        }
+                    }
+                    FrameInfo.PTS=float64_int64s(((float64)PTS_Computing)*1000000000/TimeStamp_Rate);
                     }
                     break;
         case 1  :   //Audio
                     {
-                    int32u Info, Size;
-
-                    Info_L8(TimeStamp,                          "TimeStamp"); Param_Info(((float64)TimeStamp)/720, 3, " ms");
-                    Info_L8(Duration,                           "Duration"); Param_Info(((float64)Duration)/720, 3, " ms");
-                    Skip_L4(                                    "? (Non-Zero, same in all blocks)");
-                    Get_L4(Info,                                "Info?");
-                    Get_L4(Size,                                "Block size (divided by ?)");
-                    Skip_L4(                                    "? (Always zero)");
-                    Skip_L4(                                    "? (Always zero)");
-                    Skip_L4(                                    "? (Always zero)");
-                    Info_L8(Reverse,                            "Reverse TimeStamp"); Param_Info(((float64)Reverse)/720, 3, " ms");
-
-                    size_t Multiplier;
-                    switch (Info)
+                    int32u Size;
+                    int8u Channels_Count=0;
+                    bitset<32> Channels;
+
+                    if (Version==0)
+                    {
+                        Skip_L4(                                "First Active Field");
+                        Skip_L4(                                "Total fields in packet");
+                    }
+                    BS_Begin_LE();
+                    Get_T1 ( 6, SampleSize,                     "Sample size");
+                    Skip_T1( 6,                                 "Sample precision");
+                    Skip_T1(20,                                 "Reserved");
+                    BS_End_LE();
+                    Element_Begin1("Tracks mask");
+                        BS_Begin_LE();
+                        for (size_t Pos=0; Pos<32; Pos++)
+                        {
+                            bool Channel;
+                            Get_TB(Channel,                     "Channel");
+                            Channels[Pos]=Channel;
+                            if (Channel)
+                                Channels_Count++;
+                        }
+                        BS_End_LE();
+                    Element_End0();
+                    Get_L4(Size,                                "Track size");
+                    Skip_L4(                                    "Zero");
+                    if (Version>=1)
                     {
-                        case 0x03 : Multiplier=2; break;
-                        case 0x0F : Multiplier=4; break;
-                        default   : Multiplier=0; Trusted++; //Unknown size, will unsynch
+                        Skip_L4(                                "Zero");
+                        Skip_L4(                                "Zero");
                     }
-                    Sizes.resize(Multiplier);
-                    for (size_t Pos=0; Pos<Sizes.size(); Pos++)
-                        Sizes[Pos]=Size;
-                    BlockSize=Size*Multiplier;
+                    Audio_Sizes.resize(Channels_Count);
+                    for (size_t Pos=0; Pos<Audio_Sizes.size(); Pos++)
+                        Audio_Sizes[Pos]=Size;
+                    BlockSize=Size*Channels_Count;
                     if (Audios_Header.TimeStamp_Begin==(int64u)-1)
                         Audios_Header.TimeStamp_Begin=TimeStamp;
                     Audios_Header.TimeStamp_End=TimeStamp+Duration;
                     Audios_Header.Duration=Duration;
+                    if (Audios_Header.Duration_First==(int64u)-1 && Duration)
+                        Audios_Header.Duration_First=Duration;
+                    LastAudio_BufferOffset=File_Offset+Buffer_Offset;
+                    LastAudio_TimeOffset=stream_header(TimeStamp, TimeStamp+Duration, Duration, (int8u)-1);
+                    #if MEDIAINFO_DEMUX
+                        Demux_random_access=true;
+                    #endif //MEDIAINFO_DEMUX
                     }
                     break;
         case 2  :   //Header
                     {
-                    Sizes.resize(2);
-                    int32u Size;
-                    BlockSize=0;
+                    Header_Sizes.resize(2);
+                    int32u SegmentFormat, Size;
 
-                    Skip_L8(                                    "Always 0x00000000");
-                    Skip_L8(                                    "?");
-                    Skip_L4(                                    "?");
-                    Get_L4(Size,                                "Block size");
-                    Sizes[1]=Size;
-                    BlockSize+=Size;
-                    Get_L4(Size,                                "Block size");
-                    Sizes[0]=Size;
+                    Get_L4 (SegmentFormat,                      "Segment format");
+                    Get_L4 (Size,                               "Data size");
+                    Header_Sizes[0]=Size;
                     BlockSize+=Size;
-                    Skip_L4(                                    "? (Always zero)");
-                    Skip_L4(                                    "? (Always zero)");
-                    Skip_L4(                                    "? (Always zero)");
-                    Info_L8(Reverse,                            "Reverse TimeStamp?"); Param_Info(((float64)Reverse)/720, 3, " ms");
+                    if (SegmentFormat)
+                    {
+                        Get_L4 (Size,                           "Extended fields size");
+                        Header_Sizes[1]=Size;
+                        BlockSize+=Size;
+                    }
+                    Skip_L4(                                    "Zero");
+                    Skip_L4(                                    "Zero");
+                    Skip_L4(                                    "Zero");
                     }
                     break;
         default :   BlockSize=0;
     }
+    Skip_L4(                                                    "Checksum");
+    if (Version)
+        Skip_L4(                                                "Zero");
 
-    //Cleanup of sizes
-    for (size_t Pos=0; Pos<Sizes.size(); Pos++)
-        if (Sizes[Pos]==0)
+    if (Element_Offset<HeaderSize)
+        Skip_XX(Header_Size-Element_Offset,                     "Unknown");
+
+    if (Buffer_Offset+Element_Offset+BlockSize>Buffer_Size)
+    {
+        //Hints
+        if (File_Buffer_Size_Hint_Pointer)
         {
-            Sizes.erase(Sizes.begin()+Pos);
-            Pos--;
+            size_t Buffer_Size_Target=(size_t)(Buffer_Offset+0x48+BlockSize+0x48); //+0x48 for next packet header
+            if ((*File_Buffer_Size_Hint_Pointer)<Buffer_Size_Target)
+                (*File_Buffer_Size_Hint_Pointer)=Buffer_Size_Target;
         }
-        else
-            break;
+    }
 
     //Filling
-    Header_Fill_Code(Code, Ztring::ToZtring(Code));
-    Header_Fill_Size(0x48+BlockSize);
+    Header_Fill_Code(Type, Ztring::ToZtring(Type));
+    Header_Fill_Size(HeaderSize+BlockSize);
 }
 
 //---------------------------------------------------------------------------
@@ -303,7 +733,13 @@
         case 0  : Video(); break;
         case 1  : Audio(); break;
         case 2  : Header(); break;
-        default : Skip_XX(Element_Size,                         "Unknown");
+        default :
+                    if (Element_Code&0x000100)
+                        Video_Stream(Element_Code&0xFF);
+                    else if (Element_Code&0x000200)
+                        Audio_Stream(Element_Code&0xFF);
+                    else
+                        Skip_XX(Element_Size,                   "Unknown");
     }
 }
 
@@ -316,59 +752,105 @@
 {
     Element_Name("Header");
 
-    for (size_t Pos=0; Pos<Sizes.size(); Pos++)
+    for (size_t Pos=0; Pos<Header_Sizes.size(); Pos++)
     {
         switch(Pos)
         {
             case  0 : Header_Info(); break;
             case  1 : Header_Meta(); break;
-            default : Skip_XX(Sizes[Pos],                       "Data");
+            default : Skip_XX(Header_Sizes[Pos],                       "Data");
         }
     }
-    Sizes.clear();
+    Header_Sizes.clear();
 
     Info_General_StreamSize=0x48+Element_Size;
+
+    #if MEDIAINFO_DEMUX
+        if (Config->NextPacket_Get() && Config->Event_CallBackFunction_IsSet())
+            Config->Demux_EventWasSent=true; //First set is to indicate the user that header is parsed
+    #endif //MEDIAINFO_DEMUX
 }
 
 //---------------------------------------------------------------------------
 void File_Lxf::Header_Info()
 {
-    Element_Begin("Info?");
+    Element_Begin1("Disk segment");
 
     //Parsing
-    Skip_L4(                                                    "Unknown");
-    Skip_L4(                                                    "Unknown");
-    Skip_L4(                                                    "Unknown");
-    Skip_L4(                                                    "Unknown");
-    Skip_C8(                                                    "Unknown");
-    Skip_L4(                                                    "Unknown");
-    Skip_L4(                                                    "Unknown");
-    Skip_L8(                                                    "Unknown");
-    Skip_L4(                                                    "Unknown");
-    Skip_L4(                                                    "Unknown");
-    Skip_L4(                                                    "Unknown");
-    Skip_L4(                                                    "Unknown");
-    Skip_L4(                                                    "Unknown");
-    Skip_L3(                                                    "Unknown");
-    Skip_L4(                                                    "Unknown");
-    Skip_L4(                                                    "Unknown");
-    Skip_L4(                                                    "Unknown");
-    Skip_L8(                                                    "Unknown");
-    if (Sizes[0]>83)
-        Skip_XX(Sizes[0]-83,                                    "Extra?");
-
-    Element_End();
+    int64u End=Element_Offset+Header_Sizes[0];
+    if (Header_Sizes[0]>=120)
+    {
+        Skip_L4(                                                "prev");
+        Skip_L4(                                                "next");
+        Skip_L4(                                                "videoClusters");
+        Skip_L4(                                                "audioClusters");
+        Element_Begin1("id");
+            Skip_C8(                                            "code");
+            Skip_L4(                                            "minFrame");
+            Skip_L4(                                            "start");
+            Skip_L4(                                            "duration");
+            Skip_L4(                                            "tcOffset");
+            BS_Begin_LE();
+            Skip_T1(4,                                          "Format");
+            Skip_T1(7,                                          "GOP (N)");
+            Skip_T1(3,                                          "GOP (M)");
+            Skip_T1(8,                                          "Bit rate");
+            Skip_TB(                                            "VBI present");
+            Skip_TB(                                            "Aspect Ratio");
+            BS_End_LE();
+            Skip_L1(                                            "reserved");
+            Skip_L4(                                            "base");
+            Skip_L4(                                            "prev");
+            Skip_L4(                                            "next");
+            Skip_L2(                                            "recordDate");
+            Skip_L2(                                            "killDate");
+            Skip_L1(                                            "tc_type");
+            Skip_L1(                                            "status");
+            Skip_L1(                                            "disk");
+            Skip_String(26,                                     "description");
+            Skip_String(16,                                     "agency");
+            Skip_String( 6,                                     "description");
+        Element_End0();
+        Skip_L1(                                                "videoGain");
+        Skip_L1(                                                "videoSetup");
+        Skip_L1(                                                "chromaGain");
+        Skip_L1(                                                "hueLSB");
+        Skip_L1(                                                "reserved");
+        BS_Begin_LE();
+        Skip_T1(2,                                              "hueMSB");
+        Skip_T1(4,                                              "audioTracks");
+        Skip_TB(                                                "writeProtected");
+        Skip_TB(                                                "allocated");
+        Skip_TB(                                                "sliding");
+        Skip_TB(                                                "tcTranslate");
+        Skip_TB(                                                "invisible");
+        Skip_TB(                                                "macro");
+        Skip_TB(                                                "alpha");
+        Skip_TB(                                                "project");
+        Skip_TB(                                                "purged");
+        Skip_TB(                                                "reference");
+        Skip_TB(                                                "looping");
+        Skip_TB(                                                "notReadyToPlay");
+        Skip_TB(                                                "notReadyToTransfer");
+        Skip_TB(                                                "notReadyToArchive");
+        Skip_TB(                                                "transferInProgress");
+        Skip_T2(11,                                             "reserved");
+        BS_End_LE();
+    }
+    if (Element_Offset<End)
+        Skip_XX(End-Element_Offset,                             "Unknown");
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
 void File_Lxf::Header_Meta()
 {
-    Element_Begin("Tags?");
+    Element_Begin1("Extended fields area");
 
     int64u Offset=0;
     int64u Pos=0;
 
-    while (Offset<Sizes[1])
+    while (Offset<Header_Sizes[1])
     {
         int8u Size;
         Get_L1 (Size,                                           "Size");
@@ -376,20 +858,134 @@
         {
             switch (Pos)
             {
-                case  2 :   //Channel?
+                case  0 :   //Record Date/Time
+                            {
+                            Skip_XX(Size,                       "Record Date/Time");
+                            }
+                            break;
+                case  1 :   //Library
+                            {
+                            Ztring Library;
+                            Get_UTF8(Size, Library,             "Library");
+                            Fill(Stream_General, 0, General_Encoded_Library, Library);
+                            }
+                            break;
+                case  2 :   //Source Handle
+                            {
+                            Skip_XX(Size,                       "Source Handle");
+                            }
+                            break;
+                case  3 :   //UMID
+                            {
+                            Skip_XX(Size,                       "UMID");
+                            }
+                            break;
+                case  4 :   //Video size / rate info
+                            {
+                                if (Size==0x10)
+                                {
+                                    Element_Begin1("Video size / rate info");
+                                    BS_Begin_LE();
+                                    Element_Begin1("formatCode");
+                                    int8u formatCode=(int8u)-1;
+                                    for (int8u Pos=0; Pos<96; Pos++)
+                                    {
+                                        bool Temp;
+                                        Get_TB (Temp,            "formatCode bit");
+                                        if (Temp)
+                                        {
+                                            if (formatCode==(int8u)-1)
+                                                formatCode=Pos;
+                                            else
+                                                formatCode=(int8u)-2; //problem
+                                        }
+                                    }
+                                    if (formatCode<96)
+                                    {
+                                        int8u frameRateCode=formatCode%8;
+                                        #if MEDIAINFO_TRACE
+                                            int8u temp=formatCode/8;
+                                            int8u scanType=temp%2;
+                                            int8u verticalsizeCode=temp/2;
+                                            Element_Info(verticalsizeCode);
+                                            Element_Info(scanType);
+                                        #endif //MEDIAINFO_TRACE
+                                        if (frameRateCode<16-1)
+                                        {
+                                            FrameRate=Mpegv_frame_rate[frameRateCode+1];
+                                            if (Version==0)
+                                                TimeStamp_Rate=FrameRate*2; //Time stamp is in fields
+                                            Element_Info3(FrameRate, 3, " fps");
+                                        }
+                                    }
+                                    Element_End0();
+                                    Skip_TB(                    "field");
+                                    Skip_TB(                    "interlaced");
+                                    Skip_TB(                    "pulldown");
+                                    Skip_TB(                    "chroma 420");
+                                    Skip_TB(                    "chroma 422");
+                                    Skip_TB(                    "chroma 311");
+                                    Skip_TB(                    "PAR 1:1");
+                                    Skip_TB(                    "PAR 4:3");
+                                    Skip_T4(23,                 "Zero");
+                                    BS_End_LE();
+                                    Element_End0();
+                                }
+                                else
+                                    Skip_XX(Size,               "Video size / rate info");
+                            }
+                            break;
+                case  5 :   //Source Video Info
+                            {
+                            Skip_XX(Size,                       "Source Video Info");
+                            }
+                            break;
+                case  6 :   //GUID
+                            {
+                            Skip_XX(Size,                       "GUID");
+                            }
+                            break;
+                case  7 :   //Channel?
                             {
                             Ztring Channel;
-                            Get_UTF16L(Size, Channel,          "Channel?");
+                            Get_UTF16L(Size, Channel,           "Channel?");
                             Fill(Stream_General, 0, General_ServiceName, Channel);
                             }
                             break;
-                case  7 :   //Title
+                case  8 :   //Department
+                            {
+                            Skip_UTF16L(Size,                   "Department");
+                            }
+                            break;
+                case 12 :   //Title
                             {
                             Ztring Title;
                             Get_UTF16L(Size, Title,             "Title");
                             Fill(Stream_General, 0, General_Title, Title);
                             }
                             break;
+                case 13 :   //Extended Agency
+                            {
+                            Ztring Title;
+                            Get_UTF16L(Size, Title,             "Extended Agency");
+                            Fill(Stream_General, 0, General_Title, Title); //Note: not sure
+                            }
+                            break;
+                case 14 :   //User-definable Field
+                case 15 :   //User-definable Field
+                case 16 :   //User-definable Field
+                case 17 :   //User-definable Field
+                            {
+                            Ztring Comment;
+                            Get_UTF16L(Size, Comment,           "User-definable Field");
+                            Fill(Stream_General, 0, General_Comment, Comment);
+                            }
+                            break;
+                case 20 :   //Modified Timestamp
+                            {
+                            Skip_XX(Size,                         "Modified Timestamp");
+                            }
+                            break;
                 default : Skip_XX(Size,                         "Data");
             }
         }
@@ -397,7 +993,7 @@
         Pos++;
     }
 
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
@@ -405,28 +1001,60 @@
 {
     Element_Name("Audio");
 
-    for (size_t Pos=0; Pos<Sizes.size(); Pos++)
-        Audio_Stream(Pos);
-    Sizes.clear();
+    #if MEDIAINFO_SEEK
+        if (FrameRate==0 && Audios_Header.TimeStamp_End-Audios_Header.TimeStamp_Begin!=0)
+            FrameRate=TimeStamp_Rate/(Audios_Header.TimeStamp_End-Audios_Header.TimeStamp_Begin);
+    #endif //MEDIAINFO_SEEK
+
+    Audio_Sizes_Pos=0;
+    Element_ThisIsAList();
 }
 
 //---------------------------------------------------------------------------
 void File_Lxf::Audio_Stream(size_t Pos)
 {
-    Element_Begin("Stream");
+    Element_Begin1("Stream");
 
-    Element_Code=0x0100+Pos;
-    Demux(Buffer+Buffer_Offset+(size_t)Element_Offset, Sizes[Pos], ContentType_MainStream);
+    #if MEDIAINFO_DEMUX
+        #if MEDIAINFO_SEEK
+            if (SeekRequest==(int64u)-1)
+        #endif //MEDIAINFO_SEEK
+        {
+            Element_Code=0x0200+Pos;
+            Frame_Count_NotParsedIncluded=float64_int64s(((float64)(Audios_Header.TimeStamp_End-Audios_Header.Duration))/TimeStamp_Rate*FrameRate);
+            if (SampleSize==20 && Config->Demux_PCM_20bitTo16bit_Get())
+            {
+                //Removing bits 3-0 (Little endian)
+                int8u* SixteenBit=new int8u[(size_t)Audio_Sizes[Pos]];
+                size_t SixteenBit_Pos=0;
+                size_t Buffer_Pos=Buffer_Offset+(size_t)Element_Offset;
+                size_t Buffer_Max=Buffer_Offset+(size_t)(Element_Offset+Audio_Sizes[Pos]);
 
-    Skip_XX(Sizes[Pos],                                     Sizes.size()==2?"PCM":"Unknown format");
+                while (Buffer_Pos+5<=Buffer_Max)
+                {
+                    int64u Temp=LittleEndian2int40u(Buffer+Buffer_Pos);
+                    Temp=((Temp&0xFFFF000000LL)>>8)|((Temp&0xFFFF0LL)>>4);
+                    int32s2LittleEndian(SixteenBit+SixteenBit_Pos, (int32s)Temp);
+                    SixteenBit_Pos+=4;
+                    Buffer_Pos+=5;
+                }
+
+                Demux(SixteenBit, SixteenBit_Pos, ContentType_MainStream);
+            }
+            else
+                Demux(Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)Audio_Sizes[Pos], ContentType_MainStream);
+        }
+    #endif //MEDIAINFO_DEMUX
+
+    Skip_XX(Audio_Sizes[Pos],                                   Audio_Sizes.size()==2?"PCM":"Unknown format");
 
     if (Pos>=Audios.size())
         Audios.resize(Pos+1);
     if (Audios[Pos].Parser==NULL)
     {
         //Trying to detect if this is PCM
-        int64u BitRate=Sizes[Pos]*720000*8/(Audios_Header.TimeStamp_End-Audios_Header.TimeStamp_Begin);
-        Audios[Pos].BytesPerFrame=Sizes[Pos];
+        int64u BitRate=float64_int64s(Audio_Sizes[Pos]*TimeStamp_Rate*8/(Audios_Header.TimeStamp_End-Audios_Header.TimeStamp_Begin));
+        Audios[Pos].BytesPerFrame=Audio_Sizes[Pos];
 
         Audios[Pos].Parser=new File__Analyze;
         Open_Buffer_Init(Audios[Pos].Parser);
@@ -434,23 +1062,14 @@
         Audios[Pos].Parser->Stream_Prepare(Stream_Audio);
         Audios[Pos].Parser->Fill(Stream_Audio, StreamPos_Last, Audio_BitRate, BitRate);
         Audios[Pos].Parser->Fill(Stream_Audio, 0, Audio_BitRate_Mode, "CBR");
-        if (BitRate==768000)
-        {
-            Audios[Pos].Parser->Fill(Stream_Audio, StreamPos_Last, Audio_Format, "PCM");
-            Audios[Pos].Parser->Fill(Stream_Audio, StreamPos_Last, Audio_SamplingRate, 24000);
-            Audios[Pos].Parser->Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, 2);
-            Audios[Pos].Parser->Fill(Stream_Audio, StreamPos_Last, Audio_Resolution, 16);
-        }
-        if (BitRate==960000)
-        {
-            Audios[Pos].Parser->Fill(Stream_Audio, StreamPos_Last, Audio_SamplingRate, 48000);
-            Audios[Pos].Parser->Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, 4);
-            Audios[Pos].Parser->Fill(Stream_Audio, StreamPos_Last, Audio_Resolution, 16);
-        }
+        Audios[Pos].Parser->Fill(Stream_Audio, StreamPos_Last, Audio_Format, "PCM");
+        Audios[Pos].Parser->Fill(Stream_Audio, StreamPos_Last, Audio_SamplingRate, 48000);
+        Audios[Pos].Parser->Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, 1);
+        Audios[Pos].Parser->Fill(Stream_Audio, StreamPos_Last, Audio_BitDepth, SampleSize);
         Audios[Pos].Parser->Fill();
     }
 
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
@@ -458,127 +1077,239 @@
 {
     Element_Name("Video");
 
+    #if MEDIAINFO_SEEK
+        if (FrameRate==0 && Videos_Header.TimeStamp_End-Videos_Header.TimeStamp_Begin!=0)
+            FrameRate=TimeStamp_Rate/(Videos_Header.TimeStamp_End-Videos_Header.TimeStamp_Begin);
+    #endif //MEDIAINFO_SEEK
+
+    Video_Sizes_Pos=0;
+    Element_ThisIsAList();
+}
+
+//---------------------------------------------------------------------------
+void File_Lxf::Video_Stream(size_t Pos)
+{
     if (LookingForLastFrame)
     {
         Skip_XX(Element_Size,                                   "Data");
         return;
     }
 
-    for (size_t Pos=0; Pos<Sizes.size(); Pos++)
-        Video_Stream(Pos);
-    Sizes.clear();
+    Element_Begin1("Stream");
+
+    #if MEDIAINFO_DEMUX
+        #if MEDIAINFO_SEEK
+            if (SeekRequest==(int64u)-1)
+        #endif //MEDIAINFO_SEEK
+        {
+            Element_Code=0x0100+Pos;
+            Frame_Count_NotParsedIncluded=float64_int64s(((float64)(Videos_Header.TimeStamp_End-Videos_Header.Duration))/TimeStamp_Rate*FrameRate);
+            Demux(Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)Video_Sizes[Pos], ContentType_MainStream);
+        }
+    #endif //MEDIAINFO_DEMUX
+
+    if (Pos>=Videos.size())
+        Videos.resize(Pos+1);
+
+    switch (Pos)
+    {
+        case 1 : Video_Stream_1(); break;
+        case 2 : Video_Stream_2(); break;
+        default: ;
+    }
+
+    Element_End0();
 
     FILLING_BEGIN();
-        Frame_Count++;
-        if (Frame_Count>6 && Stream_Count==0 && !Status[IsFilled]) //5 video frames for 1 Audio frame
+        if (Pos==2)
         {
-            Fill("LXF");
-            if (MediaInfoLib::Config.ParseSpeed_Get()<1)
+            Frame_Count++;
+            if (Frame_Count>6 && Stream_Count==0 && !Status[IsFilled]) //5 video frames for 1 Audio frame
             {
-                LookingForLastFrame=true;
-                if (2*(File_Offset+Buffer_Offset)<=File_Size)
-                    GoToFromEnd(File_Offset+Buffer_Offset);
+                Fill("LXF");
+                if (MediaInfoLib::Config.ParseSpeed_Get()<1)
+                {
+                    LookingForLastFrame=true;
+                    if (3*(File_Offset+Buffer_Offset)<=File_Size)
+                    {
+                        GoToFromEnd((File_Offset+Buffer_Offset)*2);
+                        Open_Buffer_Unsynch();
+                    }
+                }
             }
         }
     FILLING_END();
 }
 
 //---------------------------------------------------------------------------
-void File_Lxf::Video_Stream(size_t Pos)
+void File_Lxf::Video_Stream_1()
 {
-    Element_Begin("Stream");
+    Videos[1].BytesPerFrame=Video_Sizes[1];
 
-    Element_Code=0x0000+Pos;
-    Demux(Buffer+Buffer_Offset+(size_t)Element_Offset, Sizes[Pos], ContentType_MainStream);
+    int8u Lines_Allocated, Lines_Used, FieldNumber;
+    Get_L1 (Lines_Allocated,                            "Lines allocated");
+    Get_L1 (Lines_Used,                                 "Lines used");
+    Get_L1 (FieldNumber,                                "Field number");
 
-    if (Sizes.size()==1)
-    {
-        #if defined(MEDIAINFO_DVDIF_YES)
-            if (Pos>=Videos.size())
-                Videos.resize(Pos+1);
-            if (Videos[Pos].Parser==NULL)
-            {
-                Videos[Pos].Parser=new File_DvDif;
-                Open_Buffer_Init(Videos[Pos].Parser);
-                Stream_Count++;
-            }
-            Open_Buffer_Continue(Videos[Pos].Parser, Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)Sizes[Pos]);
-            if (Videos[Pos].Parser->Status[IsFilled])
-            {
-                if (Stream_Count>0)
-                    Stream_Count--;
-            }
-        #else
-            Skip_XX(Sizes[Pos],                                     "DV");
+    #if defined(MEDIAINFO_CDP_YES)
+        if (Videos[1].Parser==NULL)
+        {
+            Videos[1].Parser=new File_Ancillary;
+            ((File_Ancillary*)Videos[1].Parser)->InDecodingOrder=true;
+            ((File_Ancillary*)Videos[1].Parser)->WithChecksum=true;
+            Videos[1].Parser->MustSynchronize=true;
+            Open_Buffer_Init(Videos[1].Parser);
+            Stream_Count++;
+        }
+        Videos[1].Parser->FrameInfo=FrameInfo;
+        Open_Buffer_Continue(Videos[1].Parser);
+        if (Videos[1].Parser->Status[IsFilled])
+        {
+            if (Stream_Count>0)
+                Stream_Count--;
+        }
+    #else
+        Skip_XX(Video_Sizes[1],                         "VBI data");
+    #endif
+}
 
-            if (Pos>=Videos.size())
-                Videos.resize(Pos+1);
-            if (Videos[Pos].Parser==NULL)
-            {
-                int64u BitRate=float64_int64s(((float64)Sizes[Pos])*720000*8/(Videos_Header.TimeStamp_End-Videos_Header.TimeStamp_Begin));
-                float64 FrameRate=((float64)1)*720000/(Videos_Header.TimeStamp_End-Videos_Header.TimeStamp_Begin);
-
-                Videos[Pos].Parser=new File__Analyze;
-                Open_Buffer_Init(Videos[Pos].Parser);
-                Videos[Pos].Parser->Accept();
-                Videos[Pos].Parser->Stream_Prepare(Stream_Video);
-                Videos[Pos].Parser->Fill(Stream_Video, 0, Video_Format, "DV");
-                Videos[Pos].Parser->Fill(Stream_Video, 0, Video_BitRate, BitRate);
-                Videos[Pos].Parser->Fill(Stream_Video, 0, Video_BitRate_Mode, "CBR");
-                Videos[Pos].Parser->Fill(Stream_Video, 0, Video_FrameRate, FrameRate);
-                Videos[Pos].Parser->Fill();
-            }
-        #endif
-    }
-    else
+//---------------------------------------------------------------------------
+void File_Lxf::Video_Stream_2()
+{
+    switch (VideoFormat)
     {
-        if (Pos==0)
+        case 0x01 :
+        case 0x02 :
+        case 0x03 :
+        case 0x09 :
+                    Video_Stream_2_Mpegv();
+                    break;
+        case 0x04 :
+        case 0x05 :
+        case 0x06 :
+                    Video_Stream_2_DvDif();
+                    break;
+        case 0x0A :
+        case 0x0B :
+        case 0x0C :
+        case 0x0D :
+                    Video_Stream_2_Avc();
+                    break;
+        default   :
+                    Skip_XX(Element_Size,               "Unknown");
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Lxf::Video_Stream_2_Mpegv()
+{
+    #if defined(MEDIAINFO_MPEGV_YES)
+        if (Videos[2].Parser==NULL)
         {
-            Skip_XX(Sizes[Pos],                                     "Unknown");
-            if (Pos>=Videos.size())
-                Videos.resize(Pos+1);
-            Videos[Pos].BytesPerFrame=Sizes[Pos];
+            Videos[2].Parser=new File_Mpegv;
+            ((File_Mpegv*)Videos[2].Parser)->FrameIsAlwaysComplete=true;
+            Open_Buffer_Init(Videos[2].Parser);
+            Stream_Count++;
         }
-        else
+        Open_Buffer_Continue(Videos[2].Parser, Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)Video_Sizes[2]);
+        if (Videos[2].Parser->Status[IsFilled])
         {
-            #if defined(MEDIAINFO_MPEGV_YES)
-                if (Pos>=Videos.size())
-                    Videos.resize(Pos+1);
-                if (Videos[Pos].Parser==NULL)
-                {
-                    Videos[Pos].Parser=new File_Mpegv;
-                    Open_Buffer_Init(Videos[Pos].Parser);
-                    Stream_Count++;
-                }
-                Open_Buffer_Continue(Videos[Pos].Parser, Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)Sizes[Pos]);
-                if (Videos[Pos].Parser->Status[IsFilled])
-                {
-                    if (Stream_Count>0)
-                        Stream_Count--;
-                }
-            #else
-                Skip_XX(Sizes[Pos],                                     "MPEG Video");
+            if (Stream_Count>0)
+                Stream_Count--;
+        }
+    #else
+        Skip_XX(Video_Sizes[1],                       "MPEG Video");
 
-                if (Pos>=Videos.size())
-                    Videos.resize(Pos+1);
-                if (Videos[Pos].Parser==NULL)
-                {
-                    float64 FrameRate=((float64)1)*720000/(Videos_Header.TimeStamp_End-Videos_Header.TimeStamp_Begin);
+        if (Videos[2].Parser==NULL)
+        {
+            if (FrameRate==0 && Videos_Header.TimeStamp_End-Videos_Header.TimeStamp_Begin)
+                FrameRate=((float64)1)*TimeStamp_Rate/(Videos_Header.TimeStamp_End-Videos_Header.TimeStamp_Begin);
+
+            Videos[2].Parser=new File__Analyze;
+            Open_Buffer_Init(Videos[2].Parser);
+            Videos[2].Parser->Stream_Prepare(Stream_Video);
+            Videos[2].Parser->Fill(Stream_Video, 0, Video_Format, "MPEG Video");
+            if (FrameRate)
+                Videos[2].Parser->Fill(Stream_Video, 0, Video_FrameRate, FrameRate);
+        }
+    #endif
+}
 
-                    Videos[Pos].Parser=new File__Analyze;
-                    Open_Buffer_Init(Videos[Pos].Parser);
-                    Videos[Pos].Parser->Stream_Prepare(Stream_Video);
-                    Videos[Pos].Parser->Fill(Stream_Video, 0, Video_Format, "MPEG Video");
-                    Videos[Pos].Parser->Fill(Stream_Video, 0, Video_FrameRate, FrameRate);
-                }
-            #endif
+//---------------------------------------------------------------------------
+void File_Lxf::Video_Stream_2_DvDif()
+{
+    #if defined(MEDIAINFO_DVDIF_YES)
+        if (Videos[2].Parser==NULL)
+        {
+            Videos[2].Parser=new File_DvDif;
+            ((File_DvDif*)Videos[2].Parser)->IgnoreAudio=true;
+            Open_Buffer_Init(Videos[2].Parser);
+            Stream_Count++;
         }
-    }
+        Open_Buffer_Continue(Videos[2].Parser, Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)Video_Sizes[2]);
+        if (Videos[2].Parser->Status[IsFilled])
+        {
+            if (Stream_Count>0)
+                Stream_Count--;
+        }
+    #else
+        Skip_XX(Video_Sizes[1],                           "DV");
 
-    Element_End();
+        if (Videos[2].Parser==NULL)
+        {
+            int64u BitRate=float64_int64s(((float64)Video_Sizes[1])*TimeStamp_Rate*8/(Videos_Header.TimeStamp_End-Videos_Header.TimeStamp_Begin));
+            if (FrameRate==0 && Videos_Header.TimeStamp_End-Videos_Header.TimeStamp_Begin)
+                FrameRate=((float64)1)*TimeStamp_Rate/(Videos_Header.TimeStamp_End-Videos_Header.TimeStamp_Begin);
+
+            Videos[2].Parser=new File__Analyze;
+            Open_Buffer_Init(Videos[2].Parser);
+            Videos[2].Parser->Accept();
+            Videos[2].Parser->Stream_Prepare(Stream_Video);
+            Videos[2].Parser->Fill(Stream_Video, 0, Video_Format, "DV");
+            Videos[2].Parser->Fill(Stream_Video, 0, Video_BitRate, BitRate);
+            Videos[2].Parser->Fill(Stream_Video, 0, Video_BitRate_Mode, "CBR");
+            if (FrameRate)
+                Videos[2].Parser->Fill(Stream_Video, 0, Video_FrameRate, FrameRate);
+            Videos[2].Parser->Fill();
+        }
+    #endif
+}
+
+//---------------------------------------------------------------------------
+void File_Lxf::Video_Stream_2_Avc()
+{
+    #if defined(MEDIAINFO_AVC_YES)
+        if (Videos[2].Parser==NULL)
+        {
+            Videos[2].Parser=new File_Avc;
+            ((File_Avc*)Videos[2].Parser)->FrameIsAlwaysComplete=true;
+            Open_Buffer_Init(Videos[2].Parser);
+            Stream_Count++;
+        }
+        Open_Buffer_Continue(Videos[2].Parser, Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)Video_Sizes[2]);
+        if (Videos[2].Parser->Status[IsFilled])
+        {
+            if (Stream_Count>0)
+                Stream_Count--;
+        }
+    #else
+        Skip_XX(Video_Sizes[1],                       "AVC");
+
+        if (Videos[2].Parser==NULL)
+        {
+            if (FrameRate==0 && Videos_Header.TimeStamp_End-Videos_Header.TimeStamp_Begin)
+                FrameRate=((float64)1)*TimeStamp_Rate/(Videos_Header.TimeStamp_End-Videos_Header.TimeStamp_Begin);
+
+            Videos[2].Parser=new File__Analyze;
+            Open_Buffer_Init(Videos[2].Parser);
+            Videos[2].Parser->Stream_Prepare(Stream_Video);
+            Videos[2].Parser->Fill(Stream_Video, 0, Video_Format, "AVC");
+            if (FrameRate)
+                Videos[2].Parser->Fill(Stream_Video, 0, Video_FrameRate, FrameRate);
+        }
+    #endif
 }
 
 } //NameSpace
 
 #endif //MEDIAINFO_LXF_*
-

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Lxf.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Lxf.h Changed

@@ -1,17 +1,17 @@
 // File_Lxf - Info for LXF files
-// Copyright (C) 2006-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2006-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -47,14 +47,21 @@
 protected :
     //Streams management
     void Streams_Fill ();
-    void Streams_Fill_PerStream (File__Analyze* Parser);
+    void Streams_Fill_PerStream (File__Analyze* Parser, size_t Container_StreamKind, size_t Parser_Pos);
     void Streams_Finish ();
 
     //Buffer - Synchro
     bool Synchronize();
     bool Synched_Test();
 
+    //Buffer - Global
+    #if MEDIAINFO_SEEK
+    size_t Read_Buffer_Seek (size_t Method, int64u Value, int64u ID);
+    #endif //MEDIAINFO_SEEK
+    void Read_Buffer_Unsynched();
+
     //Buffer - Per element
+    bool Header_Begin ();
     void Header_Parse();
     void Data_Parse();
 
@@ -66,6 +73,11 @@
     void Audio_Stream(size_t Pos);
     void Video();
     void Video_Stream(size_t Pos);
+    void Video_Stream_1();
+    void Video_Stream_2();
+    void Video_Stream_2_Mpegv();
+    void Video_Stream_2_DvDif();
+    void Video_Stream_2_Avc();
 
     //Streams
     struct stream
@@ -86,25 +98,60 @@
         int64u          TimeStamp_Begin;
         int64u          TimeStamp_End;
         int64u          Duration;
+        int64u          Duration_First;
+        int8u           PictureType;
 
         stream_header()
         {
             TimeStamp_Begin=(int64u)-1;
             TimeStamp_End=(int64u)-1;
             Duration=(int64u)-1;
+            Duration_First=(int64u)-1;
+            PictureType=(int8u)-1;
+        }
+        stream_header(int64u TimeStamp_Begin_, int64u TimeStamp_End_, int64u Duration_, int8u PictureType_)
+        {
+            TimeStamp_Begin=TimeStamp_Begin_;
+            TimeStamp_End=TimeStamp_End_;
+            Duration=Duration_;
+            PictureType=PictureType_;
         }
     };
     stream_header Videos_Header;
     stream_header Audios_Header;
 
     //Temp
-    int64u                  Frame_Count;
-    std::vector<int64u>     Sizes;
     bool                    LookingForLastFrame;
     int64u                  Stream_Count;
     int64u                  Info_General_StreamSize;
+    std::vector<int64u>     Header_Sizes;
+    std::vector<int64u>     Audio_Sizes;
+    size_t                  Audio_Sizes_Pos;
+    std::vector<int64u>     Video_Sizes;
+    size_t                  Video_Sizes_Pos;
+    int8u                   SampleSize;
+    int8u                   VideoFormat;
+    int32u                  Version;
+
+    //Hints
+    size_t*                 File_Buffer_Size_Hint_Pointer;
+
+    //Seek
+    typedef std::map<int64u, stream_header> time_offsets;
+    time_offsets            TimeOffsets;
+    #if MEDIAINFO_SEEK
+        int64u              SeekRequest_Divider;
+        int64u              SeekRequest;
+    #endif //MEDIAINFO_SEEK
+    float64                 FrameRate;
+    float64                 TimeStamp_Rate;
+    bool                    Duration_Detected;
+    int64u                  LastAudio_BufferOffset;
+    stream_header           LastAudio_TimeOffset;
 };
 
 } //NameSpace
 
 #endif
+
+

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Mk.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Mk.cpp Changed

@@ -1,31 +1,35 @@
 // File_Mk - Info for Matroska files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 
+
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_MK_YES)
 //---------------------------------------------------------------------------
 
@@ -52,8 +56,11 @@
 #if defined(MEDIAINFO_MPEGV_YES)
     #include "MediaInfo/Video/File_Mpegv.h"
 #endif
-#if defined(MEDIAINFO_ADTS_YES)
-    #include "MediaInfo/Audio/File_Adts.h"
+#if defined(MEDIAINFO_VP8_YES)
+    #include "MediaInfo/Video/File_Vp8.h"
+#endif
+#if defined(MEDIAINFO_AAC_YES)
+    #include "MediaInfo/Audio/File_Aac.h"
 #endif
 #if defined(MEDIAINFO_AC3_YES)
     #include "MediaInfo/Audio/File_Ac3.h"
@@ -64,15 +71,12 @@
 #if defined(MEDIAINFO_MPEGA_YES)
     #include "MediaInfo/Audio/File_Mpega.h"
 #endif
-#if defined(MEDIAINFO_MPEG4_YES)
-    #include "MediaInfo/Audio/File_Mpeg4_AudioSpecificConfig.h"
-#endif
-#if defined(MEDIAINFO_AAC_YES)
-    #include "MediaInfo/Audio/File_Aac.h"
-#endif
 #if defined(MEDIAINFO_FLAC_YES)
     #include "MediaInfo/Audio/File_Flac.h"
 #endif
+#if defined(MEDIAINFO_OPUS_YES)
+    #include "MediaInfo/Audio/File_Opus.h"
+#endif
 #if defined(MEDIAINFO_WVPK_YES)
     #include "MediaInfo/Audio/File_Wvpk.h"
 #endif
@@ -109,6 +113,43 @@
     }
 }
 
+//---------------------------------------------------------------------------
+const char* Mk_StereoMode(int64u StereoMode)
+{
+    switch (StereoMode)
+    {
+        case 0x00 : return ""; //Mono (default)
+        case 0x01 : return "Side by Side (left eye first)";
+        case 0x02 : return "Top-Bottom (right eye first)";
+        case 0x03 : return "Top-Bottom (left eye first)";
+        case 0x04 : return "Checkboard (right eye first)";
+        case 0x05 : return "Checkboard (left eye first)";
+        case 0x06 : return "Row Interleaved (right eye first)";
+        case 0x07 : return "Row Interleaved (left eye first)";
+        case 0x08 : return "Column Interleaved (right eye first)";
+        case 0x09 : return "Column Interleaved (left eye first)";
+        case 0x0A : return "Anaglyph (cyan/red)";
+        case 0x0B : return "Side by Side (right eye first)";
+        case 0x0C : return "Anaglyph (green/magenta)";
+        case 0x0D : return "Both Eyes laced in one block (left eye first)";
+        case 0x0E : return "Both Eyes laced in one block (right eye first)";
+        default   : return "Unknown";
+    }
+}
+
+//---------------------------------------------------------------------------
+const char* Mk_StereoMode_v2(int64u StereoMode)
+{
+    switch (StereoMode)
+    {
+        case 0x00 : return ""; //Mono (default)
+        case 0x01 : return "Right Eye";
+        case 0x02 : return "Left Eye";
+        case 0x03 : return "Both Eye";
+        default   : return "Unknown";
+    }
+}
+
 //***************************************************************************
 // Infos
 //***************************************************************************
@@ -132,9 +173,13 @@
         ParserIDs[0]=MediaInfo_Parser_Matroska;
         StreamIDs_Width[0]=16;
     #endif //MEDIAINFO_EVENTS
+    #if MEDIAINFO_DEMUX
+        Demux_Level=2; //Container
+    #endif //MEDIAINFO_DEMUX
     DataMustAlwaysBeComplete=false;
 
     //Temp
+    Format_Version=0;
     TimecodeScale=1000000; //Default value
     Duration=0;
     Cluster_AlreadyParsed=false;
@@ -158,10 +203,18 @@
 {
     if (Duration!=0 && TimecodeScale!=0)
         Fill(Stream_General, 0, General_Duration, Duration*int64u_float64(TimecodeScale)/1000000.0, 0);
-    for (std::map<int64u, stream>::iterator Temp=Stream.begin(); Temp!=Stream.end(); Temp++)
+    for (std::map<int64u, stream>::iterator Temp=Stream.begin(); Temp!=Stream.end(); ++Temp)
     {
+        StreamKind_Last=Temp->second.StreamKind;
+        StreamPos_Last=Temp->second.StreamPos;
+
         if (Temp->second.DisplayAspectRatio!=0)
         {
+            //Corrections
+            if (Temp->second.DisplayAspectRatio>=1.777 && Temp->second.DisplayAspectRatio<=1.778)
+                Temp->second.DisplayAspectRatio=((float32)16)/9;
+            if (Temp->second.DisplayAspectRatio>=1.333 && Temp->second.DisplayAspectRatio<=1.334)
+                Temp->second.DisplayAspectRatio=((float32)4)/3;
             Fill(Stream_Video, Temp->second.StreamPos, Video_DisplayAspectRatio, Temp->second.DisplayAspectRatio, 3, true);
             int64u Width=Retrieve(Stream_Video, Temp->second.StreamPos, Video_Width).To_int64u();
             int64u Height=Retrieve(Stream_Video, Temp->second.StreamPos, Video_Height).To_int64u();
@@ -171,56 +224,85 @@
 
         if (Temp->second.Parser)
         {
-            Ztring Duration_Temp, Codec_Temp;
-            StreamKind_Last=Temp->second.StreamKind;
-            StreamPos_Last=Temp->second.StreamPos;
-            Duration_Temp=Retrieve(StreamKind_Last, Temp->second.StreamPos, Fill_Parameter(StreamKind_Last, Generic_Duration)); //Duration from stream is sometimes false
-            Codec_Temp=Retrieve(StreamKind_Last, Temp->second.StreamPos, Fill_Parameter(StreamKind_Last, Generic_Codec)); //We want to keep the 4CC
-
-            Finish(Temp->second.Parser);
-            Merge(*Temp->second.Parser, Temp->second.StreamKind, 0, Temp->second.StreamPos);
-            Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Duration), Duration_Temp, true);
-            if (Temp->second.StreamKind==Stream_Video && !Codec_Temp.empty())
-                Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Codec), Codec_Temp, true);
-
-            //Special case: AAC
-            if (StreamKind_Last==Stream_Audio
-             && (Retrieve(Stream_Audio, StreamPos_Last, Audio_Format)==_T("AAC")
-              || Retrieve(Stream_Audio, StreamPos_Last, Audio_Format)==_T("MPEG Audio")
-              || Retrieve(Stream_Audio, StreamPos_Last, Audio_Format)==_T("Vorbis")))
-                Clear(Stream_Audio, StreamPos_Last, Audio_Resolution); //Resolution is not valid for AAC / MPEG Audio / Vorbis
+            Fill(Temp->second.Parser);
+            if (Config->ParseSpeed<=1.0)
+                Temp->second.Parser->Open_Buffer_Unsynch();
+        }
 
-            //Video specific
-            if (StreamKind_Last==Stream_Video)
+        //Video specific
+        if (StreamKind_Last==Stream_Video)
+        {
+            //FrameRate
+            bool IsVfr=false;
+            if (Temp->second.Segment_Cluster_BlockGroup_BlockDuration_Counts.size()>2)
+                IsVfr=true;
+            else if (Temp->second.TimeCodes.size()>1)
             {
-                //FrameRate
-                if (Retrieve(Stream_Video, StreamPos_Last, Video_FrameRate).empty()&& Temp->second.TimeCodes.size()>1)
+                //Trying to detect VFR
+                std::vector<int64s> FrameRate_Between;
+                std::sort(Temp->second.TimeCodes.begin(), Temp->second.TimeCodes.end()); //This is PTS, no DTS --> Some frames are out of order
+                size_t FramesToAdd=0;
+                for (size_t Pos=1; Pos<Temp->second.TimeCodes.size(); Pos++)
+                {
+                    int64u Duration=Temp->second.TimeCodes[Pos]-Temp->second.TimeCodes[Pos-1];
+                    if (Duration)
+                        FrameRate_Between.push_back(Duration);
+                    else
+                        FramesToAdd++;
+                }
+                if (FrameRate_Between.size()>1)
                 {
-                    //Trying to detect VFR
-                    std::vector<int64s> FrameRate_Between;
-                    std::sort(Temp->second.TimeCodes.begin(), Temp->second.TimeCodes.end()); //This is PTS, no DTS --> Some frames are out of order
-                    for (size_t Pos=1; Pos<Temp->second.TimeCodes.size(); Pos++)
-                        FrameRate_Between.push_back(Temp->second.TimeCodes[Pos]-Temp->second.TimeCodes[Pos-1]);
-                    if (FrameRate_Between.size()>31)
-                        FrameRate_Between.resize(31); //We peek 40 frames, and remove the last ones, because this is PTS, no DTS --> Some frames are out of order
-                    std::sort(FrameRate_Between.begin(), FrameRate_Between.end());
-                    if (FrameRate_Between[0]*0.9<FrameRate_Between[FrameRate_Between.size()-1]
-                     && FrameRate_Between[0]*1.1>FrameRate_Between[FrameRate_Between.size()-1])
+                    int64s FrameRate_Between_Last=FrameRate_Between[FrameRate_Between.size()-1];
+                    size_t Pos=FrameRate_Between.size()-2;
+                    while (Pos)
+                    {
+                        if (!(FrameRate_Between[Pos]*0.9<FrameRate_Between_Last
+                           && FrameRate_Between[Pos]*1.1>FrameRate_Between_Last))
+                            break;
+                        Pos--;
+                    }
+                    if (Pos)
+                        FrameRate_Between.resize(Pos+1); //We peek 40 frames, and remove the last ones, because this is PTS, no DTS --> Some frames are out of order
+                }
+                std::sort(FrameRate_Between.begin(), FrameRate_Between.end());
+                if (FrameRate_Between[0]*0.9<FrameRate_Between[FrameRate_Between.size()-1]
+                    && FrameRate_Between[0]*1.1>FrameRate_Between[FrameRate_Between.size()-1])
+                {
+                    float Time=0;
+                    if (Temp->second.TimeCodes.size()>30+FramesToAdd)
+                        Time=(float)(Temp->second.TimeCodes[30+FramesToAdd]-Temp->second.TimeCodes[0])/30; //30 frames for handling 30 fps rounding problems
+                    else if (Temp->second.TrackDefaultDuration)
+                        Time=(float)Temp->second.TrackDefaultDuration/TimecodeScale; //TrackDefaultDuration is maybe more precise than the time code
+                    else
+                        Time=(float)(Temp->second.TimeCodes[Temp->second.TimeCodes.size()-1]-Temp->second.TimeCodes[0])/(Temp->second.TimeCodes.size()-1);
+                    if (Time)
                     {
-                        float Time=0;
-                        if (Temp->second.TimeCodes.size()>30)
-                            Time=(float)(Temp->second.TimeCodes[30]-Temp->second.TimeCodes[0])/30; //30 frames for handling 30 fps rounding problems
-                        if (Time)
+                        float32 FrameRate_FromCluster=1000000000/Time/TimecodeScale;
+                        if (Temp->second.Parser)
                         {
-                            Fill(Stream_Video, StreamPos_Last, Video_FrameRate, 1000/Time);
-                            Fill(Stream_Video, StreamPos_Last, Video_FrameRate_Mode, "CFR");
+                            float32 FrameRate_FromParser=Temp->second.Parser->Retrieve(Stream_Video, StreamPos_Last, Video_FrameRate).To_float32();
+                            if (FrameRate_FromParser
+                             && FrameRate_FromParser*2>FrameRate_FromCluster*0.9
+                             && FrameRate_FromParser*2<FrameRate_FromCluster*1.1) //TODO: awfull method to detect interlaced content with one field per block
+                                FrameRate_FromCluster/=2;
                         }
+                        Fill(Stream_Video, StreamPos_Last, Video_FrameRate, FrameRate_FromCluster);
                     }
-                    else
-                        Fill(Stream_Video, StreamPos_Last, Video_FrameRate_Mode, "VFR");
                 }
+                else
+                    IsVfr=true;
+            }
+            else if (Temp->second.TrackDefaultDuration)
+            {
+                float32 FrameRate_FromCluster=1000000000/(float32)Temp->second.TrackDefaultDuration;
+                Fill(Stream_Video, StreamPos_Last, Video_FrameRate, FrameRate_FromCluster);
             }
 
+            Fill(Stream_Video, StreamPos_Last, Video_FrameRate_Mode, IsVfr?"VFR":"CFR");
+        }
+
+        if (Temp->second.Parser)
+        {
             //Delay
             if (Temp->second.TimeCode_Start!=(int64u)-1 && TimecodeScale)
             {
@@ -241,11 +323,41 @@
                 }
 
                 //Filling
-                Fill(StreamKind_Last, StreamPos_Last, "Delay", Delay, 0, true);
-                if (Retrieve(Stream_Video, 0, Video_Delay).empty())
-                    Fill(Stream_Video, 0, Video_Delay, 0, 10, true);
+                Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Delay), Delay, 0, true);
+                Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Delay_Source), "Container");
+            }
+
+            Ztring Duration_Temp, Codec_Temp;
+            Duration_Temp=Retrieve(StreamKind_Last, Temp->second.StreamPos, Fill_Parameter(StreamKind_Last, Generic_Duration)); //Duration from stream is sometimes false
+            Codec_Temp=Retrieve(StreamKind_Last, Temp->second.StreamPos, Fill_Parameter(StreamKind_Last, Generic_Codec)); //We want to keep the 4CC
+
+            Finish(Temp->second.Parser);
+            Merge(*Temp->second.Parser, Temp->second.StreamKind, 0, Temp->second.StreamPos);
+            Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Duration), Duration_Temp, true);
+            if (Temp->second.StreamKind==Stream_Video && !Codec_Temp.empty())
+                Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Codec), Codec_Temp, true);
+
+            //Special case: AAC
+            if (StreamKind_Last==Stream_Audio
+             && (Retrieve(Stream_Audio, StreamPos_Last, Audio_Format)==__T("AAC")
+              || Retrieve(Stream_Audio, StreamPos_Last, Audio_Format)==__T("MPEG Audio")
+              || Retrieve(Stream_Audio, StreamPos_Last, Audio_Format)==__T("Vorbis")))
+                Clear(Stream_Audio, StreamPos_Last, Audio_BitDepth); //Resolution is not valid for AAC / MPEG Audio / Vorbis
+
+            //VFR
+            if (Retrieve(Stream_Video, StreamPos_Last, Video_FrameRate_Mode)==__T("VFR") && Retrieve(Stream_Video, StreamPos_Last, Video_FrameRate_Original).empty())
+            {
+                Fill(Stream_Video, StreamPos_Last, Video_FrameRate_Original, Retrieve(Stream_Video, StreamPos_Last, Video_FrameRate));
+                Clear(Stream_Video, StreamPos_Last, Video_FrameRate);
             }
         }
+
+        if (Temp->second.FrameRate!=0 && Retrieve(Stream_Video, Temp->second.StreamPos, Video_FrameRate).empty())
+            Fill(Stream_Video, Temp->second.StreamPos, Video_FrameRate, Temp->second.FrameRate, 3);
+
+        //Flags
+        Fill(Temp->second.StreamKind, Temp->second.StreamPos, "Default", Temp->second.Default?"Yes":"No");
+        Fill(Temp->second.StreamKind, Temp->second.StreamPos, "Forced", Temp->second.Forced?"Yes":"No");
     }
 
     //Chapters
@@ -264,9 +376,9 @@
                     {
                         Ztring PerLanguage;
                         if (!EditionEntries[EditionEntries_Pos].ChapterAtoms[ChapterAtoms_Pos].ChapterDisplays[ChapterDisplays_Pos].ChapLanguage.empty())
-                            PerLanguage=MediaInfoLib::Config.Iso639_1_Get(EditionEntries[EditionEntries_Pos].ChapterAtoms[ChapterAtoms_Pos].ChapterDisplays[ChapterDisplays_Pos].ChapLanguage)+_T(':');
+                            PerLanguage=MediaInfoLib::Config.Iso639_1_Get(EditionEntries[EditionEntries_Pos].ChapterAtoms[ChapterAtoms_Pos].ChapterDisplays[ChapterDisplays_Pos].ChapLanguage)+__T(':');
                         PerLanguage+=EditionEntries[EditionEntries_Pos].ChapterAtoms[ChapterAtoms_Pos].ChapterDisplays[ChapterDisplays_Pos].ChapString;
-                        Text+=PerLanguage+_T(" - ");
+                        Text+=PerLanguage+__T(" - ");
                     }
                     if (Text.size())
                         Text.resize(Text.size()-3);
@@ -277,9 +389,14 @@
         }
     }
 
-    //Attachements
+    //Attachments
     for (size_t Pos=0; Pos<AttachedFiles.size(); Pos++)
-        Fill(Stream_General, 0, "Cover", AttachedFiles[Pos]);
+    {
+        if (Ztring(AttachedFiles[Pos]).MakeLowerCase().find(__T("cover"))==string::npos)
+            Fill(Stream_General, 0, "Attachment", AttachedFiles[Pos]);
+        else
+            Fill(Stream_General, 0, "Cover", AttachedFiles[Pos]);
+    }
 
     //Purge what is not needed anymore
     if (!File_Name.empty()) //Only if this is not a buffer, with buffer we can have more data
@@ -298,9 +415,25 @@
     Peek_B1(Null);
     if (Null==0x00)
     {
-        Skip_B1(                                                "Zero byte");
+        if (Buffer_Offset_Temp==0)
+            Buffer_Offset_Temp=Buffer_Offset+1;
+
+        while (Buffer_Offset_Temp<Buffer_Size)
+        {
+            if (Buffer[Buffer_Offset_Temp])
+                break;
+            Buffer_Offset_Temp++;
+        }
+        if (Buffer_Offset_Temp>=Buffer_Size)
+        {
+            Element_WaitForMoreData();
+            return;
+        }
+
         Header_Fill_Code((int32u)-1); //Should be (int64u)-1 but Borland C++ does not like this
-        Header_Fill_Size(1);
+        Header_Fill_Size(Buffer_Offset_Temp-Buffer_Offset);
+        Buffer_Offset_Temp=0;
+
         return;
     }
 
@@ -481,12 +614,15 @@
     const int64u Segment_Tracks_TrackEntry_Video_DisplayUnit=0x14B2;
     const int64u Segment_Tracks_TrackEntry_Video_DisplayWidth=0x14B0;
     const int64u Segment_Tracks_TrackEntry_Video_FlagInterlaced=0x1A;
+    const int64u Segment_Tracks_TrackEntry_Video_FrameRate=0x383E3;
     const int64u Segment_Tracks_TrackEntry_Video_PixelCropBottom=0x14AA;
     const int64u Segment_Tracks_TrackEntry_Video_PixelCropLeft=0x14CC;
     const int64u Segment_Tracks_TrackEntry_Video_PixelCropRight=0x14DD;
     const int64u Segment_Tracks_TrackEntry_Video_PixelCropTop=0x14BB;
     const int64u Segment_Tracks_TrackEntry_Video_PixelHeight=0x3A;
     const int64u Segment_Tracks_TrackEntry_Video_PixelWidth=0x30;
+    const int64u Segment_Tracks_TrackEntry_Video_StereoMode=0x13B8;
+    const int64u Segment_Tracks_TrackEntry_Video_StereoModeBuggy=0x13B9;
     const int64u Segment_Tracks_TrackEntry_TrackOverlay=0x2FAB;
     const int64u Segment_Tracks_TrackEntry_TrackTranslate=0x2624;
     const int64u Segment_Tracks_TrackEntry_TrackTranslate_Codec=0x26BF;
@@ -773,12 +909,14 @@
                     ATOM(Segment_Tracks_TrackEntry_Video_DisplayUnit)
                     ATOM(Segment_Tracks_TrackEntry_Video_DisplayWidth)
                     ATOM(Segment_Tracks_TrackEntry_Video_FlagInterlaced)
+                    ATOM(Segment_Tracks_TrackEntry_Video_FrameRate)
                     ATOM(Segment_Tracks_TrackEntry_Video_PixelCropBottom)
                     ATOM(Segment_Tracks_TrackEntry_Video_PixelCropLeft)
                     ATOM(Segment_Tracks_TrackEntry_Video_PixelCropRight)
                     ATOM(Segment_Tracks_TrackEntry_Video_PixelCropTop)
                     ATOM(Segment_Tracks_TrackEntry_Video_PixelHeight)
                     ATOM(Segment_Tracks_TrackEntry_Video_PixelWidth)
+                    ATOM(Segment_Tracks_TrackEntry_Video_StereoMode)
                     ATOM_END_MK
                 ATOM(Segment_Tracks_TrackEntry_TrackOverlay)
                 LIST(Segment_Tracks_TrackEntry_TrackTranslate)
@@ -790,8 +928,6 @@
                 ATOM_END_MK
             ATOM_END_MK
         ATOM_END_MK
-    DATA_DEFAULT
-        Finish("Matroska");
     DATA_END_DEFAULT
 }
 
@@ -803,6 +939,8 @@
 void File_Mk::Zero()
 {
     Element_Name("ZeroPadding");
+
+    Skip_XX(Element_Size,                                       "Padding");
 }
 
 //---------------------------------------------------------------------------
@@ -872,18 +1010,25 @@
 
     //Parsing
     Ztring Data;
-    Get_Local(Element_Size, Data,                               "Data"); Element_Info(Data);
+    Get_Local(Element_Size, Data,                               "Data"); Element_Info1(Data);
 
     //Filling
     FILLING_BEGIN();
-        Accept("Matroska");
-
-        if (Data==_T("matroska"))
+        if (Data==__T("matroska"))
+        {
+            Accept("Matroska");
             Fill(Stream_General, 0, General_Format, "Matroska");
-        else if (Data==_T("webm"))
+        }
+        else if (Data==__T("webm"))
+        {
+            Accept("Matroska");
             Fill(Stream_General, 0, General_Format, "WebM");
+        }
         else
-            Fill(Stream_General, 0, General_Format, Data);
+        {
+            Reject("Matroska");
+            return;
+        }
 
         Buffer_MaximumSize=8*1024*1024;
     FILLING_END();
@@ -895,7 +1040,12 @@
     Element_Name("DocTypeVersion");
 
     //Parsing
-    UInteger_Info();
+    Format_Version=UInteger_Get();
+
+    //Filling
+    FILLING_BEGIN();
+        Fill(Stream_General, 0, General_Format_Version, __T("Version ")+Ztring::ToZtring(Format_Version));
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -904,13 +1054,22 @@
     Element_Name("DocTypeReadVersion");
 
     //Parsing
-    UInteger_Info();
+    int64u UInteger=UInteger_Get();
+
+    //Filling
+    FILLING_BEGIN();
+        if (UInteger!=Format_Version)
+            Fill(Stream_General, 0, General_Format_Version, __T("Version ")+Ztring::ToZtring(UInteger)); //Adding compatible version for info about legacy decoders
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
 void File_Mk::Segment()
 {
     Element_Name("Segment");
+
+    Segment_Offset_Begin=File_Offset+Buffer_Offset;
+    Segment_Offset_End=File_Offset+Buffer_Offset+Element_TotalSize_Get();
 }
 
 void File_Mk::Segment_Attachements()
@@ -936,7 +1095,7 @@
 
     FILLING_BEGIN();
         if (AttachedFiles[AttachedFiles.size()-1].empty())
-            AttachedFiles[AttachedFiles.size()-1]=_T("Yes");
+            AttachedFiles[AttachedFiles.size()-1]=__T("Yes");
     FILLING_END();
 }
 
@@ -1107,7 +1266,7 @@
     FILLING_BEGIN();
         EditionEntries[EditionEntries_Pos].ChapterAtoms[ChapterAtoms_Pos].ChapterDisplays[ChapterDisplays_Pos].ChapString=Data;
         //if (TimecodeScale!=0 && ChapterTimeStart!=(int64u)-1)
-        //    Fill(StreamKind_Last, StreamPos_Last, Ztring::ToZtring(Chapter_Pos).To_Local().c_str(), Ztring().Duration_From_Milliseconds(ChapterTimeStart/TimecodeScale)+_T(" - ")+ChapterString, true);
+        //    Fill(StreamKind_Last, StreamPos_Last, Ztring::ToZtring(Chapter_Pos).To_Local().c_str(), Ztring().Duration_From_Milliseconds(ChapterTimeStart/TimecodeScale)+__T(" - ")+ChapterString, true);
     FILLING_END();
 }
 
@@ -1254,20 +1413,33 @@
                 Temp->second.Searching_Payload=true;
             if (Temp->second.StreamKind==Stream_Video || Temp->second.StreamKind==Stream_Audio)
                 Temp->second.Searching_TimeStamp_Start=true;
-            if (Temp->second.StreamKind==Stream_Video && Retrieve(Stream_Video, Temp->second.StreamPos, Video_FrameRate).empty())
+            if (Temp->second.StreamKind==Stream_Video)
                 Temp->second.Searching_TimeStamps=true;
             if (Temp->second.Searching_Payload
              || Temp->second.Searching_TimeStamp_Start
              || Temp->second.Searching_TimeStamps)
                 Stream_Count++;
-            Temp++;
+
+            //Specific cases
+            if (Retrieve(Temp->second.StreamKind, Temp->second.StreamPos, Audio_CodecID).find(__T("A_AAC/"))==0)
+                ((File_Aac*)Stream[Temp->first].Parser)->Mode=File_Aac::Mode_raw_data_block; //In case AudioSpecificConfig is not present
+
+            ++Temp;
         }
 
         //We must parse moov?
         if (Stream_Count==0)
         {
             //Jumping
-            Finish("Matroska");//Skip_XX(Element_TotalSize_Get(),                        "Data");
+            std::sort(Segment_Seeks.begin(), Segment_Seeks.end());
+            for (size_t Pos=0; Pos<Segment_Seeks.size(); Pos++)
+                if (Segment_Seeks[Pos]>File_Offset+Buffer_Offset+Element_Size)
+                {
+                    GoTo(Segment_Seeks[Pos]);
+                    break;
+                }
+            if (File_GoTo==(int64u)-1)
+                GoTo(Segment_Offset_End);
             return;
         }
     }
@@ -1279,6 +1451,9 @@
 void File_Mk::Segment_Cluster_BlockGroup()
 {
     Element_Name("BlockGroup");
+
+    Segment_Cluster_BlockGroup_BlockDuration_Value=(int64u)-1;
+    Segment_Cluster_BlockGroup_BlockDuration_TrackNumber=(int64u)-1;
 }
 
 //---------------------------------------------------------------------------
@@ -1316,13 +1491,19 @@
             if (Stream[TrackNumber].TimeCodes.size()>40)
                 Stream[TrackNumber].Searching_TimeStamps=false;
         }
+
+        if (Segment_Cluster_BlockGroup_BlockDuration_Value!=(int64u)-1)
+        {
+            Stream[TrackNumber].Segment_Cluster_BlockGroup_BlockDuration_Counts[Segment_Cluster_BlockGroup_BlockDuration_Value]++;
+            Segment_Cluster_BlockGroup_BlockDuration_Value=(int64u)-1;
+        }
     FILLING_END();
 
     if (Stream[TrackNumber].Searching_Payload)
     {
         std::vector<int64u> Laces;
         int32u Lacing;
-        Element_Begin("Flags", 1);
+        Element_Begin1("Flags");
             BS_Begin();
             Skip_BS(1,                                              "KeyFrame");
             Skip_BS(3,                                              "Reserved");
@@ -1330,10 +1511,10 @@
             Get_BS (2, Lacing,                                      "Lacing");
             Skip_BS(1,                                              "Discardable");
             BS_End();
-        Element_End();
+        Element_End0();
         if (Lacing>0)
         {
-            Element_Begin("Lacing");
+            Element_Begin1("Lacing");
                 int8u FrameCountMinus1;
                 Get_B1(FrameCountMinus1,                            "Frame count minus 1");
                 switch (Lacing)
@@ -1351,7 +1532,7 @@
                                         Size+=Size8;
                                     }
                                     while (Size8==0xFF);
-                                    Param_Info(Size);
+                                    Param_Info1(Size);
                                     Element_Offset_Virtual+=Size;
                                     Laces.push_back(Size);
                                 }
@@ -1374,16 +1555,16 @@
                                 {
                                     int64s Diff;
                                     Get_ES (Diff,                   "Difference");
-                                    Size+=Diff; Param_Info(Size);
+                                    Size+=Diff; Param_Info1(Size);
                                     Element_Offset_Virtual+=Size;
                                     Laces.push_back(Size);
                                 }
-                                Laces.push_back(Element_Size-Element_Offset-Element_Offset_Virtual); Param_Info(Size); //last lace
+                                Laces.push_back(Element_Size-Element_Offset-Element_Offset_Virtual); Param_Info1(Size); //last lace
                             }
                             break;
                     default : ; //Should never be here
                 }
-            Element_End();
+            Element_End0();
         }
         else
             Laces.push_back(Element_Size-Element_Offset);
@@ -1438,11 +1619,15 @@
     if (Stream_Count==0)
     {
         //Jumping
-        Element_Show();
-        Element_End(); //Block
-        Info("Cluster, no need of more");
-        Element_End(); //BlockGroup
-        Finish("Matroska"); //GoTo(File_Offset+Buffer_Offset+Element_TotalSize_Get());
+        std::sort(Segment_Seeks.begin(), Segment_Seeks.end());
+        for (size_t Pos=0; Pos<Segment_Seeks.size(); Pos++)
+            if (Segment_Seeks[Pos]>File_Offset+Buffer_Offset+Element_Size)
+            {
+                GoTo(Segment_Seeks[Pos]);
+                break;
+            }
+        if (File_GoTo==(int64u)-1)
+            GoTo(Segment_Offset_End);
     }
 
     Element_Show(); //For debug
@@ -1481,7 +1666,17 @@
     Element_Name("BlockDuration");
 
     //Parsing
-    UInteger_Info();
+    int64u Segment_Cluster_TimeCode_Value=UInteger_Get();
+
+    FILLING_BEGIN();
+        if (Segment_Cluster_BlockGroup_BlockDuration_TrackNumber!=(int64u)-1)
+        {
+            Stream[Segment_Cluster_BlockGroup_BlockDuration_TrackNumber].Segment_Cluster_BlockGroup_BlockDuration_Counts[Segment_Cluster_TimeCode_Value]++;
+            Segment_Cluster_BlockGroup_BlockDuration_TrackNumber=(int64u)-1;
+        }
+        else
+            Segment_Cluster_BlockGroup_BlockDuration_Value=Segment_Cluster_TimeCode_Value;
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -1671,7 +1866,7 @@
 
     //Parsing
     int64u Data;
-    Get_B8(Data,                                                "Data"); Element_Info(Data/1000000000+978307200); //From Beginning of the millenium, in nanoseconds
+    Get_B8(Data,                                                "Data"); Element_Info1(Data/1000000000+978307200); //From Beginning of the millenium, in nanoseconds
 
     FILLING_BEGIN();
         Fill(Stream_General, 0, "Encoded_Date", Ztring().Date_From_Seconds_1970((int32u)(Data/1000000000+978307200))); //978307200s between beginning of the millenium and 1970
@@ -1764,7 +1959,13 @@
     Element_Name("SegmentUID");
 
     //Parsing
-    UInteger_Info();
+    int128u Data;
+    Data=UInteger16_Get();
+
+    FILLING_BEGIN();
+        Fill(Stream_General, 0, General_UniqueID, Ztring().From_Local(Data.toString(10)));
+        Fill(Stream_General, 0, General_UniqueID_String, Ztring().From_Local(Data.toString(10))+__T(" (0x")+Ztring().From_Local(Data.toString(16))+__T(')'));
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -1810,6 +2011,8 @@
 void File_Mk::Segment_SeekHead()
 {
     Element_Name("SeekHead");
+
+    Segment_Seeks.clear();
 }
 
 //---------------------------------------------------------------------------
@@ -1834,19 +2037,26 @@
     Element_Name("SeekPosition");
 
     //Parsing
-    UInteger_Info();
+    int64u Data=UInteger_Get();
+
+    Segment_Seeks.push_back(Segment_Offset_Begin+Data);
+    Element_Info1(Ztring::ToZtring(Segment_Offset_Begin+Data, 16));
 }
 
 //---------------------------------------------------------------------------
 void File_Mk::Segment_Tags()
 {
     Element_Name("Tags");
+
+    Segment_Tag_SimpleTag_TagNames.clear();
 }
 
 //---------------------------------------------------------------------------
 void File_Mk::Segment_Tags_Tag()
 {
     Element_Name("Tag");
+
+    Segment_Tag_TrackUID=(int64u)-1;
 }
 
 //---------------------------------------------------------------------------
@@ -1874,10 +2084,10 @@
 
     //Parsing
     Ztring Data;
-    Get_Local(Element_Size, Data,                              "Data"); Element_Info(Data);
+    Get_Local(Element_Size, Data,                              "Data"); Element_Info1(Data);
 
     FILLING_BEGIN();
-        Fill(StreamKind_Last, StreamPos_Last, "Language", Data);
+        //Fill(StreamKind_Last, StreamPos_Last, "Language", Data);
     FILLING_END();
 }
 
@@ -1887,7 +2097,10 @@
     Element_Name("TagName");
 
     //Parsing
-    UTF8_Info();
+    Ztring TagName=UTF8_Get();
+
+    Segment_Tag_SimpleTag_TagNames.resize(Element_Level-5); //5 is the first level of a tag
+    Segment_Tag_SimpleTag_TagNames.push_back(TagName);
 }
 
 //---------------------------------------------------------------------------
@@ -1896,7 +2109,55 @@
     Element_Name("TagString");
 
     //Parsing
-    UTF8_Info();
+    Ztring TagString;
+    TagString=UTF8_Get();
+
+    if (Segment_Tag_SimpleTag_TagNames.empty())
+        return;
+    if (Segment_Tag_SimpleTag_TagNames[0]==__T("BITSPS")) return; //Useless
+    if (Segment_Tag_SimpleTag_TagNames[0]==__T("BPS")) return; //Useless
+    if (Segment_Tag_SimpleTag_TagNames[0]==__T("COMPATIBLE_BRANDS")) return; //QuickTime techinical info, useless
+    if (Segment_Tag_SimpleTag_TagNames[0]==__T("CREATION_TIME")) {Segment_Tag_SimpleTag_TagNames[0]=__T("Encoded_Date"); TagString.insert(0, __T("UTC "));}
+    if (Segment_Tag_SimpleTag_TagNames[0]==__T("DATE_DIGITIZED")) {Segment_Tag_SimpleTag_TagNames[0]=__T("Mastered_Date"); TagString.insert(0, __T("UTC "));}
+    if (Segment_Tag_SimpleTag_TagNames[0]==__T("ENCODED_BY")) Segment_Tag_SimpleTag_TagNames[0]=__T("EncodedBy");
+    if (Segment_Tag_SimpleTag_TagNames[0]==__T("ENCODER")) Segment_Tag_SimpleTag_TagNames[0]=__T("Encoded_Library");
+    if (Segment_Tag_SimpleTag_TagNames[0]==__T("FPS")) return; //Useless
+    if (Segment_Tag_SimpleTag_TagNames[0]==__T("LANGUAGE")) Segment_Tag_SimpleTag_TagNames[0]=__T("Language");
+    if (Segment_Tag_SimpleTag_TagNames[0]==__T("MAJOR_BRAND")) return; //QuickTime techinical info, useless
+    if (Segment_Tag_SimpleTag_TagNames[0]==__T("MINOR_VERSION")) return; //QuickTime techinical info, useless
+    if (Segment_Tag_SimpleTag_TagNames[0]==__T("ORIGINAL_MEDIA_TYPE")) Segment_Tag_SimpleTag_TagNames[0]=__T("OriginalSourceForm");
+    if (Segment_Tag_SimpleTag_TagNames[0]==__T("STEREO_MODE")) return; //Useless
+    if (Segment_Tag_SimpleTag_TagNames[0]==__T("TERMS_OF_USE")) Segment_Tag_SimpleTag_TagNames[0]=__T("TermsOfUse");
+    for (size_t Pos=1; Pos<Segment_Tag_SimpleTag_TagNames.size(); Pos++)
+    {
+        if (Segment_Tag_SimpleTag_TagNames[Pos]==__T("BARCODE")) Segment_Tag_SimpleTag_TagNames[Pos]=__T("BarCode");
+        if (Segment_Tag_SimpleTag_TagNames[Pos]==__T("COMMENT")) Segment_Tag_SimpleTag_TagNames[Pos]=__T("Comment");
+        if (Segment_Tag_SimpleTag_TagNames[Pos]==__T("URL")) Segment_Tag_SimpleTag_TagNames[Pos]=__T("Url");
+    }
+
+    Ztring TagName;
+    for (size_t Pos=0; Pos<Segment_Tag_SimpleTag_TagNames.size(); Pos++)
+    {
+        TagName+=Segment_Tag_SimpleTag_TagNames[Pos];
+        if (Pos+1<Segment_Tag_SimpleTag_TagNames.size())
+            TagName+=__T('/');
+    }
+
+    StreamKind_Last=Stream_General;
+    StreamPos_Last=0;
+    if (Segment_Tag_TrackUID!=(int64u)-1 && Segment_Tag_TrackUID!=0)//0: Specs say this is for all tracks, but I prefer to wait for a sample in order to see how it is used in the reality
+    {
+        Ztring ID=Ztring::ToZtring(Segment_Tag_TrackUID);
+        for (size_t StreamKind=Stream_General+1; StreamKind<Stream_Max; StreamKind++)
+            for (size_t StreamPos=0; StreamPos<Count_Get((stream_t)StreamKind); StreamPos++)
+                if (Retrieve((stream_t)StreamKind, StreamPos, General_ID)==ID)
+                {
+                    StreamKind_Last=(stream_t)StreamKind;
+                    StreamPos_Last=StreamPos;
+                }
+    }
+
+    Fill(StreamKind_Last, StreamPos_Last, TagName.To_Local().c_str(), TagString, true);
 }
 
 //---------------------------------------------------------------------------
@@ -1939,6 +2200,9 @@
 void File_Mk::Segment_Tags_Tag_Targets_TrackUID()
 {
     Element_Name("TrackUID");
+
+    //Parsing
+    Segment_Tag_TrackUID=UInteger_Get();
 }
 
 //---------------------------------------------------------------------------
@@ -1960,13 +2224,17 @@
     InfoCodecID_Format_Type=InfoCodecID_Format_Matroska;
     TrackType=(int64u)-1;
     TrackNumber=(int64u)-1;
-    TrackDefaultDuration=0;
     TrackVideoDisplayWidth=0;
     TrackVideoDisplayHeight=0;
     AvgBytesPerSec=0;
 
     //Preparing
     Stream_Prepare(Stream_Max);
+
+    //Default values
+    Fill_Flush();
+    Fill(StreamKind_Last, StreamPos_Last, "Language", "eng");
+    Fill(StreamKind_Last, StreamPos_Last, "StreamOrder", Stream.size());
 }
 
 //---------------------------------------------------------------------------
@@ -1993,7 +2261,7 @@
     int64u UInteger=UInteger_Get();
 
     FILLING_BEGIN();
-        Fill(StreamKind_Last, StreamPos_Last, "Resolution", UInteger, 10, true);
+        Fill(StreamKind_Last, StreamPos_Last, "BitDepth", UInteger, 10, true);
     FILLING_END();
 }
 
@@ -2033,6 +2301,8 @@
 
     FILLING_BEGIN();
         Fill(Stream_Audio, StreamPos_Last, Audio_SamplingRate, Float, 0, true);
+        if (Retrieve(Stream_Audio, StreamPos_Last, Audio_CodecID).find(__T("A_AAC/"))==0)
+            ((File_Aac*)Stream[TrackNumber].Parser)->AudioSpecificConfig_OutOfBand((int32u)float64_int64s(Float));
     FILLING_END();
 }
 
@@ -2052,7 +2322,7 @@
 
     //Parsing
     Ztring Data;
-    Get_Local(Element_Size, Data,                               "Data"); Element_Info(Data);
+    Get_Local(Element_Size, Data,                               "Data"); Element_Info1(Data);
 
     FILLING_BEGIN();
         CodecID=Data;
@@ -2062,13 +2332,23 @@
 }
 
 //---------------------------------------------------------------------------
+void File_Mk::Segment_Tracks_TrackEntry_ContentEncodings_ContentEncoding_Compression()
+{
+    FILLING_BEGIN();
+        Stream[TrackNumber].ContentCompAlgo=0; //0 is default
+        Fill(StreamKind_Last, StreamPos_Last, "MuxingMode", Mk_ContentCompAlgo(0), Unlimited, true, true);
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
 void File_Mk::Segment_Tracks_TrackEntry_ContentEncodings_ContentEncoding_Compression_ContentCompAlgo()
 {
     //Parsing
-    int64u Algo=UInteger_Get(); Param_Info(Mk_ContentCompAlgo(Algo));
+    int64u Algo=UInteger_Get(); Param_Info1(Mk_ContentCompAlgo(Algo));
 
     FILLING_BEGIN();
         Stream[TrackNumber].ContentCompAlgo=Algo;
+        Fill(StreamKind_Last, StreamPos_Last, "MuxingMode", Mk_ContentCompAlgo(Algo), Unlimited, true, true);
     FILLING_END();
 }
 
@@ -2113,9 +2393,9 @@
             return;
         }
 
-        if (Stream[TrackNumber].StreamKind==Stream_Audio && Retrieve(Stream_Audio, Stream[TrackNumber].StreamPos, Audio_CodecID)==_T("A_MS/ACM"))
+        if (Stream[TrackNumber].StreamKind==Stream_Audio && Retrieve(Stream_Audio, Stream[TrackNumber].StreamPos, Audio_CodecID)==__T("A_MS/ACM"))
             Segment_Tracks_TrackEntry_CodecPrivate_auds();
-        else if (Stream[TrackNumber].StreamKind==Stream_Video && Retrieve(Stream_Video, Stream[TrackNumber].StreamPos, Video_CodecID)==_T("V_MS/VFW/FOURCC"))
+        else if (Stream[TrackNumber].StreamKind==Stream_Video && Retrieve(Stream_Video, Stream[TrackNumber].StreamPos, Video_CodecID)==__T("V_MS/VFW/FOURCC"))
             Segment_Tracks_TrackEntry_CodecPrivate_vids();
         else if (Element_Size>0)
             Skip_XX(Element_Size,                 "Unknown");
@@ -2139,7 +2419,7 @@
 //--------------------------------------------------------------------------
 void File_Mk::Segment_Tracks_TrackEntry_CodecPrivate_auds()
 {
-    Element_Info("Copy of auds");
+    Element_Info1("Copy of auds");
 
     //Parsing
     int32u SamplesPerSec;
@@ -2162,7 +2442,7 @@
         Fill(Stream_Audio, StreamPos_Last, Audio_SamplingRate, SamplesPerSec, 10, true);
         Fill(Stream_Audio, StreamPos_Last, Audio_BitRate, AvgBytesPerSec*8, 10, true);
         if (BitsPerSample)
-            Fill(Stream_Audio, StreamPos_Last, Audio_Resolution, BitsPerSample);
+            Fill(Stream_Audio, StreamPos_Last, Audio_BitDepth, BitsPerSample);
 
         CodecID_Manage();
         if (TrackNumber!=(int64u)-1)
@@ -2204,9 +2484,8 @@
             Fill(Stream_Audio, StreamPos_Last, Audio_Codec, MediaInfoLib::Config.Codec_Get(Ztring().From_Number((int16u)SubFormat.hi, 16)), true);
 
             //Creating the parser
-                 if (0);
             #if defined(MEDIAINFO_PCM_YES)
-            else if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Riff, Ztring().From_Number((int16u)SubFormat.hi, 16))==_T("PCM"))
+            if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Riff, Ztring().From_Number((int16u)SubFormat.hi, 16))==__T("PCM"))
             {
                 //Creating the parser
                 File_Pcm MI;
@@ -2234,7 +2513,7 @@
 //---------------------------------------------------------------------------
 void File_Mk::Segment_Tracks_TrackEntry_CodecPrivate_vids()
 {
-    Element_Info("Copy of vids");
+    Element_Info1("Copy of vids");
 
     //Parsing
     int32u Width, Height, Compression;
@@ -2277,28 +2556,28 @@
             Fill(Stream_Video, StreamPos_Last, Video_Width, Width, 10, true);
             Fill(Stream_Video, StreamPos_Last, Video_Height, Height, 10, true);
             if (Resolution==32 && Compression==0x74736363) //tscc
-                Fill(StreamKind_Last, StreamPos_Last, "Resolution", 8);
+                Fill(StreamKind_Last, StreamPos_Last, "BitDepth", 8);
             else if (Compression==0x44495633) //DIV3
-                Fill(StreamKind_Last, StreamPos_Last, "Resolution", 8);
+                Fill(StreamKind_Last, StreamPos_Last, "BitDepth", 8);
             else if (Compression==0x44585342) //DXSB
-                Fill(StreamKind_Last, StreamPos_Last, "Resolution", Resolution);
-            else if (Resolution>16 && MediaInfoLib::Config.CodecID_Get(StreamKind_Last, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression), InfoCodecID_ColorSpace).find(_T("RGBA"))!=std::string::npos) //RGB codecs
-                Fill(StreamKind_Last, StreamPos_Last, "Resolution", Resolution/4);
+                Fill(StreamKind_Last, StreamPos_Last, "BitDepth", Resolution);
+            else if (Resolution>16 && MediaInfoLib::Config.CodecID_Get(StreamKind_Last, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression), InfoCodecID_ColorSpace).find(__T("RGBA"))!=std::string::npos) //RGB codecs
+                Fill(StreamKind_Last, StreamPos_Last, "BitDepth", Resolution/4);
             else if (Compression==0x00000000 //RGB
-                  || MediaInfoLib::Config.CodecID_Get(StreamKind_Last, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression), InfoCodecID_ColorSpace).find(_T("RGB"))!=std::string::npos) //RGB codecs
+                  || MediaInfoLib::Config.CodecID_Get(StreamKind_Last, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression), InfoCodecID_ColorSpace).find(__T("RGB"))!=std::string::npos) //RGB codecs
             {
                 if (Resolution==32)
                 {
                     Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Format), "RGBA", Unlimited, true, true);
-                    Fill(StreamKind_Last, StreamPos_Last, "Resolution", Resolution/4); //With Alpha
+                    Fill(StreamKind_Last, StreamPos_Last, "BitDepth", Resolution/4); //With Alpha
                 }
                 else
-                    Fill(StreamKind_Last, StreamPos_Last, "Resolution", Resolution<=16?8:(Resolution/3)); //indexed or normal
+                    Fill(StreamKind_Last, StreamPos_Last, "BitDepth", Resolution<=16?8:(Resolution/3)); //indexed or normal
             }
             else if (Compression==0x56503632 //VP62
-                  || MediaInfoLib::Config.CodecID_Get(StreamKind_Last, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression), InfoCodecID_Format)==_T("H.263") //H.263
-                  || MediaInfoLib::Config.CodecID_Get(StreamKind_Last, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression), InfoCodecID_Format)==_T("VC-1")) //VC-1
-                Fill(StreamKind_Last, StreamPos_Last, "Resolution", Resolution/3);
+                  || MediaInfoLib::Config.CodecID_Get(StreamKind_Last, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression), InfoCodecID_Format)==__T("H.263") //H.263
+                  || MediaInfoLib::Config.CodecID_Get(StreamKind_Last, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression), InfoCodecID_Format)==__T("VC-1")) //VC-1
+                Fill(StreamKind_Last, StreamPos_Last, "BitDepth", Resolution/3);
         }
 
         //Creating the parser
@@ -2308,12 +2587,12 @@
 
     if (Data_Remain())
     {
-        Element_Begin("Private data");
+        Element_Begin1("Private data");
         if (Stream[TrackNumber].Parser)
             Open_Buffer_Continue(Stream[TrackNumber].Parser);
         else
             Skip_XX(Data_Remain(),                                  "Unknown");
-        Element_End();
+        Element_End0();
     }
 }
 
@@ -2326,15 +2605,7 @@
     int64u UInteger=UInteger_Get();
 
     FILLING_BEGIN();
-        TrackDefaultDuration=UInteger;
-        //FrameRate
-        if (TrackDefaultDuration && StreamKind_Last==Stream_Video)
-        {
-            float64 FrameRate=1000000000.0/TrackDefaultDuration;
-            if (FrameRate>=23.975 && FrameRate<=23.977)
-                FrameRate=23.976; //One example was seen with 23.975
-            Fill(Stream_Video, StreamPos_Last, Video_FrameRate, FrameRate, 3, true);
-        }
+        Stream[TrackNumber].TrackDefaultDuration=UInteger;
     FILLING_END();
 }
 
@@ -2344,7 +2615,11 @@
     Element_Name("FlagDefault");
 
     //Parsing
-    UInteger_Info();
+    int64u UInteger=UInteger_Get();
+
+    FILLING_BEGIN();
+        Stream[TrackNumber].Default=UInteger?true:false;
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -2362,7 +2637,11 @@
     Element_Name("FlagForced");
 
     //Parsing
-    UInteger_Info();
+    int64u UInteger=UInteger_Get();
+
+    FILLING_BEGIN();
+        Stream[TrackNumber].Forced=UInteger?true:false;
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -2381,10 +2660,10 @@
 
     //Parsing
     Ztring Data;
-    Get_Local(Element_Size, Data,                               "Data"); Element_Info(Data);
+    Get_Local(Element_Size, Data,                               "Data"); Element_Info1(Data);
 
     FILLING_BEGIN();
-        Fill(StreamKind_Last, StreamPos_Last, "Language", Data);
+        Fill(StreamKind_Last, StreamPos_Last, "Language", Data, true);
     FILLING_END();
 }
 
@@ -2422,7 +2701,7 @@
 
     //Parsing
     Ztring Data;
-    Get_UTF8(Element_Size, Data,                               "Data"); Element_Info(Data);
+    Get_UTF8(Element_Size, Data,                               "Data"); Element_Info1(Data);
 
     FILLING_BEGIN();
         Fill(StreamKind_Last, StreamPos_Last, "Title", Data);
@@ -2477,14 +2756,6 @@
         {
             case 0x01 :
                         Stream_Prepare(Stream_Video);
-                        //FrameRate
-                        if (TrackDefaultDuration)
-                        {
-                            float64 FrameRate=1000000000.0/TrackDefaultDuration;
-                            if (FrameRate>=23.975 && FrameRate<=23.977)
-                                FrameRate=23.976; //One example was seen with 23.975
-                            Fill(Stream_Video, StreamPos_Last, Video_FrameRate, FrameRate, 3, true);
-                        }
                         break;
             case 0x02 :
                         Stream_Prepare(Stream_Audio);
@@ -2599,6 +2870,20 @@
 }
 
 //---------------------------------------------------------------------------
+void File_Mk::Segment_Tracks_TrackEntry_Video_FrameRate()
+{
+    Element_Name("FrameRate");
+
+    //Parsing
+   float64 Value=Float_Get();
+
+    //Filling
+    FILLING_BEGIN();
+        Stream[TrackNumber].FrameRate=Value;
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
 void File_Mk::Segment_Tracks_TrackEntry_Video_PixelCropBottom()
 {
     Element_Name("PixelCropBottom");
@@ -2645,6 +2930,8 @@
     //Filling
     FILLING_BEGIN();
         Fill(Stream_Video, StreamPos_Last, Video_Height, UInteger, 10, true);
+        if (!TrackVideoDisplayHeight)
+            TrackVideoDisplayHeight=UInteger; //Default value of DisplayHeight is PixelHeight
     FILLING_END();
 }
 
@@ -2659,6 +2946,23 @@
     //Filling
     FILLING_BEGIN();
         Fill(Stream_Video, StreamPos_Last, Video_Width, UInteger, 10, true);
+        if (!TrackVideoDisplayWidth)
+            TrackVideoDisplayWidth=UInteger; //Default value of DisplayWidth is PixelWidth
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
+void File_Mk::Segment_Tracks_TrackEntry_Video_StereoMode()
+{
+    Element_Name("StereoMode");
+
+    //Parsing
+    int64u UInteger=UInteger_Get(); Element_Info1(Format_Version==2?Mk_StereoMode_v2(UInteger):Mk_StereoMode(UInteger));
+
+    //Filling
+    FILLING_BEGIN();
+        Fill(Stream_Video, StreamPos_Last, Video_MultiView_Count, 2); //Matroska seems to be limited to 2 views
+        Fill(Stream_Video, StreamPos_Last, Video_MultiView_Layout, Format_Version==2?Mk_StereoMode_v2(UInteger):Mk_StereoMode(UInteger));
     FILLING_END();
 }
 
@@ -2712,47 +3016,47 @@
     {
         case 1 :
                 {
-                    Info_B1(Data,                               "Data"); Element_Info(Data);
+                    Info_B1(Data,                               "Data"); Element_Info1(Data);
                     return;
                 }
         case 2 :
                 {
-                    Info_B2(Data,                               "Data"); Element_Info(Data);
+                    Info_B2(Data,                               "Data"); Element_Info1(Data);
                     return;
                 }
         case 3 :
                 {
-                    Info_B3(Data,                               "Data"); Element_Info(Data);
+                    Info_B3(Data,                               "Data"); Element_Info1(Data);
                     return;
                 }
         case 4 :
                 {
-                    Info_B4(Data,                               "Data"); Element_Info(Data);
+                    Info_B4(Data,                               "Data"); Element_Info1(Data);
                     return;
                 }
         case 5 :
                 {
-                    Info_B5(Data,                               "Data"); Element_Info(Data);
+                    Info_B5(Data,                               "Data"); Element_Info1(Data);
                     return;
                 }
         case 6 :
                 {
-                    Info_B6(Data,                               "Data"); Element_Info(Data);
+                    Info_B6(Data,                               "Data"); Element_Info1(Data);
                     return;
                 }
         case 7 :
                 {
-                    Info_B7(Data,                               "Data"); Element_Info(Data);
+                    Info_B7(Data,                               "Data"); Element_Info1(Data);
                     return;
                 }
         case 8 :
                 {
-                    Info_B8(Data,                               "Data"); Element_Info(Data);
+                    Info_B8(Data,                               "Data"); Element_Info1(Data);
                     return;
                 }
         case 16:
                 {
-                    Info_B16(Data,                              "Data"); Element_Info(Data);
+                    Info_B16(Data,                              "Data"); Element_Info1(Data);
                     return;
                 }
         default : Skip_XX(Element_Size,                         "Data");
@@ -2767,49 +3071,113 @@
         case 1 :
                 {
                     int8u Data;
-                    Get_B1 (Data,                               "Data"); Element_Info(Data);
+                    Get_B1 (Data,                               "Data"); Element_Info1(Data);
                     return Data;
                 }
         case 2 :
                 {
                     int16u Data;
-                    Get_B2 (Data,                               "Data"); Element_Info(Data);
+                    Get_B2 (Data,                               "Data"); Element_Info1(Data);
                     return Data;
                 }
         case 3 :
                 {
                     int32u Data;
-                    Get_B3 (Data,                               "Data"); Element_Info(Data);
+                    Get_B3 (Data,                               "Data"); Element_Info1(Data);
                     return Data;
                 }
         case 4 :
                 {
                     int32u Data;
-                    Get_B4 (Data,                               "Data"); Element_Info(Data);
+                    Get_B4 (Data,                               "Data"); Element_Info1(Data);
                     return Data;
                 }
         case 5 :
                 {
                     int64u Data;
-                    Get_B5 (Data,                               "Data"); Element_Info(Data);
+                    Get_B5 (Data,                               "Data"); Element_Info1(Data);
                     return Data;
                 }
         case 6 :
                 {
                     int64u Data;
-                    Get_B6 (Data,                               "Data"); Element_Info(Data);
+                    Get_B6 (Data,                               "Data"); Element_Info1(Data);
                     return Data;
                 }
         case 7 :
                 {
                     int64u Data;
-                    Get_B7 (Data,                               "Data"); Element_Info(Data);
+                    Get_B7 (Data,                               "Data"); Element_Info1(Data);
                     return Data;
                 }
         case 8 :
                 {
                     int64u Data;
-                    Get_B8 (Data,                               "Data"); Element_Info(Data);
+                    Get_B8 (Data,                               "Data"); Element_Info1(Data);
+                    return Data;
+                }
+        default :   Skip_XX(Element_Size,                       "Data");
+                    return 0;
+    }
+}
+
+//---------------------------------------------------------------------------
+int128u File_Mk::UInteger16_Get()
+{
+    switch (Element_Size)
+    {
+        case 1 :
+                {
+                    int8u Data;
+                    Get_B1 (Data,                               "Data"); Element_Info1(Data);
+                    return Data;
+                }
+        case 2 :
+                {
+                    int16u Data;
+                    Get_B2 (Data,                               "Data"); Element_Info1(Data);
+                    return Data;
+                }
+        case 3 :
+                {
+                    int32u Data;
+                    Get_B3 (Data,                               "Data"); Element_Info1(Data);
+                    return Data;
+                }
+        case 4 :
+                {
+                    int32u Data;
+                    Get_B4 (Data,                               "Data"); Element_Info1(Data);
+                    return Data;
+                }
+        case 5 :
+                {
+                    int64u Data;
+                    Get_B5 (Data,                               "Data"); Element_Info1(Data);
+                    return Data;
+                }
+        case 6 :
+                {
+                    int64u Data;
+                    Get_B6 (Data,                               "Data"); Element_Info1(Data);
+                    return Data;
+                }
+        case 7 :
+                {
+                    int64u Data;
+                    Get_B7 (Data,                               "Data"); Element_Info1(Data);
+                    return Data;
+                }
+        case 8 :
+                {
+                    int64u Data;
+                    Get_B8 (Data,                               "Data"); Element_Info1(Data);
+                    return Data;
+                }
+        case 16:
+                {
+                    int128u Data;
+                    Get_B16(Data,                               "Data"); Element_Info1(Data);
                     return Data;
                 }
         default :   Skip_XX(Element_Size,                       "Data");
@@ -2825,13 +3193,13 @@
         case 4 :
                 {
                     float32 Data;
-                    Get_BF4(Data,                               "Data"); Element_Info(Data);
+                    Get_BF4(Data,                               "Data"); Element_Info1(Data);
                     return Data;
                 }
         case 8 :
                 {
                     float64 Data;
-                    Get_BF8(Data,                               "Data"); Element_Info(Data);
+                    Get_BF8(Data,                               "Data"); Element_Info1(Data);
                     return Data;
                 }
         default :   Skip_XX(Element_Size,                       "Data");
@@ -2846,12 +3214,12 @@
     {
         case 4 :
                 {
-                    Info_BF4(Data,                              "Data"); Element_Info(Data);
+                    Info_BF4(Data,                              "Data"); Element_Info1(Data);
                     return;
                 }
         case 8 :
                 {
-                    Info_BF8(Data,                              "Data"); Element_Info(Data);
+                    Info_BF8(Data,                              "Data"); Element_Info1(Data);
                     return;
                 }
         default :   Skip_XX(Element_Size,                       "Data");
@@ -2863,28 +3231,28 @@
 Ztring File_Mk::UTF8_Get()
 {
     Ztring Data;
-    Get_UTF8(Element_Size, Data,                                "Data"); Element_Info(Data);
+    Get_UTF8(Element_Size, Data,                                "Data"); Element_Info1(Data);
     return Data;
 }
 
 //---------------------------------------------------------------------------
 void File_Mk::UTF8_Info()
 {
-    Info_UTF8(Element_Size, Data,                               "Data"); Element_Info(Data);
+    Info_UTF8(Element_Size, Data,                               "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
 Ztring File_Mk::Local_Get()
 {
     Ztring Data;
-    Get_Local(Element_Size, Data,                               "Data"); Element_Info(Data);
+    Get_Local(Element_Size, Data,                               "Data"); Element_Info1(Data);
     return Data;
 }
 
 //---------------------------------------------------------------------------
 void File_Mk::Local_Info()
 {
-    Info_Local(Element_Size, Data,                              "Data"); Element_Info(Data);
+    Info_Local(Element_Size, Data,                              "Data"); Element_Info1(Data);
 }
 
 //***************************************************************************
@@ -2907,7 +3275,7 @@
     const Ztring &Format=MediaInfoLib::Config.CodecID_Get(StreamKind_Last, InfoCodecID_Format_Type, CodecID, InfoCodecID_Format);
          if (0);
     #if defined(MEDIAINFO_MPEG4V_YES)
-    else if (Format==_T("MPEG-4 Visual"))
+    else if (Format==__T("MPEG-4 Visual"))
     {
         Stream[TrackNumber].Parser=new File_Mpeg4v;
         ((File_Mpeg4v*)Stream[TrackNumber].Parser)->FrameIsAlwaysComplete=true;
@@ -2915,7 +3283,7 @@
     }
     #endif
     #if defined(MEDIAINFO_AVC_YES)
-    else if (Format==_T("AVC"))
+    else if (Format==__T("AVC"))
     {
         Stream[TrackNumber].Parser=new File_Avc;
         ((File_Avc*)Stream[TrackNumber].Parser)->FrameIsAlwaysComplete=true;
@@ -2928,7 +3296,7 @@
     }
     #endif
     #if defined(MEDIAINFO_VC1_YES)
-    else if (Format==_T("VC-1"))
+    else if (Format==__T("VC-1"))
     {
         Stream[TrackNumber].Parser=new File_Vc1;
         ((File_Vc1*)Stream[TrackNumber].Parser)->FrameIsAlwaysComplete=true;
@@ -2936,22 +3304,28 @@
     }
     #endif
     #if defined(MEDIAINFO_DIRAC_YES)
-    else if (Format==_T("Dirac"))
+    else if (Format==__T("Dirac"))
     {
         Stream[TrackNumber].Parser=new File_Dirac;
         ((File_Dirac*)Stream[TrackNumber].Parser)->Frame_Count_Valid=1;
     }
     #endif
     #if defined(MEDIAINFO_MPEGV_YES)
-    else if (Format==_T("MPEG Video"))
+    else if (Format==__T("MPEG Video"))
     {
         Stream[TrackNumber].Parser=new File_Mpegv;
         ((File_Mpegv*)Stream[TrackNumber].Parser)->FrameIsAlwaysComplete=true;
         ((File_Mpegv*)Stream[TrackNumber].Parser)->Frame_Count_Valid=1;
     }
     #endif
+    #if defined(MEDIAINFO_VP8_YES)
+    else if (Format==__T("VP8"))
+    {
+        Stream[TrackNumber].Parser=new File_Vp8;
+    }
+    #endif
     #if defined(MEDIAINFO_OGG_YES)
-    else if (Format==_T("Theora")  || Format==_T("Vorbis"))
+    else if (Format==__T("Theora")  || Format==__T("Vorbis"))
     {
         Stream[TrackNumber].Parser=new File_Ogg;
         Stream[TrackNumber].Parser->MustSynchronize=false;
@@ -2959,79 +3333,112 @@
     }
     #endif
     #if defined(MEDIAINFO_RM_YES)
-    else if (CodecID.find(_T("V_REAL/"))==0)
+    else if (CodecID.find(__T("V_REAL/"))==0)
     {
         Stream[TrackNumber].Parser=new File_Rm;
         ((File_Rm*)Stream[TrackNumber].Parser)->FromMKV_StreamType=Stream_Video;
     }
     #endif
     #if defined(MEDIAINFO_AC3_YES)
-    else if (Format==_T("AC-3") || Format==_T("E-AC-3") || Format==_T("TrueHD"))
+    else if (Format==__T("AC-3") || Format==__T("E-AC-3") || Format==__T("TrueHD"))
     {
         Stream[TrackNumber].Parser=new File_Ac3;
         ((File_Ac3*)Stream[TrackNumber].Parser)->Frame_Count_Valid=2;
     }
     #endif
     #if defined(MEDIAINFO_DTS_YES)
-    else if (Format==_T("DTS"))
+    else if (Format==__T("DTS"))
     {
         Stream[TrackNumber].Parser=new File_Dts;
         ((File_Dts*)Stream[TrackNumber].Parser)->Frame_Count_Valid=2;
     }
     #endif
-    #if defined(MEDIAINFO_MPEG4_YES)
-    else if (CodecID==(_T("A_AAC")))
+    #if defined(MEDIAINFO_AAC_YES)
+    else if (CodecID==(__T("A_AAC")))
     {
-        Stream[TrackNumber].Parser=new File_Mpeg4_AudioSpecificConfig;
+        Stream[TrackNumber].Parser=new File_Aac;
+        ((File_Aac*)Stream[TrackNumber].Parser)->Mode=File_Aac::Mode_AudioSpecificConfig;
     }
     #endif
     #if defined(MEDIAINFO_AAC_YES)
-    else if (CodecID.find(_T("A_AAC/"))==0)
+    else if (CodecID.find(__T("A_AAC/"))==0)
     {
+        Ztring Profile;
+        int8u audioObjectType=0, Version=0, SBR=2, PS=2;
+             if (CodecID==__T("A_AAC/MPEG2/MAIN"))     {Version=2; Profile=__T("Main");                   audioObjectType=1;}
+        else if (CodecID==__T("A_AAC/MPEG2/LC"))       {Version=2; Profile=__T("LC");                     audioObjectType=2; SBR=0;}
+        else if (CodecID==__T("A_AAC/MPEG2/LC/SBR"))   {Version=2; Profile=__T("HE-AAC / LC");            audioObjectType=2; SBR=1;}
+        else if (CodecID==__T("A_AAC/MPEG2/SSR"))      {Version=2; Profile=__T("SSR");                    audioObjectType=3;}
+        else if (CodecID==__T("A_AAC/MPEG4/MAIN"))     {Version=4; Profile=__T("Main");                   audioObjectType=1;}
+        else if (CodecID==__T("A_AAC/MPEG4/LC"))       {Version=4; Profile=__T("LC");                     audioObjectType=2; SBR=0;}
+        else if (CodecID==__T("A_AAC/MPEG4/LC/SBR"))   {Version=4; Profile=__T("HE-AAC / LC");            audioObjectType=2; SBR=1; PS=0;}
+        else if (CodecID==__T("A_AAC/MPEG4/LC/SBR/PS")){Version=4; Profile=__T("HE-AACv2 / HE-AAC / LC"); audioObjectType=2; SBR=1; PS=1;}
+        else if (CodecID==__T("A_AAC/MPEG4/SSR"))      {Version=4; Profile=__T("SSR");                    audioObjectType=3;}
+        else if (CodecID==__T("A_AAC/MPEG4/LTP"))      {Version=4; Profile=__T("LTP");                    audioObjectType=4;}
+        else if (CodecID==__T("raac"))                 {           Profile=__T("LC");                     audioObjectType=2;}
+        else if (CodecID==__T("racp"))                 {           Profile=__T("HE-AAC / LC");            audioObjectType=2; SBR=1; PS=0;}
+
+        if (Version>0)
+            Fill(Stream_Audio, StreamPos_Last, Audio_Format_Version, Version==2?"Version 2":"Version 4");
+        Fill(Stream_Audio, StreamPos_Last, Audio_Format_Profile, Profile);
+        if (SBR!=2)
+            Fill(Stream_Audio, StreamPos_Last, Audio_Format_Settings_SBR, SBR?"Yes":"No");
+        if (PS!=2)
+            Fill(Stream_Audio, StreamPos_Last, Audio_Format_Settings_PS, PS?"Yes":"No");
+        int32u sampling_frequency=Retrieve(Stream_Audio, StreamPos_Last, Audio_SamplingRate).To_int32u();
+
         Stream[TrackNumber].Parser=new File_Aac;
-        ((File_Aac*)Stream[TrackNumber].Parser)->Codec=CodecID;
+        ((File_Aac*)Stream[TrackNumber].Parser)->Mode=File_Aac::Mode_AudioSpecificConfig;
+        ((File_Aac*)Stream[TrackNumber].Parser)->AudioSpecificConfig_OutOfBand(sampling_frequency, audioObjectType, SBR==1?true:false, PS==1?true:false, SBR==1?true:false, PS==1?true:false);
     }
     #endif
-    #if defined(MEDIAINFO_ADTS_YES)
-    else if (Format==(_T("AAC")))
+    #if defined(MEDIAINFO_AAC_YES)
+    else if (Format==(__T("AAC")))
     {
-        Stream[TrackNumber].Parser=new File_Adts;
+        Stream[TrackNumber].Parser=new File_Aac;
+        ((File_Aac*)Stream[TrackNumber].Parser)->Mode=File_Aac::Mode_ADTS;
     }
     #endif
     #if defined(MEDIAINFO_MPEGA_YES)
-    else if (Format==_T("MPEG Audio"))
+    else if (Format==__T("MPEG Audio"))
     {
         Stream[TrackNumber].Parser=new File_Mpega;
     }
     #endif
     #if defined(MEDIAINFO_FLAC_YES)
-    else if (Format==_T("Flac"))
+    else if (Format==__T("Flac"))
     {
         Stream[TrackNumber].Parser=new File_Flac;
     }
     #endif
+    #if defined(MEDIAINFO_OPUS_YES)
+    else if (CodecID.find(__T("A_OPUS"))==0) //http://wiki.xiph.org/MatroskaOpus
+    {
+        Stream[TrackNumber].Parser=new File_Opus;
+    }
+    #endif
     #if defined(MEDIAINFO_WVPK_YES)
-    else if (Format==_T("WavPack"))
+    else if (Format==__T("WavPack"))
     {
         Stream[TrackNumber].Parser=new File_Wvpk;
         ((File_Wvpk*)Stream[TrackNumber].Parser)->FromMKV=true;
     }
     #endif
     #if defined(MEDIAINFO_TTA_YES)
-    else if (Format==_T("TTA"))
+    else if (Format==__T("TTA"))
     {
         //Stream[TrackNumber].Parser=new File_Tta; //Parser is not needed, because header is useless and dropped (the parser analyses only the header)
     }
     #endif
     #if defined(MEDIAINFO_PCM_YES)
-    else if (Format==_T("PCM"))
+    else if (Format==__T("PCM"))
     {
         Stream[TrackNumber].Parser=new File_Pcm;
         ((File_Pcm*)Stream[TrackNumber].Parser)->Codec=CodecID;
     }
     #endif
     #if defined(MEDIAINFO_RM_YES)
-    else if (CodecID.find(_T("A_REAL/"))==0)
+    else if (CodecID.find(__T("A_REAL/"))==0)
     {
         Stream[TrackNumber].Parser=new File_Rm;
         ((File_Rm*)Stream[TrackNumber].Parser)->FromMKV_StreamType=Stream_Audio;

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Mk.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Mk.h Changed

@@ -1,24 +1,24 @@
 // File_Mk - Info for Matroska Video/Audio files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //
 // Information about Matroska files
-// 
+//
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
@@ -180,7 +180,7 @@
     void Segment_Tracks_TrackEntry_ContentEncodings_ContentEncoding_Order() {UInteger_Info();};
     void Segment_Tracks_TrackEntry_ContentEncodings_ContentEncoding_Scope() {UInteger_Info();};
     void Segment_Tracks_TrackEntry_ContentEncodings_ContentEncoding_Type() {UInteger_Info();};
-    void Segment_Tracks_TrackEntry_ContentEncodings_ContentEncoding_Compression() {};
+    void Segment_Tracks_TrackEntry_ContentEncodings_ContentEncoding_Compression();
     void Segment_Tracks_TrackEntry_ContentEncodings_ContentEncoding_Compression_ContentCompAlgo();
     void Segment_Tracks_TrackEntry_ContentEncodings_ContentEncoding_Compression_ContentCompSettings();
     void Segment_Tracks_TrackEntry_ContentEncodings_ContentEncoding_Encryption() {};
@@ -216,12 +216,15 @@
     void Segment_Tracks_TrackEntry_Video_DisplayUnit();
     void Segment_Tracks_TrackEntry_Video_DisplayWidth();
     void Segment_Tracks_TrackEntry_Video_FlagInterlaced();
+    void Segment_Tracks_TrackEntry_Video_FrameRate();
     void Segment_Tracks_TrackEntry_Video_PixelCropBottom();
     void Segment_Tracks_TrackEntry_Video_PixelCropLeft();
     void Segment_Tracks_TrackEntry_Video_PixelCropRight();
     void Segment_Tracks_TrackEntry_Video_PixelCropTop();
     void Segment_Tracks_TrackEntry_Video_PixelHeight();
     void Segment_Tracks_TrackEntry_Video_PixelWidth();
+    void Segment_Tracks_TrackEntry_Video_StereoMode();
+    void Segment_Tracks_TrackEntry_Video_StereoModeBuggy() {Segment_Tracks_TrackEntry_Video_StereoMode();}
     void Segment_Tracks_TrackEntry_TrackOverlay();
     void Segment_Tracks_TrackEntry_TrackTranslate();
     void Segment_Tracks_TrackEntry_TrackTranslate_Codec();
@@ -238,12 +241,18 @@
         size_t                  PacketCount;
         int32u                  AvgBytesPerSec; //Only used by x_MS/* codecIDs
         float32                 DisplayAspectRatio;
+        float64                 FrameRate;
         bool                    Searching_Payload;
         bool                    Searching_TimeStamps;
         bool                    Searching_TimeStamp_Start;
+        bool                    Default;
+        bool                    Forced;
         int64u                  ContentCompAlgo;
         size_t                  ContentCompSettings_Buffer_Size;
         int8u*                  ContentCompSettings_Buffer;
+        std::map<std::string, Ztring> Infos;
+        int64u                  TrackDefaultDuration;
+        std::map<int64u, int64u> Segment_Cluster_BlockGroup_BlockDuration_Counts;
 
         stream()
         {
@@ -254,12 +263,16 @@
             PacketCount=0;
             AvgBytesPerSec=0;
             DisplayAspectRatio=0;
+            FrameRate=0;
             Searching_Payload=false;
             Searching_TimeStamps=false;
             Searching_TimeStamp_Start=false;
+            Default=true;
+            Forced=false;
             ContentCompAlgo=(int32u)-1;
             ContentCompSettings_Buffer_Size=0;
             ContentCompSettings_Buffer=NULL;
+            TrackDefaultDuration=0;
         }
 
         ~stream()
@@ -273,6 +286,7 @@
 
     //Data
     int64u   UInteger_Get();
+    int128u  UInteger16_Get();
     void     UInteger_Info();
 
     float64  Float_Get();
@@ -295,10 +309,10 @@
 
     //Temp
     std::vector<Ztring> AttachedFiles;
+    int64u  Format_Version;
     int64u  TimecodeScale;
     float64 Duration;
     int64u  TrackNumber;
-    int64u  TrackDefaultDuration;
     int64u  TrackVideoDisplayWidth;
     int64u  TrackVideoDisplayHeight;
     int32u  AvgBytesPerSec;
@@ -329,6 +343,13 @@
     size_t EditionEntries_Pos;
     size_t ChapterAtoms_Pos;
     size_t ChapterDisplays_Pos;
+    int64u              Segment_Offset_Begin;
+    int64u              Segment_Offset_End;
+    std::vector<int64u> Segment_Seeks;
+    int64u              Segment_Tag_TrackUID;
+    std::vector<Ztring> Segment_Tag_SimpleTag_TagNames;
+    int64u Segment_Cluster_BlockGroup_BlockDuration_Value;
+    int64u Segment_Cluster_BlockGroup_BlockDuration_TrackNumber;
 };
 
 } //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Mpeg4.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Mpeg4.cpp Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Mpeg4.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Mpeg4.h Changed

@@ -1,17 +1,17 @@
 // File_Mpeg4 - Info for MPEG-4 files
-// Copyright (C) 2004-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2004-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -24,6 +24,7 @@
 
 //---------------------------------------------------------------------------
 #include "MediaInfo/File__Analyze.h"
+#include "MediaInfo/MediaInfo_Internal.h"
 #include <map>
 class File_MpegPs;
 //---------------------------------------------------------------------------
@@ -31,6 +32,8 @@
 namespace MediaInfoLib
 {
 
+class File__ReferenceFilesHelper;
+
 //***************************************************************************
 // Class File_Mpeg4
 //***************************************************************************
@@ -39,12 +42,21 @@
 {
 protected :
     //Streams management
+    void Streams_Accept();
     void Streams_Finish();
+    void Streams_Finish_CommercialNames ();
 
 public :
     File_Mpeg4();
+    ~File_Mpeg4();
 
 private :
+    //Buffer - Global
+    void Read_Buffer_Unsynched();
+    #if MEDIAINFO_SEEK
+    size_t Read_Buffer_Seek (size_t Method, int64u Value, int64u ID);
+    #endif //MEDIAINFO_SEEK
+
     //Buffer
     bool Header_Begin();
     void Header_Parse();
@@ -52,6 +64,8 @@
     bool BookMark_Needed();
 
     //Elements
+    void cdat();
+    void cdt2() {cdat();}
     void free();
     void ftyp();
     void idat();
@@ -62,7 +76,6 @@
     void jp2h_colr();
     void mdat();
     void mdat_xxxx();
-    void mdat_StreamClear();
     void mdat_StreamJump();
     void mfra();
     void mfra_mfro();
@@ -109,6 +122,9 @@
     void moov_trak_mdia_imap_sean___in_obid();
     void moov_trak_mdia_mdhd();
     void moov_trak_mdia_minf();
+    void moov_trak_mdia_minf_code();
+    void moov_trak_mdia_minf_code_sean();
+    void moov_trak_mdia_minf_code_sean_RU_A();
     void moov_trak_mdia_minf_dinf();
     void moov_trak_mdia_minf_dinf_url_();
     void moov_trak_mdia_minf_dinf_urn_();
@@ -142,6 +158,8 @@
     void moov_trak_mdia_minf_stbl_stsd_tx3g_ftab();
     void moov_trak_mdia_minf_stbl_stsd_xxxx();
     void moov_trak_mdia_minf_stbl_stsd_xxxxSound();
+    void moov_trak_mdia_minf_stbl_stsd_xxxxStream();
+    void moov_trak_mdia_minf_stbl_stsd_xxxxText();
     void moov_trak_mdia_minf_stbl_stsd_xxxxVideo();
     void moov_trak_mdia_minf_stbl_stsd_xxxx_avcC();
     void moov_trak_mdia_minf_stbl_stsd_xxxx_alac();
@@ -153,10 +171,21 @@
     void moov_trak_mdia_minf_stbl_stsd_xxxx_d263();
     void moov_trak_mdia_minf_stbl_stsd_xxxx_dac3();
     void moov_trak_mdia_minf_stbl_stsd_xxxx_dec3();
+    void moov_trak_mdia_minf_stbl_stsd_xxxx_ddts();
     void moov_trak_mdia_minf_stbl_stsd_xxxx_damr();
     void moov_trak_mdia_minf_stbl_stsd_xxxx_esds();
+    void moov_trak_mdia_minf_stbl_stsd_xxxx_fiel();
+    void moov_trak_mdia_minf_stbl_stsd_xxxx_glbl();
     void moov_trak_mdia_minf_stbl_stsd_xxxx_idfm();
+    void moov_trak_mdia_minf_stbl_stsd_xxxx_jp2h() {jp2h();}
+    void moov_trak_mdia_minf_stbl_stsd_xxxx_jp2h_colr() {jp2h_colr();}
+    void moov_trak_mdia_minf_stbl_stsd_xxxx_jp2h_ihdr() {jp2h_ihdr();}
     void moov_trak_mdia_minf_stbl_stsd_xxxx_pasp();
+    void moov_trak_mdia_minf_stbl_stsd_xxxx_sinf();
+    void moov_trak_mdia_minf_stbl_stsd_xxxx_sinf_frma();
+    void moov_trak_mdia_minf_stbl_stsd_xxxx_sinf_imif();
+    void moov_trak_mdia_minf_stbl_stsd_xxxx_sinf_schm();
+    void moov_trak_mdia_minf_stbl_stsd_xxxx_sinf_schi();
     void moov_trak_mdia_minf_stbl_stsd_xxxx_wave();
     void moov_trak_mdia_minf_stbl_stsd_xxxx_wave_acbf();
     void moov_trak_mdia_minf_stbl_stsd_xxxx_wave_enda();
@@ -168,6 +197,19 @@
     void moov_trak_mdia_minf_stbl_stss();
     void moov_trak_mdia_minf_stbl_stsz();
     void moov_trak_mdia_minf_stbl_stts();
+    void moov_trak_mdia_minf_stbl_stts_Common(int32u SampleCount, int32u SampleDuration, int32u Pos=0, int32u NumberOfEntries=1);
+    void moov_trak_mdia_minf_stbl_stz2() {moov_trak_mdia_minf_stbl_stsz();}
+    void moov_trak_meta() {moov_meta();}
+    void moov_trak_meta_hdlr() {moov_meta_hdlr();}
+    void moov_trak_meta_bxml() {moov_meta_bxml();}
+    void moov_trak_meta_keys() {moov_meta_keys();}
+    void moov_trak_meta_keys_mdta() {moov_meta_keys_mdta();}
+    void moov_trak_meta_ilst() {moov_meta_ilst();}
+    void moov_trak_meta_ilst_xxxx() {moov_meta_ilst_xxxx();}
+    void moov_trak_meta_ilst_xxxx_data() {moov_meta_ilst_xxxx_data();}
+    void moov_trak_meta_ilst_xxxx_mean() {moov_meta_ilst_xxxx_mean();}
+    void moov_trak_meta_ilst_xxxx_name() {moov_meta_ilst_xxxx_name();}
+    void moov_trak_meta_xml() {moov_meta_xml();}
     void moov_trak_tapt();
     void moov_trak_tapt_clef();
     void moov_trak_tapt_prof();
@@ -226,6 +268,14 @@
     void PICT();
     void pckg();
     void pnot();
+    void RDAO();
+    void RDAS();
+    void RDVO();
+    void RDVS();
+    void RED1();
+    void REDA();
+    void REDV();
+    void REOB();
     void skip();
     void wide();
 
@@ -246,16 +296,15 @@
     method Metadata_Get(std::string &Parameter, int64u Meta);
     method Metadata_Get(std::string &Parameter, const std::string &Meta);
     void Descriptors();
+    void TimeCode_Associate(int32u TrackID);
 
     //Temp
     bool List;
     bool                                    mdat_MustParse;
-    bool                                    moov_Done;
     int32u                                  moov_cmov_dcom_Compressor;
     int32u                                  moov_meta_hdlr_Type;
     std::string                             moov_meta_ilst_xxxx_name_Name;
-    int32u                                  moov_trak_mdia_mdhd_Duration;
-    int32u                                  moov_trak_mdia_mdhd_TimeScale;
+    size_t                                  moov_trak_mdia_minf_stbl_stsd_Pos;
     int32u                                  moov_trak_tkhd_TrackID;
     float32                                 moov_trak_tkhd_Width;
     float32                                 moov_trak_tkhd_Height;
@@ -263,18 +312,46 @@
     float32                                 moov_trak_tkhd_Rotation;
     std::vector<std::string>                moov_udta_meta_keys_List;
     size_t                                  moov_udta_meta_keys_ilst_Pos;
-    std::vector<int32u>                     ftyps;
     int32u                                  TimeScale;
     int32u                                  Vendor;
     Ztring                                  Vendor_Version;
+    int64u                                  FirstMdatPos;
+    int64u                                  LastMdatPos; //This is the position of the byte after the last byte of mdat
+    int64u                                  FirstMoovPos;
+    int64u                                  moof_base_data_offset;
+    bool                                    data_offset_present;
+    int64u                                  moof_traf_base_data_offset;
+    int32u                                  moof_traf_default_sample_duration;
+    int32u                                  moof_traf_default_sample_size;
+    int32u                                  MajorBrand;
+    bool                                    IsSecondPass;
+    bool                                    IsParsing_mdat;
+    bool                                    IsFragmented;
 
     //Data
     struct stream
     {
         Ztring                  File_Name;
         File__Analyze*          Parser;
+        MediaInfo_Internal*     MI;
+        struct timecode
+        {
+            int32u TimeScale;
+            int32u FrameDuration;
+            bool   DropFrame;
+            bool   H24;
+            bool   NegativeTimes;
+        };
+        timecode* TimeCode;
         stream_t                StreamKind;
         size_t                  StreamPos;
+        struct edts_struct
+        {
+            int32u  Duration;
+            int32u  Delay;
+            int32u  Rate;
+        };
+        std::vector<edts_struct> edts;
         std::vector<int64u>     stco;
         struct stsc_struct
         {
@@ -283,30 +360,106 @@
         };
         std::vector<stsc_struct> stsc;
         std::vector<int64u>     stsz;
+        std::vector<int64u>     stsz_Total; //TODO: merge with stsz
+        int64u                  stsz_StreamSize; //TODO: merge with stsz
+        std::vector<int64u>     stss; //Sync Sample, base=0
+        struct stts_struct
+        {
+            int32u SampleCount;
+            int32u SampleDuration;
+        };
+        std::vector<stts_struct> stts;
         int64u                  stsz_Sample_Size;
+        int64u                  stsz_Sample_Multiplier;
         int64u                  stsz_Sample_Count;
+        int64u                  tkhd_Duration;
+        int32u                  mdhd_TimeScale;
+        int64u                  mdhd_Duration;
+        int32u                  stts_Min;
+        int32u                  stts_Max;
+        int64u                  stts_FrameCount;
+        int64u                  stts_Duration;
+        int64u                  stts_Duration_FirstFrame;
+        int64u                  stts_Duration_LastFrame;
+        int64u                  stts_SampleDuration;
+        int32u                  mvex_trex_default_sample_duration;
+        int32u                  mvex_trex_default_sample_size;
         int32u                  TimeCode_TrackID;
         bool                    TimeCode_IsVisual;
-        bool                    Channels_AreTrustable;
+        bool                    IsPcmMono;
+        bool                    IsPriorityStream;
+        bool                    IsFilled;
+        float32                 CleanAperture_Width;
+        float32                 CleanAperture_Height;
+        float32                 CleanAperture_PixelAspectRatio;
+        #if MEDIAINFO_DEMUX || MEDIAINFO_SEEK
+            int8u               Demux_Level;
+
+            struct stts_duration
+            {
+                int64u Pos_Begin;
+                int64u Pos_End;
+                int64u DTS_Begin;
+                int64u DTS_End;
+                int32u SampleDuration;
+            };
+            typedef std::vector<stts_duration> stts_durations;
+            stts_durations  stts_Durations;
+            size_t          stts_Durations_Pos;
+            int64u          stts_FramePos;
+        #endif //MEDIAINFO_DEMUX || MEDIAINFO_SEEK
 
         stream()
         {
             Parser=NULL;
+            MI=NULL;
+            TimeCode=NULL;
             StreamKind=Stream_Max;
             StreamPos=0;
+            stsz_StreamSize=0;
             stsz_Sample_Size=0;
+            stsz_Sample_Multiplier=1;
             stsz_Sample_Count=0;
+            tkhd_Duration=0;
+            mdhd_TimeScale=0;
+            mdhd_Duration=0;
+            stts_Min=(int32u)-1;
+            stts_Max=0;
+            stts_FrameCount=0;
+            stts_Duration=0;
+            stts_Duration_FirstFrame=0;
+            stts_Duration_LastFrame=0;
+            mvex_trex_default_sample_duration=0;
+            mvex_trex_default_sample_size=0;
             TimeCode_TrackID=(int32u)-1;
             TimeCode_IsVisual=false;
-            Channels_AreTrustable=false;
+            IsPcmMono=false;
+            IsPriorityStream=false;
+            IsFilled=false;
+            CleanAperture_Width=0;
+            CleanAperture_Height=0;
+            CleanAperture_PixelAspectRatio=0;
+            #if MEDIAINFO_DEMUX
+                Demux_Level=2; //Container
+                stts_Durations_Pos=0;
+                stts_FramePos=0;
+            #endif //MEDIAINFO_DEMUX
         }
 
         ~stream()
         {
             delete Parser; //Parser=NULL;
+            delete MI; //MI=NULL;
+            delete TimeCode; //TimeCode=NULL;
         }
     };
-    std::map<int32u, stream> Stream;
+    typedef std::map<int32u, stream> streams;
+    streams             Streams;
+    streams::iterator   Stream;
+    File__ReferenceFilesHelper* ReferenceFiles;
+    #if MEDIAINFO_NEXTPACKET
+        bool                    ReferenceFiles_IsParsing;
+    #endif //MEDIAINFO_NEXTPACKET
 
     //Positions
     struct mdat_Pos_Type
@@ -314,8 +467,16 @@
         int32u StreamID;
         int64u Size;
     };
-    std::map<int64u, mdat_Pos_Type> mdat_Pos;
-    bool IsParsing_mdat;
+    typedef std::map<int64u, mdat_Pos_Type> mdat_pos;
+    mdat_pos mdat_Pos;
+    mdat_pos::iterator mdat_Pos_Temp;
+    std::vector<int32u> mdat_Pos_ToParseInPriority_StreamIDs;
+    bool                mdat_Pos_NormalParsing;
+
+    #if MEDIAINFO_DEMUX
+        int64u          TimeCode_FrameOffset;
+        int64u          TimeCode_DtsOffset;
+    #endif //MEDIAINFO_DEMUX
 };
 
 } //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Mpeg4_Descriptors.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Mpeg4_Descriptors.cpp Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Mpeg4_Descriptors.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Mpeg4_Descriptors.h Changed

@@ -2,16 +2,16 @@
 // Copyright (C) 2007-2007 Jerome Martinez, Zen@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -42,29 +42,12 @@
 public :
     //In
     stream_t KindOfStream;
-    std::vector<int32u> ftyps;
     bool     Parser_DoNotFreeIt; //If you want to keep the Parser
-    bool     DecSpecificInfoTag_DoNotFreeIt; //If you want to keep the DecSpecificInfoTag
     bool     SLConfig_DoNotFreeIt; //If you want to keep the SLConfig
-    bool     Channels_AreTrustable;
 
     //Out
     File__Analyze* Parser;
     int16u ES_ID;
-    struct decspecificinfotag
-    {
-        int8u* Buffer;
-        size_t Buffer_Size;
-        decspecificinfotag()
-        {
-            Buffer=NULL;
-            Buffer_Size=0;
-        }
-        ~decspecificinfotag()
-        {
-            delete[] Buffer; //Buffer=NULL;
-        }
-    };
 
     struct slconfig
     {
@@ -94,7 +77,6 @@
         int64u startCompositionTimeStamp;
     };
 
-    decspecificinfotag* DecSpecificInfoTag;
     slconfig* SLConfig;
 
 public :
@@ -109,15 +91,15 @@
 
     //Elements
     void Descriptor_00() {Skip_XX(Element_Size, "Data");};
-    void Descriptor_01() {Skip_XX(Element_Size, "Data");};
-    void Descriptor_02();
+    void Descriptor_01();
+    void Descriptor_02() {Descriptor_01();}
     void Descriptor_03();
     void Descriptor_04();
     void Descriptor_05();
     void Descriptor_06();
     void Descriptor_07() {Skip_XX(Element_Size, "Data");};
     void Descriptor_08() {Skip_XX(Element_Size, "Data");};
-    void Descriptor_09() {Skip_XX(Element_Size, "Data");};
+    void Descriptor_09();
     void Descriptor_0A() {Skip_XX(Element_Size, "Data");};
     void Descriptor_0B() {Skip_XX(Element_Size, "Data");};
     void Descriptor_0C() {Skip_XX(Element_Size, "Data");};

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Mpeg4_Elements.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Mpeg4_Elements.cpp Changed

@@ -1,17 +1,17 @@
 // File_Mpeg4 - Info for MPEG-4 files
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // 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 .  See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,14 +22,18 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #ifdef MEDIAINFO_MPEG4_YES
 //---------------------------------------------------------------------------
 
@@ -38,18 +42,36 @@
 #if defined(MEDIAINFO_DVDIF_YES)
     #include "MediaInfo/Multiple/File_DvDif.h"
 #endif
+#if defined(MEDIAINFO_MXF_YES)
+    #include "MediaInfo/Multiple/File_Mxf.h"
+#endif
 #if defined(MEDIAINFO_AVC_YES)
     #include "MediaInfo/Video/File_Avc.h"
 #endif
+#if defined(MEDIAINFO_H263_YES)
+    #include "MediaInfo/Video/File_H263.h"
+#endif
 #if defined(MEDIAINFO_MPEGV_YES)
     #include "MediaInfo/Video/File_Mpegv.h"
 #endif
+#if defined(MEDIAINFO_PRORES_YES)
+    #include "MediaInfo/Video/File_ProRes.h"
+#endif
 #if defined(MEDIAINFO_VC1_YES)
     #include "MediaInfo/Video/File_Vc1.h"
 #endif
+#if defined(MEDIAINFO_VC3_YES)
+    #include "MediaInfo/Video/File_Vc3.h"
+#endif
+#if defined(MEDIAINFO_AAC_YES)
+    #include "MediaInfo/Audio/File_Aac.h"
+#endif
 #if defined(MEDIAINFO_AC3_YES)
     #include "MediaInfo/Audio/File_Ac3.h"
 #endif
+#if defined(MEDIAINFO_AES3_YES)
+    #include "MediaInfo/Audio/File_ChannelGrouping.h"
+#endif
 #if defined(MEDIAINFO_AMR_YES)
     #include "MediaInfo/Audio/File_Amr.h"
 #endif
@@ -62,11 +84,18 @@
 #if defined(MEDIAINFO_PCM_YES)
     #include "MediaInfo/Audio/File_Pcm.h"
 #endif
+#if defined(MEDIAINFO_CDP_YES)
+    #include "MediaInfo/Text/File_Cdp.h"
+#endif
+#if defined(MEDIAINFO_EIA608_YES)
+    #include "MediaInfo/Text/File_Eia608.h"
+#endif
 #if defined(MEDIAINFO_JPEG_YES)
     #include "MediaInfo/Image/File_Jpeg.h"
 #endif
 #include "MediaInfo/Multiple/File_Mpeg4_TimeCode.h"
-#include "ZenLib/Base64/base64.h"
+#include "ZenLib/FileName.h"
+#include "base64.h"
 #include <cmath>
 #include <zlib.h>
 //---------------------------------------------------------------------------
@@ -144,12 +173,12 @@
 {
     switch (Vendor)
     {
-        case 0x46464D50 : return _T("FFMpeg");
-        case 0x4D4F544F : return _T("Motorola");
-        case 0x50484C50 : return _T("Philips");
-        case 0x6170706C : return _T("Apple");
-        case 0x6E6F6B69 : return _T("Nokia");
-        case 0x6D6F746F : return _T("Motorola");
+        case 0x46464D50 : return __T("FFMpeg");
+        case 0x4D4F544F : return __T("Motorola");
+        case 0x50484C50 : return __T("Philips");
+        case 0x6170706C : return __T("Apple");
+        case 0x6E6F6B69 : return __T("Nokia");
+        case 0x6D6F746F : return __T("Motorola");
         default         : return Ztring().From_CC4(Vendor);
     }
 }
@@ -157,26 +186,318 @@
 //---------------------------------------------------------------------------
 const char* Mpeg4_chan(int16u Ordering)
 {
-    //TODO: http://developer.apple.com/mac/library/documentation/MusicAudio/Reference/CAFSpec/CAF_spec/CAF_spec.html#//apple_ref/doc/uid/TP40001862-CH210-BCGECJAJ
+    //Source: http://developer.apple.com/library/mac/#documentation/MusicAudio/Reference/CACoreAudioReference/CoreAudioTypes/CompositePage.html
+    //Arbitrary decision (0° = Front):
+    //Front = 0°-80°
+    //Side = 80°-120°
+    //Rear = 120°-180°
     switch(Ordering)
     {
         case 100 : return "Front: C";
         case 101 : return "Front: L R";
-        case 102 : return "Front: L R"; //With headphones
-        case 103 : return "Front: L R"; //With matrix
-        case 104 : return "Front: MidSide";
-        case 105 : return "Front: XY";
-        case 106 : return "Front: Binaural";
-        case 107 : return "Front: WXYZ";
+        case 102 : return "Front: L R (Headphones)"; //With headphones
+        case 103 : return "Front: L R (Matrix)"; //With matrix
+        case 104 : return "Front: C S";
+        case 105 : return "Front: X Y";
+        case 106 : return "Front: L R (Binaural)";
+        case 107 : return "Front: W X Y Z";
         case 108 : return "Front: L R, Side: L R";
         case 109 : return "Front: L C R, Rear: L R";
         case 110 : return "Front: L C R, Rear: L C R";
         case 111 : return "Front: L C R, Side: L R, Rear: L C R";
         case 112 : return "Front: L R, TopFront: L R, Rear: L R, TopRear: L R";
-		default  : return "";
+        case 113 : return "Front: L C R";
+        case 114 : return "Front: L C R";
+        case 115 : return "Front: L C R, Rear: C";
+        case 116 : return "Front: L C R, Rear: C";
+        case 117 : return "Front: L C R, Side: L R";
+        case 118 : return "Front: L C R, Side: L R";
+        case 119 : return "Front: L C R, Side: L R";
+        case 120 : return "Front: L C R, Side: L R";
+        case 121 : return "Front: L C R, Side: L R, LFE";
+        case 122 : return "Front: L C R, Side: L R, LFE";
+        case 123 : return "Front: L C R, Side: L R, LFE";
+        case 124 : return "Front: L C R, Side: L R, LFE";
+        case 125 : return "Front: L C R, Side: L C R";
+        case 126 : return "Front: L Lc C Rc R, Side: L R";
+        case 127 : return "Front: L Lc Rc R, Side: L R, LFE";
+        case 128 : return "Front: L C R, Side: L R, Rear: L R, LFE";
+        case 129 : return "Front: L C R, Side: L R, Rear: L R, LFE";
+        case 130 : return "Front: L C R, Side: L R, LFE / L R (Matrix)";
+        case 131 : return "Front: L R, Rear: C";
+        case 132 : return "Front: L R, Side: L R";
+        case 133 : return "Front: L R, LFE";
+        case 134 : return "Front: L R, Rear: C, LFE";
+        case 135 : return "Front: L C R, Side: L R, LFE";
+        case 136 : return "Front: L C R, LFE";
+        case 137 : return "Front: L C R, Rear: C, LFE";
+        case 138 : return "Front: L R, Rear: L R, LFE";
+        case 139 : return "Front: L C R, Rear: L R, LFE";
+        case 140 : return "Front: L C R, Side: L R, Rear: L R";
+        case 141 : return "Front: L C R, Side: L R, Rear: C";
+        case 142 : return "Front: L C R, Side: L R, Rear: C, LFE";
+        case 143 : return "Front: L C R, Side: L R, Rear: L R";
+        case 144 : return "Front: L C R, Side: L R, Rear: L C R";
+        case 145 : return "Front: Lw L C R Rw, TopFront: L C R, Side: L R, Rear: L C Cd R, LFE: L R"; //d=direct, all must be confirmed
+        case 146 : return "Front: Lw L Lc C Rc R Rw, TopFront: L C R, Side: L R, Rear: L C Cd R, LFE: L R, HI, VI, Haptic"; //d=direct, all must be confirmed
+        default  : return "";
     }
 }
 
+//---------------------------------------------------------------------------
+const char* Mpeg4_chan_Layout(int16u Ordering)
+{
+    //Source: http://developer.apple.com/library/mac/#documentation/MusicAudio/Reference/CACoreAudioReference/CoreAudioTypes/CompositePage.html
+    // L - left
+    // R - right
+    // C - center
+    // Ls - left surround
+    // Rs - right surround
+    // Cs - center surround
+    // Rls - rear left surround
+    // Rrs - rear right surround
+    // Lw - left wide
+    // Rw - right wide
+    // Lsd - left surround direct
+    // Rsd - right surround direct
+    // Lc - left center
+    // Rc - right center
+    // Ts - top surround
+    // Vhl - vertical height left
+    // Vhc - vertical height center
+    // Vhr - vertical height right
+    // Lt - left matrix total. for matrix encoded stereo.
+    // Rt - right matrix total. for matrix encoded stereo.
+    switch(Ordering)
+    {
+        case 100 : return "C";
+        case 101 : return "L R";
+        case 102 : return "L R"; //With headphones
+        case 103 : return "Lt Rt"; //L R with matrix
+        case 104 : return "M S";
+        case 105 : return "X Y";
+        case 106 : return "L R";
+        case 107 : return "W X Y Z";
+        case 108 : return "L R Ls Rs";
+        case 109 : return "L R Lrs Rrs C";
+        case 110 : return "L R Lrs Rrs C Cs";
+        case 111 : return "L R Lrs Rrs C Crs, Ls, Rs";
+        case 112 : return "L R Lrs Rrs Vhl Vhr, Vhlrs, Vhrrs";
+        case 113 : return "L R C";
+        case 114 : return "C L R";
+        case 115 : return "L R C Cs";
+        case 116 : return "C L R Cs";
+        case 117 : return "L R C Ls Rs";
+        case 118 : return "L R Ls Rs C";
+        case 119 : return "L C R Ls Rs";
+        case 120 : return "C L R Ls Rs";
+        case 121 : return "L R C LFE Ls Rs";
+        case 122 : return "L R Ls Rs C LFE";
+        case 123 : return "L C R Ls Rs LFE";
+        case 124 : return "C L R Ls Rs LFE";
+        case 125 : return "L R C LFE Ls Rs Cs";
+        case 126 : return "L R C LFE Ls Rs Lc Rc";
+        case 127 : return "C Lc Rc L R Ls Rs LFE";
+        case 128 : return "L R C LFE Ls R Rls Rrs";
+        case 129 : return "L R Ls Rs C LFE Lc Rc";
+        case 130 : return "L R C LFE Ls Rs Lt Rt";
+        case 131 : return "L R Cs";
+        case 132 : return "L R Ls Rs";
+        case 133 : return "L R LFE";
+        case 134 : return "L R LFE Cs";
+        case 135 : return "L R LFE Ls Rs";
+        case 136 : return "L R C LFE";
+        case 137 : return "L R C LFE Cs";
+        case 138 : return "L R Ls Rs LFE";
+        case 139 : return "L R Ls Rs C Cs";
+        case 140 : return "L R Ls Rs C Rls Rrs";
+        case 141 : return "C L R Ls Rs Cs ";
+        case 142 : return "C L R Ls Rs Cs LFE";
+        case 143 : return "C L R Ls Rs Rls Rrs";
+        case 144 : return "C L R Ls Rs Rls Rrs Cs";
+        case 145 : return "L R C Vhc Lsd Rsd Ls Rs Vhl Vhr Lw Rw Csd Cs LFE1 LFE2";
+        case 146 : return "L R C Vhc Lsd Rsd Ls Rs Vhl Vhr Lw Rw Csd Cs LFE1 LFE2 Lc Rc HI VI Haptic";
+        case 147 : return "";
+        default  : return "";
+    }
+}
+
+//---------------------------------------------------------------------------
+std::string Mpeg4_chan_ChannelDescription (int32u ChannelLabels)
+{
+    std::string Text;
+    if ((ChannelLabels&0x000E)!=0x0000)
+        Text+="Front:";
+    if (ChannelLabels&0x0002)
+        Text+=" L";
+    if (ChannelLabels&0x0008)
+        Text+=" C";
+    if (ChannelLabels&0x0004)
+        Text+=" R";
+
+    if ((ChannelLabels&0x0C00)!=0x0000)
+        Text+=", Side:";
+    if (ChannelLabels&0x0400)
+        Text+=" L";
+    if (ChannelLabels&0x0800)
+        Text+=" R";
+
+    if ((ChannelLabels&0x0260)!=0x0000)
+        Text+=", Back:";
+    if (ChannelLabels&0x0020)
+        Text+=" L";
+    if (ChannelLabels&0x0200)
+        Text+=" C";
+    if (ChannelLabels&0x0040)
+        Text+=" R";
+
+    if ((ChannelLabels&0x0010)!=0x0000)
+        Text+=", LFE";
+
+    return Text;
+}
+
+//---------------------------------------------------------------------------
+const char* Mpeg4_chan_ChannelDescription_Layout (int32u ChannelLabel)
+{
+    switch(ChannelLabel)
+    {
+        case   1 : return "L";
+        case   2 : return "R";
+        case   3 : return "C";
+        case   4 : return "LFE";
+        case   5 : return "Ls";
+        case   6 : return "Rs";
+        case   7 : return "Lc";
+        case   8 : return "Rc";
+        case   9 : return "Cs";
+        case  10 : return "Lsd";
+        case  11 : return "Rsd";
+        case  12 : return "Tcs";
+        case  13 : return "Vhl";
+        case  14 : return "Vhc";
+        case  15 : return "Vhr";
+        case  16 : return "Trs";
+        case  17 : return "Trs";
+        case  18 : return "Trs";
+        case  33 : return "Lrs";
+        case  34 : return "Rrs";
+        case  35 : return "Lw";
+        case  36 : return "Rw";
+        case  37 : return "LFE2";
+        case  38 : return "Lt";
+        case  39 : return "Rt";
+        case 200 : return "W";
+        case 201 : return "X";
+        case 202 : return "Y";
+        case 203 : return "Z";
+        case 204 : return "M";
+        case 205 : return "S";
+        case 206 : return "X";
+        case 207 : return "Y";
+        default  : return "?";
+    }
+}
+
+//---------------------------------------------------------------------------
+std::string Mpeg4_chan_ChannelBitmap (int32u ChannelBitmap)
+{
+    std::string Text;
+    if ((ChannelBitmap&0x0007)!=0x0000)
+        Text+="Front:";
+    if (ChannelBitmap&0x0001)
+        Text+=" L";
+    if (ChannelBitmap&0x0004)
+        Text+=" C";
+    if (ChannelBitmap&0x0002)
+        Text+=" R";
+
+    if ((ChannelBitmap&0x0600)!=0x0000)
+        Text+=", Side:";
+    if (ChannelBitmap&0x0200)
+        Text+=" L";
+    if (ChannelBitmap&0x0400)
+        Text+=" R";
+
+    if ((ChannelBitmap&0x0130)!=0x0000)
+        Text+=", Back:";
+    if (ChannelBitmap&0x0010)
+        Text+=" L";
+    if (ChannelBitmap&0x0100)
+        Text+=" C";
+    if (ChannelBitmap&0x0020)
+        Text+=" R";
+
+    if ((ChannelBitmap&0x0008)!=0x0000)
+        Text+=", LFE";
+
+    return Text;
+}
+
+//---------------------------------------------------------------------------
+const char* Mpeg4_chan_ChannelBitmap_Layout (int32u ChannelBitmap)
+{
+    switch(ChannelBitmap)
+    {
+        case   0 : return "L";      // Left
+        case   1 : return "R";      // Right
+        case   2 : return "C";      // Center
+        case   3 : return "LFE";    // LFEScreen
+        case   4 : return "Ls";     // LeftSurround / Back Left
+        case   5 : return "Rs";     // RightSurround / Back Right
+        case   6 : return "?";      // LeftCenter
+        case   7 : return "?";      // RightCenter
+        case   8 : return "Cs";     // CenterSurround / Back Center
+        case   9 : return "Lsd";    // LeftSurroundDirect / Side Left
+        case  10 : return "Rsd";    // RightSurroundDirect / Side Right
+        case  11 : return "?";      // TopCenterSurround
+        case  12 : return "?";      // VerticalHeightLeft / Top Front Left
+        case  13 : return "?";      // VerticalHeightCenter / Top Front Center
+        case  14 : return "?";      // VerticalHeightRight / Top Front Right"
+        case  15 : return "?";      // TopBackLeft
+        case  16 : return "?";      // TopBackCenter
+        case  17 : return "?";      // TopBackRight
+        default  : return "?";
+    }
+}
+
+//---------------------------------------------------------------------------
+const char* Mpeg4_jp2h_METH(int8u METH)
+{
+    switch (METH)
+    {
+        case 0x01 : return "Enumerated colourspace";
+        case 0x02 : return "Restricted ICC profile";
+        default   : return "";
+    }
+}
+
+//---------------------------------------------------------------------------
+const char* Mpeg4_jp2h_EnumCS(int32u EnumCS)
+{
+    switch (EnumCS)
+    {
+        case 0x10 : return "RGB"; //sRGB
+        case 0x11 : return "Grey";
+        case 0x12 : return "YUV"; //sYUV
+        default   : return "";
+    }
+}
+
+//---------------------------------------------------------------------------
+const char* Mpegv_colour_primaries(int8u colour_primaries);
+const char* Mpegv_transfer_characteristics(int8u transfer_characteristics);
+const char* Mpegv_matrix_coefficients(int8u matrix_coefficients);
+
+//---------------------------------------------------------------------------
+// DTS
+#if defined(MEDIAINFO_DTS_YES)
+    extern const char*  DTS_ChannelPositions[16];
+    extern const char*  DTS_ChannelPositions2[16];
+    extern std::string DTS_HD_SpeakerActivityMask (int16u SpeakerActivityMask);
+    extern std::string DTS_HD_SpeakerActivityMask2 (int16u SpeakerActivityMask);
+#endif //defined(MEDIAINFO_DTS_YES)
+
 //***************************************************************************
 // Constants
 //***************************************************************************
@@ -184,6 +505,8 @@
 //---------------------------------------------------------------------------
 namespace Elements
 {
+    const int64u cdat=0x63646174;
+    const int64u cdt2=0x63647432;
     const int64u free=0x66726565;
     const int64u ftyp=0x66747970;
     const int64u ftyp_qt=0x71742020;
@@ -243,6 +566,7 @@
     const int64u moov_trak_load=0x6C6F6164;
     const int64u moov_trak_mdia=0x6D646961;
     const int64u moov_trak_mdia_hdlr=0x68646C72;
+    const int64u moov_trak_mdia_hdlr_clcp=0x636C6370;
     const int64u moov_trak_mdia_hdlr_MPEG=0x4D504547;
     const int64u moov_trak_mdia_hdlr_sbtl=0x7362746C;
     const int64u moov_trak_mdia_hdlr_soun=0x736F756E;
@@ -257,6 +581,9 @@
     const int64u moov_trak_mdia_imap_sean___in_obid=0x6F626964;
     const int64u moov_trak_mdia_mdhd=0x6D646864;
     const int64u moov_trak_mdia_minf=0x6D696E66;
+    const int64u moov_trak_mdia_minf_code=0x636F6465;
+    const int64u moov_trak_mdia_minf_code_sean=0x7365616E;
+    const int64u moov_trak_mdia_minf_code_sean_RU_A=0x52552A41;
     const int64u moov_trak_mdia_minf_dinf=0x64696E66;
     const int64u moov_trak_mdia_minf_dinf_url_=0x75726C20;
     const int64u moov_trak_mdia_minf_dinf_urn_=0x75726E20;
@@ -303,8 +630,11 @@
     const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_d263=0x64323633;
     const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_dac3=0x64616333;
     const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_dec3=0x64656333;
+    const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_ddts=0x64647473;
     const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_damr=0x64616D72;
     const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_esds=0x65736473;
+    const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_fiel=0x6669656C;
+    const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_glbl=0x676C626C;
     const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_idfm=0x6964666D;
     const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_idfm_atom=0x61746F6D;
     const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_idfm_qtat=0x71746174;
@@ -312,7 +642,15 @@
     const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_idfm_priv=0x70726976;
     const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_idfm_subs=0x73756273;
     const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_idfm_cspc=0x63737063;
+    const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_jp2h=0x6A703268;
+    const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_jp2h_colr=0x636F6C72;
+    const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_jp2h_ihdr=0x69686472;
     const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_pasp=0x70617370;
+    const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_sinf=0x73696E66;
+    const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_sinf_frma=0x66726D61;
+    const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_sinf_imif=0x696D6966;
+    const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_sinf_schi=0x73636869;
+    const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_sinf_schm=0x7363686D;
     const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_wave=0x77617665;
     const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_wave_acbf=0x61636266;
     const int64u moov_trak_mdia_minf_stbl_stsd_xxxx_wave_enda=0x656E6461;
@@ -323,7 +661,29 @@
     const int64u moov_trak_mdia_minf_stbl_stss=0x73747373;
     const int64u moov_trak_mdia_minf_stbl_stsz=0x7374737A;
     const int64u moov_trak_mdia_minf_stbl_stts=0x73747473;
+    const int64u moov_trak_mdia_minf_stbl_stz2=0x73747A32;
     const int64u moov_trak_mdia_minf_vmhd=0x766D6864;
+    const int64u moov_trak_meta=0x6D657461;
+    const int64u moov_trak_meta______=0x2D2D2D2D;
+    const int64u moov_trak_meta___day=0xA9646179;
+    const int64u moov_trak_meta__disk=0x6469736B;
+    const int64u moov_trak_meta__trkn=0x74726B6E;
+    const int64u moov_trak_meta__trng=0x74726E67;
+    const int64u moov_trak_meta__covr=0x636F7672;
+    const int64u moov_trak_meta__gnre=0x676E7265;
+    const int64u moov_trak_meta_bxml=0x62786D6C;
+    const int64u moov_trak_meta_hdlr=0x68646C72;
+    const int64u moov_trak_meta_hdlr_mdir=0x6D646972;
+    const int64u moov_trak_meta_hdlr_mdta=0x6D647461;
+    const int64u moov_trak_meta_hdlr_mp7b=0x6D703762;
+    const int64u moov_trak_meta_hdlr_mp7t=0x6D703774;
+    const int64u moov_trak_meta_keys=0x6B657973;
+    const int64u moov_trak_meta_keys_mdta=0x6D647461;
+    const int64u moov_trak_meta_ilst=0x696C7374;
+    const int64u moov_trak_meta_ilst_xxxx_data=0x64617461;
+    const int64u moov_trak_meta_ilst_xxxx_mean=0x6D65616E;
+    const int64u moov_trak_meta_ilst_xxxx_name=0x6E616D65;
+    const int64u moov_trak_meta_xml=0x786D6C20;
     const int64u moov_trak_tapt=0x74617074;
     const int64u moov_trak_tapt_clef=0x636C6566;
     const int64u moov_trak_tapt_enof=0x656E6F66;
@@ -379,6 +739,14 @@
     const int64u PICT=0x50494354;
     const int64u pckg=0x70636B67;
     const int64u pnot=0x706E6F74;
+    const int64u RDAO=0x5244414F;
+    const int64u RDAS=0x52444153;
+    const int64u RDVO=0x5244564F;
+    const int64u RDVS=0x52445653;
+    const int64u RED1=0x52454431;
+    const int64u REDA=0x52454441;
+    const int64u REDV=0x52454456;
+    const int64u REOB=0x52454F42;
     const int64u skip=0x736B6970;
     const int64u wide=0x77696465;
 }
@@ -414,6 +782,8 @@
 
     //Parsing
     DATA_BEGIN
+    ATOM(cdat)
+    ATOM(cdt2)
     LIST_SKIP(free)
     ATOM(ftyp)
     ATOM(idat)
@@ -421,13 +791,11 @@
     ATOM(jp2c)
     LIST(jp2h)
         ATOM_BEGIN
-        ATOM(jp2h_ihdr)
         ATOM(jp2h_colr)
+        ATOM(jp2h_ihdr)
         ATOM_END
     LIST(mdat)
-        ATOM_BEGIN
-        ATOM_DEFAULT(mdat_xxxx)
-        ATOM_END_DEFAULT
+        ATOM_DEFAULT_ALONE(mdat_xxxx)
     LIST(mfra)
         ATOM_BEGIN
         ATOM(mfra_mfro)
@@ -461,14 +829,13 @@
                 ATOM_END
             ATOM(moov_meta_hdlr)
             LIST(moov_meta_ilst)
-                ATOM_BEGIN
-                LIST_DEFAULT (moov_meta_ilst_xxxx)
+                LIST_DEFAULT_ALONE_BEGIN (moov_meta_ilst_xxxx)
                     ATOM_BEGIN
                     ATOM (moov_meta_ilst_xxxx_data)
                     ATOM (moov_meta_ilst_xxxx_mean)
                     ATOM (moov_meta_ilst_xxxx_name)
                     ATOM_END
-                ATOM_END_DEFAULT
+                LIST_DEFAULT_ALONE_END
             ATOM(moov_meta_xml)
             ATOM_END
         LIST(moov_mvex)
@@ -502,6 +869,13 @@
                 ATOM(moov_trak_mdia_mdhd)
                 LIST(moov_trak_mdia_minf)
                     ATOM_BEGIN
+                    LIST(moov_trak_mdia_minf_code)
+                        ATOM_BEGIN
+                        LIST(moov_trak_mdia_minf_code_sean)
+                            ATOM_BEGIN
+                            ATOM(moov_trak_mdia_minf_code_sean_RU_A)
+                            ATOM_END
+                        ATOM_END
                     LIST(moov_trak_mdia_minf_dinf)
                         ATOM_BEGIN
                         ATOM(moov_trak_mdia_minf_dinf_url_)
@@ -560,10 +934,25 @@
                                 ATOM(moov_trak_mdia_minf_stbl_stsd_xxxx_d263)
                                 ATOM(moov_trak_mdia_minf_stbl_stsd_xxxx_dac3)
                                 ATOM(moov_trak_mdia_minf_stbl_stsd_xxxx_dec3)
+                                ATOM(moov_trak_mdia_minf_stbl_stsd_xxxx_ddts)
                                 ATOM(moov_trak_mdia_minf_stbl_stsd_xxxx_damr)
                                 ATOM(moov_trak_mdia_minf_stbl_stsd_xxxx_esds)
+                                ATOM(moov_trak_mdia_minf_stbl_stsd_xxxx_fiel)
+                                ATOM(moov_trak_mdia_minf_stbl_stsd_xxxx_glbl)
                                 ATOM(moov_trak_mdia_minf_stbl_stsd_xxxx_idfm)
+                                LIST(moov_trak_mdia_minf_stbl_stsd_xxxx_jp2h)
+                                    ATOM_BEGIN
+                                    ATOM(moov_trak_mdia_minf_stbl_stsd_xxxx_jp2h_colr)
+                                    ATOM(moov_trak_mdia_minf_stbl_stsd_xxxx_jp2h_ihdr)
+                                    ATOM_END
                                 ATOM(moov_trak_mdia_minf_stbl_stsd_xxxx_pasp)
+                                LIST(moov_trak_mdia_minf_stbl_stsd_xxxx_sinf)
+                                    ATOM_BEGIN
+                                    ATOM(moov_trak_mdia_minf_stbl_stsd_xxxx_sinf_frma)
+                                    ATOM(moov_trak_mdia_minf_stbl_stsd_xxxx_sinf_imif)
+                                    ATOM(moov_trak_mdia_minf_stbl_stsd_xxxx_sinf_schi)
+                                    ATOM(moov_trak_mdia_minf_stbl_stsd_xxxx_sinf_schm)
+                                    ATOM_END
                                 LIST(moov_trak_mdia_minf_stbl_stsd_xxxx_wave)
                                     ATOM_BEGIN
                                     ATOM(moov_trak_mdia_minf_stbl_stsd_xxxx_esds)
@@ -580,10 +969,32 @@
                         ATOM(moov_trak_mdia_minf_stbl_stss)
                         ATOM(moov_trak_mdia_minf_stbl_stsz)
                         ATOM(moov_trak_mdia_minf_stbl_stts)
+                        ATOM(moov_trak_mdia_minf_stbl_stz2)
                         ATOM_END
                     ATOM(moov_trak_mdia_minf_vmhd)
                     ATOM_END
                 ATOM_END
+            /* Need additional tests
+            LIST(moov_trak_meta)
+                ATOM_BEGIN
+                ATOM(moov_trak_meta_bxml)
+                LIST(moov_trak_meta_keys)
+                    ATOM_BEGIN
+                    ATOM(moov_trak_meta_keys_mdta)
+                    ATOM_END
+                ATOM(moov_trak_meta_hdlr)
+                LIST(moov_trak_meta_ilst)
+                    ATOM_BEGIN
+                    LIST_DEFAULT (moov_trak_meta_ilst_xxxx)
+                        ATOM_BEGIN
+                        ATOM (moov_trak_meta_ilst_xxxx_data)
+                        ATOM (moov_trak_meta_ilst_xxxx_mean)
+                        ATOM (moov_trak_meta_ilst_xxxx_name)
+                        ATOM_END
+                    ATOM_END_DEFAULT
+                ATOM(moov_trak_meta_xml)
+                ATOM_END
+            */
             LIST(moov_trak_tapt)
                 ATOM_BEGIN
                 ATOM(moov_trak_tapt_clef)
@@ -634,14 +1045,13 @@
                 ATOM_BEGIN
                 ATOM(moov_udta_meta_hdlr)
                 LIST(moov_udta_meta_ilst)
-                    ATOM_BEGIN
-                    LIST_DEFAULT (moov_udta_meta_ilst_xxxx);
+                    LIST_DEFAULT_ALONE_BEGIN (moov_udta_meta_ilst_xxxx)
                         ATOM_BEGIN
                         ATOM (moov_udta_meta_ilst_xxxx_data);
                         ATOM (moov_udta_meta_ilst_xxxx_mean);
                         ATOM (moov_udta_meta_ilst_xxxx_name);
                         ATOM_END
-                    ATOM_END_DEFAULT
+                    LIST_DEFAULT_ALONE_END
                 ATOM_END
             ATOM(moov_udta_ndrm)
             ATOM(moov_udta_nsav)
@@ -663,6 +1073,14 @@
             ATOM_END_DEFAULT
         ATOM_END
     ATOM(PICT)
+    ATOM(RDAO)
+    ATOM(RDAS)
+    ATOM(RDVO)
+    ATOM(RDVS)
+    ATOM(RED1)
+    ATOM(REDA)
+    ATOM(REDV)
+    ATOM(REOB)
     ATOM(pckg)
     ATOM(pnot)
     LIST_SKIP(skip)
@@ -757,16 +1175,55 @@
             Get_B8(Temp,                                        _NAME); \
             _INFO.Date_From_Seconds_1904(Temp); \
         } \
-        Param_Info(_INFO); \
+        Param_Info1(_INFO); \
     } \
 
 //---------------------------------------------------------------------------
+void File_Mpeg4::cdat()
+{
+    Element_Code=Element_Code==Elements::cdat?1:2;
+
+    if (!Status[IsAccepted])
+    {
+        Accept("EIA-608");
+        Fill(Stream_General, 0, General_Format, "Final Cut EIA-608", Unlimited, true, true);
+    }
+    #ifdef MEDIAINFO_EIA608_YES
+        if (Streams[(int32u)Element_Code].Parser==NULL)
+        {
+            Streams[(int32u)Element_Code].Parser=new File_Eia608();
+            Open_Buffer_Init(Streams[(int32u)Element_Code].Parser);
+        }
+    #endif //MEDIAINFO_EIA608_YES
+
+    Element_Name(Element_Code==1?"EIA-608-1":"EIA-608-2");
+
+    #if MEDIAINFO_DEMUX
+        Demux(Buffer+Buffer_Offset, (size_t)Element_Size, ContentType_MainStream);
+        Streams[(int32u)Element_Code].Parser->FrameInfo=FrameInfo;
+    #endif //MEDIAINFO_DEMUX
+    while (Element_Offset+2<=Element_Size)
+    {
+        Open_Buffer_Continue(Streams[(int32u)Element_Code].Parser, Buffer+Buffer_Offset+(size_t)Element_Offset, 2);
+        Element_Offset+=2;
+    }
+}
+
+//---------------------------------------------------------------------------
 void File_Mpeg4::free()
 {
     Element_Name("Free space");
 
     //Parsing
-    Skip_XX(Element_TotalSize_Get(),                            "Free");
+    #if MEDIAINFO_TRACE
+        if (Trace_Activated)
+            Param("Data", Ztring("(")+Ztring::ToZtring(Element_TotalSize_Get())+Ztring(" bytes)"));
+    #endif //MEDIAINFO_TRACE
+    Element_Offset=Element_TotalSize_Get(); //Not using Skip_XX() because we want to skip data we don't have, and Skip_XX() does a test on size of buffer
+
+    //ISM
+    if (moof_traf_base_data_offset==(int64u)-1 && !data_offset_present)
+        Stream->second.stco.push_back(File_Offset+Buffer_Offset);
 }
 
 //---------------------------------------------------------------------------
@@ -781,20 +1238,15 @@
     }
 
     //Parsing
-    int32u MajorBrand;
-    Get_C4 (MajorBrand,                                              "MajorBrand");
+    std::vector<int32u> ftyps;
+    Get_C4 (MajorBrand,                                         "MajorBrand");
+    ftyps.push_back(MajorBrand);
     Skip_B4(                                                    "MajorBrandVersion");
-    FILLING_BEGIN();
-        ftyps.push_back(MajorBrand);
-    FILLING_END();
     while (Element_Offset<Element_Size)
     {
         int32u CompatibleBrand;
         Get_C4 (CompatibleBrand,                                "CompatibleBrand");
-
-        FILLING_BEGIN();
-            ftyps.push_back(CompatibleBrand);
-        FILLING_END();
+        ftyps.push_back(CompatibleBrand);
     }
 
     FILLING_BEGIN();
@@ -823,7 +1275,7 @@
         Accept("QTI");
 
         Fill(Stream_General, 0, General_Format, "MPEG-4");
-        CodecID_Fill(_T("QTI"), Stream_General, 0, InfoCodecID_Format_Mpeg4);
+        CodecID_Fill(__T("QTI"), Stream_General, 0, InfoCodecID_Format_Mpeg4);
     FILLING_END();
 }
 
@@ -839,7 +1291,7 @@
         Accept("QTI");
 
         Fill(Stream_General, 0, General_Format, "MPEG-4");
-        CodecID_Fill(_T("QTI"), Stream_General, 0, InfoCodecID_Format_Mpeg4);
+        CodecID_Fill(__T("QTI"), Stream_General, 0, InfoCodecID_Format_Mpeg4);
     FILLING_END();
 }
 
@@ -851,20 +1303,52 @@
     #if defined(MEDIAINFO_JPEG_YES)
         //Creating the parser
         File_Jpeg MI;
+        if (IsSub || Config->File_Names.size()>1) //If contained in another container or several files, this is a video stream
+            MI.StreamKind=Stream_Video;
         Open_Buffer_Init(&MI);
 
+        //Demux
+        #if MEDIAINFO_DEMUX
+            #if MEDIAINFO_EVENTS
+                StreamIDs_Width[0]=0;
+            #endif //MEDIAINFO_EVENTS
+            if (Frame_Count_NotParsedIncluded==(int64u)-1)
+                Frame_Count_NotParsedIncluded=0;
+            if (Config->Demux_Rate_Get())
+            {
+                FrameInfo.DTS=float64_int64s(Frame_Count_NotParsedIncluded*1000000000/Config->Demux_Rate_Get());
+                FrameInfo.PTS=FrameInfo.DTS;
+                FrameInfo.DUR=float64_int64s(1000000000/Config->Demux_Rate_Get());
+            }
+            Demux(Buffer+Buffer_Offset, (size_t)Element_Size, ContentType_MainStream);
+        #endif //MEDIAINFO_DEMUX
+
         //Parsing
         Open_Buffer_Continue(&MI);
 
         //Filling
-        Finish(&MI);
+        if (Frame_Count==0)
+        {
+            Accept("MPEG-4");
 
-        Accept("MPEG-4");
+            Fill(Stream_General, 0, General_Format, "JPEG 2000", Unlimited, true, true);
+            Fill(Stream_General, 0, General_Format_Profile, "MPEG-4");
 
-        Fill(Stream_General, 0, General_Format, "JPEG 2000", Unlimited, true, true);
-        Fill(Stream_General, 0, General_Format_Profile, "MPEG-4");
+            Finish(&MI);
+            Merge(MI, MI.StreamKind, 0, 0);
 
-        Merge(MI);
+            Fill("MPEG-4");
+            if (Config->File_Names.size()>1)
+            {
+                int64u OverHead=Config->File_Sizes[0]-Element_Size;
+                Fill(Stream_Video, 0, Video_StreamSize, File_Size-Config->File_Names.size()*OverHead, 10, true);
+            }
+            if (Config->ParseSpeed<1.0)
+                Finish("MPEG-4");
+        }
+        Frame_Count++;
+        if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+            Frame_Count_NotParsedIncluded++;
     #endif
 
 }
@@ -873,6 +1357,10 @@
 void File_Mpeg4::jp2h()
 {
     Element_Name("JPEG-2000 header");
+
+    FILLING_BEGIN();
+        Buffer_MaximumSize=16*1024*1024; //If we are here, this is really a MPEG-4 file with JPEG-2000 image, and some atoms are very bigs...
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -881,7 +1369,23 @@
     Element_Name("Color");
 
     //Parsing
-    Skip_XX(Element_Size,                                       "Data");
+    int8u METH;
+    Get_B1 (METH,                                               "METH - Specification method"); Param_Info1(Mpeg4_jp2h_METH(METH));
+    Skip_B1(                                                    "PREC - Precedence");
+    Skip_B1(                                                    "APPROX - Colourspace approximation");
+    switch (METH)
+    {
+        case 0x01 : {
+                    int32u EnumCS;
+                    Get_B4 (EnumCS,                             "EnumCS - Enumerated colourspace"); Param_Info1(Mpeg4_jp2h_EnumCS(EnumCS));
+                    Fill(StreamKind_Last, 0, "ColorSpace", Mpeg4_jp2h_EnumCS(EnumCS));
+                    }
+                    break;
+        case 0x02 : Skip_XX(Element_Size-Element_Offset,        "PROFILE");
+                    break;
+        default   : Skip_XX(Element_Size-Element_Offset,        "Unknown");
+                    return;
+    }
 }
 
 //---------------------------------------------------------------------------
@@ -890,12 +1394,29 @@
     Element_Name("Header");
 
     //Parsing
-    Skip_XX(Element_Size,                                       "Data");
+    Skip_B4(                                                    "Height");
+    Skip_B4(                                                    "Width");
+    Skip_B2(                                                    "NC - Number of components");
+    BS_Begin();
+    Skip_SB(                                                    "BPC - Bits per component (Sign)");
+    Skip_S1(7,                                                  "BPC - Bits per component (Value)");
+    BS_End();
+    Skip_B1(                                                    "C - Compression type");
+    Skip_B1(                                                    "UnkC - Colourspace Unknown");
+    Skip_B1(                                                    "IPR - Intellectual Property");
 }
 
 //---------------------------------------------------------------------------
 void File_Mpeg4::mdat()
 {
+    #if MEDIAINFO_TRACE
+        Trace_Layers_Update(8); //Streams
+    #endif //MEDIAINFO_TRACE
+    #if MEDIAINFO_DEMUX
+        if (Config->NextPacket_Get() && Config->Event_CallBackFunction_IsSet())
+            Config->Demux_EventWasSent=true;
+    #endif //MEDIAINFO_DEMUX
+
     if (!Status[IsAccepted])
     {
         Data_Accept("MPEG-4");
@@ -904,81 +1425,50 @@
     }
     Element_Name("Data");
 
-    //In case of second pass
-    if (mdat_MustParse && mdat_Pos.empty())
+    //Sizes
+    if (Retrieve(Stream_General, 0, General_HeaderSize).empty())
     {
-        //For each stream
-        for (std::map<int32u, stream>::iterator Temp=Stream.begin(); Temp!=Stream.end(); Temp++)
-        {
-            if (Temp->second.Parser)
-            {
-                //Adding it
-                size_t SamplesPerChunk_Pos=0;
-                int32u SamplesPerChunk=0;
-                size_t Chunk=0;
-                size_t stsc_Pos=0; //Sample to Chunk
-                int64u Position=(int64u)-1;
-                size_t stsz_Sample_Size;
-                if (Temp->second.stsz_Sample_Size)
-                    stsz_Sample_Size=(size_t)Temp->second.stsz_Sample_Size; //If stsz is not filled, this is a fixed sample size //TODO: handle 64-bit values on 32-bit OS
-                else
-                    stsz_Sample_Size=Temp->second.stsz.size();
-                for (size_t stsz_Pos=0; stsz_Pos<stsz_Sample_Size; stsz_Pos++) //Sample Size
-                {
-                    //Changing stco/stsc if needed
-                    if (SamplesPerChunk_Pos>=SamplesPerChunk)
-                    {
-                        //Reseting
-                        SamplesPerChunk_Pos=0;
-                        Chunk++;
-                        if (Chunk>Temp->second.stco.size())
-                            break;
-
-                        //Count of sample in this Chunk
-                        if (stsc_Pos+1<Temp->second.stsc.size() && Chunk>=Temp->second.stsc[stsc_Pos+1].FirstChunk || Position==(int64u)-1)
-                        {
-                            if (Position!=(int64u)-1)
-                            {
-                                stsc_Pos++;
-                                if (stsc_Pos>=Temp->second.stsc.size())
-                                    break;
-                            }
-                            SamplesPerChunk=Temp->second.stsc[stsc_Pos].SamplesPerChunk;
-                        }
-
-                        //Chunk Offset
-                        Position=Temp->second.stco[Chunk-1];
-                    }
-
-                    mdat_Pos[Position].StreamID=Temp->first;
-                    mdat_Pos[Position].Size=Temp->second.stsz_Sample_Size?Temp->second.stsz_Sample_Size:Temp->second.stsz[stsz_Pos];
+        Fill(Stream_General, 0, General_HeaderSize, File_Offset+Buffer_Offset-Header_Size);
+        Fill(Stream_General, 0, General_DataSize, Element_TotalSize_Get()+Header_Size);
+        if (File_Size!=(int64u)-1 && File_Offset+Buffer_Offset+Element_TotalSize_Get()<=File_Size)
+            Fill(Stream_General, 0, General_FooterSize, File_Size-(File_Offset+Buffer_Offset+Element_TotalSize_Get()));
+        Fill(Stream_General, 0, General_IsStreamable, FirstMoovPos==(int64u)-1?"No":"Yes");
+    }
+
+    //Trace
+    #if MEDIAINFO_TRACE
+        Trace_Layers_Update(0); //Container1
+    #endif //MEDIAINFO_TRACE
 
-                    Position+=Temp->second.stsz_Sample_Size?Temp->second.stsz_Sample_Size:Temp->second.stsz[stsz_Pos];
-                    SamplesPerChunk_Pos++;
-                }
-            }
-        }
-    }
-    if (!mdat_Pos.empty() && mdat_Pos.begin()->first<File_Offset+Buffer_Offset+Element_TotalSize_Get())
+    if (IsSecondPass && !mdat_Pos.empty() && mdat_Pos.begin()->first<File_Offset+Buffer_Offset+Element_TotalSize_Get())
     {
         //Next piece of data
         IsParsing_mdat=true;
         mdat_StreamJump();
+
         return; //Only if have something in this mdat
     }
 
     //In case of mdat is before moov
-    if (Stream.empty())
+    if (FirstMdatPos==(int64u)-1)
     {
         Buffer_Offset-=(size_t)Header_Size;
         Element_Level--;
         BookMark_Set(); //Remembering this place, for stream parsing in phase 2
         Element_Level++;
         Buffer_Offset+=(size_t)Header_Size;
+
+        FirstMdatPos=File_Offset+Buffer_Offset-Header_Size;
     }
+    if (File_Offset+Buffer_Offset>LastMdatPos)
+        LastMdatPos=File_Offset+Buffer_Offset+Element_TotalSize_Get();
 
     //Parsing
-    Skip_XX(Element_TotalSize_Get(),                            "Data");
+    #if MEDIAINFO_TRACE
+        if (Trace_Activated)
+            Param("Data", Ztring("(")+Ztring::ToZtring(Element_TotalSize_Get())+Ztring(" bytes)"));
+    #endif //MEDIAINFO_TRACE
+    Element_Offset=Element_TotalSize_Get(); //Not using Skip_XX() because we want to skip data we don't have, and Skip_XX() does a test on size of buffer
 }
 
 //---------------------------------------------------------------------------
@@ -990,61 +1480,111 @@
         return;
     }
 
-    Demux(Buffer+Buffer_Offset, (size_t)Element_Size, ContentType_MainStream);
+    std::map<int32u, stream>::iterator Stream=Streams.find((int32u)Element_Code);
+    if (Stream==Streams.end())
+        return;
+    #if MEDIAINFO_DEMUX
+        if (Streams[(int32u)Element_Code].StreamKind!=Stream_Menu && Streams[(int32u)Element_Code].StreamKind!=Stream_Max)
+        {
+            //DTS
+            Frame_Count_NotParsedIncluded=Stream->second.stts_FramePos;
+            if (Stream->second.stts_Durations_Pos<Stream->second.stts_Durations.size())
+            {
+                stream::stts_durations::iterator stts_Duration=Stream->second.stts_Durations.begin()+Stream->second.stts_Durations_Pos;
+                FrameInfo.DTS=TimeCode_DtsOffset+(stts_Duration->DTS_Begin+(((int64u)stts_Duration->SampleDuration)*(Frame_Count_NotParsedIncluded-stts_Duration->Pos_Begin)))*1000000000/Stream->second.mdhd_TimeScale;
+                FrameInfo.DUR=((int64u)stts_Duration->SampleDuration)*1000000000/Stream->second.mdhd_TimeScale;
+                Streams[(int32u)Element_Code].stts_FramePos++;
+                if (Stream->second.stts_FramePos>=stts_Duration->Pos_End)
+                    Stream->second.stts_Durations_Pos++;
+                if (!Stream->second.stss.empty())
+                {
+                    Demux_random_access=false;
+                    for (size_t Pos=0; Pos<Stream->second.stss.size(); Pos++)
+                        if (Stream->second.stss[Pos]==Frame_Count_NotParsedIncluded)
+                        {
+                            Demux_random_access=true;
+                            break;
+                        }
+                }
+                else
+                    Demux_random_access=true;
+            }
+            else
+            {
+                FrameInfo.DTS=(int64u)-1;
+                FrameInfo.DUR=(int64u)-1;
+                Streams[(int32u)Element_Code].stts_FramePos++;
+            }
 
-    if (Stream[(int32u)Element_Code].Parser)
+            Demux_Level=Streams[(int32u)Element_Code].Demux_Level;
+            Demux(Buffer+Buffer_Offset, (size_t)Element_Size, ContentType_MainStream);
+        }
+    #endif //MEDIAINFO_DEMUX
+
+    if (Stream->second.Parser)
     {
-        Open_Buffer_Continue(Stream[(int32u)Element_Code].Parser);
+        #if MEDIAINFO_DEMUX
+            Stream->second.Parser->FrameInfo=FrameInfo;
+        #endif //MEDIAINFO_DEMUX
+
+        Open_Buffer_Continue(Stream->second.Parser);
         Element_Offset=Element_Size;
         Element_Show();
+
+        #if MEDIAINFO_DEMUX
+            if (!Stream->second.IsFilled && Stream->second.Parser->Status[IsFilled])
+            {
+                if (Stream->second.StreamKind==Stream_Menu) //If this is a TimeCode track
+                {
+                    if (((File_Mpeg4_TimeCode*)Stream->second.Parser)->Pos!=(int32u)-1)
+                    {
+                        for (std::map<int32u, stream>::iterator StreamTemp=Streams.begin(); StreamTemp!=Streams.end(); ++StreamTemp)
+                            if (StreamTemp->second.TimeCode_TrackID==Stream->first)
+                            {
+                                TimeCode_FrameOffset=((File_Mpeg4_TimeCode*)Stream->second.Parser)->Pos;
+                                TimeCode_DtsOffset=float64_int64s(((float64)TimeCode_FrameOffset)*1000000000*Stream->second.TimeCode->FrameDuration/Stream->second.TimeCode->TimeScale);
+                            }
+                    }
+                }
+
+                Stream->second.IsFilled=true;
+            }
+        #endif //MEDIAINFO_DEMUX
     }
     else
         Skip_XX(Element_Size,                                   "Data");
 
-    //Erasing Index if no more needed
-    mdat_StreamClear();
-    
     //Next piece of data
+    Element_Show();
     mdat_StreamJump();
 }
 
 //---------------------------------------------------------------------------
-void File_Mpeg4::mdat_StreamClear()
-{
-    if (Stream[(int32u)Element_Code].Parser==NULL || Stream[(int32u)Element_Code].Parser->Status[IsFinished])
-    {
-        std::map<int64u, mdat_Pos_Type>::iterator Temp=mdat_Pos.begin();
-        while (Temp!=mdat_Pos.end())
-        {
-            std::map<int64u, mdat_Pos_Type>::iterator Stream_Pos_Temp=Temp;
-            bool Useful=true;
-            if (Temp->second.StreamID==(int32u)Element_Code)
-                Useful=false;
-
-            Temp++;
-
-            if (!Useful)
-                mdat_Pos.erase(Stream_Pos_Temp);
-        }
-    }
-}
-
-//---------------------------------------------------------------------------
 void File_Mpeg4::mdat_StreamJump()
 {
+    //Finding right file offset
     int64u ToJump=File_Size;
-    if (!mdat_Pos.empty())
-        ToJump=mdat_Pos.begin()->first;
+    /*if (!mdat_Pos_ToParseInPriority_StreamIDs.empty())
+    {
+        //Hanlding StreamIDs to pars in priority
+        if (!Streams[mdat_Pos_ToParseInPriority_StreamIDs[0]].stco.empty())
+            ToJump=Streams[mdat_Pos_ToParseInPriority_StreamIDs[0]].stco[0];
+        //if (<File_Offset+Buffer_Offset+Element_TotalSize_Get(Element_Level-1)) //If in this element, else
+            mdat_Pos_ToParseInPriority_StreamIDs.erase(mdat_Pos_ToParseInPriority_StreamIDs.begin());
+    }
+    else*/ if (mdat_Pos_Temp!=mdat_Pos.end())
+        ToJump=mdat_Pos_Temp->first;
     if (ToJump>File_Size)
         ToJump=File_Size;
-    if (ToJump>=File_Offset+Buffer_Offset+Element_TotalSize_Get(Element_Level-1)) //We want always Element mdat
+    /*if (ToJump>=File_Offset+Buffer_Offset+Element_TotalSize_Get(Element_Level-1)) //We want always Element mdat
     {
         if (!Status[IsAccepted])
             Data_Accept("MPEG-4");
         Data_GoTo(File_Offset+Buffer_Offset+Element_TotalSize_Get(Element_Level-1), "MPEG-4"); //Not in this chunk
+        Element_Show();
         IsParsing_mdat=false;
     }
-    else if (ToJump!=File_Offset+Buffer_Offset+Element_Size)
+    else*/ if (ToJump!=File_Offset+Buffer_Offset+Element_Size)
     {
         if (!Status[IsAccepted])
             Data_Accept("MPEG-4");
@@ -1085,7 +1625,7 @@
     Get_B4(number_of_entry,                                     "number_of_entry");
     for(int32u Pos=0; Pos<number_of_entry; Pos++)
     {
-        Element_Begin("entry");
+        Element_Begin1("entry");
         int64u time, moof_offset;
         Get_B_DEPENDOFVERSION(time,                             "time");
         Get_B_DEPENDOFVERSION(moof_offset,                      "moof_offset");
@@ -1113,7 +1653,7 @@
             case 3 : Skip_B4(                                   "sample_num"); break;
             default: ;
         }
-        Element_End();
+        Element_End0();
     }
 }
 
@@ -1121,6 +1661,20 @@
 void File_Mpeg4::moof()
 {
     Element_Name("Movie Fragment");
+
+    if (IsSecondPass)
+    {
+        #if MEDIAINFO_TRACE
+            if (Trace_Activated)
+                Param("Data", Ztring("(")+Ztring::ToZtring(Element_TotalSize_Get())+Ztring(" bytes)"));
+        #endif //MEDIAINFO_TRACE
+        Element_Offset=Element_TotalSize_Get(); //Not using Skip_XX() because we want to skip data we don't have, and Skip_XX() does a test on size of buffer
+        return;
+    }
+
+    IsFragmented=true;
+    moof_base_data_offset=File_Offset+Buffer_Offset-Header_Size;
+    data_offset_present=true;
 }
 
 //---------------------------------------------------------------------------
@@ -1136,6 +1690,12 @@
 void File_Mpeg4::moof_traf()
 {
     Element_Name("Track Fragment");
+
+    //Filling
+    moof_traf_base_data_offset=(int64u)-1;
+    Stream=Streams.begin(); //Using first track in case there is no track header
+    moof_traf_default_sample_duration=Stream->second.mvex_trex_default_sample_duration;
+    moof_traf_default_sample_size=Stream->second.mvex_trex_default_sample_size;
 }
 
 //---------------------------------------------------------------------------
@@ -1147,14 +1707,14 @@
     //for (int32u Pos=0; Pos<sample_count; Pos++) //sample_count should be taken from stsz or stz2
     while (Element_Offset<Element_Size)
     {
-        Element_Begin("sample");
+        Element_Begin1("sample");
         BS_Begin();
         Skip_S1(2,                                              "reserved");
-        Info_S1(2, sample_depends_on,                           "sample_depends_on"); Param_Info(Mpeg4_sample_depends_on[sample_depends_on]);
-        Info_S1(2, sample_is_depended_on,                       "sample_is_depended_on"); Param_Info(Mpeg4_sample_is_depended_on[sample_is_depended_on]);
-        Info_S1(2, sample_has_redundancy,                       "sample_has_redundancy"); Param_Info(Mpeg4_sample_has_redundancy[sample_has_redundancy]);
+        Info_S1(2, sample_depends_on,                           "sample_depends_on"); Param_Info1(Mpeg4_sample_depends_on[sample_depends_on]);
+        Info_S1(2, sample_is_depended_on,                       "sample_is_depended_on"); Param_Info1(Mpeg4_sample_is_depended_on[sample_is_depended_on]);
+        Info_S1(2, sample_has_redundancy,                       "sample_has_redundancy"); Param_Info1(Mpeg4_sample_has_redundancy[sample_has_redundancy]);
         BS_End();
-        Element_End();
+        Element_End0();
     }
 }
 
@@ -1171,17 +1731,27 @@
         Get_Flags (Flags,  4, default_sample_size_present,      "default-sample-size-present");
         Get_Flags (Flags,  5, default_sample_flags_present,     "default-sample-flags-present");
         Skip_Flags(Flags, 16,                                   "duration-is-empty");
-    Skip_B4(                                                    "track_ID");
+    Get_B4 (moov_trak_tkhd_TrackID,                             "track_ID");
     if (base_data_offset_present)
-        Skip_B8(                                                "base_data_offset");
+        Get_B8 (moof_traf_base_data_offset,                     "base_data_offset");
     if (sample_description_index_present)
         Skip_B4(                                                "sample_description_index");
     if (default_sample_duration_present)
-        Skip_B4(                                                "default_sample_duration");
+        Get_B4 (moof_traf_default_sample_duration,              "default_sample_duration");
+    else
+        moof_traf_default_sample_duration=Stream->second.mvex_trex_default_sample_duration;
     if (default_sample_size_present)
-        Skip_B4(                                                "default_sample_size");
+        Get_B4 (moof_traf_default_sample_size,                  "default_sample_size");
+    else
+        moof_traf_default_sample_size=Stream->second.mvex_trex_default_sample_size;
     if (default_sample_flags_present)
         Skip_B4(                                                "default_sample_flags");
+
+    FILLING_BEGIN();
+        Stream=Streams.find(moov_trak_tkhd_TrackID);
+        if (Stream==Streams.end())
+            Stream=Streams.begin();
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -1191,7 +1761,7 @@
 
     //Parsing
     int32u sample_count;
-    bool data_offset_present, first_sample_flags_present, sample_duration_present, sample_size_present, sample_flags_present, sample_composition_time_offset_present;
+    bool first_sample_flags_present, sample_duration_present, sample_size_present, sample_flags_present, sample_composition_time_offset_present;
         Get_Flags (Flags,  0, data_offset_present,              "data-offset-present");
         Get_Flags (Flags,  2, first_sample_flags_present,       "first-sample-flags-present");
         Get_Flags (Flags,  8, sample_duration_present,          "sample-duration-present");
@@ -1199,22 +1769,57 @@
         Get_Flags (Flags, 10, sample_flags_present,             "sample-flags-present");
         Get_Flags (Flags, 11, sample_composition_time_offset_present, "sample-composition-time-offsets-present");
     Get_B4 (sample_count,                                       "sample_count");
+    int64u data_offset_Final=moof_traf_base_data_offset!=(int64u)-1?moof_traf_base_data_offset:moof_base_data_offset;
     if (data_offset_present)
-        Skip_B4(                                                "data_offset");
+    {
+        int32u data_offset;
+        Get_B4 (data_offset,                                    "data_offset");
+        data_offset_Final+=data_offset;
+    }
+
+    //Filling
+    if (moof_traf_base_data_offset!=(int64u)-1 || data_offset_present)
+        Stream->second.stco.push_back(data_offset_Final);
+    stream::stsc_struct Stsc;
+    if (Stream->second.stsc.empty())
+        Stsc.FirstChunk=1;
+    else
+        Stsc.FirstChunk=Stream->second.stsc[Stream->second.stsc.size()-1].FirstChunk+1;
+    Stsc.SamplesPerChunk=sample_count;
+    Stream->second.stsc.push_back(Stsc);
+    if (!sample_duration_present)
+        moov_trak_mdia_minf_stbl_stts_Common(sample_count, moof_traf_default_sample_duration);
+    if (!sample_size_present)
+        Stream->second.stsz.resize(Stream->second.stsz.size()+sample_count, moof_traf_default_sample_size);
+
     if (first_sample_flags_present)
         Skip_B4(                                                "first_sample_flags");
     for (int32u Pos=0; Pos<sample_count; Pos++)
     {
-        Element_Begin("sample");
+        Element_Begin1("sample");
         if (sample_duration_present)
-            Skip_B4(                                            "sample_duration");
+        {
+            int32u sample_duration;
+            Get_B4 (sample_duration,                            "sample_duration");
+
+            moov_trak_mdia_minf_stbl_stts_Common(1, sample_duration);
+        }
         if (sample_size_present)
-            Skip_B4(                                            "sample_size");
+        {
+            int32u sample_size;
+            Get_B4 (sample_size,                                "sample_size");
+
+            //Filling
+            Stream->second.stsz_StreamSize+=sample_size;
+            Stream->second.stsz_Total.push_back(sample_size);
+            if (Stream->second.stsz.size()<300 || MediaInfoLib::Config.ParseSpeed_Get()==1.00)
+                Stream->second.stsz.push_back(sample_size);
+        }
         if (sample_flags_present)
             Skip_B4(                                            "sample_flags");
         if (sample_composition_time_offset_present)
             Skip_B4(                                            "sample_composition_time_offset");
-        Element_End();
+        Element_End0();
     }
 }
 
@@ -1229,11 +1834,28 @@
     }
     Element_Name("File header");
 
-    if (!Stream.empty())
+    if (IsSecondPass || FirstMoovPos!=(int64u)-1) //Currently, the 1 moov atom is used
     {
-        Skip_XX(Element_TotalSize_Get(),                        "Duplicated moov");
+        #if MEDIAINFO_TRACE
+            if (Trace_Activated)
+                Param("Data", Ztring("(")+Ztring::ToZtring(Element_TotalSize_Get())+Ztring(" bytes)"));
+        #endif //MEDIAINFO_TRACE
+        Element_Offset=Element_TotalSize_Get(); //Not using Skip_XX() because we want to skip data we don't have, and Skip_XX() does a test on size of buffer
         return;
     }
+
+    if (FirstMoovPos==(int64u)-1)
+        FirstMoovPos=File_Offset+Buffer_Offset-Header_Size;
+    /*
+    else
+    {
+        //In case of more than 1 moov atom, the last one is used (previous ones are trashed)
+        Streams.clear();
+        for (size_t StreamKind=Stream_General+1; StreamKind<Stream_Max; StreamKind++)
+            while (Count_Get((stream_t)StreamKind))
+                Stream_Erase((stream_t)StreamKind, Count_Get((stream_t)StreamKind)-1);
+    }
+    */
 }
 
 //---------------------------------------------------------------------------
@@ -1278,7 +1900,16 @@
         }
 
         //Exiting this element
-        Skip_XX(Element_Size,                                   "Will be parsed");
+        Skip_XX(Element_Size-Element_Offset,                    "Will be parsed");
+
+        //Configuring level
+        std::vector<int64u> Element_Sizes_Sav;
+        size_t Element_Level_Sav=Element_Level;
+        while(Element_Level)
+        {
+            Element_Sizes_Sav.push_back(Element_TotalSize_Get());
+            Element_End0();
+        }
 
         //Configuring buffer
         const int8u* Buffer_Sav=Buffer;
@@ -1294,17 +1925,8 @@
         Buffer_Offset=0;
         Buffer_Offset_Temp=0;
 
-        //Configuring level
-        std::vector<int64u> Element_Sizes_Sav;
-        size_t Element_Level_Sav=Element_Level;
-        while(Element_Level)
-        {
-            int64u A=Element_TotalSize_Get();
-            Element_Sizes_Sav.push_back(A);
-            Element_End();
-        }
-
         //Configuring file size
+        int64u File_Offset_Sav=File_Offset;
         int64u File_Size_Sav=File_Size;
         if (File_Size<File_Offset+Buffer_Offset+Element_Offset+Dest_Size)
             File_Size=File_Offset+Buffer_Offset+Element_Offset+Dest_Size;
@@ -1312,27 +1934,16 @@
         Header_Fill_Size(File_Size);
         Element_Level--;
 
+        //Configuring some status info
+        FirstMoovPos=(int64u)-1;
+
         //Parsing
         Open_Buffer_Continue(Dest, Dest_Size);
         delete[] Dest; //Dest=NULL;
 
-        //Resetting file size
+        //Resetting file info
+        File_Offset=File_Offset_Sav;
         File_Size=File_Size_Sav;
-        while(Element_Level)
-            Element_End();
-        Element_Level++;
-        Header_Fill_Size(File_Size);
-        Element_Level--;
-
-        //Configuring level
-        while(Element_Level<Element_Level_Sav)
-        {
-            Element_Begin();
-            Element_Begin();
-            Header_Fill_Size(Element_Sizes_Sav[0]);
-            Element_End();
-            //Ztring(), Element_Sizes_Sav[Element_Level_Sav-1-Element_Level]);
-        }
 
         //Resetting buffer
         Buffer=Buffer_Sav;
@@ -1342,6 +1953,20 @@
         Buffer_Offset=Buffer_Offset_Sav;
         Buffer_Offset_Temp=Buffer_Offset_Temp_Sav;
 
+        //Configuring level
+        while(Element_Level)
+            Element_End0();
+        Element_Level++;
+        Header_Fill_Size(File_Size);
+        Element_Level--;
+        while(Element_Level<Element_Level_Sav)
+        {
+            Element_Begin0();
+            Element_Begin0();
+            Header_Fill_Size(Element_Sizes_Sav[0]);
+            Element_End0();
+        }
+
         //Filling
         Fill(Stream_General, 0, General_Format_Settings, "Compressed header");
     FILLING_END();
@@ -1413,10 +2038,16 @@
     //Parsing
     Skip_C4(                                                    "Type (Quicktime)"); //Filled if Quicktime
     Get_C4 (moov_meta_hdlr_Type,                                "Metadata type");
-    Skip_C4(                                                    "Manufacturer");
-    Skip_B4(                                                    "Component reserved flags"); //Filled if Quicktime
-    Skip_B4(                                                    "Component reserved flags mask"); //Filled if Quicktime
-    Skip_Local(Element_Size-Element_Offset,                     "Component type name");
+    if (Element_Offset+12<=Element_Size)
+    {
+        Skip_C4(                                                "Manufacturer");
+        Skip_B4(                                                "Component reserved flags"); //Filled if Quicktime
+        Skip_B4(                                                "Component reserved flags mask"); //Filled if Quicktime
+        if (Element_Offset<Element_Size)
+            Skip_Local(Element_Size-Element_Offset,             "Component type name");
+    }
+    else if (Element_Offset<Element_Size)
+        Skip_XX(Element_Size-Element_Offset,                    "Unknown");
 }
 
 //---------------------------------------------------------------------------
@@ -1469,7 +2100,21 @@
     //Parsing
     int32u Kind, Language;
     Ztring Value;
-    Get_B4(Kind,                                                  "Kind"); Param_Info(Mpeg4_Meta_Kind(Kind));
+    Get_B4(Kind,                                                  "Kind"); Param_Info1(Mpeg4_Meta_Kind(Kind));
+
+    //Error detection
+    switch (Element_Code_Get(Element_Level-1))
+    {
+        case Elements::moov_meta__disk :
+        case Elements::moov_meta__trkn :
+                                         if (Kind)
+                                         {
+                                             //Not normal
+                                             Kind=0x00;
+                                         }
+        default                        : ;
+    }
+
     switch (Kind)
     {
         case 0x00 : //Binary
@@ -1487,8 +2132,10 @@
                                 Skip_B2(                        "Reserved"); //Sometimes there are 2 more bytes, unknown
 
                             //Filling
-                            Fill(Stream_General, 0, General_Part_Position, Position, 10, true);
-                            Fill(Stream_General, 0, General_Part_Position_Total, Total, 10, true);
+                            if (Position)
+                                Fill(Stream_General, 0, General_Part_Position, Position, 10, true);
+                            if (Total)
+                                Fill(Stream_General, 0, General_Part_Position_Total, Total, 10, true);
                             }
                             return;
                         case Elements::moov_meta__trkn :
@@ -1502,8 +2149,10 @@
                                 Skip_B2(                        "Reserved"); //Sometimes there are 2 more bytes, unknown
 
                             //Filling
-                            Fill(Stream_General, 0, General_Track_Position, Position, 10, true);
-                            Fill(Stream_General, 0, General_Track_Position_Total, Total, 10, true);
+                            if (Position)
+                                Fill(Stream_General, 0, General_Track_Position, Position, 10, true);
+                            if (Total)
+                                Fill(Stream_General, 0, General_Track_Position_Total, Total, 10, true);
                             }
                             return;
                         case Elements::moov_meta__covr :
@@ -1533,8 +2182,8 @@
                             }
                             return;
                         default:
-                            Skip_XX(Element_Size,               "To decode!");
-                            Value=_T("(Binary)");
+                            Skip_XX(Element_Size-Element_Offset,"To decode!");
+                            Value=__T("(Binary)");
                     }
                     break;
         case 0x01 : //UTF-8
@@ -1553,13 +2202,31 @@
                     }
                      break;
         case 0x02 : //UTF-16
-                    Value=_T("UTF-16 encoding not yet supported");
+                    Value=__T("UTF-16 encoding not yet supported");
                     break;
         case 0x03 : //Mac String
                     Get_B4(Language,                            "Language"); //To confirm
                     Get_Local(Element_Size-Element_Offset, Value, "Value");
                     break;
         case 0x0D : //JPEG
+                    Get_B4(Language,                            "Language");
+                    switch (Element_Code_Get(Element_Level-1))
+                    {
+                        case Elements::moov_meta__covr :
+                            {
+                            std::string Data_Raw((const char*)(Buffer+(size_t)(Buffer_Offset+Element_Offset)), (size_t)(Element_Size-Element_Offset));
+                            std::string Data_Base64(Base64::encode(Data_Raw));
+                            Skip_XX(Element_Size-Element_Offset, "Data");
+
+                            //Filling
+                            Fill(Stream_General, 0, General_Cover_Data, Data_Base64);
+                            Fill(Stream_General, 0, General_Cover, "Yes");
+                            }
+                            return;
+                        default:
+                            Value=__T("(Binary)");
+                    }
+                    break;
         case 0x0E : //PNG
                     Get_B4(Language,                            "Language");
                     switch (Element_Code_Get(Element_Level-1))
@@ -1576,7 +2243,7 @@
                             }
                             return;
                         default:
-                            Value=_T("(Binary)");
+                            Value=__T("(Binary)");
                     }
                     break;
         case 0x15 : //Signed Integer
@@ -1588,48 +2255,86 @@
                         case 2 : {int16u ValueI; Get_B2(ValueI, "Value"); Value.From_Number((int16s)ValueI);}; break;
                         case 4 : {int32u ValueI; Get_B4(ValueI, "Value"); Value.From_Number((int32s)ValueI);}; break;
                         case 8 : {int64u ValueI; Get_B8(ValueI, "Value"); Value.From_Number((int64s)ValueI);}; break;
-                        default  : Value=_T("Unknown kind of integer value!");
+                        default  : Value=__T("Unknown kind of integer value!");
                     }
                     }
                     break;
         case 0x16 : //Float 32
                     Skip_XX(4,                                  "To decode!");
-                    //Value=_T("Float32 encoding not yet supported");
+                    //Value=__T("Float32 encoding not yet supported");
                     break;
         case 0x17 : //Float 64
                     Skip_XX(8,                                  "To decode!");
-                    Trusted=1000;
-                    //Value=_T("Float64 encoding not yet supported");
+                    //Value=__T("Float64 encoding not yet supported");
                     break;
-        default: Value=_T("Unknown kind of value!");
+        default: Value=__T("Unknown kind of value!");
    }
 
-   FILLING_BEGIN();
-        switch (moov_meta_hdlr_Type)
-        {
-            case Elements::moov_meta_hdlr_mdir :
-                {
+    switch (moov_meta_hdlr_Type)
+    {
+        case Elements::moov_meta_hdlr_mdir :
+            {
+                FILLING_BEGIN();
                     std::string Parameter;
                     if (Element_Code_Get(Element_Level-1)==Elements::moov_meta______)
                         Metadata_Get(Parameter, moov_meta_ilst_xxxx_name_Name);
                     else
                         Metadata_Get(Parameter, Element_Code_Get(Element_Level-1));
+                    if (Parameter=="Encoded_Application")
+                    {
+                        if (Value.find(__T("Nero AAC codec"))==0)
+                        {
+                            ZtringList List; List.Separator_Set(0, __T(" / "));
+                            List.Write(Value);
+                            Element_Info1(Parameter.c_str());
+                            Fill(Stream_Audio, StreamPos_Last, Audio_Encoded_Library_Name, List(0), true);
+                            Fill(Stream_Audio, StreamPos_Last, Audio_Encoded_Library_Version, List(1), true);
+                            Parameter.clear(); //Set as already filled
+                        }
+                    }
+                    if (Parameter=="cdec")
+                    {
+                        if (Value.find(__T("ndaudio "))==0)
+                        {
+                            ZtringList List; List.Separator_Set(0, __T(" / "));
+                            List.Write(Value);
+                            Element_Info1(Parameter.c_str());
+                            Fill(Stream_Audio, StreamPos_Last, Audio_Encoded_Library_Name, "Nero AAC codec", Unlimited, true, true);
+                            Fill(Stream_Audio, StreamPos_Last, Audio_Encoded_Library_Name, List(0).substr(8, string::npos), true);
+                            Fill(Stream_Audio, StreamPos_Last, Audio_Encoded_Library_Settings, List(1), true);
+                            Parameter.clear(); //Set as already filled
+                        }
+                    }
+                    if (Parameter=="Compilation")
+                    {
+                        if (Value==__T("1"))
+                            Value=__T("Yes");
+                        else
+                            Value.clear(); //This is usually set to 0 even if the user did not explicitely indicated something (default)
+                    }
+                    if (Parameter=="BPM")
+                    {
+                        if (Value==__T("0"))
+                            Value.clear();
+                    }
                     if (!Parameter.empty())
                     {
-                        Element_Info(Parameter.c_str());
+                        Element_Info1(Parameter.c_str());
                         Fill(Stream_General, 0, Parameter.c_str(), Value, true);
                     }
-                }
-                break;
-            case Elements::moov_meta_hdlr_mdta :
-                if(!moov_udta_meta_keys_List.empty())
-                {
+                FILLING_END();
+            }
+            break;
+        case Elements::moov_meta_hdlr_mdta :
+            if(!moov_udta_meta_keys_List.empty())
+            {
+                FILLING_BEGIN();
                     std::string Parameter;
                     Metadata_Get(Parameter, moov_udta_meta_keys_List[moov_udta_meta_keys_ilst_Pos<moov_udta_meta_keys_List.size()?moov_udta_meta_keys_ilst_Pos:moov_udta_meta_keys_List.size()-1]);
                     if (Parameter=="com.apple.quicktime.version")
-                        Vendor_Version=Value.SubString(_T(""), _T(" "));
+                        Vendor_Version=Value.SubString(__T(""), __T(" "));
                     else if (Parameter=="com.apple.quicktime.player.version")
-                        Vendor_Version=Value.SubString(_T(""), _T(" "));
+                        Vendor_Version=Value.SubString(__T(""), __T(" "));
                     else if (Parameter=="com.apple.quicktime.comment")
                         Fill(Stream_General, 0, General_Comment, Value, true);
                     else if (Parameter=="com.apple.quicktime.description")
@@ -1640,21 +2345,23 @@
                         Fill(Stream_General, 0, "Media/History/UUID", Value);
                     else if (!Parameter.empty())
                         Fill(Stream_General, 0, Parameter.c_str(), Value, true);
-                    moov_udta_meta_keys_ilst_Pos++;
-                }
-                else
-                    Param("Keys atom is missing!", 0);
+                FILLING_END();
+                moov_udta_meta_keys_ilst_Pos++;
+            }
+            else
+                Param2("Keys atom is missing!", 0);
 
-            case Elements::moov_udta_meta :
-                {
+        case Elements::moov_udta_meta :
+            {
+                FILLING_BEGIN();
                     std::string Parameter;
                     Metadata_Get(Parameter, (int32u)Element_Code_Get(Element_Level-1));
                     if (!Parameter.empty())
                         Fill(Stream_General, 0, Parameter.c_str(), Value, true);
-                }
-            default: ;
-        }
-   FILLING_END();
+                FILLING_END();
+            }
+        default: ;
+    }
 }
 
 //---------------------------------------------------------------------------
@@ -1709,11 +2416,13 @@
     NAME_VERSION_FLAG("Movie Extends Defaults");
 
     //Parsing
-    Skip_B4(                                                    "track_ID");
+    int32u default_sample_duration;
+    int32u default_sample_size;
+    Get_B4 (moov_trak_tkhd_TrackID,                             "track_ID");
     Skip_B4(                                                    "default_sample_description_index");
-    Skip_B4(                                                    "default_sample_duration");
-    Skip_B4(                                                    "default_sample_size");
-    Element_Begin("default_sample_flags", 4);
+    Get_B4 (default_sample_duration,                            "default_sample_duration");
+    Get_B4 (default_sample_size,                                "default_sample_size");
+    Element_Begin1("default_sample_flags");
         BS_Begin();
         Skip_S1(6,                                              "reserved");
         Skip_S1(2,                                              "sample_depends_on");
@@ -1723,7 +2432,12 @@
         Skip_SB(                                                "sample_is_difference_sample");
         BS_End();
         Skip_B2(                                                "sample_degradation_priority");
-    Element_End();
+    Element_End0();
+
+    FILLING_BEGIN()
+        Streams[moov_trak_tkhd_TrackID].mvex_trex_default_sample_duration=default_sample_duration;
+        Streams[moov_trak_tkhd_TrackID].mvex_trex_default_sample_size=default_sample_size;
+    FILLING_END()
 }
 
 //---------------------------------------------------------------------------
@@ -1739,12 +2453,12 @@
     int16u Volume;
     Get_DATE1904_DEPENDOFVERSION(Date_Created,                  "Creation time");
     Get_DATE1904_DEPENDOFVERSION(Date_Modified,                 "Modification time");
-    Get_B4(TimeScale,                                           "Time scale"); Param_Info(Ztring::ToZtring(TimeScale)+_T(" Hz"));
-    Get_B_DEPENDOFVERSION(Duration,                             "Duration"); Param_Info(Ztring::ToZtring((int64u)Duration*1000/TimeScale)+_T(" ms"));
-    Get_B4 (Rate,                                               "Preferred rate"); Param_Info(Ztring::ToZtring(((float32)Rate)/0x10000));
-    Get_B2 (Volume,                                             "Preferred volume"); Param_Info(Ztring::ToZtring(((float32)Volume)/0x100));
+    Get_B4(TimeScale,                                           "Time scale"); Param_Info1(Ztring::ToZtring(TimeScale)+__T(" Hz"));
+    Get_B_DEPENDOFVERSION(Duration,                             "Duration"); Param_Info1(Ztring::ToZtring((int64u)Duration*1000/TimeScale)+__T(" ms"));
+    Get_B4 (Rate,                                               "Preferred rate"); Param_Info1(Ztring::ToZtring(((float32)Rate)/0x10000));
+    Get_B2 (Volume,                                             "Preferred volume"); Param_Info1(Ztring::ToZtring(((float32)Volume)/0x100));
     Skip_XX(10,                                                 "Reserved");
-    Element_Begin("Matrix structure", 36);
+    Element_Begin1("Matrix structure");
         Get_BFP4(16, a,                                         "a (width scale)");
         Get_BFP4(16, b,                                         "b (width rotate)");
         Get_BFP4( 2, u,                                         "u (width angle)");
@@ -1754,7 +2468,7 @@
         Get_BFP4(16, x,                                         "x (position left)");
         Get_BFP4(16, y,                                         "y (position top)");
         Get_BFP4( 2, w,                                         "w (divider)");
-    Element_End();
+    Element_End0();
     Skip_B4(                                                    "Preview time");
     Skip_B4(                                                    "Preview duration");
     Skip_B4(                                                    "Poster time");
@@ -1769,15 +2483,15 @@
             //int32u Duration=(int32u)(((float)Duration)/TimeScale*1000);
             //Fill("Duration", Duration);
         }
-        if (Date_Created.find(_T('\r'))!=std::string::npos)
-            Date_Created.resize(Date_Created.find(_T('\r')));
-        if (Date_Created.find(_T('\n'))!=std::string::npos)
-            Date_Created.resize(Date_Created.find(_T('\n')));
+        if (Date_Created.find(__T('\r'))!=std::string::npos)
+            Date_Created.resize(Date_Created.find(__T('\r')));
+        if (Date_Created.find(__T('\n'))!=std::string::npos)
+            Date_Created.resize(Date_Created.find(__T('\n')));
         Fill(StreamKind_Last, StreamPos_Last, "Encoded_Date", Date_Created);
-        if (Date_Modified.find(_T('\r'))!=std::string::npos)
-            Date_Modified.resize(Date_Modified.find(_T('\r')));
-        if (Date_Modified.find(_T('\n'))!=std::string::npos)
-            Date_Modified.resize(Date_Modified.find(_T('\n')));
+        if (Date_Modified.find(__T('\r'))!=std::string::npos)
+            Date_Modified.resize(Date_Modified.find(__T('\r')));
+        if (Date_Modified.find(__T('\n'))!=std::string::npos)
+            Date_Modified.resize(Date_Modified.find(__T('\n')));
         Fill(StreamKind_Last, StreamPos_Last, "Tagged_Date", Date_Modified);
     FILLING_END();
 }
@@ -1795,6 +2509,8 @@
         moov_trak_tkhd_DisplayAspectRatio=0;
         moov_trak_tkhd_Rotation=0;
         Stream_Prepare(Stream_Max); //clear filling
+        Streams.erase((int32u)-1);
+        Fill(StreamKind_Last, StreamPos_Last, "StreamOrder", Streams.size());
     FILLING_END();
 }
 
@@ -1810,20 +2526,18 @@
     NAME_VERSION_FLAG("Edit List");
 
     //Parsing
-    int32u Count, Duration, Time;
-    bool NoMoreEmpty=false;
+    int32u Count;
     Get_B4 (Count,                                              "Number of entries");
     for (int32u Pos=0; Pos<Count; Pos++)
     {
-        Element_Begin("Entry", 12);
-        Get_B4 (Duration,                                       "Track duration"); Param_Info((int64u)Duration*1000/TimeScale, " ms");
-        Get_B4 (Time,                                           "Media time"); if (Time!=(int32u)-1) {Param_Info((int64u)Time*1000/TimeScale, " ms");}
-        if (Time==(int32u)-1 && !NoMoreEmpty)
-            Fill(StreamKind_Last, StreamPos_Last, "Delay", (int64u)Duration*1000/TimeScale);
-        if (Time!=(int32u)-1)
-            NoMoreEmpty=true;
-        Info_B4(MediaRate,                                      "Media rate"); Param_Info(((float)MediaRate)/0x10000);
-        Element_End();
+        stream::edts_struct edts;
+        Element_Begin1("Entry");
+        Get_B4 (edts.Duration,                                  "Track duration"); Param_Info2((int64u)edts.Duration*1000/TimeScale, " ms");
+        Get_B4 (edts.Delay,                                     "Media time"); Param_Info2C((edts.Delay!=(int32u)-1), (int64u)edts.Delay*1000/TimeScale, " ms");
+        Get_B4 (edts.Rate,                                      "Media rate"); Param_Info1(((float)edts.Rate)/0x10000);
+        Element_End0();
+
+        Streams[moov_trak_tkhd_TrackID].edts.push_back(edts);
     }
 }
 
@@ -1833,7 +2547,7 @@
     Element_Name("Preload");
 
     //Parsing
-    Info_B4(PreloadTime,                                        "Preload time"); Param_Info(PreloadTime*1000/TimeScale, " ms");
+    Info_B4(PreloadTime,                                        "Preload time"); Param_Info2(PreloadTime*1000/TimeScale, " ms");
     Info_B4(PreloadFlags,                                       "Flags");
         Skip_Flags(PreloadFlags, 0,                             "PreloadAlways");
         Skip_Flags(PreloadFlags, 1,                             "TrackEnabledPreload");
@@ -1848,10 +2562,6 @@
 void File_Mpeg4::moov_trak_mdia()
 {
     Element_Name("Media");
-
-    FILLING_BEGIN();
-        moov_trak_mdia_mdhd_Duration=0;
-    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -1884,7 +2594,7 @@
             if (Title.empty())
                 Title.From_Local(TitleS.c_str()); //Trying Local...
         }
-        if (Title.find(_T("Handler"))!=std::string::npos || Title.find(_T("vide"))!=std::string::npos || Title.find(_T("soun"))!=std::string::npos)
+        if (Title.find(__T("Handler"))!=std::string::npos || Title.find(__T("vide"))!=std::string::npos || Title.find(__T("soun"))!=std::string::npos)
             Title.clear(); //This is not a Title
     }
 
@@ -1892,6 +2602,12 @@
         if (!Title.empty()) Fill(StreamKind_Last, StreamPos_Last, "Title",    Title);
         switch (SubType)
         {
+            case Elements::moov_trak_mdia_hdlr_clcp :
+                if (StreamKind_Last!=Stream_Text)
+                {
+                    Stream_Prepare(Stream_Text);
+                }
+                break;
             case Elements::moov_trak_mdia_hdlr_soun :
                 if (StreamKind_Last!=Stream_Audio)
                 {
@@ -1917,7 +2633,7 @@
                 if (StreamKind_Last!=Stream_Text)
                 {
                     Stream_Prepare(Stream_Text);
-                    CodecID_Fill(_T("subp"), Stream_Text, StreamPos_Last, InfoCodecID_Format_Mpeg4);
+                    CodecID_Fill(__T("subp"), Stream_Text, StreamPos_Last, InfoCodecID_Format_Mpeg4);
                     Fill(StreamKind_Last, StreamPos_Last, Text_Codec, "subp");
                 }
                 break;
@@ -1934,8 +2650,8 @@
                 Vendor=0xFFFFFFFF; //Two names, this is two much
         }
 
-        Stream[moov_trak_tkhd_TrackID].StreamKind=StreamKind_Last;
-        Stream[moov_trak_tkhd_TrackID].StreamPos=StreamPos_Last;
+        Streams[moov_trak_tkhd_TrackID].StreamKind=StreamKind_Last;
+        Streams[moov_trak_tkhd_TrackID].StreamPos=StreamPos_Last;
     FILLING_END();
 }
 
@@ -1977,7 +2693,7 @@
     Element_Name("Input type");
 
     //Parsing
-    Info_B4(TypeModifierName,                                   "Type modifier name"); Param_Info(Mpeg4_TypeModifierName(TypeModifierName));
+    Info_B4(TypeModifierName,                                   "Type modifier name"); Param_Info1(Mpeg4_TypeModifierName(TypeModifierName));
 }
 
 //---------------------------------------------------------------------------
@@ -2007,20 +2723,27 @@
     //Parsing
     Ztring Date_Created, Date_Modified;
     int64u Duration;
+    int32u TimeScale;
     int16u Language;
     Get_DATE1904_DEPENDOFVERSION(Date_Created,                  "Creation time");
     Get_DATE1904_DEPENDOFVERSION(Date_Modified,                 "Modification time");
-    Get_B4(moov_trak_mdia_mdhd_TimeScale,                       "Time scale");
-    Get_B_DEPENDOFVERSION(Duration,                             "Duration");
-    Get_B2 (Language,                                           "Language"); Param_Info(Language_Get(Language));
+    Get_B4(TimeScale,                                           "Time scale");
+    Get_B_DEPENDOFVERSION(Duration,                             "Duration"); Param_Info2(Duration*1000/TimeScale, " ms"); Element_Info2(Duration*1000/TimeScale, " ms");
+    Get_B2 (Language,                                           "Language"); Param_Info1(Language_Get(Language));
     Skip_B2(                                                    "Quality");
 
     FILLING_BEGIN();
         Fill(StreamKind_Last, StreamPos_Last, "Language", Language_Get(Language));
-        if (moov_trak_mdia_mdhd_TimeScale)
+        Streams[moov_trak_tkhd_TrackID].mdhd_Duration=Duration;
+        Streams[moov_trak_tkhd_TrackID].mdhd_TimeScale=TimeScale;
+
+        //Coherency tests
+        if (Streams[moov_trak_tkhd_TrackID].tkhd_Duration*1.01>=Duration*0.99 && Streams[moov_trak_tkhd_TrackID].tkhd_Duration*0.99<=Duration*1.01 && TimeScale && File_Mpeg4::TimeScale!=TimeScale)
         {
-            moov_trak_mdia_mdhd_Duration=(int32u)(((float)Duration)/moov_trak_mdia_mdhd_TimeScale*1000);
-            Fill(StreamKind_Last, StreamPos_Last, "Duration", moov_trak_mdia_mdhd_Duration);
+            float64 Ratio=((float64)TimeScale)/((float64)File_Mpeg4::TimeScale);
+            Streams[moov_trak_tkhd_TrackID].tkhd_Duration=float64_int64s(Streams[moov_trak_tkhd_TrackID].tkhd_Duration/Ratio);
+            Clear(StreamKind_Last, StreamPos_Last, "Duration_Source");
+            Fill(StreamKind_Last, StreamPos_Last, "Duration", float64_int64s(((float64)Streams[moov_trak_tkhd_TrackID].tkhd_Duration)*1000/((float64)File_Mpeg4::TimeScale)), 10, true);
         }
     FILLING_END();
 }
@@ -2032,6 +2755,45 @@
 }
 
 //---------------------------------------------------------------------------
+void File_Mpeg4::moov_trak_mdia_minf_code()
+{
+    Element_Name("code (found in Avid?)");
+
+    //Parsing
+    Skip_B4(                                                    "Unknown");
+    Skip_B4(                                                    "Unknown");
+    Skip_B4(                                                    "Unknown");
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg4::moov_trak_mdia_minf_code_sean()
+{
+    Element_Name("sean (found in Avid?)");
+
+    //Parsing
+    Skip_B4(                                                    "Unknown");
+    Skip_B4(                                                    "Unknown");
+    Skip_B4(                                                    "Unknown");
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg4::moov_trak_mdia_minf_code_sean_RU_A()
+{
+    Element_Name("RU*A (found in Avid?)");
+
+    //Parsing
+    Ztring Path;
+    Skip_B4(                                                    "Unknown");
+    Skip_B4(                                                    "Unknown");
+    Skip_B4(                                                    "Unknown");
+    Get_Local(Element_Size-Element_Offset, Path,                "Path?");
+
+    FILLING_BEGIN();
+        Streams[moov_trak_tkhd_TrackID].File_Name=Path;
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
 void File_Mpeg4::moov_trak_mdia_minf_dinf()
 {
     Element_Name("Data Information");
@@ -2080,7 +2842,7 @@
     Ztring file_name_string, volume_name_string, Directory_Name;
     int16u record_size, record_version, alias_kind;
     int8u volume_name_string_length, file_name_string_length;
-    Element_Begin("Mac OS Alias Record");
+    Element_Begin1("Mac OS Alias Record");
     Skip_B4(                                                    "user type name/app creator code");
     Get_B2 (record_size,                                        "record size");
     Get_B2 (record_version,                                     "record version");
@@ -2090,7 +2852,7 @@
         return;
     }
     int64u End=Element_Offset-8+record_size;
-    Get_B2 (alias_kind,                                         "alias kind"); Param_Info(alias_kind?"directory":"file");
+    Get_B2 (alias_kind,                                         "alias kind"); Param_Info1(alias_kind?"directory":"file");
     Get_B1 (volume_name_string_length,                          "volume name string length");
     if (volume_name_string_length>27)
         volume_name_string_length=27;
@@ -2166,26 +2928,28 @@
         if (size%2)
             Skip_B1(                                            "Padding");
     }
-    Element_End(record_size);
+    Element_End0();
 
     if (Element_Offset<Element_Size)
         Skip_XX(Element_Size-Element_Offset,                    "Padding");
 
     FILLING_BEGIN();
-        Stream[moov_trak_tkhd_TrackID].File_Name.clear();
-        if (!Directory_Name.empty())
+        if (Streams[moov_trak_tkhd_TrackID].File_Name.empty()) //Priority to "code" version
         {
-            Stream[moov_trak_tkhd_TrackID].File_Name=Directory_Name;
-            Stream[moov_trak_tkhd_TrackID].File_Name+=ZenLib::PathSeparator;
+            if (!Directory_Name.empty())
+            {
+                Streams[moov_trak_tkhd_TrackID].File_Name+=Directory_Name;
+                Streams[moov_trak_tkhd_TrackID].File_Name+=ZenLib::PathSeparator;
+            }
+            Streams[moov_trak_tkhd_TrackID].File_Name+=file_name_string;
         }
-        Stream[moov_trak_tkhd_TrackID].File_Name+=file_name_string;
     FILLING_END();
 }
 
 //---------------------------------------------------------------------------
 void File_Mpeg4::moov_trak_mdia_minf_dinf_dref_rsrc()
 {
-    Element_Name("Ressource alias");
+    Element_Name("Resource alias");
 
     //Parsing
     Skip_B4(                                                    "Flags"); //bit 0 = external/internal data
@@ -2239,7 +3003,10 @@
         Skip_Flags(TextFace, 4,                                 "Shadow");
         Skip_Flags(TextFace, 5,                                 "Condense");
         Skip_Flags(TextFace, 6,                                 "Extend");
-    Skip_BFP4(16,                                               "Text size");
+    if (Element_Size>=25 && 25+Buffer[Buffer_Offset+24]==Element_Size)
+        Skip_BFP4(16,                                           "Text size"); //Non-Standard, but found in several files
+    else
+        Skip_B2(                                                "Text size");
     Skip_B2(                                                    "Text color (red)");
     Skip_B2(                                                    "Text color (green)");
     Skip_B2(                                                    "Text color (blue)");
@@ -2250,7 +3017,7 @@
     Skip_Local(FontNameSize,                                    "Font name");
 
     FILLING_BEGIN();
-        Stream[moov_trak_tkhd_TrackID].TimeCode_IsVisual=IsVisual;
+        Streams[moov_trak_tkhd_TrackID].TimeCode_IsVisual=IsVisual;
     FILLING_END();
 }
 
@@ -2320,7 +3087,11 @@
 
     FILLING_BEGIN();
         if (StreamKind_Last!=Stream_Video)
+        {
             Stream_Prepare(Stream_Video);
+            Streams[moov_trak_tkhd_TrackID].StreamKind=Stream_Video;
+            Streams[moov_trak_tkhd_TrackID].StreamPos=StreamPos_Last;
+        }
     FILLING_END();
 }
 
@@ -2356,7 +3127,7 @@
         Element_Offset+=8;
 
         if (Pos<300 || MediaInfoLib::Config.ParseSpeed_Get()==1.00)
-            Stream[moov_trak_tkhd_TrackID].stco.push_back(Offset);
+            Streams[moov_trak_tkhd_TrackID].stco.push_back(Offset);
     }
 }
 
@@ -2375,10 +3146,14 @@
     NAME_VERSION_FLAG("Composition Time To Sample");
 
     //Parsing
-    int32u entry_count, sample_count, sample_offset;
+    int32u entry_count;
     Get_B4 (entry_count,                                        "entry_count");
-    for (int32u Pos=0; Pos<entry_count; Pos++)
+
+    //Currently no usage
+    //for (int32u Pos=0; Pos<entry_count; Pos++)
     {
+        //int32u sample_count, sample_offset;
+
         //Too much slow
         /*
         Get_B4 (sample_count,                                   "sample_count");
@@ -2386,11 +3161,13 @@
         */
 
         //Faster
+        /*
         if (Element_Offset+8>Element_Size)
             break; //Problem
         sample_count =BigEndian2int32u(Buffer+Buffer_Offset+(size_t)Element_Offset  );
         sample_offset=BigEndian2int32u(Buffer+Buffer_Offset+(size_t)Element_Offset+4);
         Element_Offset+=8;
+        */
     }
 }
 
@@ -2424,7 +3201,7 @@
         Element_Offset+=4;
 
         if (Pos<300 || MediaInfoLib::Config.ParseSpeed_Get()==1.00)
-            Stream[moov_trak_tkhd_TrackID].stco.push_back(Offset);
+            Streams[moov_trak_tkhd_TrackID].stco.push_back(Offset);
     }
 }
 
@@ -2446,10 +3223,36 @@
 //---------------------------------------------------------------------------
 void File_Mpeg4::moov_trak_mdia_minf_stbl_stps()
 {
-    Element_Name("Partial Sync Sample");
+    NAME_VERSION_FLAG("Partial Sync Sample");
 
     //Parsing
-    Skip_XX(Element_Size,                                       "Unknown");
+    int32u sample_count;
+    Get_B4 (sample_count,                                       "sample-count");
+
+    int32u Offset=1; //By default, begin at 1
+    for (int32u Pos=0; Pos<sample_count; Pos++)
+    {
+        int32u sample_number;
+
+        //Too much slow
+        Get_B4 (sample_number,                                  "sample-number");
+
+        //Faster
+/*
+        if (Element_Offset+4>Element_Size)
+            break; //Problem
+        sample_number=BigEndian2int32u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+        Element_Offset+=4;
+*/
+
+        if (Streams[moov_trak_tkhd_TrackID].stss.empty() && sample_number==0)
+            Offset=0;
+        Streams[moov_trak_tkhd_TrackID].stss.push_back(sample_number-Offset);
+    }
+
+    //Bit rate mode is based on only 1 frame bit rate computing, not valid for P and B frames
+    //TODO: compute Bit rate mode from stps
+    Clear(StreamKind_Last, StreamPos_Last, "BitRate_Mode");
 }
 
 //---------------------------------------------------------------------------
@@ -2465,15 +3268,16 @@
     {
         //Too much slow
         /*
-        Element_Begin("Entry", 12);
+        Element_Begin1("Entry", 12);
         int32u SampleDescriptionId;
         Get_B4 (Stsc.FirstChunk,                                "First chunk");
         Get_B4 (Stsc.SamplesPerChunk,                           "Samples per chunk");
         Get_B4 (SampleDescriptionId,                            "Sample description ID");
-        Element_Info(Stsc.FirstChunk);
-        Element_Info(Stsc.SamplesPerChunk);
-        Element_Info(SampleDescriptionId);
-        Element_End();
+        Element_Info1(Stsc.FirstChunk);
+        Element_Info1(Stsc.SamplesPerChunk);
+        Element_Info1(SampleDescriptionId);
+        Element_End0();
+        Streams[moov_trak_tkhd_TrackID].stsc.push_back(Stsc);
         */
 
         //Faster
@@ -2485,7 +3289,7 @@
             Stsc.SamplesPerChunk=BigEndian2int32u(Buffer+Buffer_Offset+(size_t)Element_Offset+4);
             Element_Offset+=12;
 
-            Stream[moov_trak_tkhd_TrackID].stsc.push_back(Stsc);
+            Streams[moov_trak_tkhd_TrackID].stsc.push_back(Stsc);
         }
         else
             Element_Offset=Element_Size; //No need
@@ -2499,6 +3303,9 @@
 
     //Parsing
     Skip_B4(                                                    "Count");
+
+    //Filling
+    moov_trak_mdia_minf_stbl_stsd_Pos=0;
 }
 
 //---------------------------------------------------------------------------
@@ -2526,12 +3333,12 @@
     Skip_B2(                                                    "Background color (Red)");
     Skip_B2(                                                    "Background color (Green)");
     Skip_B2(                                                    "Background color (Blue)");
-    Element_Begin("Default text box");
+    Element_Begin1("Default text box");
         Skip_B2(                                                "top");
         Skip_B2(                                                "left");
         Skip_B2(                                                "bottom");
         Skip_B2(                                                "right");
-    Element_End();
+    Element_End0();
     Skip_B8(                                                    "Reserved");
     Skip_B2(                                                    "Font number");
     Info_B2(FontFace,                                           "Font face");
@@ -2551,7 +3358,7 @@
     Skip_Local(TextName_Size,                                   "Text name");
 
     FILLING_BEGIN();
-        CodecID_Fill(_T("text"), Stream_Text, StreamPos_Last, InfoCodecID_Format_Mpeg4);
+        CodecID_Fill(__T("text"), Stream_Text, StreamPos_Last, InfoCodecID_Format_Mpeg4);
         Fill(StreamKind_Last, StreamPos_Last, Text_Codec, "text", Unlimited, true, true);
     FILLING_END();
 }
@@ -2562,62 +3369,43 @@
     Element_Name("TimeCode");
 
     //Parsing
-    int32u TimeScale, FrameDuration;
-    bool DropFrame, H24, NegativeTimes;
+    stream::timecode *tc=new stream::timecode();
+    int32u TimeCodeFlags;
+    int8u   NumberOfFrames;
     Skip_B4(                                                    "Reserved");
     Skip_B2(                                                    "Reserved");
     Skip_B2(                                                    "Data reference index");
-    Skip_B4(                                                    "Reserved (Flags)");
-    Info_B4(TimeCodeFlags,                                      "Flags (timecode)");
-        Get_Flags (TimeCodeFlags, 0, DropFrame,                 "Drop frame");
-        Get_Flags (TimeCodeFlags, 1, H24,                       "24 hour max ");
-        Get_Flags (TimeCodeFlags, 2, NegativeTimes,             "Negative times OK");
+    Skip_B4(                                                    "Reserved");
+    Get_B4 (TimeCodeFlags,                                      "Flags (timecode)");
+        Get_Flags (TimeCodeFlags, 0, tc->DropFrame,             "Drop frame");
+        Get_Flags (TimeCodeFlags, 1, tc->H24,                   "24 hour max ");
+        Get_Flags (TimeCodeFlags, 2, tc->NegativeTimes,         "Negative times OK");
         Skip_Flags(TimeCodeFlags, 3,                            "Counter");
-    Get_B4 (TimeScale,                                          "Time scale");
-    Get_B4 (FrameDuration,                                      "Frame duration");
-    Skip_B1(                                                    "Number of frames");
-    Skip_B1(                                                    "Unknown");
+    Get_B4 (tc->TimeScale,                                      "Time scale");
+    Get_B4 (tc->FrameDuration,                                  "Frame duration");
+    Get_B1 (NumberOfFrames,                                     "Number of frames");
+    if (Element_Size==Element_Offset+3 || (Element_Size>=Element_Offset+7 && Element_Size>=Element_Offset+7+BigEndian2int32u(Buffer+Buffer_Offset+(size_t)Element_Offset+3)))
+        Skip_B3(                                                "Reserved");
+    else
+        Skip_B1(                                                "Reserved"); //Non-standard but several files are like that
 
     FILLING_BEGIN();
         //Bug in one file
-        if (TimeScale==25 && FrameDuration==100)
-            TimeScale=2500;
+        if (tc->TimeScale==25 && tc->FrameDuration==100)
+            tc->TimeScale=2500;
 
-        //Is it general or for a specific stream?
-        bool IsGeneral=true;
-        for (std::map<int32u, stream>::iterator Strea=Stream.begin(); Strea!=Stream.end(); Strea++)
-            if (Strea->second.TimeCode_TrackID==moov_trak_tkhd_TrackID)
-                IsGeneral=false;
-
-        //For each track in the file (but only the last one will be used!)
-        for (std::map<int32u, stream>::iterator Strea=Stream.begin(); Strea!=Stream.end(); Strea++)
-            if (IsGeneral && Strea->second.StreamKind!=Stream_Max || Strea->second.TimeCode_TrackID==moov_trak_tkhd_TrackID)
-            {
-                if (Strea->second.StreamKind==Stream_Video)
-                {
-                    Fill(Stream_Video, Strea->second.StreamPos, Video_Delay_Settings, Ztring(_T("DropFrame="))+(DropFrame?_T("Yes"):_T("No")));
-                    Fill(Stream_Video, Strea->second.StreamPos, Video_Delay_Settings, Ztring(_T("24HourMax="))+(H24?_T("Yes"):_T("No")));
-                    Fill(Stream_Video, Strea->second.StreamPos, Video_Delay_Settings, Ztring(_T("IsVisual="))+(Stream[moov_trak_tkhd_TrackID].TimeCode_IsVisual?_T("Yes"):_T("No")));
-                }
-                if (Stream[moov_trak_tkhd_TrackID].Parser==NULL)
-                {
-                    Stream[moov_trak_tkhd_TrackID].Parser=new File_Mpeg4_TimeCode;
-                    Open_Buffer_Init(Stream[moov_trak_tkhd_TrackID].Parser);
-                    mdat_MustParse=true; //Data is in MDAT
-                    ((File_Mpeg4_TimeCode*)Stream[moov_trak_tkhd_TrackID].Parser)->StreamKind=IsGeneral?Stream_General:Strea->second.StreamKind;
-                    ((File_Mpeg4_TimeCode*)Stream[moov_trak_tkhd_TrackID].Parser)->FrameRate=FrameDuration?(((float64)TimeScale)/FrameDuration):0;
-                    ((File_Mpeg4_TimeCode*)Stream[moov_trak_tkhd_TrackID].Parser)->NegativeTimes=NegativeTimes;
-                    if (!IsGeneral)
-                    {
-                        Stream[moov_trak_tkhd_TrackID].StreamKind=Strea->second.StreamKind;
-                        Stream[moov_trak_tkhd_TrackID].StreamPos=Strea->second.StreamPos;
-                    }
-                }
-            }
+        //Filling
+        Streams[moov_trak_tkhd_TrackID].TimeCode=tc;
 
-        //General stuff
-        if (IsGeneral)
-            Stream[moov_trak_tkhd_TrackID].StreamKind=Stream_General;
+        //Preparing TimeCode parser
+        Streams[moov_trak_tkhd_TrackID].Parser=new File_Mpeg4_TimeCode;
+        Open_Buffer_Init(Streams[moov_trak_tkhd_TrackID].Parser);
+        mdat_MustParse=true; //Data is in MDAT
+        mdat_Pos_ToParseInPriority_StreamIDs.push_back(moov_trak_tkhd_TrackID);
+        Streams[moov_trak_tkhd_TrackID].IsPriorityStream=true;
+        ((File_Mpeg4_TimeCode*)Streams[moov_trak_tkhd_TrackID].Parser)->NumberOfFrames=NumberOfFrames; //tc->FrameDuration?(((float64)tc->TimeScale)/tc->FrameDuration):0;
+        ((File_Mpeg4_TimeCode*)Streams[moov_trak_tkhd_TrackID].Parser)->DropFrame=tc->DropFrame;
+        ((File_Mpeg4_TimeCode*)Streams[moov_trak_tkhd_TrackID].Parser)->NegativeTimes=tc->NegativeTimes;
     FILLING_END();
 }
 
@@ -2630,7 +3418,7 @@
     Ztring Value;
     int16u Size, Language;
     Get_B2(Size,                                                "Size");
-    Get_B2(Language,                                            "Language"); Param_Info(Language_Get(Language));
+    Get_B2(Language,                                            "Language"); Param_Info1(Language_Get(Language));
     if (Size)
     {
         int8u Junk;
@@ -2671,7 +3459,7 @@
     Skip_B1(                                                    "background-color-rgba (green)");
     Skip_B1(                                                    "background-color-rgba (blue)");
     Skip_B1(                                                    "background-color-rgba (alpha)");
-    Element_Begin("default-text-box");
+    Element_Begin1("default-text-box");
         if (Element_Size>42 && CC4(Buffer+Buffer_Offset+38)==Elements::moov_trak_mdia_minf_stbl_stsd_tx3g_ftab)
         {
             Skip_B1(                                            "top"); //Specs say 16-bits, but not in coherency with a test sample
@@ -2686,8 +3474,8 @@
             Skip_B2(                                            "bottom");
             Skip_B2(                                            "right");
         }
-    Element_End();
-    Element_Begin("default-style");
+    Element_End0();
+    Element_Begin1("default-style");
         Skip_B2(                                                "startChar");
         Skip_B2(                                                "endChar");
         Skip_B2(                                                "font-ID");
@@ -2697,11 +3485,24 @@
         Skip_B1(                                                "text-color-rgba (green)");
         Skip_B1(                                                "text-color-rgba (blue)");
         Skip_B1(                                                "text-color-rgba (alpha)");
-    Element_End();
+    Element_End0();
 
     FILLING_BEGIN();
-        CodecID_Fill(_T("tx3g"), Stream_Text, StreamPos_Last, InfoCodecID_Format_Mpeg4);
+        CodecID_Fill(__T("tx3g"), Stream_Text, StreamPos_Last, InfoCodecID_Format_Mpeg4);
         Fill(StreamKind_Last, StreamPos_Last, Text_Codec, "tx3g", Unlimited, true, true);
+
+        #if MEDIAINFO_DEMUX
+            if (Streams[moov_trak_tkhd_TrackID].Parser==NULL && Config_Demux)
+            {
+                Streams[moov_trak_tkhd_TrackID].Parser=new File__Analyze; //Only for activating Demux
+
+                int64u Elemen_Code_Save=Element_Code;
+                Element_Code=moov_trak_tkhd_TrackID; //Element_Code is use for stream identifier
+                Open_Buffer_Init(Streams[moov_trak_tkhd_TrackID].Parser);
+                Element_Code=Elemen_Code_Save;
+                mdat_MustParse=true; //Data is in MDAT
+            }
+        #endif //MEDIAINFO_DEMUX
     FILLING_END();
 }
 
@@ -2733,12 +3534,38 @@
 //---------------------------------------------------------------------------
 void File_Mpeg4::moov_trak_mdia_minf_stbl_stsd_xxxx()
 {
+    //Parsing
+    Skip_B6(                                                    "Reserved");
+    Skip_B2(                                                    "Data reference index");
+
+    if (StreamKind_Last==Stream_Max)
+        switch (Element_Code)
+        {
+            case Elements::moov_trak_mdia_minf_stbl_stsd_mp4a : Stream_Prepare(Stream_Audio); break;
+            case Elements::moov_trak_mdia_minf_stbl_stsd_mp4v : Stream_Prepare(Stream_Video); break;
+            default                                           : ;
+        }
+
     switch (StreamKind_Last)
     {
-        case Stream_Audio : moov_trak_mdia_minf_stbl_stsd_xxxxSound(); break;
         case Stream_Video : moov_trak_mdia_minf_stbl_stsd_xxxxVideo(); break;
-        default : Skip_XX(Element_TotalSize_Get(),              "Unknown");
+        case Stream_Audio : moov_trak_mdia_minf_stbl_stsd_xxxxSound(); break;
+        case Stream_Text  : moov_trak_mdia_minf_stbl_stsd_xxxxText (); break;
+        default           :
+                            switch (Element_Code)
+                            {
+                                case Elements::moov_trak_mdia_minf_stbl_stsd_mp4s : moov_trak_mdia_minf_stbl_stsd_xxxxStream(); break;
+                                default                                           : Skip_XX(Element_TotalSize_Get()-Element_Offset, "Unknown");
+                            }
     }
+
+    FILLING_BEGIN();
+        if (Streams[moov_trak_tkhd_TrackID].Parser && !Retrieve(StreamKind_Last, StreamPos_Last, "Encryption").empty())
+        {
+            Finish(Streams[moov_trak_tkhd_TrackID].Parser);
+        }
+        moov_trak_mdia_minf_stbl_stsd_Pos++;
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -2746,35 +3573,63 @@
 {
     Element_Name("Audio");
 
-    int16u Version, Channels, SampleSize, ID, SampleRate;
-    Skip_B4(                                                    "Reserved");
-    Skip_B2(                                                    "Reserved");
-    Skip_B2(                                                    "Data reference index");
+    int32u SampleRate, Channels, SampleSize;
+    int16u Version, ID;
     Get_B2 (Version,                                            "Version");
     Skip_B2(                                                    "Revision level");
     Skip_C4(                                                    "Vendor");
-    Get_B2 (Channels,                                           "Number of channels");
-    Get_B2 (SampleSize,                                         "Sample size");
-    Get_B2 (ID,                                                 "Compression ID");
-    Skip_B2(                                                    "Packet size");
-    Get_B2 (SampleRate,                                         "Sample rate"); Param_Info(SampleRate, " Hz");
-    Skip_B2(                                                    "Reserved");
-    if (Version>=1)
+    if (Version<2) // Version 0 or 1
     {
-        Skip_B4(                                                "Samples per packet");
+        int16u Channels16, SampleSize16, SampleRate16;
+        Get_B2 (Channels16,                                     "Number of channels");
+        Get_B2 (SampleSize16,                                   "Sample size");
+        Get_B2 (ID,                                             "Compression ID");
+        Skip_B2(                                                "Packet size");
+        Get_B2 (SampleRate16,                                   "Sample rate"); Param_Info2(SampleRate16, " Hz");
+        Skip_B2(                                                "Reserved");
+        if (Version>=1)
+        {
+            Skip_B4(                                            "Samples per packet");
+            Skip_B4(                                            "Bytes per packet");
+            Skip_B4(                                            "Bytes per frame");
+            Skip_B4(                                            "Bytes per sample");
+        }
+        Channels=Channels16;
+        SampleSize=SampleSize16;
+        SampleRate=SampleRate16;
+    }
+    else if (Version==2)
+    {
+        float64 SampleRateF64;
+        Skip_B2(                                                "Reserved (0x0003)");
+        Skip_B2(                                                "Reserved (0x0010)");
+        Skip_B2(                                                "Reserved (0xFFFE)");
+        Skip_B2(                                                "Reserved (0x0000)");
+        Skip_B4(                                                "Reserved (0x00010000)");
+        Skip_B4(                                                "Size of Struct");
+        Get_BF8(SampleRateF64,                                  "Sample rate");
+        Get_B4 (Channels,                                       "Number of channels");
+        Skip_B4(                                                "Reserved (0x7F000000)");
+        Get_B4 (SampleSize,                                     "Sample size");
+        Skip_B4(                                                "Flags");
         Skip_B4(                                                "Bytes per packet");
-        Skip_B4(                                                "Bytes per frame");
-        Skip_B4(                                                "Bytes per sample");
-        if (Version>=2)
-        {
-            Skip_B4(                                            "Unknown");
-            Skip_B4(                                            "Unknown");
-            Skip_B4(                                            "Unknown");
-            Skip_B4(                                            "Unknown");
-            Skip_B4(                                            "Unknown");
-        }
+        Skip_B4(                                                "Frames per packet");
+
+        SampleRate=(int32u)SampleRateF64;
+    }
+    else
+    {
+        Skip_XX(Element_Size,                                   "Unknown");
+        return;
     }
 
+    //Bug found in one file: sample size is 16 with a 24-bit CodecID ("in24")
+    if (Element_Code==0x696E3234 && SampleSize==16)
+        SampleSize=24; //Correcting the header
+
+    if (moov_trak_mdia_minf_stbl_stsd_Pos)
+        return; //Handling only the first description
+
     FILLING_BEGIN();
         //samr bug viewed in some files: channels and Sampling rate are wrong
         if (Element_Code==0x73616D72) //"samr"
@@ -2783,6 +3638,12 @@
             Channels=1;
         }
 
+        //lpcm puts "1" in the SampleRate field  and Timescale is the real sample size
+        if (Element_Code==0x6C70636D && SampleRate==1) //"lpcm"
+        {
+            SampleRate=Streams[moov_trak_tkhd_TrackID].mdhd_TimeScale;
+        }
+
         std::string Codec;
         Codec.append(1, (char)((Element_Code&0xFF000000)>>24));
         Codec.append(1, (char)((Element_Code&0x00FF0000)>>16));
@@ -2811,8 +3672,17 @@
             Fill(Stream_Audio, StreamPos_Last, Audio_Codec, Codec, true);
             Fill(Stream_Audio, StreamPos_Last, Audio_Codec_CC, Codec, true);
         }
+        #if defined(MEDIAINFO_AAC_YES)
+        if (Version==2 && Element_Code==Elements::moov_trak_mdia_minf_stbl_stsd_mp4a) //This is not normal, but I don't know where is audioObjectType, default to 2 (AAC LC)
+        {
+            Streams[moov_trak_tkhd_TrackID].Parser=new File_Aac;
+            ((File_Aac*)Streams[moov_trak_tkhd_TrackID].Parser)->AudioSpecificConfig_OutOfBand(SampleRate, 2);
+            ((File_Aac*)Streams[moov_trak_tkhd_TrackID].Parser)->Mode=File_Aac::Mode_raw_data_block;
+            ((File_Aac*)Streams[moov_trak_tkhd_TrackID].Parser)->FrameIsAlwaysComplete=true;
+        }
+        #endif
         #if defined(MEDIAINFO_AMR_YES)
-        if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Mpeg4, Ztring(Codec.c_str()), InfoCodecID_Format)==_T("AMR"))
+        if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Mpeg4, Ztring(Codec.c_str()), InfoCodecID_Format)==__T("AMR"))
         {
             //Creating the parser
             File_Amr MI;
@@ -2828,7 +3698,7 @@
         }
         #endif
         #if defined(MEDIAINFO_ADPCM_YES)
-        if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Mpeg4, Ztring(Codec.c_str()), InfoCodecID_Format)==_T("ADPCM"))
+        if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Mpeg4, Ztring(Codec.c_str()), InfoCodecID_Format)==__T("ADPCM"))
         {
             //Creating the parser
             File_Adpcm MI;
@@ -2844,8 +3714,11 @@
         }
         #endif
         #if defined(MEDIAINFO_PCM_YES)
-        if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Mpeg4, Ztring(Codec.c_str()), InfoCodecID_Format)==_T("PCM"))
+        if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Mpeg4, Ztring(Codec.c_str()), InfoCodecID_Format)==__T("PCM"))
         {
+            //Info of stream size
+            Streams[moov_trak_tkhd_TrackID].stsz_Sample_Multiplier=Channels*SampleSize/8;
+
             //Creating the parser
             File_Pcm MI;
             MI.Codec=Ztring().From_Local(Codec.c_str());
@@ -2857,26 +3730,173 @@
             //Filling
             Finish(&MI);
             Merge(MI, StreamKind_Last, 0, StreamPos_Last);
+
+            //Creating the parser
+            if ((Channels==1 && (StreamPos_Last%2)==0)
+             || (Streams.find(moov_trak_tkhd_TrackID-1)!=Streams.end() && Streams[moov_trak_tkhd_TrackID-1].IsPcmMono))
+            {
+                Streams[moov_trak_tkhd_TrackID].Parser=new File_ChannelGrouping;
+                if (StreamPos_Last%2)
+                {
+                    ((File_ChannelGrouping*)Streams[moov_trak_tkhd_TrackID].Parser)->Channel_Pos=1;
+                    ((File_ChannelGrouping*)Streams[moov_trak_tkhd_TrackID].Parser)->Common=((File_ChannelGrouping*)Streams[moov_trak_tkhd_TrackID-1].Parser)->Common;
+                    ((File_ChannelGrouping*)Streams[moov_trak_tkhd_TrackID].Parser)->StreamID=moov_trak_tkhd_TrackID-1;
+                    Element_Code=moov_trak_tkhd_TrackID-1;
+                }
+                else
+                {
+                    ((File_ChannelGrouping*)Streams[moov_trak_tkhd_TrackID].Parser)->Channel_Pos=0;
+                    ((File_ChannelGrouping*)Streams[moov_trak_tkhd_TrackID].Parser)->SampleRate=SampleRate;
+                    Streams[moov_trak_tkhd_TrackID].IsPcmMono=true;
+                }
+                ((File_ChannelGrouping*)Streams[moov_trak_tkhd_TrackID].Parser)->Channel_Total=2;
+                ((File_ChannelGrouping*)Streams[moov_trak_tkhd_TrackID].Parser)->ByteDepth=SampleSize/8;
+
+                #if MEDIAINFO_DEMUX
+                    Streams[moov_trak_tkhd_TrackID].Demux_Level=Config->Demux_Unpacketize_Get()?0:4; //Intermediate
+                #endif //MEDIAINFO_DEMUX
+            }
         }
         #endif
         #if defined(MEDIAINFO_MPEGA_YES)
-        if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Mpeg4, Ztring(Codec.c_str()), InfoCodecID_Format)==_T("MPEG Audio"))
+        if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Mpeg4, Ztring(Codec.c_str()), InfoCodecID_Format)==__T("MPEG Audio"))
         {
             //Creating the parser
-            Stream[moov_trak_tkhd_TrackID].Parser=new File_Mpega;
-            Open_Buffer_Init(Stream[moov_trak_tkhd_TrackID].Parser);
-            mdat_MustParse=true; //Data is in MDAT
+            Streams[moov_trak_tkhd_TrackID].Parser=new File_Mpega;
         }
         #endif
         if (Element_Code==0x6F776D61) //"owma"
         {
-            Skip_XX(Element_Size-Element_Offset,                "WMA Pro data");
+            //Parsing
+            int32u SamplingRate, BytesPerSec;
+            int16u CodecID, Channels, Data_Size, Resolution;
+            Get_L2 (CodecID,                                            "Codec ID");
+            Get_L2 (Channels,                                           "Number of Channels");
+            Get_L4 (SamplingRate,                                       "Samples Per Second");
+            Get_L4 (BytesPerSec,                                        "Average Number of Bytes Per Second");
+            Skip_L2(                                                    "Block Alignment");
+            Get_L2 (Resolution,                                         "Bits / Sample");
+            Get_L2 (Data_Size,                                          "Codec Specific Data Size");
+
+            //Filling
+            Ztring Codec; Codec.From_Number(CodecID, 16);
+            Codec.MakeUpperCase();
+            CodecID_Fill(Codec, Stream_Audio, StreamPos_Last, InfoCodecID_Format_Riff);
+            Fill(Stream_Audio, StreamPos_Last, Audio_Codec, Codec); //May be replaced by codec parser
+            Fill(Stream_Audio, StreamPos_Last, Audio_Codec_CC, Codec);
+            Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, Channels, 10, true);
+            Fill(Stream_Audio, StreamPos_Last, Audio_SamplingRate, SamplingRate, 10, true);
+            Fill(Stream_Audio, StreamPos_Last, Audio_BitRate, BytesPerSec*8, 10, true);
+            Fill(Stream_Audio, StreamPos_Last, Audio_BitDepth, Resolution, 10, true);
+
+            FILLING_BEGIN();
+                //Creating the parser
+                     if (0);
+                #if defined(MEDIAINFO_MPEGA_YES)
+                else if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Riff, Ztring::ToZtring(CodecID, 16))==__T("MPEG Audio"))
+                    Streams[moov_trak_tkhd_TrackID].Parser=new File_Mpega;
+                #endif
+            FILLING_END();
+
+            //Parsing
+            if (Data_Size>0)
+            {
+                Element_Begin1("Codec Specific Data");
+                switch (CodecID)
+                {
+                    case 0x0161 :
+                                    //Parsing
+                                    Skip_L4(                            "SamplesPerBlock");
+                                    Skip_L2(                            "EncodeOptions");
+                                    Skip_L4(                            "SuperBlockAlign");
+                                    break;
+                    default     : Skip_XX(Data_Size,                    "Unknown");
+                }
+                Element_End0();
+            }
+        }
+
+        #if MEDIAINFO_DEMUX
+            if (Streams[moov_trak_tkhd_TrackID].Parser==NULL && Config_Demux)
+            {
+                Streams[moov_trak_tkhd_TrackID].Parser=new File__Analyze; //Only for activating Demux
+            }
+        #endif //MEDIAINFO_DEMUX
+        if (Streams[moov_trak_tkhd_TrackID].Parser)
+        {
+            int64u Elemen_Code_Save=Element_Code;
+            Element_Code=moov_trak_tkhd_TrackID; //Element_Code is use for stream identifier
+            Open_Buffer_Init(Streams[moov_trak_tkhd_TrackID].Parser);
+            Element_Code=Elemen_Code_Save;
+            mdat_MustParse=true; //Data is in MDAT
         }
 
         Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, Channels, 10, true);
-        if (SampleSize!=0 && Element_Code!=0x6D703461 && (Element_Code&0xFFFF0000)!=0x6D730000 && Retrieve(Stream_Audio, StreamPos_Last, Audio_Resolution).empty()) //if not mp4a, and not ms*
-            Fill(Stream_Audio, StreamPos_Last, Audio_Resolution, SampleSize, 10, true);
-        Fill(Stream_Audio, StreamPos_Last, Audio_SamplingRate, SampleRate);
+        if (SampleSize!=0 && Element_Code!=0x6D703461 && (Element_Code&0xFFFF0000)!=0x6D730000 && Retrieve(Stream_Audio, StreamPos_Last, Audio_BitDepth).empty()) //if not mp4a, and not ms*
+            Fill(Stream_Audio, StreamPos_Last, Audio_BitDepth, SampleSize, 10, true);
+        Fill(Stream_Audio, StreamPos_Last, Audio_SamplingRate, SampleRate, 10, true);
+
+        //Sometimes, more Atoms in this atoms
+        if (Element_Offset+8<Element_Size)
+            Element_ThisIsAList();
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg4::moov_trak_mdia_minf_stbl_stsd_xxxxStream()
+{
+    Element_Name("Stream"); //Defined in ISO-IEC 14496-14
+
+    if (moov_trak_mdia_minf_stbl_stsd_Pos)
+        return; //Handling only the first description
+
+    FILLING_BEGIN();
+    //Sometimes, more Atoms in this atoms
+    if (Element_Offset+8<Element_Size)
+        Element_ThisIsAList();
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg4::moov_trak_mdia_minf_stbl_stsd_xxxxText()
+{
+    Element_Name("Text");
+
+    if (moov_trak_mdia_minf_stbl_stsd_Pos)
+        return; //Handling only the first description
+
+    FILLING_BEGIN();
+        Ztring CodecID; CodecID.From_CC4((int32u)Element_Code);
+        CodecID_Fill(CodecID, Stream_Text, StreamPos_Last, InfoCodecID_Format_Mpeg4);
+
+        if (MediaInfoLib::Config.CodecID_Get(Stream_Text, InfoCodecID_Format_Mpeg4, CodecID, InfoCodecID_Format)==__T("EIA-608"))
+        {
+            //Creating the parser
+            Streams[moov_trak_tkhd_TrackID].Parser=new File_Mpeg4;
+        }
+        #if defined(MEDIAINFO_CDP_YES)
+        if (MediaInfoLib::Config.CodecID_Get(Stream_Text, InfoCodecID_Format_Mpeg4, CodecID, InfoCodecID_Format)==__T("EIA-708"))
+        {
+            //Creating the parser
+            Streams[moov_trak_tkhd_TrackID].Parser=new File_Cdp;
+            ((File_Cdp*)Streams[moov_trak_tkhd_TrackID].Parser)->WithAppleHeader=true;
+            ((File_Cdp*)Streams[moov_trak_tkhd_TrackID].Parser)->AspectRatio=((float)16)/9; //TODO: this is hardcoded, must adapt it to the real video aspect ratio
+        }
+        #endif
+        #if MEDIAINFO_DEMUX
+            if (Streams[moov_trak_tkhd_TrackID].Parser==NULL && Config_Demux)
+            {
+                Streams[moov_trak_tkhd_TrackID].Parser=new File__Analyze; //Only for activating Demux
+            }
+        #endif //MEDIAINFO_DEMUX
+        if (Streams[moov_trak_tkhd_TrackID].Parser)
+        {
+            int64u Elemen_Code_Save=Element_Code;
+            Element_Code=moov_trak_tkhd_TrackID; //Element_Code is use for stream identifier
+            Open_Buffer_Init(Streams[moov_trak_tkhd_TrackID].Parser);
+            Element_Code=Elemen_Code_Save;
+            mdat_MustParse=true; //Data is in MDAT
+        }
 
         //Sometimes, more Atoms in this atoms
         if (Element_Offset+8<Element_Size)
@@ -2891,9 +3911,6 @@
 
     int16u Width, Height, ColorTableID;
     int8u  CompressorName_Size;
-    Skip_B4(                                                    "Reserved");
-    Skip_B2(                                                    "Reserved");
-    Skip_B2(                                                    "Data reference index");
     Skip_B2(                                                    "Version");
     Skip_B2(                                                    "Revision level");
     Skip_C4(                                                    "Vendor");
@@ -2918,9 +3935,12 @@
         Skip_Local(32,                                          "Compressor name");
     Skip_B2(                                                    "Depth");
     Get_B2 (ColorTableID,                                       "Color table ID");
-    if (ColorTableID==0)
+    if (ColorTableID==0 && Width && Height) //In one file, if Zero-filled, Color table is not present
         Skip_XX(32,                                             "Color Table");
 
+    if (moov_trak_mdia_minf_stbl_stsd_Pos)
+        return; //Handling only the first description
+
     FILLING_BEGIN();
         std::string Codec;
         Codec.append(1, (char)((Element_Code&0xFF000000)>>24));
@@ -2933,59 +3953,128 @@
         Fill(Stream_Video, StreamPos_Last, Video_Codec_CC, Codec, false, true);
         if (Codec=="drms")
             Fill(Stream_Video, StreamPos_Last, Video_Encryption, "iTunes");
-        if (Codec=="enca")
+        if (Codec=="encv")
             Fill(Stream_Video, StreamPos_Last, Video_Encryption, "Encrypted");
-        Fill(Stream_Video, StreamPos_Last, Video_Width, Width, 10, true);
-        Fill(Stream_Video, StreamPos_Last, Video_Height, Height, 10, true);
-        if (moov_trak_tkhd_DisplayAspectRatio && moov_trak_tkhd_DisplayAspectRatio!=((float32)Width)/Height)
+        if (Width)
+            Fill(Stream_Video, StreamPos_Last, Video_Width, Width, 10, true);
+        if (Height)
+            Fill(Stream_Video, StreamPos_Last, Video_Height, Height, 10, true);
+        if (moov_trak_tkhd_DisplayAspectRatio && Height && moov_trak_tkhd_DisplayAspectRatio!=((float32)Width)/Height)
         {
             Fill(Stream_Video, StreamPos_Last, Video_DisplayAspectRatio, moov_trak_tkhd_DisplayAspectRatio, 3, true);
             Fill(Stream_Video, StreamPos_Last, Video_PixelAspectRatio, moov_trak_tkhd_DisplayAspectRatio/Width*Height, 3, true);
         }
         Fill(Stream_Video, StreamPos_Last, Video_Rotation, moov_trak_tkhd_Rotation, 3);
         if (moov_trak_tkhd_Rotation)
-            Fill(Stream_Video, StreamPos_Last, Video_Rotation_String, Ztring::ToZtring(moov_trak_tkhd_Rotation, 0)+_T("\xB0")); //degree sign
+            Fill(Stream_Video, StreamPos_Last, Video_Rotation_String, Ztring::ToZtring(moov_trak_tkhd_Rotation, 0)+__T("\xB0")); //degree sign
 
         //Specific cases
-        if (Stream[moov_trak_tkhd_TrackID].Parser==NULL)
+        if (Streams[moov_trak_tkhd_TrackID].Parser==NULL)
         {
             #if defined(MEDIAINFO_DVDIF_YES)
-                if (MediaInfoLib::Config.CodecID_Get(Stream_Video, InfoCodecID_Format_Mpeg4, Ztring(Codec.c_str()), InfoCodecID_Format)==_T("DV"))
+                if (MediaInfoLib::Config.CodecID_Get(Stream_Video, InfoCodecID_Format_Mpeg4, Ztring(Codec.c_str()), InfoCodecID_Format)==__T("DV"))
                 {
-                    Stream[moov_trak_tkhd_TrackID].Parser=new File_DvDif;
-                    Open_Buffer_Init(Stream[moov_trak_tkhd_TrackID].Parser);
-                    mdat_MustParse=true; //Data is in MDAT
+                    Streams[moov_trak_tkhd_TrackID].Parser=new File_DvDif;
+                }
+            #endif
+            #if defined(MEDIAINFO_MXF_YES)
+                if (Element_Code==0x6D78336E || Element_Code==0x6D783370 || Element_Code==0x6D78356E || Element_Code==0x6D783570) //mx3n, mx3p, mx5n, mx5p
+                {
+                    Fill(Stream_Video, StreamPos_Last, Video_MuxingMode, "MXF");
+                    Streams[moov_trak_tkhd_TrackID].Parser=new File_Mxf;
+
+                    #if MEDIAINFO_DEMUX
+                        Streams[moov_trak_tkhd_TrackID].Demux_Level=4; //Intermediate
+                    #endif //MEDIAINFO_DEMUX
+               }
+            #endif
+            #if defined(MEDIAINFO_AVC_YES)
+                if (MediaInfoLib::Config.CodecID_Get(Stream_Video, InfoCodecID_Format_Mpeg4, Ztring().From_CC4((int32u)Element_Code), InfoCodecID_Format)==__T("AVC"))
+                {
+                    Streams[moov_trak_tkhd_TrackID].Parser=new File_Avc;
+                    ((File_Avc*)Streams[moov_trak_tkhd_TrackID].Parser)->FrameIsAlwaysComplete=true;
+                }
+            #endif
+            #if defined(MEDIAINFO_H263_YES)
+                if (MediaInfoLib::Config.CodecID_Get(Stream_Video, InfoCodecID_Format_Mpeg4, Ztring().From_CC4((int32u)Element_Code), InfoCodecID_Format)==__T("H.263"))
+                {
+                    Streams[moov_trak_tkhd_TrackID].Parser=new File_H263;
+                    ((File_H263*)Streams[moov_trak_tkhd_TrackID].Parser)->FrameIsAlwaysComplete=true;
                 }
             #endif
             #if defined(MEDIAINFO_MPEGV_YES)
-                if (MediaInfoLib::Config.CodecID_Get(Stream_Video, InfoCodecID_Format_Mpeg4, Ztring().From_CC4((int32u)Element_Code), InfoCodecID_Format)==_T("MPEG Video"))
+                if (MediaInfoLib::Config.CodecID_Get(Stream_Video, InfoCodecID_Format_Mpeg4, Ztring().From_CC4((int32u)Element_Code), InfoCodecID_Format)==__T("MPEG Video") && Element_Code!=0x6D78336E && Element_Code!=0x6D783370 && Element_Code!=0x6D78356E && Element_Code!=0x6D783570) //mx3n, mx3p, mx5n, mx5p
                 {
-                    Stream[moov_trak_tkhd_TrackID].Parser=new File_Mpegv;
-                    ((File_Mpegv*)Stream[moov_trak_tkhd_TrackID].Parser)->FrameIsAlwaysComplete=true;
-                    Open_Buffer_Init(Stream[moov_trak_tkhd_TrackID].Parser);
-                    mdat_MustParse=true; //Data is in MDAT
+                    Streams[moov_trak_tkhd_TrackID].Parser=new File_Mpegv;
+                    ((File_Mpegv*)Streams[moov_trak_tkhd_TrackID].Parser)->FrameIsAlwaysComplete=true;
+                    #if MEDIAINFO_ADVANCED
+                        ((File_Mpegv*)Streams[moov_trak_tkhd_TrackID].Parser)->InitDataNotRepeated_Optional=true;
+                    #endif // MEDIAINFO_ADVANCED
+                }
+            #endif
+            #if defined(MEDIAINFO_PRORES_YES)
+                if (MediaInfoLib::Config.CodecID_Get(Stream_Video, InfoCodecID_Format_Mpeg4, Ztring().From_CC4((int32u)Element_Code), InfoCodecID_Format)==__T("ProRes"))
+                {
+                    Streams[moov_trak_tkhd_TrackID].Parser=new File_ProRes;
                 }
             #endif
             #if defined(MEDIAINFO_VC1_YES)
-                if (MediaInfoLib::Config.CodecID_Get(Stream_Video, InfoCodecID_Format_Mpeg4, Ztring().From_CC4((int32u)Element_Code), InfoCodecID_Format)==_T("VC-1"))
+                if (MediaInfoLib::Config.CodecID_Get(Stream_Video, InfoCodecID_Format_Mpeg4, Ztring().From_CC4((int32u)Element_Code), InfoCodecID_Format)==__T("VC-1"))
                 {
-                    File_Vc1 MI;
-                    MI.FrameIsAlwaysComplete=true;
-                    Open_Buffer_Init(&MI);
-                    Open_Buffer_Continue(&MI);
+                    Streams[moov_trak_tkhd_TrackID].Parser=new File_Vc1;
+                    ((File_Vc1*)Streams[moov_trak_tkhd_TrackID].Parser)->FrameIsAlwaysComplete=true;
+                    Open_Buffer_Init(Streams[moov_trak_tkhd_TrackID].Parser);
+                    Open_Buffer_Continue(Streams[moov_trak_tkhd_TrackID].Parser);
                     Element_Offset=Element_Size;
-                    Finish(&MI);
-                    Merge(MI, Stream_Video, 0, StreamPos_Last);
+                    mdat_MustParse=true; //Data is in MDAT
                 }
             #endif
+            #if defined(MEDIAINFO_VC3_YES)
+                if (MediaInfoLib::Config.CodecID_Get(Stream_Video, InfoCodecID_Format_Mpeg4, Ztring().From_CC4((int32u)Element_Code), InfoCodecID_Format)==__T("VC-3"))
+                {
+                    Streams[moov_trak_tkhd_TrackID].Parser=new File_Vc3;
+                }
+            #endif
+            #if defined(MEDIAINFO_JPEG_YES)
+                if (MediaInfoLib::Config.CodecID_Get(Stream_Video, InfoCodecID_Format_Mpeg4, Ztring(Codec.c_str()), InfoCodecID_Format)==__T("JPEG"))
+                {
+                    Streams[moov_trak_tkhd_TrackID].Parser=new File_Jpeg;
+                    ((File_Jpeg*)Streams[moov_trak_tkhd_TrackID].Parser)->StreamKind=Stream_Video;
+                }
+            #endif
+            #if defined(MEDIAINFO_MPEG4_YES)
+                if (MediaInfoLib::Config.CodecID_Get(Stream_Video, InfoCodecID_Format_Mpeg4, Ztring(Codec.c_str()), InfoCodecID_Format)==__T("JPEG 2000"))
+                {
+                    Streams[moov_trak_tkhd_TrackID].Parser=new File_Mpeg4;
+
+                    #if MEDIAINFO_DEMUX
+                        Streams[moov_trak_tkhd_TrackID].Demux_Level=4; //Intermediate
+                    #endif //MEDIAINFO_DEMUX
+                }
+            #endif
+
+            #if MEDIAINFO_DEMUX
+                if (Streams[moov_trak_tkhd_TrackID].Parser==NULL && Config_Demux)
+                {
+                    Streams[moov_trak_tkhd_TrackID].Parser=new File__Analyze; //Only for activating Demux
+                }
+            #endif //MEDIAINFO_DEMUX
+            if (Streams[moov_trak_tkhd_TrackID].Parser && !Streams[moov_trak_tkhd_TrackID].Parser->Status[IsAccepted])
+            {
+                int64u Elemen_Code_Save=Element_Code;
+                Element_Code=moov_trak_tkhd_TrackID; //Element_Code is use for stream identifier
+                Open_Buffer_Init(Streams[moov_trak_tkhd_TrackID].Parser);
+                Element_Code=Elemen_Code_Save;
+                mdat_MustParse=true; //Data is in MDAT
+            }
         }
 
         //Descriptors or a list (we can see both!)
         if (Element_Offset+8<=Element_Size
-             && (CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+0)>='A' && CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+0)<='z' || CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+0)>='0' && CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+0)<='9')
-             && (CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+1)>='A' && CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+1)<='z' || CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+1)>='0' && CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+1)<='9')
-             && (CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+2)>='A' && CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+2)<='z' || CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+2)>='0' && CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+2)<='9')
-             && (CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+3)>='A' && CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+3)<='z' || CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+3)>='0' && CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+3)<='9'))
+             && ((CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+0)>='A' && CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+0)<='z') || (CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+0)>='0' && CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+0)<='9'))
+             && ((CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+1)>='A' && CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+1)<='z') || (CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+1)>='0' && CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+1)<='9'))
+             && ((CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+2)>='A' && CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+2)<='z') || (CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+2)>='0' && CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+2)<='9'))
+             && ((CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+3)>='A' && CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+3)<='z') || (CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+3)>='0' && CC1(Buffer+Buffer_Offset+(size_t)Element_Offset+4+3)<='9')))
                 Element_ThisIsAList();
         else if (Element_Offset<Element_Size)
             Descriptors();
@@ -2993,14 +4082,38 @@
 }
 
 //---------------------------------------------------------------------------
+// Source: http://wiki.multimedia.cx/index.php?title=Apple_Lossless_Audio_Coding
 void File_Mpeg4::moov_trak_mdia_minf_stbl_stsd_xxxx_alac()
 {
     Element_Name("ALAC");
 
     //Parsing
-    Skip_B4(                                                    "Reserved");
-    Skip_B2(                                                    "Reserved");
-    Skip_B2(                                                    "Count");
+    int32u  bitrate, samplerate;
+    int8u   sample_size, channels;
+    Skip_B4(                                                    "?");
+    Skip_B4(                                                    "max sample per frame");
+    Skip_B1(                                                    "?");
+    Get_B1 (sample_size,                                        "sample size");
+    Skip_B1(                                                    "rice history mult");
+    Skip_B1(                                                    "rice initial history");
+    Skip_B1(                                                    "rice kmodifier");
+    Get_B1 (channels,                                           "channels");
+    Skip_B1(                                                    "?");
+    Skip_B1(                                                    "?");
+    Skip_B4(                                                    "max coded frame size");
+    Get_B4 (bitrate,                                            "bitrate");
+    Get_B4 (samplerate,                                         "samplerate");
+
+    FILLING_BEGIN_PRECISE();
+        if (sample_size)
+            Fill(Stream_Audio, StreamPos_Last, Audio_BitDepth, sample_size, 10, true);
+        if (channels)
+            Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, channels, 10, true);
+        if (bitrate)
+            Fill(Stream_Audio, StreamPos_Last, Audio_BitRate_Nominal, bitrate, 10, true);
+        if (samplerate)
+            Fill(Stream_Audio, StreamPos_Last, Audio_SamplingRate, samplerate, 10, true);
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -3011,40 +4124,50 @@
     //Parsing
     int8u Version;
     Get_B1 (Version,                                            "Version");
-    if (Version==1)
+    if (moov_trak_mdia_minf_stbl_stsd_Pos>1)
+    {
+        Skip_XX(Element_Size,                                   "Data not analyzed");
+        return; //Handling only the first description
+    }
+    else if (Version==1)
     {
         #ifdef MEDIAINFO_AVC_YES
-            if (Stream[moov_trak_tkhd_TrackID].Parser==NULL)
-            {
-                Stream[moov_trak_tkhd_TrackID].Parser=new File_Avc;
-                #if MEDIAINFO_DEMUX
-                    Element_Code=moov_trak_tkhd_TrackID;
-                #endif //MEDIAINFO_DEMUX
-                Open_Buffer_Init(Stream[moov_trak_tkhd_TrackID].Parser);
-                ((File_Avc*)Stream[moov_trak_tkhd_TrackID].Parser)->MustParse_SPS_PPS=true;
-                Stream[moov_trak_tkhd_TrackID].Parser->MustSynchronize=false;
-                mdat_MustParse=true; //Data is in MDAT
+            if (Streams[moov_trak_tkhd_TrackID].Parser) //Removing any previous parser (in case of multiple streams in one track, or dummy parser for demux)
+                delete Streams[moov_trak_tkhd_TrackID].Parser; //Streams[moov_trak_tkhd_TrackID].Parser=NULL;
 
-                //Parsing
-                Demux(Buffer+(size_t)(Buffer_Offset+Element_Offset), (size_t)(Element_Size-Element_Offset), ContentType_Header);
-                Open_Buffer_Continue(Stream[moov_trak_tkhd_TrackID].Parser);
+            Streams[moov_trak_tkhd_TrackID].Parser=new File_Avc;
+            ((File_Avc*)Streams[moov_trak_tkhd_TrackID].Parser)->FrameIsAlwaysComplete=true;
+            #if MEDIAINFO_DEMUX
+                Element_Code=moov_trak_tkhd_TrackID;
+            #endif //MEDIAINFO_DEMUX
+            Open_Buffer_Init(Streams[moov_trak_tkhd_TrackID].Parser);
+            ((File_Avc*)Streams[moov_trak_tkhd_TrackID].Parser)->MustParse_SPS_PPS=true;
+            Streams[moov_trak_tkhd_TrackID].Parser->MustSynchronize=false;
+            mdat_MustParse=true; //Data is in MDAT
 
-                ((File_Avc*)Stream[moov_trak_tkhd_TrackID].Parser)->SizedBlocks=true;  //Now this is SizeBlocks
-            }
-            else
-            {
-                //We parse it, but we don't save information: how to do? Multiple formats in one track.
-                File_Avc* MI=new File_Avc;
-                Open_Buffer_Init(MI);
-                MI->MustParse_SPS_PPS=true;
-                MI->MustSynchronize=false;
+            //Demux
+            #if MEDIAINFO_DEMUX
+                switch (Config->Demux_InitData_Get())
+                {
+                    case 0 :    //In demux event
+                                Demux_Level=2; //Container
+                                Demux(Buffer+Buffer_Offset, (size_t)Element_Size, ContentType_Header);
+                                break;
+                    case 1 :    //In field
+                                {
+                                std::string Data_Raw((const char*)(Buffer+Buffer_Offset), (size_t)Element_Size);
+                                std::string Data_Base64(Base64::encode(Data_Raw));
+                                Fill(Stream_Video, StreamPos_Last, "Demux_InitBytes", Data_Base64);
+                                }
+                                break;
+                    default :   ;
+                }
+            #endif //MEDIAINFO_DEMUX
 
-                //Parsing
-                Open_Buffer_Continue(MI);
+            //Parsing
+            Open_Buffer_Continue(Streams[moov_trak_tkhd_TrackID].Parser);
 
-                //Cleanup
-                delete MI; //MI=NULL
-            }
+            ((File_Avc*)Streams[moov_trak_tkhd_TrackID].Parser)->SizedBlocks=true;  //Now this is SizeBlocks
         #else
             Skip_XX(Element_Size,                               "AVC Data");
         #endif
@@ -3063,6 +4186,9 @@
     Get_B4 (Avg_Bitrate,                                        "Avg_Bitrate");
     Get_B4 (Max_Bitrate,                                        "Max_Bitrate");
 
+    if (moov_trak_mdia_minf_stbl_stsd_Pos>1)
+        return; //Handling only the first description
+
     FILLING_BEGIN();
         if (Avg_Bitrate)
             Fill(StreamKind_Last, StreamPos_Last, "BitRate", Avg_Bitrate);
@@ -3082,6 +4208,9 @@
     Get_B4 (maxBitrate,                                         "maxBitrate");
     Get_B4 (avgBitrate,                                         "avgBitrate");
 
+    if (moov_trak_mdia_minf_stbl_stsd_Pos>1)
+        return; //Handling only the first description
+
     FILLING_BEGIN();
         //if (avgBitrate)
         //    Fill(StreamKind_Last, StreamPos_Last, "BitRate",         avgBitrate); //Not trustable enough, and we have precise bitrate from stream size with
@@ -3097,37 +4226,73 @@
 
     //Parsing
     //From http://developer.apple.com/mac/library/documentation/MusicAudio/Reference/CAFSpec/CAF_spec/CAF_spec.html#//apple_ref/doc/uid/TP40001862-CH210-DontLinkElementID_25
-    int32u ChannelLayoutTag, ChannelBitmap, NumberChannelDescriptions;
+    std::string ChannelDescription_Layout;
+    int32u ChannelLayoutTag, ChannelBitmap, NumberChannelDescriptions, ChannelLabels=0;
+    bool ChannelLabels_Valid=true;
     Get_B4 (ChannelLayoutTag,                                   "ChannelLayoutTag");
     Get_B4 (ChannelBitmap,                                      "ChannelBitmap");
     Get_B4 (NumberChannelDescriptions,                          "NumberChannelDescriptions");
-    for (int32u Pos=0; Pos<NumberChannelDescriptions; Pos++)
+    if (ChannelLayoutTag==0) //UseChannelDescriptions
     {
-        Skip_B1(                                                "ChannelLabel");
-        Skip_B1(                                                "ChannelFlags");
-        Skip_BF4(                                               "Coordinates (0)");
-        Skip_BF4(                                               "Coordinates (1)");
-        Skip_BF4(                                               "Coordinates (2)");
+        for (int32u Pos=0; Pos<NumberChannelDescriptions; Pos++)
+        {
+            int32u ChannelLabel;
+            Get_B4 (ChannelLabel,                                   "ChannelLabel");
+            if (ChannelLabel<32)
+                ChannelLabels|=(1<<ChannelLabel);
+            else
+                ChannelLabels_Valid=false;
+            ChannelDescription_Layout+=Mpeg4_chan_ChannelDescription_Layout(ChannelLabel);
+            ChannelDescription_Layout+=__T(' ');
+            Skip_B4(                                                "ChannelFlags");
+            Skip_BF4(                                               "Coordinates (0)");
+            Skip_BF4(                                               "Coordinates (1)");
+            Skip_BF4(                                               "Coordinates (2)");
+        }
+        if (!ChannelDescription_Layout.empty())
+            ChannelDescription_Layout.resize(ChannelDescription_Layout.size()-1);
     }
 
+    if (moov_trak_mdia_minf_stbl_stsd_Pos>1)
+        return; //Handling only the first description
+
     FILLING_BEGIN();
-        if (ChannelLayoutTag==0x10000) //kCAFChannelLayoutTag_UseChannelBitmap
+        if (ChannelLayoutTag==0) //UseChannelDescriptions
         {
-            int16u Channels=ChannelLayoutTag&0x0000FFFF;
-            int16u Ordering=(ChannelLayoutTag&0xFFFF0000)>16;
-            Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, Channels, 10, true);
-            Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, Mpeg4_chan(Ordering), Unlimited, true, true);
+            Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, NumberChannelDescriptions, 10, true);
+            if (ChannelLabels_Valid)
+                Fill(Stream_Audio, StreamPos_Last, Audio_ChannelPositions, Mpeg4_chan_ChannelDescription(ChannelLabels), true, true);
+            Fill(Stream_Audio, StreamPos_Last, Audio_ChannelLayout, ChannelDescription_Layout.c_str(), Unlimited, true, true);
         }
-        else
+        else if (ChannelLayoutTag==0x10000) //UseChannelBitmap
         {
-            size_t Channels=0;
+            int8u Channels=0;
             for (size_t Bit=0; Bit<18; Bit++)
                 if (ChannelBitmap&(1<<Bit))
+                {
                     Channels++;
+                    ChannelDescription_Layout+=Mpeg4_chan_ChannelBitmap_Layout((int32u)(Bit+1));
+                    ChannelDescription_Layout+=__T(' ');
+                }
             if (Channels)
-                Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, Channels);
+            {
+                Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, Channels, 10, true);
+                Fill(Stream_Audio, StreamPos_Last, Audio_ChannelPositions, Mpeg4_chan_ChannelBitmap(ChannelBitmap), true, true);
+                if (!ChannelDescription_Layout.empty())
+                {
+                    ChannelDescription_Layout.resize(ChannelDescription_Layout.size()-1);
+                    Fill(Stream_Audio, StreamPos_Last, Audio_ChannelLayout, ChannelDescription_Layout.c_str(), Unlimited, true, true);
+                }
+            }
+        }
+        else if (ChannelLayoutTag>0x10000)
+        {
+            int16u Channels=ChannelLayoutTag&0x0000FFFF;
+            int16u Ordering=(ChannelLayoutTag&0xFFFF0000)>>16;
+            Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, Channels, 10, true);
+            Fill(Stream_Audio, StreamPos_Last, Audio_ChannelPositions, Mpeg4_chan(Ordering), Unlimited, true, true);
+            Fill(Stream_Audio, StreamPos_Last, Audio_ChannelLayout, Mpeg4_chan_Layout(Ordering));
         }
-        Stream[moov_trak_tkhd_TrackID].Channels_AreTrustable=true;
     FILLING_END();
 }
 
@@ -3147,12 +4312,12 @@
     Skip_B4(                                                    "vertOff_N");
     Skip_B4(                                                    "vertOff_D");
 
+    if (moov_trak_mdia_minf_stbl_stsd_Pos>1)
+        return; //Handling only the first description
+
     FILLING_BEGIN();
-        Clear(Stream_Video, StreamPos_Last, Video_Width);
-        Clear(Stream_Video, StreamPos_Last, Video_Height);
-        Clear(Stream_Video, StreamPos_Last, Video_DisplayAspectRatio);
-        Fill(Stream_Video, StreamPos_Last, Video_Width, ((float)apertureWidth_N)/apertureWidth_D, 0);
-        Fill(Stream_Video, StreamPos_Last, Video_Height, ((float)apertureHeight_N)/apertureHeight_D, 0);
+        Streams[moov_trak_tkhd_TrackID].CleanAperture_Width=((float)apertureWidth_N)/apertureWidth_D;
+        Streams[moov_trak_tkhd_TrackID].CleanAperture_Height=((float)apertureHeight_N)/apertureHeight_D;
     FILLING_END();
 }
 
@@ -3162,10 +4327,17 @@
     Element_Name("Color Parameter");
 
     //Parsing
+    int16u  colour_primaries, transfer_characteristics, matrix_coefficients;
     Skip_C4(                                                    "Color parameter type");
-    Skip_B2(                                                    "Primaries index");
-    Skip_B2(                                                    "Transfer function index");
-    Skip_B2(                                                    "Matrix index");
+    Get_B2 (colour_primaries,                                   "Primaries index"); Param_Info1(Mpegv_colour_primaries(colour_primaries));
+    Get_B2 (transfer_characteristics,                           "Transfer function index"); Param_Info1(Mpegv_transfer_characteristics(transfer_characteristics));
+    Get_B2 (matrix_coefficients,                                "Matrix index"); Param_Info1(Mpegv_matrix_coefficients(matrix_coefficients));
+
+    FILLING_BEGIN();
+        Fill(Stream_Video, StreamPos_Last, "colour_primaries", Mpegv_colour_primaries(colour_primaries));
+        Fill(Stream_Video, StreamPos_Last, "transfer_characteristics", Mpegv_transfer_characteristics(transfer_characteristics));
+        Fill(Stream_Video, StreamPos_Last, "matrix_coefficients", Mpegv_matrix_coefficients(matrix_coefficients));
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -3181,19 +4353,22 @@
     Get_B1 (H263_Level,                                         "H263_Level");
     Get_B1 (H263_Profile,                                       "H263_Profile");
 
+    if (moov_trak_mdia_minf_stbl_stsd_Pos>1)
+        return; //Handling only the first description
+
     Ztring ProfileLevel;
     switch (H263_Profile)
     {
-        case 0x00 : ProfileLevel=_T("BaseLine"); break;
+        case 0x00 : ProfileLevel=__T("BaseLine"); break;
         default   : ProfileLevel.From_Number(H263_Profile);
     }
-    ProfileLevel+=_T('@');
+    ProfileLevel+=__T('@');
     ProfileLevel+=Ztring::ToZtring(((float32)H263_Level)/10, 1);
     Fill(Stream_Video, StreamPos_Last, Video_Format_Profile, ProfileLevel);
     Fill(Stream_Video, StreamPos_Last, Video_Encoded_Library_Name, Mpeg4_Vendor(Vendor));
     Fill(Stream_Video, StreamPos_Last, Video_Encoded_Library_Version, Version);
-    Fill(Stream_Video, StreamPos_Last, Video_Encoded_Library, Retrieve(Stream_Video, StreamPos_Last, Video_Encoded_Library_Name)+_T(' ')+Ztring::ToZtring(Version));
-    Ztring Encoded_Library_String=Retrieve(Stream_Video, StreamPos_Last, Video_Encoded_Library_Name)+(Version?(_T(" Revision ")+Ztring::ToZtring(Version)):Ztring());
+    Fill(Stream_Video, StreamPos_Last, Video_Encoded_Library, Retrieve(Stream_Video, StreamPos_Last, Video_Encoded_Library_Name)+__T(' ')+Ztring::ToZtring(Version));
+    Ztring Encoded_Library_String=Retrieve(Stream_Video, StreamPos_Last, Video_Encoded_Library_Name)+(Version?(__T(" Revision ")+Ztring::ToZtring(Version)):Ztring());
     Fill(Stream_Video, StreamPos_Last, Video_Encoded_Library_String, Encoded_Library_String, true);
 }
 
@@ -3204,9 +4379,9 @@
     Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, "", Unlimited, true, true); //Remove the value (is always wrong in the stsd atom)
 
     //Parsing
-    if (Retrieve(Stream_Audio, StreamPos_Last, Audio_CodecID)==_T("sac3"))
+    if (Retrieve(Stream_Audio, StreamPos_Last, Audio_CodecID)==__T("sac3"))
     {
-        Element_Info("Nero specific");
+        Element_Info1("Nero specific");
         int8u Version;
         Get_B1 (Version,                                        "Version");
         if (Version==1)
@@ -3215,11 +4390,11 @@
             Get_B1 (bsid,                                       "bsid");
             Skip_XX(Element_Size-Element_Offset,                "unknown");
             #ifdef MEDIAINFO_AC3_YES
-                if (Stream[moov_trak_tkhd_TrackID].Parser==NULL)
+                if (Streams[moov_trak_tkhd_TrackID].Parser==NULL)
                 {
-                    Stream[moov_trak_tkhd_TrackID].Parser=new File_Ac3;
-                    Open_Buffer_Init(Stream[moov_trak_tkhd_TrackID].Parser);
-                    ((File_Ac3*)Stream[moov_trak_tkhd_TrackID].Parser)->Frame_Count_Valid=2;
+                    Streams[moov_trak_tkhd_TrackID].Parser=new File_Ac3;
+                    Open_Buffer_Init(Streams[moov_trak_tkhd_TrackID].Parser);
+                    ((File_Ac3*)Streams[moov_trak_tkhd_TrackID].Parser)->Frame_Count_Valid=2;
                     mdat_MustParse=true; //Data is in MDAT
                 }
             #else
@@ -3237,17 +4412,20 @@
         }
     }
 
+    if (moov_trak_mdia_minf_stbl_stsd_Pos>1)
+        return; //Handling only the first description
+
     #ifdef MEDIAINFO_AC3_YES
-        if (Stream[moov_trak_tkhd_TrackID].Parser==NULL)
+        if (Streams[moov_trak_tkhd_TrackID].Parser==NULL)
         {
-            Stream[moov_trak_tkhd_TrackID].Parser=new File_Ac3;
-            Open_Buffer_Init(Stream[moov_trak_tkhd_TrackID].Parser);
-            ((File_Ac3*)Stream[moov_trak_tkhd_TrackID].Parser)->Frame_Count_Valid=2;
-            ((File_Ac3*)Stream[moov_trak_tkhd_TrackID].Parser)->MustParse_dac3=true;
+            Streams[moov_trak_tkhd_TrackID].Parser=new File_Ac3;
+            Open_Buffer_Init(Streams[moov_trak_tkhd_TrackID].Parser);
+            ((File_Ac3*)Streams[moov_trak_tkhd_TrackID].Parser)->Frame_Count_Valid=2;
+            ((File_Ac3*)Streams[moov_trak_tkhd_TrackID].Parser)->MustParse_dac3=true;
             mdat_MustParse=true; //Data is in MDAT
 
             //Parsing
-            Open_Buffer_Continue(Stream[moov_trak_tkhd_TrackID].Parser);
+            Open_Buffer_Continue(Streams[moov_trak_tkhd_TrackID].Parser);
         }
     #else
         Skip_XX(Element_Size,                                   "AC-3 Data");
@@ -3262,17 +4440,28 @@
     Element_Name("E-AC-3");
     Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, "", Unlimited, true, true); //Remove the value (is always wrong in the stsd atom)
 
+    if (moov_trak_mdia_minf_stbl_stsd_Pos>1)
+    {
+        return; //Handling only the first description
+    }
+
     #ifdef MEDIAINFO_AC3_YES
-        if (Stream[moov_trak_tkhd_TrackID].Parser==NULL)
+        if (moov_trak_mdia_minf_stbl_stsd_Pos>1)
+        {
+            Skip_XX(Element_Size,                               "Data not analyzed");
+            return; //Handling only the first description
+        }
+
+        if (Streams[moov_trak_tkhd_TrackID].Parser==NULL)
         {
-            Stream[moov_trak_tkhd_TrackID].Parser=new File_Ac3;
-            Open_Buffer_Init(Stream[moov_trak_tkhd_TrackID].Parser);
-            ((File_Ac3*)Stream[moov_trak_tkhd_TrackID].Parser)->Frame_Count_Valid=2;
-            ((File_Ac3*)Stream[moov_trak_tkhd_TrackID].Parser)->MustParse_dec3=true;
+            Streams[moov_trak_tkhd_TrackID].Parser=new File_Ac3;
+            Open_Buffer_Init(Streams[moov_trak_tkhd_TrackID].Parser);
+            ((File_Ac3*)Streams[moov_trak_tkhd_TrackID].Parser)->Frame_Count_Valid=2;
+            ((File_Ac3*)Streams[moov_trak_tkhd_TrackID].Parser)->MustParse_dec3=true;
             mdat_MustParse=true; //Data is in MDAT
 
             //Parsing
-            Open_Buffer_Continue(Stream[moov_trak_tkhd_TrackID].Parser);
+            Open_Buffer_Continue(Streams[moov_trak_tkhd_TrackID].Parser);
         }
     #else
         Skip_XX(Element_Size,                                   "E-AC-3 Data");
@@ -3283,6 +4472,63 @@
 }
 
 //---------------------------------------------------------------------------
+void File_Mpeg4::moov_trak_mdia_minf_stbl_stsd_xxxx_ddts()
+{
+    //Comments about the new CodecIDs having this atom:
+    //dtsc: DTS Core only
+    //dtse: DTS Express, not having DTS Core
+    //dtsh: DTS Core + DTS Lossless (MA), mixed
+    //dtsl: DTS Lossless (MA), not having DTS Core
+
+    int32u  DTSSamplingFrequency, maxBitrate, avgBitrate;
+    int16u  ChannelLayout;
+    int8u   CoreLayout;
+
+    //Parsing
+    Get_B4 (DTSSamplingFrequency,                               "DTSSamplingFrequency");
+    Get_B4 (maxBitrate,                                         "maxBitrate");
+    Get_B4 (avgBitrate,                                         "avgBitrate");
+    Skip_B1(                                                    "pcmSampleDepth"); // 16 or 24 bits
+    BS_Begin();
+        Skip_S1(2,                                              "FrameDuration");  // 0 = 512, 1 = 1024, 2 = 2048, 3 = 4096
+        Skip_S1(5,                                              "StreamConstruction");
+        Skip_SB(                                                "CoreLFEPresent"); // 0 = none, 1 = LFE exists
+        Get_S1 (6,  CoreLayout,                                 "CoreLayout");
+        Skip_S2(14,                                             "CoreSize");
+        Skip_SB(                                                "StereoDownmix"); // 0 = none, 1 = downmix present
+        Skip_S1 (3,                                             "RepresentationType");
+        Get_S2 (16, ChannelLayout,                              "ChannelLayout");
+        Skip_SB(                                                "MultiAssetFlag"); // 0 = none, 1 = multiple asset
+        Skip_SB(                                                "LBRDurationMod"); // 0 = ignore, 1 = Special LBR duration modifier
+        Skip_S1(6,                                              "reserved");
+    BS_End();
+
+    FILLING_BEGIN();
+        /*
+        //Disabled until we have a sample file
+        if (DTSSamplingFrequency)
+            Fill(StreamKind_Last, StreamPos_Last, Audio_SamplingRate, DTSSamplingFrequency, 10, true); //This is the maximum sampling frequency
+        if (avgBitrate)
+            Fill(StreamKind_Last, StreamPos_Last, Audio_BitRate, avgBitrate);
+        if (maxBitrate)
+            Fill(StreamKind_Last, StreamPos_Last, Audio_BitRate_Maximum, maxBitrate);
+        #if defined(MEDIAINFO_DTS_YES)
+        if (ChannelLayout)
+        {
+            Fill(Stream_Audio, 0, Audio_ChannelPositions, DTS_HD_SpeakerActivityMask(ChannelLayout).c_str());
+            Fill(Stream_Audio, 0, Audio_ChannelPositions_String2, DTS_HD_SpeakerActivityMask2(ChannelLayout).c_str());
+        }
+        if (CoreLayout && CoreLayout<16)
+        {
+            Fill(Stream_Audio, 0, Audio_ChannelPositions, DTS_ChannelPositions[CoreLayout]);
+            Fill(Stream_Audio, 0, Audio_ChannelPositions_String2, DTS_ChannelPositions2[CoreLayout]);
+        }
+        #endif //defined(MEDIAINFO_DTS_YES)
+        */
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
 void File_Mpeg4::moov_trak_mdia_minf_stbl_stsd_xxxx_damr()
 {
     Element_Name("AMR decode config");
@@ -3296,10 +4542,13 @@
     Skip_B1(                                                    "Number of packet mode changes");
     Skip_B1(                                                    "Samples per packet");
 
+    if (moov_trak_mdia_minf_stbl_stsd_Pos>1)
+        return; //Handling only the first description
+
     Fill(Stream_Audio, StreamPos_Last, Audio_Encoded_Library_Name, Mpeg4_Vendor(Vendor));
     Fill(Stream_Audio, StreamPos_Last, Audio_Encoded_Library_Version, Version);
-    Fill(Stream_Audio, StreamPos_Last, Audio_Encoded_Library, Retrieve(Stream_Audio, StreamPos_Last, Audio_Encoded_Library_Name)+_T(' ')+Ztring::ToZtring(Version));
-    Ztring Encoded_Library_String=Retrieve(Stream_Audio, StreamPos_Last, Audio_Encoded_Library_Name)+(Version?(_T(" Revision ")+Ztring::ToZtring(Version)):Ztring());
+    Fill(Stream_Audio, StreamPos_Last, Audio_Encoded_Library, Retrieve(Stream_Audio, StreamPos_Last, Audio_Encoded_Library_Name)+__T(' ')+Ztring::ToZtring(Version));
+    Ztring Encoded_Library_String=Retrieve(Stream_Audio, StreamPos_Last, Audio_Encoded_Library_Name)+(Version?(__T(" Revision ")+Ztring::ToZtring(Version)):Ztring());
     Fill(Stream_Audio, StreamPos_Last, Audio_Encoded_Library_String, Encoded_Library_String, true);
 }
 
@@ -3309,17 +4558,97 @@
     NAME_VERSION_FLAG("ES Descriptor");
     INTEGRITY_VERSION(0);
 
+    if (moov_trak_mdia_minf_stbl_stsd_Pos>1)
+        return; //Handling only the first description
+
     FILLING_BEGIN();
         Descriptors();
+        if (Streams[moov_trak_tkhd_TrackID].Parser && !Retrieve(StreamKind_Last, StreamPos_Last, "Encryption").empty())
+        {
+            Finish(Streams[moov_trak_tkhd_TrackID].Parser);
+        }
     FILLING_END();
 }
 
 //---------------------------------------------------------------------------
+void File_Mpeg4::moov_trak_mdia_minf_stbl_stsd_xxxx_fiel()
+{
+    //Source: http://developer.apple.com/quicktime/icefloe/dispatch019.html#fiel
+    Element_Name("Field/Frame Information");
+
+    //Parsing
+    int8u  fields, detail;
+    Get_B1 (fields,                                             "fields");
+    Get_B1 (detail,                                             "detail");
+
+    if (moov_trak_mdia_minf_stbl_stsd_Pos>1)
+        return; //Handling only the first description
+
+    FILLING_BEGIN();
+        switch(fields)
+        {
+            case 0x01 : Fill(Stream_Video, StreamPos_Last, Video_ScanType, "Progressive", Unlimited, true, true); break;
+            case 0x02 : Fill(Stream_Video, StreamPos_Last, Video_ScanType, "Interlaced", Unlimited, true, true);
+                        switch(detail)
+                        {
+                            case 1  :   // Split fields, TFF
+                            case 9  :   // Interleaved fields, TFF
+                                        Fill(Stream_Video, StreamPos_Last, Video_ScanOrder, "TFF", Unlimited, true, true);
+                                        break;
+                            case 6  :   // Split fields, BFF
+                            case 14 :   // Interleaved fields, BFF
+                                        Fill(Stream_Video, StreamPos_Last, Video_ScanOrder, "BFF", Unlimited, true, true);
+                                        break;
+                            default  :  ;
+                        }
+                        break;
+            default   : ;
+        }
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg4::moov_trak_mdia_minf_stbl_stsd_xxxx_glbl()
+{
+    Element_Name("Global");
+
+    if (Retrieve(Stream_Video, StreamPos_Last, Video_MuxingMode)==__T("MXF"))
+    {
+        Clear(Stream_Video, StreamPos_Last, Video_MuxingMode);
+        delete Streams[moov_trak_tkhd_TrackID].Parser;
+        #if defined(MEDIAINFO_MPEGV_YES)
+            Streams[moov_trak_tkhd_TrackID].Parser=new File_Mpegv;
+        #else //defined(MEDIAINFO_MPEGV_YES)
+            Streams[moov_trak_tkhd_TrackID].Parser=NULL;
+        #endif //defined(MEDIAINFO_MPEGV_YES)
+
+        //Re-init
+        if (Streams[moov_trak_tkhd_TrackID].Parser)
+        {
+            int64u Elemen_Code_Save=Element_Code;
+            Element_Code=moov_trak_tkhd_TrackID; //Element_Code is use for stream identifier
+            Open_Buffer_Init(Streams[moov_trak_tkhd_TrackID].Parser);
+            Element_Code=Elemen_Code_Save;
+            mdat_MustParse=true; //Data is in MDAT
+        }
+    }
+
+    //Demux
+    #if MEDIAINFO_DEMUX
+        Demux_Level=2; //Container
+        Demux(Buffer+Buffer_Offset, (size_t)Element_Size, ContentType_MainStream);
+    #endif //MEDIAINFO_DEMUX
+
+    //Parsing
+    Open_Buffer_Continue(Streams[moov_trak_tkhd_TrackID].Parser);
+}
+
+//---------------------------------------------------------------------------
 void File_Mpeg4::moov_trak_mdia_minf_stbl_stsd_xxxx_idfm()
 {
     Element_Name("Description");
 
-    Info_C4(Description,                                        "Description"); Param_Info(Mpeg4_Description(Description));
+    Info_C4(Description,                                        "Description"); Param_Info1(Mpeg4_Description(Description));
 }
 
 //---------------------------------------------------------------------------
@@ -3332,15 +4661,70 @@
     Get_B4 (hSpacing,                                           "hSpacing");
     Get_B4 (vSpacing,                                           "vSpacing");
 
+    if (moov_trak_mdia_minf_stbl_stsd_Pos>1)
+        return; //Handling only the first description
+
     FILLING_BEGIN();
         if (vSpacing)
         {
-            float64 PixelAspectRatio=(float64)hSpacing/vSpacing;
+            float32 PixelAspectRatio=(float32)hSpacing/vSpacing;
             Clear(Stream_Video, StreamPos_Last, Video_DisplayAspectRatio);
             Fill(Stream_Video, StreamPos_Last, Video_PixelAspectRatio, PixelAspectRatio, 3, true);
+            Streams[moov_trak_tkhd_TrackID].CleanAperture_PixelAspectRatio=PixelAspectRatio; //This is the PAR of the clean aperture
         }
     FILLING_END();
 }
+
+//---------------------------------------------------------------------------
+void File_Mpeg4::moov_trak_mdia_minf_stbl_stsd_xxxx_sinf()
+{
+    Element_Name("Protection scheme information box");
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg4::moov_trak_mdia_minf_stbl_stsd_xxxx_sinf_frma()
+{
+    Element_Name("Original format box");
+
+    //Parsing
+    std::string Codec;
+    Get_String(4, Codec,                                        "data_format");
+
+    FILLING_BEGIN();
+        CodecID_Fill(Ztring(Codec.c_str()), Stream_Video, StreamPos_Last, InfoCodecID_Format_Mpeg4);
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg4::moov_trak_mdia_minf_stbl_stsd_xxxx_sinf_imif()
+{
+    NAME_VERSION_FLAG("IPMP Information box");
+
+    //Parsing
+    Descriptors();
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg4::moov_trak_mdia_minf_stbl_stsd_xxxx_sinf_schi()
+{
+    Element_Name("scheme information box");
+
+    //Parsing
+    Skip_XX(Element_Size,                                       "scheme_specific_data");
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg4::moov_trak_mdia_minf_stbl_stsd_xxxx_sinf_schm()
+{
+    NAME_VERSION_FLAG("scheme type box");
+
+    //Parsing
+    Skip_C4(                                                    "scheme_type");
+    Skip_B4(                                                    "scheme_version");
+    if (Flags&0x000001)
+        Skip_UTF8(Element_Size-Element_Offset,                  "scheme_uri");
+}
+
 //---------------------------------------------------------------------------
 void File_Mpeg4::moov_trak_mdia_minf_stbl_stsd_xxxx_wave()
 {
@@ -3359,7 +4743,17 @@
 //---------------------------------------------------------------------------
 void File_Mpeg4::moov_trak_mdia_minf_stbl_stsd_xxxx_wave_enda()
 {
-    Skip_B2(                                                    "Unknown");
+    //Parsing
+    int16u Endianness;
+    Get_B2 (Endianness,                                          "Endianness");
+
+    if (moov_trak_mdia_minf_stbl_stsd_Pos>1)
+        return; //Handling only the first description
+
+    FILLING_BEGIN();
+        if (Retrieve(Stream_Audio, StreamPos_Last, Audio_Format)==__T("PCM"))
+            Fill(Stream_Audio, StreamPos_Last, Audio_Format_Settings_Endianness, Endianness?"Little":"Big", Unlimited, true, true);
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -3376,8 +4770,17 @@
         Skip_C2(                                                "Codec_MS");
         Get_B2 (CodecMS,                                        "CC2");
 
+        if (moov_trak_mdia_minf_stbl_stsd_Pos>1)
+            return; //Handling only the first description
+
         FILLING_BEGIN();
-            CodecID_Fill(Ztring::ToZtring(CodecMS, 16), Stream_Audio, StreamPos_Last, InfoCodecID_Format_Riff);
+            Ztring OldFormat=Retrieve(Stream_Audio, StreamPos_Last, Audio_CodecID);
+            Ztring NewFormat=Ztring::ToZtring(CodecMS, 16);
+            if (OldFormat!=NewFormat)
+            {
+                Clear(Stream_Audio, StreamPos_Last, Audio_CodecID);
+                CodecID_Fill(NewFormat, Stream_Audio, StreamPos_Last, InfoCodecID_Format_Riff);
+            }
             Fill(Stream_Audio, StreamPos_Last, Audio_Codec, CodecMS, 16, true);
             Fill(Stream_Audio, StreamPos_Last, Audio_Codec_CC, CodecMS, 16, true);
         FILLING_END();
@@ -3387,9 +4790,20 @@
         int32u Codec;
         Get_C4(Codec,                                           "Codec");
 
+        if (moov_trak_mdia_minf_stbl_stsd_Pos>1)
+            return; //Handling only the first description
+
         FILLING_BEGIN();
             if (Codec!=0x6D703461) //"mp4a"
-                CodecID_Fill(Ztring().From_CC4(Codec), Stream_Audio, StreamPos_Last, InfoCodecID_Format_Mpeg4);
+            {
+                Ztring OldFormat=Retrieve(Stream_Audio, StreamPos_Last, Audio_CodecID);
+                Ztring NewFormat=Ztring().From_CC4(Codec);
+                if (OldFormat!=NewFormat)
+                {
+                    Clear(Stream_Audio, StreamPos_Last, Audio_CodecID);
+                    CodecID_Fill(NewFormat, Stream_Audio, StreamPos_Last, InfoCodecID_Format_Mpeg4);
+                }
+            }
             Fill(Stream_Audio, StreamPos_Last, Audio_Codec, Ztring().From_CC4(Codec), true);
             Fill(Stream_Audio, StreamPos_Last, Audio_Codec_CC, Ztring().From_CC4(Codec), true);
         FILLING_END();
@@ -3408,10 +4822,13 @@
     Get_B1 (Version,                                            "Encoder version");
     Skip_XX(Element_Size-Element_Offset,                        "Unknown");
 
+    if (moov_trak_mdia_minf_stbl_stsd_Pos>1)
+        return; //Handling only the first description
+
     Fill(Stream_Audio, StreamPos_Last, Audio_Encoded_Library_Name, Mpeg4_Vendor(Vendor));
     Fill(Stream_Audio, StreamPos_Last, Audio_Encoded_Library_Version, Version);
-    Fill(Stream_Audio, StreamPos_Last, Audio_Encoded_Library, Retrieve(Stream_Audio, StreamPos_Last, Audio_Encoded_Library_Name)+_T(' ')+Ztring::ToZtring(Version));
-    Ztring Encoded_Library_String=Retrieve(Stream_Audio, StreamPos_Last, Audio_Encoded_Library_Name)+(Version?(_T("Revision")+Ztring::ToZtring(Version)):Ztring());
+    Fill(Stream_Audio, StreamPos_Last, Audio_Encoded_Library, Retrieve(Stream_Audio, StreamPos_Last, Audio_Encoded_Library_Name)+__T(' ')+Ztring::ToZtring(Version));
+    Ztring Encoded_Library_String=Retrieve(Stream_Audio, StreamPos_Last, Audio_Encoded_Library_Name)+(Version?(__T("Revision")+Ztring::ToZtring(Version)):Ztring());
     Fill(Stream_Audio, StreamPos_Last, Audio_Encoded_Library_String, Encoded_Library_String, true);
 }
 
@@ -3451,7 +4868,7 @@
     //Options
     if (Element_Offset+2>Element_Size)
         return; //No options
-        
+
     //Parsing
     int16u Option_Size;
     Get_L2 (Option_Size,                                        "cbSize");
@@ -3459,12 +4876,8 @@
     //Filling
     if (Option_Size>0)
     {
-             if (0);
-        else Skip_XX(Option_Size,                               "Unknown");
+        Skip_XX(Option_Size,                                    "Unknown");
     }
-
-    //Creating the parser
-         if (0);
 }
 
 //---------------------------------------------------------------------------
@@ -3488,14 +4901,36 @@
 {
     NAME_VERSION_FLAG("Sync Sample");
 
+    Streams[moov_trak_tkhd_TrackID].stss.clear();
+
     //Parsing
     int32u entry_count;
     Get_B4 (entry_count,                                        "entry-count");
 
+    int32u Offset=1; //By default, begin at 1
     for (int32u Pos=0; Pos<entry_count; Pos++)
     {
-        Skip_B4(                                                "sample-number");
+        int32u sample_number;
+
+        //Too much slow
+        Get_B4 (sample_number,                                  "sample-number");
+
+/*
+        //Faster
+        if (Element_Offset+4>Element_Size)
+            break; //Problem
+        sample_number=BigEndian2int32u(Buffer+Buffer_Offset+(size_t)Element_Offset);
+        Element_Offset+=4;
+*/
+
+        if (Streams[moov_trak_tkhd_TrackID].stss.empty() && sample_number==0)
+            Offset=0;
+        Streams[moov_trak_tkhd_TrackID].stss.push_back(sample_number-Offset);
     }
+
+    //Bit rate mode is based on only 1 frame bit rate computing, not valid for P and B frames
+    //TODO: compute Bit rate mode from stss
+    Clear(StreamKind_Last, StreamPos_Last, "BitRate_Mode");
 }
 
 //---------------------------------------------------------------------------
@@ -3503,70 +4938,116 @@
 {
     NAME_VERSION_FLAG("Sample Size")
 
+    Stream=Streams.find(moov_trak_tkhd_TrackID);
     int32u Sample_Size, Sample_Count;
-    Get_B4 (Sample_Size,                                        "Sample Size");
+    int8u  FieldSize;
+    if (Element_Code==Elements::moov_trak_mdia_minf_stbl_stsz)
+    {
+        Get_B4 (Sample_Size,                                    "Sample Size");
+        FieldSize=32;
+    }
+    else
+    {
+        Skip_B3(                                                "Reserved");
+        Get_B1 (FieldSize,                                      "Field size");
+        Sample_Size=0;
+    }
     Get_B4 (Sample_Count,                                       "Number of entries");
 
-    int64u Stream_Size=0;
-
     if (Sample_Size>0)
     {
-        Stream_Size=Sample_Size; Stream_Size*=Sample_Count;
-
-        Stream[moov_trak_tkhd_TrackID].stsz_Sample_Size=Sample_Size;
-        Stream[moov_trak_tkhd_TrackID].stsz_Sample_Count=Sample_Count;
-        
-        if (Sample_Count>1 && Retrieve(StreamKind_Last, StreamPos_Last, "BitRate_Mode").empty())
-            Fill(StreamKind_Last, StreamPos_Last, "BitRate_Mode", "CBR");
-
         //Detecting wrong stream size with some PCM streams
         if (StreamKind_Last==Stream_Audio)
         {
             const Ztring &Codec=Retrieve(Stream_Audio, StreamPos_Last, Audio_CodecID);
-            if (Codec==_T("raw ")
-             || MediaInfoLib::Config.Codec_Get(Codec, InfoCodec_KindofCodec).find(_T("PCM"))==0)
+            if (Codec==__T("raw ")
+             || MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Mpeg4, Codec).find(__T("PCM"))==0
+             || MediaInfoLib::Config.Codec_Get(Codec, InfoCodec_KindofCodec).find(__T("PCM"))==0)
              {
                 int64u Duration=Retrieve(StreamKind_Last, StreamPos_Last, Audio_Duration).To_int64u();
-                int64u Resolution=Retrieve(StreamKind_Last, StreamPos_Last, Audio_Resolution).To_int64u();
+                int64u Resolution=Retrieve(StreamKind_Last, StreamPos_Last, Audio_BitDepth).To_int64u();
                 int64u SamplingRate=Retrieve(StreamKind_Last, StreamPos_Last, Audio_SamplingRate).To_int64u();
                 int64u Channels=Retrieve(StreamKind_Last, StreamPos_Last, Audio_Channel_s_).To_int64u();
                 int64u Stream_Size_Theory=Duration*Resolution*SamplingRate*Channels/8/1000;
+                int64u Stream_Size_Real=Sample_Size; Stream_Size_Real*=Sample_Count;
                 for (int64u Multiplier=1; Multiplier<=32; Multiplier++)
-                    if (Stream_Size*Multiplier>Stream_Size_Theory*0.995 && Stream_Size*Multiplier<Stream_Size_Theory*1.005)
+                    if (Stream_Size_Real*Multiplier>Stream_Size_Theory*0.995 && Stream_Size_Real*Multiplier<Stream_Size_Theory*1.005)
                     {
-                        Stream_Size*=Multiplier;
+                        Streams[moov_trak_tkhd_TrackID].stsz_Sample_Multiplier=Multiplier;
                         break;
                     }
              }
         }
+
+        Stream->second.stsz_StreamSize=Sample_Size; Stream->second.stsz_StreamSize*=Sample_Count;
+        if (Sample_Size==1)
+            Stream->second.stsz_StreamSize*=Streams[moov_trak_tkhd_TrackID].stsz_Sample_Multiplier;
+        else
+            Stream->second.stsz_Sample_Multiplier=1; //Sampe_Size is correct, no need of stsz_Sample_Multiplier
+
+        Stream->second.stsz_Sample_Size=Sample_Size;
+        Stream->second.stsz_Sample_Count=Sample_Count;
+
+        if (Sample_Count>1 && Retrieve(StreamKind_Last, StreamPos_Last, "BitRate_Mode").empty())
+            Fill(StreamKind_Last, StreamPos_Last, "BitRate_Mode", "CBR");
+
     }
     else
     {
         int32u Size;
         int32u Size_Min=(int32u)-1, Size_Max=0;
+        /*
+        if (FieldSize==4)
+            BS_Begin(); //Too much slow
+        */
         for (int32u Pos=0; Pos<Sample_Count; Pos++)
         {
             //Too much slow
             /*
-            Get_B4 (Size,                                     "Size");
+            switch(FieldSize)
+            {
+                case  4 :                Get_S4 (4, Size,       "Size"); break;
+                case  8 : {int8u  Size1; Get_B1 (Size1,         "Size"); Size=Size1;} break;
+                case 16 : {int16u Size2; Get_B2 (Size2,         "Size"); Size=Size2;} break;
+                case 32 : {int32u Size4; Get_B4 (Size4,         "Size"); Size=Size4;} break;
+                default : return;
+            }
             */
 
             //Faster
             if (Element_Offset+4>Element_Size)
                 break; //Problem
-            Size=BigEndian2int32u(Buffer+Buffer_Offset+(size_t)Element_Offset);
-            Element_Offset+=4;
+           switch(FieldSize)
+            {
+                case  4 : if (Sample_Count%2)
+                            Size=Buffer[Buffer_Offset+(size_t)Element_Offset]&0x0F;
+                          else
+                          {
+                            Size=Buffer[Buffer_Offset+(size_t)Element_Offset]>>4;
+                            Element_Offset++;
+                          }
+                          break;
+               case  8 : Size=BigEndian2int8u (Buffer+Buffer_Offset+(size_t)Element_Offset); Element_Offset++; break;
+                case 16 : Size=BigEndian2int16u(Buffer+Buffer_Offset+(size_t)Element_Offset); Element_Offset+=2; break;
+                case 32 : Size=BigEndian2int32u(Buffer+Buffer_Offset+(size_t)Element_Offset); Element_Offset+=4; break;
+                default : return;
+            }
 
-            Stream_Size+=Size;
+            Stream->second.stsz_StreamSize+=Size;
+            Stream->second.stsz_Total.push_back(Size);
             if (Size<Size_Min)
                 Size_Min=Size;
             if (Size>Size_Max)
                 Size_Max=Size;
             if (Pos<300 || MediaInfoLib::Config.ParseSpeed_Get()==1.00)
-                Stream[moov_trak_tkhd_TrackID].stsz.push_back(Size);
+                Stream->second.stsz.push_back(Size);
         }
+        /*
+        if (FieldSize==4)
+            BS_End(); //Too much slow
+        */
 
-        if (Retrieve(StreamKind_Last, StreamPos_Last, "BitRate_Mode").empty())
+        if (Stream->second.stss.empty() && Retrieve(StreamKind_Last, StreamPos_Last, "BitRate_Mode").empty())
         {
             if (Size_Min*(1.005+0.005)<Size_Max)
                 Fill(StreamKind_Last, StreamPos_Last, "BitRate_Mode", "VBR");
@@ -3574,11 +5055,6 @@
                 Fill(StreamKind_Last, StreamPos_Last, "BitRate_Mode", "CBR");
         }
     }
-
-    FILLING_BEGIN();
-        if (Stream_Size>0)
-            Fill(StreamKind_Last, StreamPos_Last, "StreamSize", Stream_Size);
-    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -3590,98 +5066,118 @@
     int32u NumberOfEntries;
     Get_B4(NumberOfEntries,                                     "Number of entries");
 
-    int32u Min=(int32u)-1;
-    int32u Max=0;
-    int64u FrameCount=0;
+    Stream=Streams.find(moov_trak_tkhd_TrackID);
+    Stream->second.stts_Min=(int32u)-1;
+    Stream->second.stts_Max=0;
+    Stream->second.stts_FrameCount=0;
     #ifdef MEDIAINFO_DVDIF_ANALYZE_YES
-        std::map<int32u, int64u> Duration_FrameCount; //key is duration 
+        std::map<int32u, int64u> Duration_FrameCount; //key is duration
         int64u Duration_FrameCount_Max=0;
         int32u Duration_FrameCount_Max_Duration=0;
-        if (StreamKind_Last==Stream_Video && Retrieve(Stream_Video, StreamPos_Last, "Format")==_T("DV") && Stream[moov_trak_tkhd_TrackID].Parser && ((File_DvDif*)Stream[moov_trak_tkhd_TrackID].Parser)->Mpeg4_stts==NULL)
-            ((File_DvDif*)Stream[moov_trak_tkhd_TrackID].Parser)->Mpeg4_stts=new File_DvDif::stts;
+        if (StreamKind_Last==Stream_Video && Retrieve(Stream_Video, StreamPos_Last, "Format")==__T("DV") && Streams[moov_trak_tkhd_TrackID].Parser && ((File_DvDif*)Streams[moov_trak_tkhd_TrackID].Parser)->Mpeg4_stts==NULL)
+            ((File_DvDif*)Streams[moov_trak_tkhd_TrackID].Parser)->Mpeg4_stts=new File_DvDif::stts;
     #endif //MEDIAINFO_DVDIF_ANALYZE_YES
 
+    #if MEDIAINFO_DEMUX
+        Streams[moov_trak_tkhd_TrackID].stts_Durations.clear();
+    #endif //MEDIAINFO_DEMUX
+
     for (int32u Pos=0; Pos<NumberOfEntries; Pos++)
     {
         int32u SampleCount, SampleDuration;
         Get_B4(SampleCount,                                     "Sample Count");
         Get_B4(SampleDuration,                                  "Sample Duration");
 
-        FILLING_BEGIN();
-            FrameCount+=SampleCount;
-            if (NumberOfEntries==2 && Pos+1==NumberOfEntries && FrameCount && SampleCount==1 && Min==Max && SampleDuration!=Max)
-            {
-                if ((float32)SampleDuration-Min>0)
-                    Clear(Stream_Video, StreamPos_Last, Video_Duration);
-                if (moov_trak_mdia_mdhd_TimeScale)
-                    Fill(Stream_Video, StreamPos_Last, Video_Duration_LastFrame, ((float32)SampleDuration-Min)*1000/moov_trak_mdia_mdhd_TimeScale, 0); //The duration of the frame minus 1 normal frame duration
-            }
-            else
+        moov_trak_mdia_minf_stbl_stts_Common(SampleCount, SampleDuration, Pos, NumberOfEntries);
+
+        #ifdef MEDIAINFO_DVDIF_ANALYZE_YES
+            if (StreamKind_Last==Stream_Video && Retrieve(Stream_Video, StreamPos_Last, "Format")==__T("DV"))
             {
-                if (SampleDuration<Min) Min=SampleDuration;
-                if (SampleDuration>Max) Max=SampleDuration;
-            }
-            #ifdef MEDIAINFO_DVDIF_ANALYZE_YES
-                if (StreamKind_Last==Stream_Video && Retrieve(Stream_Video, StreamPos_Last, "Format")==_T("DV"))
-                {
-                    File_DvDif::stts_part DV_stts_Part;
-                    DV_stts_Part.Pos_Begin=FrameCount-SampleCount;
-                    DV_stts_Part.Pos_End=FrameCount;
-                    DV_stts_Part.Duration=SampleDuration;
-                    ((File_DvDif*)Stream[moov_trak_tkhd_TrackID].Parser)->Mpeg4_stts->push_back(DV_stts_Part);
+                File_DvDif::stts_part DV_stts_Part;
+                DV_stts_Part.Pos_Begin=Stream->second.stts_FrameCount-SampleCount;
+                DV_stts_Part.Pos_End=Stream->second.stts_FrameCount;
+                DV_stts_Part.Duration=SampleDuration;
+                ((File_DvDif*)Streams[moov_trak_tkhd_TrackID].Parser)->Mpeg4_stts->push_back(DV_stts_Part);
 
-                    Duration_FrameCount[SampleDuration]+=FrameCount;
-                    if (Duration_FrameCount_Max<=Duration_FrameCount[SampleDuration])
-                    {
-                        Duration_FrameCount_Max=Duration_FrameCount[SampleDuration];
-                        Duration_FrameCount_Max_Duration=SampleDuration;
-                    }
+                Duration_FrameCount[SampleDuration]+=Stream->second.stts_FrameCount;
+                if (Duration_FrameCount_Max<=Duration_FrameCount[SampleDuration])
+                {
+                    Duration_FrameCount_Max=Duration_FrameCount[SampleDuration];
+                    Duration_FrameCount_Max_Duration=SampleDuration;
                 }
-            #endif //MEDIAINFO_DVDIF_ANALYZE_YES
-        FILLING_END();
+            }
+        #endif //MEDIAINFO_DVDIF_ANALYZE_YES
     }
 
     FILLING_BEGIN();
         if (StreamKind_Last==Stream_Video)
         {
-            if (moov_trak_mdia_mdhd_TimeScale && Min && Max)
-            {
-                if (Min!=Max)
-                {
-                    Fill(Stream_Video, StreamPos_Last, Video_FrameRate_Minimum, ((float)moov_trak_mdia_mdhd_TimeScale)/Max);
-                    Fill(Stream_Video, StreamPos_Last, Video_FrameRate_Maximum, ((float)moov_trak_mdia_mdhd_TimeScale)/Min);
-                    Fill(Stream_Video, StreamPos_Last, Video_FrameRate,         ((float)FrameCount)/moov_trak_mdia_mdhd_Duration*1000, 3, true);
-                    Fill(Stream_Video, StreamPos_Last, Video_FrameRate_Mode,    "VFR");
-                }
-                else
-                {
-                    Fill(Stream_Video, StreamPos_Last, Video_FrameRate,         ((float)moov_trak_mdia_mdhd_TimeScale)/Max, 3, true);
-                    Fill(Stream_Video, StreamPos_Last, Video_FrameRate_Mode,    "CFR");
-                }
-            }
-            Fill(Stream_Video, StreamPos_Last, Video_FrameCount, FrameCount);
-            
+            Fill(Stream_Video, StreamPos_Last, Video_FrameCount, Stream->second.stts_FrameCount);
+
             #ifdef MEDIAINFO_DVDIF_ANALYZE_YES
-                if (StreamKind_Last==Stream_Video && Retrieve(Stream_Video, StreamPos_Last, "Format")==_T("DV"))
+                if (StreamKind_Last==Stream_Video && Retrieve(Stream_Video, StreamPos_Last, "Format")==__T("DV"))
                 {
                     //Clean up the "normal" value
-                    for (size_t Pos=0; Pos<((File_DvDif*)Stream[moov_trak_tkhd_TrackID].Parser)->Mpeg4_stts->size(); Pos++)
+                    for (size_t Pos=0; Pos<((File_DvDif*)Streams[moov_trak_tkhd_TrackID].Parser)->Mpeg4_stts->size(); Pos++)
                     {
-                        if (((File_DvDif*)Stream[moov_trak_tkhd_TrackID].Parser)->Mpeg4_stts->at(Pos).Duration==Duration_FrameCount_Max_Duration)
+                        if (((File_DvDif*)Streams[moov_trak_tkhd_TrackID].Parser)->Mpeg4_stts->at(Pos).Duration==Duration_FrameCount_Max_Duration)
                         {
-                            ((File_DvDif*)Stream[moov_trak_tkhd_TrackID].Parser)->Mpeg4_stts->erase(((File_DvDif*)Stream[moov_trak_tkhd_TrackID].Parser)->Mpeg4_stts->begin()+Pos);
+                            ((File_DvDif*)Streams[moov_trak_tkhd_TrackID].Parser)->Mpeg4_stts->erase(((File_DvDif*)Streams[moov_trak_tkhd_TrackID].Parser)->Mpeg4_stts->begin()+Pos);
                             Pos--;
                         }
                     }
 
-                    if (((File_DvDif*)Stream[moov_trak_tkhd_TrackID].Parser)->Mpeg4_stts->empty())
-                        {delete ((File_DvDif*)Stream[moov_trak_tkhd_TrackID].Parser)->Mpeg4_stts; ((File_DvDif*)Stream[moov_trak_tkhd_TrackID].Parser)->Mpeg4_stts=NULL;}
+                    if (((File_DvDif*)Streams[moov_trak_tkhd_TrackID].Parser)->Mpeg4_stts->empty())
+                        {delete ((File_DvDif*)Streams[moov_trak_tkhd_TrackID].Parser)->Mpeg4_stts; ((File_DvDif*)Streams[moov_trak_tkhd_TrackID].Parser)->Mpeg4_stts=NULL;}
                 }
             #endif //MEDIAINFO_DVDIF_ANALYZE_YES
         }
     FILLING_END();
 }
 
+void File_Mpeg4::moov_trak_mdia_minf_stbl_stts_Common(int32u SampleCount, int32u SampleDuration, int32u Pos, int32u NumberOfEntries)
+{
+    FILLING_BEGIN();
+        stream::stts_struct Stts;
+        Stts.SampleCount=SampleCount;
+        Stts.SampleDuration=SampleDuration;
+        Stream->second.stts.push_back(Stts);
+        if (Pos==1 && NumberOfEntries>=2 && NumberOfEntries<=3 && Stream->second.stts_FrameCount==1 && Stts.SampleDuration!=Stream->second.stts_Max && Stream->second.mdhd_TimeScale)
+        {
+            Stream->second.stts_Duration_FirstFrame=Stream->second.stts[0].SampleDuration;
+            Stream->second.stts_Min=Stts.SampleDuration;
+            Stream->second.stts_Max=Stts.SampleDuration;
+        }
+        if (NumberOfEntries>=2 && NumberOfEntries<=3 && Pos+1==NumberOfEntries && Stts.SampleCount==1 && Stream->second.stts_Min==Stream->second.stts_Max && Stts.SampleDuration!=Stream->second.stts_Max && Stream->second.mdhd_TimeScale)
+        {
+            Stream->second.stts_Duration_LastFrame=Stts.SampleDuration;
+        }
+        else
+        {
+            if (Stts.SampleDuration<Stream->second.stts_Min) Stream->second.stts_Min=Stts.SampleDuration;
+            if (Stts.SampleDuration>Stream->second.stts_Max) Stream->second.stts_Max=Stts.SampleDuration;
+        }
+        Stream->second.stts_FrameCount+=Stts.SampleCount;
+        Stream->second.stts_Duration+=Stts.SampleCount*Stts.SampleDuration;
+
+        #if MEDIAINFO_DEMUX
+            stream::stts_duration stts_Duration;
+            stts_Duration.Pos_Begin=Stream->second.stts_FrameCount-Stts.SampleCount;
+            stts_Duration.Pos_End=Stream->second.stts_FrameCount;
+            stts_Duration.SampleDuration=Stts.SampleDuration;
+            if (Streams[moov_trak_tkhd_TrackID].stts_Durations.empty())
+                stts_Duration.DTS_Begin=0;
+            else
+            {
+                stream::stts_durations::iterator Previous=Streams[moov_trak_tkhd_TrackID].stts_Durations.end(); --Previous;
+                stts_Duration.DTS_Begin=Previous->DTS_End;
+            }
+            stts_Duration.DTS_End=stts_Duration.DTS_Begin+Stts.SampleCount*Stts.SampleDuration;
+            Streams[moov_trak_tkhd_TrackID].stts_Durations.push_back(stts_Duration);
+        #endif //MEDIAINFO_DEMUX
+    FILLING_END();
+}
+
 //---------------------------------------------------------------------------
 void File_Mpeg4::moov_trak_tapt()
 {
@@ -3734,16 +5230,16 @@
         Skip_Flags(Flags, 3,                                    "Track in Poster");
     Get_DATE1904_DEPENDOFVERSION(Date_Created,                  "Creation time");
     Get_DATE1904_DEPENDOFVERSION(Date_Modified,                 "Modification time");
-    Get_B4 (moov_trak_tkhd_TrackID,                             "Track ID"); Element_Info(moov_trak_tkhd_TrackID);
+    Get_B4 (moov_trak_tkhd_TrackID,                             "Track ID"); Element_Info1(moov_trak_tkhd_TrackID);
     Skip_B4(                                                    "Reserved");
-    Get_B_DEPENDOFVERSION(Duration,                             "Duration"); Param_Info((int64u)Duration*1000/TimeScale, " ms"); Element_Info(Duration*1000/TimeScale, " ms");
+    Get_B_DEPENDOFVERSION(Duration,                             "Duration"); Param_Info2(Duration*1000/TimeScale, " ms"); Element_Info2(Duration*1000/TimeScale, " ms");
     Skip_B4(                                                    "Reserved");
     Skip_B4(                                                    "Reserved");
     Skip_B2(                                                    "Layer");
     Skip_B2(                                                    "Alternate group");
-    Get_B2 (Volume,                                             "Volume"); Param_Info(Ztring::ToZtring(((float)Volume)/256));
+    Get_B2 (Volume,                                             "Volume"); Param_Info1(Ztring::ToZtring(((float)Volume)/256));
     Skip_B2(                                                    "Reserved");
-    Element_Begin("Matrix structure", 36);
+    Element_Begin1("Matrix structure");
         Get_BFP4(16, a,                                         "a (width scale)");
         Get_BFP4(16, b,                                         "b (width rotate)");
         Get_BFP4( 2, u,                                         "u (width angle)");
@@ -3753,31 +5249,35 @@
         Get_BFP4(16, x,                                         "x (position left)");
         Get_BFP4(16, y,                                         "y (position top)");
         Get_BFP4( 2, w,                                         "w (divider)");
-    Element_End();
+    Element_End0();
     Get_BFP4(16, moov_trak_tkhd_Width,                          "Track width");
     Get_BFP4(16, moov_trak_tkhd_Height,                         "Track height");
 
     FILLING_BEGIN();
         //Case of header is after main part
-        if (StreamKind_Last!=Stream_Max)
+        std::map<int32u, stream>::iterator Temp=Streams.find((int32u)-1);
+        if (Temp!=Streams.end())
         {
-            std::map<int32u, stream>::iterator Temp=Stream.find((int32u)-1);
-            if (Temp!=Stream.end())
-            {
-                Stream[moov_trak_tkhd_TrackID]=Temp->second;
-                Temp->second.Parser=NULL; //It is a copy, we don't want that the destructor deletes the Parser
-                Stream.erase(Temp);
-            }
+            Streams[moov_trak_tkhd_TrackID]=Temp->second;
+            Temp->second.Parser=NULL; //It is a copy, we don't want that the destructor deletes the Parser
+            Streams.erase(Temp);
         }
 
+        Fill(StreamKind_Last, StreamPos_Last, "Duration", float64_int64s(((float64)Duration)*1000/TimeScale));
         Fill(StreamKind_Last, StreamPos_Last, "Encoded_Date", Date_Created);
         Fill(StreamKind_Last, StreamPos_Last, "Tagged_Date", Date_Modified);
         Fill(StreamKind_Last, StreamPos_Last, General_ID, moov_trak_tkhd_TrackID, 10, true);
+        Streams[moov_trak_tkhd_TrackID].tkhd_Duration=Duration;
         if (moov_trak_tkhd_Height*d)
             moov_trak_tkhd_DisplayAspectRatio=(moov_trak_tkhd_Width*a)/(moov_trak_tkhd_Height*d);
         moov_trak_tkhd_Rotation=(float32)(std::atan2(b, a)*180.0/3.14159);
         if (moov_trak_tkhd_Rotation<0)
             moov_trak_tkhd_Rotation+=360;
+
+        #if MEDIAINFO_EVENTS
+            if (StreamIDs_Size>1 && Config->File_ID_OnlyRoot_Get())
+                StreamIDs_Width[StreamIDs_Size-1]=Streams.size()<=1?0:8; //If referenced file and more than 1 stream, referenced ID is discarded, else referenced ID is used
+        #endif //MEDIAINFO_EVENTS
     FILLING_END();
 }
 
@@ -3857,7 +5357,7 @@
     Get_B4(TrackID,                                             "track-ID");
 
     FILLING_BEGIN();
-        Stream[moov_trak_tkhd_TrackID].TimeCode_TrackID=TrackID;
+        Streams[moov_trak_tkhd_TrackID].TimeCode_TrackID=TrackID;
     FILLING_END();
 }
 
@@ -3896,8 +5396,8 @@
         Get_B8 (Time,                                           "Time");
         Get_B1 (Size,                                           "Text size");
         Get_String(Size, ValueS,                                "Value");
-        //Value.From_UTF8(ValueS.c_str());
-        //if (Value.empty())
+        Value.From_UTF8(ValueS.c_str());
+        if (Value.empty())
             Value.From_Local(ValueS.c_str()); //Trying Local...
 
         FILLING_BEGIN();
@@ -4091,7 +5591,7 @@
     NAME_VERSION_FLAG("Location Information"); //3GP
 
     //Parsing
-    Skip_XX(Element_Size,                                       "Data");
+    Skip_XX(Element_Size-Element_Offset,                        "Data");
 }
 
 //---------------------------------------------------------------------------
@@ -4294,7 +5794,7 @@
     //Getting the method
     std::string Parameter;
     method Method=Metadata_Get(Parameter, Element_Code);
-    Element_Info(Parameter.c_str());
+    Element_Info1(Parameter.c_str());
 
     switch (Method)
     {
@@ -4335,7 +5835,7 @@
                 if (!IsText)
                 {
                     Skip_XX(Element_Size,                       "Unknown");
-                    return;    
+                    return;
                 }
 
                 while(Element_Offset<Element_Size)
@@ -4348,7 +5848,7 @@
                     else
                     {
                         Get_B2 (Size16,                         "Size");
-                        Get_B2 (Language,                       "Language"); Param_Info(Language_Get(Language));
+                        Get_B2 (Language,                       "Language"); Param_Info1(Language_Get(Language));
                         Get_Local(Size16, Value,                "Value");
                     }
 
@@ -4390,7 +5890,7 @@
                 int16u Language;
                 while(Element_Offset<Element_Size)
                 {
-                    Get_B2(Language,                            "Language"); Param_Info(Language_Get(Language));
+                    Get_B2(Language,                            "Language"); Param_Info1(Language_Get(Language));
                     bool Utf8=true;
                     if (Element_Offset+2<=Element_Size)
                     {
@@ -4460,7 +5960,7 @@
         Accept("QTCA");
 
         Fill(Stream_General, 0, General_Format, "MPEG-4");
-        CodecID_Fill(_T("QTCA"), Stream_General, 0, InfoCodecID_Format_Mpeg4);
+        CodecID_Fill(__T("QTCA"), Stream_General, 0, InfoCodecID_Format_Mpeg4);
     FILLING_END();
 }
 
@@ -4470,13 +5970,114 @@
     Element_Name("Preview");
 
     //Parsing
-    Info_B4(Date_Modified,                                      "Modification date"); Param_Info(Ztring().Date_From_Seconds_1904(Date_Modified));
+    Info_B4(Date_Modified,                                      "Modification date"); Param_Info1(Ztring().Date_From_Seconds_1904(Date_Modified));
     Skip_B2(                                                    "Version number");
     Skip_C4(                                                    "Atom type");
     Skip_B2(                                                    "Atom index");
 }
 
 //---------------------------------------------------------------------------
+void File_Mpeg4::RDAO()
+{
+    Element_Name("Audio O?");
+
+    //Parsing
+    Skip_XX(Element_Size,                                       "Data");
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg4::RDAS()
+{
+    Element_Name("Audio S?");
+
+    //Parsing
+    Skip_XX(Element_Size,                                       "Data");
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg4::RDVO()
+{
+    Element_Name("Video O?");
+
+    //Parsing
+    Skip_XX(Element_Size,                                       "Data");
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg4::RDVS()
+{
+    Element_Name("Video S?");
+
+    //Parsing
+    Skip_XX(Element_Size,                                       "Data");
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg4::RED1()
+{
+    Element_Name("RED Header");
+
+    //Parsing
+    Skip_XX(Element_Size,                                       "Data");
+
+    FILLING_BEGIN();
+        Accept("R3D");
+
+        Fill(Stream_General, 0, General_Format, "R3D");
+        //Source: http://peter.schlaile.de/redcode/
+
+        Finish();
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg4::REDA()
+{
+    Element_Name("RED Audio");
+
+    //Parsing
+    Skip_XX(Element_Size,                                       "Data");
+
+    Finish();
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg4::REDV()
+{
+    Element_Name("RED Video");
+
+    //Parsing
+    /*
+    if (Streams[1].Parser==0)
+    {
+        Streams[1].Parser=new File_Mpeg4();
+        Open_Buffer_Init(Streams[1].Parser);
+    }
+    */
+
+    //Parsing
+    Skip_B4(                                                    "Unknown");
+    Skip_B4(                                                    "Unknown");
+    Skip_B4(                                                    "Unknown");
+    Skip_B4(                                                    "Unknown");
+    Skip_C4(                                                    "CodecID");
+    Skip_B4(                                                    "Unknown");
+    //Open_Buffer_Continue(Streams[1].Parser);
+    Skip_XX(Element_Size-Element_Offset,                        "Data");
+
+    Finish();
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg4::REOB()
+{
+    Element_Name("OB?");
+
+    //Parsing
+    Skip_XX(Element_Size,                                       "Data");
+}
+
+//---------------------------------------------------------------------------
 void File_Mpeg4::skip()
 {
     Element_Name("Skip");

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Mpeg4_TimeCode.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Mpeg4_TimeCode.cpp Changed

@@ -1,31 +1,35 @@
 // File_Mpeg4_TimeCode - Info for MPEG-4 TimeCode  files
-// Copyright (C) 2009-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2009-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_MPEG4_YES)
 //---------------------------------------------------------------------------
 
@@ -37,47 +41,69 @@
 {
 
 //***************************************************************************
-// Format
+// Constructor/Destructor
 //***************************************************************************
 
 //---------------------------------------------------------------------------
-void File_Mpeg4_TimeCode::FileHeader_Parse()
+File_Mpeg4_TimeCode::File_Mpeg4_TimeCode()
+:File__Analyze()
 {
-    if (Buffer_Size!=4)
-    {
-        Reject("TimeCode");
-        return;
-    }
+    //Out
+    Pos=(int32u)-1;
 
-    //Parsing
-    int32u Position;
-    Get_B4 (Position,                                           "Position");
+    NumberOfFrames=0;
+    DropFrame=false;
+    NegativeTimes=false;
+}
 
-    //Filling
-    Accept("TimeCode");
+//***************************************************************************
+// Streams management
+//***************************************************************************
 
-    if (FrameRate)
+//---------------------------------------------------------------------------
+void File_Mpeg4_TimeCode::Streams_Fill()
+{
+    if (Pos!=(int32u)-1 && NumberOfFrames)
     {
-        int64s Pos=Position;
-        if (NegativeTimes)
-            Pos=(int32s)Position;
-        if (StreamKind==Stream_General)
+        int64s  Pos_Temp=Pos;
+        float64 FrameRate_WithDF=NumberOfFrames;
+        if (DropFrame)
         {
-            //No link with a track, we do all
-            Stream_Prepare(Stream_Video);
-            Fill(Stream_Video, 0, Video_Delay, Pos*1000/FrameRate, 0);
-
-            Stream_Prepare(Stream_Audio);
-            Fill(Stream_Audio, 0, Audio_Delay, Pos*1000/FrameRate, 0);
+            float64 FramesPerHour_NDF=FrameRate_WithDF*60*60;
+            FrameRate_WithDF*=(FramesPerHour_NDF-108)/FramesPerHour_NDF;
         }
-        else
+
+        Fill(Stream_General, 0, "Delay", Pos_Temp*1000/FrameRate_WithDF, 0);
+    }
+}
+
+//***************************************************************************
+// Buffer - Global
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Mpeg4_TimeCode::Read_Buffer_Continue()
+{
+    //Parsing
+    int32u Position=0;
+    while (Element_Offset<Element_Size)
+    {
+        Get_B4 (Position,                                       "Position");
+        if (Pos==(int32u)-1) //First time code
         {
-            Stream_Prepare(StreamKind);
-            Fill(StreamKind, 0, "Delay", Pos*1000/FrameRate, 0);
+            Pos=Position;
+            if (NegativeTimes)
+                Pos=(int32s)Position;
         }
     }
 
-    Finish("TimeCode");
+    FILLING_BEGIN();
+        if (!Status[IsAccepted])
+        {
+            Accept("TimeCode");
+            Fill("TimeCode");
+        }
+    FILLING_END();
 }
 
 }

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Mpeg4_TimeCode.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Mpeg4_TimeCode.h Changed

@@ -1,17 +1,17 @@
 // File_Mpeg4_TimeCode - Info for MPEG-4 TimeCode files
-// Copyright (C) 2009-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2009-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -37,13 +37,22 @@
 {
 public :
     //In
-    float64 FrameRate;
-    stream_t StreamKind;
-    bool     NegativeTimes;
+    int8u   NumberOfFrames;
+    bool    DropFrame;
+    bool    NegativeTimes;
+
+    //Out
+    int64s  Pos;
+
+    //Constructor/Destructor
+    File_Mpeg4_TimeCode();
 
 protected :
+    //Streams management
+    void Streams_Fill();
+
     //Buffer - Global
-    void FileHeader_Parse ();
+    void Read_Buffer_Continue();
 };
 
 } //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_MpegPs.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_MpegPs.cpp Changed

@@ -1,31 +1,35 @@
 // File_MpegPs - Info for MPEG files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_MPEGPS_YES)
 //---------------------------------------------------------------------------
 
@@ -62,27 +66,27 @@
 #if defined(MEDIAINFO_MPEGA_YES)
     #include "MediaInfo/Audio/File_Mpega.h"
 #endif
-#if defined(MEDIAINFO_ADTS_YES)
-    #include "MediaInfo/Audio/File_Adts.h"
-#endif
 #if defined(MEDIAINFO_PCM_YES)
     #include "MediaInfo/Audio/File_Pcm.h"
 #endif
 #if defined(MEDIAINFO_AES3_YES)
     #include "MediaInfo/Audio/File_Aes3.h"
 #endif
-#if defined(MEDIAINFO_LATM_YES)
-    #include "MediaInfo/Audio/File_Latm.h"
-#endif
 #if defined(MEDIAINFO_PS2A_YES)
     #include "MediaInfo/Audio/File_Ps2Audio.h"
 #endif
 #if defined(MEDIAINFO_RLE_YES)
     #include "MediaInfo/Image/File_Rle.h"
 #endif
+#if defined(MEDIAINFO_DVBSUBTITLE_YES)
+    #include "MediaInfo/Text/File_DvbSubtitle.h"
+#endif
 #if defined(MEDIAINFO_PGS_YES)
     #include "MediaInfo/Text/File_Pgs.h"
 #endif
+#if defined(MEDIAINFO_TELETEXT_YES)
+    #include "MediaInfo/Text/File_Teletext.h"
+#endif
 #include "MediaInfo/File_Unknown.h"
 #include <ZenLib/Utils.h>
 #include <algorithm>
@@ -90,6 +94,12 @@
     #include "MediaInfo/MediaInfo_Config_MediaInfo.h"
     #include "MediaInfo/MediaInfo_Events_Internal.h"
 #endif //MEDIAINFO_EVENTS
+#if MEDIAINFO_IBI
+    #if MEDIAINFO_SEEK
+        #include "MediaInfo/Multiple/File_Ibi.h"
+    #endif //MEDIAINFO_SEEK
+    #include "MediaInfo/Multiple/File_Ibi_Creation.h"
+#endif //MEDIAINFO_IBI
 using namespace ZenLib;
 using namespace std;
 //---------------------------------------------------------------------------
@@ -196,13 +206,20 @@
 :File__Analyze()
 {
     //Configuration
-    ParserName=_T("MpegPs");
+    ParserName=__T("MpegPs");
     #if MEDIAINFO_EVENTS
         ParserIDs[0]=MediaInfo_Parser_MpegPs;
         StreamIDs_Width[0]=2;
     #endif //MEDIAINFO_EVENTS
+    #if MEDIAINFO_DEMUX
+        Demux_Level=2; //Container
+    #endif //MEDIAINFO_DEMUX
+    #if MEDIAINFO_TRACE
+        Trace_Layers_Update(0); //Container1
+    #endif //MEDIAINFO_TRACE
     MustSynchronize=true;
     Buffer_TotalBytes_FirstSynched_Max=64*1024;
+    Buffer_TotalBytes_Fill_Max=(int64u)-1; //Disabling this feature for this format, this is done in the parser
     Trusted_Multiplier=2;
 
     //In
@@ -214,11 +231,12 @@
     MPEG_Version=0; //No info
     Searching_TimeStamp_Start=true;
     #ifdef MEDIAINFO_MPEG4_YES
-        DecSpecificInfoTag=NULL;
+        ParserFromTs=NULL;
         SLConfig=NULL;
     #endif
     #if MEDIAINFO_DEMUX
         SubStream_Demux=NULL;
+        Demux_StreamIsBeingParsed_type=(int8u)-1;
     #endif //MEDIAINFO_DEMUX
 
     //Out
@@ -228,10 +246,11 @@
     SizeToAnalyze=8*1024*1024;
     video_stream_Unlimited=false;
     Buffer_DataSizeToParse=0;
-    Parsing_End_ForDTS=false;
-    video_stream_PTS_FrameCount=0;
-    video_stream_PTS_MustAddOffset=false;
-    Demux_Unpacketize=MediaInfoLib::Config.Demux_Unpacketize_Get();
+    #if MEDIAINFO_SEEK
+        Seek_Value=(int64u)-1;
+        Seek_ID=(int64u)-1;
+        Duration_Detected=false;
+    #endif //MEDIAINFO_SEEK
 
     //From packets
     program_mux_rate=(int32u)-1;
@@ -246,6 +265,10 @@
         if (FromTS_stream_type==0x20) //If SubStream, this object owns the demux handler
             delete SubStream_Demux; //SubStream_Demux=NULL;
     #endif //MEDIAINFO_DEMUX
+    #ifdef MEDIAINFO_MPEG4_YES
+        delete ParserFromTs; //ParserFromTs=NULL;
+        delete SLConfig; //SLConfig=NULL;
+    #endif
 }
 
 //***************************************************************************
@@ -257,16 +280,16 @@
 {
     //For each Streams
     for (size_t StreamID=0; StreamID<0x100; StreamID++)
-        Streams_Fill_PerStream(StreamID, Streams[StreamID]);
+        Streams_Fill_PerStream(StreamID, Streams[StreamID], KindOfStream_Main);
 
     //For each private Streams
     for (size_t StreamID=0; StreamID<0x100; StreamID++)
-        Streams_Fill_PerStream(StreamID, Streams_Private1[StreamID]);
+        Streams_Fill_PerStream(StreamID, Streams_Private1[StreamID], KindOfStream_Private);
 
     //For each extension Streams
     for (size_t StreamID=0; StreamID<0x100; StreamID++)
     {
-        Streams_Fill_PerStream(StreamID, Streams_Extension[StreamID]);
+        Streams_Fill_PerStream(StreamID, Streams_Extension[StreamID], KindOfStream_Extension);
 
         //Special cases
         if ((StreamID==0x71 || StreamID==0x76) && !Streams_Extension[StreamID].Parsers.empty() && Streams_Extension[0x72].StreamIsRegistred) //DTS-HD and TrueHD
@@ -282,7 +305,7 @@
         Fill(Stream_General, 0, General_Encoded_Library, Retrieve(Stream_Video, 0, Video_Encoded_Library));
 
     //Special case: Video PTS
-    if (video_stream_PTS.size()>=2+4*2+1*2 && Retrieve(Stream_Video, 0, Video_FrameRate).To_float64()>30.000) //TODO: Handle all kind of files
+    if (video_stream_PTS.size()>=2+4*2+1*2 && Retrieve(Stream_Video, 0, Video_FrameRate).To_float64()>30.000) //TODO: Parser all kind of files
     {
         sort(video_stream_PTS.begin(), video_stream_PTS.end());
         video_stream_PTS.erase(video_stream_PTS.begin(), video_stream_PTS.begin()+4); //Removing first frames, they may lack of B/P frames
@@ -302,7 +325,7 @@
             if (Time)
             {
                 float64 FrameRate_Container=1000/Time;
-                if (Retrieve(Stream_Video, 0, Video_ScanType)==_T("Interlaced"))
+                if (Retrieve(Stream_Video, 0, Video_ScanType)==__T("Interlaced"))
                     FrameRate_Container/=2; //PTS is per field
                 float64 FrameRate_Original=Retrieve(Stream_Video, 0, Video_FrameRate).To_float64();
                 if (!(FrameRate_Original>=FrameRate_Container*0.9 && FrameRate_Original<=FrameRate_Container*1.1)
@@ -317,15 +340,16 @@
         }
     }
 
-    if (Count_Get(Stream_Video)==1 && Retrieve(Stream_Video, 0, Video_Format_Version)==_T("Version 1"))
+    if (Count_Get(Stream_Video)==1 && Retrieve(Stream_Video, 0, Video_Format_Version)==__T("Version 1"))
         Fill(Stream_General, 0, General_InternetMediaType, "video/mpeg", Unlimited, true, true);
 }
 
 //---------------------------------------------------------------------------
-void File_MpegPs::Streams_Fill_PerStream(size_t StreamID, ps_stream &Temp)
+void File_MpegPs::Streams_Fill_PerStream(size_t StreamID, ps_stream &Temp, kindofstream KindOfStream)
 {
     //By the parser
     StreamKind_Last=Stream_Max;
+    size_t Count=0;
     if (!Temp.Parsers.empty() && Temp.Parsers[0] && Temp.Parsers[0]->Status[IsAccepted])
     {
         Fill(Temp.Parsers[0]);
@@ -334,10 +358,10 @@
         {
             //Special case: Video and Text are together
             Stream_Prepare(Stream_Video);
-            Merge(*Temp.Parsers[0], Stream_Video, 0, StreamPos_Last);
+            Count=Merge(*Temp.Parsers[0], Stream_Video, 0, StreamPos_Last);
         }
         else
-            Merge(*Temp.Parsers[0]);
+            Count=Merge(*Temp.Parsers[0]);
     }
 
     //By the TS stream_type
@@ -355,110 +379,134 @@
         }
 
         if (Temp.stream_type!=0)
+        {
             Stream_Prepare(Mpeg_Psi_stream_type_StreamKind(Temp.stream_type, 0x00000000));
+            Count=1;
+        }
     }
 
     //By StreamIsRegistred
     if (StreamKind_Last==Stream_Max)
     {
-        if (Temp.StreamIsRegistred)
+        if (Temp.StreamIsRegistred>16)
         {
             if (StreamID>=0xC0 && StreamID<=0xDF)
+            {
                 Stream_Prepare(Stream_Audio);
+                Count=1;
+            }
             if (StreamID>=0xE0 && StreamID<=0xEF)
+            {
                 Stream_Prepare(Stream_Video);
+                Count=1;
+            }
         }
     }
 
+    #ifdef MEDIAINFO_MPEG4_YES
+        if (StreamKind_Last==Stream_Audio && SLConfig)
+            Fill(Stream_Audio, StreamPos_Last, Audio_MuxingMode, "SL");
+    #endif //MEDIAINFO_MPEG4_YES
+
     //More info
-    if (StreamKind_Last!=Stream_Max) //Found
+    for (size_t StreamPos=Count_Get(StreamKind_Last)-Count; StreamPos<Count_Get(StreamKind_Last); StreamPos++)
     {
         ///Saving StreamKind and Stream_Pos
         Temp.StreamKind=StreamKind_Last;
-        Temp.StreamPos=StreamPos_Last;
+        Temp.StreamPos=Count_Get(StreamKind_Last)-Count;
 
         //Common
-        Fill(StreamKind_Last, StreamPos_Last, General_ID, StreamID);
-        Ztring ID_String; ID_String.From_Number(StreamID); ID_String+=_T(" (0x"); ID_String+=Ztring::ToZtring(StreamID, 16); ID_String+=_T(")");
-        Fill(StreamKind_Last, StreamPos_Last, General_ID_String, ID_String, true); //TODO: merge with Decimal_Hexa in file_MpegTs
-        if (Retrieve(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Format)).empty() && Temp.stream_type!=0)
-            Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Format), Mpeg_Psi_stream_type_Format(Temp.stream_type, 0x0000));
-        if (Retrieve(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Codec)).empty() && Temp.stream_type!=0)
-            Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Codec), Mpeg_Psi_stream_type_Codec(Temp.stream_type, 0x0000));
-
-        if (Temp.TimeStamp_Start.PTS.TimeStamp!=(int64u)-1)
+        if (Retrieve(StreamKind_Last, StreamPos, General_ID).empty())
         {
-            if (StreamKind_Last==Stream_Video)
+            if (KindOfStream==KindOfStream_Main)
             {
-                if (!Retrieve(Stream_Video, Temp.StreamPos, Video_Delay).empty())
-                {
-                    Ztring Delay=Retrieve(Stream_Video, Temp.StreamPos, Video_Delay);
-                    Fill(Stream_Video, Temp.StreamPos, Video_Delay_Original, Delay);
-                }
-                if (!Retrieve(Stream_Video, Temp.StreamPos, Video_Delay_Settings).empty())
-                {
-                    Ztring Delay_Settings=Retrieve(Stream_Video, Temp.StreamPos, Video_Delay_Settings);
-                    Fill(Stream_Video, Temp.StreamPos, Video_Delay_Original_Settings, Delay_Settings);
-                }
+                Fill(StreamKind_Last, StreamPos, General_ID, StreamID);
+                Ztring ID_String; ID_String.From_Number(StreamID); ID_String+=__T(" (0x"); ID_String+=Ztring::ToZtring(StreamID, 16); ID_String+=__T(")");
+                Fill(StreamKind_Last, StreamPos, General_ID_String, ID_String, true); //TODO: merge with Decimal_Hexa in file_MpegTs
+            }
+            else if (KindOfStream==KindOfStream_Private)
+            {
+                Ztring ID=__T("189");
+                if (StreamID)
+                    ID+=__T("-")+Ztring::ToZtring(StreamID);
+                Fill(StreamKind_Last, StreamPos, General_ID, ID, true);
+                Ztring ID_String=__T("189 (0xBD)");
+                if (StreamID)
+                    ID_String+=__T("-")+Ztring::ToZtring(StreamID)+__T(" (0x")+Ztring::ToZtring(StreamID, 16)+__T(")");
+                Fill(StreamKind_Last, StreamPos, General_ID_String, ID_String, true); //TODO: merge with Decimal_Hexa in file_MpegTs
+                if (StreamID)
+                    Fill(StreamKind_Last, StreamPos, "MuxingMode", "DVD-Video", Unlimited, true, true);
+            }
+            else if (KindOfStream==KindOfStream_Extension)
+            {
+                Ztring ID=__T("253");
+                if (StreamID)
+                    ID+=__T("-")+Ztring::ToZtring(StreamID);
+                Fill(StreamKind_Last, StreamPos, General_ID, ID, true);
+                Ztring ID_String=__T("253 (0xFD)");
+                if (StreamID)
+                    ID_String+=__T("-")+Ztring::ToZtring(StreamID)+__T(" (0x")+Ztring::ToZtring(StreamID, 16)+__T(")");
+                Fill(StreamKind_Last, StreamPos, General_ID_String, ID_String, true); //TODO: merge with Decimal_Hexa in file_MpegTs
             }
-            Fill(StreamKind_Last, StreamPos_Last, "Delay", ((float64)Temp.TimeStamp_Start.PTS.TimeStamp)/90, 3, true);
-            Fill(StreamKind_Last, StreamPos_Last, "Delay_Settings", "", Unlimited, true, true);
         }
-        else
+        if (Retrieve(StreamKind_Last, StreamPos, Fill_Parameter(StreamKind_Last, Generic_Format)).empty() && Temp.stream_type!=0)
+            Fill(StreamKind_Last, StreamPos, Fill_Parameter(StreamKind_Last, Generic_Format), Mpeg_Psi_stream_type_Format(Temp.stream_type, 0x0000));
+        if (Retrieve(StreamKind_Last, StreamPos, Fill_Parameter(StreamKind_Last, Generic_Codec)).empty() && Temp.stream_type!=0)
+            Fill(StreamKind_Last, StreamPos, Fill_Parameter(StreamKind_Last, Generic_Codec), Mpeg_Psi_stream_type_Codec(Temp.stream_type, 0x0000));
+
+        if (Temp.TimeStamp_Start.PTS.TimeStamp!=(int64u)-1)
         {
-            Clear(StreamKind_Last, StreamPos_Last, "Delay");
-            Clear(StreamKind_Last, StreamPos_Last, "Delay_Settings");
+            Fill(StreamKind_Last, StreamPos, Fill_Parameter(StreamKind_Last, Generic_Delay_Original), Retrieve(StreamKind_Last, StreamPos, Fill_Parameter(StreamKind_Last, Generic_Delay)), true);
+            Clear(StreamKind_Last, StreamPos, Fill_Parameter(StreamKind_Last, Generic_Delay));
+            Fill(StreamKind_Last, StreamPos, Fill_Parameter(StreamKind_Last, Generic_Delay_Original_Source), Retrieve(StreamKind_Last, StreamPos, Fill_Parameter(StreamKind_Last, Generic_Delay_Source)), true);
+            Clear(StreamKind_Last, StreamPos, Fill_Parameter(StreamKind_Last, Generic_Delay_Source));
+            Fill(StreamKind_Last, StreamPos, Fill_Parameter(StreamKind_Last, Generic_Delay_Original_Settings), Retrieve(StreamKind_Last, StreamPos, Fill_Parameter(StreamKind_Last, Generic_Delay_Settings)), true);
+            Clear(StreamKind_Last, StreamPos, Fill_Parameter(StreamKind_Last, Generic_Delay_Settings));
+
+            Fill(StreamKind_Last, StreamPos, Fill_Parameter(StreamKind_Last, Generic_Delay), ((float64)Temp.TimeStamp_Start.PTS.TimeStamp)/90, 3, true);
+            Fill(StreamKind_Last, StreamPos, Fill_Parameter(StreamKind_Last, Generic_Delay_Source), "Container");
+        }
+
+        //Bitrate calculation
+        if (FrameInfo.PTS!=(int64u)-1 && (StreamKind_Last==Stream_Video || StreamKind_Last==Stream_Audio))
+        {
+            int64u BitRate=Retrieve(StreamKind_Last, StreamPos, "BitRate").To_int64u();
+            if (BitRate==0)
+                BitRate=Retrieve(StreamKind_Last, StreamPos, "BitRate_Nominal").To_int64u();
+            if (BitRate==0)
+                FrameInfo.PTS=(int64u)-1;
+            else
+                FrameInfo.PTS+=BitRate; //Saving global BitRate
         }
-
-        //LATM
-        if (StreamKind_Last==Stream_Audio && StreamID==0xFA && FromTS_stream_type==0x11)
-            Fill(Stream_Audio, 0, Audio_MuxingMode, "LATM");
-    }
-
-    //Bitrate calculation
-    if (PTS!=(int64u)-1 && (StreamKind_Last==Stream_Video || StreamKind_Last==Stream_Audio))
-    {
-        int64u BitRate=Retrieve(StreamKind_Last, StreamPos_Last, "BitRate").To_int64u();
-        if (BitRate==0)
-            BitRate=Retrieve(StreamKind_Last, StreamPos_Last, "BitRate_Nominal").To_int64u();
-        if (BitRate==0)
-            PTS=(int64u)-1;
-        else
-            PTS+=BitRate; //Saving global BitRate
     }
 }
 
 //---------------------------------------------------------------------------
 void File_MpegPs::Streams_Finish()
 {
-    PTS=0; //Will be used for BitRate calculation
-    DTS=0; //Will be used for Duration calculation
+    if (Streams.empty())
+        return; //Parsing already done. ToDo: real time
+
+    FrameInfo.PTS=0; //Will be used for BitRate calculation
+    FrameInfo.DTS=0; //Will be used for Duration calculation
 
     //For each Streams
     for (size_t StreamID=0; StreamID<0x100; StreamID++)
-        Streams_Finish_PerStream(StreamID, Streams[StreamID]);
+        Streams_Finish_PerStream(StreamID, Streams[StreamID], KindOfStream_Main);
 
     //For each private Streams
     for (size_t StreamID=0; StreamID<0x100; StreamID++)
-        Streams_Finish_PerStream(StreamID, Streams_Private1[StreamID]);
+        Streams_Finish_PerStream(StreamID, Streams_Private1[StreamID], KindOfStream_Private);
 
     //For each extesnion Streams
     for (size_t StreamID=0; StreamID<0x100; StreamID++)
-        Streams_Finish_PerStream(StreamID, Streams_Extension[StreamID]);
-
-    //Purge what is not needed anymore
-    if (!File_Name.empty()) //Only if this is not a buffer, with buffer we can have more data
-    {
-        Streams.clear();
-        Streams_Private1.clear();
-        Streams_Extension.clear();
-    }
+        Streams_Finish_PerStream(StreamID, Streams_Extension[StreamID], KindOfStream_Extension);
 
     //Bitrate coherancy
-    if (!IsSub && PTS>0 && PTS!=(int64u)-1 && DTS!=0 && File_Size!=(int64u)-1)
+    if (!IsSub && FrameInfo.PTS>0 && FrameInfo.PTS!=(int64u)-1 && FrameInfo.DTS!=0 && File_Size!=(int64u)-1)
     {
-        int64u BitRate_FromDuration=File_Size*8000*90/DTS;
-        int64u BitRate_FromBitRates=PTS;
+        int64u BitRate_FromDuration=File_Size*8000*90/FrameInfo.DTS;
+        int64u BitRate_FromBitRates=FrameInfo.PTS;
 
         if (BitRate_FromDuration>=BitRate_FromBitRates*3
          || BitRate_FromDuration<=BitRate_FromBitRates/20)
@@ -471,14 +519,49 @@
                 Clear(Stream_Video, 0, Video_Duration);
         }
     }
+
+    #if MEDIAINFO_IBI
+        if (Config_Ibi_Create)
+        {
+            ibi Ibi_Temp;
+            for (ibi::streams::iterator IbiStream_Temp=Ibi.Streams.begin(); IbiStream_Temp!=Ibi.Streams.end(); ++IbiStream_Temp)
+                Ibi_Temp.Streams[IbiStream_Temp->first]=new ibi::stream(*IbiStream_Temp->second);
+
+            for (ibi::streams::iterator IbiStream_Temp=Ibi_Temp.Streams.begin(); IbiStream_Temp!=Ibi_Temp.Streams.end(); ++IbiStream_Temp)
+            {
+                if (IbiStream_Temp->second && IbiStream_Temp->second->DtsFrequencyNumerator==1000000000 && IbiStream_Temp->second->DtsFrequencyDenominator==1)
+                {
+                    bool IsOk=true;
+                    for (size_t Pos=0; Pos<IbiStream_Temp->second->Infos.size(); Pos++)
+                        if (!IbiStream_Temp->second->Infos[Pos].IsContinuous && Pos+1!=IbiStream_Temp->second->Infos.size())
+                            IsOk=false;
+                    if (IsOk) //Only is all items are continuous (partial IBI not yet supported)
+                    {
+                        IbiStream_Temp->second->DtsFrequencyNumerator=90000;
+                        for (size_t Pos=0; Pos<IbiStream_Temp->second->Infos.size(); Pos++)
+                        {
+                            int64u Temp=IbiStream_Temp->second->Infos[Pos].Dts*90/1000000;
+                            IbiStream_Temp->second->Infos[Pos].Dts=Temp;
+                        }
+                    }
+                }
+            }
+
+            //IBI Creation
+            File_Ibi_Creation IbiCreation(Ibi_Temp);
+            Ztring IbiText=IbiCreation.Finish();
+            if (!IbiText.empty())
+                Fill(Stream_General, 0, "IBI", IbiText, true);
+        }
+    #endif //MEDIAINFO_IBI
 }
 
 //---------------------------------------------------------------------------
-void File_MpegPs::Streams_Finish_PerStream(size_t StreamID, ps_stream &Temp)
+void File_MpegPs::Streams_Finish_PerStream(size_t StreamID, ps_stream &Temp, kindofstream KindOfStream)
 {
     //By the parser
     if (Temp.StreamKind==Stream_Max && !Temp.Parsers.empty() && Temp.Parsers[0])
-        Streams_Fill_PerStream(StreamID, Temp);
+        Streams_Fill_PerStream(StreamID, Temp, KindOfStream);
 
     //Init
     if (Temp.StreamKind==Stream_Max)
@@ -489,27 +572,48 @@
     //By the parser
     if (!Temp.Parsers.empty() && Temp.Parsers[0])
     {
-        Temp.Parsers[0]->ShouldContinueParsing=false;
-        Finish(Temp.Parsers[0]);
+        if (!Temp.Parsers[0]->Status[IsFinished])
+        {
+            Temp.Parsers[0]->ShouldContinueParsing=false;
+            int64u File_Size_Temp=File_Size;
+            File_Size=File_Offset+Buffer_Offset+Element_Offset;
+            Open_Buffer_Continue(Temp.Parsers[0], Buffer, 0);
+            File_Size=File_Size_Temp;
+            Finish(Temp.Parsers[0]);
+            #if MEDIAINFO_DEMUX
+                if (Config->Demux_EventWasSent)
+                    return;
+            #endif //MEDIAINFO_DEMUX
+        }
+        Ztring ID=Retrieve(StreamKind_Last, StreamPos_Last, General_ID);
+        Ztring ID_String=Retrieve(StreamKind_Last, StreamPos_Last, General_ID_String);
         Merge(*Temp.Parsers[0], StreamKind_Last, 0, StreamPos_Last);
+        Fill(StreamKind_Last, StreamPos_Last, General_ID, ID, true);
+        Fill(StreamKind_Last, StreamPos_Last, General_ID_String, ID_String, true);
 
         //Special cases
         if (Temp.Parsers[0]->Count_Get(Stream_Video) && Temp.Parsers[0]->Count_Get(Stream_Text))
         {
             //Video and Text are together
             size_t Text_Count=Temp.Parsers[0]->Count_Get(Stream_Text);
-            for (size_t Text_Pos=0; Text_Pos<Text_Count; Text_Pos++)
+            for (size_t Parser_Pos=0; Parser_Pos<Text_Count; Parser_Pos++)
             {
-                Stream_Prepare(Stream_Text);
-                Merge(*Temp.Parsers[0], Stream_Text, Text_Pos, StreamPos_Last);
+                Ztring ID=Retrieve(Stream_Video, Temp.StreamPos, Video_ID)+__T("-")+Temp.Parsers[0]->Retrieve(Stream_Text, Parser_Pos, Text_ID);
+                StreamPos_Last=(size_t)-1;
+                for (size_t Pos=0; Pos<Count_Get(Stream_Text); Pos++)
+                    if (Retrieve(Stream_Text, Pos, Text_ID)==ID && Retrieve(Stream_Video, Temp.StreamPos, "MuxingMode")==Temp.Parsers[0]->Retrieve(Stream_Text, Parser_Pos, "MuxingMode"))
+                    {
+                        StreamPos_Last=Pos;
+                        break;
+                    }
+                if (StreamPos_Last==(size_t)-1)
+                    Stream_Prepare(Stream_Text, StreamPos_Last);
+                Merge(*Temp.Parsers[0], Stream_Text, Parser_Pos, StreamPos_Last);
 
-                Ztring MuxingMode=Retrieve(Stream_Text, StreamPos_Last, "MuxingMode");
-                Fill(Stream_Text, StreamPos_Last, "MuxingMode", Ztring(_T("MPEG Video / "))+MuxingMode, true);
                 if (!IsSub)
-                    Fill(Stream_Text, StreamPos_Last, "MuxingMode_MoreInfo", _T("Muxed in Video #")+Ztring().From_Number(Temp.StreamPos+1));
-                Ztring ID=Retrieve(Stream_Text, StreamPos_Last, Text_ID);
-                Fill(Stream_Text, StreamPos_Last, Text_ID, Retrieve(Stream_Video, Temp.StreamPos, Video_ID)+_T("-")+ID, true);
-                Fill(Stream_Text, StreamPos_Last, Text_ID_String, Retrieve(Stream_Video, Temp.StreamPos, Video_ID_String)+_T("-")+ID, true);
+                    Fill(Stream_Text, StreamPos_Last, "MuxingMode_MoreInfo", __T("Muxed in Video #")+Ztring().From_Number(Temp.StreamPos+1));
+                Fill(Stream_Text, StreamPos_Last, Text_ID, ID, true);
+                Fill(Stream_Text, StreamPos_Last, Text_ID_String, Retrieve(Stream_Video, Temp.StreamPos, Video_ID_String)+__T("-")+Temp.Parsers[0]->Retrieve(Stream_Text, Parser_Pos, Text_ID), true);
                 Fill(Stream_Text, StreamPos_Last, Text_Delay, Retrieve(Stream_Video, Temp.StreamPos, Video_Delay), true);
             }
 
@@ -518,13 +622,13 @@
         }
     }
 
-    //More info
-    if (Temp.StreamKind!=Stream_Max) //Found
+    //Duration if it is missing from the parser
+    if (Temp.StreamKind!=Stream_Max && Retrieve(Temp.StreamKind, Temp.StreamPos, Fill_Parameter(Temp.StreamKind, Generic_Duration)).empty())
     {
          StreamKind_Last=Temp.StreamKind;
          StreamPos_Last=Temp.StreamPos;
 
-        int64u Start=(int64u)-1, End=(int64u)-1;
+        int64u Start=(int64u)-1, End=(int64u)-1, ByteDifference=(int64u)-1;
         if (Temp.TimeStamp_Start.DTS.TimeStamp!=(int64u)-1 && Temp.TimeStamp_End.DTS.TimeStamp!=(int64u)-1)
         {
             Start=Temp.TimeStamp_Start.DTS.TimeStamp;
@@ -534,47 +638,48 @@
         {
             Start=Temp.TimeStamp_Start.PTS.TimeStamp;
             End=Temp.TimeStamp_End.PTS.TimeStamp;
+            if (Temp.TimeStamp_Start.PTS.File_Pos<Temp.TimeStamp_End.PTS.File_Pos)
+                ByteDifference=Temp.TimeStamp_End.PTS.File_Pos-Temp.TimeStamp_Start.PTS.File_Pos;
         }
         if (Start!=(int64u)-1 && End!=(int64u)-1)
         {
             //TimeStamp
-            if (End<Start)
+            if (End<0x100000000LL && Start>0x100000000LL) //Testing coherancy: no 13 hours long files.
                 End+=0x200000000LL; //33 bits, cyclic
-            int64u Duration=End-Start;
-            if (File_Size!=(int64u)-1 && File_Size>1024*1024*16 && End>=0x200000000LL)
-            {
-                //Testing coherancy
-                if (Duration/90>16*3600*1000)
-                    Duration=0; //Disabling it
-            }
-            if (Duration)
+            if (Start<End)
             {
-                if (StreamKind_Last==Stream_Video)
+                int64u Duration=End-Start;
+                if (ByteDifference!=(int64u)-1)
                 {
-                    float64 FrameRate=Retrieve(Stream_Video, StreamPos_Last, Video_FrameRate).To_float64();
-                    if (FrameRate!=0)
-                        Duration+=Ztring::ToZtring(Temp.FrameCount_AfterLast_TimeStamp_End*90*1000/FrameRate, 0).To_int64u();
+                    float BitRate=(ByteDifference*8)/(((float)Duration)/9000);
+                    if (BitRate>10000000000LL)
+                        Duration=0;
                 }
                 if (Duration)
                 {
+                    if (StreamKind_Last==Stream_Video)
+                    {
+                        float64 FrameRate=Retrieve(Stream_Video, StreamPos_Last, Video_FrameRate).To_float64();
+                        if (FrameRate!=0)
+                            Duration+=Ztring::ToZtring(90*1000/FrameRate, 0).To_int64u(); //We imagine that there is one frame in it
+                    }
+
                     Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Duration), Duration/90, 10, true);
-                    if (Duration>DTS)
-                        DTS=Duration; //Saving maximum Duration
                 }
             }
         }
     }
 
     //Bitrate calculation
-    if (PTS!=(int64u)-1 && (StreamKind_Last==Stream_Video || StreamKind_Last==Stream_Audio))
+    if (FrameInfo.PTS!=(int64u)-1 && (StreamKind_Last==Stream_Video || StreamKind_Last==Stream_Audio))
     {
         int64u BitRate=Retrieve(StreamKind_Last, StreamPos_Last, "BitRate").To_int64u();
         if (BitRate==0)
             BitRate=Retrieve(StreamKind_Last, StreamPos_Last, "BitRate_Nominal").To_int64u();
         if (BitRate==0)
-            PTS=(int64u)-1;
+            FrameInfo.PTS=(int64u)-1;
         else
-            PTS+=BitRate; //Saving global BitRate
+            FrameInfo.PTS+=BitRate; //Saving global BitRate
     }
 }
 
@@ -594,7 +699,7 @@
         Buffer_Offset+=2;
         while(Buffer_Offset<Buffer_Size && Buffer[Buffer_Offset]!=0x00)
             Buffer_Offset+=2;
-        if (Buffer_Offset<Buffer_Size && Buffer[Buffer_Offset-1]==0x00 || Buffer_Offset>=Buffer_Size)
+        if (Buffer_Offset>=Buffer_Size || Buffer[Buffer_Offset-1]==0x00)
             Buffer_Offset--;
     }
 
@@ -665,8 +770,9 @@
     video_stream_Count=(int8u)-1;
     audio_stream_Count=(int8u)-1;
     private_stream_1_Count=(int8u)-1;
-    private_stream_2_Count=true;
+    private_stream_2_Count=(int8u)-1;
     extension_stream_Count=(int8u)-1;
+    SL_packetized_stream_Count=(int8u)-1;
 
     //From packets
     program_mux_rate=0;
@@ -717,6 +823,14 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
+void File_MpegPs::Read_Buffer_Init()
+{
+    #if MEDIAINFO_DEMUX
+         Demux_UnpacketizeContainer=Config->Demux_Unpacketize_Get();
+    #endif //MEDIAINFO_DEMUX
+}
+
+//---------------------------------------------------------------------------
 void File_MpegPs::Read_Buffer_Unsynched()
 {
     Searching_TimeStamp_Start=false;
@@ -738,7 +852,13 @@
         Streams[StreamID].Searching_TimeStamp_Start=false;
         for (size_t Pos=0; Pos<Streams[StreamID].Parsers.size(); Pos++)
             if (Streams[StreamID].Parsers[Pos])
+            {
+                #if MEDIAINFO_SEEK
+                    if (IsSub)
+                        Streams[StreamID].Parsers[Pos]->Unsynch_Frame_Count=Frame_Count_NotParsedIncluded;
+                #endif //MEDIAINFO_SEEK
                 Streams[StreamID].Parsers[Pos]->Open_Buffer_Unsynch();
+            }
         Streams_Private1[StreamID].TimeStamp_End.PTS.File_Pos=(int64u)-1;
         Streams_Private1[StreamID].TimeStamp_End.DTS.File_Pos=(int64u)-1;
         Streams_Private1[StreamID].TimeStamp_End.PTS.TimeStamp=(int64u)-1;
@@ -746,7 +866,12 @@
         Streams_Private1[StreamID].Searching_TimeStamp_Start=false;
         for (size_t Pos=0; Pos<Streams_Private1[StreamID].Parsers.size(); Pos++)
             if (Streams_Private1[StreamID].Parsers[Pos])
+            {
+                #if MEDIAINFO_SEEK
+                    Streams_Private1[StreamID].Parsers[Pos]->Unsynch_Frame_Count=Unsynch_Frame_Count;
+                #endif //MEDIAINFO_SEEK
                 Streams_Private1[StreamID].Parsers[Pos]->Open_Buffer_Unsynch();
+            }
         Streams_Extension[StreamID].TimeStamp_End.PTS.File_Pos=(int64u)-1;
         Streams_Extension[StreamID].TimeStamp_End.DTS.File_Pos=(int64u)-1;
         Streams_Extension[StreamID].TimeStamp_End.PTS.TimeStamp=(int64u)-1;
@@ -754,19 +879,226 @@
         Streams_Extension[StreamID].Searching_TimeStamp_Start=false;
         for (size_t Pos=0; Pos<Streams_Extension[StreamID].Parsers.size(); Pos++)
             if (Streams_Extension[StreamID].Parsers[Pos])
+            {
+                #if MEDIAINFO_SEEK
+                    Streams_Extension[StreamID].Parsers[Pos]->Unsynch_Frame_Count=Unsynch_Frame_Count;
+                #endif //MEDIAINFO_SEEK
                 Streams_Extension[StreamID].Parsers[Pos]->Open_Buffer_Unsynch();
+            }
     }
+    #if MEDIAINFO_SEEK
+        Unsynch_Frame_Count=(int64u)-1; //We do not use it
+    #endif //MEDIAINFO_SEEK
     video_stream_Unlimited=false;
     Buffer_DataSizeToParse=0;
+    PES_FirstByte_IsAvailable=false;
+}
 
-    #if MEDIAINFO_EVENTS
-        MpegPs_PES_FirstByte_IsAvailable=false;
-    #endif //MEDIAINFO_EVENTS
+//---------------------------------------------------------------------------
+#if MEDIAINFO_SEEK
+size_t File_MpegPs::Read_Buffer_Seek (size_t Method, int64u Value, int64u ID)
+{
+    //Reset
+    Seek_Value=(int64u)-1;
+    Seek_ID=(int64u)-1;
+
+    //Init
+    if (!Duration_Detected)
+    {
+        //External IBI
+        std::string IbiFile=Config->Ibi_Get();
+        if (!IbiFile.empty())
+        {
+            Ibi.Streams.clear(); //TODO: support IBI data from different inputs
+
+            File_Ibi MI;
+            Open_Buffer_Init(&MI, IbiFile.size());
+            MI.Ibi=&Ibi;
+            MI.Open_Buffer_Continue((const int8u*)IbiFile.c_str(), IbiFile.size());
+        }
+        //Creating base IBI from a quick analysis of the file
+        else
+        {
+            MediaInfo_Internal MI;
+            MI.Option(__T("File_KeepInfo"), __T("1"));
+            Ztring ParseSpeed_Save=MI.Option(__T("ParseSpeed_Get"), __T(""));
+            Ztring Demux_Save=MI.Option(__T("Demux_Get"), __T(""));
+            MI.Option(__T("ParseSpeed"), __T("0"));
+            MI.Option(__T("Demux"), Ztring());
+            size_t MiOpenResult=MI.Open(File_Name);
+            MI.Option(__T("ParseSpeed"), ParseSpeed_Save); //This is a global value, need to reset it. TODO: local value
+            MI.Option(__T("Demux"), Demux_Save); //This is a global value, need to reset it. TODO: local value
+            if (!MiOpenResult)
+                return 0;
+            for (ibi::streams::iterator IbiStream_Temp=((File_MpegPs*)MI.Info)->Ibi.Streams.begin(); IbiStream_Temp!=((File_MpegPs*)MI.Info)->Ibi.Streams.end(); ++IbiStream_Temp)
+            {
+                if (Ibi.Streams[IbiStream_Temp->first]==NULL)
+                    Ibi.Streams[IbiStream_Temp->first]=new ibi::stream(*IbiStream_Temp->second);
+                Ibi.Streams[IbiStream_Temp->first]->Unsynch();
+                for (size_t Pos=0; Pos<IbiStream_Temp->second->Infos.size(); Pos++)
+                {
+                    Ibi.Streams[IbiStream_Temp->first]->Add(IbiStream_Temp->second->Infos[Pos]);
+                    if (!IbiStream_Temp->second->Infos[Pos].IsContinuous)
+                        Ibi.Streams[IbiStream_Temp->first]->Unsynch();
+                }
+                Ibi.Streams[IbiStream_Temp->first]->Unsynch();
+            }
+            if (Ibi.Streams.empty())
+                return 4; //Problem during IBI file parsing
+        }
+
+        Duration_Detected=true;
+    }
+
+    //Parsing
+    switch (Method)
+    {
+        case 0  :
+                    GoTo(Value);
+                    Open_Buffer_Unsynch();
+                    return 1;
+        case 1  :
+                    GoTo(File_Size*Value/10000);
+                    Open_Buffer_Unsynch();
+                    return 1;
+        case 2  :   //Timestamp
+                    #if MEDIAINFO_IBI
+                    {
+                    ibi::streams::iterator IbiStream_Temp;
+                    if (ID==(int64u)-1)
+                        IbiStream_Temp=Ibi.Streams.begin();
+                    else
+                        IbiStream_Temp=Ibi.Streams.find(ID);
+                    if (IbiStream_Temp==Ibi.Streams.end() || IbiStream_Temp->second->Infos.empty())
+                        return 5; //Invalid ID
+
+                    if (!(IbiStream_Temp->second->DtsFrequencyNumerator==1000000000 && IbiStream_Temp->second->DtsFrequencyDenominator==1))
+                    {
+                        float64 ValueF=(float64)Value;
+                        ValueF/=1000000000; //Value is in ns
+                        ValueF/=IbiStream_Temp->second->DtsFrequencyDenominator;
+                        ValueF*=IbiStream_Temp->second->DtsFrequencyNumerator;
+                        Value=float64_int64s(ValueF);
+                    }
+
+                    for (size_t Pos=0; Pos<IbiStream_Temp->second->Infos.size(); Pos++)
+                    {
+                        if (Value<=IbiStream_Temp->second->Infos[Pos].Dts)
+                        {
+                            if (Value<IbiStream_Temp->second->Infos[Pos].Dts && Pos)
+                                Pos--;
+
+                            //Checking continuity of Ibi
+                            if (!IbiStream_Temp->second->Infos[Pos].IsContinuous && Pos+1<IbiStream_Temp->second->Infos.size())
+                            {
+                                Config->Demux_IsSeeking=true;
+                                Seek_Value=Value;
+                                Seek_Value_Maximal=IbiStream_Temp->second->Infos[Pos+1].StreamOffset;
+                                Seek_ID=IbiStream_Temp->first;
+                                GoTo((IbiStream_Temp->second->Infos[Pos].StreamOffset+IbiStream_Temp->second->Infos[Pos+1].StreamOffset)/2);
+                                Open_Buffer_Unsynch();
+
+                                return 1;
+                            }
+
+                            Config->Demux_IsSeeking=false;
+                            if (!Streams[(size_t)IbiStream_Temp->first].Parsers.empty())
+                                for (size_t Parser_Pos=0; Parser_Pos<Streams[(size_t)IbiStream_Temp->first].Parsers.size(); Parser_Pos++)
+                                    Streams[(size_t)IbiStream_Temp->first].Parsers[Parser_Pos]->Unsynch_Frame_Count=IbiStream_Temp->second->Infos[Pos].FrameNumber;
+                            else
+                                Unsynch_Frame_Counts[(int16u)IbiStream_Temp->first]=IbiStream_Temp->second->Infos[Pos].FrameNumber;
+
+                            GoTo(IbiStream_Temp->second->Infos[Pos].StreamOffset);
+                            Open_Buffer_Unsynch();
+
+                            return 1;
+                        }
+                    }
+
+                    return 2; //Invalid value
+                    }
+                    #else //MEDIAINFO_IBI
+                    return (size_t)-2; //Not supported / IBI disabled
+                    #endif //MEDIAINFO_IBI
+        case 3  :   //FrameNumber
+                    #if MEDIAINFO_IBI
+                    {
+                    ibi::streams::iterator IbiStream_Temp;
+                    if (ID==(int64u)-1)
+                        IbiStream_Temp=Ibi.Streams.begin();
+                    else
+                        IbiStream_Temp=Ibi.Streams.find(ID);
+                    if (IbiStream_Temp==Ibi.Streams.end() || IbiStream_Temp->second->Infos.empty())
+                        return 5; //Invalid ID
+
+                    for (size_t Pos=0; Pos<IbiStream_Temp->second->Infos.size(); Pos++)
+                    {
+                        if (Value<=IbiStream_Temp->second->Infos[Pos].FrameNumber)
+                        {
+                            if (Value<IbiStream_Temp->second->Infos[Pos].FrameNumber && Pos)
+                                Pos--;
+
+                            if (!Streams[(size_t)IbiStream_Temp->first].Parsers.empty())
+                                for (size_t Parser_Pos=0; Parser_Pos<Streams[(size_t)IbiStream_Temp->first].Parsers.size(); Parser_Pos++)
+                                    Streams[(size_t)IbiStream_Temp->first].Parsers[Parser_Pos]->Unsynch_Frame_Count=IbiStream_Temp->second->Infos[Pos].FrameNumber;
+                            else
+                                Unsynch_Frame_Counts[(int16u)IbiStream_Temp->first]=IbiStream_Temp->second->Infos[Pos].FrameNumber;
+
+                            GoTo(IbiStream_Temp->second->Infos[Pos].StreamOffset);
+                            Open_Buffer_Unsynch();
+
+                            return 1;
+                        }
+                    }
+
+                    return 2; //Invalid value
+                    }
+                    #else //MEDIAINFO_IBI
+                    return (size_t)-2; //Not supported / IBI disabled
+                    #endif //MEDIAINFO_IBI
+        default :   return (size_t)-1; //Not supported
+    }
 }
+#endif //MEDIAINFO_SEEK
 
 //---------------------------------------------------------------------------
 void File_MpegPs::Read_Buffer_Continue()
 {
+    #if MEDIAINFO_DEMUX
+        if (Demux_StreamIsBeingParsed_type!=(int8u)-1)
+        {
+            switch (Demux_StreamIsBeingParsed_type) //TODO: transform the switch() case to a enum with a vector of streams
+            {
+                case 0 :    Open_Buffer_Continue(Streams[Demux_StreamIsBeingParsed_stream_id].Parsers[0], Buffer, 0);
+                            if (IsSub && Streams[Demux_StreamIsBeingParsed_stream_id].Parsers[0]->Frame_Count_NotParsedIncluded!=(int64u)-1)
+                                Frame_Count_NotParsedIncluded=Streams[Demux_StreamIsBeingParsed_stream_id].Parsers[0]->Frame_Count_NotParsedIncluded;
+                            break;
+                case 1 :    Open_Buffer_Continue(Streams_Private1[Demux_StreamIsBeingParsed_stream_id].Parsers[0], Buffer, 0);
+                            if (IsSub && Streams_Private1[Demux_StreamIsBeingParsed_stream_id].Parsers[0]->Frame_Count_NotParsedIncluded!=(int64u)-1)
+                                Frame_Count_NotParsedIncluded=Streams_Private1[Demux_StreamIsBeingParsed_stream_id].Parsers[0]->Frame_Count_NotParsedIncluded;
+                            break;
+                case 2 :    Open_Buffer_Continue(Streams_Extension[Demux_StreamIsBeingParsed_stream_id].Parsers[0], Buffer, 0);
+                            if (IsSub && Streams_Extension[Demux_StreamIsBeingParsed_stream_id].Parsers[0]->Frame_Count_NotParsedIncluded!=(int64u)-1)
+                                Frame_Count_NotParsedIncluded=Streams_Extension[Demux_StreamIsBeingParsed_stream_id].Parsers[0]->Frame_Count_NotParsedIncluded;
+                            break;
+                default: ;
+            }
+            if (Config->Demux_EventWasSent)
+                return;
+            Demux_StreamIsBeingParsed_type=(int8u)-1;
+        }
+    #endif //MEDIAINFO_DEMUX
+
+    if (!IsSub)
+    {
+        if (Config->ParseSpeed>=1.0)
+            Config->State_Set(((float)Buffer_TotalBytes)/File_Size);
+        else if (Buffer_TotalBytes>2*SizeToAnalyze)
+            Config->State_Set((float)0.99); //Nearly the end
+        else
+            Config->State_Set(((float)Buffer_TotalBytes)/(2*SizeToAnalyze));
+    }
+
     if (Buffer_DataSizeToParse)
     {
         if (Buffer_Size<=Buffer_DataSizeToParse)
@@ -780,22 +1112,17 @@
             Buffer_DataSizeToParse=0;
         }
 
-        Element_Begin();
+        Element_Begin0();
         Data_Parse();
         Element_Offset=Element_Size;
-        Element_End();
+        Element_End0();
     }
 
     //Video unlimited specific, we didn't wait for the end (because this is... unlimited)
     if (video_stream_Unlimited)
     {
-        #if MEDIAINFO_EVENTS
-            if (FromTS)
-            {
-                MpegPs_PES_FirstByte_IsAvailable=true;
-                MpegPs_PES_FirstByte_Value=false;
-            }
-        #endif //MEDIAINFO_EVENTS
+        PES_FirstByte_IsAvailable=true;
+        PES_FirstByte_Value=false;
 
         //Look for next Sync word
         size_t Buffer_Offset_Temp=0;
@@ -808,7 +1135,7 @@
             Buffer_Offset_Temp+=2;
             while(Buffer_Offset_Temp<Buffer_Size && Buffer[Buffer_Offset_Temp]!=0x00)
                 Buffer_Offset_Temp+=2;
-            if (Buffer_Offset_Temp<Buffer_Size && Buffer[Buffer_Offset_Temp-1]==0x00 || Buffer_Offset_Temp>=Buffer_Size)
+            if (Buffer_Offset_Temp>=Buffer_Size || Buffer[Buffer_Offset_Temp-1]==0x00)
                 Buffer_Offset_Temp--;
         }
 
@@ -837,13 +1164,56 @@
             if (Buffer_Offset_Temp+4<=Buffer_Size)
                 video_stream_Unlimited=false;
             else
-                Element_IsWaitingForMoreData(); //We don't know if the next bytes are a start_code or data
+                Element_IsWaitingForMoreData(); //We don't know if the next bytes are a stream_id or data
         }
 
-        Element_Begin();
+        Element_Begin0();
         Data_Parse();
         Element_Offset=Element_Size;
-        Element_End();
+        Element_End0();
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_MpegPs::Read_Buffer_AfterParsing()
+{
+    if (!Status[IsFilled])
+    {
+        //In case of problem with some streams
+        if (Buffer_TotalBytes>Buffer_TotalBytes_FirstSynched+SizeToAnalyze)
+        {
+            if (!Status[IsAccepted])
+            {
+                Reject("MPEG-PS");
+                return;
+            }
+
+            video_stream_Count=0;
+            audio_stream_Count=0;
+            private_stream_1_Count=0;
+            private_stream_2_Count=false;
+            extension_stream_Count=0;
+            SL_packetized_stream_Count=false;
+        }
+
+        //Jumping only if needed
+        if (Streams.empty() || video_stream_Count || audio_stream_Count || private_stream_1_Count || private_stream_2_Count || extension_stream_Count || SL_packetized_stream_Count)
+            return;
+
+        //Jumping if needed
+        if (!Status[IsAccepted])
+        {
+            Accept("MPEG-PS");
+            if (!IsSub)
+                Fill(Stream_General, 0, General_Format, "MPEG-PS");
+        }
+        Fill("MPEG-PS");
+        if (!ShouldContinueParsing && File_Offset+Buffer_Size+SizeToAnalyze<File_Size && Config->ParseSpeed<1.0)
+        {
+            //Jumping
+            GoToFromEnd(SizeToAnalyze, "MPEG-PS");
+            Open_Buffer_Unsynch();
+        }
     }
 }
 
@@ -853,61 +1223,46 @@
 
 //---------------------------------------------------------------------------
 void File_MpegPs::Header_Parse()
-#if MEDIAINFO_TRACE
 {
-    #if MEDIAINFO_EVENTS
-        if (FromTS)
-        {
-            MpegPs_PES_FirstByte_IsAvailable=true;
-            MpegPs_PES_FirstByte_Value=true;
-        }
-    #endif //MEDIAINFO_EVENTS
+    PES_FirstByte_IsAvailable=true;
+    PES_FirstByte_Value=true;
 
     //Reinit
-    PTS=(int64u)-1;
-    DTS=(int64u)-1;
+    FrameInfo.PTS=(int64u)-1;
+    FrameInfo.DTS=(int64u)-1;
 
-    //Parsing
-    Skip_B3(                                                    "synchro");
-    Get_B1 (start_code,                                         "start_code");
-
-    if (start_code!=0xB9 && start_code!=0xBA) //MPEG_program_end or pack_start have no PES
-        Header_Parse_PES_packet(start_code);
-    else if (!Header_Parse_Fill_Size()) //MPEG_program_end or pack_start specific
+    #if MEDIAINFO_TRACE
+    if (Trace_Activated)
     {
-        Element_WaitForMoreData();
-        return;
+        //Parsing
+        Skip_B3(                                                    "synchro");
+        Get_B1 (stream_id,                                         "stream_id");
     }
-    Header_Fill_Code(start_code);
-}
-#else //MEDIAINFO_TRACE
-{
-    #if MEDIAINFO_EVENTS
-        if (FromTS)
+    else
+    {
+    #endif //MEDIAINFO_TRACE
+        //Parsing
+        stream_id=Buffer[Buffer_Offset+3];
+        Element_Offset+=4;
+    #if MEDIAINFO_TRACE
+    }
+    #endif //MEDIAINFO_TRACE
+
+    if (stream_id!=0xB9 && stream_id!=0xBA) //MPEG_program_end or pack_start have no PES
+    {
+        if (!Header_Parse_PES_packet(stream_id))
         {
-            MpegPs_PES_FirstByte_IsAvailable=true;
-            MpegPs_PES_FirstByte_Value=true;
+            Element_WaitForMoreData();
+            return;
         }
-    #endif //MEDIAINFO_EVENTS
-
-    //Reinit
-    PTS=(int64u)-1;
-    DTS=(int64u)-1;
-
-    //Parsing
-    start_code=Buffer[Buffer_Offset+3];
-    Element_Offset+=4;
-
-    if (start_code!=0xB9 && start_code!=0xBA) //MPEG_program_end or pack_start have no PES
-        Header_Parse_PES_packet(start_code);
+    }
     else if (!Header_Parse_Fill_Size()) //MPEG_program_end or pack_start specific
     {
         Element_WaitForMoreData();
         return;
     }
-    Header_Fill_Code(start_code);
+    Header_Fill_Code(stream_id);
 }
-#endif //MEDIAINFO_TRACE
 
 //---------------------------------------------------------------------------
 bool File_MpegPs::Header_Parse_Fill_Size()
@@ -924,7 +1279,7 @@
         Buffer_Offset_Temp+=2;
         while(Buffer_Offset_Temp<Buffer_Size && Buffer[Buffer_Offset_Temp]!=0x00)
             Buffer_Offset_Temp+=2;
-        if (Buffer_Offset_Temp<Buffer_Size && Buffer[Buffer_Offset_Temp-1]==0x00 || Buffer_Offset_Temp>=Buffer_Size)
+        if (Buffer_Offset_Temp>=Buffer_Size || Buffer[Buffer_Offset_Temp-1]==0x00)
             Buffer_Offset_Temp--;
     }
 
@@ -945,7 +1300,7 @@
 
     if (Buffer_Offset_Temp+4>Buffer_Size)
     {
-        if (File_Offset+Buffer_Size==File_Size)
+        if (File_Offset+Buffer_Size>=File_Size)
             Buffer_Offset_Temp=Buffer_Size; //We are sure that the next bytes are a start
         else
             return false;
@@ -958,17 +1313,20 @@
 }
 
 //---------------------------------------------------------------------------
-void File_MpegPs::Header_Parse_PES_packet(int8u start_code)
+bool File_MpegPs::Header_Parse_PES_packet(int8u stream_id)
 {
     //Parsing
     int16u PES_packet_length;
     Get_B2 (PES_packet_length,                                  "PES_packet_length");
-
-    //Filling
-    Header_Fill_Size(6+PES_packet_length);
+    if (PES_packet_length && File_Offset+Buffer_Offset+6+PES_packet_length>=File_Size)
+        PES_packet_length=(int16u)(File_Size-(File_Offset+Buffer_Offset+6));
+    #if MEDIAINFO_DEMUX
+        if (Demux_UnpacketizeContainer && Buffer_Offset+6+PES_packet_length>Buffer_Size)
+            return false;
+    #endif //MEDIAINFO_DEMUX
 
     //Parsing
-    switch (start_code)
+    switch (stream_id)
     {
         //Header is only Size
         case 0xBB : //system_header_start
@@ -980,55 +1338,62 @@
         case 0xF2 : //DSMCC Streams
         case 0xF8 : //ITU-T Rec. H .222.1 type E
         case 0xFF : //Program Streams directory
-            return;
+            break;
 
         //Element with PES Header
         default :
             switch (MPEG_Version)
             {
-                case 1  : Header_Parse_PES_packet_MPEG1(start_code); break;
-                case 2  : Header_Parse_PES_packet_MPEG2(start_code); break;
+                case 1  : Header_Parse_PES_packet_MPEG1(stream_id); break;
+                case 2  : Header_Parse_PES_packet_MPEG2(stream_id); break;
                 default : ; //We don't know what to parse...
             }
     }
 
     //Video unlimited specific
-    if (PES_packet_length==0 && Element_Offset<Element_Size)
+    if (PES_packet_length==0 || File_Offset+Buffer_Size>=File_Size)
+    {
         if (!Header_Parse_Fill_Size())
         {
             //Return directly if we must unpack the elementary stream;
-            if (Demux_Unpacketize)
-            {
-                Element_WaitForMoreData();
-                return;
-            }
+            #if MEDIAINFO_DEMUX
+                if (Demux_UnpacketizeContainer)
+                    return false;
+            #endif //MEDIAINFO_DEMUX
 
             //Next PS packet is not found, we will use all the buffer
             Header_Fill_Size(Buffer_Size-Buffer_Offset); //All the buffer is used
             video_stream_Unlimited=true;
             Buffer_Offset_Temp=0; //We use the buffer
         }
+    }
+    else
+        //Filling
+        Header_Fill_Size(6+PES_packet_length);
 
     //Can be cut in small chunks
+    if (Element_IsWaitingForMoreData())
+        return false;
     if (PES_packet_length!=0 && Element_Offset<Element_Size && (size_t)(6+PES_packet_length)>Buffer_Size-Buffer_Offset
-     && ((start_code&0xE0)==0xC0 || (start_code&0xF0)==0xE0))
+     && ((stream_id&0xE0)==0xC0 || (stream_id&0xF0)==0xE0))
     {
         //Return directly if we must unpack the elementary stream;
-        if (Demux_Unpacketize)
-        {
-            Element_WaitForMoreData();
-            return;
-        }
+        #if MEDIAINFO_DEMUX
+            if (Demux_UnpacketizeContainer)
+                return false;
+        #endif //MEDIAINFO_DEMUX
 
         Header_Fill_Size(Buffer_Size-Buffer_Offset); //All the buffer is used
         Buffer_DataSizeToParse=6+PES_packet_length-(int16u)(Buffer_Size-Buffer_Offset);
         Buffer_Offset_Temp=0; //We use the buffer
     }
+
+    return true;
 }
 
 //---------------------------------------------------------------------------
 // Packet header data - MPEG-1
-void File_MpegPs::Header_Parse_PES_packet_MPEG1(int8u start_code)
+void File_MpegPs::Header_Parse_PES_packet_MPEG1(int8u stream_id)
 {
     int8u stuffing_byte;
     do
@@ -1053,14 +1418,14 @@
     {
         int16u PTS_29, PTS_14;
         int8u  PTS_32;
-        Element_Begin("PTS");
+        Element_Begin1("PTS");
         BS_Begin();
         Mark_0();
         Mark_0();
         Mark_1();
         Mark_0();
         Get_S1 ( 3, PTS_32,                                     "PTS_32");
-        Mark_1();
+        Mark_1_NoTrustError(); //Found 0 in one file
         Get_S2 (15, PTS_29,                                     "PTS_29");
         Mark_1();
         Get_S2 (15, PTS_14,                                     "PTS_14");
@@ -1068,33 +1433,41 @@
         BS_End();
 
         //Filling
-        PTS=(((int64u)PTS_32)<<30)
-          | (((int64u)PTS_29)<<15)
-          | (((int64u)PTS_14));
-        if (Streams[start_code].Searching_TimeStamp_End && start_code!=0xBD && start_code!=0xFD) //0xBD and 0xFD can contain multiple streams, TimeStamp management is in Streams management
-        {
-            Streams[start_code].TimeStamp_End.PTS.TimeStamp=PTS;
+        FrameInfo.PTS=(((int64u)PTS_32)<<30)
+                    | (((int64u)PTS_29)<<15)
+                    | (((int64u)PTS_14));
+        if (Streams[stream_id].Searching_TimeStamp_End && stream_id!=0xBD && stream_id!=0xFD) //0xBD and 0xFD can contain multiple streams, TimeStamp management is in Streams management
+        {
+            if (Streams[stream_id].TimeStamp_End.PTS.TimeStamp==(int64u)-1)
+                Streams[stream_id].TimeStamp_End.PTS.TimeStamp=FrameInfo.PTS;
+            while (FrameInfo.PTS+0x100000000LL<Streams[stream_id].TimeStamp_End.PTS.TimeStamp)
+                FrameInfo.PTS+=0x200000000LL;
+            Streams[stream_id].TimeStamp_End.PTS.File_Pos=File_Offset+Buffer_Offset;
+            Streams[stream_id].TimeStamp_End.PTS.TimeStamp=FrameInfo.PTS;
+        }
+        if (Searching_TimeStamp_Start && Streams[stream_id].Searching_TimeStamp_Start && stream_id!=0xBD && stream_id!=0xFD) //0xBD and 0xFD can contain multiple streams, TimeStamp management is in Streams management
+        {
+            Streams[stream_id].TimeStamp_Start.PTS.File_Pos=File_Offset+Buffer_Offset;
+            Streams[stream_id].TimeStamp_Start.PTS.TimeStamp=FrameInfo.PTS;
+            Streams[stream_id].Searching_TimeStamp_Start=false;
         }
-        if (Searching_TimeStamp_Start && Streams[start_code].Searching_TimeStamp_Start && start_code!=0xBD && start_code!=0xFD) //0xBD and 0xFD can contain multiple streams, TimeStamp management is in Streams management
-        {
-            Streams[start_code].TimeStamp_Start.PTS.TimeStamp=PTS;
-            Streams[start_code].Searching_TimeStamp_Start=false;
-        }
-        Element_Info_From_Milliseconds(PTS/90);
-        Element_End();
+        Element_Info_From_Milliseconds(float64_int64s(((float64)FrameInfo.PTS)/90));
+        FrameInfo.DTS=FrameInfo.PTS=FrameInfo.PTS*1000000/90; //In ns
+        HasTimeStamps=true;
+        Element_End0();
     }
     else if ((stuffing_byte&0xF0)==0x30)
     {
         int16u PTS_29, PTS_14, DTS_29, DTS_14;
         int8u  PTS_32, DTS_32;
-        Element_Begin("PTS");
+        Element_Begin1("PTS");
         BS_Begin();
         Mark_0();
         Mark_0();
         Mark_1();
         Mark_1();
         Get_S1 ( 3, PTS_32,                                     "PTS_32");
-        Mark_1();
+        Mark_1_NoTrustError(); //Found 0 in one file
         Get_S2 (15, PTS_29,                                     "PTS_29");
         Mark_1();
         Get_S2 (15, PTS_14,                                     "PTS_14");
@@ -1102,22 +1475,28 @@
         BS_End();
 
         //Filling
-        PTS=(((int64u)PTS_32)<<30)
-          | (((int64u)PTS_29)<<15)
-          | (((int64u)PTS_14));
-        if (Streams[start_code].Searching_TimeStamp_End)
-        {
-            Streams[start_code].TimeStamp_End.PTS.File_Pos=File_Offset+Buffer_Offset;
-            Streams[start_code].TimeStamp_End.PTS.TimeStamp=PTS;
-        }
-        if (Searching_TimeStamp_Start && Streams[start_code].Searching_TimeStamp_Start)
-        {
-            Streams[start_code].TimeStamp_Start.PTS.TimeStamp=PTS;
-        }
-        Element_Info_From_Milliseconds(PTS/90);
-        Element_End();
+        FrameInfo.PTS=(((int64u)PTS_32)<<30)
+                    | (((int64u)PTS_29)<<15)
+                    | (((int64u)PTS_14));
+        if (Streams[stream_id].Searching_TimeStamp_End)
+        {
+            if (Streams[stream_id].TimeStamp_End.PTS.TimeStamp==(int64u)-1)
+                Streams[stream_id].TimeStamp_End.PTS.TimeStamp=FrameInfo.PTS;
+            while (FrameInfo.PTS+0x100000000LL<Streams[stream_id].TimeStamp_End.PTS.TimeStamp)
+                FrameInfo.PTS+=0x200000000LL;
+            Streams[stream_id].TimeStamp_End.PTS.File_Pos=File_Offset+Buffer_Offset;
+            Streams[stream_id].TimeStamp_End.PTS.TimeStamp=FrameInfo.PTS;
+        }
+        if (Searching_TimeStamp_Start && Streams[stream_id].Searching_TimeStamp_Start)
+        {
+            Streams[stream_id].TimeStamp_Start.PTS.File_Pos=File_Offset+Buffer_Offset;
+            Streams[stream_id].TimeStamp_Start.PTS.TimeStamp=FrameInfo.PTS;
+        }
+        Element_Info_From_Milliseconds(float64_int64s(((float64)FrameInfo.PTS)/90));
+        FrameInfo.PTS=FrameInfo.PTS*1000000/90; //In ns
+        Element_End0();
 
-        Element_Begin("DTS");
+        Element_Begin1("DTS");
         BS_Begin();
         Mark_0();
         Mark_0();
@@ -1132,21 +1511,26 @@
         BS_End();
 
         //Filling
-        DTS=(((int64u)DTS_32)<<30)
-          | (((int64u)DTS_29)<<15)
-          | (((int64u)DTS_14));
-        if (Streams[start_code].Searching_TimeStamp_End)
-        {
-            Streams[start_code].TimeStamp_End.DTS.File_Pos=File_Offset+Buffer_Offset;
-            Streams[start_code].TimeStamp_End.DTS.TimeStamp=DTS;
-        }
-        if (Searching_TimeStamp_Start && Streams[start_code].Searching_TimeStamp_Start)
-        {
-            Streams[start_code].TimeStamp_Start.DTS.TimeStamp=DTS;
-            Streams[start_code].Searching_TimeStamp_Start=false;
-        }
-        Element_Info_From_Milliseconds(Streams[start_code].TimeStamp_End.DTS.TimeStamp/90);
-        Element_End();
+        FrameInfo.DTS=(((int64u)DTS_32)<<30)
+                    | (((int64u)DTS_29)<<15)
+                    | (((int64u)DTS_14));
+        if (Streams[stream_id].Searching_TimeStamp_End)
+        {
+            if (Streams[stream_id].TimeStamp_End.DTS.TimeStamp==(int64u)-1)
+                Streams[stream_id].TimeStamp_End.DTS.TimeStamp=FrameInfo.DTS;
+            while (FrameInfo.DTS+0x100000000LL<Streams[stream_id].TimeStamp_End.DTS.TimeStamp)
+                FrameInfo.DTS+=0x200000000LL;
+            Streams[stream_id].TimeStamp_End.DTS.File_Pos=File_Offset+Buffer_Offset;
+            Streams[stream_id].TimeStamp_End.DTS.TimeStamp=FrameInfo.DTS;
+        }
+        if (Searching_TimeStamp_Start && Streams[stream_id].Searching_TimeStamp_Start)
+        {
+            Streams[stream_id].TimeStamp_Start.DTS.TimeStamp=FrameInfo.DTS;
+            Streams[stream_id].Searching_TimeStamp_Start=false;
+        }
+        Element_Info_From_Milliseconds(float64_int64s(((float64)FrameInfo.DTS)/90));
+        FrameInfo.DTS=FrameInfo.DTS*1000000/90; //In ns
+        Element_End0();
     }
     else
     {
@@ -1160,231 +1544,287 @@
         Mark_1();
         Mark_1();
         BS_End();
+
+        if (!FromTS)
+            PES_FirstByte_Value=false;
     }
 }
 
 //---------------------------------------------------------------------------
 // Packet header data - MPEG-2
-void File_MpegPs::Header_Parse_PES_packet_MPEG2(int8u start_code)
+void File_MpegPs::Header_Parse_PES_packet_MPEG2(int8u stream_id)
 {
     //Parsing
     int8u PTS_DTS_flags, PES_header_data_length;
     bool ESCR_flag, ES_rate_flag, DSM_trick_mode_flag, additional_copy_info_flag, PES_CRC_flag, PES_extension_flag;
     #if MEDIAINFO_TRACE
-    BS_Begin();
-    Mark_1();
-    Mark_0();
-    Skip_S1(2,                                                  "PES_scrambling_control");
-    Skip_SB(                                                    "PES_priority");
-    Skip_SB(                                                    "data_alignment_indicator");
-    Skip_SB(                                                    "copyright");
-    Skip_SB(                                                    "original_or_copy");
-    Get_S1 (2, PTS_DTS_flags,                                   "PTS_DTS_flags");
-    Get_SB (ESCR_flag,                                          "ESCR_flag");
-    Get_SB (ES_rate_flag,                                       "ES_rate_flag");
-    Get_SB (DSM_trick_mode_flag,                                "DSM_trick_mode_flag");
-    Get_SB (additional_copy_info_flag,                          "additional_copy_info_flag");
-    Get_SB (PES_CRC_flag,                                       "PES_CRC_flag");
-    Get_SB (PES_extension_flag,                                 "PES_extension_flag");
-    BS_End();
-    Get_B1 (PES_header_data_length,                             "PES_header_data_length");
-    #else //MEDIAINFO_TRACE
-    if (Element_Offset+3>=Element_Size)
+    if (Trace_Activated)
     {
-        Trusted_IsNot();
-        return;
+        BS_Begin();
+        Mark_1_NoTrustError();
+        Mark_0_NoTrustError();
+        Skip_S1(2,                                                  "PES_scrambling_control");
+        Skip_SB(                                                    "PES_priority");
+        Skip_SB(                                                    "data_alignment_indicator");
+        Skip_SB(                                                    "copyright");
+        Skip_SB(                                                    "original_or_copy");
+        Get_S1 (2, PTS_DTS_flags,                                   "PTS_DTS_flags");
+        Get_SB (ESCR_flag,                                          "ESCR_flag");
+        Get_SB (ES_rate_flag,                                       "ES_rate_flag");
+        Get_SB (DSM_trick_mode_flag,                                "DSM_trick_mode_flag");
+        Get_SB (additional_copy_info_flag,                          "additional_copy_info_flag");
+        Get_SB (PES_CRC_flag,                                       "PES_CRC_flag");
+        Get_SB (PES_extension_flag,                                 "PES_extension_flag");
+        BS_End();
+        Get_B1 (PES_header_data_length,                             "PES_header_data_length");
     }
-    size_t Buffer_Pos_Flags=Buffer_Offset+(size_t)Element_Offset;
-    if ((Buffer[Buffer_Pos_Flags]&0xC0)!=0x80) //bit 6 and 7 are 01
+    else
     {
-        Element_DoNotTrust(); //Mark bits are wrong
-        return;
+    #endif //MEDIAINFO_TRACE
+        if (Element_Offset+3>=Element_Size)
+        {
+            Trusted_IsNot("");
+            return;
+        }
+        size_t Buffer_Pos_Flags=Buffer_Offset+(size_t)Element_Offset;
+        if ((Buffer[Buffer_Pos_Flags]&0xC0)!=0x80) //bit 6 and 7 are 01
+        {
+            Element_DoNotTrust(""); //Mark bits are wrong
+            return;
+        }
+        Buffer_Pos_Flags++;
+        PTS_DTS_flags               =Buffer[Buffer_Pos_Flags]>>6;
+        ESCR_flag                   =Buffer[Buffer_Pos_Flags]&0x20?true:false;
+        ES_rate_flag                =Buffer[Buffer_Pos_Flags]&0x10?true:false;
+        DSM_trick_mode_flag         =Buffer[Buffer_Pos_Flags]&0x08?true:false;
+        additional_copy_info_flag   =Buffer[Buffer_Pos_Flags]&0x04?true:false;
+        PES_CRC_flag                =Buffer[Buffer_Pos_Flags]&0x02?true:false;
+        PES_extension_flag          =Buffer[Buffer_Pos_Flags]&0x01?true:false;
+        Buffer_Pos_Flags++;
+        PES_header_data_length      =Buffer[Buffer_Pos_Flags];
+        Element_Offset+=3;
+    #if MEDIAINFO_TRACE
     }
-    Buffer_Pos_Flags++;
-    PTS_DTS_flags               =Buffer[Buffer_Pos_Flags]>>6;
-    ESCR_flag                   =Buffer[Buffer_Pos_Flags]&0x20?true:false;
-    ES_rate_flag                =Buffer[Buffer_Pos_Flags]&0x10?true:false;
-    DSM_trick_mode_flag         =Buffer[Buffer_Pos_Flags]&0x08?true:false;
-    additional_copy_info_flag   =Buffer[Buffer_Pos_Flags]&0x04?true:false;
-    PES_CRC_flag                =Buffer[Buffer_Pos_Flags]&0x02?true:false;
-    PES_extension_flag          =Buffer[Buffer_Pos_Flags]&0x01?true:false;
-    Buffer_Pos_Flags++;
-    PES_header_data_length      =Buffer[Buffer_Pos_Flags];
-    Element_Offset+=3;
     #endif //MEDIAINFO_TRACE
     int64u Element_Pos_After_Data=Element_Offset+PES_header_data_length;
-    
+    if (Element_Pos_After_Data>Element_Size)
+    {
+        Element_WaitForMoreData();
+        return;
+    }
+
     //Options
     if (PTS_DTS_flags==0x2)
     {
         #if MEDIAINFO_TRACE
-        int16u PTS_29, PTS_14;
-        int8u  PTS_32;
-        Element_Begin("PTS_DTS_flags");
-        Element_Begin("PTS");
-        BS_Begin();
-        Mark_0();
-        Mark_0();
-        Mark_1_NoTrustError(); //Is "0" in one sample
-        Mark_0_NoTrustError(); //Is "1" in one sample
-        Get_S1 ( 3, PTS_32,                                     "PTS_32");
-        Mark_1();
-        Get_S2 (15, PTS_29,                                     "PTS_29");
-        Mark_1();
-        Get_S2 (15, PTS_14,                                     "PTS_14");
-        Mark_1();
-        BS_End();
-        PTS=(((int64u)PTS_32)<<30)
-          | (((int64u)PTS_29)<<15)
-          | (((int64u)PTS_14));
-        Element_Info_From_Milliseconds(PTS/90);
-        Element_End();
-        Element_End();
-        #else //MEDIAINFO_TRACE
-        if (Element_Offset+5>Element_Size)
+        if (Trace_Activated)
         {
-            Element_WaitForMoreData();
-            return;
+            int16u PTS_29, PTS_14;
+            int8u  PTS_32;
+            Element_Begin1("PTS_DTS_flags");
+            Element_Begin1("PTS");
+            BS_Begin();
+            Mark_0();
+            Mark_0();
+            Mark_1_NoTrustError(); //Is "0" in one sample
+            Mark_0_NoTrustError(); //Is "1" in one sample
+            Get_S1 ( 3, PTS_32,                                     "PTS_32");
+            Mark_1();
+            Get_S2 (15, PTS_29,                                     "PTS_29");
+            Mark_1();
+            Get_S2 (15, PTS_14,                                     "PTS_14");
+            Mark_1();
+            BS_End();
+            FrameInfo.PTS=(((int64u)PTS_32)<<30)
+                        | (((int64u)PTS_29)<<15)
+                        | (((int64u)PTS_14));
+            Element_Info_From_Milliseconds(float64_int64s(((float64)FrameInfo.PTS)/90));
+            Element_End0();
+            Element_End0();
         }
-        size_t Buffer_Pos=Buffer_Offset+(size_t)Element_Offset;
-        if ((Buffer[Buffer_Pos  ]&0xC1)!=0x01 //bit 5 and 4 are not tested because of one sample with wrong mark bits
-         || (Buffer[Buffer_Pos+2]&0x01)!=0x01
-         || (Buffer[Buffer_Pos+4]&0x01)!=0x01)
+        else
         {
-            Element_DoNotTrust(); //Mark bits are wrong
-            return;
+        #endif //MEDIAINFO_TRACE
+            if (Element_Offset+5>Element_Size)
+            {
+                Element_WaitForMoreData();
+                return;
+            }
+            size_t Buffer_Pos=Buffer_Offset+(size_t)Element_Offset;
+            if ((Buffer[Buffer_Pos  ]&0xC1)!=0x01 //bit 5 and 4 are not tested because of one sample with wrong mark bits
+             || (Buffer[Buffer_Pos+2]&0x01)!=0x01
+             || (Buffer[Buffer_Pos+4]&0x01)!=0x01)
+            {
+                Element_DoNotTrust(""); //Mark bits are wrong
+                return;
+            }
+            FrameInfo.PTS=                                  ((((int64u)Buffer[Buffer_Pos  ]&0x0E))<<29)
+              | ( ((int64u)Buffer[Buffer_Pos+1]      )<<22)|((((int64u)Buffer[Buffer_Pos+2]&0xFE))<<14)
+              | ( ((int64u)Buffer[Buffer_Pos+3]      )<< 7)|((((int64u)Buffer[Buffer_Pos+4]&0xFE))>> 1);
+            Element_Offset+=5;
+        #if MEDIAINFO_TRACE
         }
-        PTS=                                            ((((int64u)Buffer[Buffer_Pos  ]&0x0E))<<29)
-          | ( ((int64u)Buffer[Buffer_Pos+1]      )<<22)|((((int64u)Buffer[Buffer_Pos+2]&0xFE))<<14)
-          | ( ((int64u)Buffer[Buffer_Pos+3]      )<< 7)|((((int64u)Buffer[Buffer_Pos+4]&0xFE))>> 1);
-        Element_Offset+=5;
         #endif //MEDIAINFO_TRACE
 
         //Filling
-        if (Streams[start_code].Searching_TimeStamp_End)
-        {
-            Streams[start_code].TimeStamp_End.PTS.File_Pos=File_Offset+Buffer_Offset;
-            Streams[start_code].TimeStamp_End.PTS.TimeStamp=PTS;
-        }
-        if (Searching_TimeStamp_Start && Streams[start_code].Searching_TimeStamp_Start)
+        if (Streams[stream_id].Searching_TimeStamp_End)
         {
-            Streams[start_code].TimeStamp_Start.PTS.TimeStamp=PTS;
-            Streams[start_code].Searching_TimeStamp_Start=false;
+            if (Streams[stream_id].TimeStamp_End.PTS.TimeStamp==(int64u)-1)
+                Streams[stream_id].TimeStamp_End.PTS.TimeStamp=FrameInfo.PTS;
+            while (FrameInfo.PTS+0x100000000LL<Streams[stream_id].TimeStamp_End.PTS.TimeStamp)
+                FrameInfo.PTS+=0x200000000LL;
+            Streams[stream_id].TimeStamp_End.PTS.File_Pos=File_Offset+Buffer_Offset;
+            Streams[stream_id].TimeStamp_End.PTS.TimeStamp=FrameInfo.PTS;
+        }
+        if (Searching_TimeStamp_Start && Streams[stream_id].Searching_TimeStamp_Start)
+        {
+            Streams[stream_id].TimeStamp_Start.PTS.File_Pos=File_Offset+Buffer_Offset;
+            Streams[stream_id].TimeStamp_Start.PTS.TimeStamp=FrameInfo.PTS;
+            Streams[stream_id].Searching_TimeStamp_Start=false;
         }
+        FrameInfo.DTS=FrameInfo.PTS=FrameInfo.PTS*1000000/90; //In ns
         HasTimeStamps=true;
     }
-    if (PTS_DTS_flags==0x3)
+    else if (PTS_DTS_flags==0x3)
     {
+        size_t Buffer_Pos;
         #if MEDIAINFO_TRACE
         int16u PTS_29, PTS_14, DTS_29, DTS_14;
         int8u  PTS_32, DTS_32;
-        Element_Begin("PTS_DTS_flags");
-        Element_Begin("PTS");
-        BS_Begin();
-        Mark_0();
-        Mark_0();
-        Mark_1_NoTrustError(); //Is "0" in one sample
-        Mark_0_NoTrustError(); //Is "1" in one sample
-        Get_S1 ( 3, PTS_32,                                     "PTS_32");
-        Mark_1();
-        Get_S2 (15, PTS_29,                                     "PTS_29");
-        Mark_1();
-        Get_S2 (15, PTS_14,                                     "PTS_14");
-        Mark_1();
-        BS_End();
-        PTS=(((int64u)PTS_32)<<30)
-          | (((int64u)PTS_29)<<15)
-          | (((int64u)PTS_14));
-        Element_Info_From_Milliseconds(PTS/90);
-        Element_End();
-        #else //MEDIAINFO_TRACE
-        if (Element_Offset+5>Element_Size)
+        if (Trace_Activated)
         {
-            Element_WaitForMoreData();
-            return;
+            Element_Begin1("PTS_DTS_flags");
+            Element_Begin1("PTS");
+            BS_Begin();
+            Mark_0();
+            Mark_0();
+            Mark_1_NoTrustError(); //Is "0" in one sample
+            Mark_0_NoTrustError(); //Is "1" in one sample
+            Get_S1 ( 3, PTS_32,                                     "PTS_32");
+            Mark_1();
+            Get_S2 (15, PTS_29,                                     "PTS_29");
+            Mark_1();
+            Get_S2 (15, PTS_14,                                     "PTS_14");
+            Mark_1();
+            BS_End();
+            FrameInfo.PTS=(((int64u)PTS_32)<<30)
+                        | (((int64u)PTS_29)<<15)
+                        | (((int64u)PTS_14));
+            Element_Info_From_Milliseconds(float64_int64s(((float64)FrameInfo.PTS)/90));
+            Element_End0();
         }
-        size_t Buffer_Pos=Buffer_Offset+(size_t)Element_Offset;
-        if ((Buffer[Buffer_Pos  ]&0xC1)!=0x01 //bit 5 and 4 are not tested because of one sample with wrong mark bits
-         || (Buffer[Buffer_Pos+2]&0x01)!=0x01
-         || (Buffer[Buffer_Pos+4]&0x01)!=0x01)
+        else
         {
-            Element_DoNotTrust(); //Mark bits are wrong
-            return;
+        #endif //MEDIAINFO_TRACE
+            if (Element_Offset+5>Element_Size)
+            {
+                Element_WaitForMoreData();
+                return;
+            }
+            Buffer_Pos=Buffer_Offset+(size_t)Element_Offset;
+            if ((Buffer[Buffer_Pos  ]&0xC1)!=0x01 //bit 5 and 4 are not tested because of one sample with wrong mark bits
+             || (Buffer[Buffer_Pos+2]&0x01)!=0x01
+             || (Buffer[Buffer_Pos+4]&0x01)!=0x01)
+            {
+                Element_DoNotTrust(""); //Mark bits are wrong
+                return;
+            }
+            FrameInfo.PTS=                                  ((((int64u)Buffer[Buffer_Pos  ]&0x0E))<<29)
+              | ( ((int64u)Buffer[Buffer_Pos+1]      )<<22)|((((int64u)Buffer[Buffer_Pos+2]&0xFE))<<14)
+              | ( ((int64u)Buffer[Buffer_Pos+3]      )<< 7)|((((int64u)Buffer[Buffer_Pos+4]&0xFE))>> 1);
+            Element_Offset+=5;
+        #if MEDIAINFO_TRACE
         }
-        PTS=                                            ((((int64u)Buffer[Buffer_Pos  ]&0x0E))<<29)
-          | ( ((int64u)Buffer[Buffer_Pos+1]      )<<22)|((((int64u)Buffer[Buffer_Pos+2]&0xFE))<<14)
-          | ( ((int64u)Buffer[Buffer_Pos+3]      )<< 7)|((((int64u)Buffer[Buffer_Pos+4]&0xFE))>> 1);
-        Element_Offset+=5;
         #endif //MEDIAINFO_TRACE
 
         //Filling
-        if (Streams[start_code].Searching_TimeStamp_End)
-        {
-            Streams[start_code].TimeStamp_End.PTS.File_Pos=File_Offset+Buffer_Offset;
-            Streams[start_code].TimeStamp_End.PTS.TimeStamp=PTS;
-        }
-        if (Searching_TimeStamp_Start && Streams[start_code].Searching_TimeStamp_Start)
+        if (Streams[stream_id].Searching_TimeStamp_End)
         {
-            Streams[start_code].TimeStamp_Start.PTS.TimeStamp=PTS;
-            //Streams[start_code].Searching_TimeStamp_Start=false;
+            if (Streams[stream_id].TimeStamp_End.PTS.TimeStamp==(int64u)-1)
+                Streams[stream_id].TimeStamp_End.PTS.TimeStamp=FrameInfo.PTS;
+            while (FrameInfo.PTS+0x100000000LL<Streams[stream_id].TimeStamp_End.PTS.TimeStamp)
+                FrameInfo.PTS+=0x200000000LL;
+            Streams[stream_id].TimeStamp_End.PTS.File_Pos=File_Offset+Buffer_Offset;
+            Streams[stream_id].TimeStamp_End.PTS.TimeStamp=FrameInfo.PTS;
+        }
+        if (Searching_TimeStamp_Start && Streams[stream_id].Searching_TimeStamp_Start)
+        {
+            Streams[stream_id].TimeStamp_Start.PTS.File_Pos=File_Offset+Buffer_Offset;
+            Streams[stream_id].TimeStamp_Start.PTS.TimeStamp=FrameInfo.PTS;
+            //Streams[stream_id].Searching_TimeStamp_Start=false; //Done with DTS
         }
+        FrameInfo.PTS=FrameInfo.PTS*1000000/90; //In ns
 
         #if MEDIAINFO_TRACE
-        Element_Begin("DTS");
-        BS_Begin();
-        Mark_0();
-        Mark_0();
-        Mark_1_NoTrustError(); //Is "0" in one sample
-        Mark_0_NoTrustError(); //Is "1" in one sample
-        Get_S1 ( 3, DTS_32,                                     "DTS_32");
-        Mark_1();
-        Get_S2 (15, DTS_29,                                     "DTS_29");
-        Mark_1();
-        Get_S2 (15, DTS_14,                                     "DTS_14");
-        Mark_1();
-        BS_End();
-        DTS=(((int64u)DTS_32)<<30)
-          | (((int64u)DTS_29)<<15)
-          | (((int64u)DTS_14));
-        Element_Info_From_Milliseconds(DTS/90);
-        Element_End();
-        Element_End();
-        #else //MEDIAINFO_TRACE
-        if (Element_Offset+5>Element_Size)
+        if (Trace_Activated)
         {
-            Element_WaitForMoreData();
-            return;
+            Element_Begin1("DTS");
+            BS_Begin();
+            Mark_0();
+            Mark_0();
+            Mark_1_NoTrustError(); //Is "0" in one sample
+            Mark_0_NoTrustError(); //Is "1" in one sample
+            Get_S1 ( 3, DTS_32,                                     "DTS_32");
+            Mark_1();
+            Get_S2 (15, DTS_29,                                     "DTS_29");
+            Mark_1();
+            Get_S2 (15, DTS_14,                                     "DTS_14");
+            Mark_1();
+            BS_End();
+            FrameInfo.DTS=(((int64u)DTS_32)<<30)
+                        | (((int64u)DTS_29)<<15)
+                        | (((int64u)DTS_14));
+            Element_Info_From_Milliseconds(float64_int64s(((float64)FrameInfo.DTS)/90));
+            Element_End0();
+            Element_End0();
         }
-        Buffer_Pos=Buffer_Offset+(size_t)Element_Offset;
-        if ((Buffer[Buffer_Pos  ]&0xC1)!=0x01 //bit 5 and 4 are not tested because of one sample with wrong mark bits
-         || (Buffer[Buffer_Pos+2]&0x01)!=0x01
-         || (Buffer[Buffer_Pos+4]&0x01)!=0x01)
+        else
         {
-            Element_DoNotTrust(); //Mark bits are wrong
-            return;
+        #endif //MEDIAINFO_TRACE
+            if (Element_Offset+5>Element_Size)
+            {
+                Element_WaitForMoreData();
+                return;
+            }
+            Buffer_Pos=Buffer_Offset+(size_t)Element_Offset;
+            if ((Buffer[Buffer_Pos  ]&0xC1)!=0x01 //bit 5 and 4 are not tested because of one sample with wrong mark bits
+             || (Buffer[Buffer_Pos+2]&0x01)!=0x01
+             || (Buffer[Buffer_Pos+4]&0x01)!=0x01)
+            {
+                Element_DoNotTrust(""); //Mark bits are wrong
+                return;
+            }
+            FrameInfo.DTS=                                  ((((int64u)Buffer[Buffer_Pos  ]&0x0E))<<29)
+              | ( ((int64u)Buffer[Buffer_Pos+1]      )<<22)|((((int64u)Buffer[Buffer_Pos+2]&0xFE))<<14)
+              | ( ((int64u)Buffer[Buffer_Pos+3]      )<< 7)|((((int64u)Buffer[Buffer_Pos+4]&0xFE))>> 1);
+            Element_Offset+=5;
+        #if MEDIAINFO_TRACE
         }
-        DTS=                                            ((((int64u)Buffer[Buffer_Pos  ]&0x0E))<<29)
-          | ( ((int64u)Buffer[Buffer_Pos+1]      )<<22)|((((int64u)Buffer[Buffer_Pos+2]&0xFE))<<14)
-          | ( ((int64u)Buffer[Buffer_Pos+3]      )<< 7)|((((int64u)Buffer[Buffer_Pos+4]&0xFE))>> 1);
-        Element_Offset+=5;
         #endif //MEDIAINFO_TRACE
 
         //Filling
-        if (Streams[start_code].Searching_TimeStamp_End)
+        if (Streams[stream_id].Searching_TimeStamp_End)
         {
-            Streams[start_code].TimeStamp_End.DTS.File_Pos=File_Offset+Buffer_Offset;
-            Streams[start_code].TimeStamp_End.DTS.TimeStamp=DTS;
+            if (Streams[stream_id].TimeStamp_End.DTS.TimeStamp==(int64u)-1)
+                Streams[stream_id].TimeStamp_End.DTS.TimeStamp=FrameInfo.DTS;
+            while (FrameInfo.DTS+0x100000000LL<Streams[stream_id].TimeStamp_End.DTS.TimeStamp)
+                FrameInfo.DTS+=0x200000000LL;
+            Streams[stream_id].TimeStamp_End.DTS.File_Pos=File_Offset+Buffer_Offset;
+            Streams[stream_id].TimeStamp_End.DTS.TimeStamp=FrameInfo.DTS;
         }
-        if (Searching_TimeStamp_Start && Streams[start_code].Searching_TimeStamp_Start)
+        if (Searching_TimeStamp_Start && Streams[stream_id].Searching_TimeStamp_Start)
         {
-            Streams[start_code].TimeStamp_Start.DTS.TimeStamp=DTS;
-            Streams[start_code].Searching_TimeStamp_Start=false;
+            Streams[stream_id].TimeStamp_Start.DTS.TimeStamp=FrameInfo.DTS;
+            Streams[stream_id].Searching_TimeStamp_Start=false;
         }
+        FrameInfo.DTS=FrameInfo.DTS*1000000/90; //In ns
         HasTimeStamps=true;
     }
+    else if (!FromTS)
+        PES_FirstByte_Value=false;
     if (ESCR_flag && Element_Offset<Element_Pos_After_Data)
     {
-        Element_Begin("ESCR_flag");
+        Element_Begin1("ESCR_flag");
         BS_Begin();
         int16u ESCR_29, ESCR_14, ESCR_extension;
         int8u  ESCR_32;
@@ -1398,25 +1838,25 @@
         Get_S2 (15, ESCR_extension,                             "ESCR_extension");
         Mark_1();
         BS_End();
-        Element_End();
+        Element_End0();
     }
     if (ES_rate_flag && Element_Offset<Element_Pos_After_Data)
     {
-        Element_Begin("ES_rate_flag");
+        Element_Begin1("ES_rate_flag");
         BS_Begin();
         int32u ES_rate;
         Mark_1();
         Get_S3 (22, ES_rate,                                    "ES_rate");
         Mark_1();
         BS_End();
-        Element_End();
+        Element_End0();
     }
     if (DSM_trick_mode_flag && Element_Offset<Element_Pos_After_Data)
     {
-        Element_Begin("DSM_trick_mode_flag");
+        Element_Begin1("DSM_trick_mode_flag");
         BS_Begin();
         int8u trick_mode_control;
-        Get_S1 (3, trick_mode_control,                         "trick_mode_control"); Param_Info(MpegPs_trick_mode_control_values[trick_mode_control]);
+        Get_S1 (3, trick_mode_control,                         "trick_mode_control"); Param_Info1(MpegPs_trick_mode_control_values[trick_mode_control]);
         switch (trick_mode_control)
         {
             case 0 :{ //fast_forward
@@ -1426,7 +1866,8 @@
                     }
                     break;
             case 1 :{ //slow_motion
-                        Skip_S1(5,                              "rep_cntrl");
+                        int8u rep_cntrl;
+                        Get_S1 (5, rep_cntrl,                   "rep_cntrl");
                     }
                     break;
             case 2 :{ //freeze_frame
@@ -1441,7 +1882,8 @@
                     }
                     break;
             case 4 :{ //slow_reverse
-                        Skip_S1(5,                              "rep_cntrl");
+                        int8u rep_cntrl;
+                        Get_S1 (5, rep_cntrl,                   "rep_cntrl");
                     }
                     break;
             default:{
@@ -1449,28 +1891,28 @@
                     }
         }
         BS_End();
-        Element_End();
+        Element_End0();
     }
     if (additional_copy_info_flag && Element_Offset<Element_Pos_After_Data)
     {
-        Element_Begin("additional_copy_info_flag");
+        Element_Begin1("additional_copy_info_flag");
         BS_Begin();
         Mark_1();
         Skip_S1(7,                                              "additional_copy_info");
         BS_End();
-        Element_End();
+        Element_End0();
     }
-    if (additional_copy_info_flag && Element_Offset<Element_Pos_After_Data)
+    if (PES_CRC_flag && Element_Offset<Element_Pos_After_Data)
     {
-        Element_Begin("additional_copy_info_flag");
+        Element_Begin1("PES_CRC_flag");
         Skip_B2(                                                "previous_PES_packet_CRC");
-        Element_End();
+        Element_End0();
     }
+    bool PES_private_data_flag=false, pack_header_field_flag=false, program_packet_sequence_counter_flag=false, p_STD_buffer_flag=false, PES_extension_flag_2=false; //Need it for DCA event
     if (PES_extension_flag && Element_Offset<Element_Pos_After_Data)
     {
-        Element_Begin("PES_extension_flag");
+        Element_Begin1("PES_extension_flag");
         BS_Begin();
-        bool PES_private_data_flag, pack_header_field_flag, program_packet_sequence_counter_flag, p_STD_buffer_flag, PES_extension_flag_2;
         Get_SB (PES_private_data_flag,                          "PES_private_data_flag");
         Get_SB (pack_header_field_flag,                         "pack_header_field_flag");
         Get_SB (program_packet_sequence_counter_flag,           "program_packet_sequence_counter_flag");
@@ -1478,67 +1920,77 @@
         Skip_S1(3,                                              "reserved");
         Get_SB (PES_extension_flag_2,                           "PES_extension_flag_2");
         BS_End();
+
+        //Integrity test
+        if (Element_Offset+(PES_private_data_flag?16:0)+(pack_header_field_flag?1:0)+(program_packet_sequence_counter_flag?2:0)+(p_STD_buffer_flag?2:0)+(PES_extension_flag_2?2:0)>Element_Pos_After_Data)
+        {
+            //There is a problem
+            PES_private_data_flag=false;
+            pack_header_field_flag=false;
+            program_packet_sequence_counter_flag=false;
+            p_STD_buffer_flag=false;
+            PES_extension_flag_2=false;
+        }
+
         if (PES_private_data_flag)
         {
-            Element_Begin("PES_private_data_flag");
+            Element_Begin1("PES_private_data_flag");
             Skip_B16(                                           "PES_private_data");
-            Element_End();
+            Element_End0();
         }
         if (pack_header_field_flag)
         {
-            Element_Begin("pack_header_field_flag");
+            Element_Begin1("pack_header_field_flag");
             int8u pack_field_length;
             Get_B1 (pack_field_length,                          "pack_field_length");
             Skip_XX(pack_field_length,                          "pack_header");
-            Element_End();
+            Element_End0();
         }
         if (program_packet_sequence_counter_flag)
         {
-            Element_Begin("program_packet_sequence_counter_flag");
+            Element_Begin1("program_packet_sequence_counter_flag");
+            int8u   program_packet_sequence_counter, original_stuff_length;
+            bool    MPEG1_MPEG2_identifier;
             BS_Begin();
             Mark_1();
-            Skip_S1(7,                                          "program_packet_sequence_counter");
+            Get_S1 (7, program_packet_sequence_counter,         "program_packet_sequence_counter");
             Mark_1();
-            Skip_SB(                                            "MPEG1_MPEG2_identifier");
-            Skip_S1(6,                                          "original_stuff_length");
+            Get_SB (   MPEG1_MPEG2_identifier,                  "MPEG1_MPEG2_identifier");
+            Get_S1 (6, original_stuff_length,                   "original_stuff_length");
             BS_End();
-            Element_End();
+            Element_End0();
         }
         if (p_STD_buffer_flag)
         {
-            Element_Begin("p_STD_buffer_flag");
+            Element_Begin1("p_STD_buffer_flag");
+            bool P_STD_buffer_scale;
             BS_Begin();
             Mark_0();
             Skip_SB(                                            "Should be 1"); //But I saw a file with "0"
-            Skip_SB(                                            "P-STD_buffer_scale");
+            Get_SB (    P_STD_buffer_scale,                     "P-STD_buffer_scale");
             Skip_S2(13,                                         "P-STD_buffer_size");
             BS_End();
-            Element_End();
+            Element_End0();
         }
         if (PES_extension_flag_2)
         {
-            Element_Begin("PES_extension_flag_2");
+            Element_Begin1("PES_extension_flag_2");
             int8u PES_extension_field_length;
             bool stream_id_extension_flag;
             BS_Begin();
             Mark_1();
             Get_S1 (7, PES_extension_field_length,              "PES_extension_field_length");
             Get_SB (stream_id_extension_flag,                   "stream_id_extension_flag");
-            if (stream_id_extension_flag==0)
-            {
-                Get_S1 (7, stream_id_extension,                 "stream_id_extension"); Param_Info(MpegPs_stream_id_extension(stream_id_extension));
-            }
-            else
+            if (stream_id_extension_flag==0) //This should be limited to stream_id_extension_flag==0, but I found a file with stream_id_extension_flag=1 and a real code...
             {
-                //This should not, but I found a file with stream_id_extension_flag=1 and a real code...
-                Get_S1 (7, stream_id_extension,                 "stream_id_extension"); Param_Info(MpegPs_stream_id_extension(stream_id_extension));
+                Get_S1 (7, stream_id_extension,                 "stream_id_extension"); Param_Info1(MpegPs_stream_id_extension(stream_id_extension));
             }
             BS_End();
             if (PES_extension_field_length-1>0)
                 Skip_XX(PES_extension_field_length-1,           "reserved");
-            Element_End();
+            Element_End0();
         }
-        Element_End();
+        Element_End0();
     }
     if (Element_Pos_After_Data>Element_Offset)
         Skip_XX(Element_Pos_After_Data-Element_Offset,          "stuffing_bytes");
@@ -1547,8 +1999,11 @@
 //---------------------------------------------------------------------------
 void File_MpegPs::Data_Parse()
 {
+    //Counting
+    Frame_Count++;
+
     //Needed?
-    if (!Streams[start_code].Searching_Payload)
+    if (!Streams[stream_id].Searching_Payload)
     {
         Skip_XX(Element_Size,                                   "data");
         Element_DoNotShow();
@@ -1564,7 +2019,7 @@
     }
 
     //Parsing
-    switch (start_code)
+    switch (stream_id)
     {
         case 0xB9 : MPEG_program_end(); break;
         case 0xBA : pack_start(); break;
@@ -1589,65 +2044,18 @@
         case 0xFD : extension_stream(); break;
         case 0xFF : Element_Name("program_stream_directory"); Skip_XX(Element_Size, "Data"); break;
         default:
-                 if ((start_code&0xE0)==0xC0) audio_stream();
-            else if ((start_code&0xF0)==0xE0) video_stream();
+                 if ((stream_id&0xE0)==0xC0) audio_stream();
+            else if ((stream_id&0xF0)==0xE0) video_stream();
             else
                 Trusted_IsNot("Unattended element!");
     }
-
-    //Jumping to the last DTS if needed
-    //if (!Parsing_End_ForDTS && File_Offset+Buffer_Offset==File_Size)
-    //    Jump_DTS();
-
-    #if MEDIAINFO_EVENTS
-        MpegPs_PES_FirstByte_IsAvailable=false;
-    #endif //MEDIAINFO_EVENTS
-}
-
-//---------------------------------------------------------------------------
-void File_MpegPs::Detect_EOF()
-{
-    //In case of problem with some streams
-    if (Buffer_TotalBytes>Buffer_TotalBytes_FirstSynched+SizeToAnalyze)
-    {
-        if (!Status[IsAccepted])
-        {
-            Reject("MPEG-PS");
-            return;
-        }
-
-        video_stream_Count=0;
-        audio_stream_Count=0;
-        private_stream_1_Count=0;
-        private_stream_2_Count=false;
-        extension_stream_Count=0;
-    }
-
-    //Jumping only if needed
-    if (Streams.empty() || video_stream_Count>0 || audio_stream_Count>0 || private_stream_1_Count>0 || private_stream_2_Count==true || extension_stream_Count>0)
-        return;
-
-    //Jumping if needed
-    if (!Status[IsAccepted])
-    {
-        Accept("MPEG-PS");
-        if (!IsSub)
-            Fill(Stream_General, 0, General_Format, "MPEG-PS");
-    }
-    Fill("MPEG-PS");
-    if (File_Size>SizeToAnalyze && File_Offset+Buffer_Size<File_Size-SizeToAnalyze)
-    {
-        //Jumping
-        GoToFromEnd(SizeToAnalyze, "MPEG-PS");
-        Read_Buffer_Unsynched();
-    }
 }
 
 //---------------------------------------------------------------------------
 //Jumping to the last DTS if needed
 bool File_MpegPs::BookMark_Needed()
 {
-    if (IsSub || Streams.empty() || MediaInfoLib::Config.ParseSpeed_Get()>=1.0)
+    if (IsSub || Streams.empty() || Config->ParseSpeed>=1.0)
         return false;
 
     int64u ToJump=(int64u)-1;
@@ -1691,13 +2099,6 @@
             Streams_Extension[StreamID].Searching_Payload=true;
         }
     }
-    if (Status[IsAccepted] && ToJump!=(int64u)-1)
-    {
-        Info("MPEG-PS, Jumping to nearly end of file");
-        Parsing_End_ForDTS=true;
-        File_GoTo=ToJump;
-        return true;
-    }
 
     return false;
 }
@@ -1724,48 +2125,88 @@
 
     //Parsing
     int16u SysClock_29, SysClock_14;
-    int8u Version, SysClock_32, Padding;
-    BS_Begin();
-    Peek_S1( 2, Version);
+    int8u Version, SysClock_32;
+    size_t Buffer_Pos=Buffer_Offset+(size_t)Element_Offset;
+    #if MEDIAINFO_TRACE
+    if (Trace_Activated)
+    {
+        //Parsing
+        BS_Begin();
+        Peek_S1( 2, Version);
+    }
+    else
+    {
+    #endif //MEDIAINFO_TRACE
+        //Parsing
+        Version=Buffer[Buffer_Pos]>>6;
+    #if MEDIAINFO_TRACE
+    }
+    #endif //MEDIAINFO_TRACE
     if (Version==1)
     {
         //MPEG-2
-        MPEG_Version=2;
-        Mark_0();
-        Mark_1();
-        Get_S1 ( 3, SysClock_32,                                "system_clock_reference_base32");
-        Mark_1();
-        Get_S2 (15, SysClock_29,                                "system_clock_reference_base29");
-        Mark_1();
-        Get_S2 (15, SysClock_14,                                "system_clock_reference_base14");
+        #if MEDIAINFO_TRACE
+        if (Trace_Activated)
+        {
+            //Parsing
+            int8u Padding;
+            Mark_0();
+            Mark_1();
+            Get_S1 ( 3, SysClock_32,                                "system_clock_reference_base32");
+            Mark_1();
+            Get_S2 (15, SysClock_29,                                "system_clock_reference_base29");
+            Mark_1();
+            Get_S2 (15, SysClock_14,                                "system_clock_reference_base14");
 
-        //Filling
-        Streams[0xBA].TimeStamp_End.PTS.TimeStamp=(((int64u)SysClock_32)<<30)
-                                                | (((int64u)SysClock_29)<<15)
-                                                | (((int64u)SysClock_14));
-        if (Searching_TimeStamp_Start && Streams[0xBA].Searching_TimeStamp_Start)
+            //Filling
+            Streams[0xBA].TimeStamp_End.PTS.TimeStamp=(((int64u)SysClock_32)<<30)
+                                                    | (((int64u)SysClock_29)<<15)
+                                                    | (((int64u)SysClock_14));
+            if (Searching_TimeStamp_Start && Streams[0xBA].Searching_TimeStamp_Start)
+            {
+                Streams[0xBA].TimeStamp_Start=Streams[0xBA].TimeStamp_End;
+                Streams[0xBA].Searching_TimeStamp_Start=false;
+            }
+            Param_Info_From_Milliseconds(Streams[0xBA].TimeStamp_End.PTS.TimeStamp/90);
+
+            Mark_1();
+            Skip_S2( 9,                                             "system_clock_reference_extension");
+            Mark_1();
+            Get_S3 (22, program_mux_rate,                           "program_mux_rate"); Param_Info2(program_mux_rate*400, " bps");
+            Mark_1();
+            Mark_1();
+            Skip_S1( 5,                                             "reserved");
+            Get_S1 ( 3, Padding,                                    "pack_stuffing_length");
+            BS_End();
+            if (Padding>0)
+                Skip_XX(Padding,                                    "padding");
+        }
+        else
         {
-            Streams[0xBA].TimeStamp_Start=Streams[0xBA].TimeStamp_End;
-            Streams[0xBA].Searching_TimeStamp_Start=false;
+        #endif //MEDIAINFO_TRACE
+            //Parsing
+            Streams[0xBA].TimeStamp_End.PTS.TimeStamp=((Buffer[Buffer_Pos  ]&0x38)<<30)
+                                                    | ((Buffer[Buffer_Pos  ]&0x03)<<28)
+                                                    | ((Buffer[Buffer_Pos+1]     )<<20)
+                                                    | ((Buffer[Buffer_Pos+2]&0xF8)<<15)
+                                                    | ((Buffer[Buffer_Pos+2]&0x03)<<13)
+                                                    | ((Buffer[Buffer_Pos+3]     )<< 5)
+                                                    | ((Buffer[Buffer_Pos+4]&0xF8)>> 3);
+            if (!Status[IsAccepted])
+            {
+                program_mux_rate                     =((Buffer[Buffer_Pos+6]     )<<14)
+                                                    | ((Buffer[Buffer_Pos+7]     )<< 6)
+                                                    | ((Buffer[Buffer_Pos+8]     )>> 2);
+            }
+            int8u Padding                            =  Buffer[Buffer_Pos+9]&0x07;
+            Element_Offset=10+Padding;
+        #if MEDIAINFO_TRACE
         }
-        Param_Info_From_Milliseconds(Streams[0xBA].TimeStamp_End.PTS.TimeStamp/90);
-
-        Mark_1();
-        Skip_S2( 9,                                             "system_clock_reference_extension");
-        Mark_1();
-        Get_S3 (22, program_mux_rate,                           "program_mux_rate"); Param_Info(program_mux_rate*400, " bps");
-        Mark_1();
-        Mark_1();
-        Skip_S1( 5,                                             "reserved");
-        Get_S1 ( 3, Padding,                                    "pack_stuffing_length");
-        BS_End();
-        if (Padding>0)
-            Skip_XX(Padding,                                    "padding");
+        #endif //MEDIAINFO_TRACE
     }
     else
     {
-        //MPEG-1
-        MPEG_Version=1;
+        BS_Begin();
         Mark_0();
         Mark_0();
         Mark_1();
@@ -1789,11 +2230,12 @@
 
         Mark_1();
         Mark_1();
-        Get_S3(22, program_mux_rate,                            "mux_rate"); Param_Info(program_mux_rate*400, " bps");
+        Get_S3(22, program_mux_rate,                            "mux_rate"); Param_Info2(program_mux_rate*400, " bps");
         Mark_1();
         BS_End();
     }
 
+
     //Filling
     FILLING_BEGIN_PRECISE();
         if (!Status[IsAccepted])
@@ -1818,13 +2260,20 @@
                 Streams[Pos].Searching_TimeStamp_Start=true; //audio_stream or video_stream
                 Streams[Pos].Searching_TimeStamp_End=true;   //audio_stream or video_stream
             }
+
+            MPEG_Version=Version==1?2:1;
+
+            SizeToAnalyze=program_mux_rate*50*4*(MustExtendParsingDuration?4:1); //standard delay between TimeStamps is 0.7s, we try 4s to be sure
+            if (SizeToAnalyze>16*1024*1024)
+                SizeToAnalyze=16*1024*1024; //Not too much
+            if (SizeToAnalyze<2*1024*1024)
+                SizeToAnalyze=2*1024*1024; //Not too less
         }
 
-        SizeToAnalyze=program_mux_rate*50*2; //standard delay between TimeStamps is 0.7s, we try 2s to be sure
-        if (SizeToAnalyze>16*1024*1024)
-            SizeToAnalyze=16*1024*1024; //Not too much
-        if (SizeToAnalyze<2*1024*1024)
-            SizeToAnalyze=2*1024*1024; //Not too less
+        #if MEDIAINFO_IBI
+            if (!IsSub)
+                Ibi_SynchronizationOffset_Current=File_Offset+Buffer_Offset-Header_Size;
+        #endif //MEDIAINFO_IBI
     FILLING_END();
 }
 
@@ -1836,17 +2285,18 @@
 
     //If there is system_header_start, default value for private sections are false
     private_stream_1_Count=0;
-    private_stream_2_Count=false;
+    private_stream_2_Count=0;
+    SL_packetized_stream_Count=0;
 
     //Parsing
     int32u rate_bound;
     int8u  audio_bound, video_bound;
     BS_Begin();
     Mark_1();
-    Get_S3 (22, rate_bound,                                     "rate_bound"); Param_Info(rate_bound*400, " bps");
+    Get_S3 (22, rate_bound,                                     "rate_bound"); Param_Info2(rate_bound*400, " bps");
     Mark_1();
     Get_S1 ( 6, audio_bound,                                    "audio_bound");
-    Info_SB(    fixed_flag,                                     "fixed_flag"); Param_Info(MpegPs_System_Fixed[fixed_flag]);
+    Info_SB(    fixed_flag,                                     "fixed_flag"); Param_Info1(MpegPs_System_Fixed[fixed_flag]);
     Skip_SB(                                                    "CSPS_flag");
     Skip_SB(                                                    "system_audio_lock_flag");
     Skip_SB(                                                    "system_video_lock_flag");
@@ -1859,13 +2309,13 @@
         Peek_SB(one);
     while (one)
     {
-        Element_Begin();
+        Element_Begin0();
         int16u STD_buffer_size_bound;
         int8u stream_id, stream_id_extension=0;
         bool STD_buffer_bound_scale;
-        Get_S1 ( 8, stream_id,                                  "stream_id"); Param_Info(MpegPs_stream_id(stream_id));
+        Get_S1 ( 8, stream_id,                                  "stream_id"); Param_Info1(MpegPs_stream_id(stream_id));
         Element_Name(Ztring().From_CC1(stream_id));
-        Element_Info(MpegPs_stream_id(stream_id));
+        Element_Info1(MpegPs_stream_id(stream_id));
         if (stream_id==0xB7)
         {
             Mark_1();
@@ -1890,16 +2340,18 @@
         Mark_1();
         Mark_1();
         Get_SB (    STD_buffer_bound_scale,                     "STD_buffer_bound_scale");
-        Get_S2 (13, STD_buffer_size_bound,                      "STD_buffer_size_bound"); Param_Info(Ztring::ToZtring(STD_buffer_size_bound*(STD_buffer_bound_scale?1024:128)) + _T(" bytes"));
-        Element_End();
+        Get_S2 (13, STD_buffer_size_bound,                      "STD_buffer_size_bound"); Param_Info1(Ztring::ToZtring(STD_buffer_size_bound*(STD_buffer_bound_scale?1024:128)) + __T(" bytes"));
+        Element_End0();
 
         FILLING_BEGIN();
-            if (stream_id==0xBD)
-                private_stream_1_Count=(int8u)-1;
-            if (stream_id==0xBF)
-                private_stream_2_Count=true;
-            if (stream_id==0xFD)
-                extension_stream_Count=(int8u)-1;
+            switch (stream_id)
+            {
+                case 0xBD : private_stream_1_Count=(int8u)-1; break;
+                case 0xBF : private_stream_2_Count=(int8u)-1; break;
+                case 0xFA : SL_packetized_stream_Count=(int8u)-1; break;
+                case 0xFD : extension_stream_Count=(int8u)-1; break;
+                default   : ;
+            }
         FILLING_END();
 
         if (Element_IsNotFinished())
@@ -1938,6 +2390,8 @@
     Parser.From_TS=false;
     Parser.Complete_Stream=new complete_stream;
     Parser.Complete_Stream->Streams.resize(0x100);
+    for (size_t StreamID=0; StreamID<0x100; StreamID++)
+        Parser.Complete_Stream->Streams[StreamID]=new complete_stream::stream;
     Open_Buffer_Init(&Parser);
     Open_Buffer_Continue(&Parser);
     Finish(&Parser);
@@ -1950,9 +2404,12 @@
 
         //Registering the streams
         for (int8u Pos=0; Pos<0xFF; Pos++)
-            if (Parser.Complete_Stream->Streams[Pos].stream_type)
+            if (Parser.Complete_Stream->Streams[Pos]->stream_type!=(int8u)-1)
             {
-                Streams[Pos].stream_type=Parser.Complete_Stream->Streams[Pos].stream_type;
+                if (!Parser.Complete_Stream->Transport_Streams.empty() && !Parser.Complete_Stream->Transport_Streams.begin()->second.Programs.empty())
+                    Streams[Pos].program_format_identifier=Parser.Complete_Stream->Transport_Streams.begin()->second.Programs.begin()->second.registration_format_identifier;
+                Streams[Pos].format_identifier=Parser.Complete_Stream->Streams[Pos]->registration_format_identifier;
+                Streams[Pos].stream_type=Parser.Complete_Stream->Streams[Pos]->stream_type;
             }
             else
             {
@@ -1978,8 +2435,7 @@
             Skip_XX(Element_Size-Element_Offset,                "Unknown");
             return;
         }
-        if (private_stream_1_ID)
-            Element_Info(Ztring::ToZtring(private_stream_1_ID, 16));
+        Element_Info1C(private_stream_1_ID, Ztring::ToZtring(private_stream_1_ID, 16));
     }
 
     if (!Streams_Private1[private_stream_1_ID].StreamIsRegistred)
@@ -1987,15 +2443,29 @@
         //For TS streams, which does not have Start chunk
         if (FromTS)
         {
-            //From TS
-            video_stream_Count=0;
-            audio_stream_Count=0;
-            private_stream_1_Count=1;
-            private_stream_2_Count=false;
-            extension_stream_Count=0;
-            private_stream_1_ID=FromTS_stream_type;
-            private_stream_1_Offset=0;
-            Streams_Private1[private_stream_1_ID].stream_type=FromTS_stream_type;
+            if (video_stream_Count==(int8u)-1 && audio_stream_Count==(int8u)-1)
+            {
+                video_stream_Count=0;
+                audio_stream_Count=0;
+                private_stream_1_Count=1;
+                private_stream_2_Count=0;
+                extension_stream_Count=0;
+                SL_packetized_stream_Count=0;
+                private_stream_1_ID=0;
+                private_stream_1_Offset=0;
+                Streams_Private1[private_stream_1_ID].stream_type=FromTS_stream_type;
+            }
+            else if (!IsSub)
+            {
+                //2 streams in the file, this can not be From TS, we have no idea of the count of streams
+                video_stream_Count=(int8u)-1;
+                audio_stream_Count=(int8u)-1;
+                private_stream_1_Count=(int8u)-1;
+                private_stream_2_Count=(int8u)-1;
+                extension_stream_Count=(int8u)-1;
+                SL_packetized_stream_Count=(int8u)-1;
+                FromTS=false;
+            }
         }
 
         //Registering
@@ -2005,69 +2475,100 @@
             if (!IsSub)
                 Fill(Stream_General, 0, General_Format, "MPEG-PS");
         }
-        Streams[start_code].StreamIsRegistred=true;
-        Streams_Private1[private_stream_1_ID].StreamIsRegistred=true;
+        Streams[stream_id].StreamIsRegistred++;
+        Streams_Private1[private_stream_1_ID].StreamIsRegistred++;
         Streams_Private1[private_stream_1_ID].Searching_Payload=true;
         Streams_Private1[private_stream_1_ID].Searching_TimeStamp_Start=true;
         Streams_Private1[private_stream_1_ID].Searching_TimeStamp_End=true;
 
         //New parsers
-        #if MEDIAINFO_EVENTS
-            Element_Code=private_stream_1_ID;
-        #endif //MEDIAINFO_EVENTS
         Streams_Private1[private_stream_1_ID].Parsers.push_back(private_stream_1_ChooseParser());
-        if (Streams_Private1[private_stream_1_ID].Parsers[Streams_Private1[private_stream_1_ID].Parsers.size()-1])
-            Open_Buffer_Init(Streams_Private1[private_stream_1_ID].Parsers[Streams_Private1[private_stream_1_ID].Parsers.size()-1]);
-        else
+        if (Streams_Private1[private_stream_1_ID].Parsers[Streams_Private1[private_stream_1_ID].Parsers.size()-1]==NULL)
         {
             Streams_Private1[private_stream_1_ID].Parsers.clear();
             #if defined(MEDIAINFO_AC3_YES)
-            {
-                File_Ac3* Parser=new File_Ac3;
-                if (Streams_Private1[private_stream_1_ID].stream_type==0 || Streams_Private1[private_stream_1_ID].stream_type==0x06) //None or private
-                    Parser->Frame_Count_Valid=2;
-                Open_Buffer_Init(Parser);
-                Streams_Private1[private_stream_1_ID].Parsers.push_back(Parser);
-            }
+                Streams_Private1[private_stream_1_ID].Parsers.push_back(ChooseParser_AC3());
             #endif
             #if defined(MEDIAINFO_DTS_YES)
+                Streams_Private1[private_stream_1_ID].Parsers.push_back(ChooseParser_DTS());
+            #endif
+        }
+        #if MEDIAINFO_EVENTS
+            if (private_stream_1_Offset)
             {
-                File_Dts* Parser=new File_Dts;
-                if (Streams_Private1[private_stream_1_ID].stream_type==0 || Streams_Private1[private_stream_1_ID].stream_type==0x06) //None or private
-                    Parser->Frame_Count_Valid=2;
-                Open_Buffer_Init(Parser);
-                Streams_Private1[private_stream_1_ID].Parsers.push_back(Parser);
+                //Multiple substreams in 1 stream
+                StreamIDs[StreamIDs_Size-1]=Element_Code;
+                Element_Code=private_stream_1_ID; //The upper level ID is filled by Element_Code in the common code
+                StreamIDs_Width[StreamIDs_Size]=2;
+                ParserIDs[StreamIDs_Size]=MediaInfo_Parser_MpegPs_Ext;
+                StreamIDs_Size++;
             }
-            #endif
+        #endif //MEDIAINFO_EVENTS
+        for (size_t Pos=0; Pos<Streams_Private1[private_stream_1_ID].Parsers.size(); Pos++)
+        {
+            Streams_Private1[private_stream_1_ID].Parsers[Pos]->CA_system_ID_MustSkipSlices=CA_system_ID_MustSkipSlices;
+            Open_Buffer_Init(Streams_Private1[private_stream_1_ID].Parsers[Pos]);
         }
+        #if MEDIAINFO_EVENTS
+            if (private_stream_1_Offset)
+            {
+                StreamIDs_Size--;
+                Element_Code=StreamIDs[StreamIDs_Size-1];
+            }
+        #endif //MEDIAINFO_EVENTS
     }
 
-    //Specific
-    #if defined(MEDIAINFO_AES3_YES)
-        if (FromTS && FromTS_format_identifier==0x42535344 && PTS!=(int64u)-1) //"BSSD"
-            ((File_Aes3*)Streams_Private1[private_stream_1_ID].Parsers[0])->PTS=PTS;
-    #endif
-
     //Demux
     #if MEDIAINFO_DEMUX
         if (Streams_Private1[private_stream_1_ID].Searching_Payload)
         {
+            if (private_stream_1_Offset)
+            {
+                //Multiple substreams in 1 stream
+                StreamIDs[StreamIDs_Size-1]=Element_Code;
+                Element_Code=private_stream_1_ID; //The upper level ID is filled by Element_Code in the common code
+                StreamIDs_Width[StreamIDs_Size]=2;
+                ParserIDs[StreamIDs_Size]=MediaInfo_Parser_MpegPs_Ext;
+                StreamIDs_Size++;
+                Demux(Buffer+Buffer_Offset+private_stream_1_Offset, (size_t)(Element_Size-private_stream_1_Offset), ContentType_MainStream);
+                StreamIDs_Size--;
+                Element_Code=StreamIDs[StreamIDs_Size-1];
+            }
+            else
+                Demux(Buffer+Buffer_Offset, (size_t)Element_Size, ContentType_MainStream);
+        }
+    #endif //MEDIAINFO_DEMUX
+
+    //Parsing
+    if (Element_Offset<private_stream_1_Offset)
+        Skip_XX(private_stream_1_Offset-Element_Offset,         "DVD-Video data");
+
+    #if MEDIAINFO_EVENTS
+        if (private_stream_1_Offset)
+        {
+            //Multiple substreams in 1 stream
             StreamIDs[StreamIDs_Size-1]=Element_Code;
             Element_Code=private_stream_1_ID; //The upper level ID is filled by Element_Code in the common code
             StreamIDs_Width[StreamIDs_Size]=2;
             ParserIDs[StreamIDs_Size]=MediaInfo_Parser_MpegPs_Ext;
             StreamIDs_Size++;
-            Demux(Buffer+Buffer_Offset+private_stream_1_Offset, (size_t)(Element_Size-private_stream_1_Offset), ContentType_MainStream);
+        }
+    #endif //MEDIAINFO_EVENTS
+    xxx_stream_Parse(Streams_Private1[private_stream_1_ID], private_stream_1_Count);
+    #if MEDIAINFO_EVENTS
+        if (private_stream_1_Offset)
+        {
             StreamIDs_Size--;
             Element_Code=StreamIDs[StreamIDs_Size-1];
         }
+    #endif //MEDIAINFO_EVENTS
+    #if MEDIAINFO_DEMUX
+        if (Config->Demux_EventWasSent)
+        {
+            Demux_StreamIsBeingParsed_type=1;
+            Demux_StreamIsBeingParsed_stream_id=private_stream_1_ID;
+        }
     #endif //MEDIAINFO_DEMUX
-
-    //Parsing
-    if (Element_Offset<private_stream_1_Offset)
-        Skip_XX(private_stream_1_Offset-Element_Offset,         "DVD-Video data");
-
-    xxx_stream_Parse(Streams_Private1[private_stream_1_ID], private_stream_1_Count);
 }
 
 //---------------------------------------------------------------------------
@@ -2078,13 +2579,17 @@
     if (Element_Size<4)
         return false;
 
+    //Testing false-positives
+    if (CC2(Buffer+Buffer_Offset+(size_t)Element_Offset)==0x0B77)
+        return true;
+
     //Parsing
     int8u  CodecID;
     Get_B1 (CodecID,                                            "CodecID");
 
     //Testing
     //Subtitles (CVD)
-         if (CodecID>=0x00 && CodecID<=0x0F)
+         if (CodecID<=0x0F)
     {
         private_stream_1_IsDvdVideo=true;
         private_stream_1_Offset=1;
@@ -2148,16 +2653,16 @@
         if (Count>0 && 4+(int64u)Next+4<=Element_Size)
         {
             //Subtitles (CVD)
-                 if (CodecID>=0x00 && CodecID<=0x0F)
-                ; //Seems to not work with subtitles, to be confirmed
+            //     if (CodecID>=0x00 && CodecID<=0x0F)
+            //    ; //Seems to not work with subtitles, to be confirmed
             //Subtitles (DVD)
-                 if (CodecID>=0x20 && CodecID<=0x3F)
-                ; //Seems to not work with subtitles, to be confirmed
+            //     if (CodecID>=0x20 && CodecID<=0x3F)
+            //    ; //Seems to not work with subtitles, to be confirmed
             //Subtitles (SVCD)
-                 if (CodecID>=0x70 && CodecID<=0x7F)
-                ; //Seems to not work with subtitles, to be confirmed
+            //     if (CodecID>=0x70 && CodecID<=0x7F)
+            //    ; //Seems to not work with subtitles, to be confirmed
             //AC3
-            else if (CodecID>=0x80 && CodecID<=0x87)
+                if (CodecID>=0x80 && CodecID<=0x87)
             {
                 if (CC2(Buffer+Buffer_Offset+4+Next)!=0x0B77 && CC2(Buffer+Buffer_Offset+3+Next)!=0x0B77 && CC2(Buffer+Buffer_Offset+2+Next)!=0x0B77)
                     return false;
@@ -2175,8 +2680,8 @@
                     return false;
             }
             //PCM
-            else if (CodecID>=0xA0 && CodecID<=0xAF)
-                ;
+            //else if (CodecID>=0xA0 && CodecID<=0xAF)
+            //    ;
             //MLP
             else if (CodecID>=0xB0 && CodecID<=0xBF)
             {
@@ -2205,15 +2710,20 @@
 //---------------------------------------------------------------------------
 File__Analyze* File_MpegPs::private_stream_1_ChooseParser()
 {
-    if (FromTS)
+    if (FromTS || Streams[stream_id].program_format_identifier || Streams[stream_id].format_identifier || Streams[stream_id].descriptor_tag)
     {
-        if (FromTS_format_identifier==0x42535344) //"BSSD"
+        int32u format_identifier=FromTS?FromTS_format_identifier:Streams[stream_id].format_identifier;
+        if (format_identifier==0x42535344) //"BSSD"
         {
-            return ChooseParser_AES3(); //AES3 (SMPTE 320M)
+            return ChooseParser_AES3(); //AES3 (SMPTE 302M)
         }
-        switch (FromTS_stream_type)
+        int32u stream_type=FromTS?FromTS_stream_type:Streams[stream_id].stream_type;
+        switch (stream_type)
         {
+            case 0x03 :
+            case 0x04 : return ChooseParser_Mpega(); //MPEG Audio
             case 0x0F : return ChooseParser_Adts(); //ADTS
+            case 0x11 : return ChooseParser_Latm(); //LATM
             case 0x80 : return ChooseParser_PCM(); //PCM
             case 0x81 :
             case 0x83 :
@@ -2226,10 +2736,13 @@
             case 0xA2 : return ChooseParser_DTS(); //DTS
             case 0x90 : return ChooseParser_PGS(); //PGS from Bluray
             case 0xEA : return ChooseParser_NULL(); //VC1()
-            default   : switch (FromTS_descriptor_tag)
+            default   :
+                        {
+                        int8u descriptor_tag=FromTS?FromTS_descriptor_tag:Streams[stream_id].descriptor_tag;
+                        switch (descriptor_tag)
                         {
-                            case 0x56 : return ChooseParser_NULL(); //Teletext
-                            case 0x59 : return ChooseParser_NULL(); //DVB Subtiles
+                            case 0x56 : return ChooseParser_Teletext(); //Teletext
+                            case 0x59 : return ChooseParser_DvbSubtitle(); //DVB Subtiles
                             case 0x6A :
                             case 0x7A :
                             case 0x81 : return ChooseParser_AC3(); //AC3/AC3+
@@ -2240,14 +2753,15 @@
                                         else if (Element_Size>4 && CC4(Buffer+Buffer_Offset)==0x7FFE8001)
                                             return ChooseParser_DTS(); //DTS
                                         else
-                                            return ChooseParser_NULL();
+                                            return NULL;
+                        }
                         }
         }
     }
-    else if (private_stream_1_IsDvdVideo)
+    else if (Element_Code==0xBD && private_stream_1_IsDvdVideo)
     {
         //Subtitles (CVD)
-             if (private_stream_1_ID>=0x00 && private_stream_1_ID<=0x0F)
+             if (private_stream_1_ID<=0x0F)
             return ChooseParser_RLE();
         //Subtitles (DVD)
              if (private_stream_1_ID>=0x20 && private_stream_1_ID<=0x3F)
@@ -2274,7 +2788,7 @@
         else if (private_stream_1_ID>=0xC0 && private_stream_1_ID<=0xCF)
             return ChooseParser_AC3();
         else
-            return ChooseParser_NULL();
+            return NULL;
     }
     else
     {
@@ -2289,7 +2803,7 @@
         else if (Element_Size>6 && CC2(Buffer+Buffer_Offset)==0xFF90 && CC2(Buffer+Buffer_Offset+4)==0x0000)
             return ChooseParser_RLE(); //PS2-MPG Subtitles
         else
-            return ChooseParser_NULL();
+            return NULL;
     }
 }
 
@@ -2300,59 +2814,60 @@
     {
         switch (private_stream_1_ID)
         {
-            case 0x80 : return _T(".pcm"); //PCM
-            case 0x81 : return _T(".ac3"); //AC3
+            case 0x80 : return __T(".pcm"); //PCM
+            case 0x81 : return __T(".ac3"); //AC3
             case 0x83 :
-            case 0x87 : return _T(".dd+"); //AC3+
-            case 0x86 : return _T(".dts"); //DTS
-            case 0xEA : return _T(".vc1"); //DTS
-            default   : return _T(".raw");
+            case 0x87 : return __T(".dd+"); //AC3+
+            case 0x86 : return __T(".dts"); //DTS
+            case 0xEA : return __T(".vc1"); //DTS
+            default   : return __T(".raw");
         }
     }
     else
     {
         //Subtitles
              if (private_stream_1_ID>=0x20 && private_stream_1_ID<=0x3F)
-            return _T(".sub");
+            return __T(".sub");
         //AC3
         else if (private_stream_1_ID>=0x80 && private_stream_1_ID<=0x87)
-            return _T(".ac3");
+            return __T(".ac3");
         //DTS
         else if (private_stream_1_ID>=0x88 && private_stream_1_ID<=0x8F)
-            return _T(".dts");
+            return __T(".dts");
         //SDDS
         else if (private_stream_1_ID>=0x90 && private_stream_1_ID<=0x97)
-            return _T(".sdds");
+            return __T(".sdds");
         //DTS
         else if (private_stream_1_ID>=0x98 && private_stream_1_ID<=0x9F)
-            return _T(".dts");
+            return __T(".dts");
         //PCM
         else if (private_stream_1_ID>=0xA0 && private_stream_1_ID<=0xAF)
-            return _T(".pcm");
+            return __T(".pcm");
         //MLP
         else if (private_stream_1_ID>=0xB0 && private_stream_1_ID<=0xBF)
-            return _T(".dd+");
+            return __T(".dd+");
         //AC3+
         else if (private_stream_1_ID>=0xC0 && private_stream_1_ID<=0xCF)
-            return _T(".dd+");
+            return __T(".dd+");
         else
-            return _T(".raw");
+            return __T(".raw");
     }
 }
 
 //---------------------------------------------------------------------------
-void File_MpegPs::private_stream_1_Element_Info()
+#if MEDIAINFO_TRACE
+void File_MpegPs::private_stream_1_Element_Info1()
 {
     if (FromTS)
     {
         switch (private_stream_1_ID)
         {
-            case 0x80 : Element_Info("PCM"); return;
-            case 0x81 : Element_Info("AC3"); return;
+            case 0x80 : Element_Info1("PCM"); return;
+            case 0x81 : Element_Info1("AC3"); return;
             case 0x83 :
-            case 0x87 : Element_Info("AC3+"); return;
-            case 0x86 : Element_Info("DTS"); return;
-            case 0xEA : Element_Info("VC1"); return;
+            case 0x87 : Element_Info1("AC3+"); return;
+            case 0x86 : Element_Info1("DTS"); return;
+            case 0xEA : Element_Info1("VC1"); return;
             default   : return;
         }
     }
@@ -2360,33 +2875,31 @@
     {
         //Subtitles
              if (private_stream_1_ID>=0x20 && private_stream_1_ID<=0x3F)
-            Element_Info("RLE");
+            Element_Info1("RLE");
         //AC3
         else if (private_stream_1_ID>=0x80 && private_stream_1_ID<=0x87)
-            Element_Info("AC3");
+            Element_Info1("AC3");
         //DTS
         else if (private_stream_1_ID>=0x88 && private_stream_1_ID<=0x8F)
-            Element_Info("DTS");
+            Element_Info1("DTS");
         //SDDS
         else if (private_stream_1_ID>=0x90 && private_stream_1_ID<=0x97)
-            Element_Info("SDDS");
+            Element_Info1("SDDS");
         //DTS
         else if (private_stream_1_ID>=0x98 && private_stream_1_ID<=0x9F)
-            Element_Info("DTS");
+            Element_Info1("DTS");
         //PCM
         else if (private_stream_1_ID>=0xA0 && private_stream_1_ID<=0xAF)
-            Element_Info("LPCM");
+            Element_Info1("LPCM");
         //MLP
         else if (private_stream_1_ID>=0xB0 && private_stream_1_ID<=0xBF)
-            Element_Info("MLP");
+            Element_Info1("MLP");
         //AC3+
         else if (private_stream_1_ID>=0xC0 && private_stream_1_ID<=0xCF)
-            Element_Info("AC3+");
-        //PS2
-        else if (private_stream_1_ID>=0xC0 && private_stream_1_ID<=0xCF)
-            Element_Info("PS2");
+            Element_Info1("AC3+");
     }
 }
+#endif //MEDIAINFO_TRACE
 
 //---------------------------------------------------------------------------
 // Packet "BE"
@@ -2430,7 +2943,7 @@
 
         //Disabling this Stream
         Streams[0xBF].Searching_Payload=false;
-        private_stream_2_Count=false;
+        private_stream_2_Count=0;
     }
 }
 
@@ -2499,26 +3012,41 @@
 {
     Element_Name("Audio");
 
-    if (!Streams[start_code].StreamIsRegistred)
+    if (!Streams[stream_id].StreamIsRegistred)
     {
         //For TS streams, which does not have Start chunk
         if (FromTS)
         {
-            video_stream_Count=0;
-            audio_stream_Count=1;
-            private_stream_1_Count=0;
-            private_stream_2_Count=false;
-            extension_stream_Count=0;
-            Streams[start_code].stream_type=FromTS_stream_type;
+            if (video_stream_Count==(int8u)-1 && audio_stream_Count==(int8u)-1)
+            {
+                video_stream_Count=0;
+                audio_stream_Count=1;
+                private_stream_1_Count=0;
+                private_stream_2_Count=0;
+                extension_stream_Count=0;
+                SL_packetized_stream_Count=0;
+                Streams[stream_id].stream_type=FromTS_stream_type;
+            }
+            else if (!IsSub)
+            {
+                //2 streams in the file, this can not be From TS, we have no idea of the count of streams
+                video_stream_Count=(int8u)-1;
+                audio_stream_Count=(int8u)-1;
+                private_stream_1_Count=(int8u)-1;
+                private_stream_2_Count=(int8u)-1;
+                extension_stream_Count=(int8u)-1;
+                SL_packetized_stream_Count=(int8u)-1;
+                FromTS=false;
+            }
         }
 
         //If we have no Streams map --> Registering the Streams as MPEG Audio
-        if (Streams[start_code].stream_type==0)
+        if (Streams[stream_id].stream_type==0 && !FromTS)
         {
             if (MPEG_Version==2)
-                Streams[start_code].stream_type=0x04; //MPEG-2 Audio
+                Streams[stream_id].stream_type=0x04; //MPEG-2 Audio
             else
-                Streams[start_code].stream_type=0x03; //MPEG-1 Audio
+                Streams[stream_id].stream_type=0x03; //MPEG-1 Audio
         }
 
         //Registering
@@ -2528,38 +3056,51 @@
             if (!IsSub)
                 Fill(Stream_General, 0, General_Format, "MPEG-PS");
         }
-        Streams[start_code].StreamIsRegistred=true;
+        Streams[stream_id].StreamIsRegistred++;
 
         //New parsers
-        switch (Streams[start_code].stream_type)
+        Streams[stream_id].Parsers.push_back(private_stream_1_ChooseParser());
+        if (Streams[stream_id].Parsers[Streams[stream_id].Parsers.size()-1]==NULL)
         {
-            case 0x0F : Streams[start_code].Parsers.push_back(ChooseParser_Adts()); Open_Buffer_Init(Streams[start_code].Parsers[0]); break;
-            case 0x03 :
-            case 0x04 : Streams[start_code].Parsers.push_back(ChooseParser_Mpega()); Open_Buffer_Init(Streams[start_code].Parsers[0]); break;
-            default   :
-                        #if defined(MEDIAINFO_MPEGA_YES)
-                        {
-                            File_Mpega* Parser=new File_Mpega;
-                            Open_Buffer_Init(Parser);
-                            Parser->Frame_Count_Valid=1;
-                            Streams[start_code].Parsers.push_back(Parser);
-                        }
-                        #endif
-                        #if defined(MEDIAINFO_ADTS_YES)
-                        {
-                            File_Adts* Parser=new File_Adts;
-                            Open_Buffer_Init(Parser);
-                            Streams[start_code].Parsers.push_back(Parser);
-                        }
-                        #endif
+            Streams[stream_id].Parsers.clear();
+            #if defined(MEDIAINFO_MPEGA_YES)
+                Streams[stream_id].Parsers.push_back(ChooseParser_Mpega());
+            #endif
+            #if defined(MEDIAINFO_AC3_YES)
+                Streams[stream_id].Parsers.push_back(ChooseParser_AC3());
+            #endif
+            #if defined(MEDIAINFO_DTS_YES)
+                Streams[stream_id].Parsers.push_back(ChooseParser_DTS());
+            #endif
+            #if defined(MEDIAINFO_AAC_YES)
+                Streams[stream_id].Parsers.push_back(ChooseParser_Adts());
+            #endif
+            #if defined(MEDIAINFO_AAC_YES)
+                Streams[stream_id].Parsers.push_back(ChooseParser_Latm());
+            #endif
+        }
+        for (size_t Pos=0; Pos<Streams[stream_id].Parsers.size(); Pos++)
+        {
+            Streams[stream_id].Parsers[Pos]->CA_system_ID_MustSkipSlices=CA_system_ID_MustSkipSlices;
+            Open_Buffer_Init(Streams[stream_id].Parsers[Pos]);
         }
     }
 
     //Demux
-    Demux(Buffer+Buffer_Offset, (size_t)Element_Size, ContentType_MainStream);
+    #if MEDIAINFO_DEMUX
+        if (Streams[stream_id].Parsers.empty() || !Streams[stream_id].Parsers[0]->Demux_UnpacketizeContainer)
+            Demux(Buffer+Buffer_Offset, (size_t)Element_Size, ContentType_MainStream);
+    #endif //MEDIAINFO_DEMUX
 
     //Parsing
-    xxx_stream_Parse(Streams[start_code], audio_stream_Count);
+    xxx_stream_Parse(Streams[stream_id], audio_stream_Count);
+    #if MEDIAINFO_DEMUX
+        if (Config->Demux_EventWasSent)
+        {
+            Demux_StreamIsBeingParsed_type=0;
+            Demux_StreamIsBeingParsed_stream_id=stream_id;
+        }
+    #endif //MEDIAINFO_DEMUX
 }
 
 //---------------------------------------------------------------------------
@@ -2567,17 +3108,32 @@
 {
     Element_Name("Video");
 
-    if (!Streams[start_code].StreamIsRegistred)
+    if (!Streams[stream_id].StreamIsRegistred)
     {
         //For TS streams, which does not have Start chunk
         if (FromTS)
         {
-            video_stream_Count=1;
-            audio_stream_Count=0;
-            private_stream_1_Count=0;
-            private_stream_2_Count=false;
-            extension_stream_Count=0;
-            Streams[start_code].stream_type=FromTS_stream_type;
+            if (video_stream_Count==(int8u)-1 && audio_stream_Count==(int8u)-1)
+            {
+                video_stream_Count=1;
+                audio_stream_Count=0;
+                private_stream_1_Count=0;
+                private_stream_2_Count=0;
+                extension_stream_Count=0;
+                SL_packetized_stream_Count=0;
+                Streams[stream_id].stream_type=FromTS_stream_type;
+            }
+            else if (!IsSub)
+            {
+                //2 streams in the file, this can not be From TS, we have no idea of the count of streams
+                video_stream_Count=(int8u)-1;
+                audio_stream_Count=(int8u)-1;
+                private_stream_1_Count=(int8u)-1;
+                private_stream_2_Count=(int8u)-1;
+                extension_stream_Count=(int8u)-1;
+                SL_packetized_stream_Count=(int8u)-1;
+                FromTS=false;
+            }
         }
 
         //Registering
@@ -2587,96 +3143,73 @@
             if (!IsSub)
                 Fill(Stream_General, 0, General_Format, "MPEG-PS");
         }
-        Streams[start_code].StreamIsRegistred=true;
+        Streams[stream_id].StreamIsRegistred++;
 
         //New parsers
-        switch (Streams[start_code].stream_type)
+        switch (Streams[stream_id].stream_type)
         {
-            case 0x10 : Streams[start_code].Parsers.push_back(ChooseParser_Mpeg4v()); Open_Buffer_Init(Streams[start_code].Parsers[0]); break;
-            case 0x1B : Streams[start_code].Parsers.push_back(ChooseParser_Avc()   ); Open_Buffer_Init(Streams[start_code].Parsers[0]); break;
+            case 0x10 : Streams[stream_id].Parsers.push_back(ChooseParser_Mpeg4v()); break;
+            case 0x1B : Streams[stream_id].Parsers.push_back(ChooseParser_Avc()   ); break;
             case 0x01 :
             case 0x02 :
-            case 0x80 : Streams[start_code].Parsers.push_back(ChooseParser_Mpegv() ); Open_Buffer_Init(Streams[start_code].Parsers[0]); break;
+            case 0x80 : Streams[stream_id].Parsers.push_back(ChooseParser_Mpegv() ); break;
             default   :
                         #if defined(MEDIAINFO_MPEGV_YES)
-                        {
-                            File_Mpegv* Parser=new File_Mpegv;
-                            Open_Buffer_Init(Parser);
-                            Parser->MPEG_Version=MPEG_Version;
-                            Parser->ShouldContinueParsing=true;
-                            Streams[start_code].Parsers.push_back(Parser);
-                        }
+                            Streams[stream_id].Parsers.push_back(ChooseParser_Mpegv());
                         #endif
                         #if defined(MEDIAINFO_AVC_YES)
-                        {
-                            File_Avc* Parser=new File_Avc;
-                            Open_Buffer_Init(Parser);
-                            Parser->ShouldContinueParsing=true;
-                            Streams[start_code].Parsers.push_back(Parser);
-                        }
+                            Streams[stream_id].Parsers.push_back(ChooseParser_Avc());
                         #endif
                         #if defined(MEDIAINFO_MPEG4V_YES)
-                        {
-                            File_Mpeg4v* Parser=new File_Mpeg4v;
-                            Open_Buffer_Init(Parser);
-                            Parser->ShouldContinueParsing=true;
-                            Streams[start_code].Parsers.push_back(Parser);
-                        }
+                            Streams[stream_id].Parsers.push_back(ChooseParser_Mpeg4v());
                         #endif
                         #if defined(MEDIAINFO_AVSV_YES)
                         {
                             File_AvsV* Parser=new File_AvsV;
-                            Open_Buffer_Init(Parser);
-                            Parser->ShouldContinueParsing=true;
-                            Streams[start_code].Parsers.push_back(Parser);
+                            Streams[stream_id].Parsers.push_back(Parser);
                         }
                         #endif
         }
+        for (size_t Pos=0; Pos<Streams[stream_id].Parsers.size(); Pos++)
+        {
+            Streams[stream_id].Parsers[Pos]->CA_system_ID_MustSkipSlices=CA_system_ID_MustSkipSlices;
+            Open_Buffer_Init(Streams[stream_id].Parsers[Pos]);
+            #if MEDIAINFO_IBI
+                if (FromTS)
+                    Streams[stream_id].Parsers[Pos]->IbiStream=IbiStream;
+                else
+                {
+                    if (Ibi.Streams[stream_id]==NULL)
+                        Ibi.Streams[stream_id]=new ibi::stream;
+                    Streams[stream_id].Parsers[Pos]->IbiStream=Ibi.Streams[stream_id];
+                }
+            #endif //MEDIAINFO_IBI
+            #if MEDIAINFO_SEEK
+                if (Unsynch_Frame_Counts.find(stream_id)!=Unsynch_Frame_Counts.end())
+                    Streams[stream_id].Parsers[Pos]->Frame_Count_NotParsedIncluded=Unsynch_Frame_Counts[stream_id];
+            #endif //MEDIAINFO_SEEK
+        }
+        #if MEDIAINFO_SEEK
+            if (Unsynch_Frame_Counts.find(stream_id)!=Unsynch_Frame_Counts.end())
+                Unsynch_Frame_Counts.erase(stream_id);
+        #endif //MEDIAINFO_SEEK
     }
 
     //Demux
-    if (!(FromTS_stream_type==0x20
-        #if MEDIAINFO_DEMUX
-             && SubStream_Demux
-        #endif //MEDIAINFO_DEMUX
-        ))
-        Demux(Buffer+Buffer_Offset, (size_t)Element_Size, ContentType_MainStream);
+    #if MEDIAINFO_DEMUX
+        if (!(FromTS_stream_type==0x20 && SubStream_Demux) && (Streams[stream_id].Parsers.empty() || !Streams[stream_id].Parsers[0]->Demux_UnpacketizeContainer))
+            Demux(Buffer+Buffer_Offset, (size_t)Element_Size, ContentType_MainStream);
+    #endif //MEDIAINFO_DEMUX
 
     //Parsing
-    xxx_stream_Parse(Streams[start_code], video_stream_Count);
-
-    //Saving PTS
-    bool video_stream_IsFilled=false; //If parser is filled, frame count is more update, we stop testing PTS.
-    bool video_stream_IsInterlaced=false; //If interlaced, we must count the number of fields, not frames
-    for (size_t Pos=0; Pos<Streams[start_code].Parsers.size(); Pos++)
-    {
-        if (Streams[start_code].Parsers[Pos]->Status[IsFilled])
-            video_stream_IsFilled=true;
-        if (!video_stream_IsFilled && Streams[start_code].Parsers[Pos]->Frame_Count_InThisBlock)
-        {
-            video_stream_PTS_FrameCount+=Streams[start_code].Parsers[Pos]->Frame_Count_InThisBlock; //TODO: check if there are more than 1 parser with Frame_Count_InThisBlock>0
-            video_stream_IsInterlaced=Streams[start_code].Parsers[Pos]->Retrieve(Stream_Video, 0, Video_ScanType)==_T("Intelaced"); //TODO: SanType is written too late, not available on time, wrong data
-        }
-    }
-    if (!video_stream_IsFilled && !video_stream_Unlimited && PTS!=(int64u)-1)
-    {
-        if (PTS>=0x100000000LL)
-            video_stream_PTS_MustAddOffset=true;
-        if (video_stream_IsInterlaced)
-            video_stream_PTS_FrameCount*=2; //Count fields, not frames
-        int64u PTS_Calculated=((video_stream_PTS_MustAddOffset && PTS<0x100000000LL)?0x200000000LL:0)+PTS; //With Offset if needed
-        if (video_stream_PTS_FrameCount<=1)
-            video_stream_PTS.push_back(PTS_Calculated);
-        else if (!video_stream_PTS.empty())
-        {
-            //Calculating the average PTS per frame if there is more than 1 frame between PTS
-            int64u PTS_Calculated_Base=video_stream_PTS[video_stream_PTS.size()-1];
-            int64u PTS_Calculated_PerFrame=(PTS_Calculated-PTS_Calculated_Base)/video_stream_PTS_FrameCount;
-            for (size_t Pos=0; Pos<video_stream_PTS_FrameCount; Pos++)
-                video_stream_PTS.push_back(PTS_Calculated_Base+(1+Pos)*PTS_Calculated_PerFrame);
+    xxx_stream_Parse(Streams[stream_id], video_stream_Count);
+    #if MEDIAINFO_DEMUX
+        if (Config->Demux_EventWasSent)
+        {
+            Demux_StreamIsBeingParsed_type=0;
+            Demux_StreamIsBeingParsed_stream_id=stream_id;
         }
-        video_stream_PTS_FrameCount=0;
-    }
+    #endif //MEDIAINFO_DEMUX
 }
 
 //---------------------------------------------------------------------------
@@ -2685,135 +3218,140 @@
 {
     Element_Name("SL-packetized_stream");
 
-    if (!Streams[start_code].StreamIsRegistred)
+    if (!Streams[stream_id].StreamIsRegistred)
     {
         //For TS streams, which does not have Start chunk
         if (FromTS)
         {
-            video_stream_Count=0;
-            audio_stream_Count=1;
-            private_stream_1_Count=0;
-            private_stream_2_Count=false;
-            extension_stream_Count=0;
-            Streams[start_code].stream_type=FromTS_stream_type;
+            if (video_stream_Count==(int8u)-1 && audio_stream_Count==(int8u)-1)
+            {
+                video_stream_Count=0;
+                audio_stream_Count=0;
+                private_stream_1_Count=0;
+                private_stream_2_Count=0;
+                extension_stream_Count=0;
+                SL_packetized_stream_Count=1;
+                Streams[stream_id].stream_type=FromTS_stream_type;
+            }
+            else if (!IsSub)
+            {
+                //2 streams in the file, this can not be From TS, we have no idea of the count of streams
+                video_stream_Count=(int8u)-1;
+                audio_stream_Count=(int8u)-1;
+                private_stream_1_Count=(int8u)-1;
+                private_stream_2_Count=(int8u)-1;
+                extension_stream_Count=(int8u)-1;
+                SL_packetized_stream_Count=(int8u)-1;
+                FromTS=false;
+            }
         }
 
         //Registering
-        Streams[start_code].StreamIsRegistred=true;
+        Streams[stream_id].StreamIsRegistred++;
         if (!Status[IsAccepted])
             Data_Accept("MPEG-PS");
-        Streams[start_code].Searching_TimeStamp_Start=true;
+        Streams[stream_id].Searching_TimeStamp_Start=true;
 
         //New parsers
+        #ifdef MEDIAINFO_MPEG4_YES
+            if (ParserFromTs)
+            {
+                Streams[stream_id].Parsers.push_back(ParserFromTs); ParserFromTs=NULL;
+            }
+            else
+        #endif
         if (FromTS_stream_type)
             switch (FromTS_stream_type)
             {
                 case 0x0F :
-                            #if defined(MEDIAINFO_ADTS_YES)
-                            {
-                                File_Adts* Parser=new File_Adts;
-                                Parser->Frame_Count_Valid=1;
-                                Open_Buffer_Init(Parser);
-                                Streams[start_code].Parsers.push_back(Parser);
-                            }
-                            #endif
+                            Streams[stream_id].Parsers.push_back(ChooseParser_Adts());
                             break;
 
                 case 0x11 :
-                            #if defined(MEDIAINFO_MPEG4_YES)
-                            {
-                                File_Aac* Parser=new File_Aac;
-                                Parser->DecSpecificInfoTag=DecSpecificInfoTag;
-                                Parser->SLConfig=SLConfig;
-                                Open_Buffer_Init(Parser);
-                                Streams[start_code].Parsers.push_back(Parser);
-                            }
-                            #endif
+                            Streams[stream_id].Parsers.push_back(ChooseParser_Latm());
                             break;
                 default   : ;
             }
         else
         {
-            #if defined(MEDIAINFO_ADTS_YES)
-            {
-                File_Adts* Parser=new File_Adts;
-                Parser->Frame_Count_Valid=1;
-                Open_Buffer_Init(Parser);
-                Streams[start_code].Parsers.push_back(Parser);
-            }
+            #if defined(MEDIAINFO_AAC_YES)
+                Streams[stream_id].Parsers.push_back(ChooseParser_Adts());
             #endif
-            #if defined(MEDIAINFO_MPEG4_YES)
-            {
-                File_Aac* Parser=new File_Aac;
-                Parser->DecSpecificInfoTag=DecSpecificInfoTag;
-                Parser->SLConfig=SLConfig;
-                Open_Buffer_Init(Parser);
-                Streams[start_code].Parsers.push_back(Parser);
-            }
+            #if defined(MEDIAINFO_AAC_YES)
+                Streams[stream_id].Parsers.push_back(ChooseParser_Latm());
             #endif
         }
+        for (size_t Pos=0; Pos<Streams[stream_id].Parsers.size(); Pos++)
+        {
+            Streams[stream_id].Parsers[Pos]->CA_system_ID_MustSkipSlices=CA_system_ID_MustSkipSlices;
+            Open_Buffer_Init(Streams[stream_id].Parsers[Pos]);
+        }
     }
 
     //Parsing
-    if (SLConfig) //LATM
-    {
-        BS_Begin();
-        int8u paddingBits=0;
-        bool paddingFlag=false, idleFlag=false/*not in spec*/, DegPrioflag=false/*not ins specs*/, OCRflag=false,
-             accessUnitStartFlag=false/*should be "previous-SL packet has accessUnitEndFlag"*/, accessUnitEndFlag=false/*Should be "subsequent-SL packet has accessUnitStartFlag"*/,
-             decodingTimeStampFlag=false/*not in spec*/, compositionTimeStampFlag=false/*not in spec*/,
-             instantBitrateFlag=false/*not in spec*/;
-        if (SLConfig->useAccessUnitStartFlag)
-            Get_SB (accessUnitStartFlag,                        "accessUnitStartFlag");
-        if (SLConfig->useAccessUnitEndFlag)
-            Get_SB (accessUnitEndFlag,                          "accessUnitEndFlag");
-        if (SLConfig->OCRLength>0)
-            Get_SB (OCRflag,                                    "OCRflag");
-        if (SLConfig->useIdleFlag)
-            Get_SB (idleFlag,                                   "idleFlag");
-        if (SLConfig->usePaddingFlag)
-            Get_SB (paddingFlag,                                "paddingFlag");
-        if (paddingFlag)
-            Get_S1(3, paddingBits,                              "paddingBits");
-        if (!idleFlag && (!paddingFlag || paddingBits!=0))
-        {
-            if (SLConfig->packetSeqNumLength>0)
-                Skip_S2(SLConfig->packetSeqNumLength,           "packetSequenceNumber");
-            if (SLConfig->degradationPriorityLength>0)
-                Get_SB (DegPrioflag,                            "DegPrioflag");
-            if (DegPrioflag)
-                Skip_S2(SLConfig->degradationPriorityLength,    "degradationPriority");
-            if (OCRflag)
-                Skip_S8(SLConfig->OCRLength,                    "objectClockReference");
-            if (accessUnitStartFlag)
-            {
-                if (SLConfig->useRandomAccessPointFlag)
-                    Skip_SB(                                    "randomAccessPointFlag");
-                if (SLConfig->AU_seqNumLength >0)
-                    Skip_S2(SLConfig->AU_seqNumLength,          "AU_sequenceNumber");
-                if (SLConfig->useTimeStampsFlag)
-                {
-                    Get_SB (decodingTimeStampFlag,              "decodingTimeStampFlag");
-                    Get_SB (compositionTimeStampFlag,           "compositionTimeStampFlag");
-                }
-                if (SLConfig->instantBitrateLength>0)
-                    Get_SB (instantBitrateFlag,                 "instantBitrateFlag");
-                if (decodingTimeStampFlag)
-                    Skip_S2(SLConfig->timeStampLength,          "decodingTimeStamp");
-                if (compositionTimeStampFlag)
-                    Skip_S2(SLConfig->timeStampLength,          "compositionTimeStamp");
-                if (SLConfig->AU_Length > 0)
-                    Skip_S2(SLConfig->AU_Length,                "accessUnitLength");
-                if (instantBitrateFlag)
-                    Skip_S2(SLConfig->instantBitrateLength,     "instantBitrate");
+    #ifdef MEDIAINFO_MPEG4_YES
+        if (SLConfig) //SL
+        {
+            BS_Begin();
+            int8u paddingBits=0;
+            bool paddingFlag=false, idleFlag=false, DegPrioflag=false, OCRflag=false,
+                 accessUnitStartFlag=false, accessUnitEndFlag=false,
+                 decodingTimeStampFlag=false, compositionTimeStampFlag=false,
+                 instantBitrateFlag=false;
+            if (SLConfig->useAccessUnitStartFlag)
+                Get_SB (accessUnitStartFlag,                        "accessUnitStartFlag");
+            if (SLConfig->useAccessUnitEndFlag)
+                Get_SB (accessUnitEndFlag,                          "accessUnitEndFlag");
+            if (SLConfig->OCRLength>0)
+                Get_SB (OCRflag,                                    "OCRflag");
+            if (SLConfig->useIdleFlag)
+                Get_SB (idleFlag,                                   "idleFlag");
+            if (SLConfig->usePaddingFlag)
+                Get_SB (paddingFlag,                                "paddingFlag");
+            if (paddingFlag)
+                Get_S1(3, paddingBits,                              "paddingBits");
+            if (!idleFlag && (!paddingFlag || paddingBits!=0))
+            {
+                if (SLConfig->packetSeqNumLength>0)
+                    Skip_S2(SLConfig->packetSeqNumLength,           "packetSequenceNumber");
+                if (SLConfig->degradationPriorityLength>0)
+                    Get_SB (DegPrioflag,                            "DegPrioflag");
+                if (DegPrioflag)
+                    Skip_S2(SLConfig->degradationPriorityLength,    "degradationPriority");
+                if (OCRflag)
+                    Skip_S8(SLConfig->OCRLength,                    "objectClockReference");
+                if (accessUnitStartFlag)
+                {
+                    if (SLConfig->useRandomAccessPointFlag)
+                        Skip_SB(                                    "randomAccessPointFlag");
+                    if (SLConfig->AU_seqNumLength >0)
+                        Skip_S2(SLConfig->AU_seqNumLength,          "AU_sequenceNumber");
+                    if (SLConfig->useTimeStampsFlag)
+                    {
+                        Get_SB (decodingTimeStampFlag,              "decodingTimeStampFlag");
+                        Get_SB (compositionTimeStampFlag,           "compositionTimeStampFlag");
+                    }
+                    if (SLConfig->instantBitrateLength>0)
+                        Get_SB (instantBitrateFlag,                 "instantBitrateFlag");
+                    if (decodingTimeStampFlag)
+                        Skip_S2(SLConfig->timeStampLength,          "decodingTimeStamp");
+                    if (compositionTimeStampFlag)
+                        Skip_S2(SLConfig->timeStampLength,          "compositionTimeStamp");
+                    if (SLConfig->AU_Length > 0)
+                        Skip_S2(SLConfig->AU_Length,                "accessUnitLength");
+                    if (instantBitrateFlag)
+                        Skip_S2(SLConfig->instantBitrateLength,     "instantBitrate");
+                }
             }
+            BS_End();
         }
-        BS_End();
-        Skip_XX(Element_Size-Element_Offset,                    "AAC (raw)");
-    }
+    #else //MEDIAINFO_MPEG4_YES
+        Skip_XX(Element_Size,                                       "LATM (not decoded)");
+    #endif //MEDIAINFO_MPEG4_YES
 
     //Demux
-    if (MediaInfoLib::Config.Demux_Get())
+    /*
+    if (Config_Demux)
     {
         int8u A[7];
         //TODO: Only for 24KHz stuff, should be modified... output is ADTS
@@ -2835,9 +3373,20 @@
         Demux(A, 7, ContentType_Header);
         Demux(Buffer+Buffer_Offset, (size_t)Element_Size, ContentType_MainStream);
     }
+    */
+    #if MEDIAINFO_DEMUX
+        Demux(Buffer+Buffer_Offset, (size_t)Element_Size, ContentType_MainStream);
+    #endif //MEDIAINFO_DEMUX
 
     //Parsing
-    xxx_stream_Parse(Streams[start_code], audio_stream_Count);
+    xxx_stream_Parse(Streams[stream_id], SL_packetized_stream_Count);
+    #if MEDIAINFO_DEMUX
+        if (Config->Demux_EventWasSent)
+        {
+            Demux_StreamIsBeingParsed_type=0;
+            Demux_StreamIsBeingParsed_stream_id=stream_id;
+        }
+    #endif //MEDIAINFO_DEMUX
 }
 
 //---------------------------------------------------------------------------
@@ -2845,68 +3394,145 @@
 void File_MpegPs::extension_stream()
 {
     Element_Name("With Extension");
-    Element_Info(MpegPs_stream_id_extension(stream_id_extension));
+    Element_Info1(MpegPs_stream_id_extension(stream_id_extension));
 
     if (!Streams_Extension[stream_id_extension].StreamIsRegistred)
     {
         //For TS streams, which does not have Start chunk
         if (FromTS)
         {
-            video_stream_Count=0;
-            audio_stream_Count=0;
-            private_stream_1_Count=0;
-            private_stream_2_Count=false;
-            extension_stream_Count=1;
+            if (video_stream_Count==(int8u)-1 && audio_stream_Count==(int8u)-1)
+            {
+                video_stream_Count=0;
+                audio_stream_Count=0;
+                private_stream_1_Count=0;
+                private_stream_2_Count=0;
+                extension_stream_Count=1;
+                SL_packetized_stream_Count=0;
+                Streams_Extension[stream_id_extension].stream_type=FromTS_stream_type;
+            }
+            else if (!IsSub)
+            {
+                //2 streams in the file, this can not be From TS, we have no idea of the count of streams
+                video_stream_Count=(int8u)-1;
+                audio_stream_Count=(int8u)-1;
+                private_stream_1_Count=(int8u)-1;
+                private_stream_2_Count=(int8u)-1;
+                extension_stream_Count=(int8u)-1;
+                SL_packetized_stream_Count=(int8u)-1;
+                FromTS=false;
+            }
         }
 
         //Registering
         if (!Status[IsAccepted])
             Data_Accept("MPEG-PS");
-        Streams[start_code].StreamIsRegistred=true;
-        Streams_Extension[stream_id_extension].StreamIsRegistred=true;
+        Streams[stream_id].StreamIsRegistred++;
+        Streams_Extension[stream_id_extension].StreamIsRegistred++;
         Streams_Extension[stream_id_extension].Searching_Payload=true;
         Streams_Extension[stream_id_extension].Searching_TimeStamp_Start=true;
         Streams_Extension[stream_id_extension].Searching_TimeStamp_End=true;
 
         //New parsers
-            if ((stream_id_extension>=0x55 && stream_id_extension<=0x5F)
-             || (stream_id_extension==0x75 && stream_id_extension<=0x7F))
-             Streams_Extension[stream_id_extension].Parsers.push_back(ChooseParser_VC1());
-        else if (stream_id_extension>=0x60 && stream_id_extension<=0x6F)
-             Streams_Extension[stream_id_extension].Parsers.push_back(ChooseParser_Dirac());
-        else if (stream_id_extension==0x71)
-        {
-            Streams_Extension[0x72].Parsers.clear(); //In case of HD part before Core part
-            Streams_Extension[0x71].Parsers.push_back(ChooseParser_DTS());
-            Streams_Extension[0x71].Parsers.push_back(ChooseParser_AC3());
-        }
-        else if (stream_id_extension==0x76)
-        {
-            Streams_Extension[0x72].Parsers.clear(); //In case of HD part before Core part
-            Streams_Extension[0x76].Parsers.push_back(ChooseParser_AC3());
-        }
-        else if (stream_id_extension==0x72)
-        {
-            if (Streams_Extension[0x71].Parsers.empty() && Streams_Extension[0x76].Parsers.empty())
-            {
-                Streams_Extension[0x72].Parsers.push_back(ChooseParser_DTS());
-                Streams_Extension[0x72].Parsers.push_back(ChooseParser_AC3());
-            }
-            /*
-                 if (!Streams_Extension[0x71].Parsers.empty())
-                ; //Streams_Extension[0x72].Parsers.push_back(Streams_Extension[0x71].Parsers[0]); //Binding 0x72 to 0x71 (DTS-HD)
-            else if (!Streams_Extension[0x76].Parsers.empty())
-                ; //Streams_Extension[0x72].Parsers.push_back(Streams_Extension[0x76].Parsers[0]); //Binding 0x72 to 0x76 (TrueHD)
-            else
+        if (Streams_Extension[stream_id_extension].stream_type && Streams_Extension[stream_id_extension].stream_type<0x80) //Standard
+            switch (Streams_Extension[stream_id_extension].stream_type)
             {
-                //Audio core is not yet ready, waiting
-                Skip_XX(Element_Size,                           "Waiting for core data...");
-                return;
+                case 0x0F : Streams_Extension[stream_id_extension].Parsers.push_back(ChooseParser_Adts()); break;
+                default   : ;
             }
-            */
+        else
+            switch (FromTS_format_identifier)
+            {
+                case 0x41432D33 :
+                                    Streams_Extension[stream_id_extension].Parsers.push_back(ChooseParser_AC3());
+                                    break;
+                case 0x44545331 :
+                case 0x44545332 :
+                case 0x44545333 :
+                                    Streams_Extension[stream_id_extension].Parsers.push_back(ChooseParser_DTS());
+                                    break;
+                case 0x56432D31 :
+                                    Streams_Extension[stream_id_extension].Parsers.push_back(ChooseParser_VC1());
+                                    break;
+                case 0x64726163 :
+                                    Streams_Extension[stream_id_extension].Parsers.push_back(ChooseParser_Dirac());
+                                    break;
+                default           :
+                                    switch (FromTS_program_format_identifier)
+                                    {
+                                        case 0x48444D56 :   //HDMV (BluRay)
+                                                            switch (Streams_Extension[stream_id_extension].stream_type)
+                                                            {
+                                                                case 0x81 :
+                                                                case 0x83 :
+                                                                case 0x84 :
+                                                                case 0xA1 :
+                                                                            Streams_Extension[stream_id_extension].Parsers.push_back(ChooseParser_AC3());
+                                                                            break;
+                                                                case 0x82 :
+                                                                case 0x85 :
+                                                                case 0x86 :
+                                                                case 0xA2 :
+                                                                            Streams_Extension[stream_id_extension].Parsers.push_back(ChooseParser_DTS());
+                                                                            break;
+                                                                case 0xEA :
+                                                                            Streams_Extension[stream_id_extension].Parsers.push_back(ChooseParser_VC1());
+                                                                            break;
+                                                                default   : ;
+                                                            }
+                                                            break;
+                                        default           : ;
+                                                                 if (stream_id_extension==0x00)
+                                                                {} //IPMP Control Information stream
+                                                            else if (stream_id_extension==0x01)
+                                                                {} //IPMP stream
+                                                            else if (stream_id_extension>=0x55 && stream_id_extension<=0x5F)
+                                                                 Streams_Extension[stream_id_extension].Parsers.push_back(ChooseParser_VC1());
+                                                            else if (stream_id_extension>=0x60 && stream_id_extension<=0x6F)
+                                                                 Streams_Extension[stream_id_extension].Parsers.push_back(ChooseParser_Dirac());
+                                                            else if (stream_id_extension==0x71 || stream_id_extension==0x72 || stream_id_extension==0x76)
+                                                            {
+                                                                Streams_Extension[stream_id_extension].Parsers.push_back(ChooseParser_DTS());
+                                                                Streams_Extension[stream_id_extension].Parsers.push_back(ChooseParser_AC3());
+                                                            }
+                                                            else if (stream_id_extension==0x75 && stream_id_extension<=0x7F)
+                                                                 Streams_Extension[stream_id_extension].Parsers.push_back(ChooseParser_VC1());
+                                                      }
+            }
+
+        if (Streams_Extension[stream_id_extension].Parsers.empty())
+        {
+            #if defined(MEDIAINFO_DIRAC_YES)
+                Streams_Extension[stream_id_extension].Parsers.push_back(ChooseParser_Dirac());
+            #endif
+            #if defined(MEDIAINFO_VC1_YES)
+                Streams_Extension[stream_id_extension].Parsers.push_back(ChooseParser_VC1());
+            #endif
+            #if defined(MEDIAINFO_AC3_YES)
+                Streams_Extension[stream_id_extension].Parsers.push_back(ChooseParser_AC3());
+            #endif
+            #if defined(MEDIAINFO_DTS_YES)
+                Streams_Extension[stream_id_extension].Parsers.push_back(ChooseParser_DTS());
+            #endif
         }
+
+        //In case of HD part before Core part
+        switch (stream_id_extension)
+        {
+            case 0x71 :
+            case 0x76 :
+                        for (size_t Pos=0; Pos<Streams_Extension[0x72].Parsers.size(); Pos++)
+                            delete Streams_Extension[0x72].Parsers[Pos]; //Streams_Extension[0x72].Parsers[Pos]=NULL;
+                        Streams_Extension[0x72].Parsers.clear();
+                        break;
+        }
+
+        //Init
         for (size_t Pos=0; Pos<Streams_Extension[stream_id_extension].Parsers.size(); Pos++)
+        {
+            Streams_Extension[stream_id_extension].Parsers[Pos]->CA_system_ID_MustSkipSlices=CA_system_ID_MustSkipSlices;
             Open_Buffer_Init(Streams_Extension[stream_id_extension].Parsers[Pos]);
+        }
     }
 
     //Demux
@@ -2939,12 +3565,39 @@
     if (stream_id_extension==0x72 && !(Streams_Extension[0x71].Parsers.empty() && Streams_Extension[0x76].Parsers.empty()))
     {
         if (!Streams_Extension[0x71].Parsers.empty())
+        {
             xxx_stream_Parse(Streams_Extension[0x71], extension_stream_Count);
+            #if MEDIAINFO_DEMUX
+                if (Config->Demux_EventWasSent)
+                {
+                    Demux_StreamIsBeingParsed_type=2;
+                    Demux_StreamIsBeingParsed_stream_id=0x71;
+                }
+            #endif //MEDIAINFO_DEMUX
+        }
         if (!Streams_Extension[0x76].Parsers.empty())
+        {
             xxx_stream_Parse(Streams_Extension[0x76], extension_stream_Count);
+            #if MEDIAINFO_DEMUX
+                if (Config->Demux_EventWasSent)
+                {
+                    Demux_StreamIsBeingParsed_type=2;
+                    Demux_StreamIsBeingParsed_stream_id=0x76;
+                }
+            #endif //MEDIAINFO_DEMUX
+        }
     }
     else
+    {
         xxx_stream_Parse(Streams_Extension[stream_id_extension], extension_stream_Count);
+        #if MEDIAINFO_DEMUX
+            if (Config->Demux_EventWasSent)
+            {
+                Demux_StreamIsBeingParsed_type=2;
+                Demux_StreamIsBeingParsed_stream_id=stream_id_extension;
+            }
+        #endif //MEDIAINFO_DEMUX
+    }
 }
 
 //---------------------------------------------------------------------------
@@ -2953,14 +3606,14 @@
     //AC3
         if ((stream_id_extension>=0x55 && stream_id_extension<=0x5F)
          || (stream_id_extension==0x75 && stream_id_extension<=0x7F))
-        return _T(".vc1");
+        return __T(".vc1");
     //AC3+
     else if (stream_id_extension>=0x60 && stream_id_extension<=0x6F)
-        return _T(".dirac");
+        return __T(".dirac");
     else if (stream_id_extension==0x71)
         return private_stream_1_ChooseExtension();
     else
-        return _T(".raw");
+        return __T(".raw");
 }
 
 //***************************************************************************
@@ -2968,38 +3621,39 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
-void File_MpegPs::xxx_stream_Parse(ps_stream &Temp, int8u &xxx_Count)
+void File_MpegPs::xxx_stream_Parse(ps_stream &Temp, int8u &stream_Count)
 {
-    switch (start_code)
+    switch (stream_id)
     {
         case 0xBD :
         case 0xFD :
             //PTS
-            if (PTS!=(int64u)-1)
+            if (Streams[stream_id].TimeStamp_End.PTS.TimeStamp!=(int64u)-1)
             {
-                if (Streams[start_code].Searching_TimeStamp_End)
+                if (Streams[stream_id].Searching_TimeStamp_End)
                 {
                     Temp.TimeStamp_End.PTS.File_Pos=File_Offset+Buffer_Offset;
-                    Temp.TimeStamp_End.PTS.TimeStamp=PTS;
+                    Temp.TimeStamp_End.PTS.TimeStamp=Streams[stream_id].TimeStamp_End.PTS.TimeStamp;
                 }
                 if (Searching_TimeStamp_Start && Temp.Searching_TimeStamp_Start)
                 {
-                    Temp.TimeStamp_Start.PTS.TimeStamp=PTS;
+                    Temp.TimeStamp_Start.PTS.File_Pos=File_Offset+Buffer_Offset;
+                    Temp.TimeStamp_Start.PTS.TimeStamp=Streams[stream_id].TimeStamp_End.PTS.TimeStamp;
                     Temp.Searching_TimeStamp_Start=false;
                 }
             }
 
             //DTS
-            if (DTS!=(int64u)-1)
+            if (Streams[stream_id].TimeStamp_End.DTS.TimeStamp!=(int64u)-1)
             {
-                if (Streams[start_code].Searching_TimeStamp_End)
+                if (Streams[stream_id].Searching_TimeStamp_End)
                 {
                     Temp.TimeStamp_End.DTS.File_Pos=File_Offset+Buffer_Offset;
-                    Temp.TimeStamp_End.DTS.TimeStamp=DTS;
+                    Temp.TimeStamp_End.DTS.TimeStamp=Streams[stream_id].TimeStamp_End.DTS.TimeStamp;
                 }
-                if (Searching_TimeStamp_Start && DTS!=(int64u)-1 && Temp.Searching_TimeStamp_Start)
+                if (Searching_TimeStamp_Start && Streams[stream_id].TimeStamp_End.DTS.TimeStamp!=(int64u)-1 && Temp.Searching_TimeStamp_Start)
                 {
-                    Temp.TimeStamp_Start.DTS.TimeStamp=DTS;
+                    Temp.TimeStamp_Start.DTS.TimeStamp=Streams[stream_id].TimeStamp_End.DTS.TimeStamp;
                     Temp.Searching_TimeStamp_Start=false;
                 }
             }
@@ -3014,47 +3668,44 @@
     }
 
     #if MEDIAINFO_TRACE
-        if (start_code==0xBD)
-            private_stream_1_Element_Info();
+        if (stream_id==0xBD)
+            private_stream_1_Element_Info1();
     #endif //MEDIAINFO_TRACE
 
-    if (1 //Temp.StreamKind==Stream_Video
-    && ((DTS!=(int64u)-1 && Temp.TimeStamp_End.DTS.TimeStamp!=(int64u)-1)
-      || (PTS!=(int64u)-1 && Temp.TimeStamp_End.PTS.TimeStamp!=(int64u)-1)))
-        Temp.FrameCount_AfterLast_TimeStamp_End=0;
-
     for (size_t Pos=0; Pos<Temp.Parsers.size(); Pos++)
         if (Temp.Parsers[Pos] && !Temp.Parsers[Pos]->Status[IsFinished])
         {
             //PTS/DTS
             if (Temp.Parsers[Pos]->PTS_DTS_Needed)
             {
-                if (PCR!=(int64u)-1)
-                    Temp.Parsers[Pos]->PCR=PCR;
-                if (PTS!=(int64u)-1)
-                    Temp.Parsers[Pos]->PTS=PTS*1000000/90;
-                if (DTS!=(int64u)-1)
-                    Temp.Parsers[Pos]->DTS=DTS*1000000/90;
+                if (FrameInfo.PCR!=(int64u)-1)
+                    Temp.Parsers[Pos]->FrameInfo.PCR=FrameInfo.PCR;
+                if (FrameInfo.PTS!=(int64u)-1)
+                    Temp.Parsers[Pos]->FrameInfo.PTS=FrameInfo.PTS;
+                if (FrameInfo.DTS!=(int64u)-1)
+                    Temp.Parsers[Pos]->FrameInfo.DTS=FrameInfo.DTS;
             }
 
             #if MEDIAINFO_TRACE
                 if (Temp.Parsers.size()>1)
-                    Element_Begin("Test");
+                    Element_Begin1("Test");
             #endif //MEDIAINFO_TRACE
+            #if MEDIAINFO_IBI
+                Temp.Parsers[Pos]->Ibi_SynchronizationOffset_Current=Ibi_SynchronizationOffset_Current;
+            #endif //MEDIAINFO_IBI
             Open_Buffer_Continue(Temp.Parsers[Pos], Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)(Element_Size-Element_Offset));
+            if (IsSub && Temp.Parsers[Pos]->Frame_Count_NotParsedIncluded!=(int64u)-1)
+                Frame_Count_NotParsedIncluded=Temp.Parsers[Pos]->Frame_Count_NotParsedIncluded;
+            if (!MustExtendParsingDuration && Temp.Parsers[Pos]->MustExtendParsingDuration)
+            {
+                SizeToAnalyze*=4; //Normally 4 seconds, now 16 seconds
+                MustExtendParsingDuration=true;
+            }
             #if MEDIAINFO_TRACE
                 if (Temp.Parsers.size()>1)
-                    Element_End();
+                    Element_End0();
             #endif //MEDIAINFO_TRACE
 
-            if ((Temp.Parsers[Pos]->Status[IsAccepted] && Temp.Parsers[Pos]->Status[IsFinished])
-             || (!Parsing_End_ForDTS && Temp.Parsers[Pos]->Status[IsFilled]))
-            {
-                if (MediaInfoLib::Config.ParseSpeed_Get()<1 && Temp.Parsers[Pos]->Count_Get(Stream_Video)==0) //TODO: speed improvement, we do this only for CC
-                    Temp.Searching_Payload=false;
-                if (xxx_Count>0)
-                    xxx_Count--;
-            }
             if (Temp.Parsers.size()>1)
             {
                 if (!Temp.Parsers[Pos]->Status[IsAccepted] && Temp.Parsers[Pos]->Status[IsFinished])
@@ -3075,70 +3726,108 @@
                     Temp.Parsers.push_back(Parser);
                 }
             }
-        }
-
-    if (!Temp.Parsers.empty())
-        Temp.FrameCount_AfterLast_TimeStamp_End+=Temp.Parsers[0]->Frame_Count_InThisBlock;
 
+            if (Temp.Parsers.size()==1 && !Temp.IsFilled && Temp.Parsers[0]->Status[IsFilled])
+            {
+                stream_Count--;
+                Temp.IsFilled=true;
+            }
+        }
+    //FrameInfo.PCR=(int64u)-1;
+    FrameInfo.DTS=(int64u)-1;
+    FrameInfo.PTS=(int64u)-1;
     Element_Show();
 
     #if MEDIAINFO_EVENTS
-        if (DTS==(int64u)-1)
-            DTS=PTS;
+        if (FrameInfo.DTS==(int64u)-1)
+            FrameInfo.DTS=FrameInfo.PTS;
 
         //New PES
-        if (MpegPs_PES_FirstByte_IsAvailable && MpegPs_PES_FirstByte_Value)
-        {
-            //Demux of substream data
-            if (FromTS_stream_type==0x1B && SubStream_Demux)
+        #if MEDIAINFO_DEMUX
+            if (PES_FirstByte_IsAvailable && PES_FirstByte_Value)
             {
-                if (!SubStream_Demux->Buffers.empty() && SubStream_Demux->Buffers[0]->DTS<DTS)
+                //Demux of substream data
+                if (FromTS_stream_type==0x1B && SubStream_Demux)
                 {
-                    Demux(SubStream_Demux->Buffers[0]->Buffer, SubStream_Demux->Buffers[0]->Buffer_Size, ContentType_SubStream);
-                    delete SubStream_Demux->Buffers[0]->Buffer; SubStream_Demux->Buffers[0]->Buffer=NULL;
-                    SubStream_Demux->Buffers.erase(SubStream_Demux->Buffers.begin()); //Moving 2nd Buffer to 1st position
+                    if (!SubStream_Demux->Buffers.empty() && !SubStream_Demux->Buffers.empty() && SubStream_Demux->Buffers[0] && SubStream_Demux->Buffers[0]->DTS<FrameInfo.DTS)
+                    {
+                        Demux(SubStream_Demux->Buffers[0]->Buffer, SubStream_Demux->Buffers[0]->Buffer_Size, ContentType_SubStream);
+                        delete SubStream_Demux->Buffers[0]->Buffer; SubStream_Demux->Buffers[0]->Buffer=NULL;
+                        SubStream_Demux->Buffers.erase(SubStream_Demux->Buffers.begin()); //Moving 2nd Buffer to 1st position
+                    }
                 }
             }
-        }
 
-        //Demux of SubStream
-        if (FromTS_stream_type==0x20 && SubStream_Demux)
-        {
-            //Searching an available slot
-            size_t Buffers_Pos;
-            if (SubStream_Demux->Buffers.empty() || SubStream_Demux->Buffers[SubStream_Demux->Buffers.size()-1]->DTS!=DTS)
+            //Demux of SubStream
+            if (FromTS_stream_type==0x20 && SubStream_Demux)
             {
-                Buffers_Pos=SubStream_Demux->Buffers.size();
-                SubStream_Demux->Buffers.push_back(new demux::buffer);
-            }
-            else
-            {
-                Buffers_Pos=SubStream_Demux->Buffers.size()-1;
-            }
+                //Searching an available slot
+                size_t Buffers_Pos;
+                if (SubStream_Demux->Buffers.empty() || SubStream_Demux->Buffers[SubStream_Demux->Buffers.size()-1]->DTS!=FrameInfo.DTS)
+                {
+                    Buffers_Pos=SubStream_Demux->Buffers.size();
+                    SubStream_Demux->Buffers.push_back(new demux::buffer);
+                }
+                else
+                {
+                    Buffers_Pos=SubStream_Demux->Buffers.size()-1;
+                }
 
-            //Filling buffer
-            if (SubStream_Demux->Buffers[Buffers_Pos]->Buffer==NULL)
-            {
-                SubStream_Demux->Buffers[Buffers_Pos]->DTS=DTS;
-                SubStream_Demux->Buffers[Buffers_Pos]->Buffer_Size_Max=128*1024;
-                SubStream_Demux->Buffers[Buffers_Pos]->Buffer_Size=0;
-                SubStream_Demux->Buffers[Buffers_Pos]->Buffer=new int8u[SubStream_Demux->Buffers[Buffers_Pos]->Buffer_Size_Max];
+                //Filling buffer
+                if (SubStream_Demux->Buffers[Buffers_Pos]->Buffer==NULL)
+                {
+                    SubStream_Demux->Buffers[Buffers_Pos]->DTS=FrameInfo.DTS;
+                    SubStream_Demux->Buffers[Buffers_Pos]->Buffer_Size_Max=128*1024;
+                    SubStream_Demux->Buffers[Buffers_Pos]->Buffer_Size=0;
+                    SubStream_Demux->Buffers[Buffers_Pos]->Buffer=new int8u[SubStream_Demux->Buffers[Buffers_Pos]->Buffer_Size_Max];
+                }
+                if (SubStream_Demux->Buffers[Buffers_Pos]->Buffer_Size_Max>SubStream_Demux->Buffers[Buffers_Pos]->Buffer_Size+(size_t)(Element_Size-Element_Offset) && SubStream_Demux->Buffers[Buffers_Pos]->Buffer_Size_Max<=16*1024*1024)
+                {
+                    SubStream_Demux->Buffers[Buffers_Pos]->Buffer_Size_Max*=2;
+                    int8u* Buffer_Demux=SubStream_Demux->Buffers[Buffers_Pos]->Buffer;
+                    SubStream_Demux->Buffers[Buffers_Pos]->Buffer=new int8u[SubStream_Demux->Buffers[Buffers_Pos]->Buffer_Size_Max];
+                    std::memcpy(SubStream_Demux->Buffers[Buffers_Pos]->Buffer, Buffer_Demux, SubStream_Demux->Buffers[Buffers_Pos]->Buffer_Size);
+                    delete[] Buffer_Demux; //Buffer_Demux=NULL;
+                }
+                if (SubStream_Demux->Buffers[Buffers_Pos]->Buffer_Size+(size_t)(Element_Size-Element_Offset)<=SubStream_Demux->Buffers[Buffers_Pos]->Buffer_Size_Max)
+                {
+                    std::memcpy(SubStream_Demux->Buffers[Buffers_Pos]->Buffer+SubStream_Demux->Buffers[Buffers_Pos]->Buffer_Size, Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)(Element_Size-Element_Offset));
+                    SubStream_Demux->Buffers[Buffers_Pos]->Buffer_Size+=(size_t)(Element_Size-Element_Offset);
+                }
             }
-            if (SubStream_Demux->Buffers[Buffers_Pos]->Buffer_Size_Max>SubStream_Demux->Buffers[Buffers_Pos]->Buffer_Size+(size_t)(Element_Size-Element_Offset) && SubStream_Demux->Buffers[Buffers_Pos]->Buffer_Size_Max<=16*1024*1024)
+        #endif //MEDIAINFO_DEMUX
+    #endif //MEDIAINFO_EVENTS
+
+    #if MEDIAINFO_SEEK
+        if (Seek_ID!=(int64u)-1)
+        {
+            if (Ibi.Streams[Seek_ID]->IsModified)
             {
-                SubStream_Demux->Buffers[Buffers_Pos]->Buffer_Size_Max*=2;
-                int8u* Buffer_Demux=SubStream_Demux->Buffers[Buffers_Pos]->Buffer;
-                SubStream_Demux->Buffers[Buffers_Pos]->Buffer=new int8u[SubStream_Demux->Buffers[Buffers_Pos]->Buffer_Size_Max];
-                std::memcpy(SubStream_Demux->Buffers[Buffers_Pos]->Buffer, Buffer_Demux, SubStream_Demux->Buffers[Buffers_Pos]->Buffer_Size);
-                delete[] Buffer_Demux; //Buffer_Demux=NULL;
+                Read_Buffer_Seek(2, Seek_Value, Seek_ID);
             }
-            if (SubStream_Demux->Buffers[Buffers_Pos]->Buffer_Size+(size_t)(Element_Size-Element_Offset)<=SubStream_Demux->Buffers[Buffers_Pos]->Buffer_Size_Max)
+            else if (File_Offset+Buffer_Offset>=Seek_Value_Maximal)
             {
-                std::memcpy(SubStream_Demux->Buffers[Buffers_Pos]->Buffer+SubStream_Demux->Buffers[Buffers_Pos]->Buffer_Size, Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)(Element_Size-Element_Offset));
-                SubStream_Demux->Buffers[Buffers_Pos]->Buffer_Size+=(size_t)(Element_Size-Element_Offset);
+                //No intermediate seek point found, going to previous seek point
+                for (size_t Pos=1; Pos<Ibi.Streams[Seek_ID]->Infos.size(); Pos++)
+                    if (Ibi.Streams[Seek_ID]->Infos[Pos].StreamOffset>=Seek_Value_Maximal)
+                    {
+                        if (Ibi.Streams[Seek_ID]->IsSynchronized)
+                        {
+                            //No intermediate point is possible
+                            Ibi.Streams[Seek_ID]->Infos[Pos-1].IsContinuous=true;
+                            Read_Buffer_Seek(2, Seek_Value, Seek_ID);
+                        }
+                        else
+                        {
+                            //Going to last known seek point
+                            GoTo(Ibi.Streams[Seek_ID]->Infos[Pos-1].StreamOffset);
+                            Open_Buffer_Unsynch();
+                        }
+                        break;
+                    }
             }
         }
-    #endif //MEDIAINFO_EVENTS
+    #endif //MEDIAINFO_SEEK
 }
 
 //***************************************************************************
@@ -3151,13 +3840,27 @@
     while (           Buffer_Offset+4<=Buffer_Size
       &&   CC3(Buffer+Buffer_Offset)==0x000001)
     {
-        //Getting start_code
-        int8u start_code=Buffer[Buffer_Offset+3];
+        //Getting stream_id
+        int8u stream_id=Buffer[Buffer_Offset+3];
+
+        //Trace config
+        #if MEDIAINFO_TRACE
+            if (Config_Trace_Level)
+            {
+                if (stream_id==0xC0 || stream_id==0xE0)
+                {
+                    if (!Trace_Layers[8])
+                        Trace_Layers_Update(8); //Stream
+                }
+                else
+                    Trace_Layers_Update(IsSub?1:0);
+            }
+        #endif //MEDIAINFO_TRACE
 
         //Searching start
-        if (Streams[start_code].Searching_Payload)
+        if (Streams[stream_id].Searching_Payload)
         {
-            if (start_code!=0xBD || !private_stream_1_IsDvdVideo) //Not (private_stream_1 and IsDvdVideo)
+            if (stream_id!=0xBD || !private_stream_1_IsDvdVideo) //Not (private_stream_1 and IsDvdVideo)
                 return true;
 
             //private_stream_1 and IsDvdVideo, looking for substream ID
@@ -3172,9 +3875,9 @@
         }
 
         //Searching TimeStamp_End
-        if (Streams[start_code].Searching_TimeStamp_End)
+        if (Streams[stream_id].Searching_TimeStamp_End)
         {
-            switch(start_code)
+            switch(stream_id)
             {
                 //Element with no PES Header
                 case 0xB9 : //MPEG_program_end
@@ -3217,7 +3920,7 @@
         }
 
         //Getting size
-        switch(start_code)
+        switch(stream_id)
         {
             //No size
             case 0xB9 : //MPEG_program_end
@@ -3228,7 +3931,7 @@
                     Buffer_Offset+=2;
                     while(Buffer_Offset<Buffer_Size && Buffer[Buffer_Offset]!=0x00)
                         Buffer_Offset+=2;
-                    if (Buffer_Offset<Buffer_Size && Buffer[Buffer_Offset-1]==0x00 || Buffer_Offset>=Buffer_Size)
+                    if (Buffer_Offset>=Buffer_Size || Buffer[Buffer_Offset-1]==0x00)
                         Buffer_Offset--;
                 }
                 //Parsing last bytes if needed
@@ -3282,7 +3985,7 @@
     }
 
     if (Buffer_Offset+3==Buffer_Size)
-        return false; //Sync is OK, but start_code is not available
+        return false; //Sync is OK, but stream_id is not available
     if (Buffer_Offset+4<=Buffer_Size)
         Trusted_IsNot("MPEG-PS, Synchronisation lost");
     Synched=false;
@@ -3298,25 +4001,34 @@
 {
     //Filling
     #if defined(MEDIAINFO_MPEGV_YES)
-        File_Mpegv* Handle=new File_Mpegv;
-        Handle->MPEG_Version=MPEG_Version;
-        Handle->ShouldContinueParsing=true;
+        File_Mpegv* Parser=new File_Mpegv;
+        Parser->MPEG_Version=MPEG_Version;
+        Parser->ShouldContinueParsing=true;
+        #if MEDIAINFO_DEMUX
+            if (Config->Demux_Unpacketize_Get())
+            {
+                Demux_UnpacketizeContainer=false; //No demux from this parser
+                Demux_Level=4; //Intermediate
+                Parser->Demux_Level=2; //Container
+                Parser->Demux_UnpacketizeContainer=true;
+            }
+        #endif //MEDIAINFO_DEMUX
     #else
         //Filling
-        File__Analyze* Handle=new File_Unknown();
-        Open_Buffer_Init(Handle);
-        Handle->Stream_Prepare(Stream_Video);
-        Handle->Fill(Stream_Video, 0, Video_Format, "MPEG Video");
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Video);
+        Parser->Fill(Stream_Video, 0, Video_Format, "MPEG Video");
         switch (FromTS_stream_type)
         {
-            case 0x01 : Handle->Fill(Stream_Video, 0, Video_Codec, "MPEG-1V");
-                        Handle->Fill(Stream_Video, 0, Video_Format_Version, "Version 1"); break;
-            case 0x02 : Handle->Fill(Stream_Video, 0, Video_Codec, "MPEG-2V");
-                        Handle->Fill(Stream_Video, 0, Video_Format_Version, "Version 2"); break;
-            default   : Handle->Fill(Stream_Video, 0, Video_Codec, "MPEG-V");
+            case 0x01 : Parser->Fill(Stream_Video, 0, Video_Codec, "MPEG-1V");
+                        Parser->Fill(Stream_Video, 0, Video_Format_Version, "Version 1"); break;
+            case 0x02 : Parser->Fill(Stream_Video, 0, Video_Codec, "MPEG-2V");
+                        Parser->Fill(Stream_Video, 0, Video_Format_Version, "Version 2"); break;
+            default   : Parser->Fill(Stream_Video, 0, Video_Codec, "MPEG-V");
         }
     #endif
-    return Handle;
+    return Parser;
 }
 
 //---------------------------------------------------------------------------
@@ -3324,17 +4036,26 @@
 {
     //Filling
     #if defined(MEDIAINFO_MPEG4V_YES)
-        File_Mpeg4v* Handle=new File_Mpeg4v;
-        Handle->Frame_Count_Valid=1;
+        File_Mpeg4v* Parser=new File_Mpeg4v;
+        Parser->Frame_Count_Valid=1;
+        #if MEDIAINFO_DEMUX
+            if (Config->Demux_Unpacketize_Get())
+            {
+                Demux_UnpacketizeContainer=false; //No demux from this parser
+                Demux_Level=4; //Intermediate
+                Parser->Demux_Level=2; //Container
+                Parser->Demux_UnpacketizeContainer=true;
+            }
+        #endif //MEDIAINFO_DEMUX
     #else
         //Filling
-        File__Analyze* Handle=new File_Unknown();
-        Open_Buffer_Init(Handle);
-        Handle->Stream_Prepare(Stream_Video);
-        Handle->Fill(Stream_Video, 0, Video_Codec, "MPEG-4V");
-        Handle->Fill(Stream_Video, 0, Video_Format, "MPEG-4 Visual");
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Video);
+        Parser->Fill(Stream_Video, 0, Video_Codec, "MPEG-4V");
+        Parser->Fill(Stream_Video, 0, Video_Format, "MPEG-4 Visual");
     #endif
-    return Handle;
+    return Parser;
 }
 
 //---------------------------------------------------------------------------
@@ -3342,16 +4063,25 @@
 {
     //Filling
     #if defined(MEDIAINFO_AVC_YES)
-        File_Avc* Handle=new File_Avc;
+        File_Avc* Parser=new File_Avc;
+        #if MEDIAINFO_DEMUX
+            if (Config->Demux_Unpacketize_Get())
+            {
+                Demux_UnpacketizeContainer=false; //No demux from this parser
+                Demux_Level=4; //Intermediate
+                Parser->Demux_Level=2; //Container
+                Parser->Demux_UnpacketizeContainer=true;
+            }
+        #endif //MEDIAINFO_DEMUX
     #else
         //Filling
-        File__Analyze* Handle=new File_Unknown();
-        Open_Buffer_Init(Handle);
-        Handle->Stream_Prepare(Stream_Video);
-        Handle->Fill(Stream_Video, 0, Video_Codec,  "AVC");
-        Handle->Fill(Stream_Video, 0, Video_Format, "AVC");
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Video);
+        Parser->Fill(Stream_Video, 0, Video_Codec,  "AVC");
+        Parser->Fill(Stream_Video, 0, Video_Format, "AVC");
     #endif
-    return Handle;
+    return Parser;
 }
 
 //---------------------------------------------------------------------------
@@ -3359,17 +4089,26 @@
 {
     //Filling
     #if defined(MEDIAINFO_VC1_YES)
-        File__Analyze* Handle=new File_Vc1;
-        ((File_Vc1*)Handle)->Frame_Count_Valid=30;
+        File_Vc1* Parser=new File_Vc1;
+        Parser->Frame_Count_Valid=30;
+        #if MEDIAINFO_DEMUX
+            if (Config->Demux_Unpacketize_Get())
+            {
+                Demux_UnpacketizeContainer=false; //No demux from this parser
+                Demux_Level=4; //Intermediate
+                Parser->Demux_Level=2; //Container
+                Parser->Demux_UnpacketizeContainer=true;
+            }
+        #endif //MEDIAINFO_DEMUX
     #else
         //Filling
-        File__Analyze* Handle=new File_Unknown();
-        Open_Buffer_Init(Handle);
-        Handle->Stream_Prepare(Stream_Video);
-        Handle->Fill(Stream_Video, 0, Video_Codec,  "VC-1");
-        Handle->Fill(Stream_Video, 0, Video_Format, "VC-1");
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Video);
+        Parser->Fill(Stream_Video, 0, Video_Codec,  "VC-1");
+        Parser->Fill(Stream_Video, 0, Video_Format, "VC-1");
     #endif
-    return Handle;
+    return Parser;
 }
 
 //---------------------------------------------------------------------------
@@ -3377,17 +4116,17 @@
 {
     //Filling
     #if defined(MEDIAINFO_DIRAC_YES)
-        File__Analyze* Handle=new File_Dirac;
-        ((File_Dirac*)Handle)->Frame_Count_Valid=1;
+        File__Analyze* Parser=new File_Dirac;
+        ((File_Dirac*)Parser)->Frame_Count_Valid=1;
     #else
         //Filling
-        File__Analyze* Handle=new File_Unknown();
-        Open_Buffer_Init(Handle);
-        Handle->Stream_Prepare(Stream_Video);
-        Handle->Fill(Stream_Video, 0, Video_Codec,  "Dirac");
-        Handle->Fill(Stream_Video, 0, Video_Format, "Dirac");
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Video);
+        Parser->Fill(Stream_Video, 0, Video_Codec,  "Dirac");
+        Parser->Fill(Stream_Video, 0, Video_Format, "Dirac");
     #endif
-    return Handle;
+    return Parser;
 }
 
 //---------------------------------------------------------------------------
@@ -3395,41 +4134,89 @@
 {
     //Filling
     #if defined(MEDIAINFO_MPEGA_YES)
-        File_Mpega* Handle=new File_Mpega;
-        Handle->Frame_Count_Valid=1;
+        File_Mpega* Parser=new File_Mpega;
+        Parser->Frame_Count_Valid=1;
+        #if MEDIAINFO_DEMUX
+            if (Config->Demux_Unpacketize_Get())
+            {
+                Demux_UnpacketizeContainer=false; //No demux from this parser
+                Demux_Level=4; //Intermediate
+                Parser->Demux_Level=2; //Container
+                Parser->Demux_UnpacketizeContainer=true;
+            }
+        #endif //MEDIAINFO_DEMUX
     #else
         //Filling
-        File__Analyze* Handle=new File_Unknown();
-        Open_Buffer_Init(Handle);
-        Handle->Stream_Prepare(Stream_Audio);
-        Handle->Fill(Stream_Audio, 0, Audio_Format, "MPEG Audio");
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Audio);
+        Parser->Fill(Stream_Audio, 0, Audio_Format, "MPEG Audio");
         switch (FromTS_stream_type)
         {
-            case 0x03 : Handle->Fill(Stream_Audio, 0, Audio_Codec,  "MPEG-1A");
-                        Handle->Fill(Stream_Audio, 0, Audio_Format_Version, "Version 1"); break;
-            case 0x04 : Handle->Fill(Stream_Audio, 0, Audio_Codec,  "MPEG-2A");
-                        Handle->Fill(Stream_Audio, 0, Audio_Format_Version, "Version 2"); break;
-            default   : Handle->Fill(Stream_Audio, 0, Audio_Codec,  "MPEG-A"); break;
+            case 0x03 : Parser->Fill(Stream_Audio, 0, Audio_Codec,  "MPEG-1A");
+                        Parser->Fill(Stream_Audio, 0, Audio_Format_Version, "Version 1"); break;
+            case 0x04 : Parser->Fill(Stream_Audio, 0, Audio_Codec,  "MPEG-2A");
+                        Parser->Fill(Stream_Audio, 0, Audio_Format_Version, "Version 2"); break;
+            default   : Parser->Fill(Stream_Audio, 0, Audio_Codec,  "MPEG-A"); break;
         }
     #endif
-    return Handle;
+    return Parser;
 }
 
 //---------------------------------------------------------------------------
 File__Analyze* File_MpegPs::ChooseParser_Adts()
 {
     //Filling
-    #if defined(MEDIAINFO_ADTS_YES)
-        File__Analyze* Handle=new File_Adts;
+    #if defined(MEDIAINFO_AAC_YES)
+        File_Aac* Parser=new File_Aac;
+        Parser->Mode=File_Aac::Mode_ADTS;
+        #if MEDIAINFO_DEMUX
+            if (Config->Demux_Unpacketize_Get())
+            {
+                Demux_UnpacketizeContainer=false; //No demux from this parser
+                Demux_Level=4; //Intermediate
+                Parser->Demux_Level=2; //Container
+                Parser->Demux_UnpacketizeContainer=true;
+            }
+        #endif //MEDIAINFO_DEMUX
+    #else
+        //Filling
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Audio);
+        Parser->Fill(Stream_Audio, 0, Audio_Codec,  "AAC");
+        Parser->Fill(Stream_Audio, 0, Audio_Format, "AAC");
+        Parser->Fill(Stream_Audio, 0, Audio_MuxingMode, "ADTS");
+    #endif
+    return Parser;
+}
+
+//---------------------------------------------------------------------------
+File__Analyze* File_MpegPs::ChooseParser_Latm()
+{
+    //Filling
+    #if defined(MEDIAINFO_AAC_YES)
+        File_Aac* Parser=new File_Aac;
+        Parser->Mode=File_Aac::Mode_LATM;
+        #if MEDIAINFO_DEMUX
+            if (Config->Demux_Unpacketize_Get())
+            {
+                Demux_UnpacketizeContainer=false; //No demux from this parser
+                Demux_Level=4; //Intermediate
+                Parser->Demux_Level=2; //Container
+                Parser->Demux_UnpacketizeContainer=true;
+            }
+        #endif //MEDIAINFO_DEMUX
     #else
         //Filling
-        File__Analyze* Handle=new File_Unknown();
-        Open_Buffer_Init(Handle);
-        Handle->Stream_Prepare(Stream_Audio);
-        Handle->Fill(Stream_Audio, 0, Audio_Codec,  "AAC");
-        Handle->Fill(Stream_Audio, 0, Audio_Format, "AAC");
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Audio);
+        Parser->Fill(Stream_Audio, 0, Audio_Codec,  "AAC");
+        Parser->Fill(Stream_Audio, 0, Audio_Format, "AAC");
+        Parser->Fill(Stream_Audio, 0, Audio_MuxingMode, "LATM");
     #endif
-    return Handle;
+    return Parser;
 }
 
 //---------------------------------------------------------------------------
@@ -3437,17 +4224,26 @@
 {
     //Filling
     #if defined(MEDIAINFO_AC3_YES)
-        File_Ac3* Handle=new File_Ac3();
-        Handle->Frame_Count_Valid=2; //2 frames to be sure
+        File_Ac3* Parser=new File_Ac3();
+        Parser->Frame_Count_Valid=2; //2 frames to be sure
+        #if MEDIAINFO_DEMUX
+            if (Config->Demux_Unpacketize_Get())
+            {
+                Demux_UnpacketizeContainer=false; //No demux from this parser
+                Demux_Level=4; //Intermediate
+                Parser->Demux_Level=2; //Container
+                Parser->Demux_UnpacketizeContainer=true;
+            }
+        #endif //MEDIAINFO_DEMUX
     #else
         //Filling
-        File__Analyze* Handle=new File_Unknown();
-        Open_Buffer_Init(Handle);
-        Handle->Stream_Prepare(Stream_Audio);
-        Handle->Fill(Stream_Audio, 0, Audio_Format, private_stream_1_ID==0x83?"E-AC-3":"AC-3");
-        Handle->Fill(Stream_Audio, 0, Audio_Codec, private_stream_1_ID==0x83?"AC3+":"AC3");
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Audio);
+        Parser->Fill(Stream_Audio, 0, Audio_Format, private_stream_1_ID==0x83?"E-AC-3":"AC-3");
+        Parser->Fill(Stream_Audio, 0, Audio_Codec, private_stream_1_ID==0x83?"AC3+":"AC3");
     #endif
-    return Handle;
+    return Parser;
 }
 
 //---------------------------------------------------------------------------
@@ -3455,17 +4251,26 @@
 {
     //Filling
     #if defined(MEDIAINFO_DTS_YES)
-        File__Analyze* Handle=new File_Dts();
-        ((File_Dts*)Handle)->Frame_Count_Valid=2;
+        File__Analyze* Parser=new File_Dts();
+        ((File_Dts*)Parser)->Frame_Count_Valid=2;
+        #if MEDIAINFO_DEMUX
+            if (Config->Demux_Unpacketize_Get())
+            {
+                Demux_UnpacketizeContainer=false; //No demux from this parser
+                Demux_Level=4; //Intermediate
+                Parser->Demux_Level=2; //Container
+                Parser->Demux_UnpacketizeContainer=true;
+            }
+        #endif //MEDIAINFO_DEMUX
     #else
         //Filling
-        File__Analyze* Handle=new File_Unknown();
-        Open_Buffer_Init(Handle);
-        Handle->Stream_Prepare(Stream_Audio);
-        Handle->Fill(Stream_Audio, 0, Audio_Format, "DTS");
-        Handle->Fill(Stream_Audio, 0, Audio_Codec, "DTS");
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Audio);
+        Parser->Fill(Stream_Audio, 0, Audio_Format, "DTS");
+        Parser->Fill(Stream_Audio, 0, Audio_Codec, "DTS");
     #endif
-    return Handle;
+    return Parser;
 }
 
 //---------------------------------------------------------------------------
@@ -3474,37 +4279,45 @@
     //Filling
     #if defined(MEDIAINFO_SDDS_YES)
         //Filling
-        File__Analyze* Handle=new File_Unknown();
-        Open_Buffer_Init(Handle);
-        Handle->Stream_Prepare(Stream_Audio);
-        Handle->Fill(Stream_Audio, StreamPos_Last, Audio_Format, "SDDS");
-        Handle->Fill(Stream_Audio, StreamPos_Last, Audio_Codec,  "SDDS");
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Audio);
+        Parser->Fill(Stream_Audio, StreamPos_Last, Audio_Format, "SDDS");
+        Parser->Fill(Stream_Audio, StreamPos_Last, Audio_Codec,  "SDDS");
     #else
         //Filling
-        File__Analyze* Handle=new File_Unknown();
-        Handle->Stream_Prepare(Stream_Audio);
-        Handle->Fill(Stream_Audio, 0, Audio_Format, "SDDS");
-        Handle->Fill(Stream_Audio, 0, Audio_Codec,  "SDDS");
+        File__Analyze* Parser=new File_Unknown();
+        Parser->Stream_Prepare(Stream_Audio);
+        Parser->Fill(Stream_Audio, 0, Audio_Format, "SDDS");
+        Parser->Fill(Stream_Audio, 0, Audio_Codec,  "SDDS");
     #endif
-    return Handle;
+    return Parser;
 }
 
 //---------------------------------------------------------------------------
 File__Analyze* File_MpegPs::ChooseParser_AAC()
 {
     //Filling
-    #if defined(MEDIAINFO_ADTS_YES)
-        //Filling
-        File__Analyze* Handle=new File_Aac();
+    #if defined(MEDIAINFO_AAC_YES)
+        File_Aac* Parser=new File_Aac;
+        #if MEDIAINFO_DEMUX
+            if (Config->Demux_Unpacketize_Get())
+            {
+                Demux_UnpacketizeContainer=false; //No demux from this parser
+                Demux_Level=4; //Intermediate
+                Parser->Demux_Level=2; //Container
+                Parser->Demux_UnpacketizeContainer=true;
+            }
+        #endif //MEDIAINFO_DEMUX
     #else
         //Filling
-        File__Analyze* Handle=new File_Unknown();
-        Open_Buffer_Init(Handle);
-        Handle->Stream_Prepare(Stream_Audio);
-        Handle->Fill(Stream_Audio, 0, Audio_Format, "AAC");
-        Handle->Fill(Stream_Audio, 0, Audio_Codec,  "AAC");
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Audio);
+        Parser->Fill(Stream_Audio, 0, Audio_Format, "AAC");
+        Parser->Fill(Stream_Audio, 0, Audio_Codec,  "AAC");
     #endif
-    return Handle;
+    return Parser;
 }
 
 //---------------------------------------------------------------------------
@@ -3512,24 +4325,34 @@
 {
     //Filling
     #if defined(MEDIAINFO_PCM_YES)
-        File__Analyze* Handle=new File_Pcm();
+        File_Pcm* Parser=new File_Pcm();
+        Parser->IsRawPcm=false;
         Ztring Codec;
-        switch (private_stream_1_ID)
+        switch (FromTS_stream_type)
         {
-            case 0x80 : Codec=_T("M2TS"); break;
-            case 0x83 : Codec=_T("EVOB"); break;
-            default   : Codec=_T("VOB");
+            case 0x80 : Codec=__T("M2TS"); break;
+            case 0x83 : Codec=__T("EVOB"); break;
+            default   : Codec=__T("VOB");
         }
-        ((File_Pcm*)Handle)->Codec=Codec;
+        ((File_Pcm*)Parser)->Codec=Codec;
+        #if MEDIAINFO_DEMUX
+            if (Config->Demux_Unpacketize_Get())
+            {
+                Demux_UnpacketizeContainer=false; //No demux from this parser
+                Demux_Level=4; //Intermediate
+                Parser->Demux_Level=2; //Container
+                Parser->Demux_UnpacketizeContainer=true;
+            }
+        #endif //MEDIAINFO_DEMUX
     #else
         //Filling
-        File__Analyze* Handle=new File_Unknown();
-        Open_Buffer_Init(Handle);
-        Handle->Stream_Prepare(Stream_Audio);
-        Handle->Fill(Stream_Audio, 0, Audio_Format, "PCM");
-        Handle->Fill(Stream_Audio, 0, Audio_Codec,  "PCM");
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Audio);
+        Parser->Fill(Stream_Audio, 0, Audio_Format, "PCM");
+        Parser->Fill(Stream_Audio, 0, Audio_Codec,  "PCM");
     #endif
-    return Handle;
+    return Parser;
 }
 
 //---------------------------------------------------------------------------
@@ -3537,16 +4360,59 @@
 {
     //Filling
     #if defined(MEDIAINFO_RLE_YES)
-        File__Analyze* Handle=new File_Rle();
+        File__Analyze* Parser=new File_Rle();
+    #else
+        //Filling
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Text);
+        Parser->Fill(Stream_Text, 0, Text_Format, "RLE");
+        Parser->Fill(Stream_Text, 0, Text_Codec,  "RLE");
+    #endif
+    return Parser;
+}
+
+//---------------------------------------------------------------------------
+File__Analyze* File_MpegPs::ChooseParser_DvbSubtitle()
+{
+    //Filling
+    #if defined(MEDIAINFO_DVBSUBTITLE_YES)
+        File__Analyze* Parser=new File_DvbSubtitle();
+        #if MEDIAINFO_DEMUX
+            if (Config->Demux_Unpacketize_Get())
+            {
+                Demux_UnpacketizeContainer=false; //No demux from this parser
+                Demux_Level=4; //Intermediate
+                Parser->Demux_Level=2; //Container
+                Parser->Demux_UnpacketizeContainer=true;
+            }
+        #endif //MEDIAINFO_DEMUX
+    #else
+        //Filling
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Text);
+        Parser->Fill(Stream_Text, 0, Text_Format, "DVB Subtitle");
+        Parser->Fill(Stream_Text, 0, Text_Codec,  "DVB Subtitle");
+    #endif
+    return Parser;
+}
+
+//---------------------------------------------------------------------------
+File__Analyze* File_MpegPs::ChooseParser_Teletext()
+{
+    //Filling
+    #if defined(MEDIAINFO_TELETEXT_YES)
+        File__Analyze* Parser=new File_Teletext();
     #else
         //Filling
-        File__Analyze* Handle=new File_Unknown();
-        Open_Buffer_Init(Handle);
-        Handle->Stream_Prepare(Stream_Text);
-        Handle->Fill(Stream_Text, 0, Text_Format, "RLE");
-        Handle->Fill(Stream_Text, 0, Text_Codec,  "RLE");
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Text);
+        Parser->Fill(Stream_Text, 0, Text_Format, "Teletext");
+        Parser->Fill(Stream_Text, 0, Text_Codec,  "Teletext");
     #endif
-    return Handle;
+    return Parser;
 }
 
 //---------------------------------------------------------------------------
@@ -3554,16 +4420,16 @@
 {
     //Filling
     #if defined(MEDIAINFO_PGS_YES)
-        File__Analyze* Handle=new File_Pgs();
+        File__Analyze* Parser=new File_Pgs();
     #else
         //Filling
-        File__Analyze* Handle=new File_Unknown();
-        Open_Buffer_Init(Handle);
-        Handle->Stream_Prepare(Stream_Text);
-        Handle->Fill(Stream_Text, 0, Text_Format, "PGS");
-        Handle->Fill(Stream_Text, 0, Text_Codec,  "PGS");
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Text);
+        Parser->Fill(Stream_Text, 0, Text_Format, "PGS");
+        Parser->Fill(Stream_Text, 0, Text_Codec,  "PGS");
     #endif
-    return Handle;
+    return Parser;
 }
 
 //---------------------------------------------------------------------------
@@ -3571,16 +4437,26 @@
 {
     //Filling
     #if defined(MEDIAINFO_AES3_YES)
-        File__Analyze* Handle=new File_Aes3();
+        File_Aes3* Parser=new File_Aes3();
+        Parser->From_MpegPs=true;
+        #if MEDIAINFO_DEMUX
+            if (Config->Demux_Unpacketize_Get())
+            {
+                Demux_UnpacketizeContainer=false; //No demux from this parser
+                Demux_Level=4; //Intermediate
+                Parser->Demux_Level=2; //Container
+                Parser->Demux_UnpacketizeContainer=true;
+            }
+        #endif //MEDIAINFO_DEMUX
     #else
         //Filling
-        File__Analyze* Handle=new File_Unknown();
-        Open_Buffer_Init(Handle);
-        Handle->Stream_Prepare(Stream_Audio);
-        Handle->Fill(Stream_Audio, 0, Audio_Format, "AES3");
-        Handle->Fill(Stream_Audio, 0, Audio_Codec,  "AES3");
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Audio);
+        Parser->Fill(Stream_Audio, 0, Audio_Format, "AES3");
+        Parser->Fill(Stream_Audio, 0, Audio_Codec,  "AES3");
     #endif
-    return Handle;
+    return Parser;
 }
 
 //---------------------------------------------------------------------------
@@ -3588,23 +4464,23 @@
 {
     //Filling
     #if defined(MEDIAINFO_PS2A_YES)
-        File__Analyze* Handle=new File_Ps2Audio();
+        File__Analyze* Parser=new File_Ps2Audio();
     #else
         //Filling
-        File__Analyze* Handle=new File_Unknown();
-        Open_Buffer_Init(Handle);
-        Handle->Stream_Prepare(Stream_Audio);
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Audio);
     #endif
-    return Handle;
+    return Parser;
 }
 
 //---------------------------------------------------------------------------
 File__Analyze* File_MpegPs::ChooseParser_NULL()
 {
     //Filling
-    //File__Analyze* Handle=new File__Analyze();
-    //return Handle;
-    return NULL;
+    File__Analyze* Parser=new File_Unknown();
+    Open_Buffer_Init(Parser);
+    return Parser;
 }
 
 //***************************************************************************
@@ -3640,6 +4516,3 @@
 } //Namespace
 
 #endif //MEDIAINFO_MPEGPS_YES
-
-
-

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_MpegPs.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_MpegPs.h Changed

@@ -1,17 +1,17 @@
 // File_Mpeg - Info for MPEG files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -51,7 +51,7 @@
     int8u  MPEG_Version;                //MPEG Version (or automaticly detected)
     bool   Searching_TimeStamp_Start;
     #ifdef MEDIAINFO_MPEG4_YES
-        File_Mpeg4_Descriptors::decspecificinfotag* DecSpecificInfoTag;
+        File__Analyze* ParserFromTs;
         File_Mpeg4_Descriptors::slconfig* SLConfig;
     #endif
     #if MEDIAINFO_DEMUX
@@ -90,7 +90,12 @@
             }
         };
         demux* SubStream_Demux;
+        int8u Demux_StreamIsBeingParsed_type;
+        int8u Demux_StreamIsBeingParsed_stream_id;
     #endif //MEDIAINFO_DEMUX
+    #if MEDIAINFO_SEEK
+        int64u Unsynch_Frame_Count_Temp;
+    #endif //MEDIAINFO_SEEK
 
     //Out
     bool   HasTimeStamps;
@@ -113,17 +118,21 @@
     void Synched_Init();
 
     //Buffer - Global
+    void Read_Buffer_Init ();
     void Read_Buffer_Unsynched();
+    #if MEDIAINFO_SEEK
+    size_t Read_Buffer_Seek (size_t Method, int64u Value, int64u ID);
+    #endif //MEDIAINFO_SEEK
     void Read_Buffer_Continue ();
+    void Read_Buffer_AfterParsing();
 
     //Buffer - Per element
     void Header_Parse();
     bool Header_Parse_Fill_Size();
-    void Header_Parse_PES_packet(int8u start_code);
-    void Header_Parse_PES_packet_MPEG1(int8u start_code);
-    void Header_Parse_PES_packet_MPEG2(int8u start_code);
+    bool Header_Parse_PES_packet(int8u stream_id);
+    void Header_Parse_PES_packet_MPEG1(int8u stream_id);
+    void Header_Parse_PES_packet_MPEG2(int8u stream_id);
     void Data_Parse();
-    void Detect_EOF();
     bool BookMark_Needed();
 
     //Packet
@@ -143,7 +152,9 @@
     bool           private_stream_1_Choose_DVD_ID();
     File__Analyze* private_stream_1_ChooseParser();
     const ZenLib::Char* private_stream_1_ChooseExtension();
-    void           private_stream_1_Element_Info();
+    #if MEDIAINFO_TRACE
+    void           private_stream_1_Element_Info1();
+    #endif //MEDIAINFO_TRACE
     int8u          private_stream_1_ID;
     size_t         private_stream_1_Offset;
     bool           private_stream_1_IsDvdVideo;
@@ -159,8 +170,9 @@
     int8u video_stream_Count;
     int8u audio_stream_Count;
     int8u private_stream_1_Count;
-    bool  private_stream_2_Count;
+    int8u private_stream_2_Count;
     int8u extension_stream_Count;
+    int8u SL_packetized_stream_Count;
 
     //From packets
     int32u program_mux_rate;
@@ -189,27 +201,33 @@
         stream_t       StreamKind;
         size_t         StreamPos;
         int8u          stream_type;
+        int32u         program_format_identifier;
+        int32u         format_identifier;
+        int8u          descriptor_tag;
         int8u          DVD_Identifier;
         std::vector<File__Analyze*> Parsers; //Sometimes, we need to do parallel tests
         Mpeg_TimeStamp TimeStamp_Start;
         Mpeg_TimeStamp TimeStamp_End;
-        bool           StreamIsRegistred;
+        size_t         StreamIsRegistred;
         bool           Searching_Payload;
         bool           Searching_TimeStamp_Start;
         bool           Searching_TimeStamp_End;
-        size_t         FrameCount_AfterLast_TimeStamp_End;
+        bool           IsFilled;
 
         ps_stream()
         {
             StreamKind=Stream_Max;
             StreamPos=0;
             stream_type=0;
+            program_format_identifier=0x00000000; //No info
+            format_identifier=0x00000000; //No info
+            descriptor_tag=0x00; //No info
             DVD_Identifier=0;
-            StreamIsRegistred=false;
+            StreamIsRegistred=0;
             Searching_Payload=false;
             Searching_TimeStamp_Start=false;
             Searching_TimeStamp_End=false;
-            FrameCount_AfterLast_TimeStamp_End=0;
+            IsFilled=false;
         }
 
         ~ps_stream()
@@ -221,20 +239,14 @@
     std::vector<ps_stream> Streams;
     std::vector<ps_stream> Streams_Private1; //There can have multiple streams in one private stream
     std::vector<ps_stream> Streams_Extension; //There can have multiple streams in one private stream
-    int8u start_code;
+    int8u stream_id;
 
     //Temp
     int64u SizeToAnalyze; //Total size of a chunk to analyse, it may be changed by the parser
     int8u  stream_id_extension;
     bool   video_stream_Unlimited;
     int16u Buffer_DataSizeToParse;
-    int64u PTS;
-    int64u DTS;
-    bool   Parsing_End_ForDTS;
     std::vector<int64u> video_stream_PTS;
-    size_t video_stream_PTS_FrameCount;
-    bool video_stream_PTS_MustAddOffset;
-    bool Demux_Unpacketize;
 
     //Helpers
     bool Header_Parser_QuickSearch();
@@ -247,6 +259,7 @@
     File__Analyze* ChooseParser_Dirac();
     File__Analyze* ChooseParser_Mpega();
     File__Analyze* ChooseParser_Adts();
+    File__Analyze* ChooseParser_Latm();
     File__Analyze* ChooseParser_AC3();
     File__Analyze* ChooseParser_DTS();
     File__Analyze* ChooseParser_SDDS();
@@ -254,23 +267,39 @@
     File__Analyze* ChooseParser_PCM();
     File__Analyze* ChooseParser_AES3();
     File__Analyze* ChooseParser_RLE();
+    File__Analyze* ChooseParser_DvbSubtitle();
     File__Analyze* ChooseParser_PGS();
+    File__Analyze* ChooseParser_Teletext();
     File__Analyze* ChooseParser_PS2();
     File__Analyze* ChooseParser_NULL();
 
     //File__Analyze helpers
-    void Streams_Fill_PerStream(size_t StreamID, ps_stream &Temp);
-    void Streams_Finish_PerStream(size_t StreamID, ps_stream &Temp);
-    void xxx_stream_Parse(ps_stream &Temp, int8u &xxx_Count);
+    enum kindofstream
+    {
+        KindOfStream_Main,
+        KindOfStream_Private,
+        KindOfStream_Extension,
+    };
+    void Streams_Fill_PerStream(size_t StreamID, ps_stream &Temp, kindofstream KindOfStream);
+    void Streams_Finish_PerStream(size_t StreamID, ps_stream &Temp, kindofstream KindOfStream);
+    void xxx_stream_Parse(ps_stream &Temp, int8u &stream_Count);
 
     //Output buffer
     size_t Output_Buffer_Get (const String &Value);
     size_t Output_Buffer_Get (size_t Pos);
+
+    #if MEDIAINFO_SEEK
+        std::map<int16u, int64u>    Unsynch_Frame_Counts;
+        int64u                      Seek_Value;
+        int64u                      Seek_Value_Maximal;
+        int64u                      Seek_ID;
+        bool                        Duration_Detected;
+    #endif //MEDIAINFO_SEEK
+    #if MEDIAINFO_SEEK && MEDIAINFO_IBI
+        ibi Ibi;
+    #endif //MEDIAINFO_SEEK && MEDIAINFO_IBI
 };
 
 } //NameSpace
 
 #endif
-
-
-

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_MpegTs.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_MpegTs.cpp Changed

@@ -1,31 +1,35 @@
 // File_Mpegts - Info for MPEG Transport Stream files
-// Copyright (C) 2006-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2006-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_MPEGTS_YES)
 //---------------------------------------------------------------------------
 
@@ -43,6 +47,12 @@
     #include "MediaInfo/MediaInfo_Config_MediaInfo.h"
     #include "MediaInfo/MediaInfo_Events_Internal.h"
 #endif //MEDIAINFO_EVENTS
+#if MEDIAINFO_IBI
+    #if MEDIAINFO_SEEK
+        #include "MediaInfo/Multiple/File_Ibi.h"
+    #endif //MEDIAINFO_SEEK
+    #include "MediaInfo/Multiple/File_Ibi_Creation.h"
+#endif //MEDIAINFO_IBI
 using namespace std;
 //---------------------------------------------------------------------------
 
@@ -58,6 +68,12 @@
     const int32u HDMV=0x48444D56; //BluRay
 }
 
+
+#if !MEDIAINFO_ADVANCED
+    const float64   Config_VbrDetection_Delta=0;
+    const int64u    Config_VbrDetection_Occurences=4;
+#endif // MEDIAINFO_ADVANCED
+
 //***************************************************************************
 // Depends of configuration
 //***************************************************************************
@@ -91,14 +107,16 @@
 extern const char* Mpeg_Descriptors_stream_Codec(int8u descriptor_tag, int32u format_identifier);
 extern stream_t    Mpeg_Descriptors_stream_Kind(int8u descriptor_tag, int32u format_identifier);
 
+extern const char* Mpeg_Descriptors_CA_system_ID(int16u CA_system_ID);
+
 //---------------------------------------------------------------------------
 Ztring Decimal_Hexa(int64u Number)
 {
     Ztring Temp;
     Temp.From_Number(Number);
-    Temp+=_T(" (0x");
+    Temp+=__T(" (0x");
     Temp+=Ztring::ToZtring(Number, 16);
-    Temp+=_T(")");
+    Temp+=__T(")");
     return Temp;
 }
 
@@ -108,17 +126,26 @@
 
 //---------------------------------------------------------------------------
 File_MpegTs::File_MpegTs()
+#if MEDIAINFO_DUPLICATE
 :File__Duplicate()
+#endif //MEDIAINFO_DUPLICATE
 {
     //Configuration
-    ParserName=_T("MpegTs");
+    ParserName=__T("MpegTs");
     #if MEDIAINFO_EVENTS
         ParserIDs[0]=MediaInfo_Parser_MpegTs;
         StreamIDs_Width[0]=4;
     #endif //MEDIAINFO_EVENTS
+    #if MEDIAINFO_DEMUX
+        Demux_Level=4; //Intermediate
+    #endif //MEDIAINFO_DEMUX
     MustSynchronize=true;
     Buffer_TotalBytes_FirstSynched_Max=64*1024;
+    Buffer_TotalBytes_Fill_Max=(int64u)-1; //Disabling this feature for this format, this is done in the parser
     Trusted_Multiplier=2;
+    #if MEDIAINFO_DEMUX
+        Demux_EventWasSent_Accept_Specific=true;
+    #endif //MEDIAINFO_DEMUX
 
     //Internal config
     #if defined(MEDIAINFO_BDAV_YES)
@@ -127,12 +154,21 @@
     #if defined(MEDIAINFO_TSP_YES)
         TSP_Size=0; //No TSP footer
     #endif
-    
+
     //Data
     MpegTs_JumpTo_Begin=MediaInfoLib::Config.MpegTs_MaximumOffset_Get();
-    MpegTs_JumpTo_End=16*1024*1024;
+    MpegTs_JumpTo_End=32*1024*1024;
     Searching_TimeStamp_Start=true;
     Complete_Stream=NULL;
+    Begin_MaxDuration=MediaInfoLib::Config.ParseSpeed_Get()>=0.8?(int64u)-1:MediaInfoLib::Config.MpegTs_MaximumScanDuration_Get()*27/1000;
+    ForceStreamDisplay=MediaInfoLib::Config.MpegTs_ForceStreamDisplay_Get();
+
+    #if MEDIAINFO_SEEK
+        Seek_Value=(int64u)-1;
+        Seek_ID=(int64u)-1;
+        InfiniteLoop_Detect=0;
+        Duration_Detected=false;
+    #endif //MEDIAINFO_SEEK
 }
 
 File_MpegTs::~File_MpegTs ()
@@ -145,65 +181,187 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
-void File_MpegTs::Streams_Fill()
+void File_MpegTs::Streams_Accept()
 {
-    if (Complete_Stream==NULL || Complete_Stream->Streams.empty())
-        return; //Not initialized
+    Fill(Stream_General, 0, General_Format, BDAV_Size?"BDAV":(TSP_Size?"MPEG-TS 188+16":"MPEG-TS"), Unlimited, true, true);
+
+    #if MEDIAINFO_DEMUX
+        if (Config->NextPacket_Get() && Config->Event_CallBackFunction_IsSet())
+            Config->Demux_EventWasSent=true;
+    #endif //MEDIAINFO_DEMUX
+}
+
+//---------------------------------------------------------------------------
+void File_MpegTs::Streams_Fill ()
+{
+    Status[User_20]=true;
+}
 
+//---------------------------------------------------------------------------
+void File_MpegTs::Streams_Update()
+{
+    if (Status[User_19])
+        Streams_Update_Programs();
+
+    if (Status[User_18])
+        Streams_Update_EPG();
+
+    #ifdef MEDIAINFO_MPEGTS_PCR_YES
+        if (Status[User_16])
+        {
+            Streams_Update_Duration_Update();
+
+            //Bit rate mode
+            bool IsVbr=false;
+            bool IsCbr=false;
+            #if MEDIAINFO_ADVANCED
+                int64u  TimeStamp_Distance_Min=(int64u)-1;
+                int64u  TimeStamp_Distance_Max=0;
+                int64u  TimeStamp_Distance_Total=0;
+                size_t  TimeStamp_Distance_Count=0;
+            #endif // MEDIAINFO_ADVANCED
+            for (std::map<int16u, int16u>::iterator PCR_PID=Complete_Stream->PCR_PIDs.begin(); PCR_PID!=Complete_Stream->PCR_PIDs.end(); PCR_PID++)
+                if (Complete_Stream->Streams[PCR_PID->first])
+                {
+                    if (Complete_Stream->Streams[PCR_PID->first]->TimeStamp_InstantaneousBitRate_BitRateMode_IsVbr>=Config_VbrDetection_Occurences)
+                        IsVbr=true;
+                    if (Complete_Stream->Streams[PCR_PID->first]->TimeStamp_InstantaneousBitRate_BitRateMode_IsCbr)
+                        IsCbr=true;
+                    #if MEDIAINFO_ADVANCED
+                    TimeStamp_Distance_Total+=Complete_Stream->Streams[PCR_PID->first]->TimeStamp_Distance_Total;
+                    TimeStamp_Distance_Count+=Complete_Stream->Streams[PCR_PID->first]->TimeStamp_Distance_Count;
+                    if (TimeStamp_Distance_Min>Complete_Stream->Streams[PCR_PID->first]->TimeStamp_Distance_Min)
+                        TimeStamp_Distance_Min=Complete_Stream->Streams[PCR_PID->first]->TimeStamp_Distance_Min;
+                    if (TimeStamp_Distance_Max<Complete_Stream->Streams[PCR_PID->first]->TimeStamp_Distance_Max)
+                        TimeStamp_Distance_Max=Complete_Stream->Streams[PCR_PID->first]->TimeStamp_Distance_Max;
+                    #endif // MEDIAINFO_ADVANCED
+                }
+            Clear(Stream_General, 0, General_OverallBitRate_Mode);
+            if (IsVbr)
+                Fill(Stream_General, 0, General_OverallBitRate_Mode, "VBR");
+            else if (IsCbr)
+                Fill(Stream_General, 0, General_OverallBitRate_Mode, "CBR");
+            #if MEDIAINFO_ADVANCED
+                if (TimeStamp_Distance_Max<270000000) //TODO: there are some errors in some files, why?
+                {
+                    if (TimeStamp_Distance_Count)
+                    {
+                        Fill(Stream_General, 0, "PCR_Distance_Average", ((float64)TimeStamp_Distance_Total)/27000000/TimeStamp_Distance_Count, 9);
+                        (*Stream_More)[Stream_General][0](Ztring().From_Local("PCR_Distance_Average"), Info_Options)=__T("N NT");
+                    }
+                    if (TimeStamp_Distance_Min!=(int64u)-1)
+                    {
+                        Fill(Stream_General, 0, "PCR_Distance_Min", ((float64)TimeStamp_Distance_Min)/27000000, 9);
+                        (*Stream_More)[Stream_General][0](Ztring().From_Local("PCR_Distance_Min"), Info_Options)=__T("N NT");
+                    }
+                    if (TimeStamp_Distance_Max)
+                    {
+                        Fill(Stream_General, 0, "PCR_Distance_Max", ((float64)TimeStamp_Distance_Max)/27000000, 9);
+                        (*Stream_More)[Stream_General][0](Ztring().From_Local("PCR_Distance_Max"), Info_Options)=__T("N NT");
+                    }
+                }
+            #endif // MEDIAINFO_ADVANCED
+        }
+    #endif //MEDIAINFO_MPEGTS_PCR_YES
+
+    if (Status[User_17])
+        Streams_Update_Duration_End();
+
+    if (File_Name.empty() && Config->ParseSpeed>=1.0)
+        Fill(Stream_General, 0, General_FileSize, (File_Offset+Buffer_Offset!=File_Size)?Buffer_TotalBytes:File_Size, 10, true);
+}
+
+//---------------------------------------------------------------------------
+void File_MpegTs::Streams_Update_Programs()
+{
     //Per stream
-    for (int16u PID=0; PID<0x2000; PID++)
-        Streams_Fill_PerStream(PID, Complete_Stream->Streams[PID]);
+    bool PerStream_AlwaysParse=ForceStreamDisplay;
+    if (!PerStream_AlwaysParse)
+    {
+        size_t Programs_Size=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs.size();
+        PerStream_AlwaysParse=true;
+        if (Programs_Size<=2)
+        {
+            //Testing if it is a Blu-ray
+            for (complete_stream::transport_stream::programs::iterator Program=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs.begin(); Program!=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs.end(); Program++)
+                if (Program->first!=0x0000 && Program->second.registration_format_identifier!=Elements::HDMV)
+                    {
+                        PerStream_AlwaysParse=false;
+                        break;
+                    }
+        }
+    }
+    for (std::set<int16u>::iterator StreamID=Complete_Stream->PES_PIDs.begin(); StreamID!=Complete_Stream->PES_PIDs.end(); StreamID++)
+        if (PerStream_AlwaysParse || Complete_Stream->Streams[*StreamID]->IsUpdated_IsRegistered || Complete_Stream->Streams[*StreamID]->IsUpdated_Info)
+        {
+            Streams_Update_Programs_PerStream(*StreamID);
+            Complete_Stream->Streams[*StreamID]->IsUpdated_IsRegistered=false;
+            Complete_Stream->Streams[*StreamID]->IsUpdated_Info=false;
+        }
 
     //Fill General
-    Fill(Stream_General, 0, General_Format, BDAV_Size?"BDAV":(TSP_Size?"MPEG-TS 188+16":"MPEG-TS"), Unlimited, true, true);
     if (Complete_Stream->transport_stream_id_IsValid)
     {
-        Fill(Stream_General, 0, General_ID, Complete_Stream->transport_stream_id, 16);
-        Fill(Stream_General, 0, General_ID_String, /*Decimal_Hexa(*/Complete_Stream->transport_stream_id/*)*/, 16, true);
+        Fill(Stream_General, 0, General_ID, Complete_Stream->transport_stream_id, 10, true);
+        Fill(Stream_General, 0, General_ID_String, Decimal_Hexa(Complete_Stream->transport_stream_id), true);
     }
     if (!Complete_Stream->network_name.empty())
-        Fill(Stream_General, 0, General_NetworkName, Complete_Stream->network_name);
+    {
+        Fill(Stream_General, 0, General_NetworkName, Complete_Stream->network_name, true);
+        Complete_Stream->network_name.clear();
+    }
     if (!Complete_Stream->original_network_name.empty())
-        Fill(Stream_General, 0, General_OriginalNetworkName, Complete_Stream->original_network_name);
+    {
+        Fill(Stream_General, 0, General_OriginalNetworkName, Complete_Stream->original_network_name, true);
+        Complete_Stream->original_network_name.clear();
+    }
     Ztring Countries;
     Ztring TimeZones;
     for (std::map<Ztring, Ztring>::iterator TimeZone=Complete_Stream->TimeZones.begin(); TimeZone!=Complete_Stream->TimeZones.end(); TimeZone++)
     {
-        Countries+=TimeZone->first+_T(" / ");
-        TimeZones+=TimeZone->second+_T(" / ");
+        Countries+=TimeZone->first+__T(" / ");
+        TimeZones+=TimeZone->second+__T(" / ");
     }
     if (!Countries.empty())
     {
         Countries.resize(Countries.size()-3);
-        Fill(Stream_General, 0, General_Country, Countries);
+        Fill(Stream_General, 0, General_Country, Countries, true);
+        Complete_Stream->TimeZones.clear();
     }
     if (!TimeZones.empty())
     {
         TimeZones.resize(TimeZones.size()-3);
-        Fill(Stream_General, 0, General_TimeZone, TimeZones);
+        Fill(Stream_General, 0, General_TimeZone, TimeZones, true);
+        Complete_Stream->TimeZones.clear();
     }
     if (!Complete_Stream->Duration_Start.empty())
-        Fill(Stream_General, 0, General_Duration_Start, Complete_Stream->Duration_Start);
+    {
+        Fill(Stream_General, 0, General_Duration_Start, Complete_Stream->Duration_Start, true);
+        Complete_Stream->Duration_Start.clear();
+    }
     complete_stream::transport_streams::iterator Transport_Stream=Complete_Stream->transport_stream_id_IsValid?Complete_Stream->Transport_Streams.find(Complete_Stream->transport_stream_id):Complete_Stream->Transport_Streams.end();
     if (Transport_Stream!=Complete_Stream->Transport_Streams.end())
     {
         //TS info
         for (std::map<std::string, ZenLib::Ztring>::iterator Info=Transport_Stream->second.Infos.begin(); Info!=Transport_Stream->second.Infos.end(); Info++)
-            Fill(Stream_General, 0, Info->first.c_str(), Info->second);
+            Fill(Stream_General, 0, Info->first.c_str(), Info->second, true);
+        Transport_Stream->second.Infos.clear();
 
         //Per source (ATSC)
-        std::map<Ztring, Ztring> EPGs;
-        complete_stream::sources::iterator Source=Complete_Stream->Sources.find(Transport_Stream->second.source_id);
-        if (Source!=Complete_Stream->Sources.end())
+        if (Transport_Stream->second.source_id_IsValid)
         {
-            if (!Source->second.texts.empty())
+            complete_stream::sources::iterator Source=Complete_Stream->Sources.find(Transport_Stream->second.source_id);
+            if (Source!=Complete_Stream->Sources.end())
             {
-                Ztring Texts;
-                for (std::map<int16u, Ztring>::iterator text=Source->second.texts.begin(); text!=Source->second.texts.end(); text++)
-                    Texts+=text->second+_T(" - ");
-                if (!Texts.empty())
-                    Texts.resize(Texts.size()-3);
-                Fill(Stream_General, 0, General_ServiceProvider, Texts);
+                if (!Source->second.texts.empty())
+                {
+                    Ztring Texts;
+                    for (std::map<int16u, Ztring>::iterator text=Source->second.texts.begin(); text!=Source->second.texts.end(); text++)
+                        Texts+=text->second+__T(" - ");
+                    if (!Texts.empty())
+                        Texts.resize(Texts.size()-3);
+                    Fill(Stream_General, 0, General_ServiceProvider, Texts);
+                }
             }
         }
 
@@ -212,342 +370,658 @@
         {
             if (Program->second.IsParsed)
             {
-                //Per PID
-                Ztring Languages, Codecs, Formats, StreamKinds, StreamPoss, elementary_PIDs, elementary_PIDs_String, Delay, Duration;
+                //Per pid
+                Ztring Languages, Codecs, Formats, StreamKinds, StreamPoss, elementary_PIDs, elementary_PIDs_String, Delay;
                 for (size_t Pos=0; Pos<Program->second.elementary_PIDs.size(); Pos++)
                 {
                     int16u elementary_PID=Program->second.elementary_PIDs[Pos];
-                    if (Complete_Stream->Streams[elementary_PID].IsRegistered && Retrieve(Stream_Menu, StreamPos_Last, "KLV_PID").To_int16u()!=elementary_PID)
+                    if (((PerStream_AlwaysParse && Complete_Stream->Streams[elementary_PID]->StreamKind!=Stream_Max)
+                      || Complete_Stream->Streams[elementary_PID]->IsRegistered)
+                     && Retrieve(Stream_Menu, StreamPos_Last, "KLV_PID").To_int16u()!=elementary_PID)
                     {
-                        Ztring Format=Retrieve(Complete_Stream->Streams[elementary_PID].StreamKind, Complete_Stream->Streams[elementary_PID].StreamPos, Fill_Parameter(Complete_Stream->Streams[elementary_PID].StreamKind, Generic_Format));
-                        Formats+=Format+_T(" / ");
-                        Codecs+=Retrieve(Complete_Stream->Streams[elementary_PID].StreamKind, Complete_Stream->Streams[elementary_PID].StreamPos, Fill_Parameter(Complete_Stream->Streams[elementary_PID].StreamKind, Generic_Codec))+_T(" / ");
-                        if (Complete_Stream->Streams[elementary_PID].StreamKind!=Stream_Max)
-                        {
-                            StreamKinds+=Ztring::ToZtring(Complete_Stream->Streams[elementary_PID].StreamKind);
-                            StreamPoss+=Ztring::ToZtring(Complete_Stream->Streams[elementary_PID].StreamPos);
-                        }
-                        StreamKinds+=_T(" / ");
-                        StreamPoss+=_T(" / ");
-                        elementary_PIDs+=Ztring::ToZtring(elementary_PID)+_T(" / ");
-                        Ztring Language=Retrieve(Complete_Stream->Streams[elementary_PID].StreamKind, Complete_Stream->Streams[elementary_PID].StreamPos, "Language/String");
-                        Languages+=Language+_T(" / ");
+                        Ztring Format=Retrieve(Complete_Stream->Streams[elementary_PID]->StreamKind, Complete_Stream->Streams[elementary_PID]->StreamPos, Fill_Parameter(Complete_Stream->Streams[elementary_PID]->StreamKind, Generic_Format));
+                        Formats+=Format+__T(" / ");
+                        Codecs+=Retrieve(Complete_Stream->Streams[elementary_PID]->StreamKind, Complete_Stream->Streams[elementary_PID]->StreamPos, Fill_Parameter(Complete_Stream->Streams[elementary_PID]->StreamKind, Generic_Codec))+__T(" / ");
+                        if (Complete_Stream->Streams[elementary_PID]->StreamKind!=Stream_Max)
+                        {
+                            StreamKinds+=Ztring::ToZtring(Complete_Stream->Streams[elementary_PID]->StreamKind);
+                            StreamPoss+=Ztring::ToZtring(Complete_Stream->Streams[elementary_PID]->StreamPos);
+                        }
+                        StreamKinds+=__T(" / ");
+                        StreamPoss+=__T(" / ");
+                        elementary_PIDs+=Ztring::ToZtring(elementary_PID)+__T(" / ");
+                        Ztring Language=Retrieve(Complete_Stream->Streams[elementary_PID]->StreamKind, Complete_Stream->Streams[elementary_PID]->StreamPos, "Language/String");
+                        Languages+=Language+__T(" / ");
                         Ztring List_String=Decimal_Hexa(elementary_PID);
-                        List_String+=_T(" (");
+                        List_String+=__T(" (");
                         List_String+=Format;
                         if (!Language.empty())
                         {
-                            List_String+=_T(", ");
+                            List_String+=__T(", ");
                             List_String+=Language;
                         }
-                        List_String+=_T(")");
-                        elementary_PIDs_String+=List_String+_T(" / ");
+                        List_String+=__T(")");
+                        elementary_PIDs_String+=List_String+__T(" / ");
 
-                        if (Complete_Stream->Streams[elementary_PID].IsPCR)
+                        if (Complete_Stream->Streams[elementary_PID]->IsPCR)
                         {
-                            Delay=Ztring::ToZtring(((float64)Complete_Stream->Streams[elementary_PID].TimeStamp_Start)/27000, 6);
-                            Duration=Ztring::ToZtring(((float64)(Complete_Stream->Streams[elementary_PID].TimeStamp_End-Complete_Stream->Streams[elementary_PID].TimeStamp_Start))/27000, 6);
+                            Delay=Ztring::ToZtring(((float64)Complete_Stream->Streams[elementary_PID]->TimeStamp_Start)/27000, 6);
                         }
                     }
                 }
 
-                if (!Transport_Stream->second.Programs.empty()
-                 && (Transport_Stream->second.Programs.size()>1
-                  || !Transport_Stream->second.Programs.begin()->second.Infos.empty()
-                  || !Transport_Stream->second.Programs.begin()->second.DVB_EPG_Blocks.empty()
-                  || Complete_Stream->Sources.find(Transport_Stream->second.Programs.begin()->second.source_id)!=Complete_Stream->Sources.end()
-                  || Config->File_MpegTs_ForceMenu_Get()))
+                if (Program->second.Update_Needed_Info || Program->second.Update_Needed_IsRegistered || Program->second.Update_Needed_StreamCount || Program->second.Update_Needed_StreamPos)
                 {
-                    if (Program->second.StreamPos==(size_t)-1)
+                    if (!Transport_Stream->second.Programs.empty()
+                     && (Transport_Stream->second.Programs.size()>1
+                      || !Transport_Stream->second.Programs.begin()->second.Infos.empty()
+                      || !Transport_Stream->second.Programs.begin()->second.DVB_EPG_Blocks.empty()
+                      || (Transport_Stream->second.Programs.begin()->second.source_id_IsValid && Complete_Stream->Sources.find(Transport_Stream->second.Programs.begin()->second.source_id)!=Complete_Stream->Sources.end())
+                      || Config->File_MpegTs_ForceMenu_Get()))
                     {
-                        Stream_Prepare(Stream_Menu);
-                        Program->second.StreamPos=StreamPos_Last;
-                    }
-                    else
-                        StreamPos_Last=Program->second.StreamPos;
-                    Fill(Stream_Menu, StreamPos_Last, Menu_ID, Program->second.pid);
-                    Fill(Stream_Menu, StreamPos_Last, Menu_ID_String, Decimal_Hexa(Program->second.pid), true);
-                    Fill(Stream_Menu, StreamPos_Last, Menu_MenuID, Program->first);
-                    Fill(Stream_Menu, StreamPos_Last, Menu_MenuID_String, Decimal_Hexa(Program->first));
-                    for (std::map<std::string, ZenLib::Ztring>::iterator Info=Program->second.Infos.begin(); Info!=Program->second.Infos.end(); Info++)
-                        Fill(Stream_Menu, StreamPos_Last, Info->first.c_str(), Info->second);
-
-                    if (!Formats.empty())
-                        Formats.resize(Formats.size()-3);
-                    Fill(Stream_Menu, StreamPos_Last, Menu_Format, Formats);
-                    if (!Codecs.empty())
-                        Codecs.resize(Codecs.size()-3);
-                    Fill(Stream_Menu, StreamPos_Last, Menu_Codec, Codecs);
-                    if (!StreamKinds.empty())
-                        StreamKinds.resize(StreamKinds.size()-3);
-                    Fill(Stream_Menu, StreamPos_Last, Menu_List_StreamKind, StreamKinds);
-                    if (!elementary_PIDs_String.empty())
-                        elementary_PIDs_String.resize(elementary_PIDs_String.size()-3);
-                    Fill(Stream_Menu, StreamPos_Last, Menu_List_String, elementary_PIDs_String);
-                    if (!elementary_PIDs.empty())
-                        elementary_PIDs.resize(elementary_PIDs.size()-3);
-                    Fill(Stream_Menu, StreamPos_Last, Menu_List, elementary_PIDs);
-                    if (!StreamPoss.empty())
-                        StreamPoss.resize(StreamPoss.size()-3);
-                    Fill(Stream_Menu, StreamPos_Last, Menu_List_StreamPos, StreamPoss);
-                    if (!Languages.empty())
-                        Languages.resize(Languages.size()-3);
-                    Fill(Stream_Menu, StreamPos_Last, Menu_Language, Languages);
+                        if (Program->second.StreamPos==(size_t)-1)
+                        {
+                            size_t StreamPos=(size_t)-1;
+                            for (size_t program_number=0; program_number<Complete_Stream->program_number_Order.size(); program_number++)
+                                if (Program->first<Complete_Stream->program_number_Order[program_number])
+                                {
+                                    StreamPos=program_number;
+                                    for (size_t program_number2=program_number; program_number2<Complete_Stream->program_number_Order.size(); program_number2++)
+                                        Transport_Stream->second.Programs[Complete_Stream->program_number_Order[program_number2]].StreamPos++;
+                                    Complete_Stream->program_number_Order.insert(Complete_Stream->program_number_Order.begin()+program_number, Program->first);
+                                    break;
+                                }
+                            if (StreamPos==(size_t)-1)
+                            {
+                                Complete_Stream->program_number_Order.push_back(Program->first);
+                            }
 
-                    //Fill(Stream_Menu, StreamPos_Last, Menu_Duration, Duration);
+                            Stream_Prepare(Stream_Menu, StreamPos);
+                            Program->second.StreamPos=StreamPos_Last;
+                        }
+                        else
+                            StreamPos_Last=Program->second.StreamPos;
+                        Fill(Stream_Menu, StreamPos_Last, Menu_ID, Program->second.pid, 10, true);
+                        Fill(Stream_Menu, StreamPos_Last, Menu_ID_String, Decimal_Hexa(Program->second.pid), true);
+                        Fill(Stream_Menu, StreamPos_Last, Menu_MenuID, Program->first, 10, true);
+                        Fill(Stream_Menu, StreamPos_Last, Menu_MenuID_String, Decimal_Hexa(Program->first), true);
+                        for (std::map<std::string, ZenLib::Ztring>::iterator Info=Program->second.Infos.begin(); Info!=Program->second.Infos.end(); Info++)
+                            Fill(Stream_Menu, StreamPos_Last, Info->first.c_str(), Info->second, true);
+                        Program->second.Infos.clear();
+
+                        if (!Formats.empty())
+                            Formats.resize(Formats.size()-3);
+                        Fill(Stream_Menu, StreamPos_Last, Menu_Format, Formats, true);
+                        if (!Codecs.empty())
+                            Codecs.resize(Codecs.size()-3);
+                        Fill(Stream_Menu, StreamPos_Last, Menu_Codec, Codecs, true);
+                        if (!StreamKinds.empty())
+                            StreamKinds.resize(StreamKinds.size()-3);
+                        Fill(Stream_Menu, StreamPos_Last, Menu_List_StreamKind, StreamKinds, true);
+                        if (!elementary_PIDs_String.empty())
+                            elementary_PIDs_String.resize(elementary_PIDs_String.size()-3);
+                        Fill(Stream_Menu, StreamPos_Last, Menu_List_String, elementary_PIDs_String, true);
+                        if (!elementary_PIDs.empty())
+                            elementary_PIDs.resize(elementary_PIDs.size()-3);
+                        Fill(Stream_Menu, StreamPos_Last, Menu_List, elementary_PIDs, true);
+                        if (!StreamPoss.empty())
+                            StreamPoss.resize(StreamPoss.size()-3);
+                        Fill(Stream_Menu, StreamPos_Last, Menu_List_StreamPos, StreamPoss, true);
+                        if (!Languages.empty())
+                            Languages.resize(Languages.size()-3);
+                        Fill(Stream_Menu, StreamPos_Last, Menu_Language, Languages, true);
+                    }
                 }
 
                 //Delay
-                if (Count_Get(Stream_Menu)==0)
+                if (Program->second.Update_Needed_IsRegistered)
                 {
-                    Fill(Stream_General, 0, General_Delay, Delay);
-                }
-                if (Count_Get(Stream_Menu)>0)
-                {
-                    Fill(Stream_Menu, StreamPos_Last, Menu_Delay, Delay);
+                    switch (Count_Get(Stream_Menu))
+                    {
+                        case 0 : Fill(Stream_General, 0, General_Delay, Delay, true); break;
+                        default: Fill(Stream_Menu, StreamPos_Last, Menu_Delay, Delay, true); break;
+                    }
+                    Program->second.Update_Needed_IsRegistered=false;
                 }
                 if (Count_Get(Stream_Menu)==2)
-                {
                     Clear(Stream_General, 0, General_Delay); //Not valid, multiple menus
-                }
             }
         }
     }
 
-    //Forcing updates (not done before because Status[IsFilled] was not set)
-    PSI_EPG_Update();
-    if (Complete_Stream->Duration_End_IsUpdated)
-        PSI_Duration_End_Update();
-    #ifdef MEDIAINFO_MPEGTS_PCR_YES
-        for (pid=0; pid<0x2000; pid++)
-            if (Complete_Stream->Streams[pid].IsPCR && Complete_Stream->Streams[pid].TimeStamp_End!=(int64u)-1)
-                Header_Parse_AdaptationField_Duration_Update();
-    #endif //MEDIAINFO_MPEGTS_PCR_YES
+    //Commercial name
+    if (Count_Get(Stream_Video)==1
+     && Count_Get(Stream_Audio)==1
+     && Retrieve(Stream_Video, 0, Video_Format)==__T("MPEG Video")
+     && Retrieve(Stream_Video, 0, Video_Format_Commercial_IfAny).find(__T("HDV"))==0
+     && Retrieve(Stream_Audio, 0, Audio_Format)==__T("MPEG Audio")
+     && Retrieve(Stream_Audio, 0, Audio_Format_Version)==__T("Version 1")
+     && Retrieve(Stream_Audio, 0, Audio_Format_Profile)==__T("Layer 2")
+     && Retrieve(Stream_Audio, 0, Audio_BitRate)==__T("384000"))
+        Fill(Stream_General, 0, General_Format_Commercial_IfAny, Retrieve(Stream_Video, 0, Video_Format_Commercial_IfAny));
 }
 
 //---------------------------------------------------------------------------
-void File_MpegTs::Streams_Fill_PerStream(int16u PID, complete_stream::stream &Temp)
+void File_MpegTs::Streams_Update_Programs_PerStream(size_t StreamID)
 {
-    //Only PES
-    if (Temp.Kind!=complete_stream::stream::pes)
-        return;
+    complete_stream::stream* Temp=Complete_Stream->Streams[StreamID];
 
     //No direct handling of Sub streams;
-    if (Temp.stream_type==0x20 && Temp.SubStream_pid) //Stereoscopic is not alone
+    if (Temp->stream_type==0x20 && Temp->SubStream_pid) //Stereoscopic is not alone
         return;
 
-    //By the parser
-    StreamKind_Last=Stream_Max;
-    if (Temp.Parser && Temp.Parser->Status[IsAccepted])
-    {
-        Fill(Temp.Parser);
-        if (Temp.SubStream_pid!=0x0000) //With a substream
-            Fill(Complete_Stream->Streams[Temp.SubStream_pid].Parser);
-        if (Temp.Parser->Count_Get(Stream_Video) && Temp.Parser->Count_Get(Stream_Text))
-        {
-            //Special case: Video and Text are together
-            Stream_Prepare(Stream_Video);
-            Merge(*Temp.Parser, Stream_Video, 0, StreamPos_Last);
+    //Merging from a previous merge
+    size_t Count;
+    if (Temp->StreamKind!=Stream_Max)
+    {
+        Count=1; //TODO: more than 1
+        Merge(*Temp->Parser, Temp->StreamKind, 0, Temp->StreamPos);
+        StreamKind_Last=Temp->StreamKind;
+        StreamPos_Last=Temp->StreamPos;
+    }
+    else
+    {
+        //By the parser
+        StreamKind_Last=Stream_Max;
+        Count=0;
+        if (Temp->Parser && Temp->Parser->Status[IsAccepted])
+        {
+            if (Temp->SubStream_pid!=0x0000) //With a substream
+                Fill(Complete_Stream->Streams[Temp->SubStream_pid]->Parser);
+            if (Temp->Parser->Count_Get(Stream_Video) && Temp->Parser->Count_Get(Stream_Text))
+            {
+                //Special case: Video and Text are together
+                Stream_Prepare(Stream_Video);
+                Count=Merge(*Temp->Parser, Stream_Video, 0, StreamPos_Last);
+            }
+            else
+                Count=Merge(*Temp->Parser);
+
+            //More from the FMC parser
+            if (Temp->FMC_ES_ID_IsValid)
+            {
+                complete_stream::transport_stream::iod_ess::iterator IOD_ES=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].IOD_ESs.find(Temp->FMC_ES_ID);
+                if (IOD_ES!=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].IOD_ESs.end() && IOD_ES->second.Parser)
+                {
+                    Finish(IOD_ES->second.Parser);
+                    Count=Merge(*IOD_ES->second.Parser, StreamKind_Last, StreamPos_Last, 0);
+                }
+            }
+
+            //LATM
+            complete_stream::transport_stream::iod_ess::iterator IOD_ES=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].IOD_ESs.find(Complete_Stream->Streams[StreamID]->FMC_ES_ID);
+            #ifdef MEDIAINFO_MPEG4_YES
+                if (IOD_ES!=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].IOD_ESs.end() && IOD_ES->second.SLConfig && Retrieve(Stream_Audio, StreamPos_Last, Audio_MuxingMode).empty())
+                    Fill(Stream_Audio, StreamPos_Last, Audio_MuxingMode, "SL");
+            #endif
+            if (Complete_Stream->Streams[StreamID]->stream_type==0x11 && Retrieve(Stream_Audio, StreamPos_Last, Audio_MuxingMode).empty())
+                Fill(Stream_Audio, StreamPos_Last, Audio_MuxingMode, "LATM");
+        }
+
+        //By the descriptors
+        if (StreamKind_Last==Stream_Max && Complete_Stream->transport_stream_id_IsValid && !Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs.empty())
+        {
+            int32u format_identifier=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[Temp->program_numbers[0]].registration_format_identifier;
+            if (Temp->IsRegistered
+             && Mpeg_Descriptors_registration_format_identifier_StreamKind(format_identifier)!=Stream_Max)
+            {
+                StreamKind_Last=Mpeg_Descriptors_registration_format_identifier_StreamKind(format_identifier);
+                Stream_Prepare(StreamKind_Last);
+                Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Format), Mpeg_Descriptors_registration_format_identifier_Format(format_identifier));
+                Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Codec), Mpeg_Descriptors_registration_format_identifier_Format(format_identifier));
+                Count=1;
+            }
         }
-        else
-            Merge(*Temp.Parser);
 
-        //More from the FMC parser
-        if (Temp.FMC_ES_ID_IsValid)
+        //By the stream_type
+        if (StreamKind_Last==Stream_Max && Complete_Stream->transport_stream_id_IsValid && !Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs.empty())
         {
-            complete_stream::transport_stream::iod_ess::iterator IOD_ES=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].IOD_ESs.find(Temp.FMC_ES_ID);
-            if (IOD_ES!=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].IOD_ESs.end() && IOD_ES->second.Parser)
+            int32u format_identifier=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[Temp->program_numbers[0]].registration_format_identifier;
+            if (Mpeg_Psi_stream_type_StreamKind(Temp->stream_type, format_identifier)!=Stream_Max && (Temp->IsRegistered || ForceStreamDisplay || format_identifier==Elements::HDMV))
             {
-                Finish(IOD_ES->second.Parser);
-                Merge(*IOD_ES->second.Parser, StreamKind_Last, StreamPos_Last, 0);
+                StreamKind_Last=Mpeg_Psi_stream_type_StreamKind(Temp->stream_type, format_identifier);
+                if (StreamKind_Last==Stream_General && Temp->Parser) //Only information, no streams
+                {
+                    Merge (*Temp->Parser, Stream_General, 0, 0);
+                    StreamKind_Last=Stream_Max;
+                }
+                Stream_Prepare(StreamKind_Last);
+                Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Format), Mpeg_Psi_stream_type_Format(Temp->stream_type, format_identifier));
+                Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Codec), Mpeg_Psi_stream_type_Codec(Temp->stream_type, format_identifier));
+                Count=1;
             }
         }
-    }
 
-    //By the descriptors
-    if (StreamKind_Last==Stream_Max && Complete_Stream->transport_stream_id_IsValid)
-    {
-        int32u format_identifier=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[Temp.program_numbers[0]].registration_format_identifier;
-        if (Temp.IsRegistered
-         && Mpeg_Descriptors_registration_format_identifier_StreamKind(format_identifier)!=Stream_Max)
+        //By the StreamKind
+        if (StreamKind_Last==Stream_Max && Temp->StreamKind_FromDescriptor!=Stream_Max && (Temp->IsRegistered || ForceStreamDisplay || Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[Temp->program_numbers[0]].registration_format_identifier==Elements::HDMV))
         {
-            StreamKind_Last=Mpeg_Descriptors_registration_format_identifier_StreamKind(format_identifier);
-            Stream_Prepare(StreamKind_Last);
-            Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Format), Mpeg_Descriptors_registration_format_identifier_Format(format_identifier));
-            Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Codec), Mpeg_Descriptors_registration_format_identifier_Format(format_identifier));
+            Stream_Prepare(Temp->StreamKind_FromDescriptor);
+            Count=1;
         }
     }
 
-    //By the stream_type
-    if (StreamKind_Last==Stream_Max && Complete_Stream->transport_stream_id_IsValid)
+    //More info
+    if (StreamKind_Last!=Stream_Max)
     {
-        int32u format_identifier=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[Temp.program_numbers[0]].registration_format_identifier;
-        if ((Temp.IsRegistered ||  format_identifier==Elements::HDMV) && Mpeg_Psi_stream_type_StreamKind(Temp.stream_type, format_identifier)!=Stream_Max)
+        for (size_t StreamPos=StreamPos_Last+1-Count; StreamPos<=StreamPos_Last; StreamPos++)
         {
-            StreamKind_Last=Mpeg_Psi_stream_type_StreamKind(Temp.stream_type, format_identifier);
-            if (StreamKind_Last==Stream_General && Temp.Parser) //Only information, no streams
+            Temp->StreamKind=StreamKind_Last;
+            Temp->StreamPos=StreamPos;
+
+            //Encryption
+            if (Temp->CA_system_ID)
+                Fill(StreamKind_Last, StreamPos, "Encryption", Mpeg_Descriptors_CA_system_ID(Temp->CA_system_ID));
+            else if (Temp->IsScrambled>16)
+                Fill(StreamKind_Last, StreamPos, "Encryption", "Encrypted");
+
+            //TS info
+            for (std::map<std::string, ZenLib::Ztring>::iterator Info=Temp->Infos.begin(); Info!=Temp->Infos.end(); Info++)
             {
-                Merge (*Temp.Parser, Stream_General, 0, 0);
-                StreamKind_Last=Stream_Max;
+                if (Retrieve(StreamKind_Last, StreamPos, Info->first.c_str()).empty())
+                    Fill(StreamKind_Last, StreamPos, Info->first.c_str(), Info->second, true);
             }
-            Stream_Prepare(StreamKind_Last);
-            Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Format), Mpeg_Psi_stream_type_Format(Temp.stream_type, format_identifier));
-            Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Codec), Mpeg_Psi_stream_type_Codec(Temp.stream_type, format_identifier));
-        }
-    }
+            Temp->Infos.clear();
 
-    //By the StreamKind
-    if (StreamKind_Last==Stream_Max && Temp.StreamKind!=Stream_Max && Temp.IsRegistered)
-    {
-        Stream_Prepare(Temp.StreamKind);
-    }
+            //Common
+            if (Temp->SubStream_pid!=0x0000) //Wit a substream
+            {
+                Ztring Format_Profile=Retrieve(Stream_Video, StreamPos, Video_Format_Profile);
+                Fill(Stream_Video, StreamPos, Video_ID, Ztring::ToZtring(Temp->SubStream_pid)+__T(" / ")+Ztring::ToZtring(StreamID), true);
+                Fill(Stream_Video, StreamPos, Video_ID_String, Decimal_Hexa(Temp->SubStream_pid)+__T(" / ")+Decimal_Hexa(StreamID), true);
+                if (!Format_Profile.empty() && Complete_Stream->Streams[Temp->SubStream_pid] && Complete_Stream->Streams[Temp->SubStream_pid]->Parser)
+                    Fill(Stream_Video, StreamPos, Video_Format_Profile, Complete_Stream->Streams[Temp->SubStream_pid]->Parser->Retrieve(Stream_Video, 0, Video_Format_Profile)+__T(" / ")+Format_Profile, true);
+            }
+            else if (Count>1)
+            {
+                Ztring ID=Retrieve(StreamKind_Last, StreamPos, General_ID);
+                Ztring ID_String=Retrieve(StreamKind_Last, StreamPos, General_ID_String);
+                Fill(StreamKind_Last, StreamPos, General_ID, Ztring::ToZtring(StreamID)+__T('-')+ID, true);
+                Fill(StreamKind_Last, StreamPos, General_ID_String, Decimal_Hexa(StreamID)+__T('-')+ID_String, true);
+            }
+            else
+            {
+                Fill(StreamKind_Last, StreamPos, General_ID, StreamID, 10, true);
+                Fill(StreamKind_Last, StreamPos, General_ID_String, Decimal_Hexa(StreamID), true);
+            }
+            for (size_t Pos=0; Pos<Temp->program_numbers.size(); Pos++)
+            {
+                Fill(StreamKind_Last, StreamPos, General_MenuID, Temp->program_numbers[Pos], 10, Pos==0);
+                Fill(StreamKind_Last, StreamPos, General_MenuID_String, Decimal_Hexa(Temp->program_numbers[Pos]), Pos==0);
+            }
+
+            //Special cases
+            if (StreamKind_Last==Stream_Video && Temp->Parser && Temp->Parser->Count_Get(Stream_Text))
+            {
+            }
+        }
 
-    //More info
-    if (StreamKind_Last!=Stream_Max) //Found
-    {
         //Special cases
-        if (StreamKind_Last==Stream_Text && Temp.Parser && Temp.Parser->Count_Get(Stream_Video))
+        if (Temp->Parser && Temp->Parser->Count_Get(Stream_Video) && Temp->Parser->Count_Get(Stream_Text))
         {
-            StreamKind_Last=Stream_Video;
-            StreamPos_Last=Count_Get(Stream_Video)-1;
-        }
+            //Video and Text are together
+            size_t Text_Count=Temp->Parser->Count_Get(Stream_Text);
+            for (size_t Text_Pos=0; Text_Pos<Text_Count; Text_Pos++)
+            {
+                Ztring Parser_ID=Temp->Parser->Retrieve(Stream_Text, Text_Pos, Text_ID);
+                if (Parser_ID.find(__T('-'))!=string::npos)
+                    Parser_ID.erase(Parser_ID.begin(), Parser_ID.begin()+Parser_ID.find(__T('-'))+1);
+                Ztring ID=Retrieve(Stream_Video, Temp->StreamPos, Video_ID)+__T('-')+Parser_ID;
+                Ztring ID_String=Retrieve(Stream_Video, Temp->StreamPos, Video_ID_String)+__T('-')+Parser_ID;
+                StreamPos_Last=(size_t)-1;
+                for (size_t Pos=0; Pos<Count_Get(Stream_Text); Pos++)
+                    if (Retrieve(Stream_Text, Pos, Text_ID)==ID && Retrieve(Stream_Video, Pos, "MuxingMode")==Temp->Parser->Retrieve(Stream_Text, Text_Pos, "MuxingMode"))
+                    {
+                        StreamPos_Last=Pos;
+                        break;
+                    }
+                if (StreamPos_Last==(size_t)-1)
+                    Stream_Prepare(Stream_Text, StreamPos_Last);
+                Merge(*Temp->Parser, Stream_Text, Text_Pos, StreamPos_Last);
 
-        Temp.StreamKind=StreamKind_Last;
-        Temp.StreamPos=StreamPos_Last;
+                if (!IsSub)
+                    Fill(Stream_Text, StreamPos_Last, "MuxingMode_MoreInfo", __T("Muxed in Video #")+Ztring().From_Number(Temp->StreamPos+1), true);
+                Fill(Stream_Text, StreamPos_Last, Text_ID, ID, true);
+                Fill(Stream_Text, StreamPos_Last, Text_ID_String, ID_String, true);
+                Fill(Stream_Text, StreamPos_Last, Text_MenuID, Retrieve(Stream_Video, Temp->StreamPos, Video_MenuID), true);
+                Fill(Stream_Text, StreamPos_Last, Text_MenuID_String, Retrieve(Stream_Video, Temp->StreamPos, Video_MenuID_String), true);
+                Fill(Stream_Text, StreamPos_Last, Text_Duration, Retrieve(Stream_Video, Temp->StreamPos, Video_Duration), true);
+                Fill(Stream_Text, StreamPos_Last, Text_Delay, Retrieve(Stream_Video, Temp->StreamPos, Video_Delay), true);
+                Fill(Stream_Text, StreamPos_Last, Text_Delay_Source, Retrieve(Stream_Video, Temp->StreamPos, Video_Delay_Source), true);
+
+                if (Retrieve(Stream_Text, StreamPos_Last, Text_Format).find(__T("EIA-"))!=string::npos)
+                {
+                    //Retrieving IDs
+                    Ztring ID_Complete=Retrieve(Stream_Text, StreamPos_Last, Text_ID);
+                    int16u ID_Video=ID_Complete.To_int16u();
+                    int8u  ID_Text=Ztring(ID_Complete.substr(ID_Complete.rfind(__T('-'))+1, string::npos)).To_int8u();
+                    if (ID_Complete.find(__T("-608-"))!=string::npos) //CEA-608 caption
+                        ID_Text+=128;
 
-        //Encryption
-        if (Temp.IsScrambled>16)
-            Fill(StreamKind_Last, StreamPos_Last, "Encryption", "Encrypted");
+                    //ATSC EIT
+                    for (size_t ProgramPos=0; ProgramPos<Complete_Stream->Streams[ID_Video]->program_numbers.size(); ProgramPos++)
+                    {
+                        if (Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[Complete_Stream->Streams[ID_Video]->program_numbers[ProgramPos]].source_id_IsValid)
+                        {
+                            int16u source_id=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[Complete_Stream->Streams[ID_Video]->program_numbers[ProgramPos]].source_id;
+                            complete_stream::sources::iterator Source=Complete_Stream->Sources.find(source_id);
+                            if (Source!=Complete_Stream->Sources.end())
+                            {
+                                bool IsFound=false;
 
-        //TS info
-        for (std::map<std::string, ZenLib::Ztring>::iterator Info=Temp.Infos.begin(); Info!=Temp.Infos.end(); Info++)
-        {
-            if (Retrieve(StreamKind_Last, StreamPos_Last, Info->first.c_str()).empty())
-                Fill(StreamKind_Last, StreamPos_Last, Info->first.c_str(), Info->second);
-        }
-        Temp.Infos.clear();
+                                for (complete_stream::source::atsc_epg_blocks::iterator ATSC_EPG_Block=Source->second.ATSC_EPG_Blocks.begin(); ATSC_EPG_Block!=Source->second.ATSC_EPG_Blocks.end(); ATSC_EPG_Block++)
+                                {
+                                    for (complete_stream::source::atsc_epg_block::events::iterator Event=ATSC_EPG_Block->second.Events.begin(); Event!=ATSC_EPG_Block->second.Events.end(); Event++)
+                                    {
+                                        if (!Event->second.Languages[ID_Text].empty())
+                                        {
+                                            Fill(Stream_Text, StreamPos_Last, Text_Language, Event->second.Languages[ID_Text]);
+                                            IsFound=true;
+                                            break;
+                                        }
+                                        if (IsFound)
+                                            break;
+                                    }
+                                    if (IsFound)
+                                        break;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
 
-        //Common
-        if (Temp.SubStream_pid!=0x0000) //Wit a substream
-        {
-            Ztring Format_Profile=Retrieve(Stream_Video, StreamPos_Last, Video_Format_Profile);
-            Fill(Stream_Video, StreamPos_Last, Video_ID, Ztring::ToZtring(Temp.SubStream_pid)+_T(" / ")+Ztring::ToZtring(PID), true);
-            Fill(Stream_Video, StreamPos_Last, Video_ID_String, Decimal_Hexa(Temp.SubStream_pid)+_T(" / ")+Decimal_Hexa(PID), true);
-            if (!Format_Profile.empty())
-                Fill(Stream_Video, StreamPos_Last, Video_Format_Profile, Complete_Stream->Streams[Temp.SubStream_pid].Parser->Retrieve(Stream_Video, 0, Video_Format_Profile)+_T(" / ")+Format_Profile, true);
+            StreamKind_Last=Temp->StreamKind;
+            StreamPos_Last=Temp->StreamPos;
         }
-        else
+    }
+
+    //Teletext
+    if (StreamKind_Last==Stream_Max)
+    {
+        for (std::map<int16u, complete_stream::stream::teletext>::iterator Teletext=Temp->Teletexts.begin(); Teletext!=Temp->Teletexts.end(); Teletext++)
         {
-            Fill(StreamKind_Last, StreamPos_Last, General_ID, PID, 10, true);
-            Fill(StreamKind_Last, StreamPos_Last, General_ID_String, Decimal_Hexa(PID), true);
+            Stream_Prepare(Stream_Text);
+            Fill(StreamKind_Last, StreamPos_Last, General_ID, Ztring::ToZtring(StreamID)+__T('-')+Ztring::ToZtring(Teletext->first), true);
+            Fill(StreamKind_Last, StreamPos_Last, General_ID_String, Decimal_Hexa(StreamID)+__T('-')+Ztring::ToZtring(Teletext->first), true);
+
+            for (size_t Pos=0; Pos<Temp->program_numbers.size(); Pos++)
+            {
+                Fill(StreamKind_Last, StreamPos_Last, General_MenuID, Temp->program_numbers[Pos], 10, Pos==0);
+                Fill(StreamKind_Last, StreamPos_Last, General_MenuID_String, Decimal_Hexa(Temp->program_numbers[Pos]), Pos==0);
+            }
+
+            //TS info
+            for (std::map<std::string, ZenLib::Ztring>::iterator Info=Teletext->second.Infos.begin(); Info!=Teletext->second.Infos.end(); Info++)
+            {
+                if (Retrieve(StreamKind_Last, StreamPos_Last, Info->first.c_str()).empty())
+                    Fill(StreamKind_Last, StreamPos_Last, Info->first.c_str(), Info->second);
+            }
+            Teletext->second.Infos.clear();
         }
-        for (size_t Pos=0; Pos<Temp.program_numbers.size(); Pos++)
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_MpegTs::Streams_Update_EPG()
+{
+    //EPG
+    complete_stream::transport_streams::iterator Transport_Stream=Complete_Stream->transport_stream_id_IsValid?Complete_Stream->Transport_Streams.find(Complete_Stream->transport_stream_id):Complete_Stream->Transport_Streams.end();
+    if (Transport_Stream==Complete_Stream->Transport_Streams.end())
+        return;
+
+    //Per source (ATSC)
+    if (Transport_Stream->second.source_id_IsValid)
+    {
+        complete_stream::sources::iterator Source=Complete_Stream->Sources.find(Transport_Stream->second.source_id);
+        if (Source!=Complete_Stream->Sources.end())
         {
-            Fill(StreamKind_Last, StreamPos_Last, General_MenuID, Temp.program_numbers[Pos], 10, Pos==0);
-            Fill(StreamKind_Last, StreamPos_Last, General_MenuID_String, Decimal_Hexa(Temp.program_numbers[Pos]), Pos==0);
+            //EPG
+            std::map<Ztring, Ztring> EPGs;
+            for (complete_stream::source::atsc_epg_blocks::iterator ATSC_EPG_Block=Source->second.ATSC_EPG_Blocks.begin(); ATSC_EPG_Block!=Source->second.ATSC_EPG_Blocks.end(); ATSC_EPG_Block++)
+                for (complete_stream::source::atsc_epg_block::events::iterator Event=ATSC_EPG_Block->second.Events.begin(); Event!=ATSC_EPG_Block->second.Events.end(); Event++)
+                {
+                    Ztring Texts;
+                    for (std::map<int16u, Ztring>::iterator text=Event->second.texts.begin(); text!=Event->second.texts.end(); text++)
+                        Texts+=text->second+__T(" - ");
+                    if (!Texts.empty())
+                        Texts.resize(Texts.size()-3);
+                    EPGs[Ztring().Date_From_Seconds_1970(Event->second.start_time+315964800-Complete_Stream->GPS_UTC_offset)]=Event->second.title+__T(" / ")+Texts+__T(" /  /  / ")+Event->second.duration+__T(" / ");
+                }
+            if (!EPGs.empty())
+            {
+                //Trashing old EPG
+                size_t Begin=Retrieve(Stream_General, 0, General_EPG_Positions_Begin).To_int32u();
+                size_t End=Retrieve(Stream_General, 0, General_EPG_Positions_End).To_int32u();
+                if (Begin && End && Begin<End)
+                    for (size_t Pos=End-1; Pos>=Begin; Pos--)
+                        Clear(Stream_General, 0, Pos);
+
+                //Filling
+                Fill(Stream_General, 0, General_EPG_Positions_Begin, Count_Get(Stream_General, 0), 10, true);
+                for (std::map<Ztring, Ztring>::iterator EPG=EPGs.begin(); EPG!=EPGs.end(); EPG++)
+                    Fill(Stream_General, 0, EPG->first.To_Local().c_str(), EPG->second, true);
+                Fill(Stream_General, 0, General_EPG_Positions_End, Count_Get(Stream_General, 0), 10, true);
+            }
         }
+    }
 
-        //Special cases
-        if (StreamKind_Last==Stream_Video && Temp.Parser && Temp.Parser->Count_Get(Stream_Text))
+    //Per program
+    if (!Transport_Stream->second.Programs.empty()
+     && (Transport_Stream->second.Programs.size()>1
+      || !Transport_Stream->second.Programs.begin()->second.Infos.empty()
+      || !Transport_Stream->second.Programs.begin()->second.DVB_EPG_Blocks.empty()
+      || Complete_Stream->Sources.find(Transport_Stream->second.Programs.begin()->second.source_id)!=Complete_Stream->Sources.end()
+      || Config->File_MpegTs_ForceMenu_Get()))
+        for (complete_stream::transport_stream::programs::iterator Program=Transport_Stream->second.Programs.begin(); Program!=Transport_Stream->second.Programs.end(); Program++)
         {
+            if (Program->second.IsParsed)
+            {
+                bool EPGs_IsUpdated=false;
+                std::map<Ztring, Ztring> EPGs;
+
+                //EPG - DVB
+                if (Program->second.DVB_EPG_Blocks_IsUpdated)
+                {
+                    for (complete_stream::transport_stream::program::dvb_epg_blocks::iterator DVB_EPG_Block=Program->second.DVB_EPG_Blocks.begin(); DVB_EPG_Block!=Program->second.DVB_EPG_Blocks.end(); DVB_EPG_Block++)
+                        for (complete_stream::transport_stream::program::dvb_epg_block::events::iterator Event=DVB_EPG_Block->second.Events.begin(); Event!=DVB_EPG_Block->second.Events.end(); Event++)
+                            if (EPGs.find(Event->second.start_time)==EPGs.end() || DVB_EPG_Block->first==0x4E) //Does not exist or "DVB - event_information_section - actual_transport_stream : return present/following"
+                                EPGs[Event->second.start_time]=Event->second.short_event.event_name+__T(" / ")+Event->second.short_event.text+__T(" / ")+Event->second.content+__T(" /  / ")+Event->second.duration+__T(" / ")+Event->second.running_status;
+                    Program->second.DVB_EPG_Blocks_IsUpdated=false;
+                    EPGs_IsUpdated=true;
+                }
+
+                //EPG - ATSC
+                if (Program->second.source_id_IsValid)
+                {
+                    complete_stream::sources::iterator Source=Complete_Stream->Sources.find(Program->second.source_id);
+                    if (Source!=Complete_Stream->Sources.end())
+                    {
+                        if (!Source->second.texts.empty())
+                        {
+                            Ztring Texts;
+                            for (std::map<int16u, Ztring>::iterator text=Source->second.texts.begin(); text!=Source->second.texts.end(); text++)
+                                Texts+=text->second+__T(" - ");
+                            if (!Texts.empty())
+                                Texts.resize(Texts.size()-3);
+                            if (Program->second.StreamPos==(size_t)-1)
+                            {
+                                Complete_Stream->program_number_Order.push_back(Program->first);
+                                Stream_Prepare(Stream_Menu);
+                                Program->second.StreamPos=StreamPos_Last;
+                            }
+                            Fill(Stream_Menu, Program->second.StreamPos, Menu_ServiceProvider, Texts, true);
+                        }
+                        if (Source->second.ATSC_EPG_Blocks_IsUpdated)
+                        {
+                            for (complete_stream::source::atsc_epg_blocks::iterator ATSC_EPG_Block=Source->second.ATSC_EPG_Blocks.begin(); ATSC_EPG_Block!=Source->second.ATSC_EPG_Blocks.end(); ATSC_EPG_Block++)
+                                for (complete_stream::source::atsc_epg_block::events::iterator Event=ATSC_EPG_Block->second.Events.begin(); Event!=ATSC_EPG_Block->second.Events.end(); Event++)
+                                    if (Event->second.start_time!=(int32u)-1) //TODO: find the reason when start_time is not set
+                                    {
+                                        Ztring Texts;
+                                        for (std::map<int16u, Ztring>::iterator text=Event->second.texts.begin(); text!=Event->second.texts.end(); text++)
+                                            Texts+=text->second+__T(" - ");
+                                        if (!Texts.empty())
+                                            Texts.resize(Texts.size()-3);
+                                        EPGs[Ztring().Date_From_Seconds_1970(Event->second.start_time+315964800-Complete_Stream->GPS_UTC_offset)]=Event->second.title+__T(" / ")+Texts+__T(" /  /  / ")+Event->second.duration+__T(" / ");
+                                    }
+                            Source->second.ATSC_EPG_Blocks_IsUpdated=false;
+                            EPGs_IsUpdated=true;
+                        }
+                    }
+                }
+
+                //EPG - Filling
+                if (EPGs_IsUpdated)
+                {
+                    if (Program->second.StreamPos==(size_t)-1)
+                    {
+                        Complete_Stream->program_number_Order.push_back(Program->first);
+                        Stream_Prepare(Stream_Menu);
+                        Program->second.StreamPos=StreamPos_Last;
+                    }
+
+                    Program->second.EPGs=EPGs;
+                    Streams_Update_EPG_PerProgram(Program);
+                }
+            }
         }
-    }
 
-    //Desactivating the stream (except for timestamp)
-    Temp.Searching_Payload_Start_Set(false);
-    Temp.Searching_Payload_Continue_Set(false);
+    Complete_Stream->Sources_IsUpdated=false;
+    Complete_Stream->Programs_IsUpdated=false;
 }
 
 //---------------------------------------------------------------------------
-void File_MpegTs::Streams_Finish()
+void File_MpegTs::Streams_Update_EPG_PerProgram(complete_stream::transport_stream::programs::iterator Program)
 {
-    //Per stream
-    for (int16u PID=0; PID<0x2000; PID++)
-        Streams_Finish_PerStream(PID, Complete_Stream->Streams[PID]);
-
-    File__Duplicate_Streams_Finish();
+    size_t Chapters_Pos_Begin=Retrieve(Stream_Menu, Program->second.StreamPos, Menu_Chapters_Pos_Begin).To_int32u();
+    size_t Chapters_Pos_End=Retrieve(Stream_Menu, Program->second.StreamPos, Menu_Chapters_Pos_End).To_int32u();
+    if (Chapters_Pos_Begin && Chapters_Pos_End)
+    {
+        for (size_t Pos=Chapters_Pos_End-1; Pos>=Chapters_Pos_Begin; Pos--)
+            Clear(Stream_Menu, Program->second.StreamPos, Pos);
+        Clear(Stream_Menu, Program->second.StreamPos, Menu_Chapters_Pos_Begin);
+        Clear(Stream_Menu, Program->second.StreamPos, Menu_Chapters_Pos_End);
+    }
+    if (!Program->second.EPGs.empty())
+    {
+        Fill(Stream_Menu, Program->second.StreamPos, Menu_Chapters_Pos_Begin, Count_Get(Stream_Menu, Program->second.StreamPos), 10, true);
+        for (std::map<Ztring, Ztring>::iterator EPG=Program->second.EPGs.begin(); EPG!=Program->second.EPGs.end(); EPG++)
+            Fill(Stream_Menu, Program->second.StreamPos, EPG->first.To_UTF8().c_str(), EPG->second, true);
+        Fill(Stream_Menu, Program->second.StreamPos, Menu_Chapters_Pos_End, Count_Get(Stream_Menu, Program->second.StreamPos), 10, true);
+    }
 }
 
 //---------------------------------------------------------------------------
-void File_MpegTs::Streams_Finish_PerStream(int16u PID, complete_stream::stream &Temp)
+#ifdef MEDIAINFO_MPEGTS_PCR_YES
+void File_MpegTs::Streams_Update_Duration_Update()
 {
-    //Precise overall bit rate
-    if (Complete_Stream->Streams[PID].TimeStamp_End_Offset!=(int64u)-1)
+    for (std::map<int16u, int16u>::iterator PCR_PID=Complete_Stream->PCR_PIDs.begin(); PCR_PID!=Complete_Stream->PCR_PIDs.end(); PCR_PID++)
     {
-        float64 Duration=((float64)((int64s)(Complete_Stream->Streams[PID].TimeStamp_End-Complete_Stream->Streams[PID].TimeStamp_Start)))/27000;
-        if (Duration)
-            Fill(Stream_General, 0, General_OverallBitRate, (Complete_Stream->Streams[PID].TimeStamp_End_Offset-Complete_Stream->Streams[PID].TimeStamp_Start_Offset)*8*1000/Duration, 0, true);
-    }
+        complete_stream::streams::iterator Stream=Complete_Stream->Streams.begin()+PCR_PID->first;
+        if ((*Stream)->TimeStamp_End_IsUpdated)
+        {
+            if ((*Stream)->TimeStamp_End<0x100000000LL*300 && (*Stream)->TimeStamp_Start>0x100000000LL*300)
+                (*Stream)->TimeStamp_End+=0x200000000LL*300; //33 bits, cyclic
+            if ((*Stream)->TimeStamp_Start<(*Stream)->TimeStamp_End)
+            {
+                float64 Duration=((float64)((int64s)((*Stream)->TimeStamp_End-(*Stream)->TimeStamp_Start)))/27000;
 
-    //Only PES
-    if (Temp.Kind!=complete_stream::stream::pes)
-        return;
+                Fill(Stream_General, 0, General_Duration, Duration, 6, true);
+                if (Duration)
+                    Fill(Stream_General, 0, General_OverallBitRate, ((*Stream)->TimeStamp_End_Offset-(*Stream)->TimeStamp_Start_Offset)*8*1000/Duration, 0, true);
 
-    //No direct handling of Sub streams;
-    if (Temp.stream_type==0x20 && Temp.SubStream_pid) //Stereoscopic is not alone
-        return;
+                (*Stream)->TimeStamp_End_IsUpdated=false;
+                (*Stream)->IsPCR_Duration=Duration;
 
-    //By the parser
-    if (Temp.StreamKind==Stream_Max && !Temp.Parser)
-        Streams_Fill_PerStream(PID, Temp);
+                //Filling menu duration
+                if (Count_Get(Stream_Menu))
+                {
+                    complete_stream::transport_streams::iterator Transport_Stream=Complete_Stream->transport_stream_id_IsValid?Complete_Stream->Transport_Streams.find(Complete_Stream->transport_stream_id):Complete_Stream->Transport_Streams.end();
+                    if (Transport_Stream!=Complete_Stream->Transport_Streams.end())
+                    {
+                        //Per program
+                        for (size_t Pos=0; Pos<(*Stream)->program_numbers.size(); Pos++)
+                        {
+                            int16u program_number=(*Stream)->program_numbers[Pos];
+                            if (Transport_Stream->second.Programs[program_number].IsRegistered) //Only if the menu is already displayed
+                                Fill(Stream_Menu, Transport_Stream->second.Programs[program_number].StreamPos, Menu_Duration, Duration, 6, true);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+#endif //MEDIAINFO_MPEGTS_PCR_YES
 
-    //Init
-    if (Temp.StreamKind==Stream_Max)
-        return;
-    StreamKind_Last=Temp.StreamKind;
-    StreamPos_Last=Temp.StreamPos;
+//---------------------------------------------------------------------------
+void File_MpegTs::Streams_Update_Duration_End()
+{
+    //General
+    Fill(Stream_General, 0, General_Duration_End, Complete_Stream->Duration_End, true);
 
-    //By the parser
-    if (Temp.Parser && Temp.Parser->Status[IsAccepted])
-    {
-        Temp.Parser->ShouldContinueParsing=false;
-        Finish(Temp.Parser);
-        Merge(*Temp.Parser, StreamKind_Last, 0, StreamPos_Last);
+    Complete_Stream->Duration_End_IsUpdated=false;
+}
 
-        //Special cases
-        if (Temp.Parser->Count_Get(Stream_Video) && Temp.Parser->Count_Get(Stream_Text))
+//---------------------------------------------------------------------------
+void File_MpegTs::Streams_Finish()
+{
+    //Per stream
+    for (size_t StreamID=0; StreamID<0x2000; StreamID++)
+        if (Complete_Stream->Streams[StreamID]->Parser)
         {
-            //Video and Text are together
-            size_t Text_Count=Temp.Parser->Count_Get(Stream_Text);
-            for (size_t Text_Pos=0; Text_Pos<Text_Count; Text_Pos++)
+            if (!Complete_Stream->Streams[StreamID]->Parser->Status[IsFinished])
             {
-                Stream_Prepare(Stream_Text);
-                Merge(*Temp.Parser, Stream_Text, Text_Pos, StreamPos_Last);
+                int64u File_Size_Temp=File_Size;
+                File_Size=File_Offset+Buffer_Offset+Element_Offset;
+                Open_Buffer_Continue(Complete_Stream->Streams[StreamID]->Parser, Buffer, 0);
+                File_Size=File_Size_Temp;
+                Finish(Complete_Stream->Streams[StreamID]->Parser);
+                #if MEDIAINFO_DEMUX
+                    if (Config->Demux_EventWasSent)
+                        return;
+                #endif //MEDIAINFO_DEMUX
+            }
+        }
 
-                if (!IsSub)
-                    Fill(Stream_Text, StreamPos_Last, "MuxingMode_MoreInfo", _T("Muxed in Video #")+Ztring().From_Number(Temp.StreamPos+1), true);
-                Ztring ID=Retrieve(Stream_Text, StreamPos_Last, Text_ID);
-                if (ID.find(_T('-'))!=string::npos)
-                    ID.erase(ID.begin(), ID.begin()+ID.find(_T('-'))+1);
-                Fill(Stream_Text, StreamPos_Last, Text_ID, Retrieve(Stream_Video, Temp.StreamPos, Video_ID)+_T('-')+ID, true);
-                Fill(Stream_Text, StreamPos_Last, Text_ID_String, Retrieve(Stream_Video, Temp.StreamPos, Video_ID_String)+ID, true);
-                Fill(Stream_Text, StreamPos_Last, Text_MenuID, Retrieve(Stream_Video, Temp.StreamPos, Video_MenuID), true);
-                Fill(Stream_Text, StreamPos_Last, Text_MenuID_String, Retrieve(Stream_Video, Temp.StreamPos, Video_MenuID_String), true);
-                Fill(Stream_Text, StreamPos_Last, Text_Duration, Retrieve(Stream_Video, Temp.StreamPos, Video_Duration), true);
-                Fill(Stream_Text, StreamPos_Last, Text_Delay, Retrieve(Stream_Video, Temp.StreamPos, Video_Delay), true);
-
-                //Language from ATSC EIT
-                size_t ID_Pos;
-                if (ID==_T("608-0"))
-                    ID_Pos=0;
-                else if (ID==_T("608-1"))
-                    ID_Pos=1;
-                else
+    #if MEDIAINFO_DUPLICATE
+        File__Duplicate_Streams_Finish();
+    #endif //MEDIAINFO_DUPLICATE
+
+    #if MEDIAINFO_IBI
+        if (Config_Ibi_Create)
+        {
+            ibi Ibi_Temp;
+            for (ibi::streams::iterator IbiStream_Temp=Ibi.Streams.begin(); IbiStream_Temp!=Ibi.Streams.end(); IbiStream_Temp++)
+                Ibi_Temp.Streams[IbiStream_Temp->first]=new ibi::stream(*IbiStream_Temp->second);
+
+            for (ibi::streams::iterator IbiStream_Temp=Ibi_Temp.Streams.begin(); IbiStream_Temp!=Ibi_Temp.Streams.end(); IbiStream_Temp++)
+            {
+                if (IbiStream_Temp->second && IbiStream_Temp->second->DtsFrequencyNumerator==1000000000 && IbiStream_Temp->second->DtsFrequencyDenominator==1)
                 {
-                    ID_Pos=ID.To_int8u();
-                    if (ID_Pos==0)
-                        ID_Pos=(size_t)-1;
-                    else
-                        ID_Pos--; //EIA-708 begins at 1
+                    bool IsOk=true;
+                    for (size_t Pos=0; Pos<IbiStream_Temp->second->Infos.size(); Pos++)
+                        if (!IbiStream_Temp->second->Infos[Pos].IsContinuous && Pos+1!=IbiStream_Temp->second->Infos.size())
+                            IsOk=false;
+                    if (IsOk) //Only is all items are continuous (partial IBI not yet supported)
+                    {
+                        IbiStream_Temp->second->DtsFrequencyNumerator=90000;
+                        for (size_t Pos=0; Pos<IbiStream_Temp->second->Infos.size(); Pos++)
+                        {
+                            int64u Temp=IbiStream_Temp->second->Infos[Pos].Dts*90/1000000;
+                            IbiStream_Temp->second->Infos[Pos].Dts=Temp;
+                        }
+                    }
                 }
-                if (ID_Pos<Temp.Captions_Language.size())
-                    Fill(Stream_Text, StreamPos_Last, Text_Language, Temp.Captions_Language[ID_Pos]);
             }
 
-            StreamKind_Last=Temp.StreamKind;
-            StreamPos_Last=Temp.StreamPos;
+            //IBI Creation
+            File_Ibi_Creation IbiCreation(Ibi_Temp);
+            Ztring IbiText=IbiCreation.Finish();
+            if (!IbiText.empty())
+                Fill(Stream_General, 0, "IBI", IbiText, true);
         }
-    }
+    #endif //MEDIAINFO_IBI
 }
 
 //***************************************************************************
@@ -558,15 +1032,23 @@
 bool File_MpegTs::Synchronize()
 {
     //Synchronizing
-    while (       Buffer_Offset+188*7+BDAV_Size*8+TSP_Size*7+1<=Buffer_Size
-      && !(Buffer[Buffer_Offset+188*0+BDAV_Size*1+TSP_Size*0]==0x47
-        && Buffer[Buffer_Offset+188*1+BDAV_Size*2+TSP_Size*1]==0x47
-        && Buffer[Buffer_Offset+188*2+BDAV_Size*3+TSP_Size*2]==0x47
-        && Buffer[Buffer_Offset+188*3+BDAV_Size*4+TSP_Size*3]==0x47
-        && Buffer[Buffer_Offset+188*4+BDAV_Size*5+TSP_Size*4]==0x47
-        && Buffer[Buffer_Offset+188*5+BDAV_Size*6+TSP_Size*5]==0x47
-        && Buffer[Buffer_Offset+188*6+BDAV_Size*7+TSP_Size*6]==0x47
-        && Buffer[Buffer_Offset+188*7+BDAV_Size*8+TSP_Size*7]==0x47))
+    while (       Buffer_Offset+188*16+BDAV_Size*16+TSP_Size*16<=Buffer_Size
+      && !(Buffer[Buffer_Offset+188* 0+BDAV_Size* 1+TSP_Size* 0]==0x47
+        && Buffer[Buffer_Offset+188* 1+BDAV_Size* 2+TSP_Size* 1]==0x47
+        && Buffer[Buffer_Offset+188* 2+BDAV_Size* 3+TSP_Size* 2]==0x47
+        && Buffer[Buffer_Offset+188* 3+BDAV_Size* 4+TSP_Size* 3]==0x47
+        && Buffer[Buffer_Offset+188* 4+BDAV_Size* 5+TSP_Size* 4]==0x47
+        && Buffer[Buffer_Offset+188* 5+BDAV_Size* 6+TSP_Size* 5]==0x47
+        && Buffer[Buffer_Offset+188* 6+BDAV_Size* 7+TSP_Size* 6]==0x47
+        && Buffer[Buffer_Offset+188* 7+BDAV_Size* 8+TSP_Size* 7]==0x47
+        && Buffer[Buffer_Offset+188* 8+BDAV_Size* 9+TSP_Size* 8]==0x47
+        && Buffer[Buffer_Offset+188* 9+BDAV_Size*10+TSP_Size* 9]==0x47
+        && Buffer[Buffer_Offset+188*10+BDAV_Size*11+TSP_Size*10]==0x47
+        && Buffer[Buffer_Offset+188*11+BDAV_Size*12+TSP_Size*11]==0x47
+        && Buffer[Buffer_Offset+188*12+BDAV_Size*13+TSP_Size*12]==0x47
+        && Buffer[Buffer_Offset+188*13+BDAV_Size*14+TSP_Size*13]==0x47
+        && Buffer[Buffer_Offset+188*14+BDAV_Size*15+TSP_Size*14]==0x47
+        && Buffer[Buffer_Offset+188*15+BDAV_Size*16+TSP_Size*15]==0x47))
     {
         Buffer_Offset++;
         while (       Buffer_Offset+BDAV_Size+1<=Buffer_Size
@@ -574,13 +1056,13 @@
             Buffer_Offset++;
     }
 
-    if (Buffer_Offset+188*7+BDAV_Size*8+TSP_Size*7>=Buffer_Size)
+    if (Buffer_Offset+188*16+BDAV_Size*16+TSP_Size*16>=Buffer_Size)
         return false;
 
     //Synched is OK
     if (!Status[IsAccepted])
     {
-        Accept("MPEG-TS");
+        Accept();
     }
     return true;
 }
@@ -594,18 +1076,34 @@
         if (Buffer[Buffer_Offset+BDAV_Size]!=0x47)
         {
             Synched=false;
-            if (File__Duplicate_Get())
-                Trusted++; //We don't want to stop parsing if duplication is requested, TS is not a lot stable, normal...
-            return false;
+            #if MEDIAINFO_DUPLICATE
+                if (File__Duplicate_Get())
+                    Trusted++; //We don't want to stop parsing if duplication is requested, TS is not a lot stable, normal...
+            #endif //MEDIAINFO_DUPLICATE
+            return true;
         }
 
-        //Getting PID
+        //Getting pid
         pid=(Buffer[Buffer_Offset+BDAV_Size+1]&0x1F)<<8
           |  Buffer[Buffer_Offset+BDAV_Size+2];
 
-        complete_stream::streams::iterator Stream=Complete_Stream->Streams.begin()+pid;
+        complete_stream::stream* Stream=Complete_Stream->Streams[pid];
         if (Stream->Searching)
         {
+            //Trace config
+            #if MEDIAINFO_TRACE
+                if (Config_Trace_Level)
+                {
+                    if (Stream->Kind==complete_stream::stream::pes)
+                    {
+                        if (!Trace_Layers[8])
+                            Trace_Layers_Update(8); //Stream
+                    }
+                    else
+                        Trace_Layers_Update(IsSub?1:0);
+                }
+            #endif //MEDIAINFO_TRACE
+
             payload_unit_start_indicator=(Buffer[Buffer_Offset+BDAV_Size+1]&0x40)!=0;
             if (payload_unit_start_indicator)
             {
@@ -624,17 +1122,52 @@
                         if (Version_Pos>=BDAV_Size+188)
                             return true; //There is a problem with this block, accelerated parsing disabled
                         int8u table_id=Buffer[Buffer_Offset+Version_Pos]; //table_id
+                        #if MEDIAINFO_TRACE
+                            if (Trace_Activated)
+                                Stream->Element_Info1=Mpeg_Psi_table_id(table_id);
+                        #endif //MEDIAINFO_TRACE
                         if (table_id==0xCD) //specifc case for ATSC STT
+                        {
+                            if (Config_Trace_TimeSection_OnlyFirstOccurrence)
+                            {
+                                if (!TimeSection_FirstOccurrenceParsed)
+                                    TimeSection_FirstOccurrenceParsed=true;
+                                #if MEDIAINFO_TRACE
+                                else
+                                {
+                                    Trace_Layers.reset(); //We do not want to display data about other occurences
+                                    Trace_Layers_Update();
+                                }
+                                #endif //MEDIAINFO_TRACE
+                            }
                             return true; //Version has no meaning
+                        }
+                        #if MEDIAINFO_IBI
+                            if (table_id==0x00)
+                                Complete_Stream->Streams[pid]->Ibi_SynchronizationOffset_BeginOfFrame=File_Offset+Buffer_Offset;
+                            if (table_id==0x02)
+                                Complete_Stream->Streams[pid]->Ibi_SynchronizationOffset_BeginOfFrame=Complete_Stream->Streams[0x0000]->Ibi_SynchronizationOffset_BeginOfFrame;
+                        #endif //MEDIAINFO_IBI
                         complete_stream::stream::table_ids::iterator Table_ID=Stream->Table_IDs.begin()+table_id;
                         if (*Table_ID)
                         {
                             //Searching table_id_extension, version_number, section_number
-                            #if MEDIAINFO_TRACE
-                                Stream->Element_Info=Mpeg_Psi_table_id(table_id);
-                            #endif //MEDIAINFO_TRACE
                             if (!(Buffer[Buffer_Offset+Version_Pos+1]&0x80)) //section_syntax_indicator
+                            {
+                                if (table_id==0x70 && Config_Trace_TimeSection_OnlyFirstOccurrence)
+                                {
+                                    if (!TimeSection_FirstOccurrenceParsed)
+                                        TimeSection_FirstOccurrenceParsed=true;
+                                    #if MEDIAINFO_TRACE
+                                    else
+                                    {
+                                        Trace_Layers.reset(); //We do not want to display data about other occurences
+                                        Trace_Layers_Update();
+                                    }
+                                    #endif //MEDIAINFO_TRACE
+                                }
                                 return true; //No version
+                            }
                             Version_Pos+=3; //Header size
                             if (Version_Pos+5>=BDAV_Size+188)
                                 return true; //Not able to detect version (too far)
@@ -654,6 +1187,8 @@
                             }
                             else if (Table_ID_Extension->second.version_number!=version_number)
                             {
+                                if (Table_ID_Extension->second.version_number!=(int8u)-1 && Config_Trace_TimeSection_OnlyFirstOccurrence)
+                                    break;
                                 Table_ID_Extension->second.version_number=version_number;
                                 Table_ID_Extension->second.Section_Numbers.clear();
                                 Table_ID_Extension->second.Section_Numbers.resize(0x100);
@@ -665,6 +1200,65 @@
                                 Table_ID_Extension->second.Section_Numbers[section_number]=true;
                                 return true; //section is not yet parsed
                             }
+                            else if (table_id==0x02 && Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs_NotParsedCount)
+                            {
+                                //PMT is looping, so this is nearly sure that all PMT available in the stream are assigned
+                                #ifdef MEDIAINFO_MPEGTS_ALLSTREAMS_YES
+                                    for (size_t pid=0x10; pid<0x1FFF; pid++) //Wanting 0x10-->0x2F (DVB), 0x1ABC (cea_osd), 0x1FF7-->0x1FFF (ATSC)
+                                        for (size_t Table_ID=0x00; Table_ID<0xFF; Table_ID++)
+                                        {
+                                            Complete_Stream->Streams[pid]->Searching_Payload_Start_Set(true);
+                                            Complete_Stream->Streams[pid]->Kind=complete_stream::stream::psi;
+                                            Complete_Stream->Streams[pid]->Table_IDs.resize(0x100);
+                                            Complete_Stream->Streams[pid]->Table_IDs[Table_ID]=new complete_stream::stream::table_id; //event_information_section - actual_transport_stream, schedule
+
+                                            if (Pos==0x001F)
+                                                Pos=0x1ABB; //Skipping normal data
+                                            if (Pos==0x01ABC)
+                                                Pos=0x1FF6; //Skipping normal data
+                                        }
+                                #else //MEDIAINFO_MPEGTS_ALLSTREAMS_YES
+                                    if (Complete_Stream->Streams[0x0010]->Kind==complete_stream::stream::unknown)
+                                    {
+                                        Complete_Stream->Streams[0x0010]->Searching_Payload_Start_Set(true);
+                                        Complete_Stream->Streams[0x0010]->Kind=complete_stream::stream::psi;
+                                        Complete_Stream->Streams[0x0010]->Table_IDs.resize(0x100);
+                                        Complete_Stream->Streams[0x0010]->Table_IDs[0x40]=new complete_stream::stream::table_id; //network_information_section - actual_network
+                                    }
+                                    if (Complete_Stream->Streams[0x0011]->Kind==complete_stream::stream::unknown)
+                                    {
+                                        Complete_Stream->Streams[0x0011]->Searching_Payload_Start_Set(true);
+                                        Complete_Stream->Streams[0x0011]->Kind=complete_stream::stream::psi;
+                                        Complete_Stream->Streams[0x0011]->Table_IDs.resize(0x100);
+                                        Complete_Stream->Streams[0x0011]->Table_IDs[0x42]=new complete_stream::stream::table_id; //service_description_section - actual_transport_stream
+                                    }
+                                    if (Complete_Stream->Streams[0x0012]->Kind==complete_stream::stream::unknown)
+                                    {
+                                        Complete_Stream->Streams[0x0012]->Searching_Payload_Start_Set(true);
+                                        Complete_Stream->Streams[0x0012]->Kind=complete_stream::stream::psi;
+                                        Complete_Stream->Streams[0x0012]->Table_IDs.resize(0x100);
+                                        Complete_Stream->Streams[0x0012]->Table_IDs[0x4E]=new complete_stream::stream::table_id; //event_information_section - actual_transport_stream, present/following
+                                        for (size_t Table_ID=0x50; Table_ID<0x60; Table_ID++)
+                                            Complete_Stream->Streams[0x0012]->Table_IDs[Table_ID]=new complete_stream::stream::table_id; //event_information_section - actual_transport_stream, schedule
+                                    }
+                                    if (Complete_Stream->Streams[0x0014]->Kind==complete_stream::stream::unknown)
+                                    {
+                                        Complete_Stream->Streams[0x0014]->Searching_Payload_Start_Set(true);
+                                        Complete_Stream->Streams[0x0014]->Kind=complete_stream::stream::psi;
+                                        Complete_Stream->Streams[0x0014]->Table_IDs.resize(0x100);
+                                        Complete_Stream->Streams[0x0014]->Table_IDs[0x70]=new complete_stream::stream::table_id; //time_date_section
+                                        Complete_Stream->Streams[0x0014]->Table_IDs[0x73]=new complete_stream::stream::table_id; //time_offset_section
+                                    }
+                                    if (Complete_Stream->Streams[0x1FFB]->Kind==complete_stream::stream::unknown)
+                                    {
+                                        Complete_Stream->Streams[0x1FFB]->Searching_Payload_Start_Set(true);
+                                        Complete_Stream->Streams[0x1FFB]->Kind=complete_stream::stream::psi;
+                                        Complete_Stream->Streams[0x1FFB]->Table_IDs.resize(0x100);
+                                        Complete_Stream->Streams[0x1FFB]->Table_IDs[0xC7]=new complete_stream::stream::table_id; //Master Guide Table
+                                        Complete_Stream->Streams[0x1FFB]->Table_IDs[0xCD]=new complete_stream::stream::table_id; //System Time Table
+                                    }
+                                #endif //MEDIAINFO_MPEGTS_ALLSTREAMS_YES
+                            }
                         }
                     }
                     else
@@ -705,46 +1299,89 @@
                                 program_clock_reference*=300;
                                 program_clock_reference+=(  (((int64u)Buffer[Buffer_Offset+BDAV_Size+10]&0x01)<<8)
                                                           | (((int64u)Buffer[Buffer_Offset+BDAV_Size+11])   ));
-                                if (Complete_Stream->Streams[pid].Searching_TimeStamp_End
+                                if (Complete_Stream->Streams[pid]->Searching_TimeStamp_End
                                 #ifdef MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
-                                 && (!Complete_Stream->Streams[pid].Searching_ParserTimeStamp_End
-                                  || Complete_Stream->Streams[pid].IsPCR) //If PCR, we always want it.
+                                 && (!Complete_Stream->Streams[pid]->Searching_ParserTimeStamp_End
+                                  || Complete_Stream->Streams[pid]->IsPCR) //If PCR, we always want it.
                                 #endif //MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
                                 )
                                 {
                                     Header_Parse_Events_Duration(program_clock_reference);
-                                    Complete_Stream->Streams[pid].TimeStamp_End=program_clock_reference;
-                                    Complete_Stream->Streams[pid].TimeStamp_End_Offset=File_Offset+Buffer_Offset;
-                                    if (Status[IsFilled])
-                                        Header_Parse_AdaptationField_Duration_Update();
+                                    if (Complete_Stream->Streams[pid]->TimeStamp_End_Offset!=(int64u)-1)
+                                    {
+                                        if (program_clock_reference+0x12c00000000LL<Complete_Stream->Streams[pid]->TimeStamp_End)
+                                            program_clock_reference+=0x25800000000LL; //33 bits and *300
+                                        int64u  Duration_27M=program_clock_reference-Complete_Stream->Streams[pid]->TimeStamp_End;
+                                        float64 Duration=((float64)Duration_27M)/27000000; //in seconds
+                                        float64 Bytes=((float64)(File_Offset+Buffer_Offset-Complete_Stream->Streams[pid]->TimeStamp_End_Offset))*8;
+                                        float64 TimeStamp_InstantaneousBitRate=Bytes/Duration;
+                                        if (Complete_Stream->Streams[pid]->TimeStamp_InstantaneousBitRate)
+                                        {
+                                            float64 Config_VbrDetection_Delta_Temp=Config_VbrDetection_Delta;
+                                            if (Config_VbrDetection_Delta==0 && TimeStamp_InstantaneousBitRate)
+                                                Config_VbrDetection_Delta_Temp=((float64)(BDAV_Size+188+TSP_Size))/TimeStamp_InstantaneousBitRate;
+                                            if (TimeStamp_InstantaneousBitRate<Complete_Stream->Streams[pid]->TimeStamp_InstantaneousBitRate*(1-Config_VbrDetection_Delta_Temp) || TimeStamp_InstantaneousBitRate>Complete_Stream->Streams[pid]->TimeStamp_InstantaneousBitRate*(1+Config_VbrDetection_Delta_Temp))
+                                            {
+                                                Complete_Stream->Streams[pid]->TimeStamp_InstantaneousBitRate_BitRateMode_IsVbr++;
+                                                #if MEDIAINFO_ADVANCED
+                                                    if (Config_VbrDetection_GiveUp && Complete_Stream->Streams[pid]->TimeStamp_InstantaneousBitRate_BitRateMode_IsVbr>=Config_VbrDetection_Occurences)
+                                                        Config->ParseSpeed=0;
+                                                #endif // MEDIAINFO_ADVANCED
+                                            }
+                                            else
+                                                Complete_Stream->Streams[pid]->TimeStamp_InstantaneousBitRate_BitRateMode_IsCbr++;
+                                        }
+                                        Complete_Stream->Streams[pid]->TimeStamp_InstantaneousBitRate=TimeStamp_InstantaneousBitRate;
+                                        #if MEDIAINFO_ADVANCED
+                                            if (Complete_Stream->Streams[pid]->TimeStamp_Distance_Min>Duration_27M)
+                                                Complete_Stream->Streams[pid]->TimeStamp_Distance_Min=Duration_27M;
+                                            if (Complete_Stream->Streams[pid]->TimeStamp_Distance_Max<Duration_27M)
+                                                Complete_Stream->Streams[pid]->TimeStamp_Distance_Max=Duration_27M;
+                                            Complete_Stream->Streams[pid]->TimeStamp_Distance_Total+=Duration_27M;
+                                            Complete_Stream->Streams[pid]->TimeStamp_Distance_Count++;
+                                        #endif // MEDIAINFO_ADVANCED
+                                    }
+                                    Complete_Stream->Streams[pid]->TimeStamp_End=program_clock_reference;
+                                    Complete_Stream->Streams[pid]->TimeStamp_End_IsUpdated=true;
+                                    Complete_Stream->Streams[pid]->TimeStamp_End_Offset=File_Offset+Buffer_Offset;
+                                    {
+                                        Status[IsUpdated]=true;
+                                        Status[User_16]=true;
+                                    }
                                 }
-                                if (Complete_Stream->Streams[pid].Searching_TimeStamp_Start)
+                                if (Complete_Stream->Streams[pid]->Searching_TimeStamp_Start)
                                 {
                                     //This is the first PCR
-                                    Complete_Stream->Streams[pid].TimeStamp_Start=program_clock_reference;
-                                    Complete_Stream->Streams[pid].TimeStamp_Start_Offset=File_Offset+Buffer_Offset;
-                                    Complete_Stream->Streams[pid].TimeStamp_End=program_clock_reference;
-                                    Complete_Stream->Streams[pid].TimeStamp_End_Offset=File_Offset+Buffer_Offset;
-                                    Complete_Stream->Streams[pid].Searching_TimeStamp_Start_Set(false);
-                                    Complete_Stream->Streams[pid].Searching_TimeStamp_End_Set(true);
+                                    Complete_Stream->Streams[pid]->TimeStamp_Start=program_clock_reference;
+                                    Complete_Stream->Streams[pid]->TimeStamp_Start_Offset=File_Offset+Buffer_Offset;
+                                    Complete_Stream->Streams[pid]->TimeStamp_End=program_clock_reference;
+                                    Complete_Stream->Streams[pid]->TimeStamp_End_IsUpdated=true;
+                                    Complete_Stream->Streams[pid]->TimeStamp_End_Offset=File_Offset+Buffer_Offset;
+                                    Complete_Stream->Streams[pid]->Searching_TimeStamp_Start_Set(false);
+                                    Complete_Stream->Streams[pid]->Searching_TimeStamp_End_Set(true);
                                     Complete_Stream->Streams_With_StartTimeStampCount++;
+                                    {
+                                        Status[IsUpdated]=true;
+                                        Status[User_16]=true;
+                                    }
                                 }
 
                                 //Test if we can find the TS bitrate
-                                if (!Complete_Stream->Streams[pid].EndTimeStampMoreThanxSeconds && Complete_Stream->Streams[pid].TimeStamp_Start!=(int64u)-1)
+                                if (!Complete_Stream->Streams[pid]->EndTimeStampMoreThanxSeconds && Complete_Stream->Streams[pid]->TimeStamp_Start!=(int64u)-1
+                                && (File_Offset+Buffer_Offset-Buffer_TotalBytes_FirstSynched)*2<File_Size)
                                 {
-                                    if (program_clock_reference<Complete_Stream->Streams[pid].TimeStamp_Start)
+                                    if (program_clock_reference<Complete_Stream->Streams[pid]->TimeStamp_Start)
                                         program_clock_reference+=0x200000000LL*300; //33 bits, cyclic
-                                    if ((program_clock_reference-Complete_Stream->Streams[pid].TimeStamp_Start)/27000>8000)
+                                    if ((program_clock_reference-Complete_Stream->Streams[pid]->TimeStamp_Start)>Begin_MaxDuration)
                                     {
-                                        Complete_Stream->Streams[pid].EndTimeStampMoreThanxSeconds=true;
+                                        Complete_Stream->Streams[pid]->EndTimeStampMoreThanxSeconds=true;
                                         Complete_Stream->Streams_With_EndTimeStampMoreThanxSecondsCount++;
-                                        if (Complete_Stream->Streams_NotParsedCount==0
+                                        if (Complete_Stream->Streams_NotParsedCount
                                          && Complete_Stream->Streams_With_StartTimeStampCount>0
                                          && Complete_Stream->Streams_With_StartTimeStampCount==Complete_Stream->Streams_With_EndTimeStampMoreThanxSecondsCount)
                                         {
-                                            //We are already parsing 4 seconds (for all PCRs), we don't hope to have more info
-                                            MpegTs_JumpTo_Begin=File_Offset+Buffer_Offset;
+                                            //We are already parsing 16 seconds (for all PCRs), we don't hope to have more info
+                                            MpegTs_JumpTo_Begin=File_Offset+Buffer_Offset-Buffer_TotalBytes_FirstSynched;
                                             MpegTs_JumpTo_End=MpegTs_JumpTo_Begin;
                                         }
                                     }
@@ -756,15 +1393,16 @@
             #endif //MEDIAINFO_MPEGTS_PCR_YES
         }
 
-        //File__Duplicate
-        if (Stream->ShouldDuplicate)
-        {
-            Element_Size=TS_Size;
-            File__Duplicate_Write(pid);
-        }
+        #if MEDIAINFO_DUPLICATE
+            if (Stream->ShouldDuplicate)
+            {
+                Element_Size=TS_Size;
+                File__Duplicate_Write();
+            }
+        #endif //MEDIAINFO_DUPLICATE
 
         Header_Parse_Events();
-        
+
         Buffer_Offset+=TS_Size;
     }
 
@@ -778,24 +1416,41 @@
     //Default values
     Complete_Stream=new complete_stream;
     Complete_Stream->Streams.resize(0x2000);
-    Complete_Stream->Streams[0x0000].Searching_Payload_Start_Set(true);
-    Complete_Stream->Streams[0x0000].Kind=complete_stream::stream::psi;
-    Complete_Stream->Streams[0x0000].Table_IDs.resize(0x100);
-    Complete_Stream->Streams[0x0000].Table_IDs[0x00]=new complete_stream::stream::table_id; //program_association_section
-    Complete_Stream->Streams[0x0001].Searching_Payload_Start_Set(true);
-    Complete_Stream->Streams[0x0001].Kind=complete_stream::stream::psi;
-    Complete_Stream->Streams[0x0001].Table_IDs.resize(0x100);
-    Complete_Stream->Streams[0x0001].Table_IDs[0x01]=new complete_stream::stream::table_id; //conditional_access_section
+    for (size_t StreamID=0; StreamID<0x2000; StreamID++)
+        Complete_Stream->Streams[StreamID]=new complete_stream::stream;
+    Complete_Stream->Streams[0x0000]->Searching_Payload_Start_Set(true);
+    Complete_Stream->Streams[0x0000]->Kind=complete_stream::stream::psi;
+    Complete_Stream->Streams[0x0000]->Table_IDs.resize(0x100);
+    Complete_Stream->Streams[0x0000]->Table_IDs[0x00]=new complete_stream::stream::table_id; //program_association_section
+    Complete_Stream->Streams[0x0001]->Searching_Payload_Start_Set(true);
+    Complete_Stream->Streams[0x0001]->Kind=complete_stream::stream::psi;
+    Complete_Stream->Streams[0x0001]->Table_IDs.resize(0x100);
+    Complete_Stream->Streams[0x0001]->Table_IDs[0x01]=new complete_stream::stream::table_id; //conditional_access_section
 
     //Temp
-    MpegTs_JumpTo_Begin=(File_Offset_FirstSynched==(int64u)-1?0:File_Offset_FirstSynched)+MediaInfoLib::Config.MpegTs_MaximumOffset_Get();
-    MpegTs_JumpTo_End=16*1024*1024;
-    if (MpegTs_JumpTo_Begin+MpegTs_JumpTo_End>=File_Size)
+    MpegTs_JumpTo_Begin=(File_Offset_FirstSynched==(int64u)-1?0:Buffer_TotalBytes_LastSynched)+MediaInfoLib::Config.MpegTs_MaximumOffset_Get();
+    MpegTs_JumpTo_End=32*1024*1024;
+    Buffer_TotalBytes_LastSynched=Buffer_TotalBytes_FirstSynched;
+    if (MpegTs_JumpTo_Begin==(int64u)-1 || MpegTs_JumpTo_Begin+MpegTs_JumpTo_End>=File_Size)
     {
-        MpegTs_JumpTo_Begin=File_Size;
-        MpegTs_JumpTo_End=File_Size;
+        if (MpegTs_JumpTo_Begin+MpegTs_JumpTo_End>File_Size)
+        {
+            MpegTs_JumpTo_Begin=File_Size;
+            MpegTs_JumpTo_End=0;
+        }
+        else
+            MpegTs_JumpTo_Begin=File_Size-MpegTs_JumpTo_End;
     }
 
+    //Config
+    Config_Trace_TimeSection_OnlyFirstOccurrence=MediaInfoLib::Config.Trace_TimeSection_OnlyFirstOccurrence_Get();
+    TimeSection_FirstOccurrenceParsed=false;
+    #if MEDIAINFO_ADVANCED
+        Config_VbrDetection_Delta=MediaInfoLib::Config.MpegTs_VbrDetection_Delta_Get();
+        Config_VbrDetection_Occurences=MediaInfoLib::Config.MpegTs_VbrDetection_Occurences_Get();
+        Config_VbrDetection_GiveUp=MediaInfoLib::Config.MpegTs_VbrDetection_GiveUp_Get();
+    #endif // MEDIAINFO_ADVANCED
+
     //Continue, again, for Duplicate and Filter
     Option_Manage();
 }
@@ -814,21 +1469,31 @@
     {
         //End timestamp is out of date
         #if defined(MEDIAINFO_MPEGTS_PCR_YES) || defined(MEDIAINFO_MPEGTS_PESTIMESTAMP_YES)
-        Complete_Stream->Streams[StreamID].Searching_TimeStamp_Start_Set(false); //No more searching start
-        Complete_Stream->Streams[StreamID].TimeStamp_End=(int64u)-1;
-        Complete_Stream->Streams[StreamID].TimeStamp_End_Offset=(int64u)-1;
-        if (Complete_Stream->Streams[StreamID].TimeStamp_Start!=(int64u)-1)
-            Complete_Stream->Streams[StreamID].Searching_TimeStamp_End_Set(true); //Searching only for a start found
+        Complete_Stream->Streams[StreamID]->Searching_TimeStamp_Start_Set(false); //No more searching start
+        Complete_Stream->Streams[StreamID]->TimeStamp_End=(int64u)-1;
+        Complete_Stream->Streams[StreamID]->TimeStamp_End_IsUpdated=false;
+        Complete_Stream->Streams[StreamID]->TimeStamp_End_Offset=(int64u)-1;
+        if (Complete_Stream->Streams[StreamID]->TimeStamp_Start!=(int64u)-1)
+            Complete_Stream->Streams[StreamID]->Searching_TimeStamp_End_Set(true); //Searching only for a start found
         #endif //defined(MEDIAINFO_MPEGTS_PCR_YES) ||  defined(MEDIAINFO_MPEGTS_PESTIMESTAMP_YES)
-        if (Complete_Stream->Streams[StreamID].Parser)
+        if (Complete_Stream->Streams[StreamID]->Parser)
         {
             #ifdef MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
-                Complete_Stream->Streams[StreamID].Searching_ParserTimeStamp_Start_Set(false); //No more searching start
-                if (((File_MpegPs*)Complete_Stream->Streams[StreamID].Parser)->HasTimeStamps)
-                    Complete_Stream->Streams[StreamID].Searching_ParserTimeStamp_End_Set(true); //Searching only for a start found
+                Complete_Stream->Streams[StreamID]->Searching_ParserTimeStamp_Start_Set(false); //No more searching start
+                if (((File_MpegPs*)Complete_Stream->Streams[StreamID]->Parser)->HasTimeStamps)
+                    Complete_Stream->Streams[StreamID]->Searching_ParserTimeStamp_End_Set(true); //Searching only for a start found
             #endif //MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
-            Complete_Stream->Streams[StreamID].Parser->Open_Buffer_Unsynch();
-        }
+            if (File_GoTo==0)
+                Complete_Stream->Streams[StreamID]->Parser->Unsynch_Frame_Count=0;
+            Complete_Stream->Streams[StreamID]->Parser->Open_Buffer_Unsynch();
+        }
+        #if MEDIAINFO_IBI
+            Complete_Stream->Streams[StreamID]->Ibi_SynchronizationOffset_BeginOfFrame=(int64u)-1;
+            for (complete_stream::stream::table_ids::iterator TableID=Complete_Stream->Streams[StreamID]->Table_IDs.begin(); TableID!=Complete_Stream->Streams[StreamID]->Table_IDs.end(); TableID++)
+                if (*TableID)
+                    for (complete_stream::stream::table_id::table_id_extensions::iterator TableIdExtension=(*TableID)->Table_ID_Extensions.begin(); TableIdExtension!=(*TableID)->Table_ID_Extensions.end(); TableIdExtension++)
+                        TableIdExtension->second.version_number=(int8u)-1;
+        #endif //MEDIAINFO_IBI
     }
     Complete_Stream->Duration_End.clear();
 
@@ -839,6 +1504,308 @@
         Clear(Stream_Menu, StreamPos, Menu_Duration);
 }
 
+//---------------------------------------------------------------------------
+void File_MpegTs::Read_Buffer_Continue()
+{
+    if (!IsSub)
+    {
+        if (Config->ParseSpeed>=1.0)
+            Config->State_Set(((float)Buffer_TotalBytes)/File_Size);
+        else if (Buffer_TotalBytes>MpegTs_JumpTo_Begin+MpegTs_JumpTo_End)
+            Config->State_Set((float)0.99); //Nearly the end
+        else
+            Config->State_Set(((float)Buffer_TotalBytes)/(MpegTs_JumpTo_Begin+MpegTs_JumpTo_End));
+    }
+
+    #if MEDIAINFO_DEMUX
+        if (Complete_Stream && pid<0x2000 && Complete_Stream->Streams[pid]->Kind==complete_stream::stream::pes && Complete_Stream->Streams[pid]->Parser && ((File_MpegPs*)Complete_Stream->Streams[pid]->Parser)->Demux_StreamIsBeingParsed_type!=(int8u)-1)
+        {
+            Open_Buffer_Continue(Complete_Stream->Streams[pid]->Parser, Buffer, 0);
+            PES_Parse_Finish();
+        }
+    #endif //MEDIAINFO_DEMUX
+}
+
+//---------------------------------------------------------------------------
+void File_MpegTs::Read_Buffer_AfterParsing()
+{
+    if (Complete_Stream==NULL)
+        return; //No synchronization yet
+
+    if (!Status[IsFilled])
+    {
+        //Test if parsing of headers is OK
+        if ((Complete_Stream->Streams_NotParsedCount==0 && (Complete_Stream->NoPatPmt || (Complete_Stream->transport_stream_id_IsValid && Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs_NotParsedCount==0)))
+         || (Buffer_TotalBytes-Buffer_TotalBytes_FirstSynched>=MpegTs_JumpTo_Begin && Config->ParseSpeed<0.8)
+         || File_Offset+Buffer_Size==File_Size)
+        {
+            //Test if PAT/PMT are missing (ofen in .trp files)
+            if (!Complete_Stream->transport_stream_id_IsValid
+             && !Complete_Stream->NoPatPmt)
+            {
+                //Activating all streams as PES
+                for (size_t StreamID=0; StreamID<0x2000; StreamID++)
+                {
+                    delete Complete_Stream->Streams[StreamID]; Complete_Stream->Streams[StreamID]=new complete_stream::stream;
+                }
+                for (size_t StreamID=0x20; StreamID<0x1FFF; StreamID++)
+                {
+                    Complete_Stream->Streams_NotParsedCount=(size_t)-1;
+                    Complete_Stream->Streams[StreamID]->Kind=complete_stream::stream::pes;
+                    Complete_Stream->Streams[StreamID]->Searching_Payload_Start_Set(true);
+                    Complete_Stream->Streams[StreamID]->Searching_Payload_Continue_Set(false);
+                    #if MEDIAINFO_TRACE
+                        if (Trace_Activated)
+                            Complete_Stream->Streams[StreamID]->Element_Info1="PES";
+                    #endif //MEDIAINFO_TRACE
+                    #ifdef MEDIAINFO_MPEGTS_PCR_YES
+                        Complete_Stream->Streams[StreamID]->Searching_TimeStamp_Start_Set(true);
+                        Complete_Stream->Streams[StreamID]->Searching_TimeStamp_End_Set(false);
+                    #endif //MEDIAINFO_MPEGTS_PCR_YES
+                    #ifdef MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
+                        Complete_Stream->Streams[StreamID]->Searching_ParserTimeStamp_Start_Set(true);
+                        Complete_Stream->Streams[StreamID]->Searching_ParserTimeStamp_End_Set(false);
+                    #endif //MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
+                }
+                Complete_Stream->NoPatPmt=true;
+                Fill(Stream_General, 0, General_Format_Profile, "No PAT/PMT");
+                Buffer_TotalBytes=0;
+                Buffer_TotalBytes_LastSynched=(int64u)-1;
+                Open_Buffer_Unsynch();
+                GoTo(0);
+                return;
+            }
+
+            //Filling
+            for (std::set<int16u>::iterator StreamID=Complete_Stream->PES_PIDs.begin(); StreamID!=Complete_Stream->PES_PIDs.end(); StreamID++)
+            {
+                if (Complete_Stream->Streams[*StreamID]->Parser)
+                {
+                    Fill(Complete_Stream->Streams[*StreamID]->Parser);
+
+                    Complete_Stream->Streams[*StreamID]->Parser->Status[IsUpdated]=false;
+                    Complete_Stream->Streams[*StreamID]->IsUpdated_Info=true;
+                }
+
+                for (size_t Pos=0; Pos<Complete_Stream->Streams[*StreamID]->program_numbers.size(); Pos++)
+                    Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[Complete_Stream->Streams[*StreamID]->program_numbers[Pos]].Update_Needed_IsRegistered=true;
+            }
+            Complete_Stream->Streams_NotParsedCount=0;
+            Fill();
+
+            //Deactivating
+            if (Config->File_StopSubStreamAfterFilled_Get())
+                for (std::set<int16u>::iterator StreamID=Complete_Stream->PES_PIDs.begin(); StreamID!=Complete_Stream->PES_PIDs.end(); StreamID++)
+                {
+                    Complete_Stream->Streams[*StreamID]->Searching_Payload_Start_Set(false);
+                    Complete_Stream->Streams[*StreamID]->Searching_Payload_Continue_Set(false);
+                }
+
+            //Status
+            Status[IsUpdated]=true;
+            Status[User_19]=true;
+
+            //Jumping
+            if (Config->ParseSpeed<1.0 && Config->File_IsSeekable_Get() && File_Offset+Buffer_Size<File_Size-MpegTs_JumpTo_End && MpegTs_JumpTo_End)
+            {
+                #if !defined(MEDIAINFO_MPEGTS_PCR_YES) && !defined(MEDIAINFO_MPEGTS_PESTIMESTAMP_YES)
+                    GoToFromEnd(47); //TODO: Should be changed later (when Finalize stuff will be split)
+                #else //!defined(MEDIAINFO_MPEGTS_PCR_YES) && !defined(MEDIAINFO_MPEGTS_PESTIMESTAMP_YES)
+                    GoToFromEnd(MpegTs_JumpTo_End);
+                    Searching_TimeStamp_Start=false;
+                #endif //!defined(MEDIAINFO_MPEGTS_PCR_YES) && !defined(MEDIAINFO_MPEGTS_PESTIMESTAMP_YES)
+                Open_Buffer_Unsynch();
+            }
+        }
+    }
+}
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_SEEK
+size_t File_MpegTs::Read_Buffer_Seek (size_t Method, int64u Value, int64u ID)
+{
+    //Reset
+    Seek_Value=(int64u)-1;
+    Seek_ID=(int64u)-1;
+    InfiniteLoop_Detect=0;
+    Config->Demux_IsSeeking=false;
+
+    //Init
+    if (!Duration_Detected)
+    {
+        //External IBI
+        std::string IbiFile=Config->Ibi_Get();
+        if (!IbiFile.empty())
+        {
+            Ibi.Streams.clear(); //TODO: support IBI data from different inputs
+
+            File_Ibi MI;
+            Open_Buffer_Init(&MI, IbiFile.size());
+            MI.Ibi=&Ibi;
+            MI.Open_Buffer_Continue((const int8u*)IbiFile.c_str(), IbiFile.size());
+        }
+        //Creating base IBI from a quick analysis of the file
+        else
+        {
+            MediaInfo_Internal MI;
+            MI.Option(__T("File_KeepInfo"), __T("1"));
+            Ztring ParseSpeed_Save=MI.Option(__T("ParseSpeed_Get"), __T(""));
+            Ztring Demux_Save=MI.Option(__T("Demux_Get"), __T(""));
+            MI.Option(__T("ParseSpeed"), __T("0"));
+            MI.Option(__T("Demux"), Ztring());
+            Ztring File_Names=Config->File_Names.Read();
+            MI.Option(__T("File_FileNameFormat"), __T("CSV"));
+            size_t MiOpenResult=MI.Open(File_Names);
+            MI.Option(__T("ParseSpeed"), ParseSpeed_Save); //This is a global value, need to reset it. TODO: local value
+            MI.Option(__T("Demux"), Demux_Save); //This is a global value, need to reset it. TODO: local value
+            if (!MiOpenResult)
+                return 0;
+            for (ibi::streams::iterator IbiStream_Temp=((File_MpegTs*)MI.Info)->Ibi.Streams.begin(); IbiStream_Temp!=((File_MpegTs*)MI.Info)->Ibi.Streams.end(); IbiStream_Temp++)
+            {
+                if (Ibi.Streams[IbiStream_Temp->first]==NULL)
+                    Ibi.Streams[IbiStream_Temp->first]=new ibi::stream(*IbiStream_Temp->second);
+                Ibi.Streams[IbiStream_Temp->first]->Unsynch();
+                for (size_t Pos=0; Pos<IbiStream_Temp->second->Infos.size(); Pos++)
+                {
+                    Ibi.Streams[IbiStream_Temp->first]->Add(IbiStream_Temp->second->Infos[Pos]);
+                    if (!IbiStream_Temp->second->Infos[Pos].IsContinuous)
+                        Ibi.Streams[IbiStream_Temp->first]->Unsynch();
+                }
+                Ibi.Streams[IbiStream_Temp->first]->Unsynch();
+            }
+            if (Ibi.Streams.empty())
+                return 4; //Problem during IBI file parsing
+        }
+
+        Duration_Detected=true;
+    }
+
+    //Parsing
+    switch (Method)
+    {
+        case 0  :
+                    GoTo(Value);
+                    Open_Buffer_Unsynch();
+                    return 1;
+        case 1  :
+                    GoTo(File_Size*Value/10000);
+                    Open_Buffer_Unsynch();
+                    return 1;
+        case 2  :   //Timestamp
+                    #if MEDIAINFO_IBI
+                    {
+                    ibi::streams::iterator IbiStream_Temp;
+                    if (ID==(int64u)-1)
+                        IbiStream_Temp=Ibi.Streams.begin();
+                    else
+                        IbiStream_Temp=Ibi.Streams.find(ID);
+                    if (IbiStream_Temp==Ibi.Streams.end() || IbiStream_Temp->second->Infos.empty())
+                    {
+                        for (IbiStream_Temp=Ibi.Streams.begin(); IbiStream_Temp!=Ibi.Streams.end(); IbiStream_Temp++)
+                            if (!IbiStream_Temp->second->Infos.empty())
+                                break;
+
+                        if (IbiStream_Temp==Ibi.Streams.end())
+                            return 5; //Invalid ID
+                    }
+
+                    if (!(IbiStream_Temp->second->DtsFrequencyNumerator==1000000000 && IbiStream_Temp->second->DtsFrequencyDenominator==1))
+                    {
+                        float64 ValueF=(float64)Value;
+                        ValueF/=1000000000; //Value is in ns
+                        ValueF/=IbiStream_Temp->second->DtsFrequencyDenominator;
+                        ValueF*=IbiStream_Temp->second->DtsFrequencyNumerator;
+                        Value=float64_int64s(ValueF);
+                    }
+
+                    for (size_t Pos=0; Pos<IbiStream_Temp->second->Infos.size(); Pos++)
+                    {
+                        if (Value<=IbiStream_Temp->second->Infos[Pos].Dts || Pos+1==IbiStream_Temp->second->Infos.size())
+                        {
+                            if (Value<IbiStream_Temp->second->Infos[Pos].Dts && Pos)
+                                Pos--;
+
+                            //Checking continuity of Ibi
+                            if (!IbiStream_Temp->second->Infos[Pos].IsContinuous && Pos+1<IbiStream_Temp->second->Infos.size() && InfiniteLoop_Detect<8) //With infinite loop detect
+                            {
+                                InfiniteLoop_Detect++;
+                                Config->Demux_IsSeeking=true;
+                                Seek_Value=Value;
+                                Seek_Value_Maximal=IbiStream_Temp->second->Infos[Pos+1].StreamOffset;
+                                Seek_ID=IbiStream_Temp->first;
+                                GoTo((IbiStream_Temp->second->Infos[Pos].StreamOffset+IbiStream_Temp->second->Infos[Pos+1].StreamOffset)/2);
+                                Open_Buffer_Unsynch();
+
+                                return 1;
+                            }
+
+                            InfiniteLoop_Detect=0;
+                            Config->Demux_IsSeeking=false;
+                            if (Complete_Stream && Complete_Stream->Streams[(size_t)IbiStream_Temp->first] && Complete_Stream->Streams[(size_t)IbiStream_Temp->first]->Parser)
+                                Complete_Stream->Streams[(size_t)IbiStream_Temp->first]->Parser->Unsynch_Frame_Count=IbiStream_Temp->second->Infos[Pos].FrameNumber;
+                            else
+                                Unsynch_Frame_Counts[(int16u)IbiStream_Temp->first]=IbiStream_Temp->second->Infos[Pos].FrameNumber;
+
+                            GoTo(IbiStream_Temp->second->Infos[Pos].StreamOffset);
+                            Open_Buffer_Unsynch();
+
+                            return 1;
+                        }
+                    }
+
+                    return 2; //Invalid value
+                    }
+                    #else //MEDIAINFO_IBI
+                    return (size_t)-2; //Not supported / IBI disabled
+                    #endif //MEDIAINFO_IBI
+        case 3  :   //FrameNumber
+                    #if MEDIAINFO_IBI
+                    {
+                    ibi::streams::iterator IbiStream_Temp;
+                    if (ID==(int64u)-1)
+                        IbiStream_Temp=Ibi.Streams.begin();
+                    else
+                        IbiStream_Temp=Ibi.Streams.find(ID);
+                    if (IbiStream_Temp==Ibi.Streams.end() || IbiStream_Temp->second->Infos.empty())
+                    {
+                        for (IbiStream_Temp=Ibi.Streams.begin(); IbiStream_Temp!=Ibi.Streams.end(); IbiStream_Temp++)
+                            if (!IbiStream_Temp->second->Infos.empty())
+                                break;
+
+                        if (IbiStream_Temp==Ibi.Streams.end())
+                            return 5; //Invalid ID
+                    }
+
+                    for (size_t Pos=0; Pos<IbiStream_Temp->second->Infos.size(); Pos++)
+                    {
+                        if (Value<=IbiStream_Temp->second->Infos[Pos].FrameNumber || Pos+1==IbiStream_Temp->second->Infos.size())
+                        {
+                            if (Value<IbiStream_Temp->second->Infos[Pos].FrameNumber && Pos)
+                                Pos--;
+
+                            Config->Demux_IsSeeking=false;
+                            if (Complete_Stream && Complete_Stream->Streams[(size_t)IbiStream_Temp->first] && Complete_Stream->Streams[(size_t)IbiStream_Temp->first]->Parser)
+                                Complete_Stream->Streams[(size_t)IbiStream_Temp->first]->Parser->Unsynch_Frame_Count=IbiStream_Temp->second->Infos[Pos].FrameNumber;
+                            else
+                                Unsynch_Frame_Counts[(int16u)IbiStream_Temp->first]=IbiStream_Temp->second->Infos[Pos].FrameNumber;
+
+                            GoTo(IbiStream_Temp->second->Infos[Pos].StreamOffset);
+                            Open_Buffer_Unsynch();
+
+                            return 1;
+                        }
+                    }
+
+                    return 2; //Invalid value
+                    }
+                    #else //MEDIAINFO_IBI
+                    return (size_t)-2; //Not supported / IBI disabled
+                    #endif //MEDIAINFO_IBI
+        default :   return (size_t)-1; //Not supported
+    }
+}
+#endif //MEDIAINFO_SEEK
+
 //***************************************************************************
 // Buffer - File header
 //***************************************************************************
@@ -846,6 +1813,24 @@
 //---------------------------------------------------------------------------
 bool File_MpegTs::FileHeader_Begin()
 {
+    if (Buffer_Size<8)
+        return false; //Wait for more data
+
+    //False positives detection: detect some headers from other files, DV parser is not smart enough
+    if (CC8(Buffer+Buffer_Offset)==0x444C472056312E30LL //DLG
+     || CC4(Buffer)==0x52494646  //RIFF
+     || CC4(Buffer+4)==0x66747970  //ftyp
+     || CC4(Buffer+4)==0x66726565  //free
+     || CC4(Buffer+4)==0x6D646174  //mdat
+     || CC4(Buffer+4)==0x6D6F6F76  //moov
+     || CC4(Buffer+4)==0x736B6970  //skip
+     || CC4(Buffer+4)==0x77696465  //wide
+     || CC4(Buffer)==0x060E2B34) //MXF begin
+    {
+        Reject("MPEG-TS");
+        return true;
+    }
+
     //Configuring
     #if defined(MEDIAINFO_BDAV_YES) || defined(MEDIAINFO_TSP_YES)
         TS_Size=188
@@ -870,324 +1855,427 @@
 
 //---------------------------------------------------------------------------
 void File_MpegTs::Header_Parse()
-#if MEDIAINFO_TRACE
 {
-    //Parsing
-    int8u transport_scrambling_control;
-    bool  adaptation, payload;
-    if (BDAV_Size)
-        Skip_B4(                                                "BDAV"); //BDAV supplement
-    Skip_B1(                                                    "sync_byte");
-    BS_Begin();
-    Skip_SB(                                                    "transport_error_indicator");
-    Get_SB (    payload_unit_start_indicator,                   "payload_unit_start_indicator");
-    Skip_SB(                                                    "transport_priority");
-    Get_S2 (13, pid,                                            "pid");
-    Get_S1 ( 2, transport_scrambling_control,                   "transport_scrambling_control");
-    Get_SB (    adaptation,                                     "adaptation_field_control (adaptation)");
-    Get_SB (    payload,                                        "adaptation_field_control (payload)");
-    Skip_S1( 4,                                                 "continuity_counter");
-    BS_End();
-
-    //Info
-    if (!Complete_Stream->Streams[pid].program_numbers.empty())
+    #if MEDIAINFO_TRACE
+    if (Trace_Activated)
     {
-        Ztring Program_Numbers;
-        for (size_t Pos=0; Pos<Complete_Stream->Streams[pid].program_numbers.size(); Pos++)
-            Program_Numbers+=Ztring::ToZtring_From_CC2(Complete_Stream->Streams[pid].program_numbers[Pos])+_T('/');
-        if (!Program_Numbers.empty())
-            Program_Numbers.resize(Program_Numbers.size()-1);
-        Data_Info(Program_Numbers);
-    }
-    else
-        Data_Info("    ");
-    Data_Info(Complete_Stream->Streams[pid].Element_Info);
+        //Parsing
+        bool  adaptation, payload;
+        if (BDAV_Size)
+            Skip_B4(                                                "BDAV"); //BDAV supplement
+        Skip_B1(                                                    "sync_byte");
+        BS_Begin();
+        Skip_SB(                                                    "transport_error_indicator");
+        Get_SB (    payload_unit_start_indicator,                   "payload_unit_start_indicator");
+        Skip_SB(                                                    "transport_priority");
+        Get_S2 (13, pid,                                            "pid");
+        Get_S1 ( 2, transport_scrambling_control,                   "transport_scrambling_control");
+        Get_SB (    adaptation,                                     "adaptation_field_control (adaptation)");
+        Get_SB (    payload,                                        "adaptation_field_control (payload)");
+        Skip_S1( 4,                                                 "continuity_counter");
+        BS_End();
 
-    //Adaptation
-    if (adaptation)
-        Header_Parse_AdaptationField();
+        //Info
+        /* Trace: used to display program number(s)
+        if (!Complete_Stream->Streams[pid]->program_numbers.empty())
+        {
+            Ztring Program_Numbers;
+            for (size_t Pos=0; Pos<Complete_Stream->Streams[pid]->program_numbers.size(); Pos++)
+                Program_Numbers+=Ztring::ToZtring_From_CC2(Complete_Stream->Streams[pid]->program_numbers[Pos])+__T('/');
+            if (!Program_Numbers.empty())
+                Program_Numbers.resize(Program_Numbers.size()-1);
+            Data_Info(Program_Numbers);
+        }
+        else
+            Data_Info("    ");
+        */
+        Data_Info(Complete_Stream->Streams[pid]->Element_Info1);
+
+        //Adaptation
+        if (adaptation)
+            Header_Parse_AdaptationField();
+        else
+        {
+        }
 
-    //Data
-    if (payload)
-    {
-        //Encryption
-        if (transport_scrambling_control>0)
-            Complete_Stream->Streams[pid].IsScrambled++;
+        //Data
+        if (payload)
+        {
+            //Encryption
+            if (transport_scrambling_control>0)
+                Complete_Stream->Streams[pid]->IsScrambled++;
+        }
+        else if (Element_Offset<TS_Size)
+            Skip_XX(TS_Size-Element_Offset,                         "Junk");
+
+        //Filling
+        Header_Fill_Code(pid, __T("0x")+Ztring().From_CC2(pid));
+        Header_Fill_Size(TS_Size);
+
+        Header_Parse_Events();
     }
-    else if (Element_Offset<TS_Size)
-        Skip_XX(TS_Size-Element_Offset,                         "Junk");
+    else
+    {
+    #endif //MEDIAINFO_TRACE
+        //Parsing
+               payload_unit_start_indicator=(Buffer[Buffer_Offset+BDAV_Size+1]&0x40)!=0;
+               transport_scrambling_control= Buffer[Buffer_Offset+BDAV_Size+3]&0xC0;
+        bool   adaptation=                  (Buffer[Buffer_Offset+BDAV_Size+3]&0x20)!=0;
+        bool   payload=                     (Buffer[Buffer_Offset+BDAV_Size+3]&0x10)!=0;
+        Element_Offset+=BDAV_Size+4;
+
+        //Adaptation
+        if (adaptation)
+            Header_Parse_AdaptationField();
+        else
+        {
+        }
 
-    //Filling
-    Header_Fill_Code(pid, Ztring().From_CC2(pid));
-    Header_Fill_Size(TS_Size);
+        //Data
+        if (payload)
+        {
+            //Encryption
+            if (transport_scrambling_control>0)
+                Complete_Stream->Streams[pid]->IsScrambled++;
+        }
 
-    Header_Parse_Events();
-}
-#else //MEDIAINFO_TRACE
-{
-    //Parsing
-           payload_unit_start_indicator=(Buffer[Buffer_Offset+BDAV_Size+1]&0x40)!=0;
-    int8u  transport_scrambling_control= Buffer[Buffer_Offset+BDAV_Size+3]&0xC0;
-    bool   adaptation=                  (Buffer[Buffer_Offset+BDAV_Size+3]&0x20)!=0;
-    bool   payload=                     (Buffer[Buffer_Offset+BDAV_Size+3]&0x10)!=0;
-    Element_Offset+=BDAV_Size+4;
-
-    //Adaptation
-    if (adaptation)
-        Header_Parse_AdaptationField();
+        //Filling
+        /*Element[1].Next=File_Offset+Buffer_Offset+TS_Size;  //*/Header_Fill_Size(TS_Size);
+        //Element[1].IsComplete=true;                         //Header_Fill_Size(TS_Size);
 
-    //Data
-    if (payload)
-    {
-        //Encryption
-        if (transport_scrambling_control>0)
-            Complete_Stream->Streams[pid].IsScrambled++;
+        Header_Parse_Events();
+    #if MEDIAINFO_TRACE
     }
-
-    //Filling
-    Element[1].Next=File_Offset+Buffer_Offset+TS_Size;  //Header_Fill_Size(TS_Size);
-    Element[1].IsComplete=true;                         //Header_Fill_Size(TS_Size);
-
-    Header_Parse_Events();
+    #endif //MEDIAINFO_TRACE
 }
-#endif //MEDIAINFO_TRACE
 
 //---------------------------------------------------------------------------
 void File_MpegTs::Header_Parse_AdaptationField()
-#if MEDIAINFO_TRACE
 {
-    int64u Element_Pos_Save=Element_Offset;
-    Element_Begin("adaptation_field");
-    int8u Adaptation_Size;
-    Get_B1 (Adaptation_Size,                                    "adaptation_field_length");
-    if (Adaptation_Size>188-4-1) //TS size - header - adaptation_field_length
-    {
-        Adaptation_Size=188-4-1;
-        Skip_XX(188-4-1,                                        "stuffing_bytes");
-    }
-    else if (Adaptation_Size>0)
+    #if MEDIAINFO_TRACE
+    if (Trace_Activated)
     {
-        bool PCR_flag, OPCR_flag, splicing_point_flag, transport_private_data_flag, adaptation_field_extension_flag;
-        BS_Begin();
-        Skip_SB(                                                "discontinuity_indicator");
-        Skip_SB(                                                "random_access_indicator");
-        Skip_SB(                                                "elementary_stream_priority_indicator");
-        Get_SB (    PCR_flag,                                   "PCR_flag");
-        Get_SB (    OPCR_flag,                                  "OPCR_flag");
-        Get_SB (    splicing_point_flag,                        "splicing_point_flag");
-        Get_SB (    transport_private_data_flag,                "transport_private_data_flag");
-        Get_SB (    adaptation_field_extension_flag,            "adaptation_field_extension_flag");
-        BS_End();
-        if (PCR_flag)
+        int64u Element_Pos_Save=Element_Offset;
+        Element_Begin1("adaptation_field");
+        int8u adaptation_field_length;
+        Get_B1 (adaptation_field_length,                            "adaptation_field_length");
+        if (adaptation_field_length>188-4-1) //TS size - header - adaptation_field_length
         {
-            #ifdef MEDIAINFO_MPEGTS_PCR_YES
-                BS_Begin();
-                int64u program_clock_reference_base;
-                int16u program_clock_reference_extension;
-                Get_S8 (33, program_clock_reference_base,           "program_clock_reference_base"); Param_Info_From_Milliseconds(program_clock_reference_base/90);
-                Data_Info_From_Milliseconds(program_clock_reference_base/90);
-                Skip_S1( 6,                                         "reserved");
-                Get_S2 ( 9, program_clock_reference_extension,      "program_clock_reference_extension");
-                int64u program_clock_reference=program_clock_reference_base*300+program_clock_reference_extension;
-                Param_Info(program_clock_reference);
-                BS_End();
-                if (Complete_Stream->Streams[pid].Searching_TimeStamp_End
-                #ifdef MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
-                 && (!Complete_Stream->Streams[pid].Searching_ParserTimeStamp_End
-                  || Complete_Stream->Streams[pid].IsPCR) //If PCR, we always want it.
-                #endif //MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
-                 )
-                {
-                    Header_Parse_Events_Duration(program_clock_reference);
-                    Complete_Stream->Streams[pid].TimeStamp_End=program_clock_reference;
-                    Complete_Stream->Streams[pid].TimeStamp_End_Offset=File_Offset+Buffer_Offset;
-                    if (Status[IsFilled])
-                        Header_Parse_AdaptationField_Duration_Update();
-                }
-                if (Complete_Stream->Streams[pid].Searching_TimeStamp_Start)
-                {
-                    //This is the first PCR
-                    Complete_Stream->Streams[pid].TimeStamp_Start=program_clock_reference;
-                    Complete_Stream->Streams[pid].TimeStamp_Start_Offset=File_Offset+Buffer_Offset;
-                    Complete_Stream->Streams[pid].TimeStamp_End=program_clock_reference;
-                    Complete_Stream->Streams[pid].TimeStamp_End_Offset=File_Offset+Buffer_Offset;
-                    Complete_Stream->Streams[pid].Searching_TimeStamp_Start_Set(false);
-                    Complete_Stream->Streams[pid].Searching_TimeStamp_End_Set(true);
-                    Complete_Stream->Streams_With_StartTimeStampCount++;
-                }
+            adaptation_field_length=188-4-1;
+            Skip_XX(188-4-1,                                        "stuffing_bytes");
+        }
+        else if (adaptation_field_length>0)
+        {
+            bool PCR_flag, OPCR_flag, splicing_point_flag, transport_private_data_flag, adaptation_field_extension_flag;
+            BS_Begin();
+            Skip_SB(                                                "discontinuity_indicator");
+            Skip_SB(                                                "random_access_indicator");
+            Skip_SB(                                                "elementary_stream_priority_indicator");
+            Get_SB (    PCR_flag,                                   "PCR_flag");
+            Get_SB (    OPCR_flag,                                  "OPCR_flag");
+            Get_SB (    splicing_point_flag,                        "splicing_point_flag");
+            Get_SB (    transport_private_data_flag,                "transport_private_data_flag");
+            Get_SB (    adaptation_field_extension_flag,            "adaptation_field_extension_flag");
+            BS_End();
+            if (PCR_flag)
+            {
+                #ifdef MEDIAINFO_MPEGTS_PCR_YES
+                    BS_Begin();
+                    int64u program_clock_reference_base;
+                    int16u program_clock_reference_extension;
+                    Get_S8 (33, program_clock_reference_base,           "program_clock_reference_base"); Param_Info_From_Milliseconds(program_clock_reference_base/90);
+                    Data_Info_From_Milliseconds(program_clock_reference_base/90);
+                    Skip_S1( 6,                                         "reserved");
+                    Get_S2 ( 9, program_clock_reference_extension,      "program_clock_reference_extension");
+                    int64u program_clock_reference=program_clock_reference_base*300+program_clock_reference_extension;
+                    Param_Info1(program_clock_reference);
+                    BS_End();
+                    if (Complete_Stream->Streams[pid]->Searching_TimeStamp_End
+                    #ifdef MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
+                     && (!Complete_Stream->Streams[pid]->Searching_ParserTimeStamp_End
+                      || Complete_Stream->Streams[pid]->IsPCR) //If PCR, we always want it.
+                    #endif //MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
+                     )
+                    {
+                        Header_Parse_Events_Duration(program_clock_reference);
+                        if (Complete_Stream->Streams[pid]->TimeStamp_End_Offset!=(int64u)-1)
+                        {
+                            if (program_clock_reference+0x12c00000000LL<Complete_Stream->Streams[pid]->TimeStamp_End)
+                                program_clock_reference+=0x25800000000LL; //33 bits and *300
+                            int64u  Duration_27M=program_clock_reference-Complete_Stream->Streams[pid]->TimeStamp_End;
+                            float64 Duration=((float64)Duration_27M)/27000000; //in seconds
+                            float64 Bytes=((float64)(File_Offset+Buffer_Offset-Complete_Stream->Streams[pid]->TimeStamp_End_Offset))*8;
+                            float64 TimeStamp_InstantaneousBitRate=Bytes/Duration;
+                            if (Complete_Stream->Streams[pid]->TimeStamp_InstantaneousBitRate)
+                            {
+                                float64 Config_VbrDetection_Delta_Temp=Config_VbrDetection_Delta;
+                                if (Config_VbrDetection_Delta==0 && TimeStamp_InstantaneousBitRate)
+                                    Config_VbrDetection_Delta_Temp=((float64)(BDAV_Size+188+TSP_Size))/TimeStamp_InstantaneousBitRate;
+                                if (TimeStamp_InstantaneousBitRate<Complete_Stream->Streams[pid]->TimeStamp_InstantaneousBitRate*(1-Config_VbrDetection_Delta_Temp) || TimeStamp_InstantaneousBitRate>Complete_Stream->Streams[pid]->TimeStamp_InstantaneousBitRate*(1+Config_VbrDetection_Delta_Temp))
+                                {
+                                    Complete_Stream->Streams[pid]->TimeStamp_InstantaneousBitRate_BitRateMode_IsVbr++;
+                                    #if MEDIAINFO_ADVANCED
+                                        if (Config_VbrDetection_GiveUp && Complete_Stream->Streams[pid]->TimeStamp_InstantaneousBitRate_BitRateMode_IsVbr>=Config_VbrDetection_Occurences)
+                                            Config->ParseSpeed=0;
+                                    #endif // MEDIAINFO_ADVANCED
+                                }
+                                else
+                                    Complete_Stream->Streams[pid]->TimeStamp_InstantaneousBitRate_BitRateMode_IsCbr++;
+                            }
+                            Complete_Stream->Streams[pid]->TimeStamp_InstantaneousBitRate=TimeStamp_InstantaneousBitRate;
+                            #if MEDIAINFO_ADVANCED
+                                if (Complete_Stream->Streams[pid]->TimeStamp_Distance_Min>Duration_27M)
+                                    Complete_Stream->Streams[pid]->TimeStamp_Distance_Min=Duration_27M;
+                                if (Complete_Stream->Streams[pid]->TimeStamp_Distance_Max<Duration_27M)
+                                    Complete_Stream->Streams[pid]->TimeStamp_Distance_Max=Duration_27M;
+                                Complete_Stream->Streams[pid]->TimeStamp_Distance_Total+=Duration_27M;
+                                Complete_Stream->Streams[pid]->TimeStamp_Distance_Count++;
+                            #endif // MEDIAINFO_ADVANCED
+                        }
+                        Complete_Stream->Streams[pid]->TimeStamp_End=program_clock_reference;
+                        Complete_Stream->Streams[pid]->TimeStamp_End_IsUpdated=true;
+                        Complete_Stream->Streams[pid]->TimeStamp_End_Offset=File_Offset+Buffer_Offset;
+                        {
+                            Status[IsUpdated]=true;
+                            Status[User_16]=true;
+                        }
+                    }
+                    if (Complete_Stream->Streams[pid]->Searching_TimeStamp_Start)
+                    {
+                        //This is the first PCR
+                        Complete_Stream->Streams[pid]->TimeStamp_Start=program_clock_reference;
+                        Complete_Stream->Streams[pid]->TimeStamp_Start_Offset=File_Offset+Buffer_Offset;
+                        Complete_Stream->Streams[pid]->TimeStamp_End=program_clock_reference;
+                        Complete_Stream->Streams[pid]->TimeStamp_End_IsUpdated=true;
+                        Complete_Stream->Streams[pid]->TimeStamp_End_Offset=File_Offset+Buffer_Offset;
+                        Complete_Stream->Streams[pid]->Searching_TimeStamp_Start_Set(false);
+                        Complete_Stream->Streams[pid]->Searching_TimeStamp_End_Set(true);
+                        Complete_Stream->Streams_With_StartTimeStampCount++;
+                        {
+                            Status[IsUpdated]=true;
+                            Status[User_16]=true;
+                        }
+                    }
 
-                //Test if we can find the TS bitrate
-                if (!Complete_Stream->Streams[pid].EndTimeStampMoreThanxSeconds && Complete_Stream->Streams[pid].TimeStamp_Start!=(int64u)-1)
-                {
-                    if (program_clock_reference<Complete_Stream->Streams[pid].TimeStamp_Start)
-                        program_clock_reference+=0x200000000LL*300; //33 bits, cyclic
-                    if ((program_clock_reference-Complete_Stream->Streams[pid].TimeStamp_Start)/27000>8000)
+                    //Test if we can find the TS bitrate
+                    if (!Complete_Stream->Streams[pid]->EndTimeStampMoreThanxSeconds && Complete_Stream->Streams[pid]->TimeStamp_Start!=(int64u)-1
+                    && (File_Offset+Buffer_Offset-Buffer_TotalBytes_FirstSynched)*2<File_Size)
                     {
-                        Complete_Stream->Streams[pid].EndTimeStampMoreThanxSeconds=true;
-                        Complete_Stream->Streams_With_EndTimeStampMoreThanxSecondsCount++;
-                        if (Complete_Stream->Streams_NotParsedCount==0
-                         && Complete_Stream->Streams_With_StartTimeStampCount>0
-                         && Complete_Stream->Streams_With_StartTimeStampCount==Complete_Stream->Streams_With_EndTimeStampMoreThanxSecondsCount)
+                        if (program_clock_reference<Complete_Stream->Streams[pid]->TimeStamp_Start)
+                            program_clock_reference+=0x200000000LL*300; //33 bits, cyclic
+                        if ((program_clock_reference-Complete_Stream->Streams[pid]->TimeStamp_Start)>Begin_MaxDuration)
                         {
-                            //We are already parsing 4 seconds (for all PCRs), we don't hope to have more info
-                            MpegTs_JumpTo_Begin=File_Offset+Buffer_Offset;
-                            MpegTs_JumpTo_End=MpegTs_JumpTo_Begin;
+                            Complete_Stream->Streams[pid]->EndTimeStampMoreThanxSeconds=true;
+                            Complete_Stream->Streams_With_EndTimeStampMoreThanxSecondsCount++;
+                            if (Complete_Stream->Streams_NotParsedCount
+                             && Complete_Stream->Streams_With_StartTimeStampCount>0
+                             && Complete_Stream->Streams_With_StartTimeStampCount==Complete_Stream->Streams_With_EndTimeStampMoreThanxSecondsCount)
+                            {
+                                //We are already parsing 16 seconds (for all PCRs), we don't hope to have more info
+                                MpegTs_JumpTo_Begin=File_Offset+Buffer_Offset-Buffer_TotalBytes_FirstSynched;
+                                MpegTs_JumpTo_End=MpegTs_JumpTo_Begin;
+                            }
                         }
                     }
-                }
-            #else //MEDIAINFO_MPEGTS_PCR_YES
-                Skip_B6(                                        "program_clock_reference");
-            #endif //MEDIAINFO_MPEGTS_PCR_YES
-        }
-        if (OPCR_flag)
-        {
-            BS_Begin();
-            Skip_S8(33,                                         "original_program_clock_reference_base");
-            Skip_S1( 6,                                         "reserved");
-            Skip_S2( 9,                                         "original_program_clock_reference_extension");
-            BS_End();
-        }
-        if (splicing_point_flag)
-        {
-            Skip_B1(                                            "splice_countdown");
-        }
-        if (transport_private_data_flag)
-        {
-            int8u transport_private_data_length;
-            Get_B1 (transport_private_data_length,              "transport_private_data_length");
-            if (Element_Offset+transport_private_data_length<=Element_Pos_Save+1+Adaptation_Size)
-                Skip_XX(transport_private_data_length,          "transport_private_data");
-            else
-                Skip_XX(Element_Pos_Save+1+Adaptation_Size-Element_Offset, "problem");
-        }
-        if (adaptation_field_extension_flag)
-        {
-            int8u adaptation_field_extension_length;
-            Get_B1 (adaptation_field_extension_length,          "adaptation_field_extension_length");
-            if (Element_Offset+adaptation_field_extension_length<=Element_Pos_Save+1+Adaptation_Size)
+                #else //MEDIAINFO_MPEGTS_PCR_YES
+                    Skip_B6(                                        "program_clock_reference");
+                #endif //MEDIAINFO_MPEGTS_PCR_YES
+            }
+            if (OPCR_flag)
             {
-                Element_Begin("adaptation_field_extension", adaptation_field_extension_length);
-                int64u End=Element_Offset+adaptation_field_extension_length;
-                bool ltw_flag, piecewise_rate_flag, seamless_splice_flag;
                 BS_Begin();
-                Get_SB (    ltw_flag,                                   "ltw_flag");
-                Get_SB (    piecewise_rate_flag,                        "piecewise_rate_flag");
-                Get_SB (    seamless_splice_flag,                       "seamless_splice_flag");
-                Skip_S1( 5,                                             "reserved");
-                if (ltw_flag)
-                {
-                    Skip_SB(                                            "ltw_valid_flag");
-                    Skip_S2(15,                                         "ltw_offset");
-                }
-                if (piecewise_rate_flag)
-                {
-                    Skip_S1( 2,                                         "reserved");
-                    Skip_S3(22,                                         "piecewise_rate");
-                }
-                if (seamless_splice_flag)
-                {
-                    Skip_S1( 4,                                         "splice_type");
-                    int16u DTS_29, DTS_14;
-                    int8u  DTS_32;
-                    Element_Begin("DTS");
-                    Get_S1 ( 3, DTS_32,                                 "DTS_32");
-                    Mark_1();
-                    Get_S2 (15, DTS_29,                                 "DTS_29");
-                    Mark_1();
-                    Get_S2 (15, DTS_14,                                 "DTS_14");
-                    Mark_1();
-
-                    //Filling
-                    int64u DTS;
-                    DTS=(((int64u)DTS_32)<<30)
-                      | (((int64u)DTS_29)<<15)
-                      | (((int64u)DTS_14));
-                    Element_Info_From_Milliseconds(DTS/90);
-                    Element_End();
-                }
+                Skip_S8(33,                                         "original_program_clock_reference_base");
+                Skip_S1( 6,                                         "reserved");
+                Skip_S2( 9,                                         "original_program_clock_reference_extension");
                 BS_End();
-                if (Element_Offset<End)
-                    Skip_XX(End-Element_Offset,                         "reserved");
-                Element_End();
             }
-            else
-                Skip_XX(Element_Pos_Save+1+Adaptation_Size-Element_Offset, "problem");
+            if (splicing_point_flag)
+            {
+                Skip_B1(                                            "splice_countdown");
+            }
+            if (transport_private_data_flag)
+            {
+                int8u transport_private_data_length;
+                Get_B1 (transport_private_data_length,              "transport_private_data_length");
+                if (Element_Offset+transport_private_data_length<=Element_Pos_Save+1+adaptation_field_length)
+                    Skip_XX(transport_private_data_length,          "transport_private_data");
+                else
+                    Skip_XX(Element_Pos_Save+1+adaptation_field_length-Element_Offset, "problem");
+            }
+            if (adaptation_field_extension_flag)
+            {
+                int8u adaptation_field_extension_length;
+                Get_B1 (adaptation_field_extension_length,          "adaptation_field_extension_length");
+                if (Element_Offset+adaptation_field_extension_length<=Element_Pos_Save+1+adaptation_field_length)
+                {
+                    Element_Begin1("adaptation_field_extension");
+                    int64u End=Element_Offset+adaptation_field_extension_length;
+                    bool ltw_flag, piecewise_rate_flag, seamless_splice_flag;
+                    BS_Begin();
+                    Get_SB (    ltw_flag,                                   "ltw_flag");
+                    Get_SB (    piecewise_rate_flag,                        "piecewise_rate_flag");
+                    Get_SB (    seamless_splice_flag,                       "seamless_splice_flag");
+                    Skip_S1( 5,                                             "reserved");
+                    if (ltw_flag)
+                    {
+                        Skip_SB(                                            "ltw_valid_flag");
+                        Skip_S2(15,                                         "ltw_offset");
+                    }
+                    if (piecewise_rate_flag)
+                    {
+                        Skip_S1( 2,                                         "reserved");
+                        Skip_S3(22,                                         "piecewise_rate");
+                    }
+                    if (seamless_splice_flag)
+                    {
+                        Skip_S1( 4,                                         "splice_type");
+                        int16u DTS_29, DTS_14;
+                        int8u  DTS_32;
+                        Element_Begin1("DTS");
+                        Get_S1 ( 3, DTS_32,                                 "DTS_32");
+                        Mark_1();
+                        Get_S2 (15, DTS_29,                                 "DTS_29");
+                        Mark_1();
+                        Get_S2 (15, DTS_14,                                 "DTS_14");
+                        Mark_1();
+
+                        //Filling
+                        int64u DTS;
+                        DTS=(((int64u)DTS_32)<<30)
+                          | (((int64u)DTS_29)<<15)
+                          | (((int64u)DTS_14));
+                        Element_Info_From_Milliseconds(DTS/90);
+                        Element_End0();
+                    }
+                    BS_End();
+                    if (Element_Offset<End)
+                        Skip_XX(End-Element_Offset,                         "reserved");
+                    Element_End0();
+                }
+                else
+                    Skip_XX(Element_Pos_Save+1+adaptation_field_length-Element_Offset, "problem");
+            }
         }
-    }
 
-    if (Element_Offset<Element_Pos_Save+1+Adaptation_Size)
-        Skip_XX(Element_Pos_Save+1+Adaptation_Size-Element_Offset, "stuffing_bytes");
-    Element_End(1+Adaptation_Size);
-}
-#else //MEDIAINFO_TRACE
-{
-    int8u Adaptation_Size=Buffer[Buffer_Offset+BDAV_Size+4];
-    #ifdef MEDIAINFO_MPEGTS_PCR_YES
-        if (Adaptation_Size>188-4-1) //TS size - header - adaptation_field_length
-            Adaptation_Size=188-4-1;
-        else if (Adaptation_Size)
-        {
-            bool PCR_flag=(Buffer[Buffer_Offset+BDAV_Size+5]&0x10)!=0;
-            if (PCR_flag)
+        if (Element_Offset<Element_Pos_Save+1+adaptation_field_length)
+            Skip_XX(Element_Pos_Save+1+adaptation_field_length-Element_Offset, "stuffing_bytes");
+        Element_End0();
+    }
+    else
+    {
+    #endif //MEDIAINFO_TRACE
+        int8u adaptation_field_length=Buffer[Buffer_Offset+BDAV_Size+4];
+        #ifdef MEDIAINFO_MPEGTS_PCR_YES
+            if (adaptation_field_length>188-4-1) //TS size - header - adaptation_field_length
+                adaptation_field_length=188-4-1;
+            else if (adaptation_field_length)
             {
-                int64u program_clock_reference=(  (((int64u)Buffer[Buffer_Offset+BDAV_Size+6])<<25)
-                                                | (((int64u)Buffer[Buffer_Offset+BDAV_Size+7])<<17)
-                                                | (((int64u)Buffer[Buffer_Offset+BDAV_Size+8])<< 9)
-                                                | (((int64u)Buffer[Buffer_Offset+BDAV_Size+9])<< 1)
-                                                | (((int64u)Buffer[Buffer_Offset+BDAV_Size+10])>>7));
-                program_clock_reference*=300;
-                program_clock_reference+=(  (((int64u)Buffer[Buffer_Offset+BDAV_Size+10]&0x01)<<8)
-                                          | (((int64u)Buffer[Buffer_Offset+BDAV_Size+11])   ));
-                if (Complete_Stream->Streams[pid].Searching_TimeStamp_End
-                #ifdef MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
-                 && (!Complete_Stream->Streams[pid].Searching_ParserTimeStamp_End
-                  || Complete_Stream->Streams[pid].IsPCR) //If PCR, we always want it.
-                #endif //MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
-                 )
+                bool PCR_flag=(Buffer[Buffer_Offset+BDAV_Size+5]&0x10)!=0;
+                if (PCR_flag)
                 {
-                    Header_Parse_Events_Duration(program_clock_reference);
-                    Complete_Stream->Streams[pid].TimeStamp_End=program_clock_reference;
-                    Complete_Stream->Streams[pid].TimeStamp_End_Offset=File_Offset+Buffer_Offset;
-                    if (Status[IsFilled])
-                        Header_Parse_AdaptationField_Duration_Update();
-                }
-                if (Complete_Stream->Streams[pid].Searching_TimeStamp_Start)
-                {
-                    //This is the first PCR
-                    Complete_Stream->Streams[pid].TimeStamp_Start=program_clock_reference;
-                    Complete_Stream->Streams[pid].TimeStamp_Start_Offset=File_Offset+Buffer_Offset;
-                    Complete_Stream->Streams[pid].TimeStamp_End=program_clock_reference;
-                    Complete_Stream->Streams[pid].TimeStamp_End_Offset=File_Offset+Buffer_Offset;
-                    Complete_Stream->Streams[pid].Searching_TimeStamp_Start_Set(false);
-                    Complete_Stream->Streams[pid].Searching_TimeStamp_End_Set(true);
-                    Complete_Stream->Streams_With_StartTimeStampCount++;
-                }
-
-                //Test if we can find the TS bitrate
-                if (!Complete_Stream->Streams[pid].EndTimeStampMoreThanxSeconds && Complete_Stream->Streams[pid].TimeStamp_Start!=(int64u)-1)
-                {
-                    if (program_clock_reference<Complete_Stream->Streams[pid].TimeStamp_Start)
-                        program_clock_reference+=0x200000000LL*300; //33 bits, cyclic
-                    if ((program_clock_reference-Complete_Stream->Streams[pid].TimeStamp_Start)/27000>8000)
-                    {
-                        Complete_Stream->Streams[pid].EndTimeStampMoreThanxSeconds=true;
-                        Complete_Stream->Streams_With_EndTimeStampMoreThanxSecondsCount++;
-                        if (Complete_Stream->Streams_NotParsedCount==0
-                         && Complete_Stream->Streams_With_StartTimeStampCount>0
-                         && Complete_Stream->Streams_With_StartTimeStampCount==Complete_Stream->Streams_With_EndTimeStampMoreThanxSecondsCount)
-                        {
-                            //We are already parsing 4 seconds (for all PCRs), we don't hope to have more info
-                            MpegTs_JumpTo_Begin=File_Offset+Buffer_Offset;
-                            MpegTs_JumpTo_End=MpegTs_JumpTo_Begin;
+                    int64u program_clock_reference=(  (((int64u)Buffer[Buffer_Offset+BDAV_Size+6])<<25)
+                                                    | (((int64u)Buffer[Buffer_Offset+BDAV_Size+7])<<17)
+                                                    | (((int64u)Buffer[Buffer_Offset+BDAV_Size+8])<< 9)
+                                                    | (((int64u)Buffer[Buffer_Offset+BDAV_Size+9])<< 1)
+                                                    | (((int64u)Buffer[Buffer_Offset+BDAV_Size+10])>>7));
+                    program_clock_reference*=300;
+                    program_clock_reference+=(  (((int64u)Buffer[Buffer_Offset+BDAV_Size+10]&0x01)<<8)
+                                              | (((int64u)Buffer[Buffer_Offset+BDAV_Size+11])   ));
+                    if (Complete_Stream->Streams[pid]->Searching_TimeStamp_End
+                    #ifdef MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
+                     && (!Complete_Stream->Streams[pid]->Searching_ParserTimeStamp_End
+                      || Complete_Stream->Streams[pid]->IsPCR) //If PCR, we always want it.
+                    #endif //MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
+                     )
+                    {
+                        Header_Parse_Events_Duration(program_clock_reference);
+                        if (Complete_Stream->Streams[pid]->TimeStamp_End_Offset!=(int64u)-1)
+                        {
+                            if (program_clock_reference+0x12c00000000LL<Complete_Stream->Streams[pid]->TimeStamp_End)
+                                program_clock_reference+=0x25800000000LL; //33 bits and *300
+                            int64u  Duration_27M=program_clock_reference-Complete_Stream->Streams[pid]->TimeStamp_End;
+                            float64 Duration=((float64)Duration_27M)/27000000; //in seconds
+                            float64 Bytes=((float64)(File_Offset+Buffer_Offset-Complete_Stream->Streams[pid]->TimeStamp_End_Offset))*8;
+                            float64 TimeStamp_InstantaneousBitRate=Bytes/Duration;
+                            if (Complete_Stream->Streams[pid]->TimeStamp_InstantaneousBitRate)
+                            {
+                                float64 Config_VbrDetection_Delta_Temp=Config_VbrDetection_Delta;
+                                if (Config_VbrDetection_Delta==0 && TimeStamp_InstantaneousBitRate)
+                                    Config_VbrDetection_Delta_Temp=((float64)(BDAV_Size+188+TSP_Size))/TimeStamp_InstantaneousBitRate;
+                                if (TimeStamp_InstantaneousBitRate<Complete_Stream->Streams[pid]->TimeStamp_InstantaneousBitRate*(1-Config_VbrDetection_Delta_Temp) || TimeStamp_InstantaneousBitRate>Complete_Stream->Streams[pid]->TimeStamp_InstantaneousBitRate*(1+Config_VbrDetection_Delta_Temp))
+                                {
+                                    Complete_Stream->Streams[pid]->TimeStamp_InstantaneousBitRate_BitRateMode_IsVbr++;
+                                    #if MEDIAINFO_ADVANCED
+                                        if (Config_VbrDetection_GiveUp && Complete_Stream->Streams[pid]->TimeStamp_InstantaneousBitRate_BitRateMode_IsVbr>=Config_VbrDetection_Occurences)
+                                            Config->ParseSpeed=0;
+                                    #endif // MEDIAINFO_ADVANCED
+                                }
+                                else
+                                    Complete_Stream->Streams[pid]->TimeStamp_InstantaneousBitRate_BitRateMode_IsCbr++;
+                            }
+                            Complete_Stream->Streams[pid]->TimeStamp_InstantaneousBitRate=TimeStamp_InstantaneousBitRate;
+                            #if MEDIAINFO_ADVANCED
+                                if (Complete_Stream->Streams[pid]->TimeStamp_Distance_Min>Duration_27M)
+                                    Complete_Stream->Streams[pid]->TimeStamp_Distance_Min=Duration_27M;
+                                if (Complete_Stream->Streams[pid]->TimeStamp_Distance_Max<Duration_27M)
+                                    Complete_Stream->Streams[pid]->TimeStamp_Distance_Max=Duration_27M;
+                                Complete_Stream->Streams[pid]->TimeStamp_Distance_Total+=Duration_27M;
+                                Complete_Stream->Streams[pid]->TimeStamp_Distance_Count++;
+                            #endif // MEDIAINFO_ADVANCED
+                        }
+                        Complete_Stream->Streams[pid]->TimeStamp_End=program_clock_reference;
+                        Complete_Stream->Streams[pid]->TimeStamp_End_IsUpdated=true;
+                        Complete_Stream->Streams[pid]->TimeStamp_End_Offset=File_Offset+Buffer_Offset;
+                        {
+                            Status[IsUpdated]=true;
+                            Status[User_16]=true;
+                        }
+                    }
+                    if (Complete_Stream->Streams[pid]->Searching_TimeStamp_Start)
+                    {
+                        //This is the first PCR
+                        Complete_Stream->Streams[pid]->TimeStamp_Start=program_clock_reference;
+                        Complete_Stream->Streams[pid]->TimeStamp_Start_Offset=File_Offset+Buffer_Offset;
+                        Complete_Stream->Streams[pid]->TimeStamp_End=program_clock_reference;
+                        Complete_Stream->Streams[pid]->TimeStamp_End_IsUpdated=true;
+                        Complete_Stream->Streams[pid]->TimeStamp_End_Offset=File_Offset+Buffer_Offset;
+                        Complete_Stream->Streams[pid]->Searching_TimeStamp_Start_Set(false);
+                        Complete_Stream->Streams[pid]->Searching_TimeStamp_End_Set(true);
+                        Complete_Stream->Streams_With_StartTimeStampCount++;
+                        {
+                            Status[IsUpdated]=true;
+                            Status[User_16]=true;
+                        }
+                    }
+
+                    //Test if we can find the TS bitrate
+                    if (!Complete_Stream->Streams[pid]->EndTimeStampMoreThanxSeconds && Complete_Stream->Streams[pid]->TimeStamp_Start!=(int64u)-1
+                    && (File_Offset+Buffer_Offset-Buffer_TotalBytes_FirstSynched)*2<File_Size)
+                    {
+                        if (program_clock_reference<Complete_Stream->Streams[pid]->TimeStamp_Start)
+                            program_clock_reference+=0x200000000LL*300; //33 bits, cyclic
+                        if ((program_clock_reference-Complete_Stream->Streams[pid]->TimeStamp_Start)>Begin_MaxDuration)
+                        {
+                            Complete_Stream->Streams[pid]->EndTimeStampMoreThanxSeconds=true;
+                            Complete_Stream->Streams_With_EndTimeStampMoreThanxSecondsCount++;
+                            if (Complete_Stream->Streams_NotParsedCount
+                             && Complete_Stream->Streams_With_StartTimeStampCount>0
+                             && Complete_Stream->Streams_With_StartTimeStampCount==Complete_Stream->Streams_With_EndTimeStampMoreThanxSecondsCount)
+                            {
+                                //We are already parsing 16 seconds (for all PCRs), we don't hope to have more info
+                                MpegTs_JumpTo_Begin=File_Offset+Buffer_Offset-Buffer_TotalBytes_FirstSynched;
+                                MpegTs_JumpTo_End=MpegTs_JumpTo_Begin;
+                            }
                         }
                     }
                 }
             }
-        }
-    #endif //MEDIAINFO_MPEGTS_PCR_YES
-    Element_Offset+=1+Adaptation_Size;
+        #endif //MEDIAINFO_MPEGTS_PCR_YES
+        Element_Offset+=1+adaptation_field_length;
+    #if MEDIAINFO_TRACE
+    }
+    #endif //MEDIAINFO_TRACE
 }
-#endif //MEDIAINFO_TRACE
 
 //---------------------------------------------------------------------------
 #if MEDIAINFO_EVENTS
@@ -1197,42 +2285,6 @@
 #endif //MEDIAINFO_EVENTS
 
 //---------------------------------------------------------------------------
-#ifdef MEDIAINFO_MPEGTS_PCR_YES
-void File_MpegTs::Header_Parse_AdaptationField_Duration_Update()
-{
-    if (Complete_Stream->Streams[pid].TimeStamp_End<0x100000000LL*300 && Complete_Stream->Streams[pid].TimeStamp_Start>0x100000000LL*300)
-        Complete_Stream->Streams[pid].TimeStamp_End+=0x200000000LL*300; //33 bits, cyclic
-    float64 Duration=((float64)((int64s)(Complete_Stream->Streams[pid].TimeStamp_End-Complete_Stream->Streams[pid].TimeStamp_Start)))/27000;
-
-    float64 Duration_Current=Retrieve(Stream_General, 0, General_Duration).To_float64();
-    if (Retrieve(Stream_General, 0, General_Duration).empty() || Duration>Duration_Current || Duration+700<Duration_Current) //If superior or too different
-        Fill(Stream_General, 0, General_Duration, Duration, 6, true); //Only if greater than the current duration
-
-    //TODO: I have small but annoying memory leaks with this version (on big files and Full parsing)
-    //Fill(Stream_General, 0, General_OverallBitRate, (Complete_Stream->Streams[pid].TimeStamp_End_Offset-Complete_Stream->Streams[pid].TimeStamp_Start_Offset)*8*1000/Duration, 0, true);
-
-    //Filling menu duration
-    if (Count_Get(Stream_Menu))
-    {
-        complete_stream::transport_streams::iterator Transport_Stream=Complete_Stream->transport_stream_id_IsValid?Complete_Stream->Transport_Streams.find(Complete_Stream->transport_stream_id):Complete_Stream->Transport_Streams.end();
-        if (Transport_Stream!=Complete_Stream->Transport_Streams.end())
-        {
-            //Per program
-            for (size_t Pos=0; Pos<Complete_Stream->Streams[pid].program_numbers.size(); Pos++)
-            {
-                int16u program_number=Complete_Stream->Streams[pid].program_numbers[Pos];
-                if (Transport_Stream->second.Programs[program_number].IsParsed)
-                    Fill(Stream_Menu, Transport_Stream->second.Programs[program_number].StreamPos, Menu_Duration, Duration, 6, true);
-            }
-        }
-    }
-
-    Status[IsUpdated]=true;
-    Status[User_16]=true;
-}
-#endif //MEDIAINFO_MPEGTS_PCR_YES
-
-//---------------------------------------------------------------------------
 #if MEDIAINFO_EVENTS
 void File_MpegTs::Header_Parse_Events_Duration(int64u program_clock_reference)
 {
@@ -1242,25 +2294,29 @@
 //---------------------------------------------------------------------------
 void File_MpegTs::Data_Parse()
 {
+    //Counting
+    Frame_Count++;
+
     //TSP specific
-    if (TSP_Size)
+    if (TSP_Size && Element_Size>TSP_Size)
         Element_Size-=TSP_Size;
 
-    //File__Duplicate
-    if (Complete_Stream->Streams[pid].ShouldDuplicate)
-        File__Duplicate_Write(pid);
+    #if MEDIAINFO_DUPLICATE
+        if (Complete_Stream->Streams[pid]->ShouldDuplicate)
+            File__Duplicate_Write();
+    #endif //MEDIAINFO_DUPLICATE
 
     //Parsing
-    if (!Complete_Stream->Streams[pid].Searching_Payload_Start
-     && !Complete_Stream->Streams[pid].Searching_Payload_Continue
+    if (!Complete_Stream->Streams[pid]->Searching_Payload_Start
+     && !Complete_Stream->Streams[pid]->Searching_Payload_Continue
      #ifdef MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
-         && !Complete_Stream->Streams[pid].Searching_ParserTimeStamp_Start
-         && !Complete_Stream->Streams[pid].Searching_ParserTimeStamp_End
+         && !Complete_Stream->Streams[pid]->Searching_ParserTimeStamp_Start
+         && !Complete_Stream->Streams[pid]->Searching_ParserTimeStamp_End
      #endif //MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
      )
         Skip_XX(Element_Size,                                   "data");
     else
-        switch (Complete_Stream->Streams[pid].Kind)
+        switch (Complete_Stream->Streams[pid]->Kind)
         {
             case complete_stream::stream::pes : PES(); break;
             case complete_stream::stream::psi : PSI(); break;
@@ -1268,7 +2324,7 @@
         }
 
     //TSP specific
-    if (TSP_Size)
+    if (TSP_Size && Element_Size>TSP_Size)
     {
         Element_Size+=TSP_Size;
         Skip_B4(                                                "TSP"); //TSP supplement
@@ -1283,7 +2339,7 @@
 void File_MpegTs::PES()
 {
     //Info
-    DETAILS_INFO(if (Complete_Stream->transport_stream_id_IsValid) Element_Info(Mpeg_Psi_stream_type_Info(Complete_Stream->Streams[pid].stream_type, Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[Complete_Stream->Streams[pid].program_numbers[0]].registration_format_identifier));)
+    DETAILS_INFO(if (Complete_Stream->transport_stream_id_IsValid) Element_Info1(Mpeg_Psi_stream_type_Info(Complete_Stream->Streams[pid]->stream_type, Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[Complete_Stream->Streams[pid]->program_numbers[0]].registration_format_identifier));)
 
     //Demux
     #if MEDIAINFO_DEMUX
@@ -1292,35 +2348,48 @@
     #endif //MEDIAINFO_DEMUX
 
     //Exists
-    if (!Complete_Stream->Streams[pid].IsRegistered)
+    if (!Complete_Stream->Streams[pid]->IsRegistered)
     {
-        Complete_Stream->Streams[pid].IsRegistered=true;
-        for (size_t Pos=0; Pos<Complete_Stream->Streams[pid].program_numbers.size(); Pos++)
-            Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[Complete_Stream->Streams[pid].program_numbers[Pos]].IsRegistered=true;
+        Complete_Stream->Streams[pid]->IsRegistered=true;
+        for (size_t Pos=0; Pos<Complete_Stream->Streams[pid]->program_numbers.size(); Pos++)
+            if (!Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[Complete_Stream->Streams[pid]->program_numbers[Pos]].IsRegistered)
+            {
+                Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[Complete_Stream->Streams[pid]->program_numbers[Pos]].Update_Needed_IsRegistered=true;
+
+                Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[Complete_Stream->Streams[pid]->program_numbers[Pos]].IsRegistered=true;
+            }
+
+        Complete_Stream->Streams[pid]->IsUpdated_IsRegistered=true;
+        Complete_Stream->PES_PIDs.insert(pid);
+
+        Status[IsUpdated]=true;
+        Status[User_19]=true;
     }
 
     //Case of encrypted streams
-    if (Complete_Stream->Streams[pid].IsScrambled)
+    if (transport_scrambling_control)
     {
-        if (!Complete_Stream->Streams[pid].Searching_Payload_Continue)
-            Complete_Stream->Streams[pid].Searching_Payload_Continue_Set(true); //In order to count the packets
+        if (!Complete_Stream->Streams[pid]->Searching_Payload_Continue)
+            Complete_Stream->Streams[pid]->Searching_Payload_Continue_Set(true); //In order to count the packets
 
-        if (Complete_Stream->Streams[pid].IsScrambled>16)
+        if (Complete_Stream->Streams[pid]->IsScrambled>16)
         {
             //Don't need anymore
-            Complete_Stream->Streams[pid].Searching_Payload_Start_Set(false);
-            Complete_Stream->Streams[pid].Searching_Payload_Continue_Set(false);
+            Complete_Stream->Streams[pid]->Searching_Payload_Start_Set(false);
+            Complete_Stream->Streams[pid]->Searching_Payload_Continue_Set(false);
             #ifdef MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
-                Complete_Stream->Streams[pid].Searching_ParserTimeStamp_Start_Set(false);
+                Complete_Stream->Streams[pid]->Searching_ParserTimeStamp_Start_Set(false);
             #endif //MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
         }
         Skip_XX(Element_Size-Element_Offset,                    "Scrambled data");
 
         return;
     }
+    else if (Complete_Stream->Streams[pid]->IsScrambled)
+        Complete_Stream->Streams[pid]->IsScrambled--;
 
     //Parser creation
-    if (Complete_Stream->Streams[pid].Parser==NULL)
+    if (Complete_Stream->Streams[pid]->Parser==NULL)
     {
         //Waiting for first payload_unit_start_indicator
         if (!payload_unit_start_indicator)
@@ -1331,105 +2400,189 @@
 
         //If unknown stream_type
         if (Complete_Stream->transport_stream_id_IsValid
-         && Mpeg_Psi_stream_type_StreamKind(Complete_Stream->Streams[pid].stream_type, Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[Complete_Stream->Streams[pid].program_numbers[0]].registration_format_identifier)==Stream_Max
-         && Complete_Stream->Streams[pid].stream_type!=0x06 //Exception for private data
-         && Complete_Stream->Streams[pid].stream_type<=0x7F //Exception for private data
-         && Mpeg_Descriptors_registration_format_identifier_StreamKind(Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[Complete_Stream->Streams[pid].program_numbers[0]].registration_format_identifier)==Stream_Max //From Descriptor
+         && Mpeg_Psi_stream_type_StreamKind(Complete_Stream->Streams[pid]->stream_type, Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[Complete_Stream->Streams[pid]->program_numbers[0]].registration_format_identifier)==Stream_Max
+         && Complete_Stream->Streams[pid]->stream_type!=0x06 //Exception for private data
+         && Complete_Stream->Streams[pid]->stream_type<=0x7F //Exception for private data
+         && Mpeg_Descriptors_registration_format_identifier_StreamKind(Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[Complete_Stream->Streams[pid]->program_numbers[0]].registration_format_identifier)==Stream_Max //From Descriptor
          && Config->File_MpegTs_stream_type_Trust_Get())
         {
-            Complete_Stream->Streams[pid].Searching_Payload_Start_Set(false);
-            Complete_Stream->Streams[pid].Searching_Payload_Continue_Set(false);
+            Complete_Stream->Streams[pid]->Searching_Payload_Start_Set(false);
+            Complete_Stream->Streams[pid]->Searching_Payload_Continue_Set(false);
             #ifdef MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
-                Complete_Stream->Streams[pid].Searching_ParserTimeStamp_Start_Set(false);
-                Complete_Stream->Streams[pid].Searching_ParserTimeStamp_End_Set(false);
+                Complete_Stream->Streams[pid]->Searching_ParserTimeStamp_Start_Set(false);
+                Complete_Stream->Streams[pid]->Searching_ParserTimeStamp_End_Set(false);
             #endif //MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
-            Complete_Stream->Streams_NotParsedCount--;
+                Complete_Stream->Streams[pid]->IsParsed=true;
+                Complete_Stream->Streams_NotParsedCount--;
             return;
         }
 
         //Allocating an handle if needed
         #if defined(MEDIAINFO_MPEGPS_YES)
-            Complete_Stream->Streams[pid].Parser=new File_MpegPs;
+            Complete_Stream->Streams[pid]->Parser=new File_MpegPs;
+            #if MEDIAINFO_SEEK
+                if (Unsynch_Frame_Counts.find(pid)!=Unsynch_Frame_Counts.end())
+                {
+                    ((File_MpegPs*)Complete_Stream->Streams[pid]->Parser)->Unsynch_Frame_Count_Temp=Unsynch_Frame_Counts[pid];
+                    Unsynch_Frame_Counts.erase(pid);
+                }
+            #endif //MEDIAINFO_SEEK
             #if MEDIAINFO_DEMUX
-                if (MediaInfoLib::Config.Demux_Get())
+                if (Config_Demux)
                 {
-                    if (Complete_Stream->Streams[pid].stream_type==0x20 && Complete_Stream->Streams[pid].SubStream_pid)
+                    if (Complete_Stream->Streams[pid]->stream_type==0x20 && Complete_Stream->Streams[pid]->SubStream_pid)
                     {
                         //Creating the demux buffer
-                        ((File_MpegPs*)Complete_Stream->Streams[pid].Parser)->SubStream_Demux=new File_MpegPs::demux;
+                        ((File_MpegPs*)Complete_Stream->Streams[pid]->Parser)->SubStream_Demux=new File_MpegPs::demux;
                         //If main parser is already created, associating the new demux buffer
-                        if (Complete_Stream->Streams[Complete_Stream->Streams[pid].SubStream_pid].Parser)
-                            ((File_MpegPs*)Complete_Stream->Streams[Complete_Stream->Streams[pid].SubStream_pid].Parser)->SubStream_Demux=((File_MpegPs*)Complete_Stream->Streams[pid].Parser)->SubStream_Demux;
+                        if (Complete_Stream->Streams[Complete_Stream->Streams[pid]->SubStream_pid]->Parser)
+                            ((File_MpegPs*)Complete_Stream->Streams[Complete_Stream->Streams[pid]->SubStream_pid]->Parser)->SubStream_Demux=((File_MpegPs*)Complete_Stream->Streams[pid]->Parser)->SubStream_Demux;
                     }
-                    if (Complete_Stream->Streams[pid].stream_type!=0x20 && Complete_Stream->Streams[pid].SubStream_pid && (File_MpegPs*)Complete_Stream->Streams[Complete_Stream->Streams[pid].SubStream_pid].Parser)
+                    if (Complete_Stream->Streams[pid]->stream_type!=0x20 && Complete_Stream->Streams[pid]->SubStream_pid && (File_MpegPs*)Complete_Stream->Streams[Complete_Stream->Streams[pid]->SubStream_pid]->Parser)
                     {
                         //If SubStream parser is already created, associating the SubStream demux buffer
-                        ((File_MpegPs*)Complete_Stream->Streams[pid].Parser)->SubStream_Demux=((File_MpegPs*)Complete_Stream->Streams[Complete_Stream->Streams[pid].SubStream_pid].Parser)->SubStream_Demux;
+                        ((File_MpegPs*)Complete_Stream->Streams[pid]->Parser)->SubStream_Demux=((File_MpegPs*)Complete_Stream->Streams[Complete_Stream->Streams[pid]->SubStream_pid]->Parser)->SubStream_Demux;
                     }
                 }
             #endif //MEDIAINFO_DEMUX
             #ifdef MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
                 if (Searching_TimeStamp_Start)
-                    Complete_Stream->Streams[pid].Searching_ParserTimeStamp_Start_Set(true);
-                ((File_MpegPs*)Complete_Stream->Streams[pid].Parser)->Searching_TimeStamp_Start=Complete_Stream->Streams[pid].Searching_ParserTimeStamp_Start;
+                    Complete_Stream->Streams[pid]->Searching_ParserTimeStamp_Start_Set(true);
+                ((File_MpegPs*)Complete_Stream->Streams[pid]->Parser)->Searching_TimeStamp_Start=Complete_Stream->Streams[pid]->Searching_ParserTimeStamp_Start;
             #endif //MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
-            ((File_MpegPs*)Complete_Stream->Streams[pid].Parser)->FromTS=true;
+            ((File_MpegPs*)Complete_Stream->Streams[pid]->Parser)->FromTS=true;
             if (Config->File_MpegTs_stream_type_Trust_Get())
-                ((File_MpegPs*)Complete_Stream->Streams[pid].Parser)->FromTS_stream_type=Complete_Stream->Streams[pid].stream_type;
-            if (!Complete_Stream->Streams[pid].program_numbers.empty())
-                ((File_MpegPs*)Complete_Stream->Streams[pid].Parser)->FromTS_program_format_identifier=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[Complete_Stream->Streams[pid].program_numbers[0]].registration_format_identifier;
-            ((File_MpegPs*)Complete_Stream->Streams[pid].Parser)->FromTS_format_identifier=Complete_Stream->Streams[pid].registration_format_identifier;
-            ((File_MpegPs*)Complete_Stream->Streams[pid].Parser)->MPEG_Version=2;
-            complete_stream::transport_stream::iod_ess::iterator IOD_ES=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].IOD_ESs.find(Complete_Stream->Streams[pid].FMC_ES_ID);
+                ((File_MpegPs*)Complete_Stream->Streams[pid]->Parser)->FromTS_stream_type=Complete_Stream->Streams[pid]->stream_type;
+            ((File_MpegPs*)Complete_Stream->Streams[pid]->Parser)->FromTS_descriptor_tag=Complete_Stream->Streams[pid]->descriptor_tag;
+            if (!Complete_Stream->Streams[pid]->program_numbers.empty())
+                ((File_MpegPs*)Complete_Stream->Streams[pid]->Parser)->FromTS_program_format_identifier=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[Complete_Stream->Streams[pid]->program_numbers[0]].registration_format_identifier;
+            ((File_MpegPs*)Complete_Stream->Streams[pid]->Parser)->FromTS_format_identifier=Complete_Stream->Streams[pid]->registration_format_identifier;
+            ((File_MpegPs*)Complete_Stream->Streams[pid]->Parser)->MPEG_Version=2;
+            complete_stream::transport_stream::iod_ess::iterator IOD_ES=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].IOD_ESs.find(Complete_Stream->Streams[pid]->FMC_ES_ID);
             if (IOD_ES!=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].IOD_ESs.end())
             {
-                #ifdef FILE_MPEG4_YES
-                    ((File_MpegPs*)Complete_Stream->Streams[pid].Parser)->DecSpecificInfoTag=IOD_ES->second.DecSpecificInfoTag;
-                    ((File_MpegPs*)Complete_Stream->Streams[pid].Parser)->SLConfig=IOD_ES->second.SLConfig;
+                #ifdef MEDIAINFO_MPEG4_YES
+                    ((File_MpegPs*)Complete_Stream->Streams[pid]->Parser)->ParserFromTs=IOD_ES->second.Parser; IOD_ES->second.Parser=NULL;
+                    ((File_MpegPs*)Complete_Stream->Streams[pid]->Parser)->SLConfig=IOD_ES->second.SLConfig; IOD_ES->second.SLConfig=NULL;
                 #endif
             }
             #ifdef MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
-                Complete_Stream->Streams[pid].Parser->ShouldContinueParsing=true;
+                Complete_Stream->Streams[pid]->Parser->ShouldContinueParsing=true;
             #endif //MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
-            Complete_Stream->Streams[pid].Searching_Payload_Continue_Set(true);
+            Complete_Stream->Streams[pid]->Searching_Payload_Continue_Set(true);
         #else
             //Filling
-            Streams[pid].Parser=new File_Unknown();
+            Streams[pid]->Parser=new File_Unknown();
         #endif
-        Open_Buffer_Init(Complete_Stream->Streams[pid].Parser);
+        Complete_Stream->Streams[pid]->Parser->CA_system_ID_MustSkipSlices=Complete_Stream->Streams[pid]->CA_system_ID_MustSkipSlices;
+        #if MEDIAINFO_IBI
+            if (Ibi.Streams[pid]==NULL)
+                Ibi.Streams[pid]=new ibi::stream;
+            Complete_Stream->Streams[pid]->Parser->IbiStream=Ibi.Streams[pid];
+        #endif //MEDIAINFO_IBI
+        Open_Buffer_Init(Complete_Stream->Streams[pid]->Parser);
+    }
+
+    //If unsynched, waiting for first payload_unit_start_indicator
+    if (!Complete_Stream->Streams[pid]->Parser->Synched && !payload_unit_start_indicator)
+    {
+        Element_DoNotShow(); //We don't want to show this item because there is no interessant info
+        return; //This is not the start of the PES
     }
 
     //Parsing
-    Open_Buffer_Continue(Complete_Stream->Streams[pid].Parser);
+    if (Complete_Stream->Streams[pid]->IsPCR)
+        ((File_MpegPs*)Complete_Stream->Streams[pid]->Parser)->FrameInfo.PCR=Complete_Stream->Streams[pid]->TimeStamp_End==(int64u)-1?(int64u)-1:Complete_Stream->Streams[pid]->TimeStamp_End*1000/27; //27 MHz
+    #if MEDIAINFO_IBI
+        if (Complete_Stream->transport_stream_id!=(int16u)-1 && !Complete_Stream->Streams[pid]->program_numbers.empty())
+        {
+            int16u Program_PID=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[Complete_Stream->Streams[pid]->program_numbers[0]].pid;
+            Complete_Stream->Streams[pid]->Parser->Ibi_SynchronizationOffset_Current=Complete_Stream->Streams[Program_PID]->Ibi_SynchronizationOffset_BeginOfFrame;
+            if (Complete_Stream->Streams[pid]->Parser->Ibi_SynchronizationOffset_Current==(int64u)-1)
+                return; //Not yet synchronized
+        }
+        else
+            Complete_Stream->Streams[pid]->Parser->Ibi_SynchronizationOffset_Current=File_Offset+Buffer_Offset-Header_Size;
+    #endif //MEDIAINFO_IBI
+
+    Open_Buffer_Continue(Complete_Stream->Streams[pid]->Parser);
+    PES_Parse_Finish();
+}
+
+//---------------------------------------------------------------------------
+void File_MpegTs::PES_Parse_Finish()
+{
+    if (Complete_Stream->Streams[pid]->Parser->Status[IsUpdated])
+    {
+        Complete_Stream->Streams[pid]->Parser->Status[IsUpdated]=false;
+        Complete_Stream->Streams[pid]->IsUpdated_Info=true;
+        for (size_t Pos=0; Pos<Complete_Stream->Streams[pid]->program_numbers.size(); Pos++)
+            Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[Complete_Stream->Streams[pid]->program_numbers[Pos]].Update_Needed_IsRegistered=true;
+
+        Status[IsUpdated]=true;
+        Status[User_19]=true;
+    }
+
     #if defined(MEDIAINFO_MPEGPS_YES) && defined(MEDIAINFO_MPEGTS_PESTIMESTAMP_YES)
         if (MpegTs_JumpTo_Begin+MpegTs_JumpTo_End>File_Size
-         && !Complete_Stream->Streams[pid].Searching_ParserTimeStamp_End
-         && ((File_MpegPs*)Complete_Stream->Streams[pid].Parser)->HasTimeStamps)
+         && !Complete_Stream->Streams[pid]->Searching_ParserTimeStamp_End
+         && ((File_MpegPs*)Complete_Stream->Streams[pid]->Parser)->HasTimeStamps)
         {
-            Complete_Stream->Streams[pid].Searching_ParserTimeStamp_Start_Set(false);
-            Complete_Stream->Streams[pid].Searching_ParserTimeStamp_End_Set(true);
+            Complete_Stream->Streams[pid]->Searching_ParserTimeStamp_Start_Set(false);
+            Complete_Stream->Streams[pid]->Searching_ParserTimeStamp_End_Set(true);
         }
     #endif //MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
 
     //Need anymore?
-    if (Complete_Stream->Streams[pid].Parser->Status[IsFilled]
-     || Complete_Stream->Streams[pid].Parser->Status[IsFinished])
+    if (Complete_Stream->Streams[pid]->Parser->Status[IsFilled]
+     || Complete_Stream->Streams[pid]->Parser->Status[IsFinished])
     {
-        if ((Complete_Stream->Streams[pid].Searching_Payload_Start || Complete_Stream->Streams[pid].Searching_Payload_Continue) && MediaInfoLib::Config.ParseSpeed_Get()<1)
+        if ((Complete_Stream->Streams[pid]->Searching_Payload_Start || Complete_Stream->Streams[pid]->Searching_Payload_Continue) && Config->ParseSpeed<1 && MpegTs_JumpTo_End)
         {
-            Complete_Stream->Streams[pid].Searching_Payload_Start_Set(false);
-            Complete_Stream->Streams[pid].Searching_Payload_Continue_Set(false);
+            Complete_Stream->Streams[pid]->Searching_Payload_Start_Set(false);
+            Complete_Stream->Streams[pid]->Searching_Payload_Continue_Set(false);
             if (Complete_Stream->Streams_NotParsedCount)
+            {
+                Complete_Stream->Streams[pid]->IsParsed=true;
                 Complete_Stream->Streams_NotParsedCount--;
+            }
         }
         #ifdef MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
-            if (Complete_Stream->Streams[pid].Searching_ParserTimeStamp_Start)
-                Complete_Stream->Streams[pid].Searching_ParserTimeStamp_Start_Set(false);
+            if (Complete_Stream->Streams[pid]->Searching_ParserTimeStamp_Start)
+                Complete_Stream->Streams[pid]->Searching_ParserTimeStamp_Start_Set(false);
         #else //MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
-            if (MediaInfoLib::Config.ParseSpeed_Get()<1.0)
-                Finish(Complete_Stream->Streams[pid].Parser);
+            if (Config->ParseSpeed<1.0)
+                Finish(Complete_Stream->Streams[pid]->Parser);
         #endif //MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
     }
+
+    #if MEDIAINFO_SEEK
+        if (Seek_ID!=(int64u)-1)
+        {
+            if (Ibi.Streams[Seek_ID]->IsModified)
+            {
+                Read_Buffer_Seek(2, Seek_Value, Seek_ID);
+            }
+            else if (Ibi.Streams[Seek_ID]->Infos_Pos>=2 && Ibi.Streams[Seek_ID]->IsSynchronized && Ibi.Streams[Seek_ID]->Infos[Ibi.Streams[Seek_ID]->Infos_Pos-1].StreamOffset>=Seek_Value_Maximal)
+            {
+                InfiniteLoop_Detect++;
+                if (InfiniteLoop_Detect>16)
+                {
+                    //Infinite loop
+                    Seek_ID=(int64u)-1;
+                    Seek_Value=(int64u)-1;
+                    InfiniteLoop_Detect=0;
+                    Config->Demux_IsSeeking=false;
+                }
+                else
+                {
+                    //No intermediate seek point found, going to previous seek point
+                    GoTo(Ibi.Streams[Seek_ID]->Infos[Ibi.Streams[Seek_ID]->Infos_Pos-2].StreamOffset);
+                    Open_Buffer_Unsynch();
+                }
+            }
+        }
+    #endif //MEDIAINFO_SEEK
 }
 
 //---------------------------------------------------------------------------
@@ -1438,252 +2591,116 @@
     //Initializing
     if (payload_unit_start_indicator)
     {
-        delete ((File_Mpeg_Psi*)Complete_Stream->Streams[pid].Parser); Complete_Stream->Streams[pid].Parser=new File_Mpeg_Psi;
-        Open_Buffer_Init(Complete_Stream->Streams[pid].Parser);
-        ((File_Mpeg_Psi*)Complete_Stream->Streams[pid].Parser)->Complete_Stream=Complete_Stream;
-        ((File_Mpeg_Psi*)Complete_Stream->Streams[pid].Parser)->pid=pid;
+        delete ((File_Mpeg_Psi*)Complete_Stream->Streams[pid]->Parser); Complete_Stream->Streams[pid]->Parser=new File_Mpeg_Psi;
+        Open_Buffer_Init(Complete_Stream->Streams[pid]->Parser);
+        ((File_Mpeg_Psi*)Complete_Stream->Streams[pid]->Parser)->Complete_Stream=Complete_Stream;
+        ((File_Mpeg_Psi*)Complete_Stream->Streams[pid]->Parser)->pid=pid;
     }
-    else if (Complete_Stream->Streams[pid].Parser==NULL)
+    else if (Complete_Stream->Streams[pid]->Parser==NULL)
     {
         Skip_XX(Element_Size,                                   "data");
         return; //This is not the start of the PSI
     }
 
     //Parsing
-    Open_Buffer_Continue(Complete_Stream->Streams[pid].Parser);
-
-    //EPG
-    if (Status[IsFilled])
-    {
-        if (Complete_Stream->Sources_IsUpdated || Complete_Stream->Programs_IsUpdated)
-            PSI_EPG_Update();
-        if (Complete_Stream->Duration_End_IsUpdated)
-            PSI_Duration_End_Update();
-    }
+    #if MEDIAINFO_IBI
+        Complete_Stream->Streams[pid]->Parser->Ibi_SynchronizationOffset_Current=File_Offset+Buffer_Offset-Header_Size;
+    #endif //MEDIAINFO_IBI
+    Open_Buffer_Continue(Complete_Stream->Streams[pid]->Parser);
 
     //Filling
-    if (Complete_Stream->Streams[pid].Parser->Status[IsFinished])
+    if (Complete_Stream->Streams[pid]->Parser->Status[IsFilled])
     {
         //Accept
-        if (!Status[IsAccepted] && pid==0x0000 && Complete_Stream->Streams[pid].Parser->Status[IsAccepted])
+        if (!Status[IsAccepted] && pid==0x0000 && Complete_Stream->Streams[pid]->Parser->Status[IsAccepted])
             Accept("MPEG-TS");
 
-        //Disabling this PID
-        delete Complete_Stream->Streams[pid].Parser; Complete_Stream->Streams[pid].Parser=NULL;
-        Complete_Stream->Streams[pid].Searching_Payload_Start_Set(true);
-        Complete_Stream->Streams[pid].Searching_Payload_Continue_Set(false);
-    }
-    else
-        //Waiting for more data
-        Complete_Stream->Streams[pid].Searching_Payload_Continue_Set(true);
-}
+        //Disabling this pid
+        delete Complete_Stream->Streams[pid]->Parser; Complete_Stream->Streams[pid]->Parser=NULL;
+        Complete_Stream->Streams[pid]->Searching_Payload_Start_Set(true);
+        Complete_Stream->Streams[pid]->Searching_Payload_Continue_Set(false);
 
-//---------------------------------------------------------------------------
-void File_MpegTs::PSI_EPG_Update()
-{
-    //EPG
-    complete_stream::transport_streams::iterator Transport_Stream=Complete_Stream->transport_stream_id_IsValid?Complete_Stream->Transport_Streams.find(Complete_Stream->transport_stream_id):Complete_Stream->Transport_Streams.end();
-    if (Transport_Stream==Complete_Stream->Transport_Streams.end())
-        return;
-
-    //Per source (ATSC)
-    std::map<Ztring, Ztring> EPGs;
-    complete_stream::sources::iterator Source=Complete_Stream->Sources.find(Transport_Stream->second.source_id);
-    if (Source!=Complete_Stream->Sources.end())
-    {
         //EPG
-        for (complete_stream::source::atsc_epg_blocks::iterator ATSC_EPG_Block=Source->second.ATSC_EPG_Blocks.begin(); ATSC_EPG_Block!=Source->second.ATSC_EPG_Blocks.end(); ATSC_EPG_Block++)
-            for (complete_stream::source::atsc_epg_block::events::iterator Event=ATSC_EPG_Block->second.Events.begin(); Event!=ATSC_EPG_Block->second.Events.end(); Event++)
-            {
-                Ztring Texts;
-                for (std::map<int16u, Ztring>::iterator text=Event->second.texts.begin(); text!=Event->second.texts.end(); text++)
-                    Texts+=text->second+_T(" - ");
-                if (!Texts.empty())
-                    Texts.resize(Texts.size()-3);
-                EPGs[Ztring().Date_From_Seconds_1970(Event->second.start_time+315964800-Complete_Stream->GPS_UTC_offset)]=Event->second.title+_T(" / ")+Texts+_T(" /  /  / ")+Event->second.duration+_T(" / ");
-            }
-        if (!EPGs.empty())
-        {
-            //Trashing old EPG
-            size_t Begin=Retrieve(Stream_General, 0, General_EPG_Positions_Begin).To_int32u();
-            size_t End=Retrieve(Stream_General, 0, General_EPG_Positions_End).To_int32u();
-            if (Begin && End && Begin<End)
-                for (size_t Pos=End-1; Pos>=Begin; Pos--)
-                    Clear(Stream_General, 0, Pos);
+        if (Complete_Stream->Sources_IsUpdated || Complete_Stream->Programs_IsUpdated)
+        {
+            Status[IsUpdated]=true;
+            Status[User_18]=true;
+        }
 
-            //Filling
-            Fill(Stream_General, 0, General_EPG_Positions_Begin, Count_Get(Stream_General, 0), 10, true);
-            for (std::map<Ztring, Ztring>::iterator EPG=EPGs.begin(); EPG!=EPGs.end(); EPG++)
-                Fill(Stream_General, 0, EPG->first.To_Local().c_str(), EPG->second, true);
-            Fill(Stream_General, 0, General_EPG_Positions_End, Count_Get(Stream_General, 0), 10, true);
+        //Duration
+        if (Complete_Stream->Duration_End_IsUpdated)
+        {
+            Status[IsUpdated]=true;
+            Status[User_17]=true;
         }
-    }
 
-    //Per program
-    if (!Transport_Stream->second.Programs.empty()
-     && (Transport_Stream->second.Programs.size()>1
-      || !Transport_Stream->second.Programs.begin()->second.Infos.empty()
-      || !Transport_Stream->second.Programs.begin()->second.DVB_EPG_Blocks.empty()
-      || Complete_Stream->Sources.find(Transport_Stream->second.Programs.begin()->second.source_id)!=Complete_Stream->Sources.end()
-      || Config->File_MpegTs_ForceMenu_Get()))
-        for (complete_stream::transport_stream::programs::iterator Program=Transport_Stream->second.Programs.begin(); Program!=Transport_Stream->second.Programs.end(); Program++)
+        //Program change
+        if (pid==0x0000)
         {
-            if (Program->second.IsParsed)
-            {
-                bool EPGs_IsUpdated=false;
+            Buffer_TotalBytes_LastSynched=Buffer_TotalBytes+Buffer_Offset-Header_Size;
+            Status[IsFilled]=false;
 
-                //EPG - DVB
-                if (Program->second.DVB_EPG_Blocks_IsUpdated)
-                {
-                    for (complete_stream::transport_stream::program::dvb_epg_blocks::iterator DVB_EPG_Block=Program->second.DVB_EPG_Blocks.begin(); DVB_EPG_Block!=Program->second.DVB_EPG_Blocks.end(); DVB_EPG_Block++)
-                        for (complete_stream::transport_stream::program::dvb_epg_block::events::iterator Event=DVB_EPG_Block->second.Events.begin(); Event!=DVB_EPG_Block->second.Events.end(); Event++)
-                            EPGs[Event->second.start_time]=Event->second.short_event.event_name+_T(" / ")+Event->second.short_event.text+_T(" / ")+Event->second.content+_T(" /  / ")+Event->second.duration+_T(" / ")+Event->second.running_status;
-                    Program->second.DVB_EPG_Blocks_IsUpdated=false;
-                    EPGs_IsUpdated=true;
-                }
+            Status[IsUpdated]=true;
+            Status[User_19]=true;
+        }
+        if (!Complete_Stream->Streams[pid]->Table_IDs.empty() && Complete_Stream->Streams[pid]->Table_IDs[0x02])
+        {
+            Buffer_TotalBytes_LastSynched=Buffer_TotalBytes+Buffer_Offset-Header_Size;
+            Status[IsFilled]=false;
 
-                //EPG - ATSC
-                Source=Complete_Stream->Sources.find(Program->second.source_id);
-                if (Source!=Complete_Stream->Sources.end())
+            //Status[IsUpdated]=true;
+            //Status[User_19]=true;
+        }
+
+        //Item removal
+        if (pid==0x0000 || (!Complete_Stream->Streams[pid]->Table_IDs.empty() && Complete_Stream->Streams[pid]->Table_IDs[0x02]))
+        {
+            for (size_t StreamKind=Stream_General+1; StreamKind<Stream_Max; StreamKind++)
+                if (!Complete_Stream->StreamPos_ToRemove[StreamKind].empty())
                 {
-                    if (!Source->second.texts.empty())
+                    sort(Complete_Stream->StreamPos_ToRemove[StreamKind].begin(), Complete_Stream->StreamPos_ToRemove[StreamKind].end());
+                    size_t Pos=Complete_Stream->StreamPos_ToRemove[StreamKind].size();
+                    do
                     {
-                        Ztring Texts;
-                        for (std::map<int16u, Ztring>::iterator text=Source->second.texts.begin(); text!=Source->second.texts.end(); text++)
-                            Texts+=text->second+_T(" - ");
-                        if (!Texts.empty())
-                            Texts.resize(Texts.size()-3);
-                        if (Program->second.StreamPos==(size_t)-1)
+                        Pos--;
+
+                        //Erasing text substreams
+                        Ztring ID_ToFind=Retrieve((stream_t)StreamKind, Complete_Stream->StreamPos_ToRemove[StreamKind][Pos], General_ID)+__T('-');
+                        for (size_t TextPos=0; TextPos<Count_Get(Stream_Text); TextPos++)
+                            if (Retrieve(Stream_Text, TextPos, General_ID).find(ID_ToFind)==0)
+                                 Stream_Erase(Stream_Text, TextPos);
+
+                        //Erasing the stream
+                        Stream_Erase((stream_t)StreamKind, Complete_Stream->StreamPos_ToRemove[StreamKind][Pos]);
+
+                        //Moving other StreamPos
+                        for (size_t Pos2=Pos+1; Pos2<Complete_Stream->StreamPos_ToRemove[StreamKind].size(); Pos2++)
+                            Complete_Stream->StreamPos_ToRemove[StreamKind][Pos]--;
+
+                        //Informing that the menu must be recalculated - TODO: only the related programs
+                        if (StreamKind!=Stream_Menu)
                         {
-                            Stream_Prepare(Stream_Menu);
-                            Program->second.StreamPos=StreamPos_Last;
+                            for (complete_stream::transport_stream::programs::iterator Program=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs.begin(); Program!=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs.end(); Program++)
+                                Program->second.Update_Needed_StreamPos=true;
+                        }
+                        else if (Complete_Stream->StreamPos_ToRemove[StreamKind][Pos]<Complete_Stream->program_number_Order.size())
+                        {
+                            Complete_Stream->program_number_Order.erase(Complete_Stream->program_number_Order.begin()+Complete_Stream->StreamPos_ToRemove[StreamKind][Pos]);
                         }
-                        Fill(Stream_Menu, Program->second.StreamPos, Menu_ServiceProvider, Texts, true);
-                    }
-                    if (Source->second.ATSC_EPG_Blocks_IsUpdated)
-                    {
-                        for (complete_stream::source::atsc_epg_blocks::iterator ATSC_EPG_Block=Source->second.ATSC_EPG_Blocks.begin(); ATSC_EPG_Block!=Source->second.ATSC_EPG_Blocks.end(); ATSC_EPG_Block++)
-                            for (complete_stream::source::atsc_epg_block::events::iterator Event=ATSC_EPG_Block->second.Events.begin(); Event!=ATSC_EPG_Block->second.Events.end(); Event++)
-                                if (Event->second.start_time!=(int32u)-1) //TODO: find the reason when start_time is not set
-                                {
-                                    Ztring Texts;
-                                    for (std::map<int16u, Ztring>::iterator text=Event->second.texts.begin(); text!=Event->second.texts.end(); text++)
-                                        Texts+=text->second+_T(" - ");
-                                    if (!Texts.empty())
-                                        Texts.resize(Texts.size()-3);
-                                    EPGs[Ztring().Date_From_Seconds_1970(Event->second.start_time+315964800-Complete_Stream->GPS_UTC_offset)]=Event->second.title+_T(" / ")+Texts+_T(" /  /  / ")+Event->second.duration+_T(" / ");
-                                }
-                        Source->second.ATSC_EPG_Blocks_IsUpdated=false;
-                        EPGs_IsUpdated=true;
-                    }
-                }
-
-                //EPG - Filling
-                if (EPGs_IsUpdated)
-                {
-                    if (Program->second.StreamPos==(size_t)-1)
-                    {
-                        Stream_Prepare(Stream_Menu);
-                        Program->second.StreamPos=StreamPos_Last;
                     }
-                    size_t Chapters_Pos_Begin=Retrieve(Stream_Menu, Program->second.StreamPos, Menu_Chapters_Pos_Begin).To_int32u();
-                    size_t Chapters_Pos_End=Retrieve(Stream_Menu, Program->second.StreamPos, Menu_Chapters_Pos_End).To_int32u();
-                    if (Chapters_Pos_Begin && Chapters_Pos_End)
-                    {
-                        for (size_t Pos=Chapters_Pos_End-1; Pos>=Chapters_Pos_Begin; Pos--)
-                            Clear(Stream_Menu, Program->second.StreamPos, Pos);
-                        Clear(Stream_Menu, Program->second.StreamPos, Menu_Chapters_Pos_Begin);
-                        Clear(Stream_Menu, Program->second.StreamPos, Menu_Chapters_Pos_End);
-                    }
-                    Fill(Stream_Menu, Program->second.StreamPos, Menu_Chapters_Pos_Begin, Count_Get(Stream_Menu, Program->second.StreamPos), 10, true);
-                    for (std::map<Ztring, Ztring>::iterator EPG=EPGs.begin(); EPG!=EPGs.end(); EPG++)
-                        Fill(Stream_Menu, Program->second.StreamPos, EPG->first.To_UTF8().c_str(), EPG->second, true);
-                    Fill(Stream_Menu, Program->second.StreamPos, Menu_Chapters_Pos_End, Count_Get(Stream_Menu, Program->second.StreamPos), 10, true);
-                    EPGs.clear();
+                    while (Pos);
+                    Complete_Stream->StreamPos_ToRemove[StreamKind].clear();
                 }
-            }
-        }
-
-    Complete_Stream->Sources_IsUpdated=false;
-    Complete_Stream->Programs_IsUpdated=false;
-    Status[IsUpdated]=true;
-    Status[User_18]=true;
-}
-
-
-//---------------------------------------------------------------------------
-void File_MpegTs::PSI_Duration_End_Update()
-{
-    //General
-    Fill(Stream_General, 0, General_Duration_End, Complete_Stream->Duration_End, true);
-
-    Complete_Stream->Duration_End_IsUpdated=false;
-    Status[IsUpdated]=true;
-    Status[User_17]=true;
-}
-
-//***************************************************************************
-// Helpers
-//***************************************************************************
 
-//---------------------------------------------------------------------------
-void File_MpegTs::Detect_EOF()
-{
-    if (File_Offset+Buffer_Size>=MpegTs_JumpTo_Begin && !Complete_Stream->transport_stream_id_IsValid && Retrieve(Stream_General, 0, General_Format_Profile)!=_T("No PAT/PMT"))
-    {
-        //Activating all streams as PES, in case of PAT/PMT are missing (ofen in .trp files)
-        Complete_Stream->Streams.clear();
-        Complete_Stream->Streams.resize(0x2000);
-        for (size_t StreamID=0x20; StreamID<0x1FFF; StreamID++)
-        {
-            Complete_Stream->Streams_NotParsedCount=(size_t)-1;
-            Complete_Stream->Streams[StreamID].Kind=complete_stream::stream::pes;
-            Complete_Stream->Streams[StreamID].Searching_Payload_Start_Set(true);
-            Complete_Stream->Streams[StreamID].Searching_Payload_Continue_Set(false);
-            #if MEDIAINFO_TRACE
-                Complete_Stream->Streams[StreamID].Element_Info="PES";
-            #endif //MEDIAINFO_TRACE
-            #ifdef MEDIAINFO_MPEGTS_PCR_YES
-                Complete_Stream->Streams[StreamID].Searching_TimeStamp_Start_Set(true);
-                Complete_Stream->Streams[StreamID].Searching_TimeStamp_End_Set(false);
-            #endif //MEDIAINFO_MPEGTS_PCR_YES
-            #ifdef MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
-                Complete_Stream->Streams[StreamID].Searching_ParserTimeStamp_Start_Set(true);
-                Complete_Stream->Streams[StreamID].Searching_ParserTimeStamp_End_Set(false);
-            #endif //MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
+            Status[IsUpdated]=true;
+            Status[User_19]=true;
         }
-        if (!Status[IsAccepted])
-            Accept("MPEG-TS");
-        GoTo(0, "MPEG-TS");
-        Fill(Stream_General, 0, General_Format_Profile, "No PAT/PMT");
-        return;
-    }
-
-    //Jump to the end of the file
-    if (File_Offset+Buffer_Offset>0x8000 && File_Offset+Buffer_Offset+MpegTs_JumpTo_End<File_Size && (
-       (File_Offset+Buffer_Offset>=MpegTs_JumpTo_Begin)
-    //|| (program_Count==0 && elementary_PID_Count==0)
-    ))
-    {
-        if (!Status[IsAccepted])
-            Accept("MPEG-TS");
-        Fill("MPEG-TS");
-
-        if (Config->File_IsSeekable_Get())
-        {
-            #if !defined(MEDIAINFO_MPEGTS_PCR_YES) && !defined(MEDIAINFO_MPEGTS_PESTIMESTAMP_YES)
-                GoToFromEnd(47, "MPEG-TS"); //TODO: Should be changed later (when Finalize stuff will be split)
-            #else //!defined(MEDIAINFO_MPEGTS_PCR_YES) && !defined(MEDIAINFO_MPEGTS_PESTIMESTAMP_YES)
-                GoToFromEnd(MpegTs_JumpTo_End, "MPEG-TS");
-                Searching_TimeStamp_Start=false;
-            #endif //!defined(MEDIAINFO_MPEGTS_PCR_YES) && !defined(MEDIAINFO_MPEGTS_PESTIMESTAMP_YES)
-        }
-        else
-            EOF_AlreadyDetected=true;
     }
+    else
+        //Waiting for more data
+        Complete_Stream->Streams[pid]->Searching_Payload_Continue_Set(true);
 }
 
 } //NameSpace
 
 #endif //MEDIAINFO_MPEGTS_YES
-

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_MpegTs.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_MpegTs.h Changed

@@ -1,17 +1,17 @@
 // File_Mpegts - Info for MPEG Transport Stream files
-// Copyright (C) 2006-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2006-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -42,7 +42,12 @@
 // Class File_MpegTs
 //***************************************************************************
 
-class File_MpegTs : public File__Duplicate
+class File_MpegTs :
+#if MEDIAINFO_DUPLICATE
+    public File__Duplicate
+#else //MEDIAINFO_DUPLICATE
+    public File__Analyze
+#endif //MEDIAINFO_DUPLICATE
 {
 public :
     //In
@@ -59,7 +64,9 @@
 
 private :
     //Streams management
+    void Streams_Accept();
     void Streams_Fill();
+    void Streams_Update();
     void Streams_Finish();
 
     //Buffer - File header
@@ -74,17 +81,20 @@
     void Option_Manage ();
 
     //Buffer - Global
+    void Read_Buffer_Continue();
+    void Read_Buffer_AfterParsing ();
     void Read_Buffer_Unsynched();
+    #if MEDIAINFO_SEEK
+    size_t Read_Buffer_Seek (size_t Method, int64u Value, int64u ID);
+    #endif //MEDIAINFO_SEEK
 
     //Buffer - Per element
     void Header_Parse();
     void Header_Parse_AdaptationField();
-    #ifdef MEDIAINFO_MPEGTS_PCR_YES
-    void Header_Parse_AdaptationField_Duration_Update();
-    #endif //MEDIAINFO_MPEGTS_PCR_YES
     void Data_Parse();
 
     int16u                      pid;
+    int8u                       transport_scrambling_control;
     bool                        payload_unit_start_indicator;
 
     //Global infos
@@ -92,13 +102,11 @@
 
     //Elements
     void PSI();
-    void PSI_EPG_Update();
-    void PSI_Duration_End_Update();
     void PES();
+    void PES_Parse_Finish();
 
     //Helpers
     bool Header_Parser_QuickSearch();
-    void Detect_EOF();
 
     //Temp
     #if defined(MEDIAINFO_BDAV_YES) || defined(MEDIAINFO_TSP_YES)
@@ -106,6 +114,9 @@
     #endif
     int64u MpegTs_JumpTo_Begin;
     int64u MpegTs_JumpTo_End;
+    int64u Begin_MaxDuration; //in 27 MHz
+    int64u Buffer_TotalBytes_LastSynched;
+    bool   ForceStreamDisplay;
     bool   Searching_TimeStamp_Start;
 
     #if MEDIAINFO_EVENTS
@@ -117,19 +128,47 @@
     #endif //MEDIAINFO_EVENTS
 
     //Helpers
-    void Streams_Fill_PerStream(int16u PID, complete_stream::stream &Temp);
-    void Streams_Finish_PerStream(int16u PID, complete_stream::stream &Temp);
-
-    //File__Duplicate
-    void   File__Duplicate_Streams_Finish ();
-    bool   File__Duplicate_Set  (const Ztring &Value); //Fill a new File__Duplicate value
-    bool   File__Duplicate_Get_From_PID (int16u PID);
-    void   File__Duplicate_Write (int16u PID);
-
-    //Output buffer
-    size_t Output_Buffer_Get (const String &Value);
-    size_t Output_Buffer_Get (size_t Pos);
-    std::vector<int16u> Output_Buffer_Get_Pos;
+    void Streams_Update_Programs();
+    void Streams_Update_Programs_PerStream(size_t StreamID);
+    void Streams_Update_EPG();
+    void Streams_Update_EPG_PerProgram(complete_stream::transport_stream::programs::iterator Program);
+    #ifdef MEDIAINFO_MPEGTS_PCR_YES
+    void Streams_Update_Duration_Update();
+    #if MEDIAINFO_ADVANCED
+        float64 Config_VbrDetection_Delta;
+        int64u  Config_VbrDetection_Occurences;
+        bool    Config_VbrDetection_GiveUp;
+    #endif // MEDIAINFO_ADVANCED
+    #endif //MEDIAINFO_MPEGTS_PCR_YES
+    void Streams_Update_Duration_End();
+
+    #if MEDIAINFO_DUPLICATE
+        //File__Duplicate
+        void   File__Duplicate_Streams_Finish ();
+        bool   File__Duplicate_Set  (const Ztring &Value); //Fill a new File__Duplicate value
+        void   File__Duplicate_Write ();
+
+        //Output buffer
+        size_t Output_Buffer_Get (const String &Value);
+        size_t Output_Buffer_Get (size_t Pos);
+        std::vector<int16u> Output_Buffer_Get_Pos;
+    #endif //MEDIAINFO_DUPLICATE
+
+    //Config
+    bool Config_Trace_TimeSection_OnlyFirstOccurrence;
+    bool TimeSection_FirstOccurrenceParsed;
+
+    #if MEDIAINFO_SEEK
+        std::map<int16u, int64u>    Unsynch_Frame_Counts;
+        int64u                      Seek_Value;
+        int64u                      Seek_Value_Maximal;
+        int64u                      Seek_ID;
+        size_t                      InfiniteLoop_Detect;
+        bool                        Duration_Detected;
+    #endif //MEDIAINFO_SEEK
+    #if MEDIAINFO_SEEK && MEDIAINFO_IBI
+        ibi Ibi;
+    #endif //MEDIAINFO_SEEK && MEDIAINFO_IBI
 };
 
 } //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_MpegTs_Duplicate.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_MpegTs_Duplicate.cpp Changed

@@ -1,17 +1,17 @@
 // File__Duplicate - Duplication of some formats
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,14 +22,18 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_MPEGTS_YES)
 //---------------------------------------------------------------------------
 
@@ -50,11 +54,13 @@
 // Format
 //***************************************************************************
 
+#if MEDIAINFO_DUPLICATE
 void File_MpegTs::File__Duplicate_Streams_Finish ()
 {
     if (!File_Name.empty()) //Only if this is not a buffer, with buffer we can have more data
         Complete_Stream->Duplicates_Speed_FromPID.clear();
 }
+#endif //MEDIAINFO_DUPLICATE
 
 //***************************************************************************
 // Options
@@ -65,44 +71,48 @@
 {
     if (Complete_Stream && !Complete_Stream->Streams.empty())
     {
-        //File_Filter configuration
-        if (Config->File_Filter_HasChanged())
-        {
-            bool Searching_Payload_Start=!Config->File_Filter_Get();
-            for (int32u Pos=0x01; Pos<0x10; Pos++)
-                Complete_Stream->Streams[Pos].Searching_Payload_Start_Set(Searching_Payload_Start); //base PID depends of File_Filter configuration
-            Complete_Stream->Streams[0x00].Searching_Payload_Start_Set(true); //program_map
-        }
-
-        //File__Duplicate configuration
-        if (File__Duplicate_HasChanged())
-        {
-            for (size_t Pos=0x0000; Pos<0x2000; Pos++)
-                Complete_Stream->Streams[Pos].ShouldDuplicate=false;
-            Complete_Stream->Streams[0x0000].ShouldDuplicate=true;
+        #if MEDIAINFO_FILTER
+            //File_Filter configuration
+            if (Config->File_Filter_HasChanged())
+            {
+                bool Searching_Payload_Start=!Config->File_Filter_Get();
+                for (int32u Pos=0x01; Pos<0x10; Pos++)
+                    Complete_Stream->Streams[Pos]->Searching_Payload_Start_Set(Searching_Payload_Start); //base PID depends of File_Filter configuration
+                Complete_Stream->Streams[0x0000]->Searching_Payload_Start_Set(true); //program_map
+            }
+        #endif //MEDIAINFO_FILTER
 
-            //For each program
-            for (complete_stream::transport_stream::programs::iterator Program=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs.begin(); Program!=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs.end(); Program++)
+        #if MEDIAINFO_DUPLICATE
+            //File__Duplicate configuration
+            if (File__Duplicate_HasChanged())
             {
-                //Do we want this program?
-                bool Wanted=false;
-                for (std::map<const String, File__Duplicate_MpegTs*>::iterator Duplicate=Complete_Stream->Duplicates.begin(); Duplicate!=Complete_Stream->Duplicates.end(); Duplicate++)
-                {
-                    if (Duplicate->second->Wanted_program_numbers.find(Program->first)!=Duplicate->second->Wanted_program_numbers.end())
-                        Wanted=true;
-                    if (Duplicate->second->Wanted_program_map_PIDs.find(Program->second.pid)!=Duplicate->second->Wanted_program_map_PIDs.end())
-                        Wanted=true;
-                }
+                for (size_t Pos=0x0000; Pos<0x2000; Pos++)
+                    Complete_Stream->Streams[Pos]->ShouldDuplicate=false;
+                Complete_Stream->Streams[0x0000]->ShouldDuplicate=true;
 
-                //Enabling it if wanted
-                if (Wanted)
+                //For each program
+                for (complete_stream::transport_stream::programs::iterator Program=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs.begin(); Program!=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs.end(); Program++)
                 {
-                    Complete_Stream->Streams[Program->second.pid].ShouldDuplicate=true;
-                    for (size_t Pos=0; Pos<Program->second.elementary_PIDs.size(); Pos++)
-                        Complete_Stream->Streams[Program->second.elementary_PIDs[Pos]].ShouldDuplicate=true;
+                    //Do we want this program?
+                    bool Wanted=false;
+                    for (std::map<const String, File__Duplicate_MpegTs*>::iterator Duplicate=Complete_Stream->Duplicates.begin(); Duplicate!=Complete_Stream->Duplicates.end(); Duplicate++)
+                    {
+                        if (Duplicate->second->Wanted_program_numbers.find(Program->first)!=Duplicate->second->Wanted_program_numbers.end())
+                            Wanted=true;
+                        if (Duplicate->second->Wanted_program_map_PIDs.find(Program->second.pid)!=Duplicate->second->Wanted_program_map_PIDs.end())
+                            Wanted=true;
+                    }
+
+                    //Enabling it if wanted
+                    if (Wanted)
+                    {
+                        Complete_Stream->Streams[Program->second.pid]->ShouldDuplicate=true;
+                        for (size_t Pos=0; Pos<Program->second.elementary_PIDs.size(); Pos++)
+                            Complete_Stream->Streams[Program->second.elementary_PIDs[Pos]]->ShouldDuplicate=true;
+                    }
                 }
-            }
         }
+        #endif //MEDIAINFO_DUPLICATE
     }
 }
 
@@ -111,6 +121,7 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
+#if MEDIAINFO_DUPLICATE
 bool File_MpegTs::File__Duplicate_Set (const Ztring &Value)
 {
     //Form: "Code;Target"                           <--Generic
@@ -136,26 +147,26 @@
     {
         //Detecting if we want to remove
         bool ToRemove=false;
-        if (Current->find(_T('-'))==0)
+        if (Current->find(__T('-'))==0)
         {
             ToRemove=true;
             Current->erase(Current->begin());
         }
 
         //Managing targets
-        if (Current->find(_T("file:"))==0
-         || Current->find(_T("memory:"))==0)
+        if (Current->find(__T("file:"))==0
+         || Current->find(__T("memory:"))==0)
             (ToRemove?Targets_ToRemove:Targets_ToAdd).push_back(Current);
         //Parser name
-        else if (Current->find(_T("parser="))==0)
+        else if (Current->find(__T("parser="))==0)
         {
-            if (*Current==_T("parser=MpegTs"))
+            if (*Current==__T("parser=MpegTs"))
                 IsForUs=true;
             else
                 IsForUs=false; //Backward compatibility with missing parser name
         }
         //Backward compatibility with "0"
-        else if (*Current==_T("0"))
+        else if (*Current==__T("0"))
             Orders_ToRemove_Global=true;
         //Managing orders
         else
@@ -230,32 +241,23 @@
 
     return true;
 }
-
-//***************************************************************************
-// Get
-//***************************************************************************
-
-bool File_MpegTs::File__Duplicate_Get_From_PID (int16u PID)
-{
-    if (Complete_Stream->Duplicates_Speed_FromPID.empty())
-        return false;
-    return !Complete_Stream->Duplicates_Speed_FromPID[PID].empty();
-}
+#endif //MEDIAINFO_DUPLICATE
 
 //***************************************************************************
 // Write
 //***************************************************************************
 
-void File_MpegTs::File__Duplicate_Write (int16u PID)
+#if MEDIAINFO_DUPLICATE
+void File_MpegTs::File__Duplicate_Write ()
 {
     const int8u* ToAdd=Buffer+Buffer_Offset-(size_t)Header_Size;
     size_t ToAdd_Size=(size_t)(Element_Size+Header_Size);
 
-    std::vector<File__Duplicate_MpegTs*> &Dup_FromPID=Complete_Stream->Duplicates_Speed_FromPID[PID];
-    size_t Duplicates_Speed_FromPID_Size=Complete_Stream->Duplicates_Speed_FromPID[PID].size();
+    std::vector<File__Duplicate_MpegTs*> &Dup_FromPID=Complete_Stream->Duplicates_Speed_FromPID[pid];
+    size_t Duplicates_Speed_FromPID_Size=Complete_Stream->Duplicates_Speed_FromPID[pid].size();
     bool ToUpdate=false;
     for (size_t Pos=0; Pos<Duplicates_Speed_FromPID_Size; Pos++)
-        if (Dup_FromPID[Pos] && Dup_FromPID[Pos]->Write(PID, ToAdd, ToAdd_Size))
+        if (Dup_FromPID[Pos] && Dup_FromPID[Pos]->Write(pid, ToAdd, ToAdd_Size))
             ToUpdate=true;
     if (ToUpdate)
     {
@@ -291,12 +293,14 @@
         }
     }
 }
+#endif //MEDIAINFO_DUPLICATE
 
 //***************************************************************************
 // Output_Buffer
 //***************************************************************************
 
 //---------------------------------------------------------------------------
+#if MEDIAINFO_DUPLICATE
 size_t File_MpegTs::Output_Buffer_Get (const String &Code)
 {
     if (Complete_Stream==NULL)
@@ -321,8 +325,10 @@
     return 0;
     */
 }
+#endif //MEDIAINFO_DUPLICATE
 
 //---------------------------------------------------------------------------
+#if MEDIAINFO_DUPLICATE
 size_t File_MpegTs::Output_Buffer_Get (size_t Pos)
 {
     if (Complete_Stream!=NULL && Pos<Complete_Stream->Duplicates_Speed.size() && Complete_Stream->Duplicates_Speed[Pos]!=NULL)
@@ -346,8 +352,8 @@
 
     return 0;
 }
+#endif //MEDIAINFO_DUPLICATE
 
 } //NameSpace
 
 #endif //MEDIAINFO_MPEGTS_YES
-

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Mpeg_Descriptors.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Mpeg_Descriptors.cpp Changed

@@ -1,31 +1,35 @@
 // File_Mpeg_Descriptors - Info for MPEG files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_MPEGPS_YES) || defined(MEDIAINFO_MPEGTS_YES)
 //---------------------------------------------------------------------------
 
@@ -105,11 +109,11 @@
 {
     switch (teletext_type)
     {
-        case 0x01 : return "initial Teletext page";
-        case 0x02 : return "Teletext subtitle page";
-        case 0x03 : return "additional information page";
-        case 0x04 : return "programme schedule page";
-        case 0x05 : return "Teletext subtitle page for hearing impaired people";
+        case 0x01 : return "Teletext";
+        case 0x02 : return "Teletext Subtitle";
+        case 0x03 : return "Teletext"; //additional information page
+        case 0x04 : return "Teletext"; //programme schedule page
+        case 0x05 : return "Teletext Subtitle"; //for hearing impaired people
         default   : return "reserved for future use";
     }
 }
@@ -500,14 +504,14 @@
         case 0x01 : return "EBU Teletext subtitles";
         case 0x02 : return "associated EBU Teletext";
         case 0x03 : return "VBI data";
-        case 0x10 : return "DVB subtitles (normal) with no monitor aspect ratio criticality";
-        case 0x11 : return "DVB subtitles (normal) for display on 4:3 aspect ratio monitor";
-        case 0x12 : return "DVB subtitles (normal) for display on 16:9 aspect ratio monitor";
-        case 0x13 : return "DVB subtitles (normal) for display on 2.21:1 aspect ratio monitor";
-        case 0x20 : return "DVB subtitles (for the hard of hearing) with no monitor aspect ratio criticality";
-        case 0x21 : return "DVB subtitles (for the hard of hearing) for display on 4:3 aspect ratio monitor";
-        case 0x22 : return "DVB subtitles (for the hard of hearing) for display on 16:9 aspect ratio monitor";
-        case 0x23 : return "DVB subtitles (for the hard of hearing) for display on 2.21:1 aspect ratio monitor";
+        case 0x10 : return "DVB subtitle (normal) with no monitor aspect ratio criticality";
+        case 0x11 : return "DVB subtitle (normal) for display on 4:3 aspect ratio monitor";
+        case 0x12 : return "DVB subtitle (normal) for display on 16:9 aspect ratio monitor";
+        case 0x13 : return "DVB subtitle (normal) for display on 2.21:1 aspect ratio monitor";
+        case 0x20 : return "DVB subtitle (for the hard of hearing) with no monitor aspect ratio criticality";
+        case 0x21 : return "DVB subtitle (for the hard of hearing) for display on 4:3 aspect ratio monitor";
+        case 0x22 : return "DVB subtitle (for the hard of hearing) for display on 16:9 aspect ratio monitor";
+        case 0x23 : return "DVB subtitle (for the hard of hearing) for display on 2.21:1 aspect ratio monitor";
         default   :
             if (component_type>=0xB0 && component_type<=0xFE)
                     return "user defined";
@@ -683,7 +687,7 @@
                         switch (descriptor_tag)
                         {
                             case 0x56 : return "Teletext";
-                            case 0x59 : return "DVB Subtitles";
+                            case 0x59 : return "DVB Subtitle";
                             case 0x6A : return "AC-3";
                             case 0x7A : return "E-AC-3";
                             case 0x7B : return "DTS";
@@ -729,7 +733,7 @@
                         switch (descriptor_tag)
                         {
                             case 0x56 : return "Teletext";
-                            case 0x59 : return "DVB Subtitles";
+                            case 0x59 : return "DVB Subtitle";
                             case 0x6A : return "AC3";
                             case 0x7A : return "AC3+";
                             case 0x7B : return "DTS";
@@ -823,24 +827,24 @@
         case 0x41 : return "Natural audio@L2";
         case 0x42 : return "Natural audio@L3";
         case 0x43 : return "Natural audio@L4";
-        case 0x48 : return "Mobile audio internetworking@1";
-        case 0x49 : return "Mobile audio internetworking@2";
-        case 0x4A : return "Mobile audio internetworking@3";
-        case 0x4B : return "Mobile audio internetworking@4";
-        case 0x4C : return "Mobile audio internetworking@5";
-        case 0x4D : return "Mobile audio internetworking@6";
-        case 0x50 : return "AAC@L1";
-        case 0x51 : return "AAC@L2";
-        case 0x52 : return "AAC@L3";
-        case 0x53 : return "AAC@L4";
-        case 0x58 : return "High efficiency AAC@L2";
-        case 0x59 : return "High efficiency AAC@L3";
-        case 0x5A : return "High efficiency AAC@L4";
-        case 0x5B : return "High efficiency AAC@L5";
-        case 0x60 : return "High efficiency AAC v2@L2";
-        case 0x61 : return "High efficiency AAC v2@L3";
-        case 0x62 : return "High efficiency AAC v2@L4";
-        case 0x63 : return "High efficiency AAC v2@L5";
+        case 0x48 : return "Mobile audio internetworking@L1";
+        case 0x49 : return "Mobile audio internetworking@L2";
+        case 0x4A : return "Mobile audio internetworking@L3";
+        case 0x4B : return "Mobile audio internetworking@L4";
+        case 0x4C : return "Mobile audio internetworking@L5";
+        case 0x4D : return "Mobile audio internetworking@L6";
+        case 0x50 : return "LC@L1";
+        case 0x51 : return "LC@L2";
+        case 0x52 : return "LC@L3";
+        case 0x53 : return "LC@L4";
+        case 0x58 : return "HE-AAC@L2 / LC@L2";
+        case 0x59 : return "HE-AAC@L3 / LC@L3";
+        case 0x5A : return "HE-AAC@L4 / LC@L4";
+        case 0x5B : return "HE-AAC@L5 / LC@L5";
+        case 0x60 : return "HE-AACv2@L2 / HE-AAC@L2 / LC@L2";
+        case 0x61 : return "HE-AACv2@L3 / HE-AAC@L3 / LC@L3";
+        case 0x62 : return "HE-AACv2@L4 / HE-AAC@L4 / LC@L4";
+        case 0x63 : return "HE-AACv2@L5 / HE-AAC@L5 / LC@L5";
         default   : return "";
     }
 }
@@ -1100,9 +1104,9 @@
 }
 
 //---------------------------------------------------------------------------
-const char* Mpeg_Descriptors_CA_system_ID(int16u CA_ID)
+const char* Mpeg_Descriptors_CA_system_ID(int16u CA_system_ID)
 {
-    switch (CA_ID)
+    switch (CA_system_ID)
     {
         case 0x0100 : return "Seca Mediaguard 1/2";
         case 0x0101 : return "RusCrypto";
@@ -1153,12 +1157,24 @@
         case 0x4AD1 : return "X-Crypt";
         case 0x4AD4 : return "OmniCrypt";
         case 0x4AE0 : return "RossCrypt";
+        case 0x4B13 : return "PlayReady";
         case 0x5500 : return "Z-Crypt or DRE-Crypt";
         case 0x5501 : return "Griffin";
         default     : return "Encrypted";
     }
 }
 
+//---------------------------------------------------------------------------
+bool Mpeg_Descriptors_CA_system_ID_MustSkipSlices(int16u CA_system_ID)
+{
+    switch (CA_system_ID)
+    {
+        case 0x4B13 : // PlayReady
+                      return true;
+        default     : return false; //We try, it is not sure
+    }
+}
+
 //***************************************************************************
 // Constructor/Destructor
 //***************************************************************************
@@ -1352,9 +1368,9 @@
             ELEMENT_CASE(AA, "ATSC - Redistribution Control");
             ELEMENT_CASE(AB, "ATSC - DCC Location Code");
             default: if (Element_Code>=0x40)
-                        Element_Info("user private");
+                        Element_Info1("user private");
                      else
-                        Element_Info("unknown");
+                        Element_Info1("unknown");
                      Skip_XX(Element_Size,                          "Data");
                      break;
         }
@@ -1428,9 +1444,9 @@
             ELEMENT_CASE(7E, "DVB - reserved for future use");
             ELEMENT_CASE(7F, "DVB - extension descriptor");
             default: if (Element_Code>=0x40)
-                        Element_Info("user private");
+                        Element_Info1("user private");
                      else
-                        Element_Info("unknown");
+                        Element_Info1("unknown");
                      Skip_XX(Element_Size,                          "Data");
                      break;
         }
@@ -1452,25 +1468,37 @@
             ELEMENT_CASE(AA, "ATSC - Redistribution Control");
             ELEMENT_CASE(AB, "ATSC - DCC Location Code");
             default: if (Element_Code>=0x40)
-                        Element_Info("user private");
+                        Element_Info1("user private");
                      else
-                        Element_Info("unknown");
+                        Element_Info1("unknown");
                      Skip_XX(Element_Size,                          "Data");
                      break;
         }
     }
-    else
+    else if (table_id==0xFC)
     {
+        //SCTE 35
+        #undef ELEMENT_CASE
+        #define ELEMENT_CASE(_NAME, _DETAIL) \
+            case 0x##_NAME : Element_Name(_DETAIL); CUEI_##_NAME(); break;
         switch (Element_Code)
         {
-            default: if (Element_Code>=0x40)
-                        Element_Info("user private");
-                     else
-                        Element_Info("unknown");
-                     Skip_XX(Element_Size,                          "Data");
+            ELEMENT_CASE(00, "SCTE35 - avail_descriptor");
+            ELEMENT_CASE(01, "SCTE35 - DTMF_descriptor");
+            ELEMENT_CASE(02, "SCTE35 - segmentation_descriptor");
+            default: Element_Info1("SCTE35 - Reserved");
+                     Skip_XX(Element_Size,                      "Data");
                      break;
         }
     }
+    else
+    {
+        if (Element_Code>=0x40)
+        Element_Info1("user private");
+        else
+        Element_Info1("unknown");
+        Skip_XX(Element_Size,                                   "Data");
+    }
 }
 
 //***************************************************************************
@@ -1487,16 +1515,16 @@
     bool frame_rate_extension_flag=false;
     BS_Begin();
     Get_SB (   multiple_frame_rate_flag,                        "multiple_frame_rate_flag");
-    Get_S1 (4, frame_rate_code,                                 "frame_rate_code"); Param_Info(Mpegv_frame_rate[frame_rate_code]);
+    Get_S1 (4, frame_rate_code,                                 "frame_rate_code"); Param_Info1(Mpegv_frame_rate[frame_rate_code]);
     Get_SB (   MPEG_1_only_flag,                                "MPEG_1_only_flag");
     Skip_SB(                                                    "constrained_parameter_flag");
     Skip_SB(                                                    "still_picture_flag");
     if (MPEG_1_only_flag==0)
     {
         Skip_SB(                                                "profile_and_level_indication_escape");
-        Get_S1 (3, profile_and_level_indication_profile,        "profile_and_level_indication_profile"); Param_Info(Mpegv_profile_and_level_indication_profile[profile_and_level_indication_profile]);
-        Get_S1 (4, profile_and_level_indication_level,          "profile_and_level_indication_level"); Param_Info(Mpegv_profile_and_level_indication_level[profile_and_level_indication_level]);
-        Get_S1 (2, chroma_format,                               "chroma_format"); Param_Info(Mpegv_Colorimetry_format[chroma_format]);
+        Get_S1 (3, profile_and_level_indication_profile,        "profile_and_level_indication_profile"); Param_Info1(Mpegv_profile_and_level_indication_profile[profile_and_level_indication_profile]);
+        Get_S1 (4, profile_and_level_indication_level,          "profile_and_level_indication_level"); Param_Info1(Mpegv_profile_and_level_indication_level[profile_and_level_indication_level]);
+        Get_S1 (2, chroma_format,                               "chroma_format"); Param_Info1(Mpegv_Colorimetry_format[chroma_format]);
         Get_SB (   frame_rate_extension_flag,                   "frame_rate_extension_flag");
         Skip_S1(5,                                              "reserved");
     }
@@ -1510,13 +1538,13 @@
                         if (elementary_PID_IsValid)
                         {
                             if (!multiple_frame_rate_flag && !frame_rate_extension_flag && frame_rate_code)
-                                Complete_Stream->Streams[elementary_PID].Infos["FrameRate"]=Ztring::ToZtring(Mpegv_frame_rate[frame_rate_code]);
-                            Complete_Stream->Streams[elementary_PID].Infos["Format_Version"]=MPEG_1_only_flag?_T("Version 1"):_T("Version 2");
-                            Complete_Stream->Streams[elementary_PID].Infos["Colorimetry"]=Mpegv_Colorimetry_format[chroma_format];
+                                Complete_Stream->Streams[elementary_PID]->Infos["FrameRate"]=Ztring::ToZtring(Mpegv_frame_rate[frame_rate_code]);
+                            Complete_Stream->Streams[elementary_PID]->Infos["Format_Version"]=MPEG_1_only_flag?__T("Version 1"):__T("Version 2");
+                            Complete_Stream->Streams[elementary_PID]->Infos["Colorimetry"]=Mpegv_Colorimetry_format[chroma_format];
                             if (profile_and_level_indication_profile)
                             {
-                                Complete_Stream->Streams[elementary_PID].Infos["Format_Profile"]=Ztring().From_Local(Mpegv_profile_and_level_indication_profile[profile_and_level_indication_profile])+_T("@")+Ztring().From_Local(Mpegv_profile_and_level_indication_level[profile_and_level_indication_level]);
-                                Complete_Stream->Streams[elementary_PID].Infos["Codec_Profile"]=Ztring().From_Local(Mpegv_profile_and_level_indication_profile[profile_and_level_indication_profile])+_T("@")+Ztring().From_Local(Mpegv_profile_and_level_indication_level[profile_and_level_indication_level]);
+                                Complete_Stream->Streams[elementary_PID]->Infos["Format_Profile"]=Ztring().From_Local(Mpegv_profile_and_level_indication_profile[profile_and_level_indication_profile])+__T("@")+Ztring().From_Local(Mpegv_profile_and_level_indication_level[profile_and_level_indication_level]);
+                                Complete_Stream->Streams[elementary_PID]->Infos["Codec_Profile"]=Ztring().From_Local(Mpegv_profile_and_level_indication_profile[profile_and_level_indication_profile])+__T("@")+Ztring().From_Local(Mpegv_profile_and_level_indication_level[profile_and_level_indication_level]);
                             }
                         }
                         break;
@@ -1533,8 +1561,8 @@
     bool variable_rate_audio_indicator;
     BS_Begin();
     Skip_SB(                                                    "free_format_flag");
-    Get_S1 (1, ID,                                              "ID"); Param_Info(Mpega_Version[2+ID]); //Mpega_Version is with MPEG2.5 hack
-    Get_S1 (2, layer,                                           "layer");  Param_Info(Mpega_Layer[layer]);
+    Get_S1 (1, ID,                                              "ID"); Param_Info1(Mpega_Version[2+ID]); //Mpega_Version is with MPEG2.5 hack
+    Get_S1 (2, layer,                                           "layer");  Param_Info1(Mpega_Layer[layer]);
     Get_SB (   variable_rate_audio_indicator,                   "variable_rate_audio_indicator");
     Skip_S1(3,                                                  "reserved");
     BS_End();
@@ -1542,11 +1570,11 @@
     FILLING_BEGIN()
         if (elementary_PID_IsValid)
         {
-            Complete_Stream->Streams[elementary_PID].Infos["BitRate_Mode"]=variable_rate_audio_indicator?_T("VBR"):_T("CBR");
-            Complete_Stream->Streams[elementary_PID].Infos["Codec"]=Ztring(Mpega_Version[ID])+Ztring(Mpega_Layer[layer]);
-            Complete_Stream->Streams[elementary_PID].Infos["Format"]=_T("MPEG Audio");
-            Complete_Stream->Streams[elementary_PID].Infos["Format_Version"]=Mpega_Format_Profile_Version[ID];
-            Complete_Stream->Streams[elementary_PID].Infos["Format_Profile"]=Mpega_Format_Profile_Layer[layer];
+            Complete_Stream->Streams[elementary_PID]->Infos["BitRate_Mode"]=variable_rate_audio_indicator?__T("VBR"):__T("CBR");
+            Complete_Stream->Streams[elementary_PID]->Infos["Codec"]=Ztring(Mpega_Version[ID])+Ztring(Mpega_Layer[layer]);
+            Complete_Stream->Streams[elementary_PID]->Infos["Format"]=__T("MPEG Audio");
+            Complete_Stream->Streams[elementary_PID]->Infos["Format_Version"]=Mpega_Format_Profile_Version[ID];
+            Complete_Stream->Streams[elementary_PID]->Infos["Format_Profile"]=Mpega_Format_Profile_Layer[layer];
         }
     FILLING_END();
 }
@@ -1556,7 +1584,7 @@
 {
     //Parsing
     int32u format_identifier;
-    Get_B4 (format_identifier,                                  "format_identifier"); Element_Info(Mpeg_Descriptors_registration_format_identifier_Format(format_identifier)); Param_Info(Mpeg_Descriptors_registration_format_identifier_Format(format_identifier));
+    Get_B4 (format_identifier,                                  "format_identifier"); Element_Info1(Mpeg_Descriptors_registration_format_identifier_Format(format_identifier)); Param_Info1(Mpeg_Descriptors_registration_format_identifier_Format(format_identifier));
     if (Element_Size-Element_Offset>0)
         Skip_XX(Element_Size-Element_Offset,                    "additional_identification_info");
 
@@ -1570,13 +1598,16 @@
                                         Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[table_id_extension].registration_format_identifier=format_identifier;
                                         break;
                             case true : //Per PES
-                                        Complete_Stream->Streams[elementary_PID].registration_format_identifier=format_identifier;
+                                        Complete_Stream->Streams[elementary_PID]->registration_format_identifier=format_identifier;
                                         if (format_identifier==Elements::KLVA)
                                         {
                                             if (!Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[table_id_extension].Infos["KLVA_PID"].empty())
-                                                Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[table_id_extension].Infos["KLVA_PID"]+=_T(" / ");
+                                                Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[table_id_extension].Infos["KLVA_PID"]+=__T(" / ");
                                             Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[table_id_extension].Infos["KLVA_PID"]+=Ztring::ToZtring(elementary_PID);
                                         }
+                                        //Coherency
+                                        if (stream_type==0x81 && Complete_Stream->Streams[elementary_PID]->registration_format_identifier==Elements::BSSD)
+                                            Complete_Stream->Streams[elementary_PID]->registration_format_identifier=0x00000000; //Reseting it, this combinaision is not possible but a stream has it
                                         break;
                         }
                         break;
@@ -1589,7 +1620,7 @@
 void File_Mpeg_Descriptors::Descriptor_06()
 {
     //Parsing
-    Info_B1(alignment_type,                                     "alignment_type"); Param_Info(Mpeg_Descriptors_alignment_type(alignment_type));
+    Info_B1(alignment_type,                                     "alignment_type"); Param_Info1(Mpeg_Descriptors_alignment_type(alignment_type));
 }
 
 //---------------------------------------------------------------------------
@@ -1619,7 +1650,7 @@
 {
     //Parsing
     int16u CA_system_ID, CA_PID;
-    Get_B2 (CA_system_ID,                                       "CA_system_ID"); Param_Info(Mpeg_Descriptors_CA_system_ID(CA_system_ID));
+    Get_B2 (CA_system_ID,                                       "CA_system_ID"); Param_Info1(Mpeg_Descriptors_CA_system_ID(CA_system_ID));
     BS_Begin();
     Skip_S1( 3,                                                 "reserved");
     Get_S2 (13, CA_PID,                                         "CA_PID");
@@ -1631,22 +1662,26 @@
         switch (table_id)
         {
             case 0x01 : //conditional_access_section
-                        if (Complete_Stream->Streams[CA_PID].Kind!=complete_stream::stream::psi)
+                    if (Complete_Stream->Streams[CA_PID]->Kind==complete_stream::stream::unknown) //Priority to PES, if this is a PES, we skip the CA
                         {
-                            Complete_Stream->Streams[CA_PID].Kind=complete_stream::stream::psi;
+                            Complete_Stream->Streams[CA_PID]->Kind=complete_stream::stream::psi;
+                            Complete_Stream->Streams[CA_PID]->Table_IDs.resize(0x100);
                             #ifdef MEDIAINFO_MPEGTS_ALLSTREAMS_YES
-                                Complete_Stream->Streams[CA_PID].Searching_Payload_Start_Set(true);
+                                Complete_Stream->Streams[CA_PID]->Searching_Payload_Start_Set(true);
                             #endif
                         }
                         break;
             case 0x02 : //program_map_section
                         if (elementary_PID_IsValid)
                         {
-                            if (Complete_Stream->Streams[CA_PID].Kind!=complete_stream::stream::psi)
+                            Complete_Stream->Streams[elementary_PID]->CA_system_ID=CA_system_ID;
+                            Complete_Stream->Streams[elementary_PID]->CA_system_ID_MustSkipSlices=Mpeg_Descriptors_CA_system_ID_MustSkipSlices(CA_system_ID);
+                            if (CA_PID<Complete_Stream->Streams.size() && Complete_Stream->Streams[CA_PID]->Kind==complete_stream::stream::unknown) //Priority to PES, if this is a PES, we skip the CA
                             {
-                                Complete_Stream->Streams[CA_PID].Kind=complete_stream::stream::psi;
+                                Complete_Stream->Streams[CA_PID]->Kind=complete_stream::stream::psi;
+                                Complete_Stream->Streams[CA_PID]->Table_IDs.resize(0x100);
                                 #ifdef MEDIAINFO_MPEGTS_ALLSTREAMS_YES
-                                    Complete_Stream->Streams[CA_PID].Searching_Payload_Start_Set(true);
+                                    Complete_Stream->Streams[CA_PID]->Searching_Payload_Start_Set(true);
                                 #endif
                             }
                         }
@@ -1663,7 +1698,7 @@
     int32u ISO_639_language_code;
     int8u audio_type;
     Get_C3 (ISO_639_language_code,                              "ISO_639_language_code");
-    Get_B1 (audio_type,                                         "audio_type"); Param_Info(Mpeg_Descriptors_audio_type(audio_type));
+    Get_B1 (audio_type,                                         "audio_type"); Param_Info1(Mpeg_Descriptors_audio_type(audio_type));
 
     FILLING_BEGIN();
         switch (table_id)
@@ -1671,11 +1706,13 @@
             case 0x02 : //program_map_section
                         if (elementary_PID_IsValid)
                         {
-                            Ztring ISO_639_2; ISO_639_2.From_CC3(ISO_639_language_code);
+                            Ztring ISO_639_2;
+                            if (ISO_639_language_code)
+                                ISO_639_2.From_CC3(ISO_639_language_code);
                             const Ztring& ISO_639_1=MediaInfoLib::Config.Iso639_1_Get(ISO_639_2);
-                            Complete_Stream->Streams[elementary_PID].Infos["Language"]=ISO_639_1.empty()?ISO_639_2:ISO_639_1;
+                            Complete_Stream->Streams[elementary_PID]->Infos["Language"]=ISO_639_1.empty()?ISO_639_2:ISO_639_1;
                             if (audio_type)
-                                Complete_Stream->Streams[elementary_PID].Infos["Language_More"]=Mpeg_Descriptors_audio_type(audio_type);
+                                Complete_Stream->Streams[elementary_PID]->Infos["Language_More"]=Mpeg_Descriptors_audio_type(audio_type);
                         }
                         break;
             default    : ;
@@ -1692,7 +1729,7 @@
     Skip_SB(                                                    "external_clock_reference_indicator");
     Skip_SB(                                                    "reserved");
     Get_S1 (6, clock_accuracy_integer,                          "clock_accuracy_integer");
-    Get_S1 (3, clock_accuracy_exponent,                         "clock_accuracy_exponent"); Param_Info(Ztring::ToZtring(clock_accuracy_integer*(int64u)pow(10.0, clock_accuracy_exponent)));
+    Get_S1 (3, clock_accuracy_exponent,                         "clock_accuracy_exponent"); Param_Info1(Ztring::ToZtring(clock_accuracy_integer*(int64u)pow(10.0, clock_accuracy_exponent)));
     Skip_S1(5,                                                  "reserved");
     BS_End();
 }
@@ -1708,14 +1745,14 @@
      && (copyright_identifier&0x0000FF00)>=0x00006100 && (copyright_identifier&0x0000FF00)<=0x00007A00
      && (copyright_identifier&0x000000FF)>=0x00000061 && (copyright_identifier&0x000000FF)<=0x0000007A)
     {
-        Param_Info(Ztring().From_CC4(copyright_identifier));
-        Element_Info(Ztring().From_CC4(copyright_identifier));
+        Param_Info1(Ztring().From_CC4(copyright_identifier));
+        Element_Info1(Ztring().From_CC4(copyright_identifier));
     }
     if (copyright_identifier==Elements::MANZ)
     {
         if (Element_Offset<Element_Size)
             Skip_Local(Element_Size-Element_Offset,             "Info");
-        Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Infos["Encoded_Library"]=_T("Manzanita Systems");
+        Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Infos["Encoded_Library"]=__T("Manzanita Systems");
     }
 
     if (Element_Offset<Element_Size)
@@ -1729,7 +1766,7 @@
     int32u maximum_bitrate;
     BS_Begin();
     Skip_S1( 2,                                                 "reserved");
-    Get_S3 (22, maximum_bitrate,                                "maximum_bitrate"); Param_Info(maximum_bitrate*400, " bps");
+    Get_S3 (22, maximum_bitrate,                                "maximum_bitrate"); Param_Info2(maximum_bitrate*400, " bps");
     BS_End();
 
     FILLING_BEGIN();
@@ -1737,7 +1774,7 @@
         {
             case 0x02 : //program_map_section
                         if (elementary_PID_IsValid)
-                            Complete_Stream->Streams[elementary_PID].Infos["BitRate_Maximum"]=Ztring::ToZtring(maximum_bitrate*400);
+                            Complete_Stream->Streams[elementary_PID]->Infos["BitRate_Maximum"]=Ztring::ToZtring(maximum_bitrate*400);
                         else
                             Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[table_id_extension].Infos["BitRate_Maximum"]=Ztring::ToZtring(maximum_bitrate*400);
                         break;
@@ -1757,8 +1794,8 @@
      && (private_data_indicator&0x0000FF00)>=0x00004100 && (private_data_indicator&0x0000FF00)<=0x00007A00
      && (private_data_indicator&0x000000FF)>=0x00000041 && (private_data_indicator&0x000000FF)<=0x0000007A)
     {
-        Param_Info(Ztring().From_CC4(private_data_indicator));
-        Element_Info(Ztring().From_CC4(private_data_indicator));
+        Param_Info1(Ztring().From_CC4(private_data_indicator));
+        Element_Info1(Ztring().From_CC4(private_data_indicator));
     }
 }
 
@@ -1768,9 +1805,9 @@
     //Parsing
     BS_Begin();
     Skip_S1( 2,                                                 "reserved");
-    Info_S3(22, sb_leak_rate,                                   "sb_leak_rate"); Param_Info(sb_leak_rate*400, " bps");
+    Info_S3(22, sb_leak_rate,                                   "sb_leak_rate"); Param_Info2(sb_leak_rate*400, " bps");
     Skip_S1( 2,                                                 "reserved");
-    Info_S3(22, sb_size,                                        "sb_size"); Param_Info(sb_size, " bytes");
+    Info_S3(22, sb_size,                                        "sb_size"); Param_Info2(sb_size, " bytes");
     BS_End();
 }
 
@@ -1789,10 +1826,10 @@
 {
     //Parsing
     int8u Profile_and_level;
-    Get_B1 (   Profile_and_level,                               "Profile_and_level"); Param_Info(Mpeg_Descriptors_MPEG_4_audio_profile_and_level(Profile_and_level));
+    Get_B1 (   Profile_and_level,                               "Profile_and_level"); Param_Info1(Mpeg_Descriptors_MPEG_4_audio_profile_and_level(Profile_and_level));
 
     FILLING_BEGIN();
-        Complete_Stream->Streams[elementary_PID].Infos["Format_Profile"]=Mpeg_Descriptors_MPEG_4_audio_profile_and_level(Profile_and_level);
+        Complete_Stream->Streams[elementary_PID]->Infos["Format_Profile"]=Mpeg_Descriptors_MPEG_4_audio_profile_and_level(Profile_and_level);
     FILLING_END();
 }
 
@@ -1809,13 +1846,11 @@
         {
             File_Mpeg4_Descriptors MI;
             MI.Parser_DoNotFreeIt=true;
-            MI.DecSpecificInfoTag_DoNotFreeIt=true;
             MI.SLConfig_DoNotFreeIt=true;
             Open_Buffer_Init(&MI);
             Open_Buffer_Continue(&MI);
             Finish(&MI);
             Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].IOD_ESs[MI.ES_ID].Parser=MI.Parser;
-            Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].IOD_ESs[MI.ES_ID].DecSpecificInfoTag=MI.DecSpecificInfoTag;
             Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].IOD_ESs[MI.ES_ID].SLConfig=MI.SLConfig;
         }
     #else
@@ -1830,11 +1865,11 @@
     int16u ES_ID;
     while (Element_Offset<Element_Size)
     {
-        Element_Begin("FlexMux");
+        Element_Begin1("FlexMux");
         Get_B2 (ES_ID,                                          "ES_ID");
         if (Element_Offset!=Element_Size)
             Skip_B1(                                            "FlexMuxChannel");
-        Element_End();
+        Element_End0();
 
         FILLING_BEGIN();
             switch (table_id)
@@ -1842,8 +1877,8 @@
                 case 0x02 : //program_map_section
                             if (elementary_PID_IsValid)
                             {
-                                Complete_Stream->Streams[elementary_PID].FMC_ES_ID=ES_ID;
-                                Complete_Stream->Streams[elementary_PID].FMC_ES_ID_IsValid=true;
+                                Complete_Stream->Streams[elementary_PID]->FMC_ES_ID=ES_ID;
+                                Complete_Stream->Streams[elementary_PID]->FMC_ES_ID_IsValid=true;
                             }
                             break;
                 default    : ;
@@ -1857,9 +1892,9 @@
 {
     //Parsing
     int8u profile_idc, level_idc;
-    Get_B1 (profile_idc,                                        "profile_idc"); Param_Info(Avc_profile_idc(profile_idc));
+    Get_B1 (profile_idc,                                        "profile_idc"); Param_Info1(Avc_profile_idc(profile_idc));
     BS_Begin();
-    Element_Begin("constraints");
+    Element_Begin1("constraints");
         Skip_SB(                                                "constraint_set0_flag");
         Skip_SB(                                                "constraint_set1_flag");
         Skip_SB(                                                "constraint_set2_flag");
@@ -1868,7 +1903,7 @@
         Skip_SB(                                                "reserved_zero_4bits");
         Skip_SB(                                                "reserved_zero_4bits");
         Skip_SB(                                                "reserved_zero_4bits");
-    Element_End();
+    Element_End0();
     BS_End();
     Get_B1 (level_idc,                                          "level_idc");
     BS_Begin();
@@ -1883,8 +1918,8 @@
             case 0x02 : //program_map_section
                         if (elementary_PID_IsValid)
                         {
-                            Complete_Stream->Streams[elementary_PID].Infos["Format"]=_T("AVC");
-                            Complete_Stream->Streams[elementary_PID].Infos["Format_Profile"]=Ztring().From_Local(Avc_profile_idc(profile_idc))+_T("@L")+Ztring().From_Number(((float)level_idc)/10, 1);
+                            Complete_Stream->Streams[elementary_PID]->Infos["Format"]=__T("AVC");
+                            Complete_Stream->Streams[elementary_PID]->Infos["Format_Profile"]=Ztring().From_Local(Avc_profile_idc(profile_idc))+__T("@L")+Ztring().From_Number(((float)level_idc)/10, 1);
                         }
                         break;
             default    : ;
@@ -1947,12 +1982,12 @@
     //Parsing
     while (Element_Offset<Element_Size)
     {
-        Element_Begin("service");
+        Element_Begin1("service");
         int16u service_id;
         int8u service_type;
-        Get_B2 (service_id,                                     "service_id"); Element_Info(Ztring::ToZtring(service_id, 16));
-        Get_B1 (service_type,                                   "service_type"); Param_Info(Mpeg_Descriptors_dvb_service_type(service_type));
-        Element_End(service_id);
+        Get_B2 (service_id,                                     "service_id"); Element_Info1(Ztring::ToZtring(service_id, 16));
+        Get_B1 (service_type,                                   "service_type"); Param_Info1(Mpeg_Descriptors_dvb_service_type(service_type));
+        Element_End1(Ztring::ToZtring(service_id));
 
         FILLING_BEGIN();
             Complete_Stream->Transport_Streams[table_id_extension].Programs[service_id].Infos["ServiceType"]=Mpeg_Descriptors_dvb_service_type(service_type);
@@ -1968,10 +2003,10 @@
     int16u orbital_position;
     int8u polarization, roll_off, modulation_type, FEC_inner;
     bool west_east_flag, modulation_system;
-    Get_B4 (frequency,                                          "frequency"); Param_Info(Frequency_DVB__BCD(frequency));
-    Get_B2 (orbital_position,                                   "orbital_position"); Param_Info(OrbitalPosition_DVB__BCD(orbital_position));
+    Get_B4 (frequency,                                          "frequency"); Param_Info1(Frequency_DVB__BCD(frequency));
+    Get_B2 (orbital_position,                                   "orbital_position"); Param_Info1(OrbitalPosition_DVB__BCD(orbital_position));
     BS_Begin();
-    Get_SB (    west_east_flag,                                 "west_east_flag"); Param_Info(west_east_flag?"E":"W");
+    Get_SB (    west_east_flag,                                 "west_east_flag"); Param_Info1(west_east_flag?"E":"W");
     Get_S1 ( 2, polarization,                                   "polarization");
     Get_S1 ( 2, roll_off,                                       "roll_off");
     Get_SB (    modulation_system,                              "modulation_system");
@@ -1982,7 +2017,7 @@
 
     FILLING_BEGIN();
         Complete_Stream->Transport_Streams[transport_stream_id].Infos["Frequency"]=Frequency_DVB__BCD(frequency);
-        Complete_Stream->Transport_Streams[transport_stream_id].Infos["OrbitalPosition"]=OrbitalPosition_DVB__BCD(orbital_position)+(west_east_flag?_T('E'):_T('W'));
+        Complete_Stream->Transport_Streams[transport_stream_id].Infos["OrbitalPosition"]=OrbitalPosition_DVB__BCD(orbital_position)+(west_east_flag?__T('E'):__T('W'));
     FILLING_END();
 }
 
@@ -1992,7 +2027,7 @@
     //Parsing
     Ztring service_provider_name, service_name;
     int8u service_type, service_provider_name_length, service_name_length;
-    Get_B1 (service_type,                                       "service_type"); Param_Info(Mpeg_Descriptors_dvb_service_type(service_type));
+    Get_B1 (service_type,                                       "service_type"); Param_Info1(Mpeg_Descriptors_dvb_service_type(service_type));
     Get_B1 (service_provider_name_length,                       "service_provider_name_length");
     Get_DVB_Text(service_provider_name_length, service_provider_name, "service_provider_name");
     Get_B1 (service_name_length,                                "service_name_length");
@@ -2015,9 +2050,9 @@
     //Parsing
     int8u linkage_type;
     Skip_B2(                                                    "transport_stream_id");
-    Info_B2(original_network_id,                                "original_network_id"); Param_Info(Mpeg_Descriptors_original_network_id(original_network_id));
+    Info_B2(original_network_id,                                "original_network_id"); Param_Info1(Mpeg_Descriptors_original_network_id(original_network_id));
     Skip_B2(                                                    "service_id");
-    Get_B1 (linkage_type,                                       "linkage_type"); Param_Info(Mpeg_Descriptors_linkage_type(linkage_type));
+    Get_B1 (linkage_type,                                       "linkage_type"); Param_Info1(Mpeg_Descriptors_linkage_type(linkage_type));
     if (Element_Size>7)
         Skip_XX(Element_Size-7,                                 "private_data");
 }
@@ -2031,7 +2066,7 @@
     int8u event_name_length, text_length;
     Get_C3 (ISO_639_language_code,                              "ISO_639_language_code");
     Get_B1 (event_name_length,                                  "event_name_length");
-    Get_DVB_Text(event_name_length, event_name,                 "event_name"); Element_Info(event_name);
+    Get_DVB_Text(event_name_length, event_name,                 "event_name"); Element_Info1(event_name);
     Get_B1 (text_length,                                        "text_length");
     Get_DVB_Text(text_length, text,                             "text");
 
@@ -2042,8 +2077,8 @@
             {
                 Ztring ISO_639_2; ISO_639_2.From_CC3(ISO_639_language_code);
                 const Ztring& ISO_639_1=MediaInfoLib::Config.Iso639_1_Get(ISO_639_2);
-                Complete_Stream->Transport_Streams[transport_stream_id].Programs[table_id_extension].DVB_EPG_Blocks[table_id].Events[event_id].short_event.event_name=(ISO_639_1.empty()?ISO_639_2:ISO_639_1)+_T(':')+event_name;
-                Complete_Stream->Transport_Streams[transport_stream_id].Programs[table_id_extension].DVB_EPG_Blocks[table_id].Events[event_id].short_event.text=(ISO_639_1.empty()?ISO_639_2:ISO_639_1)+_T(':')+text;
+                Complete_Stream->Transport_Streams[transport_stream_id].Programs[table_id_extension].DVB_EPG_Blocks[table_id].Events[event_id].short_event.event_name=(ISO_639_1.empty()?ISO_639_2:ISO_639_1)+__T(':')+event_name;
+                Complete_Stream->Transport_Streams[transport_stream_id].Programs[table_id_extension].DVB_EPG_Blocks[table_id].Events[event_id].short_event.text=(ISO_639_1.empty()?ISO_639_2:ISO_639_1)+__T(':')+text;
                 Complete_Stream->Transport_Streams[transport_stream_id].Programs[table_id_extension].DVB_EPG_Blocks_IsUpdated=true;
                 Complete_Stream->Programs_IsUpdated=true;
             }
@@ -2056,11 +2091,12 @@
 {
     //Parsing
     int32u ISO_639_language_code;
+    int8u stream_content;
     BS_Begin();
     Skip_S1(4,                                                  "reserved_future_use");
-    Info_S1(4, stream_content,                                  "stream_content"); Param_Info(Mpeg_Descriptors_stream_content(stream_content)); Element_Info(Mpeg_Descriptors_stream_content(stream_content));
+    Get_S1 (4, stream_content,                                  "stream_content"); Param_Info1(Mpeg_Descriptors_stream_content(stream_content)); Element_Info1(Mpeg_Descriptors_stream_content(stream_content));
     BS_End();
-    Info_B1(component_type,                                     "component_type"); Param_Info(Mpeg_Descriptors_component_type(stream_content, component_type)); Element_Info(Mpeg_Descriptors_component_type(stream_content, component_type));
+    Info_B1(component_type,                                     "component_type"); Param_Info1(Mpeg_Descriptors_component_type(stream_content, component_type)); Element_Info1(Mpeg_Descriptors_component_type(stream_content, component_type));
     Info_B1(component_tag,                                      "component_tag");
     Get_C3 (ISO_639_language_code,                              "ISO_639_language_code");
     Skip_DVB_Text(Element_Size-Element_Offset,                  "text");
@@ -2073,7 +2109,7 @@
                         {
                             Ztring ISO_639_2; ISO_639_2.From_CC3(ISO_639_language_code);
                             const Ztring& ISO_639_1=MediaInfoLib::Config.Iso639_1_Get(ISO_639_2);
-                            Complete_Stream->Streams[elementary_PID].Infos["Language"]=ISO_639_1.empty()?ISO_639_2:ISO_639_1;
+                            Complete_Stream->Streams[elementary_PID]->Infos["Language"]=ISO_639_1.empty()?ISO_639_2:ISO_639_1;
                         }
                         break;
             default    : ;
@@ -2095,8 +2131,9 @@
     while (Element_Offset<Element_Size)
     {
         BS_Begin();
-        Info_S1(4, content_nibble_level_1,                      "content_nibble_level_1"); Param_Info(Mpeg_Descriptors_content_nibble_level_1(content_nibble_level_1)); Element_Info(Mpeg_Descriptors_content_nibble_level_1(content_nibble_level_1));
-        Info_S1(4, content_nibble_level_2,                      "content_nibble_level_2"); Param_Info(Mpeg_Descriptors_content_nibble_level_2(content_nibble_level_1, content_nibble_level_2)); if (content_nibble_level_1==0xB || content_nibble_level_2!=0) Element_Info(Mpeg_Descriptors_content_nibble_level_2(content_nibble_level_1, content_nibble_level_2));
+        int8u content_nibble_level_1, content_nibble_level_2;
+        Get_S1 (4, content_nibble_level_1,                      "content_nibble_level_1"); Param_Info1(Mpeg_Descriptors_content_nibble_level_1(content_nibble_level_1)); Element_Info1(Mpeg_Descriptors_content_nibble_level_1(content_nibble_level_1));
+        Get_S1 (4, content_nibble_level_2,                      "content_nibble_level_2"); Param_Info1(Mpeg_Descriptors_content_nibble_level_2(content_nibble_level_1, content_nibble_level_2)); Element_Info1C((content_nibble_level_1==0xB || content_nibble_level_2!=0), Mpeg_Descriptors_content_nibble_level_2(content_nibble_level_1, content_nibble_level_2));
         Skip_S1(4,                                              "user_nibble");
         Skip_S1(4,                                              "user_nibble");
         BS_End();
@@ -2104,7 +2141,7 @@
         FILLING_BEGIN();
             if (event_id_IsValid)
             {
-                Complete_Stream->Transport_Streams[transport_stream_id].Programs[table_id_extension].DVB_EPG_Blocks[table_id].Events[event_id].content=Ztring().From_UTF8(Mpeg_Descriptors_content_nibble_level_2(content_nibble_level_1, content_nibble_level_2))+_T(", ");
+                Complete_Stream->Transport_Streams[transport_stream_id].Programs[table_id_extension].DVB_EPG_Blocks[table_id].Events[event_id].content=Ztring().From_UTF8(Mpeg_Descriptors_content_nibble_level_2(content_nibble_level_1, content_nibble_level_2))+__T(", ");
                 Complete_Stream->Transport_Streams[transport_stream_id].Programs[table_id_extension].DVB_EPG_Blocks_IsUpdated=true;
                 Complete_Stream->Programs_IsUpdated=true;
             }
@@ -2131,7 +2168,7 @@
     while (Element_Offset<Element_Size)
     {
         Skip_Local(3,                                           "country_code");
-        Info_B1(rating,                                         "rating"); Param_Info(rating+3, " years old"); Element_Info(rating+3, " years old");
+        Info_B1(rating,                                         "rating"); Param_Info2(rating+3, " years old"); Element_Info2(rating+3, " years old");
     }
 }
 
@@ -2142,52 +2179,39 @@
     Ztring Languages;
     while (Element_Offset<Element_Size)
     {
-        Element_Begin("teletext");
-        int32u ISO_639_language_code;
-        Get_C3 (ISO_639_language_code,                          "ISO_639_language_code");
+        Element_Begin1("teletext");
+        Ztring ISO_639_language_code;
+        int8u teletext_type;
+        int8u teletext_magazine_number;
+        int8u teletext_page_number_1;
+        int8u teletext_page_number_2;
+        Get_Local(3, ISO_639_language_code,                     "ISO_639_language_code");
         BS_Begin();
-        Info_S1(5, teletext_type,                               "teletext_type"); Param_Info(Mpeg_Descriptors_teletext_type(teletext_type));
-        Skip_S1(3,                                              "teletext_magazine_number");
-        Skip_S1(4,                                              "teletext_page_number_1");
-        Skip_S1(4,                                              "teletext_page_number_2");
+        Get_S1 (5, teletext_type,                               "teletext_type"); Param_Info1(Mpeg_Descriptors_teletext_type(teletext_type));
+        Get_S1 (3, teletext_magazine_number,                    "teletext_magazine_number");
+        Get_S1 (4, teletext_page_number_1,                      "teletext_page_number_1");
+        Get_S1 (4, teletext_page_number_2,                      "teletext_page_number_2");
         BS_End();
 
         FILLING_BEGIN();
             switch (table_id)
             {
                 case 0x02 : //program_map_section
-                            if (elementary_PID_IsValid)
+                            if (elementary_PID_IsValid /*&& (teletext_type==2 || teletext_type==5)*/) //Subtitles are the only supported format
                             {
-                                Ztring ISO_639_2; ISO_639_2.From_CC3(ISO_639_language_code);
-                                const Ztring& ISO_639_1=MediaInfoLib::Config.Iso639_1_Get(ISO_639_2);
-                                Languages+=(ISO_639_1.empty()?ISO_639_2:ISO_639_1)+_T(" / ");
-                                //TODO: this stream is teletext. Be careful, multiple stream in a PID
+                                int16u ID=(teletext_magazine_number==0?8:teletext_magazine_number)*100+teletext_page_number_1*10+teletext_page_number_2;
+                                Complete_Stream->Streams[elementary_PID]->descriptor_tag=0x56;
+                                Complete_Stream->Streams[elementary_PID]->Teletexts[ID].Infos["Language"]=MediaInfoLib::Config.Iso639_1_Get(ISO_639_language_code);
+                                Complete_Stream->Streams[elementary_PID]->Teletexts[ID].Infos["Format"]=Mpeg_Descriptors_teletext_type(teletext_type);
+                                Complete_Stream->Streams[elementary_PID]->Teletexts[ID].Infos["Codec"]=Mpeg_Descriptors_teletext_type(teletext_type);
                             }
                             break;
                 default    : ;
             }
         FILLING_END();
 
-        Element_End();
+        Element_End0();
     }
-
-    FILLING_BEGIN();
-        switch (table_id)
-        {
-            case 0x02 : //program_map_section
-                        if (elementary_PID_IsValid)
-                        {
-                            Complete_Stream->Streams[elementary_PID].StreamKind=Stream_Text;
-                            if (!Languages.empty())
-                                Languages.resize(Languages.size()-3);
-                            Complete_Stream->Streams[elementary_PID].Infos["Language"]=Languages;
-                            Complete_Stream->Streams[elementary_PID].Infos["Format"]=_T("Teletext");
-                            Complete_Stream->Streams[elementary_PID].Infos["Codec"]=_T("Teletext");
-                        }
-                        break;
-            default    : ;
-        }
-    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -2197,23 +2221,25 @@
     while (Element_Offset<Element_Size)
     {
         int32u country_code;
+        int16u local_time_offset;
         int8u country_region_id;
+        bool local_time_offset_polarity;
         Get_C3 (country_code,                                       "country_code");
         BS_Begin();
         Get_S1 (6, country_region_id,                               "country_region_id");
         Skip_SB(                                                    "reserved");
-        Info_SB(local_time_offset_polarity,                         "local_time_offset_polarity"); Param_Info(local_time_offset_polarity?"-":"+");
+        Get_SB (local_time_offset_polarity,                         "local_time_offset_polarity"); Param_Info1(local_time_offset_polarity?"-":"+");
         BS_End();
-        Info_B2(local_time_offset,                                  "local_time_offset"); Param_Info(TimeHHMM_BCD(local_time_offset));
-        Info_B2(date,                                               "time_of_change (date)"); Param_Info(Date_MJD(date));
-        Info_B3(time,                                               "time_of_change (time)"); Param_Info(Time_BCD(time));
-        Info_B2(next_time_offset,                                   "next_time_offset"); Param_Info(TimeHHMM_BCD(next_time_offset));
+        Get_B2 (local_time_offset,                                  "local_time_offset"); Param_Info1(TimeHHMM_BCD(local_time_offset));
+        Info_B2(date,                                               "time_of_change (date)"); Param_Info1(Date_MJD(date));
+        Info_B3(time,                                               "time_of_change (time)"); Param_Info1(Time_BCD(time));
+        Info_B2(next_time_offset,                                   "next_time_offset"); Param_Info1(TimeHHMM_BCD(next_time_offset));
 
         FILLING_BEGIN();
             Ztring Country; Country.From_CC3(country_code);
             if (country_region_id)
-                Country+=_T(" (")+Ztring::ToZtring(country_region_id)+_T(")");
-            Complete_Stream->TimeZones[Country]=(local_time_offset_polarity?_T('-'):_T('+'))+TimeHHMM_BCD(local_time_offset);
+                Country+=__T(" (")+Ztring::ToZtring(country_region_id)+__T(")");
+            Complete_Stream->TimeZones[Country]=(local_time_offset_polarity?__T('-'):__T('+'))+TimeHHMM_BCD(local_time_offset);
         FILLING_END();
     }
 }
@@ -2225,10 +2251,10 @@
     Ztring Languages;
     while (Element_Offset<Element_Size)
     {
-        Element_Begin("subtitle");
+        Element_Begin1("subtitle");
         int32u ISO_639_language_code;
         Get_C3 (ISO_639_language_code,                              "ISO_639_language_code");
-        Info_B1(subtitling_type,                                    "subtitling_type"); Param_Info(Mpeg_Descriptors_component_type_O3(subtitling_type));
+        Info_B1(subtitling_type,                                    "subtitling_type"); Param_Info1(Mpeg_Descriptors_component_type_O3(subtitling_type));
         Skip_B2(                                                    "composition_page_id");
         Skip_B2(                                                    "ancillary_page_id");
 
@@ -2240,15 +2266,15 @@
                             {
                                 Ztring ISO_639_2; ISO_639_2.From_CC3(ISO_639_language_code);
                                 const Ztring& ISO_639_1=MediaInfoLib::Config.Iso639_1_Get(ISO_639_2);
-                                Languages+=(ISO_639_1.empty()?ISO_639_2:ISO_639_1)+_T(" / ");
-                                //TODO: this stream is teletext. Be careful, multiple stream in a PID
+                                Languages+=(ISO_639_1.empty()?ISO_639_2:ISO_639_1)+__T(" / ");
+                                //TODO: this stream is teletext. Be careful, multiple stream in a pid
                             }
                             break;
                 default    : ;
             }
         FILLING_END();
-        
-        Element_End();
+
+        Element_End0();
     }
 
     FILLING_BEGIN();
@@ -2257,12 +2283,13 @@
             case 0x02 : //program_map_section
                         if (elementary_PID_IsValid)
                         {
-                            Complete_Stream->Streams[elementary_PID].StreamKind=Stream_Text;
+                            Complete_Stream->Streams[elementary_PID]->StreamKind_FromDescriptor=Stream_Text;
+                            Complete_Stream->Streams[elementary_PID]->descriptor_tag=0x59;
                             if (!Languages.empty())
                                 Languages.resize(Languages.size()-3);
-                            Complete_Stream->Streams[elementary_PID].Infos["Language"]=Languages;
-                            Complete_Stream->Streams[elementary_PID].Infos["Format"]=_T("DVB Subtitles");
-                            Complete_Stream->Streams[elementary_PID].Infos["Codec"]=_T("DVB Subtitles");
+                            Complete_Stream->Streams[elementary_PID]->Infos["Language"]=Languages;
+                            Complete_Stream->Streams[elementary_PID]->Infos["Format"]=__T("DVB Subtitle");
+                            Complete_Stream->Streams[elementary_PID]->Infos["Codec"]=__T("DVB Subtitle");
                         }
                         break;
             default    : ;
@@ -2274,19 +2301,19 @@
 void File_Mpeg_Descriptors::Descriptor_5A()
 {
     //Parsing
-    Info_B4(centre_frequency,                                   "centre_frequency"); Param_Info(((int64u)centre_frequency)*10, " Hz");
+    Info_B4(centre_frequency,                                   "centre_frequency"); Param_Info2(((int64u)centre_frequency)*10, " Hz");
     BS_Begin();
-    Info_S1(3, bandwidth,                                       "bandwidth"); Param_Info(Mpeg_Descriptors_bandwidth[bandwidth]);
-    Info_SB(   priority,                                        "priority"); Param_Info(priority?"HP":"LP");
+    Info_S1(3, bandwidth,                                       "bandwidth"); Param_Info1(Mpeg_Descriptors_bandwidth[bandwidth]);
+    Info_SB(   priority,                                        "priority"); Param_Info1(priority?"HP":"LP");
     Skip_SB(                                                    "Time_Slicing_indicator");
     Skip_SB(                                                    "MPE-FEC_indicator");
     Skip_S1(2,                                                  "reserved");
-    Info_S1(2, constellation,                                   "constellation"); Param_Info(Mpeg_Descriptors_constellation[constellation]);
-    Info_S1(3, hierarchy_information,                           "hierarchy_information"); Param_Info(Mpeg_Descriptors_hierarchy_information[hierarchy_information]);
-    Info_S1(3, code_rate_HP,                                    "code_rate-HP_stream"); Param_Info(Mpeg_Descriptors_code_rate[code_rate_HP]);
-    Info_S1(3, code_rate_LP,                                    "code_rate-LP_stream"); Param_Info(Mpeg_Descriptors_code_rate[code_rate_LP]);
-    Info_S1(2, guard_interval,                                  "guard_interval"); Param_Info(Mpeg_Descriptors_guard_interval[guard_interval]);
-    Info_S1(2, transmission_mode,                               "transmission_mode"); Param_Info(Mpeg_Descriptors_transmission_mode[transmission_mode]);
+    Info_S1(2, constellation,                                   "constellation"); Param_Info1(Mpeg_Descriptors_constellation[constellation]);
+    Info_S1(3, hierarchy_information,                           "hierarchy_information"); Param_Info1(Mpeg_Descriptors_hierarchy_information[hierarchy_information]);
+    Info_S1(3, code_rate_HP,                                    "code_rate-HP_stream"); Param_Info1(Mpeg_Descriptors_code_rate[code_rate_HP]);
+    Info_S1(3, code_rate_LP,                                    "code_rate-LP_stream"); Param_Info1(Mpeg_Descriptors_code_rate[code_rate_LP]);
+    Info_S1(2, guard_interval,                                  "guard_interval"); Param_Info1(Mpeg_Descriptors_guard_interval[guard_interval]);
+    Info_S1(2, transmission_mode,                               "transmission_mode"); Param_Info1(Mpeg_Descriptors_transmission_mode[transmission_mode]);
     Skip_SB(                                                    "other_frequency_flag");
     BS_End();
     Skip_B4(                                                    "reserved");
@@ -2312,8 +2339,8 @@
         FILLING_BEGIN();
             Ztring ISO_639_2=Ztring().From_CC3(ISO_639_language_code);
             const Ztring& ISO_639_1=MediaInfoLib::Config.Iso639_1_Get(ISO_639_2);
-            ServiceProvider+=(ISO_639_1.empty()?ISO_639_2:ISO_639_1)+_T(':')+service_provider_name+_T( " - ");
-            ServiceName+=(ISO_639_1.empty()?ISO_639_2:ISO_639_1)+_T(':')+service_name+_T( " - ");
+            ServiceProvider+=(ISO_639_1.empty()?ISO_639_2:ISO_639_1)+__T(':')+service_provider_name+__T( " - ");
+            ServiceName+=(ISO_639_1.empty()?ISO_639_2:ISO_639_1)+__T(':')+service_name+__T( " - ");
         FILLING_END();
     }
 
@@ -2335,7 +2362,7 @@
 void File_Mpeg_Descriptors::Descriptor_5F()
 {
     //Parsing
-    Info_B4(private_data_specifier,                             "private_data_specifier"); Param_Info(Ztring().From_CC4(private_data_specifier));
+    Info_B4(private_data_specifier,                             "private_data_specifier"); Param_Info1(Ztring().From_CC4(private_data_specifier));
 }
 
 //---------------------------------------------------------------------------
@@ -2357,7 +2384,7 @@
         {
             case 0x02 : //program_map_section
                         if (elementary_PID_IsValid)
-                            Complete_Stream->Streams[elementary_PID].Infos["OverallBitRate_Maximum"]=Ztring::ToZtring(peak_rate*400);
+                            Complete_Stream->Streams[elementary_PID]->Infos["OverallBitRate_Maximum"]=Ztring::ToZtring(peak_rate*400);
                         break;
             case 0x7F : //selection_information_section
                         Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Infos["OverallBitRate_Maximum"]=Ztring::ToZtring(peak_rate*400);
@@ -2403,8 +2430,8 @@
         BS_Begin();
         Get_SB (   enhanced_ac3,                                "enhanced AC-3");
         Skip_SB(                                                "full_service");
-        Get_S1 (3, service_type,                                "service_type"); Param_Info(AC3_Mode[service_type]);
-        Get_S1 (3, number_of_channels,                          "number_of_channels"); Param_Info(Mpeg_Descriptors_AC3_Channels[number_of_channels], " channels");
+        Get_S1 (3, service_type,                                "service_type"); Param_Info1(AC3_Mode[service_type]);
+        Get_S1 (3, number_of_channels,                          "number_of_channels"); Param_Info2(Mpeg_Descriptors_AC3_Channels[number_of_channels], " channels");
         BS_End();
 
         FILLING_BEGIN();
@@ -2412,7 +2439,10 @@
             {
                 case 0x02 : //program_map_section
                             if (elementary_PID_IsValid)
-                                Complete_Stream->Streams[elementary_PID].Infos["Channel(s)"]=Ztring().From_Local(Mpeg_Descriptors_AC3_Channels[number_of_channels]);
+                            {
+                                Complete_Stream->Streams[elementary_PID]->descriptor_tag=0x6A;
+                                Complete_Stream->Streams[elementary_PID]->Infos["Channel(s)"]=Ztring().From_Local(Mpeg_Descriptors_AC3_Channels[number_of_channels]);
+                            }
                             break;
                 default    : ;
             }
@@ -2440,9 +2470,11 @@
             case 0x02 : //program_map_section
                         if (elementary_PID_IsValid)
                         {
-                            Complete_Stream->Streams[elementary_PID].StreamKind=Stream_Audio;
-                            Complete_Stream->Streams[elementary_PID].Infos["Format"]=enhanced_ac3?_T("E-AC-3"):_T("AC-3");
-                            Complete_Stream->Streams[elementary_PID].Infos["Codec"]=_T("AC3+");
+                            Complete_Stream->Streams[elementary_PID]->StreamKind_FromDescriptor=Stream_Audio;
+                            Complete_Stream->Streams[elementary_PID]->Infos["Format"]=enhanced_ac3?__T("E-AC-3"):__T("AC-3");
+                            Complete_Stream->Streams[elementary_PID]->Infos["Codec"]=__T("AC3+");
+                            if (Complete_Stream->Streams[elementary_PID]->registration_format_identifier==Elements::BSSD)
+                                Complete_Stream->Streams[elementary_PID]->registration_format_identifier=0x00000000; //Reseting it, this combinaision is not possible but an stream has it
                         }
                         break;
             default    : ;
@@ -2471,14 +2503,17 @@
         BS_Begin();
         Get_SB (  enhanced_ac3,                                "enhanced AC-3");
         Skip_SB(                                               "full_service");
-        Get_S1 (3, service_type,                               "service_type"); Param_Info(AC3_Mode[service_type]);
-        Get_S1 (3, number_of_channels,                         "number_of_channels"); Param_Info(Mpeg_Descriptors_AC3_Channels[number_of_channels], " channels");
+        Get_S1 (3, service_type,                               "service_type"); Param_Info1(AC3_Mode[service_type]);
+        Get_S1 (3, number_of_channels,                         "number_of_channels"); Param_Info2(Mpeg_Descriptors_AC3_Channels[number_of_channels], " channels");
         FILLING_BEGIN();
             switch (table_id)
             {
                 case 0x02 : //program_map_section
                             if (elementary_PID_IsValid)
-                                Complete_Stream->Streams[elementary_PID].Infos["Channel(s)"]=Ztring().From_Local(Mpeg_Descriptors_AC3_Channels[number_of_channels]);
+                            {
+                                Complete_Stream->Streams[elementary_PID]->descriptor_tag=0x7A;
+                                Complete_Stream->Streams[elementary_PID]->Infos["Channel(s)"]=Ztring().From_Local(Mpeg_Descriptors_AC3_Channels[number_of_channels]);
+                            }
                             break;
                 default    : ;
             }
@@ -2519,9 +2554,9 @@
             case 0x02 : //program_map_section
                         if (elementary_PID_IsValid)
                         {
-                            Complete_Stream->Streams[elementary_PID].StreamKind=Stream_Audio;
-                            Complete_Stream->Streams[elementary_PID].Infos["Format"]=enhanced_ac3?_T("E-AC-3"):_T("AC-3");
-                            Complete_Stream->Streams[elementary_PID].Infos["Codec"]=_T("AC3+");
+                            Complete_Stream->Streams[elementary_PID]->StreamKind_FromDescriptor=Stream_Audio;
+                            Complete_Stream->Streams[elementary_PID]->Infos["Format"]=enhanced_ac3?__T("E-AC-3"):__T("AC-3");
+                            Complete_Stream->Streams[elementary_PID]->Infos["Codec"]=__T("AC3+");
                         }
                         break;
             default    : ;
@@ -2542,6 +2577,18 @@
     Skip_S1(2,                                                  "extended_surround_flag");
     BS_End();
     //BS_End_CANBEMORE();
+
+    FILLING_BEGIN();
+        switch (table_id)
+        {
+            case 0x02 : //program_map_section
+                        if (elementary_PID_IsValid)
+                        {
+                            Complete_Stream->Streams[elementary_PID]->descriptor_tag=0x7B;
+                        }
+            default   : ;
+        }
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -2550,7 +2597,7 @@
     //Parsing
     int8u Profile_and_level;
     bool AAC_type_flag;
-    Get_B1 (   Profile_and_level,                               "Profile_and_level"); Param_Info(Mpeg_Descriptors_MPEG_4_audio_profile_and_level(Profile_and_level));
+    Get_B1 (   Profile_and_level,                               "Profile_and_level"); Param_Info1(Mpeg_Descriptors_MPEG_4_audio_profile_and_level(Profile_and_level));
     BS_Begin();
     Get_SB (   AAC_type_flag,                                   "AAC_type_flag");
     Skip_SB(                                                    "reserved");
@@ -2569,7 +2616,16 @@
         Skip_XX(Element_Size-Element_Offset,                    "Unknown");
 
     FILLING_BEGIN();
-        Complete_Stream->Streams[elementary_PID].Infos["Format_Profile"]=Mpeg_Descriptors_MPEG_4_audio_profile_and_level(Profile_and_level);
+        switch (table_id)
+        {
+            case 0x02 : //program_map_section
+                        if (elementary_PID_IsValid)
+                        {
+                            Complete_Stream->Streams[elementary_PID]->descriptor_tag=0x7C;
+                            Complete_Stream->Streams[elementary_PID]->Infos["Format_Profile"]=Mpeg_Descriptors_MPEG_4_audio_profile_and_level(Profile_and_level);
+                        }
+            default   : ;
+        }
     FILLING_END();
 }
 
@@ -2581,12 +2637,12 @@
     int8u sample_rate_code, bit_rate_code, surround_mode, bsmod, num_channels, langcod, textlen, text_code;
     bool language_flag, language_flag_2;
     BS_Begin();
-    Get_S1 (3, sample_rate_code,                                "sample_rate_code"); if (sample_rate_code<4) {Param_Info(AC3_SamplingRate[sample_rate_code], " Hz");}
+    Get_S1 (3, sample_rate_code,                                "sample_rate_code"); if (sample_rate_code<4) {Param_Info2(AC3_SamplingRate[sample_rate_code], " Hz");}
     Skip_S1(5,                                                  "bsid");
-    Get_S1 (6, bit_rate_code,                                   "bit_rate_code"); Param_Info(AC3_BitRate[bit_rate_code]*1000, " Kbps");
-    Get_S1 (2, surround_mode,                                   "surround_mode"); Param_Info(AC3_Surround[surround_mode]);
+    Get_S1 (6, bit_rate_code,                                   "bit_rate_code"); Param_Info2(AC3_BitRate[bit_rate_code]*1000, " Kbps");
+    Get_S1 (2, surround_mode,                                   "surround_mode"); Param_Info1(AC3_Surround[surround_mode]);
     Get_S1 (3, bsmod,                                           "bsmod");
-    Get_S1 (4, num_channels,                                    "num_channels"); if (num_channels<8) {Param_Info(AC3_Channels[num_channels], " channels");}
+    Get_S1 (4, num_channels,                                    "num_channels"); if (num_channels<8) {Param_Info2(AC3_Channels[num_channels], " channels");}
     Skip_SB(                                                    "full_svc");
     BS_End();
 
@@ -2596,11 +2652,12 @@
             case 0x02 : //program_map_section
                         if (elementary_PID_IsValid)
                         {
+                            Complete_Stream->Streams[elementary_PID]->descriptor_tag=0x81;
                             if (sample_rate_code<4)
-                                Complete_Stream->Streams[elementary_PID].Infos["SamplingRate"]=Ztring::ToZtring(AC3_SamplingRate[sample_rate_code]);
-                            Complete_Stream->Streams[elementary_PID].Infos["BitRate"]=Ztring::ToZtring(AC3_BitRate[bit_rate_code]*1000);
+                                Complete_Stream->Streams[elementary_PID]->Infos["SamplingRate"]=Ztring::ToZtring(AC3_SamplingRate[sample_rate_code]);
+                            Complete_Stream->Streams[elementary_PID]->Infos["BitRate"]=Ztring::ToZtring(AC3_BitRate[bit_rate_code]*1000);
                             if (num_channels<8)
-                                Complete_Stream->Streams[elementary_PID].Infos["Channel(s)"]=Ztring::ToZtring(AC3_Channels[num_channels]);
+                                Complete_Stream->Streams[elementary_PID]->Infos["Channel(s)"]=Ztring::ToZtring(AC3_Channels[num_channels]);
                         }
         }
     FILLING_END();
@@ -2620,7 +2677,7 @@
     {
         BS_Begin();
         Skip_S1(3,                                              "mainid");
-        Info_BS(2, priority,                                    "priority"); Param_Info(Mpeg_Descriptors_AC3_Priority[priority]);
+        Info_BS(2, priority,                                    "priority"); Param_Info1(Mpeg_Descriptors_AC3_Priority[priority]);
         Skip_S1(3,                                              "reserved");
         BS_End();
     }
@@ -2631,7 +2688,7 @@
     if (Element_Offset==Element_Size) return;
     BS_Begin();
     Get_S1 (7, textlen,                                         "textlen");
-    Get_S1 (1, text_code,                                       "text_code"); if (text_code) Param_Info("Unicode");
+    Get_S1 (1, text_code,                                       "text_code"); Param_Info1C((text_code), "Unicode");
     BS_End();
     if (textlen)
         Get_Local(textlen, Text,                                "text");
@@ -2669,43 +2726,41 @@
     Skip_S1(3,                                                  "reserved");
     Get_S1 (5, number_of_services,                              "number_of_services");
     BS_End();
-    if (elementary_PID_IsValid)
-    {
-        if (number_of_services>=Complete_Stream->Streams[elementary_PID].Captions_Language.size())
-            Complete_Stream->Streams[elementary_PID].Captions_Language.resize(number_of_services);
-    }
 
     for (int8u Pos=0; Pos<number_of_services; Pos++)
     {
-        Element_Begin("service");
+        Element_Begin1("service");
         Ztring language;
+        int8u caption_service_number;
         bool digital_cc;
         Get_Local(3, language,                                  "language");
         BS_Begin();
         Get_SB (digital_cc,                                     "digital_cc");
         Skip_SB(                                                "reserved");
         if (digital_cc) //line21
+            Get_S1 (6, caption_service_number,                  "caption_service_number");
+        else
         {
+            bool line21_field;
             Skip_S1(5,                                          "reserved");
-            Skip_SB(                                            "line21_field");
+            Get_SB (   line21_field,                            "line21_field");
+            caption_service_number=128+(line21_field?2:1);
         }
-        else
-            Skip_S1(6,                                          "caption_service_number");
         Skip_SB(                                                "easy_reader");
         Skip_SB(                                                "wide_aspect_ratio");
         Skip_S2(14,                                             "reserved");
         BS_End();
-        Element_End();
+        Element_End0();
 
         if (event_id_IsValid)
         {
-            if (Complete_Stream->Sources[table_id_extension].ATSC_EPG_Blocks[Complete_Stream->Streams[pid].table_type].Events[event_id].language.empty()) //We use only the first detected value
-                Complete_Stream->Sources[table_id_extension].ATSC_EPG_Blocks[Complete_Stream->Streams[pid].table_type].Events[event_id].language=language;
+            if (Complete_Stream->Sources[table_id_extension].ATSC_EPG_Blocks[Complete_Stream->Streams[pid]->table_type].Events[event_id].Languages[caption_service_number].empty()) //We use only the first detected value
+                Complete_Stream->Sources[table_id_extension].ATSC_EPG_Blocks[Complete_Stream->Streams[pid]->table_type].Events[event_id].Languages[caption_service_number]=language;
         }
         if (elementary_PID_IsValid)
         {
-            if (Complete_Stream->Streams[elementary_PID].Captions_Language[Pos].empty()) //We use only the first detected value
-                Complete_Stream->Streams[elementary_PID].Captions_Language[Pos]=language;
+            if (Complete_Stream->Streams[elementary_PID]->Languages[caption_service_number].empty()) //We use only the first detected value
+                Complete_Stream->Streams[elementary_PID]->Languages[caption_service_number]=language;
         }
     }
 }
@@ -2721,21 +2776,21 @@
     BS_End();
     for (int8u rating_region_Pos=0; rating_region_Pos<rating_region_count; rating_region_Pos++)
     {
-        Element_Begin("rating_region");
+        Element_Begin1("rating_region");
         int8u rated_dimensions;
         Skip_B1(                                                "rating_region");
         Get_B1 (rated_dimensions,                               "rated_dimensions");
         for (int8u rated_dimension_Pos=0; rated_dimension_Pos<rated_dimensions; rated_dimension_Pos++)
         {
-            Element_Begin("rated_dimension");
+            Element_Begin1("rated_dimension");
             Skip_B1(                                            "rating_dimension_j");
             BS_Begin();
             Skip_S1(4,                                          "reserved");
             Skip_S1(4,                                          "rating_value");
             BS_End();
-            Element_End();
+            Element_End0();
         }
-        Element_End();
+        Element_End0();
     }
 }
 
@@ -2775,15 +2830,20 @@
     Get_B1 (    number_elements,                                "number_elements");
     for (int8u Pos=0; Pos<number_elements; Pos++)
     {
-        Element_Begin();
+        Element_Begin0();
+        Ztring Language;
         int16u elementary_PID;
         Skip_B1(                                                "stream_type");
         BS_Begin();
         Skip_S1( 3,                                             "reserved");
         Get_S2 (13, elementary_PID,                             "elementary_PID");
         BS_End();
-        Skip_Local(3,                                           "ISO_639_language_code");
-        Element_End(Ztring().From_CC2(elementary_PID), 6);
+        Get_Local(3, Language,                                  "ISO_639_language_code");
+        Element_End1(Ztring().From_CC2(elementary_PID));
+
+        //Filling
+        if (elementary_PID<Complete_Stream->Streams.size() && Complete_Stream->Streams[elementary_PID]->Infos["Language"].empty()) //We use only the first detected value
+            Complete_Stream->Streams[elementary_PID]->Infos["Language"]=Language;
     }
 }
 
@@ -2800,7 +2860,7 @@
             case 0x02 : //program_map_section
                         if (elementary_PID_IsValid)
                             if (!Value.empty())
-                                Complete_Stream->Streams[elementary_PID].Infos["Name"]=Value;
+                                Complete_Stream->Streams[elementary_PID]->Infos["Name"]=Value;
                         break;
             default    : ;
         }
@@ -2814,27 +2874,111 @@
     Skip_XX(Element_Size,                                       "rc_information");
 }
 
+//---------------------------------------------------------------------------
+void File_Mpeg_Descriptors::CUEI_00()
+{
+    Skip_C4(                                                    "identifier (\"CUEI\")"); //CUEI
+    Skip_B4(                                                    "provider_avail_id");
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg_Descriptors::CUEI_01()
+{
+    Skip_XX(Element_Size,                                       "Data");
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg_Descriptors::CUEI_02()
+{
+    //Parsing
+    int32u segmentation_event_id;
+    bool segmentation_event_cancel_indicator;
+    Skip_C4(                                                    "identifier (\"CUEI\")"); //CUEI
+    Get_B4 (segmentation_event_id,                              "segmentation_event_id");
+    BS_Begin();
+    Get_SB (    segmentation_event_cancel_indicator,            "segmentation_event_cancel_indicator");
+    Skip_S1( 7,                                                 "reserved");
+    BS_End();
+    if (!segmentation_event_cancel_indicator)
+    {
+        int8u segmentation_upid_length, segmentation_type_id;
+        bool program_segmentation_flag, segmentation_duration_flag;
+        BS_Begin();
+        Get_SB (    program_segmentation_flag,                  "program_segmentation_flag");
+        Get_SB (    segmentation_duration_flag,                 "segmentation_duration_flag");
+        Skip_S1( 6,                                             "reserved");
+        BS_End();
+        if (!program_segmentation_flag)
+        {
+            int8u component_count;
+            Get_B1 (component_count,                            "component_count");
+            for (int8u Pos=0; Pos<component_count; Pos++)
+            {
+                Skip_B1(                                        "component_tag");
+                BS_Begin();
+                Skip_S1( 7,                                     "reserved");
+                Skip_S5(33,                                     "pts_offset");
+                BS_End();
+            }
+        }
+        if (segmentation_duration_flag)
+        {
+            Skip_B5(                                            "segmentation_duration");
+        }
+        Skip_B1(                                                "segmentation_upid_type");
+        Get_B1 (segmentation_upid_length,                       "segmentation_upid_length");
+        Skip_XX(segmentation_upid_length,                       "segmentation_upid"); //TODO
+        Get_B1 (segmentation_type_id,                           "segmentation_type_id");
+        Skip_B1(                                                "segment_num");
+        Skip_B1(                                                "segments_expected");
+
+        FILLING_BEGIN();
+            for (size_t Program_Pos=0; Program_Pos<Complete_Stream->Streams[pid]->program_numbers.size(); Program_Pos++)
+            {
+                complete_stream::transport_stream::program::scte35* Scte35=Complete_Stream->Transport_Streams[transport_stream_id].Programs[Complete_Stream->Streams[pid]->program_numbers[Program_Pos]].Scte35;
+                if (Scte35)
+                {
+                    int8u Status=0; //Running
+                    switch (segmentation_type_id)
+                    {
+                        case 0x11 : segmentation_type_id=0x10; Status=1; break; //Program Start/End
+                        case 0x12 : segmentation_type_id=0x10; Status=2; break; //Program Start/Early Termination
+                        case 0x14 : segmentation_type_id=0x13; Status=1; break; //Program Breakaway/Resumption
+                        case 0x21 : segmentation_type_id=0x20; Status=1; break; //Chapter Start/End
+                        case 0x31 : segmentation_type_id=0x30; Status=1; break; //Provider Advertisement Start/End
+                        case 0x33 : segmentation_type_id=0x32; Status=1; break; //Distributor Advertisement Start/End
+                        case 0x41 : segmentation_type_id=0x40; Status=1; break; //Unscheduled Event Start/End
+                        default   : ;
+                    }
+
+                    Scte35->Segmentations[segmentation_event_id].Segments[segmentation_type_id].Status=Status;
+                }
+            }
+        FILLING_END();
+    }
+}
+
 //***************************************************************************
 // Helpers
 //***************************************************************************
 
 //---------------------------------------------------------------------------
-void File_Mpeg_Descriptors::ATSC_multiple_string_structure(Ztring &Value, const char* Info)
+void File_Mpeg_Descriptors::ATSC_multiple_string_structure(Ztring &Value, const char* Name)
 {
     //Parsing
     Ztring string;
     int8u number_strings, number_segments;
-    Element_Begin(Info);
+    Element_Begin1(Name);
     Get_B1(number_strings,                                      "number_strings");
     for (int8u string_Pos=0; string_Pos<number_strings; string_Pos++)
     {
-        Element_Begin("String");
+        Element_Begin1("String");
         int32u ISO_639_language_code;
         Get_C3(ISO_639_language_code,                           "ISO_639_language_code");
         Get_B1(number_segments,                                 "number_segments");
         for (int8u segment_Pos=0; segment_Pos<number_segments; segment_Pos++)
         {
-            Element_Begin("Segment");
+            Element_Begin1("Segment");
             Ztring segment;
             int8u compression_type, mode, number_bytes;
             Get_B1 (compression_type,                           "compression_type");
@@ -2848,17 +2992,17 @@
                                 case 0x00 : Get_Local(number_bytes, segment, "string"); break;
                                 case 0x3F : Get_UTF16B(number_bytes, segment, "string"); break;
                                 default   : Skip_XX(number_bytes, "Unknown");
-                                            segment=_T("(Encoded with mode=0x")+Ztring::ToZtring(mode, 16)+_T(')');
+                                            segment=__T("(Encoded with mode=0x")+Ztring::ToZtring(mode, 16)+__T(')');
                             }
                             break;
                 default   : Skip_XX(number_bytes,               "(Compressed)");
-                            segment=_T("(Compressed)");
+                            segment=__T("(Compressed)");
             }
-            Element_End(3+number_bytes);
+            Element_End0();
 
             FILLING_BEGIN();
-                if (segment.find_first_not_of(_T("\t\n "))!=std::string::npos)
-                    string+=segment+_T(" - ");
+                if (segment.find_first_not_of(__T("\t\n "))!=std::string::npos)
+                    string+=segment+__T(" - ");
             FILLING_END();
         }
 
@@ -2867,18 +3011,18 @@
                 string.resize(string.size()-3);
             Ztring ISO_639_2=Ztring().From_CC3(ISO_639_language_code);
             const Ztring& ISO_639_1=MediaInfoLib::Config.Iso639_1_Get(ISO_639_2);
-            Value+=(ISO_639_1.empty()?ISO_639_2:ISO_639_1)+_T(':')+string+_T(" - ");
+            Value+=(ISO_639_1.empty()?ISO_639_2:ISO_639_1)+__T(':')+string+__T(" - ");
         FILLING_END();
 
-        Element_Info(string);
-        Element_End("String");
+        Element_Info1(string);
+        Element_End1("String");
     }
 
     if (!Value.empty())
         Value.resize(Value.size()-3);
 
-    Element_Info(Value);
-    Element_End();
+    Element_Info1(Value);
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
@@ -2895,7 +3039,7 @@
     Peek_B1(CodePage1);
     if (CodePage1<0x20)
     {
-        Skip_B1(                                                "CodePage"); Param_Info(Mpeg_Descriptors_codepage_1(CodePage1));
+        Skip_B1(                                                "CodePage"); Param_Info1(Mpeg_Descriptors_codepage_1(CodePage1));
         if (CodePage1!=0x10)
         {
             Get_Local(Size-1, Value,                            Info);
@@ -2907,8 +3051,14 @@
                 Value.clear();
                 return;
             }
-            Skip_B2(                                            "CodePage2");
-            Get_Local(Size-3, Value,                            Info);
+            int16u CodePage2;
+            Get_B2 (CodePage2,                                  "CodePage2");
+            if (CodePage2==0x02)
+            {
+                Get_ISO_8859_2(Size-3, Value,                   Info);
+            }
+            else //Unknown
+                Get_Local(Size-3, Value,                        Info);
         }
 
     }
@@ -2932,26 +3082,26 @@
     int M =M2-1-K*12;
 
     //Formating
-    return                       Ztring::ToZtring(1900+Y)+_T("-")
-         + (M<10?_T("0"):_T(""))+Ztring::ToZtring(     M)+_T("-")
-         + (D<10?_T("0"):_T(""))+Ztring::ToZtring(     D);
+    return                       Ztring::ToZtring(1900+Y)+__T("-")
+         + (M<10?__T("0"):__T(""))+Ztring::ToZtring(     M)+__T("-")
+         + (D<10?__T("0"):__T(""))+Ztring::ToZtring(     D);
 }
 
 //---------------------------------------------------------------------------
 //Form: HHMMSS, BCD
 Ztring File_Mpeg_Descriptors::Time_BCD(int32u Time)
 {
-    return (((Time>>16)&0xFF)<10?_T("0"):_T("")) + Ztring::ToZtring((Time>>16)&0xFF, 16)+_T(":") //BCD
-         + (((Time>> 8)&0xFF)<10?_T("0"):_T("")) + Ztring::ToZtring((Time>> 8)&0xFF, 16)+_T(":") //BCD
-         + (((Time    )&0xFF)<10?_T("0"):_T("")) + Ztring::ToZtring((Time    )&0xFF, 16);        //BCD
+    return (((Time>>16)&0xFF)<10?__T("0"):__T("")) + Ztring::ToZtring((Time>>16)&0xFF, 16)+__T(":") //BCD
+         + (((Time>> 8)&0xFF)<10?__T("0"):__T("")) + Ztring::ToZtring((Time>> 8)&0xFF, 16)+__T(":") //BCD
+         + (((Time    )&0xFF)<10?__T("0"):__T("")) + Ztring::ToZtring((Time    )&0xFF, 16);        //BCD
 }
 
 //---------------------------------------------------------------------------
 //Form: HHMM, BCD
 Ztring File_Mpeg_Descriptors::TimeHHMM_BCD(int16u Time)
 {
-    return (((Time>> 8)&0xFF)<10?_T("0"):_T("")) + Ztring::ToZtring((Time>> 8)&0xFF, 16)+_T(":") //BCD
-         + (((Time    )&0xFF)<10?_T("0"):_T("")) + Ztring::ToZtring((Time    )&0xFF, 16)+_T(":00"); //BCD
+    return (((Time>> 8)&0xFF)<10?__T("0"):__T("")) + Ztring::ToZtring((Time>> 8)&0xFF, 16)+__T(":") //BCD
+         + (((Time    )&0xFF)<10?__T("0"):__T("")) + Ztring::ToZtring((Time    )&0xFF, 16)+__T(":00"); //BCD
 }
 
 //---------------------------------------------------------------------------

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Mpeg_Descriptors.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Mpeg_Descriptors.h Changed

@@ -1,17 +1,17 @@
 // File_Mpeg_Descriptors - Info for MPEG files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -61,15 +61,20 @@
         {
             bool HasChanged;
             std::map<std::string, Ztring> Infos;
+            std::map<Ztring, Ztring> EPGs;
             std::vector<int16u> elementary_PIDs;
             size_t StreamPos; //Stream_Menu
             int32u registration_format_identifier;
             int16u pid;
             int16u PCR_PID;
-            int16u program_number;
             int16u source_id; //ATSC
+            bool   source_id_IsValid;
             bool   IsParsed;
             bool   IsRegistered;
+            bool   Update_Needed_IsRegistered;
+            bool   Update_Needed_StreamCount;
+            bool   Update_Needed_StreamPos;
+            bool   Update_Needed_Info;
 
             //DVB
             struct dvb_epg_block
@@ -95,6 +100,37 @@
             dvb_epg_blocks DVB_EPG_Blocks; //Key is table_id
             bool DVB_EPG_Blocks_IsUpdated;
 
+            //SCTE 35
+            struct scte35
+            {
+                struct segmentation
+                {
+                    struct segment
+                    {
+                        int8u Status; //If it is currently in the program: 0=Running, 1=Ended, 2=Early termination
+
+                        segment()
+                        {
+                            Status=(int8u)-1;
+                        }
+                    };
+
+                    typedef std::map<int8u, segment> segments; //Key is segmentation_type_id
+                    segments Segments;
+                    ;
+                };
+
+                typedef std::map<int32u, segmentation> segmentations; //Key is segmentation_event_id
+                segmentations Segmentations;
+                int16u  pid;
+
+                scte35()
+                {
+                    pid=(int16u)-1;
+                }
+            };
+            scte35* Scte35;
+
             //Constructor/Destructor
             program()
             {
@@ -103,11 +139,16 @@
                 registration_format_identifier=0x00000000;
                 pid=0x00000;
                 PCR_PID=0x0000;
-                program_number=0x0000;
-                source_id=0x0000;
+                source_id=(int16u)-1;
+                source_id_IsValid=false;
                 IsParsed=false;
                 IsRegistered=false;
+                Update_Needed_IsRegistered=false;
+                Update_Needed_StreamCount=false;
+                Update_Needed_StreamPos=false;
+                Update_Needed_Info=false;
                 DVB_EPG_Blocks_IsUpdated=false;
+                Scte35=NULL;
             }
         };
         typedef std::map<int16u, program> programs; //Key is program_number
@@ -119,7 +160,6 @@
         {
             File__Analyze*                                  Parser;
             #ifdef MEDIAINFO_MPEG4_YES
-                File_Mpeg4_Descriptors::decspecificinfotag* DecSpecificInfoTag;
                 File_Mpeg4_Descriptors::slconfig*           SLConfig;
             #endif
 
@@ -128,7 +168,6 @@
             {
                 Parser=NULL;
                 #ifdef MEDIAINFO_MPEG4_YES
-                    DecSpecificInfoTag=NULL;
                     SLConfig=NULL;
                 #endif
             }
@@ -137,7 +176,6 @@
             {
                 delete Parser; //Parser=NULL;
                 #ifdef MEDIAINFO_MPEG4_YES
-                    delete DecSpecificInfoTag; //DecSpecificInfoTag=NULL;
                     delete SLConfig; //SLConfig=NULL;
                 #endif
             }
@@ -147,18 +185,20 @@
 
         //ATSC
         int16u source_id; //Global
+        int16u source_id_IsValid;
 
         transport_stream()
         {
             HasChanged=false;
-            source_id=0;
+            source_id=(int16u)-1;
+            source_id_IsValid=false;
             Programs_NotParsedCount=(size_t)-1;
         }
     };
     typedef std::map<int16u, transport_stream> transport_streams; //Key is transport_stream_id
     transport_streams Transport_Streams; //Key is transport_stream_id
 
-    //Per PID
+    //Per pid
     struct stream
     {
         File__Analyze*                              Parser;
@@ -192,25 +232,44 @@
         typedef std::vector<table_id*>              table_ids;
         table_ids                                   Table_IDs; //Key is table_id
         std::map<std::string, Ztring>               Infos;
-        std::vector<Ztring>                         Captions_Language;
+        std::map<int8u, Ztring>                     Languages; //Key is caption_service_number or 128+line21_field
+        struct teletext
+        {
+            std::map<std::string, Ztring>           Infos;
+        };
+        std::map<int16u, teletext>                  Teletexts; //Key is teletext_magazine_number
         #if MEDIAINFO_TRACE
-            Ztring Element_Info;
+            Ztring Element_Info1;
         #endif //MEDIAINFO_TRACE
         stream_t                                    StreamKind;
+        stream_t                                    StreamKind_FromDescriptor;
         size_t                                      StreamPos;
         ts_kind                                     Kind;
+        bool                                        IsParsed;
         bool                                        IsPCR;
+        float64                                     IsPCR_Duration;
         #ifdef MEDIAINFO_MPEGTS_PCR_YES
             int64u                                  TimeStamp_Start;
             int64u                                  TimeStamp_Start_Offset;
             int64u                                  TimeStamp_End;
             int64u                                  TimeStamp_End_Offset;
-            int16u                                  PCR_PID; //If this PID has no PCR, decide which PCR should be used
+            int16u                                  PCR_PID; //If this pid has no PCR, decide which PCR should be used
+            bool                                    TimeStamp_End_IsUpdated;
+            float64                                 TimeStamp_InstantaneousBitRate;
+            size_t                                  TimeStamp_InstantaneousBitRate_BitRateMode_IsCbr;
+            size_t                                  TimeStamp_InstantaneousBitRate_BitRateMode_IsVbr;
+            #if MEDIAINFO_ADVANCED
+                int64u                              TimeStamp_Distance_Min;
+                int64u                              TimeStamp_Distance_Max;
+                int64u                              TimeStamp_Distance_Total;
+                size_t                              TimeStamp_Distance_Count;
+            #endif // MEDIAINFO_ADVANCED
         #endif //MEDIAINFO_MPEGTS_PCR_YES
         int32u                                      registration_format_identifier;
         int16u                                      FMC_ES_ID;
         int16u                                      table_type; //ATSC
         int8u                                       stream_type;
+        int8u                                       descriptor_tag;
         bool                                        FMC_ES_ID_IsValid;
         bool                                        Searching;
         bool                                        Searching_Payload_Start;
@@ -226,28 +285,49 @@
         bool                                        EndTimeStampMoreThanxSeconds;
         bool                                        ShouldDuplicate;
         bool                                        IsRegistered;
+        bool                                        IsUpdated_IsRegistered;
+        bool                                        IsUpdated_Info;
+        bool                                        CA_system_ID_MustSkipSlices;
         size_t                                      IsScrambled;
+        int16u                                      CA_system_ID;
         int16u                                      SubStream_pid;
+        #if MEDIAINFO_IBI
+            int64u                                  Ibi_SynchronizationOffset_BeginOfFrame;
+        #endif //MEDIAINFO_IBI
 
         //Constructor/Destructor
         stream()
         {
             Parser=NULL;
             StreamKind=Stream_Max;
+            StreamKind_FromDescriptor=Stream_Max;
             StreamPos=(size_t)-1;
             Kind=unknown;
+            IsParsed=false;
             IsPCR=false;
+            IsPCR_Duration=0;
             #ifdef MEDIAINFO_MPEGTS_PCR_YES
                 TimeStamp_Start=(int64u)-1;
                 TimeStamp_Start_Offset=(int64u)-1;
                 TimeStamp_End=(int64u)-1;
                 TimeStamp_End_Offset=(int64u)-1;
                 PCR_PID=0x0000;
+                TimeStamp_End_IsUpdated=false;
+                TimeStamp_InstantaneousBitRate=0;
+                TimeStamp_InstantaneousBitRate_BitRateMode_IsCbr=0;
+                TimeStamp_InstantaneousBitRate_BitRateMode_IsVbr=0;
+                #if MEDIAINFO_ADVANCED
+                    TimeStamp_Distance_Min=(int64u)-1;
+                    TimeStamp_Distance_Max=0;
+                    TimeStamp_Distance_Total=0;
+                    TimeStamp_Distance_Count=0;
+                #endif // MEDIAINFO_ADVANCED
             #endif //MEDIAINFO_MPEGTS_PCR_YES
             registration_format_identifier=0x00000000;
             FMC_ES_ID=0x0000;
             table_type=0x0000;
-            stream_type=0x00;
+            stream_type=(int8u)-1;
+            descriptor_tag=(int8u)-1;
             FMC_ES_ID_IsValid=false;
             Searching=false;
             Searching_Payload_Start=false;
@@ -263,8 +343,15 @@
             EndTimeStampMoreThanxSeconds=false;
             ShouldDuplicate=false;
             IsRegistered=false;
+            IsUpdated_IsRegistered=false;
+            IsUpdated_Info=false;
             IsScrambled=false;
+            CA_system_ID_MustSkipSlices=false;
+            CA_system_ID=0x0000;
             SubStream_pid=0x0000;
+            #if MEDIAINFO_IBI
+                Ibi_SynchronizationOffset_BeginOfFrame=(int64u)-1;
+            #endif //MEDIAINFO_IBI
         }
 
         ~stream()
@@ -324,8 +411,8 @@
                     ;
         }
     };
-    typedef std::vector<stream> streams;
-    streams Streams; //Key is PID
+    typedef std::vector<stream*> streams;
+    streams Streams; //Key is pid
     size_t Streams_NotParsedCount;
     size_t Streams_With_StartTimeStampCount;
     size_t Streams_With_EndTimeStampMoreThanxSecondsCount;
@@ -342,7 +429,7 @@
                 int32u  start_time;
                 Ztring  duration;
                 Ztring  title;
-                Ztring  language;
+                std::map<int8u, Ztring>  Languages; //Key is caption_service_number or 128+line21_field
                 std::map<int16u, Ztring> texts;
 
                 event()
@@ -367,6 +454,7 @@
     sources Sources; //Key is source_id
     bool Sources_IsUpdated; //For EPG ATSC
     bool Programs_IsUpdated; //For EPG DVB
+    bool NoPatPmt;
 
     //File__Duplicate
     bool                                                File__Duplicate_HasChanged_;
@@ -374,29 +462,40 @@
     std::vector<File__Duplicate_MpegTs*>                Duplicates_Speed;
     std::vector<std::vector<File__Duplicate_MpegTs*> >  Duplicates_Speed_FromPID;
     std::map<const String, File__Duplicate_MpegTs*>     Duplicates;
-    bool File__Duplicate_Get_From_PID (int16u PID)
+    bool File__Duplicate_Get_From_PID (int16u pid)
     {
         if (Duplicates_Speed_FromPID.empty())
             return false;
-        return !Duplicates_Speed_FromPID[PID].empty();
+        return !Duplicates_Speed_FromPID[pid].empty();
     }
 
+    //SpeedUp information
+    std::vector<std::vector<size_t> >   StreamPos_ToRemove;
+    std::map<int16u, int16u>            PCR_PIDs; //Key is PCR_PID, value is count of programs using it
+    std::set<int16u>                    PES_PIDs; //Key is pid
+    std::vector<int16u>                 program_number_Order;
+
     //Constructor/Destructor
     complete_stream()
     {
-        transport_stream_id=0;
+        transport_stream_id=(int16u)-1;
         transport_stream_id_IsValid=false;
         Duration_End_IsUpdated=false;
-        Streams_NotParsedCount=0;
+        Streams_NotParsedCount=(size_t)-1;
         Streams_With_StartTimeStampCount=0;
         Streams_With_EndTimeStampMoreThanxSecondsCount=0;
         GPS_UTC_offset=0;
         Sources_IsUpdated=false;
         Programs_IsUpdated=false;
+        NoPatPmt=false;
+        StreamPos_ToRemove.resize(Stream_Max);
     }
 
     ~complete_stream()
     {
+        for (size_t StreamID=0; StreamID<Streams.size(); StreamID++)
+            delete Streams[StreamID]; //Streams[StreamID]=NULL;
+
         std::map<const String, File__Duplicate_MpegTs*>::iterator Duplicates_Temp=Duplicates.begin();
         while (Duplicates_Temp!=Duplicates.end())
         {
@@ -431,7 +530,7 @@
     bool   event_id_IsValid;
 
     //Out
-    
+
     //Constructor/Destructor
     File_Mpeg_Descriptors();
 
@@ -568,6 +667,11 @@
     void Descriptor_AA();
     void Descriptor_AB() {Skip_XX(Element_Size, "Data");};
 
+    //SCTE 35
+    void CUEI_00();
+    void CUEI_01();
+    void CUEI_02();
+
     //Helpers
     void ATSC_multiple_string_structure(Ztring &Value, const char* Info);
     void Get_DVB_Text(int64u Size, Ztring &Value, const char* Info);

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Mpeg_Psi.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Mpeg_Psi.cpp Changed

@@ -1,31 +1,35 @@
 // File_Mpeg_Psi - Info for MPEG Stream files
-// Copyright (C) 2006-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2006-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_MPEGPS_YES) || defined(MEDIAINFO_MPEGTS_YES)
 //---------------------------------------------------------------------------
 
@@ -83,7 +87,7 @@
              && ID<=0x017F) return "Event Information Table (EIT)";
             if (ID>=0x0200
              && ID<=0x027F) return "Event Extended Text Table (EETT)";
-            if (ID>=0x301
+            if (ID>=0x0300
              && ID<=0x03FF) return "Rating Region Table (RRT)";
             if (ID>=0x0400
              && ID<=0x0FFF) return "User private";
@@ -124,6 +128,7 @@
                 case Elements::S14A : //ATSC
                         switch (stream_type)
                         {
+                            case 0x80 : return "MPEG Video";
                             case 0x81 : return "AC-3";
                             case 0x82 : return "Text";
                             case 0x87 : return "E-AC-3";
@@ -188,6 +193,7 @@
                 case Elements::S14A : //ATSC
                         switch (stream_type)
                         {
+                            case 0x80 : return "MPEG-2V";
                             case 0x81 : return "AC3";
                             case 0x82 : return "Text";
                             case 0x87 : return "AC3+";
@@ -248,6 +254,7 @@
                 case Elements::S14A : //ATSC
                         switch (stream_type)
                         {
+                            case 0x80 : return Stream_Video;
                             case 0x81 : return Stream_Audio;
                             case 0x82 : return Stream_Text;
                             case 0x87 : return Stream_Audio;
@@ -341,11 +348,13 @@
                 case Elements::SCTE : //SCTE
                         switch (stream_type)
                         {
+                            case 0x80 : return "SCTE - MPEG Video";
                             case 0x81 : return "ATSC - AC-3";
                             case 0x82 : return "SCTE - Standard Subtitle";
                             case 0x83 : return "SCTE - Isochronous Data";
                             case 0x84 : return "ATSC - Reserved";
                             case 0x85 : return "ATSC - Program Identifier";
+                            case 0x86 : return "SCTE - Splice";
                             case 0x87 : return "ATSC - E-AC-3";
                             case 0x90 : return "DVB  - stream_type value for Time Slicing / MPE-FEC";
                             case 0x95 : return "ATSC - Data Service Table, Network Resources Table";
@@ -487,6 +496,7 @@
         case 0xD8 : return "ATSC - Cable Emergency Alert";
         case 0xD9 : return "ATSC - Aggregate Data Event Table";
         case 0xDA : return "ATSC - Satellite VCT (SVCT)";
+        case 0xFC : return "SCTE - Splice";
         default :
             if (table_id>=0x06
              && table_id<=0x37) return "ITU-T Rec. H.222.0 | ISO/IEC 13818-1 reserved";
@@ -662,6 +672,22 @@
 //---------------------------------------------------------------------------
 extern const char* Mpeg_Descriptors_original_network_id(int16u original_network_id);
 
+//---------------------------------------------------------------------------
+const char* Mpeg_Psi_splice_command_type(int8u splice_command_type)
+{
+    switch (splice_command_type)
+    {
+        case 0x00 : return "splice_null";
+        case 0x04 : return "splice_schedule";
+        case 0x05 : return "splice_insert";
+        case 0x06 : return "time_signal";
+        case 0x07 : return "bandwidth_reservation";
+        default   : return "Reserved";
+    }
+};
+
+
+
 //***************************************************************************
 // Constructor/Destructor
 //***************************************************************************
@@ -673,7 +699,7 @@
     //In
     From_TS=true; //Default is from TS
     Complete_Stream=NULL;
-    pid=0x0000;
+    pid=(int16u)-1;
 
     //Temp
     transport_stream_id=0x0000; //Impossible
@@ -687,6 +713,8 @@
     stream_type_IsValid=false;
     event_id_IsValid=false;
     current_next_indicator=false;
+    IsATSC=false;
+    ForceStreamDisplay=MediaInfoLib::Config.MpegTs_ForceStreamDisplay_Get();
 }
 
 //---------------------------------------------------------------------------
@@ -695,10 +723,45 @@
 }
 
 //***************************************************************************
+// Buffer - File header
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Mpeg_Psi::FileHeader_Parse()
+{
+    //Parsing
+    if (From_TS)
+    {
+        int8u pointer_field;
+        Get_B1 (pointer_field,                                  "pointer_field");
+        if (pointer_field)
+            Skip_XX(pointer_field,                              "payload");
+    }
+}
+
+//***************************************************************************
 // Buffer
 //***************************************************************************
 
 //---------------------------------------------------------------------------
+bool File_Mpeg_Psi::Header_Begin()
+{
+    if (Buffer_Offset) //Not the first one
+    {
+        Peek_B1(table_id);
+        if (table_id==0xFF)
+        {
+            Accept();
+            Fill();
+            Finish();
+            return false;
+        }
+    }
+
+    return true;
+}
+
+//---------------------------------------------------------------------------
 void File_Mpeg_Psi::Header_Parse()
 {
     //From Program stream
@@ -712,11 +775,6 @@
         return;
     }
 
-    //Payload
-    Get_B1 (pointer_field,                                      "pointer_field");
-    if (pointer_field)
-        Skip_XX(pointer_field,                                  "payload");
-
     //Parsing
     int16u section_length;
     Get_B1 (table_id,                                           "table_id");
@@ -728,7 +786,7 @@
     BS_End();
 
     //Size
-    if ((size_t)(pointer_field+section_length)<Element_Offset+(section_syntax_indicator?4:0)) //We must have 4 more byte for CRC
+    if ((size_t)section_length<Element_Offset+(section_syntax_indicator?4:0)) //We must have 4 more byte for CRC
     {
         Reject("PSI"); //Error, we exit
         return;
@@ -741,9 +799,16 @@
     //Element[Element_Level-1].IsComplete=true;
 
     //CRC32
-    if (section_syntax_indicator)
+    if (table_id<=0x06 && !section_syntax_indicator)
+    {
+        Trusted_IsNot("CRC error");
+        CRC_32=0xffffffff;
+        Reject();
+        return;
+    }
+    if (section_syntax_indicator || table_id==0xC1)
     {
-        int32u CRC_32=0xffffffff;
+        CRC_32=0xffffffff;
         const int8u* CRC_32_Buffer=Buffer+Buffer_Offset+(size_t)Element_Offset-3; //table_id position
 
         while(CRC_32_Buffer<Buffer+Buffer_Offset+(size_t)Element_Offset+section_length) //from table_id to the end, CRC_32 included
@@ -751,21 +816,27 @@
             CRC_32=(CRC_32<<8) ^ Psi_CRC_32_Table[(CRC_32>>24)^(*CRC_32_Buffer)];
             CRC_32_Buffer++;
         }
-        CRC_32=0;
+
+        if (CRC_32)
+        {
+            Trusted_IsNot("CRC error");
+            Reject();
+            return;
+        }
     }
 
     //Filling
     Header_Fill_Code(table_id, Ztring().From_Number(table_id, 16));
-    Header_Fill_Size(pointer_field+section_length+4);
+    Header_Fill_Size(3+section_length);
 }
 
 //---------------------------------------------------------------------------
 void File_Mpeg_Psi::Data_Parse()
 {
     //Check if OK
-    if(CRC_32!=0)
+    if (table_id<=0x06 && !section_syntax_indicator)
     {
-        Skip_XX(Element_Size,                                   "Data (CRC failed)");
+        Skip_XX(Element_Size,                                   "Data (section_syntax_indicator failed)");
         Finish("PSI");
         return;
     }
@@ -773,18 +844,22 @@
     if (section_syntax_indicator)
     {
         Element_Size-=4; //Reserving size of CRC32
-        Get_B2(     table_id_extension,                         Mpeg_Psi_table_id_extension(table_id)); Element_Name(Ztring(Mpeg_Psi_table_id_extension(table_id))+_T("=")+Ztring::ToZtring_From_CC2(table_id_extension));
+        Get_B2(     table_id_extension,                         Mpeg_Psi_table_id_extension(table_id)); Element_Name(Ztring(Mpeg_Psi_table_id_extension(table_id))+__T("=")+Ztring::ToZtring_From_CC2(table_id_extension));
         BS_Begin();
         Skip_S1( 2,                                             "reserved");
-        Get_S1 ( 5, version_number,                             "version_number"); Element_Info(_T("Version=")+Ztring::ToZtring(version_number));
+        Get_S1 ( 5, version_number,                             "version_number"); Element_Info1(__T("Version=")+Ztring::ToZtring(version_number));
         Get_SB (    current_next_indicator,                     "current_next_indicator");
         BS_End();
-        Info_B1(    section_number,                             "section_number"); Element_Info(_T("Section=")+Ztring::ToZtring(section_number));
+        Info_B1(    section_number,                             "section_number"); Element_Info1(__T("Section=")+Ztring::ToZtring(section_number));
         Skip_B1(                                                "last_section_number");
     }
+    else if (table_id==0xC1)
+    {
+        Element_Size-=4; //Reserving size of CRC32
+    }
 
     #define ELEMENT_CASE(_NAME, _DETAIL) \
-        case 0x##_NAME : Table_##_NAME(); break;
+        case 0x##_NAME : Element_Name(_DETAIL); Table_##_NAME(); break;
 
     switch (table_id)
     {
@@ -880,6 +955,7 @@
         ELEMENT_CASE(D8, "ATSC - Cable Emergency Alert");
         ELEMENT_CASE(D9, "ATSC - Aggregate Data Event Table");
         ELEMENT_CASE(DA, "ATSC - Satellite VCT");
+        ELEMENT_CASE(FC, "SCTE - Splice");
         default :
             if (table_id>=0x06
              && table_id<=0x37) {Element_Name("ITU-T Rec. H.222.0 | ISO/IEC 13818-1 reserved"); Skip_XX(Element_Size, "Unknown"); break;}
@@ -894,14 +970,21 @@
                                 {Element_Name("forbidden"); Skip_XX(Element_Size, "Unknown"); break;}
     }
 
-    if (section_syntax_indicator)
+    if (section_syntax_indicator || table_id==0xC1)
     {
         Element_Size+=4;
         Skip_B4(                                                "CRC32");
     }
 
-    Status[IsAccepted]=true; //Accept("PSI");
-    Status[IsFinished]=true; //Finish("PSI");
+    if (table_id>=0x40 && Complete_Stream->Streams_NotParsedCount!=(size_t)-1 && Complete_Stream->Streams_NotParsedCount!=0)
+        Complete_Stream->Streams_NotParsedCount=(size_t)-1; //Disabling speed up for detection in case of DVB/ATSC tables, we want all of them.
+
+    if (Buffer_Offset+Element_Size==Buffer_Size)
+    {
+        Accept();
+        Fill();
+        Finish();
+    }
 }
 
 //---------------------------------------------------------------------------
@@ -913,21 +996,21 @@
 //---------------------------------------------------------------------------
 void File_Mpeg_Psi::Table_iso13818_6()
 {
-    Element_Info("Defined in ISO/IEC 13818-6");
+    Element_Info1("Defined in ISO/IEC 13818-6");
     Skip_XX(Element_Size,                                       "Data");
 }
 
 //---------------------------------------------------------------------------
 void File_Mpeg_Psi::Table_user_private()
 {
-    Element_Info("user_private");
+    Element_Info1("user_private");
     Skip_XX(Element_Size,                                       "Data");
 }
 
 //---------------------------------------------------------------------------
 void File_Mpeg_Psi::Table_forbidden()
 {
-    Element_Info("forbidden");
+    Element_Info1("forbidden");
     Skip_XX(Element_Size,                                       "Data");
 }
 
@@ -935,6 +1018,7 @@
 void File_Mpeg_Psi::program_stream_map()
 {
     Element_Name("program_stream_map");
+    table_id=0x02; // program_map_section
 
     //Parsing
     int16u elementary_stream_map_length;
@@ -948,16 +1032,17 @@
     Mark_1 ();
     BS_End();
     Get_B2 (Descriptors_Size,                                   "program_stream_info_length");
-    Descriptors();
+    if (Descriptors_Size>0)
+        Descriptors();
 
     Get_B2 (elementary_stream_map_length,                       "elementary_stream_map_length");
     int16u elementary_stream_map_Pos=0;
     while (Element_Offset<Element_Size && elementary_stream_map_Pos<elementary_stream_map_length)
     {
-        Element_Begin();
+        Element_Begin0();
         int16u ES_info_length;
         int8u stream_type, elementary_stream_id;
-        Get_B1 (stream_type,                                    "stream_type"); Param_Info(Mpeg_Psi_stream_type_Info(stream_type, 0x00000000));
+        Get_B1 (stream_type,                                    "stream_type"); Param_Info1(Mpeg_Psi_stream_type_Info(stream_type, 0x00000000));
         Get_B1 (elementary_stream_id,                           "elementary_stream_id");
         Get_B2 (ES_info_length,                                 "ES_info_length");
         Descriptors_Size=ES_info_length;
@@ -971,12 +1056,18 @@
             if (Descriptors_Size>=3)
                 Descriptors_Size-=3;
         }
-        Descriptors();
-        Element_End(4+ES_info_length);
+        if (Descriptors_Size>0)
+        {
+            elementary_PID=elementary_stream_id;
+            elementary_PID_IsValid=true;
+            Descriptors();
+        }
+        Element_End0();
         elementary_stream_map_Pos+=4+ES_info_length;
 
         FILLING_BEGIN();
-            Complete_Stream->Streams[elementary_stream_id].stream_type=stream_type;
+            Complete_Stream->Streams[elementary_stream_id]->stream_type=stream_type;
+            Complete_Stream->Streams[elementary_stream_id]->Infos["CodecID"].From_Number(stream_type);
         FILLING_END();
     }
 }
@@ -984,83 +1075,69 @@
 //---------------------------------------------------------------------------
 void File_Mpeg_Psi::Table_00()
 {
-    FILLING_BEGIN();
+    //transport_stream_id
+    if (!Complete_Stream->transport_stream_id_IsValid || table_id_extension!=Complete_Stream->transport_stream_id)
+    {
+        if (Complete_Stream->Transport_Streams.find(Complete_Stream->transport_stream_id)!=Complete_Stream->Transport_Streams.end())
+            while (!Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs.empty())
+            {
+                program_number=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs.begin()->first;
+                program_number_Remove();
+            }
+
         Complete_Stream->transport_stream_id=table_id_extension;
         Complete_Stream->transport_stream_id_IsValid=true;
-    FILLING_END();
+    }
 
-    //Clear
-    Complete_Stream->Transport_Streams[table_id_extension].Programs_NotParsedCount=0;
-    Complete_Stream->Transport_Streams[table_id_extension].Programs.clear();
+    if (Complete_Stream->Transport_Streams[table_id_extension].Programs_NotParsedCount==(size_t)-1)
+        Complete_Stream->Transport_Streams[table_id_extension].Programs_NotParsedCount=0;
+
+    //Saving previous status
+    std::map<int16u, complete_stream::transport_stream::program> program_numbers_Previous=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs;
 
     //Reseting
     std::vector<int16u> Table_ID_Extension_List;
-    for (complete_stream::stream::table_id::table_id_extensions::iterator Table_ID_Extension=Complete_Stream->Streams[0x0000].Table_IDs[0x00]->Table_ID_Extensions.begin(); Table_ID_Extension!=Complete_Stream->Streams[0x0000].Table_IDs[0x00]->Table_ID_Extensions.end(); Table_ID_Extension++)
+    for (complete_stream::stream::table_id::table_id_extensions::iterator Table_ID_Extension=Complete_Stream->Streams[0x0000]->Table_IDs[0x00]->Table_ID_Extensions.begin(); Table_ID_Extension!=Complete_Stream->Streams[0x0000]->Table_IDs[0x00]->Table_ID_Extensions.end(); Table_ID_Extension++)
         if (Table_ID_Extension->first!=table_id_extension)
             Table_ID_Extension_List.push_back(Table_ID_Extension->first);
     for (size_t Pos=0; Pos<Table_ID_Extension_List.size(); Pos++)
-        Complete_Stream->Streams[0x0000].Table_IDs[0x00]->Table_ID_Extensions.erase(Table_ID_Extension_List[Pos]);
+        Complete_Stream->Streams[0x0000]->Table_IDs[0x00]->Table_ID_Extensions.erase(Table_ID_Extension_List[Pos]);
 
     //Parsing
     while (Element_Offset<Element_Size)
     {
-        Element_Begin(4);
-        int16u program_number;
+        Element_Begin1("program");
         Get_B2 (    program_number,                             "program_number");
         BS_Begin();
         Skip_S1( 3,                                             "reserved");
-        Get_S2 ( 13, elementary_PID,                            program_number?"program_map_PID":"network_PID"); Element_Info(Ztring::ToZtring_From_CC2(elementary_PID));
+        Get_S2 ( 13, elementary_PID,                            program_number?"program_map_PID":"network_PID"); Element_Info1(Ztring::ToZtring_From_CC2(elementary_PID));
         BS_End();
-        Element_End(Ztring::ToZtring_From_CC2(program_number));
+        Element_End0();
 
         FILLING_BEGIN();
-            if (elementary_PID && Config->File_Filter_Get(program_number))
+            if (elementary_PID
+            #if MEDIAINFO_FILTER
+                && Config->File_Filter_Get(program_number)
+            #endif //MEDIAINFO_FILTER
+                )
             {
-                //Setting the PID as program_map_section
-                if (Complete_Stream->Streams[elementary_PID].Kind!=complete_stream::stream::psi)
-                {
-                    Complete_Stream->Streams[elementary_PID].Searching_Payload_Start_Set(true);
-                    Complete_Stream->Streams[elementary_PID].Kind=complete_stream::stream::psi;
-                    Complete_Stream->Streams[elementary_PID].Table_IDs.resize(0x100);
-                    Complete_Stream->Streams[elementary_PID].Table_IDs[0x02]=new complete_stream::stream::table_id; //program_map_section
-                }
-                if (Complete_Stream->File__Duplicate_Get_From_PID(elementary_PID))
-                    Complete_Stream->Streams[elementary_PID].ShouldDuplicate=true;
+                program_number_Update();
 
-                //Handling a program
-                if (program_number)
-                {
-                    Complete_Stream->Transport_Streams[table_id_extension].Programs_NotParsedCount++;
-                    Complete_Stream->Transport_Streams[table_id_extension].Programs[program_number].pid=elementary_PID;
-                    if (Complete_Stream->Streams.size()<0x2000)
-                        Complete_Stream->Streams.resize(0x2000); //TODO: find the reason this code is called
-                    Complete_Stream->Streams[elementary_PID].program_numbers.push_back(program_number);
-                    if (Complete_Stream->Streams[elementary_PID].Table_IDs.size()<0x100)
-                        Complete_Stream->Streams[elementary_PID].Table_IDs.resize(0x100); //TODO: find the reason this code is called
-                    if (Complete_Stream->Streams[elementary_PID].Table_IDs[0x02]==NULL)
-                        Complete_Stream->Streams[elementary_PID].Table_IDs[0x02]=new complete_stream::stream::table_id; //TODO: find the reason this code is called
-                    if (Complete_Stream->Streams[elementary_PID].Table_IDs[0x02]->Table_ID_Extensions.find(program_number)==Complete_Stream->Streams[elementary_PID].Table_IDs[0x02]->Table_ID_Extensions.end())
-                    {
-                        Complete_Stream->Streams[elementary_PID].Table_IDs[0x02]->Table_ID_Extensions_CanAdd=false;
-                        Complete_Stream->Streams[elementary_PID].Table_IDs[0x02]->Table_ID_Extensions[program_number].version_number=0xFF;
-                        Complete_Stream->Streams[elementary_PID].Table_IDs[0x02]->Table_ID_Extensions[program_number].Section_Numbers.clear();
-                        Complete_Stream->Streams[elementary_PID].Table_IDs[0x02]->Table_ID_Extensions[program_number].Section_Numbers.resize(0x100);
-                    }
-                }
-
-                //Handling a network
-                else if (Complete_Stream->Streams[elementary_PID].Table_IDs[0x00]==NULL)
-                {
-                    for (size_t Table_ID=0; Table_ID<0x100; Table_ID++)
-                        if (Complete_Stream->Streams[elementary_PID].Table_IDs[Table_ID]==NULL)
-                            Complete_Stream->Streams[elementary_PID].Table_IDs[Table_ID]=new complete_stream::stream::table_id; //all
-                }
+                std::map<int16u, complete_stream::transport_stream::program>::iterator program_number_Previous=program_numbers_Previous.find(program_number);
+                if (program_number_Previous!=program_numbers_Previous.end())
+                    program_numbers_Previous.erase(program_number_Previous);
             }
         FILLING_END();
     }
     BS_End();
 
     FILLING_BEGIN();
+        //Removing previous elementary_PIDs no more used
+        for (std::map<int16u, complete_stream::transport_stream::program>::iterator program_number_Previous=program_numbers_Previous.begin(); program_number_Previous!=program_numbers_Previous.end(); program_number_Previous++)
+        {
+            program_number=program_number_Previous->first;
+            program_number_Remove();
+        }
     FILLING_END();
 }
 
@@ -1071,20 +1148,23 @@
     if (Element_Offset<Element_Size)
     {
         Descriptors_Size=(int16u)(Element_Size-Element_Offset);
-        Descriptors();
+        if (Descriptors_Size>0)
+            Descriptors();
     }
 }
 
 //---------------------------------------------------------------------------
 void File_Mpeg_Psi::Table_02()
 {
-    FILLING_BEGIN();
-        if (!Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[table_id_extension].IsParsed)
-        {
-            Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs_NotParsedCount--;
-            Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[table_id_extension].IsParsed=true;
-        }
-    FILLING_END();
+    //Informing PSI is parsed
+    if (!Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[table_id_extension].IsParsed)
+    {
+        Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs_NotParsedCount--;
+        Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[table_id_extension].IsParsed=true;
+    }
+
+    //Saving previous status
+    std::vector<int16u> elementary_PIDs_Previous=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[table_id_extension].elementary_PIDs;
 
     //Parsing
     int16u PCR_PID;
@@ -1104,10 +1184,9 @@
     //Parsing
     while (Element_Offset<Element_Size)
     {
-        Element_Begin();
-        int8u stream_type;
+        Element_Begin0();
         BS_Begin();
-        Get_S1 ( 8, stream_type,                                "stream_type"); Element_Info(Mpeg_Psi_stream_type_Info(stream_type, Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[program_number].registration_format_identifier)); Param_Info(Mpeg_Psi_stream_type_Info(stream_type, Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[program_number].registration_format_identifier));
+        Get_S1 ( 8, stream_type,                                "stream_type"); Element_Info1(Mpeg_Psi_stream_type_Info(stream_type, Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[program_number].registration_format_identifier)); Param_Info1(Mpeg_Psi_stream_type_Info(stream_type, Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[program_number].registration_format_identifier));
         Skip_S1( 3,                                             "reserved");
         Get_S2 (13, elementary_PID,                             "elementary_PID");
         Skip_S1( 4,                                             "reserved");
@@ -1115,57 +1194,25 @@
         BS_End();
 
         FILLING_BEGIN();
-            if (elementary_PID)
-            {
-                bool IsAlreadyPresent=false;
-                for (size_t Pos=0; Pos<Complete_Stream->Streams[elementary_PID].program_numbers.size(); Pos++)
-                    if (Complete_Stream->Streams[elementary_PID].program_numbers[Pos]==program_number)
-                        IsAlreadyPresent=true;
-                if (!IsAlreadyPresent)
-                {
-                    Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[program_number].elementary_PIDs.push_back(elementary_PID);
-                    Complete_Stream->Streams[elementary_PID].program_numbers.push_back(program_number);
-                }
-                if (Complete_Stream->Streams[elementary_PID].Kind!=complete_stream::stream::pes)
-                {
-                    Complete_Stream->Streams_NotParsedCount++;
-                    Complete_Stream->Streams[elementary_PID].Kind=complete_stream::stream::pes;
-                    Complete_Stream->Streams[elementary_PID].stream_type=stream_type;
-                    Complete_Stream->Streams[elementary_PID].Searching_Payload_Start_Set(true);
-                    #ifdef MEDIAINFO_MPEGTS_PCR_YES
-                        Complete_Stream->Streams[elementary_PID].Searching_TimeStamp_Start_Set(true);
-                        Complete_Stream->Streams[elementary_PID].PCR_PID=PCR_PID;
-                    #endif //MEDIAINFO_MPEGTS_PCR_YES
-                    #ifdef MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
-                        //Complete_Stream->Streams[elementary_PID].Searching_ParserTimeStamp_Start_Set(true);
-                    #endif //MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
-                    #if MEDIAINFO_TRACE
-                        Complete_Stream->Streams[elementary_PID].Element_Info="PES";
-                    #endif //MEDIAINFO_TRACE
-                    if (Complete_Stream->File__Duplicate_Get_From_PID(elementary_PID))
-                        Complete_Stream->Streams[elementary_PID].ShouldDuplicate=true;
-                }
-            }
-
             //Searching for hidden Stereoscopic stream
             if (stream_type==0x20 && File_Name_WithoutDemux.size()>=4+1+6+1+4+1+10 && Config->File_Bdmv_ParseTargetedFile_Get())
             {
-                //Searching the playlist with the PID
+                //Searching the playlist with the pid
                 Ztring Name=File_Name_WithoutDemux;
                 Name.resize(Name.size()-(4+1+6+1+4+1+10)); //Removing BDMV/STREAM/SSIF/xxxxx.ssif
-                ZtringList List=Dir::GetAllFileNames(Name+_T("BDMV")+PathSeparator+_T("PLAYLIST")+PathSeparator+_T("*.mpls"), Dir::Include_Files);
+                ZtringList List=Dir::GetAllFileNames(Name+__T("BDMV")+PathSeparator+__T("PLAYLIST")+PathSeparator+__T("*.mpls"), Dir::Include_Files);
                 std::vector<MediaInfo_Internal*> MIs;
                 MIs.resize(List.size());
                 size_t FileWithRightPID_Pos=(size_t)-1;
                 for (size_t Pos=0; Pos<MIs.size(); Pos++)
                 {
                     MIs[Pos]=new MediaInfo_Internal();
-                    MIs[Pos]->Option(_T("File_Bdmv_ParseTargetedFile"), _T("0"));
+                    MIs[Pos]->Option(__T("File_Bdmv_ParseTargetedFile"), __T("0"));
                     MIs[Pos]->Open(List[Pos]);
                     if (MIs[Pos]->Count_Get(Stream_Video)==1)
                     {
-                        int16u PID=Ztring(MIs[Pos]->Get(Stream_Video, 0, Video_ID)).To_int16u();
-                        if (PID==elementary_PID)
+                        int16u pid=Ztring(MIs[Pos]->Get(Stream_Video, 0, Video_ID)).To_int16u();
+                        if (pid==elementary_PID)
                         {
                             FileWithRightPID_Pos=Pos;
                             break;
@@ -1176,44 +1223,46 @@
                 if (FileWithRightPID_Pos!=(size_t)-1)
                 {
                     ZtringList ID_List;
-                    ID_List.Separator_Set(0, _T(" / "));
+                    ID_List.Separator_Set(0, __T(" / "));
                     ID_List.Write(MIs[FileWithRightPID_Pos]->Get(Stream_Video, 0, Video_ID));
                     if (ID_List.size()==2)
                     {
-                        Complete_Stream->Streams[ID_List[1].To_int16u()].SubStream_pid=elementary_PID;
-                        Complete_Stream->Streams[elementary_PID].SubStream_pid=ID_List[1].To_int16u();
+                        Complete_Stream->Streams[ID_List[1].To_int16u()]->SubStream_pid=elementary_PID;
+                        Complete_Stream->Streams[elementary_PID]->SubStream_pid=ID_List[1].To_int16u();
 
                         elementary_PID=ID_List[1].To_int16u();
                         stream_type=0x1B;
 
                         bool IsAlreadyPresent=false;
-                        for (size_t Pos=0; Pos<Complete_Stream->Streams[elementary_PID].program_numbers.size(); Pos++)
-                            if (Complete_Stream->Streams[elementary_PID].program_numbers[Pos]==program_number)
+                        for (size_t Pos=0; Pos<Complete_Stream->Streams[elementary_PID]->program_numbers.size(); Pos++)
+                            if (Complete_Stream->Streams[elementary_PID]->program_numbers[Pos]==program_number)
                                 IsAlreadyPresent=true;
                         if (!IsAlreadyPresent)
                         {
                             Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[program_number].elementary_PIDs.push_back(elementary_PID);
-                            Complete_Stream->Streams[elementary_PID].program_numbers.push_back(program_number);
-                            Complete_Stream->Streams[elementary_PID].registration_format_identifier=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[program_number].registration_format_identifier;
+                            Complete_Stream->Streams[elementary_PID]->program_numbers.push_back(program_number);
+                            Complete_Stream->Streams[elementary_PID]->registration_format_identifier=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[program_number].registration_format_identifier;
                         }
-                        if (Complete_Stream->Streams[elementary_PID].Kind!=complete_stream::stream::pes)
+                        if (Complete_Stream->Streams[elementary_PID]->Kind!=complete_stream::stream::pes)
                         {
+                            if (Complete_Stream->Streams_NotParsedCount==(size_t)-1)
+                                Complete_Stream->Streams_NotParsedCount=0;
                             Complete_Stream->Streams_NotParsedCount++;
-                            Complete_Stream->Streams[elementary_PID].Kind=complete_stream::stream::pes;
-                            Complete_Stream->Streams[elementary_PID].stream_type=stream_type;
-                            Complete_Stream->Streams[elementary_PID].Searching_Payload_Start_Set(true);
+                            Complete_Stream->Streams[elementary_PID]->Kind=complete_stream::stream::pes;
+                            Complete_Stream->Streams[elementary_PID]->stream_type=stream_type;
+                            Complete_Stream->Streams[elementary_PID]->Searching_Payload_Start_Set(true);
                             #ifdef MEDIAINFO_MPEGTS_PCR_YES
-                                Complete_Stream->Streams[elementary_PID].Searching_TimeStamp_Start_Set(true);
-                                Complete_Stream->Streams[elementary_PID].PCR_PID=PCR_PID;
+                                Complete_Stream->Streams[elementary_PID]->Searching_TimeStamp_Start_Set(true);
+                                Complete_Stream->Streams[elementary_PID]->PCR_PID=PCR_PID;
                             #endif //MEDIAINFO_MPEGTS_PCR_YES
                             #ifdef MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
-                                //Complete_Stream->Streams[elementary_PID].Searching_ParserTimeStamp_Start_Set(true);
+                                //Complete_Stream->Streams[elementary_PID]->Searching_ParserTimeStamp_Start_Set(true);
                             #endif //MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
                             #if MEDIAINFO_TRACE
-                                Complete_Stream->Streams[elementary_PID].Element_Info="PES";
+                                Complete_Stream->Streams[elementary_PID]->Element_Info1="PES";
                             #endif //MEDIAINFO_TRACE
                             if (Complete_Stream->File__Duplicate_Get_From_PID(elementary_PID))
-                                Complete_Stream->Streams[elementary_PID].ShouldDuplicate=true;
+                                Complete_Stream->Streams[elementary_PID]->ShouldDuplicate=true;
                         }
                     }
 
@@ -1222,6 +1271,16 @@
                 for (size_t Pos=0; Pos<MIs.size(); Pos++)
                     delete MIs[Pos]; //MIs[Pos]=NULL;
             }
+
+            if (elementary_PID)
+            {
+                elementary_PID_Update(PCR_PID);
+
+                //Removing from the list of previous elementary_PIDs to remove
+                for (size_t Pos=0; Pos<elementary_PIDs_Previous.size(); Pos++)
+                    if (elementary_PIDs_Previous[Pos]==elementary_PID)
+                        elementary_PIDs_Previous.erase(elementary_PIDs_Previous.begin()+Pos);
+            }
         FILLING_END();
 
         //Descriptors
@@ -1229,19 +1288,35 @@
         if (Descriptors_Size>0)
             Descriptors();
 
-        Element_End(Ztring::ToZtring_From_CC2(elementary_PID), 5+Descriptors_Size);
+        Element_End1(Ztring::ToZtring_From_CC2(elementary_PID));
     }
 
     FILLING_BEGIN();
+        //Removing previous elementary_PIDs no more used
+        if (Config->File_MpegTs_RealTime_Get())
+        {
+            for (size_t Pos=0; Pos<elementary_PIDs_Previous.size(); Pos++)
+            {
+                elementary_PID=elementary_PIDs_Previous[Pos];
+                elementary_PID_Remove();
+
+                Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[program_number].Update_Needed_StreamCount=true;
+            }
+        }
+
         #ifdef MEDIAINFO_MPEGTS_PCR_YES
-            Complete_Stream->Streams[PCR_PID].IsPCR=true;
-            Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[program_number].PCR_PID=PCR_PID;
-            if (Complete_Stream->Streams[PCR_PID].TimeStamp_Start==(int64u)-1)
-                Complete_Stream->Streams[PCR_PID].Searching_TimeStamp_Start_Set(true);
-            #if MEDIAINFO_TRACE
-                if (Complete_Stream->Streams[PCR_PID].Kind==complete_stream::stream::unknown)
-                    Complete_Stream->Streams[PCR_PID].Element_Info="PCR";
-            #endif //MEDIAINFO_TRACE
+            if (PCR_PID!=0x1FFF) //Not padding packet
+            {
+                Complete_Stream->Streams[PCR_PID]->IsPCR=true;
+                Complete_Stream->PCR_PIDs[PCR_PID]++;
+                Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[program_number].PCR_PID=PCR_PID;
+                if (Complete_Stream->Streams[PCR_PID]->TimeStamp_Start==(int64u)-1)
+                    Complete_Stream->Streams[PCR_PID]->Searching_TimeStamp_Start_Set(true);
+                #if MEDIAINFO_TRACE
+                    if (Complete_Stream->Streams[PCR_PID]->Kind==complete_stream::stream::unknown)
+                        Complete_Stream->Streams[PCR_PID]->Element_Info1="PCR";
+                #endif //MEDIAINFO_TRACE
+            }
         #endif //MEDIAINFO_MPEGTS_PCR_YES
 
         //Sorting
@@ -1250,15 +1325,15 @@
         //Handling ATSC/CEA/DVB
         if (!Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs_NotParsedCount)
         {
-            //We know what is each PID, so we can try known values
+            //We know what is each pid, so we can try known values
             #ifdef MEDIAINFO_MPEGTS_ALLSTREAMS_YES
-                for (size_t PID=0x10; PID<0x1FFF; PID++) //Wanting 0x10-->0x2F (DVB), 0x1ABC (cea_osd), 0x1FF7-->0x1FFF (ATSC)
+                for (size_t pid=0x10; pid<0x1FFF; pid++) //Wanting 0x10-->0x2F (DVB), 0x1ABC (cea_osd), 0x1FF7-->0x1FFF (ATSC)
                     for (size_t Table_ID=0x00; Table_ID<0xFF; Table_ID++)
                     {
-                        Complete_Stream->Streams[PID].Searching_Payload_Start_Set(true);
-                        Complete_Stream->Streams[PID].Kind=complete_stream::stream::psi;
-                        Complete_Stream->Streams[PID].Table_IDs.resize(0x100);
-                        Complete_Stream->Streams[PID].Table_IDs[Table_ID]=new complete_stream::stream::table_id; //event_information_section - actual_transport_stream, schedule
+                        Complete_Stream->Streams[pid]->Searching_Payload_Start_Set(true);
+                        Complete_Stream->Streams[pid]->Kind=complete_stream::stream::psi;
+                        Complete_Stream->Streams[pid]->Table_IDs.resize(0x100);
+                        Complete_Stream->Streams[pid]->Table_IDs[Table_ID]=new complete_stream::stream::table_id; //event_information_section - actual_transport_stream, schedule
 
                         if (Pos==0x001F)
                             Pos=0x1ABB; //Skipping normal data
@@ -1266,44 +1341,44 @@
                             Pos=0x1FF6; //Skipping normal data
                     }
             #else //MEDIAINFO_MPEGTS_ALLSTREAMS_YES
-                if (Complete_Stream->Streams[0x0010].Kind==complete_stream::stream::unknown)
+                if (Complete_Stream->Streams[0x0010]->Kind==complete_stream::stream::unknown)
                 {
-                    Complete_Stream->Streams[0x0010].Searching_Payload_Start_Set(true);
-                    Complete_Stream->Streams[0x0010].Kind=complete_stream::stream::psi;
-                    Complete_Stream->Streams[0x0010].Table_IDs.resize(0x100);
-                    Complete_Stream->Streams[0x0010].Table_IDs[0x40]=new complete_stream::stream::table_id; //network_information_section - actual_network
+                    Complete_Stream->Streams[0x0010]->Searching_Payload_Start_Set(true);
+                    Complete_Stream->Streams[0x0010]->Kind=complete_stream::stream::psi;
+                    Complete_Stream->Streams[0x0010]->Table_IDs.resize(0x100);
+                    Complete_Stream->Streams[0x0010]->Table_IDs[0x40]=new complete_stream::stream::table_id; //network_information_section - actual_network
                 }
-                if (Complete_Stream->Streams[0x0011].Kind==complete_stream::stream::unknown)
+                if (Complete_Stream->Streams[0x0011]->Kind==complete_stream::stream::unknown)
                 {
-                    Complete_Stream->Streams[0x0011].Searching_Payload_Start_Set(true);
-                    Complete_Stream->Streams[0x0011].Kind=complete_stream::stream::psi;
-                    Complete_Stream->Streams[0x0011].Table_IDs.resize(0x100);
-                    Complete_Stream->Streams[0x0011].Table_IDs[0x42]=new complete_stream::stream::table_id; //service_description_section - actual_transport_stream
+                    Complete_Stream->Streams[0x0011]->Searching_Payload_Start_Set(true);
+                    Complete_Stream->Streams[0x0011]->Kind=complete_stream::stream::psi;
+                    Complete_Stream->Streams[0x0011]->Table_IDs.resize(0x100);
+                    Complete_Stream->Streams[0x0011]->Table_IDs[0x42]=new complete_stream::stream::table_id; //service_description_section - actual_transport_stream
                 }
-                if (Complete_Stream->Streams[0x0012].Kind==complete_stream::stream::unknown)
+                if (Complete_Stream->Streams[0x0012]->Kind==complete_stream::stream::unknown)
                 {
-                    Complete_Stream->Streams[0x0012].Searching_Payload_Start_Set(true);
-                    Complete_Stream->Streams[0x0012].Kind=complete_stream::stream::psi;
-                    Complete_Stream->Streams[0x0012].Table_IDs.resize(0x100);
-                    Complete_Stream->Streams[0x0012].Table_IDs[0x4E]=new complete_stream::stream::table_id; //event_information_section - actual_transport_stream, present/following
+                    Complete_Stream->Streams[0x0012]->Searching_Payload_Start_Set(true);
+                    Complete_Stream->Streams[0x0012]->Kind=complete_stream::stream::psi;
+                    Complete_Stream->Streams[0x0012]->Table_IDs.resize(0x100);
+                    Complete_Stream->Streams[0x0012]->Table_IDs[0x4E]=new complete_stream::stream::table_id; //event_information_section - actual_transport_stream, present/following
                     for (size_t Table_ID=0x50; Table_ID<0x60; Table_ID++)
-                        Complete_Stream->Streams[0x0012].Table_IDs[Table_ID]=new complete_stream::stream::table_id; //event_information_section - actual_transport_stream, schedule
+                        Complete_Stream->Streams[0x0012]->Table_IDs[Table_ID]=new complete_stream::stream::table_id; //event_information_section - actual_transport_stream, schedule
                 }
-                if (Complete_Stream->Streams[0x0014].Kind==complete_stream::stream::unknown)
+                if (Complete_Stream->Streams[0x0014]->Kind==complete_stream::stream::unknown)
                 {
-                    Complete_Stream->Streams[0x0014].Searching_Payload_Start_Set(true);
-                    Complete_Stream->Streams[0x0014].Kind=complete_stream::stream::psi;
-                    Complete_Stream->Streams[0x0014].Table_IDs.resize(0x100);
-                    Complete_Stream->Streams[0x0014].Table_IDs[0x70]=new complete_stream::stream::table_id; //time_date_section
-                    Complete_Stream->Streams[0x0014].Table_IDs[0x73]=new complete_stream::stream::table_id; //time_offset_section
+                    Complete_Stream->Streams[0x0014]->Searching_Payload_Start_Set(true);
+                    Complete_Stream->Streams[0x0014]->Kind=complete_stream::stream::psi;
+                    Complete_Stream->Streams[0x0014]->Table_IDs.resize(0x100);
+                    Complete_Stream->Streams[0x0014]->Table_IDs[0x70]=new complete_stream::stream::table_id; //time_date_section
+                    Complete_Stream->Streams[0x0014]->Table_IDs[0x73]=new complete_stream::stream::table_id; //time_offset_section
                 }
-                if (Complete_Stream->Streams[0x1FFB].Kind==complete_stream::stream::unknown)
+                if (Complete_Stream->Streams[0x1FFB]->Kind==complete_stream::stream::unknown)
                 {
-                    Complete_Stream->Streams[0x1FFB].Searching_Payload_Start_Set(true);
-                    Complete_Stream->Streams[0x1FFB].Kind=complete_stream::stream::psi;
-                    Complete_Stream->Streams[0x1FFB].Table_IDs.resize(0x100);
-                    Complete_Stream->Streams[0x1FFB].Table_IDs[0xC7]=new complete_stream::stream::table_id; //Master Guide Table
-                    Complete_Stream->Streams[0x1FFB].Table_IDs[0xCD]=new complete_stream::stream::table_id; //System Time Table
+                    Complete_Stream->Streams[0x1FFB]->Searching_Payload_Start_Set(true);
+                    Complete_Stream->Streams[0x1FFB]->Kind=complete_stream::stream::psi;
+                    Complete_Stream->Streams[0x1FFB]->Table_IDs.resize(0x100);
+                    Complete_Stream->Streams[0x1FFB]->Table_IDs[0xC7]=new complete_stream::stream::table_id; //Master Guide Table
+                    Complete_Stream->Streams[0x1FFB]->Table_IDs[0xCD]=new complete_stream::stream::table_id; //System Time Table
                 }
             #endif //MEDIAINFO_MPEGTS_ALLSTREAMS_YES
         }
@@ -1317,13 +1392,20 @@
     if (Element_Offset<Element_Size)
     {
         Descriptors_Size=(int16u)(Element_Size-Element_Offset);
-        Descriptors();
+        if (Descriptors_Size>0)
+            Descriptors();
     }
 }
 
 //---------------------------------------------------------------------------
 void File_Mpeg_Psi::Table_40()
 {
+    if (IsATSC)
+    {
+        Skip_XX(Element_Size,                               "Unknown ATSC");
+        return;
+    }
+
     //Parsing
     BS_Begin();
     Skip_S1( 4,                                             "reserved");
@@ -1344,9 +1426,9 @@
     if (Element_Offset<Element_Size)
     {
         int16u original_network_id;
-        Element_Begin();
-        Get_B2 (transport_stream_id,                        "transport_stream_id"); Element_Info(transport_stream_id);
-        Get_B2 (original_network_id,                        "original_network_id"); Param_Info(Mpeg_Descriptors_original_network_id(original_network_id));
+        Element_Begin0();
+        Get_B2 (transport_stream_id,                        "transport_stream_id"); Element_Info1(transport_stream_id);
+        Get_B2 (original_network_id,                        "original_network_id"); Param_Info1(Mpeg_Descriptors_original_network_id(original_network_id));
         BS_Begin();
         Skip_S1( 4,                                         "reserved");
         Get_S2 (12, Descriptors_Size,                       "transport_descriptors_length");
@@ -1356,7 +1438,7 @@
         if (Descriptors_Size>0)
             Descriptors();
 
-        Element_End();
+        Element_End0();
 
         FILLING_BEGIN();
             Complete_Stream->original_network_name=Mpeg_Descriptors_original_network_id(original_network_id);
@@ -1372,7 +1454,7 @@
     Skip_B1(                                                    "reserved_future_use");
     while (Element_Offset<Element_Size)
     {
-        Element_Begin();
+        Element_Begin0();
         int64u Test;
         Peek_B5(Test);
         if (Test!=0xFFFFFFFFFFULL)
@@ -1382,7 +1464,7 @@
             Skip_S1( 6,                                         "reserved_future_use");
             Skip_SB(                                            "EIT_schedule_flag");
             Skip_SB(                                            "EIT_present_following_flag");
-            Info_S1( 3, running_status,                         "running_status"); Param_Info(Mpeg_Psi_running_status[running_status]);
+            Info_S1( 3, running_status,                         "running_status"); Param_Info1(Mpeg_Psi_running_status[running_status]);
             Skip_SB(                                            "free_CA_mode");
             Get_S2 (12, Descriptors_Size,                       "ES_info_length");
             BS_End();
@@ -1392,12 +1474,12 @@
             if (Descriptors_Size>0)
                 Descriptors();
 
-            Element_End(Ztring::ToZtring_From_CC2(program_number), 5+Descriptors_Size);
+            Element_End1(Ztring::ToZtring_From_CC2(program_number));
         }
         else
         {
             Skip_XX(Element_Size-Element_Offset,                    "Junk");
-            Element_End("Junk");
+            Element_End1("Junk");
         }
     }
 }
@@ -1430,16 +1512,16 @@
     }
     while (Element_Offset<Element_Size)
     {
-        Element_Begin();
+        Element_Begin0();
         int32u time, duration;
         int16u date;
         int8u running_status;
         Get_B2 (event_id,                                       "event_id");
-        Get_B2 (date,                                           "start_time (date)"); Param_Info(Date_MJD(date));
-        Get_B3 (time,                                           "start_time (time)"); Param_Info(Time_BCD(time));
-        Get_B3 (duration,                                       "duration"); Param_Info(Time_BCD(duration));
+        Get_B2 (date,                                           "start_time (date)"); Param_Info1(Date_MJD(date));
+        Get_B3 (time,                                           "start_time (time)"); Param_Info1(Time_BCD(time));
+        Get_B3 (duration,                                       "duration"); Param_Info1(Time_BCD(duration));
         BS_Begin();
-        Get_S1 ( 3, running_status,                             "running_status"); Param_Info(Mpeg_Psi_running_status[running_status]);
+        Get_S1 ( 3, running_status,                             "running_status"); Param_Info1(Mpeg_Psi_running_status[running_status]);
         Skip_SB(                                                "free_CA_mode");
         Get_S2 (12, Descriptors_Size,                           "descriptors_loop_length");
         BS_End();
@@ -1449,12 +1531,13 @@
         if (Descriptors_Size>0)
             Descriptors();
 
-        Element_End(Ztring::ToZtring_From_CC2(event_id), 11+Descriptors_Size);
+        Element_End1(Ztring::ToZtring_From_CC2(event_id));
 
         FILLING_BEGIN();
-            Complete_Stream->Transport_Streams[transport_stream_id].Programs[table_id_extension].DVB_EPG_Blocks[table_id].Events[event_id].start_time=_T("UTC ")+Date_MJD(date)+_T(" ")+Time_BCD(time);
+            Complete_Stream->Transport_Streams[transport_stream_id].Programs[table_id_extension].DVB_EPG_Blocks[table_id].Events[event_id].start_time=__T("UTC ")+Date_MJD(date)+__T(" ")+Time_BCD(time);
             Complete_Stream->Transport_Streams[transport_stream_id].Programs[table_id_extension].DVB_EPG_Blocks[table_id].Events[event_id].duration=Time_BCD(duration);
-            Complete_Stream->Transport_Streams[transport_stream_id].Programs[table_id_extension].DVB_EPG_Blocks[table_id].Events[event_id].running_status=Mpeg_Psi_running_status[running_status];
+            if (running_status)
+                Complete_Stream->Transport_Streams[transport_stream_id].Programs[table_id_extension].DVB_EPG_Blocks[table_id].Events[event_id].running_status=Mpeg_Psi_running_status[running_status];
         FILLING_END();
     }
 }
@@ -1483,13 +1566,13 @@
     //Parsing
     int32u time;
     int16u date;
-    Get_B2 (date,                                               "UTC_time (date)"); Param_Info(Date_MJD(date));
-    Get_B3 (time,                                               "UTC_time (time)"); Param_Info(Time_BCD(time));
+    Get_B2 (date,                                               "UTC_time (date)"); Param_Info1(Date_MJD(date));
+    Get_B3 (time,                                               "UTC_time (time)"); Param_Info1(Time_BCD(time));
 
     FILLING_BEGIN();
         if (Complete_Stream->Duration_Start.empty())
-            Complete_Stream->Duration_Start=_T("UTC ")+Date_MJD(date)+_T(" ")+Time_BCD(time);
-        Complete_Stream->Duration_End=_T("UTC ")+Date_MJD(date)+_T(" ")+Time_BCD(time);
+            Complete_Stream->Duration_Start=__T("UTC ")+Date_MJD(date)+__T(" ")+Time_BCD(time);
+        Complete_Stream->Duration_End=__T("UTC ")+Date_MJD(date)+__T(" ")+Time_BCD(time);
         Complete_Stream->Duration_End_IsUpdated=true;
     FILLING_END();
 }
@@ -1500,8 +1583,8 @@
     //Parsing
     int32u time;
     int16u date;
-    Get_B2 (date,                                               "UTC_time (date)"); Param_Info(Date_MJD(date));
-    Get_B3 (time,                                               "UTC_time (time)"); Param_Info(Time_BCD(time));
+    Get_B2 (date,                                               "UTC_time (date)"); Param_Info1(Date_MJD(date));
+    Get_B3 (time,                                               "UTC_time (time)"); Param_Info1(Time_BCD(time));
     BS_Begin();
     Skip_S1( 4,                                                 "DVB_reserved_for_future_use");
     Get_S2 (12, Descriptors_Size,                               "transmission_info_loop_length");
@@ -1515,8 +1598,8 @@
 
     FILLING_BEGIN();
         if (Complete_Stream->Duration_Start.empty())
-            Complete_Stream->Duration_Start=_T("UTC ")+Date_MJD(date)+_T(" ")+Time_BCD(time);
-        Complete_Stream->Duration_End=_T("UTC ")+Date_MJD(date)+_T(" ")+Time_BCD(time);
+            Complete_Stream->Duration_Start=__T("UTC ")+Date_MJD(date)+__T(" ")+Time_BCD(time);
+        Complete_Stream->Duration_End=__T("UTC ")+Date_MJD(date)+__T(" ")+Time_BCD(time);
         Complete_Stream->Duration_End_IsUpdated=true;
     FILLING_END();
 }
@@ -1536,11 +1619,11 @@
 
     while (Element_Offset<Element_Size)
     {
-        Element_Begin();
+        Element_Begin0();
         Get_B2 (    program_number,                             "service_id");
         BS_Begin();
         Skip_SB(                                                "DVB_reserved_future_use");
-        Info_S1( 3, running_status,                             "running_status"); Param_Info(Mpeg_Psi_running_status[running_status]);
+        Info_S1( 3, running_status,                             "running_status"); Param_Info1(Mpeg_Psi_running_status[running_status]);
         Get_S2 (12, Descriptors_Size,                           "service_loop_length");
         BS_End();
 
@@ -1549,7 +1632,72 @@
         if (Descriptors_Size>0)
             Descriptors();
 
-        Element_End(Ztring::ToZtring_From_CC2(program_number), 5+Descriptors_Size);
+        Element_End1(Ztring::ToZtring_From_CC2(program_number));
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg_Psi::Table_C0()
+{
+        //TODO
+        Skip_XX(Element_Size-Element_Offset,                    "data");
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg_Psi::Table_C1()
+{
+    IsATSC=true;
+
+    //Parsing
+    Ztring program_name, alternate_program_name;
+    int8u protocol_version, program_name_length, alternate_program_name_length, package_count;
+    BS_Begin();
+    Skip_S1(3,                                                  "reserved");
+    Get_S1 (5, protocol_version,                                "protocol_version");
+    BS_End();
+    if (protocol_version!=0)
+    {
+        Skip_XX(Element_Size-Element_Offset,                    "data");
+        return;
+    }
+    Skip_C3(                                                    "ISO_639_language_code");
+    Skip_B2(                                                    "program_number");
+    Skip_B1(                                                    "reserved");
+    Skip_B1(                                                    "sequence");
+    Skip_B1(                                                    "program_epoch_number");
+    BS_Begin();
+    Skip_SB(                                                    "display_name_when_not_auth");
+    Skip_SB(                                                    "use_alt_name_in_purchase_history");
+    Skip_SB(                                                    "use_alt_name_if_not_auth");
+    Skip_SB(                                                    "display_ratings");
+    Skip_S1(4,                                                  "reserved");
+    BS_End();
+    Get_B1 (program_name_length,                                "program_name_length");
+    SCTE_multilingual_text_string(program_name_length, program_name, "program_name");
+    Get_B1 (alternate_program_name_length,                      "alternate_program_name_length");
+    SCTE_multilingual_text_string(alternate_program_name_length, alternate_program_name, "alternate_program_name");
+    BS_Begin();
+    Skip_S1(3,                                                  "reserved");
+    Get_S1 (5, package_count,                                   "package_count");
+    BS_End();
+    for (int8u Pos=0; Pos<package_count; Pos++)
+    {
+        Ztring package_name;
+        int8u package_name_length;
+        Get_B1 (package_name_length,                            "package_name_length");
+        SCTE_multilingual_text_string(package_name_length, package_name, "package_name");
+    }
+
+    if (Element_Offset<Element_Size)
+    {
+        BS_Begin();
+        Skip_S1( 6,                                             "reserved");
+        Get_S2 (10, Descriptors_Size,                           "descriptors_length");
+        BS_End();
+
+        //Descriptors
+        if (Descriptors_Size>0)
+            Descriptors();
     }
 }
 
@@ -1569,8 +1717,8 @@
     for (int16u Pos=0; Pos<tables_defined; Pos++)
     {
         int16u table_type, table_type_PID;
-        Element_Begin();
-        Get_B2 (    table_type,                                 "table_type"); Param_Info(Mpeg_Psi_ATSC_table_type(table_type));
+        Element_Begin0();
+        Get_B2 (    table_type,                                 "table_type"); Param_Info1(Mpeg_Psi_ATSC_table_type(table_type));
         BS_Begin();
         Skip_S1( 3,                                             "reserved");
         Get_S2 (13, table_type_PID,                             "table_type_PID");
@@ -1587,15 +1735,16 @@
         if (Descriptors_Size>0)
             Descriptors();
 
-        Element_Info(Mpeg_Psi_ATSC_table_type(table_type));
-        Element_End(Ztring::ToZtring_From_CC2(table_type_PID), 11+Descriptors_Size);
+        Element_Info1(Mpeg_Psi_ATSC_table_type(table_type));
+        Element_Info1C((table_type>=0x0100), table_type%0x100);
+        Element_End1(Ztring::ToZtring_From_CC2(table_type_PID));
 
         FILLING_BEGIN();
-            if (Complete_Stream->Streams[table_type_PID].Kind==complete_stream::stream::unknown && table_type!=0x0001 && table_type!=0x0003) //Not activing current_next_indicator='0'
+            if (Complete_Stream->Streams[table_type_PID]->Kind==complete_stream::stream::unknown && table_type!=0x0001 && table_type!=0x0003) //Not activing current_next_indicator='0'
             {
-                Complete_Stream->Streams[table_type_PID].Searching_Payload_Start_Set(true);
-                Complete_Stream->Streams[table_type_PID].Kind=complete_stream::stream::psi;
-                Complete_Stream->Streams[table_type_PID].Table_IDs.resize(0x100);
+                Complete_Stream->Streams[table_type_PID]->Searching_Payload_Start_Set(true);
+                Complete_Stream->Streams[table_type_PID]->Kind=complete_stream::stream::psi;
+                Complete_Stream->Streams[table_type_PID]->Table_IDs.resize(0x100);
             }
             #ifdef MEDIAINFO_MPEGTS_ALLSTREAMS_YES
                 for (int8u table_id=0x00; table_id<0xFF; table_id++)
@@ -1623,10 +1772,10 @@
                     table_id=0xDA;
                 else
                     table_id=0xFF;
-                if (table_id!=0xFF && Complete_Stream->Streams[table_type_PID].Table_IDs[table_id]==NULL)
-                    Complete_Stream->Streams[table_type_PID].Table_IDs[table_id]=new complete_stream::stream::table_id; //Master Guide Table
+                if (table_id!=0xFF && Complete_Stream->Streams[table_type_PID]->Table_IDs[table_id]==NULL)
+                    Complete_Stream->Streams[table_type_PID]->Table_IDs[table_id]=new complete_stream::stream::table_id; //Master Guide Table
             #endif //MEDIAINFO_MPEGTS_ALLSTREAMS_YES
-            Complete_Stream->Streams[table_type_PID].table_type=table_type-((table_type&0x200)?0x100:0); //For having the same table_type for both EIT and ETT
+            Complete_Stream->Streams[table_type_PID]->table_type=table_type-((table_type&0x200)?0x100:0); //For having the same table_type for both EIT and ETT
         FILLING_END();
     }
     BS_Begin();
@@ -1652,7 +1801,7 @@
     {
         int16u major_channel_number, minor_channel_number, source_id;
         int8u service_type;
-        Element_Begin();
+        Element_Begin0();
         Get_UTF16B(table_id==0xDA?16:14, short_name,            "short_name"); //8 chars for satellite, else 7 chars
         BS_Begin();
         Skip_S1( 4,                                             "reserved");
@@ -1699,15 +1848,18 @@
         BS_End();
 
         FILLING_BEGIN();
+            if (!Config->File_MpegTs_Atsc_transport_stream_id_Trust_Get())
+                table_id_extension=Complete_Stream->transport_stream_id;
             Ztring Channel=Ztring::ToZtring(major_channel_number);
             if (minor_channel_number)
-                Channel+=_T("-")+Ztring::ToZtring(minor_channel_number);
+                Channel+=__T("-")+Ztring::ToZtring(minor_channel_number);
             if (minor_channel_number==0 || program_number==0xFFFF)
             {
                 Complete_Stream->Transport_Streams[table_id_extension].Infos["ServiceName"]=short_name;
                 Complete_Stream->Transport_Streams[table_id_extension].Infos["ServiceChannel"]=Channel;
                 Complete_Stream->Transport_Streams[table_id_extension].Infos["ServiceType"]=Mpeg_Psi_atsc_service_type(service_type);
                 Complete_Stream->Transport_Streams[table_id_extension].source_id=source_id;
+                Complete_Stream->Transport_Streams[table_id_extension].source_id_IsValid=true;
             }
             else if (program_number<0x2000)
             {
@@ -1715,6 +1867,7 @@
                 Complete_Stream->Transport_Streams[table_id_extension].Programs[program_number].Infos["ServiceChannel"]=Channel;
                 Complete_Stream->Transport_Streams[table_id_extension].Programs[program_number].Infos["ServiceType"]=Mpeg_Psi_atsc_service_type(service_type);
                 Complete_Stream->Transport_Streams[table_id_extension].Programs[program_number].source_id=source_id;
+                Complete_Stream->Transport_Streams[table_id_extension].Programs[program_number].source_id_IsValid=true;
             }
         FILLING_END();
 
@@ -1723,7 +1876,7 @@
         if (Descriptors_Size>0)
             Descriptors();
 
-        Element_End(Ztring::ToZtring_From_CC2(program_number), 18+Descriptors_Size);
+        Element_End1(Ztring::ToZtring_From_CC2(program_number));
     }
 
     BS_Begin();
@@ -1749,11 +1902,11 @@
     BS_End();
     for (int8u dimension_Pos=0; dimension_Pos<dimensions_defined; dimension_Pos++)
     {
-        Element_Begin("dimension");
+        Element_Begin1("dimension");
         Ztring dimension_name;
         int8u values_defined;
         Skip_B1(                                                "dimension_name_length"); //Not used
-        ATSC_multiple_string_structure(dimension_name,          "dimension_name");  Element_Info(dimension_name);
+        ATSC_multiple_string_structure(dimension_name,          "dimension_name");  Element_Info1(dimension_name);
         BS_Begin();
         Skip_S1( 3,                                             "reserved");
         Skip_SB(                                                "graduated_scale");
@@ -1761,15 +1914,15 @@
         BS_End();
         for (int8u value_Pos=0; value_Pos<values_defined; value_Pos++)
         {
-            Element_Begin("value");
+            Element_Begin1("value");
             Ztring abbrev_rating_value, rating_value;
             Skip_B1(                                            "abbrev_rating_value_length"); //Not used
-            ATSC_multiple_string_structure(abbrev_rating_value, "abbrev_rating_value");  Element_Info(abbrev_rating_value);
+            ATSC_multiple_string_structure(abbrev_rating_value, "abbrev_rating_value");  Element_Info1(abbrev_rating_value);
             Skip_B1(                                            "rating_value_length"); //Not used
-            ATSC_multiple_string_structure(rating_value,        "rating_value"); Element_Info(rating_value);
-            Element_End();
+            ATSC_multiple_string_structure(rating_value,        "rating_value"); Element_Info1(rating_value);
+            Element_End0();
         }
-            Element_End();
+            Element_End0();
     }
 
     BS_Begin();
@@ -1800,13 +1953,13 @@
     {
         Ztring title;
         int32u start_time, length_in_seconds;
-        Element_Begin();
+        Element_Begin0();
         BS_Begin();
         Skip_SB(                                                table_id==0xD9?"off_air":"reserved");
         Skip_SB(                                                "reserved");
         Get_S2 (14, event_id,                                   "event_id");
         BS_End();
-        Get_B4 (    start_time,                                 "start_time"); Param_Info(Ztring().Date_From_Seconds_1970(start_time+315964800)); Element_Info(Ztring().Date_From_Seconds_1970(start_time+315964800-Complete_Stream->GPS_UTC_offset)); //UTC 1980-01-06 00:00:00
+        Get_B4 (    start_time,                                 "start_time"); Param_Info1(Ztring().Date_From_Seconds_1970(start_time+315964800)); Element_Info1(Ztring().Date_From_Seconds_1970(start_time+315964800-Complete_Stream->GPS_UTC_offset)); //UTC 1980-01-06 00:00:00
         BS_Begin();
         Skip_S1( 2,                                             "reserved");
         Skip_S1( 2,                                             table_id==0xCB?"ETM_location":"reserved");
@@ -1824,17 +1977,17 @@
         if (Descriptors_Size>0)
             Descriptors();
 
-        Element_End(Ztring::ToZtring_From_CC2(event_id));
+        Element_End1(Ztring::ToZtring_From_CC2(event_id));
 
         FILLING_BEGIN();
-            Complete_Stream->Sources[table_id_extension].ATSC_EPG_Blocks[Complete_Stream->Streams[pid].table_type].Events[event_id].start_time=start_time;
-            Ztring duration =(length_in_seconds<36000?_T("0"):_T(""))+Ztring::ToZtring(length_in_seconds/3600)+_T(":");
+            Complete_Stream->Sources[table_id_extension].ATSC_EPG_Blocks[Complete_Stream->Streams[pid]->table_type].Events[event_id].start_time=start_time;
+            Ztring duration =(length_in_seconds<36000?__T("0"):__T(""))+Ztring::ToZtring(length_in_seconds/3600)+__T(":");
             length_in_seconds%=3600;
-                   duration+=(length_in_seconds<  600?_T("0"):_T(""))+Ztring::ToZtring(length_in_seconds/  60)+_T(":");
+                   duration+=(length_in_seconds<  600?__T("0"):__T(""))+Ztring::ToZtring(length_in_seconds/  60)+__T(":");
             length_in_seconds%=60;
-                   duration+=(length_in_seconds<   10?_T("0"):_T(""))+Ztring::ToZtring(length_in_seconds     );
-            Complete_Stream->Sources[table_id_extension].ATSC_EPG_Blocks[Complete_Stream->Streams[pid].table_type].Events[event_id].duration=duration;
-            Complete_Stream->Sources[table_id_extension].ATSC_EPG_Blocks[Complete_Stream->Streams[pid].table_type].Events[event_id].title=title;
+                   duration+=(length_in_seconds<   10?__T("0"):__T(""))+Ztring::ToZtring(length_in_seconds     );
+            Complete_Stream->Sources[table_id_extension].ATSC_EPG_Blocks[Complete_Stream->Streams[pid]->table_type].Events[event_id].duration=duration;
+            Complete_Stream->Sources[table_id_extension].ATSC_EPG_Blocks[Complete_Stream->Streams[pid]->table_type].Events[event_id].title=title;
         FILLING_END();
     }
 }
@@ -1846,21 +1999,21 @@
     Ztring extended_text_message;
     int16u source_id, event_id;
     Skip_B1(                                                    "protocol_version");
-    Element_Begin("ETM_id", 2);
+    Element_Begin1("ETM_id");
         Get_B2 (    source_id,                                  "source_id");
         BS_Begin();
         Get_S2 (14, event_id,                                   "event_id");
         Skip_S1( 2,                                             "lsb");
         BS_End();
-    Element_End();
+    Element_End0();
     ATSC_multiple_string_structure(extended_text_message,       "extended_text_message");
 
     FILLING_BEGIN();
-        if (Complete_Stream->Streams[pid].table_type==4)
+        if (Complete_Stream->Streams[pid]->table_type==4)
             Complete_Stream->Sources[source_id].texts[table_id_extension]=extended_text_message;
         else
         {
-            Complete_Stream->Sources[source_id].ATSC_EPG_Blocks[Complete_Stream->Streams[pid].table_type].Events[event_id].texts[table_id_extension]=extended_text_message;
+            Complete_Stream->Sources[source_id].ATSC_EPG_Blocks[Complete_Stream->Streams[pid]->table_type].Events[event_id].texts[table_id_extension]=extended_text_message;
             Complete_Stream->Sources[source_id].ATSC_EPG_Blocks_IsUpdated=true;
             Complete_Stream->Sources_IsUpdated=true;
         }
@@ -1874,17 +2027,17 @@
     int32u system_time;
     int8u  GPS_UTC_offset;
     Skip_B1(                                                    "protocol_version");
-    Get_B4 (system_time,                                        "system_time"); Param_Info(Ztring().Date_From_Seconds_1970(system_time+315964800)); //UTC 1980-01-06 00:00:00
+    Get_B4 (system_time,                                        "system_time"); Param_Info1(Ztring().Date_From_Seconds_1970(system_time+315964800)); //UTC 1980-01-06 00:00:00
     Get_B1 (GPS_UTC_offset,                                     "GPS_UTC_offset");
-    Element_Begin("daylight_savings", 2);
+    Element_Begin1("daylight_savings");
         BS_Begin();
         Skip_SB(                                                "DS_status");
-        Mark_1();
-        Mark_1();
+        Skip_SB(                                                "Reserved");
+        Skip_SB(                                                "Reserved");
         Skip_S1(5,                                              "DS_day_of_month");
         BS_End();
         Skip_B1(                                                "DS_hour");
-    Element_End();
+    Element_End0();
 
     //Descriptors
     Descriptors_Size=(int16u)(Element_Size-Element_Offset);
@@ -1918,6 +2071,157 @@
         Skip_XX(Element_Size,                                   "reserved");
 }
 
+//---------------------------------------------------------------------------
+void File_Mpeg_Psi::Table_FC()
+{
+    //Parsing
+    int16u splice_command_length;
+    int8u splice_command_type;
+    bool encrypted_packet;
+    Skip_B1(                                                    "protocol_version");
+    BS_Begin();
+    Get_SB (    encrypted_packet,                               "encrypted_packet");
+    Skip_S1( 6,                                                 "encryption_algorithm");
+    Skip_S5(33,                                                 "pts_adjustment");
+    Skip_S1( 8,                                                 "cw_index");
+    Skip_S2(12,                                                 "reserved");
+    Get_S2 (12, splice_command_length,                          "splice_command_length");
+    if (splice_command_length==0xFFF)
+        splice_command_length=(int16u)(Element_Size-4-Element_Offset);
+    Get_S1 ( 8, splice_command_type,                            "splice_command_type"); Param_Info1(Mpeg_Psi_splice_command_type(splice_command_type));
+    BS_End();
+
+    Element_Begin0();
+    #undef ELEMENT_CASE
+    #define ELEMENT_CASE(_NAME, _DETAIL) \
+        case 0x##_NAME : Element_Name(_DETAIL); Table_FC_##_NAME(); break;
+    switch (splice_command_type)
+    {
+        ELEMENT_CASE (00, "splice_null"); break;
+        ELEMENT_CASE (04, "splice_schedule"); break;
+        ELEMENT_CASE (05, "splice_insert"); break;
+        ELEMENT_CASE (06, "time_signal"); break;
+        ELEMENT_CASE (07, "bandwidth_reservation"); break;
+        default   : Skip_XX(splice_command_length,              "Unknown");
+    }
+    Element_End0();
+
+    if (Element_Offset+4<Element_Size)
+    {
+        Get_B2 (Descriptors_Size,                               "descriptor_loop_length");
+        transport_stream_id=Complete_Stream->transport_stream_id; //SCTE 35 is automaticly linked to the current transport_stream_id
+        if (Descriptors_Size>0)
+            Descriptors();
+    }
+
+    if (Element_Offset+4<Element_Size)
+        Skip_XX(Element_Size-(Element_Offset+4),                "alignment_stuffing");
+    if (encrypted_packet)
+        Skip_B4(                                                "E_CRC_32");
+    Skip_B4(                                                    "CRC32");
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg_Psi::Table_FC_00()
+{
+    //Null
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg_Psi::Table_FC_04()
+{
+    //TODO
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg_Psi::Table_FC_05()
+{
+    //Parsing
+    bool splice_event_cancel_indicator;
+    Skip_B4(                                                    "splice_event_id");
+    BS_Begin();
+    Get_SB (    splice_event_cancel_indicator,                  "splice_event_cancel_indicator");
+    Skip_S1( 7,                                                 "reserved");
+    BS_End();
+    if (!splice_event_cancel_indicator)
+    {
+        bool program_splice_flag, duration_flag, splice_immediate_flag;
+        BS_Begin();
+        Skip_SB(                                                "out_of_network_indicator");
+        Get_SB (    program_splice_flag,                        "program_splice_flag");
+        Get_SB (    duration_flag,                              "duration_flag");
+        Get_SB (    splice_immediate_flag,                      "splice_immediate_flag");
+        Skip_S1( 4,                                             "reserved");
+        BS_End();
+        if(program_splice_flag && !splice_immediate_flag)
+            Table_FC_05_splice_time();
+        if (!program_splice_flag)
+        {
+            int8u component_count;
+            Get_B1(component_count,                             "component_count");
+            for (int8u component=0; component<component_count; component++)
+            {
+                Skip_B1(                                        "component_tag");
+                Table_FC_05_splice_time();
+            }
+        }
+        if(duration_flag)
+            Table_FC_05_break_duration();
+        Skip_B2(                                                "unique_program_id");
+        Skip_B1(                                                "avail_num");
+        Skip_B1(                                                "avails_expected");
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg_Psi::Table_FC_05_break_duration()
+{
+    Element_Begin1("break_duration");
+
+    //Parsing
+    BS_Begin();
+    Skip_SB(                                                    "auto_return");
+    Skip_S1( 6,                                                 "reserved");
+    Skip_S5(33,                                                 "duration");
+    BS_End();
+
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg_Psi::Table_FC_05_splice_time()
+{
+    Element_Begin1("splice_time");
+
+    //Parsing
+    bool time_specified_flag;
+    BS_Begin();
+    Get_SB (    time_specified_flag,                            "time_specified_flag");
+    if (time_specified_flag)
+    {
+        Skip_S1( 6,                                             "reserved");
+        Skip_S5(33,                                             "pts_time");
+
+    }
+    else
+        Skip_S5(7,                                              "reserved");
+    BS_End();
+
+   Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg_Psi::Table_FC_06()
+{
+    Table_FC_05_splice_time();
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg_Psi::Table_FC_07()
+{
+    //TODO
+}
+
 //***************************************************************************
 // Helpers
 //***************************************************************************
@@ -1925,8 +2229,6 @@
 //---------------------------------------------------------------------------
 void File_Mpeg_Psi::Descriptors()
 {
-    if (Descriptors_Size==0)
-        return;
     if (Element_Offset+Descriptors_Size>Element_Size)
     {
         Trusted_IsNot("Descriptor size too big");
@@ -1950,10 +2252,13 @@
     Descriptors.event_id_IsValid=event_id_IsValid;
 
     //Parsing
-    Element_Begin("Descriptors", Descriptors_Size);
-    Open_Buffer_Init(&Descriptors);
-    Open_Buffer_Continue(&Descriptors, Descriptors_Size);
-    Element_End();
+    if (Descriptors_Size!=0)
+    {
+        Element_Begin1("Descriptors");
+        Open_Buffer_Init(&Descriptors);
+        Open_Buffer_Continue(&Descriptors, Descriptors_Size);
+        Element_End0();
+    }
 
     //Configuring
     elementary_PID_IsValid=false;
@@ -1963,22 +2268,22 @@
 }
 
 //---------------------------------------------------------------------------
-void File_Mpeg_Psi::ATSC_multiple_string_structure(Ztring &Value, const char* Info)
+void File_Mpeg_Psi::ATSC_multiple_string_structure(Ztring &Value, const char* Name)
 {
     //Parsing
     Ztring string;
     int8u number_strings, number_segments;
-    Element_Begin(Info);
+    Element_Begin1(Name);
     Get_B1(number_strings,                                      "number_strings");
     for (int8u string_Pos=0; string_Pos<number_strings; string_Pos++)
     {
-        Element_Begin("String");
+        Element_Begin1("String");
         int32u ISO_639_language_code;
         Get_C3(ISO_639_language_code,                           "ISO_639_language_code");
         Get_B1(number_segments,                                 "number_segments");
         for (int8u segment_Pos=0; segment_Pos<number_segments; segment_Pos++)
         {
-            Element_Begin("Segment");
+            Element_Begin1("Segment");
             Ztring segment;
             int8u compression_type, mode, number_bytes;
             Get_B1 (compression_type,                           "compression_type");
@@ -1992,17 +2297,17 @@
                                 case 0x00 : Get_Local(number_bytes, segment, "string"); break;
                                 case 0x3F : Get_UTF16B(number_bytes, segment, "string"); break;
                                 default   : Skip_XX(number_bytes, "Unknown");
-                                            segment=_T("(Encoded with mode=0x")+Ztring::ToZtring(mode, 16)+_T(')');
+                                            segment=__T("(Encoded with mode=0x")+Ztring::ToZtring(mode, 16)+__T(')');
                             }
                             break;
                 default   : Skip_XX(number_bytes,               "(Compressed)");
-                            segment=_T("(Compressed)");
+                            segment=__T("(Compressed)");
             }
-            Element_End(3+number_bytes);
+            Element_End0();
 
             FILLING_BEGIN();
-                if (segment.find_first_not_of(_T("\t\n "))!=std::string::npos)
-                    string+=segment+_T(" - ");
+                if (segment.find_first_not_of(__T("\t\n "))!=std::string::npos)
+                    string+=segment+__T(" - ");
             FILLING_END();
         }
 
@@ -2011,18 +2316,53 @@
                 string.resize(string.size()-3);
             Ztring ISO_639_2=Ztring().From_CC3(ISO_639_language_code);
             const Ztring& ISO_639_1=MediaInfoLib::Config.Iso639_1_Get(ISO_639_2);
-            Value+=(ISO_639_1.empty()?ISO_639_2:ISO_639_1)+_T(':')+string+_T(" - ");
+            Value+=(ISO_639_1.empty()?ISO_639_2:ISO_639_1)+__T(':')+string+__T(" - ");
         FILLING_END();
 
-        Element_Info(string);
-        Element_End("String");
+        Element_Info1(string);
+        Element_End1("String");
     }
 
     if (!Value.empty())
         Value.resize(Value.size()-3);
 
-    Element_Info(Value);
-    Element_End();
+    Element_Info1(Value);
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg_Psi::SCTE_multilingual_text_string(int8u Size, Ztring &Value, const char* Name)
+{
+    //Parsing
+    Element_Begin1(Name);
+    int64u End=Element_Offset+Size;
+    while (Element_Offset<End)
+    {
+        int8u mode;
+        Get_B1 (mode,                                           "mode");
+        if (mode<0x3F)
+        {
+            int8u eightbit_string_length;
+            Get_B1 (eightbit_string_length,                     "eightbit_string_length");
+            if (mode==0)
+                Get_ISO_8859_1(eightbit_string_length, Value,   "eightbit_string");
+            else
+                Skip_XX(eightbit_string_length,                 "eightbit_string (unsupporeted)");
+        }
+        else if (mode==0x3F)
+        {
+            int8u sixteenbit_string_length;
+            Get_B1 (sixteenbit_string_length,                   "sixteenbit_string_length");
+            Get_UTF16B(sixteenbit_string_length, Value,         "sixteenbit_string");
+        }
+        else if (mode>=0xA0)
+        {
+            int8u format_effector_param_length;
+            Get_B1 (format_effector_param_length,               "format_effector_param_length");
+            Skip_XX(format_effector_param_length,               "format_effector_data");
+        }
+    }
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
@@ -2041,18 +2381,229 @@
     int M =M2-1-K*12;
 
     //Formating
-    return                       Ztring::ToZtring(1900+Y)+_T("-")
-         + (M<10?_T("0"):_T(""))+Ztring::ToZtring(     M)+_T("-")
-         + (D<10?_T("0"):_T(""))+Ztring::ToZtring(     D);
+    return                       Ztring::ToZtring(1900+Y)+__T("-")
+         + (M<10?__T("0"):__T(""))+Ztring::ToZtring(     M)+__T("-")
+         + (D<10?__T("0"):__T(""))+Ztring::ToZtring(     D);
 }
 
 //---------------------------------------------------------------------------
 //Form: HHMMSS, BCD
 Ztring File_Mpeg_Psi::Time_BCD(int32u Time)
 {
-    return (((Time>>16)&0xFF)<10?_T("0"):_T("")) + Ztring::ToZtring((Time>>16)&0xFF, 16)+_T(":") //BCD
-         + (((Time>> 8)&0xFF)<10?_T("0"):_T("")) + Ztring::ToZtring((Time>> 8)&0xFF, 16)+_T(":") //BCD
-         + (((Time    )&0xFF)<10?_T("0"):_T("")) + Ztring::ToZtring((Time    )&0xFF, 16);        //BCD
+    return (((Time>>16)&0xFF)<10?__T("0"):__T("")) + Ztring::ToZtring((Time>>16)&0xFF, 16)+__T(":") //BCD
+         + (((Time>> 8)&0xFF)<10?__T("0"):__T("")) + Ztring::ToZtring((Time>> 8)&0xFF, 16)+__T(":") //BCD
+         + (((Time    )&0xFF)<10?__T("0"):__T("")) + Ztring::ToZtring((Time    )&0xFF, 16);        //BCD
+}
+
+//***************************************************************************
+// Helpers
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Mpeg_Psi::program_number_Update()
+{
+    //Setting the pid as program_map_section
+    if (Complete_Stream->Streams[elementary_PID]->Kind!=complete_stream::stream::psi)
+    {
+        Complete_Stream->Streams[elementary_PID]->Searching_Payload_Start_Set(true);
+        Complete_Stream->Streams[elementary_PID]->Kind=complete_stream::stream::psi;
+        Complete_Stream->Streams[elementary_PID]->Table_IDs.resize(0x100);
+        if (program_number)
+            Complete_Stream->Streams[elementary_PID]->Table_IDs[0x02]=new complete_stream::stream::table_id; //program_map_section
+    }
+    if (Complete_Stream->File__Duplicate_Get_From_PID(elementary_PID))
+        Complete_Stream->Streams[elementary_PID]->ShouldDuplicate=true;
+
+    //Handling a program
+    if (program_number)
+    {
+        Complete_Stream->Transport_Streams[table_id_extension].Programs_NotParsedCount++;
+        Complete_Stream->Transport_Streams[table_id_extension].Programs[program_number].pid=elementary_PID;
+        if (Complete_Stream->Streams.size()<0x2000)
+            Complete_Stream->Streams.resize(0x2000); //TODO: find the reason this code is called
+        Complete_Stream->Streams[elementary_PID]->program_numbers.push_back(program_number);
+        if (Complete_Stream->Streams[elementary_PID]->Table_IDs.size()<0x100)
+            Complete_Stream->Streams[elementary_PID]->Table_IDs.resize(0x100); //TODO: find the reason this code is called
+        if (Complete_Stream->Streams[elementary_PID]->Table_IDs[0x02]==NULL)
+            Complete_Stream->Streams[elementary_PID]->Table_IDs[0x02]=new complete_stream::stream::table_id; //TODO: find the reason this code is called
+        if (Complete_Stream->Streams[elementary_PID]->Table_IDs[0x02]->Table_ID_Extensions.find(program_number)==Complete_Stream->Streams[elementary_PID]->Table_IDs[0x02]->Table_ID_Extensions.end())
+        {
+            Complete_Stream->Streams[elementary_PID]->Table_IDs[0x02]->Table_ID_Extensions_CanAdd=false;
+            Complete_Stream->Streams[elementary_PID]->Table_IDs[0x02]->Table_ID_Extensions[program_number].version_number=0xFF;
+            Complete_Stream->Streams[elementary_PID]->Table_IDs[0x02]->Table_ID_Extensions[program_number].Section_Numbers.clear();
+            Complete_Stream->Streams[elementary_PID]->Table_IDs[0x02]->Table_ID_Extensions[program_number].Section_Numbers.resize(0x100);
+        }
+    }
+
+    //Handling a network except basic version
+    else if (Complete_Stream->Streams[elementary_PID]->Table_IDs[0x00]==NULL)
+    {
+        for (size_t Table_ID=1; Table_ID<0x100; Table_ID++)
+        {
+            if (Complete_Stream->Streams[elementary_PID]->Table_IDs[Table_ID]==NULL)
+                Complete_Stream->Streams[elementary_PID]->Table_IDs[Table_ID]=new complete_stream::stream::table_id; //all
+
+            if (Table_ID==1)
+                Table_ID++; //Skipping TableID 2
+        }
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg_Psi::program_number_Remove()
+{
+    //Removing this program_number from the list of program_numbers for each elementary_PID
+    for (size_t Pos=0; Pos<Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[program_number].elementary_PIDs.size(); Pos++)
+    {
+        int16u elementary_PID_Temp=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[program_number].elementary_PIDs[Pos];
+
+        //Removing this program_number from the list of program_numbers for this elementary_PID
+        for (size_t Pos=0; Pos<Complete_Stream->Streams[elementary_PID_Temp]->program_numbers.size(); Pos++)
+            if (Complete_Stream->Streams[elementary_PID_Temp]->program_numbers[Pos]==program_number)
+                Complete_Stream->Streams[elementary_PID_Temp]->program_numbers.erase(Complete_Stream->Streams[elementary_PID_Temp]->program_numbers.begin()+Pos);
+
+        //Removing parser if no more program_number
+        if (Complete_Stream->Streams[elementary_PID_Temp]->program_numbers.empty())
+        {
+            stream_t StreamKind=Complete_Stream->Streams[elementary_PID_Temp]->StreamKind;
+            size_t StreamPos=Complete_Stream->Streams[elementary_PID_Temp]->StreamPos;
+            if (StreamKind!=Stream_Max && StreamPos!=(size_t)-1)
+                Complete_Stream->StreamPos_ToRemove[StreamKind].push_back(StreamPos);
+
+            if (Complete_Stream->Streams_NotParsedCount!=(size_t)-1 && Complete_Stream->Streams_NotParsedCount>0 && !Complete_Stream->Streams[elementary_PID_Temp]->IsParsed)
+                Complete_Stream->Streams_NotParsedCount--; //Not parsed, and no need to parse it now
+            delete Complete_Stream->Streams[elementary_PID_Temp]; Complete_Stream->Streams[elementary_PID_Temp]=new complete_stream::stream;
+        }
+    }
+
+    //Removing related PCR
+    std::map<int16u, int16u>::iterator PCR_PID=Complete_Stream->PCR_PIDs.find(Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[program_number].PCR_PID);
+    if (PCR_PID!=Complete_Stream->PCR_PIDs.end())
+    {
+        PCR_PID->second--;
+        if (PCR_PID->second==0)
+            Complete_Stream->PCR_PIDs.erase(PCR_PID);
+    }
+
+    //Removing program_number
+    size_t StreamPos=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[program_number].StreamPos;
+    if (StreamPos!=(size_t)-1)
+    {
+        Complete_Stream->StreamPos_ToRemove[Stream_Menu].push_back(StreamPos);
+        Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[program_number].StreamPos=(size_t)-1;
+    }
+    int16u program_number_pid=Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[program_number].pid;
+    if (program_number_pid)
+    {
+        for (size_t Pos=0; Pos<Complete_Stream->Streams[program_number_pid]->program_numbers.size(); Pos++)
+            if (Complete_Stream->Streams[program_number_pid]->program_numbers[Pos]==program_number)
+                Complete_Stream->Streams[program_number_pid]->program_numbers.erase(Complete_Stream->Streams[program_number_pid]->program_numbers.begin()+Pos);
+        if (Complete_Stream->Streams[program_number_pid]->Table_IDs[0x02])
+            Complete_Stream->Streams[program_number_pid]->Table_IDs[0x02]->Table_ID_Extensions.erase(program_number);
+    }
+    Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs.erase(program_number);
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg_Psi::elementary_PID_Update(int16u PCR_PID)
+{
+    if (Complete_Stream->Streams[elementary_PID]->Kind==complete_stream::stream::psi)
+    {
+        //A PID can not be PSI and PES at the same time
+        return;
+    }
+
+    //stream_type
+    if (stream_type!=Complete_Stream->Streams[elementary_PID]->stream_type && Complete_Stream->Streams[elementary_PID]->stream_type!=(int8u)-1)
+    {
+        if (Complete_Stream->Streams_NotParsedCount!=(size_t)-1 && Complete_Stream->Streams_NotParsedCount>0 && !Complete_Stream->Streams[elementary_PID]->IsParsed)
+            Complete_Stream->Streams_NotParsedCount--; //Not parsed, and no need to parse it now
+        delete Complete_Stream->Streams[elementary_PID]; Complete_Stream->Streams[elementary_PID]=new complete_stream::stream;
+        Complete_Stream->Streams[elementary_PID]->Kind=complete_stream::stream::unknown;
+    }
+    if (Complete_Stream->Streams[elementary_PID]->Kind!=complete_stream::stream::pes)
+    {
+        delete Complete_Stream->Streams[elementary_PID]; Complete_Stream->Streams[elementary_PID]=new complete_stream::stream;
+
+        if (Complete_Stream->Streams_NotParsedCount==(size_t)-1)
+            Complete_Stream->Streams_NotParsedCount=0;
+        Complete_Stream->Streams_NotParsedCount++;
+        if (stream_type==0x86 && Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[table_id_extension].registration_format_identifier==Elements::CUEI)
+        {
+            Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[table_id_extension].Infos["SCTE35_PID"]=Ztring::ToZtring(elementary_PID);
+            Complete_Stream->Streams[elementary_PID]->Kind=complete_stream::stream::psi;
+            Complete_Stream->Streams[elementary_PID]->Table_IDs.resize(0x100);
+            Complete_Stream->Streams[elementary_PID]->Table_IDs[0xFC]=new complete_stream::stream::table_id; //Splice
+            if (Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[table_id_extension].Scte35==NULL)
+            {
+                Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[table_id_extension].Scte35=new complete_stream::transport_stream::program::scte35;
+                Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[table_id_extension].Scte35->pid=elementary_PID;
+            }
+            #if MEDIAINFO_TRACE
+                Complete_Stream->Streams[elementary_PID]->Element_Info1="PSI";
+            #endif //MEDIAINFO_TRACE
+        }
+        else
+        {
+            Complete_Stream->Streams[elementary_PID]->Kind=complete_stream::stream::pes;
+            Complete_Stream->Streams[elementary_PID]->Infos["CodecID"].From_Number(stream_type);
+            #if MEDIAINFO_TRACE
+                Complete_Stream->Streams[elementary_PID]->Element_Info1="PES";
+            #endif //MEDIAINFO_TRACE
+        }
+        Complete_Stream->Streams[elementary_PID]->stream_type=stream_type;
+        Complete_Stream->Streams[elementary_PID]->Searching_Payload_Start_Set(true);
+        #ifdef MEDIAINFO_MPEGTS_PCR_YES
+            Complete_Stream->Streams[elementary_PID]->Searching_TimeStamp_Start_Set(true);
+            Complete_Stream->Streams[elementary_PID]->PCR_PID=PCR_PID;
+        #endif //MEDIAINFO_MPEGTS_PCR_YES
+        #ifdef MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
+            //Complete_Stream->Streams[elementary_PID]->Searching_ParserTimeStamp_Start_Set(true);
+        #endif //MEDIAINFO_MPEGTS_PESTIMESTAMP_YES
+        if (Complete_Stream->File__Duplicate_Get_From_PID(elementary_PID))
+            Complete_Stream->Streams[elementary_PID]->ShouldDuplicate=true;
+    }
+
+    //Program information
+    bool IsAlreadyPresent=false;
+    for (size_t Pos=0; Pos<Complete_Stream->Streams[elementary_PID]->program_numbers.size(); Pos++)
+        if (Complete_Stream->Streams[elementary_PID]->program_numbers[Pos]==program_number)
+            IsAlreadyPresent=true;
+    if (!IsAlreadyPresent)
+    {
+        Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[program_number].elementary_PIDs.push_back(elementary_PID);
+        Complete_Stream->Streams[elementary_PID]->program_numbers.push_back(program_number);
+        if (ForceStreamDisplay || (Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[program_number].registration_format_identifier==Elements::HDMV && Complete_Stream->Streams[elementary_PID]->stream_type==0x90)) //Testing if forcing display of all streams or if it is a PGS from Blu-ray
+            Complete_Stream->PES_PIDs.insert(elementary_PID); //Adding it for sure
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Mpeg_Psi::elementary_PID_Remove()
+{
+    //Removing this elementary_PID from the list of elementary_PIDs for this program_number
+    for (size_t Pos=0; Pos<Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[program_number].elementary_PIDs.size(); Pos++)
+        if (Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[program_number].elementary_PIDs[Pos]==elementary_PID)
+            Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[program_number].elementary_PIDs.erase(Complete_Stream->Transport_Streams[Complete_Stream->transport_stream_id].Programs[program_number].elementary_PIDs.begin()+Pos);
+
+    //Removing this program_number from the list of program_numbers for this elementary_PID
+    for (size_t Pos=0; Pos<Complete_Stream->Streams[elementary_PID]->program_numbers.size(); Pos++)
+        if (Complete_Stream->Streams[elementary_PID]->program_numbers[Pos]==program_number)
+            Complete_Stream->Streams[elementary_PID]->program_numbers.erase(Complete_Stream->Streams[elementary_PID]->program_numbers.begin()+Pos);
+
+    //Removing parser if no more program_number
+    if (Complete_Stream->Streams[elementary_PID]->program_numbers.empty())
+    {
+        stream_t StreamKind=Complete_Stream->Streams[elementary_PID]->StreamKind;
+        size_t StreamPos=Complete_Stream->Streams[elementary_PID]->StreamPos;
+        if (StreamKind!=Stream_Max && StreamPos!=(size_t)-1)
+            Complete_Stream->StreamPos_ToRemove[StreamKind].push_back(StreamPos);
+
+        if (Complete_Stream->Streams_NotParsedCount!=(size_t)-1 && Complete_Stream->Streams_NotParsedCount>0 && !Complete_Stream->Streams[elementary_PID]->IsParsed)
+            Complete_Stream->Streams_NotParsedCount--; //Not parsed, and no need to parse it now
+        delete Complete_Stream->Streams[elementary_PID]; Complete_Stream->Streams[elementary_PID]=new complete_stream::stream;
+        Complete_Stream->PES_PIDs.erase(elementary_PID);
+    }
 }
 
 //***************************************************************************

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Mpeg_Psi.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Mpeg_Psi.h Changed

@@ -1,17 +1,17 @@
 // File_Mpeg_Psi - Info for MPEG Stream files
-// Copyright (C) 2006-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2006-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -53,7 +53,11 @@
     ~File_Mpeg_Psi();
 
 private :
+    //Buffer - File header
+    void FileHeader_Parse();
+
     //Buffer - Per element
+    bool Header_Begin();
     void Header_Parse();
     void Data_Parse();
 
@@ -103,8 +107,8 @@
     void Table_7E() {Skip_XX(Element_Size-Element_Offset, "Data");};
     void Table_7F();
     //Elements - ASTC
-    void Table_C0() {Skip_XX(Element_Size-Element_Offset, "Data");};
-    void Table_C1() {Skip_XX(Element_Size-Element_Offset, "Data");};
+    void Table_C0();
+    void Table_C1();
     void Table_C2() {Skip_XX(Element_Size-Element_Offset, "Data");};
     void Table_C3() {Skip_XX(Element_Size-Element_Offset, "Data");};
     void Table_C4() {Skip_XX(Element_Size-Element_Offset, "Data");};
@@ -130,14 +134,29 @@
     void Table_D8() {Skip_XX(Element_Size-Element_Offset, "Data");};
     void Table_D9() {Skip_XX(Element_Size-Element_Offset, "Data");};
     void Table_DA() {Table_C9();};
+    void Table_FC();
+    void Table_FC_00();
+    void Table_FC_04();
+    void Table_FC_05();
+    void Table_FC_05_break_duration();
+    void Table_FC_05_splice_time();
+    void Table_FC_06();
+    void Table_FC_07();
 
     //Helpers
     int16u Descriptors_Size;
     void Descriptors();
     void ATSC_multiple_string_structure(Ztring &Value, const char* Info);
+    void SCTE_multilingual_text_string(int8u Size, Ztring &Value, const char* Info);
     Ztring Date_MJD(int16u Date);
     Ztring Time_BCD(int32u Time);
 
+    //Items removal
+    void program_number_Update();
+    void program_number_Remove();
+    void elementary_PID_Update(int16u PCR_PID);
+    void elementary_PID_Remove();
+
     //Data
     int32u CRC_32;
     int16u transport_stream_id;
@@ -155,6 +174,8 @@
     bool   program_number_IsValid;
     bool   stream_type_IsValid;
     bool   event_id_IsValid;
+    bool   IsATSC;
+    bool   ForceStreamDisplay;
 };
 
 } //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Mxf.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Mxf.cpp Changed

@@ -1,31 +1,35 @@
 // File_Mxf - Info for MXF files
-// Copyright (C) 2006-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2006-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_MXF_YES)
 //---------------------------------------------------------------------------
 
@@ -34,6 +38,9 @@
 #if defined(MEDIAINFO_DVDIF_YES)
     #include "MediaInfo/Multiple/File_DvDif.h"
 #endif
+#if defined(MEDIAINFO_DVDIF_YES)
+    #include "MediaInfo/Multiple/File_DvDif.h"
+#endif
 #if defined(MEDIAINFO_AVC_YES)
     #include "MediaInfo/Video/File_Avc.h"
 #endif
@@ -43,15 +50,40 @@
 #if defined(MEDIAINFO_MPEGV_YES)
     #include "MediaInfo/Video/File_Mpegv.h"
 #endif
+#if defined(MEDIAINFO_VC3_YES)
+    #include "MediaInfo/Video/File_Vc3.h"
+#endif
+#if defined(MEDIAINFO_AAC_YES)
+    #include "MediaInfo/Audio/File_Aac.h"
+#endif
+#if defined(MEDIAINFO_AC3_YES)
+    #include "MediaInfo/Audio/File_Ac3.h"
+#endif
+#if defined(MEDIAINFO_AES3_YES)
+    #include "MediaInfo/Audio/File_Aes3.h"
+#endif
+#if defined(MEDIAINFO_AES3_YES)
+    #include "MediaInfo/Audio/File_ChannelGrouping.h"
+#endif
 #if defined(MEDIAINFO_MPEGA_YES)
     #include "MediaInfo/Audio/File_Mpega.h"
 #endif
+#if defined(MEDIAINFO_PCM_YES)
+    #include "MediaInfo/Audio/File_Pcm.h"
+#endif
 #if defined(MEDIAINFO_JPEG_YES)
     #include "MediaInfo/Image/File_Jpeg.h"
 #endif
 #include "MediaInfo/File_Unknown.h"
+#include "ZenLib/File.h"
 #include "ZenLib/FileName.h"
+#include "ZenLib/Dir.h"
 #include "MediaInfo/MediaInfo_Internal.h"
+#include "MediaInfo/Multiple/File__ReferenceFilesHelper.h"
+#include "ZenLib/Format/Http/Http_Utils.h"
+#if MEDIAINFO_SEEK
+    #include <algorithm>
+#endif //MEDIAINFO_SEEK
 //---------------------------------------------------------------------------
 
 namespace MediaInfoLib
@@ -86,60 +118,32 @@
 
 namespace Elements
 {
-    UUID(AES3PCMDescriptor,                                     060E2B34, 02530101, 0D010101, 01014700)
-    UUID(CDCIEssenceDescriptor,                                 060E2B34, 02530101, 0D010101, 01012800)
-    UUID(ClosedCompleteHeader,                                  060E2B34, 02050101, 0D010201, 01020400)
-    UUID(ClosedHeader,                                          060E2B34, 02050101, 0D010201, 01020200)
-    UUID(CompleteBody,                                          060E2B34, 02050101, 0D010201, 01030400)
-    UUID(CompleteFooter,                                        060E2B34, 02050101, 0D010201, 01040400)
-    UUID(CompleteHeader,                                        060E2B34, 02050101, 0D010201, 01020400)
-    UUID(ContentStorage,                                        060E2B34, 02530101, 0D010101, 01011800)
-    UUID(DMSegment,                                             060E2B34, 02530101, 0D010101, 01014100)
-    UUID(EssenceContainerData,                                  060E2B34, 02530101, 0D010101, 01012300)
-    UUID(EventTrack,                                            060E2B34, 02530101, 0D010101, 01013900)
-    UUID(GenericSoundEssenceDescriptor,                         060E2B34, 02530101, 0D010101, 01014200)
-    UUID(Identification,                                        060E2B34, 02530101, 0D010101, 01013000)
-    UUID(IndexTableSegment,                                     060E2B34, 02530101, 0D010201, 01100100)
-    UUID(JPEG2000PictureSubDescriptor,                          060E2B34, 02530101, 0D010101, 01015A00)
-    UUID(MaterialPackage,                                       060E2B34, 02530101, 0D010101, 01013600)
-    UUID(MPEG2VideoDescriptor,                                  060E2B34, 02530101, 0D010101, 01015100)
-    UUID(MultipleDescriptor,                                    060E2B34, 02530101, 0D010101, 01014400)
-    UUID(NetworkLocator,                                        060E2B34, 02530101, 0D010101, 01013200)
-    UUID(OpenCompleteBodyPartition,                             060E2B34, 02050101, 0D010201, 01030300)
-    UUID(OpenHeader,                                            060E2B34, 02050101, 0D010201, 01020100)
-    UUID(Padding,                                               060E2B34, 01010101, 03010210, 01000000)
-    UUID(Preface,                                               060E2B34, 02530101, 0D010101, 01012F00)
-    UUID(RandomIndexMetadata,                                   060E2B34, 02050101, 0D010201, 01110100)
-    UUID(RGBAEssenceDescriptor,                                 060E2B34, 02530101, 0D010101, 01012900)
-    UUID(Primer,                                                060E2B34, 02050101, 0D010201, 01050100)
-    UUID(Sequence,                                              060E2B34, 02530101, 0D010101, 01010F00)
-    UUID(SourceClip,                                            060E2B34, 02530101, 0D010101, 01011100)
-    UUID(SourcePackage,                                         060E2B34, 02530101, 0D010101, 01013700)
-    UUID(StaticTrack,                                           060E2B34, 02530101, 0D010101, 01013A00)
-    UUID(TextLocator,                                           060E2B34, 02530101, 0D010101, 01013300)
-    UUID(TimecodeComponent,                                     060E2B34, 02530101, 0D010101, 01011400)
-    UUID(Track,                                                 060E2B34, 02530101, 0D010101, 01013B00)
-    UUID(WaveAudioDescriptor,                                   060E2B34, 02530101, 0D010101, 01014800)
-
-    //OperationalPatterns
-    UUID(OP_MultiTrack,                                         060E2B34, 04010101, 0D010201, 01010900)
-    UUID(OP_SingleTrack,                                        060E2B34, 04010101, 0D010201, 01010100)
-    UUID(OP_SingleItem,                                         060E2B34, 04010101, 0D010201, 01020F00)
-
-    //EssenceContainer
-    UUID(EssenceContainer_DV,                                   060E2B34, 04010101, 0D010301, 02025001)
-    UUID(EssenceContainer_DV2,                                  060E2B34, 04010101, 0D010301, 02020101)
-    UUID(EssenceContainer_DV3,                                  060E2B34, 04010101, 0D010301, 02025002)
-    UUID(EssenceContainer_JPEG2000,                             060E2B34, 04010107, 0D010301, 020C0100)
-    UUID(EssenceContainer_MPEG2,                                060E2B34, 04010102, 0D010301, 02046001)
-    UUID(EssenceContainer_RV24,                                 060E2B34, 04010101, 0D010301, 02050001)
-    UUID(EssenceContainer_PCM,                                  060E2B34, 04010101, 0D010301, 02060100)
-    UUID(EssenceContainer_PCM2,                                 060E2B34, 04010101, 0D010301, 02060200)
-    UUID(EssenceContainer_PCM3,                                 060E2B34, 04010101, 0D010301, 02060300)
-    UUID(EssenceContainer_PCM4,                                 060E2B34, 04010101, 0D010301, 02060400)
-    UUID(EssenceContainer_Generic,                              060E2B34, 04010103, 0D010301, 027F0100)
+    //Item - Elements - Interpretive - Fundamental - Data Interpretations and Definitions - Name-Value Construct Interpretations
+    UUID(Ansi_01,                                               060E2B34, 01010105, 0301020A, 01000000)
+    UUID(UTF16_01,                                              060E2B34, 01010105, 0301020A, 01010000)
+    UUID(Ansi_02,                                               060E2B34, 01010105, 0301020A, 02000000)
+    UUID(UTF16_02,                                              060E2B34, 01010105, 0301020A, 02010000)
+
+    //Item - Elements - Interpretive - Fundamental - Data Interpretations and Definitions - KLV Interpretations
+    UUID(Filler01,                                              060E2B34, 01010101, 03010210, 01000000)
+    UUID(Filler02,                                              060E2B34, 01010102, 03010210, 01000000)
+    UUID(TerminatingFiller,                                     060E2B34, 01010102, 03010210, 05000000)
+
+    //Item - Elements - Interpretive - Fundamental - Data Interpretations and Definitions - XML Constructs and Interpretations
+    UUID(XmlDocumentText,                                       060E2B34, 01010105, 03010220, 01000000)
+
+    //Item - Elements - User organization registred for public use - AAF Association - Generic Container - Version 1
+    UUID(GenericContainer_Aaf,                                  060E2B34, 01020101, 0D010301, 00000000)
+
+    //Item - Elements - User organization registred for private use - Avid - Generic Container - Version 1
+    UUID(GenericContainer_Avid,                                 060E2B34, 01020101, 0E040301, 00000000)
+
+    //Item - Elements - Interpretive -
+    UUID(DMScheme1_PrimaryExtendedSpokenLanguage,               060E2B34, 01010107, 03010102, 03110000)
+    UUID(DMScheme1_SecondaryExtendedSpokenLanguage,             060E2B34, 01010107, 03010102, 03110000)
+    UUID(DMScheme1_OriginalExtendedSpokenLanguage,              060E2B34, 01010107, 03010102, 03110000)
 
-    //MPEG2VideoDescriptor
+    //Item - Elements - Parametric - Video and Image Essence Characteristics - Digital Video and Image Compression Parameters - MPEG Coding Parameters - MPEG-2 Coding Parameters
     UUID(MPEG2VideoDescriptor_SingleSequence,                   060E2B34, 01010105, 04010602, 01020000)
     UUID(MPEG2VideoDescriptor_ConstantBFrames,                  060E2B34, 01010105, 04010602, 01030000)
     UUID(MPEG2VideoDescriptor_CodedContentType,                 060E2B34, 01010105, 04010602, 01040000)
@@ -151,22 +155,73 @@
     UUID(MPEG2VideoDescriptor_ProfileAndLevel,                  060E2B34, 01010105, 04010602, 010A0000)
     UUID(MPEG2VideoDescriptor_BitRate,                          060E2B34, 01010105, 04010602, 010B0000)
 
-    //EssenceCoding
-    UUID(EssenceCoding_D10Video,                                060E2B34, 04010101, 04010202, 01020101)
-    UUID(EssenceCoding_DV,                                      060E2B34, 04010101, 04010202, 02020200)
-    UUID(EssenceCoding_MPEG2Video,                              060E2B34, 04010103, 04010202, 01040300) //To be confirmed
-    UUID(EssenceCoding_MPEG4Visual,                             060E2B34, 04010103, 04010202, 01200204) //To be confirmed
-    UUID(EssenceCoding_Alaw,                                    060E2B34, 04010104, 04020202, 03010100) //To be confirmed
-    UUID(EssenceCoding_RV24,                                    060E2B34, 04010101, 04010201, 7F000000) //?
-    UUID(EssenceCoding_PCM,                                     060E2B34, 04010101, 04020201, 7F000000) //To be confirmed
-    UUID(EssenceCoding_JPEG2000,                                060E2B34, 04010107, 04010202, 03010100) //To be confirmed
-    UUID(EssenceCoding_AVC,                                     060E2B34, 0401010A, 04010202, 01323102)
+    //Groups - Elements - User organization registred for public use - AAF Association - AAF Attributes - AAF Information Attributes - Version 1 - Enumerated Attributes
+    UUID(Sequence,                                              060E2B34, 02530101, 0D010101, 01010F00)
+    UUID(SourceClip,                                            060E2B34, 02530101, 0D010101, 01011100)
+    UUID(TimecodeComponent,                                     060E2B34, 02530101, 0D010101, 01011400)
+    UUID(ContentStorage,                                        060E2B34, 02530101, 0D010101, 01011800)
+    UUID(EssenceContainerData,                                  060E2B34, 02530101, 0D010101, 01012300)
+    UUID(CDCIEssenceDescriptor,                                 060E2B34, 02530101, 0D010101, 01012800)
+    UUID(RGBAEssenceDescriptor,                                 060E2B34, 02530101, 0D010101, 01012900)
+    UUID(Preface,                                               060E2B34, 02530101, 0D010101, 01012F00)
+    UUID(Identification,                                        060E2B34, 02530101, 0D010101, 01013000)
+    UUID(NetworkLocator,                                        060E2B34, 02530101, 0D010101, 01013200)
+    UUID(TextLocator,                                           060E2B34, 02530101, 0D010101, 01013300)
+    UUID(MaterialPackage,                                       060E2B34, 02530101, 0D010101, 01013600)
+    UUID(SourcePackage,                                         060E2B34, 02530101, 0D010101, 01013700)
+    UUID(EventTrack,                                            060E2B34, 02530101, 0D010101, 01013900)
+    UUID(StaticTrack,                                           060E2B34, 02530101, 0D010101, 01013A00)
+    UUID(Track,                                                 060E2B34, 02530101, 0D010101, 01013B00)
+    UUID(DMSegment,                                             060E2B34, 02530101, 0D010101, 01014100)
+    UUID(GenericSoundEssenceDescriptor,                         060E2B34, 02530101, 0D010101, 01014200)
+    UUID(MultipleDescriptor,                                    060E2B34, 02530101, 0D010101, 01014400)
+    UUID(AES3PCMDescriptor,                                     060E2B34, 02530101, 0D010101, 01014700)
+    UUID(WaveAudioDescriptor,                                   060E2B34, 02530101, 0D010101, 01014800)
+    UUID(MPEG2VideoDescriptor,                                  060E2B34, 02530101, 0D010101, 01015100)
+    UUID(JPEG2000PictureSubDescriptor,                          060E2B34, 02530101, 0D010101, 01015A00)
+    UUID(VbiPacketsDescriptor,                                  060E2B34, 02530101, 0D010101, 01015B00)
+    UUID(AncPacketsDescriptor,                                  060E2B34, 02530101, 0D010101, 01015C00)
+
+    //Groups - Elements - User organization registred for public use - AAF Association - ? - Version 1 - ?
+    UUID(OpenIncompleteHeaderPartition,                         060E2B34, 02050101, 0D010201, 01020100)
+    UUID(ClosedIncompleteHeaderPartition,                       060E2B34, 02050101, 0D010201, 01020200)
+    UUID(OpenCompleteHeaderPartition,                           060E2B34, 02050101, 0D010201, 01020300)
+    UUID(ClosedCompleteHeaderPartition,                         060E2B34, 02050101, 0D010201, 01020400)
+    UUID(OpenIncompleteBodyPartition,                           060E2B34, 02050101, 0D010201, 01030100)
+    UUID(ClosedIncompleteBodyPartition,                         060E2B34, 02050101, 0D010201, 01030200)
+    UUID(OpenCompleteBodyPartition,                             060E2B34, 02050101, 0D010201, 01030300)
+    UUID(ClosedCompleteBodyPartition,                           060E2B34, 02050101, 0D010201, 01030400)
+    UUID(OpenIncompleteFooterPartition,                         060E2B34, 02050101, 0D010201, 01040100)
+    UUID(ClosedIncompleteFooterPartition,                       060E2B34, 02050101, 0D010201, 01040200)
+    UUID(OpenCompleteFooterPartition,                           060E2B34, 02050101, 0D010201, 01040300)
+    UUID(ClosedCompleteFooterPartition,                         060E2B34, 02050101, 0D010201, 01040400)
 
-    //Sequence
-    UUID(Sequence_Time,                                         060E2B34, 04010101, 01030201, 01000000)
-    UUID(Sequence_Picture,                                      060E2B34, 04010101, 01030202, 01000000)
-    UUID(Sequence_Sound,                                        060E2B34, 04010101, 01030202, 02000000)
-    UUID(Sequence_Data,                                         060E2B34, 04010101, 01030202, 03000000)
+    //Groups - Elements - User organization registred for public use - AAF Association - ?  - Version 1 - ?
+    UUID(Primer,                                                060E2B34, 02050101, 0D010201, 01050100)
+
+    //Groups - Elements - User organization registred for public use - AAF Association - ? - Version 1 - ?
+    UUID(IndexTableSegment,                                     060E2B34, 02530101, 0D010201, 01100100)
+
+    //Groups - Elements - User organization registred for public use - AAF Association - ? - Version 1 - ?
+    UUID(RandomIndexMetadata,                                   060E2B34, 02050101, 0D010201, 01110100)
+
+    //Groups - Elements - User organization registred for public use - AAF Association - ? - Version 1 - ? (SDTI-CP (SMPTE 385M))
+    UUID(SDTI_SystemMetadataPack,                               060E2B34, 02050101, 0D010301, 04010100)
+    UUID(SDTI_PackageMetadataSet,                               060E2B34, 02430101, 0D010301, 04010200)
+    UUID(SDTI_PictureMetadataSet,                               060E2B34, 02430101, 0D010301, 04010300)
+    UUID(SDTI_SoundMetadataSet,                                 060E2B34, 02430101, 0D010301, 04010400)
+    UUID(SDTI_DataMetadataSet,                                  060E2B34, 02430101, 0D010301, 04010500)
+    UUID(SDTI_ControlMetadataSet,                               060E2B34, 02630101, 0D010301, 04010600)
+
+    //Groups - Elements - User organization registred for public use - AAF Association - ? - Version 1 - ? (SystemScheme (SMPTE 405M))
+    UUID(SystemScheme1,                                         060E2B34, 02530101, 0D010301, 14020100)
+
+    //Groups - Elements - User organization registred for public use - AAF Association - Descriptive Metadata Scheme - Version 1 (SystemScheme (SMPTE 380M))
+    UUID(DMScheme1,                                             060E2B34, 02530101, 0D010401, 01010100)
+
+    //Groups - Elements - User organization registred for private use - Omneon Video Networks
+    UUID(Omneon_010201010100,                                   060E2B34, 02530105, 0E0B0102, 01010100)
+    UUID(Omneon_010201020100,                                   060E2B34, 02530105, 0E0B0102, 01020100)
 }
 
 //---------------------------------------------------------------------------
@@ -183,26 +238,28 @@
 }
 
 //---------------------------------------------------------------------------
-const char* Mxf_RegistryDesignator(int8u Category, int8u RegistryDesignator)
+const char* Mxf_Registry(int8u Category, int8u Registry)
 {
     switch(Category)
     {
         case 0x01 : //"Item"
-                    switch(RegistryDesignator)
+                    switch(Registry)
                     {
-                        case 0x01 : return "Metadata dictionary";
-                        case 0x02 : return "Essence dictionary";
+                        case 0x01 : return "Metadata";
+                        case 0x02 : return "Essence";
                         default   : return "";
                     }
         case 0x02 : //"Group (Set/Pack)"
-                    switch(RegistryDesignator)
+                    switch(Registry)
                     {
-                        case 0x05 : return "Contains a fixed number of predefined items with no tag of value indicators";
-                        case 0x53 : return "The value of this KLV block contains other KLV-items with a two-byte tag and a two-byte length indicator";
+                        case 0x05 : return "Predefined items";
+                        case 0x43 : return "1-byte tag, 2-byte length";
+                        case 0x53 : return "2-byte tag, 2-byte length";
+                        case 0x63 : return "1-byte tag, 4-byte length";
                         default   : return "";
                     }
         case 0x04 : //"Value"
-                    switch(RegistryDesignator)
+                    switch(Registry)
                     {
                         case 0x01 : return "Fixed";
                         default   : return "";
@@ -212,6 +269,26 @@
 }
 
 //---------------------------------------------------------------------------
+const char* Mxf_Structure(int8u Category, int8u Registry, int8u Structure)
+{
+    switch(Category)
+    {
+        case 0x01 : //"Item"
+                    switch(Registry)
+                    {
+                        case 0x02 : //Essence
+                                    switch(Structure)
+                                    {
+                                        case 0x01 : return "Standard";
+                                        default   : return "";
+                                    }
+                        default   : return "";
+                    }
+        default   : return "";
+    }
+}
+
+//---------------------------------------------------------------------------
 const char* Mxf_MPEG2_CodedContentType(int8u CodedContentType)
 {
     switch(CodedContentType)
@@ -226,28 +303,8 @@
 //---------------------------------------------------------------------------
 const char* Mxf_OperationalPattern(int128u OperationalPattern)
 {
-    //int32u Code_Compare1=OperationalPattern.hi>>32;
-    //int32u Code_Compare2=(int32u)OperationalPattern.hi;
-    //int32u Code_Compare3=OperationalPattern.lo>>32;
-    int32u Code_Compare4=(int32u)OperationalPattern.lo;
-    /*
-    #undef ELEMENT
-    #define ELEMENT(_ELEMENT, _NAME) \
-    else if (Code_Compare1==Elements::_ELEMENT##1 \
-     && Code_Compare2==Elements::_ELEMENT##2 \
-     && Code_Compare3==Elements::_ELEMENT##3 \
-     && Code_Compare4==Elements::_ELEMENT##4) \
-        return _NAME; \
-
-    if (0) {}
-    ELEMENT   (OP_MultiTrack,                                   "Multi-track")
-    ELEMENT   (OP_SingleTrack,                                  "Single-track")
-    ELEMENT   (OP_SingleItem,                                   "Single-item")
-    else
-        return "";
-    */
-
     //Item and Package Complexity
+    int32u Code_Compare4=(int32u)OperationalPattern.lo;
     switch ((int8u)(Code_Compare4>>24))
     {
         case 0x01 : switch ((int8u)(Code_Compare4>>16))
@@ -271,149 +328,539 @@
                         case 0x03 : return "OP-3c";
                         default   : return "";
                     }
+        case 0x10 : return "OP-Atom";
         default   : return "";
     }
 }
 
 //---------------------------------------------------------------------------
-const char* Mxf_EssenceContainer(int128u EssenceContainer)
+const char* Mxf_EssenceElement(int128u EssenceElement)
 {
-    int32u Code_Compare1=EssenceContainer.hi>>32;
-    int32u Code_Compare2=(int32u)EssenceContainer.hi;
-    int32u Code_Compare3=EssenceContainer.lo>>32;
-    int32u Code_Compare4=(int32u)EssenceContainer.lo;
-    #undef ELEMENT
-    #define ELEMENT(_ELEMENT, _NAME) \
-    else if (Code_Compare1==Elements::_ELEMENT##1 \
-     && Code_Compare2==Elements::_ELEMENT##2 \
-     && Code_Compare3==Elements::_ELEMENT##3 \
-     && Code_Compare4==Elements::_ELEMENT##4) \
-        return _NAME; \
-
-    if (0) {}
-    ELEMENT   (EssenceContainer_DV,                             "DV")
-    ELEMENT   (EssenceContainer_DV2,                            "DV")
-    ELEMENT   (EssenceContainer_DV3,                            "DV")
-    ELEMENT   (EssenceContainer_JPEG2000,                       "JPEG 2000 Picture")
-    ELEMENT   (EssenceContainer_MPEG2,                          "MPEG-2 Video")
-    ELEMENT   (EssenceContainer_RV24,                           "RV24 (RGBA?)")
-    ELEMENT   (EssenceContainer_PCM,                            "PCM")
-    ELEMENT   (EssenceContainer_PCM2,                           "PCM")
-    ELEMENT   (EssenceContainer_PCM3,                           "PCM")
-    ELEMENT   (EssenceContainer_PCM4,                           "PCM")
-    ELEMENT   (EssenceContainer_Generic,                        "Generic")
-    else
+    if ((EssenceElement.hi&0xFFFFFFFFFFFFFF00LL)!=0x060E2B3401020100LL)
         return "";
+
+    int8u Code5=(int8u)((EssenceElement.lo&0x00000000FF000000LL)>>24);
+    int8u Code7=(int8u)((EssenceElement.lo&0x000000000000FF00LL)>> 8);
+
+    switch (Code5)
+    {
+        case 0x05 : //CP Picture (SMPTE 326M)
+                    switch (Code7)
+                    {
+                        case 0x01 : return "D-10 Video";
+                        default   : return "Unknown stream";
+                    }
+        case 0x06 : //CP Sound (SMPTE 326M)
+                    switch (Code7)
+                    {
+                        case 0x10 : return "D-10 Audio";
+                        default   : return "Unknown stream";
+                    }
+        case 0x07 : //CP Data (SMPTE 326M)
+                    return "";
+        case 0x14 : //MXF in MXF?
+                    switch (Code7)
+                    {
+                        case 0x01 : return "MXF in MXF?";
+                        default   : return "Unknown stream";
+                    }
+        case 0x15 : //GC Picture
+                    switch (Code7)
+                    {
+                        case 0x01 : return "RGB";
+                        case 0x05 : return "MPEG stream (Frame)";
+                        case 0x06 : return "MPEG stream (Clip)";
+                        case 0x07 : return "MPEG stream (Custom)";
+                        case 0x08 : return "JPEG 2000";
+                        default   : return "Unknown stream";
+                    }
+        case 0x16 : //GC Sound
+                    switch (Code7)
+                    {
+                        case 0x01 : return "PCM"; //BWF
+                        case 0x02 : return "PCM"; //BWF
+                        case 0x03 : return "PCM"; //DV Audio
+                        case 0x04 : return "PCM"; //BWF
+                        case 0x05 : return "MPEG Audio / AC-3";
+                        case 0x0A : return "A-law";
+                        default   : return "Unknown stream";
+                    }
+        case 0x17 : //GC Data
+                    switch (Code7)
+                    {
+                        case 0x01 : return "VBI"; //Frame-Wrapped VBI Data Element
+                        case 0x02 : return "ANC"; //Frame-Wrapped ANC Data Element
+                        default   : return "Unknown stream";
+                    }
+        case 0x18 : //GC Compound
+                    switch (Code7)
+                    {
+                        case 0x01 : return "DV"; //Frame
+                        case 0x02 : return "DV"; //Clip
+                        default   : return "Unknown stream";
+                    }
+        default   : return "Unknown stream";
+    }
 }
 
 //---------------------------------------------------------------------------
-const char* Mxf_EssenceCoding(int128u EssenceContainer)
+const char* Mxf_EssenceContainer(int128u EssenceContainer)
 {
-    int32u Code_Compare1=EssenceContainer.hi>>32;
-    int32u Code_Compare2=(int32u)EssenceContainer.hi;
-    int32u Code_Compare3=EssenceContainer.lo>>32;
-    int32u Code_Compare4=(int32u)EssenceContainer.lo;
-    #undef ELEMENT
-    #define ELEMENT(_ELEMENT, _NAME) \
-    else if (Code_Compare1==Elements::_ELEMENT##1 \
-     && Code_Compare2==Elements::_ELEMENT##2 \
-     && Code_Compare3==Elements::_ELEMENT##3 \
-     && Code_Compare4==Elements::_ELEMENT##4) \
-        return _NAME; \
-
-    if (0) {}
-    ELEMENT(EssenceCoding_D10Video,                             "D-10 Video")
-    ELEMENT(EssenceCoding_DV,                                   "DV")
-    ELEMENT(EssenceCoding_PCM,                                  "PCM")
-    ELEMENT(EssenceCoding_RV24,                                 "RV24")
-    ELEMENT(EssenceCoding_MPEG2Video,                           "MPEG-2 Video")
-    ELEMENT(EssenceCoding_MPEG4Visual,                          "MPEG-4 Visual")
-    ELEMENT(EssenceCoding_Alaw,                                 "A-law")
-    ELEMENT(EssenceCoding_JPEG2000,                             "JPEG 2000")
-    ELEMENT(EssenceCoding_AVC,                                  "AVC")
-    else
+    if ((EssenceContainer.hi&0xFFFFFFFFFFFFFF00LL)!=0x060E2B3404010100LL)
         return "";
+
+    int8u Code1=(int8u)((EssenceContainer.lo&0xFF00000000000000LL)>>56);
+    int8u Code2=(int8u)((EssenceContainer.lo&0x00FF000000000000LL)>>48);
+    int8u Code3=(int8u)((EssenceContainer.lo&0x0000FF0000000000LL)>>40);
+    int8u Code4=(int8u)((EssenceContainer.lo&0x000000FF00000000LL)>>32);
+    int8u Code5=(int8u)((EssenceContainer.lo&0x00000000FF000000LL)>>24);
+    int8u Code6=(int8u)((EssenceContainer.lo&0x0000000000FF0000LL)>>16);
+    //int8u Code7=(int8u)((EssenceContainer.lo&0x000000000000FF00LL)>> 8);
+
+    switch (Code1)
+    {
+        case 0x0D : //Public Use
+                    switch (Code2)
+                    {
+                        case 0x01 : //AAF
+                                    switch (Code3)
+                                    {
+                                        case 0x03 : //Essence Container Application
+                                                    switch (Code4)
+                                                    {
+                                                        case 0x01 : //MXF EC Structure version
+                                                                    switch (Code5)
+                                                                    {
+                                                                        case 0x02 : //Essence container kind
+                                                                                    switch (Code6)
+                                                                                    {
+                                                                                        case 0x01 : return "D-10 Audio";
+                                                                                        case 0x02 : return "DV";
+                                                                                        case 0x05 : return "Uncompressed pictures";
+                                                                                        case 0x06 : return "PCM";
+                                                                                        case 0x04 : return "MPEG ES mappings with Stream ID";
+                                                                                        case 0x0A : return "A-law";
+                                                                                        case 0x0C : return "JPEG 2000";
+                                                                                        case 0x10 : return "AVC";
+                                                                                        case 0x11 : return "VC-3";
+                                                                                        default   : return "";
+                                                                                    }
+                                                                        default   : return "";
+                                                                    }
+                                                         default   : return "";
+                                                    }
+                                         default   : return "";
+                                    }
+                        default   : return "";
+                    }
+        case 0x0E : //Private Use
+                    switch (Code2)
+                    {
+                        case 0x04 : //Avid
+                                    switch (Code3)
+                                    {
+                                        case 0x03 : //Essence Container Application
+                                                    switch (Code4)
+                                                    {
+                                                        case 0x01 : //MXF EC Structure version
+                                                                    switch (Code5)
+                                                                    {
+                                                                        case 0x02 : //Essence container kind
+                                                                                    switch (Code6)
+                                                                                    {
+                                                                                        case 0x06 : return "VC-3";
+                                                                                        default   : return "";
+                                                                                    }
+                                                                        default   : return "";
+                                                                    }
+                                                         default   : return "";
+                                                    }
+                                         default   : return "";
+                                    }
+                        default   : return "";
+                    }
+        default   : return "";
+    }
 }
 
 //---------------------------------------------------------------------------
-const char* Mxf_EssenceCoding_Format(int128u EssenceContainer)
+const char* Mxf_EssenceContainer_Mapping(int8u Code6, int8u Code7, int8u Code8)
 {
-    int32u Code_Compare1=EssenceContainer.hi>>32;
-    int32u Code_Compare2=(int32u)EssenceContainer.hi;
-    int32u Code_Compare3=EssenceContainer.lo>>32;
-    int32u Code_Compare4=(int32u)EssenceContainer.lo;
-    #undef ELEMENT
-    #define ELEMENT(_ELEMENT, _NAME) \
-    else if (Code_Compare1==Elements::_ELEMENT##1 \
-     && Code_Compare2==Elements::_ELEMENT##2 \
-     && Code_Compare3==Elements::_ELEMENT##3 \
-     && Code_Compare4==Elements::_ELEMENT##4) \
-        return _NAME; \
+    switch (Code6)
+    {
+        case 0x01 : //D-10, SMPTE 386M
+                    return "Frame (D-10)";
+        case 0x02 : //DV, SMPTE 383M
+                    switch (Code8)
+                    {
+                        case 0x01 : return "Frame";
+                        case 0x02 : return "Clip";
+                        default   : return "";
+                    }
+        case 0x04 : //MPEG ES, SMPTE 381M
+        case 0x07 : //MPEG PES, SMPTE 381M
+        case 0x08 : //MPEG PS, SMPTE 381M
+        case 0x09 : //MPEG TS, SMPTE 381M
+        case 0x10 : //AVC
+        case 0x15 : //YUV
+                    switch (Code8)
+                    {
+                        case 0x01 : return "Frame";
+                        case 0x02 : return "Clip";
+                        case 0x03 : return "Custom: Stripe";
+                        case 0x04 : return "Custom: PES";
+                        case 0x05 : return "Custom: Fixed Audio Size";
+                        case 0x06 : return "Custom: Splice";
+                        case 0x07 : return "Custom: Closed GOP";
+                        case 0x08 : return "Custom: Slave";
+                        case 0x7F : return "Custom";
+                        default   : return "";
+                    }
+        case 0x05 : //Uncompressed pictures, SMPTE 384M
+                    switch (Code8)
+                    {
+                        case 0x01 : return "Frame";
+                        case 0x02 : return "Clip";
+                        case 0x03 : return "Line";
+                        default   : return "";
+                    }
+        case 0x06 : //AES-PCM, SMPTE 382M
+                    switch (Code7)
+                    {
+                        case 0x01 : return "Frame (BWF)";
+                        case 0x02 : return "Clip (BWF)";
+                        case 0x03 : return "Frame (AES)";
+                        case 0x04 : return "Clip (AES)";
+                        case 0x08 : return "Custom (BWF)";
+                        case 0x09 : return "Custom (AES)";
+                        default   : return "";
+                    }
+        case 0x0A : //A-Law
+                    switch (Code7)
+                    {
+                        case 0x01 : return "Frame";
+                        case 0x02 : return "Clip";
+                        case 0x03 : return "?";
+                        case 0x07 : return "Custom";
+                        default   : return "";
+                    }
+        case 0x0C : //JPEG 2000
+                    switch (Code7)
+                    {
+                        case 0x01 : return "Frame";
+                        case 0x02 : return "Clip";
+                        default   : return "";
+                    }
+        case 0x11 : //VC-3, SMPTE 2019-4
+                    switch (Code7)
+                    {
+                        case 0x01 : return "Frame";
+                        case 0x02 : return "Clip";
+                        default   : return "";
+                    }
+        default   : return "";
+    }
+}
 
-    if (0) {}
-    ELEMENT(EssenceCoding_D10Video,                             "MPEG Video")
-    ELEMENT(EssenceCoding_DV,                                   "DV")
-    ELEMENT(EssenceCoding_JPEG2000,                             "M-JPEG 2000")
-    ELEMENT(EssenceCoding_MPEG2Video,                           "MPEG Video")
-    ELEMENT(EssenceCoding_MPEG4Visual,                          "MPEG-4 Visual")
-    ELEMENT(EssenceCoding_Alaw,                                 "A-law")
-    ELEMENT(EssenceCoding_PCM,                                  "PCM")
-    ELEMENT(EssenceCoding_RV24,                                 "RV24")
-    ELEMENT(EssenceCoding_AVC,                                  "AVC")
-    else
+//---------------------------------------------------------------------------
+const char* Mxf_EssenceCompression(int128u EssenceCompression)
+{
+    if ((EssenceCompression.hi&0xFFFFFFFFFFFFFF00LL)!=0x060E2B3404010100LL || !((EssenceCompression.lo&0xFF00000000000000LL)==0x0400000000000000LL || (EssenceCompression.lo&0xFF00000000000000LL)==0x0E00000000000000LL))
         return "";
+
+    int8u Code1=(int8u)((EssenceCompression.lo&0xFF00000000000000LL)>>56);
+    int8u Code2=(int8u)((EssenceCompression.lo&0x00FF000000000000LL)>>48);
+    int8u Code3=(int8u)((EssenceCompression.lo&0x0000FF0000000000LL)>>40);
+    int8u Code4=(int8u)((EssenceCompression.lo&0x000000FF00000000LL)>>32);
+    int8u Code5=(int8u)((EssenceCompression.lo&0x00000000FF000000LL)>>24);
+    int8u Code6=(int8u)((EssenceCompression.lo&0x0000000000FF0000LL)>>16);
+    int8u Code7=(int8u)((EssenceCompression.lo&0x000000000000FF00LL)>> 8);
+
+    switch (Code1)
+    {
+        case 0x04 : //
+                    switch (Code2)
+                    {
+                        case 0x01 : //Picture
+                                    switch (Code3)
+                                    {
+                                        case 0x02 : //Coding characteristics
+                                                    switch (Code4)
+                                                    {
+                                                        case 0x01 : //Uncompressed coding
+                                                                    switch (Code5)
+                                                                    {
+                                                                        case 0x01 : //Uncompressed picture coding
+                                                                                    return "YUV";
+                                                                        default   : return "";
+                                                                    }
+                                                        case 0x02 : //Compressed coding
+                                                                    switch (Code5)
+                                                                    {
+                                                                        case 0x01 : //MPEG Compression
+                                                                                    switch (Code6)
+                                                                                    {
+                                                                                        case 0x01 : return "MPEG Video"; //Version 2
+                                                                                        case 0x02 : return "MPEG Video"; //Version 2
+                                                                                        case 0x03 : return "MPEG Video"; //Version 2
+                                                                                        case 0x04 : return "MPEG Video"; //Version 2
+                                                                                        case 0x11 : return "MPEG Video"; //Version 1
+                                                                                        case 0x20 : return "MPEG-4 Visual";
+                                                                                        case 0x32 : return "AVC";
+                                                                                        default   : return "";
+                                                                                    }
+                                                                        case 0x02 : return "DV";
+                                                                        case 0x03 : //Individual Picture Coding Schemes
+                                                                                    switch (Code6)
+                                                                                    {
+                                                                                        case 0x01 : return "JPEG 2000";
+                                                                                        default   : return "";
+                                                                                    }
+                                                                        case 0x71 : return "VC-3";
+                                                                        default   : return "";
+                                                                    }
+                                                         default   : return "";
+                                                    }
+                                         default   : return "";
+                                    }
+                        case 0x02 : //Sound
+                                    switch (Code3)
+                                    {
+                                        case 0x02 : //Coding characteristics
+                                                    switch (Code4)
+                                                    {
+                                                        case 0x01 : //Uncompressed Sound Coding
+                                                                    switch (Code5)
+                                                                    {
+                                                                        case 0x00 : return "PCM";
+                                                                        case 0x01 : return "PCM";
+                                                                        case 0x7E : return "PCM"; //AIFF
+                                                                        case 0x7F : return "PCM";
+                                                                        default   : return "";
+                                                                    }
+                                                        case 0x02 : //Compressed coding
+                                                                    switch (Code5)
+                                                                    {
+                                                                        case 0x03 : //Compressed Audio Coding
+                                                                                    switch (Code6)
+                                                                                    {
+                                                                                        case 0x01 : //Compandeded Audio Coding
+                                                                                                    switch (Code7)
+                                                                                                    {
+                                                                                                        case 0x01 : return "A-law";
+                                                                                                        case 0x10 : return "DV Audio"; //DV 12-bit
+                                                                                                        default   : return ""; //Unknown
+                                                                                                    }
+                                                                                        case 0x02 : //SMPTE 338M Audio Coding
+                                                                                                    switch (Code7)
+                                                                                                    {
+                                                                                                        case 0x01 : return "AC-3";
+                                                                                                        case 0x04 : return "MPEG-1 Audio Layer 1";
+                                                                                                        case 0x05 : return "MPEG-1 Audio Layer 2 or 3";
+                                                                                                        case 0x06 : return "MPEG-2 Audio Layer 1";
+                                                                                                        case 0x1C : return "Dolby E";
+                                                                                                        default   : return ""; //Unknown
+                                                                                                    }
+                                                                                        case 0x03 : //MPEG-2 Coding (not defined in SMPTE 338M)
+                                                                                                    switch (Code7)
+                                                                                                    {
+                                                                                                        case 0x01 : return "AAC version 2";
+                                                                                                        default   : return ""; //Unknown
+                                                                                                    }
+                                                                                        case 0x04 : //MPEG-4 Audio Coding
+                                                                                                    switch (Code7)
+                                                                                                    {
+                                                                                                        case 0x01 : return "MPEG-4 Speech Profile";
+                                                                                                        case 0x02 : return "MPEG-4 Synthesis Profile";
+                                                                                                        case 0x03 : return "MPEG-4 Scalable Profile";
+                                                                                                        case 0x04 : return "MPEG-4 Main Profile";
+                                                                                                        case 0x05 : return "MPEG-4 High Quality Audio Profile";
+                                                                                                        case 0x06 : return "MPEG-4 Low Delay Audio Profile";
+                                                                                                        case 0x07 : return "MPEG-4 Natural Audio Profile";
+                                                                                                        case 0x08 : return "MPEG-4 Mobile Audio Internetworking Profile";
+                                                                                                        default   : return ""; //Unknown
+                                                                                                    }
+                                                                                        default   : return "";
+                                                                                    }
+                                                                         default   : return "";
+                                                                    }
+                                                         default   : return "";
+                                                    }
+                                         default   : return "";
+                                    }
+                        default   : return "";
+                    }
+        case 0x0E : //Private Use
+                    switch (Code2)
+                    {
+                        case 0x04 : //Avid
+                                    switch (Code3)
+                                    {
+                                        case 0x02 : //Essence Compression ?
+                                                    switch (Code4)
+                                                    {
+                                                        case 0x01 : //?
+                                                                    switch (Code5)
+                                                                    {
+                                                                        case 0x02 : //?
+                                                                                    switch (Code6)
+                                                                                    {
+                                                                                        case 0x04 : return "VC-3";
+                                                                                        default   : return "";
+                                                                                    }
+                                                                        default   : return "";
+                                                                    }
+                                                         default   : return "";
+                                                    }
+                                         default   : return "";
+                                    }
+                        default   : return "";
+                    }
+        default   : return "";
+    }
 }
 
 //---------------------------------------------------------------------------
-const char* Mxf_EssenceCoding_Format_Version(int128u EssenceContainer)
+const char* Mxf_EssenceCompression_Version(int128u EssenceCompression)
 {
-    int32u Code_Compare1=EssenceContainer.hi>>32;
-    int32u Code_Compare2=(int32u)EssenceContainer.hi;
-    int32u Code_Compare3=EssenceContainer.lo>>32;
-    int32u Code_Compare4=(int32u)EssenceContainer.lo;
-    #undef ELEMENT
-    #define ELEMENT(_ELEMENT, _NAME) \
-    else if (Code_Compare1==Elements::_ELEMENT##1 \
-     && Code_Compare2==Elements::_ELEMENT##2 \
-     && Code_Compare3==Elements::_ELEMENT##3 \
-     && Code_Compare4==Elements::_ELEMENT##4) \
-        return _NAME; \
+    int8u Code2=(int8u)((EssenceCompression.lo&0x00FF000000000000LL)>>48);
+    int8u Code3=(int8u)((EssenceCompression.lo&0x0000FF0000000000LL)>>40);
+    int8u Code4=(int8u)((EssenceCompression.lo&0x000000FF00000000LL)>>32);
+    int8u Code5=(int8u)((EssenceCompression.lo&0x00000000FF000000LL)>>24);
+    int8u Code6=(int8u)((EssenceCompression.lo&0x0000000000FF0000LL)>>16);
+    int8u Code7=(int8u)((EssenceCompression.lo&0x000000000000FF00LL)>> 8);
 
-    if (0) {}
-    ELEMENT(EssenceCoding_D10Video,                             "Version 2")
-    ELEMENT(EssenceCoding_MPEG2Video,                           "Version 2")
-    else
-        return "";
+    switch (Code2)
+    {
+        case 0x01 : //Picture
+                    switch (Code3)
+                    {
+                        case 0x02 : //Coding characteristics
+                                    switch (Code4)
+                                    {
+                                        case 0x02 : //Compressed coding
+                                                    switch (Code5)
+                                                    {
+                                                        case 0x01 : //MPEG Compression
+                                                                    switch (Code6)
+                                                                    {
+                                                                        case 0x01 : return "Version 2";
+                                                                        case 0x02 : return "Version 2";
+                                                                        case 0x03 : return "Version 2";
+                                                                        case 0x04 : return "Version 2";
+                                                                        case 0x11 : return "Version 1";
+                                                                        default   : return "";
+                                                                    }
+                                                        default   : return "";
+                                                    }
+                                         default   : return "";
+                                    }
+                         default   : return "";
+                    }
+        case 0x02 : //Sound
+                    switch (Code3)
+                    {
+                        case 0x02 : //Coding characteristics
+                                    switch (Code4)
+                                    {
+                                        case 0x02 : //Compressed coding
+                                                    switch (Code5)
+                                                    {
+                                                        case 0x03 : //Compressed Audio Coding
+                                                                    switch (Code6)
+                                                                    {
+                                                                        case 0x02 : //SMPTE 338M Audio Coding
+                                                                                    switch (Code7)
+                                                                                    {
+                                                                                        case 0x04 : return "Version 1"; //Layer 1
+                                                                                        case 0x05 : return "Version 1"; //Layer 2 or 3
+                                                                                        case 0x06 : return "Version 2"; //Layer 1
+                                                                                        default   : return ""; //Unknown
+                                                                                    }
+                                                                        default   : return "";
+                                                                    }
+                                                            default   : return "";
+                                                    }
+                                            default   : return "";
+                                    }
+                            default   : return "";
+                    }
+        default   : return "";
+    }
 }
 
 //---------------------------------------------------------------------------
 const char* Mxf_Sequence_DataDefinition(int128u DataDefinition)
 {
-    int32u Code_Compare1=DataDefinition.hi>>32;
-    int32u Code_Compare2=(int32u)DataDefinition.hi;
-    int32u Code_Compare3=DataDefinition.lo>>32;
-    int32u Code_Compare4=(int32u)DataDefinition.lo;
-    #undef ELEMENT
-    #define ELEMENT(_ELEMENT, _NAME) \
-    else if (Code_Compare1==Elements::_ELEMENT##1 \
-     && Code_Compare2==Elements::_ELEMENT##2 \
-     && Code_Compare3==Elements::_ELEMENT##3 \
-     && Code_Compare4==Elements::_ELEMENT##4) \
-        return _NAME; \
+    int8u Code4=(int8u)((DataDefinition.lo&0x000000FF00000000LL)>>32);
+    int8u Code5=(int8u)((DataDefinition.lo&0x00000000FF000000LL)>>24);
 
-    if (0) {}
-    ELEMENT(Sequence_Time,                                      "Time")
-    ELEMENT(Sequence_Picture,                                   "Picture")
-    ELEMENT(Sequence_Sound,                                     "Sound")
-    ELEMENT(Sequence_Data,                                      "Data")
-    else
-        return "";
+    switch (Code4)
+    {
+        case 0x01 : return "Time";
+        case 0x02 :
+                    switch (Code5)
+                    {
+                        case 0x01 : return "Picture";
+                        case 0x02 : return "Sound";
+                        case 0x03 : return "Data";
+                        default   : return "";
+                    }
+        default   : return "";
+    }
+}
+
+//---------------------------------------------------------------------------
+const char* Mxf_FrameLayout(int8u FrameLayout)
+{
+    switch (FrameLayout)
+    {
+        case 0x00 : return "Full frame";
+        case 0x01 : return "Separated fields";
+        case 0x02 : return "Single field";
+        case 0x03 : return "Mixed fields";
+        case 0x04 : return "Segmented frame";
+        default   : return "";
+    }
+}
+
+//---------------------------------------------------------------------------
+const char* Mxf_FrameLayout_ScanType(int8u FrameLayout)
+{
+    switch (FrameLayout)
+    {
+        case 0x01 :
+        case 0x04 :
+        case 0xFF : //Seen in one file
+                    return "Interlaced";
+        default   :
+                    return "Progressive";
+    }
+}
+
+//---------------------------------------------------------------------------
+int8u Mxf_FrameLayout_Multiplier(int8u FrameLayout)
+{
+    switch (FrameLayout)
+    {
+        case 0x01 :
+        case 0x04 :
+        case 0xFF : //Seen in one file
+                    return 2;
+        default   :
+                    return 1;
+    }
 }
 
 //---------------------------------------------------------------------------
 extern const char* Mpegv_profile_and_level_indication_profile[];
 extern const char* Mpegv_profile_and_level_indication_level[];
 
+//---------------------------------------------------------------------------
+extern const char* AfdBarData_active_format[];
+extern const char* AfdBarData_active_format_4_3[];
+extern const char* AfdBarData_active_format_16_9[];
+
 //***************************************************************************
 // Constructor/Destructor
 //***************************************************************************
@@ -423,22 +870,89 @@
 :File__Analyze()
 {
     //Configuration
-    ParserName=_T("MXF");
+    ParserName=__T("MXF");
     #if MEDIAINFO_EVENTS
         ParserIDs[0]=MediaInfo_Parser_Mxf;
         StreamIDs_Width[0]=8;
     #endif //MEDIAINFO_EVENTS
+    #if MEDIAINFO_DEMUX
+        Demux_Level=2; //Container
+    #endif //MEDIAINFO_DEMUX
     MustSynchronize=true;
     DataMustAlwaysBeComplete=false;
+    Buffer_MaximumSize=16*1024*1024; //Some big frames are possible (e.g YUV 4:2:2 10 bits 1080p)
+    Buffer_TotalBytes_Fill_Max=(int64u)-1; //Disabling this feature for this format, this is done in the parser
+    FrameInfo.DTS=0;
+    Frame_Count_NotParsedIncluded=0;
+    #if MEDIAINFO_DEMUX
+        Demux_EventWasSent_Accept_Specific=true;
+    #endif //MEDIAINFO_DEMUX
 
     //Temp
+    RandomIndexMetadatas_AlreadyParsed=false;
     Streams_Count=(size_t)-1;
     OperationalPattern=0;
-    Buffer_DataSizeToParse=0;
-    Buffer_DataSizeToParse_Complete=(int64u)-1;
-    Preface_Current.hi=(int64u)-1;
-    Preface_Current.lo=(int64u)-1;
+    Buffer_Begin=(int64u)-1;
+    Buffer_End=0;
+    Buffer_Header_Size=0;
+    Preface_Current.hi=0;
+    Preface_Current.lo=0;
+    IsParsingMiddle_MaxOffset=(int64u)-1;
     Track_Number_IsAvailable=false;
+    IsParsingEnd=false;
+    IsCheckingRandomAccessTable=false;
+    IsCheckingFooterPartitionAddress=false;
+    FooterPartitionAddress_Jumped=false;
+    PartitionPack_Parsed=false;
+    IdIsAlwaysSame_Offset=0;
+    PartitionMetadata_PreviousPartition=(int64u)-1;
+    PartitionMetadata_FooterPartition=(int64u)-1;
+    TimeCode_StartTimecode=(int64u)-1;
+    TimeCode_RoundedTimecodeBase=0;
+    TimeCode_DropFrame=false;
+    DTS_Delay=0;
+    StreamPos_StartAtOne=true;
+    SDTI_TimeCode_StartTimecode=(int64u)-1;
+    SDTI_SizePerFrame=0;
+    SDTI_IsPresent=false;
+    SDTI_IsInIndexStreamOffset=true;
+    SystemScheme1_TimeCodeArray_StartTimecode=(int64u)-1;
+    SystemScheme1_FrameRateFromDescriptor=0;
+    Essences_FirstEssence_Parsed=false;
+    ReferenceFiles=NULL;
+    #if MEDIAINFO_NEXTPACKET
+        ReferenceFiles_IsParsing=false;
+    #endif //MEDIAINFO_NEXTPACKET
+    #if defined(MEDIAINFO_ANCILLARY_YES)
+        Ancillary=NULL;
+        Ancillary_IsBinded=false;
+    #endif //defined(MEDIAINFO_ANCILLARY_YES)
+
+    #if MEDIAINFO_DEMUX
+        Demux_HeaderParsed=false;
+    #endif //MEDIAINFO_DEMUX
+
+    Partitions_Pos=0;
+    Partitions_IsCalculatingHeaderByteCount=false;
+    Partitions_IsCalculatingSdtiByteCount=false;
+    Partitions_IsFooter=false;
+
+    #if MEDIAINFO_SEEK
+        IndexTables_Pos=0;
+        Clip_Header_Size=0;
+        Clip_Begin=(int64u)-1;
+        Clip_End=0;
+        OverallBitrate_IsCbrForSure=0;
+        Duration_Detected=false;
+    #endif //MEDIAINFO_SEEK
+}
+
+//---------------------------------------------------------------------------
+File_Mxf::~File_Mxf()
+{
+    delete ReferenceFiles;
+    if (!Ancillary_IsBinded)
+        delete Ancillary;
 }
 
 //***************************************************************************
@@ -446,106 +960,114 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
+void File_Mxf::Streams_Fill()
+{
+    for (essences::iterator Essence=Essences.begin(); Essence!=Essences.end(); Essence++)
+        if (Essence->second.Parser)
+            Fill(Essence->second.Parser);
+}
+
+//---------------------------------------------------------------------------
 void File_Mxf::Streams_Finish()
 {
+    #if MEDIAINFO_NEXTPACKET
+        //Locators only
+        if (ReferenceFiles_IsParsing)
+        {
+            ReferenceFiles->ParseReferences();
+            #if MEDIAINFO_DEMUX
+                if (Config->Demux_EventWasSent)
+                    return;
+            #endif //MEDIAINFO_DEMUX
+
+            Streams_Finish_CommercialNames();
+            return;
+        }
+    #endif //MEDIAINFO_NEXTPACKET
+
+    //Per stream
+    for (essences::iterator Essence=Essences.begin(); Essence!=Essences.end(); Essence++)
+        if (Essence->second.Parser)
+        {
+            if (!Essence->second.Parser->Status[IsFinished])
+            {
+                int64u File_Size_Temp=File_Size;
+                File_Size=File_Offset+Buffer_Offset+Element_Offset;
+                Open_Buffer_Continue(Essence->second.Parser, Buffer, 0);
+                File_Size=File_Size_Temp;
+                Finish(Essence->second.Parser);
+                #if MEDIAINFO_DEMUX
+                    if (Config->Demux_EventWasSent)
+                        return;
+                #endif //MEDIAINFO_DEMUX
+            }
+        }
+
     if (!Track_Number_IsAvailable)
     {
-        for (tracks::iterator Track=Tracks.begin(); Track!=Tracks.end(); Track++)
+        if (Tracks.empty())
         {
-            //Searching the corresponding Descriptor
-            stream_t StreamKind=Stream_Max;
-            for (descriptors::iterator Descriptor=Descriptors.begin(); Descriptor!=Descriptors.end(); Descriptor++)
-                if (Descriptor->second.LinkedTrackID==Track->second.TrackID)
-                {
-                    StreamKind=Descriptor->second.StreamKind;
-                    break;
-                }
-            if (StreamKind!=Stream_Max)
+            for (essences::iterator Essence=Essences.begin(); Essence!=Essences.end(); Essence++)
+                if (Essence->second.Parser)
+                    Merge(*Essence->second.Parser);
+        }
+        else
+            for (tracks::iterator Track=Tracks.begin(); Track!=Tracks.end(); Track++)
             {
-                for (essences::iterator Essence=Essences.begin(); Essence!=Essences.end(); Essence++)
-                    if (Essence->second.StreamKind==StreamKind && !Essence->second.Track_Number_IsMappedToTrack)
+                //Searching the corresponding Descriptor
+                stream_t StreamKind=Stream_Max;
+                for (descriptors::iterator Descriptor=Descriptors.begin(); Descriptor!=Descriptors.end(); Descriptor++)
+                    if (Descriptor->second.LinkedTrackID==Track->second.TrackID)
                     {
-                        Track->second.TrackNumber=Essence->first;
-                        Essence->second.Track_Number_IsMappedToTrack=true;
+                        StreamKind=Descriptor->second.StreamKind;
                         break;
                     }
-            }
+                if (StreamKind!=Stream_Max)
+                {
+                    for (essences::iterator Essence=Essences.begin(); Essence!=Essences.end(); Essence++)
+                        if (Essence->second.StreamKind==StreamKind && !Essence->second.Track_Number_IsMappedToTrack)
+                        {
+                            Track->second.TrackNumber=Essence->first;
+                            Essence->second.Track_Number_IsMappedToTrack=true;
+                            break;
+                        }
+                }
         }
     }
 
     File_Size_Total=File_Size;
+    StreamKind_Last=Stream_Max;
+    StreamPos_Last=(size_t)-1;
 
     Streams_Finish_Preface(Preface_Current);
 
     //OperationalPattern
     Fill(Stream_General, 0, General_Format_Profile, Mxf_OperationalPattern(OperationalPattern));
 
-    //File size handling
-    if (File_Size_Total!=File_Size)
-        Fill(Stream_General, 0, General_FileSize, File_Size_Total, 10, true);
-
-    //Commercial names
-    if (Count_Get(Stream_Video)==1)
-    {
-        Streams_Finish_StreamOnly();
-             if (!Retrieve(Stream_Video, 0, Video_Format_Commercial_IfAny).empty())
+    //Parsing locators
+    Locators_Test();
+    #if MEDIAINFO_NEXTPACKET
+        if (Config->NextPacket_Get() && ReferenceFiles && !ReferenceFiles->References.empty())
         {
-            Fill(Stream_General, 0, General_Format_Commercial_IfAny, Retrieve(Stream_Video, 0, Video_Format_Commercial_IfAny));
-            Fill(Stream_General, 0, General_Format_Commercial, _T("MXF ")+Retrieve(Stream_Video, 0, Video_Format_Commercial_IfAny));
-        }
-        else if (Retrieve(Stream_Video, 0, Video_Format)==_T("DV"))
-        {
-            Fill(Stream_General, 0, General_Format_Commercial_IfAny, "DV");
-            Fill(Stream_General, 0, General_Format_Commercial, "MXF DV");
-        }
-        else if (Retrieve(Stream_Video, 0, Video_Format)==_T("AVC") && Retrieve(Stream_Video, 0, Video_Format_Settings_GOP)==_T("N=1") && Retrieve(Stream_Video, 0, Video_Colorimetry)==_T("4:2:0") && Retrieve(Stream_Video, 0, Video_BitRate)==_T("56064000"))
-        {
-            Fill(Stream_General, 0, General_Format_Commercial_IfAny, "AVC-Intra 50");
-            Fill(Stream_General, 0, General_Format_Commercial, "MXF AVC-Intra 50");
-            Fill(Stream_Video, 0, Video_Format_Commercial_IfAny, "AVC-Intra 50");
-        }
-        else if (Retrieve(Stream_Video, 0, Video_Format)==_T("AVC") && Retrieve(Stream_Video, 0, Video_Format_Settings_GOP)==_T("N=1") && Retrieve(Stream_Video, 0, Video_Colorimetry)==_T("4:2:2") && Retrieve(Stream_Video, 0, Video_BitRate)==_T("113664000"))
-        {
-            Fill(Stream_General, 0, General_Format_Commercial_IfAny, "AVC-Intra 100");
-            Fill(Stream_General, 0, General_Format_Commercial, "MXF AVC-Intra 100");
-            Fill(Stream_Video, 0, Video_Format_Commercial_IfAny, "AVC-Intra 100");
-        }
-        else if (Retrieve(Stream_Video, 0, Video_Format)==_T("MPEG Video") && Retrieve(Stream_Video, 0, Video_Format_Settings_GOP)==_T("N=1") && Retrieve(Stream_Video, 0, Video_Colorimetry)==_T("4:2:2") && Retrieve(Stream_Video, 0, Video_BitRate)==_T("30000000"))
-        {
-            Fill(Stream_General, 0, General_Format_Commercial_IfAny, "XDCAM IMX 30");
-            Fill(Stream_Video, 0, Video_Format_Commercial_IfAny, "XDCAM IMX 30");
-        }
-        else if (Retrieve(Stream_Video, 0, Video_Format)==_T("MPEG Video") && Retrieve(Stream_Video, 0, Video_Format_Settings_GOP)==_T("N=1") && Retrieve(Stream_Video, 0, Video_Colorimetry)==_T("4:2:2") && Retrieve(Stream_Video, 0, Video_BitRate)==_T("40000000"))
-        {
-            Fill(Stream_General, 0, General_Format_Commercial_IfAny, "XDCAM IMX 40");
-            Fill(Stream_Video, 0, Video_Format_Commercial_IfAny, "XDCAM IMX 40");
-        }
-        else if (Retrieve(Stream_Video, 0, Video_Format)==_T("MPEG Video") && Retrieve(Stream_Video, 0, Video_Format_Settings_GOP)==_T("N=1") && Retrieve(Stream_Video, 0, Video_Colorimetry)==_T("4:2:2") && Retrieve(Stream_Video, 0, Video_BitRate)==_T("50000000"))
-        {
-            Fill(Stream_General, 0, General_Format_Commercial_IfAny, "XDCAM IMX 50");
-            Fill(Stream_Video, 0, Video_Format_Commercial_IfAny, "XDCAM IMX 50");
-        }
-        else if (Retrieve(Stream_Video, 0, Video_Format)==_T("MPEG Video") && Retrieve(Stream_Video, 0, Video_Format_Settings_GOP)!=_T("N=1") && Retrieve(Stream_Video, 0, Video_Colorimetry)==_T("4:2:0") && Retrieve(Stream_Video, 0, Video_BitRate)==_T("18000000"))
-        {
-            Fill(Stream_General, 0, General_Format_Commercial_IfAny, "XDCAM HD 18");
-            Fill(Stream_Video, 0, Video_Format_Commercial_IfAny, "XDCAM HD 18");
-        }
-        else if (Retrieve(Stream_Video, 0, Video_Format)==_T("MPEG Video") && Retrieve(Stream_Video, 0, Video_Format_Settings_GOP)!=_T("N=1") && Retrieve(Stream_Video, 0, Video_Colorimetry)==_T("4:2:0") && Retrieve(Stream_Video, 0, Video_BitRate)==_T("25000000"))
-        {
-            Fill(Stream_General, 0, General_Format_Commercial_IfAny, "XDCAM HD 25");
-            Fill(Stream_Video, 0, Video_Format_Commercial_IfAny, "XDCAM HD 25");
-        }
-        else if (Retrieve(Stream_Video, 0, Video_Format)==_T("MPEG Video") && Retrieve(Stream_Video, 0, Video_Format_Settings_GOP)!=_T("N=1") && Retrieve(Stream_Video, 0, Video_Colorimetry)==_T("4:2:0") && Retrieve(Stream_Video, 0, Video_BitRate)==_T("35000000"))
-        {
-            Fill(Stream_General, 0, General_Format_Commercial_IfAny, "XDCAM HD 35");
-            Fill(Stream_Video, 0, Video_Format_Commercial_IfAny, "XDCAM HD 35");
-        }
-        else if (Retrieve(Stream_Video, 0, Video_Format)==_T("MPEG Video") && Retrieve(Stream_Video, 0, Video_Format_Settings_GOP)!=_T("N=1") && Retrieve(Stream_Video, 0, Video_Colorimetry)==_T("4:2:2") && Retrieve(Stream_Video, 0, Video_BitRate)==_T("50000000"))
-        {
-            Fill(Stream_General, 0, General_Format_Commercial_IfAny, "XDCAM HD422");
-            Fill(Stream_Video, 0, Video_Format_Commercial_IfAny, "XDCAM HD422");
+            ReferenceFiles_IsParsing=true;
+            return;
         }
-    }
+    #endif //MEDIAINFO_NEXTPACKET
+
+    //Commercial names
+    Streams_Finish_CommercialNames();
+
+    //Handling separate streams
+    for (size_t StreamKind=Stream_General+1; StreamKind<Stream_Max; StreamKind++)
+        for (size_t StreamPos=0; StreamPos<Count_Get((stream_t)StreamKind); StreamPos++)
+            if (Retrieve((stream_t)StreamKind, StreamPos, Fill_Parameter((stream_t)StreamKind, Generic_StreamSize_Encoded)).empty() && !Retrieve((stream_t)StreamKind, StreamPos, Fill_Parameter((stream_t)StreamKind, Generic_BitRate_Encoded)).empty() && !Retrieve((stream_t)StreamKind, StreamPos, Fill_Parameter((stream_t)StreamKind, Generic_Duration)).empty())
+            {
+                float64 BitRate_Encoded=Retrieve((stream_t)StreamKind, StreamPos, Fill_Parameter((stream_t)StreamKind, Generic_BitRate_Encoded)).To_float64();
+                float64 Duration=Retrieve((stream_t)StreamKind, StreamPos, Fill_Parameter((stream_t)StreamKind, Generic_Duration)).To_float64();
+                if (Duration)
+                    Fill((stream_t)StreamKind, StreamPos, Fill_Parameter((stream_t)StreamKind, Generic_StreamSize_Encoded), BitRate_Encoded/8*(Duration/1000), 3);
+            }
+
 }
 
 //---------------------------------------------------------------------------
@@ -578,13 +1100,13 @@
 void File_Mxf::Streams_Finish_Package (int128u PackageUID)
 {
     packages::iterator Package=Packages.find(PackageUID);
-    if (Package==Packages.end())
+    if (Package==Packages.end() || !Package->second.IsSourcePackage)
         return;
 
     for (size_t Pos=0; Pos<Package->second.Tracks.size(); Pos++)
         Streams_Finish_Track(Package->second.Tracks[Pos]);
 
-    Streams_Finish_Descriptor(Package->second.Descriptor);
+    Streams_Finish_Descriptor(Package->second.Descriptor, PackageUID);
 }
 
 //---------------------------------------------------------------------------
@@ -594,10 +1116,14 @@
     if (Track==Tracks.end() || Track->second.Stream_Finish_Done)
         return;
 
+    StreamKind_Last=Stream_Max;
+    StreamPos_Last=(size_t)-1;
+
     Streams_Finish_Essence(Track->second.TrackNumber, TrackUID);
 
     //Sequence
-    Streams_Finish_Component(Track->second.Sequence, Track->second.EditRate);
+    if (StreamKind_Last!=Stream_Max)
+        Streams_Finish_Component(Track->second.Sequence, Track->second.EditRate);
 
     //Done
     Track->second.Stream_Finish_Done=true;
@@ -613,46 +1139,213 @@
     if (Essence->second.Parser==NULL)
         return;
 
+    //Descriptive Metadata
+    std::vector<int128u> DMScheme1s_List;
+    int32u TrackID=(int32u)-1;
+    tracks::iterator Track=Tracks.find(TrackUID);
+    if (Track!=Tracks.end())
+        TrackID=Track->second.TrackID;
+
+    for (dmsegments::iterator DMSegment=DMSegments.begin(); DMSegment!=DMSegments.end(); DMSegment++)
+        for (size_t Pos=0; Pos<DMSegment->second.TrackIDs.size(); Pos++)
+            if (DMSegment->second.TrackIDs[Pos]==TrackID)
+                DMScheme1s_List.push_back(DMSegment->second.Framework);
+
+    if (Config->ParseSpeed<=1.0)
+    {
+        Fill(Essence->second.Parser);
+        Essence->second.Parser->Open_Buffer_Unsynch();
+    }
     Finish(Essence->second.Parser);
     StreamKind_Last=Stream_Max;
     if (Essence->second.Parser->Count_Get(Stream_Video))
         Stream_Prepare(Stream_Video);
     else if (Essence->second.Parser->Count_Get(Stream_Audio))
         Stream_Prepare(Stream_Audio);
-    if (StreamKind_Last!=Stream_Max)
+    else if (Essence->second.Parser->Count_Get(Stream_Text))
+        Stream_Prepare(Stream_Text);
+    else if (Essence->second.StreamKind!=Stream_Max)
+        Stream_Prepare(Essence->second.StreamKind);
+    else
     {
-        for (std::map<std::string, Ztring>::iterator Info=Essence->second.Infos.begin(); Info!=Essence->second.Infos.end(); Info++)
-            Fill(StreamKind_Last, StreamPos_Last, Info->first.c_str(), Info->second, true);
-        Merge(*Essence->second.Parser, StreamKind_Last, 0, StreamPos_Last);
+        for (descriptors::iterator Descriptor=Descriptors.begin(); Descriptor!=Descriptors.end(); Descriptor++)
+            if (Descriptor->second.LinkedTrackID==Essence->second.TrackID)
+            {
+                if (Descriptor->second.StreamKind!=Stream_Max)
+                {
+                    Stream_Prepare(Descriptor->second.StreamKind);
+                    Descriptor->second.StreamPos=StreamPos_Last;
+                }
+                break;
+            }
+        if (StreamKind_Last==Stream_Max)
+            return; //Not found
     }
 
-    if (Tracks[TrackUID].TrackID!=(int32u)-1)
-        Fill(StreamKind_Last, StreamPos_Last, General_ID, Tracks[TrackUID].TrackID);
-    else
+    for (descriptors::iterator Descriptor=Descriptors.begin(); Descriptor!=Descriptors.end(); Descriptor++)
+        if (Descriptor->second.LinkedTrackID==Essence->second.TrackID)
+        {
+            if (Descriptor->second.StreamKind!=Stream_Max)
+            {
+                Descriptor->second.StreamPos=StreamPos_Last;
+            }
+            break;
+        }
+
+    for (std::map<std::string, Ztring>::iterator Info=Essence->second.Infos.begin(); Info!=Essence->second.Infos.end(); Info++)
+        Fill(StreamKind_Last, StreamPos_Last, Info->first.c_str(), Info->second, true);
+    if (TimeCode_RoundedTimecodeBase && TimeCode_StartTimecode!=(int64u)-1)
+    {
+        Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Delay), DTS_Delay*1000, 0, true);
+        Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Delay_Source), "Container");
+    }
+    if (SDTI_TimeCode_StartTimecode!=(int64u)-1)
+        Fill(StreamKind_Last, StreamPos_Last, "Delay_SDTI", SDTI_TimeCode_StartTimecode);
+    if (SystemScheme1_TimeCodeArray_StartTimecode!=(int64u)-1)
+        Fill(StreamKind_Last, StreamPos_Last, "Delay_SystemScheme1", SystemScheme1_TimeCodeArray_StartTimecode);
+
+    //Special case - Multiple sub-streams in a stream
+    if (Essence->second.Parser->Retrieve(Stream_General, 0, General_Format)==__T("ChannelGrouping") && Essence->second.Parser->Count_Get(Stream_Audio))
+    {
+        //Before
+        Clear(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_StreamSize));
+        if (StreamKind_Last==Stream_Audio)
+        {
+            Clear(Stream_Audio, StreamPos_Last, Audio_Format_Settings_Sign);
+        }
+        ZtringList StreamSave; StreamSave.Write((*File__Analyze::Stream)[StreamKind_Last][StreamPos_Last].Read());
+        ZtringListList StreamMoreSave; StreamMoreSave.Write((*Stream_More)[StreamKind_Last][StreamPos_Last].Read());
+
+        //Erasing former streams data
+        stream_t NewKind=StreamKind_Last;
+        size_t NewPos1;
+        Ztring ID;
+
+        //Searching second stream
+        size_t StreamPos_Difference=Essence->second.StreamPos-Essence->second.StreamPos_Initial;
+        essences::iterator Essence1=Essence;
+        Essence1--;
+        Essence->second.StreamPos=Essence1->second.StreamPos;
+        for (descriptors::iterator Descriptor=Descriptors.begin(); Descriptor!=Descriptors.end(); Descriptor++)
+        {
+            if (Descriptor->second.LinkedTrackID==Essence1->second.TrackID)
+                Descriptor->second.StreamPos=Essence1->second.StreamPos;
+            if (Descriptor->second.LinkedTrackID==Essence->second.TrackID)
+                Descriptor->second.StreamPos=Essence->second.StreamPos;
+        }
+
+        //Removing the 2 corresponding streams
+        NewPos1=(Essence->second.StreamPos_Initial/2)*2+StreamPos_Difference;
+        size_t NewPos2=NewPos1+1;
+        ID=Ztring::ToZtring(Essence1->second.TrackID)+__T(" / ")+Ztring::ToZtring(Essence->second.TrackID);
+
+        Stream_Erase(NewKind, NewPos2);
+        Stream_Erase(NewKind, NewPos1);
+
+        //After
+        for (size_t StreamPos=0; StreamPos<Essence->second.Parser->Count_Get(NewKind); StreamPos++)
+        {
+            Stream_Prepare(NewKind, NewPos1+StreamPos);
+            Merge(*Essence->second.Parser, StreamKind_Last, StreamPos, StreamPos_Last);
+            Ztring Parser_ID=Retrieve(StreamKind_Last, StreamPos_Last, General_ID);
+            Fill(StreamKind_Last, StreamPos_Last, General_ID, ID+(Parser_ID.empty()?Ztring():(__T("-")+Parser_ID)), true);
+            for (size_t Pos=0; Pos<StreamSave.size(); Pos++)
+                if (Retrieve(StreamKind_Last, StreamPos_Last, Pos).empty())
+                    Fill(StreamKind_Last, StreamPos_Last, Pos, StreamSave[Pos]);
+            for (size_t Pos=0; Pos<StreamMoreSave.size(); Pos++)
+                Fill(StreamKind_Last, StreamPos_Last, StreamMoreSave(Pos, 0).To_Local().c_str(), StreamMoreSave(Pos, 1));
+
+            for (size_t Pos=0; Pos<DMScheme1s_List.size(); Pos++)
+            {
+                dmscheme1s::iterator DMScheme1=DMScheme1s.find(DMScheme1s_List[Pos]);
+                if (DMScheme1!=DMScheme1s.end())
+                {
+                    Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Language), DMScheme1->second.PrimaryExtendedSpokenLanguage, true);
+                }
+            }
+        }
+
+        //Positioning other streams
+        for (essences::iterator Essence_Temp=Essence; Essence_Temp!=Essences.end(); Essence_Temp++)
+            if (Essence_Temp->second.Parser && Essence_Temp->second.Parser->Count_Get(Stream_Audio))
+            {
+                Essence_Temp->second.StreamPos-=2; //ChannelGrouping
+                Essence_Temp->second.StreamPos+=Essence_Temp->second.Parser->Count_Get(Stream_Audio);
+            }
+    }
+    else //Normal
     {
-        Fill(StreamKind_Last, StreamPos_Last, General_ID, Essence->first);
-        Fill(StreamKind_Last, StreamPos_Last, General_ID_String, Ztring::ToZtring(Essence->first, 16), true);
+        Merge(*Essence->second.Parser, StreamKind_Last, 0, StreamPos_Last);
+
+        for (size_t Pos=0; Pos<DMScheme1s_List.size(); Pos++)
+        {
+            dmscheme1s::iterator DMScheme1=DMScheme1s.find(DMScheme1s_List[Pos]);
+            if (DMScheme1!=DMScheme1s.end())
+            {
+                Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Language), DMScheme1->second.PrimaryExtendedSpokenLanguage, true);
+            }
+        }
+
+        for (size_t StreamPos=1; StreamPos<Essence->second.Parser->Count_Get(StreamKind_Last); StreamPos++) //If more than 1 stream, TODO: better way to do this
+        {
+            Stream_Prepare(StreamKind_Last);
+            Merge(*Essence->second.Parser, StreamKind_Last, StreamPos, StreamPos_Last);
+        }
     }
 
-    //Interlacement management
-    if (StreamKind_Last==Stream_Video && Retrieve(Stream_Video, StreamPos_Last, Video_ScanType)==_T("Interlaced") && Retrieve(Stream_Video, StreamPos_Last, Video_Format)==_T("M-JPEG 2000"))
+    if (Retrieve(StreamKind_Last, StreamPos_Last, General_ID).empty() || StreamKind_Last==Stream_Text) //TODO: better way to do detect subID
     {
-        //M-JPEG 2000 has no complete frame height, but field height
-        int64u Height=Retrieve(Stream_Video, StreamPos_Last, Video_Height).To_int64u();
-        Height*=2; //This is per field
-        if (Height)
-            Fill(Stream_Video, StreamPos_Last, Video_Height, Height, 10, true);
-
-        //M-JPEG 2000 has no complete frame framerate, but field framerate
-        float64 FrameRate=Retrieve(Stream_Video, StreamPos_Last, Video_FrameRate).To_float64();
-        FrameRate/=2; //This is per field
-        if (FrameRate)
-            Fill(Stream_Video, StreamPos_Last, Video_FrameRate, FrameRate, 3, true);
+        //Looking for Material package TrackID
+        int32u TrackID=(int32u)-1;
+        for (packages::iterator SourcePackage=Packages.begin(); SourcePackage!=Packages.end(); SourcePackage++)
+            if (SourcePackage->second.PackageUID.hi.hi) //Looking fo a SourcePackage with PackageUID only
+            {
+                //Testing if the Track is in this SourcePackage
+                for (size_t Tracks_Pos=0; Tracks_Pos<SourcePackage->second.Tracks.size(); Tracks_Pos++)
+                    if (SourcePackage->second.Tracks[Tracks_Pos]==TrackUID)
+                    {
+                        tracks::iterator Track=Tracks.find(SourcePackage->second.Tracks[Tracks_Pos]);
+                        if (Track!=Tracks.end())
+                            TrackID=Track->second.TrackID;
+                    }
+            }
+
+        Ztring ID;
+        Ztring ID_String;
+        if (TrackID!=(int32u)-1)
+            ID=Ztring::ToZtring(TrackID);
+        else if (Tracks[TrackUID].TrackID!=(int32u)-1)
+            ID=Ztring::ToZtring(Tracks[TrackUID].TrackID);
+        else
+        {
+            ID=Ztring::ToZtring(Essence->first);
+            ID_String=Ztring::ToZtring(Essence->first, 16);
+        }
+        if (!ID.empty())
+        {
+            for (size_t StreamPos=StreamPos_Last-(Essence->second.Parser->Count_Get(StreamKind_Last)?(Essence->second.Parser->Count_Get(StreamKind_Last)-1):0); StreamPos<=StreamPos_Last; StreamPos++) //If more than 1 stream
+            {
+                Ztring ID_Temp(ID);
+                if (!Retrieve(StreamKind_Last, StreamPos, General_ID).empty())
+                {
+                    ID_Temp+=__T("-");
+                    ID_Temp+=Retrieve(StreamKind_Last, StreamPos, General_ID);
+                }
+                Fill(StreamKind_Last, StreamPos, General_ID, ID_Temp, true);
+                if (!ID_String.empty())
+                    Fill(StreamKind_Last, StreamPos, General_ID_String, ID_String, true);
+            }
+        }
+        if (!Tracks[TrackUID].TrackName.empty())
+        {
+            for (size_t StreamPos=StreamPos_Last-(Essence->second.Parser->Count_Get(StreamKind_Last)?(Essence->second.Parser->Count_Get(StreamKind_Last)-1):0); StreamPos<=StreamPos_Last; StreamPos++) //If more than 1 stream
+                Fill(StreamKind_Last, StreamPos, "Title", Tracks[TrackUID].TrackName);
+        }
     }
 
     //Special case - DV
     #if defined(MEDIAINFO_DVDIF_YES)
-        if (StreamKind_Last==Stream_Video && Retrieve(Stream_Video, StreamPos_Last, Video_Format)==_T("DV"))
+        if (StreamKind_Last==Stream_Video && Retrieve(Stream_Video, StreamPos_Last, Video_Format)==__T("DV"))
         {
             if (Retrieve(Stream_General, 0, General_Recorded_Date).empty())
                 Fill(Stream_General, 0, General_Recorded_Date, Essence->second.Parser->Retrieve(Stream_General, 0, General_Recorded_Date));
@@ -661,26 +1354,30 @@
             size_t Audio_Count=Essence->second.Parser->Count_Get(Stream_Audio);
             for (size_t Audio_Pos=0; Audio_Pos<Audio_Count; Audio_Pos++)
             {
-                size_t StreamPos_Video=StreamPos_Last;
                 Fill_Flush();
                 Stream_Prepare(Stream_Audio);
                 size_t Pos=Count_Get(Stream_Audio)-1;
                 Essence->second.Parser->Finish();
+                if (TimeCode_RoundedTimecodeBase && TimeCode_StartTimecode!=(int64u)-1)
+                {
+                    Fill(Stream_Audio, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Delay), DTS_Delay*1000, 0, true);
+                    Fill(Stream_Audio, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Delay_Source), "Container");
+                }
                 Merge(*Essence->second.Parser, Stream_Audio, Audio_Pos, StreamPos_Last);
                 if (Retrieve(Stream_Audio, Pos, Audio_MuxingMode).empty())
-                    Fill(Stream_Audio, Pos, Audio_MuxingMode, Retrieve(Stream_Video, Essence->second.StreamPos, Video_Format), true);
+                    Fill(Stream_Audio, Pos, Audio_MuxingMode, Retrieve(Stream_Video, Essence->second.StreamPos-(StreamPos_StartAtOne?1:0), Video_Format), true);
                 else
-                    Fill(Stream_Audio, Pos, Audio_MuxingMode, Retrieve(Stream_Video, Essence->second.StreamPos, Video_Format)+_T(" / ")+Retrieve(Stream_Audio, Pos, Audio_MuxingMode), true);
-                Fill(Stream_Audio, Pos, Audio_Duration, Retrieve(Stream_Video, Essence->second.StreamPos, Video_Duration));
-                Fill(Stream_Audio, Pos, "MuxingMode_MoreInfo", _T("Muxed in Video #")+Ztring().From_Number(StreamPos_Video+1));
-                Fill(Stream_Audio, Pos, Audio_StreamSize, "0"); //Included in the DV stream size
+                    Fill(Stream_Audio, Pos, Audio_MuxingMode, Retrieve(Stream_Video, Essence->second.StreamPos-(StreamPos_StartAtOne?1:0), Video_Format)+__T(" / ")+Retrieve(Stream_Audio, Pos, Audio_MuxingMode), true);
+                Fill(Stream_Audio, Pos, Audio_Duration, Retrieve(Stream_Video, Essence->second.StreamPos-(StreamPos_StartAtOne?1:0), Video_Duration));
+                Fill(Stream_Audio, Pos, Audio_StreamSize_Encoded, 0); //Included in the DV stream size
                 Ztring ID=Retrieve(Stream_Audio, Pos, Audio_ID);
-                Fill(Stream_Audio, Pos, Audio_ID, Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_ID)+_T("-")+ID, true);
-                Fill(Stream_Audio, Pos, Audio_ID_String, Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_ID_String)+_T("-")+ID, true);
+                Fill(Stream_Audio, Pos, Audio_ID, Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_ID)+__T("-")+ID, true);
+                Fill(Stream_Audio, Pos, Audio_ID_String, Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_ID_String)+__T("-")+ID, true);
+                Fill(Stream_Audio, Pos, Audio_Title, Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_Title), true);
             }
 
             StreamKind_Last=Stream_Video;
-            StreamPos_Last=Essence->second.StreamPos;
+            StreamPos_Last=Essence->second.StreamPos-(StreamPos_StartAtOne?1:0);
         }
     #endif
 
@@ -688,25 +1385,52 @@
     if (StreamKind_Last==Stream_Video && Essence->second.Parser && Essence->second.Parser->Count_Get(Stream_Text))
     {
         //Video and Text are together
-        size_t Text_Count=Essence->second.Parser->Count_Get(Stream_Text);
-        for (size_t Text_Pos=0; Text_Pos<Text_Count; Text_Pos++)
+        File__Analyze* Parser=Essence->second.Parser;
+        size_t Parser_Text_Count=Parser->Count_Get(Stream_Text);
+        for (size_t Parser_Text_Pos=0; Parser_Text_Pos<Parser_Text_Count; Parser_Text_Pos++)
         {
             size_t StreamPos_Video=StreamPos_Last;
-            size_t Pos=Count_Get(Stream_Text)-Text_Count+Text_Pos;
-            Ztring MuxingMode=Retrieve(Stream_Text, Pos, "MuxingMode");
-            if (Retrieve(Stream_Text, Pos, Text_MuxingMode).empty())
-                Fill(Stream_Text, Pos, Text_MuxingMode, Retrieve(Stream_Video, Essence->second.StreamPos, Video_Format), true);
+            Fill_Flush();
+            Stream_Prepare(Stream_Text);
+            Parser->Finish();
+            if (TimeCode_RoundedTimecodeBase && TimeCode_StartTimecode!=(int64u)-1)
+            {
+                Fill(Stream_Text, Parser_Text_Pos, Fill_Parameter(StreamKind_Last, Generic_Delay), DTS_Delay*1000, 0, true);
+                Fill(Stream_Text, Parser_Text_Pos, Fill_Parameter(StreamKind_Last, Generic_Delay_Source), "Container");
+            }
+            Merge(*Parser, Stream_Text, Parser_Text_Pos, StreamPos_Last);
+            Fill(Stream_Text, StreamPos_Last, Text_Duration, Retrieve(Stream_Video, StreamPos_Video, Video_Duration));
+            Ztring ID=Retrieve(Stream_Text, StreamPos_Last, Text_ID);
+            if (Retrieve(Stream_Text, StreamPos_Last, Text_MuxingMode).find(__T("Ancillary"))!=string::npos)
+            {
+                for (descriptors::iterator Descriptor=Descriptors.begin(); Descriptor!=Descriptors.end(); Descriptor++)
+                    if (Descriptor->second.Type==descriptor::Type_AncPackets)
+                    {
+                        Fill(Stream_Text, StreamPos_Last, Text_ID, Ztring::ToZtring(Descriptor->second.LinkedTrackID)+__T("-")+ID, true);
+                        Fill(Stream_Text, StreamPos_Last, Text_ID_String, Ztring::ToZtring(Descriptor->second.LinkedTrackID)+__T("-")+ID, true);
+                        Fill(Stream_Text, StreamPos_Last, Text_Title, Tracks[TrackUID].TrackName, true);
+                        break;
+                    }
+            }
             else
-                Fill(Stream_Text, Pos, Text_MuxingMode, Retrieve(Stream_Video, Essence->second.StreamPos, Video_Format)+_T(" / ")+Retrieve(Stream_Text, Pos, Text_MuxingMode), true);
-            if (!IsSub)
-                Fill(Stream_Text, Pos, "MuxingMode_MoreInfo", _T("Muxed in Video #")+Ztring().From_Number(StreamPos_Video+1));
-            Fill(Stream_Text, Pos, Text_StreamSize, 0);
-            Ztring ID=Retrieve(Stream_Text, Pos, Text_ID);
-            Fill(Stream_Text, Pos, Text_ID, Retrieve(Stream_Video, StreamPos_Last, Video_ID)+_T("-")+ID, true);
-            Fill(Stream_Text, Pos, Text_ID_String, Retrieve(Stream_Video, StreamPos_Last, Video_ID_String)+_T("-")+ID, true);
-            Fill(Stream_Text, Pos, Text_Delay, Retrieve(Stream_Video, StreamPos_Last, Video_Delay), true);
-            Fill(Stream_Text, Pos, Text_ID, Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_ID)+_T("-")+Retrieve(Stream_Text, Pos, Text_ID), true);
+            {
+                Fill(Stream_Text, StreamPos_Last, Text_ID, Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_ID)+__T("-")+ID, true);
+                Fill(Stream_Text, StreamPos_Last, Text_ID_String, Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_ID_String)+__T("-")+ID, true);
+                Fill(Stream_Text, StreamPos_Last, Text_Title, Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_Title), true);
+            }
+
+            for (size_t Pos=0; Pos<DMScheme1s_List.size(); Pos++)
+            {
+                dmscheme1s::iterator DMScheme1=DMScheme1s.find(DMScheme1s_List[Pos]);
+                if (DMScheme1!=DMScheme1s.end())
+                {
+                    Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Language), DMScheme1->second.PrimaryExtendedSpokenLanguage, true);
+                }
+            }
         }
+
+        StreamKind_Last=Stream_Video;
+        StreamPos_Last=Essence->second.StreamPos-(StreamPos_StartAtOne?1:0);
     }
 
     //Stream size
@@ -718,7 +1442,7 @@
 }
 
 //---------------------------------------------------------------------------
-void File_Mxf::Streams_Finish_Descriptor(int128u DescriptorUID)
+void File_Mxf::Streams_Finish_Descriptor(int128u DescriptorUID, int128u PackageUID)
 {
     descriptors::iterator Descriptor=Descriptors.find(DescriptorUID);
     if (Descriptor==Descriptors.end())
@@ -728,25 +1452,82 @@
     if (!Descriptor->second.SubDescriptors.empty())
     {
         for (size_t Pos=0; Pos<Descriptor->second.SubDescriptors.size(); Pos++)
-            Streams_Finish_Descriptor(Descriptor->second.SubDescriptors[Pos]);
+            Streams_Finish_Descriptor(Descriptor->second.SubDescriptors[Pos], PackageUID);
         return; //Is not a real descriptor
     }
 
-    StreamKind_Last=Stream_Max;
-    StreamPos_Last=(size_t)-1;
-    if (Descriptor->second.StreamKind!=Stream_Max)
+    StreamKind_Last=Descriptor->second.StreamKind;
+    StreamPos_Last=Descriptor->second.StreamPos;
+    if (StreamPos_Last==(size_t)-1)
     {
-        StreamKind_Last=Descriptor->second.StreamKind;
         for (size_t Pos=0; Pos<Count_Get(StreamKind_Last); Pos++)
             if (Ztring::ToZtring(Descriptor->second.LinkedTrackID)==Retrieve(StreamKind_Last, Pos, General_ID))
             {
                 StreamPos_Last=Pos;
                 break;
             }
-        if (StreamPos_Last==(size_t)-1)
+    }
+    if (StreamPos_Last==(size_t)-1)
+    {
+        if (Descriptors.size()==1 && Count_Get(StreamKind_Last)==1)
+            StreamPos_Last=0;
+        else if (Descriptor->second.LinkedTrackID!=(int32u)-1)
+        {
+            //Workaround for a specific file with same ID
+            if (!Locators.empty())
+                for (descriptors::iterator Descriptor1=Descriptors.begin(); Descriptor1!=Descriptor; Descriptor1++)
+                    if (Descriptor1->second.LinkedTrackID==Descriptor->second.LinkedTrackID)
+                    {
+                        IdIsAlwaysSame_Offset++;
+                        break;
+                    }
+
+            Stream_Prepare(Descriptor->second.StreamKind);
+            Fill(StreamKind_Last, StreamPos_Last, General_ID, Descriptor->second.LinkedTrackID+IdIsAlwaysSame_Offset);
+        }
+        else
         {
-            if (Count_Get(Stream_Video)+Count_Get(Stream_Audio)==1)
-                StreamPos_Last=0;
+            //Looking for Material package TrackID
+            packages::iterator SourcePackage=Packages.find(PackageUID);
+            //We have the the right PackageUID, looking for SourceClip from Sequence from Track from MaterialPackage
+            for (components::iterator SourceClip=Components.begin(); SourceClip!=Components.end(); SourceClip++)
+                if (SourceClip->second.SourcePackageID.lo==SourcePackage->second.PackageUID.lo) //int256u doesn't support yet ==
+                {
+                    //We have the right SourceClip, looking for the Sequence from Track from MaterialPackage
+                    for (components::iterator Sequence=Components.begin(); Sequence!=Components.end(); Sequence++)
+                        for (size_t StructuralComponents_Pos=0; StructuralComponents_Pos<Sequence->second.StructuralComponents.size(); StructuralComponents_Pos++)
+                            if (Sequence->second.StructuralComponents[StructuralComponents_Pos]==SourceClip->first)
+                            {
+                                //We have the right Sequence, looking for Track from MaterialPackage
+                                for (tracks::iterator Track=Tracks.begin(); Track!=Tracks.end(); Track++)
+                                {
+                                    if (Track->second.Sequence==Sequence->first)
+                                    {
+                                        Ztring ID=Ztring::ToZtring(Track->second.TrackID);
+                                        StreamKind_Last=Stream_Max;
+                                        StreamPos_Last=(size_t)-1;
+                                        for (size_t StreamKind=Stream_General+1; StreamKind<Stream_Max; StreamKind++)
+                                            for (size_t StreamPos=0; StreamPos<Count_Get((stream_t)StreamKind); StreamPos++)
+                                                if (ID==Retrieve((stream_t)StreamKind, StreamPos, General_ID))
+                                                {
+                                                    StreamKind_Last=(stream_t)StreamKind;
+                                                    StreamPos_Last=(stream_t)StreamPos;
+                                                }
+                                        if (StreamPos_Last==(size_t)-1 && !Descriptor->second.Locators.empty()) //TODO: 1 file has a TimeCode stream linked to a video stream, and it is displayed if Locator test is removed. Why? AS02 files streams are not filled if I remove completely this block, why?
+                                        {
+                                            Stream_Prepare(Descriptor->second.StreamKind);
+                                            if (Track->second.TrackID!=(int32u)-1)
+                                            {
+                                                if (Descriptor->second.LinkedTrackID==(int32u)-1)
+                                                    Descriptor->second.LinkedTrackID=Track->second.TrackID;
+                                                Fill(StreamKind_Last, StreamPos_Last, General_ID, ID);
+                                                Fill(StreamKind_Last, StreamPos_Last, "Title", Track->second.TrackName);
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                }
         }
     }
 
@@ -760,7 +1541,7 @@
     for (size_t Locator_Pos=0; Locator_Pos<Descriptor->second.Locators.size(); Locator_Pos++)
     {
         //Locator
-        Streams_Finish_Locator(Descriptor->second.Locators[Locator_Pos]);
+        Streams_Finish_Locator(DescriptorUID, Descriptor->second.Locators[Locator_Pos]);
     }
 
     if (StreamPos_Last==(size_t)-1 && Essences.size()==1)
@@ -780,6 +1561,11 @@
 
     if (StreamKind_Last!=Stream_Max && StreamPos_Last!=(size_t)-1)
     {
+        //Handling buggy files
+        std::map<std::string, Ztring>::iterator Info=Descriptor->second.Infos.find("ScanType");
+        if (Info!=Descriptor->second.Infos.end() && Info->second==__T("Interlaced") && Descriptor->second.Height==1152 && Descriptor->second.Height_Display==1152 && Descriptor->second.Width==720) //Height value is height of the frame instead of the field
+            Descriptor->second.Height_Display/=2;
+
         //ID
         if (Descriptor->second.LinkedTrackID!=(int32u)-1 && Retrieve(StreamKind_Last, StreamPos_Last, General_ID).empty())
         {
@@ -787,8 +1573,8 @@
                 for (size_t StreamPos=Before_Count[StreamKind]; StreamPos<Count_Get((stream_t)StreamKind); StreamPos++)
                 {
                     Ztring ID=Retrieve((stream_t)StreamKind, StreamPos, General_ID);
-                    if (ID.empty())
-                        Fill((stream_t)StreamKind, StreamPos, General_ID, Descriptor->second.LinkedTrackID);
+                    if (ID.empty() || Config->File_ID_OnlyRoot_Get())
+                        Fill((stream_t)StreamKind, StreamPos, General_ID, Descriptor->second.LinkedTrackID, 10, true);
                     else
                         Fill((stream_t)StreamKind, StreamPos, General_ID, Ztring::ToZtring(Descriptor->second.LinkedTrackID)+ID, true);
                 }
@@ -796,18 +1582,54 @@
 
         if (Descriptor->second.Width!=(int32u)-1 && Retrieve(Stream_Video, StreamPos_Last, Video_Width).empty())
             Fill(Stream_Video, StreamPos_Last, Video_Width, Descriptor->second.Width, 10, true);
+        if (Descriptor->second.Width_Display!=(int32u)-1 && Descriptor->second.Width_Display!=Retrieve(Stream_Video, StreamPos_Last, Video_Width).To_int32u())
+        {
+            Fill(Stream_Video, StreamPos_Last, Video_Width_Original, Retrieve(Stream_Video, StreamPos_Last, Video_Width), true);
+            if (Retrieve(Stream_Video, StreamPos_Last, Video_PixelAspectRatio_Original).empty())
+                Fill(Stream_Video, StreamPos_Last, Video_PixelAspectRatio_Original, Retrieve(Stream_Video, StreamPos_Last, Video_PixelAspectRatio), true);
+            Clear(Stream_Video, StreamPos_Last, Video_PixelAspectRatio);
+            Fill(Stream_Video, StreamPos_Last, Video_Width, Descriptor->second.Width_Display, 10, true);
+            if (Descriptor->second.Width_Display_Offset!=(int32u)-1)
+                Fill(Stream_Video, StreamPos_Last, Video_Width_Offset, Descriptor->second.Width_Display_Offset, 10, true);
+        }
         if (Descriptor->second.Height!=(int32u)-1 && Retrieve(Stream_Video, StreamPos_Last, Video_Height).empty())
             Fill(Stream_Video, StreamPos_Last, Video_Height, Descriptor->second.Height, 10, true);
+        if (Descriptor->second.Height_Display!=(int32u)-1 && Descriptor->second.Height_Display!=Retrieve(Stream_Video, StreamPos_Last, Video_Height).To_int32u())
+        {
+            Fill(Stream_Video, StreamPos_Last, Video_Height_Original, Retrieve(Stream_Video, StreamPos_Last, Video_Height), true);
+            if (Retrieve(Stream_Video, StreamPos_Last, Video_PixelAspectRatio_Original).empty())
+                Fill(Stream_Video, StreamPos_Last, Video_PixelAspectRatio_Original, Retrieve(Stream_Video, StreamPos_Last, Video_PixelAspectRatio), true);
+            Clear(Stream_Video, StreamPos_Last, Video_PixelAspectRatio);
+            Fill(Stream_Video, StreamPos_Last, Video_Height, Descriptor->second.Height_Display, 10, true);
+            if (Descriptor->second.Height_Display_Offset!=(int32u)-1)
+                Fill(Stream_Video, StreamPos_Last, Video_Height_Offset, Descriptor->second.Height_Display_Offset, 10, true);
+        }
+
+        //Special case
+        if (StreamKind_Last==Stream_Audio)
+        {
+            std::map<std::string, Ztring>::iterator Info=Descriptor->second.Infos.find("FrameRate");
+            if (Info!=Descriptor->second.Infos.end())
+                Descriptor->second.Infos.erase(Info);
+        }
+
+        //Info
         for (std::map<std::string, Ztring>::iterator Info=Descriptor->second.Infos.begin(); Info!=Descriptor->second.Infos.end(); Info++)
             if (Retrieve(StreamKind_Last, StreamPos_Last, Info->first.c_str()).empty())
                 Fill(StreamKind_Last, StreamPos_Last, Info->first.c_str(), Info->second, true);
 
         //Bitrate (PCM)
-        if (StreamKind_Last==Stream_Audio && Retrieve(Stream_Audio, StreamPos_Last, Audio_BitRate).empty() && Retrieve(Stream_Audio, StreamPos_Last, Audio_Format)==_T("PCM"))
+        if (StreamKind_Last==Stream_Audio && Retrieve(Stream_Audio, StreamPos_Last, Audio_BitRate).empty() && Retrieve(Stream_Audio, StreamPos_Last, Audio_Format)==__T("PCM") && Retrieve(Stream_Audio, StreamPos_Last, Audio_Format_Settings_Wrapping).find(__T("D-10"))!=string::npos)
+        {
+            int64u SamplingRate=Retrieve(Stream_Audio, StreamPos_Last, Audio_SamplingRate).To_int64u();
+            if (SamplingRate)
+               Fill(Stream_Audio, StreamPos_Last, Audio_BitRate, 8*SamplingRate*32);
+        }
+        if (StreamKind_Last==Stream_Audio && Retrieve(Stream_Audio, StreamPos_Last, Audio_BitRate).empty() && Retrieve(Stream_Audio, StreamPos_Last, Audio_Format)==__T("PCM"))
         {
             int64u Channels=Retrieve(Stream_Audio, StreamPos_Last, Audio_Channel_s_).To_int64u();
             int64u SamplingRate=Retrieve(Stream_Audio, StreamPos_Last, Audio_SamplingRate).To_int64u();
-            int64u Resolution=Retrieve(Stream_Audio, StreamPos_Last, Audio_Resolution).To_int64u();
+            int64u Resolution=Retrieve(Stream_Audio, StreamPos_Last, Audio_BitDepth).To_int64u();
             if (Channels && SamplingRate && Resolution)
                Fill(Stream_Audio, StreamPos_Last, Audio_BitRate, Channels*SamplingRate*Resolution);
         }
@@ -819,6 +1641,14 @@
             Fill(Stream_Video, StreamPos_Last, Video_BitRate, Retrieve(Stream_Video, StreamPos_Last, Video_BitRate_Nominal));
         }
 
+        //Frame rate
+        if (StreamKind_Last==Stream_Video && Descriptor->second.Infos.find("FrameRate")!=Descriptor->second.Infos.end() && Descriptor->second.Infos["FrameRate"]!=Retrieve(Stream_Video, StreamPos_Last, Video_FrameRate))
+        {
+            //Until now, I only found CBR files
+            Fill(Stream_Video, StreamPos_Last, Video_FrameRate_Original, Retrieve(Stream_Video, StreamPos_Last, Video_FrameRate));
+            Fill(Stream_Video, StreamPos_Last, Video_FrameRate, Descriptor->second.Infos["FrameRate"], true);
+        }
+
         //Display Aspect Ratio
         if (StreamKind_Last==Stream_Video && !Descriptor->second.Infos["DisplayAspectRatio"].empty() && Retrieve(Stream_Video, StreamPos_Last, Video_DisplayAspectRatio)!=Descriptor->second.Infos["DisplayAspectRatio"])
         {
@@ -826,149 +1656,166 @@
             Clear(Stream_Video, StreamPos_Last, Video_PixelAspectRatio);
             Fill(Stream_Video, StreamPos_Last, Video_DisplayAspectRatio, Descriptor->second.Infos["DisplayAspectRatio"], true);
             Fill(Stream_Video, StreamPos_Last, Video_DisplayAspectRatio_Original, DAR);
+            float32 Width =Retrieve(Stream_Video, StreamPos_Last, Video_Width             ).To_float32();
+            float32 Height=Retrieve(Stream_Video, StreamPos_Last, Video_Height            ).To_float32();
+            float32 DAR_F =DAR.To_float32();
+            if (Width && Height && DAR_F)
+            {
+                float32 PAR   =1/(Width/Height/DAR_F);
+                if (PAR>(float32)12/(float32)11*0.99 && PAR<(float32)12/(float32)11*1.01)
+                    PAR=(float32)12/(float32)11;
+                if (PAR>(float32)10/(float32)11*0.99 && PAR<(float32)10/(float32)11*1.01)
+                    PAR=(float32)10/(float32)11;
+                if (PAR>(float32)16/(float32)11*0.99 && PAR<(float32)16/(float32)11*1.01)
+                    PAR=(float32)16/(float32)11;
+                if (PAR>(float32)40/(float32)33*0.99 && PAR<(float32)40/(float32)33*1.01)
+                    PAR=(float32)40/(float32)33;
+                if (PAR>(float32)24/(float32)11*0.99 && PAR<(float32)24/(float32)11*1.01)
+                    PAR=(float32)24/(float32)11;
+                if (PAR>(float32)20/(float32)11*0.99 && PAR<(float32)20/(float32)11*1.01)
+                    PAR=(float32)20/(float32)11;
+                if (PAR>(float32)32/(float32)11*0.99 && PAR<(float32)32/(float32)11*1.01)
+                    PAR=(float32)32/(float32)11;
+                if (PAR>(float32)80/(float32)33*0.99 && PAR<(float32)80/(float32)33*1.01)
+                    PAR=(float32)80/(float32)33;
+                if (PAR>(float32)18/(float32)11*0.99 && PAR<(float32)18/(float32)11*1.01)
+                    PAR=(float32)18/(float32)11;
+                if (PAR>(float32)15/(float32)11*0.99 && PAR<(float32)15/(float32)11*1.01)
+                    PAR=(float32)15/(float32)11;
+                if (PAR>(float32)64/(float32)33*0.99 && PAR<(float32)64/(float32)33*1.01)
+                    PAR=(float32)64/(float32)33;
+                if (PAR>(float32)160/(float32)99*0.99 && PAR<(float32)160/(float32)99*1.01)
+                    PAR=(float32)160/(float32)99;
+                if (PAR>(float32)4/(float32)3*0.99 && PAR<(float32)4/(float32)3*1.01)
+                    PAR=(float32)4/(float32)3;
+                if (PAR>(float32)3/(float32)2*0.99 && PAR<(float32)3/(float32)2*1.01)
+                    PAR=(float32)3/(float32)2;
+                if (PAR>(float32)2/(float32)1*0.99 && PAR<(float32)2/(float32)1*1.01)
+                    PAR=(float32)2;
+                if (PAR>(float32)59/(float32)54*0.99 && PAR<(float32)59/(float32)54*1.01)
+                    PAR=(float32)59/(float32)54;
+            }
+        }
+
+        //ActiveFormatDescriptor
+        if (StreamKind_Last==Stream_Video && Descriptor->second.ActiveFormat!=(int8u)-1 && Retrieve(Stream_Video, StreamPos_Last, Video_ActiveFormatDescription).empty())
+        {
+            Fill(Stream_Video, 0, Video_ActiveFormatDescription, Descriptor->second.ActiveFormat);
+            if (Descriptor->second.ActiveFormat<16)
+            {
+                float32 DAR=Retrieve(Stream_Video, StreamPos_Last, Video_DisplayAspectRatio).To_float32();
+                if (DAR>(float32)4/(float32)3*0.99 && DAR<(float32)4/(float32)3*1.01)
+                    Fill(Stream_Video, 0, Video_ActiveFormatDescription_String, AfdBarData_active_format_4_3[Descriptor->second.ActiveFormat]);
+                if (DAR>(float32)16/(float32)9*0.99 && DAR<(float32)16/(float32)9*1.01)
+                    Fill(Stream_Video, 0, Video_ActiveFormatDescription_String, AfdBarData_active_format_16_9[Descriptor->second.ActiveFormat]);
+            }
+            if (Retrieve(Stream_Video, 0, Video_ActiveFormatDescription_String).empty())
+                Fill(Stream_Video, 0, Video_ActiveFormatDescription_String, Descriptor->second.ActiveFormat);
         }
     }
+
+    //Fallback on partition data if classic methods failed
+    if (StreamKind_Last!=Stream_Max && StreamPos_Last!=(size_t)-1 && Retrieve(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Format)).empty() && Descriptors.size()==1 && Count_Get(StreamKind_Last)==1)
+        Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Format), Mxf_EssenceContainer(EssenceContainer_FromPartitionMetadata));
 }
 
 //---------------------------------------------------------------------------
-void File_Mxf::Streams_Finish_Locator(int128u LocatorUID)
+void File_Mxf::Streams_Finish_Locator(int128u DescriptorUID, int128u LocatorUID)
 {
+    descriptors::iterator Descriptor=Descriptors.find(DescriptorUID);
+    if (Descriptor==Descriptors.end())
+        return;
+
     locators::iterator Locator=Locators.find(LocatorUID);
     if (Locator==Locators.end())
         return;
 
     //External file name specific
-    if (!Locator->second.EssenceLocator.empty())
+    if (!Locator->second.IsTextLocator && !Locator->second.EssenceLocator.empty())
     {
         //Preparing
-        stream_t StreamKind_Last_Essence=StreamKind_Last;
-        size_t StreamPos_Last_Essence=StreamPos_Last;
-
-        //Configuring file name
-        Ztring AbsoluteName=ZenLib::FileName::Path_Get(File_Name);
-        if (!AbsoluteName.empty())
-            AbsoluteName+=ZenLib::PathSeparator;
-        AbsoluteName+=Locator->second.EssenceLocator;
-
-        MediaInfo_Internal MI;
-        MI.Option(_T("File_StopAfterFilled"), _T("1"));
-        MI.Option(_T("File_KeepInfo"), _T("1"));
-        Fill(StreamKind_Last_Essence, StreamPos_Last_Essence, "Source", Locator->second.EssenceLocator);
+        Locator->second.StreamKind=StreamKind_Last;
+        Locator->second.StreamPos=StreamPos_Last;
+        Locator->second.LinkedTrackID=Descriptor->second.LinkedTrackID;
+    }
+}
 
-        if (MI.Open(AbsoluteName))
+//---------------------------------------------------------------------------
+void File_Mxf::Streams_Finish_CommercialNames ()
+{
+    //Commercial names
+    if (Count_Get(Stream_Video)==1)
+    {
+        Streams_Finish_StreamOnly();
+             if (!Retrieve(Stream_Video, 0, Video_Format_Commercial_IfAny).empty())
         {
-            //Hacks - Before
-            Ztring CodecID=Retrieve(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_CodecID));
-
-            Merge(*(MI.Info));
-            File_Size_Total+=Ztring(MI.Get(Stream_General, 0, General_FileSize)).To_int64u();
-
-            //Hacks - After
-            if (CodecID!=Retrieve(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_CodecID)))
-            {
-                if (!CodecID.empty())
-                    CodecID+=_T(" / ");
-                CodecID+=Retrieve(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_CodecID));
-                Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_CodecID), CodecID, true);
-            }
-
-            //Special case: MXF in MXF
-            if (MI.Info && MI.Info->Get(Stream_General, 0, General_Format)==_T("MXF"))
-            {
-                if (MI.Info->Count_Get(Stream_Video)==1)
-                {
-                    Fill(Stream_Video, Count_Get(Stream_Video)-1, "MuxingMode", "MXF");
-                    StreamKind_Last=Stream_Video;
-                    StreamPos_Last=Count_Get(Stream_Video)-1;
-                }
-                else if (MI.Info->Count_Get(Stream_Audio)==1)
-                    Fill(Stream_Audio, Count_Get(Stream_Audio)-1, "MuxingMode", "MXF");
-            }
-            if (MI.Info && MI.Info->Get(Stream_General, 0, General_Format)==_T("MXF") && MI.Info->Count_Get(Stream_Video)>0)
-            {
-                size_t Audio_Count=MI.Info->Count_Get(Stream_Audio);
-                for (size_t Audio_Pos=0; Audio_Pos<Audio_Count; Audio_Pos++)
-                {
-                    size_t Pos=Count_Get(Stream_Audio)-1-Audio_Pos;
-                    if (Retrieve(Stream_Audio, Pos, Audio_MuxingMode).empty())
-                        Fill(Stream_Audio, Pos, Audio_MuxingMode, "MXF");
-                    else
-                        Fill(Stream_Audio, Pos, Audio_MuxingMode, _T("MXF / ")+Retrieve(Stream_Audio, Pos, Audio_MuxingMode), true);
-                    Fill(Stream_Audio, Pos, "Source", Retrieve(Stream_Video, Count_Get(Stream_Video)-1, "Source"));
-                    Fill(Stream_Audio, Pos, "Source_Info", Retrieve(Stream_Video, Count_Get(Stream_Video)-1, "Source_Info"));
-                }
-                size_t Text_Count=MI.Info->Count_Get(Stream_Text);
-                for (size_t Text_Pos=0; Text_Pos<Text_Count; Text_Pos++)
-                {
-                    size_t Pos=Count_Get(Stream_Text)-1-Text_Pos;
-                    if (Retrieve(Stream_Text, Pos, Text_MuxingMode).empty())
-                        Fill(Stream_Text, Pos, Text_MuxingMode, "MXF");
-                    else
-                        Fill(Stream_Text, Pos, Text_MuxingMode, _T("MXF / ")+Retrieve(Stream_Text, Pos, Text_MuxingMode), true);
-                    Fill(Stream_Text, Pos, "Source", Retrieve(Stream_Video, Count_Get(Stream_Video)-1, "Source"));
-                    Fill(Stream_Text, Pos, "Source_Info", Retrieve(Stream_Video, Count_Get(Stream_Video)-1, "Source_Info"));
-                }
-            }
-            //Special case: DV with Audio or/and Text in the video stream
-            else if (MI.Info && MI.Info->Get(Stream_General, 0, General_Format)==_T("DV") && (MI.Info->Count_Get(Stream_Audio) || MI.Info->Count_Get(Stream_Text)))
-            {
-                StreamKind_Last=Stream_Video;
-                StreamPos_Last=Count_Get(Stream_Video)-1;
-
-                //Video and Audio are together
-                size_t Audio_Count=MI.Info->Count_Get(Stream_Audio);
-                for (size_t Audio_Pos=0; Audio_Pos<Audio_Count; Audio_Pos++)
-                {
-                    size_t StreamPos_Video=StreamPos_Last;
-                    size_t Pos=Count_Get(Stream_Audio)-1-Audio_Pos;
-                    if (Retrieve(Stream_Audio, Pos, Audio_MuxingMode).empty())
-                        Fill(Stream_Audio, Pos, Audio_MuxingMode, Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_Format), true);
-                    else
-                        Fill(Stream_Audio, Pos, Audio_MuxingMode, Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_Format)+_T(" / ")+Retrieve(Stream_Audio, Pos, Audio_MuxingMode), true);
-                    Fill(Stream_Audio, Pos, Audio_MuxingMode_MoreInfo, _T("Muxed in Video #")+Ztring().From_Number(StreamPos_Video+1), true);
-                    Fill(Stream_Audio, Pos, Audio_Duration, Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_Duration), true);
-                    Fill(Stream_Audio, Pos, "Source", Retrieve(Stream_Video, Count_Get(Stream_Video)-1, "Source"));
-                    Fill(Stream_Audio, Pos, "Source_Info", Retrieve(Stream_Video, Count_Get(Stream_Video)-1, "Source_Info"));
-                    Ztring ID=Retrieve(Stream_Audio, Pos, Audio_ID);
-                    Ztring A=Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_ID);
-                    Fill(Stream_Audio, Pos, Audio_ID, Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_ID)+_T("-")+ID, true);
-                    Fill(Stream_Audio, Pos, Audio_ID_String, Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_ID_String)+_T("-")+ID, true);
-                }
-
-                //Video and Text are together
-                size_t Text_Count=MI.Info->Count_Get(Stream_Text);
-                for (size_t Text_Pos=0; Text_Pos<Text_Count; Text_Pos++)
-                {
-                    size_t StreamPos_Video=StreamPos_Last;
-                    size_t Pos=Count_Get(Stream_Text)-1-Text_Pos;
-                    if (Retrieve(Stream_Text, Pos, Text_MuxingMode).empty())
-                        Fill(Stream_Text, Pos, Text_MuxingMode, Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_Format), true);
-                    else
-                        Fill(Stream_Text, Pos, Text_MuxingMode, Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_Format)+_T(" / ")+Retrieve(Stream_Text, Pos, Text_MuxingMode), true);
-                    Fill(Stream_Text, Pos, Text_MuxingMode_MoreInfo, _T("Muxed in Video #")+Ztring().From_Number(StreamPos_Video+1), true);
-                    Fill(Stream_Text, Pos, Text_Duration, Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_Duration), true);
-                    Fill(Stream_Text, Pos, "Source", Retrieve(Stream_Video, Count_Get(Stream_Video)-1, "Source"));
-                    Fill(Stream_Text, Pos, "Source_Info", Retrieve(Stream_Video, Count_Get(Stream_Video)-1, "Source_Info"));
-                    Ztring ID=Retrieve(Stream_Text, Pos, Text_ID);
-                    Fill(Stream_Text, Pos, Text_ID, Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_ID)+_T("-")+ID, true);
-                    Fill(Stream_Text, Pos, Text_ID_String, Retrieve(Stream_Video, Count_Get(Stream_Video)-1, Video_ID_String)+_T("-")+ID, true);
-                }
-            }
+            Fill(Stream_General, 0, General_Format_Commercial_IfAny, Retrieve(Stream_Video, 0, Video_Format_Commercial_IfAny));
+            Fill(Stream_General, 0, General_Format_Commercial, __T("MXF ")+Retrieve(Stream_Video, 0, Video_Format_Commercial_IfAny));
+        }
+        else if (Retrieve(Stream_Video, 0, Video_Format)==__T("DV"))
+        {
+            Fill(Stream_General, 0, General_Format_Commercial_IfAny, "DV");
+            Fill(Stream_General, 0, General_Format_Commercial, "MXF DV");
+        }
+        else if (Retrieve(Stream_Video, 0, Video_Format)==__T("AVC") && Retrieve(Stream_Video, 0, Video_Format_Settings_GOP)==__T("N=1") && Retrieve(Stream_Video, 0, Video_Colorimetry)==__T("4:2:0") && Retrieve(Stream_Video, 0, Video_BitRate)==__T("56064000"))
+        {
+            Fill(Stream_General, 0, General_Format_Commercial_IfAny, "AVC-Intra 50");
+            Fill(Stream_General, 0, General_Format_Commercial, "MXF AVC-Intra 50");
+            Fill(Stream_Video, 0, Video_Format_Commercial_IfAny, "AVC-Intra 50");
+        }
+        else if (Retrieve(Stream_Video, 0, Video_Format)==__T("AVC") && Retrieve(Stream_Video, 0, Video_Format_Settings_GOP)==__T("N=1") && Retrieve(Stream_Video, 0, Video_Colorimetry)==__T("4:2:2") && Retrieve(Stream_Video, 0, Video_BitRate)==__T("113664000"))
+        {
+            Fill(Stream_General, 0, General_Format_Commercial_IfAny, "AVC-Intra 100");
+            Fill(Stream_General, 0, General_Format_Commercial, "MXF AVC-Intra 100");
+            Fill(Stream_Video, 0, Video_Format_Commercial_IfAny, "AVC-Intra 100");
+        }
+        else if (Retrieve(Stream_Video, 0, Video_Format)==__T("MPEG Video") && Retrieve(Stream_Video, 0, Video_Format_Settings_GOP)==__T("N=1") && Retrieve(Stream_Video, 0, Video_Colorimetry)==__T("4:2:2") && (Retrieve(Stream_Video, 0, Video_BitRate)==__T("30000000") || Retrieve(Stream_Video, 0, Video_BitRate_Nominal)==__T("30000000") || Retrieve(Stream_Video, 0, Video_BitRate_Maximum)==__T("30000000")))
+        {
+            Fill(Stream_General, 0, General_Format_Commercial_IfAny, "IMX 30");
+            Fill(Stream_Video, 0, Video_Format_Commercial_IfAny, "IMX 30");
+        }
+        else if (Retrieve(Stream_Video, 0, Video_Format)==__T("MPEG Video") && Retrieve(Stream_Video, 0, Video_Format_Settings_GOP)==__T("N=1") && Retrieve(Stream_Video, 0, Video_Colorimetry)==__T("4:2:2") && (Retrieve(Stream_Video, 0, Video_BitRate)==__T("40000000") || Retrieve(Stream_Video, 0, Video_BitRate_Nominal)==__T("40000000") || Retrieve(Stream_Video, 0, Video_BitRate_Maximum)==__T("40000000")))
+        {
+            Fill(Stream_General, 0, General_Format_Commercial_IfAny, "IMX 40");
+            Fill(Stream_Video, 0, Video_Format_Commercial_IfAny, "IMX 40");
+        }
+        else if (Retrieve(Stream_Video, 0, Video_Format)==__T("MPEG Video") && Retrieve(Stream_Video, 0, Video_Format_Settings_GOP)==__T("N=1") && Retrieve(Stream_Video, 0, Video_Colorimetry)==__T("4:2:2") && (Retrieve(Stream_Video, 0, Video_BitRate)==__T("50000000") || Retrieve(Stream_Video, 0, Video_BitRate_Nominal)==__T("50000000") || Retrieve(Stream_Video, 0, Video_BitRate_Maximum)==__T("50000000")))
+        {
+            Fill(Stream_General, 0, General_Format_Commercial_IfAny, "IMX 50");
+            Fill(Stream_Video, 0, Video_Format_Commercial_IfAny, "IMX 50");
+        }
+        else if (Retrieve(Stream_Video, 0, Video_Format)==__T("MPEG Video") && Retrieve(Stream_Video, 0, Video_Format_Settings_GOP)!=__T("N=1") && Retrieve(Stream_Video, 0, Video_Colorimetry)==__T("4:2:0") && (Retrieve(Stream_Video, 0, Video_BitRate)==__T("18000000") || Retrieve(Stream_Video, 0, Video_BitRate_Nominal)==__T("18000000") || Retrieve(Stream_Video, 0, Video_BitRate_Maximum)==__T("18000000")))
+        {
+            Fill(Stream_General, 0, General_Format_Commercial_IfAny, "XDCAM HD 18");
+            Fill(Stream_Video, 0, Video_Format_Commercial_IfAny, "XDCAM HD 18");
+        }
+        else if (Retrieve(Stream_Video, 0, Video_Format)==__T("MPEG Video") && Retrieve(Stream_Video, 0, Video_Format_Settings_GOP)!=__T("N=1") && Retrieve(Stream_Video, 0, Video_Colorimetry)==__T("4:2:0") && (Retrieve(Stream_Video, 0, Video_BitRate)==__T("25000000") || Retrieve(Stream_Video, 0, Video_BitRate_Nominal)==__T("25000000") || Retrieve(Stream_Video, 0, Video_BitRate_Maximum)==__T("25000000")))
+        {
+            Fill(Stream_General, 0, General_Format_Commercial_IfAny, "XDCAM HD 25");
+            Fill(Stream_Video, 0, Video_Format_Commercial_IfAny, "XDCAM HD 25");
+        }
+        else if (Retrieve(Stream_Video, 0, Video_Format)==__T("MPEG Video") && Retrieve(Stream_Video, 0, Video_Format_Settings_GOP)!=__T("N=1") && Retrieve(Stream_Video, 0, Video_Colorimetry)==__T("4:2:0") && (Retrieve(Stream_Video, 0, Video_BitRate)==__T("35000000") || Retrieve(Stream_Video, 0, Video_BitRate_Nominal)==__T("35000000") || Retrieve(Stream_Video, 0, Video_BitRate_Maximum)==__T("35000000")))
+        {
+            Fill(Stream_General, 0, General_Format_Commercial_IfAny, "XDCAM HD 35");
+            Fill(Stream_Video, 0, Video_Format_Commercial_IfAny, "XDCAM HD 35");
+        }
+        else if (Retrieve(Stream_Video, 0, Video_Format)==__T("MPEG Video") && Retrieve(Stream_Video, 0, Video_Format_Settings_GOP)!=__T("N=1") && Retrieve(Stream_Video, 0, Video_Colorimetry)==__T("4:2:2") && (Retrieve(Stream_Video, 0, Video_BitRate)==__T("50000000") || Retrieve(Stream_Video, 0, Video_BitRate_Nominal)==__T("50000000") || Retrieve(Stream_Video, 0, Video_BitRate_Maximum)==__T("50000000")))
+        {
+            Fill(Stream_General, 0, General_Format_Commercial_IfAny, "XDCAM HD422");
+            Fill(Stream_Video, 0, Video_Format_Commercial_IfAny, "XDCAM HD422");
         }
-        else
-            Fill(StreamKind_Last, StreamPos_Last, "Source_Info", "Missing");
     }
 }
 
 //---------------------------------------------------------------------------
-void File_Mxf::Streams_Finish_Component(int128u ComponentUID, float32 EditRate)
+void File_Mxf::Streams_Finish_Component(int128u ComponentUID, float64 EditRate)
 {
     components::iterator Component=Components.find(ComponentUID);
     if (Component==Components.end())
         return;
 
     //Duration
-    if (EditRate && StreamKind_Last!=Stream_Max)
+    if (EditRate && StreamKind_Last!=Stream_Max && Component->second.Duration!=(int64u)-1)
         Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Duration), Component->second.Duration*1000/EditRate, 0, true);
 }
 
@@ -985,7 +1832,7 @@
         if (!Identification->second.CompanyName.empty())
         {
             Encoded_Library_Name+=Identification->second.CompanyName;
-            Encoded_Library_Name+=_T(' ');
+            Encoded_Library_Name+=__T(' ');
         }
         Encoded_Library_Name+=Identification->second.ProductName;
         Ztring Encoded_Library_Version;
@@ -1000,7 +1847,7 @@
         Ztring Encoded_Application=Encoded_Library_Name;
         if (!Encoded_Library_Version.empty())
         {
-            Encoded_Application+=_T(' ');
+            Encoded_Application+=__T(' ');
             Encoded_Application+=Encoded_Library_Version;
         }
         Fill(Stream_General, 0, General_Encoded_Application, Encoded_Application, true);
@@ -1017,27 +1864,550 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
+void File_Mxf::Read_Buffer_Init()
+{
+    EssenceContainer_FromPartitionMetadata=0;
+    #if MEDIAINFO_DEMUX
+         Demux_UnpacketizeContainer=Config->Demux_Unpacketize_Get();
+         Demux_Rate=Config->Demux_Rate_Get();
+    #endif //MEDIAINFO_DEMUX
+}
+
+//---------------------------------------------------------------------------
 void File_Mxf::Read_Buffer_Continue()
 {
-    if (Buffer_DataSizeToParse)
+    if (!IsSub)
+    {
+        if (Config->ParseSpeed>=1.0)
+        {
+            if (Config->File_IsGrowing)
+            {
+                File F;
+                F.Open(File_Name);
+                int8u SearchingPartitionPack[65536];
+                size_t SearchingPartitionPack_Size=F.Read(SearchingPartitionPack, 65536);
+                for (size_t Pos=0; Pos+16<SearchingPartitionPack_Size; Pos++)
+                    if (SearchingPartitionPack[Pos   ]==0x06
+                     && SearchingPartitionPack[Pos+ 1]==0x0E
+                     && SearchingPartitionPack[Pos+ 2]==0x2B
+                     && SearchingPartitionPack[Pos+ 3]==0x34
+                     && SearchingPartitionPack[Pos+ 4]==0x02
+                     && SearchingPartitionPack[Pos+ 5]==0x05
+                     && SearchingPartitionPack[Pos+ 6]==0x01
+                     && SearchingPartitionPack[Pos+ 7]==0x01
+                     && SearchingPartitionPack[Pos+ 8]==0x0D
+                     && SearchingPartitionPack[Pos+ 9]==0x01
+                     && SearchingPartitionPack[Pos+10]==0x02
+                     && SearchingPartitionPack[Pos+11]==0x01
+                     && SearchingPartitionPack[Pos+12]==0x01
+                     && SearchingPartitionPack[Pos+13]==0x02) //Header Partition Pack
+                    {
+                        switch (SearchingPartitionPack[Pos+14])
+                        {
+                            case 0x02 :
+                            case 0x04 :
+                                        {
+                                        //Filling duration
+                                        F.Close();
+                                        Config->File_IsNotGrowingAnymore=true;
+                                        MediaInfo_Internal MI;
+                                        Ztring ParseSpeed_Save=MI.Option(__T("ParseSpeed_Get"), __T(""));
+                                        Ztring Demux_Save=MI.Option(__T("Demux_Get"), __T(""));
+                                        MI.Option(__T("ParseSpeed"), __T("0"));
+                                        MI.Option(__T("Demux"), Ztring());
+                                        size_t MiOpenResult=MI.Open(File_Name);
+                                        MI.Option(__T("ParseSpeed"), ParseSpeed_Save); //This is a global value, need to reset it. TODO: local value
+                                        MI.Option(__T("Demux"), Demux_Save); //This is a global value, need to reset it. TODO: local value
+                                        if (MiOpenResult)
+                                        {
+                                            Fill(Stream_General, 0, General_Format_Settings, MI.Get(Stream_General, 0, General_Format_Settings), true);
+                                            Fill(Stream_General, 0, General_Duration, MI.Get(Stream_General, 0, General_Duration), true);
+                                            Fill(Stream_General, 0, General_FileSize, MI.Get(Stream_General, 0, General_FileSize), true);
+                                        }
+                                        }
+                                        break;
+                            default   : ;
+                        }
+                    }
+
+            }
+
+            Config->State_Set(((float)Buffer_TotalBytes)/Config->File_Size);
+        }
+    }
+
+    if ((IsCheckingRandomAccessTable || IsCheckingFooterPartitionAddress) && File_Offset+Buffer_Offset+16<File_Size)
+    {
+        if (Buffer_Offset+16>Buffer_Size)
+        {
+            Element_WaitForMoreData();
+            return;
+        }
+        if (CC4(Buffer+Buffer_Offset)!=0x060E2B34 || CC3(Buffer+Buffer_Offset+4)!=0x020501 || CC3(Buffer+Buffer_Offset+8)!=0x0D0102 || CC1(Buffer+Buffer_Offset+12)!=0x01)
+        {
+            if (IsCheckingRandomAccessTable || (IsCheckingFooterPartitionAddress && FooterPartitionAddress_Jumped))
+                TryToFinish(); //No footer
+            else if (IsCheckingFooterPartitionAddress)
+            {
+                IsParsingEnd=true;
+                GoToFromEnd(4); //For random access table
+                FooterPartitionAddress_Jumped=true;
+                Open_Buffer_Unsynch();
+            }
+        }
+        IsCheckingRandomAccessTable=false;
+        IsCheckingFooterPartitionAddress=false;
+    }
+
+    if (Config->ParseSpeed<1.0 && File_Offset+Buffer_Offset+4==File_Size)
+    {
+        int32u Length;
+        Get_B4 (Length,                                         "Length (Random Index)");
+        if (Length>=16+4 && Length<File_Size/2)
+        {
+            GoToFromEnd(Length); //For random access table
+            Open_Buffer_Unsynch();
+        }
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Mxf::Read_Buffer_AfterParsing()
+{
+    if (File_Offset+Buffer_Offset>=IsParsingMiddle_MaxOffset)
+    {
+        Fill();
+        Open_Buffer_Unsynch();
+        Finish();
+        return;
+    }
+
+    if (File_Offset+Buffer_Size>=File_Size)
+    {
+        if (IsParsingEnd)
+        {
+            if (PartitionMetadata_PreviousPartition && RandomIndexMetadatas.empty() && !RandomIndexMetadatas_AlreadyParsed)
+            {
+                Partitions_Pos=0;
+                while (Partitions_Pos<Partitions.size() && Partitions[Partitions_Pos].StreamOffset!=PartitionMetadata_PreviousPartition)
+                    Partitions_Pos++;
+                if (Partitions_Pos==Partitions.size())
+                {
+                    GoTo(PartitionMetadata_PreviousPartition);
+                    Open_Buffer_Unsynch();
+                    return;
+                }
+            }
+        }
+
+        //Checking if we want to seek again
+        if (File_GoTo==(int64u)-1)
+            TryToFinish();
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Mxf::Read_Buffer_Unsynched()
+{
+    //Adapting DataSizeToParse
+    if (Buffer_End)
     {
-        if (Buffer_Size<=Buffer_DataSizeToParse)
+        if (File_GoTo>=Buffer_End //Too much late
+        || File_GoTo<=Buffer_Begin) //Too much early
         {
-            Element_Size=Buffer_Size; //All the buffer is used
-            Buffer_DataSizeToParse-=Buffer_Size;
+            Buffer_Begin=(int64u)-1;
+            Buffer_End=0;
+            Buffer_Header_Size=0;
+            MustSynchronize=true;
+            Synched=false;
         }
         else
+            Synched=true; //Always in clip data
+    }
+
+    for (essences::iterator Essence=Essences.begin(); Essence!=Essences.end(); Essence++)
+        if (Essence->second.Parser)
         {
-            Element_Size=Buffer_DataSizeToParse;
-            Buffer_DataSizeToParse=0;
+            Essence->second.Parser->Open_Buffer_Unsynch();
+            Essence->second.FrameInfo=frame_info();
+            if (!File_GoTo)
+                Essence->second.FrameInfo.DTS=float64_int64s(DTS_Delay*1000000000);
+            Essence->second.Frame_Count_NotParsedIncluded=File_GoTo?(int64u)-1:0;
         }
+    if (File_GoTo)
+        Frame_Count_NotParsedIncluded=(int64u)-1;
+    else
+    {
+        FrameInfo=frame_info();
+        FrameInfo.DTS=float64_int64s(DTS_Delay*1000000000);
+        Frame_Count_NotParsedIncluded=0;
+    }
 
-        Element_Begin();
-        Data_Parse();
-        Element_Offset=Element_Size;
-        Element_End();
+    Partitions_Pos=0;
+    if (Partitions_IsCalculatingHeaderByteCount)
+    {
+        Partitions.erase(Partitions.end()-1);
+        Partitions_IsCalculatingHeaderByteCount=false;
+    }
+    if (Partitions_IsCalculatingSdtiByteCount)
+        Partitions_IsCalculatingSdtiByteCount=false;
+    Essences_FirstEssence_Parsed=false;
+
+    #if MEDIAINFO_SEEK
+        IndexTables_Pos=0;
+    #endif //MEDIAINFO_SEEK
+}
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_DEMUX || MEDIAINFO_SEEK
+bool File_Mxf::DetectDuration ()
+{
+    if (Duration_Detected)
+        return false;
+
+    MediaInfo_Internal MI;
+    MI.Option(__T("File_IsDetectingDuration"), __T("1"));
+    MI.Option(__T("File_KeepInfo"), __T("1"));
+    Ztring ParseSpeed_Save=MI.Option(__T("ParseSpeed_Get"), __T(""));
+    Ztring Demux_Save=MI.Option(__T("Demux_Get"), __T(""));
+    MI.Option(__T("ParseSpeed"), __T("0"));
+    MI.Option(__T("Demux"), Ztring());
+    size_t MiOpenResult=MI.Open(File_Name);
+    MI.Option(__T("ParseSpeed"), ParseSpeed_Save); //This is a global value, need to reset it. TODO: local value
+    MI.Option(__T("Demux"), Demux_Save); //This is a global value, need to reset it. TODO: local value
+    if (!MiOpenResult || MI.Get(Stream_General, 0, General_Format)!=__T("MXF"))
+        return false;
+    Partitions=((File_Mxf*)MI.Info)->Partitions;
+    std::sort(Partitions.begin(), Partitions.end());
+    IndexTables=((File_Mxf*)MI.Info)->IndexTables;
+    std::sort(IndexTables.begin(), IndexTables.end());
+    SDTI_SizePerFrame=((File_Mxf*)MI.Info)->SDTI_SizePerFrame;
+    Clip_Begin=((File_Mxf*)MI.Info)->Clip_Begin;
+    Clip_End=((File_Mxf*)MI.Info)->Clip_End;
+    Clip_Header_Size=((File_Mxf*)MI.Info)->Clip_Header_Size;
+    Clip_Code=((File_Mxf*)MI.Info)->Clip_Code;
+    Tracks=((File_Mxf*)MI.Info)->Tracks; //In one file (*-009.mxf), the TrackNumber is known only at the end of the file (Open and incomplete header/footer)
+    for (tracks::iterator Track=Tracks.begin(); Track!=Tracks.end(); Track++)
+        Track->second.Stream_Finish_Done=false; //Reseting the value, it is not done in this instance
+    if (MI.Get(Stream_General, 0, General_OverallBitRate_Mode)==__T("CBR") && Partitions.size()==2 && Partitions[0].FooterPartition==Partitions[1].StreamOffset && !Descriptors.empty())
+    {
+        //Searching duration
+        int64u Duration=0;
+        for (descriptors::iterator Descriptor=Descriptors.begin(); Descriptor!=Descriptors.end(); Descriptor++)
+            if (Descriptor->second.Duration!=(int64u)-1 && Descriptor->second.Duration)
+            {
+                if (Duration && Duration!=Descriptor->second.Duration)
+                {
+                    Duration=0;
+                    break; //Not supported
+                }
+                Duration=Descriptor->second.Duration;
+            }
+
+        //Computing the count of bytes per frame
+        if (Duration)
+        {
+            int64u Begin=Partitions[0].StreamOffset+Partitions[0].PartitionPackByteCount+Partitions[0].HeaderByteCount+Partitions[0].IndexByteCount;
+            float64 BytesPerFrameF=((float64)(Partitions[0].FooterPartition-Begin)/Duration);
+            OverallBitrate_IsCbrForSure=float64_int64s(BytesPerFrameF);
+            if (OverallBitrate_IsCbrForSure!=BytesPerFrameF) //Testing integrity of the computing
+                OverallBitrate_IsCbrForSure=0;
+        }
     }
+    Duration_Detected=true;
+
+    return true;
 }
+#endif //MEDIAINFO_DEMUX || MEDIAINFO_SEEK
+
+#if MEDIAINFO_SEEK
+size_t File_Mxf::Read_Buffer_Seek (size_t Method, int64u Value, int64u ID)
+{
+    if (ReferenceFiles)
+        return ReferenceFiles->Read_Buffer_Seek(Method, Value, ID);
+
+    //Init
+    if (!Duration_Detected)
+    {
+        if (!DetectDuration())
+            return 0;
+    }
+
+    //Parsing
+    switch (Method)
+    {
+        case 0  :
+                    {
+                    //Calculating the byte count not included in seek information (partition, index...)
+                    Partitions_Pos=0;
+                    while (Partitions_Pos<Partitions.size() && Partitions[Partitions_Pos].StreamOffset<Value)
+                        Partitions_Pos++;
+                    if (Partitions_Pos && (Partitions_Pos==Partitions.size() || Partitions[Partitions_Pos].StreamOffset!=Value))
+                        Partitions_Pos--; //This is the previous item
+                    if (Partitions_Pos>=Partitions.size())
+                    {
+                        GoTo(0);
+                        Open_Buffer_Unsynch();
+                        return 1;
+                    }
+                    int64u StreamOffset_Offset=Partitions[Partitions_Pos].StreamOffset-Partitions[Partitions_Pos].BodyOffset+Partitions[Partitions_Pos].PartitionPackByteCount+Partitions[Partitions_Pos].HeaderByteCount+Partitions[Partitions_Pos].IndexByteCount;
+
+                    //If in header
+                    if ((Clip_Begin!=(int64u)-1 && Value<Clip_Begin) || Value<StreamOffset_Offset)
+                    {
+                        GoTo(0);
+                        Open_Buffer_Unsynch();
+                        return 1;
+                    }
+
+                    if (Buffer_End
+                     && Descriptors.size()==1 && Descriptors.begin()->second.ByteRate!=(int32u)-1 && Descriptors.begin()->second.BlockAlign && Descriptors.begin()->second.BlockAlign!=(int16u)-1  && Descriptors.begin()->second.SampleRate)
+                    {
+                        if (Value>StreamOffset_Offset)
+                        {
+                            float64 BytesPerFrame=Descriptors.begin()->second.ByteRate/Descriptors.begin()->second.SampleRate;
+                            int64u FrameCount=(int64u)((Value-Buffer_Begin)/BytesPerFrame);
+                            int64u SizeBlockAligned=float64_int64s(FrameCount*BytesPerFrame);
+                            SizeBlockAligned/=Descriptors.begin()->second.BlockAlign;
+                            SizeBlockAligned*=Descriptors.begin()->second.BlockAlign;
+
+                            GoTo(Buffer_Begin+SizeBlockAligned);
+                            Open_Buffer_Unsynch();
+                            return 1;
+                        }
+                    }
+                    else if (Buffer_End
+                     && !IndexTables.empty() && IndexTables[0].EditUnitByteCount)
+                    {
+                        int64u Stream_Offset=0;
+                        for (size_t Pos=0; Pos<IndexTables.size(); Pos++)
+                        {
+                            if (IndexTables[Pos].IndexDuration==0 || Value<StreamOffset_Offset+Stream_Offset+IndexTables[Pos].IndexDuration*IndexTables[Pos].EditUnitByteCount)
+                            {
+                                int64u FrameToAdd=(Value-(StreamOffset_Offset+Stream_Offset))/IndexTables[Pos].EditUnitByteCount;
+                                Stream_Offset+=FrameToAdd*IndexTables[Pos].EditUnitByteCount;
+
+                                GoTo(Buffer_Begin+Stream_Offset);
+                                Open_Buffer_Unsynch();
+                                return 1;
+                            }
+                            else
+                                Stream_Offset+=IndexTables[Pos].IndexDuration*IndexTables[Pos].EditUnitByteCount;
+                        }
+                        return 2; //Invalid value
+                    }
+
+                    GoTo(Value);
+                    Open_Buffer_Unsynch();
+                    return 1;
+                    }
+        case 1  :
+                    return Read_Buffer_Seek(0, File_Size*Value/10000, ID);
+        case 2  :   //Timestamp
+                    {
+                        //We transform TimeStamp to a frame number
+                        descriptors::iterator Descriptor;
+                        for (Descriptor=Descriptors.begin(); Descriptor!=Descriptors.end(); Descriptor++)
+                            if (Descriptors.begin()->second.SampleRate)
+                                break;
+                        if (Descriptor==Descriptors.end())
+                            return (size_t)-1; //Not supported
+
+                        if (TimeCode_StartTimecode!=(int64u)-1)
+                        {
+                            int64u Delay=float64_int64s(DTS_Delay*1000000000);
+                            if (Value<Delay)
+                                return 2; //Invalid value
+                            Value-=Delay;
+                        }
+                        Value=float64_int64s(((float64)Value)/1000000000*Descriptor->second.SampleRate);
+                        }
+                    //No break;
+        case 3  :   //FrameNumber
+                    if (Descriptors.size()==1 && Descriptors.begin()->second.ByteRate!=(int32u)-1 && Descriptors.begin()->second.BlockAlign && Descriptors.begin()->second.BlockAlign!=(int16u)-1  && Descriptors.begin()->second.SampleRate)
+                    {
+                        //Config - TODO: merge with the one in Data_Parse()
+                        if (!Essences_FirstEssence_Parsed)
+                        {
+                            if (Demux_UnpacketizeContainer && Descriptors.size()==1 && Descriptors.begin()->second.StreamKind==Stream_Audio)
+                            {
+                                //Configuring bitrate is not available in descriptor
+                                if (Descriptors.begin()->second.ByteRate==(int32u)-1 && Descriptors.begin()->second.Infos.find("SamplingRate")!=Descriptors.begin()->second.Infos.end())
+                                {
+                                    int32u SamplingRate=Descriptors.begin()->second.Infos["SamplingRate"].To_int32u();
+
+                                    if (Descriptors.begin()->second.BlockAlign!=(int16u)-1)
+                                        Descriptors.begin()->second.ByteRate=SamplingRate*Descriptors.begin()->second.BlockAlign;
+                                    else if (Descriptors.begin()->second.QuantizationBits!=(int8u)-1)
+                                        Descriptors.begin()->second.ByteRate=SamplingRate*Descriptors.begin()->second.QuantizationBits/8;
+                                }
+
+                                //Configuring EditRate if needed (e.g. audio at 48000 Hz)
+                                if (Demux_Rate) //From elsewhere
+                                {
+                                    Descriptors.begin()->second.SampleRate=Demux_Rate;
+                                }
+                                else if (Descriptors.begin()->second.SampleRate>1000)
+                                {
+                                    Descriptors.begin()->second.SampleRate=25; //Default value
+                                }
+                            }
+
+                            Essences_FirstEssence_Parsed=true;
+                        }
+
+                        float64 BytesPerFrame=Descriptors.begin()->second.ByteRate/Descriptors.begin()->second.SampleRate;
+                        int64u StreamOffset=(int64u)(Value*BytesPerFrame);
+                        StreamOffset/=Descriptors.begin()->second.BlockAlign;
+                        StreamOffset*=Descriptors.begin()->second.BlockAlign;
+
+                        //Calculating the byte count not included in seek information (partition, index...)
+                        int64u StreamOffset_Offset=0;
+                        Partitions_Pos=0;
+                        while (Partitions_Pos<Partitions.size() && Partitions[Partitions_Pos].StreamOffset<=StreamOffset_Offset+StreamOffset+Value*SDTI_SizePerFrame)
+                        {
+                            StreamOffset_Offset+=Partitions[Partitions_Pos].PartitionPackByteCount+Partitions[Partitions_Pos].HeaderByteCount+Partitions[Partitions_Pos].IndexByteCount;
+                            Partitions_Pos++;
+                        }
+
+                        if (Clip_Begin!=(int64u)-1)
+                        {
+                            Buffer_Begin=Clip_Begin;
+                            Buffer_End=Clip_End;
+                            Buffer_Header_Size=Clip_Header_Size;
+                            Code=Clip_Code;
+                            MustSynchronize=false;
+                            #if MEDIAINFO_DEMUX
+                                if (Buffer_End && Demux_UnpacketizeContainer && Essences.size()==1 && Essences.begin()->second.Parser && Essences.begin()->second.Parser->Demux_UnpacketizeContainer)
+                                {
+                                    Essences.begin()->second.Parser->Demux_Level=1; //Frame
+                                    Essences.begin()->second.Parser->Demux_UnpacketizeContainer=false;
+                                }
+                            #endif //MEDIAINFO_DEMUX
+                        }
+
+                        GoTo(StreamOffset_Offset+Buffer_Header_Size+StreamOffset+Value*SDTI_SizePerFrame);
+                        Open_Buffer_Unsynch();
+                        return 1;
+                    }
+                    else if (!IndexTables.empty() && IndexTables[0].EditUnitByteCount)
+                    {
+                        if (Descriptors.size()==1 && Descriptors.begin()->second.SampleRate!=IndexTables[0].IndexEditRate)
+                        {
+                            float64 ValueF=(float64)Value;
+                            ValueF/=Descriptors.begin()->second.SampleRate;
+                            ValueF*=IndexTables[0].IndexEditRate;
+                            Value=float64_int64s(ValueF);
+                        }
+
+                        if (IndexTables[IndexTables.size()-1].IndexDuration && IndexTables[IndexTables.size()-1].IndexStartPosition!=(int64u)-1 && Value>=IndexTables[IndexTables.size()-1].IndexStartPosition+IndexTables[IndexTables.size()-1].IndexDuration) //Considering IndexDuration=0 as unlimited
+                            return 2; //Invalid value
+
+                        int64u StreamOffset=0;
+                        for (size_t Pos=0; Pos<IndexTables.size(); Pos++)
+                        {
+                            if (IndexTables[Pos].IndexDuration && Value>IndexTables[Pos].IndexStartPosition+IndexTables[Pos].IndexDuration) //Considering IndexDuration=0 as unlimited
+                                StreamOffset+=IndexTables[Pos].EditUnitByteCount*IndexTables[Pos].IndexDuration;
+                            else
+                            {
+                                StreamOffset+=IndexTables[Pos].EditUnitByteCount*(Value-IndexTables[Pos].IndexStartPosition);
+                                break;
+                            }
+                        }
+
+                        //Calculating the byte count not included in seek information (partition, index...)
+                        int64u StreamOffset_Offset=0;
+                        Partitions_Pos=0;
+                        while (Partitions_Pos<Partitions.size() && Partitions[Partitions_Pos].StreamOffset<=StreamOffset_Offset+StreamOffset+Value*SDTI_SizePerFrame)
+                        {
+                            StreamOffset_Offset+=Partitions[Partitions_Pos].PartitionPackByteCount+Partitions[Partitions_Pos].HeaderByteCount+Partitions[Partitions_Pos].IndexByteCount;
+                            Partitions_Pos++;
+                        }
+
+                        if (Clip_Begin!=(int64u)-1)
+                        {
+                            Buffer_Begin=Clip_Begin;
+                            Buffer_End=Clip_End;
+                            Buffer_Header_Size=Clip_Header_Size;
+                            Code=Clip_Code;
+                            MustSynchronize=false;
+                            #if MEDIAINFO_DEMUX
+                                if (Buffer_End && Demux_UnpacketizeContainer && Essences.size()==1 && Essences.begin()->second.Parser && Essences.begin()->second.Parser->Demux_UnpacketizeContainer)
+                                {
+                                    Essences.begin()->second.Parser->Demux_Level=1; //Frame
+                                    Essences.begin()->second.Parser->Demux_UnpacketizeContainer=false;
+                                }
+                            #endif //MEDIAINFO_DEMUX
+                        }
+
+                        GoTo(StreamOffset_Offset+Buffer_Header_Size+StreamOffset+Value*SDTI_SizePerFrame);
+                        Open_Buffer_Unsynch();
+                        return 1;
+                    }
+                    else if (!IndexTables.empty() && !IndexTables[0].Entries.empty())
+                    {
+                        for (size_t Pos=0; Pos<IndexTables.size(); Pos++)
+                        {
+                            if (Value>=IndexTables[Pos].IndexStartPosition && Value<IndexTables[Pos].IndexStartPosition+IndexTables[Pos].IndexDuration)
+                            {
+                                while (Value>=IndexTables[Pos].IndexStartPosition && IndexTables[Pos].Entries[(size_t)(Value-IndexTables[Pos].IndexStartPosition)].Type)
+                                {
+                                    Value--;
+                                    if (Value<IndexTables[Pos].IndexStartPosition)
+                                    {
+                                        if (Pos==0)
+                                            break; //There is a problem
+                                        Pos--; //In previous index
+                                    }
+                                }
+
+                                int64u StreamOffset=IndexTables[Pos].Entries[(size_t)(Value-IndexTables[Pos].IndexStartPosition)].StreamOffset;
+
+                                //Calculating the byte count not included in seek information (partition, index...)
+                                int64u StreamOffset_Offset=0;
+                                Partitions_Pos=0;
+                                while (Partitions_Pos<Partitions.size() && Partitions[Partitions_Pos].StreamOffset<=StreamOffset_Offset+StreamOffset+Value*SDTI_SizePerFrame)
+                                {
+                                    StreamOffset_Offset+=Partitions[Partitions_Pos].PartitionPackByteCount+Partitions[Partitions_Pos].HeaderByteCount+Partitions[Partitions_Pos].IndexByteCount;
+                                    Partitions_Pos++;
+                                }
+
+                                if (Clip_Begin!=(int64u)-1)
+                                {
+                                    Buffer_Begin=Clip_Begin;
+                                    Buffer_End=Clip_End;
+                                    Buffer_Header_Size=Clip_Header_Size;
+                                    Code=Clip_Code;
+                                    MustSynchronize=false;
+                                    #if MEDIAINFO_DEMUX
+                                        if (Buffer_End && Demux_UnpacketizeContainer && Essences.size()==1 && Essences.begin()->second.Parser && Essences.begin()->second.Parser->Demux_UnpacketizeContainer)
+                                        {
+                                            Essences.begin()->second.Parser->Demux_Level=1; //Frame
+                                            Essences.begin()->second.Parser->Demux_UnpacketizeContainer=false;
+                                        }
+                                    #endif //MEDIAINFO_DEMUX
+                                }
+
+                                GoTo(StreamOffset_Offset+Buffer_Header_Size+StreamOffset+Value*SDTI_SizePerFrame);
+                                Open_Buffer_Unsynch();
+                                return 1;
+                            }
+                        }
+                        return 2; //Invalid value
+                    }
+                    else if (OverallBitrate_IsCbrForSure)
+                    {
+                        int64u Begin=Partitions[0].StreamOffset+Partitions[0].PartitionPackByteCount+Partitions[0].HeaderByteCount+Partitions[0].IndexByteCount;
+                        GoTo(Begin+Value*OverallBitrate_IsCbrForSure);
+                        Open_Buffer_Unsynch();
+                        return 1;
+                    }
+                    else
+                        return (size_t)-1; //Not supported
+        default :   return (size_t)-1; //Not supported
+    }
+}
+#endif //MEDIAINFO_SEEK
 
 //***************************************************************************
 // Buffer - File header
@@ -1046,6 +2416,10 @@
 //---------------------------------------------------------------------------
 bool File_Mxf::FileHeader_Begin()
 {
+    //DCA uses buffer interface without filename
+    if (File_Name.empty())
+        File_Name=Config->File_FileName_Get();
+
     return true;
 }
 
@@ -1057,6 +2431,17 @@
 bool File_Mxf::Synchronize()
 {
     //Synchronizing
+    while (Buffer_Offset+4<=Buffer_Size && (Buffer[Buffer_Offset  ]!=0x06
+                                         || Buffer[Buffer_Offset+1]!=0x0E
+                                         || Buffer[Buffer_Offset+2]!=0x2B
+                                         || Buffer[Buffer_Offset+3]!=0x34))
+    {
+        Buffer_Offset++;
+        while (Buffer_Offset<Buffer_Size && Buffer[Buffer_Offset]!=0x06)
+            Buffer_Offset++;
+    }
+
+
     while (Buffer_Offset+4<=Buffer_Size
         && CC4(Buffer+Buffer_Offset)!=0x060E2B34)
         Buffer_Offset++;
@@ -1064,8 +2449,6 @@
     //Parsing last bytes if needed
     if (Buffer_Offset+4>Buffer_Size)
     {
-        if (Buffer_Offset+4==Buffer_Size && CC4(Buffer+Buffer_Offset)!=0x060E2B34)
-            Buffer_Offset++;
         if (Buffer_Offset+3==Buffer_Size && CC3(Buffer+Buffer_Offset)!=0x060E2B)
             Buffer_Offset++;
         if (Buffer_Offset+2==Buffer_Size && CC2(Buffer+Buffer_Offset)!=0x060E)
@@ -1080,6 +2463,11 @@
         Accept();
 
         Fill(Stream_General, 0, General_Format, "MXF");
+
+        File_Buffer_Size_Hint_Pointer=Config->File_Buffer_Size_Hint_Pointer_Get();
+        #if MEDIAINFO_DEMUX
+            Demux_Interleave=Config->File_Demux_Interleave_Get();
+        #endif //MEDIAINFO_DEMUX
     }
 
     //Synched is OK
@@ -1099,14 +2487,27 @@
 
     //Quick test of synchro
     if (CC4(Buffer+Buffer_Offset)!=0x060E2B34)
-    {
         Synched=false;
-        Trusted++;
-    }
 
-    //Quick search
-    if (!Synched && !Synchronize())
-        return false;
+    //Trace config
+    #if MEDIAINFO_TRACE
+        if (Synched)
+        {
+            int64u Compare=CC8(Buffer+Buffer_Offset+ 4);
+            if (Compare==0x010201010D010301LL //Raw stream
+             || (Compare==0x0101010203010210LL && CC1(Buffer+Buffer_Offset+12)==0x01) //Filler
+             || (Compare==0x020501010D010301LL && CC3(Buffer+Buffer_Offset+12)==0x040101) //SDTI Package Metadata Pack
+             || (Compare==0x024301010D010301LL && CC3(Buffer+Buffer_Offset+12)==0x040102) //SDTI Package Metadata Set
+             || (Compare==0x025301010D010301LL && CC3(Buffer+Buffer_Offset+12)==0x140201)) //System Scheme 1
+            {
+                Trace_Layers_Update(8); //Stream
+            }
+            else
+            {
+                Trace_Layers_Update(0); //Container1
+            }
+        }
+    #endif //MEDIAINFO_TRACE
 
     //We continue
     return true;
@@ -1117,104 +2518,317 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
+bool File_Mxf::Header_Begin()
+{
+    while (Buffer_End)
+    {
+        #if MEDIAINFO_DEMUX
+            if (Demux_UnpacketizeContainer && Descriptors.size()==1 && Descriptors.begin()->second.ByteRate!=(int32u)-1 && Descriptors.begin()->second.BlockAlign && Descriptors.begin()->second.BlockAlign!=(int16u)-1  && Descriptors.begin()->second.SampleRate)
+            {
+                float64 BytesPerFrame=((float64)Descriptors.begin()->second.ByteRate)/Descriptors.begin()->second.SampleRate;
+                int64u FramesAlreadyParsed=float64_int64s(((float64)(File_Offset+Buffer_Offset-Buffer_Begin))/BytesPerFrame);
+                Element_Size=float64_int64s(Descriptors.begin()->second.ByteRate/Descriptors.begin()->second.SampleRate*(FramesAlreadyParsed+1));
+                Element_Size/=Descriptors.begin()->second.BlockAlign;
+                Element_Size*=Descriptors.begin()->second.BlockAlign;
+                Element_Size-=File_Offset+Buffer_Offset-Buffer_Begin;
+                while (Element_Size && File_Offset+Buffer_Offset+Element_Size>Buffer_End)
+                    Element_Size-=Descriptors.begin()->second.BlockAlign;
+                if (Buffer_Offset+Element_Size>Buffer_Size)
+                    return false;
+            }
+            else if (Demux_UnpacketizeContainer && !IndexTables.empty() && IndexTables[0].EditUnitByteCount)
+            {
+                //Calculating the byte count not included in seek information (partition, index...)
+                int64u StreamOffset_Offset;
+                if (!Partitions.empty())
+                {
+                    while (Partitions_Pos<Partitions.size() && Partitions[Partitions_Pos].StreamOffset<File_Offset+Buffer_Offset-Header_Size)
+                        Partitions_Pos++;
+                    if (Partitions_Pos && (Partitions_Pos==Partitions.size() || Partitions[Partitions_Pos].StreamOffset!=File_Offset+Buffer_Offset-Header_Size))
+                        Partitions_Pos--; //This is the previous item
+                    StreamOffset_Offset=Partitions[Partitions_Pos].StreamOffset-Partitions[Partitions_Pos].BodyOffset+Partitions[Partitions_Pos].PartitionPackByteCount+Partitions[Partitions_Pos].HeaderByteCount+Partitions[Partitions_Pos].IndexByteCount;
+                }
+                else
+                    StreamOffset_Offset=0;
+
+                int64u Position=0;
+                for (size_t Pos=0; Pos<IndexTables.size(); Pos++)
+                {
+                    if (IndexTables[Pos].IndexDuration && File_Offset+Buffer_Offset>=StreamOffset_Offset+Buffer_Header_Size+Position+IndexTables[Pos].IndexDuration*IndexTables[Pos].EditUnitByteCount) //Considering IndexDuration==0 as unlimited
+                        Position+=IndexTables[Pos].EditUnitByteCount*IndexTables[Pos].IndexDuration;
+                    else
+                    {
+                        Element_Size=IndexTables[Pos].EditUnitByteCount;
+                        if (File_Offset+Buffer_Offset+Element_Size>Buffer_End)
+                        {
+                            Element_Size=Buffer_End-(File_Offset+Buffer_Offset);
+                            break; //There is a problem
+                        }
+
+                        if (Buffer_Offset+Element_Size>Buffer_Size)
+                        {
+                            //Hints
+                            if (File_Buffer_Size_Hint_Pointer)
+                            {
+                                size_t Buffer_Size_Target=(size_t)(Buffer_Offset+Element_Size-Buffer_Size+24); //+24 for next packet header
+                                if ((*File_Buffer_Size_Hint_Pointer)<Buffer_Size_Target)
+                                    (*File_Buffer_Size_Hint_Pointer)=Buffer_Size_Target;
+                            }
+
+                            return false;
+                        }
+                        break;
+                    }
+                }
+
+                if (Buffer_Offset+(size_t)Element_Size>Buffer_Size)
+                    Element_Size=Buffer_Size-Buffer_Offset; //There is a problem
+            }
+            else if (Demux_UnpacketizeContainer && !IndexTables.empty() && !IndexTables[0].Entries.empty())
+            {
+                //Calculating the byte count not included in seek information (partition, index...)
+                int64u StreamOffset_Offset;
+                if (!Partitions.empty())
+                {
+                    while (Partitions_Pos<Partitions.size() && Partitions[Partitions_Pos].StreamOffset<File_Offset+Buffer_Offset-Header_Size)
+                        Partitions_Pos++;
+                    if (Partitions_Pos && (Partitions_Pos==Partitions.size() || Partitions[Partitions_Pos].StreamOffset!=File_Offset+Buffer_Offset-Header_Size))
+                        Partitions_Pos--; //This is the previous item
+                    StreamOffset_Offset=Partitions[Partitions_Pos].StreamOffset-Partitions[Partitions_Pos].BodyOffset+Partitions[Partitions_Pos].PartitionPackByteCount+Partitions[Partitions_Pos].HeaderByteCount+Partitions[Partitions_Pos].IndexByteCount;
+                }
+                else
+                    StreamOffset_Offset=0;
+
+                int64u StreamOffset=File_Offset+Buffer_Offset-StreamOffset_Offset;
+                for (size_t Pos=0; Pos<IndexTables.size(); Pos++)
+                {
+                    //Searching the right index
+                    if (!IndexTables[Pos].Entries.empty() && StreamOffset>=IndexTables[Pos].Entries[0].StreamOffset+(IndexTables[Pos].IndexStartPosition)*SDTI_SizePerFrame && (Pos+1>=IndexTables.size() || StreamOffset<IndexTables[Pos+1].Entries[0].StreamOffset+(IndexTables[Pos+1].IndexStartPosition)*SDTI_SizePerFrame))
+                    {
+                        //Searching the frame pos
+                        for (size_t EntryPos=0; EntryPos<IndexTables[Pos].Entries.size(); EntryPos++)
+                        {
+                            //Testing coherency
+                            int64u Entry0_StreamOffset=0; //For coherency checking
+                            int64u Entry_StreamOffset=IndexTables[Pos].Entries[EntryPos].StreamOffset+(IndexTables[Pos].IndexStartPosition+EntryPos)*SDTI_SizePerFrame;
+                            int64u Entry1_StreamOffset=File_Size; //For coherency checking
+                            if (EntryPos==0 && Pos && IndexTables[Pos-1].Entries.empty())
+                                Entry0_StreamOffset=IndexTables[Pos-1].Entries[IndexTables[Pos-1].Entries.size()-1].StreamOffset+(IndexTables[Pos].IndexStartPosition+EntryPos-1)*SDTI_SizePerFrame;
+                            else if (EntryPos)
+                                Entry0_StreamOffset=IndexTables[Pos].Entries[EntryPos-1].StreamOffset+(IndexTables[Pos].IndexStartPosition+EntryPos-1)*SDTI_SizePerFrame;
+                            if (EntryPos+1<IndexTables[Pos].Entries.size())
+                                Entry1_StreamOffset=IndexTables[Pos].Entries[EntryPos+1].StreamOffset+(IndexTables[Pos].IndexStartPosition+EntryPos+1)*SDTI_SizePerFrame;
+                            else if (Pos+1<IndexTables.size() && !IndexTables[Pos+1].Entries.empty())
+                                Entry1_StreamOffset=IndexTables[Pos+1].Entries[0].StreamOffset+(IndexTables[Pos].IndexStartPosition+EntryPos+1)*SDTI_SizePerFrame;
+
+                            if (Entry0_StreamOffset>Entry_StreamOffset || Entry_StreamOffset>Entry1_StreamOffset)
+                                break; //Problem
+
+                            if (StreamOffset>=Entry_StreamOffset && StreamOffset<Entry1_StreamOffset)
+                            {
+                                Element_Size=StreamOffset_Offset+Buffer_Header_Size+Entry1_StreamOffset-(File_Offset+Buffer_Offset);
+                                if (File_Offset+Buffer_Offset+Element_Size>Buffer_End)
+                                {
+                                    Element_Size=Buffer_End-(File_Offset+Buffer_Offset);
+                                    break; //There is a problem
+                                }
+
+                                if (Buffer_Offset+Element_Size>Buffer_Size)
+                                {
+                                    //Hints
+                                    if (File_Buffer_Size_Hint_Pointer)
+                                    {
+                                        size_t Buffer_Size_Target=(size_t)(Buffer_Offset+Element_Size-Buffer_Size+24); //+24 for next packet header
+                                        if ((*File_Buffer_Size_Hint_Pointer)<Buffer_Size_Target)
+                                            (*File_Buffer_Size_Hint_Pointer)=Buffer_Size_Target;
+                                    }
+
+                                    return false;
+                                }
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+            else
+        #endif //MEDIAINFO_DEMUX
+            if (File_Offset+Buffer_Size<=Buffer_End)
+                Element_Size=Buffer_Size-Buffer_Offset; //All the buffer is used
+            else
+                Element_Size=Buffer_End-(File_Offset+Buffer_Offset);
+
+        Element_Begin0();
+        Data_Parse();
+        Buffer_Offset+=(size_t)Element_Size;
+        Element_Size-=Element_Offset;
+        Element_Offset=0;
+        Element_End0();
+
+        if (Buffer_Offset>=Buffer_Size)
+            return false;
+
+        #if MEDIAINFO_DEMUX
+            if (Config->Demux_EventWasSent)
+                return false;
+        #endif //MEDIAINFO_DEMUX
+    }
+
+    return true;
+}
+
+//---------------------------------------------------------------------------
 void File_Mxf::Header_Parse()
 {
     //Parsing
-    int8u Length;
+    int64u Length;
     Get_UL(Code,                                                "Code", NULL);
-    Get_B1(Length,                                              "Length");
-    int64u Length_Final;
-    if (Length<0x80)
+    Get_BER(Length,                                             "Length");
+
+    //Filling
+    int32u Code_Compare1=Code.hi>>32;
+    int32u Code_Compare2=(int32u)Code.hi;
+    int32u Code_Compare3=Code.lo>>32;
+    int32u Code_Compare4=(int32u)Code.lo;
+    if (Partitions_IsCalculatingHeaderByteCount)
     {
-        Length_Final=Length;
+        if (!(Code_Compare1==Elements::Filler011
+           && (Code_Compare2&0xFFFFFF00)==(Elements::Filler012&0xFFFFFF00)
+           && Code_Compare3==Elements::Filler013))
+        {
+            Partitions_IsCalculatingHeaderByteCount=false;
+            if (Partitions_Pos<Partitions.size())
+                Partitions[Partitions_Pos].PartitionPackByteCount=File_Offset+Buffer_Offset-Partitions[Partitions_Pos].StreamOffset;
+        }
     }
-    else
+    if (Partitions_IsCalculatingSdtiByteCount)
     {
-        Length&=0x7F;
-        switch (Length)
+        if (!((Code_Compare1==Elements::SDTI_SystemMetadataPack1
+            && (Code_Compare2&0xFF00FFFF)==(Elements::SDTI_SystemMetadataPack2&0xFF00FFFF) //Independent of Category
+            && Code_Compare3==Elements::SDTI_SystemMetadataPack3
+            && (Code_Compare4&0xFFFF0000)==(Elements::SDTI_SystemMetadataPack4&0xFFFF0000))
+          || ((Code_Compare1==Elements::Filler011
+            && (Code_Compare2&0xFFFFFF00)==(Elements::Filler012&0xFFFFFF00)
+            && Code_Compare3==Elements::Filler013))))
         {
-            case 1 :
-                    {
-                    int8u  Length1;
-                    Get_B1(Length1,                             "Length");
-                    Length_Final=Length1;
-                    }
-                    break;
-            case 2 :
-                    {
-                    int16u Length2;
-                    Get_B2(Length2,                             "Length");
-                    Length_Final=Length2;
-                    }
-                    break;
-            case 3 :
-                    {
-                    int32u Length3;
-                    Get_B3(Length3,                             "Length");
-                    Length_Final=Length3;
-                    }
-                    break;
-            case 4 :
-                    {
-                    int32u Length4;
-                    Get_B4(Length4,                             "Length");
-                    Length_Final=Length4;
-                    }
-                    break;
-            case 5 :
-                    {
-                    int64u Length5;
-                    Get_B5(Length5,                             "Length");
-                    Length_Final=Length5;
-                    }
-                    break;
-            case 6 :
-                    {
-                    int64u Length6;
-                    Get_B6(Length6,                             "Length");
-                    Length_Final=Length6;
-                    }
-                    break;
-            case 7 :
-                    {
-                    int64u Length7;
-                    Get_B7(Length7,                             "Length");
-                    Length_Final=Length7;
-                    }
-                    break;
-            case 8 :
+            if (Partitions_Pos<Partitions.size() && !SDTI_IsInIndexStreamOffset)
+                SDTI_SizePerFrame=File_Offset+Buffer_Offset-(Partitions[Partitions_Pos].StreamOffset+Partitions[Partitions_Pos].PartitionPackByteCount+Partitions[Partitions_Pos].HeaderByteCount);
+            Partitions_IsCalculatingSdtiByteCount=false;
+        }
+    }
+
+    #if MEDIAINFO_NEXTPACKET && MEDIAINFO_DEMUX
+        if (!Demux_HeaderParsed && !Partitions.empty() && Partitions[Partitions.size()-1].StreamOffset+Partitions[Partitions.size()-1].PartitionPackByteCount+Partitions[Partitions.size()-1].HeaderByteCount+Partitions[Partitions.size()-1].IndexByteCount==File_Offset+Buffer_Offset)
+        {
+            Demux_HeaderParsed=true;
+
+            //Testing locators
+            Locators_CleanUp();
+
+            if (Config->NextPacket_Get() && Config->Event_CallBackFunction_IsSet())
+            {
+                if (Locators.empty())
+                {
+                    Config->Demux_EventWasSent=true; //First set is to indicate the user that header is parsed
+                    return;
+                }
+            }
+        }
+    #endif //MEDIAINFO_NEXTPACKET && MEDIAINFO_DEMUX
+
+    #if MEDIAINFO_DEMUX || MEDIAINFO_SEEK
+        if (IsParsingEnd && PartitionPack_Parsed && !Partitions.empty() && Partitions[Partitions.size()-1].StreamOffset+Partitions[Partitions.size()-1].PartitionPackByteCount+Partitions[Partitions.size()-1].HeaderByteCount+Partitions[Partitions.size()-1].IndexByteCount==File_Offset+Buffer_Offset
+         && !(Code_Compare1==Elements::RandomIndexMetadata1 && Code_Compare2==Elements::RandomIndexMetadata2 && Code_Compare3==Elements::RandomIndexMetadata3 && Code_Compare4==Elements::RandomIndexMetadata4))
+        {
+            if (RandomIndexMetadatas.empty())
+            {
+                if (!RandomIndexMetadatas_AlreadyParsed)
+                {
+                    Partitions_Pos=0;
+                    while (Partitions_Pos<Partitions.size() && Partitions[Partitions_Pos].StreamOffset!=PartitionMetadata_PreviousPartition)
+                        Partitions_Pos++;
+                    if (Partitions_Pos==Partitions.size())
                     {
-                    int64u Length8;
-                    Get_B8(Length8,                             "Length");
-                    Length_Final=Length8;
+                        GoTo(PartitionMetadata_PreviousPartition);
+                        Open_Buffer_Unsynch();
                     }
-                    break;
-            default: Length_Final=0; //Problem
+                    else
+                        TryToFinish();
+                }
+            }
+            else
+            {
+                GoTo(RandomIndexMetadatas[0].ByteOffset);
+                RandomIndexMetadatas.erase(RandomIndexMetadatas.begin());
+                PartitionPack_Parsed=false;
+                Open_Buffer_Unsynch();
+            }
+            return;
         }
-    }
+    #endif //MEDIAINFO_DEMUX || MEDIAINFO_SEEK
 
-    //Filling
-    if (Buffer_Offset+Length_Final>(size_t)-1 || Buffer_Offset+(size_t)Length_Final>Buffer_Size)
+    if (Buffer_Offset+Element_Offset+Length>(size_t)-1 || Buffer_Offset+(size_t)(Element_Offset+Length)>Buffer_Size) //Not complete
     {
-        int32u Code_Compare1=Code.hi>>32;
-        int32u Code_Compare2=(int32u)Code.hi;
-        int32u Code_Compare3=Code.lo>>32;
-        if (Code_Compare1==0x060E2B34
-         && Code_Compare2==0x01020101
-         && Code_Compare3==0x0D010301)
-        {
-            Buffer_DataSizeToParse_Complete=Length_Final;
-            Length_Final=Buffer_Size-(Buffer_Offset+Element_Offset);
-            Buffer_DataSizeToParse=Buffer_DataSizeToParse_Complete-Length_Final;
+        #if MEDIAINFO_DEMUX || MEDIAINFO_SEEK
+        if (Length>File_Size/2) //Divided by 2 for testing if this is a big chunk = Clip based and not frames.
+        {
+            //Calculating the byte count not included in seek information (partition, index...)
+            int64u StreamOffset_Offset;
+            if (!Partitions.empty())
+            {
+                while (Partitions_Pos<Partitions.size() && Partitions[Partitions_Pos].StreamOffset<File_Offset+Buffer_Offset-Header_Size)
+                    Partitions_Pos++;
+                if (Partitions_Pos && (Partitions_Pos==Partitions.size() || Partitions[Partitions_Pos].StreamOffset!=File_Offset+Buffer_Offset-Header_Size))
+                    Partitions_Pos--; //This is the previous item
+                StreamOffset_Offset=Partitions[Partitions_Pos].StreamOffset-Partitions[Partitions_Pos].BodyOffset+Partitions[Partitions_Pos].PartitionPackByteCount+Partitions[Partitions_Pos].HeaderByteCount+Partitions[Partitions_Pos].IndexByteCount;
+            }
+            else
+                StreamOffset_Offset=0;
+
+            if (StreamOffset_Offset<=File_Offset+Buffer_Offset
+             && !Partitions_IsFooter
+             && !(Code_Compare1==Elements::OpenIncompleteHeaderPartition1   //Skipping any kind of Partition
+               && Code_Compare2==Elements::OpenIncompleteHeaderPartition2
+               && Code_Compare3==Elements::OpenIncompleteHeaderPartition3)
+             && !(Code_Compare1==Elements::IndexTableSegment1               //Skipping any kind of IndexTableSegment
+               && Code_Compare2==Elements::IndexTableSegment2
+               && Code_Compare3==Elements::IndexTableSegment3))
+            {
+                Clip_Begin=Buffer_Begin=File_Offset+Buffer_Offset+Element_Offset;
+                Clip_End=Buffer_End=Buffer_Begin+Length;
+                Clip_Header_Size=Buffer_Header_Size=Element_Offset;
+                Clip_Code=Code;
+                MustSynchronize=false;
+                Length=0;
+            }
         }
-        else
+
+        if (Clip_Begin==(int64u)-1)
+        #endif //MEDIAINFO_DEMUX || MEDIAINFO_SEEK
         {
-            Element_WaitForMoreData();
-            return;
+            if (Length<=File_Size/2) //Divided by 2 for testing if this is a big chunk = Clip based and not frames.))
+            {
+                if (File_Buffer_Size_Hint_Pointer)
+                {
+                    int64u Buffer_Size_Target=(size_t)(Buffer_Offset+Element_Offset+Length-Buffer_Size+24); //+24 for next packet header
+
+                    if ((*File_Buffer_Size_Hint_Pointer)<Buffer_Size_Target)
+                        (*File_Buffer_Size_Hint_Pointer)=(size_t)Buffer_Size_Target;
+                }
+
+
+                Element_WaitForMoreData();
+                return;
+            }
         }
     }
-    Header_Fill_Code(0, Ztring::ToZtring(Code.hi, 16)+Ztring::ToZtring(Code.lo, 16));
-    Header_Fill_Size(Element_Offset+Length_Final);
+
+    #if MEDIAINFO_TRACE
+        Header_Fill_Code(0, Ztring::ToZtring(Code.hi, 16)+Ztring::ToZtring(Code.lo, 16));
+    #else //MEDIAINFO_TRACE
+        Header_Fill_Code(0);
+    #endif //MEDIAINFO_TRACE
+    Header_Fill_Size(Element_Offset+Length);
 }
 
 //---------------------------------------------------------------------------
@@ -1237,8 +2851,12 @@
     { \
         if (!Element_IsComplete_Get()) \
         { \
-            Element_WaitForMoreData(); \
-            return; \
+            if (Buffer_End==0) \
+            { \
+                Element_WaitForMoreData(); \
+                return; \
+            } \
+            Skip_XX(Element_Size, "Data"); \
         } \
         Element_Name(_NAME); \
         switch (Code_Compare2>>24) \
@@ -1247,14 +2865,15 @@
             case 0x02 : switch ((int8u)(Code_Compare2>>16)) \
                         { \
                             case 0x05 : _ELEMENT(); break; \
+                            case 0x43 : _ELEMENT(); break; \
                             case 0x53 : \
                                         while(Element_Offset<Element_Size) \
                                         { \
-                                            Element_Begin(); \
-                                            Element_Begin("Header"); \
+                                            Element_Begin0(); \
+                                            Element_Begin1("Header"); \
                                                 Get_B2 (Code2,                                  "Code"); \
                                                 Get_B2 (Length2,                                "Length"); \
-                                            Element_End(); \
+                                            Element_End0(); \
                                             Element_Name(Ztring().From_CC2(Code2)); \
                                             \
                                             int64u End=Element_Offset+Length2; \
@@ -1262,243 +2881,511 @@
                                             if (Element_Offset<End) \
                                                 Skip_XX(End-Element_Offset,                     "Unknown"); \
                                             \
-                                            Element_End(4+Length2); \
+                                            Element_End0(); \
                                         } \
                                         break; \
+                            case 0x63 : _ELEMENT(); break; \
                             default   : Skip_XX(Element_Size,                                   "Unknown"); \
                         } \
         } \
     } \
 
-
+    //Parsing
     if (0) {}
-    ELEMENT(AES3PCMDescriptor,                                  "AES3 Descriptor")
-    ELEMENT(CDCIEssenceDescriptor,                              "CDCI Essence Descriptor")
-    ELEMENT(ClosedHeader,                                       "Closed Header Partition Pack")
-    ELEMENT(ClosedCompleteHeader,                               "Closed Complete Header Partition Pack")
-    ELEMENT(CompleteBody,                                       "CompleteBody")
-    ELEMENT(CompleteFooter,                                     "CompleteFooter")
-    ELEMENT(CompleteHeader,                                     "CompleteHeader")
+    ELEMENT(Filler01,                                           "Filler")
+    ELEMENT(Filler02,                                           "Padding")
+    ELEMENT(TerminatingFiller,                                  "Terminating Filler")
+    ELEMENT(XmlDocumentText,                                    "XML Document Text")
+    ELEMENT(Sequence,                                           "Sequence")
+    ELEMENT(SourceClip,                                         "Source Clip")
+    ELEMENT(TimecodeComponent,                                  "Timecode Component")
     ELEMENT(ContentStorage,                                     "Content Storage")
-    ELEMENT(DMSegment,                                          "Descriptive Metadata Segment")
     ELEMENT(EssenceContainerData,                               "Essence Container Data")
-    ELEMENT(EventTrack,                                         "Event track")
-    ELEMENT(GenericSoundEssenceDescriptor,                      "Generic Sound Essence Descriptor")
+    ELEMENT(CDCIEssenceDescriptor,                              "CDCI Essence Descriptor")
+    ELEMENT(RGBAEssenceDescriptor,                              "RGBA Essence Descriptor")
+    ELEMENT(Preface,                                            "Preface")
     ELEMENT(Identification,                                     "Identification")
-    ELEMENT(IndexTableSegment,                                  "Index Table (Segment)")
-    ELEMENT(JPEG2000PictureSubDescriptor,                       "JPEG 2000 Picture Sub Descriptor")
-    ELEMENT(MaterialPackage,                                    "Material Package")
-    ELEMENT(MultipleDescriptor,                                 "Multiple Descriptor")
-    ELEMENT(MPEG2VideoDescriptor,                               "MPEG-2 Video Descriptor")
     ELEMENT(NetworkLocator,                                     "Network Locator")
-    ELEMENT(OpenCompleteBodyPartition,                          "OpenCompleteBodyPartition")
-    ELEMENT(OpenHeader,                                         "OpenHeader")
-    ELEMENT(Preface,                                            "Preface")
-    ELEMENT(Padding,                                            "Padding")
-    ELEMENT(Primer,                                             "Primer")
-    ELEMENT(RGBAEssenceDescriptor,                              "RGBA Essence Descriptor")
-    ELEMENT(RandomIndexMetadata,                                "Random Index Metadata")
-    ELEMENT(Sequence,                                           "Sequence")
-    ELEMENT(SourceClip,                                         "Source Clip")
+    ELEMENT(TextLocator,                                        "Text Locator")
+    ELEMENT(MaterialPackage,                                    "Material Package")
     ELEMENT(SourcePackage,                                      "Source Package")
+    ELEMENT(EventTrack,                                         "Event track")
     ELEMENT(StaticTrack,                                        "Static Track")
-    ELEMENT(TextLocator,                                        "Text Locator")
-    ELEMENT(TimecodeComponent,                                  "Timecode Component")
     ELEMENT(Track,                                              "Track")
+    ELEMENT(DMSegment,                                          "Descriptive Metadata Segment")
+    ELEMENT(GenericSoundEssenceDescriptor,                      "Generic Sound Essence Descriptor")
+    ELEMENT(MultipleDescriptor,                                 "Multiple Descriptor")
+    ELEMENT(AES3PCMDescriptor,                                  "AES3 Descriptor")
     ELEMENT(WaveAudioDescriptor,                                "Wave Audio Descriptor")
-    else if (Code_Compare1==0x060E2B34
-          && Code_Compare2==0x01020101
-          && Code_Compare3==0x0D010301)
-    {
-        switch (Code_Compare4&0xFF00FF00)
-        {
-            case 0x14000100 : Element_Name("Generic"        ); break;
-            case 0x05000100 : Element_Name("D-10 Video"     ); break;
-            case 0x15000500 : Element_Name("MPEG Video"     ); break;
-            case 0x15000800 : Element_Name("JPEG 2000"      ); break;
-            case 0x06001000 : Element_Name("D-10 Audio"     ); break;
-            case 0x15000100 : Element_Name("RV24"           ); break;
-            case 0x15000600 : Element_Name("AVC"            ); break;
-            case 0x15000700 : Element_Name("MPEG-4 Visual"  ); break;
-            case 0x16000100 : Element_Name("BWF (PCM)"      ); break;
-            case 0x16000200 : Element_Name("BWF (PCM)"      ); break;
-            case 0x16000300 : Element_Name("DV Audio (PCM)" ); break;
-            case 0x16000400 : Element_Name("BWF (PCM)"      ); break;
-            case 0x16000500 : Element_Name("MPEG Audio"     ); break;
-            case 0x16000A00 : Element_Name("A-law"          ); break;
-            case 0x18000100 : Element_Name("DV"  ); break;
-            case 0x18000200 : Element_Name("DV"  ); break; //One block
-            default         : Element_Name("Unknown stream" );
+    ELEMENT(MPEG2VideoDescriptor,                               "MPEG-2 Video Descriptor")
+    ELEMENT(JPEG2000PictureSubDescriptor,                       "JPEG 2000 Picture Sub Descriptor")
+    ELEMENT(VbiPacketsDescriptor,                               "VBI Descriptor")
+    ELEMENT(AncPacketsDescriptor,                               "ANC Packets Descriptor")
+    ELEMENT(OpenIncompleteHeaderPartition,                      "Open and Incomplete Header Partition Pack")
+    ELEMENT(ClosedIncompleteHeaderPartition,                    "Closed and Iomplete Header Partition Pack")
+    ELEMENT(OpenCompleteHeaderPartition,                        "Open and Complete Header Partition Pack")
+    ELEMENT(ClosedCompleteHeaderPartition,                      "Closed and Complete Header Partition Pack")
+    ELEMENT(OpenIncompleteBodyPartition,                        "Open and Incomplete Body Partition Pack")
+    ELEMENT(ClosedIncompleteBodyPartition,                      "Closed and Iomplete Body Partition Pack")
+    ELEMENT(OpenCompleteBodyPartition,                          "Open and Complete Body Partition Pack")
+    ELEMENT(ClosedCompleteBodyPartition,                        "Closed and Complete Body Partition Pack")
+    ELEMENT(OpenIncompleteFooterPartition,                      "Open and Incomplete Footer Partition Pack")
+    ELEMENT(ClosedIncompleteFooterPartition,                    "Closed and Iomplete Footer Partition Pack")
+    ELEMENT(OpenCompleteFooterPartition,                        "Open and Complete Footer Partition Pack")
+    ELEMENT(ClosedCompleteFooterPartition,                      "Closed and Complete Footer Partition Pack")
+    ELEMENT(Primer,                                             "Primer")
+    ELEMENT(IndexTableSegment,                                  "Index Table (Segment)")
+    ELEMENT(RandomIndexMetadata,                                "Random Index Metadata")
+    ELEMENT(SDTI_SystemMetadataPack,                            "SDTI System Metadata Pack")
+    else if (Code_Compare1==Elements::SDTI_SystemMetadataPack1
+          && ((Code_Compare2)&0xFF00FFFF)==(Elements::SDTI_SystemMetadataPack2&0xFF00FFFF)
+          && Code_Compare3==Elements::SDTI_SystemMetadataPack3
+          && ((Code_Compare4)&0xFFFF0000)==(Elements::SDTI_SystemMetadataPack4&0xFFFF0000))
+    {
+        Code_Compare4&=0xFFFFFF00; //Remove MetaData Block Count
+        if (0) {}
+        ELEMENT(SDTI_PackageMetadataSet,                        "SDTI Package Metadata Set")
+        ELEMENT(SDTI_PictureMetadataSet,                        "SDTI Picture Metadata Set")
+        ELEMENT(SDTI_SoundMetadataSet,                          "SDTI Sound Metadata Set")
+        ELEMENT(SDTI_DataMetadataSet,                           "SDTI Data Metadata Set")
+        ELEMENT(SDTI_ControlMetadataSet,                        "SDTI Control Metadata Set")
+    }
+    ELEMENT(SystemScheme1,                                      "System Scheme 1") //SMPTE 405M
+    ELEMENT(DMScheme1,                                          "Descriptive Metadata Scheme 1") //SMPTE 380M
+    ELEMENT(Omneon_010201010100,                                "Omneon (010201010100)")
+    ELEMENT(Omneon_010201020100,                                "Omneon (010201020100)")
+    else if (Code_Compare1==Elements::GenericContainer_Aaf1
+          && Code_Compare2==Elements::GenericContainer_Aaf2
+          && (Code_Compare3==Elements::GenericContainer_Aaf3
+           || Code_Compare3==Elements::GenericContainer_Avid3))
+    {
+        Element_Name(Mxf_EssenceElement(Code));
+
+        //Config
+        #if MEDIAINFO_DEMUX || MEDIAINFO_SEEK
+        if (!Essences_FirstEssence_Parsed)
+        {
+            if (Demux_UnpacketizeContainer && Descriptors.size()==1 && Descriptors.begin()->second.StreamKind==Stream_Audio)
+            {
+                //Configuring bitrate is not available in descriptor
+                if (Descriptors.begin()->second.ByteRate==(int32u)-1 && Descriptors.begin()->second.Infos.find("SamplingRate")!=Descriptors.begin()->second.Infos.end())
+                {
+                    int32u SamplingRate=Descriptors.begin()->second.Infos["SamplingRate"].To_int32u();
+
+                    if (Descriptors.begin()->second.BlockAlign!=(int16u)-1)
+                        Descriptors.begin()->second.ByteRate=SamplingRate*Descriptors.begin()->second.BlockAlign;
+                    else if (Descriptors.begin()->second.QuantizationBits!=(int8u)-1)
+                        Descriptors.begin()->second.ByteRate=SamplingRate*Descriptors.begin()->second.QuantizationBits/8;
+                }
+
+                //Configuring EditRate if needed (e.g. audio at 48000 Hz)
+                if (Demux_Rate) //From elsewhere
+                {
+                    Descriptors.begin()->second.SampleRate=Demux_Rate;
+                }
+                else if (Descriptors.begin()->second.SampleRate>1000)
+                {
+                    Descriptors.begin()->second.SampleRate=25; //Default value
+                }
+            }
+
+            Essences_FirstEssence_Parsed=true;
         }
+        #endif //MEDIAINFO_DEMUX || MEDIAINFO_SEEK
 
-        #if MEDIAINFO_DEMUX
-            if (!Essences[Code_Compare4].TrackID_WasLookedFor)
+        if (IsParsingEnd)
+        {
+            //We have the necessary for indexes, jumping to next index
+            Skip_XX(Element_Size,                               "Data");
+            if (RandomIndexMetadatas.empty())
+            {
+                if (!RandomIndexMetadatas_AlreadyParsed)
+                {
+                    Partitions_Pos=0;
+                    while (Partitions_Pos<Partitions.size() && Partitions[Partitions_Pos].StreamOffset!=PartitionMetadata_PreviousPartition)
+                        Partitions_Pos++;
+                    if (Partitions_Pos==Partitions.size())
+                    {
+                        GoTo(PartitionMetadata_PreviousPartition);
+                        Open_Buffer_Unsynch();
+                    }
+                    else
+                        TryToFinish();
+                }
+            }
+            else
+            {
+                GoTo(RandomIndexMetadatas[0].ByteOffset);
+                RandomIndexMetadatas.erase(RandomIndexMetadatas.begin());
+                Open_Buffer_Unsynch();
+            }
+            return;
+        }
+
+        essences::iterator Essence=Essences.find(Code_Compare4);
+        if (Essence==Essences.end())
+            Essence=Essences.insert(make_pair(Code_Compare4,essence())).first;
+
+        if (Essence->second.Parser==NULL)
+        {
+            //Format_Settings_Wrapping
+            if (Descriptors.size()==1 && (Descriptors.begin()->second.Infos.find("Format_Settings_Wrapping")==Descriptors.begin()->second.Infos.end() || Descriptors.begin()->second.Infos["Format_Settings_Wrapping"].empty()) && (Buffer_End?(Buffer_End-Buffer_Begin):Element_Size)>File_Size/2) //Divided by 2 for testing if this is a big chunk = Clip based and not frames.
+                Descriptors.begin()->second.Infos["Format_Settings_Wrapping"]=__T("Clip"); //By default, not sure about it, should be from descriptor
+
+            //Searching the corresponding Track (for TrackID)
+            if (!Essence->second.TrackID_WasLookedFor)
             {
                 for (tracks::iterator Track=Tracks.begin(); Track!=Tracks.end(); Track++)
                     if (Track->second.TrackNumber==Code_Compare4)
-                        Essences[Code_Compare4].TrackID=Track->second.TrackID;
-                Essences[Code_Compare4].TrackID_WasLookedFor=true;
+                        Essence->second.TrackID=Track->second.TrackID;
+                #if MEDIAINFO_DEMUX || MEDIAINFO_SEEK
+                    if (Essence->second.TrackID==(int32u)-1 && !Duration_Detected && !Config->File_IsDetectingDuration_Get())
+                    {
+                        DetectDuration(); //In one file (*-009.mxf), the TrackNumber is known only at the end of the file (Open and incomplete header/footer)
+                        for (tracks::iterator Track=Tracks.begin(); Track!=Tracks.end(); Track++)
+                            if (Track->second.TrackNumber==Code_Compare4)
+                                Essence->second.TrackID=Track->second.TrackID;
+                    }
+                #endif //MEDIAINFO_DEMUX || MEDIAINFO_SEEK
+                Essence->second.TrackID_WasLookedFor=true;
             }
-            if (Essences[Code_Compare4].TrackID!=(int32u)-1)
-                Element_Code=Essences[Code_Compare4].TrackID;
-            else
-                Element_Code=Code.lo;
-        #endif MEDIAINFO_DEMUX
 
-        if (Essences[Code_Compare4].Parser==NULL)
-        {
-            switch (Code_Compare4&0xFF00FF00)
+            //Searching the corresponding Descriptor
+            for (descriptors::iterator Descriptor=Descriptors.begin(); Descriptor!=Descriptors.end(); Descriptor++)
+                if (Descriptors.size()==1 || (Descriptor->second.LinkedTrackID==Essence->second.TrackID && Descriptor->second.LinkedTrackID!=(int32u)-1))
+                {
+                    Essence->second.StreamPos_Initial=Essence->second.StreamPos=Code_Compare4&0x000000FF;
+                    if ((Code_Compare4&0x000000FF)==0x00000000)
+                        StreamPos_StartAtOne=false;
+
+                    if (Descriptor->second.StreamKind==Stream_Audio && Descriptor->second.Infos.find("Format_Settings_Endianness")==Descriptor->second.Infos.end())
+                    {
+                        Ztring Format;
+                        Format.From_Local(Mxf_EssenceCompression(Descriptor->second.EssenceCompression));
+                        if (Format.empty())
+                            Format.From_Local(Mxf_EssenceContainer(Descriptor->second.EssenceContainer));
+                        if (Format.find(__T("PCM"))==0)
+                            Descriptor->second.Infos["Format_Settings_Endianness"]=__T("Little");
+                    }
+
+                    Essence->second.Parser=ChooseParser(Essence, Descriptor); //Searching by the descriptor
+                    if (Essence->second.Parser==NULL)
+                        ChooseParser__FromEssence(Essence, Descriptor); //Searching by the track identifier
+
+                    #ifdef MEDIAINFO_VC3_YES
+                        if (Ztring().From_Local(Mxf_EssenceContainer(Descriptor->second.EssenceContainer))==__T("VC-3"))
+                            ((File_Vc3*)Essence->second.Parser)->FrameRate=Descriptor->second.Infos["FrameRate"].To_float32();
+                    #endif //MEDIAINFO_VC3_YES
+                    break;
+                }
+
+            //Searching by the track identifier
+            if (Essence->second.Parser==NULL)
+                ChooseParser__FromEssence(Essence, Descriptors.end());
+
+            //Demux
+            #if MEDIAINFO_DEMUX
+                //Configuration
+                Essence->second.Frame_Count_NotParsedIncluded=Frame_Count_NotParsedIncluded;
+                Essence->second.FrameInfo=FrameInfo;
+                if (Essence->second.TrackID!=(int32u)-1)
+                    Element_Code=Essence->second.TrackID;
+                else
+                    Element_Code=Code.lo;
+            #endif //MEDIAINFO_DEMUX
+
+            if (Essence->second.Parser)
             {
-                case 0x05000100 : //D-10 Video
-                case 0x15000500 : //MPEG Video
-                                    Essences[Code_Compare4].StreamKind=Stream_Video;
-                                    Essences[Code_Compare4].StreamPos=Code_Compare4&0x000000FF;
-                                    #if defined(MEDIAINFO_MPEGV_YES)
-                                        Essences[Code_Compare4].Parser=new File_Mpegv();
-                                    #else
-                                        Essences[Code_Compare4].Parser=new File_Unknown();
-                                        Open_Buffer_Init(Essences[Code_Compare4].Parser);
-                                        Essences[Code_Compare4].Parser->Stream_Prepare(Stream_Video);
-                                        Essences[Code_Compare4].Parser->Fill(Stream_Video, 0, Video_Format, "MPEG Video");
-                                        if (Streams_Count>0)
-                                            Streams_Count--;
-                                    #endif
-                                    break;
-                case 0x15000100 : //RV24
-                                    Essences[Code_Compare4].StreamKind=Stream_Video;
-                                    Essences[Code_Compare4].StreamPos=Code_Compare4&0x000000FF;
-                                    Essences[Code_Compare4].Parser=new File_Unknown();
-                                    Open_Buffer_Init(Essences[Code_Compare4].Parser);
-                                    Essences[Code_Compare4].Parser->Stream_Prepare(Stream_Video);
-                                    Essences[Code_Compare4].Parser->Fill(Stream_Video, 0, Video_Format, "RV24");
-                                    if (Streams_Count>0)
-                                        Streams_Count--;
-                                    break;
-                case 0x15000600 : //AVC
-                                    Essences[Code_Compare4].StreamKind=Stream_Video;
-                                    Essences[Code_Compare4].StreamPos=Code_Compare4&0x000000FF;
-                                    #if defined(MEDIAINFO_AVC_YES)
-                                        Essences[Code_Compare4].Parser=new File_Avc();
-                                    #else
-                                        Essences[Code_Compare4].Parser=new File_Unknown();
-                                        Open_Buffer_Init(Essences[Code_Compare4].Parser);
-                                        Essences[Code_Compare4].Parser->Stream_Prepare(Stream_Video);
-                                        Essences[Code_Compare4].Parser->Fill(Stream_Video, 0, Video_Format, "AVC");
-                                        if (Streams_Count>0)
-                                            Streams_Count--;
-                                    #endif
-                                    break;
-                case 0x15000700 : //MPEG-4 Visual
-                                    Essences[Code_Compare4].StreamKind=Stream_Video;
-                                    Essences[Code_Compare4].StreamPos=Code_Compare4&0x000000FF;
-                                    #if defined(MEDIAINFO_MPEG4V_YES)
-                                        Essences[Code_Compare4].Parser=new File_Mpeg4v();
-                                    #else
-                                        Essences[Code_Compare4].Parser=new File_Unknown();
-                                        Open_Buffer_Init(Essences[Code_Compare4].Parser);
-                                        Essences[Code_Compare4].Parser->Stream_Prepare(Stream_Video);
-                                        Essences[Code_Compare4].Parser->Fill(Stream_Video, 0, Video_Format, "MPEG-4 Visual");
-                                        if (Streams_Count>0)
-                                            Streams_Count--;
-                                    #endif
-                                    break;
-                case 0x15000800 : //M-JPEG 2000
-                                    Essences[Code_Compare4].StreamKind=Stream_Video;
-                                    Essences[Code_Compare4].StreamPos=Code_Compare4&0x000000FF;
-                                    #if defined(MEDIAINFO_JPEG_YES)
-                                        Essences[Code_Compare4].Parser=new File_Jpeg();
-                                        ((File_Jpeg*)Essences[Code_Compare4].Parser)->StreamKind=Stream_Video;
-                                    #else
-                                        Essences[Code_Compare4].Parser=new File_Unknown();
-                                        Open_Buffer_Init(Essences[Code_Compare4].Parser);
-                                        Essences[Code_Compare4].Parser->Stream_Prepare(Stream_Video);
-                                        Essences[Code_Compare4].Parser->Fill(Stream_Video, 0, Video_Format, "M-JPEG 2000");
-                                        if (Streams_Count>0)
-                                            Streams_Count--;
-                                    #endif
-                                    break;
-                case 0x06001000 : //D-10 Audio
-                case 0x16000100 : //BWF (PCM)
-                case 0x16000200 : //BWF (PCM)
-                case 0x16000300 : //DV Audio (PCM)
-                case 0x16000400 : //P2 Audio (PCM)
-                                    Essences[Code_Compare4].StreamKind=Stream_Audio;
-                                    Essences[Code_Compare4].StreamPos=Code_Compare4&0x000000FF;
-                                    Essences[Code_Compare4].Parser=new File_Unknown();
-                                    Open_Buffer_Init(Essences[Code_Compare4].Parser);
-                                    Essences[Code_Compare4].Parser->Stream_Prepare(Stream_Audio);
-                                    Essences[Code_Compare4].Parser->Fill(Stream_Audio, 0, Audio_Format, "PCM");
-                                    if (Streams_Count>0)
-                                        Streams_Count--;
-                                    break;
-                case 0x16000500 : //MPEG Audio
-                                    Essences[Code_Compare4].StreamKind=Stream_Audio;
-                                    Essences[Code_Compare4].StreamPos=Code_Compare4&0x000000FF;
-                                    #if defined(MEDIAINFO_MPEGA_YES)
-                                        Essences[Code_Compare4].Parser=new File_Mpega();
-                                    #else
-                                        Essences[Code_Compare4].Parser=new File_Unknown();
-                                        Open_Buffer_Init(Essences[Code_Compare4].Parser);
-                                        Essences[Code_Compare4].Parser->Stream_Prepare(Stream_Audio);
-                                        Essences[Code_Compare4].Parser->Fill(Stream_Audio, 0, Audio_Format, "MPEG Audio");
-                                        if (Streams_Count>0)
-                                            Streams_Count--;
-                                    #endif
-                                    break;
-                case 0x16000A00 : //A-law
-                                    Essences[Code_Compare4].StreamKind=Stream_Audio;
-                                    Essences[Code_Compare4].StreamPos=Code_Compare4&0x000000FF;
-                                    Essences[Code_Compare4].Parser=new File_Unknown();
-                                    Open_Buffer_Init(Essences[Code_Compare4].Parser);
-                                    Essences[Code_Compare4].Parser->Stream_Prepare(Stream_Audio);
-                                    Essences[Code_Compare4].Parser->Fill(Stream_Audio, 0, Audio_Format, "A-law");
-                                    if (Streams_Count>0)
-                                        Streams_Count--;
-                                    break;
-                case 0x18000100 : //DV
-                case 0x18000200 : //DV
-                                    Essences[Code_Compare4].StreamKind=Stream_Video;
-                                    Essences[Code_Compare4].StreamPos=Code_Compare4&0x000000FF;
-                                    #if defined(MEDIAINFO_DVDIF_YES)
-                                        Essences[Code_Compare4].Parser=new File_DvDif();
-                                        //Bitrate is precise
-                                        if (Element_Size==144000)
-                                            Essences[Code_Compare4].Infos["BitRate"].From_Number( 28800000);
-                                        if (Element_Size==288000)
-                                            Essences[Code_Compare4].Infos["BitRate"].From_Number( 57600000);
-                                        if (Element_Size==576000)
-                                            Essences[Code_Compare4].Infos["BitRate"].From_Number(115200000);
-                                    #else
-                                        Essences[Code_Compare4].Parser=new File_Unknown();
-                                        Open_Buffer_Init(Essences[Code_Compare4].Parser);
-                                        Essences[Code_Compare4].Parser->Stream_Prepare(Stream_Video);
-                                        Essences[Code_Compare4].Parser->Fill(Stream_Video, 0, Video_Format, "DV");
-                                        if (Streams_Count>0)
-                                            Streams_Count--;
-                                    #endif
-                                    break;
-                default         :   Essences[Code_Compare4].Parser=new File__Analyze();
+                Element_Code=Essence->second.TrackID;
+                Open_Buffer_Init(Essence->second.Parser);
+                if (Essence->second.Parser->Status[IsFinished])
+                    if (Streams_Count>0)
+                        Streams_Count--;
             }
-            Open_Buffer_Init(Essences[Code_Compare4].Parser);
 
             //Stream size is sometime easy to find
-            if ((Buffer_DataSizeToParse_Complete==(int64u)-1?Element_Size:Buffer_DataSizeToParse_Complete)>=File_Size*0.98) //let imagine: if element size is 98% of file size, this is the only one element in the file
-                Essences[Code_Compare4].Stream_Size=(Buffer_DataSizeToParse_Complete==(int64u)-1?Element_Size:Buffer_DataSizeToParse_Complete);
+            if ((Buffer_End?(Buffer_End-Buffer_Begin):Element_Size)>=File_Size*0.98) //let imagine: if element size is 98% of file size, this is the only one element in the file
+                Essence->second.Stream_Size=Buffer_End?(Buffer_End-Buffer_Begin):Element_Size;
+
+            //Compute stream bit rate if there is only one stream
+            int64u Stream_Size;
+            if (Essence->second.Stream_Size!=(int64u)-1)
+                Stream_Size=Essence->second.Stream_Size;
+            else
+                Stream_Size=File_Size; //TODO: find a way to remove header/footer correctly
+            if (Stream_Size!=(int64u)-1 && Essence->second.Parser)
+            {
+                if (Essence->second.Parser && Descriptors.size()==1 && Descriptors.begin()->second.ByteRate!=(int32u)-1)
+                    Essences.begin()->second.Parser->Stream_BitRateFromContainer=Descriptors.begin()->second.ByteRate*8;
+                else if (Descriptors.size()==1 && Descriptors.begin()->second.Infos["Duration"].To_float64())
+                    Essences.begin()->second.Parser->Stream_BitRateFromContainer=((float64)Stream_Size)*8/(Descriptors.begin()->second.Infos["Duration"].To_float64()/1000);
+            }
         }
 
         //Demux
-        Demux(Buffer+Buffer_Offset, (size_t)Element_Size, ContentType_MainStream);
+        #if MEDIAINFO_DEMUX
+            if (Essence->second.TrackID!=(int32u)-1)
+                Element_Code=Essence->second.TrackID;
+            else
+                Element_Code=Code.lo;
+            Demux_Level=(Essence->second.Parser && (Essence->second.Parser->Demux_UnpacketizeContainer || Essence->second.Parser->Demux_Level==2))?4:2; //Intermediate (D-10 Audio) / Container
+            Essence->second.FrameInfo.DUR=(int64u)-1;
+             #if MEDIAINFO_DEMUX || MEDIAINFO_SEEK
+                //Calculating the byte count not included in seek information (partition, index...)
+                int64u StreamOffset_Offset=0;
+                Partitions_Pos=0;
+                while (Partitions_Pos<Partitions.size() && Partitions[Partitions_Pos].StreamOffset<=File_Offset+Buffer_Offset)
+                {
+                    StreamOffset_Offset+=Partitions[Partitions_Pos].PartitionPackByteCount+Partitions[Partitions_Pos].HeaderByteCount+Partitions[Partitions_Pos].IndexByteCount;
+                    Partitions_Pos++;
+                }
+
+                if (Descriptors.size()==1 && Descriptors.begin()->second.ByteRate!=(int32u)-1 && Descriptors.begin()->second.SampleRate)
+                {
+                    float64 BytePerFrame=Descriptors.begin()->second.ByteRate/Descriptors.begin()->second.SampleRate;
+                    float64 Frame_Count_NotParsedIncluded_Precise=(File_Offset+Buffer_Offset-(StreamOffset_Offset+Buffer_Header_Size))/BytePerFrame; //In case of audio at frame rate not an integer
+                    Essence->second.Frame_Count_NotParsedIncluded=float64_int64s(Frame_Count_NotParsedIncluded_Precise);
+                    Essence->second.FrameInfo.DTS=float64_int64s(DTS_Delay*1000000000+((float64)Frame_Count_NotParsedIncluded_Precise)*1000000000/Descriptors.begin()->second.SampleRate);
+                    Essence->second.FrameInfo.PTS=Essence->second.FrameInfo.DTS;
+                    Essence->second.FrameInfo.DUR=float64_int64s(1000000000/Descriptors.begin()->second.SampleRate);
+                    Demux_random_access=true;
+                }
+                else if (!IndexTables.empty() && IndexTables[0].EditUnitByteCount)
+                {
+                    int64u Position=0;
+                    Essence->second.Frame_Count_NotParsedIncluded=0;
+                    for (size_t Pos=0; Pos<IndexTables.size(); Pos++)
+                    {
+                        if (IndexTables[0].IndexDuration && File_Offset+Buffer_Offset>=((Buffer_End?Buffer_Begin:(StreamOffset_Offset+Buffer_Header_Size))+Position)+IndexTables[Pos].IndexDuration*IndexTables[Pos].EditUnitByteCount) //Considering IndexDuration=0 as unlimited
+                        {
+                            Position+=SDTI_SizePerFrame+IndexTables[Pos].EditUnitByteCount*IndexTables[Pos].IndexDuration;
+                            Essence->second.Frame_Count_NotParsedIncluded+=IndexTables[Pos].IndexDuration;
+                        }
+                        else
+                        {
+                            int64u FramesToAdd=(File_Offset+Buffer_Offset-((Buffer_End?Buffer_Begin:(StreamOffset_Offset+Buffer_Header_Size))+Position))/IndexTables[Pos].EditUnitByteCount;
+                            Position+=(SDTI_SizePerFrame+IndexTables[Pos].EditUnitByteCount)*FramesToAdd;
+                            if (IndexTables[Pos].IndexEditRate)
+                            {
+                                if (Descriptors.size()==1 && Descriptors.begin()->second.SampleRate!=IndexTables[Pos].IndexEditRate)
+                                {
+                                    float64 Frame_Count_NotParsedIncluded_Precise=((float64)FramesToAdd)/IndexTables[Pos].IndexEditRate*Descriptors.begin()->second.SampleRate;
+                                    Essence->second.Frame_Count_NotParsedIncluded+=float64_int64s(((float64)FramesToAdd)/IndexTables[Pos].IndexEditRate*Descriptors.begin()->second.SampleRate);
+                                    Essence->second.FrameInfo.PTS=Essence->second.FrameInfo.DTS=float64_int64s(DTS_Delay*1000000000+((float64)Frame_Count_NotParsedIncluded_Precise)*1000000000/Descriptors.begin()->second.SampleRate);
+                                }
+                                else
+                                {
+                                    Essence->second.Frame_Count_NotParsedIncluded+=FramesToAdd;
+                                    Essence->second.FrameInfo.PTS=Essence->second.FrameInfo.DTS=float64_int64s(DTS_Delay*1000000000+((float64)Essence->second.Frame_Count_NotParsedIncluded)*1000000000/IndexTables[Pos].IndexEditRate);
+                                }
+                            }
+                            else
+                                Essence->second.FrameInfo.PTS=Essence->second.FrameInfo.DTS=(int64u)-1;
+                            Demux_random_access=true;
 
-        if (!(Essences[Code_Compare4].Parser->Status[IsFinished] || Essences[Code_Compare4].Parser->Status[IsFilled]))
+                            break;
+                        }
+                    }
+                }
+                else if (!IndexTables.empty() && !IndexTables[0].Entries.empty())
+                {
+                    int64u StreamOffset=File_Offset+Buffer_Offset-StreamOffset_Offset;
+                    for (size_t Pos=0; Pos<IndexTables.size(); Pos++)
+                    {
+                        //Searching the right index
+                        if (!IndexTables[Pos].Entries.empty() && StreamOffset>=IndexTables[Pos].Entries[0].StreamOffset+(IndexTables[Pos].IndexStartPosition)*SDTI_SizePerFrame && (Pos+1>=IndexTables.size() || StreamOffset<IndexTables[Pos+1].Entries[0].StreamOffset+(IndexTables[Pos+1].IndexStartPosition)*SDTI_SizePerFrame))
+                        {
+                            //Searching the frame pos
+                            for (size_t EntryPos=0; EntryPos<IndexTables[Pos].Entries.size(); EntryPos++)
+                            {
+                                //Testing coherency
+                                int64u Entry0_StreamOffset=0; //For coherency checking
+                                int64u Entry_StreamOffset=IndexTables[Pos].Entries[EntryPos].StreamOffset+(IndexTables[Pos].IndexStartPosition+EntryPos)*SDTI_SizePerFrame;
+                                int64u Entry1_StreamOffset=File_Size; //For coherency checking
+                                if (EntryPos==0 && Pos && IndexTables[Pos-1].Entries.empty())
+                                    Entry0_StreamOffset=IndexTables[Pos-1].Entries[IndexTables[Pos-1].Entries.size()-1].StreamOffset+(IndexTables[Pos].IndexStartPosition+EntryPos-1)*SDTI_SizePerFrame;
+                                else if (EntryPos)
+                                    Entry0_StreamOffset=IndexTables[Pos].Entries[EntryPos-1].StreamOffset+(IndexTables[Pos].IndexStartPosition+EntryPos-1)*SDTI_SizePerFrame;
+                                if (EntryPos+1<IndexTables[Pos].Entries.size())
+                                    Entry1_StreamOffset=IndexTables[Pos].Entries[EntryPos+1].StreamOffset+(IndexTables[Pos].IndexStartPosition+EntryPos+1)*SDTI_SizePerFrame;
+                                else if (Pos+1<IndexTables.size() && !IndexTables[Pos+1].Entries.empty())
+                                    Entry1_StreamOffset=IndexTables[Pos+1].Entries[0].StreamOffset+(IndexTables[Pos].IndexStartPosition+EntryPos+1)*SDTI_SizePerFrame;
+
+                                if (Entry0_StreamOffset>Entry_StreamOffset || Entry_StreamOffset>Entry1_StreamOffset)
+                                    break; //Problem
+
+                                if (StreamOffset>=Entry_StreamOffset && StreamOffset<Entry1_StreamOffset)
+                                {
+                                    //Special case: we are not sure the last index is the last frame, doing nothing
+                                    if (Pos+1==IndexTables.size() && EntryPos+1==IndexTables[Pos].Entries.size())
+                                        break;
+
+                                    Essence->second.Frame_Count_NotParsedIncluded=IndexTables[Pos].IndexStartPosition+EntryPos;
+                                    if (IndexTables[Pos].IndexEditRate)
+                                        Essence->second.FrameInfo.DTS=float64_int64s(DTS_Delay*1000000000+((float64)Essence->second.Frame_Count_NotParsedIncluded)/IndexTables[Pos].IndexEditRate*1000000000);
+                                    Demux_random_access=IndexTables[Pos].Entries[EntryPos].Type?false:true;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
+                else if (OverallBitrate_IsCbrForSure)
+                {
+                    int64u Begin=Partitions[0].StreamOffset+Partitions[0].PartitionPackByteCount+Partitions[0].HeaderByteCount+Partitions[0].IndexByteCount;
+                    Essence->second.Frame_Count_NotParsedIncluded=(File_Offset+Buffer_Offset-Begin)/OverallBitrate_IsCbrForSure;
+                    if (!Descriptors.empty() && Descriptors.begin()->second.SampleRate)
+                        Essence->second.FrameInfo.PTS=Essence->second.FrameInfo.DTS=float64_int64s(DTS_Delay*1000000000+((float64)Essence->second.Frame_Count_NotParsedIncluded)*1000000000/Descriptors.begin()->second.SampleRate);
+                }
+                else if (Essence->second.Frame_Count_NotParsedIncluded==0)
+                {
+                    Essence->second.FrameInfo.DTS=float64_int64s(DTS_Delay*1000000000);
+                    #if MEDIAINFO_DEMUX
+                        if (Buffer_End && Demux_UnpacketizeContainer && Essences.size()==1 && Essences.begin()->second.Parser && !Essences.begin()->second.Parser->Demux_UnpacketizeContainer)
+                        {
+                            Essences.begin()->second.Parser->Demux_Level=2; //Container
+                            Essences.begin()->second.Parser->Demux_UnpacketizeContainer=true;
+                        }
+                    #endif //MEDIAINFO_DEMUX
+                }
+
+                //Default
+                if (!Essence->second.Frame_Count_NotParsedIncluded && !Demux_random_access)
+                    Demux_random_access=true;
+            #else //MEDIAINFO_DEMUX || MEDIAINFO_SEEK
+                //Hints
+                if (File_Buffer_Size_Hint_Pointer)
+                {
+                    size_t Buffer_Size_Target=Header_Size+(Buffer_End?(Buffer_End-Buffer_Begin):Element_Size); //We bet this is CBR
+                    if ((*File_Buffer_Size_Hint_Pointer)<Buffer_Size_Target)
+                        (*File_Buffer_Size_Hint_Pointer)=Buffer_Size_Target;
+                }
+            #endif //MEDIAINFO_SEEK
+            if (!IsSub) //Updating for MXF only if MXF is not embedded in another container
+            {
+                if (Essence->second.FrameInfo.DUR==(int64u)-1)
+                {
+                    if (!IndexTables.empty() && IndexTables[0].IndexEditRate)
+                        Essence->second.FrameInfo.DUR=float64_int64s(1000000000/IndexTables[0].IndexEditRate);
+                    else if (!Tracks.empty() && Tracks.begin()->second.EditRate) //TODO: use the corresponding track instead of the first one
+                        Essence->second.FrameInfo.DUR=float64_int64s(1000000000/Tracks.begin()->second.EditRate);
+                }
+                FrameInfo=Essence->second.FrameInfo;
+                Frame_Count_NotParsedIncluded=Essence->second.Frame_Count_NotParsedIncluded;
+            }
+            Demux(Buffer+Buffer_Offset, (size_t)Element_Size, ContentType_MainStream);
+        #endif //MEDIAINFO_DEMUX
+
+        if (Essence->second.Parser && !Essence->second.Parser->Status[IsFinished])
         {
-            //Parsing
-            Open_Buffer_Continue(Essences[Code_Compare4].Parser);
+            if ((Code_Compare4&0xFF00FF00)==0x17000100 || (Code_Compare4&0xFF00FF00)==0x17000200)
+            {
+                //Ancillary with
+                int16u Count;
+                Get_B2 (Count,                                  "Number of packets");
+                for (int16u Pos=0; Pos<Count; Pos++)
+                {
+                    Element_Begin1("Packet");
+                    int16u LineNumber, Size;
+                    Get_B2 (LineNumber,                         "Line Number");
+                    Skip_B1(                                    "Wrapping Type");
+                    Skip_B1(                                    "Payload Sample Coding");
+                    Get_B2 (Size,                               "Payload Sample Count");
+                    Skip_B4(                                    "Size?");
+                    Skip_B4(                                    "Count?");
+                    if (FrameInfo.DTS!=(int64u)-1)
+                        Essence->second.Parser->FrameInfo.DTS=FrameInfo.DTS;
+                    if (FrameInfo.PTS!=(int64u)-1)
+                        Essence->second.Parser->FrameInfo.PTS=FrameInfo.PTS;
+                    if (FrameInfo.DUR!=(int64u)-1)
+                        Essence->second.Parser->FrameInfo.DUR=FrameInfo.DUR;
+                    if (Essence->second.Parser->ParserName==__T("Ancillary") && (((File_Ancillary*)Essence->second.Parser)->FrameRate==0 || ((File_Ancillary*)Essence->second.Parser)->AspectRatio==0))
+                    {
+                        //Configuring with video info
+                        for (descriptors::iterator Descriptor=Descriptors.begin(); Descriptor!=Descriptors.end(); Descriptor++)
+                            if (Descriptor->second.StreamKind==Stream_Video)
+                            {
+                                ((File_Ancillary*)Essence->second.Parser)->HasBFrames=Descriptor->second.HasBFrames;
+                                ((File_Ancillary*)Essence->second.Parser)->AspectRatio=Descriptor->second.DisplayAspectRatio;
+                                ((File_Ancillary*)Essence->second.Parser)->FrameRate=Descriptor->second.SampleRate;
+                                break;
+                            }
+                    }
+                    Open_Buffer_Continue(Essence->second.Parser, Buffer+Buffer_Offset+(size_t)(Element_Offset), Size);
+                    if ((Code_Compare4&0xFF00FF00)==0x17000100 && LineNumber==21 && Essence->second.Parser->Count_Get(Stream_Text)==0)
+                    {
+                        Essence->second.Parser->Accept();
+                        Essence->second.Parser->Stream_Prepare(Stream_Text);
+                        Essence->second.Parser->Fill(Stream_Text, StreamPos_Last, Text_Format, "EIA-608");
+                        Essence->second.Parser->Fill(Stream_Text, StreamPos_Last, Text_MuxingMode, "VBI / Line 21");
+                    }
+                    if (Essence->second.Frame_Count_NotParsedIncluded!=(int64u)-1)
+                        Essence->second.Frame_Count_NotParsedIncluded+=Essence->second.Parser->Frame_Count_InThisBlock;
+                    if (Essence->second.FrameInfo.DTS!=(int64u)-1 && Essence->second.FrameInfo.DUR!=(int64u)-1)
+                        Essence->second.FrameInfo.DTS+=Essence->second.FrameInfo.DUR;
+                    if (Essence->second.FrameInfo.PTS!=(int64u)-1 && Essence->second.FrameInfo.DUR!=(int64u)-1)
+                        Essence->second.FrameInfo.PTS+=Essence->second.FrameInfo.DUR;
+                    Element_Offset+=Size;
+                    if (Size%4)
+                        Skip_XX(4-(Size%4),                     "Padding");
+                    Element_End0();
+                }
+            }
+            else if (Element_Size)
+            {
+                //Parsing
+                if (FrameInfo.DTS!=(int64u)-1)
+                    Essence->second.Parser->FrameInfo.DTS=FrameInfo.DTS;
+                if (FrameInfo.PTS!=(int64u)-1)
+                    Essence->second.Parser->FrameInfo.PTS=FrameInfo.PTS;
+                if (FrameInfo.DUR!=(int64u)-1)
+                    Essence->second.Parser->FrameInfo.DUR=FrameInfo.DUR;
+                Open_Buffer_Continue(Essence->second.Parser);
+                #if MEDIAINFO_DEMUX
+                    if (Buffer_End && Demux_UnpacketizeContainer && Essences.size()==1 && Essences.begin()->second.Parser && Essences.begin()->second.Parser->Demux_UnpacketizeContainer)
+                    {
+                        Essence->second.Frame_Count_NotParsedIncluded=Frame_Count_NotParsedIncluded=(int64u)-1;
+                        Essence->second.FrameInfo.DTS=FrameInfo.DTS=(int64u)-1;
+                        Essence->second.FrameInfo.PTS=FrameInfo.PTS=(int64u)-1;
+                    }
+                    else
+                #endif //MEDIAINFO_DEMUX
+                {
+                    #if MEDIAINFO_DEMUX || MEDIAINFO_SEEK
+                        if (Descriptors.size()==1 && Descriptors.begin()->second.ByteRate!=(int32u)-1 && Descriptors.begin()->second.SampleRate)
+                        {
+                            float64 BytePerFrame=Descriptors.begin()->second.ByteRate/Descriptors.begin()->second.SampleRate;
+                            float64 Frame_Count_NotParsedIncluded_Precise=(File_Offset+Buffer_Offset+Element_Size-(StreamOffset_Offset+Buffer_Header_Size))/BytePerFrame; //In case of audio at frame rate not an integer
+                            Frame_Count_NotParsedIncluded=float64_int64s(Frame_Count_NotParsedIncluded_Precise);
+                        }
+                        else
+                    #endif //MEDIAINFO_DEMUX || MEDIAINFO_SEEK
+                    if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+                        Frame_Count_NotParsedIncluded+=Essence->second.Parser->Frame_Count_InThisBlock; //TODO: if !(MEDIAINFO_DEMUX || MEDIAINFO_SEEK), this is wrong for some PCM streams with ByteRate==2
+                    if (FrameInfo.DTS!=(int64u)-1 && FrameInfo.DUR!=(int64u)-1)
+                        FrameInfo.DTS+=FrameInfo.DUR;
+                    if (FrameInfo.PTS!=(int64u)-1 && FrameInfo.DUR!=(int64u)-1)
+                        FrameInfo.PTS+=FrameInfo.DUR;
+                    Essence->second.Frame_Count_NotParsedIncluded=Frame_Count_NotParsedIncluded;
+                    if (Essence->second.FrameInfo.DTS!=(int64u)-1 && Essence->second.FrameInfo.DUR!=(int64u)-1)
+                        Essence->second.FrameInfo.DTS+=Essence->second.FrameInfo.DUR;
+                    if (Essence->second.FrameInfo.PTS!=(int64u)-1 && Essence->second.FrameInfo.DUR!=(int64u)-1)
+                        Essence->second.FrameInfo.PTS+=Essence->second.FrameInfo.DUR;
+                }
+            }
 
             //Disabling this Streams
-            if (Essences[Code_Compare4].Parser->Status[IsFinished] || Essences[Code_Compare4].Parser->Status[IsFilled])
+            if (((!Essence->second.IsFilled && Essence->second.Parser->Status[IsFinished]) || Essence->second.Parser->Status[IsFilled]) || Config->ParseSpeed==0)
             {
                 if (Streams_Count>0)
                     Streams_Count--;
+                Essence->second.IsFilled=true;
+                if (Config->ParseSpeed<1.0 && IsSub)
+                {
+                    Fill();
+                    Open_Buffer_Unsynch();
+                    Finish();
+                }
             }
         }
         else
@@ -1507,9 +3394,33 @@
     else
         Skip_XX(Element_Size,                                   "Unknown");
 
-    if (File_Offset>=0x4000000 //TODO: 64 MB by default (security), should be changed
-     || (Streams_Count==0 && !Descriptors.empty()))
-        Finish();
+    if (Buffer_End && File_Offset+Buffer_Offset+Element_Size>=Buffer_End)
+    {
+        Buffer_Begin=(int64u)-1;
+        Buffer_End=0;
+        Buffer_Header_Size=0;
+        MustSynchronize=true;
+    }
+
+    if ((!IsParsingEnd && IsParsingMiddle_MaxOffset==(int64u)-1 && MediaInfoLib::Config.ParseSpeed_Get()<1.0)
+     && ((!IsSub && File_Offset>=0x4000000) //TODO: 64 MB by default (security), should be changed
+      || (Streams_Count==0 && !Descriptors.empty())))
+    {
+        Fill();
+
+        IsParsingEnd=true;
+        if (PartitionMetadata_FooterPartition!=(int64u)-1)
+        {
+            GoTo(PartitionMetadata_FooterPartition);
+            IsCheckingFooterPartitionAddress=true;
+        }
+        else
+        {
+            GoToFromEnd(4); //For random access table
+            FooterPartitionAddress_Jumped=true;
+        }
+        Open_Buffer_Unsynch();
+    }
 }
 
 //***************************************************************************
@@ -1563,38 +3474,166 @@
         ELEMENT(330B, CDCIEssenceDescriptor_ReversedByteOrder,  "Luma followed by Chroma")
         default: GenericPictureEssenceDescriptor();
     }
+
+    if (Descriptors[InstanceUID].Infos["ColorSpace"].empty())
+        Descriptors[InstanceUID].Infos["ColorSpace"]="YUV";
+}
+
+//---------------------------------------------------------------------------
+void File_Mxf::OpenIncompleteHeaderPartition()
+{
+    //Parsing
+    PartitionMetadata();
+}
+
+//---------------------------------------------------------------------------
+void File_Mxf::ClosedIncompleteHeaderPartition()
+{
+    //Parsing
+    PartitionMetadata();
 }
 
 //---------------------------------------------------------------------------
-void File_Mxf::ClosedCompleteHeader()
+void File_Mxf::OpenCompleteHeaderPartition()
 {
     //Parsing
     PartitionMetadata();
 }
 
 //---------------------------------------------------------------------------
-void File_Mxf::ClosedHeader()
+void File_Mxf::ClosedCompleteHeaderPartition()
 {
     //Parsing
     PartitionMetadata();
 }
 
 //---------------------------------------------------------------------------
-void File_Mxf::CompleteBody()
+void File_Mxf::OpenIncompleteBodyPartition()
 {
     //Parsing
     PartitionMetadata();
+
+    #if MEDIAINFO_NEXTPACKET && MEDIAINFO_DEMUX
+        if (!Demux_HeaderParsed)
+        {
+            Demux_HeaderParsed=true;
+
+            //Testing locators
+            Locators_CleanUp();
+
+            if (Config->NextPacket_Get() && Config->Event_CallBackFunction_IsSet())
+            {
+                if (Locators.empty())
+                {
+                    Config->Demux_EventWasSent=true; //First set is to indicate the user that header is parsed
+                    return;
+                }
+            }
+        }
+    #endif //MEDIAINFO_NEXTPACKET && MEDIAINFO_DEMUX
 }
 
 //---------------------------------------------------------------------------
-void File_Mxf::CompleteFooter()
+void File_Mxf::ClosedIncompleteBodyPartition()
 {
     //Parsing
     PartitionMetadata();
+
+    #if MEDIAINFO_NEXTPACKET && MEDIAINFO_DEMUX
+        if (!Demux_HeaderParsed)
+        {
+            Demux_HeaderParsed=true;
+
+            //Testing locators
+            Locators_CleanUp();
+
+            if (Config->NextPacket_Get() && Config->Event_CallBackFunction_IsSet())
+            {
+                if (Locators.empty())
+                {
+                    Config->Demux_EventWasSent=true; //First set is to indicate the user that header is parsed
+                    return;
+                }
+            }
+        }
+    #endif //MEDIAINFO_NEXTPACKET && MEDIAINFO_DEMUX
 }
 
 //---------------------------------------------------------------------------
-void File_Mxf::CompleteHeader()
+void File_Mxf::OpenCompleteBodyPartition()
+{
+    //Parsing
+    PartitionMetadata();
+
+    #if MEDIAINFO_NEXTPACKET && MEDIAINFO_DEMUX
+        if (!Demux_HeaderParsed)
+        {
+            Demux_HeaderParsed=true;
+
+            //Testing locators
+            Locators_CleanUp();
+
+            if (Config->NextPacket_Get() && Config->Event_CallBackFunction_IsSet())
+            {
+                if (Locators.empty())
+                {
+                    Config->Demux_EventWasSent=true; //First set is to indicate the user that header is parsed
+                    return;
+                }
+            }
+        }
+    #endif //MEDIAINFO_NEXTPACKET && MEDIAINFO_DEMUX
+}
+
+//---------------------------------------------------------------------------
+void File_Mxf::ClosedCompleteBodyPartition()
+{
+    //Parsing
+    PartitionMetadata();
+
+    #if MEDIAINFO_NEXTPACKET && MEDIAINFO_DEMUX
+        if (!Demux_HeaderParsed)
+        {
+            Demux_HeaderParsed=true;
+
+            //Testing locators
+            Locators_CleanUp();
+
+            if (Config->NextPacket_Get() && Config->Event_CallBackFunction_IsSet())
+            {
+                if (Locators.empty())
+                {
+                    Config->Demux_EventWasSent=true; //First set is to indicate the user that header is parsed
+                    return;
+                }
+            }
+        }
+    #endif //MEDIAINFO_NEXTPACKET && MEDIAINFO_DEMUX
+}
+
+//---------------------------------------------------------------------------
+void File_Mxf::OpenIncompleteFooterPartition()
+{
+    //Parsing
+    PartitionMetadata();
+}
+
+//---------------------------------------------------------------------------
+void File_Mxf::ClosedIncompleteFooterPartition()
+{
+    //Parsing
+    PartitionMetadata();
+}
+
+//---------------------------------------------------------------------------
+void File_Mxf::OpenCompleteFooterPartition()
+{
+    //Parsing
+    PartitionMetadata();
+}
+
+//---------------------------------------------------------------------------
+void File_Mxf::ClosedCompleteFooterPartition()
 {
     //Parsing
     PartitionMetadata();
@@ -1613,7 +3652,7 @@
     if (Code2==0x3C0A && InstanceUID==Prefaces[Preface_Current].ContentStorage) //InstanceIUD
     {
         Element_Level--;
-        Element_Info("Valid from Preface");
+        Element_Info1("Valid from Preface");
         Element_Level++;
     }
 }
@@ -1623,6 +3662,8 @@
 {
     switch(Code2)
     {
+        ELEMENT(6101, DMSegment_DMFramework,                    "DM Framework")
+        ELEMENT(6102, DMSegment_TrackIDs,                       "Track IDs")
         default: StructuralComponent();
     }
 }
@@ -1685,18 +3726,43 @@
 //---------------------------------------------------------------------------
 void File_Mxf::IndexTableSegment()
 {
+    if (Element_Offset==4)
+    {
+        #if MEDIAINFO_DEMUX || MEDIAINFO_SEEK
+            //Testing if already parsed
+            for (size_t Pos=0; Pos<IndexTables.size(); Pos++)
+                if (File_Offset+Buffer_Offset-Header_Size==IndexTables[Pos].StreamOffset)
+                {
+                    Element_Offset=Element_Size;
+                    return;
+                }
+
+            IndexTables.push_back(indextable());
+            IndexTables[IndexTables.size()-1].StreamOffset=File_Offset+Buffer_Offset-Header_Size;
+        #endif //MEDIAINFO_DEMUX || MEDIAINFO_SEEK
+    }
+
     switch(Code2)
     {
-        ELEMENT(3F05, IndexTableSegment_EditUnitByteCount,      "EditUnitByteCount")
+        ELEMENT(3F05, IndexTableSegment_EditUnitByteCount,      "Edit Unit Byte Count")
         ELEMENT(3F06, IndexTableSegment_IndexSID,               "IndexSID")
         ELEMENT(3F07, IndexTableSegment_BodySID,                "BodySID")
-        ELEMENT(3F08, IndexTableSegment_SliceCount,             "SliceCount")
-        ELEMENT(3F0B, IndexTableSegment_IndexEditRate,          "IndexEditRate")
-        ELEMENT(3F0C, IndexTableSegment_IndexStartPosition,     "IndexStartPosition")
-        ELEMENT(3F0D, IndexTableSegment_IndexDuration,          "IndexDuration")
-        ELEMENT(3F0E, IndexTableSegment_PosTableCount ,         "PosTableCount ")
+        ELEMENT(3F08, IndexTableSegment_SliceCount,             "Slice Count")
+        ELEMENT(3F09, IndexTableSegment_DeltaEntryArray,        "Delta Entry Array")
+        ELEMENT(3F0A, IndexTableSegment_IndexEntryArray,        "Index Entry Array")
+        ELEMENT(3F0B, IndexTableSegment_IndexEditRate,          "Index Edit Rate")
+        ELEMENT(3F0C, IndexTableSegment_IndexStartPosition,     "Index Start Position")
+        ELEMENT(3F0D, IndexTableSegment_IndexDuration,          "Index Duration")
+        ELEMENT(3F0E, IndexTableSegment_PosTableCount,          "PosTableCount")
+        ELEMENT(8002, IndexTableSegment_8002,                   "8002?")
         default: InterchangeObject();
     }
+
+    if (Code2==0x3C0A) //InstanceIUD
+    {
+        IndexTable_NSL=0;
+        IndexTable_NPE=0;
+    }
 }
 
 //---------------------------------------------------------------------------
@@ -1765,7 +3831,7 @@
         ELEMENT(3204, GenericPictureEssenceDescriptor_SampledHeight, "Sampled height supplied to codec")
         ELEMENT(3205, GenericPictureEssenceDescriptor_SampledWidth, "Sampled width supplied to codec")
         ELEMENT(3206, GenericPictureEssenceDescriptor_SampledXOffset, "Offset from sampled to stored width")
-        ELEMENT(3207, GenericPictureEssenceDescriptor_SampledYOffset, "Offset from sampled to stored")
+        ELEMENT(3207, GenericPictureEssenceDescriptor_SampledYOffset, "Offset from sampled to stored height")
         ELEMENT(3208, GenericPictureEssenceDescriptor_DisplayHeight, "Displayed Height placed in Production Aperture")
         ELEMENT(3209, GenericPictureEssenceDescriptor_DisplayWidth, "Displayed Width placed in Production Aperture")
         ELEMENT(320A, GenericPictureEssenceDescriptor_DisplayXOffset,"Horizontal offset from the of the picture as displayed")
@@ -1786,7 +3852,7 @@
         default: FileDescriptor();
     }
 
-    if (Code2==0x3C0A) //InstanceUID
+    if (Descriptors[InstanceUID].StreamKind==Stream_Max)
     {
         Descriptors[InstanceUID].StreamKind=Stream_Video;
         if (Streams_Count==(size_t)-1)
@@ -1812,7 +3878,7 @@
         default: FileDescriptor();
     }
 
-    if (Code2==0x3C0A) //InstanceUID
+    if (Descriptors[InstanceUID].StreamKind==Stream_Max)
     {
         Descriptors[InstanceUID].StreamKind=Stream_Audio;
         if (Streams_Count==(size_t)-1)
@@ -1856,7 +3922,7 @@
         if (InstanceUID==Prefaces[Preface_Current].PrimaryPackage) //InstanceIUD
         {
             Element_Level--;
-            Element_Info("Primary package");
+            Element_Info1("Primary package");
             Element_Level++;
         }
         for (contentstorages::iterator ContentStorage=ContentStorages.begin(); ContentStorage!=ContentStorages.end(); ContentStorage++)
@@ -1865,7 +3931,7 @@
                 if (InstanceUID==ContentStorage->second.Packages[Pos])
                 {
                     Element_Level--;
-                    Element_Info("Valid from Content storage");
+                    Element_Info1("Valid from Content storage");
                     Element_Level++;
                 }
         }
@@ -1926,7 +3992,7 @@
                 if (InstanceUID==Descriptor->second.Locators[Pos])
                 {
                     Element_Level--;
-                    Element_Info("Valid from Descriptor");
+                    Element_Info1("Valid from Descriptor");
                     Element_Level++;
                 }
         }
@@ -1934,27 +4000,6 @@
 }
 
 //---------------------------------------------------------------------------
-void File_Mxf::OpenCompleteBodyPartition()
-{
-    //Parsing
-    PartitionMetadata();
-}
-
-//---------------------------------------------------------------------------
-void File_Mxf::OpenHeader()
-{
-    //Parsing
-    PartitionMetadata();
-}
-
-//---------------------------------------------------------------------------
-void File_Mxf::Padding()
-{
-    //Parsing
-    Skip_XX(Element_Size,                                       "Padding");
-}
-
-//---------------------------------------------------------------------------
 void File_Mxf::Preface()
 {
     switch(Code2)
@@ -1987,12 +4032,12 @@
     Get_B4 (Length,                                             "Length");
     for (int32u Pos=0; Pos<Count; Pos++)
     {
-        Element_Begin("LocalTagEntryBatch", Length);
+        Element_Begin1("LocalTagEntryBatch");
         int16u LocalTag;
         int128u UID;
-        Get_B2 (LocalTag,                                       "LocalTag"); Element_Info(Ztring().From_CC2(LocalTag));
-        Get_UL (UID,                                            "UID", NULL); Element_Info(Ztring().From_UUID(UID));
-        Element_End();
+        Get_B2 (LocalTag,                                       "LocalTag"); Element_Info1(Ztring().From_CC2(LocalTag));
+        Get_UL (UID,                                            "UID", NULL); Element_Info1(Ztring().From_UUID(UID));
+        Element_End0();
 
         FILLING_BEGIN();
             if (LocalTag>=0x8000) //user defined
@@ -2016,6 +4061,9 @@
         ELEMENT(3409, RGBAEssenceDescriptor_AlphaMinRef,        "Minimum value for alpha component")
         default: GenericPictureEssenceDescriptor();
     }
+
+    if (Descriptors[InstanceUID].Infos["ColorSpace"].empty())
+        Descriptors[InstanceUID].Infos["ColorSpace"]="RGB";
 }
 
 //---------------------------------------------------------------------------
@@ -2024,12 +4072,30 @@
     //Parsing
     while (Element_Offset+4<Element_Size)
     {
-        Element_Begin("PartitionArray", 12);
-        Info_B4(BodySID,                                        "BodySID"); Element_Info(BodySID);
-        Info_B8(ByteOffset,                                     "ByteOffset"); Element_Info(Ztring::ToZtring(ByteOffset, 16));
-        Element_End();
+        Element_Begin1("PartitionArray");
+        randomindexmetadata RandomIndexMetadata;
+        Get_B4 (RandomIndexMetadata.BodySID,                    "BodySID"); Element_Info1(RandomIndexMetadata.BodySID);
+        Get_B8 (RandomIndexMetadata.ByteOffset,                 "ByteOffset"); Element_Info1(Ztring::ToZtring(RandomIndexMetadata.ByteOffset, 16));
+        Element_End0();
+
+        FILLING_BEGIN();
+            if (!RandomIndexMetadatas_AlreadyParsed && PartitionPack_AlreadyParsed.find(RandomIndexMetadata.ByteOffset)==PartitionPack_AlreadyParsed.end())
+                RandomIndexMetadatas.push_back(RandomIndexMetadata);
+        FILLING_END();
     }
     Skip_B4(                                                    "Length");
+
+    FILLING_BEGIN();
+        if (MediaInfoLib::Config.ParseSpeed_Get()<1.0 && !RandomIndexMetadatas_AlreadyParsed && !RandomIndexMetadatas.empty())
+        {
+            IsParsingEnd=true;
+            IsCheckingRandomAccessTable=true;
+            GoTo(RandomIndexMetadatas[0].ByteOffset);
+            RandomIndexMetadatas.erase(RandomIndexMetadatas.begin());
+            Open_Buffer_Unsynch();
+        }
+        RandomIndexMetadatas_AlreadyParsed=true;
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -2048,7 +4114,7 @@
             if (InstanceUID==Track->second.Sequence)
             {
                 Element_Level--;
-                Element_Info("Valid from track");
+                Element_Info1("Valid from track");
                 Element_Level++;
             }
         }
@@ -2086,6 +4152,38 @@
 }
 
 //---------------------------------------------------------------------------
+//SMPTE 405M
+void File_Mxf::SystemScheme1()
+{
+    switch(Code2)
+    {
+        ELEMENT(0102, SystemScheme1_TimeCodeArray,              "TimeCode Array")
+        default: InterchangeObject();
+    }
+}
+
+//---------------------------------------------------------------------------
+//SMPTE 380M
+void File_Mxf::DMScheme1()
+{
+    std::map<int16u, int128u>::iterator Primer_Value=Primer_Values.find(Code2);
+    if (Primer_Value==Primer_Values.end()) //if not a standard code or unknown user defined code
+    {
+        InterchangeObject();
+        return;
+    }
+
+    int32u Code_Compare1=Primer_Value->second.hi>>32;
+    int32u Code_Compare2=(int32u)Primer_Value->second.hi;
+    int32u Code_Compare3=Primer_Value->second.lo>>32;
+    int32u Code_Compare4=(int32u)Primer_Value->second.lo;
+    if(0);
+    ELEMENT_UUID(DMScheme1_PrimaryExtendedSpokenLanguage,       "Primary Extended Spoken Language")
+    ELEMENT_UUID(DMScheme1_SecondaryExtendedSpokenLanguage,     "Secondary Extended Spoken Language")
+    ELEMENT_UUID(DMScheme1_OriginalExtendedSpokenLanguage,      "Original Extended Spoken Language")
+}
+
+//---------------------------------------------------------------------------
 void File_Mxf::StructuralComponent()
 {
     switch(Code2)
@@ -2109,6 +4207,14 @@
 //---------------------------------------------------------------------------
 void File_Mxf::TimecodeComponent()
 {
+    if (Element_Offset==4)
+    {
+        TimeCode_StartTimecode=(int64u)-1;
+        TimeCode_RoundedTimecodeBase=0;
+        TimeCode_DropFrame=false;
+        DTS_Delay=0;
+    }
+
     switch(Code2)
     {
         ELEMENT(1501, TimecodeComponent_StartTimecode,          "StartTimecode")
@@ -2141,6 +4247,318 @@
 }
 
 //---------------------------------------------------------------------------
+void File_Mxf::VbiPacketsDescriptor()
+{
+    //switch(Code2)
+    //{
+    //    default:
+                FileDescriptor();
+    //}
+
+    if (Descriptors[InstanceUID].Type==descriptor::Type_Unknown)
+    {
+        Descriptors[InstanceUID].Type=descriptor::Type_AncPackets;
+        if (Streams_Count==(size_t)-1)
+            Streams_Count=0;
+        Streams_Count++;
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Mxf::AncPacketsDescriptor()
+{
+    //switch(Code2)
+    //{
+    //    default:
+                FileDescriptor();
+    //}
+
+    if (Descriptors[InstanceUID].Type==descriptor::Type_Unknown)
+    {
+        Descriptors[InstanceUID].Type=descriptor::Type_AncPackets;
+        if (Streams_Count==(size_t)-1)
+            Streams_Count=0;
+        Streams_Count++;
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Mxf::Filler()
+{
+    Skip_XX(Element_Size,                                       "Junk");
+
+    Buffer_PaddingBytes+=Element_Size;
+}
+
+//---------------------------------------------------------------------------
+void File_Mxf::TerminatingFiller()
+{
+    Skip_XX(Element_Size,                                       "Junk");
+
+    Buffer_PaddingBytes+=Element_Size;
+}
+
+//---------------------------------------------------------------------------
+void File_Mxf::XmlDocumentText()
+{
+    Skip_XX(Element_Size,                                       "XML data");
+}
+
+//---------------------------------------------------------------------------
+void File_Mxf::SDTI_SystemMetadataPack() //SMPTE 385M + 326M
+{
+    //Info for SDTI in Index StreamOffset
+    if (!SDTI_IsPresent)
+    {
+        if (!Partitions.empty() && File_Offset+Buffer_Offset<Partitions[Partitions_Pos].StreamOffset+Partitions[Partitions_Pos].BodyOffset)
+            SDTI_IsInIndexStreamOffset=false;
+        SDTI_IsPresent=true;
+    }
+
+    //Parsing
+    int8u SMB, CPR_Rate, Format;
+    bool SMB_UL_Present, SMB_CreationTimeStamp, SMB_UserTimeStamp, CPR_DropFrame;
+    Get_B1 (SMB,                                                "System Metadata Bitmap");
+        Skip_Flags(SMB, 7,                                      "FEC Active");
+        Get_Flags (SMB, 6, SMB_UL_Present,                      "SMPTE Label");
+        Get_Flags (SMB, 5, SMB_CreationTimeStamp,               "Creation Date/Time");
+        Get_Flags (SMB, 4, SMB_UserTimeStamp,                   "User Date/Time");
+        Skip_Flags(SMB, 3,                                      "Picture item");
+        Skip_Flags(SMB, 2,                                      "Sound item");
+        Skip_Flags(SMB, 1,                                      "Data item");
+        Skip_Flags(SMB, 0,                                      "Control item");
+    BS_Begin();
+    Element_Begin1("Content Package Rate");
+    Skip_S1(2,                                                  "Reserved");
+    Get_S1 (5, CPR_Rate,                                        "Package Rate"); //See SMPTE 326M
+    Get_SB (   CPR_DropFrame,                                   "1.001 Flag");
+    Element_End0();
+    Element_Begin1("Content Package Type");
+    Skip_S1(3,                                                  "Stream Status");
+    Skip_SB(                                                    "Sub-package flag");
+    Skip_SB(                                                    "Transfer Mode");
+    Skip_S1(3,                                                  "Timing Mode");
+    Element_End0();
+    BS_End();
+    Skip_B2(                                                    "channel handle");
+    Skip_B2(                                                    "continuity count");
+
+    //Some computing
+    float64 FrameRate;
+    switch (CPR_Rate) //See SMPTE 326M
+    {
+        case 0x01 : FrameRate=24; break;
+        case 0x02 : FrameRate=25; break;
+        case 0x03 : FrameRate=30; break;
+        case 0x04 : FrameRate=48; break;
+        case 0x05 : FrameRate=50; break;
+        case 0x06 : FrameRate=60; break;
+        case 0x07 : FrameRate=72; break;
+        case 0x08 : FrameRate=75; break;
+        case 0x09 : FrameRate=90; break;
+        case 0x0A : FrameRate=96; break;
+        case 0x0B : FrameRate=100; break;
+        case 0x0C : FrameRate=120; break;
+        default   : FrameRate=0; break;
+    }
+    if (CPR_DropFrame)
+    {
+        FrameRate*=1000;
+        FrameRate/=1001;
+    }
+
+    //Parsing
+    if (SMB_UL_Present)
+        Skip_UL(                                                "SMPTE Universal label");
+    if (SMB_CreationTimeStamp)
+    {
+        Get_B1 (Format,                                         "Format"); //0x81=timecode, 0x82=date-timecode
+        Skip_B8(                                                "Time stamp");
+        Skip_B8(                                                "Zero");
+    }
+    else
+        Skip_XX(17,                                             "Junk");
+    if (SMB_UserTimeStamp)
+    {
+        Get_B1 (Format,                                         "Format"); //0x81=timecode, 0x82=date-timecode, SMPTE 331M
+        Element_Begin1("TimeCode");
+        int8u Frames_Units, Frames_Tens, Seconds_Units, Seconds_Tens, Minutes_Units, Minutes_Tens, Hours_Units, Hours_Tens;
+        bool  DropFrame;
+        BS_Begin();
+
+        Skip_SB(                                                "CF - Color fame");
+        Get_SB (   DropFrame,                                   "DP - Drop frame");
+        Get_S1 (2, Frames_Tens,                                 "Frames (Tens)");
+        Get_S1 (4, Frames_Units,                                "Frames (Units)");
+
+        Skip_SB(                                                "FP - Field Phase / BGF0");
+        Get_S1 (3, Seconds_Tens,                                "Seconds (Tens)");
+        Get_S1 (4, Seconds_Units,                               "Seconds (Units)");
+
+        Skip_SB(                                                "BGF0 / BGF2");
+        Get_S1 (3, Minutes_Tens,                                "Minutes (Tens)");
+        Get_S1 (4, Minutes_Units,                               "Minutes (Units)");
+
+        Skip_SB(                                                "BGF2 / Field Phase");
+        Skip_SB(                                                "BGF1");
+        Get_S1 (2, Hours_Tens,                                  "Hours (Tens)");
+        Get_S1 (4, Hours_Units,                                 "Hours (Units)");
+
+        Skip_S1(4,                                              "BG2");
+        Skip_S1(4,                                              "BG1");
+
+        Skip_S1(4,                                              "BG4");
+        Skip_S1(4,                                              "BG3");
+
+        Skip_S1(4,                                              "BG6");
+        Skip_S1(4,                                              "BG5");
+
+        Skip_S1(4,                                              "BG8");
+        Skip_S1(4,                                              "BG7");
+
+        BS_End();
+
+        int64u TimeCode_ms=(int64u)(Hours_Tens     *10*60*60*1000
+                               + Hours_Units       *60*60*1000
+                               + Minutes_Tens      *10*60*1000
+                               + Minutes_Units        *60*1000
+                               + Seconds_Tens         *10*1000
+                               + Seconds_Units           *1000
+                               + (FrameRate?float64_int32s((Frames_Tens*10+Frames_Units)*1000/FrameRate):0));
+
+        Element_Info1(Ztring().Duration_From_Milliseconds(TimeCode_ms));
+
+        Element_End0();
+
+        Skip_B8(                                            "Zero");
+
+        //TimeCode
+        if (SDTI_TimeCode_StartTimecode==(int64u)-1)
+            SDTI_TimeCode_StartTimecode=TimeCode_ms;
+    }
+    else
+        Skip_XX(17,                                             "Junk");
+
+    //Filling
+    if (SDTI_SizePerFrame==0)
+        Partitions_IsCalculatingSdtiByteCount=true;
+}
+
+//---------------------------------------------------------------------------
+void File_Mxf::SDTI_PackageMetadataSet()
+{
+    while (Element_Offset<Element_Size)
+    {
+        //Parsing
+        Element_Begin1("Item");
+        int128u Tag;
+        int16u Length;
+        int8u Type;
+        Get_B1 (Type,                                            "Type");
+        Get_B2 (Length,                                         "Length");
+        int64u End=Element_Offset+Length;
+        Get_UL (Tag,                                            "Tag", NULL);
+        switch (Type)
+        {
+            case 0x83 : //UMID
+                        {
+                            Skip_UMID(                          );
+                            Skip_UL  (                          "Zeroes");
+                        }
+                        break;
+            case 0x88 : //KLV Metadata
+                        {
+                            while (Element_Offset<End)
+                            {
+                                int64u Length;
+                                Get_BER(Length,                 "Length");
+                                switch ((Tag.lo>>16)&0xFF)
+                                {
+                                    case 0x00 : Skip_Local(Length,"Data"); break;
+                                    case 0x01 : Skip_UTF16L(Length,"Data"); break;
+                                    default   : Skip_XX(Length, "Data");
+                                }
+                            }
+                        }
+                        break;
+            default   : Skip_XX(Length,                         "Unknown");
+        }
+        Element_End0();
+    }
+
+    //Filling
+    if (SDTI_SizePerFrame==0)
+        Partitions_IsCalculatingSdtiByteCount=true;
+}
+
+//---------------------------------------------------------------------------
+void File_Mxf::SDTI_PictureMetadataSet()
+{
+    Skip_XX(Element_Size,                                       "Data");
+
+    //Filling
+    if (SDTI_SizePerFrame==0)
+        Partitions_IsCalculatingSdtiByteCount=true;
+}
+
+//---------------------------------------------------------------------------
+void File_Mxf::SDTI_SoundMetadataSet()
+{
+    Skip_XX(Element_Size,                                       "Data");
+
+    //Filling
+    if (SDTI_SizePerFrame==0)
+        Partitions_IsCalculatingSdtiByteCount=true;
+}
+
+//---------------------------------------------------------------------------
+void File_Mxf::SDTI_DataMetadataSet()
+{
+    Skip_XX(Element_Size,                                       "Data");
+
+    //Filling
+    if (SDTI_SizePerFrame==0)
+        Partitions_IsCalculatingSdtiByteCount=true;
+}
+
+//---------------------------------------------------------------------------
+void File_Mxf::SDTI_ControlMetadataSet()
+{
+    Skip_XX(Element_Size,                                       "Data");
+
+    //Filling
+    if (SDTI_SizePerFrame==0)
+        Partitions_IsCalculatingSdtiByteCount=true;
+}
+
+//---------------------------------------------------------------------------
+void File_Mxf::Omneon_010201010100()
+{
+    //Parsing
+    switch(Code2)
+    {
+        ELEMENT(8001, Omneon_010201010100_8001,                 "Omneon (80.01)")
+        ELEMENT(8003, Omneon_010201010100_8003,                 "Omneon (80.03)")
+        default: GenerationInterchangeObject();
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Mxf::Omneon_010201020100()
+{
+    //Parsing
+    switch(Code2)
+    {
+        ELEMENT(8002, Omneon_010201020100_8002,                 "Omneon (80.02)")
+        ELEMENT(8003, Omneon_010201020100_8003,                 "Omneon (80.03)")
+        ELEMENT(8004, Omneon_010201020100_8004,                 "Omneon (80.04)")
+        ELEMENT(8005, Omneon_010201020100_8005,                 "Omneon (80.05)")
+        ELEMENT(8006, Omneon_010201020100_8006,                 "Omneon (80.06)")
+        default: GenerationInterchangeObject();
+    }
+}
+
+//---------------------------------------------------------------------------
 void File_Mxf::Track()
 {
     //Parsing
@@ -2158,14 +4576,14 @@
             if (Package->first==Prefaces[Preface_Current].PrimaryPackage) //InstanceIUD
             {
                 Element_Level--;
-                Element_Info("Primary package");
+                Element_Info1("Primary package");
                 Element_Level++;
             }
             for (size_t Pos=0; Pos<Package->second.Tracks.size(); Pos++)
                 if (InstanceUID==Package->second.Tracks[Pos])
                 {
                     Element_Level--;
-                    Element_Info("Valid from Package");
+                    Element_Info1("Valid from Package");
                     Element_Level++;
                 }
         }
@@ -2181,7 +4599,7 @@
 void File_Mxf::AES3PCMDescriptor_AuxBitsMode()
 {
     //Parsing
-    Info_B1(Data,                                               "Data"); Element_Info(Data);
+    Info_B1(Data,                                               "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -2189,7 +4607,7 @@
 void File_Mxf::AES3PCMDescriptor_Emphasis()
 {
     //Parsing
-    Info_B1(Data,                                               "Data"); Element_Info(Data);
+    Info_B1(Data,                                               "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -2197,7 +4615,7 @@
 void File_Mxf::AES3PCMDescriptor_BlockStartOffset()
 {
     //Parsing
-    Info_B2(Data,                                               "Data"); Element_Info(Data);
+    Info_B2(Data,                                               "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -2238,11 +4656,11 @@
 {
     //Parsing
     int32u Data;
-    Get_B4 (Data,                                                "Data"); Element_Info(Data);
+    Get_B4 (Data,                                                "Data"); Element_Info1(Data);
 
     FILLING_BEGIN();
         if (Data)
-            Descriptors[InstanceUID].Infos["Resolution"].From_Number(Data);
+            Descriptors[InstanceUID].Infos["BitDepth"].From_Number(Data);
     FILLING_END();
 }
 
@@ -2251,7 +4669,13 @@
 void File_Mxf::CDCIEssenceDescriptor_HorizontalSubsampling()
 {
     //Parsing
-    Info_B4(Data,                                               "Data"); Element_Info(Data);
+    int32u Data;
+    Get_B4 (Data,                                                "Data"); Element_Info1(Data);
+
+    FILLING_BEGIN();
+        Descriptors[InstanceUID].SubSampling_Horizontal=Data;
+        Subsampling_Compute(Descriptors.find(InstanceUID));
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -2259,7 +4683,7 @@
 void File_Mxf::CDCIEssenceDescriptor_ColorSiting()
 {
     //Parsing
-    Info_B1(Data,                                               "Data"); Element_Info(Data);
+    Info_B1(Data,                                               "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -2267,7 +4691,7 @@
 void File_Mxf::CDCIEssenceDescriptor_BlackRefLevel()
 {
     //Parsing
-    Info_B4(Data,                                               "Data"); Element_Info(Data);
+    Info_B4(Data,                                               "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -2275,7 +4699,7 @@
 void File_Mxf::CDCIEssenceDescriptor_WhiteReflevel()
 {
     //Parsing
-    Info_B4(Data,                                               "Data"); Element_Info(Data);
+    Info_B4(Data,                                               "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -2283,7 +4707,7 @@
 void File_Mxf::CDCIEssenceDescriptor_ColorRange()
 {
     //Parsing
-    Info_B4(Data,                                               "Data"); Element_Info(Data);
+    Info_B4(Data,                                               "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -2291,7 +4715,7 @@
 void File_Mxf::CDCIEssenceDescriptor_PaddingBits()
 {
     //Parsing
-    Info_B2(Data,                                               "Data"); Element_Info(Data);
+    Info_B2(Data,                                               "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -2299,7 +4723,13 @@
 void File_Mxf::CDCIEssenceDescriptor_VerticalSubsampling()
 {
     //Parsing
-    Info_B4(Data,                                               "Data"); Element_Info(Data);
+    int32u Data;
+    Get_B4 (Data,                                                "Data"); Element_Info1(Data);
+
+    FILLING_BEGIN();
+        Descriptors[InstanceUID].SubSampling_Vertical=Data;
+        Subsampling_Compute(Descriptors.find(InstanceUID));
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -2307,7 +4737,7 @@
 void File_Mxf::CDCIEssenceDescriptor_AlphaSampleDepth()
 {
     //Parsing
-    Info_B4(Data,                                               "Data"); Element_Info(Data);
+    Info_B4(Data,                                               "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -2315,7 +4745,7 @@
 void File_Mxf::CDCIEssenceDescriptor_ReversedByteOrder()
 {
     //Parsing
-    Info_B1(Data,                                               "Data"); Element_Info(Data);
+    Info_B1(Data,                                               "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -2329,17 +4759,13 @@
     Get_B4 (Length,                                             "Length");
     for (int32u Pos=0; Pos<Count; Pos++)
     {
-        Element_Begin("Package", Length);
         int128u Data;
-        Get_UL (Data,                                           "Data", NULL);
+        Get_UUID(Data,                                          "Package");
 
         FILLING_BEGIN();
-            if (Data==Prefaces[Preface_Current].PrimaryPackage)
-                Element_Info("Primary package");
+            Element_Info1C((Data==Prefaces[Preface_Current].PrimaryPackage), "Primary package");
             ContentStorages[InstanceUID].Packages.push_back(Data);
         FILLING_END();
-
-        Element_End();
     }
 }
 
@@ -2354,7 +4780,40 @@
     Get_B4 (Length,                                             "Length");
     for (int32u Pos=0; Pos<Count; Pos++)
     {
-        Info_UL (EssenceContainer,                              "EssenceContainer", Mxf_EssenceContainer);
+        Skip_UUID(                                              "EssenceContainer");
+    }
+}
+
+//---------------------------------------------------------------------------
+// 0x6101
+void File_Mxf::DMSegment_DMFramework()
+{
+    //Parsing
+    int128u Data;
+    Get_UUID(Data,                                             "DM Framework"); Element_Info1(Ztring().From_UUID(Data));
+
+    FILLING_BEGIN();
+        DMSegments[InstanceUID].Framework=Data;
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
+// 0x6101
+void File_Mxf::DMSegment_TrackIDs()
+{
+    //Parsing
+    //Vector
+    int32u Count, Length;
+    Get_B4 (Count,                                              "Count");
+    Get_B4 (Length,                                             "Length");
+    for (int32u Pos=0; Pos<Count; Pos++)
+    {
+        int32u Data;
+        Get_B4 (Data,                                           "Track ID");
+
+        FILLING_BEGIN();
+            DMSegments[InstanceUID].TrackIDs.push_back(Data);
+        FILLING_END();
     }
 }
 
@@ -2371,7 +4830,7 @@
 void File_Mxf::EssenceContainerData_IndexSID()
 {
     //Parsing
-    Info_B4(Data,                                               "Data"); Element_Info(Data);
+    Info_B4(Data,                                               "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -2379,7 +4838,7 @@
 void File_Mxf::EssenceContainerData_BodySID()
 {
     //Parsing
-    Info_B4(Data,                                               "Data"); Element_Info(Data);
+    Info_B4(Data,                                               "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -2395,7 +4854,7 @@
 void File_Mxf::EventTrack_EventOrigin()
 {
     //Parsing
-    Info_B8(Data,                                               "Data"); Element_Info(Data);
+    Info_B8(Data,                                               "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -2403,14 +4862,12 @@
 void File_Mxf::FileDescriptor_SampleRate()
 {
     //Parsing
-    Get_Rational(Descriptors[InstanceUID].SampleRate); Element_Info(Descriptors[InstanceUID].SampleRate);
+    Get_Rational(Descriptors[InstanceUID].SampleRate); Element_Info1(Descriptors[InstanceUID].SampleRate);
 
     FILLING_BEGIN();
-        switch (Descriptors[InstanceUID].StreamKind)
-        {
-            case Stream_Video   : Descriptors[InstanceUID].Infos["FrameRate"]=Ztring().From_Number(Descriptors[InstanceUID].SampleRate, 3); break;
-            default             : ;
-        }
+        Descriptors[InstanceUID].Infos["FrameRate"]=Ztring().From_Number(Descriptors[InstanceUID].SampleRate, 3);
+        if (Descriptors[InstanceUID].SampleRate && Descriptors[InstanceUID].Duration!=(int64u)-1)
+            Descriptors[InstanceUID].Infos["Duration"].From_Number(Descriptors[InstanceUID].Duration/Descriptors[InstanceUID].SampleRate*1000, 0);
     FILLING_END();
 }
 
@@ -2420,12 +4877,15 @@
 {
     //Parsing
     int64u Data;
-    Get_B8 (Data,                                               "Data"); Element_Info(Data);
+    Get_B8 (Data,                                               "Data"); Element_Info1(Data);
 
     FILLING_BEGIN();
-        float32 SampleRate=Descriptors[InstanceUID].SampleRate;
-        if (SampleRate && Data!=0xFFFFFFFFFFFFFFFFLL)
-            Descriptors[InstanceUID].Infos["Duration"].From_Number(Data/SampleRate*1000);
+        if (Data)
+        {
+            Descriptors[InstanceUID].Duration=Data;
+            if (Descriptors[InstanceUID].SampleRate && Descriptors[InstanceUID].Duration!=(int64u)-1)
+                Descriptors[InstanceUID].Infos["Duration"].From_Number(Descriptors[InstanceUID].Duration/Descriptors[InstanceUID].SampleRate*1000, 0);
+        }
     FILLING_END();
 }
 
@@ -2434,7 +4894,17 @@
 void File_Mxf::FileDescriptor_EssenceContainer()
 {
     //Parsing
-    Info_UL(EssenceContainer,                                   "EssenceContainer", Mxf_EssenceContainer); Element_Info(Mxf_EssenceContainer(EssenceContainer));
+    int128u EssenceContainer;
+    Get_UL (EssenceContainer,                                   "EssenceContainer", Mxf_EssenceContainer); Element_Info1(Mxf_EssenceContainer(EssenceContainer));
+
+    FILLING_BEGIN();
+        int8u Code6=(int8u)((EssenceContainer.lo&0x0000000000FF0000LL)>>16);
+        int8u Code7=(int8u)((EssenceContainer.lo&0x000000000000FF00LL)>> 8);
+        int8u Code8=(int8u)((EssenceContainer.lo&0x00000000000000FFLL)    );
+
+        Descriptors[InstanceUID].EssenceContainer=EssenceContainer;
+        Descriptors[InstanceUID].Infos["Format_Settings_Wrapping"].From_UTF8(Mxf_EssenceContainer_Mapping(Code6, Code7, Code8));
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -2451,10 +4921,11 @@
 {
     //Parsing
     int32u Data;
-    Get_B4 (Data,                                               "Data"); Element_Info(Data);
+    Get_B4 (Data,                                               "Data"); Element_Info1(Data);
 
     FILLING_BEGIN();
-        Descriptors[InstanceUID].LinkedTrackID=Data;
+        if (Descriptors[InstanceUID].LinkedTrackID==(int32u)-1)
+            Descriptors[InstanceUID].LinkedTrackID=Data;
     FILLING_END();
 }
 
@@ -2463,7 +4934,7 @@
 void File_Mxf::InterchangeObject_InstanceUID()
 {
     //Parsing
-    Get_UUID(InstanceUID,                                       "UUID");
+    Get_UUID(InstanceUID,                                       "UUID"); Element_Info1(Ztring().From_UUID(InstanceUID));
 
     FILLING_BEGIN();
         //Putting the right UID for already parsed items
@@ -2512,7 +4983,7 @@
         components::iterator Component=Components.find(0);
         if (Component!=Components.end())
         {
-            Components[InstanceUID]=Component->second;
+            Components[InstanceUID].Update(Component->second);
             Components.erase(Component);
         }
     FILLING_END();
@@ -2530,6 +5001,8 @@
 // 0x2F01
 void File_Mxf::GenericDescriptor_Locators()
 {
+    Descriptors[InstanceUID].Locators.clear();
+
     //Parsing
     //Vector
     int32u Count, Length;
@@ -2537,7 +5010,7 @@
     Get_B4 (Length,                                             "Length");
     for (int32u Pos=0; Pos<Count; Pos++)
     {
-        Element_Begin("Locator", Length);
+        Element_Begin1("Locator");
         int128u UUID;
         Get_UUID(UUID,                                          "UUID");
 
@@ -2545,7 +5018,7 @@
             Descriptors[InstanceUID].Locators.push_back(UUID);
         FILLING_END();
 
-        Element_End();
+        Element_End0();
     }
 }
 
@@ -2554,7 +5027,12 @@
 void File_Mxf::GenericPackage_PackageUID()
 {
     //Parsing
-    Skip_UMID();
+    int256u Data;
+    Get_UMID (Data,                                             "PackageUID");
+
+    FILLING_BEGIN();
+        Packages[InstanceUID].PackageUID=Data;
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -2562,7 +5040,7 @@
 void File_Mxf::GenericPackage_Name()
 {
     //Parsing
-    Info_UTF16B(Length2, Data,                                  "Data"); Element_Info(Data);
+    Info_UTF16B(Length2, Data,                                  "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -2576,15 +5054,12 @@
     Get_B4 (Length,                                             "Length");
     for (int32u Pos=0; Pos<Count; Pos++)
     {
-        Element_Begin("Track", Length);
         int128u Data;
-        Get_UUID(Data,                                          "Data");
+        Get_UUID(Data,                                          "Track");
 
         FILLING_BEGIN();
             Packages[InstanceUID].Tracks.push_back(Data);
         FILLING_END();
-
-        Element_End();
     }
 }
 
@@ -2610,11 +5085,13 @@
 {
     //Parsing
     int128u Data;
-    Get_UL(Data,                                                "Data", Mxf_EssenceCoding); Element_Info(Mxf_EssenceCoding(Data));
+    Get_UL(Data,                                                "Data", Mxf_EssenceCompression); Element_Info1(Mxf_EssenceCompression(Data));
 
     FILLING_BEGIN();
-        Descriptors[InstanceUID].Infos["Format"]=Mxf_EssenceCoding_Format(Data);
-        Descriptors[InstanceUID].Infos["Format_Version"]=Mxf_EssenceCoding_Format_Version(Data);
+        Descriptors[InstanceUID].EssenceCompression=Data;
+        Descriptors[InstanceUID].StreamKind=Stream_Video;
+        Descriptors[InstanceUID].Infos["Format"]=Mxf_EssenceCompression(Data);
+        Descriptors[InstanceUID].Infos["Format_Version"]=Mxf_EssenceCompression_Version(Data);
     FILLING_END();
 }
 
@@ -2624,10 +5101,11 @@
 {
     //Parsing
     int32u Data;
-    Get_B4 (Data,                                                "Data"); Element_Info(Data);
+    Get_B4 (Data,                                                "Data"); Element_Info1(Data);
 
     FILLING_BEGIN();
-        if (Descriptors[InstanceUID].Infos["ScanType"]==_T("Interlaced"))
+        std::map<std::string, Ztring>::iterator Info=Descriptors[InstanceUID].Infos.find("ScanType");
+        if (Info!=Descriptors[InstanceUID].Infos.end() && Info->second==__T("Interlaced"))
             Data*=2; //This is per field
         if (Descriptors[InstanceUID].Height==(int32u)-1)
             Descriptors[InstanceUID].Height=Data;
@@ -2640,7 +5118,7 @@
 {
     //Parsing
     int32u Data;
-    Get_B4 (Data,                                                "Data"); Element_Info(Data);
+    Get_B4 (Data,                                                "Data"); Element_Info1(Data);
 
     FILLING_BEGIN();
         if (Descriptors[InstanceUID].Width==(int32u)-1)
@@ -2654,10 +5132,11 @@
 {
     //Parsing
     int32u Data;
-    Get_B4 (Data,                                                "Data"); Element_Info(Data);
+    Get_B4 (Data,                                                "Data"); Element_Info1(Data);
 
     FILLING_BEGIN();
-        if (Descriptors[InstanceUID].Infos["ScanType"]==_T("Interlaced"))
+        std::map<std::string, Ztring>::iterator Info=Descriptors[InstanceUID].Infos.find("ScanType");
+        if (Info!=Descriptors[InstanceUID].Infos.end() && Info->second==__T("Interlaced"))
             Data*=2; //This is per field
         Descriptors[InstanceUID].Height=Data;
     FILLING_END();
@@ -2669,7 +5148,7 @@
 {
     //Parsing
     int32u Data;
-    Get_B4 (Data,                                                "Data"); Element_Info(Data);
+    Get_B4 (Data,                                                "Data"); Element_Info1(Data);
 
     FILLING_BEGIN();
         Descriptors[InstanceUID].Width=Data;
@@ -2681,7 +5160,7 @@
 void File_Mxf::GenericPictureEssenceDescriptor_SampledXOffset()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    Info_B4(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -2689,7 +5168,7 @@
 void File_Mxf::GenericPictureEssenceDescriptor_SampledYOffset()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    Info_B4(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -2697,7 +5176,15 @@
 void File_Mxf::GenericPictureEssenceDescriptor_DisplayHeight()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    int32u Data;
+    Get_B4 (Data,                                                "Data"); Element_Info1(Data);
+
+    FILLING_BEGIN();
+        std::map<std::string, Ztring>::iterator Info=Descriptors[InstanceUID].Infos.find("ScanType");
+        if (Info!=Descriptors[InstanceUID].Infos.end() && Info->second==__T("Interlaced"))
+            Data*=2; //This is per field
+        Descriptors[InstanceUID].Height_Display=Data;
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -2705,7 +5192,12 @@
 void File_Mxf::GenericPictureEssenceDescriptor_DisplayWidth()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    int32u Data;
+    Get_B4 (Data,                                                "Data"); Element_Info1(Data);
+
+    FILLING_BEGIN();
+        Descriptors[InstanceUID].Width_Display=Data;
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -2713,7 +5205,12 @@
 void File_Mxf::GenericPictureEssenceDescriptor_DisplayXOffset()
 {
     //Parsing
-    Info_B4(Data,                                               "Data"); Element_Info(Data);
+    int32u Data;
+    Get_B4 (Data,                                               "Data"); Element_Info1(Data);
+
+    FILLING_BEGIN();
+        Descriptors[InstanceUID].Width_Display_Offset=Data;
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -2721,7 +5218,15 @@
 void File_Mxf::GenericPictureEssenceDescriptor_DisplayYOffset()
 {
     //Parsing
-    Info_B4(Data,                                               "Data"); Element_Info(Data);
+    int32u Data;
+    Get_B4 (Data,                                               "Data"); Element_Info1(Data);
+
+    FILLING_BEGIN();
+        std::map<std::string, Ztring>::iterator Info=Descriptors[InstanceUID].Infos.find("ScanType");
+        if (Info!=Descriptors[InstanceUID].Infos.end() && Info->second==__T("Interlaced"))
+            Data*=2; //This is per field
+        Descriptors[InstanceUID].Height_Display_Offset=Data;
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -2730,10 +5235,16 @@
 {
     //Parsing
     int8u Data;
-    Get_B1 (Data,                                               "Data"); Element_Info(Data);
+    Get_B1 (Data,                                               "Data"); Element_Info1(Data); Param_Info1(Mxf_FrameLayout(Data)); Element_Info1(Mxf_FrameLayout(Data));
 
     FILLING_BEGIN();
-        Descriptors[InstanceUID].Infos["ScanType"]=Data?"Interlaced":"PPF";
+        if (Data && Descriptors[InstanceUID].Infos.find("ScanType")==Descriptors[InstanceUID].Infos.end())
+        {
+            if (Descriptors[InstanceUID].Height!=(int32u)-1) Descriptors[InstanceUID].Height*=Mxf_FrameLayout_Multiplier(Data);
+            if (Descriptors[InstanceUID].Height_Display!=(int32u)-1) Descriptors[InstanceUID].Height_Display*=Mxf_FrameLayout_Multiplier(Data);
+            if (Descriptors[InstanceUID].Height_Display_Offset!=(int32u)-1) Descriptors[InstanceUID].Height_Display_Offset*=Mxf_FrameLayout_Multiplier(Data);
+        }
+        Descriptors[InstanceUID].Infos["ScanType"]=Mxf_FrameLayout_ScanType(Data);
     FILLING_END();
 }
 
@@ -2756,12 +5267,15 @@
 void File_Mxf::GenericPictureEssenceDescriptor_AspectRatio()
 {
     //Parsing
-    float32 Data;
+    float64 Data;
     Get_Rational(Data);
 
     FILLING_BEGIN();
         if (Data)
+        {
+            Descriptors[InstanceUID].DisplayAspectRatio=Data;
             Descriptors[InstanceUID].Infos["DisplayAspectRatio"].From_Number(Data, 3);
+        }
     FILLING_END();
 }
 
@@ -2770,7 +5284,7 @@
 void File_Mxf::GenericPictureEssenceDescriptor_AlphaTransparency()
 {
     //Parsing
-    Info_B1(Data,                                               "Data"); Element_Info(Data);
+    Info_B1(Data,                                               "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -2786,7 +5300,7 @@
 void File_Mxf::GenericPictureEssenceDescriptor_ImageAlignmentOffset()
 {
     //Parsing
-    Info_B4(Data,                                               "Data"); Element_Info(Data);
+    Info_B4(Data,                                               "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -2794,7 +5308,7 @@
 void File_Mxf::GenericPictureEssenceDescriptor_FieldDominance()
 {
     //Parsing
-    Info_B1(Data,                                               "Data"); Element_Info(Data);
+    Info_B1(Data,                                               "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -2802,7 +5316,7 @@
 void File_Mxf::GenericPictureEssenceDescriptor_ImageStartOffset()
 {
     //Parsing
-    Info_B4(Data,                                               "Data"); Element_Info(Data);
+    Info_B4(Data,                                               "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -2810,7 +5324,7 @@
 void File_Mxf::GenericPictureEssenceDescriptor_ImageEndOffset()
 {
     //Parsing
-    Info_B4(Data,                                               "Data"); Element_Info(Data);
+    Info_B4(Data,                                               "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -2818,7 +5332,7 @@
 void File_Mxf::GenericPictureEssenceDescriptor_SignalStandard()
 {
     //Parsing
-    Info_B1(Data,                                                "Data"); Element_Info(Data);
+    Info_B1(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -2826,7 +5340,7 @@
 void File_Mxf::GenericPictureEssenceDescriptor_StoredF2Offset()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    Info_B4(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -2834,7 +5348,7 @@
 void File_Mxf::GenericPictureEssenceDescriptor_DisplayF2Offset()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    Info_B4(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -2842,7 +5356,12 @@
 void File_Mxf::GenericPictureEssenceDescriptor_ActiveFormatDescriptor()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    int8u Data;
+    Get_B1 (Data,                                                "Data"); Element_Info1C((Data<16), AfdBarData_active_format[Data]);
+
+    FILLING_BEGIN();
+        Descriptors[InstanceUID].ActiveFormat=Data;
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -2851,13 +5370,15 @@
 {
     //Parsing
     int32u Data;
-    Get_B4 (Data,                                               "Data"); Element_Info(Data);
+    Get_B4 (Data,                                               "Data"); Element_Info1(Data);
 
     FILLING_BEGIN();
         if (Data)
-            Descriptors[InstanceUID].Infos["Resolution"].From_Number(Data);
+        {
+            Descriptors[InstanceUID].Infos["BitDepth"].From_Number(Data);
+            Descriptors[InstanceUID].QuantizationBits=Data;
+        }
     FILLING_END();
-
 }
 
 //---------------------------------------------------------------------------
@@ -2865,7 +5386,7 @@
 void File_Mxf::GenericSoundEssenceDescriptor_Locked()
 {
     //Parsing
-    Info_B1(Data,                                               "Data"); Element_Info(Data?"Yes":"No");
+    Info_B1(Data,                                               "Data"); Element_Info1(Data?"Yes":"No");
 }
 
 //---------------------------------------------------------------------------
@@ -2873,8 +5394,8 @@
 void File_Mxf::GenericSoundEssenceDescriptor_AudioSamplingRate()
 {
     //Parsing
-    float32 Data;
-    Get_Rational(Data); Element_Info(Data);
+    float64 Data;
+    Get_Rational(Data); Element_Info1(Data);
 
     FILLING_BEGIN();
         Descriptors[InstanceUID].Infos["SamplingRate"].From_Number(Data, 0);
@@ -2886,7 +5407,7 @@
 void File_Mxf::GenericSoundEssenceDescriptor_AudioRefLevel()
 {
     //Parsing
-    Info_B1(Data,                                               "Data"); Element_Info(Data, " dB");
+    Info_B1(Data,                                               "Data"); Element_Info2(Data, " dB");
 }
 
 //---------------------------------------------------------------------------
@@ -2894,7 +5415,7 @@
 void File_Mxf::GenericSoundEssenceDescriptor_ElectroSpatialFormulation()
 {
     //Parsing
-    Info_B1(Data,                                               "Data"); Element_Info(Data); //Enum
+    Info_B1(Data,                                               "Data"); Element_Info1(Data); //Enum
 }
 
 //---------------------------------------------------------------------------
@@ -2903,11 +5424,15 @@
 {
     //Parsing
     int128u Data;
-    Get_UL(Data,                                                "Data", Mxf_EssenceContainer); Element_Info(Mxf_EssenceContainer(Data));
+    Get_UL(Data,                                                "Data", Mxf_EssenceCompression); Element_Info1(Mxf_EssenceCompression(Data));
 
     FILLING_BEGIN();
-        Descriptors[InstanceUID].Infos["Format"]=Mxf_EssenceCoding_Format(Data);
-        Descriptors[InstanceUID].Infos["Format_Version"]=Mxf_EssenceCoding_Format_Version(Data);
+        Descriptors[InstanceUID].EssenceCompression=Data;
+        Descriptors[InstanceUID].StreamKind=Stream_Audio;
+        Descriptors[InstanceUID].Infos["Format"]=Mxf_EssenceCompression(Data);
+        Descriptors[InstanceUID].Infos["Format_Version"]=Mxf_EssenceCompression_Version(Data);
+        if ((Data.lo&0xFFFFFFFFFF000000LL)==0x040202017e000000LL)
+            Descriptors[InstanceUID].Infos["Format_Settings_Endianness"]=__T("Big");
     FILLING_END();
 }
 
@@ -2917,9 +5442,10 @@
 {
     //Parsing
     int32u Data;
-    Get_B4 (Data,                                               "Data"); Element_Info(Data);
+    Get_B4 (Data,                                               "Data"); Element_Info1(Data);
 
     FILLING_BEGIN();
+        Descriptors[InstanceUID].ChannelCount=Data;
         Descriptors[InstanceUID].Infos["Channel(s)"].From_Number(Data);
     FILLING_END();
 }
@@ -2929,7 +5455,7 @@
 void File_Mxf::GenericSoundEssenceDescriptor_DialNorm()
 {
     //Parsing
-    Info_B1(Data,                                               "Data"); Element_Info(Data, " dB");
+    Info_B1(Data,                                               "Data"); Element_Info2(Data, " dB");
 }
 
 //---------------------------------------------------------------------------
@@ -2938,10 +5464,11 @@
 {
     //Parsing
     int32u Data;
-    Get_B4 (Data,                                                "Data"); Element_Info(Data);
+    Get_B4 (Data,                                                "Data"); Element_Info1(Data);
 
     FILLING_BEGIN();
-        Tracks[InstanceUID].TrackID=Data;
+        if (Tracks[InstanceUID].TrackID==(int32u)-1)
+            Tracks[InstanceUID].TrackID=Data;
     FILLING_END();
 }
 
@@ -2950,7 +5477,12 @@
 void File_Mxf::GenericTrack_TrackName()
 {
     //Parsing
-    Info_UTF16B(Length2, Data,                                  "Data"); Element_Info(Data);
+    Ztring Data;
+    Get_UTF16B (Length2, Data,                                  "Data"); Element_Info1(Data);
+
+    FILLING_BEGIN();
+        Tracks[InstanceUID].TrackName=Data;
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -2959,7 +5491,7 @@
 {
     //Parsing
     int128u Data;
-    Get_UUID(Data,                                              "Data");
+    Get_UUID(Data,                                              "Data"); Element_Info1(Ztring::ToZtring(Data, 16));
 
     FILLING_BEGIN();
         Tracks[InstanceUID].Sequence=Data;
@@ -2972,7 +5504,7 @@
 {
     //Parsing
     int32u Data;
-    Get_B4 (Data,                                                "Data"); Element_Info(Ztring::ToZtring(Data, 16));
+    Get_B4 (Data,                                                "Data"); Element_Info1(Ztring::ToZtring(Data, 16));
 
     FILLING_BEGIN();
         Tracks[InstanceUID].TrackNumber=Data;
@@ -2986,7 +5518,7 @@
 {
     //Parsing
     Ztring Data;
-    Get_UTF16B(Length2, Data,                                  "Data"); Element_Info(Data);
+    Get_UTF16B(Length2, Data,                                  "Data"); Element_Info1(Data);
 
     FILLING_BEGIN();
         Identifications[InstanceUID].CompanyName=Data;
@@ -2999,7 +5531,7 @@
 {
     //Parsing
     Ztring Data;
-    Get_UTF16B(Length2, Data,                                  "Data"); Element_Info(Data);
+    Get_UTF16B(Length2, Data,                                  "Data"); Element_Info1(Data);
 
     FILLING_BEGIN();
         Identifications[InstanceUID].ProductName=Data;
@@ -3017,12 +5549,12 @@
     Get_B2 (Patch,                                              "Patch");
     Get_B2 (Build,                                              "Build");
     Get_B2 (Release,                                            "Release");
-    Ztring Version=Ztring::ToZtring(Major)+_T('.')
-                  +Ztring::ToZtring(Minor)+_T('.')
-                  +Ztring::ToZtring(Patch)+_T('.')
-                  +Ztring::ToZtring(Build)+_T('.')
+    Ztring Version=Ztring::ToZtring(Major)+__T('.')
+                  +Ztring::ToZtring(Minor)+__T('.')
+                  +Ztring::ToZtring(Patch)+__T('.')
+                  +Ztring::ToZtring(Build)+__T('.')
                   +Ztring::ToZtring(Release)      ;
-    Element_Info(Version);
+    Element_Info1(Version);
 
     FILLING_BEGIN();
         Identifications[InstanceUID].ProductVersion=Version;
@@ -3035,7 +5567,7 @@
 {
     //Parsing
     Ztring Data;
-    Get_UTF16B(Length2, Data,                                  "Data"); Element_Info(Data);
+    Get_UTF16B(Length2, Data,                                  "Data"); Element_Info1(Data);
 
     FILLING_BEGIN();
         Identifications[InstanceUID].VersionString=Data;
@@ -3069,10 +5601,10 @@
     Info_B2(Patch,                                              "Patch");
     Info_B2(Build,                                              "Build");
     Info_B2(Release,                                            "Release");
-    Element_Info(Ztring::ToZtring(Major)+_T('.')
-                +Ztring::ToZtring(Minor)+_T('.')
-                +Ztring::ToZtring(Patch)+_T('.')
-                +Ztring::ToZtring(Build)+_T('.')
+    Element_Info1(Ztring::ToZtring(Major)+__T('.')
+                +Ztring::ToZtring(Minor)+__T('.')
+                +Ztring::ToZtring(Patch)+__T('.')
+                +Ztring::ToZtring(Build)+__T('.')
                 +Ztring::ToZtring(Release)      );
 }
 
@@ -3081,7 +5613,7 @@
 void File_Mxf::Identification_Platform()
 {
     //Parsing
-    Info_UTF16B(Length2, Data,                                  "Data"); Element_Info(Data);
+    Info_UTF16B(Length2, Data,                                  "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3097,7 +5629,14 @@
 void File_Mxf::IndexTableSegment_EditUnitByteCount()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    int32u Data;
+    Get_B4(Data,                                                "Data"); Element_Info1(Data);
+
+    FILLING_BEGIN();
+        #if MEDIAINFO_SEEK
+            IndexTables[IndexTables.size()-1].EditUnitByteCount=Data;
+        #endif //MEDIAINFO_SEEK
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -3105,7 +5644,7 @@
 void File_Mxf::IndexTableSegment_IndexSID()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    Info_B4(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3113,7 +5652,7 @@
 void File_Mxf::IndexTableSegment_BodySID()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    Info_B4(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3121,7 +5660,80 @@
 void File_Mxf::IndexTableSegment_SliceCount()
 {
     //Parsing
-    Info_B1(Data,                                                "Data"); Element_Info(Data);
+    int8u Data;
+    Get_B1(Data,                                                "Data"); Element_Info1(Data);
+
+    FILLING_BEGIN();
+        IndexTable_NSL=Data;
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
+// 0x3F09
+void File_Mxf::IndexTableSegment_DeltaEntryArray()
+{
+    //Parsing
+    int32u NDE, Length;
+    Get_B4(NDE,                                                 "NDE");
+    Get_B4(Length,                                              "Length");
+    for (int32u Pos=0; Pos<NDE; Pos++)
+    {
+        Element_Begin1("Delta Entry");
+        Skip_B1(                                                "PosTableIndex");
+        Skip_B1(                                                "Slice");
+        Skip_B4(                                                "Element Delta");
+        Element_End0();
+    }
+}
+
+//---------------------------------------------------------------------------
+// 0x3F0A
+void File_Mxf::IndexTableSegment_IndexEntryArray()
+{
+    //Parsing
+    int32u NIE, Length;
+    Get_B4(NIE,                                                 "NIE");
+    Get_B4(Length,                                              "Length");
+    for (int32u Pos=0; Pos<NIE; Pos++)
+    {
+        #if MEDIAINFO_SEEK
+            indextable::entry Entry;
+            int64u Stream_Offset;
+            bool   forward_rediction_flag, backward_prediction_flag;
+        #endif //MEDIAINFO_SEEK
+        int8u Flags;
+        Element_Begin1("Index Entry");
+        Skip_B1(                                                "Temporal Offset");
+        Skip_B1(                                                "Key-Frame Offset");
+        Get_B1 (Flags,                                          "Flags");
+            Skip_Flags(Flags, 7,                                "Random Access");
+            Skip_Flags(Flags, 6,                                "Sequence Header");
+            #if MEDIAINFO_SEEK
+                Get_Flags (Flags, 5, forward_rediction_flag,    "forward prediction flag");
+                Get_Flags (Flags, 4, backward_prediction_flag,  "backward prediction flag");
+            #else //MEDIAINFO_SEEK
+                Skip_Flags(Flags, 5,                            "forward prediction flag");
+                Skip_Flags(Flags, 4,                            "backward prediction flag");
+            #endif //MEDIAINFO_SEEK
+        #if MEDIAINFO_SEEK
+            Get_B8 (Stream_Offset,                              "Stream Offset");
+            if (IndexTables[IndexTables.size()-1].IndexDuration==0 //Filling in all cases if IndexDuration is not yet filled
+             || NIE==IndexTables[IndexTables.size()-1].IndexDuration
+             || (NIE/2==IndexTables[IndexTables.size()-1].IndexDuration && (Pos%2)==0)) //Detecting corrupted index having index position twice per frame
+            {
+                Entry.StreamOffset=Stream_Offset;
+                Entry.Type=(forward_rediction_flag?1:0)*2+(backward_prediction_flag?1:0);
+                IndexTables[IndexTables.size()-1].Entries.push_back(Entry);
+            }
+        #else //MEDIAINFO_SEEK
+            Skip_B8(                                            "Stream Offset");
+        #endif //MEDIAINFO_SEEK
+        for (int32u NSL_Pos=0; NSL_Pos<IndexTable_NSL; NSL_Pos++)
+            Skip_B4(                                            "SliceOffset");
+        for (int32u NPE_Pos=0; NPE_Pos<IndexTable_NPE; NPE_Pos++)
+            Skip_B4(                                            "PosTable");
+        Element_End0();
+    }
 }
 
 //---------------------------------------------------------------------------
@@ -3129,7 +5741,14 @@
 void File_Mxf::IndexTableSegment_IndexEditRate()
 {
     //Parsing
-    Info_Rational();
+    float64 Data;
+    Get_Rational(Data);
+
+    FILLING_BEGIN();
+        #if MEDIAINFO_SEEK
+            IndexTables[IndexTables.size()-1].IndexEditRate=Data;
+        #endif //MEDIAINFO_SEEK
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -3137,7 +5756,30 @@
 void File_Mxf::IndexTableSegment_IndexStartPosition()
 {
     //Parsing
-    Info_B8(Data,                                                "Data"); Element_Info(Data);
+    int64u Data;
+    Get_B8 (Data,                                                "Data"); Element_Info1(Data);
+
+    FILLING_BEGIN();
+        #if MEDIAINFO_SEEK
+            IndexTables[IndexTables.size()-1].IndexStartPosition=Data;
+
+            //Integrity test (in one file, I have 2 indexes with IndexStartPosition=0, the first  one is weird (only one frame), or the same index is repeated
+            //Integrity test (in one file, I have 2 indexes with IndexStartPosition=0, the second one is weird (only one frame), or the same index is repeated
+            for (size_t Pos=0; Pos<IndexTables.size()-1; Pos++)
+                if (IndexTables[Pos].IndexStartPosition==Data)
+                {
+                    if (IndexTables[Pos].IndexDuration==1 && Pos!=IndexTables.size()-1)
+                        IndexTables.erase(IndexTables.begin()+Pos);
+                    else
+                    {
+                        IndexTables.erase(IndexTables.begin()+IndexTables.size()-1);
+                        Element_Offset=Element_Size;
+                    }
+
+                    return;
+                }
+        #endif //MEDIAINFO_SEEK
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -3145,7 +5787,14 @@
 void File_Mxf::IndexTableSegment_IndexDuration()
 {
     //Parsing
-    Info_B8(Data,                                                "Data"); Element_Info(Data);
+    int64u Data;
+    Get_B8 (Data,                                                "Data"); Element_Info1(Data);
+
+    FILLING_BEGIN();
+        #if MEDIAINFO_SEEK
+            IndexTables[IndexTables.size()-1].IndexDuration=Data;
+        #endif //MEDIAINFO_SEEK
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -3153,7 +5802,20 @@
 void File_Mxf::IndexTableSegment_PosTableCount()
 {
     //Parsing
-    Info_B1(Data,                                                "Data"); Element_Info(Data);
+    int8u Data;
+    Get_B1(Data,                                                "Data"); Element_Info1(Data);
+
+    FILLING_BEGIN();
+        IndexTable_NPE=Data;
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
+// 0x8002
+void File_Mxf::IndexTableSegment_8002()
+{
+    //Parsing
+    Info_B8(Data,                                               "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3161,7 +5823,7 @@
 void File_Mxf::JPEG2000PictureSubDescriptor_Rsiz()
 {
     //Parsing
-    Info_B2(Data,                                                "Data"); Element_Info(Data);
+    Info_B2(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3169,7 +5831,7 @@
 void File_Mxf::JPEG2000PictureSubDescriptor_Xsiz()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    Info_B4(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3177,7 +5839,7 @@
 void File_Mxf::JPEG2000PictureSubDescriptor_Ysiz()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    Info_B4(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3185,7 +5847,7 @@
 void File_Mxf::JPEG2000PictureSubDescriptor_XOsiz()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    Info_B4(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3193,7 +5855,7 @@
 void File_Mxf::JPEG2000PictureSubDescriptor_YOsiz()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    Info_B4(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3201,7 +5863,7 @@
 void File_Mxf::JPEG2000PictureSubDescriptor_XTsiz()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    Info_B4(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3209,7 +5871,7 @@
 void File_Mxf::JPEG2000PictureSubDescriptor_YTsiz()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    Info_B4(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3217,7 +5879,7 @@
 void File_Mxf::JPEG2000PictureSubDescriptor_XTOsiz()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    Info_B4(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3225,7 +5887,7 @@
 void File_Mxf::JPEG2000PictureSubDescriptor_YTOsiz()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    Info_B4(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3233,7 +5895,7 @@
 void File_Mxf::JPEG2000PictureSubDescriptor_Csiz()
 {
     //Parsing
-    Info_B2(Data,                                                "Data"); Element_Info(Data);
+    Info_B2(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3246,11 +5908,11 @@
     Get_B4 (Length,                                             "Length");
     for (int32u Pos=0; Pos<Count; Pos++)
     {
-        Element_Begin("PictureComponentSize", Length);
-        Info_B1(Ssiz,                                           "Component sample precision"); Element_Info(Ssiz);
-        Info_B1(XRsiz,                                          "Horizontal separation of a sample"); Element_Info(XRsiz);
-        Info_B1(YRsiz,                                          "Vertical separation of a sample"); Element_Info(YRsiz);
-        Element_End();
+        Element_Begin1("PictureComponentSize");
+        Info_B1(Ssiz,                                           "Component sample precision"); Element_Info1(Ssiz);
+        Info_B1(XRsiz,                                          "Horizontal separation of a sample"); Element_Info1(XRsiz);
+        Info_B1(YRsiz,                                          "Vertical separation of a sample"); Element_Info1(YRsiz);
+        Element_End0();
     }
 }
 
@@ -3260,7 +5922,7 @@
 {
     //Parsing
     Ztring Value;
-    Get_Timestamp(Value); Element_Info(Value);
+    Get_Timestamp(Value); Element_Info1(Value);
 
     FILLING_BEGIN();
         Fill(Stream_General, 0, General_Encoded_Date, Value, true);
@@ -3269,10 +5931,39 @@
 
 //---------------------------------------------------------------------------
 // 0x
+void File_Mxf::DMScheme1_PrimaryExtendedSpokenLanguage()
+{
+    //Parsing
+    Ztring Data;
+    Get_Local (Length2, Data,                                   "Data"); Element_Info1(Data);
+
+    FILLING_BEGIN();
+        DMScheme1s[InstanceUID].PrimaryExtendedSpokenLanguage=Data;
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
+// 0x
+void File_Mxf::DMScheme1_SecondaryExtendedSpokenLanguage()
+{
+    //Parsing
+    Info_Local(Length2, Data,                                   "Data"); Element_Info1(Data);
+}
+
+//---------------------------------------------------------------------------
+// 0x
+void File_Mxf::DMScheme1_OriginalExtendedSpokenLanguage()
+{
+    //Parsing
+    Info_Local(Length2, Data,                                   "Data"); Element_Info1(Data);
+}
+
+//---------------------------------------------------------------------------
+// 0x
 void File_Mxf::MPEG2VideoDescriptor_SingleSequence()
 {
     //Parsing
-    Info_B1(Data,                                               "Data"); Element_Info(Data?"Yes":"No");
+    Info_B1(Data,                                               "Data"); Element_Info1(Data?"Yes":"No");
 }
 
 //---------------------------------------------------------------------------
@@ -3280,7 +5971,7 @@
 void File_Mxf::MPEG2VideoDescriptor_ConstantBFrames()
 {
     //Parsing
-    Info_B1(Data,                                               "Data"); Element_Info(Data?"Yes":"No");
+    Info_B1(Data,                                               "Data"); Element_Info1(Data?"Yes":"No");
 }
 
 //---------------------------------------------------------------------------
@@ -3289,9 +5980,15 @@
 {
     //Parsing
     int8u Data;
-    Get_B1 (Data,                                               "Data"); Element_Info(Mxf_MPEG2_CodedContentType(Data));
+    Get_B1 (Data,                                               "Data"); Element_Info1(Mxf_MPEG2_CodedContentType(Data));
 
     FILLING_BEGIN();
+        if (Data==2 && Descriptors[InstanceUID].Infos.find("ScanType")==Descriptors[InstanceUID].Infos.end())
+        {
+            if (Descriptors[InstanceUID].Height!=(int32u)-1) Descriptors[InstanceUID].Height*=2;
+            if (Descriptors[InstanceUID].Height_Display!=(int32u)-1) Descriptors[InstanceUID].Height_Display*=2;
+            if (Descriptors[InstanceUID].Height_Display_Offset!=(int32u)-1) Descriptors[InstanceUID].Height_Display_Offset*=2;
+        }
         Descriptors[InstanceUID].Infos["ScanType"]=Mxf_MPEG2_CodedContentType(Data);
     FILLING_END();
 }
@@ -3301,7 +5998,7 @@
 void File_Mxf::MPEG2VideoDescriptor_LowDelay()
 {
     //Parsing
-    Info_B1(Data,                                               "Data"); Element_Info(Data?"Yes":"No");
+    Info_B1(Data,                                               "Data"); Element_Info1(Data?"Yes":"No");
 }
 
 //---------------------------------------------------------------------------
@@ -3309,7 +6006,7 @@
 void File_Mxf::MPEG2VideoDescriptor_ClosedGOP()
 {
     //Parsing
-    Info_B1(Data,                                               "Data"); Element_Info(Data?"Yes":"No");
+    Info_B1(Data,                                               "Data"); Element_Info1(Data?"Yes":"No");
 }
 
 //---------------------------------------------------------------------------
@@ -3317,7 +6014,7 @@
 void File_Mxf::MPEG2VideoDescriptor_IdenticalGOP()
 {
     //Parsing
-    Info_B1(Data,                                               "Data"); Element_Info(Data?"Yes":"No");
+    Info_B1(Data,                                               "Data"); Element_Info1(Data?"Yes":"No");
 }
 
 //---------------------------------------------------------------------------
@@ -3325,7 +6022,7 @@
 void File_Mxf::MPEG2VideoDescriptor_MaxGOP()
 {
     //Parsing
-    Info_B2(Data,                                               "Data"); Element_Info(Data);
+    Info_B2(Data,                                               "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3333,7 +6030,12 @@
 void File_Mxf::MPEG2VideoDescriptor_BPictureCount()
 {
     //Parsing
-    Info_B2(Data,                                               "Data"); Element_Info(Data);
+    int16u Data;
+    Get_B2 (Data,                                               "Data"); Element_Info1(Data);
+
+    FILLING_BEGIN();
+        Descriptors[InstanceUID].HasBFrames=Data?true:false;
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -3344,13 +6046,13 @@
     int8u profile_and_level_indication_profile, profile_and_level_indication_level;
     BS_Begin();
     Skip_SB(                                                    "profile_and_level_indication_escape");
-    Get_S1 ( 3, profile_and_level_indication_profile,           "profile_and_level_indication_profile"); Param_Info(Mpegv_profile_and_level_indication_profile[profile_and_level_indication_profile]);
-    Get_S1 ( 4, profile_and_level_indication_level,             "profile_and_level_indication_level"); Param_Info(Mpegv_profile_and_level_indication_level[profile_and_level_indication_level]);
+    Get_S1 ( 3, profile_and_level_indication_profile,           "profile_and_level_indication_profile"); Param_Info1(Mpegv_profile_and_level_indication_profile[profile_and_level_indication_profile]);
+    Get_S1 ( 4, profile_and_level_indication_level,             "profile_and_level_indication_level"); Param_Info1(Mpegv_profile_and_level_indication_level[profile_and_level_indication_level]);
     BS_End();
 
     FILLING_BEGIN();
         if (profile_and_level_indication_profile && profile_and_level_indication_level)
-            Descriptors[InstanceUID].Infos["Format_Profile"]=Ztring().From_Local(Mpegv_profile_and_level_indication_profile[profile_and_level_indication_profile])+_T("@")+Ztring().From_Local(Mpegv_profile_and_level_indication_level[profile_and_level_indication_level]);
+            Descriptors[InstanceUID].Infos["Format_Profile"]=Ztring().From_Local(Mpegv_profile_and_level_indication_profile[profile_and_level_indication_profile])+__T("@")+Ztring().From_Local(Mpegv_profile_and_level_indication_level[profile_and_level_indication_level]);
     FILLING_END();
 }
 
@@ -3360,7 +6062,7 @@
 {
     //Parsing
     int32u Data;
-    Get_B4 (Data,                                               "Data"); Element_Info(Data);
+    Get_B4 (Data,                                               "Data"); Element_Info1(Data);
 
     FILLING_BEGIN();
         Descriptors[InstanceUID].Infos["BitRate"].From_Number(Data);
@@ -3373,7 +6075,7 @@
 {
     //Parsing
     Ztring Data;
-    Get_UTF16B(Length2, Data,                                   "Essence Locator"); Element_Info(Data);
+    Get_UTF16B(Length2, Data,                                   "Essence Locator"); Element_Info1(Data);
 
     FILLING_BEGIN();
         Locators[InstanceUID].EssenceLocator=Data;
@@ -3405,28 +6107,71 @@
 void File_Mxf::PartitionMetadata()
 {
     //Parsing
+    int64u PreviousPartition, FooterPartition, HeaderByteCount, IndexByteCount, BodyOffset;
+    int32u IndexSID;
+    int32u KAGSize;
     Skip_B2(                                                    "MajorVersion");
     Skip_B2(                                                    "MinorVersion");
-    Skip_B4(                                                    "KAGSize");
+    Get_B4 (KAGSize,                                            "KAGSize");
     Skip_B8(                                                    "ThisPartition");
-    Skip_B8(                                                    "PreviousPartition");
-    Skip_B8(                                                    "FooterPartition");
-    Skip_B8(                                                    "HeaderByteCount");
-    Skip_B8(                                                    "IndexByteCount");
-    Skip_B4(                                                    "IndexSID");
-    Skip_B8(                                                    "BodyOffset");
+    Get_B8 (PreviousPartition,                                  "PreviousPartition");
+    Get_B8 (FooterPartition,                                    "FooterPartition");
+    Get_B8 (HeaderByteCount,                                    "HeaderByteCount");
+    Get_B8 (IndexByteCount,                                     "IndexByteCount");
+    Get_B4 (IndexSID,                                           "IndexSID");
+    Get_B8 (BodyOffset,                                         "BodyOffset");
     Skip_B4(                                                    "BodySID");
     Get_UL (OperationalPattern,                                 "OperationalPattern", Mxf_OperationalPattern);
 
-    Element_Begin("EssenceContainers"); //Vector
+    Element_Begin1("EssenceContainers"); //Vector
         int32u Count, Length;
         Get_B4 (Count,                                          "Count");
         Get_B4 (Length,                                         "Length");
         for (int32u Pos=0; Pos<Count; Pos++)
         {
-            Info_UL(EssenceContainer,                           "EssenceContainer", Mxf_EssenceContainer);
+            int128u EssenceContainer;
+            Get_UL (EssenceContainer,                           "EssenceContainer", Mxf_EssenceContainer);
+            if (Count==1)
+                EssenceContainer_FromPartitionMetadata=EssenceContainer;
+        }
+    Element_End0();
+
+    PartitionPack_Parsed=true;
+    Partitions_IsFooter=(Code.lo&0x00FF0000)==0x00040000;
+    if (PreviousPartition!=File_Offset+Buffer_Offset-Header_Size)
+        PartitionMetadata_PreviousPartition=PreviousPartition;
+    if (FooterPartition)
+        PartitionMetadata_FooterPartition=FooterPartition;
+    bool AlreadyParsed=false;
+    for (size_t Pos=0; Pos<Partitions.size(); Pos++)
+        if (Partitions[Pos].StreamOffset==File_Offset+Buffer_Offset-Header_Size)
+            AlreadyParsed=true;
+    if (!AlreadyParsed)
+    {
+        partition Partition;
+        Partition.StreamOffset=File_Offset+Buffer_Offset-Header_Size;
+        Partition.FooterPartition=FooterPartition;
+        Partition.HeaderByteCount=HeaderByteCount;
+        Partition.IndexByteCount=IndexByteCount;
+        Partition.BodyOffset=BodyOffset;
+        Partitions_Pos=0;
+        while (Partitions_Pos<Partitions.size() && Partitions[Partitions_Pos].StreamOffset<Partition.StreamOffset)
+            Partitions_Pos++;
+        Partitions.insert(Partitions.begin()+Partitions_Pos, Partition);
+        Partitions_IsCalculatingHeaderByteCount=true;
+    }
+
+    if ((Code.lo&0xFF0000)==0x020000) //If Header Partition Pack
+        switch ((Code.lo>>8)&0xFF)
+        {
+            case 0x01 : Fill(Stream_General, 0, General_Format_Settings, "Open / Incomplete"  , Unlimited, true, true); if (Config->ParseSpeed>=1.0) Config->File_IsGrowing=true; break;
+            case 0x02 : Fill(Stream_General, 0, General_Format_Settings, "Closed / Incomplete", Unlimited, true, true);                                                          break;
+            case 0x03 : Fill(Stream_General, 0, General_Format_Settings, "Open / Complete"    , Unlimited, true, true); if (Config->ParseSpeed>=1.0) Config->File_IsGrowing=true; break;
+            case 0x04 : Fill(Stream_General, 0, General_Format_Settings, "Closed / Complete"  , Unlimited, true, true);                                                          break;
+            default   : ;
         }
-    Element_End();
+
+    PartitionPack_AlreadyParsed.insert(File_Offset+Buffer_Offset-Header_Size);
 }
 
 //---------------------------------------------------------------------------
@@ -3435,7 +6180,7 @@
 {
     //Parsing
     int128u Data;
-    Get_UUID(Data,                                              "Data");
+    Get_UUID(Data,                                              "Data"); Element_Info1(Ztring().From_UUID(Data));
 
     FILLING_BEGIN();
         Prefaces[Preface_Current].ContentStorage=Data;
@@ -3449,7 +6194,7 @@
     //Parsing
     Info_B1(Major,                                              "Major"); //1
     Info_B1(Minor,                                              "Minor"); //2
-    Element_Info(Ztring::ToZtring(Major)+_T('.')+Ztring::ToZtring(Minor));
+    Element_Info1(Ztring::ToZtring(Major)+__T('.')+Ztring::ToZtring(Minor));
 }
 
 //---------------------------------------------------------------------------
@@ -3463,10 +6208,10 @@
     Get_B4 (Length,                                             "Length");
     for (int32u Pos=0; Pos<Count; Pos++)
     {
-        Element_Begin("Identification", Length);
+        Element_Begin1("Identification");
         int128u Data;
-        Get_UUID(Data,                                          "UUID");
-        Element_End();
+        Get_UUID(Data,                                          "UUID"); Element_Info1(Ztring().From_UUID(Data));
+        Element_End0();
 
         FILLING_BEGIN();
             Prefaces[Preface_Current].Identifications.push_back(Data);
@@ -3500,7 +6245,7 @@
 void File_Mxf::Preface_OperationalPattern()
 {
     //Parsing
-    Get_UL (OperationalPattern,                                 "UUID", Mxf_OperationalPattern);
+    Get_UL (OperationalPattern,                                 "UUID", Mxf_OperationalPattern); Element_Info1(Mxf_OperationalPattern(OperationalPattern));
 }
 
 //---------------------------------------------------------------------------
@@ -3528,11 +6273,12 @@
     Get_B4 (Count,                                              "Count");
     Get_B4 (Length,                                             "Length");
     for (int32u Pos=0; Pos<Count; Pos++)
-    {
-        Element_Begin("DMScheme", Length);
-        Skip_UL(                                                "UUID");
-        Element_End();
-    }
+        if (Length==16)
+        {
+            Info_UL(Data,                                       "DMScheme", NULL); Element_Info1(Ztring().From_UUID(Data));
+        }
+        else
+            Skip_XX(Length,                                     "DMScheme");
 }
 
 //---------------------------------------------------------------------------
@@ -3540,7 +6286,7 @@
 void File_Mxf::RGBAEssenceDescriptor_PixelLayout()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    Info_B4(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3548,7 +6294,7 @@
 void File_Mxf::RGBAEssenceDescriptor_Palette()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    Info_B4(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3556,7 +6302,7 @@
 void File_Mxf::RGBAEssenceDescriptor_PaletteLayout()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    Info_B4(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3564,7 +6310,7 @@
 void File_Mxf::RGBAEssenceDescriptor_ScanningDirection()
 {
     //Parsing
-    Info_B1(Data,                                                "Data"); Element_Info(Data);
+    Info_B1(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3572,7 +6318,7 @@
 void File_Mxf::RGBAEssenceDescriptor_ComponentMaxRef()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    Info_B4(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3580,7 +6326,7 @@
 void File_Mxf::RGBAEssenceDescriptor_ComponentMinRef()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    Info_B4(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3588,7 +6334,7 @@
 void File_Mxf::RGBAEssenceDescriptor_AlphaMaxRef()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    Info_B4(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3596,7 +6342,7 @@
 void File_Mxf::RGBAEssenceDescriptor_AlphaMinRef()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    Info_B4(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3610,9 +6356,12 @@
     Get_B4 (Length,                                             "Length");
     for (int32u Pos=0; Pos<Count; Pos++)
     {
-        Element_Begin("StructuralComponent", Length);
-        Skip_UUID(                                              "UUID");
-        Element_End();
+        int128u Data;
+        Get_UUID (Data,                                         "StructuralComponent");
+
+        FILLING_BEGIN();
+            Components[InstanceUID].StructuralComponents.push_back(Data);
+        FILLING_END();
     }
 }
 
@@ -3621,7 +6370,12 @@
 void File_Mxf::SourceClip_SourcePackageID()
 {
     //Parsing
-    Skip_UMID();
+    int256u Data;
+    Get_UMID(Data,                                              "SourcePackageID");
+
+    FILLING_BEGIN();
+        Components[InstanceUID].SourcePackageID=Data;
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -3629,7 +6383,13 @@
 void File_Mxf::SourceClip_SourceTrackID()
 {
     //Parsing
-    Info_B4(Data,                                                "ID"); Element_Info(Data);
+    int32u Data;
+    Get_B4 (Data,                                                "SourceTrackID"); Element_Info1(Data);
+
+    FILLING_BEGIN();
+        if (Components[InstanceUID].SourceTrackID==(int32u)-1)
+            Components[InstanceUID].SourceTrackID=Data;
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -3637,7 +6397,7 @@
 void File_Mxf::SourceClip_StartPosition()
 {
     //Parsing
-    Info_B8(Duration,                                           "Duration"); Element_Info(Duration); //units of edit rate
+    Info_B8(Data,                                               "StartPosition"); Element_Info1(Data); //units of edit rate
 }
 
 //---------------------------------------------------------------------------
@@ -3646,7 +6406,7 @@
 {
     //Parsing
     int128u Data;
-    Get_UUID(Data,                                              "Data");
+    Get_UUID(Data,                                              "Data"); Element_Info1(Ztring().From_UUID(Data));
 
     FILLING_BEGIN();
         Packages[InstanceUID].Descriptor=Data;
@@ -3658,7 +6418,7 @@
 void File_Mxf::StructuralComponent_DataDefinition()
 {
     //Parsing
-    Info_UL(Data,                                               "Data", Mxf_Sequence_DataDefinition); Element_Info(Mxf_Sequence_DataDefinition(Data));
+    Info_UL(Data,                                               "Data", Mxf_Sequence_DataDefinition); Element_Info1(Mxf_Sequence_DataDefinition(Data));
 }
 
 //---------------------------------------------------------------------------
@@ -3667,7 +6427,7 @@
 {
     //Parsing
     int64u Data;
-    Get_B8 (Data,                                               "Data"); Element_Info(Data); //units of edit rate
+    Get_B8 (Data,                                               "Data"); Element_Info1(Data); //units of edit rate
 
     FILLING_BEGIN();
         if (Data!=0xFFFFFFFFFFFFFFFFLL)
@@ -3676,11 +6436,82 @@
 }
 
 //---------------------------------------------------------------------------
+// 0x0102
+void File_Mxf::SystemScheme1_TimeCodeArray()
+{
+    //Parsing
+    //Vector
+    int32u Count, Length;
+    Get_B4 (Count,                                              "Count");
+    Get_B4 (Length,                                             "Length");
+    for (int32u Pos=0; Pos<Count; Pos++)
+    {
+        Element_Begin1("TimeCode");
+        int8u Frames_Units, Frames_Tens, Seconds_Units, Seconds_Tens, Minutes_Units, Minutes_Tens, Hours_Units, Hours_Tens;
+        bool  DropFrame;
+        BS_Begin();
+
+        Skip_SB(                                                "CF - Color fame");
+        Get_SB (   DropFrame,                                   "DP - Drop frame");
+        Get_S1 (2, Frames_Tens,                                 "Frames (Tens)");
+        Get_S1 (4, Frames_Units,                                "Frames (Units)");
+
+        Skip_SB(                                                "FP - Field Phase / BGF0");
+        Get_S1 (3, Seconds_Tens,                                "Seconds (Tens)");
+        Get_S1 (4, Seconds_Units,                               "Seconds (Units)");
+
+        Skip_SB(                                                "BGF0 / BGF2");
+        Get_S1 (3, Minutes_Tens,                                "Minutes (Tens)");
+        Get_S1 (4, Minutes_Units,                               "Minutes (Units)");
+
+        Skip_SB(                                                "BGF2 / Field Phase");
+        Skip_SB(                                                "BGF1");
+        Get_S1 (2, Hours_Tens,                                  "Hours (Tens)");
+        Get_S1 (4, Hours_Units,                                 "Hours (Units)");
+
+        Skip_S1(4,                                              "BG2");
+        Skip_S1(4,                                              "BG1");
+
+        Skip_S1(4,                                              "BG4");
+        Skip_S1(4,                                              "BG3");
+
+        Skip_S1(4,                                              "BG6");
+        Skip_S1(4,                                              "BG5");
+
+        Skip_S1(4,                                              "BG8");
+        Skip_S1(4,                                              "BG7");
+
+        BS_End();
+
+        int64u TimeCode=(int64u)(Hours_Tens     *10*60*60*1000
+                               + Hours_Units       *60*60*1000
+                               + Minutes_Tens      *10*60*1000
+                               + Minutes_Units        *60*1000
+                               + Seconds_Tens         *10*1000
+                               + Seconds_Units           *1000
+                               + (SystemScheme1_FrameRateFromDescriptor?float64_int32s((Frames_Tens*10+Frames_Units)*1000/(float64)SystemScheme1_FrameRateFromDescriptor):0));
+
+        Element_Info1(Ztring().Duration_From_Milliseconds(TimeCode));
+
+        Element_End0();
+
+        //TimeCode
+        if (SystemScheme1_TimeCodeArray_StartTimecode==(int64u)-1)
+            SystemScheme1_TimeCodeArray_StartTimecode=TimeCode;
+    }
+}
+
+//---------------------------------------------------------------------------
 // 0x4101
 void File_Mxf::TextLocator_LocatorName()
 {
     //Parsing
-    Info_UTF16B(Length2, Data,                                  "Data"); Element_Info(Data);
+    Info_UTF16B(Length2, Data,                                  "Data"); Element_Info1(Data);
+
+    FILLING_BEGIN();
+        Locators[InstanceUID].EssenceLocator=Data;
+        Locators[InstanceUID].IsTextLocator=true;
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -3688,7 +6519,24 @@
 void File_Mxf::TimecodeComponent_StartTimecode()
 {
     //Parsing
-    Info_B8(Data,                                                "Data"); Element_Info(Data);
+    int64u Data;
+    Get_B8 (Data,                                                "Data"); Element_Info1(Data);
+
+    FILLING_BEGIN();
+        if (Data!=(int64u)-1)
+        {
+            TimeCode_StartTimecode=Data;
+            if (TimeCode_RoundedTimecodeBase)
+            {
+                DTS_Delay=((float64)TimeCode_StartTimecode)/TimeCode_RoundedTimecodeBase;
+                if (TimeCode_DropFrame)
+                {
+                    DTS_Delay*=1001;
+                    DTS_Delay/=1000;
+                }
+            }
+        }
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -3696,7 +6544,24 @@
 void File_Mxf::TimecodeComponent_RoundedTimecodeBase()
 {
     //Parsing
-    Info_B2(Data,                                                "Data"); Element_Info(Data);
+    int16u Data;
+    Get_B2 (Data,                                                "Data"); Element_Info1(Data);
+
+    FILLING_BEGIN();
+        if (Data && Data!=(int16u)-1)
+        {
+            TimeCode_RoundedTimecodeBase=Data;
+            if (TimeCode_StartTimecode!=(int64u)-1)
+            {
+                DTS_Delay=((float64)TimeCode_StartTimecode)/TimeCode_RoundedTimecodeBase;
+                if (TimeCode_DropFrame)
+                {
+                    DTS_Delay*=1001;
+                    DTS_Delay/=1000;
+                }
+            }
+        }
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -3704,7 +6569,20 @@
 void File_Mxf::TimecodeComponent_DropFrame()
 {
     //Parsing
-    Info_B1(Data,                                                "Data"); Element_Info(Data);
+    int8u Data;
+    Get_B1 (Data,                                                "Data"); Element_Info1(Data);
+
+    FILLING_BEGIN();
+        if (Data!=(int8u)-1 && Data)
+        {
+            TimeCode_DropFrame=true;
+            if (DTS_Delay)
+            {
+                DTS_Delay*=1001;
+                DTS_Delay/=1000;
+            }
+        }
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -3712,8 +6590,8 @@
 void File_Mxf::Track_EditRate()
 {
     //Parsing
-    float32 Data;
-    Get_Rational(Data); Element_Info(Data);
+    float64 Data;
+    Get_Rational(Data); Element_Info1(Data);
 
     FILLING_BEGIN();
         Tracks[InstanceUID].EditRate=Data;
@@ -3725,7 +6603,7 @@
 void File_Mxf::Track_Origin()
 {
     //Parsing
-    Info_B8(Data,                                                "Data"); Element_Info(Data);
+    Info_B8(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3734,10 +6612,11 @@
 {
     //Parsing
     int32u Data;
-    Get_B4 (Data,                                               "Data"); Element_Info(Data);
+    Get_B4 (Data,                                               "Data"); Element_Info1(Data);
 
     FILLING_BEGIN();
         Descriptors[InstanceUID].Infos["BitRate"].From_Number(Data*8);
+        Descriptors[InstanceUID].ByteRate=Data;
     FILLING_END();
 }
 
@@ -3746,7 +6625,12 @@
 void File_Mxf::WaveAudioDescriptor_BlockAlign()
 {
     //Parsing
-    Info_B2(Data,                                                "Data"); Element_Info(Data);
+    int16u Data;
+    Get_B2 (Data,                                               "Data"); Element_Info1(Data);
+
+    FILLING_BEGIN();
+        Descriptors[InstanceUID].BlockAlign=Data;
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -3754,7 +6638,7 @@
 void File_Mxf::WaveAudioDescriptor_SequenceOffset()
 {
     //Parsing
-    Info_B1(Data,                                                "Data"); Element_Info(Data);
+    Info_B1(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3762,7 +6646,7 @@
 void File_Mxf::WaveAudioDescriptor_PeakEnvelopeVersion()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    Info_B4(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3770,7 +6654,7 @@
 void File_Mxf::WaveAudioDescriptor_PeakEnvelopeFormat()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    Info_B4(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3778,7 +6662,7 @@
 void File_Mxf::WaveAudioDescriptor_PointsPerPeakValue()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    Info_B4(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3786,7 +6670,7 @@
 void File_Mxf::WaveAudioDescriptor_PeakEnvelopeBlockSize()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    Info_B4(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3794,7 +6678,7 @@
 void File_Mxf::WaveAudioDescriptor_PeakChannels()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    Info_B4(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3802,7 +6686,7 @@
 void File_Mxf::WaveAudioDescriptor_PeakFrames()
 {
     //Parsing
-    Info_B4(Data,                                                "Data"); Element_Info(Data);
+    Info_B4(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3810,7 +6694,7 @@
 void File_Mxf::WaveAudioDescriptor_PeakOfPeaksPosition()
 {
     //Parsing
-    Info_B8(Data,                                                "Data"); Element_Info(Data);
+    Info_B8(Data,                                                "Data"); Element_Info1(Data);
 }
 
 //---------------------------------------------------------------------------
@@ -3837,12 +6721,82 @@
     Skip_B16(                                                   "Label");
 }
 
+//---------------------------------------------------------------------------
+// 0x8001
+void File_Mxf::Omneon_010201010100_8001()
+{
+    //Parsing
+    //Vector
+    int32u Count, Length;
+    Get_B4 (Count,                                              "Count");
+    Get_B4 (Length,                                             "Length");
+    for (int32u Pos=0; Pos<Count; Pos++)
+    {
+        Skip_UUID(                                              "UUID Omneon_010201020100");
+    }
+}
+
+//---------------------------------------------------------------------------
+// 0x8001
+void File_Mxf::Omneon_010201010100_8003()
+{
+    //Parsing
+    //Vector
+    int32u Count, Length;
+    Get_B4 (Count,                                              "Count");
+    Get_B4 (Length,                                             "Length");
+    for (int32u Pos=0; Pos<Count; Pos++)
+    {
+        Skip_UUID(                                              "UUID Omneon_010201020100");
+    }
+}
+
+//---------------------------------------------------------------------------
+// 0x8003
+void File_Mxf::Omneon_010201020100_8002()
+{
+    //Parsing
+    Skip_UTF16B(Length2,                                        "Content");
+}
+
+//---------------------------------------------------------------------------
+// 0x8003
+void File_Mxf::Omneon_010201020100_8003()
+{
+    //Parsing
+    Skip_UTF16B(Length2,                                        "Content");
+}
+
+//---------------------------------------------------------------------------
+// 0x8004
+void File_Mxf::Omneon_010201020100_8004()
+{
+    //Parsing
+    Skip_XX(Length2,                                            "Unknown");
+}
+
+//---------------------------------------------------------------------------
+// 0x8005
+void File_Mxf::Omneon_010201020100_8005()
+{
+    //Parsing
+    Skip_UTF16B(Length2,                                        "Content");
+}
+
+//---------------------------------------------------------------------------
+// 0x8006
+void File_Mxf::Omneon_010201020100_8006()
+{
+    //Parsing
+    Skip_Local(Length2,                                         "Content");
+}
+
 //***************************************************************************
 // Basic types
 //***************************************************************************
 
 //---------------------------------------------------------------------------
-void File_Mxf::Get_Rational(float32 &Value)
+void File_Mxf::Get_Rational(float64 &Value)
 {
     //Parsing
     int32u N, D;
@@ -3868,8 +6822,7 @@
     //Parsing
     Info_B4(N,                                                  "Numerator");
     Info_B4(D,                                                  "Denominator");
-    if (D)
-        Element_Info(((float32)N)/D);
+    Element_Info1C(D, ((float32)N)/D);
 }
 
 //---------------------------------------------------------------------------
@@ -3879,23 +6832,651 @@
         Skip_UUID();
     #else
     //Parsing
-    Element_Begin(Name);
+    Element_Begin1(Name);
     int64u Value_hi, Value_lo;
+    int8u Category, Registry, Structure;
     Peek_B8(Value_hi);
     Skip_B1(                                                    "Start (0x06)");
     Skip_B1(                                                    "Length of the remaining key (0x0E)");
     Skip_B1(                                                    "ISO, ORG (0x2B)");
     Skip_B1(                                                    "SMPTE (0x34)");
-    Info_B1(Category,                                           "Category"); Param_Info(Mxf_Category(Category));
-    Info_B1(RegistryDesignator,                                 "RegistryDesignator"); Param_Info(Mxf_RegistryDesignator(Category, RegistryDesignator));
-    Skip_B1(                                                    "0x01");
+    Get_B1 (Category,                                           "Category"); Param_Info1(Mxf_Category(Category));
+    Get_B1 (Registry,                                           "Registry"); Param_Info1(Mxf_Registry(Category, Registry));
+    Get_B1 (Structure,                                          "Structure"); Param_Info1(Mxf_Structure(Category, Registry, Structure));
     Skip_B1(                                                    "Version");
     Peek_B8(Value_lo);
-    Info_B1(Code1,                                              "Code (1)");
+    switch (Category)
+    {
+        case 0x01 : //Item
+                    {
+                    //switch (Registry)
+                    //{
+                    //    default   :
+                                    {
+                                    switch (Structure)
+                                    {
+                                        case 0x01 : //Standard
+                                                    Param_Info1("Essence element"); //SMPTE 379M
+                                                    Info_UL_01xx01_Items();
+                                                    break;
+                                        default   :
+                                                    Skip_B8(    "Unknown");
+                                    }
+                                    }
+                    //}
+                    }
+                    break;
+        case 0x02 : //Group
+                    {
+                    //switch (Registry)
+                    //{
+                    //    default   :
+                                    {
+                                    switch (Structure)
+                                    {
+                                        case 0x01 :
+                                                    Info_UL_02xx01_Groups();
+                                                    break;
+                                        default   :
+                                                    Skip_B8(    "Unknown");
+                                    }
+                                    }
+                    //}
+                    }
+                    break;
+        case 0x04 : //Value
+                    {
+                    switch (Registry)
+                    {
+                        case 0x01 :
+                                    {
+                                    Param_Info1("Labels");
+                                    switch (Structure)
+                                    {
+                                        case 0x01 :
+                                                    Info_UL_040101_Values();
+                                                    break;
+                                        default   :
+                                                    Skip_B8(   "Unknown");
+                                    }
+                                    }
+                                    break;
+                        default   :
+                                    Skip_B8(                    "Unknown");
+                    }
+                    }
+                    break;
+        default   :
+                    Skip_B8(                                    "Unknown");
+    }
+
+
+    Value.hi=Value_hi;
+    Value.lo=Value_lo;
+    Element_Info1C((Param), Param(Value));
+    Element_End0();
+    #endif
+}
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_TRACE
+void File_Mxf::Info_UL_01xx01_Items()
+{
+    Info_B1(Code1,                                              "Item Designator");
     switch (Code1)
     {
         case 0x01 :
             {
+            Param_Info1("Identifiers and locators");
+            Info_B1(Code2,                                      "Code (2)");
+            switch (Code2)
+            {
+                case 0x01 :
+                    {
+                    Param_Info1("GUID");
+                    Info_B1(Code3,                              "Code (3)");
+                    switch (Code3)
+                    {
+                        case 0x0D :
+                            {
+                            Param_Info1("UMID Mixed");
+                            Info_B1(Code4,                      "Code (4)");
+                            Info_B1(Code5,                      "Code (5)");
+                            Info_B1(Code6,                      "Code (6)");
+                            Info_B1(Code7,                      "Code (7)");
+                            Info_B1(Code8,                      "Code (8)");
+                            }
+                            break;
+                        default   :
+                            Skip_B5(                            "Unknown");
+                    }
+                    }
+                    break;
+                default   :
+                    Skip_B6(                                    "Unknown");
+            }
+            }
+            break;
+        case 0x03 :
+            {
+            Param_Info1("Interpretive");
+            Info_B1(Code2,                                      "Code (2)");
+            switch (Code2)
+            {
+                case 0x01 :
+                    {
+                    Param_Info1("Fundamental");
+                    Info_B1(Code3,                              "Code (3)");
+                    switch (Code3)
+                    {
+                        case 0x02 :
+                            {
+                            Param_Info1("Data Interpretations and Definitions");
+                            Info_B1(Code4,                      "Code (4)");
+                            switch (Code4)
+                            {
+                                case 0x0A :
+                                    {
+                                    Param_Info1("Name-Value Construct Interpretations");
+                                    Info_B1(Code5,              "Code (5)");
+                                    switch (Code5)
+                                    {
+                                        case 0x01 :
+                                        case 0x02 :
+                                            {
+                                            Param_Info1("");
+                                            Info_B1(Code6,              "Code (6)");
+                                            switch (Code6)
+                                            {
+                                                case 0x00 :
+                                                    {
+                                                    Param_Info1("ANSI");
+                                                    Info_B1(Code7,      "Reserved");
+                                                    Info_B1(Code8,      "Reserved");
+                                                    }
+                                                    break;
+                                                case 0x01 :
+                                                    {
+                                                    Param_Info1("UTF-16");
+                                                    Info_B1(Code7,      "Reserved");
+                                                    Info_B1(Code8,      "Reserved");
+                                                    }
+                                                    break;
+                                               default   :
+                                                    Skip_B2(            "Unknown");
+                                            }
+                                            }
+                                            break;
+                                       default   :
+                                            Skip_B3(            "Unknown");
+                                    }
+                                    }
+                                    break;
+                                case 0x10 :
+                                    {
+                                    Param_Info1("KLV Interpretations");
+                                    Info_B1(Code5,              "Code (5)");
+                                    switch (Code5)
+                                    {
+                                        case 0x01 :
+                                            {
+                                            Param_Info1("Filler");
+                                            Info_B1(Code6,      "Reserved");
+                                            Info_B1(Code7,      "Reserved");
+                                            Info_B1(Code8,      "Reserved");
+                                            }
+                                            break;
+                                        case 0x05 :
+                                            {
+                                            Param_Info1("Terminating Filler");
+                                            Info_B1(Code6,      "Reserved");
+                                            Info_B1(Code7,      "Reserved");
+                                            Info_B1(Code8,      "Reserved");
+                                            }
+                                            break;
+                                       default   :
+                                            Skip_B3(            "Unknown");
+                                    }
+                                    }
+                                    break;
+                                case 0x20 :
+                                    {
+                                    Param_Info1("XML Constructs and Interpretations");
+                                    Info_B1(Code5,              "Code (5)");
+                                    switch (Code5)
+                                    {
+                                        case 0x01 :
+                                            {
+                                            Param_Info1("XML Document Text");
+                                            Info_B1(Code6,      "Reserved");
+                                            Info_B1(Code7,      "Reserved");
+                                            Info_B1(Code8,      "Reserved");
+                                            }
+                                            break;
+                                       default   :
+                                            Skip_B3(            "Unknown");
+                                    }
+                                    }
+                                    break;
+                                default   :
+                                    Skip_B4(                    "Unknown");
+                            }
+                            }
+                            break;
+                        default   :
+                            Skip_B5(                            "Unknown");
+                    }
+                    }
+                    break;
+                default   :
+                    Skip_B6(                                    "Unknown");
+            }
+            }
+            break;
+        case 0x0D :
+            {
+            Param_Info1("User Organisation Registered For Public Use");
+            Info_B1(Code2,                                      "Organization");
+            switch (Code2)
+            {
+                case 0x01 :
+                    {
+                    Param_Info1("AAF");
+                    Info_B1(Code3,                              "Application");
+                    switch (Code3)
+                    {
+                        case 0x03 :
+                            {
+                            Param_Info1("MXF Generic Container Keys");
+                            Info_B1(Code4,                      "Structure Version");
+                            switch (Code4)
+                            {
+                                case 0x01 :
+                                    {
+                                    Param_Info1("Version 1");
+                                    Info_B1(Code5,              "Item Type Identifier");
+                                    switch (Code5)
+                                    {
+                                        case 0x05 : Param_Info1("CP Picture (SMPTE 326M)"); break;
+                                        case 0x06 : Param_Info1("CP Sound (SMPTE 326M)"); break;
+                                        case 0x07 : Param_Info1("CP Data (SMPTE 326M)"); break;
+                                        case 0x14 : Param_Info1("MXF in MXF? (To confirm)"); break;
+                                        case 0x15 : Param_Info1("GC Picture"); break;
+                                        case 0x16 : Param_Info1("GC Sound"); break;
+                                        case 0x17 : Param_Info1("GC Data"); break;
+                                        case 0x18 : Param_Info1("GC Compound"); break;
+                                        default   : ;
+                                    }
+                                    Info_B1(Code6,              "Essence Element Count");
+                                    Info_B1(Code7,              "Essence Element Type");
+                                    Info_B1(Code8,              "Essence Element Number");
+                                    }
+                                    break;
+                                default   :
+                                    Skip_B4(                    "Unknown");
+                            }
+                            }
+                            break;
+                        default   :
+                            Skip_B5(                            "Unknown");
+                    }
+                    }
+                    break;
+                default   :
+                    Skip_B6(                                    "Unknown");
+            }
+            }
+            break;
+        case 0x0E :
+            {
+            Param_Info1("User Organisation Registered For Private Use");
+            Info_B1(Code2,                                      "Organization");
+            switch (Code2)
+            {
+                case 0x04 :
+                    {
+                    Param_Info1("Avid");
+                    Info_B1(Code3,                              "Application");
+                    switch (Code3)
+                    {
+                        case 0x03 :
+                            {
+                            Param_Info1("Container Keys");
+                            Info_B1(Code4,                      "Structure Version");
+                            switch (Code4)
+                            {
+                                case 0x01 :
+                                    {
+                                    Param_Info1("Version 1");
+                                    Info_B1(Code5,              "Item Type Identifier");
+                                    switch (Code5)
+                                    {
+                                        case 0x15 : Param_Info1("Picture"); break;
+                                        default   : ;
+                                    }
+                                    Info_B1(Code6,              "Essence Element Count");
+                                    Info_B1(Code7,              "Essence Element Type");
+                                    Info_B1(Code8,              "Essence Element Number");
+                                    }
+                                    break;
+                                default   :
+                                    Skip_B4(                    "Unknown");
+                            }
+                            }
+                            break;
+                        default   :
+                            Skip_B5(                            "Unknown");
+                    }
+                    }
+                    break;
+                default   :
+                    Skip_B6(                                    "Unknown");
+            }
+            }
+            break;
+        default   :
+            Skip_B7(                                            "Unknown");
+    }
+}
+#endif //MEDIAINFO_TRACE
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_TRACE
+void File_Mxf::Info_UL_02xx01_Groups()
+{
+    Info_B1(Code1,                                              "Item Designator");
+    switch (Code1)
+    {
+        case 0x0D :
+            {
+            Param_Info1("User Organisation Registered For Public Use");
+            Info_B1(Code2,                                      "Organization");
+            switch (Code2)
+            {
+                case 0x01 :
+                    {
+                    Param_Info1("AAF");
+                    Info_B1(Code3,                              "Application");
+                    switch (Code3)
+                    {
+                        case 0x01 :
+                            {
+                            Param_Info1("Structural Metadata Sets");
+                            Info_B1(Code4,                      "Structure Version");
+                            switch (Code4)
+                            {
+                                case 0x01 :
+                                    {
+                                    Param_Info1("Version 1");
+                                    Info_B1(Code5,              "Structure Kind");
+                                    switch (Code5)
+                                    {
+                                        case 0x01 :
+                                            {
+                                            Param_Info1("MXF / AAF Association compatible sets & packs");
+                                            Info_B1(Code6,      "Set Kind (1)"); //See table 14
+                                            Info_B1(Code7,      "Set Kind (2)"); //See table 14
+                                            Info_B1(Code8,      "Reserved");
+                                            }
+                                            break;
+                                       default   :
+                                            Skip_B3(            "Unknown");
+                                    }
+                                    }
+                                    break;
+                                default   :
+                                    Skip_B4(                    "Unknown");
+                            }
+                            }
+                            break;
+                        case 0x02 :
+                            {
+                            Param_Info1("MXF File Structure");
+                            Info_B1(Code4,                      "Structure Version");
+                            switch (Code4)
+                            {
+                                case 0x01 :
+                                    {
+                                    Param_Info1("Version 1");
+                                    Info_B1(Code5,              "Structure Kind");
+                                    switch (Code5)
+                                    {
+                                        case 0x01 :
+                                            {
+                                            Param_Info1("MXF File Structure sets & packs");
+                                            Info_B1(Code6,      "Set / Pack Kind");
+                                            switch (Code6)
+                                            {
+                                                case 0x02 :
+                                                    {
+                                                    Param_Info1("Header Partition");
+                                                    Info_B1(Code7, "Partition Status");
+                                                    Info_B1(Code8, "Reserved");
+                                                    }
+                                                    break;
+                                                case 0x03 :
+                                                    {
+                                                    Param_Info1("Body Partition");
+                                                    Info_B1(Code7, "Partition Status");
+                                                    Info_B1(Code8, "Reserved");
+                                                    }
+                                                    break;
+                                                case 0x04 :
+                                                    {
+                                                    Param_Info1("Footer Partition");
+                                                    Info_B1(Code7, "Partition Status");
+                                                    Info_B1(Code8, "Reserved");
+                                                    }
+                                                    break;
+                                                case 0x05 :
+                                                    {
+                                                    Param_Info1("Primer");
+                                                    Info_B1(Code7, "Version of the Primer Pack");
+                                                    Info_B1(Code8, "Reserved");
+                                                    }
+                                                    break;
+                                                case 0x10 :
+                                                    Param_Info1("Index Table Segment");
+                                                    Skip_B1(    "Version");
+                                                    Skip_B1(    "Reserved");
+                                                    break;
+                                                case 0x11 :
+                                                    Param_Info1("Random Index Pack");
+                                                    Skip_B1(    "Version");
+                                                    Skip_B1(    "Reserved");
+                                                    break;
+                                                default   :
+                                                    Skip_B3(    "Unknown");
+                                            }
+                                            }
+                                            break;
+                                       default   :
+                                            Skip_B3(            "Unknown");
+                                    }
+                                    }
+                                    break;
+                                default   :
+                                    Skip_B4(                    "Unknown");
+                            }
+                            }
+                            break;
+                        case 0x03 :
+                            {
+                            Param_Info1("MXF Generic Container Keys");
+                            Info_B1(Code4,                      "Structure Version");
+                            switch (Code4)
+                            {
+                                case 0x01 :
+                                    {
+                                    Param_Info1("MXF-GC Version 1");
+                                    Info_B1(Code5,              "Item Type Identifier");
+                                    switch (Code5)
+                                    {
+                                        case 0x04 :
+                                            {
+                                            Param_Info1("CP-Compatible System Item"); //SMPTE 379M
+                                            Info_B1(Code6,      "System Scheme Identifier");
+                                            switch (Code6)
+                                            {
+                                                case 0x02 :
+                                                    {
+                                                    Param_Info1("SDTI-CP, version 1"); //SMPTE 385M
+                                                    Info_B1(Code7, "Metadata or Control Element Identifier");
+                                                    switch (Code7)
+                                                    {
+                                                        case 0x01 :
+                                                            {
+                                                            Param_Info1("System Metadata Pack");
+                                                            Info_B1(Code8, "Reserved");
+                                                            }
+                                                            break;
+                                                        case 0x02 :
+                                                            {
+                                                            Param_Info1("Package metadata set");
+                                                            Info_B1(Code8, "Metadata Block Count");
+                                                            }
+                                                            break;
+                                                        case 0x03 :
+                                                            {
+                                                            Param_Info1("Picture metadata set");
+                                                            Info_B1(Code8, "Metadata Block Count");
+                                                            }
+                                                            break;
+                                                        case 0x04 :
+                                                            {
+                                                            Param_Info1("Sound metadata set");
+                                                            Info_B1(Code8, "Metadata Block Count");
+                                                            }
+                                                            break;
+                                                        case 0x05 :
+                                                            {
+                                                            Param_Info1("Data metadata set");
+                                                            Info_B1(Code8, "Metadata Block Count");
+                                                            }
+                                                            break;
+                                                        case 0x06 :
+                                                            {
+                                                            Param_Info1("Control data set");
+                                                            Info_B1(Code8, "Metadata Block Count");
+                                                            }
+                                                            break;
+                                                        default   :
+                                                            Info_B1(Code8, "Metadata Block Count");
+                                                    }
+                                                    }
+                                                    break;
+                                                default   :
+                                                    Info_B1(Code7,      "Metadata or Control Element Identifier");
+                                                    Info_B1(Code8,      "Reserved");
+                                            }
+                                            }
+                                            break;
+                                        case 0x14 :
+                                            {
+                                            Param_Info1("GC-Compatible System Item"); //SMPTE 379M
+                                            Info_B1(Code6,      "System Scheme Identifier");
+                                            switch (Code6)
+                                            {
+                                                case 0x02 :
+                                                    {
+                                                    Param_Info1("GC System Scheme 1"); //SMPTE 394M
+                                                    Info_B1(Code7, "Metadata or Control Element Identifier");
+                                                    switch (Code7)
+                                                    {
+                                                        case 0x01 :
+                                                            Param_Info1("First Element");
+                                                            break;
+                                                        case 0x02 :
+                                                            Param_Info1("Subsequent Element");
+                                                            break;
+                                                        case 0x03 :
+                                                            Param_Info1("Picture Item Descriptor");
+                                                            break;
+                                                        case 0x04 :
+                                                            Param_Info1("Sound Item Descriptor");
+                                                            break;
+                                                        case 0x05 :
+                                                            Param_Info1("Data Item Descriptor");
+                                                            break;
+                                                        case 0x06 :
+                                                            Param_Info1("Control Item Descriptor");
+                                                            break;
+                                                        case 0x07 :
+                                                            Param_Info1("Compound Item Descriptor");
+                                                            break;
+                                                        default   : if (Code7>=0x10 && Code7<=0x7F) Param_Info1("Pack coded System Elements (SMPTE 336M)");
+                                                    }
+                                                    Info_B1(Code8, "Element Number");
+                                                    }
+                                                    break;
+                                                default   :
+                                                    Info_B1(Code7,      "Metadata or Control Element Identifier");
+                                                    Info_B1(Code8,      "Unknown");
+                                            }
+                                            }
+                                            break;
+                                       default   :
+                                            Skip_B3(            "Unknown");
+                                    }
+                                    }
+                                    break;
+                                default   :
+                                    Skip_B4(                    "Unknown");
+                            }
+                            }
+                            break;
+                        case 0x04 :
+                            {
+                            Param_Info1("MXF / AAF Descriptive Metadata sets");
+                            Info_B1(Code4,                      "Structure Version");
+                            switch (Code4)
+                            {
+                                case 0x01 :
+                                    {
+                                    Param_Info1("Version 1");
+                                    Info_B1(Code5,              "Structure / Scheme Kind");
+                                    Info_B1(Code6,              "Reserved");
+                                    Info_B1(Code7,              "Reserved");
+                                    Info_B1(Code8,              "Reserved");
+                                    }
+                                    break;
+                                default   :
+                                    Skip_B4(                    "Unknown");
+                            }
+                            }
+                            break;
+                        default   :
+                            Skip_B5(                            "Unknown");
+                    }
+                    }
+                    break;
+                default   :
+                    Skip_B6(                                    "Unknown");
+            }
+            }
+            break;
+        case 0x0E :
+            {
+            Param_Info1("User Organisation Registered For Private Use");
+            Skip_B7(                                            "Private");
+            break;
+            }
+        default   :
+            Skip_B7(                                            "Unknown");
+    }
+}
+#endif //MEDIAINFO_TRACE
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_TRACE
+void File_Mxf::Info_UL_040101_Values()
+{
+    Info_B1(Code1,                                              "Item Designator");
+    switch (Code1)
+    {
+        case 0x01 :
+            {
+            Param_Info1("Interpretive");
             Info_B1(Code2,                                      "Code (2)");
             switch (Code2)
             {
@@ -3919,17 +7500,126 @@
             break;
         case 0x04 :
             {
+            Param_Info1("Parametric");
             Info_B1(Code2,                                      "Code (2)");
             switch (Code2)
             {
                 case 0x01 :
                     {
+                    Param_Info1("Picture essence");
                     Info_B1(Code3,                              "Code (3)");
                     switch (Code3)
                     {
-                        case 0x02 :
+                        case 0x01 :
+                            Param_Info1("Fundamental Picture Characteristics");
                             Skip_B5(                            "Picture coding or compression");
                             break;
+                        case 0x02 :
+                            Param_Info1("Picture Coding Characteristics");
+                            Info_B1(Code4,                      "Code (4)");
+                            switch (Code4)
+                            {
+                                case 0x01 :
+                                    Param_Info1("Uncompressed Picture Coding");
+                                    Skip_B1(                    "Item Type Identifier"); //if 0x14: SMPTE 384M Uncompressed picture Line wrapped
+                                    Skip_B1(                    "System Scheme Identifier"); //SMPTE 384M
+                                    Skip_B1(                    "System Element Identifier"); //SMPTE 384M
+                                    Skip_B1(                    "Reserved");
+                                    break;
+                                case 0x02 :
+                                    {
+                                    Param_Info1("Compressed Picture Coding");
+                                    Info_B1(Code5,              "Code (5)");
+                                    switch (Code5)
+                                    {
+                                        case 0x01 :
+                                            {
+                                            Param_Info1("MPEG Compression");
+                                            Info_B1(Code6,      "Code (6)");
+                                            switch (Code6)
+                                            {
+                                                case 0x01 :
+                                                    Param_Info1("MPEG-2 MP@ML");
+                                                    Skip_B2(    "Unknown");
+                                                    break;
+                                                case 0x02 :
+                                                    Param_Info1("MPEG-2 422P@ML");
+                                                    Skip_B2(    "Unknown");
+                                                    break;
+                                                case 0x03 :
+                                                    Param_Info1("MPEG-2 MP@HL");
+                                                    Skip_B2(    "Unknown");
+                                                    break;
+                                                case 0x04 :
+                                                    Param_Info1("MPEG-2 422P@HL");
+                                                    Skip_B2(    "Unknown");
+                                                    break;
+                                                case 0x10 :
+                                                    Param_Info1("MPEG-1");
+                                                    Skip_B2(    "Unknown");
+                                                    break;
+                                                case 0x20 :
+                                                    Param_Info1("MPEG-4 Visual");
+                                                    Skip_B2(    "Unknown");
+                                                    break;
+                                                case 0x32 :
+                                                    Param_Info1("AVC");
+                                                    Skip_B2(    "Unknown");
+                                                    break;
+                                                default   :
+                                                    Skip_B2(    "Unknown");
+                                            }
+                                            }
+                                            break;
+                                        case 0x02 :
+                                            {
+                                            Param_Info1("DV Video Compression");
+                                            Info_B1(Code6,      "Code (6)");
+                                            switch (Code6)
+                                            {
+                                                case 0x02 :
+                                                    Param_Info1("DV-Based Compression");
+                                                    Info_B1(Code7, "DV type (SMPTE 383)");
+                                                    Info_B1(Code8, "Mapping Kind"); Param_Info1(Mxf_EssenceContainer_Mapping(Code6, Code7, Code8));
+                                                    break;
+                                                default   :
+                                                    Skip_B2(    "Unknown");
+                                            }
+                                            }
+                                            break;
+                                        case 0x03 :
+                                            {
+                                            Param_Info1("Individual Picture Coding Schemes");
+                                            Info_B1(Code6,      "Code (6)");
+                                            switch (Code6)
+                                            {
+                                                case 0x01 :
+                                                    Param_Info1("JPEG 2000");
+                                                    Skip_B1(    "Unused");
+                                                    Skip_B1(    "Unused");
+                                                    break;
+                                                default   :
+                                                    Skip_B2(    "Unknown");
+                                            }
+                                            }
+                                            break;
+                                        case 0x71 :
+                                            {
+                                            Param_Info1("VC-3");
+                                            Skip_B1(            "Variant");
+                                            Skip_B1(            "Unused");
+                                            Skip_B1(            "Unused");
+                                            }
+                                            break;
+                                        default   :
+                                            Skip_B3(            "Unknown");
+                                    }
+                                    }
+                                    break;
+                                default   :
+                                    Skip_B4(                    "Unknown");
+                            }
+                            break;
                         default   :
                             Skip_B5(                            "Unknown");
                     }
@@ -3937,12 +7627,177 @@
                     break;
                 case 0x02 :
                     {
+                    Param_Info1("Sound essence");
                     Info_B1(Code3,                              "Code (3)");
                     switch (Code3)
                     {
-                        case 0x02 :
+                        case 0x01 :
                             Skip_B5(                            "Sound coding or compression");
                             break;
+                        case 0x02 :
+                            {
+                            Param_Info1("Sound Coding Characteristics");
+                            Info_B1(Code4,                      "Code (4)");
+                            switch (Code4)
+                            {
+                                case 0x01 :
+                                    {
+                                    Param_Info1("Uncompressed Sound Coding");
+                                    Info_B1(Code5,              "Code (5)");
+                                    switch (Code5)
+                                    {
+                                        case 0x7E :
+                                            {
+                                            Param_Info1("PCM (AIFF)");
+                                            Skip_B3(            "Reserved");
+                                            }
+                                            break;
+                                        case 0x7F :
+                                            {
+                                            Param_Info1("PCM");
+                                            Skip_B3(            "Reserved");
+                                            }
+                                            break;
+                                        default   :
+                                            Skip_B3(            "Unknown");
+                                    }
+                                    }
+                                    break;
+                                case 0x02 :
+                                    {
+                                    Param_Info1("Compressed Sound Coding");
+                                    Info_B1(Code5,              "Code (5)");
+                                    switch (Code5)
+                                    {
+                                        case 0x03 :
+                                            {
+                                            Param_Info1("Compressed Audio Coding");
+                                            Info_B1(Code6,      "Code (6)");
+                                            switch (Code6)
+                                            {
+                                                case 0x01 :
+                                                    {
+                                                    Param_Info1("Compandeded Audio Coding");
+                                                    Info_B1(Code7, "Code (7)");
+                                                    switch (Code7)
+                                                    {
+                                                        case 0x01 :
+                                                            Param_Info1("A-law Coded Audio (default)");
+                                                            Skip_B1("Unknown");
+                                                            break;
+                                                        case 0x02 :
+                                                            Param_Info1("DV Compressed Audio");
+                                                            Skip_B1("Unknown");
+                                                            break;
+                                                        default   :
+                                                            Skip_B2("Unknown");
+                                                    }
+                                                    }
+                                                    break;
+                                                case 0x02 :
+                                                    {
+                                                    Param_Info1("SMPTE 338M Audio Coding");
+                                                    Info_B1(Code7, "Code (7)");
+                                                    switch (Code7)
+                                                    {
+                                                        case 0x01 :
+                                                            Param_Info1("AC-3");
+                                                            Skip_B1("Unknown");
+                                                            break;
+                                                        case 0x04 :
+                                                            Param_Info1("MPEG-1 Audio Layer 1");
+                                                            Skip_B1("Unknown");
+                                                            break;
+                                                        case 0x05 :
+                                                            Param_Info1("MPEG-1 Audio Layer 2");
+                                                            Skip_B1("Unknown");
+                                                            break;
+                                                        case 0x06 :
+                                                            Param_Info1("MPEG-2 Audio Layer 1");
+                                                            Skip_B1("Unknown");
+                                                            break;
+                                                        case 0x1C :
+                                                            Param_Info1("Dolby E");
+                                                            Skip_B1("Unknown");
+                                                            break;
+                                                        default   :
+                                                            Skip_B2("Unknown");
+                                                    }
+                                                    }
+                                                    break;
+                                                case 0x03 :
+                                                    {
+                                                    Param_Info1("MPEG-2 Coding (not defined in SMPTE 338M)");
+                                                    Info_B1(Code7, "Code (7)");
+                                                    switch (Code7)
+                                                    {
+                                                        case 0x01 :
+                                                            Param_Info1("AAC version 2");
+                                                            Skip_B1("Unknown");
+                                                            break;
+                                                        default   :
+                                                            Skip_B2("Unknown");
+                                                    }
+                                                    }
+                                                    break;
+                                                case 0x04 :
+                                                    {
+                                                    Param_Info1("MPEG-4 Audio Coding");
+                                                    Info_B1(Code7, "Code (7)");
+                                                    switch (Code7)
+                                                    {
+                                                        case 0x01 :
+                                                            Param_Info1("MPEG-4 Speech Profile");
+                                                            Skip_B1("Unknown");
+                                                            break;
+                                                        case 0x02 :
+                                                            Param_Info1("MPEG-4 Synthesis Profile");
+                                                            Skip_B1("Unknown");
+                                                            break;
+                                                        case 0x03 :
+                                                            Param_Info1("MPEG-4 Scalable Profile");
+                                                            Skip_B1("Unknown");
+                                                            break;
+                                                        case 0x04 :
+                                                            Param_Info1("MPEG-4 Main Profile");
+                                                            Skip_B1("Unknown");
+                                                            break;
+                                                        case 0x05 :
+                                                            Param_Info1("MPEG-4 High Quality Audio Profile");
+                                                            Skip_B1("Unknown");
+                                                            break;
+                                                        case 0x06 :
+                                                            Param_Info1("MPEG-4 Low Delay Audio Profile");
+                                                            Skip_B1("Unknown");
+                                                            break;
+                                                        case 0x07 :
+                                                            Param_Info1("MPEG-4 Natural Audio Profile");
+                                                            Skip_B1("Unknown");
+                                                            break;
+                                                        case 0x08 :
+                                                            Param_Info1("MPEG-4 Mobile Audio Internetworking Profile");
+                                                            Skip_B1("Unknown");
+                                                            break;
+                                                        default   :
+                                                            Skip_B2("Unknown");
+                                                    }
+                                                    }
+                                                    break;
+                                                default   :
+                                                    Skip_B2(    "Unknown");
+                                            }
+                                            }
+                                            break;
+                                        default   :
+                                            Skip_B3(            "Unknown");
+                                    }
+                                    }
+                                    break;
+                                default   :
+                                    Skip_B4(                    "Unknown");
+                            }
+                            }
+                            break;
                         default   :
                             Skip_B5(                            "Unknown");
                     }
@@ -3955,21 +7810,33 @@
             break;
         case 0x0D :
             {
-            Info_B1(Code2,                                      "Code (2)");
+            Param_Info1("User Organisation Registered For Public Use");
+            Info_B1(Code2,                                      "Organization");
             switch (Code2)
             {
                 case 0x01 :
                     {
-                    Info_B1(Code3,                              "Code (3)");
+                    Param_Info1("AAF");
+                    Info_B1(Code3,                              "Application");
                     switch (Code3)
                     {
                         case 0x02 :
                             {
-                            Info_B1(Code4,                      "Code (4)");
+                            Param_Info1("Operational Patterns");
+                            Info_B1(Code4,                      "Version");
                             switch (Code4)
                             {
                                 case 0x01 :
-                                    Skip_B4(                    "Operational pattern");
+                                    {
+                                    Param_Info1("Version 1");
+                                    Info_B1(Code5,              "Item Complexity");
+                                    Info_B1(Code6,              "Package Complexity");
+                                    Info_B1(Code7,              "Qualifier");
+                                        Skip_Flags(Code7, 3,    "uni/multi-track");
+                                        Skip_Flags(Code7, 2,    "stream/non-stream file");
+                                        Skip_Flags(Code7, 1,    "internal/external essence");
+                                    Info_B1(Code8,              "Reserved");
+                                    }
                                     break;
                                 case 0x02 :
                                     {
@@ -3991,14 +7858,165 @@
                             break;
                         case 0x03 :
                             {
-                            Info_B1(Code4,                      "Code (4)");
+                            Param_Info1("Essence Container Application");
+                            Info_B1(Code4,                      "Structure Version");
+                            switch (Code4)
+                            {
+                                case 0x01 :
+                                    {
+                                    Param_Info1("MXF EC Structure Version 1");
+                                    Info_B1(Code5,              "Essence container Kind");
+                                    switch (Code5)
+                                    {
+                                        case 0x01 :
+                                            Param_Info1("Deprecated Essence Container Kind");
+                                            Skip_B3(            "Unknown");
+                                            break;
+                                        case 0x02 :
+                                            {
+                                            Param_Info1("Essence Container Kind");
+                                            Info_B1(Code6,      "Code (6)");
+                                            switch (Code6)
+                                            {
+                                                case 0x01 : //SMPTE 386M
+                                                    {
+                                                    Param_Info1("Type D-10 Mapping");
+                                                    Skip_B1(            "MPEG Constraints"); //SMPTE 356M
+                                                    Skip_B1(            "Template Extension");
+                                                    }
+                                                    break;
+                                                case 0x02 :
+                                                    {
+                                                    Param_Info1("DV Mappings");
+                                                    Skip_B1(            "Mapping Kind");
+                                                    Skip_B1(            "Locally defined");
+                                                    }
+                                                    break;
+                                                case 0x03 :
+                                                    {
+                                                    Param_Info1("Type D-11 Mapping");
+                                                    Skip_B1(            "Mapping Kind");
+                                                    Skip_B1(            "Locally defined");
+                                                    }
+                                                    break;
+                                                case 0x04 :
+                                                    {
+                                                    Param_Info1("MPEG ES mappings");
+                                                    Info_B1(Code7,      "ISO13818-1 stream_id bits 6..0"); Param_Info1(Ztring::ToZtring(0x80+Code7, 16));
+                                                    Info_B1(Code8,      "Mapping Kind"); Param_Info1(Mxf_EssenceContainer_Mapping(Code6, Code7, Code8));
+                                                    }
+                                                    break;
+                                                case 0x05 : //SMPTE 384M
+                                                    {
+                                                    Param_Info1("Uncompressed Pictures");
+                                                    Info_B1(Code7,      "Number of lines / field rate combination"); //SMPTE 384M
+                                                    Info_B1(Code8,      "Mapping Kind"); Param_Info1(Mxf_EssenceContainer_Mapping(Code6, Code7, Code8));
+                                                    }
+                                                    break;
+                                                case 0x06 :
+                                                    {
+                                                    Param_Info1("AES-BWF");
+                                                    Info_B1(Code7,      "Mapping Kind"); Param_Info1(Mxf_EssenceContainer_Mapping(Code6, Code7, 0x7F));
+                                                    Skip_B1(            "Locally defined");
+                                                    }
+                                                    break;
+                                                case 0x07 :
+                                                    {
+                                                    Param_Info1("MPEG PES mappings");
+                                                    Info_B1(Code7,      "ISO13818-1 stream_id bits 6..0"); Param_Info1(Ztring::ToZtring(0x80+Code7, 16));
+                                                    Info_B1(Code8,      "Mapping Kind"); Param_Info1(Mxf_EssenceContainer_Mapping(Code6, Code7, Code8));
+                                                    }
+                                                    break;
+                                                case 0x08 :
+                                                    {
+                                                    Param_Info1("MPEG PS mappings");
+                                                    Info_B1(Code7,      "ISO13818-1 stream_id bits 6..0"); Param_Info1(Ztring::ToZtring(0x80+Code7, 16));
+                                                    Info_B1(Code8,      "Mapping Kind"); Param_Info1(Mxf_EssenceContainer_Mapping(Code6, Code7, Code8));
+                                                    }
+                                                    break;
+                                                case 0x09 :
+                                                    {
+                                                    Param_Info1("MPEG TS mappings");
+                                                    Info_B1(Code7,      "ISO13818-1 stream_id bits 6..0"); Param_Info1(Ztring::ToZtring(0x80+Code7, 16));
+                                                    Info_B1(Code8,      "Mapping Kind"); Param_Info1(Mxf_EssenceContainer_Mapping(Code6, Code7, Code8));
+                                                    }
+                                                    break;
+                                                case 0x0A :
+                                                    {
+                                                    Param_Info1("A-law Sound Element Mapping");
+                                                    Info_B1(Code7,      "Mapping Kind"); Param_Info1(Mxf_EssenceContainer_Mapping(Code6, Code7, 0xFF));
+                                                    Skip_B1(            "Locally defined");
+                                                    }
+                                                    break;
+                                                case 0x0B :
+                                                    {
+                                                    Param_Info1("Encrypted Generic Container");
+                                                    Skip_B1(            "Mapping Kind");
+                                                    Skip_B1(            "Locally defined");
+                                                    }
+                                                    break;
+                                                case 0x0C :
+                                                    {
+                                                    Param_Info1("JPEG 2000 Picture Mapping");
+                                                    Skip_B1(            "Mapping Kind");
+                                                    Skip_B1(            "Locally defined");
+                                                    }
+                                                    break;
+                                                case 0x11 :
+                                                    {
+                                                    Param_Info1("VC-3 Picture Element");
+                                                    Info_B1(Code7,      "Content Kind"); Param_Info1(Mxf_EssenceContainer_Mapping(Code6, Code7, 0xFF));
+                                                    Skip_B1(            "Reserved");
+                                                    }
+                                                    break;
+                                                case 0x16 :
+                                                    {
+                                                    Param_Info1("AVC Picture Element");
+                                                    Skip_B1(            "Unknown");
+                                                    Skip_B1(            "Unknown");
+                                                    }
+                                                    break;
+                                                case 0x7F :
+                                                    {
+                                                    Param_Info1("Generic Essence Container Wrapping");
+                                                    Skip_B1(            "Mapping Kind");
+                                                    Skip_B1(            "Locally defined");
+                                                    }
+                                                    break;
+                                                default   :
+                                                    {
+                                                    Skip_B1(            "Mapping Kind");
+                                                    Skip_B1(            "Locally defined");
+                                                    }
+                                            }
+                                            }
+                                            break;
+                                        default   :
+                                            Skip_B1(            "Essence container Kind");
+                                            Skip_B1(            "Mapping Kind");
+                                            Skip_B1(            "Locally defined");
+                                    }
+                                    }
+                                    break;
+                                default   :
+                                    Skip_B4(                    "Unknown");
+                            }
+                            }
+                            break;
+                        case 0x04 :
+                            {
+                            Param_Info1("MXF / AAF compatible Descriptive Metadata Labels");
+                            Info_B1(Code4,                      "Label Version");
                             switch (Code4)
                             {
                                 case 0x01 :
-                                    Skip_B1(                    "Format?");
-                                    Skip_B1(                    "Essence element count");
-                                    Skip_B1(                    "Essence element type");
-                                    Skip_B1(                    "Essence element number");
+                                    {
+                                    Param_Info1("Version 1");
+                                    Info_B1(Code5,              "Scheme Kind");
+                                    Info_B1(Code6,              "Reserved");
+                                    Info_B1(Code7,              "Reserved");
+                                    Info_B1(Code8,              "Reserved");
+                                    }
                                     break;
                                 default   :
                                     Skip_B4(                    "Unknown");
@@ -4010,25 +8028,142 @@
                     }
                     }
                     break;
+                case 0x02 :
+                    {
+                    Param_Info1("EBU/UER");
+                    Skip_B6(                                    "Unknown");
+                    }
+                    break;
+                case 0x03 :
+                    {
+                    Param_Info1("Pro-MPEG Forum");
+                    Skip_B6(                                    "Unknown");
+                    }
+                    break;
+                case 0x04 :
+                    {
+                    Param_Info1("BBC");
+                    Skip_B6(                                    "Unknown");
+                    }
+                    break;
+                case 0x05 :
+                    {
+                    Param_Info1("IRT");
+                    Skip_B6(                                    "Unknown");
+                    }
+                    break;
+                case 0x06 :
+                    {
+                    Param_Info1("ARIB");
+                    Skip_B6(                                    "Unknown");
+                    }
+                    break;
                 default   :
                     Skip_B6(                                    "Unknown");
             }
             }
             break;
+        case 0x0E :
+            {
+            Param_Info1("User Organisation Registered For Private Use");
+            Info_B1(Code2,                                      "Code (2)");
+            switch (Code2)
+            {
+                case 0x04 :
+                    {
+                    Param_Info1("Avid");
+                    Info_B1(Code3,                              "Code (3)");
+                    switch (Code3)
+                    {
+                        case 0x02 :
+                            {
+                            Param_Info1("Essence Compression?");
+                            Info_B1(Code4,                      "?");
+                            switch (Code4)
+                            {
+                                case 0x01 :
+                                    {
+                                    Param_Info1("?");
+                                    Info_B1(Code5,              "?");
+                                    switch (Code5)
+                                    {
+                                        case 0x02 :
+                                            {
+                                            Param_Info1("?");
+                                            Info_B1(Code6,      "Code (6)");
+                                            switch (Code6)
+                                            {
+                                                case 0x04 :
+                                                    Param_Info1("VC-3");
+                                                    Skip_B2(    "Unknown");
+                                                    break;
+                                                default   :
+                                                    Skip_B2(    "Unknown");
+                                            }
+                                            }
+                                            break;
+                                        default   :
+                                            Skip_B3(            "Unknown");
+                                    }
+                                    }
+                                    break;
+                                default   :
+                                    Skip_B4(                    "Unknown");
+                            }
+                            }
+                            break;
+                        case 0x03 :
+                            {
+                            Param_Info1("Essence Container Application");
+                            Info_B1(Code4,                      "Structure Version");
+                            switch (Code4)
+                            {
+                                case 0x01 :
+                                    {
+                                    Param_Info1("MXF EC Structure Version 1");
+                                    Info_B1(Code5,              "Essence container Kind");
+                                    switch (Code5)
+                                    {
+                                        case 0x02 :
+                                            {
+                                            Param_Info1("Essence Container Kind");
+                                            Info_B1(Code6,      "Code (6)");
+                                            switch (Code6)
+                                            {
+                                                case 0x06 :
+                                                    Param_Info1("VC-3");
+                                                    Skip_B2(    "Unknown");
+                                                    break;
+                                                default   :
+                                                    Skip_B2(    "Unknown");
+                                            }
+                                            }
+                                            break;
+                                        default   :
+                                            Skip_B3(            "Unknown");
+                                    }
+                                    }
+                                    break;
+                                default   :
+                                    Skip_B4(                    "Unknown");
+                            }
+                            }
+                            break;
+                        default   :
+                            Skip_B5(                            "Unknown");
+                    }
+                    }
+                    break;
+                default   :
+                    Skip_B6(                                    "Private");
+            }
+            }
+            break;
         default   :
             Skip_B7(                                            "Unknown");
     }
-
-    Value.hi=Value_hi;
-    Value.lo=Value_lo;
-    if (Param)
-    {
-        Param_Info(Param(Value));
-        Element_Info(Param(Value));
-    }
-    Element_End();
-    #endif
 }
+#endif //MEDIAINFO_TRACE
 
 //---------------------------------------------------------------------------
 void File_Mxf::Skip_UL(const char* Name)
@@ -4042,57 +8177,67 @@
 }
 
 //---------------------------------------------------------------------------
+void File_Mxf::Get_UMID(int256u &Value, const char* Name)
+{
+    Element_Name(Name);
+
+    //Parsing
+    Get_UUID (Value.hi,                                         "Fixed");
+    Get_UUID (Value.lo,                                         "UUID"); Element_Info1(Ztring().From_UUID(Value.lo));
+}
+
+//---------------------------------------------------------------------------
 void File_Mxf::Skip_UMID()
 {
     //Parsing
     Skip_UUID(                                                  "Fixed");
-    Skip_UUID(                                                  "UUID");
+    Info_UUID(Data,                                             "UUID"); Element_Info1(Ztring().From_UUID(Data));
 }
 
 //---------------------------------------------------------------------------
 void File_Mxf::Get_Timestamp(Ztring &Value)
 {
     //Parsing
-    Info_B2(Year,                                               "Year");
-    Info_B1(Month,                                              "Month");
-    Info_B1(Day,                                                "Day");
-    Info_B1(Hours,                                              "Hours");
-    Info_B1(Minutes,                                            "Minutes");
-    Info_B1(Seconds,                                            "Seconds");
-    Info_B1(Milliseconds,                                       "Milliseconds/4"); Param_Info(Milliseconds*4, " ms");
+    int16u  Year;
+    int8u   Month, Day, Hours, Minutes, Seconds, Milliseconds;
+    Get_B2 (Year,                                               "Year");
+    Get_B1 (Month,                                              "Month");
+    Get_B1 (Day,                                                "Day");
+    Get_B1 (Hours,                                              "Hours");
+    Get_B1 (Minutes,                                            "Minutes");
+    Get_B1 (Seconds,                                            "Seconds");
+    Get_B1 (Milliseconds,                                       "Milliseconds/4"); Param_Info2(Milliseconds*4, " ms");
     Value.From_Number(Year);
-    Value+=_T('-');
+    Value+=__T('-');
     Ztring Temp;
     Temp.From_Number(Month);
     if (Temp.size()<2)
-        Temp.insert(Temp.begin(), _T('0'));
+        Temp.insert(0, 1, __T('0'));
     Value+=Temp;
-    Value+=_T('-');
+    Value+=__T('-');
     Temp.From_Number(Day);
     if (Temp.size()<2)
-        Temp.insert(Temp.begin(), _T('0'));
+        Temp.insert(0, 1, __T('0'));
     Value+=Temp;
-    Value+=_T(' ');
+    Value+=__T(' ');
     Temp.From_Number(Hours);
     if (Temp.size()<2)
-        Temp.insert(Temp.begin(), _T('0'));
+        Temp.insert(0, 1, __T('0'));
     Value+=Temp;
-    Value+=_T(':');
+    Value+=__T(':');
     Temp.From_Number(Minutes);
     if (Temp.size()<2)
-        Temp.insert(Temp.begin(), _T('0'));
+        Temp.insert(0, 1, __T('0'));
     Value+=Temp;
-    Value+=_T(':');
+    Value+=__T(':');
     Temp.From_Number(Seconds);
     if (Temp.size()<2)
-        Temp.insert(Temp.begin(), _T('0'));
+        Temp.insert(0, 1, __T('0'));
     Value+=Temp;
-    Value+=_T('.');
+    Value+=__T('.');
     Temp.From_Number(Milliseconds*4);
-    if (Temp.size()<2)
-        Temp.insert(Temp.begin(), _T('0'));
-    if (Temp.size()<2)
-        Temp.insert(Temp.begin(), _T('0'));
+    if (Temp.size()<3)
+        Temp.insert(0, 3-Temp.size(), __T('0'));
     Value+=Temp;
 }
 
@@ -4106,7 +8251,7 @@
     Skip_B1(                                                    "Hours");
     Skip_B1(                                                    "Minutes");
     Skip_B1(                                                    "Seconds");
-    Info_B1(Milliseconds,                                       "Milliseconds/4"); Param_Info(Milliseconds*4, " ms");
+    Info_B1(Milliseconds,                                       "Milliseconds/4"); Param_Info2(Milliseconds*4, " ms");
 }
 
 //---------------------------------------------------------------------------
@@ -4119,17 +8264,1095 @@
     Info_B1(Hours,                                              "Hours");
     Info_B1(Minutes,                                            "Minutes");
     Info_B1(Seconds,                                            "Seconds");
-    Info_B1(Milliseconds,                                       "Milliseconds/4"); Param_Info(Milliseconds*4, " ms");
-    Element_Info(Ztring::ToZtring(Year          )+_T('-')+
-                 Ztring::ToZtring(Month         )+_T('-')+
-                 Ztring::ToZtring(Day           )+_T(' ')+
-                 Ztring::ToZtring(Hours         )+_T(':')+
-                 Ztring::ToZtring(Minutes       )+_T(':')+
-                 Ztring::ToZtring(Seconds       )+_T('.')+
+    Info_B1(Milliseconds,                                       "Milliseconds/4"); Param_Info2(Milliseconds*4, " ms");
+    Element_Info1(Ztring::ToZtring(Year          )+__T('-')+
+                 Ztring::ToZtring(Month         )+__T('-')+
+                 Ztring::ToZtring(Day           )+__T(' ')+
+                 Ztring::ToZtring(Hours         )+__T(':')+
+                 Ztring::ToZtring(Minutes       )+__T(':')+
+                 Ztring::ToZtring(Seconds       )+__T('.')+
                  Ztring::ToZtring(Milliseconds*4)         );
 }
 
+//---------------------------------------------------------------------------
+void File_Mxf::Get_BER(int64u &Value, const char* Name)
+{
+    int8u Length;
+    Get_B1(Length,                                              Name);
+    if (Length<0x80)
+    {
+        Value=Length; //1-byte
+        return;
+    }
+
+    Length&=0x7F;
+    switch (Length)
+    {
+        case 1 :
+                {
+                int8u  Length1;
+                Get_B1(Length1,                                 Name);
+                Value=Length1;
+                break;
+                }
+        case 2 :
+                {
+                int16u Length2;
+                Get_B2(Length2,                                 Name);
+                Value=Length2;
+                break;
+                }
+        case 3 :
+                {
+                int32u Length3;
+                Get_B3(Length3,                                 Name);
+                Value=Length3;
+                break;
+                }
+        case 4 :
+                {
+                int32u Length4;
+                Get_B4(Length4,                                 Name);
+                Value=Length4;
+                break;
+                }
+        case 5 :
+                {
+                int64u Length5;
+                Get_B5(Length5,                                 Name);
+                Value=Length5;
+                break;
+                }
+        case 6 :
+                {
+                int64u Length6;
+                Get_B6(Length6,                                 Name);
+                Value=Length6;
+                break;
+                }
+        case 7 :
+                {
+                int64u Length7;
+                Get_B7(Length7,                                 Name);
+                Value=Length7;
+                break;
+                }
+        case 8 :
+                {
+                int64u Length8;
+                Get_B8(Length8,                                 Name);
+                Value=Length8;
+                break;
+                }
+        default:Value=(int64u)-1; //Problem
+    }
+}
+
+//***************************************************************************
+// Parsers
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File__Analyze* File_Mxf::ChooseParser(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    if ((Descriptor->second.EssenceCompression.hi&0xFFFFFFFFFFFFFF00LL)!=0x060E2B3404010100LL || (Descriptor->second.EssenceCompression.lo&0xFF00000000000000LL)!=0x0400000000000000LL)
+        return ChooseParser__FromEssenceContainer (Essence, Descriptor);
+
+    int8u Code2=(int8u)((Descriptor->second.EssenceCompression.lo&0x00FF000000000000LL)>>48);
+    int8u Code3=(int8u)((Descriptor->second.EssenceCompression.lo&0x0000FF0000000000LL)>>40);
+    int8u Code4=(int8u)((Descriptor->second.EssenceCompression.lo&0x000000FF00000000LL)>>32);
+    int8u Code5=(int8u)((Descriptor->second.EssenceCompression.lo&0x00000000FF000000LL)>>24);
+    int8u Code6=(int8u)((Descriptor->second.EssenceCompression.lo&0x0000000000FF0000LL)>>16);
+    int8u Code7=(int8u)((Descriptor->second.EssenceCompression.lo&0x000000000000FF00LL)>> 8);
+
+    switch (Code2)
+    {
+        case 0x01 : //Picture
+                    switch (Code3)
+                    {
+                        case 0x02 : //Coding characteristics
+                                    switch (Code4)
+                                    {
+                                        case 0x01 : //Uncompressed Picture Coding
+                                                    switch (Code5)
+                                                    {
+                                                        case 0x01 : return ChooseParser_Raw(Essence, Descriptor);
+                                                        case 0x7F : return ChooseParser_RV24(Essence, Descriptor);
+                                                        default   : return NULL;
+                                                    }
+                                        case 0x02 : //Compressed coding
+                                                    switch (Code5)
+                                                    {
+                                                        case 0x01 : //MPEG Compression
+                                                                    switch (Code6)
+                                                                    {
+                                                                        case 0x01 :
+                                                                        case 0x02 :
+                                                                        case 0x03 :
+                                                                        case 0x04 :
+                                                                        case 0x11 : return ChooseParser_Mpegv(Essence, Descriptor);
+                                                                        case 0x20 : return ChooseParser_Mpeg4v(Essence, Descriptor);
+                                                                        case 0x32 : return ChooseParser_Avc(Essence, Descriptor);
+                                                                        default   : return NULL;
+                                                                    }
+                                                        case 0x02 : return ChooseParser_DV(Essence, Descriptor);
+                                                        case 0x03 : //Individual Picture Coding Schemes
+                                                                    switch (Code6)
+                                                                    {
+                                                                        case 0x01 : return ChooseParser_Jpeg2000(Essence, Descriptor);
+                                                                        default   : return NULL;
+                                                                    }
+                                                        case 0x71 : return ChooseParser_Vc3(Essence, Descriptor);
+                                                        default   : return NULL;
+                                                    }
+                                         default   : return NULL;
+                                    }
+                         default   : return NULL;
+                    }
+        case 0x02 : //Sound
+                    switch (Code3)
+                    {
+                        case 0x02 : //Coding characteristics
+                                    switch (Code4)
+                                    {
+                                        case 0x01 : //Uncompressed Sound Coding
+                                                    return ChooseParser_Pcm(Essence, Descriptor);
+                                        case 0x02 : //Compressed coding
+                                                    switch (Code5)
+                                                    {
+                                                        case 0x03 : //Compressed Audio Coding
+                                                                    switch (Code6)
+                                                                    {
+                                                                        case 0x01 : //Compandeded Audio Coding
+                                                                                    switch (Code7)
+                                                                                    {
+                                                                                        case 0x01 : if ((Descriptor->second.EssenceContainer.lo&0xFFFF0000)==0x02060000) //Test coherency between container and compression
+                                                                                                        return ChooseParser_Pcm(Essence, Descriptor); //Compression is A-Law but Container is PCM, not logic, prioritizing PCM
+                                                                                                     else
+                                                                                                        return ChooseParser_Alaw(Essence, Descriptor);
+                                                                                        case 0x10 : return ChooseParser_Pcm(Essence, Descriptor); //DV 12-bit
+                                                                                        default   : return NULL;
+                                                                                    }
+                                                                        case 0x02 : //SMPTE 338M Audio Coding
+                                                                                    switch (Code7)
+                                                                                    {
+                                                                                        case 0x01 : return ChooseParser_Ac3(Essence, Descriptor);
+                                                                                        case 0x04 :
+                                                                                        case 0x05 :
+                                                                                        case 0x06 : return ChooseParser_Mpega(Essence, Descriptor);
+                                                                                        case 0x1C : return ChooseParser_ChannelGrouping(Essence, Descriptor); //Dolby E (in 2 mono streams)
+                                                                                        default   : return NULL;
+                                                                                    }
+                                                                        case 0x03 : //MPEG-2 Coding (not defined in SMPTE 338M)
+                                                                                    switch (Code7)
+                                                                                    {
+                                                                                        case 0x01 : return ChooseParser_Aac(Essence, Descriptor);
+                                                                                        default   : return NULL;
+                                                                                    }
+                                                                        case 0x04 : //MPEG-4 Audio Coding
+                                                                                    switch (Code7)
+                                                                                    {
+                                                                                        case 0x01 :
+                                                                                        case 0x02 :
+                                                                                        case 0x03 :
+                                                                                        case 0x04 :
+                                                                                        case 0x05 :
+                                                                                        case 0x06 :
+                                                                                        case 0x07 :
+                                                                                        case 0x08 : return ChooseParser_Aac(Essence, Descriptor);
+                                                                                        default   : return NULL;
+                                                                                    }
+                                                                        default   : return NULL;
+                                                                    }
+                                                         default   : return NULL;
+                                                    }
+                                         default   : return NULL;
+                                    }
+                         default   : return NULL;
+                    }
+        default   : return NULL;
+    }
+}
+
+//---------------------------------------------------------------------------
+File__Analyze* File_Mxf::ChooseParser__FromEssenceContainer(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    int8u Code1=(int8u)((Descriptor->second.EssenceContainer.lo&0xFF00000000000000LL)>>56);
+    int8u Code2=(int8u)((Descriptor->second.EssenceContainer.lo&0x00FF000000000000LL)>>48);
+    int8u Code3=(int8u)((Descriptor->second.EssenceContainer.lo&0x0000FF0000000000LL)>>40);
+    int8u Code4=(int8u)((Descriptor->second.EssenceContainer.lo&0x000000FF00000000LL)>>32);
+    int8u Code5=(int8u)((Descriptor->second.EssenceContainer.lo&0x00000000FF000000LL)>>24);
+    int8u Code6=(int8u)((Descriptor->second.EssenceContainer.lo&0x0000000000FF0000LL)>>16);
+    //int8u Code7=(int8u)((Descriptor->second.EssenceContainer.lo&0x000000000000FF00LL)>> 8);
+
+    switch (Code1)
+    {
+        case 0x0D : //Public Use
+                    switch (Code2)
+                    {
+                        case 0x01 : //AAF
+                                    switch (Code3)
+                                    {
+                                        case 0x03 : //Essence Container Application
+                                                    switch (Code4)
+                                                    {
+                                                        case 0x01 : //MXF EC Structure version
+                                                                    switch (Code5)
+                                                                    {
+                                                                        case 0x02 : //Essence container kind
+                                                                                    switch (Code6)
+                                                                                    {
+                                                                                        case 0x01 : switch(Descriptor->second.StreamKind)
+                                                                                                    {
+                                                                                                        case Stream_Video : return ChooseParser_Mpegv(Essence, Descriptor);
+                                                                                                        case Stream_Audio : return ChooseParser_Aes3(Essence, Descriptor);
+                                                                                                        default           : return NULL;
+                                                                                                    }
+                                                                                        case 0x02 : return NULL; //DV
+                                                                                        case 0x05 : return ChooseParser_Raw(Essence, Descriptor);
+                                                                                        case 0x06 : if (Descriptor->second.ChannelCount==1) return ChooseParser_ChannelGrouping(Essence, Descriptor); else return ChooseParser_Pcm(Essence, Descriptor); //PCM, but one file is found with Dolby E in it
+                                                                                        case 0x04 : return NULL; //MPEG ES mappings with Stream ID
+                                                                                        case 0x0A : return ChooseParser_Alaw(Essence, Descriptor);
+                                                                                        case 0x0C : return ChooseParser_Jpeg2000(Essence, Descriptor);
+                                                                                        case 0x10 : return ChooseParser_Avc(Essence, Descriptor);
+                                                                                        case 0x11 : return ChooseParser_Vc3(Essence, Descriptor);
+                                                                                        default   : return NULL;
+                                                                                    }
+                                                                        default   : return NULL;
+                                                                    }
+                                                         default   : return NULL;
+                                                    }
+                                         default   : return NULL;
+                                    }
+                        default   : return NULL;
+                    }
+        case 0x0E : //Private Use
+                    switch (Code2)
+                    {
+                        case 0x04 : //Avid
+                                    switch (Code3)
+                                    {
+                                        case 0x03 : //Essence Container Application
+                                                    switch (Code4)
+                                                    {
+                                                        case 0x01 : //MXF EC Structure version
+                                                                    switch (Code5)
+                                                                    {
+                                                                        case 0x02 : //Essence container kind
+                                                                                    switch (Code6)
+                                                                                    {
+                                                                                        case 0x06 : return ChooseParser_Vc3(Essence, Descriptor);
+                                                                                        default   : return NULL;
+                                                                                    }
+                                                                        default   : return NULL;
+                                                                    }
+                                                         default   : return NULL;
+                                                    }
+                                         default   : return NULL;
+                                    }
+                        default   : return NULL;
+                    }
+        default   : return NULL;
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Mxf::ChooseParser__FromEssence(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    int32u Code_Compare3=Code.lo>>32;
+
+    switch (Code_Compare3)
+    {
+        case Elements::GenericContainer_Aaf3        : return ChooseParser__Aaf(Essence, Descriptor);
+        case Elements::GenericContainer_Avid3       : return ChooseParser__Avid(Essence, Descriptor);
+        default                                     : Essences[(int32u)Code.lo].Parser=new File__Analyze();
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Mxf::ChooseParser__Aaf(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    int32u Code_Compare4=(int32u)Code.lo;
+    int8u  Code_Compare4_1=Code_Compare4>>24;
+
+    switch (Code_Compare4_1)
+    {
+        case 0x05 : //CP Picture
+                    ChooseParser__Aaf_CP_Picture(Essence, Descriptor);
+                    break;
+        case 0x06 : //CP Sound
+                    ChooseParser__Aaf_CP_Sound(Essence, Descriptor);
+                    break;
+        case 0x07 : //CP Data
+                    ChooseParser__Aaf_CP_Data(Essence, Descriptor);
+                    break;
+        case 0x14 : //MXF in MXF?
+                    ChooseParser__Aaf_14(Essence, Descriptor);
+                    break;
+        case 0x15 : //CP Picture
+                    ChooseParser__Aaf_GC_Picture(Essence, Descriptor);
+                    break;
+        case 0x16 : //CP Sound
+                    ChooseParser__Aaf_GC_Sound(Essence, Descriptor);
+                    break;
+        case 0x17 : //CP Data
+                    ChooseParser__Aaf_GC_Data(Essence, Descriptor);
+                    break;
+        case 0x18 : //CP Compound
+                    ChooseParser__Aaf_GC_Compound(Essence, Descriptor);
+                    break;
+        default   : //Unknown
+                    Essences[Code_Compare4].Parser=new File__Analyze();
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Mxf::ChooseParser__Avid(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    int32u Code_Compare4=(int32u)Code.lo;
+    int8u  Code_Compare4_1=Code_Compare4>>24;
+
+    switch (Code_Compare4_1)
+    {
+        case 0x15 : //CP Picture
+                    ChooseParser__Avid_Picture(Essence, Descriptor);
+                    break;
+        default   : //Unknown
+                    Essences[Code_Compare4].Parser=new File__Analyze();
+    }
+}
+
+//---------------------------------------------------------------------------
+// 0x05, SMPTE 326M
+void File_Mxf::ChooseParser__Aaf_CP_Picture(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    int32u Code_Compare4=(int32u)Code.lo;
+    int8u  Code_Compare4_3=(int8u)(Code_Compare4>>8);
+
+    Essences[Code_Compare4].StreamKind=Stream_Video;
+    Essences[Code_Compare4].StreamPos=Code_Compare4&0x000000FF;
+
+    switch (Code_Compare4_3)
+    {
+        case 0x01 : //D-10 Video, SMPTE 386M
+                    Essences[Code_Compare4].Parser=ChooseParser_Mpegv(Essence, Descriptor);
+                    break;
+        default   : //Unknown
+                    Essences[Code_Compare4].Parser=new File__Analyze();
+    }
+}
+
+//---------------------------------------------------------------------------
+// 0x06, SMPTE 326M
+void File_Mxf::ChooseParser__Aaf_CP_Sound(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    int32u Code_Compare4=(int32u)Code.lo;
+    int8u  Code_Compare4_3=(int8u)(Code_Compare4>>8);
+
+    Essences[Code_Compare4].StreamKind=Stream_Audio;
+    Essences[Code_Compare4].StreamPos=Code_Compare4&0x000000FF;
+
+    switch (Code_Compare4_3)
+    {
+        case 0x10 : //D-10 Audio, SMPTE 386M
+                    Essences[Code_Compare4].Parser=ChooseParser_Aes3(Essence, Descriptor);
+                    break;
+        default   : //Unknown
+                    Essences[Code_Compare4].Parser=new File__Analyze();
+    }
+}
+
+//---------------------------------------------------------------------------
+// 0x07, SMPTE 326M
+void File_Mxf::ChooseParser__Aaf_CP_Data(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    int32u Code_Compare4=(int32u)Code.lo;
+    //int8u  Code_Compare4_3=(int8u)(Code_Compare4>>8);
+
+    //switch (Code_Compare4_3)
+    //{
+    //    default   : //Unknown
+                    Essences[Code_Compare4].Parser=new File__Analyze();
+    //}
+}
+
+//---------------------------------------------------------------------------
+// 0x14
+void File_Mxf::ChooseParser__Aaf_14(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    int32u Code_Compare4=(int32u)Code.lo;
+    int8u  Code_Compare4_3=(int8u)(Code_Compare4>>8);
+
+    switch (Code_Compare4_3)
+    {
+        case 0x01 : //MXF in MXF?
+                    Essences[Code_Compare4].Parser=new File_Mxf();
+                    break;
+        default   : Essences[Code_Compare4].Parser=new File__Analyze();
+    }
+}
+
+//---------------------------------------------------------------------------
+// 0x15
+void File_Mxf::ChooseParser__Aaf_GC_Picture(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    int32u Code_Compare4=(int32u)Code.lo;
+    int8u  Code_Compare4_3=(int8u)(Code_Compare4>>8);
+
+    Essences[Code_Compare4].StreamKind=Stream_Video;
+    Essences[Code_Compare4].StreamPos=Code_Compare4&0x000000FF;
+
+    switch (Code_Compare4_3)
+    {
+        case 0x01 : //RV24
+                    Essences[Code_Compare4].Parser=ChooseParser_RV24(Essence, Descriptor);
+                    break;
+        case 0x02 : //Raw video
+                    Essences[Code_Compare4].Parser=ChooseParser_Raw(Essence, Descriptor);
+                    break;
+        case 0x05 : //SMPTE 381M, Frame wrapped
+                    Essences[Code_Compare4].Parser=ChooseParser_Mpegv(Essence, Descriptor); //Trying...
+                    Essences[Code_Compare4].Infos["Format_Settings_Wrapping"]=__T("Frame");
+                    break;
+        case 0x06 : //SMPTE 381M, Clip wrapped
+                    Essences[Code_Compare4].Parser=ChooseParser_Mpegv(Essence, Descriptor); //Trying...
+                    Essences[Code_Compare4].Infos["Format_Settings_Wrapping"]=__T("Clip");
+                    break;
+        case 0x07 : //SMPTE 381M, Custom wrapped
+                    Essences[Code_Compare4].Parser=ChooseParser_Mpegv(Essence, Descriptor); //Trying...
+                    Essences[Code_Compare4].Infos["Format_Settings_Wrapping"]=__T("Custom");
+                    break;
+        case 0x08 : //JPEG 2000
+                    Essences[Code_Compare4].Parser=ChooseParser_Jpeg2000(Essence, Descriptor);
+                    break;
+        case 0x0D : //VC-3
+                    Essences[Code_Compare4].Parser=ChooseParser_Vc3(Essence, Descriptor);
+                    break;
+        default   : //Unknown
+                    Essences[Code_Compare4].Parser=new File__Analyze();
+    }
+}
+
+//---------------------------------------------------------------------------
+// 0x16
+void File_Mxf::ChooseParser__Aaf_GC_Sound(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    int32u Code_Compare4=(int32u)Code.lo;
+    int8u  Code_Compare4_3=(int8u)(Code_Compare4>>8);
+
+    Essences[Code_Compare4].StreamKind=Stream_Audio;
+    Essences[Code_Compare4].StreamPos=Code_Compare4&0x000000FF;
+
+    switch (Code_Compare4_3)
+    {
+        case 0x01 : //BWF (PCM)
+        case 0x02 : //BWF (PCM)
+        case 0x03 : //DV Audio (PCM)
+        case 0x04 : //P2 Audio (PCM)
+                    Essences[Code_Compare4].Parser=ChooseParser_Pcm(Essences.begin(), Descriptors.begin());
+                    break;
+        case 0x05 : //MPEG Audio
+                    Essences[Code_Compare4].Parser=ChooseParser_Mpega(Essence, Descriptor);
+                    break;
+        case 0x08 : //A-law, Frame wrapped
+                    Essences[Code_Compare4].Parser=ChooseParser_Alaw(Essence, Descriptor);
+                    Essences[Code_Compare4].Infos["Format_Settings_Wrapping"]=__T("Frame");
+                    break;
+        case 0x09 : //A-law, Clip wrapped
+                    Essences[Code_Compare4].Parser=ChooseParser_Alaw(Essence, Descriptor);
+                    Essences[Code_Compare4].Infos["Format_Settings_Wrapping"]=__T("Clip");
+                    break;
+        case 0x0A : //A-law, Custom wrapped
+                    Essences[Code_Compare4].Parser=ChooseParser_Alaw(Essence, Descriptor);
+                    Essences[Code_Compare4].Infos["Format_Settings_Wrapping"]=__T("Custom");
+                    break;
+        default   : //Unknown
+                    Essences[Code_Compare4].Parser=new File__Analyze();
+    }
+}
+
+//---------------------------------------------------------------------------
+// 0x17
+void File_Mxf::ChooseParser__Aaf_GC_Data(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    int32u Code_Compare4=(int32u)Code.lo;
+    int8u  Code_Compare4_3=(int8u)(Code_Compare4>>8);
+
+    switch (Code_Compare4_3)
+    {
+        case 0x01 : //VBI
+                    Essences[Code_Compare4].Parser=new File__Analyze(); //TODO: VBI is not yet well supported
+                    break;
+        case 0x02 : //Ancillary
+                    if (Ancillary)
+                        Essences[Code_Compare4].Parser=Ancillary;
+                    else
+                    {
+                        Essences[Code_Compare4].Parser=new File_Ancillary();
+                        Ancillary=(File_Ancillary*)Essences[Code_Compare4].Parser;
+                    }
+                    Ancillary_IsBinded=true;
+                    break;
+        case 0x08 : //Line Wrapped Data Element, SMPTE 384M
+        case 0x09 : //Line Wrapped VANC Data Element, SMPTE 384M
+        case 0x0A : //Line Wrapped HANC Data Element, SMPTE 384M
+                    break;
+        default   : //Unknown
+                    Essences[Code_Compare4].Parser=new File__Analyze();
+    }
+}
+
+//---------------------------------------------------------------------------
+// 0x18
+void File_Mxf::ChooseParser__Aaf_GC_Compound(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    int32u Code_Compare4=(int32u)Code.lo;
+    int8u  Code_Compare4_3=(int8u)(Code_Compare4>>8);
+
+    Essences[Code_Compare4].StreamKind=Stream_Video; //Default to video, audio will be merge later
+    Essences[Code_Compare4].StreamPos=Code_Compare4&0x000000FF;
+
+    switch (Code_Compare4_3)
+    {
+        case 0x01 : //DV
+        case 0x02 : //DV
+                    Essences[Code_Compare4].Parser=ChooseParser_DV(Essence, Descriptor);
+                    break;
+        default   : //Unknown
+                    Essences[Code_Compare4].Parser=new File__Analyze();
+    }
+}
+
+//---------------------------------------------------------------------------
+// 0x15
+void File_Mxf::ChooseParser__Avid_Picture(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    int32u Code_Compare4=(int32u)Code.lo;
+    int8u  Code_Compare4_3=(int8u)(Code_Compare4>>8);
+
+    Essences[Code_Compare4].StreamKind=Stream_Video;
+    Essences[Code_Compare4].StreamPos=Code_Compare4&0x000000FF;
+
+    switch (Code_Compare4_3)
+    {
+        case 0x05 : //VC-1, Frame wrapped
+                    Essences[Code_Compare4].Parser=ChooseParser_Vc3(Essence, Descriptor);
+                    Essences[Code_Compare4].Infos["Format_Settings_Wrapping"]=__T("Frame");
+                    break;
+        case 0x06 : //VC-1, Clip wrapped
+                    Essences[Code_Compare4].Parser=ChooseParser_Vc3(Essence, Descriptor);
+                    Essences[Code_Compare4].Infos["Format_Settings_Wrapping"]=__T("Clip");
+                    break;
+        case 0x07 : //VC-1, Custom wrapped
+                    Essences[Code_Compare4].Parser=ChooseParser_Vc3(Essence, Descriptor);
+                    Essences[Code_Compare4].Infos["Format_Settings_Wrapping"]=__T("Custom");
+                    break;
+        default   : //Unknown
+                    Essences[Code_Compare4].Parser=new File__Analyze();
+    }
+}
+
+//---------------------------------------------------------------------------
+File__Analyze* File_Mxf::ChooseParser_Avc(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    Essence->second.StreamKind=Stream_Video;
+
+    //Filling
+    #if defined(MEDIAINFO_AVC_YES)
+        File_Avc* Parser=new File_Avc;
+    #else
+        //Filling
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Video);
+        Parser->Fill(Stream_Video, 0, Video_Format, "AVC");
+    #endif
+    return Parser;
+}
+
+//---------------------------------------------------------------------------
+File__Analyze* File_Mxf::ChooseParser_DV(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    Essence->second.StreamKind=Stream_Video;
+
+    //Filling
+    #if defined(MEDIAINFO_DVDIF_YES)
+        File_DvDif* Parser=new File_DvDif;
+    #else
+        //Filling
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Video);
+        Parser->Fill(Stream_Audio, 0, Audio_Format, "DV");
+    #endif
+    return Parser;
+}
+
+//---------------------------------------------------------------------------
+File__Analyze* File_Mxf::ChooseParser_Mpeg4v(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    Essence->second.StreamKind=Stream_Video;
+
+    //Filling
+    #if defined(MEDIAINFO_MPEG4V_YES)
+        File_Mpeg4v* Parser=new File_Mpeg4v;
+        Parser->OnlyVOP();
+    #else
+        //Filling
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Video);
+        Parser->Fill(Stream_Video, 0, Video_Format, "MPEG-4 Visual");
+    #endif
+    return Parser;
+}
+
+//---------------------------------------------------------------------------
+File__Analyze* File_Mxf::ChooseParser_Mpegv(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    Essence->second.StreamKind=Stream_Video;
+
+    //Filling
+    #if defined(MEDIAINFO_MPEGV_YES)
+        File_Mpegv* Parser=new File_Mpegv();
+        Parser->Ancillary=&Ancillary;
+        #if MEDIAINFO_ADVANCED
+            Parser->InitDataNotRepeated_Optional=true;
+        #endif // MEDIAINFO_ADVANCED
+    #else
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Video);
+        Parser->Fill(Stream_Video, 0, Video_Format, "MPEG Video");
+    #endif
+    return Parser;
+}
+
+//---------------------------------------------------------------------------
+File__Analyze* File_Mxf::ChooseParser_Raw(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    Essence->second.StreamKind=Stream_Video;
+
+    //Filling
+    File__Analyze* Parser=new File_Unknown();
+    Open_Buffer_Init(Parser);
+    Parser->Stream_Prepare(Stream_Video);
+    Parser->Fill(Stream_Video, 0, Video_Format, "YUV");
+    return Parser;
+}
+
+//---------------------------------------------------------------------------
+File__Analyze* File_Mxf::ChooseParser_RV24(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    Essence->second.StreamKind=Stream_Video;
+
+    //Filling
+    File__Analyze* Parser=new File_Unknown();
+    Open_Buffer_Init(Parser);
+    Parser->Stream_Prepare(Stream_Video);
+    Parser->Fill(Stream_Video, 0, Video_Format, "RV24");
+    return Parser;
+}
+
+//---------------------------------------------------------------------------
+File__Analyze* File_Mxf::ChooseParser_Vc3(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    Essence->second.StreamKind=Stream_Video;
+
+    //Filling
+    #if defined(MEDIAINFO_VC3_YES)
+        File_Vc3* Parser=new File_Vc3;
+    #else
+        //Filling
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Video);
+        Parser->Fill(Stream_Video, 0, Video_Format, "VC-3");
+    #endif
+    return Parser;
+}
+
+//---------------------------------------------------------------------------
+File__Analyze* File_Mxf::ChooseParser_Aac(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    Essence->second.StreamKind=Stream_Audio;
+
+    //Filling
+    #if defined(MEDIAINFO_AAC_YES)
+        File_Aac* Parser=new File_Aac;
+    #else
+        //Filling
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Audio);
+        Parser->Fill(Stream_Audio, 0, Audio_Format, "AAC");
+    #endif
+    return Parser;
+}
+
+//---------------------------------------------------------------------------
+File__Analyze* File_Mxf::ChooseParser_Ac3(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    Essence->second.StreamKind=Stream_Audio;
+
+    //Filling
+    #if defined(MEDIAINFO_AC3_YES)
+        File_Ac3* Parser=new File_Ac3;
+    #else
+        //Filling
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Audio);
+        Parser->Fill(Stream_Audio, 0, Audio_Format, "AC-3");
+    #endif
+    return Parser;
+}
+
+//---------------------------------------------------------------------------
+File__Analyze* File_Mxf::ChooseParser_Aes3(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    Essence->second.StreamKind=Stream_Audio;
+
+    //Filling
+    #if defined(MEDIAINFO_AES3_YES)
+        File_Aes3* Parser=new File_Aes3;
+        Parser->From_Raw=true;
+        if (Descriptor!=Descriptors.end())
+        {
+            if (Descriptor->second.QuantizationBits!=(int32u)-1)
+                Parser->QuantizationBits=Descriptor->second.QuantizationBits;
+            if (Descriptor->second.Infos.find("SamplingRate")!=Descriptor->second.Infos.end())
+                Parser->SampleRate=Descriptor->second.Infos["SamplingRate"].To_int32u();
+            if (Descriptor->second.Infos.find("Format_Settings_Endianness")!=Descriptor->second.Infos.end())
+            {
+                if (Descriptor->second.Infos["Format_Settings_Endianness"]==__T("Big"))
+                    Parser->Endianness='B';
+                else
+                    Parser->Endianness='L';
+            }
+            else
+                Parser->Endianness='L';
+        }
+        else
+            Parser->Endianness='L';
+
+        #if MEDIAINFO_DEMUX
+            if (Demux_UnpacketizeContainer)
+            {
+                Parser->Demux_Level=2; //Container
+                Parser->Demux_UnpacketizeContainer=true;
+            }
+        #endif //MEDIAINFO_DEMUX
+    #else
+        //Filling
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Audio);
+        Parser->Fill(Stream_Audio, 0, Audio_Format, "AAC");
+    #endif
+    return Parser;
+}
+
+//---------------------------------------------------------------------------
+File__Analyze* File_Mxf::ChooseParser_Alaw(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    Essence->second.StreamKind=Stream_Audio;
+
+    //Filling
+    File__Analyze* Parser=new File_Unknown();
+    Open_Buffer_Init(Parser);
+    Parser->Stream_Prepare(Stream_Audio);
+    Parser->Fill(Stream_Audio, 0, Audio_Format, "Alaw");
+    return Parser;
+}
+
+
+//---------------------------------------------------------------------------
+File__Analyze* File_Mxf::ChooseParser_ChannelGrouping(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    Essence->second.StreamKind=Stream_Audio;
+
+    //Creating the parser
+    //if (Descriptor->second.BlockAlign==3) //Channels==1 && ((StreamPos_Last%2==0) || Streams.find(moov_trak_tkhd_TrackID-1)!=Streams.end() && Streams[moov_trak_tkhd_TrackID-1].IsPcmMono))
+    {
+        File_ChannelGrouping* Parser;
+        if ((Essence->second.StreamPos-(StreamPos_StartAtOne?1:0))%2)
+        {
+            essences::iterator FirstChannel=Essences.find(Essence->first-1);
+            if (FirstChannel==Essences.end() || !FirstChannel->second.IsChannelGrouping)
+                return ChooseParser_Pcm(Essence, Descriptor); //Not a channel grouping
+
+            Parser=new File_ChannelGrouping;
+            Parser->Channel_Pos=1;
+            Parser->Common=((File_ChannelGrouping*)Essences[Essence->first-1].Parser)->Common;
+            Parser->StreamID=Essence->second.TrackID-1;
+        }
+        else
+        {
+            Parser=new File_ChannelGrouping;
+            Parser->Channel_Pos=0;
+            if (Descriptor!=Descriptors.end() && Descriptor->second.Infos.find("SamplingRate")!=Descriptor->second.Infos.end())
+                Parser->SampleRate=Descriptor->second.Infos["SamplingRate"].To_int32u();
+            Essence->second.IsChannelGrouping=true;
+        }
+        Parser->Channel_Total=2;
+        if (Descriptor!=Descriptors.end())
+        {
+            Parser->ByteDepth=Descriptor->second.BlockAlign<=4?Descriptor->second.BlockAlign:(Descriptor->second.BlockAlign/2); //In one file, BlockAlign is size of the aggregated channelgroup
+            if (Descriptor->second.Infos.find("Format_Settings_Endianness")!=Descriptor->second.Infos.end())
+            {
+                if (Descriptor->second.Infos["Format_Settings_Endianness"]==__T("Big"))
+                    Parser->Endianness='B';
+                else
+                    Parser->Endianness='L';
+            }
+            else
+                Parser->Endianness='L';
+        }
+        else
+            Parser->Endianness='L';
+
+        #if MEDIAINFO_DEMUX
+            if (Demux_UnpacketizeContainer)
+            {
+                Parser->Demux_Level=2; //Container
+                Parser->Demux_UnpacketizeContainer=true;
+            }
+        #endif //MEDIAINFO_DEMUX
+
+        return Parser;
+    }
+}
+
+//---------------------------------------------------------------------------
+File__Analyze* File_Mxf::ChooseParser_Mpega(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    Essence->second.StreamKind=Stream_Audio;
+
+    //Filling
+    #if defined(MEDIAINFO_MPEGA_YES)
+        File_Mpega* Parser=new File_Mpega;
+    #else
+        //Filling
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Audio);
+        Parser->Fill(Stream_Audio, 0, Audio_Format, "MPEG Audio");
+    #endif
+    return Parser;
+}
+
+//---------------------------------------------------------------------------
+File__Analyze* File_Mxf::ChooseParser_Pcm(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    Essence->second.StreamKind=Stream_Audio;
+
+    //Creating the parser
+    #if defined(MEDIAINFO_AES3_YES)
+        File_Aes3* Parser=new File_Aes3;
+        if (Descriptor!=Descriptors.end())
+        {
+            if (Descriptor->second.BlockAlign!=(int16u)-1)
+                Parser->ByteSize=Descriptor->second.BlockAlign;
+            if (Descriptor->second.Infos.find("SamplingRate")!=Descriptor->second.Infos.end())
+                Parser->SampleRate=Descriptor->second.Infos["SamplingRate"].To_int32u();
+            if (Descriptor->second.Infos.find("Channel(s)")!=Descriptor->second.Infos.end())
+                Parser->ChannelCount=Descriptor->second.Infos["Channel(s)"].To_int32u();
+            if (Descriptor->second.Infos.find("Format_Settings_Endianness")!=Descriptor->second.Infos.end())
+            {
+                if (Descriptor->second.Infos["Format_Settings_Endianness"]==__T("Big"))
+                    Parser->Endianness='B';
+                else
+                    Parser->Endianness='L';
+            }
+            else
+                Parser->Endianness='L';
+        }
+        else
+            Parser->Endianness='L';
+
+        #if MEDIAINFO_DEMUX
+            if (Demux_UnpacketizeContainer)
+            {
+                Parser->Demux_Level=2; //Container
+                Parser->Demux_UnpacketizeContainer=true;
+            }
+        #endif //MEDIAINFO_DEMUX
+    #else
+        //Filling
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Audio);
+        Parser->Fill(Stream_Audio, 0, Audio_Format, "PCM");
+    #endif
+    return Parser;
+}
+
+//---------------------------------------------------------------------------
+File__Analyze* File_Mxf::ChooseParser_Jpeg2000(const essences::iterator &Essence, const descriptors::iterator &Descriptor)
+{
+    Essence->second.StreamKind=Stream_Video;
+
+    //Filling
+    #if defined(MEDIAINFO_JPEG_YES)
+        File_Jpeg* Parser=new File_Jpeg;
+        Parser->StreamKind=Stream_Video;
+        if (Descriptor!=Descriptors.end())
+        {
+            std::map<std::string, Ztring>::iterator Info=Descriptor->second.Infos.find("ScanType");
+            Parser->Interlaced=Info!=Descriptor->second.Infos.end() && Info->second==__T("Interlaced");
+        }
+    #else
+        //Filling
+        File__Analyze* Parser=new File_Unknown();
+        Open_Buffer_Init(Parser);
+        Parser->Stream_Prepare(Stream_Video);
+        Parser->Fill(Stream_Video, 0, Video_Format, "JPEG 2000");
+    #endif
+    return Parser;
+}
+
+//***************************************************************************
+// Helpers
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Mxf::Subsampling_Compute(descriptors::iterator Descriptor)
+{
+    if (Descriptor->second.SubSampling_Horizontal==(int32u)-1 || Descriptor->second.SubSampling_Vertical==(int32u)-1)
+        return;
+
+    switch (Descriptor->second.SubSampling_Horizontal)
+    {
+        case 1 :    switch (Descriptor->second.SubSampling_Vertical)
+                    {
+                        case 1 : Descriptor->second.Infos["ChromaSubsampling"]=__T("4:4:4"); return;
+                        default: Descriptor->second.Infos["ChromaSubsampling"].clear(); return;
+                    }
+        case 2 :    switch (Descriptor->second.SubSampling_Vertical)
+                    {
+                        case 1 : Descriptor->second.Infos["ChromaSubsampling"]=__T("4:2:2"); return;
+                        case 2 : Descriptor->second.Infos["ChromaSubsampling"]=__T("4:2:0"); return;
+                        default: Descriptor->second.Infos["ChromaSubsampling"].clear(); return;
+                    }
+        case 4 :    switch (Descriptor->second.SubSampling_Vertical)
+                    {
+                        case 1 : Descriptor->second.Infos["ChromaSubsampling"]=__T("4:1:1"); return;
+                        default: Descriptor->second.Infos["ChromaSubsampling"].clear(); return;
+                    }
+        default:    return;
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Mxf::Locators_CleanUp()
+{
+    //Testing locators (TODO: check if this is still useful)
+    if (Locators.size()==1)
+    {
+        Locators.clear();
+        return;
+    }
+
+    locators::iterator Locator=Locators.begin();
+    while (Locator!=Locators.end())
+    {
+        bool IsReferenced=false;
+        for (descriptors::iterator Descriptor=Descriptors.begin(); Descriptor!=Descriptors.end(); Descriptor++)
+            for (size_t Pos=0; Pos<Descriptor->second.Locators.size(); Pos++)
+                if (Locator->first==Descriptor->second.Locators[Pos])
+                    IsReferenced=true;
+        if (!IsReferenced)
+        {
+            //Deleting current locator
+            locators::iterator LocatorToDelete=Locator;
+            Locator++;
+            Locators.erase(LocatorToDelete);
+        }
+        else
+            Locator++;
+    }
+
+}
+
+//---------------------------------------------------------------------------
+void File_Mxf::Locators_Test()
+{
+    Locators_CleanUp();
+
+    if (!Locators.empty() && ReferenceFiles==NULL)
+    {
+        ReferenceFiles=new File__ReferenceFilesHelper(this, Config);
+
+        for (locators::iterator Locator=Locators.begin(); Locator!=Locators.end(); Locator++)
+            if (!Locator->second.IsTextLocator && !Locator->second.EssenceLocator.empty())
+            {
+                File__ReferenceFilesHelper::reference ReferenceFile;
+                ReferenceFile.FileNames.push_back(Locator->second.EssenceLocator);
+                ReferenceFile.StreamKind=Locator->second.StreamKind;
+                ReferenceFile.StreamPos=Locator->second.StreamPos;
+                if (Locator->second.LinkedTrackID!=(int32u)-1)
+                    ReferenceFile.StreamID=Locator->second.LinkedTrackID;
+                else if (!Retrieve(Locator->second.StreamKind, Locator->second.StreamPos, General_ID).empty())
+                    ReferenceFile.StreamID=Retrieve(Locator->second.StreamKind, Locator->second.StreamPos, General_ID).To_int64u();
+                ReferenceFile.Delay=float64_int64s(DTS_Delay*1000000000);
+
+                //Special cases
+                if (Locator->second.StreamKind==Stream_Video)
+                {
+                    //Searching the corresponding frame rate
+                    for (descriptors::iterator Descriptor=Descriptors.begin(); Descriptor!=Descriptors.end(); Descriptor++)
+                        for (size_t LocatorPos=0; LocatorPos<Descriptor->second.Locators.size(); LocatorPos++)
+                            if (Descriptor->second.Locators[LocatorPos]==Locator->first)
+                                ReferenceFile.FrameRate=Descriptor->second.SampleRate;
+                }
+
+
+                if (ReferenceFile.StreamID!=(int32u)-1)
+                {
+                    //Descriptive Metadata
+                    std::vector<int128u> DMScheme1s_List;
+
+                    for (dmsegments::iterator DMSegment=DMSegments.begin(); DMSegment!=DMSegments.end(); DMSegment++)
+                        for (size_t Pos=0; Pos<DMSegment->second.TrackIDs.size(); Pos++)
+                            if (DMSegment->second.TrackIDs[Pos]==ReferenceFile.StreamID)
+                                DMScheme1s_List.push_back(DMSegment->second.Framework);
+
+                    for (size_t Pos=0; Pos<DMScheme1s_List.size(); Pos++)
+                    {
+                        dmscheme1s::iterator DMScheme1=DMScheme1s.find(DMScheme1s_List[Pos]);
+                        if (DMScheme1!=DMScheme1s.end())
+                        {
+                            ReferenceFile.Infos["Language"]=DMScheme1->second.PrimaryExtendedSpokenLanguage;
+                        }
+                    }
+                }
+
+                ReferenceFiles->References.push_back(ReferenceFile);
+            }
+
+        ReferenceFiles->ParseReferences();
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_Mxf::TryToFinish()
+{
+    if (!IsSub && IsParsingEnd && File_Size!=(int64u)-1 && Config->ParseSpeed<1 && IsParsingMiddle_MaxOffset==(int64u)-1 && File_Size/2>0x4000000) //TODO: 64 MB by default;
+    {
+        IsParsingMiddle_MaxOffset=File_Size/2+0x4000000; //TODO: 64 MB by default;
+        GoTo(File_Size/2);
+        Open_Buffer_Unsynch();
+        IsParsingEnd=false;
+        Streams_Count=(size_t)-1;
+        return;
+    }
+
+    Fill();
+    Open_Buffer_Unsynch();
+    Finish();
+}
+
 } //NameSpace
 
 #endif //MEDIAINFO_MXF_*
-

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Mxf.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Mxf.h Changed

@@ -1,17 +1,17 @@
 // File_Mxf - Info for MXF files
-// Copyright (C) 2006-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2006-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -28,12 +28,19 @@
 
 //---------------------------------------------------------------------------
 #include "MediaInfo/File__Analyze.h"
+#if defined(MEDIAINFO_ANCILLARY_YES)
+    #include <MediaInfo/Multiple/File_Ancillary.h>
+#endif //defined(MEDIAINFO_ANCILLARY_YES)
+#include "MediaInfo/MediaInfo_Internal.h"
 #include <vector>
+#include <set>
 //---------------------------------------------------------------------------
 
 namespace MediaInfoLib
 {
 
+class File__ReferenceFilesHelper;
+
 //***************************************************************************
 // Class File_Mxf
 //***************************************************************************
@@ -43,22 +50,49 @@
 public :
     //Constructor/Destructor
     File_Mxf();
+    ~File_Mxf();
+
+    //int256u
+    class int256u
+    {
+        public:
+            // Binary correct representation of signed 256bit integer
+            int128u lo;
+            int128u hi;
+
+            int256u()
+            {
+                lo.lo=0;
+                lo.hi=0;
+                hi.lo=0;
+                hi.hi=0;
+            }
+    };
+
 
 protected :
     //Streams management
+    void Streams_Fill ();
     void Streams_Finish ();
     void Streams_Finish_Preface (int128u PrefaceUID);
     void Streams_Finish_ContentStorage (int128u ContentStorageUID);
     void Streams_Finish_Package (int128u PackageUID);
     void Streams_Finish_Track (int128u TrackUID);
     void Streams_Finish_Essence (int32u EssenceUID, int128u TrackUID);
-    void Streams_Finish_Descriptor (int128u DescriptorUID);
-    void Streams_Finish_Locator (int128u LocatorUID);
-    void Streams_Finish_Component (int128u ComponentUID, float32 EditRate);
+    void Streams_Finish_Descriptor (int128u DescriptorUID, int128u PackageUID);
+    void Streams_Finish_Locator (int128u DescriptorUID, int128u LocatorUID);
+    void Streams_Finish_Component (int128u ComponentUID, float64 EditRate);
     void Streams_Finish_Identification (int128u IdentificationUID);
+    void Streams_Finish_CommercialNames ();
 
     //Buffer - Global
+    void Read_Buffer_Init ();
     void Read_Buffer_Continue ();
+    void Read_Buffer_AfterParsing ();
+    void Read_Buffer_Unsynched();
+    #if MEDIAINFO_SEEK
+    size_t Read_Buffer_Seek (size_t Method, int64u Value, int64u ID);
+    #endif //MEDIAINFO_SEEK
 
     //Buffer - File header
     bool FileHeader_Begin();
@@ -68,53 +102,77 @@
     bool Synched_Test();
 
     //Buffer - Per element
+    bool Header_Begin();
     void Header_Parse();
     void Data_Parse();
 
     //Elements
-    void AES3PCMDescriptor();
-    void CDCIEssenceDescriptor();
-    void ClosedHeader();
-    void ClosedCompleteHeader();
-    void CompleteBody();
-    void CompleteFooter();
-    void CompleteHeader();
+    void Filler();
+    void Filler01() {Filler();}
+    void Filler02() {Filler();}
+    void TerminatingFiller();
+    void XmlDocumentText();
+    void Sequence();
+    void SourceClip();
+    void TimecodeComponent();
     void ContentStorage();
-    void DMSegment();
     void EssenceContainerData();
-    void EventTrack();
-    void FileDescriptor();
+    void CDCIEssenceDescriptor();
+    void RGBAEssenceDescriptor();
+    void Preface();
     void Identification();
-    void IndexTableSegment();
-    void InterchangeObject();
-    void JPEG2000PictureSubDescriptor();
-    void GenerationInterchangeObject();
-    void GenericDescriptor();
-    void GenericPackage();
-    void GenericPictureEssenceDescriptor();
-    void GenericSoundEssenceDescriptor();
-    void GenericTrack();
+    void NetworkLocator();
+    void TextLocator();
     void MaterialPackage();
-    void MPEG2VideoDescriptor();
+    void SourcePackage();
+    void EventTrack();
+    void StaticTrack();
+    void Track();
+    void DMSegment();
+    void GenericSoundEssenceDescriptor();
     void MultipleDescriptor();
-    void NetworkLocator();
-    void PartitionMetadata();
+    void AES3PCMDescriptor();
+    void WaveAudioDescriptor();
+    void MPEG2VideoDescriptor();
+    void JPEG2000PictureSubDescriptor();
+    void VbiPacketsDescriptor();
+    void AncPacketsDescriptor();
+    void OpenIncompleteHeaderPartition();
+    void ClosedIncompleteHeaderPartition();
+    void OpenCompleteHeaderPartition();
+    void ClosedCompleteHeaderPartition();
+    void OpenIncompleteBodyPartition();
+    void ClosedIncompleteBodyPartition();
     void OpenCompleteBodyPartition();
-    void OpenHeader();
-    void Padding();
-    void Preface();
+    void ClosedCompleteBodyPartition();
+    void OpenIncompleteFooterPartition();
+    void ClosedIncompleteFooterPartition();
+    void OpenCompleteFooterPartition();
+    void ClosedCompleteFooterPartition();
     void Primer();
-    void RGBAEssenceDescriptor();
+    void IndexTableSegment();
     void RandomIndexMetadata();
-    void Sequence();
-    void SourceClip();
-    void SourcePackage();
-    void StaticTrack();
+    void SDTI_SystemMetadataPack();
+    void SDTI_PackageMetadataSet();
+    void SDTI_PictureMetadataSet();
+    void SDTI_SoundMetadataSet();
+    void SDTI_DataMetadataSet();
+    void SDTI_ControlMetadataSet();
+    void SystemScheme1();
+    void DMScheme1();
+    void Omneon_010201010100();
+    void Omneon_010201020100();
+
+    //Common
+    void GenerationInterchangeObject();
+    void InterchangeObject();
+    void GenericPictureEssenceDescriptor();
+    void PartitionMetadata();
+    void GenericTrack();
+    void GenericPackage();
+    void FileDescriptor();
     void StructuralComponent();
-    void TextLocator();
-    void TimecodeComponent();
-    void Track();
-    void WaveAudioDescriptor();
+    void GenericDescriptor();
 
     //Complex types
     void AES3PCMDescriptor_AuxBitsMode();                       //3D08
@@ -136,6 +194,8 @@
     void CDCIEssenceDescriptor_ReversedByteOrder();             //330B
     void ContentStorage_Packages();                             //1901
     void ContentStorage_EssenceContainerData();                 //1902
+    void DMSegment_DMFramework();                               //6101
+    void DMSegment_TrackIDs();                                  //6102
     void EssenceContainerData_LinkedPackageUID();               //2701
     void EssenceContainerData_IndexSID();                       //3F06
     void EssenceContainerData_BodySID();                        //3F07
@@ -203,10 +263,13 @@
     void IndexTableSegment_IndexSID();                          //3F06
     void IndexTableSegment_BodySID();                           //3F07
     void IndexTableSegment_SliceCount();                        //3F08
+    void IndexTableSegment_DeltaEntryArray();                   //3F09
+    void IndexTableSegment_IndexEntryArray();                   //3F0A
     void IndexTableSegment_IndexEditRate();                     //3F0B
     void IndexTableSegment_IndexStartPosition();                //3F0C
     void IndexTableSegment_IndexDuration();                     //3F0D
     void IndexTableSegment_PosTableCount();                     //3F0E
+    void IndexTableSegment_8002();                              //8002
     void JPEG2000PictureSubDescriptor_Rsiz();                   //8001
     void JPEG2000PictureSubDescriptor_Xsiz();                   //8002
     void JPEG2000PictureSubDescriptor_Ysiz();                   //8003
@@ -219,6 +282,9 @@
     void JPEG2000PictureSubDescriptor_Csiz();                   //800A
     void JPEG2000PictureSubDescriptor_PictureComponentSizing(); //800B
     void MultipleDescriptor_SubDescriptorUIDs();                //3F01
+    void DMScheme1_PrimaryExtendedSpokenLanguage();             //
+    void DMScheme1_SecondaryExtendedSpokenLanguage();           //
+    void DMScheme1_OriginalExtendedSpokenLanguage();            //
     void MPEG2VideoDescriptor_SingleSequence();                 //
     void MPEG2VideoDescriptor_ConstantBFrames();                //
     void MPEG2VideoDescriptor_CodedContentType();               //
@@ -254,6 +320,7 @@
     void SourcePackage_Descriptor();                            //4701
     void StructuralComponent_DataDefinition();                  //0201
     void StructuralComponent_Duration();                        //0202
+    void SystemScheme1_TimeCodeArray();                         //0102
     void TextLocator_LocatorName();                             //4101
     void TimecodeComponent_StartTimecode();                     //1501
     void TimecodeComponent_RoundedTimecodeBase();               //1502
@@ -273,30 +340,65 @@
     void WaveAudioDescriptor_PeakEnvelopeTimestamp();           //3D30
     void WaveAudioDescriptor_PeakEnvelopeData();                //3D31
     void WaveAudioDescriptor_ChannelAssignment();               //3D31
+    void Omneon_010201010100_8001();                            //8001
+    void Omneon_010201010100_8003();                            //8003
+    void Omneon_010201020100_8002();                            //8002
+    void Omneon_010201020100_8003();                            //8003
+    void Omneon_010201020100_8004();                            //8004
+    void Omneon_010201020100_8005();                            //8005
+    void Omneon_010201020100_8006();                            //8006
 
     //Basic types
-    void Get_Rational(float32 &Value);
+    void Get_Rational(float64 &Value);
     void Skip_Rational();
     void Info_Rational();
     void Get_Timestamp (Ztring &Value);
     void Skip_Timestamp();
     void Info_Timestamp();
+    void Get_UMID       (int256u &Value, const char* Name);
     void Skip_UMID      ();
 
     void Get_UL (int128u &Value, const char* Name, const char* (*Param) (int128u));
     void Skip_UL(const char* Name);
+    void Get_BER(int64u &Value, const char* Name);
+    #if MEDIAINFO_TRACE
+    void Info_UL_01xx01_Items ();
+    void Info_UL_02xx01_Groups ();
+    void Info_UL_040101_Values ();
     #define Info_UL(_INFO, _NAME, _PARAM) int128u _INFO; Get_UL(_INFO, _NAME, _PARAM)
-
+    #else //MEDIAINFO_TRACE
+    void Info_UL_01xx01_Items () {Element_Offset+=8;};
+    void Info_UL_02xx01_Groups () {Element_Offset+=8;};
+    void Info_UL_040101_Values () {Element_Offset+=8;};
+    #define Info_UL(_INFO, _NAME, _PARAM) int128u _INFO;
+    #endif //MEDIAINFO_TRACE
+
+    struct randomindexmetadata
+    {
+        int64u ByteOffset;
+        int32u BodySID;
+    };
+    std::vector<randomindexmetadata> RandomIndexMetadatas;
+    bool                             RandomIndexMetadatas_AlreadyParsed;
+    std::set<int64u>                 PartitionPack_AlreadyParsed;
     size_t Streams_Count;
     int128u Code;
     int128u OperationalPattern;
     int128u InstanceUID;
-    int64u Buffer_DataSizeToParse;
-    int64u Buffer_DataSizeToParse_Complete;
+    int64u Buffer_Begin;
+    int64u Buffer_End;
+    int64u Buffer_Header_Size;
     int16u Code2;
     int16u Length2;
     int64u File_Size_Total; //Used only in Finish()
+    int64u IsParsingMiddle_MaxOffset;
     bool   Track_Number_IsAvailable;
+    bool   IsParsingEnd;
+    bool   IsCheckingRandomAccessTable;
+    bool   IsCheckingFooterPartitionAddress;
+    bool   FooterPartitionAddress_Jumped;
+    bool   PartitionPack_Parsed;
+    size_t IdIsAlwaysSame_Offset;
 
     //Primer
     std::map<int16u, int128u> Primer_Values;
@@ -343,6 +445,7 @@
     //Package
     struct package
     {
+        int256u PackageUID;
         int128u Descriptor;
         std::vector<int128u> Tracks;
         bool IsSourcePackage;
@@ -361,8 +464,9 @@
     {
         int128u Sequence;
         int32u TrackID;
+        Ztring TrackName;
         int32u TrackNumber;
-        float32 EditRate;
+        float64 EditRate;
         bool   Stream_Finish_Done;
 
         track()
@@ -370,7 +474,7 @@
             Sequence=0;
             TrackID=(int32u)-1;
             TrackNumber=(int32u)-1;
-            EditRate=0.000;
+            EditRate=(float64)0;
             Stream_Finish_Done=false;
         }
     };
@@ -382,6 +486,7 @@
     {
         stream_t StreamKind;
         size_t   StreamPos;
+        size_t   StreamPos_Initial;
         File__Analyze* Parser;
         std::map<std::string, Ztring> Infos;
         int64u Stream_Size;
@@ -389,17 +494,26 @@
         bool   TrackID_WasLookedFor;
         bool   Stream_Finish_Done;
         bool   Track_Number_IsMappedToTrack; //if !Track_Number_IsAvailable, is true when it was euristicly mapped
+        bool   IsFilled;
+        bool   IsChannelGrouping;
+        int64u      Frame_Count_NotParsedIncluded;
+        frame_info  FrameInfo;
 
         essence()
         {
             StreamKind=Stream_Max;
             StreamPos=(size_t)-1;
+            StreamPos_Initial=(size_t)-1;
             Parser=NULL;
             Stream_Size=(int64u)-1;
             TrackID=(int32u)-1;
             TrackID_WasLookedFor=false;
             Stream_Finish_Done=false;
             Track_Number_IsMappedToTrack=false;
+            IsFilled=false;
+            IsChannelGrouping=false;
+            Frame_Count_NotParsedIncluded=(int64u)-1;
+            FrameInfo.DTS=(int64u)-1;
         }
 
         ~essence()
@@ -417,22 +531,71 @@
         std::vector<int128u> Locators;
 
         stream_t StreamKind;
-        float32 SampleRate;
+        size_t   StreamPos;
+        float64 SampleRate;
+        float64 DisplayAspectRatio;
         int128u InstanceUID;
+        int128u EssenceContainer;
+        int128u EssenceCompression;
         int32u LinkedTrackID;
         int32u Width;
+        int32u Width_Display;
+        int32u Width_Display_Offset;
         int32u Height;
+        int32u Height_Display;
+        int32u Height_Display_Offset;
+        int32u SubSampling_Horizontal;
+        int32u SubSampling_Vertical;
+        int32u ChannelCount;
         std::map<std::string, Ztring> Infos;
+        int16u BlockAlign;
+        int32u QuantizationBits;
+        int64u Duration;
+        int8u  ActiveFormat;
+        enum type
+        {
+            Type_Unknown,
+            Type_CDCI,
+            Type_RGBA,
+            Type_MPEG2Video,
+            Type_WaveAudio,
+            Type_AES3PCM,
+            Type_JPEG2000Picture,
+            Type_AncPackets,
+        };
+        type Type;
+        bool HasBFrames;
+        int32u ByteRate;
 
         descriptor()
         {
             StreamKind=Stream_Max;
+            StreamPos=(size_t)-1;
             SampleRate=0;
+            DisplayAspectRatio=0;
             InstanceUID.hi=(int64u)-1;
             InstanceUID.lo=(int64u)-1;
+            EssenceContainer.hi=(int64u)-1;
+            EssenceContainer.lo=(int64u)-1;
+            EssenceCompression.hi=(int64u)-1;
+            EssenceCompression.lo=(int64u)-1;
             LinkedTrackID=(int32u)-1;
             Width=(int32u)-1;
+            Width_Display=(int32u)-1;
+            Width_Display_Offset=(int32u)-1;
             Height=(int32u)-1;
+            Height_Display=(int32u)-1;
+            Height_Display_Offset=(int32u)-1;
+            SubSampling_Horizontal=(int32u)-1;
+            SubSampling_Vertical=(int32u)-1;
+            ChannelCount=(int32u)-1;
+            BlockAlign=(int16u)-1;
+            QuantizationBits=(int8u)-1;
+            Duration=(int64u)-1;
+            ActiveFormat=(int8u)-1;
+            Type=Type_Unknown;
+            HasBFrames=false;
+            ByteRate=(int32u)-1;
         }
     };
     typedef std::map<int128u, descriptor> descriptors; //Key is InstanceUID of Descriptor
@@ -441,23 +604,236 @@
     //Locator
     struct locator
     {
-        Ztring EssenceLocator;
+        Ztring      EssenceLocator;
+        stream_t    StreamKind;
+        size_t      StreamPos;
+        int32u      LinkedTrackID;
+        bool        IsTextLocator;
+
+        locator()
+        {
+            StreamKind=Stream_Max;
+            StreamPos=(size_t)-1;
+            LinkedTrackID=(int32u)-1;
+            IsTextLocator=false;
+        }
+
+        ~locator()
+        {
+        }
     };
     typedef std::map<int128u, locator> locators; //Key is InstanceUID of the locator
     locators Locators;
+    File__ReferenceFilesHelper* ReferenceFiles;
+    #if MEDIAINFO_NEXTPACKET
+        bool                    ReferenceFiles_IsParsing;
+    #endif //MEDIAINFO_NEXTPACKET
 
     //Component (Sequence, TimeCode, Source Clip)
     struct component
     {
         int64u Duration;
+        int256u SourcePackageID; //Sequence from SourcePackage only
+        int32u  SourceTrackID;
+        std::vector<int128u> StructuralComponents; //Sequence from MaterialPackage only
 
         component()
         {
-            Duration=0;
+            Duration=(int64u)-1;
+            SourceTrackID=(int32u)-1;
+        }
+
+        void Update (struct component &New)
+        {
+            if (New.Duration!=(int64u)-1)
+                Duration=New.Duration;
+            if (New.SourcePackageID.hi || New.SourcePackageID.lo)
+                SourcePackageID=New.SourcePackageID;
+            if (New.SourceTrackID!=(int32u)-1)
+                SourceTrackID=New.SourceTrackID;
+            if (!New.StructuralComponents.empty())
+                StructuralComponents=New.StructuralComponents;
         }
     };
     typedef std::map<int128u, component> components; //Key is InstanceUID of the component
     components Components;
+
+    //Descriptive Metadata - DMSegments
+    struct dmsegment
+    {
+        int128u     Framework;
+        std::vector<int32u> TrackIDs;
+
+        dmsegment()
+        {
+        }
+
+        ~dmsegment()
+        {
+        }
+    };
+    typedef std::map<int128u, dmsegment> dmsegments; //Key is InstanceUID of the DMSegment
+    dmsegments DMSegments;
+
+    //Descriptive Metadata - DMScheme1
+    struct dmscheme1
+    {
+        Ztring      PrimaryExtendedSpokenLanguage;
+
+        dmscheme1()
+        {
+        }
+
+        ~dmscheme1()
+        {
+        }
+    };
+    typedef std::map<int128u, dmscheme1> dmscheme1s; //Key is InstanceUID of the DMScheme1
+    dmscheme1s DMScheme1s;
+
+    //Parsers
+    void           ChooseParser__FromEssence(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+    void           ChooseParser__Aaf(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+    void           ChooseParser__Aaf_CP_Picture(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+    void           ChooseParser__Aaf_CP_Sound(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+    void           ChooseParser__Aaf_CP_Data(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+    void           ChooseParser__Aaf_14(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+    void           ChooseParser__Aaf_GC_Picture(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+    void           ChooseParser__Aaf_GC_Sound(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+    void           ChooseParser__Aaf_GC_Data(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+    void           ChooseParser__Aaf_GC_Compound(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+    void           ChooseParser__Avid(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+    void           ChooseParser__Avid_Picture(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+    File__Analyze* ChooseParser(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+    File__Analyze* ChooseParser__FromEssenceContainer(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+    File__Analyze* ChooseParser_Avc(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+    File__Analyze* ChooseParser_DV(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+    File__Analyze* ChooseParser_Mpeg4v(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+    File__Analyze* ChooseParser_Mpegv(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+    File__Analyze* ChooseParser_Raw(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+    File__Analyze* ChooseParser_RV24(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+    File__Analyze* ChooseParser_Vc3(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+    File__Analyze* ChooseParser_Aac(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+    File__Analyze* ChooseParser_Ac3(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+    File__Analyze* ChooseParser_Aes3(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+    File__Analyze* ChooseParser_Alaw(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+    File__Analyze* ChooseParser_ChannelGrouping(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+    File__Analyze* ChooseParser_Mpega(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+    File__Analyze* ChooseParser_Pcm(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+    File__Analyze* ChooseParser_Jpeg2000(const essences::iterator &Essence, const descriptors::iterator &Descriptor);
+
+    //Helpers
+    void Subsampling_Compute(descriptors::iterator Descriptor);
+    void Locators_CleanUp();
+    void Locators_Test();
+    void TryToFinish();
+
+    //Temp
+    int128u EssenceContainer_FromPartitionMetadata;
+    int64u PartitionMetadata_PreviousPartition;
+    int64u PartitionMetadata_FooterPartition;
+    int64u TimeCode_StartTimecode;
+    int16u TimeCode_RoundedTimecodeBase;
+    bool   TimeCode_DropFrame;
+    float64 DTS_Delay; //In seconds
+    bool   StreamPos_StartAtOne; //information about the base of StreamPos (0 or 1, 1 is found in 1 file)
+    int64u SDTI_TimeCode_StartTimecode;
+    int64u SDTI_SizePerFrame;
+    bool   SDTI_IsPresent; //Used to test if SDTI packet is used for Index StreamOffset calculation
+    bool   SDTI_IsInIndexStreamOffset; //Used to test if SDTI packet is used for Index StreamOffset calculation
+    int64u SystemScheme1_TimeCodeArray_StartTimecode;
+    int64u SystemScheme1_FrameRateFromDescriptor;
+    bool   Essences_FirstEssence_Parsed;
+    int32u IndexTable_NSL;
+    int32u IndexTable_NPE;
+    #if defined(MEDIAINFO_ANCILLARY_YES)
+        File_Ancillary* Ancillary;
+        bool            Ancillary_IsBinded;
+    #endif //defined(MEDIAINFO_ANCILLARY_YES)
+
+    //Hints
+    size_t* File_Buffer_Size_Hint_Pointer;
+
+    //Partitions
+    struct partition
+    {
+        int64u StreamOffset; //From file, not MXF one
+        int64u PartitionPackByteCount; //Fill included
+        int64u FooterPartition;
+        int64u HeaderByteCount;
+        int64u IndexByteCount;
+        int64u BodyOffset;
+
+        partition()
+        {
+            StreamOffset=0;
+            PartitionPackByteCount=(int64u)-1;
+            FooterPartition=0;
+            HeaderByteCount=0;
+            IndexByteCount=0;
+            BodyOffset=0;
+        }
+
+        bool operator < (const partition& lhs) const
+        {
+            return StreamOffset<lhs.StreamOffset;
+        }
+    };
+    typedef std::vector<partition>  partitions;
+    partitions                      Partitions;
+    size_t                          Partitions_Pos;
+    bool                            Partitions_IsCalculatingHeaderByteCount;
+    bool                            Partitions_IsCalculatingSdtiByteCount;
+    bool                            Partitions_IsFooter;
+
+    #if MEDIAINFO_DEMUX || MEDIAINFO_SEEK
+        bool Demux_HeaderParsed;
+        bool Demux_Interleave;
+        size_t CountOfLocatorsToParse;
+        float64 Demux_Rate;
+
+        //IndexTable
+        struct indextable
+        {
+            int64u  StreamOffset; //From file, not MXF one
+            int64u  IndexStartPosition;
+            int64u  IndexDuration;
+            int32u  EditUnitByteCount;
+            float64 IndexEditRate;
+            struct entry
+            {
+                int64u  StreamOffset;
+                int8u   Type;
+            };
+            std::vector<entry> Entries;
+
+            indextable()
+            {
+                StreamOffset=(int64u)-1;
+                IndexStartPosition=0;
+                IndexDuration=0;
+                EditUnitByteCount=0;
+                IndexEditRate=0;
+            }
+
+            bool operator < (const indextable& lhs) const
+            {
+                return IndexStartPosition<lhs.IndexStartPosition;
+            }
+        };
+        typedef std::vector<indextable> indextables;
+        indextables                     IndexTables;
+        size_t                          IndexTables_Pos;
+
+        //Other
+        int64u  Clip_Header_Size;
+        int64u  Clip_Begin;
+        int64u  Clip_End;
+        int128u Clip_Code;
+        int64u  OverallBitrate_IsCbrForSure;
+        bool    Duration_Detected;
+        bool    DetectDuration();
+    #endif //MEDIAINFO_DEMUX || MEDIAINFO_SEEK
 };
 
 } //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Nut.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Nut.cpp Changed

@@ -1,17 +1,17 @@
 // File_Nut - Info for Nut files
-// Copyright (C) 2008-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,14 +22,18 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_NUT_YES)
 //---------------------------------------------------------------------------
 
@@ -96,10 +100,10 @@
 void File_Nut::FileHeader_Parse()
 {
     //Parsing
-    Element_Begin("Nut header", 25);
+    Element_Begin1("Nut header");
     std::string file_id_string;
     Get_String(25, file_id_string,                               "file_id_string");
-    Element_End();
+    Element_End0();
 
     FILLING_BEGIN();
         //Integrity
@@ -147,11 +151,13 @@
 
     Skip_B4(                                                    "cheksum");
 }
+*/
 
 //***************************************************************************
 // Elements
 //***************************************************************************
 
+/*
 //---------------------------------------------------------------------------
 void File_Nut::main()
 {

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Nut.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Nut.h Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Ogg.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Ogg.cpp Changed

@@ -1,31 +1,35 @@
 // File_Ogg - Info for ogg files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_OGG_YES)
 //---------------------------------------------------------------------------
 
@@ -56,7 +60,7 @@
     //Temp - Global
     StreamsToDo=0;
     Parsing_End=false;
-    
+
     //Temp - Stream
     Chunk_Sizes_Finished=true;
     packet_type=0;
@@ -84,7 +88,7 @@
             Stream_Temp->second.StreamPos=Count_Get(Stream_Temp->second.StreamKind)-1;
             if (!SizedBlocks && !XiphLacing)
                 Stream_Temp->second.absolute_granule_position_Resolution=((File_Ogg_SubElement*)Stream_Temp->second.Parser)->absolute_granule_position_Resolution;
-            if (Stream_Temp->second.StreamKind==Stream_Audio, Stream_Temp->second.absolute_granule_position_Resolution==0)
+            if (Stream_Temp->second.StreamKind==Stream_Audio && Stream_Temp->second.absolute_granule_position_Resolution==0)
                 Stream_Temp->second.absolute_granule_position_Resolution=Retrieve(Stream_Audio, Stream_Temp->second.StreamPos, Audio_SamplingRate).To_int64u();
             if (!IsSub && Stream_Temp->second.absolute_granule_position && Stream_Temp->second.absolute_granule_position_Resolution)
             {
@@ -99,10 +103,10 @@
                     Stream_Temp->second.StreamPos=0;
                 }
                 Fill(Stream_Temp->second.StreamKind, Stream_Temp->second.StreamPos, General_ID, Stream_Temp->first);
-                Fill(Stream_Temp->second.StreamKind, Stream_Temp->second.StreamPos, General_ID_String, Ztring::ToZtring(Stream_Temp->first)+_T(" (0x")+Ztring::ToZtring(Stream_Temp->first, 16)+_T(')'), true);
+                Fill(Stream_Temp->second.StreamKind, Stream_Temp->second.StreamPos, General_ID_String, Ztring::ToZtring(Stream_Temp->first)+__T(" (0x")+Ztring::ToZtring(Stream_Temp->first, 16)+__T(')'), true);
             }
         }
-        Stream_Temp++;
+        ++Stream_Temp;
     }
 
     Fill(Stream_General, 0, General_Format, "OGG", Unlimited, true, true);
@@ -123,7 +127,7 @@
             Merge(*Stream_Temp->second.Parser, Stream_Temp->second.StreamKind, 0, Stream_Temp->second.StreamPos);
             Merge(*Stream_Temp->second.Parser, Stream_General, 0, 0);
         }
-        Stream_Temp++;
+        ++Stream_Temp;
     }
 
     //No more need
@@ -163,11 +167,17 @@
     //Synchronizing
     while (Buffer_Offset+4<=Buffer_Size)
     {
-        while (Buffer_Offset+4<=Buffer_Size)
+        while(Buffer_Offset+4<=Buffer_Size && (Buffer[Buffer_Offset  ]!=0x4F
+                                            || Buffer[Buffer_Offset+1]!=0x67
+                                            || Buffer[Buffer_Offset+2]!=0x67
+                                            || Buffer[Buffer_Offset+3]!=0x53)) //"OggS"
         {
-            if (CC4(Buffer+Buffer_Offset)==0x4F676753) //"OggS"
-                break;
-            Buffer_Offset++;
+            Buffer_Offset+=1+2;
+            while(Buffer_Offset<Buffer_Size && Buffer[Buffer_Offset]!=0x67)
+                Buffer_Offset+=2;
+            if (Buffer_Offset>=Buffer_Size || Buffer[Buffer_Offset-1]==0x67)
+                Buffer_Offset--;
+            Buffer_Offset--;
         }
 
         if (Buffer_Offset+4<=Buffer_Size) //Testing if size is coherant
@@ -203,7 +213,7 @@
             Buffer_Offset++;
         return false;
     }
-    
+
     //Synched is OK
     return true;
 }
@@ -260,7 +270,7 @@
                     Size+=Size8;
                 }
                 while (Size8==0xFF);
-                Param_Info(Size);
+                Param_Info1(Size);
                 Chunk_Sizes.push_back(Size);
                 UsedSize+=Size;
             }
@@ -316,6 +326,9 @@
 //---------------------------------------------------------------------------
 void File_Ogg::Data_Parse()
 {
+    //Counting
+    Frame_Count++;
+
     //If first chunk of a stream
     if (Stream[Element_Code].Parser==NULL)
     {
@@ -323,7 +336,7 @@
             return; //Maybe multitracks concatained, not supported
         Stream[Element_Code].Parser=new File_Ogg_SubElement;
         Open_Buffer_Init(Stream[Element_Code].Parser);
-        ((File_Ogg_SubElement*)Stream[Element_Code].Parser)->InAnotherContainer=SizedBlocks|SizedBlocks;
+        ((File_Ogg_SubElement*)Stream[Element_Code].Parser)->InAnotherContainer=IsSub;
         StreamsToDo++;
     }
     ((File_Ogg_SubElement*)Stream[Element_Code].Parser)->MultipleStreams=Stream.size()>1; //has no sens for the first init, must check allways
@@ -337,9 +350,8 @@
             //Info
             if (!continued)
                 Peek_L1(packet_type); //Only for information
-            Element_Info(Ztring::ToZtring(packet_type, 16));
-            if (continued)
-                Element_Info("Continue");
+            Element_Info1(Ztring::ToZtring(packet_type, 16));
+            Element_Info1C((continued), "Continue");
 
             //Parsing
             if (continued || Parser->File_Offset!=Parser->File_Size)
@@ -381,7 +393,7 @@
             while (Stream_Temp!=Stream.end())
             {
                 Stream_Temp->second.absolute_granule_position=0;
-                Stream_Temp++;
+                ++Stream_Temp;
             }
         Parsing_End=true;
     }

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Ogg.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Ogg.h Changed

@@ -1,17 +1,17 @@
 // File_Ogg - Info for ogg files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Ogg_SubElement.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Ogg_SubElement.cpp Changed

@@ -1,31 +1,35 @@
 // File_Ogg_SubElement - Info for OGG files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_OGG_YES)
 //---------------------------------------------------------------------------
 
@@ -46,12 +50,18 @@
 #if defined(MEDIAINFO_AC3_YES)
     #include "MediaInfo/Audio/File_Ac3.h"
 #endif
+#if defined(MEDIAINFO_CELT_YES)
+    #include "MediaInfo/Audio/File_Celt.h"
+#endif
 #if defined(MEDIAINFO_FLAC_YES)
     #include "MediaInfo/Audio/File_Flac.h"
 #endif
 #if defined(MEDIAINFO_MPEGA_YES)
     #include "MediaInfo/Audio/File_Mpega.h"
 #endif
+#if defined(MEDIAINFO_OPUS_YES)
+    #include "MediaInfo/Audio/File_Opus.h"
+#endif
 #if defined(MEDIAINFO_SPEEX_YES)
     #include "MediaInfo/Audio/File_Speex.h"
 #endif
@@ -82,7 +92,7 @@
 
 #elif defined(WINDOWS) //__BORLANDC__
     #define OGG_ID(NAME, PART1, PART2, COUNT) \
-        const int64u Identifier_##NAME=(int64u)0x##PART1##PART2##UL; \
+        const int64u Identifier_##NAME=(int64u)0x##PART1##PART2##ULL; \
         const size_t Identifier_##NAME##3=0x##COUNT; \
 
 #else //__BORLANDC__
@@ -103,9 +113,12 @@
     OGG_ID(FLAC,           7F, 464C4143, 5)
     OGG_ID(JNG,      8B4A4E47, 0D0A1A0A, 8)
     OGG_ID(kate,     806B6174, 65000000, 8)
+    OGG_ID(kateTags, 6B617465, 00000000, 8)
     OGG_ID(KW_DIRAC, 4B572D44, 49524143, 8)
     OGG_ID(OggMIDI,  4D67674D, 49444900, 8)
     OGG_ID(MNG,      8A4D4E47, 0D0A1A0A, 8)
+    OGG_ID(OpusHead, 4F707573, 48656164, 8)
+    OGG_ID(OpusTags, 4F707573, 54616773, 8)
     OGG_ID(PCM,      50434D20, 20202020, 8)
     OGG_ID(PNG,      89504E47, 0D0A1A0A, 8)
     OGG_ID(Speex,    53706565, 78202020, 8)
@@ -259,13 +272,10 @@
 void File_Ogg_SubElement::Header_Parse()
 {
     //Parsing
-    int64u SamplesCount;
-    int32u SamplesCount4;
-    int16u SamplesCount2;
-    int8u  SamplesCount1, Type;
-    bool lenbytes0, lenbytes1, lenbytes2;
+    int8u Type;
     if (Identified && WithType)
     {
+        bool lenbytes0, lenbytes1, lenbytes2;
         Get_L1 (Type,                                               "Type");
             Skip_Flags(Type, 0,                                     "Indicates data packet");
             Get_Flags (Type, 1, lenbytes2,                          "Bit 2 of lenbytes");
@@ -282,22 +292,16 @@
                 if (lenbytes1)
                 {
                     if (lenbytes0)
-                        //Get_L7 (SamplesCount,                   "SamplesCount");
-                        Element_Offset+=7;
+                        Skip_L7(                                 "SamplesCount");
                     else
-                        //Get_L6 (SamplesCount,                   "SamplesCount");
-                        Element_Offset+=6;
+                        Skip_L6(                                "SamplesCount");
                 }
                 else
                 {
                     if (lenbytes0)
-                        //Get_L5 (SamplesCount,                   "SamplesCount");
-                        Element_Offset+=5;
+                        Skip_L5(                                "SamplesCount");
                     else
-                    {
-                        Get_L4 (SamplesCount4,                  "SamplesCount");
-                        SamplesCount=SamplesCount4;
-                    }
+                        Skip_L4(                                "SamplesCount");
                 }
             }
             else
@@ -305,25 +309,14 @@
                 if (lenbytes1)
                 {
                     if (lenbytes0)
-                    {
-                        Get_L3 (SamplesCount4,                  "SamplesCount");
-                        SamplesCount=SamplesCount4;
-                    }
+                        Skip_L3 (                               "SamplesCount");
                     else
-                    {
-                        Get_L2 (SamplesCount2,                  "SamplesCount");
-                        SamplesCount=SamplesCount2;
-                    }
+                        Skip_L2 (                               "SamplesCount");
                 }
                 else
                 {
                     if (lenbytes0)
-                    {
-                        Get_L1 (SamplesCount1,                  "SamplesCount");
-                        SamplesCount=SamplesCount1;
-                    }
-                    //else
-                    //    Get_L0 (SamplesCount,                   "SamplesCount");
+                        Skip_L1 (                               "SamplesCount");
                 }
             }
         }
@@ -398,6 +391,7 @@
     ELEMENT_CASE(KW_DIRAC)
     ELEMENT_CASE(OggMIDI)
     ELEMENT_CASE(MNG)
+    ELEMENT_CASE(OpusHead)
     ELEMENT_CASE(PCM)
     ELEMENT_CASE(PNG)
     ELEMENT_CASE(Speex)
@@ -412,7 +406,7 @@
     ELEMENT_CASE(fisbone)
     else
     {
-        Skip_XX(Element_Size,                                   "Unkown");
+        Skip_XX(Element_Size,                                   "Unknown");
         Accept("OggSubElement");
         Finish("OggSubElement");
         return;
@@ -436,7 +430,7 @@
 //---------------------------------------------------------------------------
 void File_Ogg_SubElement::Identification_CELT()
 {
-    #if defined(MEDIAINFO__YES)
+    #if defined(MEDIAINFO_CELT_YES)
         StreamKind_Last=Stream_Audio;
         Parser=new File_Celt;
     #else
@@ -444,6 +438,7 @@
         Fill(Stream_Audio, 0, Audio_Format, "celt");
         Fill(Stream_Audio, 0, Audio_Codec, "celt");
     #endif
+    WithType=false;
 }
 
 //---------------------------------------------------------------------------
@@ -537,6 +532,21 @@
 }
 
 //---------------------------------------------------------------------------
+void File_Ogg_SubElement::Identification_OpusHead()
+{
+    #if defined(MEDIAINFO_OPUS_YES)
+        StreamKind_Last=Stream_Audio;
+        Parser=new File_Opus;
+    #else
+        Stream_Prepare(Stream_Audio);
+        Fill(Stream_Audio, 0, Audio_Format, "Opus");
+        Fill(Stream_Audio, 0, Audio_Codec, "Opus");
+    #endif
+    WithType=false;
+    absolute_granule_position_Resolution=48000; // From specs: "It is possible to run a decoder at other sampling rates, but the format and this specification always count samples assuming a 48 kHz decoding rate."
+}
+
+//---------------------------------------------------------------------------
 void File_Ogg_SubElement::Identification_MNG()
 {
     #if defined(MEDIAINFO__YES)
@@ -631,7 +641,7 @@
 //---------------------------------------------------------------------------
 void File_Ogg_SubElement::Identification_video()
 {
-    Element_Info("Video");
+    Element_Info1("Video");
 
     //Parsing
     int64u TimeUnit;
@@ -663,7 +673,7 @@
     //Creating the parser
          if (0);
     #if defined(MEDIAINFO_MPEG4V_YES)
-    else if (MediaInfoLib::Config.CodecID_Get(Stream_Video, InfoCodecID_Format_Riff, Ztring().From_CC4(fccHandler))==_T("MPEG-4 Visual"))
+    else if (MediaInfoLib::Config.CodecID_Get(Stream_Video, InfoCodecID_Format_Riff, Ztring().From_CC4(fccHandler))==__T("MPEG-4 Visual"))
     {
         Parser=new File_Mpeg4v;
         ((File_Mpeg4v*)Parser)->FrameIsAlwaysComplete=true;
@@ -674,7 +684,7 @@
 //---------------------------------------------------------------------------
 void File_Ogg_SubElement::Identification_audio()
 {
-    Element_Info("Audio");
+    Element_Info1("Audio");
 
     //Parsing
     int64u TimeUnit, SamplesPerUnit;
@@ -700,7 +710,7 @@
     //Filling
     Stream_Prepare(Stream_Audio);
     Ztring Codec; Codec.From_CC4(fccHandler);
-    Codec.TrimLeft(_T('0'));
+    Codec.TrimLeft(__T('0'));
     CodecID_Fill(Codec, Stream_Audio, StreamPos_Last, InfoCodecID_Format_Riff);
     Fill(Stream_Audio, StreamPos_Last, Audio_Codec, Codec);
     if (AvgBytesPerSec<0x80000000) //This is a signed value, and negative values are not OK
@@ -712,7 +722,7 @@
     //Creating the parser
          if (0);
     #if defined(MEDIAINFO_MPEGA_YES)
-    else if (MediaInfoLib::Config.Codec_Get(Codec, InfoCodec_KindofCodec).find(_T("MPEG-"))==0)
+    else if (MediaInfoLib::Config.Codec_Get(Codec, InfoCodec_KindofCodec).find(__T("MPEG-"))==0)
     {
         Parser=new File_Mpega;
     }
@@ -729,7 +739,7 @@
 //---------------------------------------------------------------------------
 void File_Ogg_SubElement::Identification_text()
 {
-    Element_Info("Text");
+    Element_Info1("Text");
 
     //Parsing
     Skip_B1   (                                                 "Signature");
@@ -765,7 +775,7 @@
     if (Element_Offset==Element_Size)
         return;
 
-    Element_Info("Skeleton");
+    Element_Info1("Skeleton");
 
     //Parsing
     int16u VersionMajor;
@@ -793,7 +803,7 @@
     if (Element_Offset==Element_Size)
         return;
 
-    Element_Info("Skeleton");
+    Element_Info1("Skeleton");
 
     //Parsing
     int32u Offset;
@@ -816,8 +826,6 @@
 //---------------------------------------------------------------------------
 void File_Ogg_SubElement::Comment()
 {
-    Element_Name("Comment");
-
     //Integrity
     if (Element_Size<8)
         return;
@@ -829,20 +837,30 @@
     #undef ELEMENT_CASE
     #ifdef __BORLANDC__ //Borland converts int64u to int32u
         #define ELEMENT_CASE(_NAME) \
-            else if (ID_Identification>>(64-8*Elements::Identifier_##_NAME##3)==(((((int64u)Elements::Identifier_##_NAME##1)*0x100000000LL+Elements::Identifier_##_NAME##2)&0x00FFFFFFFFFFFFFFLL)<<8))
+            else if (ID_Identification>>(64-8*Elements::Identifier_##_NAME##3)==(((int64u)Elements::Identifier_##_NAME##1)*0x100000000LL|Elements::Identifier_##_NAME##2))
 
     #else //__BORLANDC__
         #define ELEMENT_CASE(_NAME) \
-            else if (ID_Identification>>(64-8*Elements::Identifier_##_NAME##3)==((Elements::Identifier_##_NAME&0x00FFFFFFFFFFFFFFLL)<<8))
+            else if (ID_Identification>>(64-8*Elements::Identifier_##_NAME##3)==Elements::Identifier_##_NAME)
 
     #endif //__BORLANDC__
 
     int32u ID_Identification_Size;
     if (0) ;
-    ELEMENT_CASE(kate)      ID_Identification_Size=8;
-    else                    ID_Identification_Size=6; //Default
-    Skip_Local(ID_Identification_Size,                          "ID");
+    ELEMENT_CASE(OpusTags)  ID_Identification_Size=8;
+    else if (WithType)
+    {
+        if (0) ;
+        ELEMENT_CASE(kateTags)  ID_Identification_Size=8;
+        else
+                                ID_Identification_Size=6; //Default
+    }
+    else
+        return; //Not a comment
 
+    Element_Name("Comment");
+
+    Skip_Local(ID_Identification_Size,                          "ID");
 
     //Preparing
     File_VorbisCom Vorbis;
@@ -872,6 +890,8 @@
 
     if (Parser)
     {
+        if (!WithType)
+            Comment(); //In case of comments
         Open_Buffer_Continue(Parser);
         if (Identified && Parser->Status[IsFilled])
             Finish("OggSubElement");

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Ogg_SubElement.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Ogg_SubElement.h Changed

@@ -1,17 +1,17 @@
 // File_Ogg_SubElement - Info for OGG files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -72,12 +72,13 @@
     void Identification_FLAC();
     void Identification_JNG();
     void Identification_kate();
-    void Identification_KW_DIRAC();
-    void Identification_OggMIDI();
-    void Identification_MNG();
-    void Identification_PCM();
-    void Identification_PNG();
-    void Identification_Speex();
+    void Identification_KW_DIRAC();
+    void Identification_OggMIDI();
+    void Identification_MNG();
+    void Identification_OpusHead();
+    void Identification_PCM();
+    void Identification_PNG();
+    void Identification_Speex();
     void Identification_theora();
     void Identification_vorbis();
     void Identification_YUV4MPEG();

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_P2_Clip.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_P2_Clip.cpp Changed

@@ -1,31 +1,35 @@
 // File_P2_Clip - Info for P2 Clip (XML) files
-// Copyright (C) 2010-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_P2_YES)
 //---------------------------------------------------------------------------
 
@@ -33,56 +37,94 @@
 #include "MediaInfo/Multiple/File_P2_Clip.h"
 #include "MediaInfo/MediaInfo.h"
 #include "MediaInfo/MediaInfo_Internal.h"
+#include "MediaInfo/Multiple/File__ReferenceFilesHelper.h"
 #include "ZenLib/Dir.h"
 #include "ZenLib/FileName.h"
-#include "ZenLib/TinyXml/tinyxml.h"
+#include "tinyxml2.h"
+using namespace tinyxml2;
 //---------------------------------------------------------------------------
 
 namespace MediaInfoLib
 {
 
 //***************************************************************************
-// Buffer - File header
+// Constructor/Destructor
 //***************************************************************************
 
 //---------------------------------------------------------------------------
-bool File_P2_Clip::FileHeader_Begin()
+File_P2_Clip::File_P2_Clip()
+:File__Analyze()
 {
-    //Element_Size
-    if (File_Size>64*1024)
-    {
-        Reject("P2_Clip");
-        return false; //P2_Clip XML files are not big
-    }
+    #if MEDIAINFO_EVENTS
+        ParserIDs[0]=MediaInfo_Parser_None; //TODO
+        StreamIDs_Width[0]=sizeof(size_t)*2;
+    #endif //MEDIAINFO_EVENTS
+    #if MEDIAINFO_DEMUX
+        Demux_EventWasSent_Accept_Specific=true;
+    #endif //MEDIAINFO_DEMUX
+
+    //Temp
+    ReferenceFiles=NULL;
+}
+
+//---------------------------------------------------------------------------
+File_P2_Clip::~File_P2_Clip()
+{
+    delete ReferenceFiles; //ReferenceFiles=NULL;
+}
 
-    //Element_Size
-    if (Buffer_Size<5)
-        return false; //Must wait for more data
+//***************************************************************************
+// Streams management
+//***************************************************************************
 
-    //XML header
-    if (Buffer[0]!='<'
-     || Buffer[1]!='?'
-     || Buffer[2]!='x'
-     || Buffer[3]!='m'
-     || Buffer[4]!='l')
-    {
-        Reject("P2_Clip");
-        return false;
-    }
+//---------------------------------------------------------------------------
+void File_P2_Clip::Streams_Finish()
+{
+    if (ReferenceFiles==NULL)
+        return;
+
+    ReferenceFiles->ParseReferences();
+}
+
+//***************************************************************************
+// Buffer - Global
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_SEEK
+size_t File_P2_Clip::Read_Buffer_Seek (size_t Method, int64u Value, int64u ID)
+{
+    if (ReferenceFiles==NULL)
+        return 0;
+
+    return ReferenceFiles->Read_Buffer_Seek(Method, Value, ID);
+}
+#endif //MEDIAINFO_SEEK
+
+//***************************************************************************
+// Buffer - File header
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_P2_Clip::FileHeader_Begin()
+{
+    XMLDocument document;
+    if (!FileHeader_Begin_XML(document))
+       return false;
 
-    TiXmlDocument document(File_Name.To_Local());
-    if (document.LoadFile())
     {
-        TiXmlElement* Root=document.FirstChildElement("P2Main");
+        XMLElement* Root=document.FirstChildElement("P2Main");
         if (Root)
         {
             Accept("P2_Clip");
             Fill(Stream_General, 0, General_Format, "P2 Clip");
 
-            TiXmlElement* ClipContent=Root->FirstChildElement("ClipContent");
+            ReferenceFiles=new File__ReferenceFilesHelper(this, Config);
+
+            XMLElement* ClipContent=Root->FirstChildElement("ClipContent");
             if (ClipContent)
             {
-                TiXmlElement* ChildElement;
+                XMLElement* ChildElement;
 
                 //ID
                 ChildElement=ClipContent->FirstChildElement("GlobalClipID");
@@ -98,23 +140,40 @@
                 if (ChildElement)
                     EditUnit=ChildElement->GetText();
                 int64u Duration_Frames=Duration.To_int64u();
-                int64u EditUnit_Numerator=EditUnit.SubString(Ztring(), _T("/")).To_int64u();
-                int64u EditUnit_Denominator=EditUnit.SubString(_T("/"), Ztring()).To_int64u();
+                int64u EditUnit_Numerator=EditUnit.SubString(Ztring(), __T("/")).To_int64u();
+                int64u EditUnit_Denominator=EditUnit.SubString(__T("/"), Ztring()).To_int64u();
                 if (Duration_Frames && EditUnit_Numerator && EditUnit_Denominator)
                     Fill(Stream_General, 0, General_Duration, ((float32)Duration_Frames)*1000*EditUnit_Numerator/EditUnit_Denominator, 0);
 
                 //EssenceList
-                TiXmlElement* EssenceList=ClipContent->FirstChildElement("EssenceList");
-                int64u File_Size_Total=File_Size;
+                XMLElement* EssenceList=ClipContent->FirstChildElement("EssenceList");
                 if (EssenceList)
                 {
-                    TiXmlElement* Track=EssenceList->FirstChildElement();
+                    XMLElement* Track=EssenceList->FirstChildElement();
+                    size_t Audio_Count=0;
                     while (Track)
                     {
-                        string Field=Track->ValueStr();
+                        string Field=Track->Value();
                         if (Field=="Video")
                         {
-                            Stream_Prepare(Stream_Video);
+                            File__ReferenceFilesHelper::reference ReferenceFile;
+
+                            //FrameRate
+                            ChildElement=Track->FirstChildElement("FrameRate");
+                            if (ChildElement)
+                            {
+                                Ztring FrameRateS=Ztring(ChildElement->GetText());
+                                        if (FrameRateS.find(__T("23.97"))==0)
+                                    ReferenceFile.FrameRate=((float64)24)*1000/1001;
+                                else if (FrameRateS.find(__T("29.97"))==0)
+                                    ReferenceFile.FrameRate=((float64)30)*1000/1001;
+                                else if (FrameRateS.find(__T("59.94"))==0)
+                                    ReferenceFile.FrameRate=((float64)60)*1000/1001;
+                                else
+                                    ReferenceFile.FrameRate=FrameRateS.To_float64();
+                                if (FrameRateS.find('i')!=string::npos)
+                                    ReferenceFile.FrameRate/=2;
+                            }
 
                             //CreationDate
                             ChildElement=Track->FirstChildElement("StartTimecode");
@@ -123,113 +182,84 @@
                                 string Text=ChildElement->GetText();
                                 if (Text.size()==11)
                                 {
-                                    int32u ToFill=(Text[0]-'0')*10*60*60*1000
+                                    int64u ToFill=(Text[0]-'0')*10*60*60*1000
                                                 + (Text[1]-'0')   *60*60*1000
                                                 + (Text[3]-'0')   *10*60*1000
                                                 + (Text[4]-'0')      *60*1000
                                                 + (Text[6]-'0')      *10*1000
                                                 + (Text[7]-'0')         *1000;
-                                    ChildElement=Track->FirstChildElement("FrameRate");
-                                    if (ChildElement)
-                                    {
-                                        Ztring FrameRateS=Ztring(ChildElement->GetText());
-                                        float32 FrameRate=FrameRateS.To_float32();
-                                        if (FrameRateS.find('i')!=string::npos)
-                                            FrameRate/=2;
-                                        if (FrameRate)
-                                            ToFill+=float32_int32s(((Text[9]-'0')*10+(Text[10]-'0'))*1000/FrameRate);
-                                    }
-                                    Fill(Stream_Video, 0, Video_Delay, ToFill);
+                                        if (ReferenceFile.FrameRate)
+                                            ToFill+=float64_int64s(((Text[9]-'0')*10+(Text[10]-'0'))*1000/ReferenceFile.FrameRate);
+                                    //Fill(Stream_Video, StreamPos_Last, Video_Delay, ToFill);
+                                    //Fill(Stream_Video, StreamPos_Last, Video_Delay_Source, "P2 Clip");
                                 }
                             }
 
                             #if defined(MEDIAINFO_MXF_YES)
                                 if (File_Name.size()>10+1+4
                                  && File_Name[File_Name.size()-10-1]==PathSeparator
-                                 && File_Name[File_Name.size()-10-2]==_T('P')
-                                 && File_Name[File_Name.size()-10-3]==_T('I')
-                                 && File_Name[File_Name.size()-10-4]==_T('L')
-                                 && File_Name[File_Name.size()-10-5]==_T('C'))
+                                 && (File_Name[File_Name.size()-10-2]&(~0x20))==__T('P')
+                                 && (File_Name[File_Name.size()-10-3]&(~0x20))==__T('I')
+                                 && (File_Name[File_Name.size()-10-4]&(~0x20))==__T('L')
+                                 && (File_Name[File_Name.size()-10-5]&(~0x20))==__T('C'))
                                 {
                                     Ztring file=File_Name.substr(File_Name.size()-10, 6);
                                     Ztring MXF_File=File_Name;
                                     MXF_File.resize(MXF_File.size()-(10+1+4));
-                                    MXF_File+=_T("VIDEO");
+                                    MXF_File+=__T("VIDEO");
                                     MXF_File+=PathSeparator;
                                     MXF_File+=file;
-                                    MXF_File+=_T(".MXF");
-
-                                    //int8u ReadByHuman=Ztring(MediaInfo::Option_Static(_T("ReadByHuman_Get"))).To_int8u();
-                                    //MediaInfo::Option_Static(_T("ReadByHuman"), _T("0"));
-                                    MediaInfo_Internal MI;
-                                    if (MI.Open(MXF_File))
-                                    {
-                                        //MediaInfo::Option_Static(_T("ReadByHuman"), ReadByHuman?_T("1"):_T("0"));
-                                        Merge(MI, Stream_Video, 0, StreamPos_Last);
-                                        Fill(Stream_Video, StreamPos_Last, "Source", MXF_File);
-                                        File_Size_Total+=Ztring(MI.Get(Stream_General, 0, General_FileSize)).To_int64u();
-
-                                        //Commercial names
-                                        Fill(Stream_General, 0, General_Format_Commercial_IfAny, MI.Get(Stream_General, 0, General_Format_Commercial_IfAny), true);
-                                        Fill(Stream_General, 0, General_Format_Commercial, _T("P2 Clip ")+MI.Get(Stream_General, 0, General_Format_Commercial_IfAny), true);
-                                    }
-                                    //else
-                                    //    MediaInfo::Option_Static(_T("ReadByHuman"), ReadByHuman?_T("1"):_T("0"));
+                                    MXF_File+=__T(".MXF");
+
+                                    ReferenceFile.FileNames.push_back(MXF_File);
+                                    ReferenceFile.StreamKind=Stream_Video;
+                                    ReferenceFile.StreamID=ReferenceFiles->References.size()+1;
+                                    ReferenceFiles->References.push_back(ReferenceFile);
                                 }
                             #endif //defined(MEDIAINFO_MXF_YES)
                         }
                         else if (Field=="Audio")
                         {
-                            Stream_Prepare(Stream_Audio);
-
                             #if defined(MEDIAINFO_MXF_YES)
                                 if (File_Name.size()>10+1+4
                                  && File_Name[File_Name.size()-10-1]==PathSeparator
-                                 && File_Name[File_Name.size()-10-2]==_T('P')
-                                 && File_Name[File_Name.size()-10-3]==_T('I')
-                                 && File_Name[File_Name.size()-10-4]==_T('L')
-                                 && File_Name[File_Name.size()-10-5]==_T('C'))
+                                 && (File_Name[File_Name.size()-10-2]&(~0x20))==__T('P')
+                                 && (File_Name[File_Name.size()-10-3]&(~0x20))==__T('I')
+                                 && (File_Name[File_Name.size()-10-4]&(~0x20))==__T('L')
+                                 && (File_Name[File_Name.size()-10-5]&(~0x20))==__T('C'))
                                 {
                                     Ztring file=File_Name.substr(File_Name.size()-10, 6);
                                     Ztring MXF_File=File_Name;
                                     MXF_File.resize(MXF_File.size()-(10+1+4));
-                                    MXF_File+=_T("AUDIO");
+                                    MXF_File+=__T("AUDIO");
                                     MXF_File+=PathSeparator;
                                     MXF_File+=file;
-                                    Ztring Pos=Ztring::ToZtring(StreamPos_Last);
+                                    Ztring Pos=Ztring::ToZtring(Audio_Count);
                                     if (Pos.size()<2)
-                                        Pos.insert(0, 1, _T('0'));
+                                        Pos.insert(0, 1, __T('0'));
                                     MXF_File+=Pos;
-                                    MXF_File+=_T(".MXF");
-
-                                    //int8u ReadByHuman=Ztring(MediaInfo::Option_Static(_T("ReadByHuman_Get"))).To_int8u();
-                                    //MediaInfo::Option_Static(_T("ReadByHuman"), _T("0"));
-                                    MediaInfo_Internal MI;
-                                    if (MI.Open(MXF_File))
-                                    {
-                                        //MediaInfo::Option_Static(_T("ReadByHuman"), ReadByHuman?_T("1"):_T("0"));
-                                        Merge(MI, Stream_Audio, 0, StreamPos_Last);
-                                        Fill(Stream_Audio, StreamPos_Last, "Source", MXF_File);
-                                        File_Size_Total+=Ztring(MI.Get(Stream_General, 0, General_FileSize)).To_int64u();
-                                    }
-                                    //else
-                                    //    MediaInfo::Option_Static(_T("ReadByHuman"), ReadByHuman?_T("1"):_T("0"));
+                                    MXF_File+=__T(".MXF");
+
+                                    File__ReferenceFilesHelper::reference ReferenceFile;
+                                    ReferenceFile.FileNames.push_back(MXF_File);
+                                    ReferenceFile.StreamKind=Stream_Audio;
+                                    ReferenceFile.StreamID=ReferenceFiles->References.size()+1;
+                                    ReferenceFiles->References.push_back(ReferenceFile);
+
+                                    Audio_Count++;
                                 }
                             #endif //defined(MEDIAINFO_MXF_YES)
                         }
 
                         Track=Track->NextSiblingElement();
                     }
-
-                    if (File_Size_Total!=File_Size)
-                        Fill(Stream_General, 0, General_FileSize, File_Size_Total, 10, true);
                 }
 
                 //ClipMetadata
-                TiXmlElement* ClipMetadata=ClipContent->FirstChildElement("ClipMetadata");
+                XMLElement* ClipMetadata=ClipContent->FirstChildElement("ClipMetadata");
                 if (ClipMetadata)
                 {
-                    TiXmlElement* Access=ClipMetadata->FirstChildElement("Access");
+                    XMLElement* Access=ClipMetadata->FirstChildElement("Access");
                     if (Access)
                     {
                         //CreationDate
@@ -237,12 +267,12 @@
                         if (ChildElement)
                         {
                             Ztring Content=ChildElement->GetText();
-                            if (Content.size()>=11 && Content[10]==_T('T'))
-                                Content[10]=_T(' ');
-                            if (Content.find(_T("+00:00"))!=string::npos)
+                            if (Content.size()>=11 && Content[10]==__T('T'))
+                                Content[10]=__T(' ');
+                            if (Content.find(__T("+00:00"))!=string::npos)
                             {
                                 Content.resize(10+1+8);
-                                Content.insert(0, _T("UTC "));
+                                Content.insert(0, __T("UTC "));
                             }
                             Fill(Stream_General, 0, General_Recorded_Date, Content);
                         }
@@ -252,28 +282,28 @@
                         if (ChildElement)
                         {
                             Ztring Content=ChildElement->GetText();
-                            if (Content.size()>=11 && Content[10]==_T('T'))
-                                Content[10]=_T(' ');
-                            if (Content.find(_T("+00:00"))!=string::npos)
+                            if (Content.size()>=11 && Content[10]==__T('T'))
+                                Content[10]=__T(' ');
+                            if (Content.find(__T("+00:00"))!=string::npos)
                             {
                                 Content.resize(10+1+8);
-                                Content.insert(0, _T("UTC "));
+                                Content.insert(0, __T("UTC "));
                             }
                             Fill(Stream_General, 0, General_Tagged_Date, Content);
                         }
                     }
 
-                    TiXmlElement* Device=ClipMetadata->FirstChildElement("Device");
+                    XMLElement* Device=ClipMetadata->FirstChildElement("Device");
                     if (Device)
                     {
                         //Manufacturer+ModelName
-                        TiXmlElement* Manufacturer=Device->FirstChildElement("Manufacturer");
-                        TiXmlElement* ModelName=Device->FirstChildElement("ModelName");
+                        XMLElement* Manufacturer=Device->FirstChildElement("Manufacturer");
+                        XMLElement* ModelName=Device->FirstChildElement("ModelName");
                         if (Manufacturer && ModelName)
                             Fill(Stream_General, 0, General_Encoded_Application, string(Manufacturer->GetText())+" "+ModelName->GetText());
                     }
 
-                    TiXmlElement* Shoot=ClipMetadata->FirstChildElement("Shoot");
+                    XMLElement* Shoot=ClipMetadata->FirstChildElement("Shoot");
                     if (Shoot)
                     {
                         //StartDate
@@ -281,12 +311,12 @@
                         if (ChildElement)
                         {
                             Ztring Content=ChildElement->GetText();
-                            if (Content.size()>=11 && Content[10]==_T('T'))
-                                Content[10]=_T(' ');
-                            if (Content.find(_T("+00:00"))!=string::npos)
+                            if (Content.size()>=11 && Content[10]==__T('T'))
+                                Content[10]=__T(' ');
+                            if (Content.find(__T("+00:00"))!=string::npos)
                             {
                                 Content.resize(10+1+8);
-                                Content.insert(0, _T("UTC "));
+                                Content.insert(0, __T("UTC "));
                             }
                             Fill(Stream_General, 0, General_Duration_Start, Content);
                         }
@@ -296,29 +326,29 @@
                         if (ChildElement)
                         {
                             Ztring Content=ChildElement->GetText();
-                            if (Content.size()>=11 && Content[10]==_T('T'))
-                                Content[10]=_T(' ');
-                            if (Content.find(_T("+00:00"))!=string::npos)
+                            if (Content.size()>=11 && Content[10]==__T('T'))
+                                Content[10]=__T(' ');
+                            if (Content.find(__T("+00:00"))!=string::npos)
                             {
                                 Content.resize(10+1+8);
-                                Content.insert(0, _T("UTC "));
+                                Content.insert(0, __T("UTC "));
                             }
                             Fill(Stream_General, 0, General_Duration_End, Content);
                         }
 
                         //Location
-                        TiXmlElement* Location=Shoot->FirstChildElement("Location");
+                        XMLElement* Location=Shoot->FirstChildElement("Location");
                         if (Location)
                         {
                             //Longitude+Latitude
-                            TiXmlElement* Longitude=Location->FirstChildElement("Longitude");
-                            TiXmlElement* Latitude=Location->FirstChildElement("Latitude");
+                            XMLElement* Longitude=Location->FirstChildElement("Longitude");
+                            XMLElement* Latitude=Location->FirstChildElement("Latitude");
                             if (Longitude && Latitude)
                                 Fill(Stream_General, 0, General_Recorded_Location, string(Latitude->GetText())+", "+Longitude->GetText());
                         }
                     }
 
-                    TiXmlElement* Scenario=ClipMetadata->FirstChildElement("Scenario");
+                    XMLElement* Scenario=ClipMetadata->FirstChildElement("Scenario");
                     if (Scenario)
                     {
                         //ProgramName
@@ -337,7 +367,7 @@
                             Fill(Stream_General, 0, "Take Number", ChildElement->GetText());
                     }
 
-                    TiXmlElement* News=ClipMetadata->FirstChildElement("News");
+                    XMLElement* News=ClipMetadata->FirstChildElement("News");
                     if (News)
                     {
                         //Reporter
@@ -364,11 +394,6 @@
             return false;
         }
     }
-    else
-    {
-        Reject("P2_Clip");
-        return false;
-    }
 
     //All should be OK...
     return true;
@@ -377,3 +402,4 @@
 } //NameSpace
 
 #endif //MEDIAINFO_P2_YES
+

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_P2_Clip.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_P2_Clip.h Changed

@@ -1,17 +1,17 @@
 // File_P2_Clip - Info for P2 Clip (XML) files
-// Copyright (C) 2010-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -28,20 +28,39 @@
 
 //---------------------------------------------------------------------------
 #include "MediaInfo/File__Analyze.h"
+#include <vector>
 //---------------------------------------------------------------------------
 
 namespace MediaInfoLib
 {
 
+class File__ReferenceFilesHelper;
+
 //***************************************************************************
 // Class File_P2_Clip
 //***************************************************************************
 
 class File_P2_Clip : public File__Analyze
 {
+public :
+    //Constructor/Destructor
+    File_P2_Clip();
+    ~File_P2_Clip();
+
 private :
+    //Streams management
+    void Streams_Finish ();
+
+    //Buffer - Global
+    #if MEDIAINFO_SEEK
+    size_t Read_Buffer_Seek (size_t Method, int64u Value, int64u ID);
+    #endif //MEDIAINFO_SEEK
+
     //Buffer - File header
     bool FileHeader_Begin();
+
+    //Temp
+    File__ReferenceFilesHelper*     ReferenceFiles;
 };
 
 } //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Riff.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Riff.cpp Changed

@@ -1,31 +1,35 @@
 // File_Riff - Info for RIFF files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #ifdef MEDIAINFO_RIFF_YES
 //---------------------------------------------------------------------------
 
@@ -49,6 +53,7 @@
 #if MEDIAINFO_EVENTS
     #include "MediaInfo/MediaInfo_Events.h"
 #endif //MEDIAINFO_EVENTS
+#include <ZenLib/File.h>
 #include <ZenLib/Utils.h>
 using namespace ZenLib;
 //---------------------------------------------------------------------------
@@ -62,6 +67,7 @@
 
 namespace Elements
 {
+    const int32u AIFF_SSND=0x53534E44;
     const int32u AVI_=0x41564920;
     const int32u AVI__hdlr_strl_strh_txts=0x74787473;
     const int32u FORM=0x464F524D;
@@ -91,10 +97,19 @@
     //Configuration
     #if MEDIAINFO_EVENTS
         ParserIDs[0]=MediaInfo_Parser_Riff;
-        StreamIDs_Width[0]=17;
+        StreamIDs_Width[0]=4;
     #endif //MEDIAINFO_EVENTS
+    #if MEDIAINFO_DEMUX
+        Demux_Level=2; //Container
+        Demux_EventWasSent_Accept_Specific=true;
+    #endif //MEDIAINFO_DEMUX
     DataMustAlwaysBeComplete=false;
 
+    //In/Out
+    #if defined(MEDIAINFO_ANCILLARY_YES)
+        Ancillary=NULL;
+    #endif //defined(MEDIAINFO_ANCILLARY_YES)
+
     //Data
     Interleaved0_1=0;
     Interleaved0_10=0;
@@ -104,7 +119,11 @@
     //Temp
     WAVE_data_Size=0xFFFFFFFF;
     WAVE_fact_samplesCount=0xFFFFFFFF;
-    Buffer_DataSizeToParse=0;
+    Buffer_DataToParse_Begin=(int64u)-1;
+    Buffer_DataToParse_End=0;
+    #if MEDIAINFO_DEMUX
+        AvgBytesPerSec=0;
+    #endif //!MEDIAINFO_DEMUX
     avih_FrameRate=0;
     avih_TotalFrame=0;
     dmlh_TotalFrame=0;
@@ -112,6 +131,7 @@
     movi_Size=0;
     TimeReference=(int64u)-1;
     SMV_BlockSize=0;
+    SamplesPerSec=0;
     stream_Count=0;
     rec__Present=false;
     NeedOldIndex=true;
@@ -119,17 +139,11 @@
     IsWave64=false;
     IsRIFF64=false;
     IsWaveBroken=false;
+    IsNotWordAligned=false;
+    IsNotWordAligned_Tested=false;
     SecondPass=false;
     DV_FromHeader=NULL;
-    #if defined(MEDIAINFO_GXF_YES)
-        rcrd_Parsers_Count=0;
-        #if defined(MEDIAINFO_CDP_YES)
-            Cdp_Data=NULL;
-        #endif //MEDIAINFO_CDP_YES
-        #if defined(MEDIAINFO_AFDBARDATA_YES)
-            Cdp_Data=NULL;
-        #endif //MEDIAINFO_AFDBARDATA_YES
-    #endif //MEDIAINFO_GXF_YES
+    Kind=Kind_None;
 
     //Pointers
     Stream_Structure_Temp=Stream_Structure.end();
@@ -141,12 +155,6 @@
     #ifdef MEDIAINFO_DVDIF_YES
         delete (File_DvDif*)DV_FromHeader; //DV_FromHeader=NULL
     #endif //MEDIAINFO_DVDIF_YES
-
-    #if defined(MEDIAINFO_GXF_YES)
-        for (size_t DataID=0; DataID<rcrd_Parsers.size(); DataID++)
-            for (size_t SecondaryDataID=0; SecondaryDataID<rcrd_Parsers[DataID].size(); SecondaryDataID++)
-                delete rcrd_Parsers[DataID][SecondaryDataID]; //rcrd_Parsers[DataID][SecondaryDataID]=NULL;
-    #endif //MEDIAINFO_GXF_YES
 }
 
 //***************************************************************************
@@ -156,6 +164,16 @@
 //---------------------------------------------------------------------------
 void File_Riff::Streams_Finish ()
 {
+    //Ancillary specific
+    #if defined(MEDIAINFO_ANCILLARY_YES)
+        if (Ancillary && (*Ancillary))
+        {
+            Finish(*Ancillary);
+            Merge(**Ancillary);
+            return;
+        }
+    #endif //defined(MEDIAINFO_ANCILLARY_YES)
+
     //Global
     if (IsRIFF64)
         Fill(Stream_General, 0, General_Format_Profile, "RF64");
@@ -173,10 +191,10 @@
             Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_StreamSize), Temp->second.StreamSize);
 
         //Parser specific
-        if (Temp->second.Parser)
+        if (Temp->second.Parsers.size()==1)
         {
             //Finalizing and Merging (except Video codec and 120 fps hack)
-            Temp->second.Parser->ShouldContinueParsing=false;
+            Temp->second.Parsers[0]->ShouldContinueParsing=false;
 
             //Hack - Before
             Ztring StreamSize, Codec_Temp;
@@ -185,8 +203,13 @@
             StreamSize=Retrieve(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_StreamSize)); //We want to keep the 4CC of AVI
 
             //Merging
-            Finish(Temp->second.Parser);
-            Merge(*Temp->second.Parser, StreamKind_Last, 0, StreamPos_Last);
+            if (Config->ParseSpeed<=1.0)
+            {
+                Fill(Temp->second.Parsers[0]);
+                Temp->second.Parsers[0]->Open_Buffer_Unsynch();
+            }
+            Finish(Temp->second.Parsers[0]);
+            Merge(*Temp->second.Parsers[0], StreamKind_Last, 0, StreamPos_Last);
             Fill(StreamKind_Last, StreamPos_Last, General_ID, ((Temp->first>>24)-'0')*10+(((Temp->first>>16)&0xFF)-'0'));
 
             //Hacks - After
@@ -200,7 +223,7 @@
                 const Ztring &FrameRate=Retrieve(Stream_Video, StreamPos_Last, Video_FrameRate);
                 if (FrameRate.To_int32u()==120)
                 {
-                    Fill(Stream_Video, StreamPos_Last, Video_FrameRate_String, MediaInfoLib::Config.Language_Get(FrameRate+_T(" (24/30)"), _T(" fps")), true);
+                    Fill(Stream_Video, StreamPos_Last, Video_FrameRate_String, MediaInfoLib::Config.Language_Get(FrameRate+__T(" (24/30)"), __T(" fps")), true);
                     Fill(Stream_Video, StreamPos_Last, Video_FrameRate_Minimum, 24, 10, true);
                     Fill(Stream_Video, StreamPos_Last, Video_FrameRate_Maximum, 30, 10, true);
                     Fill(Stream_Video, StreamPos_Last, Video_FrameRate_Mode, "VFR");
@@ -211,33 +234,33 @@
             if (StreamKind_Last==Stream_Audio && Count_Get(Stream_Video)>0) //Only if this is not a WAV file
             {
                 Fill(Stream_Audio, StreamPos_Last, Audio_Alignment, Temp->second.ChunksAreComplete?"Aligned":"Split");
-                Fill(Stream_Audio, StreamPos_Last, Audio_Alignment_String, MediaInfoLib::Config.Language_Get(Temp->second.ChunksAreComplete?_T("Alignment_Aligned"):_T("Alignment_Split")));
+                Fill(Stream_Audio, StreamPos_Last, Audio_Alignment_String, MediaInfoLib::Config.Language_Get(Temp->second.ChunksAreComplete?__T("Alignment_Aligned"):__T("Alignment_Split")));
             }
 
             //Delay
-            if (StreamKind_Last==Stream_Audio && Count_Get(Stream_Video)==1 && Temp->second.Rate!=0 && Temp->second.Parser->Status[IsAccepted])
+            if (StreamKind_Last==Stream_Audio && Count_Get(Stream_Video)==1 && Temp->second.Rate!=0 && Temp->second.Parsers[0]->Status[IsAccepted])
             {
                 float Delay=0;
                 bool Delay_IsValid=false;
 
-                     if (Temp->second.Parser->Buffer_TotalBytes_FirstSynched==0)
+                     if (Temp->second.Parsers[0]->Buffer_TotalBytes_FirstSynched==0)
                 {
                     Delay=0;
                     Delay_IsValid=true;
                 }
                 else if (Temp->second.Rate!=0)
                 {
-                    Delay=((float)Temp->second.Parser->Buffer_TotalBytes_FirstSynched)*1000/Temp->second.Rate;
+                    Delay=((float)Temp->second.Parsers[0]->Buffer_TotalBytes_FirstSynched)*1000/Temp->second.Rate;
                     Delay_IsValid=true;
                 }
-                else if (Temp->second.Parser->Retrieve(Stream_Audio, 0, Audio_BitRate).To_int64u()!=0)
+                else if (Temp->second.Parsers[0]->Retrieve(Stream_Audio, 0, Audio_BitRate).To_int64u()!=0)
                 {
-                    Delay=((float)Temp->second.Parser->Buffer_TotalBytes_FirstSynched)*1000/Temp->second.Parser->Retrieve(Stream_Audio, 0, Audio_BitRate).To_int64u();
+                    Delay=((float)Temp->second.Parsers[0]->Buffer_TotalBytes_FirstSynched)*1000/Temp->second.Parsers[0]->Retrieve(Stream_Audio, 0, Audio_BitRate).To_int64u();
                     Delay_IsValid=true;
                 }
-                else if (Temp->second.Parser->Retrieve(Stream_Audio, 0, Audio_BitRate_Nominal).To_int64u()!=0)
+                else if (Temp->second.Parsers[0]->Retrieve(Stream_Audio, 0, Audio_BitRate_Nominal).To_int64u()!=0)
                 {
-                    Delay=((float)Temp->second.Parser->Buffer_TotalBytes_FirstSynched)*1000/Temp->second.Parser->Retrieve(Stream_Audio, 0, Audio_BitRate_Nominal).To_int64u();
+                    Delay=((float)Temp->second.Parsers[0]->Buffer_TotalBytes_FirstSynched)*1000/Temp->second.Parsers[0]->Retrieve(Stream_Audio, 0, Audio_BitRate_Nominal).To_int64u();
                     Delay_IsValid=true;
                 }
 
@@ -245,55 +268,42 @@
                 {
                     Delay+=((float)Temp->second.Start)*1000/Temp->second.Rate;
                     Fill(Stream_Audio, StreamPos_Last, Audio_Delay, Delay, 0, true);
-                    Fill(Stream_Video, 0, Video_Delay, 0, 10, true);
+                    Fill(Stream_Audio, StreamPos_Last, Audio_Delay_Source, "Stream", Unlimited, true, true);
+                    for (size_t StreamPos=0; StreamPos<Count_Get(Stream_Video); StreamPos++)
+                        Fill(Stream_Video, StreamPos, Video_Delay, 0, 10, true);
                 }
             }
 
             //Special case: AAC
             if (StreamKind_Last==Stream_Audio
-             && (Retrieve(Stream_Audio, StreamPos_Last, Audio_Format)==_T("AAC")
-              || Retrieve(Stream_Audio, StreamPos_Last, Audio_Format)==_T("MPEG Audio")
-              || Retrieve(Stream_Audio, StreamPos_Last, Audio_Format)==_T("Vorbis")))
-                Clear(Stream_Audio, StreamPos_Last, Audio_Resolution); //Resolution is not valid for AAC / MPEG Audio / Vorbis
+             && (Retrieve(Stream_Audio, StreamPos_Last, Audio_Format)==__T("AAC")
+              || Retrieve(Stream_Audio, StreamPos_Last, Audio_Format)==__T("MPEG Audio")
+              || Retrieve(Stream_Audio, StreamPos_Last, Audio_Format)==__T("Vorbis")))
+                Clear(Stream_Audio, StreamPos_Last, Audio_BitDepth); //Resolution is not valid for AAC / MPEG Audio / Vorbis
 
             //Format specific
-            #if defined(MEDIAINFO_MPEG4V_YES)
-                if (StreamKind_Last==Stream_Video && MediaInfoLib::Config.Codec_Get(Ztring().From_CC4(Temp->second.Compression), InfoCodec_KindofCodec).find(_T("MPEG-4V"))==0)
-                {
-                    if (((File_Mpeg4v*)Temp->second.Parser)->Frame_Count_InThisBlock>1)
-                    {
-                        Fill(Stream_Video, StreamPos_Last, Video_MuxingMode, MediaInfoLib::Config.Language_Get("MuxingMode_PackedBitstream"));
-                        Fill(Stream_Video, StreamPos_Last, Video_Codec_Settings, "Packed Bitstream");
-                        Fill(Stream_Video, StreamPos_Last, Video_Codec_Settings_PacketBitStream, "Yes");
-                    }
-                    else
-                    {
-                        Fill(Stream_Video, StreamPos_Last, Video_Codec_Settings_PacketBitStream, "No");
-                    }
-                }
-            #endif
             #if defined(MEDIAINFO_DVDIF_YES)
-                if (StreamKind_Last==Stream_Video && (MediaInfoLib::Config.Codec_Get(Ztring().From_CC4(Temp->second.Compression), InfoCodec_KindofCodec).find(_T("DV"))==0
-                                                   || Retrieve(Stream_Video, StreamPos_Last, Video_Format)==_T("DV")
-                                                   || Retrieve(Stream_Video, StreamPos_Last, Video_Codec)==_T("DV")))
+                if (StreamKind_Last==Stream_Video && (MediaInfoLib::Config.Codec_Get(Ztring().From_CC4(Temp->second.Compression), InfoCodec_KindofCodec).find(__T("DV"))==0
+                                                   || Retrieve(Stream_Video, StreamPos_Last, Video_Format)==__T("DV")
+                                                   || Retrieve(Stream_Video, StreamPos_Last, Video_Codec)==__T("DV")))
                 {
                     if (Retrieve(Stream_General, 0, General_Recorded_Date).empty())
-                        Fill(Stream_General, 0, General_Recorded_Date, Temp->second.Parser->Retrieve(Stream_General, 0, General_Recorded_Date));
+                        Fill(Stream_General, 0, General_Recorded_Date, Temp->second.Parsers[0]->Retrieve(Stream_General, 0, General_Recorded_Date));
 
                     //Video and Audio are together
-                    size_t Audio_Count=Temp->second.Parser->Count_Get(Stream_Audio);
+                    size_t Audio_Count=Temp->second.Parsers[0]->Count_Get(Stream_Audio);
                     for (size_t Audio_Pos=0; Audio_Pos<Audio_Count; Audio_Pos++)
                     {
                         Fill_Flush();
                         Stream_Prepare(Stream_Audio);
                         size_t Pos=Count_Get(Stream_Audio)-1;
-                        Merge(*Temp->second.Parser, Stream_Audio, Audio_Pos, StreamPos_Last);
+                        Merge(*Temp->second.Parsers[0], Stream_Audio, Audio_Pos, StreamPos_Last);
                         Fill(Stream_Audio, Pos, Audio_MuxingMode, "DV");
                         Fill(Stream_Audio, Pos, Audio_Duration, Retrieve(Stream_Video, Temp->second.StreamPos, Video_Duration));
-                        Fill(Stream_Audio, Pos, "MuxingMode_MoreInfo", _T("Muxed in Video #")+Ztring().From_Number(Temp->second.StreamPos+1));
-                        Fill(Stream_Audio, Pos, Audio_StreamSize, "0"); //Included in the DV stream size
+                        Fill(Stream_Audio, Pos, "MuxingMode_MoreInfo", __T("Muxed in Video #")+Ztring().From_Number(Temp->second.StreamPos+1));
+                        Fill(Stream_Audio, Pos, Audio_StreamSize_Encoded, 0); //Included in the DV stream size
                         Ztring ID=Retrieve(Stream_Audio, Pos, Audio_ID);
-                        Fill(Stream_Audio, Pos, Audio_ID, Retrieve(Stream_Video, Temp->second.StreamPos, Video_ID)+_T("-")+ID, true);
+                        Fill(Stream_Audio, Pos, Audio_ID, Retrieve(Stream_Video, Temp->second.StreamPos, Video_ID)+__T("-")+ID, true);
                     }
 
                     StreamKind_Last=Stream_Video;
@@ -307,39 +317,46 @@
         //Duration
         if (Temp->second.PacketCount>0)
         {
-            if (StreamKind_Last==Stream_Video)
+            if (StreamKind_Last==Stream_Video) // && Retrieve(Stream_Video, StreamPos_Last, Video_Duration).empty())
             {
                 //Duration in case it is missing from header (malformed header...)
-                float32 FrameRate=Retrieve(Stream_Video, StreamPos_Last, Video_FrameRate).To_float32();
-                if (FrameRate>0)
-                    Fill(Stream_Video, StreamPos_Last, Video_Duration, Temp->second.PacketCount*1000/FrameRate, 0, true);
+                if (Temp->second.indx_Duration && Temp->second.Rate)
+                    Fill(Stream_Video, StreamPos_Last, Video_Duration, ((float64)Temp->second.indx_Duration)*1000*Temp->second.Scale/Temp->second.Rate, 0, true);
+                else
+                    Fill(Stream_Video, StreamPos_Last, Video_FrameCount, Temp->second.PacketCount, 10, true);
             }
             if (StreamKind_Last==Stream_Audio)
             {
                 //Duration in case it is missing from header (malformed header...)
                 int64u SamplingCount=0;
                 #if defined(MEDIAINFO_MPEGA_YES)
-                if (Retrieve(Stream_Audio, StreamPos_Last, Audio_Format)==_T("MPEG Audio"))
+                if (Retrieve(Stream_Audio, StreamPos_Last, Audio_Format)==__T("MPEG Audio"))
                 {
-                    if (Temp->second.Parser && Temp->second.PacketPos==((File_Mpega*)Temp->second.Parser)->Frame_Count_Valid) //Only for stream with one frame per chunk
+                    if (Temp->second.Parsers[0] && Temp->second.PacketPos==((File_Mpega*)Temp->second.Parsers[0])->Frame_Count_Valid) //Only for stream with one frame per chunk
                     {
-                        if (Retrieve(Stream_Audio, StreamPos_Last, Audio_Format_Profile)==_T("Layer 1"))
-                            SamplingCount=Temp->second.PacketCount*384;  //Layer 1
+                        Ztring Version=Retrieve(Stream_Audio, StreamPos_Last, Audio_Format_Version);
+                        Ztring Layer=Retrieve(Stream_Audio, StreamPos_Last, Audio_Format_Profile);
+                        if (Version==__T("Version 1") && Layer==__T("Layer 1"))
+                            SamplingCount=Temp->second.PacketCount*384;  //MPEG-1 Layer 1
+                        else if ((Version==__T("Version 2") || Version==__T("Version 2.5")) && Layer==__T("Layer 1"))
+                            SamplingCount=Temp->second.PacketCount*192;  //MPEG-2 or 2.5 Layer 1
+                        else if ((Version==__T("Version 2") || Version==__T("Version 2.5")) && Layer==__T("Layer 3"))
+                            SamplingCount=Temp->second.PacketCount*576;  //MPEG-2 or 2.5 Layer 3
                         else
-                            SamplingCount=Temp->second.PacketCount*1152; //Layer 2 and 3
+                            SamplingCount=Temp->second.PacketCount*1152;
                     }
                 }
                 #endif
-                if (Retrieve(Stream_Audio, StreamPos_Last, Audio_Format)==_T("PCM"))
+                if (Retrieve(Stream_Audio, StreamPos_Last, Audio_Format)==__T("PCM"))
                 {
-                    int64u Resolution=Retrieve(Stream_Audio, StreamPos_Last, Audio_Resolution).To_int64u();
+                    int64u Resolution=Retrieve(Stream_Audio, StreamPos_Last, Audio_BitDepth).To_int64u();
                     int64u Channels=Retrieve(Stream_Audio, StreamPos_Last, Audio_Channel_s_).To_int64u();
                     if (Resolution>0 && Channels>0)
                         SamplingCount=Temp->second.StreamSize*8/Resolution/Channels;
                 }
-                if (Retrieve(Stream_Audio, StreamPos_Last, Audio_Format)==_T("ADPCM"))
+                if (Retrieve(Stream_Audio, StreamPos_Last, Audio_Format)==__T("ADPCM"))
                 {
-                    int64u Resolution=Retrieve(Stream_Audio, StreamPos_Last, Audio_Resolution).To_int64u();
+                    int64u Resolution=Retrieve(Stream_Audio, StreamPos_Last, Audio_BitDepth).To_int64u();
                     int64u Channels=Retrieve(Stream_Audio, StreamPos_Last, Audio_Channel_s_).To_int64u();
                     if (Resolution>0 && Channels>0)
                         SamplingCount=(int64u)(Temp->second.StreamSize*8/Resolution/Channels*0.98); //0.98 is not precise!
@@ -357,6 +374,10 @@
                 float32 SamplingRate=Retrieve(Stream_Audio, StreamPos_Last, Audio_SamplingRate).To_float32();
                 if (SamplingCount>0 && SamplingRate>0)
                     Fill(Stream_Audio, StreamPos_Last, Audio_Duration, SamplingCount*1000/SamplingRate, 0, true);
+                else if (Temp->second.indx_Duration && Temp->second.Rate)
+                    Fill(Stream_Audio, StreamPos_Last, Audio_Duration, ((float64)Temp->second.indx_Duration)*1000*Temp->second.Scale/Temp->second.Rate, 0, true);
+                else if (Temp->second.Rate && Temp->second.Scale!=1) //Note: some files with Scale==1 are buggy
+                    Fill(Stream_Audio, StreamPos_Last, Audio_Duration, ((float64)Temp->second.Length)*1000*Temp->second.Scale/Temp->second.Rate, 0, true);
 
                 //Interleave
                 if (Stream[0x30300000].PacketCount && Temp->second.PacketCount)
@@ -367,18 +388,18 @@
                         Fill(Stream_Audio, StreamPos_Last, "Interleave_Duration", (float)Stream[0x30300000].PacketCount/Temp->second.PacketCount*1000/Retrieve(Stream_Video, 0, Video_FrameRate).To_float32(), 0);
                         Ztring Interleave_Duration_String;
                         Interleave_Duration_String+=Retrieve(Stream_Audio, StreamPos_Last, "Interleave_Duration");
-                        Interleave_Duration_String+=_T(" ");
-                        Interleave_Duration_String+=MediaInfoLib::Config.Language_Get(_T("ms"));
+                        Interleave_Duration_String+=__T(" ");
+                        Interleave_Duration_String+=MediaInfoLib::Config.Language_Get(__T("ms"));
                         if (!Retrieve(Stream_Audio, StreamPos_Last, "Interleave_VideoFrames").empty())
                         {
-                            Interleave_Duration_String+=_T(" (");
-                            Interleave_Duration_String+=MediaInfoLib::Config.Language_Get(Retrieve(Stream_Audio, StreamPos_Last, "Interleave_VideoFrames"), _T(" video frames"));
-                            Interleave_Duration_String+=_T(")");
+                            Interleave_Duration_String+=__T(" (");
+                            Interleave_Duration_String+=MediaInfoLib::Config.Language_Get(Retrieve(Stream_Audio, StreamPos_Last, "Interleave_VideoFrames"), __T(" video frames"));
+                            Interleave_Duration_String+=__T(")");
                         }
                         Fill(Stream_Audio, StreamPos_Last, "Interleave_Duration/String", Interleave_Duration_String);
                     }
                     int64u Audio_FirstBytes=0;
-                    for (std::map<int64u, stream_structure>::iterator Stream_Structure_Temp=Stream_Structure.begin(); Stream_Structure_Temp!=Stream_Structure.end(); Stream_Structure_Temp++)
+                    for (std::map<int64u, stream_structure>::iterator Stream_Structure_Temp=Stream_Structure.begin(); Stream_Structure_Temp!=Stream_Structure.end(); ++Stream_Structure_Temp)
                     {
                         if (Stream_Structure_Temp->second.Name==0x30300000)
                             break;
@@ -388,13 +409,30 @@
                     if (Audio_FirstBytes && Retrieve(Stream_Audio, StreamPos_Last, Audio_BitRate).To_int32u())
                     {
                         Fill(Stream_Audio, StreamPos_Last, "Interleave_Preload", Audio_FirstBytes*1000/Temp->second.AvgBytesPerSec);
-                        Fill(Stream_Audio, StreamPos_Last, "Interleave_Preload/String", Retrieve(Stream_Audio, StreamPos_Last, "Interleave_Preload")+_T(" ms"));
+                        Fill(Stream_Audio, StreamPos_Last, "Interleave_Preload/String", Retrieve(Stream_Audio, StreamPos_Last, "Interleave_Preload")+__T(" ")+MediaInfoLib::Config.Language_Get(__T("ms")));
                     }
                 }
             }
+
+            //Source duration
+            if (Temp->second.PacketCount && Temp->second.Length!=Temp->second.PacketCount)
+            {
+                if (StreamKind_Last==Stream_Video && Temp->second.Rate)
+                    Fill(Stream_Video, StreamPos_Last, "Source_Duration", ((float64)Temp->second.PacketCount)*1000*Temp->second.Scale/Temp->second.Rate, 0);
+                if (StreamKind_Last==Stream_Audio && Temp->second.Rate)
+                {
+                    float64 Duration_Source=((float64)Temp->second.StreamSize)*1000/Temp->second.AvgBytesPerSec;
+                    float64 Duration_Header=Retrieve(Stream_Audio, StreamPos_Last, Audio_Duration).To_float64();
+                    float64 Difference=Duration_Source-Duration_Header;
+                    if (Temp->second.Scale!=1 && float64_int64s(Duration_Header/Duration_Source)==Temp->second.Scale)
+                        Fill(Stream_Audio, StreamPos_Last, Audio_Duration, Duration_Source, 0, true); //Found 1 stream with Scale not being right
+                    else if (Difference<-2 || Difference>2) //+/- 2 ms
+                        Fill(Stream_Audio, StreamPos_Last, "Source_Duration", Duration_Source, 0);
+                }
+            }
         }
 
-        Temp++;
+        ++Temp;
     }
 
     //Some work on the first video stream
@@ -402,7 +440,8 @@
     {
         //ODML
         if (dmlh_TotalFrame!=0 && Retrieve(Stream_Video, 0, Video_Duration).empty())
-            Fill(Stream_Video, 0, Video_FrameCount, dmlh_TotalFrame, 10, true);
+            for (size_t StreamPos=0; StreamPos<Count_Get(Stream_Video); StreamPos++)
+                Fill(Stream_Video, StreamPos, Video_FrameCount, dmlh_TotalFrame, 10, true);
     }
 
     //Rec
@@ -411,8 +450,23 @@
 
     //Interleaved
     if (Interleaved0_1 && Interleaved0_10 && Interleaved1_1 && Interleaved1_10)
-        Fill(Stream_General, 0, General_Interleaved, (Interleaved0_1<Interleaved1_1 && Interleaved0_10>Interleaved1_1
-                                                   || Interleaved1_1<Interleaved0_1 && Interleaved1_10>Interleaved0_1)?"Yes":"No");
+        Fill(Stream_General, 0, General_Interleaved, ((Interleaved0_1<Interleaved1_1 && Interleaved0_10>Interleaved1_1)
+                                                   || (Interleaved1_1<Interleaved0_1 && Interleaved1_10>Interleaved0_1))?"Yes":"No");
+
+    //Time codes
+    TimeCode_Fill(__T("ISMP"), INFO_ISMP);
+    TimeCode_Fill(__T("tc_A"), Tdat_tc_A);
+    TimeCode_Fill(__T("tc_O"), Tdat_tc_O);
+
+    //MD5
+    size_t Pos=0;
+    for (size_t StreamKind=Stream_General+1; StreamKind<Stream_Max; StreamKind++)
+        for (size_t StreamPos=0; StreamPos<Count_Get((stream_t)StreamKind); StreamPos++)
+            if (Pos<MD5s.size())
+            {
+                Fill((stream_t)StreamKind, StreamPos, "MD5", MD5s[Pos]);
+                Pos++;
+            }
 
     //Purge what is not needed anymore
     if (!File_Name.empty()) //Only if this is not a buffer, with buffer we can have more data
@@ -429,24 +483,24 @@
              if (!Retrieve(Stream_Video, 0, Video_Format_Commercial_IfAny).empty())
         {
             Fill(Stream_General, 0, General_Format_Commercial_IfAny, Retrieve(Stream_Video, 0, Video_Format_Commercial_IfAny));
-            Fill(Stream_General, 0, General_Format_Commercial, _T("AVI ")+Retrieve(Stream_Video, 0, Video_Format_Commercial_IfAny));
+            Fill(Stream_General, 0, General_Format_Commercial, __T("AVI ")+Retrieve(Stream_Video, 0, Video_Format_Commercial_IfAny));
         }
-        else if (Retrieve(Stream_Video, 0, Video_Format)==_T("DV"))
+        else if (Retrieve(Stream_Video, 0, Video_Format)==__T("DV"))
         {
             Fill(Stream_General, 0, General_Format_Commercial_IfAny, "DV");
             Fill(Stream_General, 0, General_Format_Commercial, "AVI DV");
         }
-        else if (Retrieve(Stream_Video, 0, Video_Format)==_T("MPEG Video") && Retrieve(Stream_Video, 0, Video_Format_Settings_GOP)==_T("N=1") && Retrieve(Stream_Video, 0, Video_Colorimetry)==_T("4:2:2") && Retrieve(Stream_Video, 0, Video_BitRate)==_T("30000000"))
+        else if (Retrieve(Stream_Video, 0, Video_Format)==__T("MPEG Video") && Retrieve(Stream_Video, 0, Video_Format_Settings_GOP)==__T("N=1") && Retrieve(Stream_Video, 0, Video_Colorimetry)==__T("4:2:2") && Retrieve(Stream_Video, 0, Video_BitRate)==__T("30000000"))
         {
             Fill(Stream_General, 0, General_Format_Commercial_IfAny, "MPEG IMX 30");
             Fill(Stream_Video, 0, Video_Format_Commercial_IfAny, "MPEG IMX 30");
         }
-        else if (Retrieve(Stream_Video, 0, Video_Format)==_T("MPEG Video") && Retrieve(Stream_Video, 0, Video_Format_Settings_GOP)==_T("N=1") && Retrieve(Stream_Video, 0, Video_Colorimetry)==_T("4:2:2") && Retrieve(Stream_Video, 0, Video_BitRate)==_T("40000000"))
+        else if (Retrieve(Stream_Video, 0, Video_Format)==__T("MPEG Video") && Retrieve(Stream_Video, 0, Video_Format_Settings_GOP)==__T("N=1") && Retrieve(Stream_Video, 0, Video_Colorimetry)==__T("4:2:2") && Retrieve(Stream_Video, 0, Video_BitRate)==__T("40000000"))
         {
             Fill(Stream_General, 0, General_Format_Commercial_IfAny, "MPEG IMX 40");
             Fill(Stream_Video, 0, Video_Format_Commercial_IfAny, "MPEG IMX 40");
         }
-        else if (Retrieve(Stream_Video, 0, Video_Format)==_T("MPEG Video") && Retrieve(Stream_Video, 0, Video_Format_Settings_GOP)==_T("N=1") && Retrieve(Stream_Video, 0, Video_Colorimetry)==_T("4:2:2") && Retrieve(Stream_Video, 0, Video_BitRate)==_T("50000000"))
+        else if (Retrieve(Stream_Video, 0, Video_Format)==__T("MPEG Video") && Retrieve(Stream_Video, 0, Video_Format_Settings_GOP)==__T("N=1") && Retrieve(Stream_Video, 0, Video_Colorimetry)==__T("4:2:2") && Retrieve(Stream_Video, 0, Video_BitRate)==__T("50000000"))
         {
             Fill(Stream_General, 0, General_Format_Commercial_IfAny, "MPEG IMX 50");
             Fill(Stream_Video, 0, Video_Format_Commercial_IfAny, "MPEG IMX 50");
@@ -459,31 +513,164 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
-void File_Riff::Read_Buffer_Continue()
+void File_Riff::Read_Buffer_Init()
 {
-    if (Buffer_DataSizeToParse)
+    #if MEDIAINFO_DEMUX
+         Demux_UnpacketizeContainer=Config->Demux_Unpacketize_Get();
+         Demux_Rate=Config->Demux_Rate_Get();
+         if (Demux_Rate==0)
+             Demux_Rate=25; //Default value
+    #endif //MEDIAINFO_DEMUX
+}
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_SEEK
+size_t File_Riff::Read_Buffer_Seek (size_t Method, int64u Value, int64u /*ID*/)
+{
+    //Only Wave and AIFF
+    switch (Kind)
     {
-        if (Buffer_Size<=Buffer_DataSizeToParse)
-        {
+        case Kind_Wave :
+        case Kind_Aiff :
+                         break;
+        default        : return (size_t)-1;
+    }
+
+    //Parsing
+    switch (Method)
+    {
+        case 0  :
+                    if (Value<Buffer_DataToParse_Begin)
+                        Value=Buffer_DataToParse_Begin;
+                    if (Value>Buffer_DataToParse_End)
+                        Value=Buffer_DataToParse_End;
+                    GoTo(Value);
+                    Open_Buffer_Unsynch();
+                    return 1;
+        case 1  :
+                    GoTo(Buffer_DataToParse_Begin+(Buffer_DataToParse_End-Buffer_DataToParse_Begin)*Value/10000);
+                    Open_Buffer_Unsynch();
+                    return 1;
+        case 2  :   //Timestamp
+                    {
+                    if (AvgBytesPerSec==0)
+                        return (size_t)-1;
+
+                    float64 ValueF=(float64)Value;
+                    ValueF/=1000000000; //Value is in ns
+                    ValueF*=AvgBytesPerSec;
+                    GoTo(Buffer_DataToParse_Begin+float64_int64s(ValueF));
+                    return 1;
+                    }
+        case 3  :   //FrameNumber
+                    {
+                    if (AvgBytesPerSec==0 || Demux_Rate==0 || BlockAlign==0)
+                        return (size_t)-1;
+
+                    float64 BytesPerFrame=AvgBytesPerSec/Demux_Rate;
+                    int64u StreamOffset=(int64u)(Value*BytesPerFrame);
+                    StreamOffset/=BlockAlign;
+                    StreamOffset*=BlockAlign;
+
+                    GoTo(Buffer_DataToParse_Begin+StreamOffset);
+                    return 1;
+                    }
+        default :   return (size_t)-1; //Not supported
+    }
+}
+#endif //MEDIAINFO_SEEK
+
+//---------------------------------------------------------------------------
+void File_Riff::Read_Buffer_Unsynched()
+{
+    if (IsSub)
+    {
+        while(Element_Level)
+            Element_End0();
+
+        #if defined(MEDIAINFO_ANCILLARY_YES)
+            //Ancillary specific
+            if (Ancillary && (*Ancillary))
+                (*Ancillary)->Open_Buffer_Unsynch();
+        #endif //defined(MEDIAINFO_ANCILLARY_YES)
+    }
+}
+
+//***************************************************************************
+// Buffer
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_Riff::Header_Begin()
+{
+    while (File_Offset+Buffer_Offset<Buffer_DataToParse_End)
+    {
+        #if MEDIAINFO_DEMUX
+            if (AvgBytesPerSec && Demux_Rate && BlockAlign)
+            {
+                float64 BytesPerFrame=((float64)AvgBytesPerSec)/Demux_Rate;
+                Frame_Count_NotParsedIncluded=float64_int64s(((float64)(File_Offset+Buffer_Offset-Buffer_DataToParse_Begin))/BytesPerFrame);
+                Element_Size=float64_int64s(BytesPerFrame*(Frame_Count_NotParsedIncluded+1));
+                Element_Size/=BlockAlign;
+                Element_Size*=BlockAlign;
+                Element_Size-=File_Offset+Buffer_Offset-Buffer_DataToParse_Begin;
+                FrameInfo.PTS=FrameInfo.DTS=float64_int64s(((float64)Frame_Count_NotParsedIncluded)*1000000000/Demux_Rate);
+                while (Element_Size && File_Offset+Buffer_Offset+Element_Size>Buffer_DataToParse_End)
+                    Element_Size-=BlockAlign;
+                if (Element_Size==0)
+                    Element_Size=BlockAlign;
+                if (Buffer_Offset+Element_Size>Buffer_Size)
+                    return false;
+            }
+            else
+        #endif //MEDIAINFO_DEMUX
+        if (File_Offset+Buffer_Size<=Buffer_DataToParse_End)
             Element_Size=Buffer_Size; //All the buffer is used
-            Buffer_DataSizeToParse-=Buffer_Size;
+        else
+        {
+            Element_Size=File_Offset+Buffer_Size-Buffer_DataToParse_End;
+            Buffer_DataToParse_End=0;
+        }
+
+        if (Buffer_Offset+(size_t)Element_Size>Buffer_Size)
+            return false;
+
+        Element_Begin0();
+        switch (Kind)
+        {
+            case Kind_Wave : WAVE_data_Continue(); break;
+            case Kind_Aiff : AIFF_SSND_Continue(); break;
+            case Kind_Rmp3 : RMP3_data_Continue(); break;
+            default        : AVI__movi_xxxx();
+        }
+
+        if (Config->ParseSpeed<1.0 && File_Offset+Buffer_Offset+Element_Offset-Buffer_DataToParse_Begin>=0x10000)
+        {
+            Buffer_Offset=(size_t)(Buffer_DataToParse_End-File_Offset);
+            if (Buffer_Offset<Buffer_Size)
+                Element_Size=Buffer_Size-Buffer_Offset;
+            else
+                Element_Size=0;
         }
         else
         {
-            Element_Size=Buffer_DataSizeToParse;
-            Buffer_DataSizeToParse=0;
+            Buffer_Offset+=(size_t)Element_Size;
+            Element_Size-=Element_Offset;
         }
+        Element_Offset=0;
+        Element_End0();
+
+        if (Buffer_Offset>=Buffer_Size)
+            return false;
 
-        Element_Begin();
-        AVI__movi_xxxx();
-        Element_Offset=Element_Size;
-        Element_End();
+        #if MEDIAINFO_DEMUX
+            if (Config->Demux_EventWasSent)
+                return false;
+        #endif //MEDIAINFO_DEMUX
     }
-}
 
-//***************************************************************************
-// Buffer
-//***************************************************************************
+    return true;
+}
 
 //---------------------------------------------------------------------------
 void File_Riff::Header_Parse()
@@ -560,11 +747,34 @@
     if (IsBigEndian)
         Get_B4 (Size,                                           "Size");
     else
+    {
         Get_L4 (Size,                                           "Size");
 
+        //Testing malformed (not word aligned)
+        if (!IsNotWordAligned_Tested && Size%2)
+        {
+            if (File_Offset+Buffer_Offset+8+Size==File_Size)
+                IsNotWordAligned=true;
+            else if (!File_Name.empty())
+            {
+                File F(File_Name);
+                F.GoTo(File_Offset+Buffer_Offset+8+Size);
+                int8u Temp;
+                if (F.Read(&Temp, 1))
+                {
+                    if (!((Temp<'A' || Temp>'z') && Temp!=' '))
+                        IsNotWordAligned=true;
+                }
+            }
+            IsNotWordAligned_Tested=true;
+        }
+    }
+
     //RF64
     int64u Size_Complete=Size;
-    if (Size==0xFFFFFFFF)
+    if (Size==0 && Name==Elements::RIFF)
+        Size_Complete=File_Size-8;
+    else if (Size==0xFFFFFFFF)
     {
         if (Element_Size<0x1C)
         {
@@ -574,17 +784,26 @@
         if (Name==Elements::RF64 && CC4(Buffer+Buffer_Offset+0x0C)==Elements::WAVE_ds64)
         {
             Size_Complete=LittleEndian2int64u(Buffer+Buffer_Offset+0x14);
-            Param_Info(Size_Complete);
+            Param_Info1(Size_Complete);
         }
         else if (Name==Elements::WAVE_data)
         {
             Size_Complete=WAVE_data_Size;
-            Param_Info(Size_Complete);
+            Param_Info1(Size_Complete);
         }
     }
 
+    //Coherency
+    if (Stream_Structure_Temp!=Stream_Structure.end() && Stream_Structure_Temp->second.Size==0)
+    {
+        Name=(int32u)-1;
+        Size_Complete=0; //Hack in some indexes with Size==0 (why?), ignoring content of header
+    }
+    if (File_Offset+Buffer_Offset+8+Size_Complete>File_Size)
+        Size_Complete=File_Size-(File_Offset+Buffer_Offset+8);
+
     //Alignment
-    if (Size_Complete%2)
+    if (Size_Complete%2 && !IsNotWordAligned)
     {
         Size_Complete++; //Always 2-byte aligned
         Alignement_ExtraByte=1;
@@ -619,11 +838,16 @@
         Name=Elements::AVI_;
 
     //Filling
-    if (movi_Size && Element_Level==4 && Size_Complete+8>1024*1024)
+    if (movi_Size && Size_Complete>movi_Size/2 && 8+Size_Complete>1024*1024 && !((Name&0xFFFF0000)==0x69780000 || (Name&0x0000FFFF)==0x00006978) && Element_Level==(rec__Present?(size_t)5:(size_t)4) && Buffer_Offset+8+Size_Complete>Buffer_Size)
     {
-        Buffer_DataSizeToParse=Size_Complete+8;
+        Buffer_DataToParse_End=File_Offset+Buffer_Offset+8+Size_Complete;
         Size_Complete=Buffer_Size-(Buffer_Offset+8);
-        Buffer_DataSizeToParse-=Size_Complete;
+    }
+    if ((Name==Elements::WAVE_data || Name==Elements::AIFF_SSND))
+    {
+        Buffer_DataToParse_Begin=File_Offset+Buffer_Offset+8;
+        Buffer_DataToParse_End=File_Offset+Buffer_Offset+8+Size_Complete;
+        Size_Complete=0;
     }
 
     //Filling
@@ -652,6 +876,39 @@
 }
 
 //***************************************************************************
+// Helpers
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Riff::TimeCode_Fill(const Ztring &Name, const Ztring &Value)
+{
+    float64 FrameRate=Retrieve(Stream_Video, 0, Video_FrameRate).To_float64();
+    if (Value.size()==11 && FrameRate)
+    {
+        for (size_t StreamKind=Stream_General+1; StreamKind<Stream_Max; StreamKind++)
+            for (size_t StreamPos=0; StreamPos<Count_Get((stream_t)StreamKind); StreamPos++)
+            {
+                int64u Delay=0;
+                Delay+=(Value[0]-__T('0'))*10*60*60*1000;
+                Delay+=(Value[1]-__T('0'))   *60*60*1000;
+                Delay+=(Value[3]-__T('0'))   *10*60*1000;
+                Delay+=(Value[4]-__T('0'))      *60*1000;
+                Delay+=(Value[6]-__T('0'))      *10*1000;
+                Delay+=(Value[7]-__T('0'))         *1000;
+
+                int64u Frames=0;
+                Frames+=(Value[ 9]-__T('0'))*10;
+                Frames+=(Value[10]-__T('0'));
+                Delay+=float64_int64s((1000/FrameRate)*Frames);
+
+                Fill((stream_t)StreamKind, StreamPos, Fill_Parameter((stream_t)StreamKind, Generic_Delay), Delay);
+                Fill((stream_t)StreamKind, StreamPos, Fill_Parameter((stream_t)StreamKind, Generic_Delay_Source), __T("Container (")+Name+__T(")"));
+                Fill((stream_t)StreamKind, StreamPos, Fill_Parameter((stream_t)StreamKind, Generic_Delay_String4), Value);
+            }
+    }
+}
+
+//***************************************************************************
 // C++
 //***************************************************************************

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Riff.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Riff.h Changed

@@ -1,17 +1,17 @@
 // File_Riff - Info for RIFF files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -28,6 +28,9 @@
 
 //---------------------------------------------------------------------------
 #include "MediaInfo/File__Analyze.h"
+#if defined(MEDIAINFO_ANCILLARY_YES)
+    #include <MediaInfo/Multiple/File_Ancillary.h>
+#endif //defined(MEDIAINFO_ANCILLARY_YES)
 #include <vector>
 //---------------------------------------------------------------------------
 
@@ -41,31 +44,10 @@
 class File_Riff : public File__Analyze
 {
 public :
-    //Out
-    #if defined(MEDIAINFO_GXF_YES) && (defined(MEDIAINFO_CDP_YES) || defined(MEDIAINFO_AFDBARDATA_YES))
-        struct buffered_data
-        {
-            size_t Size;
-            int8u* Data;
-
-            buffered_data()
-            {
-                Size=0;
-                Data=NULL;
-            }
-
-            ~buffered_data()
-            {
-                delete[] Data; //Data=NULL;
-            }
-        };
-        #if defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_CDP_YES)
-            std::vector<buffered_data*>* Cdp_Data;
-        #endif //defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_CDP_YES)
-        #if defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_AFDBARDATA_YES)
-            std::vector<buffered_data*>* AfdBarData_Data;
-        #endif //defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_AFDBARDATA_YES)
-    #endif //defined(MEDIAINFO_GXF_YES) && (defined(MEDIAINFO_CDP_YES) || defined(MEDIAINFO_AFDBARDATA_YES))
+    //In/Out
+    #if defined(MEDIAINFO_ANCILLARY_YES)
+        File_Ancillary** Ancillary;
+    #endif //defined(MEDIAINFO_ANCILLARY_YES)
 
 protected :
     //Streams management
@@ -77,9 +59,14 @@
 
 private :
     //Buffer - Global
-    void Read_Buffer_Continue ();
+    void Read_Buffer_Init();
+    #if MEDIAINFO_SEEK
+    size_t Read_Buffer_Seek (size_t Method, int64u Value, int64u ID);
+    #endif //MEDIAINFO_SEEK
+    void Read_Buffer_Unsynched();
 
     //Buffer - Per element
+    bool Header_Begin();
     void Header_Parse();
     void Data_Parse();
 
@@ -88,11 +75,13 @@
     //Data
     struct stream
     {
-        File__Analyze*          Parser;
+        std::vector<File__Analyze*> Parsers;
         int32u                  fccType;
         int32u                  fccHandler;
+        int32u                  Scale;
         int32u                  Rate;
         int32u                  Start;
+        int32u                  Length;
         int32u                  Compression;
         stream_t                StreamKind;
         size_t                  StreamPos;
@@ -100,17 +89,19 @@
         size_t                  PacketPos;
         size_t                  PacketCount;
         int64u                  StreamSize;
+        int64u                  indx_Duration;
         bool                    SearchingPayload;
         bool                    Specific_IsMpeg4v;
         bool                    ChunksAreComplete;
 
         stream()
         {
-            Parser=NULL;
             fccType=0x00000000;
             fccHandler=0x00000000;
+            Scale=0;
             Rate=0;
             Start=0;
+            Length=0;
             Compression=0x00000000;
             StreamKind=Stream_Max;
             StreamPos=0;
@@ -118,6 +109,7 @@
             PacketPos=0;
             PacketCount=0;
             StreamSize=0;
+            indx_Duration=0;
             SearchingPayload=true;
             Specific_IsMpeg4v=false;
             ChunksAreComplete=true;
@@ -125,7 +117,8 @@
 
         ~stream()
         {
-            delete Parser; //Parser=NULL;
+            for (size_t Pos=0; Pos<Parsers.size(); Pos++)
+                delete Parsers[Pos]; //Parser=NULL;
         }
     };
     std::map<int32u, stream> Stream;
@@ -145,10 +138,18 @@
     int64u Interleaved1_10;
 
     //Temp
+    Ztring INFO_ISMP;
+    Ztring Tdat_tc_A;
+    Ztring Tdat_tc_O;
+    ZtringList MD5s;
     int64u WAVE_data_Size;  //RF64 WAVE_data real chunk size
     int64u WAVE_fact_samplesCount;  //RF64 WAVE_fact real samplesCount
     int64u Alignement_ExtraByte; //Padding from the container
-    int64u Buffer_DataSizeToParse;
+    int64u Buffer_DataToParse_Begin;
+    int64u Buffer_DataToParse_End;
+    int32u AvgBytesPerSec;
+    int16u BlockAlign;
+    float64 Demux_Rate;
     float64 avih_FrameRate; //FrameRate of the first video stream in one MOVI chunk
     int32u avih_TotalFrame; //Count of frames in one MOVI chunk
     int32u dmlh_TotalFrame; //Count of frames in the whole AVI file (with odml too)
@@ -157,6 +158,7 @@
     int64u TimeReference;   //Only used by Brodcast extension
     int32u SMV_BlockSize;   //Size of a SMV block, 0 if not SMV
     int32u SMV_FrameCount;  //Frame count of a SMV block, 0 if not SMV
+    int32u SamplesPerSec;   //For bext
     int16u BitsPerSample;   //For PCM only
     int8u  stream_Count;    //How many stream we have to parse
     bool   rec__Present;    //True if synchro element is present
@@ -165,13 +167,21 @@
     bool   IsWave64;
     bool   IsRIFF64;
     bool   IsWaveBroken;
+    bool   IsNotWordAligned;
+    bool   IsNotWordAligned_Tested;
     bool   SecondPass;      //Second pass for streams
     File__Analyze*  DV_FromHeader;
-    #if defined(MEDIAINFO_GXF_YES)
-        std::vector<std::vector<File__Analyze*> > rcrd_Parsers;
-        size_t rcrd_Parsers_Count;
-        std::vector<std::vector<size_t> > rcrd_Parsers_StreamPos;
-    #endif //MEDIAINFO_GXF_YES
+    enum kind
+    {
+        Kind_None,
+        Kind_Avi,
+        Kind_Wave,
+        Kind_Aiff,
+        Kind_Rmp3,
+    };
+    kind Kind;
+
+    void TimeCode_Fill(const Ztring &Name, const Ztring &Value);
 
     //Chunks
     void AIFC ();
@@ -179,6 +189,7 @@
     void AIFC_COMT ();
     void AIFC_FVER ();
     void AIFC_SSND ();
+    void AIFF_SSND_Continue();
     void AIFC_xxxx ();
     void AIFF ();
     void AIFF_COMM ();
@@ -188,6 +199,7 @@
     void AIFF_xxxx ();
     void AVI_ ();
     void AVI__cset ();
+    void AVI__Cr8r ();
     void AVI__exif ();
     void AVI__exif_xxxx ();
     void AVI__goog ();
@@ -229,6 +241,7 @@
     void AVI__INFO_JUNK ();
     void AVI__INFO_xxxx ();
     void AVI__JUNK ();
+    void AVI__MD5_ ();
     void AVI__movi ();
     void AVI__movi_xxxx ();
     void AVI__movi_xxxx___dc ();
@@ -237,6 +250,12 @@
     void AVI__movi_rec_ ();
     void AVI__movi_rec__xxxx ();
     void AVI__movi_StreamJump ();
+    void AVI__PrmA ();
+    void AVI__Tdat ();
+    void AVI__Tdat_rn_A ();
+    void AVI__Tdat_rn_O ();
+    void AVI__Tdat_tc_A ();
+    void AVI__Tdat_tc_O ();
     void AVI__GMET ();
     void AVI__xxxx ();
     void AVIX ();
@@ -246,6 +265,8 @@
     void AVIX_movi_rec_ ();
     void AVIX_movi_rec__xxxx ();
     void CADP ();
+    void CDDA ();
+    void CDDA_fmt_ ();
     void CMJP ();
     void CMP4 ();
     void IDVX ();
@@ -272,6 +293,7 @@
     void RMMP ();
     void RMP3 ();
     void RMP3_data ();
+    void RMP3_data_Continue();
     void RMP3_INFO() {AVI__INFO();}
     void RMP3_INFO_IID3() {AVI__INFO_IID3();}
     void RMP3_INFO_ILYC() {AVI__INFO_ILYC();}
@@ -286,10 +308,12 @@
     void WAVE_bext ();
     void WAVE_cue_ ();
     void WAVE_data ();
+    void WAVE_data_Continue ();
     void WAVE_ds64 ();
     void WAVE_fact ();
     void WAVE_fmt_ ();
     void WAVE_ID3_ ();
+    void WAVE_id3_ () {WAVE_ID3_();}
     void WAVE_INFO() {AVI__INFO();}
     void WAVE_INFO_xxxx() {AVI__INFO_xxxx ();}
     void WAVE_iXML ();

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Riff_Elements.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Riff_Elements.cpp Changed

@@ -1,17 +1,18 @@
 // File_Riff - Info for RIFF files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2011-2012 Lionel Duchateau, kurtnoise@free.fr
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,14 +23,18 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #ifdef MEDIAINFO_RIFF_YES
 //---------------------------------------------------------------------------
 
@@ -60,18 +65,18 @@
 #if defined(MEDIAINFO_MPEGA_YES)
     #include "MediaInfo/Audio/File_Mpega.h"
 #endif
+#if defined(MEDIAINFO_AAC_YES)
+    #include "MediaInfo/Audio/File_Aac.h"
+#endif
 #if defined(MEDIAINFO_AC3_YES)
     #include "MediaInfo/Audio/File_Ac3.h"
 #endif
+#if defined(MEDIAINFO_AES3_YES)
+    #include "MediaInfo/Audio/File_Aes3.h"
+#endif
 #if defined(MEDIAINFO_DTS_YES)
     #include "MediaInfo/Audio/File_Dts.h"
 #endif
-#if defined(MEDIAINFO_MPEG4_YES)
-    #include "MediaInfo/Audio/File_Mpeg4_AudioSpecificConfig.h"
-#endif
-#if defined(MEDIAINFO_ADTS_YES)
-    #include "MediaInfo/Audio/File_Adts.h"
-#endif
 #if defined(MEDIAINFO_JPEG_YES)
     #include "MediaInfo/Image/File_Jpeg.h"
 #endif
@@ -97,6 +102,7 @@
     #endif
 #endif //MEDIAINFO_GXF_YES
 #include "MediaInfo/MediaInfo_Config_MediaInfo.h"
+using namespace std;
 //---------------------------------------------------------------------------
 
 namespace MediaInfoLib
@@ -177,94 +183,6 @@
     return Text;
 }
 
-//---------------------------------------------------------------------------
-#if defined(MEDIAINFO_GXF_YES)
-const char* Riff_Rcrd_DataServices(int8u DataID, int8u SecondaryDataID)
-{
-         if (DataID==0x00)
-        return "Undefined format";
-    else if (DataID<=0x03)
-        return "Reserved";
-    else if (DataID<=0x0F)
-        return "Reserved for 8-bit applications";
-    else if (DataID<=0x3F)
-        return "Reserved";
-    else if (DataID==0x41)
-    {
-        //SMPTE 2016-3-2007
-        switch (SecondaryDataID)
-        {
-            case 0x05 : return "Bar Data";
-            default   : return "Internationally registered";
-        }
-    }
-    else if (DataID==0x45)
-    {
-        //SMPTE 2020-1-2008
-        switch (SecondaryDataID)
-        {
-            case 0x01 : return "Audio Metadata - No association";
-            case 0x02 : return "Audio Metadata - Channels 1/2";
-            case 0x03 : return "Audio Metadata - Channels 3/4";
-            case 0x04 : return "Audio Metadata - Channels 5/6";
-            case 0x05 : return "Audio Metadata - Channels 7/8";
-            case 0x06 : return "Audio Metadata - Channels 9/10";
-            case 0x07 : return "Audio Metadata - Channels 11/12";
-            case 0x08 : return "Audio Metadata - Channels 13/14";
-            case 0x09 : return "Audio Metadata - Channels 15/16";
-            default   : return "SMPTE 2020-1-2008?";
-        }
-    }
-    else if (DataID<=0x4F)
-        return "Internationally registered";
-    else if (DataID<=0x5F)
-        return "Reserved";
-    else if (DataID==0x60)
-        return "Ancillary time code (Internationally registered)";
-    else if (DataID==0x61)
-    {
-        switch (SecondaryDataID)
-        {
-            case 0x01 : return "CEA-708 (CDP)";
-            case 0x02 : return "CEA-608";
-            default   : return "S334-1-2007 Defined data services?";
-        }
-    }
-    else if (DataID==0x62)
-    {
-        switch (SecondaryDataID)
-        {
-            case 0x01 : return "Program description";
-            case 0x02 : return "Data broadcast";
-            case 0x03 : return "VBI data";
-            default   : return "S334-1-2007 Variable-format data services?";
-        }
-    }
-    else if (DataID<=0x7F)
-        return "Internationally registered";
-    else if (DataID==0x80)
-        return "Ancillary packet marked for deletion";
-    else if (DataID<=0x83)
-        return "Reserved";
-    else if (DataID==0x84)
-        return "Optional ancillary packet data end marker";
-    else if (DataID<=0x87)
-        return "Reserved";
-    else if (DataID==0x88)
-        return "Optional ancillary packet data start marker";
-    else if (DataID<=0x9F)
-        return "Reserved";
-    else if (DataID<=0xBF)
-        return "Internationally registered";
-    else if (DataID<=0xCF)
-        return "User application";
-    else if (DataID<=0xDF)
-        return "Internationally registered";
-    else
-        return "Internationally registered";
-}
-#endif //MEDIAINFO_GXF_YES
-
 //***************************************************************************
 // Const
 //***************************************************************************
@@ -293,6 +211,7 @@
     const int32u AIFF_ID3_=0x49443320;
     const int32u AVI_=0x41564920;
     const int32u AVI__cset=0x63736574;
+    const int32u AVI__Cr8r=0x43723872;
     const int32u AVI__exif=0x65786966;
     const int32u AVI__exif_ecor=0x65636F72;
     const int32u AVI__exif_emdl=0x656D646C;
@@ -373,6 +292,7 @@
     const int32u AVI__INFO_ISTR=0x49535452;
     const int32u AVI__INFO_ISFT=0x49534654;
     const int32u AVI__INFO_ISHP=0x49534850;
+    const int32u AVI__INFO_ISMP=0x49534D50;
     const int32u AVI__INFO_ISRC=0x49535243;
     const int32u AVI__INFO_ISRF=0x49535246;
     const int32u AVI__INFO_ITCH=0x49544348;
@@ -380,6 +300,7 @@
     const int32u AVI__INFO_IWRI=0x49575249;
     const int32u AVI__INFO_JUNK=0x4A554E4B;
     const int32u AVI__JUNK=0x4A554E4B;
+    const int32u AVI__MD5_=0x4D443520;
     const int32u AVI__movi=0x6D6F7669;
     const int32u AVI__movi_rec_=0x72656320;
     const int32u AVI__movi_xxxx_____=0x00005F5F;
@@ -388,11 +309,19 @@
     const int32u AVI__movi_xxxx___sb=0x00007362;
     const int32u AVI__movi_xxxx___tx=0x00007478;
     const int32u AVI__movi_xxxx___wb=0x00007762;
+    const int32u AVI__PrmA=0x50726D41;
+    const int32u AVI__Tdat=0x54646174;
+    const int32u AVI__Tdat_rn_A=0x726E5F41;
+    const int32u AVI__Tdat_rn_O=0x726E5F4F;
+    const int32u AVI__Tdat_tc_A=0x74635F41;
+    const int32u AVI__Tdat_tc_O=0x74635F4F;
     const int32u AVIX=0x41564958;
     const int32u AVIX_idx1=0x69647831;
     const int32u AVIX_movi=0x6D6F7669;
     const int32u AVIX_movi_rec_=0x72656320;
     const int32u CADP=0x43414450;
+    const int32u CDDA=0x43444441;
+    const int32u CDDA_fmt_=0x666D7420;
     const int32u CMJP=0x434D4A50;
     const int32u CMP4=0x434D5034;
     const int32u IDVX=0x49445658;
@@ -433,6 +362,7 @@
     const int32u WAVE_fact=0x66616374;
     const int32u WAVE_fmt_=0x666D7420;
     const int32u WAVE_ID3_=0x49443320;
+    const int32u WAVE_id3_=0x69643320;
     const int32u WAVE_INFO=0x494E464F;
     const int32u WAVE_iXML=0x69584D4C;
     const int32u wave=0x77617665;
@@ -466,7 +396,7 @@
         ATOM(AIFC_COMM)
         ATOM(AIFC_COMT)
         ATOM(AIFC_FVER)
-        LIST_SKIP(AIFC_SSND)
+        ATOM(AIFC_SSND)
         ATOM_DEFAULT(AIFC_xxxx)
         ATOM_END_DEFAULT
     LIST(AIFF)
@@ -479,6 +409,7 @@
         ATOM_END_DEFAULT
     LIST(AVI_)
         ATOM_BEGIN
+        ATOM(AVI__Cr8r);
         ATOM(AVI__cset)
         LIST(AVI__exif)
             ATOM_DEFAULT_ALONE(AVI__exif_xxxx)
@@ -516,7 +447,7 @@
                 ATOM_END_DEFAULT
             ATOM_DEFAULT(AVI__hdlr_xxxx)
             ATOM_END_DEFAULT
-        LIST_SKIP(AVI__idx1)
+        ATOM(AVI__idx1)
         LIST(AVI__INFO)
             ATOM_BEGIN
             ATOM(AVI__INFO_IID3)
@@ -526,12 +457,21 @@
             ATOM_DEFAULT(AVI__INFO_xxxx)
             ATOM_END_DEFAULT
         ATOM(AVI__JUNK)
+        ATOM(AVI__MD5_)
         LIST(AVI__movi)
             ATOM_BEGIN
             LIST(AVI__movi_rec_)
                 ATOM_DEFAULT_ALONE(AVI__movi_xxxx)
             ATOM_DEFAULT(AVI__movi_xxxx)
             ATOM_END_DEFAULT
+        ATOM(AVI__PrmA);
+        LIST(AVI__Tdat)
+            ATOM_BEGIN
+            ATOM(AVI__Tdat_rn_A)
+            ATOM(AVI__Tdat_rn_O)
+            ATOM(AVI__Tdat_tc_A)
+            ATOM(AVI__Tdat_tc_O)
+            ATOM_END
         ATOM_DEFAULT(AVI__xxxx)
         ATOM_END_DEFAULT
     LIST(AVIX) //OpenDML
@@ -544,18 +484,16 @@
             ATOM_DEFAULT(AVIX_movi_xxxx)
             ATOM_END_DEFAULT
         ATOM_END
-    LIST(CADP)
-        ATOM_BEGIN
-        ATOM_END
-    LIST(CMJP)
+    ATOM_PARTIAL(CADP)
+    LIST(CDDA)
         ATOM_BEGIN
+        ATOM(CDDA_fmt_)
         ATOM_END
+    ATOM_PARTIAL(CMJP)
     ATOM(CMP4)
     ATOM(IDVX)
     LIST(INDX)
-        ATOM_BEGIN
-        ATOM_DEFAULT(INDX_xxxx)
-        ATOM_END_DEFAULT
+        ATOM_DEFAULT_ALONE(INDX_xxxx)
     LIST_SKIP(JUNK)
     LIST_SKIP(menu)
     ATOM(MThd)
@@ -603,9 +541,7 @@
         ATOM_BEGIN
         ATOM(WAVE__pmx)
         ATOM(WAVE_aXML)
-        LIST(WAVE_bext)
-            ATOM_BEGIN
-            ATOM_END
+        ATOM(WAVE_bext)
         LIST(WAVE_data)
             break;
         ATOM(WAVE_cue_)
@@ -613,10 +549,9 @@
         ATOM(WAVE_fact)
         ATOM(WAVE_fmt_)
         ATOM(WAVE_ID3_)
+        ATOM(WAVE_id3_)
         LIST(WAVE_INFO)
-            ATOM_BEGIN
-            ATOM_DEFAULT(WAVE_INFO_xxxx)
-            ATOM_END_DEFAULT
+            ATOM_DEFAULT_ALONE(WAVE_INFO_xxxx)
         ATOM(WAVE_iXML)
         ATOM_END
     LIST(wave)
@@ -647,7 +582,6 @@
 
     //Filling
     Fill(Stream_General, 0, General_Format, "AIFF");
-    Stream_Prepare(Stream_Audio);
 }
 
 //---------------------------------------------------------------------------
@@ -691,13 +625,14 @@
 
     //Filling
     Fill(Stream_General, 0, General_Format, "AIFF");
-    Stream_Prepare(Stream_Audio);
+    Kind=Kind_Aiff;
 }
 
 //---------------------------------------------------------------------------
 void File_Riff::AIFF_COMM()
 {
     Element_Name("Common");
+    Stream_Prepare(Stream_Audio);
 
     int32u numSampleFrames;
     int16u numChannels, sampleSize;
@@ -727,10 +662,13 @@
 
     //Filling
     Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, numChannels);
-    Fill(Stream_Audio, StreamPos_Last, Audio_Resolution, sampleSize);
+    Fill(Stream_Audio, StreamPos_Last, Audio_BitDepth, sampleSize);
     if (sampleRate)
         Fill(Stream_Audio, StreamPos_Last, Audio_Duration, numSampleFrames/sampleRate*1000);
     Fill(Stream_Audio, StreamPos_Last, Audio_SamplingRate, sampleRate, 0);
+
+    BlockAlign=numChannels*sampleSize/8;
+    AvgBytesPerSec=(int32u)float64_int64s(BlockAlign*(float64)sampleRate);
 }
 
 //---------------------------------------------------------------------------
@@ -743,13 +681,13 @@
     {
         Ztring text;
         int16u count;
-        Element_Begin("Comment");
+        Element_Begin1("Comment");
         Skip_B4(                                                "timeStamp");
         Skip_B4(                                                "marker");
         Get_B2 (count,                                          "count");
         count+=count%1; //always even
         Get_Local(count, text,                                  "text");
-        Element_End();
+        Element_End0();
 
         //Filling
         Fill(Stream_General, 0, General_Comment, text);
@@ -761,10 +699,28 @@
 {
     Element_Name("Sound Data");
 
-    Skip_XX(Element_TotalSize_Get(),                            "Data");
+    Skip_XX(Buffer_DataToParse_End-Buffer_DataToParse_Begin,    "Data");
 
     //Filling
-    Fill(Stream_Audio, 0, Audio_StreamSize, Element_TotalSize_Get());
+    Fill(Stream_Audio, 0, Audio_StreamSize, Buffer_DataToParse_End-Buffer_DataToParse_Begin);
+    Fill(Stream_Audio, 0, Audio_Format_Settings_Endianness, "Big");
+
+    #if MEDIAINFO_DEMUX
+        if (Config->NextPacket_Get() && Config->Event_CallBackFunction_IsSet())
+            Config->Demux_EventWasSent=true; //First set is to indicate the user that header is parsed
+    #endif //MEDIAINFO_DEMUX
+}
+
+//---------------------------------------------------------------------------
+void File_Riff::AIFF_SSND_Continue()
+{
+    #if MEDIAINFO_DEMUX
+        if (Element_Size)
+        {
+            Demux_random_access=true;
+            Demux(Buffer+Buffer_Offset, (size_t)Element_Size, ContentType_MainStream);
+        }
+    #endif //MEDIAINFO_DEMUX
 }
 
 //---------------------------------------------------------------------------
@@ -801,21 +757,34 @@
     //Test if there is only one AVI chunk
     if (Status[IsAccepted])
     {
-        Element_Info("Problem: 2 AVI chunks, this is not normal");
+        Element_Info1("Problem: 2 AVI chunks, this is not normal");
         Skip_XX(Element_TotalSize_Get(),                        "Data");
         return;
     }
 
     Data_Accept("AVI");
+    Buffer_MaximumSize*=16;
 
     //Filling
     Fill(Stream_General, 0, General_Format, "AVI");
+    Kind=Kind_Avi;
 
     //Configuring
     Buffer_MaximumSize=32*1024*1024;
 }
 
 //---------------------------------------------------------------------------
+void File_Riff::AVI__Cr8r()
+{
+    Element_Name("Adobe Premiere Cr8r");
+
+    //Parsing
+    Skip_C4(                                                    "FourCC");
+    Skip_B4(                                                    "Size");
+    Skip_XX(Element_Size-Element_Offset,                        "Unknown");
+}
+
+//---------------------------------------------------------------------------
 void File_Riff::AVI__cset()
 {
     Element_Name("Regional settings");
@@ -881,25 +850,27 @@
     //Parsing
     Ztring Value; Value.From_Local((const char*)(Buffer+Buffer_Offset+0), (size_t)Element_Size);
     ZtringListList List;
-    List.Separator_Set(0, _T("\n"));
-    List.Separator_Set(1, _T(":"));
+    List.Separator_Set(0, __T("\n"));
+    List.Separator_Set(1, __T(":"));
     List.Max_Set(1, 2);
     List.Write(Value);
 
     //Details
-    if (MediaInfoLib::Config.DetailsLevel_Get())
-    {
-        //for (size_t Pos=0; Pos<List.size(); Pos++)
-        //    Details_Add_Info(Pos, List(Pos, 0).To_Local().c_str(), List(Pos, 1));
-    }
+    #if MEDIAINFO_TRACE
+        if (Config_Trace_Level)
+        {
+            //for (size_t Pos=0; Pos<List.size(); Pos++)
+            //    Details_Add_Info(Pos, List(Pos, 0).To_Local().c_str(), List(Pos, 1));
+        }
+    #endif //MEDIAINFO_TRACE
 
     //Filling
     for (size_t Pos=0; Pos<List.size(); Pos++)
     {
-        if (List(Pos, 0)==_T("title"))          Fill(Stream_General, 0, General_Title, List(Pos, 1));
-        if (List(Pos, 0)==_T("description"))    Fill(Stream_General, 0, General_Title_More, List(Pos, 1));
-        if (List(Pos, 0)==_T("url"))            Fill(Stream_General, 0, General_Title_Url, List(Pos, 1));
-        if (List(Pos, 0)==_T("docid"))          Fill(Stream_General, 0, General_UniqueID, List(Pos, 1));
+        if (List(Pos, 0)==__T("title"))          Fill(Stream_General, 0, General_Title, List(Pos, 1));
+        if (List(Pos, 0)==__T("description"))    Fill(Stream_General, 0, General_Title_More, List(Pos, 1));
+        if (List(Pos, 0)==__T("url"))            Fill(Stream_General, 0, General_Title_Url, List(Pos, 1));
+        if (List(Pos, 0)==__T("docid"))          Fill(Stream_General, 0, General_UniqueID, List(Pos, 1));
     }
 }
 
@@ -981,10 +952,11 @@
 void File_Riff::AVI__hdlr_strl()
 {
     Element_Name("Stream info");
-    Element_Info(stream_Count);
+    Element_Info1(stream_Count);
 
     //Clean up
     StreamKind_Last=Stream_Max;
+    StreamPos_Last=(size_t)-1;
 
     //Compute the current codec ID
     Stream_ID=(('0'+stream_Count/10)*0x01000000
@@ -1042,14 +1014,14 @@
     {
         //Is too slow
         /*
-        Element_Begin("Index");
+        Element_Begin1("Index");
         int32u Offset, Size;
         Get_L4 (Offset,                                         "Offset"); //BaseOffset + this is absolute file offset
         Get_L4 (Size,                                           "Size"); //Bit 31 is set if this is NOT a keyframe
-        Element_Info(Size&0x7FFFFFFF);
+        Element_Info1(Size&0x7FFFFFFF);
         if (Size)
-            Element_Info("KeyFrame");
-        Element_End();
+            Element_Info1("KeyFrame");
+        Element_End0();
         */
 
         //Faster method
@@ -1093,11 +1065,11 @@
     Skip_L4(                                                    "Reserved2");
     for (int32u Pos=0; Pos<Entry_Count; Pos++)
     {
-        Element_Begin("Index");
+        Element_Begin1("Index");
         Skip_L4(                                                "Offset"); //BaseOffset + this is absolute file offset
         Skip_L4(                                                "Size"); //Bit 31 is set if this is NOT a keyframe
         Skip_L4(                                                "OffsetField2"); //Offset to second field
-        Element_End();
+        Element_End0();
     }
 }
 
@@ -1113,12 +1085,14 @@
     Skip_L4(                                                    "Reserved2");
     for (int32u Pos=0; Pos<Entry_Count; Pos++)
     {
-        Element_Begin("Index of Indexes");
+        int32u Duration;
+        Element_Begin1("Index of Indexes");
         Get_L8 (Offset,                                         "Offset");
         Skip_L4(                                                "Size"); //Size of index chunk at this offset
-        Skip_L4(                                                "Duration"); //time span in stream ticks
+        Get_L4 (Duration,                                       "Duration"); //time span in stream ticks
         Index_Pos[Offset]=ChunkId;
-        Element_End();
+        Stream[Stream_ID].indx_Duration+=Duration;
+        Element_End0();
     }
 
     //We needn't anymore Old version
@@ -1153,7 +1127,7 @@
         case Elements::AVI__hdlr_strl_strh_mids : AVI__hdlr_strl_strf_mids(); break;
         case Elements::AVI__hdlr_strl_strh_txts : AVI__hdlr_strl_strf_txts(); break;
         case Elements::AVI__hdlr_strl_strh_vids : AVI__hdlr_strl_strf_vids(); break;
-        default :                                 Element_Info("Unknown");
+        default :                                 Element_Info1("Unknown");
     }
 
     //Registering stream
@@ -1164,17 +1138,23 @@
 //---------------------------------------------------------------------------
 void File_Riff::AVI__hdlr_strl_strf_auds()
 {
-    Element_Info("Audio");
+    Element_Info1("Audio");
 
     //Parsing
-    int32u SamplesPerSec, AvgBytesPerSec;
+    #if !MEDIAINFO_DEMUX
+        int32u AvgBytesPerSec;
+    #endif //!MEDIAINFO_DEMUX
     int16u FormatTag, Channels;
     BitsPerSample=0;
     Get_L2 (FormatTag,                                          "FormatTag");
     Get_L2 (Channels,                                           "Channels");
     Get_L4 (SamplesPerSec,                                      "SamplesPerSec");
     Get_L4 (AvgBytesPerSec,                                     "AvgBytesPerSec");
-    Skip_L2(                                                    "BlockAlign");
+    #if MEDIAINFO_DEMUX
+        Get_L2 (BlockAlign,                                     "BlockAlign");
+    #else //MEDIAINFO_DEMUX
+        Skip_L2(                                                "BlockAlign");
+    #endif //MEDIAINFO_DEMUX
     if (Element_Offset+2<=Element_Size)
         Get_L2 (BitsPerSample,                                  "BitsPerSample");
 
@@ -1194,47 +1174,68 @@
     Fill(Stream_Audio, StreamPos_Last, Audio_SamplingRate, SamplesPerSec);
     Fill(Stream_Audio, StreamPos_Last, Audio_BitRate, AvgBytesPerSec*8);
     if (BitsPerSample)
-        if (BitsPerSample) Fill(Stream_Audio, StreamPos_Last, Audio_Resolution, BitsPerSample);
+        Fill(Stream_Audio, StreamPos_Last, Audio_BitDepth, BitsPerSample);
     Stream[Stream_ID].AvgBytesPerSec=AvgBytesPerSec; //Saving bitrate for each stream
     if (SamplesPerSec && TimeReference!=(int64u)-1)
-        Fill(Stream_Audio, 0, Audio_Delay, TimeReference/SamplesPerSec);
+    {
+        Fill(Stream_Audio, 0, Audio_Delay, float64_int64s(((float64)TimeReference)*1000/SamplesPerSec));
+        Fill(Stream_Audio, 0, Audio_Delay_Source, "Container (bext)");
+    }
 
     //Creating the parser
          if (0);
     #if defined(MEDIAINFO_MPEGA_YES)
-    else if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Riff, Codec)==_T("MPEG Audio"))
+    else if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Riff, Codec)==__T("MPEG Audio"))
     {
-        Stream[Stream_ID].Parser=new File_Mpega;
-        Stream[Stream_ID].Parser->ShouldContinueParsing=true;
+        File_Mpega* Parser=new File_Mpega;
+        Parser->CalculateDelay=true;
+        Parser->ShouldContinueParsing=true;
+        Stream[Stream_ID].Parsers.push_back(Parser);
     }
     #endif
     #if defined(MEDIAINFO_AC3_YES)
-    else if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Riff, Codec)==_T("AC-3"))
+    else if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Riff, Codec)==__T("AC-3"))
     {
-        Stream[Stream_ID].Parser=new File_Ac3;
-        ((File_Ac3*)Stream[Stream_ID].Parser)->Frame_Count_Valid=2;
-        Stream[Stream_ID].Parser->ShouldContinueParsing=true;
+        File_Ac3* Parser=new File_Ac3;
+        Parser->Frame_Count_Valid=2;
+        Parser->CalculateDelay=true;
+        Parser->ShouldContinueParsing=true;
+        Stream[Stream_ID].Parsers.push_back(Parser);
     }
     #endif
     #if defined(MEDIAINFO_DTS_YES)
-    else if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Riff, Codec)==_T("DTS")
-          || (FormatTag==0x1 && Retrieve(Stream_General, 0, General_Format)==_T("Wave"))) //Some DTS streams are coded "1"
+    else if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Riff, Codec)==__T("DTS")
+          || (FormatTag==0x1 && Retrieve(Stream_General, 0, General_Format)==__T("Wave"))) //Some DTS streams are coded "1"
     {
-        Stream[Stream_ID].Parser=new File_Dts;
-        ((File_Dts*)Stream[Stream_ID].Parser)->Frame_Count_Valid=2;
-        Stream[Stream_ID].Parser->ShouldContinueParsing=true;
+        {
+            File_Dts* Parser=new File_Dts;
+            Parser->Frame_Count_Valid=2;
+            Parser->ShouldContinueParsing=true;
+            Stream[Stream_ID].Parsers.push_back(Parser);
+        }
+
+        {
+            File_Aes3* Parser=new File_Aes3;
+            Parser->SampleRate=SamplesPerSec;
+            Parser->ByteSize=AvgBytesPerSec/SamplesPerSec;
+            Parser->QuantizationBits=AvgBytesPerSec*8/SamplesPerSec/Channels;
+            Parser->ShouldContinueParsing=true;
+            Stream[Stream_ID].Parsers.push_back(Parser);
+        }
     }
     #endif
-    #if defined(MEDIAINFO_ADTS_YES)
-    else if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Riff, Codec)==_T("AAC"))
+    #if defined(MEDIAINFO_AAC_YES)
+    else if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Riff, Codec)==__T("AAC"))
     {
-        Stream[Stream_ID].Parser=new File_Adts;
-        ((File_Adts*)Stream[Stream_ID].Parser)->Frame_Count_Valid=1;
-        Stream[Stream_ID].Parser->ShouldContinueParsing=true;
+        File_Aac* Parser=new File_Aac;
+        Parser->Mode=File_Aac::Mode_ADTS;
+        Parser->Frame_Count_Valid=1;
+        Parser->ShouldContinueParsing=true;
+        Stream[Stream_ID].Parsers.push_back(Parser);
     }
     #endif
     #if defined(MEDIAINFO_PCM_YES)
-    else if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Riff, Codec)==_T("PCM"))
+    else if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Riff, Codec)==__T("PCM"))
     {
         //Creating the parser
         File_Pcm MI;
@@ -1251,7 +1252,7 @@
     }
     #endif
     #if defined(MEDIAINFO_ADPCM_YES)
-    else if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Riff, Codec)==_T("ADPCM"))
+    else if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Riff, Codec)==__T("ADPCM"))
     {
         //Creating the parser
         File_Adpcm MI;
@@ -1267,14 +1268,16 @@
     }
     #endif
     #if defined(MEDIAINFO_OGG_YES)
-    else if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Riff, Codec)==_T("Vorbis")
+    else if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Riff, Codec)==__T("Vorbis")
           && FormatTag!=0x566F) //0x566F has config in this chunk
     {
-        Stream[Stream_ID].Parser=new File_Ogg;
-        Stream[Stream_ID].Parser->ShouldContinueParsing=true;
+        File_Ogg* Parser=new File_Ogg;
+        Parser->ShouldContinueParsing=true;
+        Stream[Stream_ID].Parsers.push_back(Parser);
     }
     #endif
-    Open_Buffer_Init(Stream[Stream_ID].Parser);
+    for (size_t Pos=0; Pos<Stream[Stream_ID].Parsers.size(); Pos++)
+        Open_Buffer_Init(Stream[Stream_ID].Parsers[Pos]);
 
     //Options
     if (Element_Offset+2>Element_Size)
@@ -1288,14 +1291,14 @@
     if (Option_Size>0)
     {
              if (0);
-        else if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Riff, Codec)==_T("MPEG Audio"))
+        else if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Riff, Codec)==__T("MPEG Audio"))
         {
             if (Option_Size==12)
                 AVI__hdlr_strl_strf_auds_Mpega();
             else
                 Skip_XX(Option_Size,                            "MPEG Audio - Uknown");
         }
-        else if (Codec==_T("AAC") || Codec==_T("FF"))
+        else if (Codec==__T("AAC") || Codec==__T("FF") || Codec==__T("8180"))
             AVI__hdlr_strl_strf_auds_Aac();
         else if (FormatTag==0x566F) //Vorbis with Config in this chunk
             AVI__hdlr_strl_strf_auds_Vorbis();
@@ -1303,7 +1306,10 @@
             AVI__hdlr_strl_strf_auds_Vorbis2();
         else if (FormatTag==0xFFFE) //Extensible Wave
             AVI__hdlr_strl_strf_auds_ExtensibleWave();
-        else Skip_XX(Option_Size,                               "Unknown");
+        else if (Element_Offset+Option_Size<=Element_Size)
+            Skip_XX(Option_Size,                               "Unknown");
+        else if (Element_Offset!=Element_Size)
+            Skip_XX(Element_Size-Element_Offset,               "Error");
     }
 }
 
@@ -1311,41 +1317,43 @@
 void File_Riff::AVI__hdlr_strl_strf_auds_Mpega()
 {
     //Parsing
-    Element_Begin("MPEG Audio options");
+    Element_Begin1("MPEG Audio options");
     Skip_L2(                                                    "ID");
     Skip_L4(                                                    "Flags");
     Skip_L2(                                                    "BlockSize");
     Skip_L2(                                                    "FramesPerBlock");
     Skip_L2(                                                    "CodecDelay");
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
 void File_Riff::AVI__hdlr_strl_strf_auds_Aac()
 {
     //Parsing
-    Element_Begin("AAC options");
-    #if defined(MEDIAINFO_MPEG4_YES)
-        File_Mpeg4_AudioSpecificConfig MI;
-        Open_Buffer_Init(&MI);
-        Open_Buffer_Continue(&MI);
-        Finish(&MI);
-        Merge(MI, StreamKind_Last, 0, StreamPos_Last);
+    Element_Begin1("AAC options");
+    #if defined(MEDIAINFO_AAC_YES)
+        File_Aac* MI=new File_Aac();
+        MI->Mode=File_Aac::Mode_AudioSpecificConfig;
+        Open_Buffer_Init(MI);
+        Open_Buffer_Continue(MI);
+        Finish(MI);
+        Merge(*MI, StreamKind_Last, 0, StreamPos_Last);
+        delete MI; //MI=NULL;
     #else //MEDIAINFO_MPEG4_YES
         Skip_XX(Element_Size-Element_Offset,                    "(AudioSpecificConfig)");
     #endif
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
 void File_Riff::AVI__hdlr_strl_strf_auds_Vorbis()
 {
     //Parsing
-    Element_Begin("Vorbis options");
+    Element_Begin1("Vorbis options");
     #if defined(MEDIAINFO_OGG_YES)
         File_Ogg_SubElement MI;
         Open_Buffer_Init(&MI);
-        Element_Begin("Element sizes");
+        Element_Begin1("Element sizes");
             //All elements parsing, except last one
             std::vector<size_t> Elements_Size;
             size_t Elements_TotalSize=0;
@@ -1359,7 +1367,7 @@
                 Elements_Size[Pos]=Size;
                 Elements_TotalSize+=Size;
             }
-        Element_End();
+        Element_End0();
         if (Element_Offset+Elements_TotalSize>Element_Size)
             return;
         //Adding the last block
@@ -1375,12 +1383,12 @@
         //Finalizing
         Finish(&MI);
         Merge(MI, StreamKind_Last, 0, StreamPos_Last);
-        Clear(Stream_Audio, StreamPos_Last, Audio_Resolution); //Resolution is not valid for Vorbis
+        Clear(Stream_Audio, StreamPos_Last, Audio_BitDepth); //Resolution is not valid for Vorbis
         Element_Show();
     #else //MEDIAINFO_MPEG4_YES
         Skip_XX(Element_Size-Element_Offset,                    "(Vorbis headers)");
     #endif
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
@@ -1388,18 +1396,17 @@
 {
     //Parsing
     Skip_XX(8,                                                  "Vorbis Unknown");
-    Element_Begin("Vorbis options");
+    Element_Begin1("Vorbis options");
     #if defined(MEDIAINFO_OGG_YES)
-        File_Ogg_SubElement MI;
-        Open_Buffer_Continue(Stream[Stream_ID].Parser);
-        Open_Buffer_Continue(Stream[Stream_ID].Parser, 0);
-        Finish(Stream[Stream_ID].Parser);
-        Merge(*Stream[Stream_ID].Parser, StreamKind_Last, 0, StreamPos_Last);
+        Open_Buffer_Continue(Stream[Stream_ID].Parsers[0]);
+        Open_Buffer_Continue(Stream[Stream_ID].Parsers[0], 0);
+        Finish(Stream[Stream_ID].Parsers[0]);
+        Merge(*Stream[Stream_ID].Parsers[0], StreamKind_Last, 0, StreamPos_Last);
         Element_Show();
     #else //MEDIAINFO_MPEG4_YES
         Skip_XX(Element_Size-Element_Offset,                    "(Vorbis headers)");
     #endif
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
@@ -1422,7 +1429,7 @@
             //Creating the parser
                  if (0);
             #if defined(MEDIAINFO_PCM_YES)
-            else if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Riff, Ztring().From_Number((int16u)SubFormat.hi, 16))==_T("PCM"))
+            else if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Riff, Ztring().From_Number((int16u)SubFormat.hi, 16))==__T("PCM"))
             {
                 //Creating the parser
                 File_Pcm MI;
@@ -1454,12 +1461,12 @@
     //Standard video header before Iavs?
     if (Element_Size==72)
     {
-        Element_Begin();
+        Element_Begin0();
             AVI__hdlr_strl_strf_vids();
-        Element_End();
+        Element_End0();
     }
 
-    Element_Info("Interleaved Audio/Video");
+    Element_Info1("Interleaved Audio/Video");
 
     #ifdef MEDIAINFO_DVDIF_YES
         if (Element_Size<8*4)
@@ -1472,7 +1479,6 @@
         //DVAAuxSrc
         ((File_DvDif*)DV_FromHeader)->AuxToAnalyze=0x50; //Audio source
         Open_Buffer_Continue(DV_FromHeader, 4);
-        Element_Offset+=4;
         //DVAAuxCtl
         ((File_DvDif*)DV_FromHeader)->AuxToAnalyze=0x51; //Audio control
         Open_Buffer_Continue(DV_FromHeader, Buffer+Buffer_Offset+(size_t)Element_Offset, 4);
@@ -1484,20 +1490,21 @@
         //DVVAuxSrc
         ((File_DvDif*)DV_FromHeader)->AuxToAnalyze=0x60; //Video source
         Open_Buffer_Continue(DV_FromHeader, 4);
-        Element_Offset+=4;
         //DVAAuxCtl
         ((File_DvDif*)DV_FromHeader)->AuxToAnalyze=0x61; //Video control
         Open_Buffer_Continue(DV_FromHeader, 4);
-        Element_Offset+=4;
         //Reserved
-        Skip_L4(                                                "DVReserved");
-        Skip_L4(                                                "DVReserved");
+        if (Element_Offset<Element_Size)
+        {
+            Skip_L4(                                            "DVReserved");
+            Skip_L4(                                            "DVReserved");
+        }
 
         Finish(DV_FromHeader);
 
         Stream_Prepare(Stream_Video);
-        Stream[Stream_ID].Parser=new File_DvDif;
-        Open_Buffer_Init(Stream[Stream_ID].Parser);
+        Stream[Stream_ID].Parsers.push_back(new File_DvDif);
+        Open_Buffer_Init(Stream[Stream_ID].Parsers[0]);
 
     #else //MEDIAINFO_DVDIF_YES
         //Parsing
@@ -1516,15 +1523,15 @@
         float32 FrameRate=Retrieve(Stream_Video, StreamPos_Last, Video_FrameRate).To_float32();
         Fill(Stream_Video, StreamPos_Last, Video_Codec, Codec); //May be replaced by codec parser
         Fill(Stream_Video, StreamPos_Last, Video_Codec_CC, Codec);
-             if (Codec==_T("dvsd")
-              || Codec==_T("dvsl"))
+             if (Codec==__T("dvsd")
+              || Codec==__T("dvsl"))
         {
                                         Fill(Stream_Video, StreamPos_Last, Video_Width,  720);
                  if (FrameRate==25.000) Fill(Stream_Video, StreamPos_Last, Video_Height, 576);
             else if (FrameRate==29.970) Fill(Stream_Video, StreamPos_Last, Video_Height, 480);
             Fill(Stream_Video, StreamPos_Last, Video_DisplayAspectRatio, 4.0/3, 3, true);
         }
-        else if (Codec==_T("dvhd"))
+        else if (Codec==__T("dvhd"))
         {
                                         Fill(Stream_Video, StreamPos_Last, Video_Width,  1440);
                  if (FrameRate==25.000) Fill(Stream_Video, StreamPos_Last, Video_Height, 1152);
@@ -1541,7 +1548,7 @@
 //---------------------------------------------------------------------------
 void File_Riff::AVI__hdlr_strl_strf_mids()
 {
-    Element_Info("Midi");
+    Element_Info1("Midi");
 
     //Filling
     Stream_Prepare(Stream_Audio);
@@ -1552,7 +1559,7 @@
 //---------------------------------------------------------------------------
 void File_Riff::AVI__hdlr_strl_strf_txts()
 {
-    Element_Info("Text");
+    Element_Info1("Text");
 
     //Parsing
     Ztring Format;
@@ -1569,8 +1576,8 @@
         {
             //Creating the parser
             #if defined(MEDIAINFO_OTHERTEXT_YES)
-                Stream[Stream_ID].Parser=new File_OtherText;
-                Open_Buffer_Init(Stream[Stream_ID].Parser);
+                Stream[Stream_ID].Parsers.push_back(new File_OtherText);
+                Open_Buffer_Init(Stream[Stream_ID].Parsers[0]);
             #endif
         }
         else
@@ -1583,7 +1590,7 @@
 //---------------------------------------------------------------------------
 void File_Riff::AVI__hdlr_strl_strf_vids()
 {
-    Element_Info("Video");
+    Element_Info1("Video");
 
     //Parsing
     int32u Compression, Width, Height;
@@ -1624,7 +1631,7 @@
         //Filling
         if (Compression==0x00000000 || Compression==0x01000000 || Compression==0x02000000 || Compression==0x03000000)
         {
-            Ztring CodecID=_T("0x0000000")+Ztring::ToZtring(Compression>>24);
+            Ztring CodecID=__T("0x0000000")+Ztring::ToZtring(Compression>>24);
             CodecID_Fill(CodecID, StreamKind_Last, StreamPos_Last, InfoCodecID_Format_Riff);
             Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Codec), CodecID); //FormatTag, may be replaced by codec parser
             Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Codec_CC), CodecID); //FormatTag
@@ -1638,28 +1645,28 @@
         Fill(StreamKind_Last, StreamPos_Last, "Width", Width, 10, true);
         Fill(StreamKind_Last, StreamPos_Last, "Height", Height, 10, true);
         if (Resolution==32 && Compression==0x74736363) //tscc
-            Fill(StreamKind_Last, StreamPos_Last, "Resolution", 8);
+            Fill(StreamKind_Last, StreamPos_Last, "BitDepth", 8);
         else if (Compression==0x44495633) //DIV3
-            Fill(StreamKind_Last, StreamPos_Last, "Resolution", 8);
+            Fill(StreamKind_Last, StreamPos_Last, "BitDepth", 8);
         else if (Compression==0x44585342) //DXSB
-            Fill(StreamKind_Last, StreamPos_Last, "Resolution", Resolution);
-        else if (MediaInfoLib::Config.CodecID_Get(StreamKind_Last, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression), InfoCodecID_ColorSpace).find(_T("RGBA"))!=std::string::npos) //RGB codecs
-            Fill(StreamKind_Last, StreamPos_Last, "Resolution", Resolution/4);
+            Fill(StreamKind_Last, StreamPos_Last, "BitDepth", Resolution);
+        else if (MediaInfoLib::Config.CodecID_Get(StreamKind_Last, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression), InfoCodecID_ColorSpace).find(__T("RGBA"))!=std::string::npos) //RGB codecs
+            Fill(StreamKind_Last, StreamPos_Last, "BitDepth", Resolution/4);
         else if (Compression==0x00000000 //RGB
-              || MediaInfoLib::Config.CodecID_Get(StreamKind_Last, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression), InfoCodecID_ColorSpace).find(_T("RGB"))!=std::string::npos) //RGB codecs
+              || MediaInfoLib::Config.CodecID_Get(StreamKind_Last, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression), InfoCodecID_ColorSpace).find(__T("RGB"))!=std::string::npos) //RGB codecs
         {
             if (Resolution==32)
             {
                 Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Format), "RGBA", Unlimited, true, true);
-                Fill(StreamKind_Last, StreamPos_Last, "Resolution", Resolution/4); //With Alpha
+                Fill(StreamKind_Last, StreamPos_Last, "BitDepth", Resolution/4); //With Alpha
             }
             else
-                Fill(StreamKind_Last, StreamPos_Last, "Resolution", Resolution<=16?8:(Resolution/3)); //indexed or normal
+                Fill(StreamKind_Last, StreamPos_Last, "BitDepth", Resolution<=16?8:(Resolution/3)); //indexed or normal
         }
         else if (Compression==0x56503632 //VP62
-              || MediaInfoLib::Config.CodecID_Get(StreamKind_Last, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression), InfoCodecID_Format)==_T("H.263") //H.263
-              || MediaInfoLib::Config.CodecID_Get(StreamKind_Last, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression), InfoCodecID_Format)==_T("VC-1")) //VC-1
-            Fill(StreamKind_Last, StreamPos_Last, "Resolution", Resolution/3);
+              || MediaInfoLib::Config.CodecID_Get(StreamKind_Last, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression), InfoCodecID_Format)==__T("H.263") //H.263
+              || MediaInfoLib::Config.CodecID_Get(StreamKind_Last, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression), InfoCodecID_Format)==__T("VC-1")) //VC-1
+            Fill(StreamKind_Last, StreamPos_Last, "BitDepth", Resolution/3);
     }
     else
     {
@@ -1671,47 +1678,54 @@
     //Creating the parser
          if (0);
     #if defined(MEDIAINFO_MPEGV_YES)
-    else if (MediaInfoLib::Config.CodecID_Get(Stream_Video, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression), InfoCodecID_Format)==_T("MPEG Video"))
+    else if (MediaInfoLib::Config.CodecID_Get(Stream_Video, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression), InfoCodecID_Format)==__T("MPEG Video"))
     {
-        Stream[Stream_ID].Parser=new File_Mpegv;
-        ((File_Mpegv*)Stream[Stream_ID].Parser)->FrameIsAlwaysComplete=true;
+        File_Mpegv* Parser=new File_Mpegv;
+        Parser->FrameIsAlwaysComplete=true;
+        Parser->TimeCodeIsNotTrustable=true;
+        Stream[Stream_ID].Parsers.push_back(Parser);
     }
     #endif
     #if defined(MEDIAINFO_MPEG4V_YES)
-    else if (MediaInfoLib::Config.CodecID_Get(Stream_Video, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression))==_T("MPEG-4 Visual"))
+    else if (MediaInfoLib::Config.CodecID_Get(Stream_Video, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression))==__T("MPEG-4 Visual"))
     {
-        Stream[Stream_ID].Parser=new File_Mpeg4v;
+        File_Mpeg4v* Parser=new File_Mpeg4v;
         Stream[Stream_ID].Specific_IsMpeg4v=true;
-        ((File_Mpeg4v*)Stream[Stream_ID].Parser)->FrameIsAlwaysComplete=true;
+        Parser->FrameIsAlwaysComplete=true;
         if (MediaInfoLib::Config.ParseSpeed_Get()>=0.5)
-            Stream[Stream_ID].Parser->ShouldContinueParsing=true;
+            Parser->ShouldContinueParsing=true;
+        Stream[Stream_ID].Parsers.push_back(Parser);
     }
     #endif
     #if defined(MEDIAINFO_AVC_YES)
-    else if (MediaInfoLib::Config.CodecID_Get(Stream_Video, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression))==_T("AVC"))
+    else if (MediaInfoLib::Config.CodecID_Get(Stream_Video, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression))==__T("AVC"))
     {
-        Stream[Stream_ID].Parser=new File_Avc;
-        ((File_Avc*)Stream[Stream_ID].Parser)->FrameIsAlwaysComplete=true;
+        File_Avc* Parser=new File_Avc;
+        Parser->FrameIsAlwaysComplete=true;
+        Stream[Stream_ID].Parsers.push_back(Parser);
     }
     #endif
     #if defined(MEDIAINFO_JPEG_YES)
-    else if (MediaInfoLib::Config.CodecID_Get(Stream_Video, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression))==_T("M-JPEG"))
+    else if (MediaInfoLib::Config.CodecID_Get(Stream_Video, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression))==__T("JPEG"))
     {
-        Stream[Stream_ID].Parser=new File_Jpeg;
-        ((File_Jpeg*)Stream[Stream_ID].Parser)->StreamKind=Stream_Video;
+        File_Jpeg* Parser=new File_Jpeg;
+        Parser->StreamKind=Stream_Video;
+        Stream[Stream_ID].Parsers.push_back(Parser);
     }
     #endif
     #if defined(MEDIAINFO_DVDIF_YES)
-    else if (MediaInfoLib::Config.CodecID_Get(Stream_Video, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression))==_T("DV"))
+    else if (MediaInfoLib::Config.CodecID_Get(Stream_Video, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression))==__T("DV"))
     {
-        Stream[Stream_ID].Parser=new File_DvDif;
-        ((File_DvDif*)Stream[Stream_ID].Parser)->IgnoreAudio=true;
+        File_DvDif* Parser=new File_DvDif;
+        Parser->IgnoreAudio=true;
+        Stream[Stream_ID].Parsers.push_back(Parser);
     }
     #endif
     #if defined(MEDIAINFO_FRAPS_YES)
     else if (Compression==0x46505331) //"FPS1"
     {
-        Stream[Stream_ID].Parser=new File_Fraps;
+        File_Fraps* Parser=new File_Fraps;
+        Stream[Stream_ID].Parsers.push_back(Parser);
     }
     #endif
     else if (Compression==0x48465955) //"HFUY"
@@ -1727,10 +1741,12 @@
     #if defined(MEDIAINFO_LAGARITH_YES)
     else if (Compression==0x4C414753) //"LAGS"
     {
-        Stream[Stream_ID].Parser=new File_Lagarith;
+        File_Lagarith* Parser=new File_Lagarith;
+        Stream[Stream_ID].Parsers.push_back(Parser);
     }
     #endif
-    Open_Buffer_Init(Stream[Stream_ID].Parser);
+    for (size_t Pos=0; Pos<Stream[Stream_ID].Parsers.size(); Pos++)
+        Open_Buffer_Init(Stream[Stream_ID].Parsers[Pos]);
 
     //Options
     if (Element_Offset>=Element_Size)
@@ -1738,7 +1754,7 @@
 
     //Filling
          if (0);
-    else if (MediaInfoLib::Config.CodecID_Get(Stream_Video, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression))==_T("AVC"))
+    else if (MediaInfoLib::Config.CodecID_Get(Stream_Video, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression))==__T("AVC"))
         AVI__hdlr_strl_strf_vids_Avc();
     else Skip_XX(Element_Size-Element_Offset,                   "Unknown");
 }
@@ -1747,16 +1763,32 @@
 void File_Riff::AVI__hdlr_strl_strf_vids_Avc()
 {
     //Parsing
-    Element_Begin("AVC options");
+    Element_Begin1("AVC options");
     #if defined(MEDIAINFO_AVC_YES)
-        ((File_Avc*)Stream[Stream_ID].Parser)->MustParse_SPS_PPS=true;
-        ((File_Avc*)Stream[Stream_ID].Parser)->SizedBlocks=true;
-        ((File_Avc*)Stream[Stream_ID].Parser)->MustSynchronize=false;
-        Open_Buffer_Continue(Stream[Stream_ID].Parser);
+        //Can be sized block or with 000001
+        File_Avc* Parser=(File_Avc*)Stream[Stream_ID].Parsers[0];
+        Parser->MustParse_SPS_PPS=false;
+        Parser->SizedBlocks=false;
+        Parser->MustSynchronize=true;
+        int64u Element_Offset_Save=Element_Offset;
+        Open_Buffer_Continue(Parser);
+        if (!Parser->Status[IsAccepted])
+        {
+            Element_Offset=Element_Offset_Save;
+            delete Stream[Stream_ID].Parsers[0]; Stream[Stream_ID].Parsers[0]=new File_Avc;
+            Parser=(File_Avc*)Stream[Stream_ID].Parsers[0];
+            Open_Buffer_Init(Parser);
+            Parser->FrameIsAlwaysComplete=true;
+            Parser->MustParse_SPS_PPS=true;
+            Parser->SizedBlocks=true;
+            Parser->MustSynchronize=false;
+            Open_Buffer_Continue(Parser);
+            Element_Show();
+        }
     #else //MEDIAINFO_AVC_YES
         Skip_XX(Element_Size-Element_Offset,                    "(AVC headers)");
     #endif
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
@@ -1798,12 +1830,36 @@
     float32 FrameRate=0;
     if (Rate>0 && Scale>0)
     {
+        //FrameRate (without known value detection)
         FrameRate=((float32)Rate)/Scale;
-        int64u Duration=float32_int64s((1000*(float32)Length)/FrameRate);
-        if (avih_TotalFrame>0 //avih_TotalFrame is here because some files have a wrong Audio Duration if TotalFrame==0 (which is a bug, of course!)
-        && (avih_FrameRate==0 || Duration<((float32)avih_TotalFrame)/avih_FrameRate*1000*1.10)  //Some file have a nearly perfect header, except that the value is false, trying to detect it (false if 10% more than 1st video)
-        && (avih_FrameRate==0 || Duration>((float32)avih_TotalFrame)/avih_FrameRate*1000*0.90)) //Some file have a nearly perfect header, except that the value is false, trying to detect it (false if 10% less than 1st video)
-            Fill(StreamKind_Last, StreamPos_Last, "Duration", Duration);
+        if (FrameRate>1)
+        {
+            float32 Rest=FrameRate-(int32u)FrameRate;
+            if (Rest<0.01)
+                FrameRate-=Rest;
+            else if (Rest>0.99)
+                FrameRate+=1-Rest;
+            else
+            {
+                float32 Rest1001=FrameRate*1001/1000-(int32u)(FrameRate*1001/1000);
+                if (Rest1001<0.001)
+                    FrameRate=(float32)((int32u)(FrameRate*1001/1000))*1000/1001;
+                if (Rest1001>0.999)
+                    FrameRate=(float32)((int32u)(FrameRate*1001/1000)+1)*1000/1001;
+            }
+        }
+
+        //Duration
+        if (FrameRate)
+        {
+            int64u Duration=float32_int64s((1000*(float32)Length)/FrameRate);
+            if (avih_TotalFrame>0 //avih_TotalFrame is here because some files have a wrong Audio Duration if TotalFrame==0 (which is a bug, of course!)
+            && (avih_FrameRate==0 || Duration<((float32)avih_TotalFrame)/avih_FrameRate*1000*1.10)  //Some file have a nearly perfect header, except that the value is false, trying to detect it (false if 10% more than 1st video)
+            && (avih_FrameRate==0 || Duration>((float32)avih_TotalFrame)/avih_FrameRate*1000*0.90)) //Some file have a nearly perfect header, except that the value is false, trying to detect it (false if 10% less than 1st video)
+            {
+                Fill(StreamKind_Last, StreamPos_Last, "Duration", Duration);
+            }
+        }
     }
     switch (fccType)
     {
@@ -1817,8 +1873,10 @@
     }
     Stream[Stream_ID].fccType=fccType;
     Stream[Stream_ID].fccHandler=fccHandler;
+    Stream[Stream_ID].Scale=Scale;
     Stream[Stream_ID].Rate=Rate;
     Stream[Stream_ID].Start=Start;
+    Stream[Stream_ID].Length=Length;
 }
 
 //---------------------------------------------------------------------------
@@ -1841,12 +1899,14 @@
 
     //Parsing
     int32u FieldPerFrame;
+    int16u FrameAspectRatio_H, FrameAspectRatio_W;
     Skip_L4(                                                    "VideoFormatToken");
     Skip_L4(                                                    "VideoStandard");
     Skip_L4(                                                    "VerticalRefreshRate");
     Skip_L4(                                                    "HTotalInT");
     Skip_L4(                                                    "VTotalInLines");
-    Skip_L4(                                                    "FrameAspectRatio");
+    Get_L2 (FrameAspectRatio_H,                                 "FrameAspectRatio Height");
+    Get_L2 (FrameAspectRatio_W,                                 "FrameAspectRatio Width");
     Skip_L4(                                                    "FrameWidthInPixels");
     Skip_L4(                                                    "FrameHeightInLines");
     Get_L4 (FieldPerFrame,                                      "FieldPerFrame");
@@ -1863,6 +1923,11 @@
     }
     if(Element_Offset<Element_Size)
         Skip_XX(Element_Size-Element_Offset,                    "Unknown");
+
+    FILLING_BEGIN();
+        if (FrameAspectRatio_H && FrameAspectRatio_W)
+            Fill(Stream_Video, 0, Video_DisplayAspectRatio, ((float32)FrameAspectRatio_W)/FrameAspectRatio_H, 3);
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
@@ -1879,12 +1944,7 @@
     //Tests
     if (!NeedOldIndex || Idx1_Offset==(int64u)-1)
     {
-        Skip_XX(Element_TotalSize_Get(),                            "Data");
-        return;
-    }
-    else if (!Element_IsComplete_Get())
-    {
-        Element_WaitForMoreData();
+        Skip_XX(Element_Size,                                   "Data");
         return;
     }
 
@@ -1893,13 +1953,12 @@
         Idx1_Offset=0; //Fixing base of movi atom, the index think it is the start of the file
 
     //Parsing
-    std::map <int64u, size_t> Stream_Count;
     while (Element_Offset+16<=Element_Size)
     {
         //Is too slow
         /*
         int32u ChunkID, Offset, Size;
-        Element_Begin("Index");
+        Element_Begin1("Index");
         Get_C4 (ChunkID,                                        "ChunkID"); //Bit 31 is set if this is NOT a keyframe
         Info_L4(Flags,                                          "Flags");
             Skip_Flags(Flags, 0,                                "NoTime");
@@ -1909,14 +1968,16 @@
             Skip_Flags(Flags, 4,                                "KeyFrame");
         Get_L4 (Offset,                                         "Offset"); //qwBaseOffset + this is absolute file offset
         Get_L4 (Size,                                           "Size"); //Bit 31 is set if this is NOT a keyframe
-        Element_Info(Ztring().From_CC4(ChunkID));
-        Element_Info(Size);
+        Element_Info1(Ztring().From_CC4(ChunkID));
+        Element_Info1(Size);
 
         //Stream Pos and Size
-        int32u StreamID_Temp=(ChunkID&0xFFFF0000);
-        Stream[StreamID_Temp].StreamSize+=Size;
-        Stream_Pos[Idx1_Offset+Offset]=StreamID_Temp;
-        Element_End();
+        int32u StreamID=(ChunkID&0xFFFF0000);
+        Stream[StreamID].StreamSize+=Size;
+        Stream[StreamID].PacketCount++;
+        Stream_Structure[Idx1_Offset+Offset].Name=StreamID;
+        Stream_Structure[Idx1_Offset+Offset].Size=Size;
+        Element_End0();
         */
 
         //Faster method
@@ -1933,7 +1994,7 @@
     //Interleaved
     size_t Pos0=0;
     size_t Pos1=0;
-    for (std::map<int64u, stream_structure>::iterator Temp=Stream_Structure.begin(); Temp!=Stream_Structure.end(); Temp++)
+    for (std::map<int64u, stream_structure>::iterator Temp=Stream_Structure.begin(); Temp!=Stream_Structure.end(); ++Temp)
     {
         switch (Temp->second.Name)
         {
@@ -2069,13 +2130,29 @@
         default                       : ;
     }
     Element_Name(MediaInfoLib::Config.Info_Get(StreamKind, Parameter, Info_Name));
-    Element_Info(Value);
-    if (!Value.empty())
+    Element_Info1(Value);
+
+    switch (Element_Code)
     {
-        if (Parameter!=(size_t)-1)
-            Fill(StreamKind, StreamPos, Parameter, Value);
-        else
-            Fill(StreamKind, StreamPos, Ztring().From_CC4((int32u)Element_Code).To_Local().c_str(), Value, true);
+        case Elements::AVI__INFO_ISMP : INFO_ISMP=Value;
+                                        break;
+        case Elements::AVI__INFO_IGNR :
+                                        {
+                                            Ztring ISGN=Retrieve(Stream_General, 0, General_Genre);
+                                            Clear(Stream_General, 0, General_Genre);
+                                            Fill(StreamKind, StreamPos, General_Genre, Value);
+                                            if (!ISGN.empty())
+                                                Fill(StreamKind, StreamPos, General_Genre, ISGN);
+                                        }
+                                        break;
+        default                      :
+                                        if (!Value.empty())
+                                        {
+                                            if (Parameter!=(size_t)-1)
+                                                Fill(StreamKind, StreamPos, Parameter, Value);
+                                            else
+                                                Fill(StreamKind, StreamPos, Ztring().From_CC4((int32u)Element_Code).To_Local().c_str(), Value, true);
+                                        }
     }
 }
 
@@ -2125,6 +2202,23 @@
 }
 
 //---------------------------------------------------------------------------
+void File_Riff::AVI__MD5_()
+{
+    //Parsing
+    while (Element_Offset<Element_Size)
+    {
+        int128u MD5Stored;
+        Get_L16   (MD5Stored,                                   "MD5");
+        Ztring MD5_PerItem;
+        MD5_PerItem.From_Number(MD5Stored, 16);
+        while (MD5_PerItem.size()<32)
+            MD5_PerItem.insert(MD5_PerItem.begin(), '0'); //Padding with 0, this must be a 32-byte string
+        MD5_PerItem.MakeLowerCase();
+        MD5s.push_back(MD5_PerItem);
+    }
+}
+
+//---------------------------------------------------------------------------
 void File_Riff::AVI__movi()
 {
     Element_Name("Datas");
@@ -2139,23 +2233,36 @@
         std::map<int32u, stream>::iterator Temp=Stream.begin();
         while (Temp!=Stream.end())
         {
-            if (!Temp->second.Parser && Temp->second.fccType!=Elements::AVI__hdlr_strl_strh_txts)
+            if ((Temp->second.Parsers.empty() || Temp->second.Parsers[0]==NULL) && Temp->second.fccType!=Elements::AVI__hdlr_strl_strh_txts)
             {
                 Temp->second.SearchingPayload=false;
                 stream_Count--;
             }
-            Temp++;
+            ++Temp;
         }
     }
 
     //Filling
     movi_Size+=Element_TotalSize_Get();
 
+    //Probing rec (with index, this is not always tested in the flow
+    if (Element_Size<12)
+    {
+        Element_WaitForMoreData();
+        return;
+    }
+    if (CC4(Buffer+Buffer_Offset+8)==0x72656320) //"rec "
+        rec__Present=true;
+
     //We must parse moov?
     if (NeedOldIndex || (stream_Count==0 && Index_Pos.empty()))
     {
         //Jumping
-        Skip_XX(Element_TotalSize_Get(),                        "Data");
+        #if MEDIAINFO_TRACE
+            if (Trace_Activated)
+                Param("Data", Ztring("(")+Ztring::ToZtring(Element_TotalSize_Get())+Ztring(" bytes)"));
+        #endif //MEDIAINFO_TRACE
+        Element_Offset=Element_TotalSize_Get(); //Not using Skip_XX() because we want to skip data we don't have, and Skip_XX() does a test on size of buffer
         return;
     }
 
@@ -2206,7 +2313,24 @@
         return;
     }
 
-    Demux(Buffer+Buffer_Offset, (size_t)Element_Size, ContentType_MainStream);
+    #if MEDIAINFO_DEMUX
+        if (Stream[Stream_ID].Rate) //AVI
+        {
+            int64u Element_Code_Old=Element_Code;
+            Element_Code=((Element_Code_Old>>24)&0xF)*10+((Element_Code_Old>>16)&0xF);
+            Frame_Count_NotParsedIncluded=Stream[Stream_ID].PacketPos;
+            FrameInfo.DTS=Frame_Count_NotParsedIncluded*1000000000*Stream[Stream_ID].Scale/Stream[Stream_ID].Rate;
+            Element_Code=Stream_ID;
+            Demux(Buffer+Buffer_Offset, (size_t)Element_Size, ContentType_MainStream);
+            Element_Code=Element_Code_Old;
+        }
+        else //WAV
+        {
+            //TODO
+        }
+    #endif //MEDIAINFO_DEMUX
+
+    Stream[Stream_ID].PacketPos++;
 
     //Finished?
     if (!Stream[Stream_ID].SearchingPayload)
@@ -2216,21 +2340,22 @@
         return;
     }
 
-    Stream[Stream_ID].PacketPos++;
-    if (MediaInfoLib::Config.DetailsLevel_Get())
-    {
-        switch (Element_Code&0x0000FFFF) //2 last bytes
+    #if MEDIAINFO_TRACE
+        if (Config_Trace_Level)
         {
-            case Elements::AVI__movi_xxxx_____ : Element_Info("DV"); break;
-            case Elements::AVI__movi_xxxx___db :
-            case Elements::AVI__movi_xxxx___dc : Element_Info("Video"); break;
-            case Elements::AVI__movi_xxxx___sb :
-            case Elements::AVI__movi_xxxx___tx : Element_Info("Text"); break;
-            case Elements::AVI__movi_xxxx___wb : Element_Info("Audio"); break;
-            default :                            Element_Info("Unknown"); break;
+            switch (Element_Code&0x0000FFFF) //2 last bytes
+            {
+                case Elements::AVI__movi_xxxx_____ : Element_Info1("DV"); break;
+                case Elements::AVI__movi_xxxx___db :
+                case Elements::AVI__movi_xxxx___dc : Element_Info1("Video"); break;
+                case Elements::AVI__movi_xxxx___sb :
+                case Elements::AVI__movi_xxxx___tx : Element_Info1("Text"); break;
+                case Elements::AVI__movi_xxxx___wb : Element_Info1("Audio"); break;
+                default :                            Element_Info1("Unknown"); break;
+            }
+            Element_Info1(Stream[Stream_ID].PacketPos);
         }
-        Element_Info(Stream[Stream_ID].PacketPos);
-    }
+    #endif //MEDIAINFO_TRACE
 
     //Some specific stuff
     switch (Element_Code&0x0000FFFF) //2 last bytes
@@ -2240,12 +2365,36 @@
     }
 
     //Parsing
-    if (Stream[Stream_ID].Parser)
-    {
-        Open_Buffer_Continue(Stream[Stream_ID].Parser);
-        if (Stream[Stream_ID].Parser->Buffer_Size>0)
-            Stream[Stream_ID].ChunksAreComplete=false;
-    }
+    for (size_t Pos=0; Pos<Stream[Stream_ID].Parsers.size(); Pos++)
+        if (Stream[Stream_ID].Parsers[Pos])
+        {
+            Open_Buffer_Continue(Stream[Stream_ID].Parsers[Pos], Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)(Element_Size-Element_Offset));
+            Element_Show();
+            if (Stream[Stream_ID].Parsers.size()==1 && Stream[Stream_ID].Parsers[Pos]->Buffer_Size>0)
+                Stream[Stream_ID].ChunksAreComplete=false;
+
+            if (Stream[Stream_ID].Parsers.size()>1)
+            {
+                if (!Stream[Stream_ID].Parsers[Pos]->Status[IsAccepted] && Stream[Stream_ID].Parsers[Pos]->Status[IsFinished])
+                {
+                    delete *(Stream[Stream_ID].Parsers.begin()+Pos);
+                    Stream[Stream_ID].Parsers.erase(Stream[Stream_ID].Parsers.begin()+Pos);
+                    Pos--;
+                }
+                else if (Stream[Stream_ID].Parsers.size()>1 && Stream[Stream_ID].Parsers[Pos]->Status[IsAccepted])
+                {
+                    File__Analyze* Parser=Stream[Stream_ID].Parsers[Pos];
+                    for (size_t Pos2=0; Pos2<Stream[Stream_ID].Parsers.size(); Pos2++)
+                    {
+                        if (Pos2!=Pos)
+                            delete *(Stream[Stream_ID].Parsers.begin()+Pos2);
+                    }
+                    Stream[Stream_ID].Parsers.clear();
+                    Stream[Stream_ID].Parsers.push_back(Parser);
+                    Pos=0;
+                }
+            }
+        }
 
     //Some specific stuff
     switch (Element_Code&0x0000FFFF) //2 last bytes
@@ -2267,11 +2416,8 @@
 void File_Riff::AVI__movi_xxxx___dc()
 {
     //Finish (if requested)
-    if (Stream[Stream_ID].Parser==NULL
-    #if defined(MEDIAINFO_MPEG4V_YES)
-     || Stream[Stream_ID].Specific_IsMpeg4v && ((File_Mpeg4v*)Stream[Stream_ID].Parser)->Frame_Count_InThisBlock>1 //Searching Packet bitstream, no more need if found
-    #endif
-     || Stream[Stream_ID].Parser->Status[IsFinished]
+    if (Stream[Stream_ID].Parsers.empty()
+     || Stream[Stream_ID].Parsers[0]->Status[IsFinished]
      || (Stream[Stream_ID].PacketPos>=300 && MediaInfoLib::Config.ParseSpeed_Get()<1.00))
     {
         Stream[Stream_ID].SearchingPayload=false;
@@ -2303,11 +2449,11 @@
 void File_Riff::AVI__movi_xxxx___wb()
 {
     //Finish (if requested)
-    if ( Stream[Stream_ID].PacketPos>=4 //For having the chunk alignement
-     && (Stream[Stream_ID].Parser==NULL
-      || Stream[Stream_ID].Parser->Status[IsFilled]
-      || (Stream[Stream_ID].PacketPos>=300 && MediaInfoLib::Config.ParseSpeed_Get()<1.00))
-      || Element_Size>50000) //For PCM, we disable imediatly
+    if ((Stream[Stream_ID].PacketPos>=4 //For having the chunk alignement
+      && (Stream[Stream_ID].Parsers.empty()
+       || Stream[Stream_ID].Parsers[0]->Status[IsFinished]
+       || (Stream[Stream_ID].PacketPos>=300 && MediaInfoLib::Config.ParseSpeed_Get()<1.00)))
+     || Element_Size>50000) //For PCM, we disable imediatly
     {
         Stream[Stream_ID].SearchingPayload=false;
         stream_Count--;
@@ -2337,10 +2483,19 @@
         //Jumping
         Element_Show();
         if (rec__Present)
-            Element_End();
+            Element_End0();
         Info("movi, Jumping to end of chunk");
         if (SecondPass)
+        {
+            std::map<int32u, stream>::iterator Temp=Stream.begin();
+            while (Temp!=Stream.end())
+            {
+                for (size_t Pos=0; Pos<Temp->second.Parsers.size(); ++Pos)
+                    Temp->second.Parsers[Pos]->Open_Buffer_Unsynch();
+                ++Temp;
+            }
             Finish("AVI"); //The rest is already parsed
+        }
         else
             GoTo(File_Offset+Buffer_Offset+Element_TotalSize_Get(), "AVI");
     }
@@ -2363,6 +2518,69 @@
 }
 
 //---------------------------------------------------------------------------
+void File_Riff::AVI__PrmA()
+{
+    Element_Name("Adobe Premiere PrmA");
+
+    //Parsing
+    Skip_C4(                                                    "FourCC");
+    Skip_B4(                                                    "Size");
+    Skip_B4(                                                    "Unknown");
+    Skip_B4(                                                    "Width");
+    Skip_B4(                                                    "Height");
+}
+
+//---------------------------------------------------------------------------
+void File_Riff::AVI__Tdat()
+{
+    Element_Name("Adobe Premiere Tdat");
+}
+
+//---------------------------------------------------------------------------
+void File_Riff::AVI__Tdat_tc_A()
+{
+    Element_Name("tc_A");
+
+    //Parsing
+    Ztring Value;
+    Get_Local(Element_Size, Value,                              "Unknown");
+
+    if (Value.find_first_not_of(__T("0123456789:;"))==string::npos)
+        Tdat_tc_A=Value;
+}
+
+//---------------------------------------------------------------------------
+void File_Riff::AVI__Tdat_tc_O()
+{
+    Element_Name("tc_O");
+
+    //Parsing
+    Ztring Value;
+    Get_Local(Element_Size, Value,                              "Unknown");
+
+    if (Value.find_first_not_of(__T("0123456789:;"))==string::npos)
+        Tdat_tc_O=Value;
+}
+
+//---------------------------------------------------------------------------
+void File_Riff::AVI__Tdat_rn_A()
+{
+    Element_Name("rn_A");
+
+    //Parsing
+    Skip_Local(Element_Size,                                    "Unknown");
+}
+
+//---------------------------------------------------------------------------
+void File_Riff::AVI__Tdat_rn_O()
+{
+    Element_Name("rn_O");
+
+    //Parsing
+    Skip_Local(Element_Size,                                    "Unknown");
+}
+
+//---------------------------------------------------------------------------
 void File_Riff::AVI__xxxx()
 {
     Stream_ID=(int32u)(Element_Code&0xFFFF0000);
@@ -2427,10 +2645,21 @@
 {
     Element_Name("CMP4 - ADPCM");
 
+    //Testing if we have enough data
+    if (Element_Size<4)
+    {
+        Element_WaitForMoreData();
+        return;
+    }
+
     //Parsing
     int32u Codec;
     Get_C4 (Codec,                                              "Codec");
-    Skip_XX(Element_TotalSize_Get()-Element_Offset,             "Data");
+    #if MEDIAINFO_TRACE
+        if (Trace_Activated)
+            Param("Data", Ztring("(")+Ztring::ToZtring(Element_TotalSize_Get()-Element_Offset)+Ztring(" bytes)"));
+    #endif //MEDIAINFO_TRACE
+    Element_Offset=Element_TotalSize_Get(); //Not using Skip_XX() because we want to skip data we don't have, and Skip_XX() does a test on size of buffer
 
     FILLING_BEGIN();
         Stream_Prepare(Stream_Audio);
@@ -2441,33 +2670,103 @@
 }
 
 //---------------------------------------------------------------------------
+void File_Riff::CDDA()
+{
+    Element_Name("Compact Disc for Digital Audio");
+
+    //Filling
+    Accept("CDDA");
+}
+
+//---------------------------------------------------------------------------
+void File_Riff::CDDA_fmt_()
+{
+    //Specs: http://fr.wikipedia.org/wiki/Compact_Disc_Audio_track
+    //Specs: http://www.moon-soft.com/program/FORMAT/sound/cda.htm
+
+    Element_Name("Stream format");
+
+    //Parsing
+    int32u id;
+    int16u Version, tracknb=1;
+    int8u TPositionF=0, TPositionS=0, TPositionM=0, TDurationF=0, TDurationS=0, TDurationM=0;
+    Get_L2 (Version,                                            "Version"); // Always 1
+    if (Version!=1)
+    {
+        //Not supported
+        Skip_XX(Element_Size-2,                                 "Data");
+        return;
+    }
+    Get_L2 (tracknb,                                            "Number"); // Start at 1
+    Get_L4 (id,                                                 "id");
+    Skip_L4(                                                    "offset"); // in frames //Priority of FSM format
+    Skip_L4(                                                    "Duration"); // in frames //Priority of FSM format
+    Get_L1 (TPositionF,                                         "Track_PositionF"); // in frames
+    Get_L1 (TPositionS,                                         "Track_PositionS"); // in seconds
+    Get_L1 (TPositionM,                                         "Track_PositionM"); // in minutes
+    Skip_L1(                                                    "empty");
+    Get_L1 (TDurationF,                                         "Track_DurationF"); // in frames
+    Get_L1 (TDurationS,                                         "Track_DurationS"); // in seconds
+    Get_L1 (TDurationM,                                         "Track_DurationM"); // in minutes
+    Skip_L1(                                                    "empty");
+
+    FILLING_BEGIN();
+        int32u TPosition=TPositionM*60*75+TPositionS*75+TPositionF;
+        int32u TDuration=TDurationM*60*75+TDurationS*75+TDurationF;
+
+        Fill(Stream_General, 0, General_Track_Position, tracknb);
+        Fill(Stream_General, 0, General_Format, "CDDA");
+        Fill(Stream_General, 0, General_Format_Info, "Compact Disc for Digital Audio");
+        Fill(Stream_General, 0, General_UniqueID, id);
+        Fill(Stream_General, 0, General_FileSize, File_Size+TDuration*2352, 10, true);
+
+        Stream_Prepare(Stream_Audio);
+        Fill(Stream_Audio, 0, Audio_Format, "PCM");
+        Fill(Stream_Audio, 0, Audio_Format_Settings_Endianness, "Little");
+        Fill(Stream_Audio, 0, Audio_BitDepth, 16);
+        Fill(Stream_Audio, 0, Audio_Channel_s_, 2);
+        Fill(Stream_Audio, 0, Audio_SamplingRate, 44100);
+        Fill(Stream_Audio, 0, Audio_FrameRate, 75);
+        Fill(Stream_Audio, 0, Audio_BitRate, 1411200);
+        Fill(Stream_Audio, 0, Audio_Compression_Mode, "Lossless");
+        Fill(Stream_Audio, 0, Audio_FrameCount, TDuration);
+        Fill(Stream_Audio, 0, Audio_Duration, float32_int32s(((float32)TDuration)*1000/75));
+        Fill(Stream_Audio, 0, Audio_Delay, float32_int32s(((float32)TPosition)*1000/75));
+
+        //No more need data
+        Finish("CDDA");
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
 void File_Riff::CMJP()
 {
-    Element_Name("CMP4 - M-JPEG");
+    Element_Name("CMP4 - JPEG");
 
     //Parsing
     #ifdef MEDIAINFO_JPEG_YES
         Stream_ID=0;
-        Stream[Stream_ID].Parser=new File_Jpeg;
-        Open_Buffer_Init(Stream[Stream_ID].Parser);
-        ((File_Jpeg*)Stream[Stream_ID].Parser)->StreamKind=Stream_Video;
-        Open_Buffer_Continue(Stream[Stream_ID].Parser);
-        Element_Offset=Element_Size;
-        Skip_XX(Element_TotalSize_Get()-Element_Offset,         "Other data");
+        File_Jpeg* Parser=new File_Jpeg;
+        Open_Buffer_Init(Parser);
+        Parser->StreamKind=Stream_Video;
+        Open_Buffer_Continue(Parser);
+        Element_Offset=Element_TotalSize_Get(); //Not using Skip_XX() because we want to skip data we don't have, and Skip_XX() does a test on size of buffer
 
         FILLING_BEGIN();
             Stream_Prepare(Stream_Video);
             Fill(Stream_Video, StreamPos_Last, Video_StreamSize, Element_TotalSize_Get());
-            Finish(Stream[Stream_ID].Parser);
-            Merge(*Stream[Stream_ID].Parser, StreamKind_Last, 0, StreamPos_Last);
+            Finish(Parser);
+            Merge(*Parser, StreamKind_Last, 0, StreamPos_Last);
         FILLING_END();
+
+        Stream[Stream_ID].Parsers.push_back(Parser);
     #else
-        Skip_XX(Element_TotalSize_Get(),                        "Data");
+        Element_Offset=Element_TotalSize_Get(); //Not using Skip_XX() because we want to skip data we don't have, and Skip_XX() does a test on size of buffer
 
         FILLING_BEGIN();
             Stream_Prepare(Stream_Video);
-            Fill(Stream_Video, StreamKind_Last, Video_Format, "M-JPEG");
-            Fill(Stream_Video, StreamKind_Last, Video_StreamSize, Element_TotalSize_Get());
+            Fill(Stream_Video, StreamPos_Last, Video_Format, "JPEG");
+            Fill(Stream_Video, StreamPos_Last, Video_StreamSize, Element_TotalSize_Get());
         FILLING_END();
     #endif
 }
@@ -2542,7 +2841,11 @@
     Element_Name("Junk");
 
     //Parse
-    Skip_XX(Element_TotalSize_Get(),                            "Junk");
+    #if MEDIAINFO_TRACE
+        if (Trace_Activated)
+            Param("Junk", Ztring("(")+Ztring::ToZtring(Element_TotalSize_Get())+Ztring(" bytes)"));
+    #endif //MEDIAINFO_TRACE
+    Element_Offset=Element_TotalSize_Get(); //Not using Skip_XX() because we want to skip data we don't have, and Skip_XX() does a test on size of buffer
 }
 
 //---------------------------------------------------------------------------
@@ -2580,7 +2883,11 @@
     Element_Name("MIDI Track");
 
     //Parsing
-    Skip_XX(Element_TotalSize_Get(),                            "Data");
+    #if MEDIAINFO_TRACE
+        if (Trace_Activated)
+            Param("Data", Ztring("(")+Ztring::ToZtring(Element_TotalSize_Get())+Ztring(" bytes)"));
+    #endif //MEDIAINFO_TRACE
+    Element_Offset=Element_TotalSize_Get(); //Not using Skip_XX() because we want to skip data we don't have, and Skip_XX() does a test on size of buffer
 
     FILLING_BEGIN();
         Stream_Prepare(Stream_Audio);
@@ -2630,14 +2937,14 @@
     Get_L2 (block_size,                                         "block-size");
     Get_L2 (sampling_rate,                                      "sampling-rate");
     Get_L2 (sample_size,                                        "sample-size");
-    Element_Begin("rate-map-table");
+    Element_Begin1("rate-map-table");
         Get_L4 (num_rates,                                      "num-rates");
         for (int32u rate=0; rate<num_rates; rate++)
         {
             Skip_L2(                                            "rate-size");
             Skip_L2(                                            "rate-octet");
         }
-    Element_End();
+    Element_End0();
     Skip_L4(                                                    "Reserved");
     Skip_L4(                                                    "Reserved");
     Skip_L4(                                                    "Reserved");
@@ -2657,7 +2964,7 @@
         }
         Fill(Stream_Audio, 0, Audio_BitRate, average_bps);
         Fill(Stream_Audio, 0, Audio_SamplingRate, sampling_rate);
-        Fill(Stream_Audio, 0, Audio_Resolution, sample_size);
+        Fill(Stream_Audio, 0, Audio_BitDepth, sample_size);
         Fill(Stream_Audio, 0, Audio_Channel_s_, 1);
     FILLING_END();
 }
@@ -2670,15 +2977,12 @@
     Element_Name("Ancillary media packets");
 
     //Filling
-    Fill(Stream_General, 0, General_Format, "Ancillary media packets"); //GXF, RDD14-2007
+    if (Retrieve(Stream_General, 0, General_Format).empty())
+        Fill(Stream_General, 0, General_Format, "Ancillary media packets"); //GXF, RDD14-2007
 
     //Clearing old data
-    for (size_t Pos=0; Pos<Cdp_Data->size(); Pos++)
-        delete (*Cdp_Data)[Pos]; //(*Cdp_Data)[0]=NULL;
-    Cdp_Data->clear();
-    for (size_t Pos=0; Pos<AfdBarData_Data->size(); Pos++)
-        delete (*AfdBarData_Data)[Pos]; //(*AfdBarData_Data)[0]=NULL;
-    AfdBarData_Data->clear();
+    if (Ancillary)
+        Open_Buffer_Continue(*Ancillary, Buffer, 0);
 }
 
 //---------------------------------------------------------------------------
@@ -2728,119 +3032,11 @@
 {
     Element_Name("Ancillary data sample payload");
 
-    Element_Begin("Decoding");
-    //Parsing
-    int8u DataID, SecondaryDataID, DataCount;
-    Get_L1 (DataID,                                             "Data ID");
-    Skip_L1(                                                    "Parity+Unused"); //even:1, odd:2
-    Get_L1 (SecondaryDataID,                                    "Secondary Data ID"); Param_Info(Riff_Rcrd_DataServices(DataID, SecondaryDataID));
-    Skip_L1(                                                    "Parity+Unused"); //even:1, odd:2
-    Get_L1 (DataCount,                                          "Data count");
-    Skip_L1(                                                    "Parity+Unused"); //even:1, odd:2
-
-    //Buffer
-    int8u* Payload=new int8u[DataCount];
-    for(int8u Pos=0; Pos<DataCount; Pos++)
+    if (Ancillary)
     {
-        Get_L1 (Payload[Pos],                                   "Data");
-        Skip_L1(                                                "CRC+Unused"); //even:1, odd:2
+        (*Ancillary)->FrameInfo.DTS=FrameInfo.DTS;
+        Open_Buffer_Continue(*Ancillary);
     }
-
-    //Parsing
-    Skip_L1(                                                    "Checksum");
-    Skip_L1(                                                    "Parity+Unused"); //even:1, odd:2
-    Element_End();
-
-    FILLING_BEGIN();
-        if (DataID>=rcrd_Parsers.size())
-            rcrd_Parsers.resize(DataID+1);
-        if (SecondaryDataID>=rcrd_Parsers[DataID].size())
-            rcrd_Parsers[DataID].resize(SecondaryDataID+1);
-        if (rcrd_Parsers[DataID][SecondaryDataID]==NULL)
-        {
-            switch (DataID)
-            {
-                case 0x41 : // (from SMPTE 2016-3)
-                            switch (SecondaryDataID)
-                            {
-                                case 0x05 : //Bar Data (from SMPTE 2016-3), saving data for future use
-                                            #if defined(MEDIAINFO_AFDBARDATA_YES)
-                                            if (AfdBarData_Data)
-                                            {
-                                                buffered_data* AfdBarData=new buffered_data;
-                                                AfdBarData->Data=new int8u[(size_t)DataCount];
-                                                std::memcpy(AfdBarData->Data, Payload, (size_t)DataCount);
-                                                AfdBarData->Size=(size_t)DataCount;
-                                                AfdBarData_Data->push_back(AfdBarData);
-                                            }
-                                            #endif //MEDIAINFO_AFDBARDATA_YES
-                                            break;
-                                default   : ;
-                                ;
-                            }
-                            break;
-                case 0x45 : // (from SMPTE 2020-1)
-                            switch (SecondaryDataID)
-                            {
-                                case 0x01 : //No association
-                                case 0x02 : //Channel pair 1/2
-                                case 0x03 : //Channel pair 3/4
-                                case 0x04 : //Channel pair 5/6
-                                case 0x05 : //Channel pair 7/8
-                                case 0x06 : //Channel pair 9/10
-                                case 0x07 : //Channel pair 11/12
-                                case 0x08 : //Channel pair 13/14
-                                case 0x09 : //Channel pair 15/16
-                                            break;
-                                default   : ;
-                                ;
-                            }
-                            break;
-                case 0x61 : //Defined data services (from SMPTE 331-1)
-                            switch (SecondaryDataID)
-                            {
-                                case 0x01 : //CDP (from SMPTE 331-1), saving data for future use
-                                            #if defined(MEDIAINFO_CDP_YES)
-                                            if (Cdp_Data)
-                                            {
-                                                buffered_data* Cdp=new buffered_data;
-                                                Cdp->Data=new int8u[(size_t)DataCount];
-                                                std::memcpy(Cdp->Data, Payload, (size_t)DataCount);
-                                                Cdp->Size=(size_t)DataCount;
-                                                Cdp_Data->push_back(Cdp);
-                                            }
-                                            #endif //MEDIAINFO_CDP_YES
-                                            break;
-                                case 0x02 : //CEA-608 (from SMPTE 331-1)
-                                            #if defined(MEDIAINFO_EIA608_YES)
-                                            if (DataCount==3) //This must be 3-byte data
-                                            {
-                                                //CEA-608 in video presentation order
-                                            }
-                                            #endif //MEDIAINFO_EIA608_YES
-                                            break;
-                                default   : ;
-                                ;
-                            }
-                            break;
-                case 0x62 : //Variable-format data services (from SMPTE 331-1)
-                            switch (SecondaryDataID)
-                            {
-                                case 0x01 : //Program description (from SMPTE 331-1),
-                                            break;
-                                case 0x02 : //Data broadcast (from SMPTE 331-1)
-                                            break;
-                                case 0x03 : //VBI data (from SMPTE 331-1)
-                                            break;
-                                default   : ;
-                                ;
-                            }
-                            break;
-                default   : ;
-            }
-        }
-    FILLING_END();
-    delete[] Payload; //Payload=NULL
 }
 
 //---------------------------------------------------------------------------
@@ -2891,6 +3087,7 @@
 
     //Filling
     Fill(Stream_General, 0, General_Format, "RMP3");
+    Kind=Kind_Rmp3;
 }
 
 //---------------------------------------------------------------------------
@@ -2898,20 +3095,45 @@
 {
     Element_Name("Raw datas");
 
+    FILLING_BEGIN();
+        Fill(Stream_Audio, 0, Audio_StreamSize, Buffer_DataToParse_End-Buffer_DataToParse_Begin);
+    FILLING_END();
+
     //Parsing
-    #if defined(MEDIAINFO_MPEGA_YES)
-        File_Mpega MI;
-        Open_Buffer_Init(&MI);
-        Open_Buffer_Continue(&MI);
-        Finish(&MI);
-        Merge(MI, Stream_Audio, 0, 0);
-    #else
+    Element_Code=0x30307762; //00wb
+
+    //Creating parser
+    #if defined(MEDIAINFO_AAC_YES)
+        File_Mpega* Parser=new File_Mpega;
+        Parser->CalculateDelay=true;
+        Parser->ShouldContinueParsing=true;
+        Open_Buffer_Init(Parser);
+        Stream[0x30300000].StreamKind=Stream_Audio;
+        Stream[0x30300000].StreamPos=0;
+        Stream[0x30300000].Parsers.push_back(Parser);
         Stream_Prepare(Stream_Audio);
-        Fill(Stream_Audio, 0, Audio_Codec, "MPEG1/2 Audio");
+    #else //MEDIAINFO_MPEG4_YES
+        Skip_XX(Element_Size-Element_Offset,                    "(AudioSpecificConfig)");
     #endif
 
-    //Positionning
-    Element_Offset+=Element_TotalSize_Get()-Element_Size;
+    #if MEDIAINFO_DEMUX
+        if (Config->NextPacket_Get() && Config->Event_CallBackFunction_IsSet())
+            Config->Demux_EventWasSent=true; //First set is to indicate the user that header is parsed
+    #endif //MEDIAINFO_DEMUX
+}
+
+//---------------------------------------------------------------------------
+void File_Riff::RMP3_data_Continue()
+{
+    #if MEDIAINFO_DEMUX
+        if (Element_Size)
+        {
+            Demux_random_access=true;
+            Demux(Buffer+Buffer_Offset, (size_t)Element_Size, ContentType_MainStream);
+        }
+    #endif //MEDIAINFO_DEMUX
+
+    AVI__movi_xxxx();
 }
 
 //---------------------------------------------------------------------------
@@ -2976,8 +3198,8 @@
         SMV_FrameCount++;
         Fill(Stream_General, 0, General_Format_Profile, "SMV v2");
         Stream_Prepare(Stream_Video);
-        Fill(Stream_Video, 0, Video_Format, "M-JPEG");
-        Fill(Stream_Video, 0, Video_Codec,  "M-JPEG");
+        Fill(Stream_Video, 0, Video_Format, "JPEG");
+        Fill(Stream_Video, 0, Video_Codec,  "JPEG");
         Fill(Stream_Video, 0, Video_MuxingMode, "SMV v2");
         Fill(Stream_Video, 0, Video_Width, Width);
         Fill(Stream_Video, 0, Video_Height, Height);
@@ -3028,6 +3250,8 @@
 
     //Filling
     Fill(Stream_General, 0, General_Format, "Wave");
+    Fill(Stream_Audio, 0, Audio_Format_Settings_Endianness, "Little");
+    Kind=Kind_Wave;
 }
 
 //---------------------------------------------------------------------------
@@ -3055,11 +3279,11 @@
     Element_Name("Broadcast extension");
 
     //Parsing
-    Ztring Description, Originator, OriginationDate, OriginationTime, History;
+    Ztring Description, Originator, OriginatorReference, OriginationDate, OriginationTime, History;
     int16u Version;
     Get_Local(256, Description,                                 "Description");
     Get_Local( 32, Originator,                                  "Originator");
-    Skip_Local(32,                                              "OriginatorReference");
+    Get_Local( 32, OriginatorReference,                         "OriginatorReference");
     Get_Local( 10, OriginationDate,                             "OriginationDate");
     Get_Local(  8, OriginationTime,                             "OriginationTime");
     Get_L8   (     TimeReference,                               "TimeReference"); //To be divided by SamplesPerSec
@@ -3073,8 +3297,14 @@
     FILLING_BEGIN();
         Fill(Stream_General, 0, General_Description, Description);
         Fill(Stream_General, 0, General_Producer, Originator);
-        Fill(Stream_General, 0, General_Encoded_Date, _T("UTC ")+OriginationDate+_T(' ')+OriginationTime);
+        Fill(Stream_General, 0, "Producer_Reference", OriginatorReference);
+        Fill(Stream_General, 0, General_Encoded_Date, OriginationDate+__T(' ')+OriginationTime);
         Fill(Stream_General, 0, General_Encoded_Library_Settings, History);
+        if (SamplesPerSec && TimeReference!=(int64u)-1)
+        {
+            Fill(Stream_Audio, 0, Audio_Delay, float64_int64s(((float64)TimeReference)*1000/SamplesPerSec));
+            Fill(Stream_Audio, 0, Audio_Delay_Source, "Container (bext)");
+        }
     FILLING_END();
 }
 
@@ -3088,14 +3318,14 @@
     Get_L4(numCuePoints,                                        "numCuePoints");
     for (int32u Pos=0; Pos<numCuePoints; Pos++)
     {
-        Element_Begin("Cue point");
+        Element_Begin1("Cue point");
         Skip_L4(                                                "ID");
         Skip_L4(                                                "Position");
         Skip_C4(                                                "DataChunkID");
         Skip_L4(                                                "ChunkStart");
         Skip_L4(                                                "BlockStart");
         Skip_L4(                                                "SampleOffset");
-        Element_End();
+        Element_End0();
     }
 }
 
@@ -3104,28 +3334,27 @@
 {
     Element_Name("Raw datas");
 
+    /*
     if (Element_TotalSize_Get()<100)
     {
         Skip_XX(Element_Size,                                   "Unknown");
         return; //This is maybe embeded in another container, and there is only the header (What is the junk?)
     }
+    */
 
     FILLING_BEGIN();
-        Fill(Stream_Audio, 0, Audio_StreamSize, Element_TotalSize_Get());
+        Fill(Stream_Audio, 0, Audio_StreamSize, Buffer_DataToParse_End-Buffer_DataToParse_Begin);
     FILLING_END();
 
     //Parsing
     Element_Code=CC4("00wb");
-    AVI__movi_xxxx();
-    if (File_GoTo==(int64u)-1)
-        Skip_XX(Element_TotalSize_Get()-Element_Offset,         "Data");
 
     FILLING_BEGIN();
         int64u Duration=Retrieve(Stream_Audio, 0, Audio_Duration).To_int64u();
         int64u BitRate=Retrieve(Stream_Audio, 0, Audio_BitRate).To_int64u();
         if (Duration)
         {
-            int64u BitRate_New=Element_TotalSize_Get()*8*1000/Duration;
+            int64u BitRate_New=(Buffer_DataToParse_End-Buffer_DataToParse_Begin)*8*1000/Duration;
             if (BitRate_New<BitRate*0.95 || BitRate_New>BitRate*1.05)
                 Fill(Stream_Audio, 0, Audio_BitRate, BitRate_New, 10, true); //Correcting the bitrate, it was false in the header
         }
@@ -3135,10 +3364,30 @@
                 //Retrieving "data" real size, in case of truncated files and/or wave header in another container
                 Duration=((int64u)LittleEndian2int32u(Buffer+Buffer_Offset-4))*8*1000/BitRate; //TODO: RF64 is not handled
             else
-                Duration=Element_TotalSize_Get()*8*1000/BitRate;
+                Duration=(Buffer_DataToParse_End-Buffer_DataToParse_Begin)*8*1000/BitRate;
+            Fill(Stream_General, 0, General_Duration, Duration, 10, true);
             Fill(Stream_Audio, 0, Audio_Duration, Duration, 10, true);
         }
     FILLING_END();
+
+    #if MEDIAINFO_DEMUX
+        if (Config->NextPacket_Get() && Config->Event_CallBackFunction_IsSet())
+            Config->Demux_EventWasSent=true; //First set is to indicate the user that header is parsed
+    #endif //MEDIAINFO_DEMUX
+}
+
+//---------------------------------------------------------------------------
+void File_Riff::WAVE_data_Continue()
+{
+    #if MEDIAINFO_DEMUX
+        if (Element_Size)
+        {
+            Demux_random_access=true;
+            Demux(Buffer+Buffer_Offset, (size_t)Element_Size, ContentType_MainStream);
+        }
+    #endif //MEDIAINFO_DEMUX
+
+    AVI__movi_xxxx();
 }
 
 //---------------------------------------------------------------------------
@@ -3280,10 +3529,10 @@
     Get_L4 (TrackPos,                                           "Track_Position");
     if(Element_Offset+8<Element_Size)
         Skip_XX(Element_Size-Element_Offset,                    "Unknown");
-    Element_Begin("Footer");
+    Element_Begin1("Footer");
         Skip_L4(                                                "Size");
         Skip_C4(                                                "Name");
-    Element_End();
+    Element_End0();
 
     //Filling
     Fill(Stream_General, 0, General_Track, Title);

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Rm.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Rm.cpp Changed

@@ -1,31 +1,35 @@
 // File_Rm - Info for Real Media files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_RM_YES)
 //---------------------------------------------------------------------------
 
@@ -84,7 +88,7 @@
     if (FromMKV_StreamType!=Stream_Max)
     {
         //Filling
-        Header_Fill_Code(0, _T("Real Media Header"));
+        Header_Fill_Code(0, __T("Real Media Header"));
         Header_Fill_Size(Element_Size);
         return;
     }
@@ -236,14 +240,14 @@
     Skip_B4(                                                    "next_data_header"); //Offset from start of file to the next data chunk. A non-zero value refers to the file offset of the next data chunk. A value of zero means there are no more data chunks in this file. This field is not typically used.
     for (int32u Pos=0; Pos<num_packets; Pos++)
     {
-        Element_Begin("packet");
+        Element_Begin1("packet");
         Get_B2 (Version,                                        "object_version");
         INTEGRITY_VERSION(1);
         Get_B2 (length,                                         "length"); //The length of the packet in bytes.
         if (Version==0)
-            Element_Info("Media_Packet_Header");
+            Element_Info1("Media_Packet_Header");
         else
-            Element_Info("Media_Packet_Header");
+            Element_Info1("Media_Packet_Header");
         Skip_B2(                                                "stream_number"); //The 16-bit alias used to associate data packets with their associated Media Properties Header.
         Skip_B4(                                                "timestamp"); //The time stamp of the packet in milliseconds.
         if (Version==0)
@@ -267,10 +271,10 @@
         if (Pos>10)
         {
             Pos=num_packets;
-            Element_Info("(...)");
+            Element_Info1("(...)");
         }
 
-        Element_End();
+        Element_End0();
     }
     */
 }
@@ -287,14 +291,14 @@
     Skip_B4(                                                    "next_index_header"); //Offset from start of file to the next index chunk. This member enables RealMedia file format readers to find all the index chunks quickly. A value of zero for this member indicates there are no more index headers in this file.
     for (int32u Pos=0; Pos<num_indices; Pos++)
     {
-        Element_Begin("index", 14);
+        Element_Begin1("index");
         Get_B2 (Version,                                        "object_version");
         INTEGRITY_VERSION(0);
-        Element_Info("Media_Packet_Header");
+        Element_Info1("Media_Packet_Header");
         Skip_B4(                                                "timestamp"); //The time stamp (in milliseconds) associated with this record.
         Skip_B4(                                                "offset"); //The offset from the start of the file at which this packet can be found.
         Skip_B4(                                                "packet_count_for_this_packet"); //The packet number of the packet for this record. This is the same number of packets that would have been seen had the file been played from the beginning to this point.
-        Element_End();
+        Element_End0();
     }
 }
 
@@ -325,10 +329,9 @@
     Get_B4 (type_specific_len,                                  "type_specific_len"); //The length of the following type_specific_data in bytes
 
     //Parsing TypeSpecific
-    Element_Info(mime_type.c_str());
+    Element_Info1(mime_type.c_str());
     MDPR_IsStream=true;
-         if (0);
-    else if (mime_type=="audio/x-pn-multirate-realaudio")
+         if (mime_type=="audio/x-pn-multirate-realaudio")
         MDPR_IsStream=false; //What do we with this?
     else if (mime_type=="audio/X-MP3-draft-00")
     {
@@ -389,7 +392,8 @@
         {
             Fill(StreamKind_Last, StreamPos_Last, General_ID, stream_number);
             Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_BitRate), avg_bit_rate, 10, true);
-            Fill(StreamKind_Last, StreamPos_Last, "Delay", start_time);
+            Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Delay), start_time);
+            Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Delay_Source), "Container");
             Fill(StreamKind_Last, StreamPos_Last, Fill_Parameter(StreamKind_Last, Generic_Duration), duration);
         }
     FILLING_END();
@@ -423,7 +427,12 @@
     Fill(Stream_Video, StreamPos_Last, Video_Codec, Ztring().From_CC4(Codec));
     Fill(Stream_Video, StreamPos_Last, Video_Width, Width); //Width
     Fill(Stream_Video, StreamPos_Last, Video_Height, Height); //Height
-    Fill(Stream_Video, StreamPos_Last, Video_FrameRate, (float)FrameRate); //FrameRate
+    switch (FrameRate)
+    {
+        case 23 : Fill(Stream_Video, StreamPos_Last, Video_FrameRate, ((float)24)*1000/1001); break; //Hard-coded frame rate?
+        case 29 : Fill(Stream_Video, StreamPos_Last, Video_FrameRate, ((float)30)*1000/1001); break; //Hard-coded frame rate?
+        default : Fill(Stream_Video, StreamPos_Last, Video_FrameRate, (float)FrameRate);
+    }
 }
 
 //---------------------------------------------------------------------------
@@ -552,7 +561,7 @@
         Fill(Stream_Audio, StreamPos_Last, Audio_Codec, Ztring().From_CC4(FourCC5));
     }
     Fill(Stream_Audio, StreamPos_Last, Audio_SamplingRate, Samplerate);
-    Fill(Stream_Audio, StreamPos_Last, Audio_Resolution, Samplesize);
+    Fill(Stream_Audio, StreamPos_Last, Audio_BitDepth, Samplesize);
     Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, Channels);
     if (BytesPerMinute)
         Fill(Stream_Audio, StreamPos_Last, Audio_BitRate, BytesPerMinute*8/60, 10, true);
@@ -582,7 +591,7 @@
     //Parsing
     for (int16u Pos=0; Pos<num_properties; Pos++)
     {
-        Element_Begin("property");
+        Element_Begin1("property");
         std::string name;
         int32u size, type;
         int16u value_length;
@@ -602,7 +611,7 @@
                 Skip_Local(value_length,                        "value_data"); break; //string
             default : Skip_XX(value_length,                     "unknown");
         }
-        Element_End(size);
+        Element_End0();
     }
 }
 
@@ -657,7 +666,7 @@
     Ztring value;
     std::string name;
     int32u type, flags, num_subproperties, name_length, value_length;
-    Element_Begin("MetadataProperty");
+    Element_Begin1("MetadataProperty");
     Skip_B4(                                                    "size");
     Get_B4 (type,                                               "type");
     Get_B4 (flags,                                              "flags");
@@ -741,17 +750,17 @@
     //Parsing
     for (int32u Pos=0; Pos<num_subproperties; Pos++)
     {
-        Element_Begin("PropListEntry");
+        Element_Begin1("PropListEntry");
         Skip_B4(                                                "offset"); //The offset for this indexed sub-property, relative to the beginning of the containing MetadataProperty.
         Skip_B4(                                                "num_props_for_name"); //The number of sub-properties that share the same name. For example, a lyrics property could have multiple versions as differentiated by the language sub-property type descriptor.
-        Element_End();
+        Element_End0();
     }
     for (int32u Pos=0; Pos<num_subproperties; Pos++)
     {
         RJMD_property(Name);
     }
 
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Rm.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Rm.h Changed

@@ -1,17 +1,17 @@
 // File_Rm - Info for Real Media files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_SequenceInfo.cpp Added

@@ -0,0 +1,258 @@
+// File_SequenceInfo - Info for XML files starting with SEQUENCEINFO
+// Copyright (C) 2012-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_SEQUENCEINFO_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Multiple/File_SequenceInfo.h"
+#include "MediaInfo/MediaInfo.h"
+#include "MediaInfo/MediaInfo_Internal.h"
+#include "MediaInfo/Multiple/File__ReferenceFilesHelper.h"
+#include "ZenLib/File.h"
+#include "ZenLib/Dir.h"
+#include "ZenLib/FileName.h"
+#include "ZenLib/Format/Http/Http_Utils.h"
+#include "tinyxml2.h"
+using namespace tinyxml2;
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File_SequenceInfo::File_SequenceInfo()
+:File__Analyze()
+{
+    #if MEDIAINFO_DEMUX
+        Demux_EventWasSent_Accept_Specific=true;
+    #endif //MEDIAINFO_DEMUX
+
+    //Temp
+    ReferenceFiles=NULL;
+}
+
+//---------------------------------------------------------------------------
+File_SequenceInfo::~File_SequenceInfo()
+{
+    delete ReferenceFiles; //ReferenceFiles=NULL;
+}
+
+//***************************************************************************
+// Streams management
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_SequenceInfo::Streams_Finish()
+{
+    if (ReferenceFiles==NULL)
+        return;
+
+    ReferenceFiles->ParseReferences();
+}
+
+//***************************************************************************
+// Buffer - Global
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_SEEK
+size_t File_SequenceInfo::Read_Buffer_Seek (size_t Method, int64u Value, int64u ID)
+{
+    if (ReferenceFiles==NULL)
+        return 0;
+
+    return ReferenceFiles->Read_Buffer_Seek(Method, Value, ID);
+}
+#endif //MEDIAINFO_SEEK
+
+//***************************************************************************
+// Buffer - File header
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_SequenceInfo::FileHeader_Begin()
+{
+    XMLDocument document;
+    if (!FileHeader_Begin_XML(document))
+       return false;
+
+    {
+        XMLElement* Root=document.FirstChildElement("SEQUENCEINFO");
+        if (Root)
+        {
+            Accept("SequenceInfo");
+            Fill(Stream_General, 0, General_Format, "SequenceInfo");
+
+            ReferenceFiles=new File__ReferenceFilesHelper(this, Config);
+
+            File__ReferenceFilesHelper::reference ReferenceFile;
+            ReferenceFile.StreamKind=Stream_Video;
+
+            FileName FN(File_Name);
+            Ztring Base=FN.Path_Get();
+            size_t Pos=Base.rfind(PathSeparator);
+            if (Pos!=string::npos)
+            {
+                Ztring ToAdd=Base.substr(Pos, string::npos);
+                Pos=ToAdd.rfind(__T('_'));
+                Ztring DirectoryBase=Base;
+                DirectoryBase+=ToAdd;
+                DirectoryBase+=__T('_');
+
+                size_t DirNumberCount=1;
+                Ztring Directory=DirectoryBase;
+                for (; DirNumberCount<9; DirNumberCount++)
+                {
+                    Directory+=__T('0');
+                    if (Dir::Exists(Directory))
+                        break;
+                }
+
+                if (DirNumberCount<9)
+                {
+                    int32u DirNumber=0;
+                    do
+                    {
+                        Ztring Number=Ztring::ToZtring(DirNumber);
+                        if (Number.size()<DirNumberCount)
+                            Number.insert(0, DirNumberCount-Number.size(), __T('0'));
+
+                        Directory=DirectoryBase;
+                        Directory+=Number;
+                        if (!Dir::Exists(Directory))
+                            break;
+
+                        Ztring FileBase=Directory;
+                        FileBase+=ToAdd;
+                        FileBase+=__T('_');
+                        FileBase+=__T('.');
+
+                        size_t FileNumberCount=1;
+                        Ztring FullFile=FileBase;
+                        Ztring Extension;
+                        for (; FileNumberCount<10; FileNumberCount++)
+                        {
+                            FullFile.insert(FullFile.begin()+FullFile.size()-Extension.size()-1, __T('0'));
+                            if (Extension.empty())
+                            {
+                                ZtringList List=Dir::GetAllFileNames(FullFile+__T('*'));
+                                if (List.size()>=2)
+                                {
+                                    FileNumberCount=(size_t)-1; //Problem, which one to choose?
+                                    break;
+                                }
+                                else if (List.size()==1)
+                                {
+                                    FileName Temp(List[0]);
+                                    Extension=Temp.Extension_Get();
+                                    FileBase+=Extension;
+                                    FullFile=FileBase;
+                                    break;
+                                }
+                            }
+                            else if (File::Exists(FullFile))
+                                    break;
+                        }
+                        bool FromZero=true;
+                        if (FileNumberCount>=9)
+                        {
+                            //Trying with consecutive file numbers betweens dirs
+                            Number=Ztring::ToZtring(ReferenceFile.FileNames.size());
+                            FullFile=FileBase;
+                            FullFile.insert(FullFile.size()-Extension.size()-1, Number);
+                            FileNumberCount=Number.size();
+                            if (!File::Exists(FullFile))
+                            {
+                                FileNumberCount++;
+                                for (; FileNumberCount<10; FileNumberCount++)
+                                {
+                                    FullFile.insert(FullFile.begin()+FullFile.size()-Extension.size()-Number.size()-1, __T('0'));
+                                    if (File::Exists(FullFile))
+                                    {
+                                        FromZero=false;
+                                        break;
+                                    }
+                                }
+                            }
+                            else
+                                FromZero=false;
+                        }
+
+                        if (FileNumberCount<9)
+                        {
+                            size_t FileNumber=FromZero?0:ReferenceFile.FileNames.size();
+                            do
+                            {
+                                Number=Ztring::ToZtring(FileNumber);
+                                if (Number.size()<FileNumberCount)
+                                    Number.insert(0, FileNumberCount-Number.size(), __T('0'));
+
+                                FullFile=FileBase;
+                                FullFile.insert(FullFile.size()-Extension.size()-1, Number);
+                                if (!File::Exists(FullFile))
+                                    break;
+
+                                ReferenceFile.FileNames.push_back(FullFile);
+
+                                FileNumber++;
+                            }
+                            while (FileNumber<1000000000);
+                        }
+
+                        DirNumber++;
+                    }
+                    while (DirNumber<1000000000);
+
+                    if (!ReferenceFile.FileNames.empty())
+                        ReferenceFiles->References.push_back(ReferenceFile);
+                }
+            }
+        }
+        else
+        {
+            Reject("SequenceInfo");
+            return false;
+        }
+    }
+
+    //All should be OK...
+    return true;
+}
+
+} //NameSpace
+
+#endif //MEDIAINFO_SEQUENCEINFO_YES

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_SequenceInfo.h Added

@@ -0,0 +1,69 @@
+// File_SequenceInfo - Info for XML files starting with SEQUENCEINFO
+// Copyright (C) 2012-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Information about XML files starting with SEQUENCEINFO
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_File_SequenceInfoH
+#define MediaInfo_File_SequenceInfoH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+#include <vector>
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+class File__ReferenceFilesHelper;
+
+//***************************************************************************
+// Class File_SequenceInfo
+//***************************************************************************
+
+class File_SequenceInfo : public File__Analyze
+{
+public :
+    //Constructor/Destructor
+    File_SequenceInfo();
+    ~File_SequenceInfo();
+
+private :
+    //Streams management
+    void Streams_Finish ();
+
+    //Buffer - Global
+    #if MEDIAINFO_SEEK
+    size_t Read_Buffer_Seek (size_t Method, int64u Value, int64u ID);
+    #endif //MEDIAINFO_SEEK
+
+    //Buffer - File header
+    bool FileHeader_Begin();
+
+    //Temp
+    File__ReferenceFilesHelper*     ReferenceFiles;
+};
+
+} //NameSpace
+
+#endif
+

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Skm.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Skm.cpp Changed

@@ -1,31 +1,35 @@
 // File_Skm - Info for Skm files
-// Copyright (C) 2006-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2006-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_SKM_YES)
 //---------------------------------------------------------------------------
 
@@ -59,8 +63,11 @@
 //---------------------------------------------------------------------------
 void File_Skm::Streams_Finish()
 {
-    Stream.Parser->Finish();
-    Merge(*Stream.Parser);
+    if (Stream.Parser)
+    {
+        Finish(Stream.Parser);
+        Merge(*Stream.Parser);
+    }
 }
 
 //***************************************************************************
@@ -124,7 +131,7 @@
     Skip_B4(                                                    "PreviousTagSize");
     if (File_Offset+Buffer_Offset+4<File_Size)
     {
-        Get_B1 (Type,                                           "Type"); //Param_Info(Type<19?Flv_Type[Type]:_T("Unknown"));
+        Get_B1 (Type,                                           "Type"); //Param_Info1(Type<19?Flv_Type[Type]:__T("Unknown"));
         Get_B3 (BodyLength,                                     "BodyLength");
         Skip_B3(                                                "Timestamp_Base"); //in ms
         Skip_B1(                                                "Timestamp_Extended"); //TimeStamp = Timestamp_Extended*0x01000000+Timestamp_Base

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Skm.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Skm.h Changed

@@ -1,17 +1,17 @@
 // File_Skm - Info for SKM files
-// Copyright (C) 2006-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2006-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Swf.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Swf.cpp Changed

@@ -1,31 +1,35 @@
 // File_Swf - Info for SWF files
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_SWF_YES)
 //---------------------------------------------------------------------------
 
@@ -294,9 +298,6 @@
     Frame_Count_Valid=1024;
     FileLength=0;
     Version=0;
-
-    //Temp
-    Frame_Count=0;
 }
 
 //***************************************************************************
@@ -331,11 +332,11 @@
     int32u Signature;
     if (FileLength==0 && Version==0)
     {
-        Element_Begin("SWF header", 8);
+        Element_Begin1("SWF header");
             Get_C3 (Signature,                                  "Signature");
             Get_L1 (Version,                                    "Version");
             Get_L4 (FileLength,                                 "FileLength");
-        Element_End();
+        Element_End0();
     }
     else
     {
@@ -353,14 +354,15 @@
     //Parsing
     //Parsing - BitStream
     float32 FrameRate;
-    int32u Nbits, Xmin, Xmax, Ymin, Ymax;
+    int32u Xmin, Xmax, Ymin, Ymax;
     int16u FrameCount;
+    int8u  Nbits;
     BS_Begin();
-    Get_BS (5, Nbits,                                           "Nbits");
+    Get_S1 (5, Nbits,                                           "Nbits");
     Get_BS (Nbits, Xmin,                                        "Xmin");
-    Get_BS (Nbits, Xmax,                                        "Xmax"); Param_Info((Xmax-Xmin)/20, " pixels");
+    Get_BS (Nbits, Xmax,                                        "Xmax"); Param_Info2((Xmax-Xmin)/20, " pixels");
     Get_BS (Nbits, Ymin,                                        "Ymin");
-    Get_BS (Nbits, Ymax,                                        "Ymax"); Param_Info((Ymax-Ymin)/20, " pixels");
+    Get_BS (Nbits, Ymax,                                        "Ymax"); Param_Info2((Ymax-Ymin)/20, " pixels");
     BS_End();
     if (Version<=7)
     {
@@ -374,7 +376,7 @@
         int16u FrameRate_8_8;
         Get_L2(FrameRate_8_8,                                   "FrameRate");
         FrameRate=FrameRate_8_8/0x0100+(((float32)(FrameRate_8_8&0x00FF))/0x0100); //8.8 format
-        Param_Info(FrameRate);
+        Param_Info1(FrameRate);
     }
     Get_L2 (FrameCount,                                         "FrameCount");
 
@@ -410,14 +412,14 @@
     Get_L2 (TagCodeAndLength,                                   "TagCodeAndLength");
 
     //Filling
-    int16u Tag=(TagCodeAndLength&0xFFC0)>>6; Param_Info(Tag);
+    int16u Tag=(TagCodeAndLength&0xFFC0)>>6; Param_Info1(Tag);
     Header_Fill_Code(Tag, Ztring().From_Number(Tag, 16));
 
     //Size
     int16u Length=TagCodeAndLength&0x003F;
     if (Length<0x003F)
     {
-        Param_Info(Length, " bytes");
+        Param_Info2(Length, " bytes");
 
         //Filling
         Header_Fill_Size(Element_Offset+Length);
@@ -425,7 +427,7 @@
     else
     {
         int32u Length2;
-        Get_L4(Length2,                                          "Length"); Param_Info(Length2, " bytes");
+        Get_L4(Length2,                                          "Length"); Param_Info2(Length2, " bytes");
 
         //Filling
         Header_Fill_Size(Element_Offset+Length2);
@@ -557,10 +559,10 @@
     int8u  SoundFormat, SoundRate, SoundSize, SoundType;
     Get_L2 (SoundId,                                            "SoundId");
     BS_Begin();
-    Get_S1 (4, SoundFormat,                                     "SoundFormat"); Param_Info(Swf_SoundFormat[SoundFormat]);
-    Get_S1 (2, SoundRate,                                       "SoundRate"); Param_Info(Swf_SoundRate[SoundRate], " Hz");
-    Get_S1 (1, SoundSize,                                       "SoundSize"); Param_Info(Swf_SoundSize[SoundSize], " bits");
-    Get_S1 (1, SoundType,                                       "SoundType"); Param_Info(Swf_SoundType[SoundType], " channel(s)");
+    Get_S1 (4, SoundFormat,                                     "SoundFormat"); Param_Info1(Swf_SoundFormat[SoundFormat]);
+    Get_S1 (2, SoundRate,                                       "SoundRate"); Param_Info2(Swf_SoundRate[SoundRate], " Hz");
+    Get_S1 (1, SoundSize,                                       "SoundSize"); Param_Info2(Swf_SoundSize[SoundSize], " bits");
+    Get_S1 (1, SoundType,                                       "SoundType"); Param_Info2(Swf_SoundType[SoundType], " channel(s)");
     BS_End();
     Skip_L4(                                                    "SoundSampleCount");
     Skip_XX(Element_Size-Element_Offset,                        "SoundData");
@@ -573,7 +575,7 @@
     Fill(Stream_Audio, StreamPos_Last, Audio_Codec, Swf_SoundFormat[SoundFormat]);
     Fill(Stream_Audio, StreamPos_Last, Audio_SamplingRate, Swf_SoundRate[SoundRate]);
     if (SoundFormat!=2) //SoundSize is not valid for MPEG Audio
-        Fill(Stream_Audio, StreamPos_Last, Audio_Resolution, Swf_SoundSize[SoundSize]);
+        Fill(Stream_Audio, StreamPos_Last, Audio_BitDepth, Swf_SoundSize[SoundSize]);
     Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, Swf_SoundType[SoundType]);
 }
 
@@ -585,13 +587,13 @@
     int8u  StreamSoundCompression, StreamSoundRate, StreamSoundType, StreamSoundSize;
     BS_Begin();
     Skip_S1(4,                                                  "Reserved");
-    Info_S1(2, PlaybackSoundRate,                               "PlaybackSoundRate"); Param_Info(Swf_SoundRate[PlaybackSoundRate], " Hz");
-    Info_S1(1, PlaybackSoundSize,                               "PlaybackSoundSize"); Param_Info(Swf_SoundSize[PlaybackSoundSize], " bits");
-    Info_S1(1, PlaybackSoundType,                               "PlaybackSoundType"); Param_Info(Swf_SoundType[PlaybackSoundType], " channel(s)");
-    Get_S1 (4, StreamSoundCompression,                          "StreamSoundCompression"); Param_Info(Swf_SoundFormat[StreamSoundCompression]);
-    Get_S1 (2, StreamSoundRate,                                 "StreamSoundRate"); Param_Info(Swf_SoundRate[StreamSoundRate], " Hz");
-    Get_S1 (1, StreamSoundSize,                                 "StreamSoundSize"); Param_Info(Swf_SoundSize[StreamSoundSize], " bits");
-    Get_S1 (1, StreamSoundType,                                 "StreamSoundType"); Param_Info(Swf_SoundType[StreamSoundType], " channel(s)");
+    Info_S1(2, PlaybackSoundRate,                               "PlaybackSoundRate"); Param_Info2(Swf_SoundRate[PlaybackSoundRate], " Hz");
+    Info_S1(1, PlaybackSoundSize,                               "PlaybackSoundSize"); Param_Info2(Swf_SoundSize[PlaybackSoundSize], " bits");
+    Info_S1(1, PlaybackSoundType,                               "PlaybackSoundType"); Param_Info2(Swf_SoundType[PlaybackSoundType], " channel(s)");
+    Get_S1 (4, StreamSoundCompression,                          "StreamSoundCompression"); Param_Info1(Swf_SoundFormat[StreamSoundCompression]);
+    Get_S1 (2, StreamSoundRate,                                 "StreamSoundRate"); Param_Info2(Swf_SoundRate[StreamSoundRate], " Hz");
+    Get_S1 (1, StreamSoundSize,                                 "StreamSoundSize"); Param_Info2(Swf_SoundSize[StreamSoundSize], " bits");
+    Get_S1 (1, StreamSoundType,                                 "StreamSoundType"); Param_Info2(Swf_SoundType[StreamSoundType], " channel(s)");
     BS_End();
     Get_L2 (StreamSoundSampleCount,                             "StreamSoundSampleCount");
     if (StreamSoundCompression==2)
@@ -606,7 +608,7 @@
         Fill(Stream_Audio, StreamPos_Last, Audio_Codec, Swf_SoundFormat[StreamSoundCompression]);
         Fill(Stream_Audio, StreamPos_Last, Audio_SamplingRate, Swf_SoundRate[StreamSoundRate]);
         if (StreamSoundCompression!=2) //SoundSize is not valid for MPEG Audio
-            Fill(Stream_Audio, StreamPos_Last, Audio_Resolution, Swf_SoundSize[StreamSoundSize]);
+            Fill(Stream_Audio, StreamPos_Last, Audio_BitDepth, Swf_SoundSize[StreamSoundSize]);
         Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, Swf_SoundType[StreamSoundType]);
     }
 }
@@ -634,7 +636,7 @@
     Skip_BS(3,                                                  "VideoFlagsDeblocking");
     Skip_BS(1,                                                  "VideoFlagsSmoothing");
     BS_End();
-    Get_L1 (CodecID,                                            "CodecID"); Param_Info(Swf_Format_Video[CodecID]);
+    Get_L1 (CodecID,                                            "CodecID"); Param_Info1(Swf_Format_Video[CodecID]);
     if (CodecID>=16)
         CodecID=0; //Should never happen (FLV is only 4-bit sized)

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Swf.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Swf.h Changed

@@ -1,17 +1,17 @@
 // File_Swf - Info for SWF Audio files
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -41,13 +41,13 @@
 {
 public :
     //In
-    size_t Frame_Count_Valid;
-    int32u FileLength;;
+    int64u Frame_Count_Valid;
+    int32u FileLength;
     int8u  Version;
 
 public :
     File_Swf();
-    
+
 private :
     //Buffer
     bool FileHeader_Begin();
@@ -123,9 +123,6 @@
 
     //Helpers
     bool Decompress();
-
-    //Temp
-    size_t  Frame_Count;
 };
 
 } //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Umf.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Umf.cpp Changed

@@ -1,31 +1,35 @@
 // File_Flv - Info for GXF (SMPTE 360M) files
-// Copyright (C) 2010-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_GXF_YES)
 //---------------------------------------------------------------------------
 
@@ -37,6 +41,20 @@
 {
 
 //***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File_Umf::File_Umf()
+:File__Analyze()
+{
+    //In
+    #if MEDIAINFO_SEEK || MEDIAINFO_DEMUX
+        GopSize=(int64u)-1;
+    #endif //MEDIAINFO_SEEK || MEDIAINFO_DEMUX
+}
+
+//***************************************************************************
 // Buffer - File header
 //***************************************************************************
 
@@ -65,7 +83,7 @@
 {
     //Parsing
     int32u Tracks, Segments;
-    Element_Begin("Payload description");
+    Element_Begin1("Payload description");
     Skip_L4(                                                    "Total length of the UMF data");
     Skip_L4(                                                    "Version of this file");
     Get_L4 (Tracks,                                             "Number of tracks in the material");
@@ -78,9 +96,9 @@
     Skip_L4(                                                    "Size of the user data section");
     Skip_L4(                                                    "Reserved");
     Skip_L4(                                                    "Reserved");
-    Element_End();
+    Element_End0();
 
-    Element_Begin("Material description");
+    Element_Begin1("Material description");
     Skip_L4(                                                    "Attributes");
     Skip_L4(                                                    "Maximum length of the material in fields");
     Skip_L4(                                                    "Minimum length of the material in fields");
@@ -98,23 +116,23 @@
     Skip_L2(                                                    "Number of time code tracks");
     Skip_L2(                                                    "Reserved");
     Skip_L2(                                                    "Number of MPEG-1, MPEG-2, and MPEG-2 HD video tracks");
-    Element_End();
+    Element_End0();
 
     for (int32u Pos=0; Pos<Tracks; Pos++)
     {
-        Element_Begin("Track description");
+        Element_Begin1("Track description");
         Skip_C1(                                                "Track information - Track type");
         Skip_C1(                                                "Track information - Track logical number");
         Skip_L2(                                                "Number of segments on this track");
-        Element_End();
+        Element_End0();
 
-        if (Element_Offset==Element_Size)
+        if (Element_Offset>=Element_Size)
             break;
     }
 
     for (int32u Pos=0; Pos<Segments; Pos++)
     {
-        Element_Begin("Media description");
+        Element_Begin1("Media description");
         int32u Type;
         int16u Length;
         Get_L2 (Length,                                         "Length of this media description");
@@ -137,14 +155,27 @@
             case 0x00000004 :
             case 0x00000007 :
             case 0x00000009 : //MPEG-Video
+                {
+                #if MEDIAINFO_SEEK || MEDIAINFO_DEMUX
+                    int32u P, B;
+                #endif //MEDIAINFO_SEEK || MEDIAINFO_DEMUX
                 Skip_L4(                                                "Color difference format");
                 Skip_L4(                                                "GoP structure");
                 Skip_L4(                                                "Frame/field structure");
                 Skip_L4(                                                "Target I-pictures per GoP");
-                Skip_L4(                                                "Target P-pictures per I-picture");
-                Skip_L4(                                                "Target B-pictures per P-picture or I-picture");
+                #if MEDIAINFO_SEEK || MEDIAINFO_DEMUX
+                    Get_L4 (P,                                          "Target P-pictures per I-picture");
+                    Get_L4 (B,                                          "Target B-pictures per P-picture or I-picture");
+                #else //MEDIAINFO_SEEK || MEDIAINFO_DEMUX
+                    Skip_L4(                                            "Target P-pictures per I-picture");
+                    Skip_L4(                                            "Target B-pictures per P-picture or I-picture");
+                #endif //MEDIAINFO_SEEK || MEDIAINFO_DEMUX
                 Skip_L4(                                                "MPEG video attributes");
                 Skip_L4(                                                "Reserved");
+                #if MEDIAINFO_SEEK || MEDIAINFO_DEMUX
+                    GopSize=(1+P)*(1+B);
+                #endif //MEDIAINFO_SEEK || MEDIAINFO_DEMUX
+                }
                 break;
             case 0x00000003 : //TimeCode
                 Skip_L4(                                                "Time code attributes");
@@ -166,6 +197,20 @@
                 Skip_L4(                                                 "Reserved");
                 Skip_L4(                                                 "Reserved");
                 break;
+            case 0x00000005 : //DV25
+            case 0x00000006 : //DV50
+                Skip_L4(                                                "Attributes"); //With Aspect ratio
+                Skip_L4(                                                "Reserved");
+                Skip_L4(                                                "Reserved");
+                Skip_L4(                                                "Reserved");
+                Skip_L4(                                                "Reserved");
+                Skip_L4(                                                "Reserved");
+                Skip_L4(                                                "Reserved");
+                Skip_L4(                                                "Reserved");
+                #if MEDIAINFO_SEEK || MEDIAINFO_DEMUX
+                    GopSize=1;
+                #endif //MEDIAINFO_SEEK || MEDIAINFO_DEMUX
+                break;
             default         :
                 Skip_L4(                                                "Reserved");
                 Skip_L4(                                                "Reserved");
@@ -177,16 +222,16 @@
                 Skip_L4(                                                "Reserved");
         }
         if (Element_Offset<End)
-            Skip_XX(End-Element_Offset,                         "Unknown");
-        Element_End();
+            Skip_XX(End-Element_Offset,                                 "Unknown");
+        Element_End0();
 
-        if (Element_Offset==Element_Size)
+        if (Element_Offset>=Element_Size)
             break;
     }
 
     while (Element_Offset<Element_Size)
     {
-        Element_Begin("User data");
+        Element_Begin1("User data");
         int32u Length;
             Get_L4 (Length,                                     "The length of this user data record");
             Skip_L4(                                            "Position on the material time line");
@@ -199,7 +244,7 @@
                 Skip_XX(Element_Size-Element_Offset-2,          "User data");
             Skip_L1(                                            "NULL byte");
             Skip_L1(                                            "Reserved byte");
-        Element_End();
+        Element_End0();
     }
 }

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Umf.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Umf.h Changed

@@ -1,17 +1,17 @@
 // File_Umf - Info for UMF files
-// Copyright (C) 2010-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -41,6 +41,15 @@
 
 class File_Umf : public File__Analyze
 {
+public :
+    //Constructor/Destructor
+    File_Umf();
+
+    //Out
+    #if MEDIAINFO_SEEK || MEDIAINFO_DEMUX
+        int64u GopSize;
+    #endif //MEDIAINFO_SEEK || MEDIAINFO_DEMUX
+
 protected :
     //Buffer - File header
     bool FileHeader_Begin();

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Wm.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Wm.cpp Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Wm.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Wm.h Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Wm_Elements.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Wm_Elements.cpp Changed

@@ -1,17 +1,17 @@
 // File_Wm - Info for Windows Media files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,14 +22,18 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #ifdef MEDIAINFO_WM_YES
 //---------------------------------------------------------------------------
 
@@ -47,9 +51,10 @@
 #if defined(MEDIAINFO_MPEGA_YES)
     #include "MediaInfo/Audio/File_Mpega.h"
 #endif
-#if defined(MEDIAINFO_LATM_YES)
-   #include "MediaInfo/Audio/File_Latm.h"
-#endif
+#if MEDIAINFO_DEMUX
+    #include "MediaInfo/MediaInfo_Config_MediaInfo.h"
+    #include "base64.h"
+#endif //MEDIAINFO_DEMUX
 #include "ZenLib/Utils.h"
 using namespace ZenLib;
 //---------------------------------------------------------------------------
@@ -251,7 +256,7 @@
     int32u Flags, MaximumBitRate;
     Skip_GUID(                                                  "File ID");
     Skip_L8(                                                    "File Size");
-    Get_L8 (CreationDate,                                       "Creation Date"); Param_Info(Ztring().Date_From_Milliseconds_1601(CreationDate/10000));
+    Get_L8 (CreationDate,                                       "Creation Date"); Param_Info1(Ztring().Date_From_Milliseconds_1601(CreationDate/10000));
     Skip_L8(                                                    "Data Packets Count");
     Get_L8 (PlayDuration,                                       "Play Duration"); Param_Info_From_Milliseconds(PlayDuration/10000);
     Get_L8 (SendDuration,                                       "Send Duration"); Param_Info_From_Milliseconds(SendDuration/10000);
@@ -284,7 +289,7 @@
     //Parsing
     int128u StreamType;
     int32u StreamTypeLength, ErrorCorrectionTypeLength;
-    Get_GUID(StreamType,                                        "StreamType"); Param_Info(Wm_StreamType(StreamType)); Element_Info(Wm_StreamType(StreamType));
+    Get_GUID(StreamType,                                        "StreamType"); Param_Info1(Wm_StreamType(StreamType)); Element_Info1(Wm_StreamType(StreamType));
     Skip_GUID(                                                  "Error Correction Type");
     Skip_L8(                                                    "Time Offset");
     Get_L4 (StreamTypeLength,                                   "Type-Specific Data Length");
@@ -292,31 +297,31 @@
     Get_L2 (Stream_Number,                                      "Stream Number");
     if (Stream_Number&0x8000)
     {
-        Param_Info("Encrypted Content");
-        Stream[Stream_Number&0x007F].Info["Encryption"]=_T("Encrypted");
+        Param_Info1("Encrypted Content");
+        Stream[Stream_Number&0x007F].Info["Encryption"]=__T("Encrypted");
     }
     Stream_Number&=0x007F; //Only 7bits
-    Element_Info(Stream_Number);
+    Element_Info1(Stream_Number);
     Skip_L4(                                                    "Reserved");
     switch (StreamType.hi)
     {
-        case Elements::Header_StreamProperties_Audio :          Element_Begin(StreamTypeLength);
+        case Elements::Header_StreamProperties_Audio :          Element_Begin0(); //size is StreamTypeLength
                                                                 Header_StreamProperties_Audio();
-                                                                Element_End(); break;
-        case Elements::Header_StreamProperties_Video :          Element_Begin(StreamTypeLength);
+                                                                Element_End0(); break;
+        case Elements::Header_StreamProperties_Video :          Element_Begin0(); //size is StreamTypeLength
                                                                 Header_StreamProperties_Video();
-                                                                Element_End(); break;
-        case Elements::Header_StreamProperties_JFIF :           Element_Begin(StreamTypeLength);
+                                                                Element_End0(); break;
+        case Elements::Header_StreamProperties_JFIF :           Element_Begin0(); //size is StreamTypeLength
                                                                 Header_StreamProperties_JFIF();
-                                                                Element_End(); break;
-        case Elements::Header_StreamProperties_DegradableJPEG : Element_Begin(StreamTypeLength);
+                                                                Element_End0(); break;
+        case Elements::Header_StreamProperties_DegradableJPEG : Element_Begin0(); //size is StreamTypeLength
                                                                 Header_StreamProperties_DegradableJPEG();
-                                                                Element_End(); break;
+                                                                Element_End0(); break;
         case Elements::Header_StreamProperties_FileTransfer :
-        case Elements::Header_StreamProperties_Binary :         Element_Begin(StreamTypeLength);
+        case Elements::Header_StreamProperties_Binary :         Element_Begin0(); //size is StreamTypeLength
                                                                 Header_StreamProperties_Binary();
                                                                 StreamKind_Last=Stream_Max; StreamPos_Last=(size_t)-1;
-                                                                Element_End(); break;
+                                                                Element_End0(); break;
         default :                                               if (StreamTypeLength>0)
                                                                     Skip_XX(StreamTypeLength, "Type-Specific Data");
                                                                 StreamKind_Last=Stream_Max; StreamPos_Last=(size_t)-1;
@@ -334,7 +339,7 @@
 void File_Wm::Header_StreamProperties_Audio ()
 {
     Element_Name("Audio");
-    
+
     //Parsing
     int32u SamplingRate, BytesPerSec;
     int16u CodecID, Channels, Data_Size, Resolution;
@@ -357,13 +362,13 @@
     Fill(Stream_Audio, StreamPos_Last, Audio_Channel_s_, Channels);
     Fill(Stream_Audio, StreamPos_Last, Audio_SamplingRate, SamplingRate);
     Fill(Stream_Audio, StreamPos_Last, Audio_BitRate, BytesPerSec*8);
-    Fill(Stream_Audio, StreamPos_Last, Audio_Resolution, Resolution);
+    Fill(Stream_Audio, StreamPos_Last, Audio_BitDepth, Resolution);
 
     FILLING_BEGIN();
         //Creating the parser
              if (0);
         #if defined(MEDIAINFO_MPEGA_YES)
-        else if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Riff, Ztring::ToZtring(CodecID, 16))==_T("MPEG Audio"))
+        else if (MediaInfoLib::Config.CodecID_Get(Stream_Audio, InfoCodecID_Format_Riff, Ztring::ToZtring(CodecID, 16))==__T("MPEG Audio"))
         {
             Stream[Stream_Number].Parser=new File_Mpega;
             ((File_Mpega*)Stream[Stream_Number].Parser)->Frame_Count_Valid=8;
@@ -376,7 +381,7 @@
     //Parsing
     if (Data_Size>0)
     {
-        Element_Begin("Codec Specific Data", Data_Size);
+        Element_Begin1("Codec Specific Data");
         switch (CodecID)
         {
             case 0x0161 :
@@ -386,25 +391,25 @@
             case 0x7A22 : Header_StreamProperties_Audio_AMR(); break;
             default     : Skip_XX(Data_Size,                    "Unknown");
         }
-        Element_End();
+        Element_End0();
     }
 }
 
 //---------------------------------------------------------------------------
 void File_Wm::Header_StreamProperties_Audio_WMA ()
 {
-    Element_Info("WMA");
+    Element_Info1("WMA");
 
     //Parsing
     Skip_L4(                                                    "SamplesPerBlock");
     Skip_L2(                                                    "EncodeOptions");
-    Skip_L4(                                                    "SuperBlockAlign");    
+    Skip_L4(                                                    "SuperBlockAlign");
 }
 
 //---------------------------------------------------------------------------
 void File_Wm::Header_StreamProperties_Audio_AMR ()
 {
-    Element_Info("AMR");
+    Element_Info1("AMR");
 
     //Parsing
     int32u Flags;
@@ -450,14 +455,25 @@
     Fill(Stream_Video, StreamPos_Last, Video_Width, Width);
     Fill(Stream_Video, StreamPos_Last, Video_Height, Height);
     if (Resolution>0)
-        Fill(Stream_Video, StreamPos_Last, Video_Resolution, (Resolution%3)?Resolution:(Resolution/3)); //If not a multiple of 3, the total resolution is filled
+        Fill(Stream_Video, StreamPos_Last, Video_BitDepth, (Resolution%3)?Resolution:(Resolution/3)); //If not a multiple of 3, the total resolution is filled
     if (Compression==CC4("DVR "))
         IsDvrMs=true;
 
+    //From Content description (we imagine that data is for all video streams...)
+    if (Header_ExtendedContentDescription_AspectRatioX && Header_ExtendedContentDescription_AspectRatioY)
+    {
+        if (Header_ExtendedContentDescription_AspectRatioX==16 && Header_ExtendedContentDescription_AspectRatioY==9)
+            Fill(Stream_Video, StreamPos_Last, Video_DisplayAspectRatio, ((float32)16)/9, 3);
+        else if (Header_ExtendedContentDescription_AspectRatioX==4 && Header_ExtendedContentDescription_AspectRatioY==3)
+            Fill(Stream_Video, StreamPos_Last, Video_DisplayAspectRatio, ((float32)4)/3, 3);
+        else
+            Fill(Stream_Video, StreamPos_Last, Video_PixelAspectRatio, ((float32)Header_ExtendedContentDescription_AspectRatioX)/Header_ExtendedContentDescription_AspectRatioY, 3, true);
+    }
+
     //Creating the parser
          if (0);
     #if defined(MEDIAINFO_VC1_YES)
-    else if (MediaInfoLib::Config.CodecID_Get(Stream_Video, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression), InfoCodecID_Format)==_T("VC-1"))
+    else if (MediaInfoLib::Config.CodecID_Get(Stream_Video, InfoCodecID_Format_Riff, Ztring().From_CC4(Compression), InfoCodecID_Format)==__T("VC-1"))
     {
         Stream[Stream_Number].Parser=new File_Vc1;
         if (Compression==CC4("WMV3"))
@@ -469,8 +485,26 @@
         Open_Buffer_Init(Stream[Stream_Number].Parser);
         if (Data_Size>40)
         {
-            Element_Code=Stream_Number;
-            Demux(Buffer+(size_t)Element_Offset, (size_t)(Data_Size-40), ContentType_Header);
+
+            //Demux
+            #if MEDIAINFO_DEMUX
+                switch (Config->Demux_InitData_Get())
+                {
+                    case 0 :    //In demux event
+                                Element_Code=Stream_Number;
+                                Demux_Level=2; //Container
+                                Demux(Buffer+(size_t)Element_Offset, (size_t)(Data_Size-40), ContentType_Header);
+                                break;
+                    case 1 :    //In field
+                                {
+                                std::string Data_Raw((const char*)(Buffer+(size_t)Element_Offset), (size_t)(Data_Size-40));
+                                std::string Data_Base64(Base64::encode(Data_Raw));
+                                Fill(Stream_Video, StreamPos_Last, "Demux_InitBytes", Data_Base64);
+                                }
+                                break;
+                    default :   ;
+                }
+            #endif //MEDIAINFO_DEMUX
 
             Open_Buffer_Continue(Stream[Stream_Number].Parser, (size_t)(Data_Size-40));
             if (Stream[Stream_Number].Parser->Status[IsFinished])
@@ -488,7 +522,7 @@
     }
     #endif
     #if defined(MEDIAINFO_MPEGV_YES)
-    else if (MediaInfoLib::Config.Codec_Get(Ztring().From_CC4(Compression), InfoCodec_KindofCodec).find(_T("MPEG-2"))==0)
+    else if (MediaInfoLib::Config.Codec_Get(Ztring().From_CC4(Compression), InfoCodec_KindofCodec).find(__T("MPEG-2"))==0)
     {
         Stream[Stream_Number].Parser=new File_Mpegv;
         ((File_Mpegv*)Stream[Stream_Number].Parser)->Frame_Count_Valid=30; //For searching Pulldown
@@ -512,7 +546,7 @@
 
     //Filling
     Stream_Prepare(Stream_Image);
-    Fill(Stream_Video, StreamPos_Last, Video_Format, "M-JPEG");
+    Fill(Stream_Video, StreamPos_Last, Video_Format, "JPEG");
     Fill(Stream_Video, StreamPos_Last, Video_Codec, "JPEG");
     Fill(Stream_Video, StreamPos_Last, Video_Width, Width);
     Fill(Stream_Video, StreamPos_Last, Video_Height, Height);
@@ -538,7 +572,7 @@
 
     //Filling
     Stream_Prepare(Stream_Image);
-    Fill(Stream_Video, StreamPos_Last, Video_Format, "M-JPEG");
+    Fill(Stream_Video, StreamPos_Last, Video_Format, "JPEG");
     Fill(Stream_Video, StreamPos_Last, Video_Codec, "JPEG");
     Fill(Stream_Video, StreamPos_Last, Video_Width, Width);
     Fill(Stream_Video, StreamPos_Last, Video_Height, Height);
@@ -597,23 +631,23 @@
         Skip_Flags(Flags, 1,                                    "Seekable");
         Skip_Flags(Flags, 2,                                    "No Cleanpoints");
         Skip_Flags(Flags, 3,                                    "Resend Live Cleanpoints");
-    Get_L2 (StreamNumber,                                       "Stream Number"); Element_Info(StreamNumber);
+    Get_L2 (StreamNumber,                                       "Stream Number"); Element_Info1(StreamNumber);
     Get_L2 (LanguageID,                                         "Stream Language ID Index");
     Get_L8 (AverageTimePerFrame,                                "Average Time Per Frame");
     Get_L2 (StreamNameCount,                                    "Stream Name Count");
     Get_L2 (PayloadExtensionSystemCount,                        "Payload Extension System Count");
     for (int16u Pos=0; Pos<StreamNameCount; Pos++)
     {
-        Element_Begin("Stream Name");
+        Element_Begin1("Stream Name");
         int16u StreamNameLength;
         Skip_L2(                                                "Language ID Index");
         Get_L2 (StreamNameLength,                               "Stream Name Length");
         Skip_UTF16L(StreamNameLength,                           "Stream Name");
-        Element_End();
+        Element_End0();
     }
     for (int16u Pos=0; Pos<PayloadExtensionSystemCount; Pos++)
     {
-        Element_Begin("Payload Extension System");
+        Element_Begin1("Payload Extension System");
         stream::payload_extension_system Payload_Extension_System;
         int32u ExtensionSystemInfoLength;
         Get_GUID(Payload_Extension_System.ID,                   "Extension System ID");
@@ -621,7 +655,7 @@
         Get_L4 (ExtensionSystemInfoLength,                      "Extension System Info Length");
         if (ExtensionSystemInfoLength>0)
             Skip_XX(ExtensionSystemInfoLength,                  "Extension System Info");
-        Element_End();
+        Element_End0();
 
         //Filling
         Stream[StreamNumber].Payload_Extension_Systems.push_back(Payload_Extension_System);
@@ -633,11 +667,11 @@
         //This could be everything, but in theory this is only Header_StreamProperties
         int128u Name;
         int64u Size;
-        Element_Begin("Stream Properties Object", Element_Size-Element_Offset);
-        Element_Begin("Header", 24);
+        Element_Begin1("Stream Properties Object");
+        Element_Begin1("Header");
             Get_GUID(Name,                                      "Name");
             Get_L8 (Size,                                       "Size");
-        Element_End();
+        Element_End0();
         if (Size>=24 && Element_Offset+Size-24==Element_Size)
         {
             switch (Name.hi)
@@ -648,7 +682,7 @@
         }
         else
             Skip_XX(Element_Size-Element_Offset,                "Problem");
-        Element_End();
+        Element_End0();
     }
 
     //Filling
@@ -664,11 +698,11 @@
 
     //Parsing
     int16u Count;
-    Info_GUID(ExclusionType,                                    "Exclusion Type"); Param_Info(Wm_ExclusionType(ExclusionType));
+    Info_GUID(ExclusionType,                                    "Exclusion Type"); Param_Info1(Wm_ExclusionType(ExclusionType));
     Get_L2 (Count,                                              "Stream Numbers Count");
     for (int16u Pos=0; Pos<Count; Pos++)
     {
-        Info_L2(StreamNumber,                                   "Stream Number"); Element_Info(StreamNumber);
+        Info_L2(StreamNumber,                                   "Stream Number"); Element_Info1(StreamNumber);
     }
 }
 
@@ -692,11 +726,11 @@
     for (int16u Pos=0; Pos<Count; Pos++)
     {
         int16u Flags;
-        Element_Begin("Stream");
-        Info_L2(StreamNumber,                                   "Stream Number"); Element_Info(StreamNumber);
+        Element_Begin1("Stream");
+        Info_L2(StreamNumber,                                   "Stream Number"); Element_Info1(StreamNumber);
         Get_L2 (Flags,                                          "Flags");
             Skip_Flags(Flags, 0,                                "Mandatory");
-        Element_End();
+        Element_End0();
     }
 }
 
@@ -721,14 +755,14 @@
     Get_L2 (Count,                                              "Count");
     for (int16u Pos=0; Pos<Count; Pos++)
     {
-        Element_Begin("Language ID");
+        Element_Begin1("Language ID");
         Get_L1 (LanguageID_Length,                              "Language ID Length");
         if (LanguageID_Length>0)
         {
             Get_UTF16L(LanguageID_Length, LanguageID,           "Language ID");
-            Element_Info(LanguageID);
+            Element_Info1(LanguageID);
         }
-        Element_End();
+        Element_End0();
 
         //Filling
         Languages.push_back(LanguageID);
@@ -752,7 +786,7 @@
     Get_L2 (Count,                                              "Description Records Count");
     for (int16u Pos=0; Pos<Count; Pos++)
     {
-        Element_Begin("Description Record");
+        Element_Begin1("Description Record");
         Ztring Name, Data;
         int64u Data_Int64=0;
         int32u Data_Length;
@@ -766,40 +800,40 @@
         switch (Data_Type)
         {
             case 0x00 : Get_UTF16L(Data_Length, Data,           "Data"); break;
-            case 0x01 : Skip_XX(Data_Length,                    "Data"); Data=_T("(Binary)"); break;
-            case 0x02 : {int16u Data_Int; Get_L2 (Data_Int,     "Data"); Data=(Data_Int==0)?_T("No"):_T("Yes"); Data_Int64=Data_Int;} break;
+            case 0x01 : Skip_XX(Data_Length,                    "Data"); Data=__T("(Binary)"); break;
+            case 0x02 : {int16u Data_Int; Get_L2 (Data_Int,     "Data"); Data=(Data_Int==0)?__T("No"):__T("Yes"); Data_Int64=Data_Int;} break;
             case 0x03 : {int32u Data_Int; Get_L4 (Data_Int,     "Data"); Data.From_Number(Data_Int); Data_Int64=Data_Int;} break;
             case 0x04 : {int64u Data_Int; Get_L8 (Data_Int,     "Data"); Data.From_Number(Data_Int); Data_Int64=Data_Int;} break;
             case 0x05 : {int16u Data_Int; Get_L2 (Data_Int,     "Data"); Data.From_Number(Data_Int); Data_Int64=Data_Int;} break;
-            default   : Skip_XX(Data_Length,                    "Data"); Data=_T("(Unknown)"); break;
+            default   : Skip_XX(Data_Length,                    "Data"); Data=__T("(Unknown)"); break;
         }
-        Element_Info(Name);
-        Element_Info(Data);
-        Element_End();
+        Element_Info1(Name);
+        Element_Info1(Data);
+        Element_End0();
 
-        if (Name==_T("IsVBR"))
+        if (Name==__T("IsVBR"))
             Stream[StreamNumber].Info["BitRate_Mode"]=(Data_Int64==0)?"CBR":"VBR";
-        else if (Name==_T("AspectRatioX"))
+        else if (Name==__T("AspectRatioX"))
         {
             AspectRatioX=Data.To_float32();
             if (AspectRatioX && AspectRatioY)
                 Stream[StreamNumber].Info["PixelAspectRatio"].From_Number(AspectRatioX/AspectRatioY, 3);
         }
-        else if (Name==_T("AspectRatioY"))
+        else if (Name==__T("AspectRatioY"))
         {
             AspectRatioY=Data.To_float32();
             if (AspectRatioX && AspectRatioY)
                 Stream[StreamNumber].Info["PixelAspectRatio"].From_Number(AspectRatioX/AspectRatioY, 3);
         }
-        else if (Name==_T("DeviceConformanceTemplate"))
+        else if (Name==__T("DeviceConformanceTemplate"))
         {
-            if (Data!=_T("@") && Data.find(_T('@'))!=std::string::npos)
+            if (Data!=__T("@") && Data.find(__T('@'))!=std::string::npos)
                 Stream[StreamNumber].Info["Format_Profile"]=Data;
         }
-        else if (Name==_T("WM/WMADRCPeakReference")) {}
-        else if (Name==_T("WM/WMADRCAverageReference")) {}
-        else if (Name==_T("WM/WMADRCAverageTarget")) {}
-        else if (Name==_T("WM/WMADRCPeakTarget")) {}
+        else if (Name==__T("WM/WMADRCPeakReference")) {}
+        else if (Name==__T("WM/WMADRCAverageReference")) {}
+        else if (Name==__T("WM/WMADRCAverageTarget")) {}
+        else if (Name==__T("WM/WMADRCPeakTarget")) {}
         else
             Stream[StreamNumber].Info[Name.To_Local()]=Data;
     }
@@ -816,12 +850,12 @@
     Get_L2 (Count,                                              "Index Specifiers Count");
     for (int16u Pos=0; Pos<Count; Pos++)
     {
-        Element_Begin("Index Specifier");
+        Element_Begin1("Index Specifier");
         int16u IndexType;
         Skip_L2(                                                "Stream Number");
         Get_L2 (IndexType,                                      "Index Type");
-        Element_Info(IndexType);
-        Element_End();
+        Element_Info1(IndexType);
+        Element_End0();
     }
 }
 
@@ -874,8 +908,8 @@
     CodecInfos.resize(Count);
     for (int16u Pos=0; Pos<Count; Pos++)
     {
-        Element_Begin("Codec Entry");
-        Get_L2 (Type,                                           "Type"); Param_Info(Wm_CodecList_Kind(Type));
+        Element_Begin1("Codec Entry");
+        Get_L2 (Type,                                           "Type"); Param_Info1(Wm_CodecList_Kind(Type));
         Get_L2 (CodecNameLength,                                "Codec Name Length");
         Get_UTF16L(CodecNameLength*2, CodecName,                "Codec Name");
         Get_L2 (CodecDescriptionLength,                         "Codec Description Length");
@@ -887,14 +921,14 @@
             Skip_C4(                                            "4CC"); //Not used, we have it elsewhere
         else
             Skip_XX(CodecInformationLength,                     "Codec Information");
-        Element_End();
+        Element_End0();
 
         FILLING_BEGIN();
             CodecInfos[Pos].Type=Type;
             CodecInfos[Pos].Info=CodecName;
             if (!CodecDescription.empty())
             {
-                CodecInfos[Pos].Info+=_T(" - ");
+                CodecInfos[Pos].Info+=__T(" - ");
                 CodecInfos[Pos].Info+=CodecDescription;
             }
 
@@ -915,22 +949,22 @@
     Get_L2 (CommandTypes_Count,                                 "Command Types Count");
     for (int16u Pos=0; Pos<CommandTypes_Count; Pos++)
     {
-        Element_Begin("Command Type");
+        Element_Begin1("Command Type");
         int16u Length;
         Get_L2 (Length,                                         "Command Type Length");
         if (Length>0)
             Skip_UTF16L(Length*2,                               "Command Type");
-        Element_End();
+        Element_End0();
     }
     for (int16u Pos=0; Pos<Commands_Count; Pos++)
     {
-        Element_Begin("Command");
+        Element_Begin1("Command");
         int16u Length;
         Skip_L2(                                                "Type Index");
         Get_L2 (Length,                                         "Command Length");
         if (Length>0)
             Skip_UTF16L(Length*2,                               "Command");
-        Element_End();
+        Element_End0();
     }
 }
 
@@ -948,7 +982,7 @@
     Get_L2 (Name_Length,                                        "Name Length");
     if (Name_Length>0)
         Skip_UTF16L(Name_Length,                                "Name");
-    
+
     //Filling
     if (Markers_Count>0)
         Stream_Prepare(Stream_Menu);
@@ -956,7 +990,7 @@
     //Parsing
     for (int32u Pos=0; Pos<Markers_Count; Pos++)
     {
-        Element_Begin("Marker");
+        Element_Begin1("Marker");
         Ztring Marker;
         int32u Marker_Length;
         Skip_L8(                                                "Offset");
@@ -967,7 +1001,7 @@
         Get_L4 (Marker_Length,                                  "Marker Description Length");
         if (Marker_Length>0)
             Get_UTF16L(Marker_Length*2, Marker,                 "Marker Description");
-        Element_End();
+        Element_End0();
     }
 }
 
@@ -1032,7 +1066,7 @@
     Get_L2 (Count,                                              "Content Descriptors Count");
     for (int16u Pos=0; Pos<Count; Pos++)
     {
-        Element_Begin("Content Descriptor");
+        Element_Begin1("Content Descriptor");
         Ztring Name, Value;
         int64u Value_Int64=0;
         int16u Name_Length, Value_Type, Value_Length;
@@ -1044,117 +1078,119 @@
         {
             case 0x00 : Get_UTF16L(Value_Length, Value,         "Value"); break;
             case 0x01 :
-                        if (Name==_T("ASFLeakyBucketPairs")) Header_ExtendedContentDescription_ASFLeakyBucketPairs(Value_Length);
-                        else {Skip_XX(Value_Length,             "Value"); Value=_T("(Binary)");} break;
-            case 0x02 : {int32u Value_Int; Get_L4 (Value_Int,   "Value"); Value=(Value_Int==0)?_T("No"):_T("Yes"); Value_Int64=Value_Int;} break;
+                        if (Name==__T("ASFLeakyBucketPairs")) Header_ExtendedContentDescription_ASFLeakyBucketPairs(Value_Length);
+                        else {Skip_XX(Value_Length,             "Value"); Value=__T("(Binary)");} break;
+            case 0x02 : {int32u Value_Int; Get_L4 (Value_Int,   "Value"); Value=(Value_Int==0)?__T("No"):__T("Yes"); Value_Int64=Value_Int;} break;
             case 0x03 : {int32u Value_Int; Get_L4 (Value_Int,   "Value"); Value.From_Number(Value_Int); Value_Int64=Value_Int;} break;
             case 0x04 : {int64u Value_Int; Get_L8 (Value_Int,   "Value"); Value.From_Number(Value_Int); Value_Int64=Value_Int;} break;
             case 0x05 : {int16u Value_Int; Get_L2 (Value_Int,   "Value"); Value.From_Number(Value_Int); Value_Int64=Value_Int;} break;
-            default   : Skip_XX(Value_Length,                   "Value"); Value=_T("(Unknown)"); break;
+            default   : Skip_XX(Value_Length,                   "Value"); Value=__T("(Unknown)"); break;
         }
-        Element_Info(Name);
-        Element_Info(Value);
-        Element_End();
+        Element_Info1(Name);
+        Element_Info1(Value);
+        Element_End0();
 
         //Filling
         if (!Value.empty())
         {
-                 if (Name==_T("Agility FPS")) {}
-            else if (Name==_T("ASFLeakyBucketPairs")) {} //Already done elsewhere
-            else if (Name==_T("Buffer Average")) {}
-            else if (Name==_T("DVR Index Granularity")) {}
-            else if (Name==_T("DVR File Version")) {}
-            else if (Name==_T("IsVBR"))
+                 if (Name==__T("Agility FPS")) {}
+            else if (Name==__T("ASFLeakyBucketPairs")) {} //Already done elsewhere
+            else if (Name==__T("AspectRatioX")) Header_ExtendedContentDescription_AspectRatioX=Value_Int64;
+            else if (Name==__T("AspectRatioY")) Header_ExtendedContentDescription_AspectRatioY=Value_Int64;
+            else if (Name==__T("Buffer Average")) {}
+            else if (Name==__T("DVR Index Granularity")) {}
+            else if (Name==__T("DVR File Version")) {}
+            else if (Name==__T("IsVBR"))
                 Fill(Stream_General, 0, General_OverallBitRate_Mode, Value_Int64==0?"CBR":"VBR");
-            else if (Name==_T("VBR Peak")) {} //Already in "Stream Bitrate" chunk
-            else if (Name==_T("WMFSDKVersion")) {}
-            else if (Name==_T("WMFSDKNeeded")) {}
-            else if (Name==_T("WM/AlbumTitle"))
+            else if (Name==__T("VBR Peak")) {} //Already in "Stream Bitrate" chunk
+            else if (Name==__T("WMFSDKVersion")) {}
+            else if (Name==__T("WMFSDKNeeded")) {}
+            else if (Name==__T("WM/AlbumTitle"))
                 Fill(Stream_General, 0, General_Album, Value);
-            else if (Name==_T("WM/AlbumArtist"))
+            else if (Name==__T("WM/AlbumArtist"))
             {
                 Fill(Stream_General, 0, General_Performer, "");
                 Fill(Stream_General, 0, General_Performer, Value, true); //Clear last value, like Author (Content Description)
             }
-            else if (Name==_T("WM/ArtistSortOrder"))
+            else if (Name==__T("WM/ArtistSortOrder"))
                 Fill(Stream_General, 0, General_Performer_Sort, Value);
-            else if (Name==_T("WM/AuthorURL"))
+            else if (Name==__T("WM/AuthorURL"))
                 Fill(Stream_General, 0, "Author/Url", Value);
-            else if (Name==_T("WM/BeatsPerMinute"))
+            else if (Name==__T("WM/BeatsPerMinute"))
                 Fill(Stream_General, 0, General_BPM, Value);
-            else if (Name==_T("WM/Binary"))
+            else if (Name==__T("WM/Binary"))
                 Fill(Stream_General, 0, General_Cover, "Y");
-            else if (Name==_T("WM/Comments"))
+            else if (Name==__T("WM/Comments"))
                 Fill(Stream_General, 0, General_Comment, Value, true); //Clear last value
-            else if (Name==_T("WM/Composer"))
+            else if (Name==__T("WM/Composer"))
                 Fill(Stream_General, 0, General_Composer, Value);
-            else if (Name==_T("WM/Conductor"))
+            else if (Name==__T("WM/Conductor"))
                 Fill(Stream_General, 0, General_Conductor, Value);
-            else if (Name==_T("WM/EncodedBy"))
+            else if (Name==__T("WM/EncodedBy"))
                 Fill(Stream_General, 0, General_EncodedBy, Value);
-            else if (Name==_T("WM/EncoderSettings"))
+            else if (Name==__T("WM/EncoderSettings"))
                 Fill(Stream_General, 0, General_Encoded_Library_Settings, Value);
-            else if (Name==_T("WM/EncodingTime"))
+            else if (Name==__T("WM/EncodingTime"))
                 Fill(Stream_General, 0, General_Encoded_Date, Ztring().Date_From_Seconds_1601(Value_Int64));
-            else if (Name==_T("WM/Genre"))
+            else if (Name==__T("WM/Genre"))
                 Fill(Stream_General, 0, General_Genre, Value, true); //Clear last value
-            else if (Name==_T("WM/GenreID"))
+            else if (Name==__T("WM/GenreID"))
             {
                 if (Retrieve(Stream_General, 0, General_Genre).empty())
                     Fill(Stream_General, 0, General_Genre, Value);
             }
-            else if (Name==_T("WM/Language"))
+            else if (Name==__T("WM/Language"))
                 Language_ForAll=Value;
-            else if (Name==_T("WM/MediaCredits"))
+            else if (Name==__T("WM/MediaCredits"))
                 Fill(Stream_General, 0, General_ThanksTo, Value);
-            else if (Name==_T("WM/MediaPrimaryClassID")) {}
-            else if (Name==_T("WM/MCDI")) {}
-            else if (Name==_T("WM/ModifiedBy"))
+            else if (Name==__T("WM/MediaPrimaryClassID")) {}
+            else if (Name==__T("WM/MCDI")) {}
+            else if (Name==__T("WM/ModifiedBy"))
                 Fill(Stream_General, 0, General_RemixedBy, Value);
-            else if (Name==_T("WM/OriginalAlbumTitle"))
+            else if (Name==__T("WM/OriginalAlbumTitle"))
                 Fill(Stream_General, 0, "Original/Album", Value);
-            else if (Name==_T("WM/OriginalReleaseTime"))
+            else if (Name==__T("WM/OriginalReleaseTime"))
                 Fill(Stream_General, 0, "Original/Released_Date", Value);
-            else if (Name==_T("WM/ParentalRating"))
+            else if (Name==__T("WM/ParentalRating"))
                 Fill(Stream_General, 0, General_LawRating, Value);
-            else if (Name==_T("WM/ParentalRatingReason"))
+            else if (Name==__T("WM/ParentalRatingReason"))
                 Fill(Stream_General, 0, General_LawRating_Reason, Value);
-            else if (Name==_T("WM/Picture"))
+            else if (Name==__T("WM/Picture"))
                 Fill(Stream_General, 0, General_Cover, "Y");
-            else if (Name==_T("WM/Provider"))
+            else if (Name==__T("WM/Provider"))
                 Fill(Stream_General, 0, "Provider", Value);
-            else if (Name==_T("WM/Publisher"))
+            else if (Name==__T("WM/Publisher"))
                 Fill(Stream_General, 0, General_Publisher, Value);
-            else if (Name==_T("WM/RadioStationName"))
+            else if (Name==__T("WM/RadioStationName"))
                 Fill(Stream_General, 0, General_ServiceName, Value);
-            else if (Name==_T("WM/RadioStationOwner"))
+            else if (Name==__T("WM/RadioStationOwner"))
                 Fill(Stream_General, 0, General_ServiceProvider, Value);
-            else if (Name==_T("WM/SubTitle"))
+            else if (Name==__T("WM/SubTitle"))
                 Fill(Stream_General, 0, General_Title_More, Value);
-            else if (Name==_T("WM/SubTitleDescription"))
+            else if (Name==__T("WM/SubTitleDescription"))
                 Fill(Stream_General, 0, General_Title_More, Value);
-            else if (Name==_T("WM/ToolName"))
+            else if (Name==__T("WM/ToolName"))
                 Fill(Stream_General, 0, General_Encoded_Application, Value);
-            else if (Name==_T("WM/ToolVersion"))
-                Fill(Stream_General, 0, General_Encoded_Application, Retrieve(Stream_General, 0, General_Encoded_Application)+_T(" ")+Value, true);
-            else if (Name==_T("WM/TrackNumber"))
+            else if (Name==__T("WM/ToolVersion"))
+                Fill(Stream_General, 0, General_Encoded_Application, Retrieve(Stream_General, 0, General_Encoded_Application)+__T(" ")+Value, true);
+            else if (Name==__T("WM/TrackNumber"))
                 Fill(Stream_General, 0, General_Track_Position, Value, true); //Clear last value, like WM/Track
-            else if (Name==_T("WM/Track"))
+            else if (Name==__T("WM/Track"))
             {
                 if (Retrieve(Stream_General, 0, General_Track_Position).empty())
                     Fill(Stream_General, 0, General_Track_Position, Value.To_int32u()+1);
             }
-            else if (Name==_T("WM/UniqueFileIdentifier"))
+            else if (Name==__T("WM/UniqueFileIdentifier"))
             {
-                if (Value.empty() || Value[0]!=_T(';')) //Test if there is only the separator
+                if (Value.empty() || Value[0]!=__T(';')) //Test if there is only the separator
                 {
-                    Value.FindAndReplace(_T(";"), MediaInfoLib::Config.TagSeparator_Get());
+                    Value.FindAndReplace(__T(";"), MediaInfoLib::Config.TagSeparator_Get());
                     Fill(Stream_General, 0, General_UniqueID, Value);
                 }
             }
-            else if (Name==_T("WM/Writer"))
+            else if (Name==__T("WM/Writer"))
                 Fill(Stream_General, 0, General_WrittenBy, Value);
-            else if (Name==_T("WM/Year"))
+            else if (Name==__T("WM/Year"))
                 Fill(Stream_General, 0, General_Recorded_Date, Value);
             else
                 Fill(Stream_General, 0, Name.To_Local().c_str(), Value);
@@ -1165,16 +1201,16 @@
 //---------------------------------------------------------------------------
 void File_Wm::Header_ExtendedContentDescription_ASFLeakyBucketPairs(int16u Value_Length)
 {
-    Element_Begin("ASFLeakyBucketPairs", Value_Length);
+    Element_Begin1("ASFLeakyBucketPairs");
     Skip_L2(                                                    "Reserved");
     for (int16u Pos=2; Pos<Value_Length; Pos+=8)
     {
-        Element_Begin("Bucket", 8);
+        Element_Begin1("Bucket");
         Skip_L4(                                                "BitRate");
         Skip_L4(                                                "msBufferWindow");
-        Element_End();
+        Element_End0();
     }
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
@@ -1187,12 +1223,12 @@
     Get_L2 (Count,                                              "Count");
     for (int16u Pos=0; Pos<Count; Pos++)
     {
-        Element_Begin("Stream", 6);
+        Element_Begin1("Stream");
         int32u AverageBitRate;
         int16u StreamNumber;
-        Get_L2 (StreamNumber,                                   "Stream Number"); Element_Info(StreamNumber);
-        Get_L4 (AverageBitRate,                                 "Average Bitrate"); Element_Info(AverageBitRate);
-        Element_End();
+        Get_L2 (StreamNumber,                                   "Stream Number"); Element_Info1(StreamNumber);
+        Get_L4 (AverageBitRate,                                 "Average Bitrate"); Element_Info1(AverageBitRate);
+        Element_End0();
 
         //Filling
         if (Stream[StreamNumber].AverageBitRate==0) //Prefere Average bitrate of Extended Stream Properties if present
@@ -1208,7 +1244,7 @@
     //Parsing
     Ztring CopyrightURL, BannerImageURL;
     int32u BannerImageData_Type, BannerImageData_Length, BannerImageURL_Length, CopyrightURL_Length;
-    Get_L4 (BannerImageData_Type,                               "Banner Image Data Type"); Param_Info(Wm_BannerImageData_Type(BannerImageData_Type));
+    Get_L4 (BannerImageData_Type,                               "Banner Image Data Type"); Param_Info1(Wm_BannerImageData_Type(BannerImageData_Type));
     Get_L4 (BannerImageData_Length,                             "Banner Image Data Length");
     if (BannerImageData_Length>0)
         Skip_XX(BannerImageData_Length,                         "Banner Image Data");
@@ -1306,7 +1342,7 @@
             Temp->second.SearchingPayload=true;
             Streams_Count++;
         }
-        Temp++;
+        ++Temp;
     }
 
     //Enabling the alternative parser
@@ -1319,41 +1355,41 @@
 {
     //Counting
     Packet_Count++;
-    Element_Info(Packet_Count);
+    Element_Info1(Packet_Count);
     size_t Element_Show_Count=0;
 
     //Parsing
     int32u PacketLength=0, SizeOfMediaObject=0;
     int8u  Flags, ErrorCorrectionData_Length, ErrorCorrectionLengthType, SequenceType, PaddingLengthType, PacketLengthType;
     bool   ErrorCorrectionPresent;
-    Element_Begin("Error Correction");
+    Element_Begin1("Error Correction");
         Get_L1 (Flags,                                          "Flags");
-            Get_Flags (Flags&0x0F, ErrorCorrectionData_Length,  "Error Correction Data Length"); //4 lowest bits
+            Get_FlagsM(Flags&0x0F, ErrorCorrectionData_Length,  "Error Correction Data Length"); //4 lowest bits
             Skip_Flags(Flags, 4,                                "Opaque Data Present");
-            Get_Flags ((Flags>>5)&0x03, ErrorCorrectionLengthType, "Error Correction Length Type"); //bits 6 and 7
+            Get_FlagsM((Flags>>5)&0x03, ErrorCorrectionLengthType, "Error Correction Length Type"); //bits 6 and 7
             Get_Flags (Flags, 7, ErrorCorrectionPresent,        "Error Correction Present");
         if (ErrorCorrectionPresent && ErrorCorrectionLengthType==0 && ErrorCorrectionData_Length==2)
         {
             int8u  TypeNumber;
             Get_L1 (TypeNumber,                                 "Type/Number");
-                Skip_Flags((TypeNumber>>4)&0x0F, "Type");
-                Skip_Flags( TypeNumber    &0x0F, "Number");
+                Skip_FlagsM((TypeNumber>>4)&0x0F, "Type");
+                Skip_FlagsM( TypeNumber    &0x0F, "Number");
             Skip_L1(                                            "Cycle");
         }
-    Element_End();
+    Element_End0();
 
-    Element_Begin("Payload Parsing Information");
+    Element_Begin1("Payload Parsing Information");
         Get_L1 (Flags,                                          "Length Type Flags");
             Get_Flags (Flags, 0, MultiplePayloadsPresent,       "Multiple Payloads Present");
-            Get_Flags ((Flags>>1)&0x3, SequenceType,            "Sequence Type");
-            Get_Flags ((Flags>>3)&0x3, PaddingLengthType,       "Padding Length Type");
-            Get_Flags ((Flags>>5)&0x3, PacketLengthType,        "Packet Length Type");
+            Get_FlagsM((Flags>>1)&0x3, SequenceType,            "Sequence Type");
+            Get_FlagsM((Flags>>3)&0x3, PaddingLengthType,       "Padding Length Type");
+            Get_FlagsM((Flags>>5)&0x3, PacketLengthType,        "Packet Length Type");
             Skip_Flags(Flags, 7,                                "Error Correction Present");
         Get_L1 (Flags,                                          "Property Flags");
-            Get_Flags ( Flags    &0x3, ReplicatedDataLengthType, "Replicated Data Length Type");
-            Get_Flags ((Flags>>2)&0x3, OffsetIntoMediaObjectLengthType, "Offset Into Media Object Length Type");
-            Get_Flags ((Flags>>4)&0x3, MediaObjectNumberLengthType, "Media Object Number Length Type");
-            Get_Flags ((Flags>>6)&0x3, StreamNumberLengthType,  "Stream Number Length Type");
+            Get_FlagsM( Flags    &0x3, ReplicatedDataLengthType, "Replicated Data Length Type");
+            Get_FlagsM((Flags>>2)&0x3, OffsetIntoMediaObjectLengthType, "Offset Into Media Object Length Type");
+            Get_FlagsM((Flags>>4)&0x3, MediaObjectNumberLengthType, "Media Object Number Length Type");
+            Get_FlagsM((Flags>>6)&0x3, StreamNumberLengthType,  "Stream Number Length Type");
         switch (PacketLengthType)
         {
             case 1 : {int8u  Data; Get_L1(Data,                 "Packet Length"); PacketLength=Data;} break;
@@ -1377,17 +1413,17 @@
         }
         Skip_L4(                                                "Send Time");
         Skip_L2(                                                "Duration");
-    Element_End();
+    Element_End0();
 
     if (MultiplePayloadsPresent)
     {
         //Parsing
-        Element_Begin("Multiple Payloads additional flags");
+        Element_Begin1("Multiple Payloads additional flags");
             int8u AdditionalFlags;
             Get_L1 (AdditionalFlags,                                     "Flags");
-                Get_Flags ( AdditionalFlags    &0x3F, NumberPayloads,    "Number of Payloads"); //6 bits
-                Get_Flags ((AdditionalFlags>>6)&0x03, PayloadLengthType, "Payload Length Type"); //bits 6 and 7
-        Element_End();
+                Get_FlagsM( AdditionalFlags    &0x3F, NumberPayloads,    "Number of Payloads"); //6 bits
+                Get_FlagsM((AdditionalFlags>>6)&0x03, PayloadLengthType, "Payload Length Type"); //bits 6 and 7
+        Element_End0();
     }
     else
     {
@@ -1397,12 +1433,12 @@
 
     for (NumberPayloads_Pos=0; NumberPayloads_Pos<NumberPayloads; NumberPayloads_Pos++)
     {
-        Element_Begin("Payload");
+        Element_Begin1("Payload");
         int32u ReplicatedDataLength=0, PayloadLength=0;
         int8u  StreamNumber;
         Get_L1 (StreamNumber,                                   "Stream Number");
         Stream_Number=StreamNumber&0x7F; //For KeyFrame
-        Element_Info(Stream_Number);
+        Element_Info1(Stream_Number);
         switch (MediaObjectNumberLengthType)
         {
             case 1 : Skip_L1(                                   "Media Object Number"); break;
@@ -1503,7 +1539,7 @@
 
             //Codec specific
             #if defined(MEDIAINFO_VC1_YES)
-            if (Retrieve(Stream[Stream_Number].StreamKind, Stream[Stream_Number].StreamPos, Fill_Parameter(Stream[Stream_Number].StreamKind, Generic_Format))==_T("VC-1"))
+            if (Retrieve(Stream[Stream_Number].StreamKind, Stream[Stream_Number].StreamPos, Fill_Parameter(Stream[Stream_Number].StreamKind, Generic_Format))==__T("VC-1"))
                 ((File_Vc1*)Stream[Stream_Number].Parser)->FrameIsAlwaysComplete=FrameIsAlwaysComplete;
             #endif
 
@@ -1531,7 +1567,7 @@
                 Streams_Count--;
             }
         }
-        Element_End();
+        Element_End0();
     }
 
     if (Data_Parse_Padding)
@@ -1551,11 +1587,11 @@
 //---------------------------------------------------------------------------
 void File_Wm::Data_Packet_ReplicatedData(int32u Size)
 {
-    Element_Begin("Replicated Data", Size);
+    Element_Begin1("Replicated Data");
     int64u Element_Offset_Final=Element_Offset+Size;
     for (size_t Pos=0; Pos<Stream[Stream_Number].Payload_Extension_Systems.size(); Pos++)
     {
-        Element_Begin();
+        Element_Begin0();
         switch (Stream[Stream_Number].Payload_Extension_Systems[Pos].ID.hi)
         {
             case Elements::Payload_Extension_System_TimeStamp :     Data_Packet_ReplicatedData_TimeStamp(); break;
@@ -1568,16 +1604,16 @@
                                                                     //else
                                                                         Pos=Stream[Stream_Number].Payload_Extension_Systems.size(); //Disabling the rest, all is unknown
         }
-        Element_End();
+        Element_End0();
     }
 
     if (Element_Offset<Element_Offset_Final)
     {
-        Element_Begin("Other chunks");
+        Element_Begin1("Other chunks");
         Skip_XX(Element_Offset_Final-Element_Offset, "Unknown");
-        Element_End();
+        Element_End0();
     }
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
@@ -1586,11 +1622,18 @@
     Element_Name("TimeStamp");
 
     //Parsing
+    int64u TS0;
     Skip_L2(                                                    "Unknown");
     Skip_L4(                                                    "Unknown");
     Skip_L4(                                                    "Unknown");
-    Info_L8(TS0,                                                "TS0"); if (TS0!=(int64u)-1) Param_Info(TS0/10000);
-    Info_L8(TS1,                                                "TS1"); if (TS1!=(int64u)-1) Param_Info(TS1/10000);
+    Get_L8 (TS0,                                                "TS0");
+    #if MEDIAINFO_TRACE
+        if (TS0!=(int64u)-1) Param_Info1(TS0/10000);
+    #endif //MEDIAINFO_TRACE
+    Info_L8(TS1,                                                "TS1");
+    #if MEDIAINFO_TRACE
+        if (TS1!=(int64u)-1) Param_Info1(TS1/10000);
+    #endif //MEDIAINFO_TRACE
     Skip_L4(                                                    "Unknown");
     Skip_L4(                                                    "Unknown");
     Skip_L4(                                                    "Unknown");
@@ -1614,12 +1657,12 @@
     Get_L4 (Count,                                              "Index Entries Count");
     for (int32u Pos=0; Pos<Count; Pos++)
     {
-        Element_Begin("Index Entry", 6);
+        Element_Begin1("Index Entry", 6);
         int32u PacketNumber;
         int16u PacketCount;
         Get_L4 (PacketNumber,                                   "Packet Number");
         Get_L2 (PacketCount,                                    "Packet Count");
-        Element_End();
+        Element_End0();
     }
     */
     Skip_XX(Element_TotalSize_Get()-Element_Offset,             "Indexes");
@@ -1639,28 +1682,28 @@
     Get_L4 (Blocks_Count,                                       "Index Blocks Count");
     for (int16u Pos=0; Pos<Specifiers_Count; Pos++)
     {
-        Element_Begin("Specifier");
+        Element_Begin1("Specifier");
             Skip_L2(                                            "Stream Number");
             Skip_L2(                                            "Index Type");
-        Element_End();
+        Element_End0();
     }
     for (int32u Pos=0; Pos<Blocks_Count; Pos++)
     {
-        Element_Begin("Block");
+        Element_Begin1("Block");
         int32u Entry_Count;
         Get_L4 (Entry_Count,                                    "Index Entry Count");
-        Element_Begin("Block Positions");
+        Element_Begin1("Block Positions");
             for (int16u Pos=0; Pos<Specifiers_Count; Pos++)
                 Skip_L4(                                        "Position");
-        Element_End();
+        Element_End0();
         for (int32u Pos=0; Pos<Entry_Count; Pos++)
         {
-            Element_Begin("Entry");
+            Element_Begin1("Entry");
             for (int16u Pos=0; Pos<Specifiers_Count; Pos++)
                 Skip_L4(                                        "Offset");
-            Element_End();
+            Element_End0();
         }
-        Element_End();
+        Element_End0();
     }
     */
     Skip_XX(Element_TotalSize_Get()-Element_Offset,             "Indexes");

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Xdcam_Clip.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Xdcam_Clip.cpp Changed

@@ -1,31 +1,35 @@
 // File_Xdcam_Clip - Info for XDCAM XML files
-// Copyright (C) 2010-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_XDCAM_YES)
 //---------------------------------------------------------------------------
 
@@ -36,7 +40,8 @@
 #include "ZenLib/Dir.h"
 #include "ZenLib/File.h"
 #include "ZenLib/FileName.h"
-#include "ZenLib/TinyXml/tinyxml.h"
+#include "tinyxml2.h"
+using namespace tinyxml2;
 //---------------------------------------------------------------------------
 
 namespace MediaInfoLib
@@ -49,38 +54,18 @@
 //---------------------------------------------------------------------------
 bool File_Xdcam_Clip::FileHeader_Begin()
 {
-    //Element_Size
-    if (File_Size>64*1024)
-    {
-        Reject("Xdcam_Clip");
-        return false; //Xdcam_Clip XML files are not big
-    }
+    XMLDocument document;
+    if (!FileHeader_Begin_XML(document))
+       return false;
 
-    //Element_Size
-    if (Buffer_Size<5)
-        return false; //Must wait for more data
-
-    //XML header
-    if (Buffer[0]!='<'
-     || Buffer[1]!='?'
-     || Buffer[2]!='x'
-     || Buffer[3]!='m'
-     || Buffer[4]!='l')
-    {
-        Reject("Xdcam_Clip");
-        return false;
-    }
-
-    TiXmlDocument document(File_Name.To_Local());
-    if (document.LoadFile())
     {
-        TiXmlElement* Root=document.FirstChildElement("NonRealTimeMeta");
+        XMLElement* Root=document.FirstChildElement("NonRealTimeMeta");
         if (Root)
         {
             Accept("Xdcam_Clip");
             Fill(Stream_General, 0, General_Format, "XDCAM Clip");
 
-            TiXmlElement* Element;
+            XMLElement* Element;
 
             //CreationDate
             Element=Root->FirstChildElement("CreationDate");
@@ -110,29 +95,29 @@
 
             #if defined(MEDIAINFO_MXF_YES)
                 if (File_Name.size()>12
-                 && File_Name[File_Name.size()-7]==_T('M')
-                 && File_Name[File_Name.size()-6]==_T('0')
-                 && File_Name[File_Name.size()-5]==_T('1')
-                 && File_Name[File_Name.size()-4]==_T('.')
-                 && File_Name[File_Name.size()-3]==_T('X')
-                 && File_Name[File_Name.size()-2]==_T('M')
-                 && File_Name[File_Name.size()-1]==_T('L'))
+                 && File_Name[File_Name.size()-7]==__T('M')
+                 && File_Name[File_Name.size()-6]==__T('0')
+                 && File_Name[File_Name.size()-5]==__T('1')
+                 && File_Name[File_Name.size()-4]==__T('.')
+                 && File_Name[File_Name.size()-3]==__T('X')
+                 && File_Name[File_Name.size()-2]==__T('M')
+                 && File_Name[File_Name.size()-1]==__T('L'))
                 {
                     Ztring file=File_Name.substr(File_Name.size()-12, 5);
                     Ztring MXF_File=File_Name;
                     MXF_File.resize(MXF_File.size()-12);
                     MXF_File+=file;
-                    if (File::Exists(MXF_File+_T(".MXF")))
-                        MXF_File+=_T(".MXF");
-                    if (File::Exists(MXF_File+_T(".MP4")))
-                        MXF_File+=_T(".MP4");
+                    if (File::Exists(MXF_File+__T(".MXF")))
+                        MXF_File+=__T(".MXF");
+                    if (File::Exists(MXF_File+__T(".MP4")))
+                        MXF_File+=__T(".MP4");
 
-                    //int8u ReadByHuman=Ztring(MediaInfo::Option_Static(_T("ReadByHuman_Get"))).To_int8u();
-                    //MediaInfo::Option_Static(_T("ReadByHuman"), _T("0"));
+                    //int8u ReadByHuman=Ztring(MediaInfo::Option_Static(__T("ReadByHuman_Get"))).To_int8u();
+                    //MediaInfo::Option_Static(__T("ReadByHuman"), __T("0"));
                     MediaInfo_Internal MI;
                     if (MI.Open(MXF_File))
                     {
-                        //MediaInfo::Option_Static(_T("ReadByHuman"), ReadByHuman?_T("1"):_T("0"));
+                        //MediaInfo::Option_Static(__T("ReadByHuman"), ReadByHuman?__T("1"):__T("0"));
                         Merge(MI);
                         Fill(Stream_Video, StreamPos_Last, "Source", MXF_File);
                         File_Size_Total+=Ztring(MI.Get(Stream_General, 0, General_FileSize)).To_int64u();
@@ -142,12 +127,12 @@
                         Ztring Format_Commercial=MI.Get(Stream_General, 0, General_Format_Commercial_IfAny);
                         if (!Format_Commercial.empty())
                         {
-                            Format_Commercial.FindAndReplace(_T("XDCAM "), Ztring());
-                            Fill(Stream_General, 0, General_Format_Commercial, _T("XDCAM Clip ")+Format_Commercial, true);
+                            Format_Commercial.FindAndReplace(__T("XDCAM "), Ztring());
+                            Fill(Stream_General, 0, General_Format_Commercial, __T("XDCAM Clip ")+Format_Commercial, true);
                         }
                     }
                     //else
-                    //    MediaInfo::Option_Static(_T("ReadByHuman"), ReadByHuman?_T("1"):_T("0"));
+                    //    MediaInfo::Option_Static(__T("ReadByHuman"), ReadByHuman?__T("1"):__T("0"));
                 }
             #endif //defined(MEDIAINFO_MXF_YES)
 
@@ -165,11 +150,6 @@
             return false;
         }
     }
-    else
-    {
-        Reject("Xdcam_Clip");
-        return false;
-    }
 
     //All should be OK...
     return true;

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Multiple/File_Xdcam_Clip.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File_Xdcam_Clip.h Changed

@@ -1,17 +1,17 @@
 // File_Xdcam_Clip - Info for XDCAM Clip files
-// Copyright (C) 2010-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File__ReferenceFilesHelper.cpp Added

@@ -0,0 +1,974 @@
+// File__ReferenceFilesHelper - class for analyzing/demuxing reference files
+// Copyright (C) 2011-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_REFERENCES_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Multiple/File__ReferenceFilesHelper.h"
+#include "MediaInfo/MediaInfo_Internal.h"
+#include "ZenLib/Dir.h"
+#include "ZenLib/File.h"
+#include "ZenLib/FileName.h"
+#include "ZenLib/Format/Http/Http_Utils.h"
+#include <set>
+#include <algorithm>
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File__ReferenceFilesHelper::File__ReferenceFilesHelper(File__Analyze* MI_, MediaInfo_Config_MediaInfo* Config_)
+{
+    //Temp
+    MI=MI_;
+    Config=Config_;
+    Reference=References.end();
+    Init_Done=false;
+    TestContinuousFileNames=false;
+    FrameRate=0;
+    Duration=0;
+    #if MEDIAINFO_NEXTPACKET
+        DTS_Interval=(int64u)-1;
+    #endif //MEDIAINFO_NEXTPACKET
+}
+
+//---------------------------------------------------------------------------
+File__ReferenceFilesHelper::~File__ReferenceFilesHelper()
+{
+    for (references::iterator ReferenceTemp=References.begin(); ReferenceTemp!=References.end(); ReferenceTemp++)
+        delete ReferenceTemp->MI; //ReferenceTemp->MI=NULL;
+}
+
+//***************************************************************************
+// Streams management
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File__ReferenceFilesHelper_Algo1 (const File__ReferenceFilesHelper::reference &Ref1, const File__ReferenceFilesHelper::reference &Ref2) { return (Ref1.StreamID<Ref2.StreamID);}
+bool File__ReferenceFilesHelper_Algo2 (const File__ReferenceFilesHelper::reference &Ref1, const File__ReferenceFilesHelper::reference &Ref2) { return (Ref1.StreamPos<Ref2.StreamPos);}
+bool File__ReferenceFilesHelper_Algo3 (const File__ReferenceFilesHelper::reference &Ref1, const File__ReferenceFilesHelper::reference &Ref2) { return (Ref1.StreamKind<Ref2.StreamKind);}
+void File__ReferenceFilesHelper::ParseReferences()
+{
+    if (!Init_Done)
+    {
+        //Testing IDs
+        std::sort(References.begin(), References.end(), File__ReferenceFilesHelper_Algo1);
+        std::sort(References.begin(), References.end(), File__ReferenceFilesHelper_Algo2);
+        std::sort(References.begin(), References.end(), File__ReferenceFilesHelper_Algo3);
+        std::set<int64u> StreamList;
+        bool StreamList_DuplicatedIds=false;
+        for (Reference=References.begin(); Reference<References.end(); Reference++)
+            if (StreamList.find((*Reference).StreamID)==StreamList.end())
+                StreamList.insert((*Reference).StreamID);
+            else
+            {
+                StreamList_DuplicatedIds=true;
+                break;
+            }
+        if (StreamList_DuplicatedIds)
+            for (Reference=References.begin(); Reference<References.end(); Reference++)
+                (*Reference).StreamID=Reference-References.begin()+1;
+
+        //Configuring file names
+        Reference=References.begin();
+        while (Reference!=References.end())
+        {
+            ZtringList Names=Reference->FileNames;
+            ZtringList AbsoluteNames; AbsoluteNames.Separator_Set(0, ",");
+            for (size_t Pos=0; Pos<Names.size(); Pos++)
+            {
+                if (Names[Pos].find(__T("file:///"))==0)
+                {
+                    Names[Pos].erase(0, 8); //Removing "file:///", this is the default behaviour and this makes comparison easier
+                    Names[Pos]=ZenLib::Format::Http::URL_Encoded_Decode(Names[Pos]);
+                }
+                if (Names[Pos].find(__T("file://"))==0)
+                {
+                    Names[Pos].erase(0, 7); //Removing "file://", this is the default behaviour and this makes comparison easier
+                    Names[Pos]=ZenLib::Format::Http::URL_Encoded_Decode(Names[Pos]);
+                }
+                if (Names[Pos].find(__T("file:"))==0)
+                {
+                    Names[Pos].erase(0, 5); //Removing "file:", this is the default behaviour and this makes comparison easier
+                    Names[Pos]=ZenLib::Format::Http::URL_Encoded_Decode(Names[Pos]);
+                }
+                Ztring AbsoluteName;
+                if (Names[Pos].find(__T(':'))!=1 && Names[Pos].find(__T("/"))!=0 && Names[Pos].find(__T("\\\\"))!=0) //If absolute patch
+                {
+                    AbsoluteName=ZenLib::FileName::Path_Get(MI->File_Name);
+                    if (!AbsoluteName.empty())
+                        AbsoluteName+=ZenLib::PathSeparator;
+                }
+                AbsoluteName+=Names[Pos];
+                #ifdef __WINDOWS__
+                    AbsoluteName.FindAndReplace(__T("/"), __T("\\"), 0, Ztring_Recursive); //Names[Pos] normalization
+                #endif //__WINDOWS__
+                AbsoluteNames.push_back(AbsoluteName);
+            }
+            if (!File::Exists(AbsoluteNames[0]))
+            {
+                AbsoluteNames.clear();
+
+                //Configuring file name (this time, we try to force URL decode in all cases)
+                for (size_t Pos=0; Pos<Names.size(); Pos++)
+                {
+                    Names[Pos]=ZenLib::Format::Http::URL_Encoded_Decode(Names[Pos]);
+                    Ztring AbsoluteName;
+                    if (Names[Pos].find(__T(':'))!=1 && Names[Pos].find(__T("/"))!=0 && Names[Pos].find(__T("\\\\"))!=0) //If absolute patch
+                    {
+                        AbsoluteName=ZenLib::FileName::Path_Get(MI->File_Name);
+                        if (!AbsoluteName.empty())
+                            AbsoluteName+=ZenLib::PathSeparator;
+                    }
+                    AbsoluteName+=Names[Pos];
+                    #ifdef __WINDOWS__
+                        AbsoluteName.FindAndReplace(__T("/"), __T("\\"), 0, Ztring_Recursive); //Names[Pos] normalization
+                    #endif //__WINDOWS__
+                    AbsoluteNames.push_back(AbsoluteName);
+                }
+
+                if (!File::Exists(AbsoluteNames[0]))
+                {
+                    AbsoluteNames.clear();
+                    Names=Reference->FileNames;
+
+                    //Configuring file name (this time, we try to test local files)
+                    size_t PathSeparator_Pos=Names[0].find_last_of(__T("\\/"));
+                    if (PathSeparator_Pos!=string::npos && PathSeparator_Pos)
+                    {
+                        Ztring PathToRemove=Names[0].substr(0, PathSeparator_Pos);
+                        bool IsOk=true;
+                        for (size_t Pos=0; Pos<Names.size(); Pos++)
+                            if (Names[Pos].find(PathToRemove))
+                            {
+                                IsOk=false;
+                                break;
+                            }
+                        if (IsOk)
+                        {
+                            for (size_t Pos=0; Pos<Names.size(); Pos++)
+                            {
+                                Names[Pos].erase(0, PathSeparator_Pos+1);
+                                Ztring AbsoluteName=ZenLib::FileName::Path_Get(MI->File_Name);
+                                if (!AbsoluteName.empty())
+                                    AbsoluteName+=ZenLib::PathSeparator;
+                                AbsoluteName+=Names[Pos];
+                                #ifdef __WINDOWS__
+                                    AbsoluteName.FindAndReplace(__T("/"), __T("\\"), 0, Ztring_Recursive); //Names[Pos] normalization
+                                #endif //__WINDOWS__
+                                AbsoluteNames.push_back(AbsoluteName);
+                            }
+
+                            if (!File::Exists(AbsoluteNames[0]))
+                            {
+                                AbsoluteNames.clear();
+                                Names=Reference->FileNames;
+
+                                //Configuring file name (this time, we try to test local files)
+                                size_t PathSeparator_Pos=Names[0].find_last_of(__T("\\/"));
+                                if (PathSeparator_Pos!=string::npos && PathSeparator_Pos)
+                                    PathSeparator_Pos=Names[0].find_last_of(__T("\\/"), PathSeparator_Pos-1);
+                                if (PathSeparator_Pos!=string::npos && PathSeparator_Pos)
+                                {
+                                    Ztring PathToRemove=Names[0].substr(0, PathSeparator_Pos);
+                                    bool IsOk=true;
+                                    for (size_t Pos=0; Pos<Names.size(); Pos++)
+                                        if (Names[Pos].find(PathToRemove))
+                                        {
+                                            IsOk=false;
+                                            break;
+                                        }
+                                    if (IsOk)
+                                        for (size_t Pos=0; Pos<Names.size(); Pos++)
+                                        {
+                                            Names[Pos].erase(0, PathSeparator_Pos+1);
+                                            Ztring AbsoluteName=ZenLib::FileName::Path_Get(MI->File_Name);
+                                            if (!AbsoluteName.empty())
+                                                AbsoluteName+=ZenLib::PathSeparator;
+                                            AbsoluteName+=Names[Pos];
+                                            #ifdef __WINDOWS__
+                                                AbsoluteName.FindAndReplace(__T("/"), __T("\\"), 0, Ztring_Recursive); //Names[Pos] normalization
+                                            #endif //__WINDOWS__
+                                            AbsoluteNames.push_back(AbsoluteName);
+                                        }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            Reference->Source=Reference->FileNames.Read(0);
+            if (Reference->StreamKind!=Stream_Max)
+            {
+                if (Reference->StreamPos==(size_t)-1)
+                    Reference->StreamPos=Stream_Prepare(Reference->StreamKind);
+                MI->Fill(Reference->StreamKind, Reference->StreamPos, "Source", Reference->Source);
+            }
+            if (!AbsoluteNames.empty())
+                Reference->FileNames=AbsoluteNames;
+
+            if (!AbsoluteNames.empty() && AbsoluteNames[0]==MI->File_Name)
+            {
+                Reference->IsCircular=true;
+                Reference->FileNames.clear();
+            }
+            else if (!AbsoluteNames.empty())
+                Reference->FileNames=AbsoluteNames;
+            else
+            {
+                Reference->FileNames.clear();
+                MI->Fill(Reference->StreamKind, Reference->StreamPos, "Source_Info", "Missing");
+            }
+
+            if (TestContinuousFileNames)
+                File__Analyze::Streams_Accept_TestContinuousFileNames_Static(Reference->FileNames, true);
+
+            Reference++;
+        }
+
+        #if MEDIAINFO_DEMUX
+            if (Config->NextPacket_Get())
+            {
+                Demux_Interleave=Config->File_Demux_Interleave_Get();
+                if (Demux_Interleave)
+                {
+                    CountOfReferencesToParse=References.size();
+                    DTS_Interval=3000000000; // 3 seconds
+                }
+            }
+
+            //Using the frame rate from the first stream having a frame rate
+            if (!FrameRate)
+                for (references::iterator ReferenceFrameRate=References.begin(); ReferenceFrameRate!=References.end(); ReferenceFrameRate++)
+                    if (ReferenceFrameRate->FrameRate)
+                    {
+                        FrameRate=ReferenceFrameRate->FrameRate;
+                        break;
+                    }
+
+            if (Config->NextPacket_Get())
+            {
+                Reference=References.begin();
+                while (Reference!=References.end())
+                {
+                    ParseReference(); //Init
+                    Reference++;
+                }
+
+                //Cleanup
+                for (size_t Pos=0; Pos<References.size(); Pos++)
+                    if (References[Pos].Status[File__Analyze::IsFinished])
+                    {
+                        References.erase(References.begin()+Pos);
+                        Pos--;
+                    }
+                if (References.empty())
+                    return;
+
+                //File size handling
+                if (MI->Config->File_Size!=MI->File_Size)
+                {
+                    MI->Fill(Stream_General, 0, General_FileSize, MI->Config->File_Size, 10, true);
+                    MI->Fill(Stream_General, 0, General_StreamSize, MI->File_Size, 10, true);
+                }
+
+            }
+        #endif //MEDIAINFO_DEMUX
+
+        FileSize_Compute();
+        Reference=References.begin();
+        Init_Done=true;
+        /*
+        #if MEDIAINFO_EVENTS
+            struct MediaInfo_Event_General_SubFile_Start_0 Event;
+            MI->Event_Prepare((struct MediaInfo_Event_Generic*)&Event);
+            Event.EventCode=MediaInfo_EventCode_Create(0, MediaInfo_Event_General_SubFile_Start, 0);
+            Event.EventSize=sizeof(struct MediaInfo_Event_General_SubFile_Start_0);
+
+            Event.FileName_Relative_Unicode=Reference->Source.c_str();
+
+            MI->Config->Event_Send(NULL, (const int8u*)&Event, Event.EventSize, MI->File_Name);
+        #endif //MEDIAINFO_EVENTS
+        */
+
+        #if MEDIAINFO_DEMUX
+            if (Config->NextPacket_Get() && MI->Demux_EventWasSent_Accept_Specific)
+            {
+                MI->Config->Demux_EventWasSent=true;
+                return;
+            }
+        #endif //MEDIAINFO_DEMUX
+    }
+
+    while (Reference!=References.end())
+    {
+        #if MEDIAINFO_NEXTPACKET
+        if (Reference->MI==NULL || !Reference->Status[File__Analyze::IsFinished])
+        #endif //MEDIAINFO_NEXTPACKET
+            ParseReference();
+
+        //State
+        int64u FileSize_Parsed=0;
+        #if MEDIAINFO_NEXTPACKET
+            DTS_Minimal=(int64u)-1;
+        #endif //MEDIAINFO_NEXTPACKET
+        for (references::iterator ReferenceTemp=References.begin(); ReferenceTemp!=References.end(); ReferenceTemp++)
+        {
+            if (ReferenceTemp->MI)
+            {
+                if (ReferenceTemp->State<10000)
+                {
+                    if (ReferenceTemp->MI)
+                        ReferenceTemp->State=ReferenceTemp->MI->State_Get();
+                    if (ReferenceTemp->State && ReferenceTemp->MI->Config.File_Size!=(int64u)-1)
+                        FileSize_Parsed+=(int64u)(ReferenceTemp->MI->Config.File_Size*(((float)ReferenceTemp->State)/10000));
+                }
+                else
+                    FileSize_Parsed+=ReferenceTemp->MI->Config.File_Size;
+
+                #if MEDIAINFO_NEXTPACKET
+                    //Minimal DTS
+                    if (DTS_Interval!=(int64u)-1 && !Reference->Status[File__Analyze::IsFinished] && ReferenceTemp->MI->Info && DTS_Minimal>ReferenceTemp->MI->Info->FrameInfo.DTS)
+                        DTS_Minimal=ReferenceTemp->MI->Info->FrameInfo.DTS;
+                #endif //MEDIAINFO_NEXTPACKET
+            }
+        }
+        Config->State_Set(((float)FileSize_Parsed)/MI->Config->File_Size);
+
+        /*
+        #if MEDIAINFO_EVENTS
+            struct MediaInfo_Event_General_SubFile_End_0 Event;
+            MI->Event_Prepare((struct MediaInfo_Event_Generic*)&Event);
+            Event.EventCode=MediaInfo_EventCode_Create(0, MediaInfo_Event_General_SubFile_End, 0);
+            Event.EventSize=sizeof(struct MediaInfo_Event_General_SubFile_End_0);
+
+            Event.FileName_Relative_Unicode=Reference->Source.c_str();
+
+            MI->Config->Event_Send(NULL, (const int8u*)&Event, Event.EventSize, MI->File_Name);
+        #endif //MEDIAINFO_EVENTS
+        */
+
+        #if MEDIAINFO_DEMUX
+            if (Demux_Interleave)
+            {
+                references::iterator Reference_Next=Reference; Reference_Next++;
+
+                if (Reference_Next==References.end() && Config->NextPacket_Get() && CountOfReferencesToParse)
+                    Reference=References.begin();
+                else
+                    Reference=Reference_Next;
+
+                /*
+                #if MEDIAINFO_EVENTS
+                    struct MediaInfo_Event_General_SubFile_Start_0 Event;
+                    MI->Event_Prepare((struct MediaInfo_Event_Generic*)&Event);
+                    Event.EventCode=MediaInfo_EventCode_Create(0, MediaInfo_Event_General_SubFile_Start, 0);
+                    Event.EventSize=sizeof(struct MediaInfo_Event_General_SubFile_Start_0);
+
+                    Event.FileName_Relative_Unicode=Reference->Source.c_str();
+
+                    MI->Config->Event_Send(NULL, (const int8u*)&Event, Event.EventSize, MI->File_Name);
+                #endif //MEDIAINFO_EVENTS
+                */
+
+                if (Config->Demux_EventWasSent)
+                    return;
+            }
+            else
+            {
+                if (Config->Demux_EventWasSent)
+                    return;
+
+                Reference++;
+            }
+        #else //MEDIAINFO_DEMUX
+            Reference++;
+        #endif //MEDIAINFO_DEMUX
+
+        /*
+        #if MEDIAINFO_EVENTS
+            if (Reference!=References.end())
+            {
+                struct MediaInfo_Event_General_SubFile_Start_0 Event;
+                MI->Event_Prepare((struct MediaInfo_Event_Generic*)&Event);
+                Event.EventCode=MediaInfo_EventCode_Create(0, MediaInfo_Event_General_SubFile_Start, 0);
+                Event.EventSize=sizeof(struct MediaInfo_Event_General_SubFile_Start_0);
+
+                Event.FileName_Relative_Unicode=Reference->Source.c_str();
+
+                MI->Config->Event_Send(NULL, (const int8u*)&Event, Event.EventSize, MI->File_Name);
+            }
+        #endif //MEDIAINFO_EVENTS
+        */
+    }
+
+    //File size handling
+    FileSize_Compute();
+    if (MI->Config->File_Size!=MI->File_Size)
+    {
+        MI->Fill(Stream_General, 0, General_FileSize, MI->Config->File_Size, 10, true);
+        MI->Fill(Stream_General, 0, General_StreamSize, MI->File_Size, 10, true);
+    }
+}
+
+//---------------------------------------------------------------------------
+void File__ReferenceFilesHelper::ParseReference()
+{
+    if (Reference->MI==NULL && !Reference->FileNames.empty())
+    {
+        //Configuration
+        Reference->MI=new MediaInfo_Internal();
+        Reference->MI->Option(__T("File_IsReferenced"), __T("1"));
+        Reference->MI->Option(__T("File_FileNameFormat"), __T("CSV"));
+        Reference->MI->Option(__T("File_KeepInfo"), __T("1"));
+        Reference->MI->Option(__T("File_ID_OnlyRoot"), Config->File_ID_OnlyRoot_Get()?__T("1"):__T("0"));
+        Reference->MI->Option(__T("File_DvDif_DisableAudioIfIsInContainer"), Config->File_DvDif_DisableAudioIfIsInContainer_Get()?__T("1"):__T("0"));
+        if (References.size()>1 || Config->File_MpegTs_ForceMenu_Get())
+            Reference->MI->Option(__T("File_MpegTs_ForceMenu"), __T("1"));
+        #if MEDIAINFO_NEXTPACKET
+            if (Config->NextPacket_Get())
+                Reference->MI->Option(__T("File_NextPacket"), __T("1"));
+        #endif //MEDIAINFO_NEXTPACKET
+        #if MEDIAINFO_EVENTS
+            if (Config->Event_CallBackFunction_IsSet())
+                Reference->MI->Option(__T("File_Event_CallBackFunction"), Config->Event_CallBackFunction_Get());
+            ZtringListList SubFile_IDs;
+            for (size_t Pos=0; Pos<MI->StreamIDs_Size; Pos++)
+            {
+                ZtringList ID;
+                if (MI->StreamIDs_Width[Pos]==0)
+                    ID.push_back(Ztring::ToZtring(-1));
+                else if (Pos+1==MI->StreamIDs_Size)
+                    ID.push_back(Ztring::ToZtring(Reference->StreamID));
+                else
+                    ID.push_back(Ztring::ToZtring(MI->StreamIDs[Pos]));
+                ID.push_back(Ztring::ToZtring(MI->StreamIDs_Width[Pos]));
+                ID.push_back(Ztring::ToZtring(MI->ParserIDs[Pos]));
+                SubFile_IDs.push_back(ID);
+            }
+            if (!SubFile_IDs.empty())
+            {
+                SubFile_IDs.Separator_Set(0, EOL);
+                SubFile_IDs.Separator_Set(1, __T(","));
+                Reference->MI->Option(__T("File_SubFile_IDs_Set"), SubFile_IDs.Read());
+            }
+        #endif //MEDIAINFO_EVENTS
+        #if MEDIAINFO_DEMUX
+            if (Config->Demux_Unpacketize_Get())
+                Reference->MI->Option(__T("File_Demux_Unpacketize"), __T("1"));
+            if (FrameRate)
+                Reference->MI->Option(__T("File_Demux_Rate"), Ztring::ToZtring(FrameRate, 25));
+            switch (Config->Demux_InitData_Get())
+            {
+                case 0 : Reference->MI->Option(__T("File_Demux_InitData"), __T("Event")); break;
+                case 1 : Reference->MI->Option(__T("File_Demux_InitData"), __T("Field")); break;
+                default: ;
+            }
+        #endif //MEDIAINFO_DEMUX
+        #if MEDIAINFO_IBI
+            if (!Reference->IbiStream.Infos.empty())
+            {
+                ibi Ibi;
+                Ibi.Streams[(int64u)-1]=new ibi::stream(Reference->IbiStream);
+
+                //IBI Creation
+                File_Ibi_Creation IbiCreation(Ibi);
+                Ztring IbiText=IbiCreation.Finish();
+                if (!IbiText.empty())
+                    Reference->MI->Option(__T("File_Ibi"), IbiText);
+            }
+        #endif //MEDIAINFO_IBI
+
+        if (Reference->IsCircular)
+        {
+            MI->Fill(Reference->StreamKind, Reference->StreamPos, "Source_Info", "Circular");
+            if (!Config->File_KeepInfo_Get())
+            {
+                #if MEDIAINFO_DEMUX
+                    if (CountOfReferencesToParse)
+                        CountOfReferencesToParse--;
+                #endif //MEDIAINFO_DEMUX
+                Reference->StreamKind=Stream_Max;
+                Reference->StreamPos=(size_t)-1;
+                Reference->FileSize=Reference->MI->Config.File_Size;
+                delete Reference->MI; Reference->MI=NULL;
+            }
+            Reference->FileNames.clear();
+        }
+        else
+        {
+            //Run
+            if (!Reference->MI->Open(Reference->FileNames.Read()))
+            {
+                MI->Fill(Reference->StreamKind, Reference->StreamPos, "Source_Info", "Missing");
+                if (!Config->File_KeepInfo_Get())
+                {
+                    #if MEDIAINFO_DEMUX
+                        if (CountOfReferencesToParse)
+                            CountOfReferencesToParse--;
+                    #endif //MEDIAINFO_DEMUX
+                    Reference->StreamKind=Stream_Max;
+                    Reference->StreamPos=(size_t)-1;
+                    Reference->FileSize=Reference->MI->Config.File_Size;
+                    delete Reference->MI; Reference->MI=NULL;
+                }
+                Reference->FileNames.clear();
+            }
+
+            #if MEDIAINFO_NEXTPACKET && MEDIAINFO_DEMUX
+                if (Config->NextPacket_Get())
+                    return;
+            #endif //MEDIAINFO_NEXTPACKET
+        }
+    }
+
+    if (Reference->MI)
+    {
+        #if MEDIAINFO_EVENTS && MEDIAINFO_NEXTPACKET
+            if (DTS_Interval!=(int64u)-1 && !Reference->Status[File__Analyze::IsFinished] && Reference->MI->Info->FrameInfo.DTS!=(int64u)-1 && DTS_Minimal!=(int64u)-1 && Reference->MI->Info->FrameInfo.DTS>DTS_Minimal+1000000000)
+                return;
+            if (Config->Event_CallBackFunction_IsSet() && !Reference->Status[File__Analyze::IsFinished])
+            {
+                #if MEDIAINFO_DEMUX
+                    while ((Reference->Status=Reference->MI->Open_NextPacket())[8])
+                    {
+                            if (Config->Event_CallBackFunction_IsSet())
+                            {
+                                Config->Demux_EventWasSent=true;
+                                return;
+                            }
+                    }
+                if (CountOfReferencesToParse)
+                    CountOfReferencesToParse--;
+                #endif //MEDIAINFO_DEMUX
+            }
+        #endif //MEDIAINFO_EVENTS && MEDIAINFO_NEXTPACKET
+        ParseReference_Finalize();
+        if (!Config->File_KeepInfo_Get())
+        {
+            Reference->StreamKind=Stream_Max;
+            Reference->StreamPos=(size_t)-1;
+            Reference->State=10000;
+            Reference->FileSize=Reference->MI->Config.File_Size;
+            delete Reference->MI; Reference->MI=NULL;
+        }
+    }
+}
+
+//---------------------------------------------------------------------------
+void File__ReferenceFilesHelper::ParseReference_Finalize ()
+{
+    bool StreamFound=false;
+    for (size_t StreamKind=Stream_General+1; StreamKind<Stream_Max; StreamKind++)
+        for (size_t StreamPos=0; StreamPos<Reference->MI->Count_Get((stream_t)StreamKind); StreamPos++)
+        {
+            StreamKind_Last=(stream_t)StreamKind;
+            if (Reference->StreamPos!=(size_t)-1 && StreamKind_Last==Reference->StreamKind && StreamPos==0)
+            {
+                StreamPos_To=Reference->StreamPos;
+                StreamFound=true;
+            }
+            else
+            {
+                size_t ToInsert=(size_t)-1;
+                for (references::iterator ReferencePos=References.begin(); ReferencePos!=References.end(); ReferencePos++)
+                    if (ReferencePos->StreamKind==StreamKind_Last && Reference->StreamID<ReferencePos->StreamID)
+                    {
+                        ToInsert=ReferencePos->StreamPos;
+                        break;
+                    }
+
+                StreamPos_To=Stream_Prepare((stream_t)StreamKind, ToInsert);
+            }
+            StreamPos_From=StreamPos;
+
+            ParseReference_Finalize_PerStream();
+        }
+
+    if (!StreamFound && Reference->StreamKind!=Stream_Max && Reference->StreamPos!=(size_t)-1)
+    {
+        Ztring MuxingMode=MI->Retrieve(Reference->StreamKind, Reference->StreamPos, "MuxingMode");
+        if (!MuxingMode.empty())
+            MuxingMode.insert(0, __T(" / "));
+        MI->Fill(Reference->StreamKind, Reference->StreamPos, "MuxingMode", Reference->MI->Info->Get(Stream_General, 0, General_Format)+MuxingMode, true);
+    }
+}
+
+//---------------------------------------------------------------------------
+void File__ReferenceFilesHelper::ParseReference_Finalize_PerStream ()
+{
+    //Hacks - Before
+    Ztring CodecID=MI->Retrieve(StreamKind_Last, StreamPos_To, MI->Fill_Parameter(StreamKind_Last, Generic_CodecID));
+    Ztring ID_Base;
+    if (Reference->StreamID!=(int64u)-1)
+        ID_Base=Ztring::ToZtring(Reference->StreamID);
+    Ztring ID=ID_Base;
+    Ztring ID_String=ID_Base;
+    Ztring MenuID;
+    Ztring MenuID_String;
+
+    MI->Clear(StreamKind_Last, StreamPos_To, General_ID);
+
+    MI->Merge(*Reference->MI->Info, StreamKind_Last, StreamPos_From, StreamPos_To);
+
+    //Frame rate if available from container
+    if (StreamKind_Last==Stream_Video && Reference->FrameRate)
+        MI->Fill(Stream_Video, StreamPos_To, Video_FrameRate, Reference->FrameRate, 3 , true);
+
+    //Hacks - After
+    if (CodecID!=MI->Retrieve(StreamKind_Last, StreamPos_To, MI->Fill_Parameter(StreamKind_Last, Generic_CodecID)))
+    {
+        if (!CodecID.empty())
+            CodecID+=__T(" / ");
+        CodecID+=MI->Retrieve(StreamKind_Last, StreamPos_To, MI->Fill_Parameter(StreamKind_Last, Generic_CodecID));
+        MI->Fill(StreamKind_Last, StreamPos_To, MI->Fill_Parameter(StreamKind_Last, Generic_CodecID), CodecID, true);
+    }
+    if (Reference->MI->Count_Get(Stream_Video)+Reference->MI->Count_Get(Stream_Audio)>1 && Reference->MI->Get(Stream_Video, 0, Video_Format)!=__T("DV"))
+    {
+        if (StreamKind_Last==Stream_Menu)
+        {
+            ZtringList List; List.Separator_Set(0, __T(" / ")); List.Write(MI->Retrieve(StreamKind_Last, StreamPos_To, "List"));
+            ZtringList List_String; List_String.Separator_Set(0, __T(" / ")); List_String.Write(MI->Retrieve(StreamKind_Last, StreamPos_To, "List/String"));
+            if (!ID_Base.empty())
+                for (size_t Pos=0; Pos<List.size(); Pos++)
+                {
+                    List[Pos].insert(0, ID_Base+__T("-"));
+                    List_String[Pos].insert(0, ID_Base+__T("-"));
+                }
+            MI->Fill(Stream_Menu, StreamPos_To, Menu_List, List.Read(), true);
+            MI->Fill(Stream_Menu, StreamPos_To, Menu_List_String, List_String.Read(), true);
+        }
+        else if (References.size()>1 && Reference->MI->Count_Get(Stream_Menu)==0)
+        {
+            if (Reference->MenuPos==(size_t)-1)
+            {
+                Reference->MenuPos=MI->Stream_Prepare(Stream_Menu);
+                MI->Fill(Stream_Menu, Reference->MenuPos, General_ID, ID_Base);
+            }
+            Ztring List=Reference->MI->Get(StreamKind_Last, StreamPos_From, General_ID);
+            Ztring List_String=Reference->MI->Get(StreamKind_Last, StreamPos_From, General_ID_String);
+            if (!ID_Base.empty())
+            {
+                List.insert(0, ID_Base+__T("-"));
+                List_String.insert(0, ID_Base+__T("-"));
+            }
+            MI->Fill(Stream_Menu, Reference->MenuPos, Menu_List, List);
+            MI->Fill(Stream_Menu, Reference->MenuPos, Menu_List_String, List_String);
+        }
+    }
+    if ((!Config->File_ID_OnlyRoot_Get() || Reference->MI->Count_Get(Stream_Video)+Reference->MI->Count_Get(Stream_Audio)>1) && !MI->Retrieve(StreamKind_Last, StreamPos_To, General_ID).empty())
+    {
+        if (!ID.empty())
+            ID+=__T('-');
+        ID+=MI->Retrieve(StreamKind_Last, StreamPos_To, General_ID);
+        if (!ID_String.empty())
+            ID_String+=__T('-');
+        ID_String+=MI->Retrieve(StreamKind_Last, StreamPos_To, General_ID_String);
+        if (!MI->Retrieve(StreamKind_Last, StreamPos_To, "MenuID").empty())
+        {
+            if (!ID_Base.empty())
+                MenuID=ID_Base+__T('-');
+            MenuID+=MI->Retrieve(StreamKind_Last, StreamPos_To, "MenuID");
+            if (!ID_Base.empty())
+                MenuID_String=ID_Base+__T('-');
+            MenuID_String+=MI->Retrieve(StreamKind_Last, StreamPos_To, "MenuID/String");
+        }
+        else if (Reference->MenuPos!=(size_t)-1)
+        {
+            MenuID=ID_Base;
+            MenuID_String=ID_Base;
+        }
+    }
+    MI->Fill(StreamKind_Last, StreamPos_To, General_ID, ID, true);
+    MI->Fill(StreamKind_Last, StreamPos_To, General_ID_String, ID_String, true);
+    MI->Fill(StreamKind_Last, StreamPos_To, "MenuID", MenuID, true);
+    MI->Fill(StreamKind_Last, StreamPos_To, "MenuID/String", MenuID_String, true);
+    if (MI->Retrieve(StreamKind_Last, StreamPos_To, "Source").empty())
+        MI->Fill(StreamKind_Last, StreamPos_To, "Source", Reference->Source);
+    for (std::map<string, Ztring>::iterator Info=Reference->Infos.begin(); Info!=Reference->Infos.end(); Info++)
+        MI->Fill(StreamKind_Last, StreamPos_To, Info->first.c_str(), Info->second);
+
+    //Others
+    if (Reference->MI->Info && MI->Retrieve(StreamKind_Last, StreamPos_To, Reference->MI->Info->Fill_Parameter(StreamKind_Last, Generic_Format))!=Reference->MI->Info->Get(Stream_General, 0, General_Format))
+    {
+        Ztring MuxingMode=MI->Retrieve(StreamKind_Last, StreamPos_To, "MuxingMode");
+        if (!MuxingMode.empty())
+            MuxingMode.insert(0, __T(" / "));
+        MI->Fill(StreamKind_Last, StreamPos_To, "MuxingMode", Reference->MI->Info->Get(Stream_General, 0, General_Format)+MuxingMode, true);
+    }
+}
+
+//---------------------------------------------------------------------------
+void File__ReferenceFilesHelper::Read_Buffer_Unsynched()
+{
+    MI->Open_Buffer_Unsynch();
+    for (references::iterator Reference=References.begin(); Reference!=References.end(); Reference++)
+        if (Reference->MI)
+            Reference->MI->Open_Buffer_Unsynch();
+
+    #if MEDIAINFO_DEMUX
+        Config->Demux_EventWasSent=true; //We want not try to read new data from the file
+    #endif //MEDIAINFO_DEMUX
+}
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_SEEK
+size_t File__ReferenceFilesHelper::Read_Buffer_Seek (size_t Method, int64u Value, int64u ID)
+{
+    //Parsing
+    switch (Method)
+    {
+        case 0  :
+                    #if MEDIAINFO_DEMUX
+                        {
+                        if (Value)
+                        {
+                            if (Value>MI->Config->File_Size)
+                                return 2; //Invalid value
+
+                            //Init
+                            if (!Duration)
+                            {
+                                MediaInfo_Internal MI2;
+                                MI2.Option(__T("File_KeepInfo"), __T("1"));
+                                Ztring ParseSpeed_Save=MI2.Option(__T("ParseSpeed_Get"), __T(""));
+                                Ztring Demux_Save=MI2.Option(__T("Demux_Get"), __T(""));
+                                MI2.Option(__T("ParseSpeed"), __T("0"));
+                                MI2.Option(__T("Demux"), Ztring());
+                                size_t MiOpenResult=MI2.Open(MI->File_Name);
+                                MI2.Option(__T("ParseSpeed"), ParseSpeed_Save); //This is a global value, need to reset it. TODO: local value
+                                MI2.Option(__T("Demux"), Demux_Save); //This is a global value, need to reset it. TODO: local value
+                                if (!MiOpenResult)
+                                    return (size_t)-1;
+                                Duration=MI2.Get(Stream_General, 0, General_Duration).To_float64()/1000;
+                            }
+
+                            //Time percentage
+                            float64 DurationF=Duration;
+                            DurationF*=Value;
+                            DurationF/=MI->Config->File_Size;
+                            size_t DurationM=(size_t)(DurationF*1000);
+                            Ztring DurationS;
+                            DurationS+=L'0'+(wchar_t)(DurationM/(10*60*60*1000)); DurationM%=10*60*60*1000;
+                            DurationS+=L'0'+(wchar_t)(DurationM/(   60*60*1000)); DurationM%=   60*60*1000;
+                            DurationS+=L':';
+                            DurationS+=L'0'+(wchar_t)(DurationM/(   10*60*1000)); DurationM%=   10*60*1000;
+                            DurationS+=L'0'+(wchar_t)(DurationM/(      60*1000)); DurationM%=      60*1000;
+                            DurationS+=L':';
+                            DurationS+=L'0'+(wchar_t)(DurationM/(      10*1000)); DurationM%=      10*1000;
+                            DurationS+=L'0'+(wchar_t)(DurationM/(         1000)); DurationM%=         1000;
+                            DurationS+=L'.';
+                            DurationS+=L'0'+(wchar_t)(DurationM/(          100)); DurationM%=          100;
+                            DurationS+=L'0'+(wchar_t)(DurationM/(           10)); DurationM%=           10;
+                            DurationS+=L'0'+(wchar_t)(DurationM);
+
+                            CountOfReferencesToParse=References.size();
+                            bool HasProblem=false;
+                            for (Reference=References.begin(); Reference!=References.end(); Reference++)
+                            {
+                                if (Reference->MI)
+                                {
+                                    Ztring Result=Reference->MI->Option(__T("File_Seek"), DurationS);
+                                    if (!Result.empty())
+                                        HasProblem=true;
+                                }
+                                Reference->Status.reset();
+                            }
+                            Reference=References.begin();
+                            Open_Buffer_Unsynch();
+                            return HasProblem?(size_t)-1:1; //Not supported value if there is a problem (TODO: better info)
+                        }
+
+                        CountOfReferencesToParse=References.size();
+                        bool HasProblem=false;
+                        for (Reference=References.begin(); Reference!=References.end(); Reference++)
+                        {
+                            if (Reference->MI)
+                            {
+                                Ztring Result=Reference->MI->Option(__T("File_Seek"), Ztring::ToZtring(Value));
+                                if (!Result.empty())
+                                    HasProblem=true;
+                            }
+                            Reference->Status.reset();
+                        }
+                        Reference=References.begin();
+                        Open_Buffer_Unsynch();
+                        return HasProblem?(size_t)-1:1; //Not supported value if there is a problem (TODO: better info)
+                        }
+                    #else //MEDIAINFO_DEMUX
+                        return (size_t)-1; //Not supported
+                    #endif //MEDIAINFO_DEMUX
+        case 1  :
+                    {
+                        //Time percentage
+                        int64u Duration=MI->Get(Stream_General, 0, General_Duration).To_int64u();
+                        Ztring DurationS;
+                        if (Duration)
+                        {
+                            Duration*=Value;
+                            Duration/=10000;
+                            DurationS+=L'0'+(wchar_t)(Duration/(10*60*60*1000)); Duration%=10*60*60*1000;
+                            DurationS+=L'0'+(wchar_t)(Duration/(   60*60*1000)); Duration%=   60*60*1000;
+                            DurationS+=L':';
+                            DurationS+=L'0'+(wchar_t)(Duration/(   10*60*1000)); Duration%=   10*60*1000;
+                            DurationS+=L'0'+(wchar_t)(Duration/(      60*1000)); Duration%=      60*1000;
+                            DurationS+=L':';
+                            DurationS+=L'0'+(wchar_t)(Duration/(      10*1000)); Duration%=      10*1000;
+                            DurationS+=L'0'+(wchar_t)(Duration/(         1000)); Duration%=         1000;
+                            DurationS+=L'.';
+                            DurationS+=L'0'+(wchar_t)(Duration/(          100)); Duration%=          100;
+                            DurationS+=L'0'+(wchar_t)(Duration/(           10)); Duration%=           10;
+                            DurationS+=L'0'+(wchar_t)(Duration);
+                        }
+                        else
+                            DurationS=Ztring::ToZtring(((float64)Value)/100)+__T('%');
+
+                        CountOfReferencesToParse=References.size();
+                        bool HasProblem=false;
+                        for (Reference=References.begin(); Reference!=References.end(); Reference++)
+                        {
+                            if (Reference->MI)
+                            {
+                                Ztring Result=Reference->MI->Option(__T("File_Seek"), DurationS);
+                                if (!Result.empty())
+                                    HasProblem=true;
+                            }
+                            Reference->Status.reset();
+                        }
+                        Reference=References.begin();
+                        Open_Buffer_Unsynch();
+                        return HasProblem?2:1; //Invalid value if there is a problem (TODO: better info)
+                    }
+        case 2  :   //Timestamp
+                    #if MEDIAINFO_DEMUX
+                    {
+                        CountOfReferencesToParse=References.size();
+                        Ztring Time; Time.Duration_From_Milliseconds(Value/1000000);
+                        for (Reference=References.begin(); Reference!=References.end(); Reference++)
+                        {
+                            if (Reference->MI)
+                            {
+                                Ztring Result=Reference->MI->Option(__T("File_Seek"), Time);
+                                if (!Result.empty())
+                                    return 2; //Invalid value
+                            }
+                            else
+                            {
+                                //There was a problem, removing Reference
+                                References.clear();
+                                return Read_Buffer_Seek(Method, Value, ID);
+                            }
+                            Reference->Status.reset();
+                        }
+                        Reference=References.begin();
+                        Open_Buffer_Unsynch();
+                        return 1;
+                    }
+                    #else //MEDIAINFO_DEMUX
+                        return (size_t)-1; //Not supported
+                    #endif //MEDIAINFO_DEMUX
+        case 3  :   //FrameNumber
+                    #if MEDIAINFO_DEMUX
+                        CountOfReferencesToParse=References.size();
+                        for (Reference=References.begin(); Reference!=References.end(); Reference++)
+                        {
+                            if (Reference->MI)
+                            {
+                                Ztring Result=Reference->MI->Option(__T("File_Seek"), __T("Frame=")+Ztring::ToZtring(Value));
+                                if (!Result.empty())
+                                    return 2; //Invalid value
+                            }
+                            else
+                            {
+                                //There was a problem, removing Reference
+                                References.clear();
+                                return Read_Buffer_Seek(Method, Value, ID);
+                            }
+                            Reference->Status.reset();
+                        }
+                        Reference=References.begin();
+                        Open_Buffer_Unsynch();
+                        return 1;
+                    #else //MEDIAINFO_DEMUX
+                        return (size_t)-1; //Not supported
+                    #endif //MEDIAINFO_DEMUX
+         default :   return 0;
+    }
+}
+#endif //MEDIAINFO_SEEK
+
+//***************************************************************************
+// Helpers
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+size_t File__ReferenceFilesHelper::Stream_Prepare (stream_t StreamKind, size_t StreamPos)
+{
+    size_t StreamPos_Last=MI->Stream_Prepare(StreamKind, StreamPos);
+
+    for (references::iterator ReferencePos=References.begin(); ReferencePos!=References.end(); ReferencePos++)
+        if (ReferencePos->StreamKind==StreamKind && ReferencePos->StreamPos>=StreamPos_Last)
+            if (ReferencePos->StreamPos!=(size_t)-1)
+                ReferencePos->StreamPos++;
+
+    return StreamPos_Last;
+}
+
+//---------------------------------------------------------------------------
+void File__ReferenceFilesHelper::FileSize_Compute ()
+{
+    if (MI->Config==NULL)
+        return;
+
+    MI->Config->File_Size=MI->File_Size;
+
+    for (references::iterator Reference=References.begin(); Reference!=References.end(); Reference++)
+    {
+        if (Reference->FileSize!=(int64u)-1)
+            MI->Config->File_Size+=Reference->FileSize;
+        else if (Reference->MI && Reference->MI->Config.File_Size!=(int64u)-1)
+            MI->Config->File_Size+=Reference->MI->Config.File_Size;
+        else
+            for (size_t Pos=0; Pos<Reference->FileNames.size(); Pos++)
+                MI->Config->File_Size+=File::Size_Get(Reference->FileNames[Pos]);
+    }
+}
+
+} //NameSpace
+
+#endif //MEDIAINFO_REFERENCES_YES

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Multiple/File__ReferenceFilesHelper.h Added

@@ -0,0 +1,134 @@
+// File__ReferenceFilesHelper - class for analyzing/demuxing reference files
+// Copyright (C) 2011-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef File__ReferenceFilesHelperH
+#define File__ReferenceFilesHelperH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+#include <vector>
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Class File__ReferenceFilesHelper
+//***************************************************************************
+
+class File__ReferenceFilesHelper
+{
+public :
+    //In
+    struct reference
+    {
+        ZtringList          FileNames;
+        Ztring              Source; //Source file name (relative path)
+        stream_t            StreamKind;
+        size_t              StreamPos;
+        size_t              MenuPos;
+        int64u              StreamID;
+        float64             FrameRate;
+        int64u              Delay;
+        int64u              FileSize;
+        bool                IsCircular;
+        size_t              State;
+        std::map<std::string, Ztring> Infos;
+        MediaInfo_Internal* MI;
+        #if MEDIAINFO_FILTER
+            int64u          Enabled;
+        #endif //MEDIAINFO_FILTER
+        #if MEDIAINFO_NEXTPACKET
+            std::bitset<32> Status;
+        ibi::stream         IbiStream;
+        #endif //MEDIAINFO_NEXTPACKET
+
+        reference()
+        {
+            FileNames.Separator_Set(0, __T(","));
+            StreamKind=Stream_Max;
+            StreamPos=(size_t)-1;
+            MenuPos=(size_t)-1;
+            StreamID=(int64u)-1;
+            FrameRate=0;
+            Delay=0;
+            FileSize=(int64u)-1;
+            IsCircular=false;
+            State=0;
+            MI=NULL;
+            #if MEDIAINFO_FILTER
+                Enabled=true;
+            #endif //MEDIAINFO_FILTER
+        }
+    };
+    typedef std::vector<reference>  references;
+    references                      References;
+    bool                            TestContinuousFileNames;
+
+    //Streams management
+    void ParseReferences();
+
+    //Constructor / Destructor
+    File__ReferenceFilesHelper(File__Analyze* MI, MediaInfo_Config_MediaInfo* Config);
+    ~File__ReferenceFilesHelper();
+
+    #if MEDIAINFO_SEEK
+    size_t Read_Buffer_Seek (size_t Method, int64u Value, int64u ID);
+    #endif //MEDIAINFO_SEEK
+
+private :
+    //Streams management
+    void ParseReference ();
+    void ParseReference_Finalize ();
+    void ParseReference_Finalize_PerStream ();
+    void Open_Buffer_Unsynch() {Read_Buffer_Unsynched();}
+
+    //Buffer - Global
+    void Read_Buffer_Unsynched();
+
+    //temp
+    File__Analyze*                  MI;
+    MediaInfo_Config_MediaInfo*     Config;
+    references::iterator            Reference;
+    bool                            Init_Done;
+    bool                            Demux_Interleave;
+    size_t                          CountOfReferencesToParse;
+    float64                         FrameRate;
+    float64                         Duration;
+    stream_t                        StreamKind_Last;
+    size_t                          StreamPos_From;
+    size_t                          StreamPos_To;
+    #if MEDIAINFO_NEXTPACKET
+        int64u                      DTS_Minimal;
+        int64u                      DTS_Interval;
+    #endif //MEDIAINFO_NEXTPACKET
+
+    //Helpers
+    size_t Stream_Prepare(stream_t StreamKind, size_t StreamPos=(size_t)-1);
+    void   FileSize_Compute();
+};
+
+} //NameSpace
+
+#endif
+

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/PreComp.cpp Added

@@ -0,0 +1,26 @@
+// PreComp - PreComp file for MediaInfo
+// Copyright (C) 2006-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Helpers for compilers (precompilation)
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/PreComp.h"
+//---------------------------------------------------------------------------

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/PreComp.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/PreComp.h Changed

@@ -1,17 +1,17 @@
 // PreComp - PreComp file for MediaInfo
-// Copyright (C) 2006-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2006-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,19 +22,18 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-#ifdef ZENLIB_USEWX
-    #include <wx/wxprec.h>
-    #ifdef WX_PRECOMP
-        #include <string>
-        #include <sstream>
-        #include <vector>
-    #endif
-#else //ZENLIB_USEWX
-    #if defined(__BORLANDC__) ||defined(__VISUALC__)
-        #include <string>
-        #include <sstream>
-        #include <vector>
-    #endif
-#endif //ZENLIB_USEWX
+#ifndef MediaInfo_PreCompH
+#define MediaInfo_PreCompH
 //---------------------------------------------------------------------------
 
+//---------------------------------------------------------------------------
+#if defined(_MSC_VER) || defined(__BORLANDC__)
+ #include "MediaInfo/Setup.h"
+ #include "MediaInfo/File__Analyze.h"
+#endif //_MSC_VER
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+#endif

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Reader/Reader_Directory.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Reader/Reader_Directory.cpp Changed

@@ -1,31 +1,35 @@
 // Reader_Directory - All info about media files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_DIRECTORY_YES)
 //---------------------------------------------------------------------------
 
@@ -41,17 +45,17 @@
 size_t Reader_Directory::Format_Test(MediaInfo_Internal* MI, const String &File_Name)
 {
     #ifdef MEDIAINFO_BDMV_YES
-        if (Dir::Exists(File_Name) && File_Name.find(Ztring(1, PathSeparator)+_T("BDMV"))+5==File_Name.size())
+        if (Dir::Exists(File_Name) && File_Name.find(Ztring(1, PathSeparator)+__T("BDMV"))+5==File_Name.size())
             return Bdmv_Format_Test(MI, File_Name);
     #endif //MEDIAINFO_BDMV_YES
 
     #ifdef MEDIAINFO_P2_YES
-        if (Dir::Exists(File_Name) && File_Name.rfind(Ztring(1, PathSeparator)+_T("CONTENT"))+8==File_Name.size())
+        if (Dir::Exists(File_Name) && File_Name.rfind(Ztring(1, PathSeparator)+__T("CONTENT"))+8==File_Name.size())
             return P2_Format_Test(MI, File_Name);
     #endif //MEDIAINFO_P2_YES
 
     #ifdef MEDIAINFO_XDCAM_YES
-        if (Dir::Exists(File_Name) && File_Name.rfind(Ztring(1, PathSeparator)+_T("XDCAM"))+5==File_Name.size())
+        if (Dir::Exists(File_Name) && File_Name.rfind(Ztring(1, PathSeparator)+__T("XDCAM"))+5==File_Name.size())
             return Xdcam_Format_Test(MI, File_Name);
     #endif //MEDIAINFO_XDCAM_YES
 
@@ -82,7 +86,7 @@
 #ifdef MEDIAINFO_BDMV_YES
 int Reader_Directory::Bdmv_Format_Test(MediaInfo_Internal* MI, const String &File_Name)
 {
-    if (!MI->SelectFromExtension(_T("Bdmv")))
+    if (!MI->SelectFromExtension(__T("Bdmv")))
         return 0;
 
     MI->Open_Buffer_Init(0, File_Name);
@@ -100,7 +104,7 @@
 void Reader_Directory::Bdmv_Directory_Cleanup(ZtringList &List)
 {
     //if there is a BDMV folder, this is blu-ray
-    Ztring ToSearch=Ztring(1, PathSeparator)+_T("BDMV")+PathSeparator+_T("index.bdmv"); //"\BDMV\index.bdmv"
+    Ztring ToSearch=Ztring(1, PathSeparator)+__T("BDMV")+PathSeparator+__T("index.bdmv"); //"\BDMV\index.bdmv"
     for (size_t File_Pos=0; File_Pos<List.size(); File_Pos++)
     {
         size_t BDMV_Pos=List[File_Pos].find(ToSearch);
@@ -109,7 +113,7 @@
             //This is a BDMV index, parsing the directory only if index and movie objects are BOTH present
             ToSearch=List[File_Pos];
             ToSearch.resize(ToSearch.size()-10);
-            ToSearch+=_T("MovieObject.bdmv");  //"%CompletePath%\BDMV\MovieObject.bdmv"
+            ToSearch+=__T("MovieObject.bdmv");  //"%CompletePath%\BDMV\MovieObject.bdmv"
             if (List.Find(ToSearch)!=string::npos)
             {
                 //We want the folder instead of the files
@@ -139,10 +143,10 @@
 #ifdef MEDIAINFO_P2_YES
 int Reader_Directory::P2_Format_Test(MediaInfo_Internal* MI, const String &File_Name)
 {
-    if (!MI->SelectFromExtension(_T("P2_Clip")))
+    if (!MI->SelectFromExtension(__T("P2_Clip")))
         return 0;
 
-    MI->Open(File_Name+_T("CLIP")+PathSeparator+_T("0013MM.XML"));
+    MI->Open(File_Name+__T("CLIP")+PathSeparator+__T("0013MM.XML"));
 
     return 1;
 }
@@ -153,7 +157,7 @@
 void Reader_Directory::P2_Directory_Cleanup(ZtringList &List)
 {
     //if there is a CONTENTS/CLIP folder, this is P2
-    Ztring ToSearch=Ztring(1, PathSeparator)+_T("CONTENTS")+PathSeparator+_T("CLIP")+PathSeparator; //"/CONTENTS/CLIP/"
+    Ztring ToSearch=Ztring(1, PathSeparator)+__T("CONTENTS")+PathSeparator+__T("CLIP")+PathSeparator; //"/CONTENTS/CLIP/"
     for (size_t File_Pos=0; File_Pos<List.size(); File_Pos++)
     {
         size_t P2_Pos=List[File_Pos].find(ToSearch);
@@ -166,7 +170,7 @@
             bool HasChanged=false;
             for (size_t Pos=0; Pos<List.size(); Pos++)
             {
-                if (List[Pos].find(Path_Begin)==0 && List[Pos].find(Path_Begin+_T("CONTENTS")+PathSeparator+_T("CLIP")+PathSeparator)==string::npos) //Remove all subdirs of Path_Begin but not with CLIP
+                if (List[Pos].find(Path_Begin)==0 && List[Pos].find(Path_Begin+__T("CONTENTS")+PathSeparator+__T("CLIP")+PathSeparator)==string::npos) //Remove all subdirs of Path_Begin but not with CLIP
                 {
                     //Removing the file in the P2 directory
                     List.erase(List.begin()+Pos);
@@ -189,10 +193,10 @@
 #ifdef MEDIAINFO_XDCAM_YES
 int Reader_Directory::Xdcam_Format_Test(MediaInfo_Internal* MI, const String &File_Name)
 {
-    if (!MI->SelectFromExtension(_T("Xdcam_Clip")))
+    if (!MI->SelectFromExtension(__T("Xdcam_Clip")))
         return 0;
 
-    MI->Open(File_Name+_T("CLIP")+PathSeparator+_T("0013MM.XML"));
+    MI->Open(File_Name+__T("CLIP")+PathSeparator+__T("0013MM.XML"));
 
     return 1;
 }
@@ -203,7 +207,7 @@
 void Reader_Directory::Xdcam_Directory_Cleanup(ZtringList &List)
 {
     //if there is a XDCAM/Clip folder, this is Xdcam
-    Ztring ToSearch=Ztring(1, PathSeparator)+_T("Clip")+PathSeparator; //"/Clip/"
+    Ztring ToSearch=Ztring(1, PathSeparator)+__T("Clip")+PathSeparator; //"/Clip/"
     for (size_t File_Pos=0; File_Pos<List.size(); File_Pos++)
     {
         size_t Xdcam_Pos=List[File_Pos].find(ToSearch);
@@ -213,12 +217,12 @@
             Ztring Path_Begin=List[File_Pos];
             Path_Begin.resize(Path_Begin.size()-(1+4+1+12));
             Path_Begin+=Ztring(1, PathSeparator);
-            if (Dir::Exists(Path_Begin+_T("Edit")) && Dir::Exists(Path_Begin+_T("General")) && Dir::Exists(Path_Begin+_T("Sub")))
+            if (Dir::Exists(Path_Begin+__T("Edit")) && Dir::Exists(Path_Begin+__T("General")) && Dir::Exists(Path_Begin+__T("Sub")))
             {
                 bool HasChanged=false;
                 for (size_t Pos=0; Pos<List.size(); Pos++)
                 {
-                    if (List[Pos].find(Path_Begin)==0 && (List[Pos].find(Path_Begin+_T("Clip")+PathSeparator)==string::npos || (List[Pos].find(_T(".XML"))!=List[Pos].size()-4))) //Remove all subdirs of Path_Begin but not with the right XML
+                    if (List[Pos].find(Path_Begin)==0 && (List[Pos].find(Path_Begin+__T("Clip")+PathSeparator)==string::npos || (List[Pos].find(__T(".XML"))!=List[Pos].size()-4))) //Remove all subdirs of Path_Begin but not with the right XML
                     {
                         //Removing the file in the XDCAM directory
                         List.erase(List.begin()+Pos);

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Reader/Reader_Directory.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Reader/Reader_Directory.h Changed

@@ -1,17 +1,17 @@
 // Reader_Directory - All information about media files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -28,7 +28,7 @@
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
-#include "MediaInfo/MediaInfo_Internal.h"
+#include "MediaInfo/Reader/Reader__Base.h"
 //---------------------------------------------------------------------------
 
 namespace MediaInfoLib
@@ -38,27 +38,30 @@
 /// @brief Reader_Directory
 //***************************************************************************
 
-class Reader_Directory
+class Reader_Directory : public Reader__Base
 {
 public :
+    //Constructor/Destructor
+    virtual ~Reader_Directory() {}
+
     //Format testing
-    static size_t Format_Test(MediaInfo_Internal* MI, const String &File_Name);
+    size_t Format_Test(MediaInfo_Internal* MI, const String &File_Name);
 
     //For the list
-    static void Directory_Cleanup(ZtringList &List);
+    void Directory_Cleanup(ZtringList &List);
 
 private :
     //Bdmv
-    static int  Bdmv_Format_Test(MediaInfo_Internal* MI, const String &File_Name);
-    static void Bdmv_Directory_Cleanup(ZtringList &List);
+    int  Bdmv_Format_Test(MediaInfo_Internal* MI, const String &File_Name);
+    void Bdmv_Directory_Cleanup(ZtringList &List);
 
     //P2
-    static int  P2_Format_Test(MediaInfo_Internal* MI, const String &File_Name);
-    static void P2_Directory_Cleanup(ZtringList &List);
+    int  P2_Format_Test(MediaInfo_Internal* MI, const String &File_Name);
+    void P2_Directory_Cleanup(ZtringList &List);
 
     //XDCAM
-    static int  Xdcam_Format_Test(MediaInfo_Internal* MI, const String &File_Name);
-    static void Xdcam_Directory_Cleanup(ZtringList &List);
+    int  Xdcam_Format_Test(MediaInfo_Internal* MI, const String &File_Name);
+    void Xdcam_Directory_Cleanup(ZtringList &List);
 };
 
 } //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Reader/Reader_File.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Reader/Reader_File.cpp Changed

@@ -1,17 +1,17 @@
 // MediaInfo_Internal - All info about media files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -23,18 +23,25 @@
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #include "MediaInfo/Reader/Reader_File.h"
 #include "MediaInfo/File__Analyze.h"
 #include "ZenLib/FileName.h"
-#include "ZenLib/File.h"
+#ifdef WINDOWS
+    #undef __TEXT
+    #include "Windows.h"
+#endif //WINDOWS
 using namespace ZenLib;
 using namespace std;
 //---------------------------------------------------------------------------
@@ -51,12 +58,12 @@
 namespace MediaInfoLib
 {
 
-const size_t Buffer_NormalSize=/*188*7;//*/64*1024;
 const size_t Buffer_NoJump=128*1024;
 
 //---------------------------------------------------------------------------
 size_t Reader_File::Format_Test(MediaInfo_Internal* MI, const String &File_Name)
 {
+    //std::cout<<Ztring(File_Name).To_Local().c_str()<<std::endl;
     #if MEDIAINFO_EVENTS
         {
             struct MediaInfo_Event_General_Start_0 Event;
@@ -80,19 +87,25 @@
 
     //Search the theorical format from extension
     InfoMap &FormatList=MediaInfoLib::Config.Format_Get();
-    InfoMap::iterator Format=FormatList.begin();
-    while (Format!=FormatList.end())
+    InfoMap::iterator Format=FormatList.end();
+    if (!MI->Config.File_ForceParser_Get().empty())
+        Format=FormatList.find(MI->Config.File_ForceParser_Get());
+    if (Format==FormatList.end())
     {
-        const Ztring &Extensions=FormatList.Get(Format->first, InfoFormat_Extensions);
-        if (Extensions.find(Extension)!=Error)
+        Format=FormatList.begin();
+        while (Format!=FormatList.end())
         {
-            if(Extension.size()==Extensions.size())
-                break; //Only one extenion in the list
-            if(Extensions.find(Extension+_T(" "))!=Error
-            || Extensions.find(_T(" ")+Extension)!=Error)
-                break;
+            const Ztring &Extensions=FormatList.Get(Format->first, InfoFormat_Extensions);
+            if (Extensions.find(Extension)!=Error)
+            {
+                if(Extension.size()==Extensions.size())
+                    break; //Only one extenion in the list
+                if(Extensions.find(Extension+__T(" "))!=Error
+                || Extensions.find(__T(" ")+Extension)!=Error)
+                    break;
+            }
+            ++Format;
         }
-        Format++;
     }
     if (Format!=FormatList.end())
     {
@@ -113,84 +126,299 @@
 size_t Reader_File::Format_Test_PerParser(MediaInfo_Internal* MI, const String &File_Name)
 {
     //Opening the file
-    File F;
     F.Open(File_Name);
     if (!F.Opened_Get())
         return 0;
 
-    //Buffer
-    size_t Buffer_Size_Max=Buffer_NormalSize;
-    int8u* Buffer=new int8u[Buffer_Size_Max];
+    //Info
+    Status=0;
+    MI->Config.File_Size=F.Size_Get();
+    MI->Config.File_Current_Offset=0;
+    MI->Config.File_Current_Size=MI->Config.File_Size;
+    MI->Config.File_Sizes.clear();
+    MI->Config.File_Sizes.push_back(MI->Config.File_Size);
+    if (MI->Config.File_Names.size()>1)
+    {
+        for (size_t Pos=1; Pos<MI->Config.File_Names.size(); Pos++)
+        {
+            int64u Size=File::Size_Get(MI->Config.File_Names[Pos]);
+            MI->Config.File_Sizes.push_back(Size);
+            MI->Config.File_Size+=Size;
+        }
+    }
+
+    //Partial file handling
+    Ztring Config_Partial_Begin=MI->Config.File_Partial_Begin_Get();
+    if (!Config_Partial_Begin.empty() && Config_Partial_Begin[0]>=__T('0') && Config_Partial_Begin[0]<=__T('9'))
+    {
+        if (Config_Partial_Begin.find(__T('%'))==Config_Partial_Begin.size()-1)
+            Partial_Begin=float64_int64s(MI->Config.File_Size*Config_Partial_Begin.To_float64()/100);
+        else
+            Partial_Begin=Config_Partial_Begin.To_int64u();
+        if (Partial_Begin)
+            F.GoTo(Partial_Begin);
+    }
+    else
+        Partial_Begin=0;
+    Ztring Config_Partial_End=MI->Config.File_Partial_End_Get();
+    if (!Config_Partial_End.empty() && Config_Partial_End[0]>=__T('0') && Config_Partial_End[0]<=__T('9'))
+    {
+        if (Config_Partial_End.find(__T('%'))==Config_Partial_End.size()-1)
+            Partial_End=float64_int64s(MI->Config.File_Size*Config_Partial_End.To_float64()/100);
+        else
+            Partial_End=Config_Partial_End.To_int64u();
+    }
+    else
+        Partial_End=(int64u)-1;
+    if (Partial_Begin>MI->Config.File_Size)
+        Partial_Begin=0; //Wrong value
+    if (Partial_Begin>Partial_End)
+        Partial_Begin=0; //Wrong value
 
     //Parser
-    MI->Open_Buffer_Init(F.Size_Get(), File_Name);
+    MI->Open_Buffer_Init((Partial_End<=MI->Config.File_Size?Partial_End:MI->Config.File_Size)-Partial_Begin, File_Name);
+
+    //Buffer
+    MI->Option(__T("File_Buffer_Size_Hint_Pointer"), Ztring::ToZtring((size_t)(&MI->Config.File_Buffer_Size_ToRead)));
+    MI->Config.File_Buffer_Repeat_IsSupported=true;
 
     //Test the format with buffer
+    return Format_Test_PerParser_Continue(MI);
+}
+
+//---------------------------------------------------------------------------
+size_t Reader_File::Format_Test_PerParser_Continue (MediaInfo_Internal* MI)
+{
     bool StopAfterFilled=MI->Config.File_StopAfterFilled_Get();
-    std::bitset<32> Status;
-    do
+    bool ShouldContinue=true;
+
+    //Previous data
+    if (MI->Config.File_Buffer_Repeat)
+    {
+        MI->Config.File_Buffer_Repeat=false;
+        #if MEDIAINFO_DEMUX
+            MI->Config.Demux_EventWasSent=false;
+        #endif //MEDIAINFO_DEMUX
+
+        Status=MI->Open_Buffer_Continue(MI->Config.File_Buffer, MI->Config.File_Buffer_Size);
+
+        #if MEDIAINFO_DEMUX
+            //Demux
+            if (MI->Config.Demux_EventWasSent)
+                return 2; //Must return immediately
+        #endif //MEDIAINFO_DEMUX
+
+        //Threading
+        if (MI->IsTerminating())
+            return 1; //Termination is requested
+
+        if (Status[File__Analyze::IsFinished] || (StopAfterFilled && Status[File__Analyze::IsFilled]))
+            ShouldContinue=false;
+    }
+
+    #if MEDIAINFO_DEMUX
+    //PerPacket
+    if (ShouldContinue && MI->Config.Demux_EventWasSent)
+    {
+        MI->Config.Demux_EventWasSent=false;
+
+        Status=MI->Open_Buffer_Continue(NULL, 0);
+
+        //Demux
+        if (MI->Config.Demux_EventWasSent)
+            return 2; //Must return immediately
+
+        //Threading
+        if (MI->IsTerminating())
+            return 1; //Termination is requested
+
+        if (Status[File__Analyze::IsFinished] || (StopAfterFilled && Status[File__Analyze::IsFilled]))
+            ShouldContinue=false;
+    }
+    #endif //MEDIAINFO_DEMUX
+
+    if (ShouldContinue)
     {
-        //Seek (if needed)
-        if (MI->Open_Buffer_Continue_GoTo_Get()!=(int64u)-1)
+        //Test the format with buffer
+        while (!(Status[File__Analyze::IsFinished] || (StopAfterFilled && Status[File__Analyze::IsFilled])))
         {
-            #ifdef MEDIAINFO_DEBUG
-                std::cout<<std::hex<<Reader_File_Offset<<" - "<<Reader_File_Offset+Reader_File_BytesRead<<" : "<<std::dec<<Reader_File_BytesRead<<" bytes"<<std::endl;
-                Reader_File_Offset=MI->Open_Buffer_Continue_GoTo_Get();
-                Reader_File_BytesRead=0;
-                Reader_File_Count++;
-            #endif //MEDIAINFO_DEBUG
+            //Seek (if needed)
+            if (MI->Open_Buffer_Continue_GoTo_Get()!=(int64u)-1)
+            {
+                #ifdef MEDIAINFO_DEBUG
+                    std::cout<<std::hex<<Reader_File_Offset<<" - "<<Reader_File_Offset+Reader_File_BytesRead<<" : "<<std::dec<<Reader_File_BytesRead<<" bytes"<<std::endl;
+                    Reader_File_Offset=MI->Open_Buffer_Continue_GoTo_Get();
+                    Reader_File_BytesRead=0;
+                    Reader_File_Count++;
+                #endif //MEDIAINFO_DEBUG
 
-            if (MI->Open_Buffer_Continue_GoTo_Get()>=F.Size_Get())
-                break; //Seek requested, but on a file bigger in theory than what is in the real file, we can't do this
-            if (!(MI->Open_Buffer_Continue_GoTo_Get()>F.Position_Get() && MI->Open_Buffer_Continue_GoTo_Get()<F.Position_Get()+Buffer_NoJump)) //No smal jumps
+                int64u GoTo=Partial_Begin+MI->Open_Buffer_Continue_GoTo_Get();
+                MI->Config.File_Current_Offset=0;
+                int64u Buffer_NoJump_Temp=Buffer_NoJump;
+                if (MI->Config.File_Names.size()>1)
+                {
+                    size_t Pos;
+                    for (Pos=0; Pos<MI->Config.File_Sizes.size(); Pos++)
+                    {
+                        if (GoTo>=MI->Config.File_Sizes[Pos])
+                        {
+                            GoTo-=MI->Config.File_Sizes[Pos];
+                            MI->Config.File_Current_Offset+=MI->Config.File_Sizes[Pos];
+                        }
+                        else
+                            break;
+                    }
+                    if (Pos>=MI->Config.File_Sizes.size())
+                        break;
+                    if (Pos!=MI->Config.File_Names_Pos)
+                    {
+                        F.Close();
+                        F.Open(MI->Config.File_Names[Pos]);
+                        MI->Config.File_Names_Pos=Pos+1;
+                        MI->Config.File_Current_Size=MI->Config.File_Current_Offset+F.Size_Get();
+                        Buffer_NoJump_Temp=0;
+                    }
+                }
+
+                if (GoTo>=F.Size_Get())
+                    break; //Seek requested, but on a file bigger in theory than what is in the real file, we can't do this
+                if (!(GoTo>F.Position_Get() && GoTo<F.Position_Get()+Buffer_NoJump_Temp)) //No smal jumps
+                {
+                     if (!F.GoTo(GoTo))
+                        break; //File is not seekable
+
+                    MI->Open_Buffer_Init((int64u)-1, MI->Config.File_Current_Offset+F.Position_Get()-Partial_Begin);
+                }
+            }
+
+            //Handling of hints
+            if (MI->Config.File_Buffer_Size_ToRead==0)
+                break; //Problem while config
+            if (MI->Config.File_Buffer_Size_ToRead>MI->Config.File_Buffer_Size_Max)
             {
-                 if (!F.GoTo(MI->Open_Buffer_Continue_GoTo_Get()))
-                    break; //File is not seekable
+                delete[] MI->Config.File_Buffer;
+                if (MI->Config.File_Buffer_Size_Max==0)
+                    MI->Config.File_Buffer_Size_Max=1;
+                while (MI->Config.File_Buffer_Size_ToRead>MI->Config.File_Buffer_Size_Max)
+                    MI->Config.File_Buffer_Size_Max*=2;
+                MI->Config.File_Buffer=new int8u[MI->Config.File_Buffer_Size_Max];
+            }
+
+            MI->Config.File_Buffer_Size=F.Read(MI->Config.File_Buffer, (F.Position_Get()+MI->Config.File_Buffer_Size_ToRead<(Partial_End<=MI->Config.File_Size?Partial_End:MI->Config.File_Size))?MI->Config.File_Buffer_Size_ToRead:((size_t)((Partial_End<=MI->Config.File_Size?Partial_End:MI->Config.File_Size)-F.Position_Get())));
 
-                MI->Open_Buffer_Init((int64u)-1, F.Position_Get());
+            //Testing growing files
+            if (!MI->Config.File_IsGrowing && F.Position_Get()>=MI->Config.File_Size)
+            {
+                if (MediaInfoLib::Config.ParseSpeed_Get()>=1.0) //Only if full parsing
+                {
+                    int64u FileSize_New=F.Size_Get();
+                    if (MI->Config.File_Size!=FileSize_New)
+                        MI->Config.File_IsGrowing=true;
+                }
+            }
+            if (MI->Config.File_IsNotGrowingAnymore)
+            {
+                MI->Config.File_Current_Size=MI->Config.File_Size=F.Size_Get();
+                MI->Open_Buffer_Init(MI->Config.File_Size, F.Position_Get()-MI->Config.File_Buffer_Size);
+                MI->Config.File_IsGrowing=false;
+                MI->Config.File_IsNotGrowingAnymore=false;
+            }
+            if (MI->Config.File_IsGrowing && F.Position_Get()>=MI->Config.File_Size)
+            {
+                for (size_t CountOfSeconds=0; CountOfSeconds<(size_t)MI->Config.File_GrowingFile_Delay_Get(); CountOfSeconds++)
+                {
+                    int64u FileSize_New=F.Size_Get();
+                    if (MI->Config.File_Size!=FileSize_New)
+                    {
+                        MI->Config.File_Current_Size=MI->Config.File_Size=FileSize_New;
+                        MI->Open_Buffer_Init(MI->Config.File_Size, F.Position_Get()-MI->Config.File_Buffer_Size);
+                        break;
+                    }
+                    #ifdef WINDOWS
+                        Sleep(1000);
+                    #endif //WINDOWS
+                }
             }
-        }
 
-        //Buffering
-        size_t Buffer_Size=F.Read(Buffer, Buffer_Size_Max);
-        if (Buffer_Size==0)
-            break; //Problem while reading
+            #ifdef MEDIAINFO_DEBUG
+                Reader_File_BytesRead_Total+=MI->Config.File_Buffer_Size;
+                Reader_File_BytesRead+=MI->Config.File_Buffer_Size;
+            #endif //MEDIAINFO_DEBUG
 
-        #ifdef MEDIAINFO_DEBUG
-            Reader_File_BytesRead_Total+=Buffer_Size;
-            Reader_File_BytesRead+=Buffer_Size;
-        #endif //MEDIAINFO_DEBUG
+            //Parser
+            Status=MI->Open_Buffer_Continue(MI->Config.File_Buffer, MI->Config.File_Buffer_Size);
 
-        //Parser
-        Status=MI->Open_Buffer_Continue(Buffer, Buffer_Size);
+            //Testing multiple file per stream
+            if (F.Position_Get()>=F.Size_Get())
+            {
+                if (MI->Config.File_Names_Pos<MI->Config.File_Names.size())
+                {
+                    MI->Config.File_Current_Offset+=F.Size_Get();
+                    F.Close();
+                    F.Open(MI->Config.File_Names[MI->Config.File_Names_Pos]);
+                    MI->Config.File_Names_Pos++;
+                    MI->Config.File_Current_Size+=F.Size_Get();
+                }
+            }
 
-        //Threading
-        if (MI->IsTerminating())
-            break; //Termination is requested
+            if (MI->Config.File_Buffer_Size==0)
+            {
+                #if MEDIAINFO_EVENTS
+                    MediaInfoLib::Config.Log_Send(0xC0, 0xFF, 0xF0F00101, "File read error");
+                #endif //MEDIAINFO_EVENTS
+                break;
+            }
+
+            #if MEDIAINFO_DEMUX
+                if (MI->Config.Demux_EventWasSent)
+                    return 2; //Must return immediately
+            #endif //MEDIAINFO_DEMUX
+
+            //Threading
+            if (MI->IsTerminating())
+                break; //Termination is requested
+        }
     }
-    while (!(Status[File__Analyze::IsFinished] || (StopAfterFilled && Status[File__Analyze::IsFilled])));
-    if (F.Size_Get()==0) //If Size==0, Status is never updated
-        Status=MI->Open_Buffer_Continue(NULL, 0);
 
     #ifdef MEDIAINFO_DEBUG
         std::cout<<std::hex<<Reader_File_Offset<<" - "<<Reader_File_Offset+Reader_File_BytesRead<<" : "<<std::dec<<Reader_File_BytesRead<<" bytes"<<std::endl;
         std::cout<<"Total: "<<std::dec<<Reader_File_BytesRead_Total<<" bytes in "<<Reader_File_Count<<" blocks"<<std::endl;
     #endif //MEDIAINFO_DEBUG
 
-    //File
-    F.Close();
-
-    //Buffer
-    delete[] Buffer; //Buffer=NULL;
+    if (MI==NULL || !MI->Config.File_KeepInfo_Get())
+    {
+        //File
+        F.Close();
+    }
 
     //Is this file detected?
     if (!Status[File__Analyze::IsAccepted])
         return 0;
 
     MI->Open_Buffer_Finalize();
+
+    #if MEDIAINFO_DEMUX
+        if (MI->Config.Demux_EventWasSent)
+            return 2; //Must return immediately
+    #endif //MEDIAINFO_DEMUX
+
     return 1;
 }
 
-} //NameSpace
+//---------------------------------------------------------------------------
+#if MEDIAINFO_SEEK
+size_t Reader_File::Format_Test_PerParser_Seek (MediaInfo_Internal* MI, size_t Method, int64u Value, int64u ID)
+{
+    size_t ToReturn=MI->Open_Buffer_Seek(Method, Value, ID);
+
+    if (ToReturn==0 || ToReturn==1)
+    {
+        //Reset
+        Status=0;
+    }
 
+    return ToReturn;
+}
+#endif //MEDIAINFO_SEEK
 
+} //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Reader/Reader_File.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Reader/Reader_File.h Changed

@@ -1,17 +1,17 @@
 // Reader_File - All information about media files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -28,7 +28,9 @@
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
-#include "MediaInfo/MediaInfo_Internal.h"
+#include "MediaInfo/Reader/Reader__Base.h"
+#include "ZenLib/File.h"
+using namespace ZenLib;
 //---------------------------------------------------------------------------
 
 namespace MediaInfoLib
@@ -38,12 +40,22 @@
 /// @brief Reader_File
 //***************************************************************************
 
-class Reader_File
+class Reader_File : public Reader__Base
 {
 public :
+    //Constructor/Destructor
+    virtual ~Reader_File() {}
+
     //Format testing
-    static size_t Format_Test(MediaInfo_Internal* MI, const String &File_Name);
-    static size_t Format_Test_PerParser(MediaInfo_Internal* MI, const String &File_Name);
+    size_t Format_Test(MediaInfo_Internal* MI, const String &File_Name);
+    size_t Format_Test_PerParser(MediaInfo_Internal* MI, const String &File_Name);
+    size_t Format_Test_PerParser_Continue (MediaInfo_Internal* MI);
+    size_t Format_Test_PerParser_Seek (MediaInfo_Internal* MI, size_t Method, int64u Value, int64u ID);
+
+    ZenLib::File F;
+    std::bitset<32> Status;
+    int64u          Partial_Begin;
+    int64u          Partial_End;
 };
 
 } //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Reader/Reader__Base.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Reader/Reader__Base.h Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Reader/Reader_libcurl.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Reader/Reader_libcurl.cpp Changed

@@ -1,17 +1,17 @@
 // Reader_libcurl - All info about media files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -23,26 +23,34 @@
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_LIBCURL_YES)
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 #include "MediaInfo/Reader/Reader_libcurl.h"
 #include "MediaInfo/File__Analyze.h"
-#if defined LIBCURL_DLL_RUNTIME
-#elif defined LIBCURL_DLL_STATIC
+#if defined MEDIAINFO_LIBCURL_DLL_RUNTIME
+    //Copy of cURL include files
+    #include "MediaInfo/Reader/Reader_libcurl_Include.h"
 #else
+    #define CURL_STATICLIB
     #undef __TEXT
     #include "curl/curl.h"
 #endif
+#include <ctime>
+#include "ZenLib/File.h"
 using namespace ZenLib;
 using namespace std;
 #ifdef MEDIAINFO_DEBUG
@@ -57,15 +65,35 @@
 // libcurl stuff
 //***************************************************************************
 
-struct curl_data
+//---------------------------------------------------------------------------
+struct Reader_libcurl::curl_data
 {
     MediaInfo_Internal* MI;
     CURL*               Curl;
+    char                ErrorBuffer[CURL_ERROR_SIZE];
+    #if MEDIAINFO_NEXTPACKET
+        CURLM*          CurlM;
+    #endif MEDIAINFO_NEXTPACKET
+    struct curl_slist*  HttpHeader;
+    std::bitset<32>     Status;
     String              File_Name;
-    int64u              File_Offset;
-    int64u              File_Size;
-    int64u              File_GoTo;
+    std::string         Ssl_CertificateFileName;
+    std::string         Ssl_CertificateFormat;
+    std::string         Ssl_PrivateKeyFileName;
+    std::string         Ssl_PrivateKeyFormat;
+    std::string         Ssl_CertificateAuthorityFileName;
+    std::string         Ssl_CertificateAuthorityPath;
+    std::string         Ssl_CertificateRevocationListFileName;
+    bool                Ssl_IgnoreSecurity;
+    std::string         Ssh_KnownHostsFileName;
+    std::string         Ssh_PublicKeyFileName;
+    std::string         Ssh_PrivateKeyFileName;
+    bool                Ssh_IgnoreSecurity;
     bool                Init_AlreadyDone;
+    #if MEDIAINFO_NEXTPACKET
+        bool            NextPacket;
+    #endif MEDIAINFO_NEXTPACKET
+    time_t              Time_Max;
     #ifdef MEDIAINFO_DEBUG
         int64u          Debug_BytesRead_Total;
         int64u          Debug_BytesRead;
@@ -76,10 +104,18 @@
     {
         MI=NULL;
         Curl=NULL;
-        File_Offset=0;
-        File_Size=(int64u)-1;
-        File_GoTo=(int64u)-1;
+        ErrorBuffer[0]='\0';
+        #if MEDIAINFO_NEXTPACKET
+            CurlM=NULL;
+        #endif MEDIAINFO_NEXTPACKET
+        HttpHeader=NULL;
+        Ssl_IgnoreSecurity=false;
+        Ssh_IgnoreSecurity=false;
         Init_AlreadyDone=false;
+        #if MEDIAINFO_NEXTPACKET
+            NextPacket=false;
+        #endif MEDIAINFO_NEXTPACKET
+        Time_Max=0;
         #ifdef MEDIAINFO_DEBUG
             Debug_BytesRead_Total=0;
             Debug_BytesRead=0;
@@ -88,114 +124,690 @@
     }
 };
 
+//---------------------------------------------------------------------------
 size_t libcurl_WriteData_CallBack(void *ptr, size_t size, size_t nmemb, void *data)
 {
     #ifdef MEDIAINFO_DEBUG
-        ((curl_data*)data)->Debug_BytesRead_Total+=size*nmemb;
-        ((curl_data*)data)->Debug_BytesRead+=size*nmemb;
+        ((Reader_libcurl::curl_data*)data)->Debug_BytesRead_Total+=size*nmemb;
+        ((Reader_libcurl::curl_data*)data)->Debug_BytesRead+=size*nmemb;
     #endif //MEDIAINFO_DEBUG
 
     //Init
-    if (!((curl_data*)data)->Init_AlreadyDone)
+    if (!((Reader_libcurl::curl_data*)data)->Init_AlreadyDone)
     {
         double File_SizeD;
-        CURLcode Result=curl_easy_getinfo(((curl_data*)data)->Curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &File_SizeD);
+        CURLcode Result=curl_easy_getinfo(((Reader_libcurl::curl_data*)data)->Curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &File_SizeD);
         if (Result==CURLE_OK && File_SizeD!=-1)
-            ((curl_data*)data)->MI->Open_Buffer_Init((int64u)File_SizeD, ((curl_data*)data)->File_Name);
+        {
+            ((Reader_libcurl::curl_data*)data)->MI->Open_Buffer_Init((int64u)File_SizeD, ((Reader_libcurl::curl_data*)data)->File_Name);
+        }
         else
-            ((curl_data*)data)->MI->Open_Buffer_Init((int64u)-1, ((curl_data*)data)->File_Name);
-        ((curl_data*)data)->Init_AlreadyDone=true;
+            ((Reader_libcurl::curl_data*)data)->MI->Open_Buffer_Init((int64u)-1, ((Reader_libcurl::curl_data*)data)->File_Name);
+        ((Reader_libcurl::curl_data*)data)->Init_AlreadyDone=true;
     }
 
     //Continue
-    std::bitset<32> Result=((curl_data*)data)->MI->Open_Buffer_Continue((int8u*)ptr, size*nmemb);
-    ((curl_data*)data)->File_Offset+=size*nmemb;
-    
-    if (Result[File__Analyze::IsFinished])
+    ((Reader_libcurl::curl_data*)data)->Status=((Reader_libcurl::curl_data*)data)->MI->Open_Buffer_Continue((int8u*)ptr, size*nmemb);
+    time_t CurrentTime = time(0);
+
+    if (((Reader_libcurl::curl_data*)data)->Status[File__Analyze::IsFinished] || (((Reader_libcurl::curl_data*)data)->Time_Max && CurrentTime>=((Reader_libcurl::curl_data*)data)->Time_Max))
     {
-        ((curl_data*)data)->MI->Open_Buffer_Finalize();
         return 0;
     }
 
     //GoTo
-    if (((curl_data*)data)->MI->Open_Buffer_Continue_GoTo_Get()!=(int64u)-1)
+    if (((Reader_libcurl::curl_data*)data)->MI->Open_Buffer_Continue_GoTo_Get()!=(int64u)-1)
     {
-        if (!(((curl_data*)data)->MI->Open_Buffer_Continue_GoTo_Get()>=((curl_data*)data)->File_Offset && ((curl_data*)data)->MI->Open_Buffer_Continue_GoTo_Get()<=((curl_data*)data)->File_Offset+100000))
-        {
-            ((curl_data*)data)->File_GoTo=((curl_data*)data)->MI->Open_Buffer_Continue_GoTo_Get();
-            return 0;
-        }
+        return 0;
     }
 
     //Continue parsing
     return size*nmemb;
 }
 
+Ztring Reader_libcurl_FileNameWithoutPassword(const Ztring &FileName)
+{
+    Ztring FileName_Modified(FileName);
+    size_t Begin=FileName_Modified.find(__T(':'), 6);
+    size_t End=FileName_Modified.find(__T('@'));
+    if (Begin!=string::npos && End!=string::npos && Begin<End)
+        FileName_Modified.erase(Begin, End-Begin);
+    return FileName_Modified;
+}
+
+bool Reader_libcurl_HomeIsSet()
+{
+    return getenv("HOME")?true:false;
+}
+
+Ztring Reader_libcurl_ExpandFileName(const Ztring &FileName)
+{
+    Ztring FileName_Modified(FileName);
+    if (FileName_Modified.find(__T("$HOME"))==0)
+    {
+        char* env=getenv("HOME");
+        if (env)
+            FileName_Modified.FindAndReplace(__T("$HOME"), Ztring().From_Local(env));
+    }
+    if (FileName_Modified.find(__T("~"))==0)
+    {
+        char* env=getenv("HOME");
+        if (env)
+            FileName_Modified.FindAndReplace(__T("~"), Ztring().From_Local(env));
+    }
+    return FileName_Modified;
+}
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+Reader_libcurl::Reader_libcurl ()
+{
+    Curl_Data=NULL;
+}
+
+//---------------------------------------------------------------------------
+Reader_libcurl::~Reader_libcurl ()
+{
+    if (Curl_Data==NULL)
+        return;
+
+    //Cleanup
+    #if MEDIAINFO_NEXTPACKET
+        if (Curl_Data->CurlM)
+        {
+             curl_multi_remove_handle(Curl_Data->CurlM, Curl_Data->Curl);
+             curl_multi_cleanup(Curl_Data->CurlM);
+        }
+    #endif //MEDIAINFO_NEXTPACKET
+    if (Curl_Data->Curl)
+        curl_easy_cleanup(Curl_Data->Curl);
+    if (Curl_Data->HttpHeader)
+        curl_slist_free_all(Curl_Data->HttpHeader);
+    delete Curl_Data; //Curl_Data=NULL;
+}
+
+//***************************************************************************
+//
+//***************************************************************************
+
 //---------------------------------------------------------------------------
 size_t Reader_libcurl::Format_Test(MediaInfo_Internal* MI, const String &File_Name)
 {
-    //Configuring
-    curl_data Curl_Data;
-    Curl_Data.Curl=curl_easy_init();
-    Curl_Data.MI=MI;
-    Curl_Data.File_Name=File_Name;
-    string FileName_String=Ztring(Curl_Data.File_Name).To_Local();
-    if (!MI->Config.File_Curl_Get(_T("UserAgent")).empty())
-        curl_easy_setopt(Curl_Data.Curl, CURLOPT_USERAGENT, MI->Config.File_Curl_Get(_T("UserAgent")).To_Local().c_str());
-    if (!MI->Config.File_Curl_Get(_T("Proxy")).empty())
-        curl_easy_setopt(Curl_Data.Curl, CURLOPT_PROXY, MI->Config.File_Curl_Get(_T("Proxy")).To_Local().c_str());
-    curl_easy_setopt(Curl_Data.Curl, CURLOPT_URL, FileName_String.c_str());
-    curl_easy_setopt(Curl_Data.Curl, CURLOPT_FOLLOWLOCATION, 1);
-    curl_easy_setopt(Curl_Data.Curl, CURLOPT_MAXREDIRS, 3);
-    curl_easy_setopt(Curl_Data.Curl, CURLOPT_WRITEFUNCTION, &libcurl_WriteData_CallBack);
-    curl_easy_setopt(Curl_Data.Curl, CURLOPT_WRITEDATA, &Curl_Data);
-    
-    //Parsing
-    CURLcode Result;
-    do
+    #if defined MEDIAINFO_LIBCURL_DLL_RUNTIME
+        if (libcurl_Module_Count==0)
+        {
+            size_t Errors=0;
+
+            /* Load library */
+            #ifdef MEDIAINFO_GLIBC
+                libcurl_Module=g_module_open(MEDIAINFODLL_NAME, G_MODULE_BIND_LAZY);
+            #elif defined (_WIN32) || defined (WIN32)
+                libcurl_Module=LoadLibrary(MEDIAINFODLL_NAME);
+            #else
+                libcurl_Module=dlopen(MEDIAINFODLL_NAME, RTLD_LAZY);
+                if (!libcurl_Module)
+                    libcurl_Module=dlopen("./" MEDIAINFODLL_NAME, RTLD_LAZY);
+                if (!libcurl_Module)
+                    libcurl_Module=dlopen("/usr/local/lib/" MEDIAINFODLL_NAME, RTLD_LAZY);
+                if (!libcurl_Module)
+                    libcurl_Module=dlopen("/usr/local/lib64/" MEDIAINFODLL_NAME, RTLD_LAZY);
+                if (!libcurl_Module)
+                    libcurl_Module=dlopen("/usr/lib/" MEDIAINFODLL_NAME, RTLD_LAZY);
+                if (!libcurl_Module)
+                    libcurl_Module=dlopen("/usr/lib64/" MEDIAINFODLL_NAME, RTLD_LAZY);
+            #endif
+            if (!libcurl_Module)
+            {
+                #if MEDIAINFO_EVENTS
+                    MediaInfoLib::Config.Log_Send(0xC0, 0xFF, 0, Reader_libcurl_FileNameWithoutPassword(File_Name)+__T(", Libcurl library is not found"));
+                #endif //MEDIAINFO_EVENTS
+                return 0;
+            }
+
+            /* Load methods */
+            MEDIAINFO_ASSIGN    (curl_easy_init,            "curl_easy_init")
+            MEDIAINFO_ASSIGN    (curl_easy_setopt,          "curl_easy_setopt")
+            MEDIAINFO_ASSIGN    (curl_easy_perform,         "curl_easy_perform")
+            MEDIAINFO_ASSIGN    (curl_easy_cleanup,         "curl_easy_cleanup")
+            MEDIAINFO_ASSIGN    (curl_easy_getinfo,         "curl_easy_getinfo")
+            MEDIAINFO_ASSIGN    (curl_slist_append,         "curl_slist_append")
+            MEDIAINFO_ASSIGN    (curl_slist_free_all,       "curl_slist_free_all")
+            MEDIAINFO_ASSIGN    (curl_easy_duphandle,       "curl_easy_duphandle")
+            MEDIAINFO_ASSIGN    (curl_easy_strerror,        "curl_easy_strerror")
+            MEDIAINFO_ASSIGN    (curl_version_info,         "curl_version_info")
+            MEDIAINFO_ASSIGN    (curl_multi_init,           "curl_multi_init")
+            MEDIAINFO_ASSIGN    (curl_multi_add_handle,     "curl_multi_add_handle")
+            MEDIAINFO_ASSIGN    (curl_multi_remove_handle,  "curl_multi_remove_handle")
+            MEDIAINFO_ASSIGN    (curl_multi_perform,        "curl_multi_perform")
+            MEDIAINFO_ASSIGN    (curl_multi_cleanup,        "curl_multi_cleanup")
+            if (Errors>0)
+            {
+                #if MEDIAINFO_EVENTS
+                    MediaInfoLib::Config.Log_Send(0xC0, 0xFF, 0, Reader_libcurl_FileNameWithoutPassword(File_Name)+__T(", Libcurl library is not correctly loaded"));
+                #endif //MEDIAINFO_EVENTS
+                return 0;
+            }
+
+            libcurl_Module_Count++;
+        }
+    #endif //defined MEDIAINFO_LIBCURL_DLL_RUNTIME
+
+    #if MEDIAINFO_EVENTS
+        {
+            struct MediaInfo_Event_General_Start_0 Event;
+            Event.EventCode=MediaInfo_EventCode_Create(MediaInfo_Parser_None, MediaInfo_Event_General_Start, 0);
+            Event.Stream_Size=(int64u)-1;
+            MI->Config.Event_Send((const int8u*)&Event, sizeof(MediaInfo_Event_General_Start_0));
+        }
+    #endif //MEDIAINFO_EVENTS
+
+    //With Parser MultipleParsing
+    return Format_Test_PerParser(MI, File_Name);
+}
+
+//---------------------------------------------------------------------------
+size_t Reader_libcurl::Format_Test_PerParser(MediaInfo_Internal* MI, const String &File_Name)
+{
+    #if defined MEDIAINFO_LIBCURL_DLL_RUNTIME
+        if (libcurl_Module_Count==0)
+            return 0; //No libcurl library
+    #endif //defined MEDIAINFO_LIBCURL_DLL_RUNTIME
+
+    Curl_Data=new curl_data();
+    Curl_Data->Ssl_CertificateFileName=MediaInfoLib::Config.Ssl_CertificateFileName_Get().To_Local();
+    Curl_Data->Ssl_CertificateFormat=MediaInfoLib::Config.Ssl_CertificateFormat_Get().To_Local();
+    Curl_Data->Ssl_PrivateKeyFileName=MediaInfoLib::Config.Ssl_PrivateKeyFileName_Get().To_Local();
+    Curl_Data->Ssl_PrivateKeyFormat=MediaInfoLib::Config.Ssl_PrivateKeyFormat_Get().To_Local();
+    Curl_Data->Ssl_CertificateAuthorityFileName=MediaInfoLib::Config.Ssl_CertificateAuthorityFileName_Get().To_Local();
+    Curl_Data->Ssl_CertificateAuthorityPath=MediaInfoLib::Config.Ssl_CertificateAuthorityPath_Get().To_Local();
+    Curl_Data->Ssl_CertificateRevocationListFileName=MediaInfoLib::Config.Ssl_CertificateRevocationListFileName_Get().To_Local();
+    Curl_Data->Ssl_IgnoreSecurity=MediaInfoLib::Config.Ssl_IgnoreSecurity_Get();
+    Curl_Data->Ssh_PublicKeyFileName=Reader_libcurl_ExpandFileName(MediaInfoLib::Config.Ssh_PublicKeyFileName_Get()).To_Local();
+    if (Curl_Data->Ssh_PublicKeyFileName.empty())
     {
-        //GoTo
-        if (Curl_Data.File_GoTo!=(int64u)-1)
+        if (Reader_libcurl_HomeIsSet())
         {
-            #ifdef MEDIAINFO_DEBUG
-                std::cout<<std::hex<<Curl_Data.File_Offset-Curl_Data.Debug_BytesRead<<" - "<<Curl_Data.File_Offset<<" : "<<std::dec<<Curl_Data.Debug_BytesRead<<" bytes"<<std::endl;
-                Curl_Data.File_Offset=Curl_Data.File_GoTo;
-                Curl_Data.Debug_BytesRead=0;
-                Curl_Data.Debug_Count++;
-            #endif //MEDIAINFO_DEBUG
-
-                if (Curl_Data.File_GoTo<0x80000000)
+            Ztring Temp=Reader_libcurl_ExpandFileName(__T("$HOME/.ssh/id_rsa.pub"));
+            if (File::Exists(Temp))
+                Curl_Data->Ssh_PublicKeyFileName=Temp.To_Local();
+        }
+        else
+        {
+            if (File::Exists(__T("id_rsa.pub")))
+                Curl_Data->Ssh_PublicKeyFileName="id_rsa.pub";
+        }
+    }
+    Curl_Data->Ssh_PrivateKeyFileName=Reader_libcurl_ExpandFileName(MediaInfoLib::Config.Ssh_PrivateKeyFileName_Get()).To_Local();
+    if (Curl_Data->Ssh_PrivateKeyFileName.empty())
+    {
+        if (Reader_libcurl_HomeIsSet())
+        {
+            Ztring Temp=Reader_libcurl_ExpandFileName(__T("$HOME/.ssh/id_rsa"));
+            if (File::Exists(Temp))
+                Curl_Data->Ssh_PrivateKeyFileName=Temp.To_Local();
+        }
+        else
+        {
+            if (File::Exists(__T("id_rsa")))
+                Curl_Data->Ssh_PublicKeyFileName="id_rsa";
+        }
+    }
+    Curl_Data->Ssh_KnownHostsFileName=Reader_libcurl_ExpandFileName(MediaInfoLib::Config.Ssh_KnownHostsFileName_Get()).To_Local();
    if (Curl_Data->Ssh_KnownHostsFileName.empty())
+    {
+        if (Reader_libcurl_HomeIsSet())
+            Curl_Data->Ssh_KnownHostsFileName=Reader_libcurl_ExpandFileName(__T("$HOME/.ssh/known_hosts")).To_Local();
+        else
+            Curl_Data->Ssh_KnownHostsFileName="known_hosts";
+    }
+    Curl_Data->Ssh_IgnoreSecurity=MediaInfoLib::Config.Ssh_IgnoreSecurity_Get();
+    Curl_Data->Curl=curl_easy_init();
+    if (Curl_Data->Curl==NULL)
+        return 0;
+    #if MEDIAINFO_NEXTPACKET
+        if (MI->Config.NextPacket_Get())
+        {
+            Curl_Data->CurlM=curl_multi_init( );
+            if (Curl_Data->CurlM==NULL)
+                return 0;
+            CURLMcode CodeM=curl_multi_add_handle(Curl_Data->CurlM, Curl_Data->Curl);
+            if (CodeM!=CURLM_OK)
+                return 0;
+            Curl_Data->NextPacket=true;
+        }
+    #endif //MEDIAINFO_NEXTPACKET
+    Curl_Data->MI=MI;
+    Curl_Data->File_Name=File_Name;
+    string FileName_String=Ztring(Curl_Data->File_Name).To_Local();
+    if (MI->Config.File_TimeToLive_Get())
+        Curl_Data->Time_Max=time(0)+(time_t)MI->Config.File_TimeToLive_Get();
+    if (!MI->Config.File_Curl_Get(__T("UserAgent")).empty())
+        curl_easy_setopt(Curl_Data->Curl, CURLOPT_USERAGENT, MI->Config.File_Curl_Get(__T("UserAgent")).To_Local().c_str());
+    if (!MI->Config.File_Curl_Get(__T("Proxy")).empty())
+        curl_easy_setopt(Curl_Data->Curl, CURLOPT_PROXY, MI->Config.File_Curl_Get(__T("Proxy")).To_Local().c_str());
+    if (!MI->Config.File_Curl_Get(__T("HttpHeader")).empty())
+    {
+        ZtringList HttpHeaderStrings; HttpHeaderStrings.Separator_Set(0, EOL); //End of line is set depending of the platform: \n on Linux, \r on Mac, or \r\n on Windows
+        HttpHeaderStrings.Write(MI->Config.File_Curl_Get(__T("HttpHeader")));
+        for (size_t Pos=0; Pos<HttpHeaderStrings.size(); Pos++)
+            curl_slist_append(Curl_Data->HttpHeader, HttpHeaderStrings[Pos].To_Local().c_str());
+        curl_easy_setopt(Curl_Data->Curl, CURLOPT_HTTPHEADER, Curl_Data->HttpHeader);
+    }
+    curl_easy_setopt(Curl_Data->Curl, CURLOPT_URL, FileName_String.c_str());
+    curl_easy_setopt(Curl_Data->Curl, CURLOPT_FOLLOWLOCATION, 1);
+    curl_easy_setopt(Curl_Data->Curl, CURLOPT_MAXREDIRS, 3);
+    curl_easy_setopt(Curl_Data->Curl, CURLOPT_WRITEFUNCTION, &libcurl_WriteData_CallBack);
+    curl_easy_setopt(Curl_Data->Curl, CURLOPT_WRITEDATA, Curl_Data);
+    curl_easy_setopt(Curl_Data->Curl, CURLOPT_ERRORBUFFER, Curl_Data->ErrorBuffer);
+    size_t Protocol_Limit=File_Name.find(__T(":"));
+    if (Protocol_Limit!=string::npos)
+    {
+        Ztring Protocol=File_Name;
+        Protocol.resize(Protocol_Limit);
+        Protocol.MakeLowerCase();
+
+        if (Protocol==__T("sftp") || Protocol==__T("scp"))
+        {
+            if (!Curl_Data->Ssh_PublicKeyFileName.empty())
+            {
+                CURLcode Result=curl_easy_setopt(Curl_Data->Curl, CURLOPT_SSH_PUBLIC_KEYFILE, Curl_Data->Ssh_PublicKeyFileName.c_str());
+                if (Result)
+                {
+                    #if MEDIAINFO_EVENTS
+                        if (Result==CURLE_UNKNOWN_TELNET_OPTION)
+                            MediaInfoLib::Config.Log_Send(0xC0, 0xFF, 0xF1010101, Reader_libcurl_FileNameWithoutPassword(File_Name)+__T(", The Curl library you use has no support for secure connections."));
+                        else
+                        {
+                            Ztring MessageString;
+                            MessageString.From_Local(Curl_Data->ErrorBuffer);
+                            if (MessageString.empty())
+                                MessageString.From_Local(curl_easy_strerror(Result));
+                            MediaInfoLib::Config.Log_Send(0xC0, 0xFF, 0, Reader_libcurl_FileNameWithoutPassword(File_Name)+__T(", ")+MessageString);
+                        }
+                        Curl_Data->ErrorBuffer[0]='\0';
+                    #endif //MEDIAINFO_EVENTS
+                    return 0;
+                }
+            }
+
+            if (!Curl_Data->Ssh_PrivateKeyFileName.empty())
+            {
+                CURLcode Result=curl_easy_setopt(Curl_Data->Curl, CURLOPT_SSH_PRIVATE_KEYFILE, Curl_Data->Ssh_PrivateKeyFileName.c_str());
+                if (Result)
+                {
+                    #if MEDIAINFO_EVENTS
+                        if (Result==CURLE_UNKNOWN_TELNET_OPTION)
+                            MediaInfoLib::Config.Log_Send(0xC0, 0xFF, 0xF1010101, Reader_libcurl_FileNameWithoutPassword(File_Name)+__T(", The Curl library you use has no support for secure connections."));
+                        else
+                        {
+                            Ztring MessageString;
+                            MessageString.From_Local(Curl_Data->ErrorBuffer);
+                            if (MessageString.empty())
+                                MessageString.From_Local(curl_easy_strerror(Result));
+                            MediaInfoLib::Config.Log_Send(0xC0, 0xFF, 0, Reader_libcurl_FileNameWithoutPassword(File_Name)+__T(", ")+MessageString);
+                        }
+                        Curl_Data->ErrorBuffer[0]='\0';
+                    #endif //MEDIAINFO_EVENTS
+                    return 0;
+                }
+            }
+
+            if (!Curl_Data->Ssh_IgnoreSecurity)
+            {
+                CURLcode Result=curl_easy_setopt(Curl_Data->Curl, CURLOPT_SSH_KNOWNHOSTS, Curl_Data->Ssh_KnownHostsFileName.c_str());
+                if (Result)
+                {
+                    #if MEDIAINFO_EVENTS
+                        if (Result==CURLE_UNKNOWN_TELNET_OPTION)
+                            MediaInfoLib::Config.Log_Send(0xC0, 0xFF, 0xF1010102, Reader_libcurl_FileNameWithoutPassword(File_Name)+__T(", The Curl library you use has no support for known_host security file, transfer would not be secure."));
+                        else
+                        {
+                            Ztring MessageString;
+                            MessageString.From_Local(Curl_Data->ErrorBuffer);
+                            if (MessageString.empty())
+                                MessageString.From_Local(curl_easy_strerror(Result));
+                            MediaInfoLib::Config.Log_Send(0xC0, 0xFF, 0, Reader_libcurl_FileNameWithoutPassword(File_Name)+__T(", ")+MessageString);
+                        }
+                        Curl_Data->ErrorBuffer[0]='\0';
+                    #endif //MEDIAINFO_EVENTS
+                    return 0;
+                }
+            }
+        }
+
+        if (Protocol==__T("ftps"))
+        {
+            if (!Curl_Data->Ssl_CertificateFileName.empty())
+            {
+                CURLcode Result=curl_easy_setopt(Curl_Data->Curl, CURLOPT_SSLCERT, Curl_Data->Ssl_CertificateFileName.c_str());
+                if (Result)
+                {
+                    #if MEDIAINFO_EVENTS
+                        Ztring MessageString;
+                        MessageString.From_Local(Curl_Data->ErrorBuffer);
+                        if (MessageString.empty())
+                            MessageString.From_Local(curl_easy_strerror(Result));
+                        Curl_Data->ErrorBuffer[0]='\0';
+                        MediaInfoLib::Config.Log_Send(0xC0, 0xFF, 0, Reader_libcurl_FileNameWithoutPassword(File_Name)+__T(", ")+MessageString);
+                    #endif //MEDIAINFO_EVENTS
+                    return 0;
+                }
+            }
+
+            if (!Curl_Data->Ssl_CertificateFormat.empty())
+            {
+                CURLcode Result=curl_easy_setopt(Curl_Data->Curl, CURLOPT_SSLCERTTYPE, Curl_Data->Ssl_CertificateFormat.c_str());
+                if (Result)
+                {
+                    #if MEDIAINFO_EVENTS
+                        Ztring MessageString;
+                        MessageString.From_Local(Curl_Data->ErrorBuffer);
+                        if (MessageString.empty())
+                            MessageString.From_Local(curl_easy_strerror(Result));
+                        Curl_Data->ErrorBuffer[0]='\0';
+                        MediaInfoLib::Config.Log_Send(0xC0, 0xFF, 0, Reader_libcurl_FileNameWithoutPassword(File_Name)+__T(", ")+MessageString);
+                    #endif //MEDIAINFO_EVENTS
+                    return 0;
+                }
+            }
+
+            if (!Curl_Data->Ssl_PrivateKeyFileName.empty())
+            {
+                CURLcode Result=curl_easy_setopt(Curl_Data->Curl, CURLOPT_SSLKEY, Curl_Data->Ssl_PrivateKeyFileName.c_str());
+                if (Result)
+                {
+                    #if MEDIAINFO_EVENTS
+                        Ztring MessageString;
+                        MessageString.From_Local(Curl_Data->ErrorBuffer);
+                        if (MessageString.empty())
+                            MessageString.From_Local(curl_easy_strerror(Result));
+                        Curl_Data->ErrorBuffer[0]='\0';
+                        MediaInfoLib::Config.Log_Send(0xC0, 0xFF, 0, Reader_libcurl_FileNameWithoutPassword(File_Name)+__T(", ")+MessageString);
+                    #endif //MEDIAINFO_EVENTS
+                    return 0;
+                }
+            }
+
+            if (!Curl_Data->Ssl_PrivateKeyFormat.empty())
+            {
+                CURLcode Result=curl_easy_setopt(Curl_Data->Curl, CURLOPT_SSLKEYTYPE, Curl_Data->Ssl_PrivateKeyFormat.c_str());
+                if (Result)
+                {
+                    #if MEDIAINFO_EVENTS
+                        Ztring MessageString;
+                        MessageString.From_Local(Curl_Data->ErrorBuffer);
+                        if (MessageString.empty())
+                            MessageString.From_Local(curl_easy_strerror(Result));
+                        Curl_Data->ErrorBuffer[0]='\0';
+                        MediaInfoLib::Config.Log_Send(0xC0, 0xFF, 0, Reader_libcurl_FileNameWithoutPassword(File_Name)+__T(", ")+MessageString);
+                    #endif //MEDIAINFO_EVENTS
+                    return 0;
+                }
+            }
+
+            if (!Curl_Data->Ssl_CertificateAuthorityFileName.empty())
+            {
+                CURLcode Result=curl_easy_setopt(Curl_Data->Curl, CURLOPT_CAINFO, Curl_Data->Ssl_CertificateAuthorityFileName.c_str());
+                if (Result)
+                {
+                    #if MEDIAINFO_EVENTS
+                        Ztring MessageString;
+                        MessageString.From_Local(Curl_Data->ErrorBuffer);
+                        if (MessageString.empty())
+                            MessageString.From_Local(curl_easy_strerror(Result));
+                        Curl_Data->ErrorBuffer[0]='\0';
+                        MediaInfoLib::Config.Log_Send(0xC0, 0xFF, 0, Reader_libcurl_FileNameWithoutPassword(File_Name)+__T(", ")+MessageString);
+                    #endif //MEDIAINFO_EVENTS
+                    return 0;
+                }
+            }
+
+            if (!Curl_Data->Ssl_CertificateAuthorityPath.empty())
+            {
+                CURLcode Result=curl_easy_setopt(Curl_Data->Curl, CURLOPT_CAPATH, Curl_Data->Ssl_CertificateAuthorityPath.c_str());
+                if (Result)
+                {
+                    #if MEDIAINFO_EVENTS
+                        Ztring MessageString;
+                        MessageString.From_Local(Curl_Data->ErrorBuffer);
+                        if (MessageString.empty())
+                            MessageString.From_Local(curl_easy_strerror(Result));
+                        Curl_Data->ErrorBuffer[0]='\0';
+                        MediaInfoLib::Config.Log_Send(0xC0, 0xFF, 0, Reader_libcurl_FileNameWithoutPassword(File_Name)+__T(", ")+MessageString);
+                    #endif //MEDIAINFO_EVENTS
+                    return 0;
+                }
+            }
+
+            if (!Curl_Data->Ssl_CertificateRevocationListFileName.empty())
             {
-                //We do NOT use large version if we can, because some version (tested: 7.15 linux) do NOT like large version (error code 18)
-                long File_GoTo_Long=(long)Curl_Data.File_GoTo;
-                curl_easy_setopt(Curl_Data.Curl, CURLOPT_RESUME_FROM, File_GoTo_Long);
+                CURLcode Result=curl_easy_setopt(Curl_Data->Curl, CURLOPT_CRLFILE, Curl_Data->Ssl_CertificateRevocationListFileName.c_str());
+                if (Result)
+                {
+                    #if MEDIAINFO_EVENTS
+                        Ztring MessageString;
+                        MessageString.From_Local(Curl_Data->ErrorBuffer);
+                        if (MessageString.empty())
+                            MessageString.From_Local(curl_easy_strerror(Result));
+                        Curl_Data->ErrorBuffer[0]='\0';
+                        MediaInfoLib::Config.Log_Send(0xC0, 0xFF, 0, Reader_libcurl_FileNameWithoutPassword(File_Name)+__T(", ")+MessageString);
+                    #endif //MEDIAINFO_EVENTS
+                    return 0;
+                }
             }
-            else
+
+            if (Curl_Data->Ssl_IgnoreSecurity)
             {
-                curl_off_t File_GoTo_Off=(curl_off_t)Curl_Data.File_GoTo;
-                curl_easy_setopt(Curl_Data.Curl, CURLOPT_RESUME_FROM_LARGE, File_GoTo_Off);
+                CURLcode Result=curl_easy_setopt(Curl_Data->Curl, CURLOPT_SSL_VERIFYPEER, 0);
+                if (Result)
+                {
+                    #if MEDIAINFO_EVENTS
+                        Ztring MessageString;
+                        MessageString.From_Local(Curl_Data->ErrorBuffer);
+                        if (MessageString.empty())
+                            MessageString.From_Local(curl_easy_strerror(Result));
+                        Curl_Data->ErrorBuffer[0]='\0';
+                        MediaInfoLib::Config.Log_Send(0xC0, 0xFF, 0, Reader_libcurl_FileNameWithoutPassword(File_Name)+__T(", ")+MessageString);
+                    #endif //MEDIAINFO_EVENTS
+                    return 0;
+                }
+
+                Result=curl_easy_setopt(Curl_Data->Curl, CURLOPT_SSL_VERIFYHOST, 0);
+                if (Result)
+                {
+                    #if MEDIAINFO_EVENTS
+                        Ztring MessageString;
+                        MessageString.From_Local(Curl_Data->ErrorBuffer);
+                        if (MessageString.empty())
+                            MessageString.From_Local(curl_easy_strerror(Result));
+                        Curl_Data->ErrorBuffer[0]='\0';
+                        MediaInfoLib::Config.Log_Send(0xC0, 0xFF, 0, Reader_libcurl_FileNameWithoutPassword(File_Name)+__T(", ")+MessageString);
+                    #endif //MEDIAINFO_EVENTS
+                    return 0;
+                }
             }
-            MI->Open_Buffer_Init((int64u)-1, Curl_Data.File_GoTo);
-            Curl_Data.File_GoTo=(int64u)-1;
         }
+    }
+
+    //Test the format with buffer
+    return Format_Test_PerParser_Continue(MI);
+}
+
+//---------------------------------------------------------------------------
+size_t Reader_libcurl::Format_Test_PerParser_Continue (MediaInfo_Internal* MI)
+{
+    bool StopAfterFilled=MI->Config.File_StopAfterFilled_Get();
+    bool ShouldContinue=true;
+
+    #if MEDIAINFO_DEMUX
+    //PerPacket
+    if (ShouldContinue && MI->Config.Demux_EventWasSent)
+    {
+        MI->Config.Demux_EventWasSent=false;
+
+        Curl_Data->Status=MI->Open_Buffer_Continue(NULL, 0);
+
+        //Demux
+        if (MI->Config.Demux_EventWasSent)
+            return 2; //Must return immediately
+
+        //Threading
+        if (MI->IsTerminating())
+            return 1; //Termination is requested
+
+        if (Curl_Data->Status[File__Analyze::IsFinished] || (StopAfterFilled && Curl_Data->Status[File__Analyze::IsFilled]))
+            ShouldContinue=false;
+    }
+    #endif //MEDIAINFO_DEMUX
+
+    if (ShouldContinue)
+    {
+        CURLcode Result=CURLE_WRITE_ERROR;
+        while ((!(Curl_Data->Status[File__Analyze::IsFinished] || (StopAfterFilled && Curl_Data->Status[File__Analyze::IsFilled]))) && Result==CURLE_WRITE_ERROR)
+        {
+            //GoTo
+            if (Curl_Data->MI->Open_Buffer_Continue_GoTo_Get()!=(int64u)-1)
+            {
+                #ifdef MEDIAINFO_DEBUG
+                    std::cout<<std::hex<<Curl_Data->File_Offset-Curl_Data->Debug_BytesRead<<" - "<<Curl_Data->File_Offset<<" : "<<std::dec<<Curl_Data->Debug_BytesRead<<" bytes"<<std::endl;
+                    Curl_Data->Debug_BytesRead=0;
+                    Curl_Data->Debug_Count++;
+                #endif //MEDIAINFO_DEBUG
+                CURLcode Code;
+                CURL* Temp=curl_easy_duphandle(Curl_Data->Curl);
+                if (Temp==0)
+                    return 0;
+                #if MEDIAINFO_NEXTPACKET
+                    if (Curl_Data->CurlM)
+                            curl_multi_remove_handle(Curl_Data->CurlM, Curl_Data->Curl);
+                #endif //MEDIAINFO_NEXTPACKET
+                curl_easy_cleanup(Curl_Data->Curl); Curl_Data->Curl=Temp;
+                #if MEDIAINFO_NEXTPACKET
+                    if (Curl_Data->CurlM)
+                            curl_multi_add_handle(Curl_Data->CurlM, Curl_Data->Curl);
+                #endif //MEDIAINFO_NEXTPACKET
+                if (Curl_Data->MI->Open_Buffer_Continue_GoTo_Get()<0x80000000)
+                {
+                    //We do NOT use large version if we can, because some version (tested: 7.15 linux) do NOT like large version (error code 18)
+                    long File_GoTo_Long=(long)Curl_Data->MI->Open_Buffer_Continue_GoTo_Get();
+                    Code=curl_easy_setopt(Curl_Data->Curl, CURLOPT_RESUME_FROM, File_GoTo_Long);
+                }
+                else
+                {
+                    curl_off_t File_GoTo_Off=(curl_off_t)Curl_Data->MI->Open_Buffer_Continue_GoTo_Get();
+                    Code=curl_easy_setopt(Curl_Data->Curl, CURLOPT_RESUME_FROM_LARGE, File_GoTo_Off);
+                }
+                if (Code==CURLE_OK)
+                    MI->Open_Buffer_Init((int64u)-1, Curl_Data->MI->Open_Buffer_Continue_GoTo_Get());
+            }
+
+            //Parsing
+            #if MEDIAINFO_NEXTPACKET
+                if (Curl_Data->NextPacket)
+                {
+                    int running_handles=0;
+                    do
+                    {
+                        CURLMcode CodeM=curl_multi_perform(Curl_Data->CurlM, &running_handles);
+                        if (CodeM!=CURLM_OK && CodeM!=CURLM_CALL_MULTI_PERFORM)
+                            break; //There is a problem
+                        #if MEDIAINFO_DEMUX
+                            if (MI->Config.Demux_EventWasSent)
+                                return 2; //Must return immediately
+                        #endif //MEDIAINFO_DEMUX
+                        if (running_handles==0)
+                            break; //cUrl has finished
+                    }
+                    while (running_handles);
+                    if (running_handles==0 && Curl_Data->MI->Open_Buffer_Continue_GoTo_Get()==(int64u)-1)
+                        break; //cUrl has finished
+                    Result=CURLE_WRITE_ERROR; //Configuring as if classic method is used
+                }
+                else
+            #endif //MEDIAINFO_NEXTPACKET
+                Result=curl_easy_perform(Curl_Data->Curl);
+
+            if (Result!=CURLE_OK && Result!=CURLE_WRITE_ERROR)
+            {
+                #if MEDIAINFO_EVENTS
+                    Ztring MessageString;
+                    int32u MessageCode=0;
+                    MessageString.From_Local(Curl_Data->ErrorBuffer);
+                    if (MessageString.empty())
+                        MessageString.From_Local(curl_easy_strerror(Result));
+                    if (Result==CURLE_PEER_FAILED_VERIFICATION)
+                    {
+                        size_t Protocol_Limit=Curl_Data->File_Name.find(__T(":"));
+                        if (Protocol_Limit!=string::npos)
+                        {
+                            Ztring Protocol=Curl_Data->File_Name;
+                            Protocol.resize(Protocol_Limit);
+                            Protocol.MakeLowerCase();
+                            if (Protocol==__T("sftp") || Protocol==__T("scp"))
+                            {
+                                MessageString=__T("The remote server's SSH fingerprint was deemed not OK (not in your known_host file).");
+                                MessageCode=0xF1010103;
+                            }
+                            else if (Protocol==__T("https") || Protocol==__T("ftps"))
+                            {
+                                MessageString=__T("The remote server's SSL certificate was deemed not OK.");
+                                MessageCode=0xF1010104;
+                            }
+                        }
+                    }
+                    Curl_Data->ErrorBuffer[0]='\0';
+                    MediaInfoLib::Config.Log_Send(0xC0, 0xFF, MessageCode, Reader_libcurl_FileNameWithoutPassword(Curl_Data->File_Name)+__T(", ")+MessageString);
+                #endif //MEDIAINFO_EVENTS
+            }
 
-        //Parsing
-        Result=curl_easy_perform(Curl_Data.Curl);
+            #if MEDIAINFO_DEMUX
+                if (MI->Config.Demux_EventWasSent)
+                    return 2; //Must return immediately
+            #endif //MEDIAINFO_DEMUX
+
+            //Threading
+            if (MI->IsTerminating())
+                break; //Termination is requested
+        }
     }
-    while (Result==CURLE_WRITE_ERROR && Curl_Data.File_GoTo!=(int64u)-1);
 
     #ifdef MEDIAINFO_DEBUG
-        std::cout<<std::hex<<Curl_Data.File_Offset-Curl_Data.Debug_BytesRead<<" - "<<Curl_Data.File_Offset<<" : "<<std::dec<<Curl_Data.Debug_BytesRead<<" bytes"<<std::endl;
-        std::cout<<"Total: "<<std::dec<<Curl_Data.Debug_BytesRead_Total<<" bytes in "<<Curl_Data.Debug_Count<<" blocks"<<std::endl;
+        std::cout<<std::hex<<Curl_Data->File_Offset-Curl_Data->Debug_BytesRead<<" - "<<Curl_Data->File_Offset<<" : "<<std::dec<<Curl_Data->Debug_BytesRead<<" bytes"<<std::endl;
+        std::cout<<"Total: "<<std::dec<<Curl_Data->Debug_BytesRead_Total<<" bytes in "<<Curl_Data->Debug_Count<<" blocks"<<std::endl;
     #endif //MEDIAINFO_DEBUG
 
+    //Is this file detected?
+    if (!Curl_Data->Status[File__Analyze::IsAccepted])
+        return 0;
+
     MI->Open_Buffer_Finalize();
 
-    //Cleanup
-    curl_easy_cleanup(Curl_Data.Curl);
+    #if MEDIAINFO_DEMUX
+        if (MI->Config.Demux_EventWasSent)
+            return 2; //Must return immediately
+    #endif //MEDIAINFO_DEMUX
+
     return 1;
 }
 
+//---------------------------------------------------------------------------
+#if MEDIAINFO_SEEK
+size_t Reader_libcurl::Format_Test_PerParser_Seek (MediaInfo_Internal* MI, size_t Method, int64u Value, int64u ID)
+{
+    size_t ToReturn=MI->Open_Buffer_Seek(Method, Value, ID);
+
+    if (ToReturn==0 || ToReturn==1)
+    {
+        //Reset
+        Curl_Data->Status=0;
+    }
+
+    return ToReturn;
+}
+#endif //MEDIAINFO_SEEK
+
 } //NameSpace
 
 #endif //MEDIAINFO_LIBCURL_YES

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Reader/Reader_libcurl.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Reader/Reader_libcurl.h Changed

@@ -1,17 +1,17 @@
 // Reader_libcurl - All information about media files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -28,7 +28,7 @@
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
-#include "MediaInfo/MediaInfo_Internal.h"
+#include "MediaInfo/Reader/Reader__Base.h"
 //---------------------------------------------------------------------------
 
 namespace MediaInfoLib
@@ -38,12 +38,26 @@
 /// @brief Reader_libcurl
 //***************************************************************************
 
-class Reader_libcurl
+class Reader_libcurl : public Reader__Base
 {
 public :
+    //Constructor/Destructor
+    Reader_libcurl ();
+    virtual ~Reader_libcurl();
+
     //Format testing
-    static size_t Format_Test(MediaInfo_Internal* MI, const String &File_Name);
+    size_t Format_Test(MediaInfo_Internal* MI, const String &File_Name);
+    size_t Format_Test_PerParser(MediaInfo_Internal* MI, const String &File_Name);
+    size_t Format_Test_PerParser_Continue (MediaInfo_Internal* MI);
+    size_t Format_Test_PerParser_Seek (MediaInfo_Internal* MI, size_t Method, int64u Value, int64u ID);
+
+public:
+    struct curl_data;
+
+private :
+    curl_data*          Curl_Data;
 };
 
 } //NameSpace
 #endif
+

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Reader/Reader_libcurl_Include.h Added

@@ -0,0 +1,988 @@
+// Reader_libcurl - All info about media files
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_Reader_libcurl_IncludeH
+#define MediaInfo_Reader_libcurl_IncludeH
+//---------------------------------------------------------------------------
+
+//***************************************************************************
+// Copy of curl include files - Easy interface
+//***************************************************************************
+
+typedef void CURL;
+
+typedef enum {
+    CURLE_OK = 0,
+    CURLE_UNSUPPORTED_PROTOCOL,    /* 1 */
+    CURLE_FAILED_INIT,             /* 2 */
+    CURLE_URL_MALFORMAT,           /* 3 */
+    CURLE_OBSOLETE4,               /* 4 - NOT USED */
+    CURLE_COULDNT_RESOLVE_PROXY,   /* 5 */
+    CURLE_COULDNT_RESOLVE_HOST,    /* 6 */
+    CURLE_COULDNT_CONNECT,         /* 7 */
+    CURLE_FTP_WEIRD_SERVER_REPLY,  /* 8 */
+    CURLE_REMOTE_ACCESS_DENIED,    /* 9 a service was denied by the server
+                                    due to lack of access - when login fails
+                                    this is not returned. */
+    CURLE_OBSOLETE10,              /* 10 - NOT USED */
+    CURLE_FTP_WEIRD_PASS_REPLY,    /* 11 */
+    CURLE_OBSOLETE12,              /* 12 - NOT USED */
+    CURLE_FTP_WEIRD_PASV_REPLY,    /* 13 */
+    CURLE_FTP_WEIRD_227_FORMAT,    /* 14 */
+    CURLE_FTP_CANT_GET_HOST,       /* 15 */
+    CURLE_OBSOLETE16,              /* 16 - NOT USED */
+    CURLE_FTP_COULDNT_SET_TYPE,    /* 17 */
+    CURLE_PARTIAL_FILE,            /* 18 */
+    CURLE_FTP_COULDNT_RETR_FILE,   /* 19 */
+    CURLE_OBSOLETE20,              /* 20 - NOT USED */
+    CURLE_QUOTE_ERROR,             /* 21 - quote command failure */
+    CURLE_HTTP_RETURNED_ERROR,     /* 22 */
+    CURLE_WRITE_ERROR,             /* 23 */
+    CURLE_OBSOLETE24,              /* 24 - NOT USED */
+    CURLE_UPLOAD_FAILED,           /* 25 - failed upload "command" */
+    CURLE_READ_ERROR,              /* 26 - couldn't open/read from file */
+    CURLE_OUT_OF_MEMORY,           /* 27 */
+    /* Note: CURLE_OUT_OF_MEMORY may sometimes indicate a conversion error
+            instead of a memory allocation error if CURL_DOES_CONVERSIONS
+            is defined
+    */
+    CURLE_OPERATION_TIMEDOUT,      /* 28 - the timeout time was reached */
+    CURLE_OBSOLETE29,              /* 29 - NOT USED */
+    CURLE_FTP_PORT_FAILED,         /* 30 - FTP PORT operation failed */
+    CURLE_FTP_COULDNT_USE_REST,    /* 31 - the REST command failed */
+    CURLE_OBSOLETE32,              /* 32 - NOT USED */
+    CURLE_RANGE_ERROR,             /* 33 - RANGE "command" didn't work */
+    CURLE_HTTP_POST_ERROR,         /* 34 */
+    CURLE_SSL_CONNECT_ERROR,       /* 35 - wrong when connecting with SSL */
+    CURLE_BAD_DOWNLOAD_RESUME,     /* 36 - couldn't resume download */
+    CURLE_FILE_COULDNT_READ_FILE,  /* 37 */
+    CURLE_LDAP_CANNOT_BIND,        /* 38 */
+    CURLE_LDAP_SEARCH_FAILED,      /* 39 */
+    CURLE_OBSOLETE40,              /* 40 - NOT USED */
+    CURLE_FUNCTION_NOT_FOUND,      /* 41 */
+    CURLE_ABORTED_BY_CALLBACK,     /* 42 */
+    CURLE_BAD_FUNCTION_ARGUMENT,   /* 43 */
+    CURLE_OBSOLETE44,              /* 44 - NOT USED */
+    CURLE_INTERFACE_FAILED,        /* 45 - CURLOPT_INTERFACE failed */
+    CURLE_OBSOLETE46,              /* 46 - NOT USED */
+    CURLE_TOO_MANY_REDIRECTS ,     /* 47 - catch endless re-direct loops */
+    CURLE_UNKNOWN_TELNET_OPTION,   /* 48 - User specified an unknown option */
+    CURLE_TELNET_OPTION_SYNTAX ,   /* 49 - Malformed telnet option */
+    CURLE_OBSOLETE50,              /* 50 - NOT USED */
+    CURLE_PEER_FAILED_VERIFICATION, /* 51 - peer's certificate or fingerprint
+                                        wasn't verified fine */
+    CURLE_GOT_NOTHING,             /* 52 - when this is a specific error */
+    CURLE_SSL_ENGINE_NOTFOUND,     /* 53 - SSL crypto engine not found */
+    CURLE_SSL_ENGINE_SETFAILED,    /* 54 - can not set SSL crypto engine as
+                                    default */
+    CURLE_SEND_ERROR,              /* 55 - failed sending network data */
+    CURLE_RECV_ERROR,              /* 56 - failure in receiving network data */
+    CURLE_OBSOLETE57,              /* 57 - NOT IN USE */
+    CURLE_SSL_CERTPROBLEM,         /* 58 - problem with the local certificate */
+    CURLE_SSL_CIPHER,              /* 59 - couldn't use specified cipher */
+    CURLE_SSL_CACERT,              /* 60 - problem with the CA cert (path?) */
+    CURLE_BAD_CONTENT_ENCODING,    /* 61 - Unrecognized transfer encoding */
+    CURLE_LDAP_INVALID_URL,        /* 62 - Invalid LDAP URL */
+    CURLE_FILESIZE_EXCEEDED,       /* 63 - Maximum file size exceeded */
+    CURLE_USE_SSL_FAILED,          /* 64 - Requested FTP SSL level failed */
+    CURLE_SEND_FAIL_REWIND,        /* 65 - Sending the data requires a rewind
+                                    that failed */
+    CURLE_SSL_ENGINE_INITFAILED,   /* 66 - failed to initialise ENGINE */
+    CURLE_LOGIN_DENIED,            /* 67 - user, password or similar was not
+                                    accepted and we failed to login */
+    CURLE_TFTP_NOTFOUND,           /* 68 - file not found on server */
+    CURLE_TFTP_PERM,               /* 69 - permission problem on server */
+    CURLE_REMOTE_DISK_FULL,        /* 70 - out of disk space on server */
+    CURLE_TFTP_ILLEGAL,            /* 71 - Illegal TFTP operation */
+    CURLE_TFTP_UNKNOWNID,          /* 72 - Unknown transfer ID */
+    CURLE_REMOTE_FILE_EXISTS,      /* 73 - File already exists */
+    CURLE_TFTP_NOSUCHUSER,         /* 74 - No such user */
+    CURLE_CONV_FAILED,             /* 75 - conversion failed */
+    CURLE_CONV_REQD,               /* 76 - caller must register conversion
+                                    callbacks using curl_easy_setopt options
+                                    CURLOPT_CONV_FROM_NETWORK_FUNCTION,
+                                    CURLOPT_CONV_TO_NETWORK_FUNCTION, and
+                                    CURLOPT_CONV_FROM_UTF8_FUNCTION */
+    CURLE_SSL_CACERT_BADFILE,      /* 77 - could not load CACERT file, missing
+                                    or wrong format */
+    CURLE_REMOTE_FILE_NOT_FOUND,   /* 78 - remote file not found */
+    CURLE_SSH,                     /* 79 - error from the SSH layer, somewhat
+                                    generic so the error message will be of
+                                    interest when this has happened */
+
+    CURLE_SSL_SHUTDOWN_FAILED,     /* 80 - Failed to shut down the SSL
+                                    connection */
+    CURLE_AGAIN,                   /* 81 - socket is not ready for send/recv,
+                                    wait till it's ready and try again (Added
+                                    in 7.18.2) */
+    CURLE_SSL_CRL_BADFILE,         /* 82 - could not load CRL file, missing or
+                                    wrong format (Added in 7.19.0) */
+    CURLE_SSL_ISSUER_ERROR,        /* 83 - Issuer check failed.  (Added in
+                                    7.19.0) */
+    CURL_LAST /* never use! */
+} CURLcode;
+
+#define CURLINFO_STRING   0x100000
+#define CURLINFO_LONG     0x200000
+#define CURLINFO_DOUBLE   0x300000
+#define CURLINFO_SLIST    0x400000
+#define CURLINFO_MASK     0x0fffff
+#define CURLINFO_TYPEMASK 0xf00000
+
+typedef enum {
+    CURLINFO_NONE, /* first, never use this */
+    CURLINFO_EFFECTIVE_URL    = CURLINFO_STRING + 1,
+    CURLINFO_RESPONSE_CODE    = CURLINFO_LONG   + 2,
+    CURLINFO_TOTAL_TIME       = CURLINFO_DOUBLE + 3,
+    CURLINFO_NAMELOOKUP_TIME  = CURLINFO_DOUBLE + 4,
+    CURLINFO_CONNECT_TIME     = CURLINFO_DOUBLE + 5,
+    CURLINFO_PRETRANSFER_TIME = CURLINFO_DOUBLE + 6,
+    CURLINFO_SIZE_UPLOAD      = CURLINFO_DOUBLE + 7,
+    CURLINFO_SIZE_DOWNLOAD    = CURLINFO_DOUBLE + 8,
+    CURLINFO_SPEED_DOWNLOAD   = CURLINFO_DOUBLE + 9,
+    CURLINFO_SPEED_UPLOAD     = CURLINFO_DOUBLE + 10,
+    CURLINFO_HEADER_SIZE      = CURLINFO_LONG   + 11,
+    CURLINFO_REQUEST_SIZE     = CURLINFO_LONG   + 12,
+    CURLINFO_SSL_VERIFYRESULT = CURLINFO_LONG   + 13,
+    CURLINFO_FILETIME         = CURLINFO_LONG   + 14,
+    CURLINFO_CONTENT_LENGTH_DOWNLOAD   = CURLINFO_DOUBLE + 15,
+    CURLINFO_CONTENT_LENGTH_UPLOAD     = CURLINFO_DOUBLE + 16,
+    CURLINFO_STARTTRANSFER_TIME = CURLINFO_DOUBLE + 17,
+    CURLINFO_CONTENT_TYPE     = CURLINFO_STRING + 18,
+    CURLINFO_REDIRECT_TIME    = CURLINFO_DOUBLE + 19,
+    CURLINFO_REDIRECT_COUNT   = CURLINFO_LONG   + 20,
+    CURLINFO_PRIVATE          = CURLINFO_STRING + 21,
+    CURLINFO_HTTP_CONNECTCODE = CURLINFO_LONG   + 22,
+    CURLINFO_HTTPAUTH_AVAIL   = CURLINFO_LONG   + 23,
+    CURLINFO_PROXYAUTH_AVAIL  = CURLINFO_LONG   + 24,
+    CURLINFO_OS_ERRNO         = CURLINFO_LONG   + 25,
+    CURLINFO_NUM_CONNECTS     = CURLINFO_LONG   + 26,
+    CURLINFO_SSL_ENGINES      = CURLINFO_SLIST  + 27,
+    CURLINFO_COOKIELIST       = CURLINFO_SLIST  + 28,
+    CURLINFO_LASTSOCKET       = CURLINFO_LONG   + 29,
+    CURLINFO_FTP_ENTRY_PATH   = CURLINFO_STRING + 30,
+    CURLINFO_REDIRECT_URL     = CURLINFO_STRING + 31,
+    CURLINFO_PRIMARY_IP       = CURLINFO_STRING + 32,
+    CURLINFO_APPCONNECT_TIME  = CURLINFO_DOUBLE + 33,
+    CURLINFO_CERTINFO         = CURLINFO_SLIST  + 34,
+    CURLINFO_CONDITION_UNMET  = CURLINFO_LONG   + 35,
+    /* Fill in new entries below here! */
+
+    CURLINFO_LASTONE          = 35
+} CURLINFO;
+
+/* CURLPROTO_ defines are for the CURLOPT_*PROTOCOLS options */
+#define CURLPROTO_HTTP   (1<<0)
+#define CURLPROTO_HTTPS  (1<<1)
+#define CURLPROTO_FTP    (1<<2)
+#define CURLPROTO_FTPS   (1<<3)
+#define CURLPROTO_SCP    (1<<4)
+#define CURLPROTO_SFTP   (1<<5)
+#define CURLPROTO_TELNET (1<<6)
+#define CURLPROTO_LDAP   (1<<7)
+#define CURLPROTO_LDAPS  (1<<8)
+#define CURLPROTO_DICT   (1<<9)
+#define CURLPROTO_FILE   (1<<10)
+#define CURLPROTO_TFTP   (1<<11)
+#define CURLPROTO_ALL    (~0) /* enable everything */
+
+/* long may be 32 or 64 bits, but we should never depend on anything else
+    but 32 */
+#define CURLOPTTYPE_LONG          0
+#define CURLOPTTYPE_OBJECTPOINT   10000
+#define CURLOPTTYPE_FUNCTIONPOINT 20000
+#define CURLOPTTYPE_OFF_T         30000
+
+#define CINIT(name,type,number) CURLOPT_ ## name = CURLOPTTYPE_ ## type + number
+
+/*
+    * This macro-mania below setups the CURLOPT_[what] enum, to be used with
+    * curl_easy_setopt(). The first argument in the CINIT() macro is the [what]
+    * word.
+    */
+
+typedef enum {
+    /* This is the FILE * or void * the regular output should be written to. */
+    CINIT(FILE, OBJECTPOINT, 1),
+
+    /* The full URL to get/put */
+    CINIT(URL,  OBJECTPOINT, 2),
+
+    /* Port number to connect to, if other than default. */
+    CINIT(PORT, LONG, 3),
+
+    /* Name of proxy to use. */
+    CINIT(PROXY, OBJECTPOINT, 4),
+
+    /* "name:password" to use when fetching. */
+    CINIT(USERPWD, OBJECTPOINT, 5),
+
+    /* "name:password" to use with proxy. */
+    CINIT(PROXYUSERPWD, OBJECTPOINT, 6),
+
+    /* Range to get, specified as an ASCII string. */
+    CINIT(RANGE, OBJECTPOINT, 7),
+
+    /* not used */
+
+    /* Specified file stream to upload from (use as input): */
+    CINIT(INFILE, OBJECTPOINT, 9),
+
+    /* Buffer to receive error messages in, must be at least CURL_ERROR_SIZE
+    * bytes big. If this is not used, error messages go to stderr instead: */
+    CINIT(ERRORBUFFER, OBJECTPOINT, 10),
+
+    /* Function that will be called to store the output (instead of fwrite). The
+    * parameters will use fwrite() syntax, make sure to follow them. */
+    CINIT(WRITEFUNCTION, FUNCTIONPOINT, 11),
+
+    /* Function that will be called to read the input (instead of fread). The
+    * parameters will use fread() syntax, make sure to follow them. */
+    CINIT(READFUNCTION, FUNCTIONPOINT, 12),
+
+    /* Time-out the read operation after this amount of seconds */
+    CINIT(TIMEOUT, LONG, 13),
+
+    /* If the CURLOPT_INFILE is used, this can be used to inform libcurl about
+    * how large the file being sent really is. That allows better error
+    * checking and better verifies that the upload was successful. -1 means
+    * unknown size.
+    *
+    * For large file support, there is also a _LARGE version of the key
+    * which takes an off_t type, allowing platforms with larger off_t
+    * sizes to handle larger files.  See below for INFILESIZE_LARGE.
+    */
+    CINIT(INFILESIZE, LONG, 14),
+
+    /* POST static input fields. */
+    CINIT(POSTFIELDS, OBJECTPOINT, 15),
+
+    /* Set the referrer page (needed by some CGIs) */
+    CINIT(REFERER, OBJECTPOINT, 16),
+
+    /* Set the FTP PORT string (interface name, named or numerical IP address)
+        Use i.e '-' to use default address. */
+    CINIT(FTPPORT, OBJECTPOINT, 17),
+
+    /* Set the User-Agent string (examined by some CGIs) */
+    CINIT(USERAGENT, OBJECTPOINT, 18),
+
+    /* If the download receives less than "low speed limit" bytes/second
+    * during "low speed time" seconds, the operations is aborted.
+    * You could i.e if you have a pretty high speed connection, abort if
+    * it is less than 2000 bytes/sec during 20 seconds.
+    */
+
+    /* Set the "low speed limit" */
+    CINIT(LOW_SPEED_LIMIT, LONG, 19),
+
+    /* Set the "low speed time" */
+    CINIT(LOW_SPEED_TIME, LONG, 20),
+
+    /* Set the continuation offset.
+    *
+    * Note there is also a _LARGE version of this key which uses
+    * off_t types, allowing for large file offsets on platforms which
+    * use larger-than-32-bit off_t's.  Look below for RESUME_FROM_LARGE.
+    */
+    CINIT(RESUME_FROM, LONG, 21),
+
+    /* Set cookie in request: */
+    CINIT(COOKIE, OBJECTPOINT, 22),
+
+    /* This points to a linked list of headers, struct curl_slist kind */
+    CINIT(HTTPHEADER, OBJECTPOINT, 23),
+
+    /* This points to a linked list of post entries, struct curl_httppost */
+    CINIT(HTTPPOST, OBJECTPOINT, 24),
+
+    /* name of the file keeping your private SSL-certificate */
+    CINIT(SSLCERT, OBJECTPOINT, 25),
+
+    /* password for the SSL or SSH private key */
+    CINIT(KEYPASSWD, OBJECTPOINT, 26),
+
+    /* send TYPE parameter? */
+    CINIT(CRLF, LONG, 27),
+
+    /* send linked-list of QUOTE commands */
+    CINIT(QUOTE, OBJECTPOINT, 28),
+
+    /* send FILE * or void * to store headers to, if you use a callback it
+        is simply passed to the callback unmodified */
+    CINIT(WRITEHEADER, OBJECTPOINT, 29),
+
+    /* point to a file to read the initial cookies from, also enables
+        "cookie awareness" */
+    CINIT(COOKIEFILE, OBJECTPOINT, 31),
+
+    /* What version to specifically try to use.
+        See CURL_SSLVERSION defines below. */
+    CINIT(SSLVERSION, LONG, 32),
+
+    /* What kind of HTTP time condition to use, see defines */
+    CINIT(TIMECONDITION, LONG, 33),
+
+    /* Time to use with the above condition. Specified in number of seconds
+        since 1 Jan 1970 */
+    CINIT(TIMEVALUE, LONG, 34),
+
+    /* 35 = OBSOLETE */
+
+    /* Custom request, for customizing the get command like
+        HTTP: DELETE, TRACE and others
+        FTP: to use a different list command
+        */
+    CINIT(CUSTOMREQUEST, OBJECTPOINT, 36),
+
+    /* HTTP request, for odd commands like DELETE, TRACE and others */
+    CINIT(STDERR, OBJECTPOINT, 37),
+
+    /* 38 is not used */
+
+    /* send linked-list of post-transfer QUOTE commands */
+    CINIT(POSTQUOTE, OBJECTPOINT, 39),
+
+    /* Pass a pointer to string of the output using full variable-replacement
+        as described elsewhere. */
+    CINIT(WRITEINFO, OBJECTPOINT, 40),
+
+    CINIT(VERBOSE, LONG, 41),      /* talk a lot */
+    CINIT(HEADER, LONG, 42),       /* throw the header out too */
+    CINIT(NOPROGRESS, LONG, 43),   /* shut off the progress meter */
+    CINIT(NOBODY, LONG, 44),       /* use HEAD to get http document */
+    CINIT(FAILONERROR, LONG, 45),  /* no output on http error codes >= 300 */
+    CINIT(UPLOAD, LONG, 46),       /* this is an upload */
+    CINIT(POST, LONG, 47),         /* HTTP POST method */
+    CINIT(DIRLISTONLY, LONG, 48),  /* return bare names when listing directories */
+
+    CINIT(APPEND, LONG, 50),       /* Append instead of overwrite on upload! */
+
+    /* Specify whether to read the user+password from the .netrc or the URL.
+    * This must be one of the CURL_NETRC_* enums below. */
+    CINIT(NETRC, LONG, 51),
+
+    CINIT(FOLLOWLOCATION, LONG, 52),  /* use Location: Luke! */
+
+    CINIT(TRANSFERTEXT, LONG, 53), /* transfer data in text/ASCII format */
+    CINIT(PUT, LONG, 54),          /* HTTP PUT */
+
+    /* 55 = OBSOLETE */
+
+    /* Function that will be called instead of the internal progress display
+    * function. This function should be defined as the curl_progress_callback
+    * prototype defines. */
+    CINIT(PROGRESSFUNCTION, FUNCTIONPOINT, 56),
+
+    /* Data passed to the progress callback */
+    CINIT(PROGRESSDATA, OBJECTPOINT, 57),
+
+    /* We want the referrer field set automatically when following locations */
+    CINIT(AUTOREFERER, LONG, 58),
+
+    /* Port of the proxy, can be set in the proxy string as well with:
+        "[host]:[port]" */
+    CINIT(PROXYPORT, LONG, 59),
+
+    /* size of the POST input data, if strlen() is not good to use */
+    CINIT(POSTFIELDSIZE, LONG, 60),
+
+    /* tunnel non-http operations through a HTTP proxy */
+    CINIT(HTTPPROXYTUNNEL, LONG, 61),
+
+    /* Set the interface string to use as outgoing network interface */
+    CINIT(INTERFACE, OBJECTPOINT, 62),
+
+    /* Set the krb4/5 security level, this also enables krb4/5 awareness.  This
+    * is a string, 'clear', 'safe', 'confidential' or 'private'.  If the string
+    * is set but doesn't match one of these, 'private' will be used.  */
+    CINIT(KRBLEVEL, OBJECTPOINT, 63),
+
+    /* Set if we should verify the peer in ssl handshake, set 1 to verify. */
+    CINIT(SSL_VERIFYPEER, LONG, 64),
+
+    /* The CApath or CAfile used to validate the peer certificate
+        this option is used only if SSL_VERIFYPEER is true */
+    CINIT(CAINFO, OBJECTPOINT, 65),
+
+    /* 66 = OBSOLETE */
+    /* 67 = OBSOLETE */
+
+    /* Maximum number of http redirects to follow */
+    CINIT(MAXREDIRS, LONG, 68),
+
+    /* Pass a long set to 1 to get the date of the requested document (if
+        possible)! Pass a zero to shut it off. */
+    CINIT(FILETIME, LONG, 69),
+
+    /* This points to a linked list of telnet options */
+    CINIT(TELNETOPTIONS, OBJECTPOINT, 70),
+
+    /* Max amount of cached alive connections */
+    CINIT(MAXCONNECTS, LONG, 71),
+
+    /* What policy to use when closing connections when the cache is filled
+        up */
+    CINIT(CLOSEPOLICY, LONG, 72),
+
+    /* 73 = OBSOLETE */
+
+    /* Set to explicitly use a new connection for the upcoming transfer.
+        Do not use this unless you're absolutely sure of this, as it makes the
+        operation slower and is less friendly for the network. */
+    CINIT(FRESH_CONNECT, LONG, 74),
+
+    /* Set to explicitly forbid the upcoming transfer's connection to be re-used
+        when done. Do not use this unless you're absolutely sure of this, as it
+        makes the operation slower and is less friendly for the network. */
+    CINIT(FORBID_REUSE, LONG, 75),
+
+    /* Set to a file name that contains random data for libcurl to use to
+        seed the random engine when doing SSL connects. */
+    CINIT(RANDOM_FILE, OBJECTPOINT, 76),
+
+    /* Set to the Entropy Gathering Daemon socket pathname */
+    CINIT(EGDSOCKET, OBJECTPOINT, 77),
+
+    /* Time-out connect operations after this amount of seconds, if connects
+        are OK within this time, then fine... This only aborts the connect
+        phase. [Only works on unix-style/SIGALRM operating systems] */
+    CINIT(CONNECTTIMEOUT, LONG, 78),
+
+    /* Function that will be called to store headers (instead of fwrite). The
+    * parameters will use fwrite() syntax, make sure to follow them. */
+    CINIT(HEADERFUNCTION, FUNCTIONPOINT, 79),
+
+    /* Set this to force the HTTP request to get back to GET. Only really usable
+        if POST, PUT or a custom request have been used first.
+    */
+    CINIT(HTTPGET, LONG, 80),
+
+    /* Set if we should verify the Common name from the peer certificate in ssl
+    * handshake, set 1 to check existence, 2 to ensure that it matches the
+    * provided hostname. */
+    CINIT(SSL_VERIFYHOST, LONG, 81),
+
+    /* Specify which file name to write all known cookies in after completed
+        operation. Set file name to "-" (dash) to make it go to stdout. */
+    CINIT(COOKIEJAR, OBJECTPOINT, 82),
+
+    /* Specify which SSL ciphers to use */
+    CINIT(SSL_CIPHER_LIST, OBJECTPOINT, 83),
+
+    /* Specify which HTTP version to use! This must be set to one of the
+        CURL_HTTP_VERSION* enums set below. */
+    CINIT(HTTP_VERSION, LONG, 84),
+
+    /* Specifically switch on or off the FTP engine's use of the EPSV command. By
+        default, that one will always be attempted before the more traditional
+        PASV command. */
+    CINIT(FTP_USE_EPSV, LONG, 85),
+
+    /* type of the file keeping your SSL-certificate ("DER", "PEM", "ENG") */
+    CINIT(SSLCERTTYPE, OBJECTPOINT, 86),
+
+    /* name of the file keeping your private SSL-key */
+    CINIT(SSLKEY, OBJECTPOINT, 87),
+
+    /* type of the file keeping your private SSL-key ("DER", "PEM", "ENG") */
+    CINIT(SSLKEYTYPE, OBJECTPOINT, 88),
+
+    /* crypto engine for the SSL-sub system */
+    CINIT(SSLENGINE, OBJECTPOINT, 89),
+
+    /* set the crypto engine for the SSL-sub system as default
+        the param has no meaning...
+    */
+    CINIT(SSLENGINE_DEFAULT, LONG, 90),
+
+    /* Non-zero value means to use the global dns cache */
+    CINIT(DNS_USE_GLOBAL_CACHE, LONG, 91), /* To become OBSOLETE soon */
+
+    /* DNS cache timeout */
+    CINIT(DNS_CACHE_TIMEOUT, LONG, 92),
+
+    /* send linked-list of pre-transfer QUOTE commands */
+    CINIT(PREQUOTE, OBJECTPOINT, 93),
+
+    /* set the debug function */
+    CINIT(DEBUGFUNCTION, FUNCTIONPOINT, 94),
+
+    /* set the data for the debug function */
+    CINIT(DEBUGDATA, OBJECTPOINT, 95),
+
+    /* mark this as start of a cookie session */
+    CINIT(COOKIESESSION, LONG, 96),
+
+    /* The CApath directory used to validate the peer certificate
+        this option is used only if SSL_VERIFYPEER is true */
+    CINIT(CAPATH, OBJECTPOINT, 97),
+
+    /* Instruct libcurl to use a smaller receive buffer */
+    CINIT(BUFFERSIZE, LONG, 98),
+
+    /* Instruct libcurl to not use any signal/alarm handlers, even when using
+        timeouts. This option is useful for multi-threaded applications.
+        See libcurl-the-guide for more background information. */
+    CINIT(NOSIGNAL, LONG, 99),
+
+    /* Provide a CURLShare for mutexing non-ts data */
+    CINIT(SHARE, OBJECTPOINT, 100),
+
+    /* indicates type of proxy. accepted values are CURLPROXY_HTTP (default),
+        CURLPROXY_SOCKS4, CURLPROXY_SOCKS4A and CURLPROXY_SOCKS5. */
+    CINIT(PROXYTYPE, LONG, 101),
+
+    /* Set the Accept-Encoding string. Use this to tell a server you would like
+        the response to be compressed. */
+    CINIT(ENCODING, OBJECTPOINT, 102),
+
+    /* Set pointer to private data */
+    CINIT(PRIVATE, OBJECTPOINT, 103),
+
+    /* Set aliases for HTTP 200 in the HTTP Response header */
+    CINIT(HTTP200ALIASES, OBJECTPOINT, 104),
+
+    /* Continue to send authentication (user+password) when following locations,
+        even when hostname changed. This can potentially send off the name
+        and password to whatever host the server decides. */
+    CINIT(UNRESTRICTED_AUTH, LONG, 105),
+
+    /* Specifically switch on or off the FTP engine's use of the EPRT command ( it
+        also disables the LPRT attempt). By default, those ones will always be
+        attempted before the good old traditional PORT command. */
+    CINIT(FTP_USE_EPRT, LONG, 106),
+
+    /* Set this to a bitmask value to enable the particular authentications
+        methods you like. Use this in combination with CURLOPT_USERPWD.
+        Note that setting multiple bits may cause extra network round-trips. */
+    CINIT(HTTPAUTH, LONG, 107),
+
+    /* Set the ssl context callback function, currently only for OpenSSL ssl_ctx
+        in second argument. The function must be matching the
+        curl_ssl_ctx_callback proto. */
+    CINIT(SSL_CTX_FUNCTION, FUNCTIONPOINT, 108),
+
+    /* Set the userdata for the ssl context callback function's third
+        argument */
+    CINIT(SSL_CTX_DATA, OBJECTPOINT, 109),
+
+    /* FTP Option that causes missing dirs to be created on the remote server.
+        In 7.19.4 we introduced the convenience enums for this option using the
+        CURLFTP_CREATE_DIR prefix.
+    */
+    CINIT(FTP_CREATE_MISSING_DIRS, LONG, 110),
+
+    /* Set this to a bitmask value to enable the particular authentications
+        methods you like. Use this in combination with CURLOPT_PROXYUSERPWD.
+        Note that setting multiple bits may cause extra network round-trips. */
+    CINIT(PROXYAUTH, LONG, 111),
+
+    /* FTP option that changes the timeout, in seconds, associated with
+        getting a response.  This is different from transfer timeout time and
+        essentially places a demand on the FTP server to acknowledge commands
+        in a timely manner. */
+    CINIT(FTP_RESPONSE_TIMEOUT, LONG, 112),
+
+    /* Set this option to one of the CURL_IPRESOLVE_* defines (see below) to
+        tell libcurl to resolve names to those IP versions only. This only has
+        affect on systems with support for more than one, i.e IPv4 _and_ IPv6. */
+    CINIT(IPRESOLVE, LONG, 113),
+
+    /* Set this option to limit the size of a file that will be downloaded from
+        an HTTP or FTP server.
+
+        Note there is also _LARGE version which adds large file support for
+        platforms which have larger off_t sizes.  See MAXFILESIZE_LARGE below. */
+    CINIT(MAXFILESIZE, LONG, 114),
+
+    /* See the comment for INFILESIZE above, but in short, specifies
+    * the size of the file being uploaded.  -1 means unknown.
+    */
+    CINIT(INFILESIZE_LARGE, OFF_T, 115),
+
+    /* Sets the continuation offset.  There is also a LONG version of this;
+    * look above for RESUME_FROM.
+    */
+    CINIT(RESUME_FROM_LARGE, OFF_T, 116),
+
+    /* Sets the maximum size of data that will be downloaded from
+    * an HTTP or FTP server.  See MAXFILESIZE above for the LONG version.
+    */
+    CINIT(MAXFILESIZE_LARGE, OFF_T, 117),
+
+    /* Set this option to the file name of your .netrc file you want libcurl
+        to parse (using the CURLOPT_NETRC option). If not set, libcurl will do
+        a poor attempt to find the user's home directory and check for a .netrc
+        file in there. */
+    CINIT(NETRC_FILE, OBJECTPOINT, 118),
+
+    /* Enable SSL/TLS for FTP, pick one of:
+        CURLFTPSSL_TRY     - try using SSL, proceed anyway otherwise
+        CURLFTPSSL_CONTROL - SSL for the control connection or fail
+        CURLFTPSSL_ALL     - SSL for all communication or fail
+    */
+    CINIT(USE_SSL, LONG, 119),
+
+    /* The _LARGE version of the standard POSTFIELDSIZE option */
+    CINIT(POSTFIELDSIZE_LARGE, OFF_T, 120),
+
+    /* Enable/disable the TCP Nagle algorithm */
+    CINIT(TCP_NODELAY, LONG, 121),
+
+    /* 122 OBSOLETE, used in 7.12.3. Gone in 7.13.0 */
+    /* 123 OBSOLETE. Gone in 7.16.0 */
+    /* 124 OBSOLETE, used in 7.12.3. Gone in 7.13.0 */
+    /* 125 OBSOLETE, used in 7.12.3. Gone in 7.13.0 */
+    /* 126 OBSOLETE, used in 7.12.3. Gone in 7.13.0 */
+    /* 127 OBSOLETE. Gone in 7.16.0 */
+    /* 128 OBSOLETE. Gone in 7.16.0 */
+
+    /* When FTP over SSL/TLS is selected (with CURLOPT_USE_SSL), this option
+        can be used to change libcurl's default action which is to first try
+        "AUTH SSL" and then "AUTH TLS" in this order, and proceed when a OK
+        response has been received.
+
+        Available parameters are:
+        CURLFTPAUTH_DEFAULT - let libcurl decide
+        CURLFTPAUTH_SSL     - try "AUTH SSL" first, then TLS
+        CURLFTPAUTH_TLS     - try "AUTH TLS" first, then SSL
+    */
+    CINIT(FTPSSLAUTH, LONG, 129),
+
+    CINIT(IOCTLFUNCTION, FUNCTIONPOINT, 130),
+    CINIT(IOCTLDATA, OBJECTPOINT, 131),
+
+    /* 132 OBSOLETE. Gone in 7.16.0 */
+    /* 133 OBSOLETE. Gone in 7.16.0 */
+
+    /* zero terminated string for pass on to the FTP server when asked for
+        "account" info */
+    CINIT(FTP_ACCOUNT, OBJECTPOINT, 134),
+
+    /* feed cookies into cookie engine */
+    CINIT(COOKIELIST, OBJECTPOINT, 135),
+
+    /* ignore Content-Length */
+    CINIT(IGNORE_CONTENT_LENGTH, LONG, 136),
+
+    /* Set to non-zero to skip the IP address received in a 227 PASV FTP server
+        response. Typically used for FTP-SSL purposes but is not restricted to
+        that. libcurl will then instead use the same IP address it used for the
+        control connection. */
+    CINIT(FTP_SKIP_PASV_IP, LONG, 137),
+
+    /* Select "file method" to use when doing FTP, see the curl_ftpmethod
+        above. */
+    CINIT(FTP_FILEMETHOD, LONG, 138),
+
+    /* Local port number to bind the socket to */
+    CINIT(LOCALPORT, LONG, 139),
+
+    /* Number of ports to try, including the first one set with LOCALPORT.
+        Thus, setting it to 1 will make no additional attempts but the first.
+    */
+    CINIT(LOCALPORTRANGE, LONG, 140),
+
+    /* no transfer, set up connection and let application use the socket by
+        extracting it with CURLINFO_LASTSOCKET */
+    CINIT(CONNECT_ONLY, LONG, 141),
+
+    /* Function that will be called to convert from the
+        network encoding (instead of using the iconv calls in libcurl) */
+    CINIT(CONV_FROM_NETWORK_FUNCTION, FUNCTIONPOINT, 142),
+
+    /* Function that will be called to convert to the
+        network encoding (instead of using the iconv calls in libcurl) */
+    CINIT(CONV_TO_NETWORK_FUNCTION, FUNCTIONPOINT, 143),
+
+    /* Function that will be called to convert from UTF8
+        (instead of using the iconv calls in libcurl)
+        Note that this is used only for SSL certificate processing */
+    CINIT(CONV_FROM_UTF8_FUNCTION, FUNCTIONPOINT, 144),
+
+    /* if the connection proceeds too quickly then need to slow it down */
+    /* limit-rate: maximum number of bytes per second to send or receive */
+    CINIT(MAX_SEND_SPEED_LARGE, OFF_T, 145),
+    CINIT(MAX_RECV_SPEED_LARGE, OFF_T, 146),
+
+    /* Pointer to command string to send if USER/PASS fails. */
+    CINIT(FTP_ALTERNATIVE_TO_USER, OBJECTPOINT, 147),
+
+    /* callback function for setting socket options */
+    CINIT(SOCKOPTFUNCTION, FUNCTIONPOINT, 148),
+    CINIT(SOCKOPTDATA, OBJECTPOINT, 149),
+
+    /* set to 0 to disable session ID re-use for this transfer, default is
+        enabled (== 1) */
+    CINIT(SSL_SESSIONID_CACHE, LONG, 150),
+
+    /* allowed SSH authentication methods */
+    CINIT(SSH_AUTH_TYPES, LONG, 151),
+
+    /* Used by scp/sftp to do public/private key authentication */
+    CINIT(SSH_PUBLIC_KEYFILE, OBJECTPOINT, 152),
+    CINIT(SSH_PRIVATE_KEYFILE, OBJECTPOINT, 153),
+
+    /* Send CCC (Clear Command Channel) after authentication */
+    CINIT(FTP_SSL_CCC, LONG, 154),
+
+    /* Same as TIMEOUT and CONNECTTIMEOUT, but with ms resolution */
+    CINIT(TIMEOUT_MS, LONG, 155),
+    CINIT(CONNECTTIMEOUT_MS, LONG, 156),
+
+    /* set to zero to disable the libcurl's decoding and thus pass the raw body
+        data to the application even when it is encoded/compressed */
+    CINIT(HTTP_TRANSFER_DECODING, LONG, 157),
+    CINIT(HTTP_CONTENT_DECODING, LONG, 158),
+
+    /* Permission used when creating new files and directories on the remote
+        server for protocols that support it, SFTP/SCP/FILE */
+    CINIT(NEW_FILE_PERMS, LONG, 159),
+    CINIT(NEW_DIRECTORY_PERMS, LONG, 160),
+
+    /* Set the behaviour of POST when redirecting. Values must be set to one
+        of CURL_REDIR* defines below. This used to be called CURLOPT_POST301 */
+    CINIT(POSTREDIR, LONG, 161),
+
+    /* used by scp/sftp to verify the host's public key */
+    CINIT(SSH_HOST_PUBLIC_KEY_MD5, OBJECTPOINT, 162),
+
+    /* Callback function for opening socket (instead of socket(2)). Optionally,
+        callback is able change the address or refuse to connect returning
+        CURL_SOCKET_BAD.  The callback should have type
+        curl_opensocket_callback */
+    CINIT(OPENSOCKETFUNCTION, FUNCTIONPOINT, 163),
+    CINIT(OPENSOCKETDATA, OBJECTPOINT, 164),
+
+    /* POST volatile input fields. */
+    CINIT(COPYPOSTFIELDS, OBJECTPOINT, 165),
+
+    /* set transfer mode (;type=<a|i>) when doing FTP via an HTTP proxy */
+    CINIT(PROXY_TRANSFER_MODE, LONG, 166),
+
+    /* Callback function for seeking in the input stream */
+    CINIT(SEEKFUNCTION, FUNCTIONPOINT, 167),
+    CINIT(SEEKDATA, OBJECTPOINT, 168),
+
+    /* CRL file */
+    CINIT(CRLFILE, OBJECTPOINT, 169),
+
+    /* Issuer certificate */
+    CINIT(ISSUERCERT, OBJECTPOINT, 170),
+
+    /* (IPv6) Address scope */
+    CINIT(ADDRESS_SCOPE, LONG, 171),
+
+    /* Collect certificate chain info and allow it to get retrievable with
+        CURLINFO_CERTINFO after the transfer is complete. (Unfortunately) only
+        working with OpenSSL-powered builds. */
+    CINIT(CERTINFO, LONG, 172),
+
+    /* "name" and "pwd" to use when fetching. */
+    CINIT(USERNAME, OBJECTPOINT, 173),
+    CINIT(PASSWORD, OBJECTPOINT, 174),
+
+    /* "name" and "pwd" to use with Proxy when fetching. */
+    CINIT(PROXYUSERNAME, OBJECTPOINT, 175),
+    CINIT(PROXYPASSWORD, OBJECTPOINT, 176),
+
+    /* Comma separated list of hostnames defining no-proxy zones. These should
+        match both hostnames directly, and hostnames within a domain. For
+        example, local.com will match local.com and www.local.com, but NOT
+        notlocal.com or www.notlocal.com. For compatibility with other
+        implementations of this, .local.com will be considered to be the same as
+        local.com. A single * is the only valid wildcard, and effectively
+        disables the use of proxy. */
+    CINIT(NOPROXY, OBJECTPOINT, 177),
+
+    /* block size for TFTP transfers */
+    CINIT(TFTP_BLKSIZE, LONG, 178),
+
+    /* Socks Service */
+    CINIT(SOCKS5_GSSAPI_SERVICE, OBJECTPOINT, 179),
+
+    /* Socks Service */
+    CINIT(SOCKS5_GSSAPI_NEC, LONG, 180),
+
+    /* set the bitmask for the protocols that are allowed to be used for the
+        transfer, which thus helps the app which takes URLs from users or other
+        external inputs and want to restrict what protocol(s) to deal
+        with. Defaults to CURLPROTO_ALL. */
+    CINIT(PROTOCOLS, LONG, 181),
+
+    /* set the bitmask for the protocols that libcurl is allowed to follow to,
+        as a subset of the CURLOPT_PROTOCOLS ones. That means the protocol needs
+        to be set in both bitmasks to be allowed to get redirected to. Defaults
+        to all protocols except FILE and SCP. */
+    CINIT(REDIR_PROTOCOLS, LONG, 182),
+
+    /* set the SSH knownhost file name to use */
+    CINIT(SSH_KNOWNHOSTS, OBJECTPOINT, 183),
+
+    /* set the SSH host key callback, must point to a curl_sshkeycallback
+        function */
+    CINIT(SSH_KEYFUNCTION, FUNCTIONPOINT, 184),
+
+    /* set the SSH host key callback custom pointer */
+    CINIT(SSH_KEYDATA, OBJECTPOINT, 185),
+
+    CURLOPT_LASTENTRY /* the last unused */
+} CURLoption;
+
+    /* three convenient "aliases" that follow the name scheme better */
+#define CURLOPT_WRITEDATA CURLOPT_FILE
+#define CURLOPT_READDATA  CURLOPT_INFILE
+#define CURLOPT_HEADERDATA CURLOPT_WRITEHEADER
+
+typedef int64u curl_off_t;
+
+//***************************************************************************
+// Copy of curl include files - Multi interface
+//***************************************************************************
+
+typedef void CURLM;
+
+typedef enum {
+  CURLM_CALL_MULTI_PERFORM = -1, /* please call curl_multi_perform() or
+                                    curl_multi_socket*() soon */
+  CURLM_OK,
+  CURLM_BAD_HANDLE,      /* the passed-in handle is not a valid CURLM handle */
+  CURLM_BAD_EASY_HANDLE, /* an easy handle was not good/valid */
+  CURLM_OUT_OF_MEMORY,   /* if you ever get this, you're in deep sh*t */
+  CURLM_INTERNAL_ERROR,  /* this is a libcurl bug */
+  CURLM_BAD_SOCKET,      /* the passed in socket argument did not match */
+  CURLM_UNKNOWN_OPTION,  /* curl_multi_setopt() with unsupported option */
+  CURLM_LAST
+} CURLMcode;
+
+typedef enum {
+  CURLVERSION_FIRST,
+  CURLVERSION_SECOND,
+  CURLVERSION_THIRD,
+  CURLVERSION_FOURTH,
+  CURLVERSION_LAST /* never actually use this */
+} CURLversion;
+
+#define CURLVERSION_NOW CURLVERSION_FOURTH
+
+typedef struct {
+  CURLversion age;          /* age of the returned struct */
+  const char *version;      /* LIBCURL_VERSION */
+  unsigned int version_num; /* LIBCURL_VERSION_NUM */
+  const char *host;         /* OS/host/cpu/machine when configured */
+  int features;             /* bitmask, see defines below */
+  const char *ssl_version;  /* human readable string */
+  long ssl_version_num;     /* not used anymore, always 0 */
+  const char *libz_version; /* human readable string */
+  /* protocols is terminated by an entry with a NULL protoname */
+  const char * const *protocols;
+
+  /* The fields below this were added in CURLVERSION_SECOND */
+  const char *ares;
+  int ares_num;
+
+  /* This field was added in CURLVERSION_THIRD */
+  const char *libidn;
+
+  /* These field were added in CURLVERSION_FOURTH */
+
+  /* Same as '_libiconv_version' if built with HAVE_ICONV */
+  int iconv_ver_num;
+
+  const char *libssh_version; /* human readable string */
+
+} curl_version_info_data;
+
+#define CURL_ERROR_SIZE 256
+
+//***************************************************************************
+// Dynamic load stuff
+//***************************************************************************
+
+extern "C"
+{
+
+#if defined (_WIN32) || defined (WIN32)
+    #ifdef _UNICODE
+        #define MEDIAINFODLL_NAME  L"libcurl.dll"
+    #else //_UNICODE
+        #define MEDIAINFODLL_NAME  "libcurl.dll"
+    #endif //_UNICODE
+#elif defined(__APPLE__) && defined(__MACH__)
+    #define MEDIAINFODLL_NAME  "libcurl.0.dylib"
+    #define __stdcall
+#else
+    #define MEDIAINFODLL_NAME  "libcurl.so.0"
+    #define __stdcall
+#endif //!defined(_WIN32) || defined (WIN32)
+
+#ifdef MEDIAINFO_GLIBC
+    #include <gmodule.h>
+    static GModule* libcurl_Module=NULL;
+#elif defined (_WIN32) || defined (WIN32)
+    #undef __TEXT
+    #include <windows.h>
+    static HMODULE  libcurl_Module=NULL;
+#else
+    #include <dlfcn.h>
+    static void*    libcurl_Module=NULL;
+#endif
+
+size_t libcurl_Module_Count=0;
+
+#ifdef MEDIAINFO_GLIBC
+#define MEDIAINFO_ASSIGN(_Name,_Name2) \
+    if (!g_module_symbol (libcurl_Module, _Name2, (gpointer*)&_Name)) \
+        Errors++;
+#elif defined (_WIN32) || defined (WIN32)
+#define MEDIAINFO_ASSIGN(_Name,_Name2) \
+    _Name=(LIBCURL_##_Name)GetProcAddress(libcurl_Module, _Name2); \
+    if (_Name==NULL) Errors++;
+#else
+#define MEDIAINFO_ASSIGN(_Name,_Name2) \
+    _Name=(LIBCURL_##_Name)dlsym(libcurl_Module, _Name2); \
+    if (_Name==NULL) Errors++;
+#endif
+
+//---------------------------------------------------------------------------
+// Easy interface
+typedef CURL* (*LIBCURL_curl_easy_init)   ();   static LIBCURL_curl_easy_init    curl_easy_init;
+typedef CURLcode (*LIBCURL_curl_easy_setopt) (CURL *curl, CURLoption option, ...);   static LIBCURL_curl_easy_setopt  curl_easy_setopt;
+typedef CURLcode (*LIBCURL_curl_easy_perform)(CURL *curl);   static LIBCURL_curl_easy_perform curl_easy_perform;
+typedef void (*LIBCURL_curl_easy_cleanup)(CURL *curl);   static LIBCURL_curl_easy_cleanup curl_easy_cleanup;
+typedef CURLcode (*LIBCURL_curl_easy_getinfo)(CURL *curl, CURLINFO info, ...);   static LIBCURL_curl_easy_getinfo curl_easy_getinfo;
+typedef struct curl_slist* (*LIBCURL_curl_slist_append)   (struct curl_slist *, const char *);   static LIBCURL_curl_slist_append    curl_slist_append;
+typedef void (*LIBCURL_curl_slist_free_all)   (struct curl_slist *);   static LIBCURL_curl_slist_free_all    curl_slist_free_all;
+typedef CURL* (*LIBCURL_curl_easy_duphandle)(CURL *curl);   static LIBCURL_curl_easy_duphandle curl_easy_duphandle;
+typedef const char* (*LIBCURL_curl_easy_strerror)(CURLcode curlcode);   static LIBCURL_curl_easy_strerror curl_easy_strerror;
+typedef curl_version_info_data* (*LIBCURL_curl_version_info)(CURLversion version);   static LIBCURL_curl_version_info curl_version_info;
+
+//---------------------------------------------------------------------------
+// Multi interface
+typedef CURLM* (*LIBCURL_curl_multi_init)   ();   static LIBCURL_curl_multi_init    curl_multi_init;
+typedef CURLMcode (*LIBCURL_curl_multi_add_handle) (CURLM *multi_handle, CURL *curl_handle);   static LIBCURL_curl_multi_add_handle curl_multi_add_handle;
+typedef CURLMcode (*LIBCURL_curl_multi_remove_handle) (CURLM *multi_handle, CURL *curl_handle);   static LIBCURL_curl_multi_remove_handle curl_multi_remove_handle;
+typedef CURLMcode (*LIBCURL_curl_multi_perform)(CURLM *curl, int *running_handles);   static LIBCURL_curl_multi_perform curl_multi_perform;
+typedef void (*LIBCURL_curl_multi_cleanup)(CURLM *curl);   static LIBCURL_curl_multi_cleanup curl_multi_cleanup;
+
+}
+
+#endif

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Reader/Reader_libmms.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Reader/Reader_libmms.cpp Changed

@@ -1,31 +1,42 @@
 // Reader_libmms - All info about media files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+// Config
+#ifndef MEDIAINFO_LIBMMS_DESCRIBE_SUPPORT //If not defined by the compiler
+    #define MEDIAINFO_LIBMMS_DESCRIBE_SUPPORT 0 //0=without, 1=with libmms customized version containing DESCRIBE only API
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_LIBMMS_YES)
 //---------------------------------------------------------------------------
 
@@ -37,10 +48,13 @@
 #else
     #ifdef MEDIAINFO_LIBMMS_FROMSOURCE
         #include "mmsx.h"
+        #include "mmsh.h"
     #else //MEDIAINFO_LIBMMS_FROMSOURCE
         #include "libmms/mmsx.h"
+        #include "libmms/mmsh.h"
     #endif //MEDIAINFO_LIBMMS_FROMSOURCE
 #endif
+#include <iostream>
 using namespace ZenLib;
 using namespace std;
 //---------------------------------------------------------------------------
@@ -55,22 +69,60 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
-int Reader_libmms::Format_Test(MediaInfo_Internal* MI, const String &File_Name)
+size_t Reader_libmms::Format_Test(MediaInfo_Internal* MI, const String &File_Name)
 {
+    mmsx_t* Handle;
+
     //Opening the file
-    mmsx_t* Handle=mmsx_connect(0, 0, Ztring(File_Name).To_Local().c_str(), (int)-1);
-    if (Handle==NULL)
-        return 0;
+    #if MEDIAINFO_LIBMMS_DESCRIBE_SUPPORT
+    if (MI->Config.File_Mmsh_Describe_Only_Get())
+    {
+        // Use MMSH & Send a DESCRIBE request
+        mmsh_t* MmshHandle;
 
-    mms_off_t Offset=mmsx_seek(0, Handle, 0, SEEK_SET);
-    uint32_t Length=mmsx_get_length(Handle);
+        MmshHandle=mmsh_describe_request(0, 0, Ztring(File_Name).To_Local().c_str());
+        if (MmshHandle==NULL)
+            return 0;
 
-    //Buffer
-    size_t Buffer_Size_Max=Buffer_NormalSize;
-    int8u* Buffer=new int8u[Buffer_Size_Max];
+        Handle=mmsx_set_mmsh_handle(MmshHandle);
+        if (Handle==NULL)
+        {
+            mmsh_close(MmshHandle);
+            return 0;
+        }
+    }
+    else
+    #endif //MEDIAINFO_LIBMMS_DESCRIBE_SUPPORT
+    {
+       // Use MMS or MMSH (Send a DESCRIBE & PLAY request)
+       Handle=mmsx_connect(0, 0, Ztring(File_Name).To_Local().c_str(), (int)-1);
+       if (Handle==NULL)
+           return 0;
+    }
 
-    //Parser
-    MI->Open_Buffer_Init(Length, File_Name);
+    //Init
+    size_t Buffer_Size_Max;
+    uint32_t Length;
+    if (!MI->Config.File_Mmsh_Describe_Only_Get())
+    {
+        //Buffer
+        Buffer_Size_Max=Buffer_NormalSize;
+
+        //MediaInfo init
+        mms_off_t Offset=mmsx_seek(0, Handle, 0, SEEK_SET);
+        uint32_t Length=mmsx_get_length(Handle);
+        MI->Open_Buffer_Init(Length, File_Name);
+    }
+    else
+    {
+        //Buffer
+        Buffer_Size_Max=mmsx_get_asf_header_len(Handle);
+
+        //MediaInfo init
+        Length=(uint32_t)-1;
+        MI->Open_Buffer_Init((int64u)-1, File_Name);
+    }
+    int8u* Buffer=new int8u[Buffer_Size_Max];
 
     //Test the format with buffer
     bool StopAfterFilled=MI->Config.File_StopAfterFilled_Get();
@@ -89,16 +141,18 @@
         }
 
         //Buffering
-        size_t Buffer_Size=mmsx_read(0, Handle, (char*)Buffer, (int)Buffer_Size_Max);
-        if (Buffer_Size==0)
-            break; //Problem while reading
+        size_t Buffer_Size;
+        if (!MI->Config.File_Mmsh_Describe_Only_Get())
+            Buffer_Size=mmsx_read(0, Handle, (char*)Buffer, (int)Buffer_Size_Max);
+        else
+            Buffer_Size=mmsx_peek_header(Handle, (char*)Buffer, (int)Buffer_Size_Max);
 
         //Parser
         Status=MI->Open_Buffer_Continue(Buffer, Buffer_Size);
+        if (Buffer_Size==0 || MI->Config.File_Mmsh_Describe_Only_Get())
+            break;
     }
     while (!(Status[File__Analyze::IsFinished] || (StopAfterFilled && Status[File__Analyze::IsFilled])));
-    if (Length==0) //If Size==0, Status is never updated
-        Status=MI->Open_Buffer_Continue(NULL, 0);
 
     //File
     mmsx_close(Handle);

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Reader/Reader_libmms.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Reader/Reader_libmms.h Changed

@@ -1,17 +1,17 @@
 // Reader_libmms - All information about media files
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -28,7 +28,7 @@
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
-#include "MediaInfo/MediaInfo_Internal.h"
+#include "MediaInfo/Reader/Reader__Base.h"
 //---------------------------------------------------------------------------
 
 namespace MediaInfoLib
@@ -38,11 +38,14 @@
 /// @brief Reader_libmms
 //***************************************************************************
 
-class Reader_libmms
+class Reader_libmms : public Reader__Base
 {
 public :
+    //Constructor/Destructor
+    virtual ~Reader_libmms() {}
+
     //Format testing
-    static int Format_Test(MediaInfo_Internal* MI, const String &File_Name);
+    size_t Format_Test(MediaInfo_Internal* MI, const String &File_Name);
 };
 
 } //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Setup.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Setup.h Changed

@@ -1,17 +1,17 @@
 // Config - Config file for MediaInfo
-// Copyright (C) 2006-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2006-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,46 +22,10 @@
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-//***************************************************************************
-// Precompilation
-//***************************************************************************
-
 //---------------------------------------------------------------------------
-//Useful for precompiled headers
-#ifdef ZENLIB_USEWX
-    #ifndef __BORLANDC__ //Borland C++ does NOT support large files
-        #ifndef _FILE_OFFSET_BITS
-            #define _FILE_OFFSET_BITS 64
-        #endif //_FILE_OFFSET_BITS
-        #ifndef _LARGE_FILES
-            #define _LARGE_FILES
-        #endif //_LARGE_FILES
-        #ifndef _LARGEFILE_SOURCE
-            #define _LARGEFILE_SOURCE 1
-        #endif //_LARGEFILE_SOURCE
-    #endif //__BORLANDC__
-    #ifdef __BORLANDC__
-        #include <mem.h> //memcpy
-    #endif //__BORLANDC__
-    #include <wx/wxprec.h>
-#else //ZENLIB_USEWX
-    #if defined(__VISUALC__) || defined(__BORLANDC__)
-        #if defined WINDOWS && !defined ZENLIB_STANDARD
-            #undef __TEXT
-            #include <windows.h>
-        #endif //WINDOWS
-        #include <iomanip>
-        #include <algorithm>
-        #include <cmath>
-        #include <cstdio>
-        #include <cstdlib>
-        #include <ctime>
-        #include <map>
-        #include <string>
-        #include <sstream>
-        #include <vector>
-    #endif //defined(__VISUALC__) || defined(__BORLANDC__)
-#endif //ZENLIB_USEWX
+#ifndef MediaInfo_SetupH
+#define MediaInfo_SetupH
+//---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 //Needed in the whole library
@@ -74,15 +38,33 @@
 //---------------------------------------------------------------------------
 // Legacy
 #if defined(MEDIAINFO_MINIMIZESIZE)
-    #if !defined (MEDIAINFO_TRACE_NO) && !defined (MEDIAINFO_TRACE_YES) 
+    #if !defined (MEDIAINFO_TRACE_NO) && !defined (MEDIAINFO_TRACE_YES)
         #define MEDIAINFO_TRACE_NO
     #endif
+    //#if !defined (MEDIAINFO_FILTER_NO) && !defined (MEDIAINFO_FILTER_YES)
+    //    #define MEDIAINFO_FILTER_NO
+    //#endif
+    //#if !defined (MEDIAINFO_DUPLICATE_NO) && !defined (MEDIAINFO_DUPLICATE_YES)
+    //    #define MEDIAINFO_DUPLICATE_NO
+    //#endif
+    #if !defined (MEDIAINFO_MACROBLOCKS_NO) && !defined (MEDIAINFO_MACROBLOCKS_YES)
+        #define MEDIAINFO_MACROBLOCKS_NO
+    #endif
+    #if !defined (MEDIAINFO_NEXTPACKET_NO) && !defined (MEDIAINFO_NEXTPACKET_YES)
+        #define MEDIAINFO_NEXTPACKET_NO
+    #endif
+    #if !defined (MEDIAINFO_SEEK_NO) && !defined (MEDIAINFO_SEEK_YES)
+        #define MEDIAINFO_SEEK_NO
+    #endif
     #if !defined (MEDIAINFO_EVENTS_NO) && !defined (MEDIAINFO_EVENTS_YES)
         #define MEDIAINFO_EVENTS_NO
     #endif
     #if !defined (MEDIAINFO_DEMUX_NO) && !defined (MEDIAINFO_DEMUX_YES)
         #define MEDIAINFO_DEMUX_NO
     #endif
+    #if !defined (MEDIAINFO_IBI_NO) && !defined (MEDIAINFO_IBI_YES)
+        #define MEDIAINFO_IBI_NO
+    #endif
 #endif
 #if defined(MEDIAINFO_EVENTS)
     #undef MEDIAINFO_EVENTS
@@ -94,15 +76,33 @@
 //---------------------------------------------------------------------------
 // Special configurations
 #if defined(MEDIAINFO_MINIMAL_YES)
-    #if !defined (MEDIAINFO_TRACE_NO) && !defined (MEDIAINFO_TRACE_YES) 
+    #if !defined (MEDIAINFO_TRACE_NO) && !defined (MEDIAINFO_TRACE_YES)
         #define MEDIAINFO_TRACE_NO
     #endif
+    #if !defined (MEDIAINFO_FILTER_NO) && !defined (MEDIAINFO_FILTER_YES)
+        #define MEDIAINFO_FILTER_NO
+    #endif
+    #if !defined (MEDIAINFO_DUPLICATE_NO) && !defined (MEDIAINFO_DUPLICATE_YES)
+        #define MEDIAINFO_DUPLICATE_NO
+    #endif
+    #if !defined (MEDIAINFO_MACROBLOCKS_NO) && !defined (MEDIAINFO_MACROBLOCKS_YES)
+        #define MEDIAINFO_MACROBLOCKS_NO
+    #endif
+    #if !defined (MEDIAINFO_NEXTPACKET_NO) && !defined (MEDIAINFO_NEXTPACKET_YES)
+        #define MEDIAINFO_NEXTPACKET_NO
+    #endif
+    #if !defined (MEDIAINFO_SEEK_NO) && !defined (MEDIAINFO_SEEK_YES)
+        #define MEDIAINFO_SEEK_NO
+    #endif
     #if !defined (MEDIAINFO_EVENTS_NO) && !defined (MEDIAINFO_EVENTS_YES)
         #define MEDIAINFO_EVENTS_NO
     #endif
     #if !defined (MEDIAINFO_DEMUX_NO) && !defined (MEDIAINFO_DEMUX_YES)
         #define MEDIAINFO_DEMUX_NO
     #endif
+    #if !defined (MEDIAINFO_IBI_NO) && !defined (MEDIAINFO_IBI_YES)
+        #define MEDIAINFO_IBI_NO
+    #endif
     #if !defined (MEDIAINFO_DIRECTORY_NO) && !defined (MEDIAINFO_DIRECTORY_YES)
         #define MEDIAINFO_DIRECTORY_NO
     #endif
@@ -124,39 +124,109 @@
 // Optional features
 #if !defined(MEDIAINFO_TRACE)
     #if defined(MEDIAINFO_TRACE_NO) && defined(MEDIAINFO_TRACE_YES)
-		#undef MEDIAINFO_TRACE_NO //MEDIAINFO_TRACE_YES has priority
-	#endif
+        #undef MEDIAINFO_TRACE_NO //MEDIAINFO_TRACE_YES has priority
+    #endif
     #if defined(MEDIAINFO_TRACE_NO)
         #define MEDIAINFO_TRACE 0
     #else
         #define MEDIAINFO_TRACE 1
     #endif
 #endif
+#if !defined(MEDIAINFO_FILTER)
+    #if defined(MEDIAINFO_FILTER_NO) && defined(MEDIAINFO_FILTER_YES)
+        #undef MEDIAINFO_FILTER_NO //MEDIAINFO_FILTER_YES has priority
+    #endif
+    #if defined(MEDIAINFO_FILTER_NO)
+        #define MEDIAINFO_FILTER 0
+    #else
+        #define MEDIAINFO_FILTER 1
+    #endif
+#endif
+#if !defined(MEDIAINFO_DUPLICATE)
+    #if defined(MEDIAINFO_DUPLICATE_NO) && defined(MEDIAINFO_DUPLICATE_YES)
+        #undef MEDIAINFO_DUPLICATE_NO //MEDIAINFO_DUPLICATE_YES has priority
+    #endif
+    #if defined(MEDIAINFO_DUPLICATE_NO)
+        #define MEDIAINFO_DUPLICATE 0
+    #else
+        #define MEDIAINFO_DUPLICATE 1
+    #endif
+#endif
+#if !defined(MEDIAINFO_MACROBLOCKS)
+    #if defined(MEDIAINFO_MACROBLOCKS_NO) && defined(MEDIAINFO_MACROBLOCKS_YES)
+        #undef MEDIAINFO_MACROBLOCKS_NO //MEDIAINFO_MACROBLOCKS_YES has priority
+    #endif
+    #if defined(MEDIAINFO_MACROBLOCKS_NO)
+        #define MEDIAINFO_MACROBLOCKS 0
+    #else
+        #define MEDIAINFO_MACROBLOCKS 1
+    #endif
+#endif
+#if !defined(MEDIAINFO_NEXTPACKET)
+    #if defined(MEDIAINFO_NEXTPACKET_NO) && defined(MEDIAINFO_NEXTPACKET_YES)
+        #undef MEDIAINFO_NEXTPACKET_NO //MEDIAINFO_NEXTPACKET_YES has priority
+    #endif
+    #if defined(MEDIAINFO_NEXTPACKET_NO)
+        #define MEDIAINFO_NEXTPACKET 0
+    #else
+        #define MEDIAINFO_NEXTPACKET 1
+    #endif
+#endif
+#if !defined(MEDIAINFO_SEEK)
+    #if defined(MEDIAINFO_SEEK_NO) && defined(MEDIAINFO_SEEK_YES)
+        #undef MEDIAINFO_SEEK_NO //MEDIAINFO_SEEK_YES has priority
+    #endif
+    #if defined(MEDIAINFO_SEEK_NO)
+        #define MEDIAINFO_SEEK 0
+    #else
+        #define MEDIAINFO_SEEK 1
+    #endif
+#endif
 #if !defined(MEDIAINFO_EVENTS)
     #if defined(MEDIAINFO_EVENTS_NO) && defined(MEDIAINFO_EVENTS_YES)
-		#undef MEDIAINFO_EVENTS_NO //MEDIAINFO_EVENTS_YES has priority
-	#endif
+        #undef MEDIAINFO_EVENTS_NO //MEDIAINFO_EVENTS_YES has priority
+    #endif
     #if defined(MEDIAINFO_EVENTS_NO)
         #define MEDIAINFO_EVENTS 0
     #else
         #define MEDIAINFO_EVENTS 1
     #endif
 #endif
+#if !defined(MEDIAINFO_ADVANCED)
+    #if defined(MEDIAINFO_ADVANCED_NO) && defined(MEDIAINFO_ADVANCED_YES)
+        #undef MEDIAINFO_ADVANCED_NO //MEDIAINFO_ADVANCED_YES has priority
+    #endif
+    #if defined(MEDIAINFO_ADVANCED_NO)
+        #define MEDIAINFO_ADVANCED 0
+    #else
+        #define MEDIAINFO_ADVANCED 1
+    #endif
+#endif
 #if !defined(MEDIAINFO_DEMUX)
-    #if !defined(MEDIAINFO_DEMUX_YES) && !MEDIAINFO_EVENTS
-		#define MEDIAINFO_DEMUX_NO //MEDIAINFO_DEMUX is disabled by default if MEDIAINFO_EVENTS is set to 1
-	#endif
+    #if !defined(MEDIAINFO_DEMUX_NO) && !defined(MEDIAINFO_DEMUX_YES) && !MEDIAINFO_EVENTS
+        #define MEDIAINFO_DEMUX_NO //MEDIAINFO_DEMUX is disabled by default if MEDIAINFO_EVENTS is set to 0
+    #endif
     #if defined(MEDIAINFO_DEMUX_NO) && defined(MEDIAINFO_DEMUX_YES)
-		#undef MEDIAINFO_DEMUX_NO //MEDIAINFO_DEMUX_YES has priority
-	#endif
-	#if defined(MEDIAINFO_DEMUX_NO)
+        #undef MEDIAINFO_DEMUX_NO //MEDIAINFO_DEMUX_YES has priority
+    #endif
+    #if defined(MEDIAINFO_DEMUX_NO)
         #define MEDIAINFO_DEMUX 0
     #else
         #define MEDIAINFO_DEMUX 1
     #endif
 #endif
 #if MEDIAINFO_DEMUX && !MEDIAINFO_EVENTS
-	pragma error MEDIAINFO_DEMUX can be set to 1 only if MEDIAINFO_EVENTS is set to 1 
+    pragma error MEDIAINFO_DEMUX can be set to 1 only if MEDIAINFO_EVENTS is set to 1
+#endif
+#if !defined(MEDIAINFO_IBI)
+    #if defined(MEDIAINFO_IBI_NO) && defined(MEDIAINFO_IBI_YES)
+        #undef MEDIAINFO_IBI_NO //MEDIAINFO_IBI_YES has priority
+    #endif
+    #if defined(MEDIAINFO_IBI_NO)
+        #define MEDIAINFO_IBI 0
+    #else
+        #define MEDIAINFO_IBI 1
+    #endif
 #endif
 
 //***************************************************************************
@@ -175,7 +245,9 @@
     #define MEDIAINFO_LIBCURL_YES
 #endif
 #if !defined(MEDIAINFO_READER_NO) && !defined(MEDIAINFO_LIBMMS_NO) && !defined(MEDIAINFO_LIBMMS_YES)
-    #define MEDIAINFO_LIBMMS_YES
+    #ifndef WINDOWS
+        #define MEDIAINFO_LIBMMS_YES
+    #endif //WINDOWS
 #endif
 
 //---------------------------------------------------------------------------
@@ -204,6 +276,12 @@
 
 //---------------------------------------------------------------------------
 // Multiple
+#if !defined(MEDIAINFO_MULTI_NO) && !defined(MEDIAINFO_REFERENCES_NO) && !defined(MEDIAINFO_REFERENCES_YES)
+    #define MEDIAINFO_REFERENCES_YES
+#endif
+#if !defined(MEDIAINFO_MULTI_NO) && !defined(MEDIAINFO_ANCILLARY_NO) && !defined(MEDIAINFO_ANCILLARY_YES)
+    #define MEDIAINFO_ANCILLARY_YES
+#endif
 #if !defined(MEDIAINFO_MULTI_NO) && !defined(MEDIAINFO_BDAV_NO) && !defined(MEDIAINFO_BDAV_YES)
     #define MEDIAINFO_BDAV_YES
 #endif
@@ -213,6 +291,9 @@
 #if !defined(MEDIAINFO_MULTI_NO) && !defined(MEDIAINFO_CDXA_NO) && !defined(MEDIAINFO_CDXA_YES)
     #define MEDIAINFO_CDXA_YES
 #endif
+#if !defined(MEDIAINFO_MULTI_NO) && !defined(MEDIAINFO_DCP_NO) && !defined(MEDIAINFO_DCP_YES)
+    #define MEDIAINFO_DCP_YES
+#endif
 #if !defined(MEDIAINFO_MULTI_NO) && !defined(MEDIAINFO_DVDIF_NO) && !defined(MEDIAINFO_DVDIF_YES)
     #define MEDIAINFO_DVDIF_YES
 #endif
@@ -222,15 +303,27 @@
 #if !defined(MEDIAINFO_MULTI_NO) && !defined(MEDIAINFO_DVDV_NO) && !defined(MEDIAINFO_DVDV_YES)
     #define MEDIAINFO_DVDV_YES
 #endif
+#if !defined(MEDIAINFO_MULTI_NO) && !defined(MEDIAINFO_DXW_NO) && !defined(MEDIAINFO_DXW_YES)
+    #define MEDIAINFO_DXW_YES
+#endif
 #if !defined(MEDIAINFO_MULTI_NO) && !defined(MEDIAINFO_FLV_NO) && !defined(MEDIAINFO_FLV_YES)
     #define MEDIAINFO_FLV_YES
 #endif
 #if !defined(MEDIAINFO_MULTI_NO) && !defined(MEDIAINFO_GXF_NO) && !defined(MEDIAINFO_GXF_YES)
     #define MEDIAINFO_GXF_YES
 #endif
+#if !defined(MEDIAINFO_MULTI_NO) && !defined(MEDIAINFO_HLS_NO) && !defined(MEDIAINFO_HLS_YES)
+    #define MEDIAINFO_HLS_YES
+#endif
+#if !defined(MEDIAINFO_MULTI_NO) && !defined(MEDIAINFO_ISM_NO) && !defined(MEDIAINFO_ISM_YES)
+    #define MEDIAINFO_ISM_YES
+#endif
 #if !defined(MEDIAINFO_MULTI_NO) && !defined(MEDIAINFO_IVF_NO) && !defined(MEDIAINFO_IVF_YES)
     #define MEDIAINFO_IVF_YES
 #endif
+#if !defined(MEDIAINFO_MULTI_NO) && !defined(MEDIAINFO_IBI_NO) && !defined(MEDIAINFO_IBI_YES)
+    #define MEDIAINFO_IBI_YES
+#endif
 #if !defined(MEDIAINFO_MULTI_NO) && !defined(MEDIAINFO_LXF_NO) && !defined(MEDIAINFO_LXF_YES)
     #define MEDIAINFO_LXF_YES
 #endif
@@ -273,6 +366,9 @@
 #if !defined(MEDIAINFO_MULTI_NO) && !defined(MEDIAINFO_RM_NO) && !defined(MEDIAINFO_RM_YES)
     #define MEDIAINFO_RM_YES
 #endif
+#if !defined(MEDIAINFO_MULTI_NO) && !defined(MEDIAINFO_SEQUENCEINFO_NO) && !defined(MEDIAINFO_SEQUENCEINFO_YES)
+    #define MEDIAINFO_SEQUENCEINFO_YES
+#endif
 #if !defined(MEDIAINFO_MULTI_NO) && !defined(MEDIAINFO_SKM_NO) && !defined(MEDIAINFO_SKM_YES)
     #define MEDIAINFO_SKM_YES
 #endif
@@ -315,6 +411,9 @@
 #if !defined(MEDIAINFO_VIDEO_NO) && !defined(MEDIAINFO_FRAPS_NO) && !defined(MEDIAINFO_FRAPS_YES)
     #define MEDIAINFO_FRAPS_YES
 #endif
+#if !defined(MEDIAINFO_VIDEO_NO) && !defined(MEDIAINFO_H263_NO) && !defined(MEDIAINFO_H263_YES)
+    #define MEDIAINFO_H263_YES
+#endif
 #if !defined(MEDIAINFO_VIDEO_NO) && !defined(MEDIAINFO_LAGARITH_NO) && !defined(MEDIAINFO_LAGARITH_YES)
     #define MEDIAINFO_LAGARITH_YES
 #endif
@@ -324,12 +423,24 @@
 #if !defined(MEDIAINFO_VIDEO_NO) && !defined(MEDIAINFO_MPEGV_NO) && !defined(MEDIAINFO_MPEGV_YES)
     #define MEDIAINFO_MPEGV_YES
 #endif
+#if !defined(MEDIAINFO_VIDEO_NO) && !defined(MEDIAINFO_PRORES_NO) && !defined(MEDIAINFO_PRORES_YES)
+    #define MEDIAINFO_PRORES_YES
+#endif
 #if !defined(MEDIAINFO_VIDEO_NO) && !defined(MEDIAINFO_VC1_NO) && !defined(MEDIAINFO_VC1_YES)
     #define MEDIAINFO_VC1_YES
 #endif
+#if !defined(MEDIAINFO_VIDEO_NO) && !defined(MEDIAINFO_VC3_NO) && !defined(MEDIAINFO_VC3_YES)
+    #define MEDIAINFO_VC3_YES
+#endif
 #if !defined(MEDIAINFO_VIDEO_NO) && !defined(MEDIAINFO_THEORA_NO) && !defined(MEDIAINFO_THEORA_YES)
     #define MEDIAINFO_THEORA_YES
 #endif
+#if !defined(MEDIAINFO_VIDEO_NO) && !defined(MEDIAINFO_VP8_NO) && !defined(MEDIAINFO_VP8_YES)
+    #define MEDIAINFO_VP8_YES
+#endif
+#if !defined(MEDIAINFO_VIDEO_NO) && !defined(MEDIAINFO_Y4M_NO) && !defined(MEDIAINFO_Y4M_YES)
+    #define MEDIAINFO_Y4M_YES
+#endif
 
 //---------------------------------------------------------------------------
 // Audio
@@ -339,15 +450,9 @@
 #if !defined(MEDIAINFO_AUDIO_NO) && !defined(MEDIAINFO_AC3_NO) && !defined(MEDIAINFO_AC3_YES)
     #define MEDIAINFO_AC3_YES
 #endif
-#if !defined(MEDIAINFO_AUDIO_NO) && !defined(MEDIAINFO_ADIF_NO) && !defined(MEDIAINFO_ADIF_YES)
-    #define MEDIAINFO_ADIF_YES
-#endif
 #if !defined(MEDIAINFO_AUDIO_NO) && !defined(MEDIAINFO_ADPCM_NO) && !defined(MEDIAINFO_ADPCM_YES)
     #define MEDIAINFO_ADPCM_YES
 #endif
-#if !defined(MEDIAINFO_AUDIO_NO) && !defined(MEDIAINFO_ADTS_NO) && !defined(MEDIAINFO_ADTS_YES)
-    #define MEDIAINFO_ADTS_YES
-#endif
 #if !defined(MEDIAINFO_AUDIO_NO) && !defined(MEDIAINFO_ALS_NO) && !defined(MEDIAINFO_ALS_YES)
     #define MEDIAINFO_ALS_YES
 #endif
@@ -369,6 +474,12 @@
 #if !defined(MEDIAINFO_AUDIO_NO) && !defined(MEDIAINFO_AU_NO) && !defined(MEDIAINFO_AU_YES)
     #define MEDIAINFO_AU_YES
 #endif
+#if !defined(MEDIAINFO_AUDIO_NO) && !defined(MEDIAINFO_CELT_NO) && !defined(MEDIAINFO_CELT_YES)
+    #define MEDIAINFO_CELT_YES
+#endif
+#if !defined(MEDIAINFO_AUDIO_NO) && !defined(MEDIAINFO_DOLBYE_NO) && !defined(MEDIAINFO_DOLBYE_YES)
+    #define MEDIAINFO_DOLBYE_YES
+#endif
 #if !defined(MEDIAINFO_AUDIO_NO) && !defined(MEDIAINFO_DTS_NO) && !defined(MEDIAINFO_DTS_YES)
     #define MEDIAINFO_DTS_YES
 #endif
@@ -381,9 +492,6 @@
 #if !defined(MEDIAINFO_AUDIO_NO) && !defined(MEDIAINFO_LA_NO) && !defined(MEDIAINFO_LA_YES)
     #define MEDIAINFO_LA_YES
 #endif
-#if !defined(MEDIAINFO_AUDIO_NO) && !defined(MEDIAINFO_LATM_NO) && !defined(MEDIAINFO_LATM_YES)
-    #define MEDIAINFO_LATM_YES
-#endif
 #if !defined(MEDIAINFO_AUDIO_NO) && !defined(MEDIAINFO_MIDO_NO) && !defined(MEDIAINFO_MIDO_YES)
     #define MEDIAINFO_MIDI_YES
 #endif
@@ -396,15 +504,21 @@
 #if !defined(MEDIAINFO_AUDIO_NO) && !defined(MEDIAINFO_MPCSV8_NO) && !defined(MEDIAINFO_MPCSV8_YES)
     #define MEDIAINFO_MPCSV8_YES
 #endif
-#if !defined(MEDIAINFO_AUDIO_NO) && !defined(MEDIAINFO_MPEGA_NO) && !defined(MEDIAINFO_MPEGA_YES)
-    #define MEDIAINFO_MPEGA_YES
-#endif
-#if !defined(MEDIAINFO_AUDIO_NO) && !defined(MEDIAINFO_PCM_NO) && !defined(MEDIAINFO_PCM_YES)
-    #define MEDIAINFO_PCM_YES
-#endif
+#if !defined(MEDIAINFO_AUDIO_NO) && !defined(MEDIAINFO_MPEGA_NO) && !defined(MEDIAINFO_MPEGA_YES)
+    #define MEDIAINFO_MPEGA_YES
+#endif
+#if !defined(MEDIAINFO_AUDIO_NO) && !defined(MEDIAINFO_OPUS_NO) && !defined(MEDIAINFO_OPUS_YES)
+    #define MEDIAINFO_OPUS_YES
+#endif
+#if !defined(MEDIAINFO_AUDIO_NO) && !defined(MEDIAINFO_PCM_NO) && !defined(MEDIAINFO_PCM_YES)
+    #define MEDIAINFO_PCM_YES
+#endif
 #if !defined(MEDIAINFO_AUDIO_NO) && !defined(MEDIAINFO_PS2A_NO) && !defined(MEDIAINFO_PS2A_YES)
     #define MEDIAINFO_PS2A_YES
 #endif
+#if !defined(MEDIAINFO_AUDIO_NO) && !defined(MEDIAINFO_RKAU_NO) && !defined(MEDIAINFO_RKAU_YES)
+    #define MEDIAINFO_RKAU_YES
+#endif
 #if !defined(MEDIAINFO_AUDIO_NO) && !defined(MEDIAINFO_S3M_NO) && !defined(MEDIAINFO_S3M_YES)
     #define MEDIAINFO_S3M_YES
 #endif
@@ -438,6 +552,9 @@
 #if !defined(MEDIAINFO_TEXT_NO) && !defined(MEDIAINFO_CMML_NO) && !defined(MEDIAINFO_CMML_YES)
     #define MEDIAINFO_CMML_YES
 #endif
+#if !defined(MEDIAINFO_TEXT_NO) && !defined(MEDIAINFO_DVBSUBTITLE_NO) && !defined(MEDIAINFO_DVBSUBTITLE_YES)
+    #define MEDIAINFO_DVBSUBTITLE_YES
+#endif
 #if !defined(MEDIAINFO_TEXT_NO) && !defined(MEDIAINFO_DTVCCTRANSPORT_NO) && !defined(MEDIAINFO_DTVCCTRANSPORT_YES)
     #define MEDIAINFO_DTVCCTRANSPORT_YES
 #endif
@@ -456,9 +573,15 @@
 #if !defined(MEDIAINFO_TEXT_NO) && !defined(MEDIAINFO_PGS_NO) && !defined(MEDIAINFO_PGS_YES)
     #define MEDIAINFO_PGS_YES
 #endif
+#if !defined(MEDIAINFO_TEXT_NO) && !defined(MEDIAINFO_SCC_NO) && !defined(MEDIAINFO_SCC_YES)
+    #define MEDIAINFO_SCC_YES
+#endif
 #if !defined(MEDIAINFO_TEXT_NO) && !defined(MEDIAINFO_SCTE20_NO) && !defined(MEDIAINFO_SCTE20_YES)
     #define MEDIAINFO_SCTE20_YES
 #endif
+#if !defined(MEDIAINFO_TEXT_NO) && !defined(MEDIAINFO_TELETEXT_NO) && !defined(MEDIAINFO_TELETEXT_YES)
+    #define MEDIAINFO_TELETEXT_YES
+#endif
 #if !defined(MEDIAINFO_TEXT_NO) && !defined(MEDIAINFO_OTHERTEXT_NO) && !defined(MEDIAINFO_OTHERTEXT_YES)
     #define MEDIAINFO_OTHERTEXT_YES
 #endif
@@ -468,6 +591,12 @@
 #if !defined(MEDIAINFO_IMAGE_NO) && !defined(MEDIAINFO_BMP_NO) && !defined(MEDIAINFO_BMP_YES)
     #define MEDIAINFO_BMP_YES
 #endif
+#if !defined(MEDIAINFO_IMAGE_NO) && !defined(MEDIAINFO_DPX_NO) && !defined(MEDIAINFO_DPX_YES)
+    #define MEDIAINFO_DPX_YES
+#endif
+#if !defined(MEDIAINFO_IMAGE_NO) && !defined(MEDIAINFO_EXR_NO) && !defined(MEDIAINFO_EXR_YES)
+    #define MEDIAINFO_EXR_YES
+#endif
 #if !defined(MEDIAINFO_IMAGE_NO) && !defined(MEDIAINFO_GIF_NO) && !defined(MEDIAINFO_GIF_YES)
     #define MEDIAINFO_GIF_YES
 #endif
@@ -477,15 +606,24 @@
 #if !defined(MEDIAINFO_IMAGE_NO) && !defined(MEDIAINFO_JPEG_NO) && !defined(MEDIAINFO_JPEG_YES)
     #define MEDIAINFO_JPEG_YES
 #endif
+#if !defined(MEDIAINFO_IMAGE_NO) && !defined(MEDIAINFO_PCX_NO) && !defined(MEDIAINFO_PCX_YES)
+    #define MEDIAINFO_PCX_YES
+#endif
 #if !defined(MEDIAINFO_IMAGE_NO) && !defined(MEDIAINFO_PNG_NO) && !defined(MEDIAINFO_PNG_YES)
     #define MEDIAINFO_PNG_YES
 #endif
+#if !defined(MEDIAINFO_IMAGE_NO) && !defined(MEDIAINFO_PSD_NO) && !defined(MEDIAINFO_PSD_YES)
+    #define MEDIAINFO_PSD_YES
+#endif
 #if !defined(MEDIAINFO_IMAGE_NO) && !defined(MEDIAINFO_RLE_NO) && !defined(MEDIAINFO_RLE_YES)
     #define MEDIAINFO_RLE_YES
 #endif
 #if !defined(MEDIAINFO_IMAGE_NO) && !defined(MEDIAINFO_TIFF_NO) && !defined(MEDIAINFO_TIFF_YES)
     #define MEDIAINFO_TIFF_YES
 #endif
+#if !defined(MEDIAINFO_IMAGE_NO) && !defined(MEDIAINFO_TGA_NO) && !defined(MEDIAINFO_TGA_YES)
+    #define MEDIAINFO_TGA_YES
+#endif
 
 //---------------------------------------------------------------------------
 // Archive
@@ -504,6 +642,9 @@
 #if !defined(MEDIAINFO_ARCHIVE_NO) && !defined(MEDIAINFO_GZIP_NO) && !defined(MEDIAINFO_GZIP_YES)
     #define MEDIAINFO_GZIP_YES
 #endif
+#if !defined(MEDIAINFO_ARCHIVE_NO) && !defined(MEDIAINFO_ISO9660_NO) && !defined(MEDIAINFO_ISO9660_YES)
+    #define MEDIAINFO_ISO9660_YES
+#endif
 #if !defined(MEDIAINFO_ARCHIVE_NO) && !defined(MEDIAINFO_MZ_NO) && !defined(MEDIAINFO_MZ_YES)
     #define MEDIAINFO_MZ_YES
 #endif
@@ -553,3 +694,4 @@
     #define MEDIAINFO_UNKNOWN_YES
 #endif
 
+#endif

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Tag/File_ApeTag.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Tag/File_ApeTag.cpp Changed

@@ -1,31 +1,35 @@
 // File_ApeTag - Info for ApeTag tagged files
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_APETAG_YES)
 //---------------------------------------------------------------------------
 
@@ -150,7 +154,7 @@
 
     //Parsing
     Ztring Value;
-    Get_UTF8(Element_Size, Value,                               "Value"); Element_Info(Value);
+    Get_UTF8(Element_Size, Value,                               "Value"); Element_Info1(Value);
 
     //Filling
     transform(Key.begin(), Key.end(), Key.begin(), (int(*)(int))toupper); //(int(*)(int)) is a patch for unix
@@ -165,10 +169,10 @@
     else if (Key=="COPYRIGHT")      Fill(Stream_General, 0, General_Copyright, Value);
     else if (Key=="DISK")
     {
-                                    if (Value.find(_T("/"))!=Error)
+                                    if (Value.find(__T("/"))!=Error)
                                     {
-                                        Fill(Stream_General, 0, General_Part_Position_Total, Value.SubString(_T("/"), _T("")));
-                                        Fill(Stream_General, 0, General_Part_Position, Value.SubString(_T(""), _T("/")));
+                                        Fill(Stream_General, 0, General_Part_Position_Total, Value.SubString(__T("/"), __T("")));
+                                        Fill(Stream_General, 0, General_Part_Position, Value.SubString(__T(""), __T("/")));
                                     }
                                     else
                                         Fill(Stream_General, 0, General_Track_Position, Value);
@@ -179,10 +183,10 @@
     else if (Key=="TITLE")          Fill(Stream_General, 0, General_Title, Value);
     else if (Key=="TRACK")
     {
-                                    if (Value.find(_T("/"))!=Error)
+                                    if (Value.find(__T("/"))!=Error)
                                     {
-                                        Fill(Stream_General, 0, General_Track_Position_Total, Value.SubString(_T("/"), _T("")));
-                                        Fill(Stream_General, 0, General_Track_Position, Value.SubString(_T(""), _T("/")));
+                                        Fill(Stream_General, 0, General_Track_Position_Total, Value.SubString(__T("/"), __T("")));
+                                        Fill(Stream_General, 0, General_Track_Position, Value.SubString(__T(""), __T("/")));
                                     }
                                     else
                                         Fill(Stream_General, 0, General_Track_Position, Value);

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Tag/File_ApeTag.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Tag/File_ApeTag.h Changed

@@ -1,17 +1,17 @@
 // File_ApeTag - Info for APETAG tagged files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Tag/File_Id3.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Tag/File_Id3.cpp Changed

@@ -1,31 +1,35 @@
 // File_Id3 - Info for ID3 tagged files
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_ID3_YES)
 //---------------------------------------------------------------------------
 
@@ -47,9 +51,33 @@
     if (Buffer_Size<128)
         return;
 
+    int32u Magic;
+    Peek_B4(Magic);
+    Ztring TitleAddition;
+    Ztring ArtistAddition;
+    Ztring AlbumAddition;
+    Ztring GenreAddition;
+    if (Magic==0x5441472B)
+    {
+        if (Buffer_Size<227+128)
+            return;
+
+        Skip_C4   (                                                 "ID");
+        Get_Local (60, TitleAddition,                               "Title");
+        Get_Local (60, ArtistAddition,                              "Artist");
+        Get_Local (60, AlbumAddition,                               "Album");
+        Skip_B1   (                                                 "Speed");
+        Get_Local (30, GenreAddition,                               "Genre");
+        Skip_Local(6,                                               "Start time"); //mmm:ss
+        Skip_Local(6,                                               "End time"); //mmm:ss
+
+        TitleAddition.TrimRight();
+        ArtistAddition.TrimRight();
+        AlbumAddition.TrimRight();
+        GenreAddition.TrimRight();
+    }
+
     //Parsing
-    Element_Offset=0;
-    Element_Size=Buffer_Size;
     Ztring Title, Artist, Album, Year, Comment;
     int8u Track=0, Genre;
     Skip_C3   (                                                 "ID");
@@ -74,20 +102,25 @@
     Get_B1 (Genre,                                              "Genre");
 
     FILLING_BEGIN();
-        Title.TrimRight();
-        Artist.TrimRight();
-        Album.TrimRight();
+        if (TitleAddition.empty())
+            Title.TrimRight();
+        if (ArtistAddition.empty())
+            Artist.TrimRight();
+        if (AlbumAddition.empty())
+            Album.TrimRight();
         Year.TrimRight();
         Comment.TrimRight();
 
         Accept("Id3");
 
         Stream_Prepare(Stream_General);
-        Fill(Stream_General, 0, General_Album, Album);
-        Fill(Stream_General, 0, General_Track, Title);
-        Fill(Stream_General, 0, General_Performer, Artist);
+        Fill(Stream_General, 0, General_Album, Album+AlbumAddition);
+        Fill(Stream_General, 0, General_Track, Title+TitleAddition);
+        Fill(Stream_General, 0, General_Performer, Artist+ArtistAddition);
         Fill(Stream_General, 0, General_Comment, Comment);
         Fill(Stream_General, 0, General_Recorded_Date, Year);
+        if (GenreAddition.empty())
+            Fill(Stream_General, 0, General_Genre, GenreAddition);
         if (Genre && Genre!=(int8u)-1)
             Fill(Stream_General, 0, General_Genre, Genre);
         if (Track)

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Tag/File_Id3.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Tag/File_Id3.h Changed

@@ -1,17 +1,17 @@
 // File_Id3 - Info for Id3 tagged files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Tag/File_Id3v2.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Tag/File_Id3v2.cpp Changed

@@ -1,30 +1,34 @@
 // File_Id3 - Info for ID3v2 tagged files
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
 //***************************************************************************
 // Infos (Common)
 //***************************************************************************
@@ -85,7 +89,7 @@
 #include "MediaInfo/Tag/File_Id3v2.h"
 #include "ZenLib/ZtringListList.h"
 #include "ZenLib/Utils.h"
-#include "ZenLib/Base64/base64.h"
+#include "base64.h"
 #include <cstring>
 using namespace ZenLib;
 //---------------------------------------------------------------------------
@@ -310,10 +314,9 @@
 {
     //Configuration
     Buffer_MaximumSize=8*1024*1024;
-    
+
     //Temp
     Id3v2_Size=0;
-    Unsynchronisation_Frame=false;
 }
 
 //***************************************************************************
@@ -339,56 +342,37 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
-void File_Id3v2::Streams_Finish()
+void File_Id3v2::Streams_Fill()
 {
     if (Count_Get(Stream_General)==0)
         return;
 
     //Specific formats (multiple Id3v2 tags for one MI tag)
-    Ztring Recorded_Date;
     if (Retrieve(Stream_General, 0, General_Recorded_Date).empty() && !Year.empty())
     {
-        Recorded_Date+=Year;
-        if (!Month.empty() && !Month.empty())
+        Ztring Recorded_Date=Year;
+        if (!Month.empty())
         {
-            Recorded_Date+=_T("-");
-            Recorded_Date+=Year;
-            Recorded_Date+=_T("-");
-            Recorded_Date+=Day;
-            if (!Month.empty() && !Month.empty())
+            Recorded_Date+=__T('-');
+            Recorded_Date+=Month;
+            if (!Day.empty())
             {
-                Recorded_Date+=_T(" ");
-                Recorded_Date+=Hour;
-                Recorded_Date+=_T(":");
-                Recorded_Date+=Minute;
+                Recorded_Date+=__T('-');
+                Recorded_Date+=Day;
+                if (!Hour.empty())
+                {
+                    Recorded_Date+=__T(' ');
+                    Recorded_Date+=Hour;
+                    if (Minute.empty())
+                    {
+                        Recorded_Date+=__T(':');
+                        Recorded_Date+=Minute;
+                    }
+                }
             }
         }
+        Fill(Stream_General, 0, General_Recorded_Date, Recorded_Date);
     }
-    if (!Recorded_Date.empty())
-        Fill(Stream_General, 0, "Recorded_Date", Recorded_Date);
-
-    //Special cases
-    //-Position and total parts
-    if (Retrieve(Stream_General, 0, General_Part_Position).find(_T("/"))!=Error)
-    {
-        Ztring Temp=Retrieve(Stream_General, 0, General_Part_Position);
-        Fill(Stream_General, 0, General_Part_Position_Total, Temp.SubString(_T("/"), _T("")));
-        Fill(Stream_General, 0, General_Part_Position, Temp.SubString(_T(""), _T("/")));
-    }
-    if (Retrieve(Stream_General, 0, General_Track_Position).find(_T("/"))!=Error)
-    {
-        const Ztring &Temp=Retrieve(Stream_General, 0, General_Track_Position);
-        Fill(Stream_General, 0, General_Track_Position_Total, Temp.SubString(_T("/"), _T("")), true);
-        Fill(Stream_General, 0, General_Track_Position, Temp.SubString(_T(""), _T("/")), true);
-    }
-    //-Genre
-    if (Retrieve(Stream_General, 0, General_Genre).find(_T("("))==0)
-    {
-        const Ztring &Genre=Retrieve(Stream_General, 0, General_Genre);
-        Fill(Stream_General, 0, General_Genre, Genre.SubString(_T("("), _T(")")), true); //Replace (nn) by nn
-    }
-    if (Retrieve(Stream_General, 0, General_Genre)==_T("0") || Retrieve(Stream_General, 0, General_Genre)==_T("255"))
-        Clear(Stream_General, 0, General_Genre);
 }
 
 //***************************************************************************
@@ -414,14 +398,14 @@
              | ((Size>>1)&0x3F80)
              | ((Size>>2)&0x1FC000)
              | ((Size>>3)&0x0FE00000);
-    Param_Info(Id3v2_Size);
+    Param_Info1(Id3v2_Size);
     if (ExtendedHeader)
     {
-        Element_Begin("Extended header");
+        Element_Begin1("Extended header");
         int32u Size_Extended;
         Get_B4 (Size_Extended,                                  "Size");
         Skip_XX(Size_Extended,                                  "Extended header");
-        Element_End();
+        Element_End0();
     }
 
     FILLING_BEGIN();
@@ -450,6 +434,9 @@
 //---------------------------------------------------------------------------
 void File_Id3v2::Header_Parse()
 {
+    Unsynchronisation_Frame=false;
+    DataLengthIndicator=false;
+
     if (Id3v2_Size<10) //first 10 is minimum size of a tag, Second 10 is ID3v2 header size
     {
         //Not enough place for a tag, must be padding
@@ -486,6 +473,14 @@
         int16u Flags;
         Get_C4 (Frame_ID,                                       "Frame ID");
         Get_B4 (Size,                                           "Size");
+        if (Id3v2_Version!=3)
+        {
+            Size=((Size>>0)&0x7F)
+               | ((Size>>1)&0x3F80)
+               | ((Size>>2)&0x1FC000)
+               | ((Size>>3)&0x0FE00000);
+            Param_Info2(Size, " bytes");
+        }
         Get_B2 (Flags,                                          "Flags");
         if (Id3v2_Version==3)
         {
@@ -505,16 +500,28 @@
             Skip_Flags(Flags,  3,                               "Compression");
             Skip_Flags(Flags,  2,                               "Encryption");
             Get_Flags (Flags,  1, Unsynchronisation_Frame,      "Unsynchronisation");
-            Skip_Flags(Flags,  0,                               "Data length indicator");
+            Get_Flags (Flags,  0, DataLengthIndicator,          "Data length indicator");
         }
-        if (Id3v2_Version!=3)
+    }
+
+    //Hanlding Unsynchronisation
+    if (Unsynchronisation_Global || Unsynchronisation_Frame)
+    {
+        if (Buffer_Offset+(size_t)Element_Offset+Size>Buffer_Size)
         {
-            Size=((Size>>0)&0x7F)
-               | ((Size>>1)&0x3F80)
-               | ((Size>>2)&0x1FC000)
-               | ((Size>>3)&0x0FE00000);
-            Param_Info(Size);
+            Element_WaitForMoreData();
+            return;
         }
+        for (size_t Element_Offset_Unsynch=0; Element_Offset_Unsynch+2<Element_Offset+Size; Element_Offset_Unsynch++)
+            if (CC2(Buffer+Buffer_Offset+Element_Offset_Unsynch)==0xFF00)
+            {
+                Size++;
+                if (Buffer_Offset+(size_t)Element_Offset+Size>Buffer_Size)
+                {
+                    Element_WaitForMoreData();
+                    return;
+                }
+            }
     }
 
     //Filling
@@ -532,24 +539,42 @@
 {
     Id3v2_Size-=Header_Size+Element_Size;
 
+    int32u DataLength=(int32u)-1;
+    if (DataLengthIndicator)
+    {
+        Get_B4 (DataLength,                             "Data length");
+        DataLength=((DataLength>>0)&0x7F)
+                 | ((DataLength>>1)&0x3F80)
+                 | ((DataLength>>2)&0x1FC000)
+                 | ((DataLength>>3)&0x0FE00000);
+        Param_Info2(DataLength, " bytes");
+    }
+
     //Unsynchronisation
     int8u* Buffer_Unsynch=NULL;
     const int8u* Save_Buffer=Buffer;
+    int64u Save_File_Offset=File_Offset;
     size_t Save_Buffer_Offset=Buffer_Offset;
     int64u Save_Element_Size=Element_Size;
-    size_t Element_Offset_Unsynch=0;
+    int64u Element_Offset_Unsynch=Element_Offset;
     std::vector<size_t> Unsynch_List;
     if (Unsynchronisation_Global || Unsynchronisation_Frame)
     {
-        while (Element_Offset_Unsynch+3<=Element_Size)
+        while (Element_Offset_Unsynch+2<Element_Size)
         {
             if (CC2(Buffer+Buffer_Offset+(size_t)Element_Offset_Unsynch)==0xFF00)
-                Unsynch_List.push_back(Element_Offset_Unsynch+1);
+                Unsynch_List.push_back((size_t)(Element_Offset_Unsynch+1));
             Element_Offset_Unsynch++;
         }
+        if (DataLength!=(int32u)-1 && 4+DataLength!=Element_Size-Unsynch_List.size())
+        {
+            Skip_XX(Element_Size-Element_Offset,                "Size coherency issue");
+            return;
+        }
         if (!Unsynch_List.empty())
         {
             //We must change the buffer for keeping out
+            File_Offset=Save_File_Offset+Buffer_Offset;
             Element_Size=Save_Element_Size-Unsynch_List.size();
             Buffer_Offset=0;
             Buffer_Unsynch=new int8u[(size_t)Element_Size];
@@ -567,7 +592,7 @@
     }
 
     #define CASE_INFO(_NAME, _DETAIL) \
-        case Elements::_NAME : Element_Info(_DETAIL); _NAME(); break;
+        case Elements::_NAME : Element_Info1(_DETAIL); _NAME(); break;
 
     //Parsing
     Element_Value.clear();
@@ -740,6 +765,7 @@
     if (!Unsynch_List.empty())
     {
         //We must change the buffer for keeping out
+        File_Offset=Save_File_Offset;
         Element_Size=Save_Element_Size;
         Buffer_Offset=Save_Buffer_Offset;
         delete[] Buffer; Buffer=Save_Buffer;
@@ -763,14 +789,23 @@
     Get_B1 (Encoding,                                           "Text_encoding");
     switch (Encoding)
     {
-        case 0 : Get_Local (Element_Size-1, Element_Value,      "Information"); break;
-        case 1 : Get_UTF16 (Element_Size-1, Element_Value,      "Information"); break;
-        case 2 : Get_UTF16B(Element_Size-1, Element_Value,      "Information"); break;
-        case 3 : Get_UTF8  (Element_Size-1, Element_Value,      "Information"); break;
+        case 0 : Get_ISO_8859_1 (Element_Size-Element_Offset, Element_Value, "Information"); break;
+        case 1 : Get_UTF16      (Element_Size-Element_Offset, Element_Value, "Information"); break;
+        case 2 : Get_UTF16B     (Element_Size-Element_Offset, Element_Value, "Information"); break;
+        case 3 : Get_UTF8       (Element_Size-Element_Offset, Element_Value, "Information"); break;
         default : ;
     }
 
+    //Exceptions
+    if (Element_Code==Elements::TCMP || Element_Code==Elements::TCP)
+    {
+        if (Element_Value==__T("0")) Element_Value.clear(); //This is usually set to 0 even if the user did not explicitely indicated something (default)
+        if (Element_Value==__T("1")) Element_Value=__T("Yes");
+    }
+
     //Filling
+    if (Element_Value.empty())
+        return;
     Fill_Name();
 }
 
@@ -801,17 +836,15 @@
                     return; //Problem
                 switch (Encoding)
                 {
-                    // case 0 : Get_Local (Value0_Size, Element_Values(0), "Short_content_descrip"); break;
                     case 0 : Get_ISO_8859_1 (Value0_Size, Element_Values(0), "Short_content_descrip"); break;
-                    case 3 : Get_UTF8  (Value0_Size, Element_Values(0), "Short_content_descrip"); break;
+                    case 3 : Get_UTF8       (Value0_Size, Element_Values(0), "Short_content_descrip"); break;
                     default : ;
                 }
                 Skip_B1(                                        "Null");
                 switch (Encoding)
                 {
-                    // case 0 : Get_Local (Element_Size-Element_Offset, Element_Values(1), "The_actual_text"); break;
                     case 0 : Get_ISO_8859_1 (Element_Size-Element_Offset, Element_Values(1), "The_actual_text"); break;
-                    case 3 : Get_UTF8  (Element_Size-Element_Offset, Element_Values(1), "The_actual_text"); break;
+                    case 3 : Get_UTF8       (Element_Size-Element_Offset, Element_Values(1), "The_actual_text"); break;
                     default : ;
                 }
                 break;
@@ -846,7 +879,7 @@
 //---------------------------------------------------------------------------
 void File_Id3v2::W___()
 {
-    Get_Local(Element_Size, Element_Value,                      "URL");
+    Get_ISO_8859_1(Element_Size, Element_Value,                 "URL");
 
     //Filling
     Fill_Name();
@@ -862,21 +895,23 @@
     Get_B1 (Encoding,                                           "Text_encoding");
     switch (Encoding)
     {
-        case 0 : Get_Local (Element_Size-1, Element_Values(0),  "Description"); break;
-        case 1 : Get_UTF16 (Element_Size-1, Element_Values(0),  "Description"); break;
-        case 2 : Get_UTF16B(Element_Size-1, Element_Values(0),  "Description"); break;
-        case 3 : Get_UTF8  (Element_Size-1, Element_Values(0),  "Description"); break;
+        case 0 : Get_ISO_8859_1 (Element_Size-1, Element_Values(0),  "Description"); break;
+        case 1 : Get_UTF16      (Element_Size-1, Element_Values(0),  "Description"); break;
+        case 2 : Get_UTF16B     (Element_Size-1, Element_Values(0),  "Description"); break;
+        case 3 : Get_UTF8       (Element_Size-1, Element_Values(0),  "Description"); break;
         default : ;
     }
     Element_Offset=1;
-    if (Encoding==1)
-        Element_Offset+=Element_Values(0).size()*2+4; //UTF-16 BOM + UTF-16 NULL
-    else if (Encoding==1 || Encoding==2)
-        Element_Offset+=Element_Values(0).size()*2+2; //UTF-16 NULL
-    else
-        Element_Offset+=Element_Values(0).size()+1;   //UTF-8 NULL
+    switch (Encoding)
+    {
+        case 0 : Element_Offset+=Element_Values(0).size()+1; break; //NULL
+        case 1 : Element_Offset+=Element_Values(0).size()*2+4; break; //UTF-16 BOM + UTF-16 NULL
+        case 2 : Element_Offset+=Element_Values(0).size()*2+2; break; //UTF-16 NULL
+        case 3 : Element_Offset+=Element_Values(0).To_UTF8().size()+1; break; //UTF-8 NULL
+        default : ;
+    }
     if (Element_Offset<Element_Size)
-        Get_Local(Element_Size-Element_Offset, Element_Values(1),  "URL");
+        Get_ISO_8859_1(Element_Size-Element_Offset, Element_Values(1), "URL");
 }
 
 //---------------------------------------------------------------------------
@@ -884,7 +919,6 @@
 {
     int8u Encoding, PictureType;
     Ztring Mime, Description;
-    size_t MimeLength;
     Get_B1 (Encoding,                                           "Text_encoding");
     if (Id3v2_Version==2)
     {
@@ -892,21 +926,36 @@
         Get_C3(Image_format,                                    "Image_format");
         switch (Image_format)
         {
-            case 0x504E47 : Mime="image/png";
-            case 0x4A5047 : Mime="image/jpeg";
+            case 0x504E47 : Mime="image/png"; break;
+            case 0x4A5047 : Mime="image/jpeg"; break;
             default       : ;
         }
-        MimeLength=3;
     }
     else
     {
-        Get_Local(Element_Size-1, Mime,                         "MIME_type");
-        MimeLength=Mime.size()+1;
+        int64u Element_Offset_Real=Element_Offset;
+        Get_ISO_8859_1(Element_Size-Element_Offset, Mime,       "MIME_type");
+        Element_Offset=Element_Offset_Real+Mime.size()+1;
+    }
+    Get_B1 (PictureType,                                        "Picture_type"); Element_Info1(Id3v2_PictureType(PictureType));
+    int64u Element_Offset_Real=Element_Offset;
+    switch (Encoding)
+    {
+        case 0 : Get_ISO_8859_1 (Element_Size-Element_Offset, Description, "Description"); break;
+        case 1 : Get_UTF16      (Element_Size-Element_Offset, Description, "Description"); break;
+        case 2 : Get_UTF16B     (Element_Size-Element_Offset, Description, "Description"); break;
+        case 3 : Get_UTF8       (Element_Size-Element_Offset, Description, "Description"); break;
+        default : ;
+    }
+    Element_Offset=Element_Offset_Real;
+    switch (Encoding)
+    {
+        case 0 : Element_Offset+=Description.size()+1; break; //NULL
+        case 1 : Element_Offset+=Description.size()*2+4; break; //UTF-16 BOM + UTF-16 NULL
+        case 2 : Element_Offset+=Description.size()*2+2; break; //UTF-16 NULL
+        case 3 : Element_Offset+=Description.To_UTF8().size()+1; break; //UTF-8 NULL
+        default : ;
     }
-    Element_Offset=1+MimeLength;
-    Get_B1 (PictureType,                                        "Picture_type"); Element_Info(Id3v2_PictureType(PictureType));
-    Get_Local(Element_Size-Element_Offset, Description,         "Description");
-    Element_Offset=1+MimeLength+1+Description.size()+1;
     if (Element_Offset>Element_Size)
         return; //There is a problem
     std::string Data_Raw((const char*)(Buffer+(size_t)(Buffer_Offset+Element_Offset)), (size_t)(Element_Size-Element_Offset));
@@ -926,21 +975,24 @@
     T__X();
 
     //Testing
-         if (Element_Values(0)==_T("Songs-DB_Tempo")) return;
-    else if (Element_Values(0)==_T("Songs-DB_Preference")) return;
-    else if (Element_Values(0)==_T("MusicMatch_Tempo")) return;
-    else if (Element_Values(0)==_T("MusicMatch_Mood"))
+         if (Element_Values(0)==__T("iTunes_CDDB_IDs")) return;
+    else if (Element_Values(0)==__T("iTunNORM")) return;
+    else if (Element_Values(0)==__T("iTunSMPB")) return;
+    else if (Element_Values(0)==__T("Songs-DB_Tempo")) return;
+    else if (Element_Values(0)==__T("Songs-DB_Preference")) return;
+    else if (Element_Values(0)==__T("MusicMatch_Tempo")) return;
+    else if (Element_Values(0)==__T("MusicMatch_Mood"))
     {
         if (Retrieve(Stream_General, 0, General_Mood).empty())
-            Element_Values(0)==_T("Mood");
+            Element_Values(0)==__T("Mood");
         else
             return;
     }
-    else if (Element_Values(0)==_T("MusicMatch_Preference")) return;
+    else if (Element_Values(0)==__T("MusicMatch_Preference")) return;
 
     //Filling
     if (Element_Values(0).empty())
-        Element_Values(0)=_T("Comment");
+        Element_Values(0)=__T("Comment");
     Fill_Name();
 }
 
@@ -952,17 +1004,17 @@
     Get_BF4 (Peak_Amplitude,                                    "Peak Amplitude");
     while (Element_Offset+2<=Element_Size)
     {
-        Element_Begin("Gain Adjustement", 2);
+        Element_Begin1("Gain Adjustement");
         int16u Replay_Gain_Adjustment;
         int8u  Name_code;
         bool   Sign_bit;
         BS_Begin();
-        Get_S1 (3, Name_code,                                   "Name code"); Param_Info(Id3v2_RGAD_Name_code[Name_code]);
-        Info_S1(3, Originator_code,                             "Originator code"); Param_Info(Id3v2_RGAD_Originator_code[Originator_code]);
+        Get_S1 (3, Name_code,                                   "Name code"); Param_Info1(Id3v2_RGAD_Name_code[Name_code]);
+        Info_S1(3, Originator_code,                             "Originator code"); Param_Info1(Id3v2_RGAD_Originator_code[Originator_code]);
         Get_SB (Sign_bit,                                       "Sign bit");
-        Get_S2 (9, Replay_Gain_Adjustment,                      "Replay Gain Adjustment"); Param_Info ((Sign_bit?-1:1)*(float)Replay_Gain_Adjustment/10, 1, " dB");
+        Get_S2 (9, Replay_Gain_Adjustment,                      "Replay Gain Adjustment"); Param_Info3 ((Sign_bit?-1:1)*(float)Replay_Gain_Adjustment/10, 1, " dB");
         BS_End();
-        Element_End();
+        Element_End0();
 
         FILLING_BEGIN();
             switch (Name_code)
@@ -986,7 +1038,7 @@
 {
     //Parsing
     Ztring Owner;
-    Get_Local(Element_Size, Owner,                              "Owner identifier");
+    Get_ISO_8859_1(Element_Size, Owner,                         "Owner identifier");
     Element_Offset=Owner.size()+1;
     Skip_XX(Element_Size-Element_Offset,                        "Data");
 }
@@ -998,8 +1050,8 @@
 
     //Filling
     if (!Element_Values(0).empty())
-        Element_Values(1)=Element_Values(0)+MediaInfoLib::Config.Language_Get(_T(": "))+Element_Values(1);
-    Element_Values(0)=_T("Lyrics");
+        Element_Values(1)=Element_Values(0)+MediaInfoLib::Config.Language_Get(__T(": "))+Element_Values(1);
+    Element_Values(0)=__T("Lyrics");
 
     Fill_Name();
 }
@@ -1011,7 +1063,7 @@
 
     //Filling
     if (Element_Values(0).empty())
-        Element_Values(0)=_T("Comment");
+        Element_Values(0)=__T("Comment");
     Fill_Name();
 }
 
@@ -1025,10 +1077,10 @@
     Skip_B1(                                                    "Content_type");
     switch (Encoding)
     {
-        case 0 : Get_Local (Element_Size-6, Element_Value,      "Short_content_descrip"); break;
-        case 1 : Get_UTF16 (Element_Size-6, Element_Value,      "Short_content_descrip"); break;
-        case 2 : Get_UTF16B(Element_Size-6, Element_Value,      "Short_content_descrip"); break;
-        case 3 : Get_UTF8  (Element_Size-6, Element_Value,      "Short_content_descrip"); break;
+        case 0 : Get_ISO_8859_1 (Element_Size-6, Element_Value, "Short_content_descrip"); break;
+        case 1 : Get_UTF16      (Element_Size-6, Element_Value, "Short_content_descrip"); break;
+        case 2 : Get_UTF16B     (Element_Size-6, Element_Value, "Short_content_descrip"); break;
+        case 3 : Get_UTF8       (Element_Size-6, Element_Value, "Short_content_descrip"); break;
         default : ;
     }
 
@@ -1042,8 +1094,10 @@
     W__X();
 
     //Filling
+    if (Element_Values(1).empty())
+        return;
     if (Element_Values(0).empty())
-        Element_Values(0)=_T("URL");
+        Element_Values(0)=__T("URL");
     Fill_Name();
 }
 
@@ -1054,6 +1108,13 @@
 //---------------------------------------------------------------------------
 void File_Id3v2::Fill_Name()
 {
+    Ztring Value=Ztring().From_CC4((int32u)Element_Code);
+    if (MediaInfoLib::Config.CustomMapping_IsPresent(__T("Id3v2"), Value))
+    {
+        Fill(Stream_General, 0, MediaInfoLib::Config.CustomMapping_Get(__T("Id3v2"), Value).To_Local().c_str(), Element_Value);
+        return;
+    }
+
     switch (Element_Code)
     {
         case Elements::AENC : break;
@@ -1085,8 +1146,17 @@
         case Elements::SYTC : break;
         case Elements::TALB : Fill(Stream_General, 0, General_Album, Element_Value); break;
         case Elements::TBPM : Fill(Stream_General, 0, General_BPM, Element_Value); break;
+        case Elements::TCMP : Fill(Stream_General, 0, General_Compilation, Element_Value); break;
         case Elements::TCOM : Fill(Stream_General, 0, General_Composer, Element_Value); break;
-        case Elements::TCON : Fill(Stream_General, 0, General_Genre, Element_Value); break;
+        case Elements::TCON :
+                              {
+                                if (Element_Value.find(__T("("))==0)
+                                    Element_Value=Element_Value.SubString(__T("("), __T(")")); //Replace (nn) by nn
+                                if (Element_Value==__T("0") || Element_Value==__T("255"))
+                                    Element_Value.clear();
+                                Fill(Stream_General, 0, General_Genre, Element_Value);
+                              }
+                              break;
         case Elements::TCOP : Fill(Stream_General, 0, General_Copyright, Element_Value); break;
         case Elements::TDA  :
         case Elements::TDAT : if (Element_Value.size()==4)
@@ -1100,7 +1170,7 @@
         case Elements::TDRC : Normalize_Date(Element_Value); Fill(Stream_General, 0, General_Recorded_Date, Element_Value); break;
         case Elements::TDRL : Normalize_Date(Element_Value); Fill(Stream_General, 0, General_Released_Date, Element_Value); break;
         case Elements::TDTG : Normalize_Date(Element_Value); Fill(Stream_General, 0, General_Tagged_Date, Element_Value); break;
-        case Elements::TENC : Fill(Stream_General, 0, General_Encoded_Library, Element_Value); break;
+        case Elements::TENC : Fill(Stream_General, 0, General_EncodedBy, Element_Value); break;
         case Elements::TEXT : Fill(Stream_General, 0, General_Lyricist, Element_Value); break;
         case Elements::TFLT : Fill(Stream_General, 0, "File type", Element_Value); break;
         case Elements::TIM  :
@@ -1110,7 +1180,7 @@
                             Minute.assign(Element_Value.c_str(), 2, 2); break;
                          }
         case Elements::TIPL : Fill(Stream_General, 0, General_ThanksTo, Element_Value); break;
-        case Elements::TIT1 : Fill(Stream_General, 0, General_ContentType, Element_Value); break;
+        case Elements::TIT1 : Fill(Stream_General, 0, General_Grouping, Element_Value); break;
         case Elements::TIT2 : Fill(Stream_General, 0, General_Track, Element_Value); break;
         case Elements::TIT3 : Fill(Stream_General, 0, General_Track_More, Element_Value); break;
         case Elements::TKEY : Fill(Stream_General, 0, "Initial key", Element_Value); break;
@@ -1126,13 +1196,29 @@
         case Elements::TORY : Normalize_Date(Element_Value); Fill(Stream_General, 0, "Original/Released_Date", Element_Value); break;
         case Elements::TOWN : Fill(Stream_General, 0, General_Owner, Element_Value); break;
         case Elements::TPE1 : Fill(Stream_General, 0, General_Performer, Element_Value); break;
-        case Elements::TPE2 : Fill(Stream_General, 0, General_Accompaniment, Element_Value); break;
+        case Elements::TPE2 : Fill(Stream_General, 0, General_Album_Performer, Element_Value); break;
         case Elements::TPE3 : Fill(Stream_General, 0, General_Conductor, Element_Value); break;
         case Elements::TPE4 : Fill(Stream_General, 0, General_RemixedBy, Element_Value); break;
-        case Elements::TPOS : Fill(Stream_General, 0, General_Part_Position, Element_Value); break;
+        case Elements::TPOS :
+                              {
+                                ZtringList List; List.Separator_Set(0, __T("/")); List.Write(Element_Value);
+                                if (!List(0).empty())
+                                    Fill(Stream_General, 0, General_Part_Position, List(0));
+                                if (!List(1).empty())
+                                    Fill(Stream_General, 0, General_Part_Position_Total, List(1));
+                              }
+                              break;
         case Elements::TPRO : Fill(Stream_General, 0, General_Producer_Copyright, Element_Value); break;
         case Elements::TPUB : Fill(Stream_General, 0, General_Publisher, Element_Value); break;
-        case Elements::TRCK : Fill(Stream_General, 0, General_Track_Position, Element_Value); break;
+        case Elements::TRCK :
+                              {
+                                ZtringList List; List.Separator_Set(0, __T("/")); List.Write(Element_Value);
+                                if (!List(0).empty())
+                                    Fill(Stream_General, 0, General_Track_Position, List(0));
+                                if (!List(1).empty())
+                                    Fill(Stream_General, 0, General_Track_Position_Total, List(1));
+                              }
+                              break;
         case Elements::TRDA : Normalize_Date(Element_Value); Fill(Stream_General, 0, "Recorded_Date", Element_Value); break;
         case Elements::TRSN : Fill(Stream_General, 0, General_ServiceName, Element_Value); break;
         case Elements::TRSO : Fill(Stream_General, 0, General_ServiceProvider, Element_Value); break;
@@ -1143,20 +1229,22 @@
         case Elements::TSOP : Fill(Stream_General, 0, General_Performer_Sort, Element_Value); break;
         case Elements::TSOT : Fill(Stream_General, 0, General_Track_Sort, Element_Value); break;
         case Elements::TSRC : Fill(Stream_General, 0, General_ISRC, Element_Value); break;
-        case Elements::TSSE : Fill(Stream_General, 0, General_Encoded_Library_Settings, Element_Value); break;
+        case Elements::TSSE : Fill(Stream_General, 0, General_Encoded_Library, Element_Value); break;
         case Elements::TSST : Fill(Stream_General, 0, "Set subtitle", Element_Value); break;
-        case Elements::TXXX :      if (Element_Values(0)==_T("CT_GAPLESS_DATA"))        ;
-                         else if (Element_Values(0)==_T("DISCNUMBER"))             Fill(Stream_General, 0, General_Part_Position,           Element_Values(1), true);
-                         else if (Element_Values(0)==_T("DISCTOTAL"))              Fill(Stream_General, 0, General_Part_Position_Total,     Element_Values(1), true);
-                         else if (Element_Values(0)==_T("first_played_timestamp")) Fill(Stream_General, 0, General_Played_First_Date,       Ztring().Date_From_Milliseconds_1601(Element_Values(1).To_int64u()/10000));
-                         else if (Element_Values(0)==_T("last_played_timestamp"))  Fill(Stream_General, 0, General_Played_Last_Date,        Ztring().Date_From_Milliseconds_1601(Element_Values(1).To_int64u()/10000));
-                         else if (Element_Values(0)==_T("play_count"))             Fill(Stream_General, 0, General_Played_Count,            Element_Values(1).To_int64u());
-                         else if (Element_Values(0)==_T("added_timestamp"))        Fill(Stream_General, 0, General_Added_Date,              Ztring().Date_From_Milliseconds_1601(Element_Values(1).To_int64u()/10000));
-                         else if (Element_Values(0)==_T("replaygain_album_gain"))  Fill(Stream_General, 0, General_Album_ReplayGain_Gain,   Element_Values(1).To_float64(), 2, true);
-                         else if (Element_Values(0)==_T("replaygain_album_peak"))  Fill(Stream_General, 0, General_Album_ReplayGain_Peak,   Element_Values(1).To_float64(), 6, true);
-                         else if (Element_Values(0)==_T("replaygain_track_gain"))  Fill(Stream_Audio,   0, Audio_ReplayGain_Gain,           Element_Values(1).To_float64(), 2, true);
-                         else if (Element_Values(0)==_T("replaygain_track_peak"))  Fill(Stream_Audio,   0, Audio_ReplayGain_Peak,           Element_Values(1).To_float64(), 6, true);
-                         else if (Element_Values(0)==_T("TRACKTOTAL"))             Fill(Stream_General, 0, General_Track_Position_Total,    Element_Values(1), true);
+        case Elements::TXXX : if (Element_Values(0)==__T("AccurateRipResult"))      ;
+                         else if (Element_Values(0)==__T("AccurateRipDiscID"))      ;
+                         else if (Element_Values(0)==__T("CT_GAPLESS_DATA"))        ;
+                         else if (Element_Values(0)==__T("DISCNUMBER"))             Fill(Stream_General, 0, General_Part_Position,           Element_Values(1), true);
+                         else if (Element_Values(0)==__T("DISCTOTAL"))              Fill(Stream_General, 0, General_Part_Position_Total,     Element_Values(1), true);
+                         else if (Element_Values(0)==__T("first_played_timestamp")) Fill(Stream_General, 0, General_Played_First_Date,       Ztring().Date_From_Milliseconds_1601(Element_Values(1).To_int64u()/10000));
+                         else if (Element_Values(0)==__T("last_played_timestamp"))  Fill(Stream_General, 0, General_Played_Last_Date,        Ztring().Date_From_Milliseconds_1601(Element_Values(1).To_int64u()/10000));
+                         else if (Element_Values(0)==__T("play_count"))             Fill(Stream_General, 0, General_Played_Count,            Element_Values(1).To_int64u());
+                         else if (Element_Values(0)==__T("added_timestamp"))        Fill(Stream_General, 0, General_Added_Date,              Ztring().Date_From_Milliseconds_1601(Element_Values(1).To_int64u()/10000));
+                         else if (Element_Values(0)==__T("replaygain_album_gain"))  Fill(Stream_General, 0, General_Album_ReplayGain_Gain,   Element_Values(1).To_float64(), 2, true);
+                         else if (Element_Values(0)==__T("replaygain_album_peak"))  Fill(Stream_General, 0, General_Album_ReplayGain_Peak,   Element_Values(1).To_float64(), 6, true);
+                         else if (Element_Values(0)==__T("replaygain_track_gain"))  Fill(Stream_Audio,   0, Audio_ReplayGain_Gain,           Element_Values(1).To_float64(), 2, true);
+                         else if (Element_Values(0)==__T("replaygain_track_peak"))  Fill(Stream_Audio,   0, Audio_ReplayGain_Peak,           Element_Values(1).To_float64(), 6, true);
+                         else if (Element_Values(0)==__T("TRACKTOTAL"))             Fill(Stream_General, 0, General_Track_Position_Total,    Element_Values(1), true);
                          else
                             Fill(Stream_General, 0, Element_Values(0).To_UTF8().c_str(), Element_Values(1));
                          break;
@@ -1194,7 +1282,16 @@
         case Elements::TAL  : Fill(Stream_General, 0, "Album", Element_Value); break;
         case Elements::TBP  : Fill(Stream_General, 0, "BPM", Element_Value); break;
         case Elements::TCM  : Fill(Stream_General, 0, "Composer", Element_Value); break;
-        case Elements::TCO  : Fill(Stream_General, 0, "Genre", Element_Value); break;
+        case Elements::TCO  :
+                              {
+                                if (Element_Value.find(__T("("))==0)
+                                    Element_Value=Element_Value.SubString(__T("("), __T(")")); //Replace (nn) by nn
+                                if (Element_Value==__T("0") || Element_Value==__T("255"))
+                                    Element_Value.clear();
+                                if (!Element_Value.empty())
+                                    Fill(Stream_General, 0, General_Genre, Element_Value);
+                              }
+                              break;
         case Elements::TCR  : Fill(Stream_General, 0, "Copyright", Element_Value); break;
         case Elements::TDY  : break;
         case Elements::TEN  : Fill(Stream_General, 0, "Encoded_Library", Element_Value); break;
@@ -1212,14 +1309,30 @@
         case Elements::TP2  : Fill(Stream_General, 0, "Accompaniment", Element_Value); break;
         case Elements::TP3  : Fill(Stream_General, 0, "Conductor", Element_Value); break;
         case Elements::TP4  : Fill(Stream_General, 0, "RemixedBy", Element_Value); break;
-        case Elements::TPA  : Fill(Stream_General, 0, "Part/Position", Element_Value); break;
+        case Elements::TPA  :
+                              {
+                                ZtringList List; List.Separator_Set(0, __T("/")); List.Write(Element_Value);
+                                if (!List(0).empty())
+                                    Fill(Stream_General, 0, General_Part_Position, List(0));
+                                if (!List(1).empty())
+                                    Fill(Stream_General, 0, General_Part_Position_Total, List(1));
+                              }
+                              break;
         case Elements::TPB  : Fill(Stream_General, 0, "Publisher", Element_Value); break;
         case Elements::TRC  : Fill(Stream_General, 0, "ISRC", Element_Value); break;
         case Elements::TRD  : Normalize_Date(Element_Value); Fill(Stream_General, 0, "Recorded_Date", Element_Value); break;
-        case Elements::TRK  : Fill(Stream_General, 0, "Track/Position", Element_Value); break;
+        case Elements::TRK  :
+                              {
+                                ZtringList List; List.Separator_Set(0, __T("/")); List.Write(Element_Value);
+                                if (!List(0).empty())
+                                    Fill(Stream_General, 0, General_Track_Position, List(0));
+                                if (!List(1).empty())
+                                    Fill(Stream_General, 0, General_Track_Position_Total, List(1));
+                              }
+                              break;
         case Elements::TSI  : break;
         case Elements::TSS  : break;
-        case Elements::TT1  : Fill(Stream_General, 0, "ContentType", Element_Value); break;
+        case Elements::TT1  : Fill(Stream_General, 0, "Grouping", Element_Value); break;
         case Elements::TT2  : Fill(Stream_General, 0, "Track", Element_Value); break;
         case Elements::TT3  : Fill(Stream_General, 0, "Track/More", Element_Value); break;
         case Elements::TXT  : Fill(Stream_General, 0, "Lyricist", Element_Value); break;
@@ -1243,8 +1356,8 @@
 {
     if (Date.size()<=8)
         return; //Format unknown
-    Date[8]=_T(' '); //could be "T"
-    Date=Ztring(_T("UTC "))+Date; //Id3v2 specify a UTC date
+    Date[8]=__T(' '); //could be "T"
+    Date=Ztring(__T("UTC "))+Date; //Id3v2 specify a UTC date
 }
 
 //***************************************************************************

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Tag/File_Id3v2.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Tag/File_Id3v2.h Changed

@@ -1,17 +1,17 @@
 // File_Id3v2 - Info for ID3v2 tagged files
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -48,7 +48,7 @@
 
 private :
     //Streams management
-    void Streams_Finish();
+    void Streams_Fill();
 
     //Buffer - File header
     void FileHeader_Parse ();
@@ -95,7 +95,7 @@
     void SYTC()   {Skip_XX(Element_Size, "Data");}
     void TALB()   {T___();}
     void TBPM()   {T___();}
-    void TCMP()   {Skip_XX(Element_Size, "Data");}
+    void TCMP()   {T___();}
     void TCOM()   {T___();}
     void TCON()   {T___();}
     void TCOP()   {T___();}
@@ -235,6 +235,7 @@
     int8u  Id3v2_Version;
     bool   Unsynchronisation_Global;
     bool   Unsynchronisation_Frame;
+    bool   DataLengthIndicator;
 
     //Helpers
     void Fill_Name();

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Tag/File_Lyrics3.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Tag/File_Lyrics3.cpp Changed

@@ -1,31 +1,35 @@
 // File_Lyrics3 - Info for Lyrics3 tagged files
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_LYRICS3_YES)
 //---------------------------------------------------------------------------

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Tag/File_Lyrics3.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Tag/File_Lyrics3.h Changed

@@ -1,17 +1,17 @@
 // File_Lyrics3 - Info for Lyrics3 tagged files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Tag/File_Lyrics3v2.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Tag/File_Lyrics3v2.cpp Changed

@@ -1,31 +1,35 @@
 // File_Lyrics3v2 - Info for Lyrics3v2 tagged files
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_LYRICS3V2_YES)
 //---------------------------------------------------------------------------
 
@@ -121,7 +125,7 @@
 void File_Lyrics3v2::Data_Parse()
 {
     #define CASE_INFO(_NAME, _DETAIL) \
-        case Elements::_NAME : Element_Info(_DETAIL); _NAME(); break;
+        case Elements::_NAME : Element_Info1(_DETAIL); _NAME(); break;
 
     //Parsing
     switch (Element_Code)

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Tag/File_Lyrics3v2.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Tag/File_Lyrics3v2.h Changed

@@ -1,17 +1,17 @@
 // File_Lyrics3v2 - Info for Lyrics3v2 tagged files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Tag/File_VorbisCom.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Tag/File_VorbisCom.cpp Changed

@@ -1,31 +1,35 @@
 // File_VorbisCom - Info for VorbisComments tagged files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_VORBISCOM_YES) || defined(MEDIAINFO_OGG_YES)
 //---------------------------------------------------------------------------
 
@@ -60,6 +64,38 @@
 }
 
 //***************************************************************************
+// Streams management
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_VorbisCom::Streams_Fill()
+{
+    if (!Performers.empty())
+    {
+        Artists.Separator_Set(0, __T(" / "));
+        Fill(StreamKind_Common,   0, "Performer", Performers.Read());
+    }
+
+    if (!Artists.empty() && Artists!=Performers)
+    {
+        Artists.Separator_Set(0, __T(" / "));
+        Fill(StreamKind_Common,   0, Performers.empty()?"Performer":"Composer", Artists.Read());
+    }
+
+    if (!Accompaniments.empty() && Accompaniments!=Artists && Accompaniments!=Performers)
+    {
+        Artists.Separator_Set(0, __T(" / "));
+        Fill(StreamKind_Common,   0, "Accompaniment", Accompaniments.Read());
+    }
+
+    if (!AlbumArtists.empty())
+    {
+        AlbumArtists.Separator_Set(0, __T(" / "));
+        Fill(StreamKind_Common,   0, (Performers==Artists || Performers.empty())?"Album/Performer":"Album/Composer", AlbumArtists.Read());
+    }
+}
+
+//***************************************************************************
 // Buffer - File header
 //***************************************************************************
 
@@ -84,24 +120,24 @@
             Stream_Prepare(StreamKind_Multiple);
 
         //vendor_string
-        if (StreamKind_Specific!=Stream_Audio && vendor_string.find(_T("Xiph.Org libVorbis"))==0)
+        if (StreamKind_Specific!=Stream_Audio && vendor_string.find(__T("Xiph.Org libVorbis"))==0)
             vendor_string.clear(); //string was set "by default"
         Ztring Library_Name, Library_Version, Library_Date;
-        Ztring vendor_string_Without=vendor_string; vendor_string_Without.FindAndReplace(_T(";"), _T(""), 0, Ztring_Recursive);
+        Ztring vendor_string_Without=vendor_string; vendor_string_Without.FindAndReplace(__T(";"), __T(""), 0, Ztring_Recursive);
         Library_Version=MediaInfoLib::Config.Library_Get(InfoLibrary_Format_VorbisCom, vendor_string_Without, InfoLibrary_Version);
         Library_Date=MediaInfoLib::Config.Library_Get(InfoLibrary_Format_VorbisCom, vendor_string_Without, InfoLibrary_Date);
         if (Library_Version.empty())
         {
-            if (vendor_string.find(_T(" I "))!=std::string::npos)
+            if (vendor_string.find(__T(" I "))!=std::string::npos)
             {
-                Library_Name=vendor_string.SubString(_T(""), _T(" I "));
-                Library_Date=vendor_string.SubString(_T(" I "), _T(""));
+                Library_Name=vendor_string.SubString(__T(""), __T(" I "));
+                Library_Date=vendor_string.SubString(__T(" I "), __T(""));
                 if (Library_Date.size()>9)
                 {
                     Library_Version=Library_Date.substr(9, std::string::npos);
-                    if (Library_Version.find(_T("("))==std::string::npos)
+                    if (Library_Version.find(__T("("))==std::string::npos)
                     {
-                        Library_Version.FindAndReplace(_T(" "), _T("."), 0, Ztring_Recursive);
+                        Library_Version.FindAndReplace(__T(" "), __T("."), 0, Ztring_Recursive);
                         Library_Date.resize(8);
                     }
                 }
@@ -112,39 +148,39 @@
                 Library_Date=vendor_string.substr(vendor_string.size()-8, std::string::npos);
                 if (!Library_Name.empty())
                 {
-                    std::string::size_type Pos=Library_Name.rfind(_T(' '));
-                    if (Pos<Library_Name.size()-2 && Library_Name[Pos+1]>=_T('0') && Library_Name[Pos+1]<=_T('9'))
+                    std::string::size_type Pos=Library_Name.rfind(__T(' '));
+                    if (Pos<Library_Name.size()-2 && Library_Name[Pos+1]>=__T('0') && Library_Name[Pos+1]<=__T('9'))
                     {
                         Library_Version=Library_Name.substr(Pos+1, std::string::npos);
                         Library_Name.resize(Pos);
                     }
                 }
             }
-            else if (vendor_string.find(_T("aoTuV "))!=std::string::npos)
+            else if (vendor_string.find(__T("aoTuV "))!=std::string::npos)
             {
-                Library_Name=_T("aoTuV");
-                Library_Version=vendor_string.SubString(_T("aoTuV "), _T("["));
-                Library_Date=vendor_string.SubString(_T("["), _T("]"));
+                Library_Name=__T("aoTuV");
+                Library_Version=vendor_string.SubString(__T("aoTuV "), __T("["));
+                Library_Date=vendor_string.SubString(__T("["), __T("]"));
             }
-            else if (vendor_string.find(_T("Lancer "))!=std::string::npos)
+            else if (vendor_string.find(__T("Lancer "))!=std::string::npos)
             {
-                Library_Name=_T("Lancer");
-                Library_Date=vendor_string.SubString(_T("["), _T("]"));
+                Library_Name=__T("Lancer");
+                Library_Date=vendor_string.SubString(__T("["), __T("]"));
             }
             if (Library_Version.empty())
                 Library_Version=Library_Date;
             if (Library_Date.size()==8)
             {
-                Library_Date.insert(Library_Date.begin()+6, _T('-'));
-                Library_Date.insert(Library_Date.begin()+4, _T('-'));
-                Library_Date.insert(0, _T("UTC "));
+                Library_Date.insert(6, 1, __T('-'));
+                Library_Date.insert(4, 1, __T('-'));
+                Library_Date.insert(0, __T("UTC "));
             }
         }
-        if (vendor_string.find(_T("libFLAC"))!=std::string::npos) Library_Name="libFLAC";
-        if (vendor_string.find(_T("libVorbis I"))!=std::string::npos) Library_Name="libVorbis";
-        if (vendor_string.find(_T("libTheora I"))!=std::string::npos) Library_Name="libTheora";
-        if (vendor_string.find(_T("AO; aoTuV"))==0) Library_Name="aoTuV";
-        if (vendor_string.find(_T("BS; Lancer"))==0) Library_Name="Lancer";
+        if (vendor_string.find(__T("libFLAC"))!=std::string::npos) Library_Name="libFLAC";
+        if (vendor_string.find(__T("libVorbis I"))!=std::string::npos) Library_Name="libVorbis";
+        if (vendor_string.find(__T("libTheora I"))!=std::string::npos) Library_Name="libTheora";
+        if (vendor_string.find(__T("AO; aoTuV"))==0) Library_Name="aoTuV";
+        if (vendor_string.find(__T("BS; Lancer"))==0) Library_Name="Lancer";
 
         Fill(StreamKind_Specific, 0, "Encoded_Library", vendor_string);
         Fill(StreamKind_Specific, 0, "Encoded_Library/Name", Library_Name);
@@ -184,72 +220,85 @@
     Element_Name(comment);
 
     FILLING_BEGIN_PRECISE();
-        Ztring Key=comment.SubString(_T(""), _T("="));
+        Ztring Key=comment.SubString(__T(""), __T("="));
         Key.MakeUpperCase();
-        Ztring Value=comment.SubString(_T("="), _T(""));
-
-             if (Key==_T("ADDED_TIMESTAMP"))        Fill(StreamKind_Common,   0, "Added_Date", Ztring().Date_From_Milliseconds_1601(Value.To_int64u()/1000));
-        else if (Key==_T("ALBUM ARTIST"))           {if (Value!=Retrieve(StreamKind_Common,   0, "Performer")) Fill(StreamKind_Common,   0, "Performer", Value);}
-        else if (Key==_T("ALBUM"))                  Fill(StreamKind_Common,   0, "Album", Value);
-        else if (Key==_T("ALBUM_COMMENT"))          Fill(StreamKind_Common,   0, "Comment", Value);
-        else if (Key==_T("ALBUMARTIST"))            {if (Value!=Retrieve(StreamKind_Common,   0, "Performer")) Fill(StreamKind_Common,   0, "Performer", Value);}
-        else if (Key==_T("ARTIST"))                 {if (Value!=Retrieve(StreamKind_Common,   0, "Performer")) Fill(StreamKind_Common,   0, "Performer", Value);}
-        else if (Key==_T("AUTHOR"))                 Fill(StreamKind_Common,   0, "WrittenBy", Value);
-        else if (Key==_T("BUYCDURL"))               {}
-        else if (Key==_T("CLASS"))                  Fill(StreamKind_Common,   0, "ContentType", Value);
-        else if (Key==_T("COMPOSER"))               Fill(StreamKind_Common,   0, "Composer", Value);
-        else if (Key==_T("COMMENT"))                Fill(StreamKind_Common,   0, "Comment", Value);
-        else if (Key==_T("COMMENTS"))               Fill(StreamKind_Common,   0, "Comment", Value);
-        else if (Key==_T("CONDUCTOR"))              Fill(StreamKind_Common,   0, "Conductor", Value);
-        else if (Key==_T("CONTACT"))                Fill(StreamKind_Common,   0, "Publisher", Value);
-        else if (Key==_T("COPYRIGHT"))              Fill(StreamKind_Common,   0, "Copyright", Value);
-        else if (Key==_T("DATE"))                   Fill(StreamKind_Common,   0, "Recorded_Date", Value, true);
-        else if (Key==_T("DESCRIPTION"))            Fill(StreamKind_Common,   0, "Description", Value);
-        else if (Key==_T("DISC"))                   Fill(StreamKind_Common,   0, "Part", Value, true);
-        else if (Key==_T("DISCNUMBER"))             Fill(StreamKind_Common,   0, "Part", Value, true);
-        else if (Key==_T("ENCODEDBY"))              Fill(StreamKind_Common,   0, "EncodedBy", Value);
-        else if (Key==_T("ENCODER"))                Fill(StreamKind_Common,   0, "Encoded_Application", Value);
-        else if (Key==_T("ENCODED_USING"))          Fill(StreamKind_Common,   0, "Encoded_Application", Value);
-        else if (Key==_T("ENCODER_URL"))            Fill(StreamKind_Common,   0, "Encoded_Application/Url", Value);
-        else if (Key==_T("ENSEMBLE"))               {if (Value!=Retrieve(StreamKind_Common,   0, "Performer")) Fill(StreamKind_Common,   0, "Accompaniment", Value);}
-        else if (Key==_T("GENRE"))                  Fill(StreamKind_Common,   0, "Genre", Value);
-        else if (Key==_T("FIRST_PLAYED_TIMESTAMP")) Fill(StreamKind_Common,   0, "Played_First_Date", Ztring().Date_From_Milliseconds_1601(Value.To_int64u()/10000));
-        else if (Key==_T("ISRC"))                   Fill(StreamKind_Multiple, 0, "ISRC", Value);
-        else if (Key==_T("LABEL"))                  Fill(StreamKind_Common,   0, "Label", Value);
-        else if (Key==_T("LANGUAGE"))               {if (Value.find(_T("Director"))==0) Fill(StreamKind_Specific, 0, "Language_More", Value); else if (!Value.SubString(_T("["), _T("]")).empty()) Fill(StreamKind_Specific, 0, "Language", Value.SubString(_T("["), _T("]"))); else Fill(StreamKind_Specific, 0, "Language", Value);}
-        else if (Key==_T("LAST_PLAYED_TIMESTAMP"))  Fill(StreamKind_Multiple, 0, "Played_Last_Date", Ztring().Date_From_Milliseconds_1601(Value.To_int64u()/10000));
-        else if (Key==_T("LICENCE"))                Fill(StreamKind_Common,   0, "TermsOfUse", Value);
-        else if (Key==_T("LYRICS"))                 Fill(StreamKind_Common,   0, "Lyrics", Value);
-        else if (Key==_T("LWING_GAIN"))             Fill(StreamKind_Multiple, 0, "ReplayGain_Gain", Value.To_float64(), 2);
-        else if (Key==_T("LOCATION"))               Fill(StreamKind_Common,   0, "Recorded/Location", Value);
-        else if (Key==_T("ORGANIZATION"))           Fill(StreamKind_Common,   0, "Producer", Value);
-        else if (Key==_T("PERFORMER"))              Fill(StreamKind_Common,   0, "Performer", Value);
-        else if (Key==_T("PLAY_COUNT"))             Fill(StreamKind_Multiple, 0, "Played_Count", Value.To_int64u());
-        else if (Key==_T("RATING"))                 Fill(StreamKind_Multiple, 0, "Rating", Value);
-        else if (Key==_T("REPLAYGAIN_ALBUM_GAIN"))  Fill(StreamKind_Common,   0, "Album_ReplayGain_Gain", Value.To_float64(), 2);
-        else if (Key==_T("REPLAYGAIN_ALBUM_PEAK"))  Fill(StreamKind_Common,   0, "Album_ReplayGain_Peak", Value.To_float64(), 6);
-        else if (Key==_T("REPLAYGAIN_TRACK_GAIN"))  Fill(StreamKind_Specific, 0, "ReplayGain_Gain",       Value.To_float64(), 2);
-        else if (Key==_T("REPLAYGAIN_TRACK_PEAK"))  Fill(StreamKind_Specific, 0, "ReplayGain_Peak",       Value.To_float64(), 6);
-        else if (Key==_T("TITLE"))                  Fill(StreamKind_Common,   0, "Title", Value);
-        else if (Key==_T("TOTALTRACKS"))            Fill(StreamKind_Common,   0, "Track/Position_Total", Value);
-        else if (Key==_T("TRACK_COMMENT"))          Fill(StreamKind_Multiple, 0, "Comment", Value);
-        else if (Key==_T("TRACKNUMBER"))            Fill(StreamKind_Multiple, 0, "Track/Position", Value);
-        else if (Key==_T("VERSION"))                Fill(StreamKind_Common,   0, "Track/More", Value);
-        else if (Key==_T("WAVEFORMATEXTENSIBLE_CHANNEL_MASK"))
+        Ztring Value=comment.SubString(__T("="), __T(""));
+
+             if (Key==__T("ADDED_TIMESTAMP"))        Fill(StreamKind_Common,   0, "Added_Date", Ztring().Date_From_Milliseconds_1601(Value.To_int64u()/1000));
+        else if (Key==__T("ALBUM ARTIST"))           AlbumArtists.push_back(Value);
+        else if (Key==__T("ALBUM"))                  Fill(StreamKind_Common,   0, "Album", Value);
+        else if (Key==__T("ALBUM_COMMENT"))          Fill(StreamKind_Common,   0, "Comment", Value);
+        else if (Key==__T("ALBUMARTIST"))            AlbumArtists.push_back(Value);
+        else if (Key==__T("ARTIST"))                 Artists.push_back(Value);
+        else if (Key==__T("AUTHOR"))                 Fill(StreamKind_Common,   0, "WrittenBy", Value);
+        else if (Key==__T("BUYCDURL"))               {}
+        else if (Key==__T("CLASS"))                  Fill(StreamKind_Common,   0, "ContentType", Value);
+        else if (Key==__T("COMPOSER"))               Fill(StreamKind_Common,   0, "Composer", Value);
+        else if (Key==__T("COMMENT"))                Fill(StreamKind_Common,   0, "Comment", Value);
+        else if (Key==__T("COMMENTS"))               Fill(StreamKind_Common,   0, "Comment", Value);
+        else if (Key==__T("CONDUCTOR"))              Fill(StreamKind_Common,   0, "Conductor", Value);
+        else if (Key==__T("CONTACT"))                Fill(StreamKind_Common,   0, "Publisher", Value);
+        else if (Key==__T("COPYRIGHT"))              Fill(StreamKind_Common,   0, "Copyright", Value);
+        else if (Key==__T("DATE"))                   Fill(StreamKind_Common,   0, "Recorded_Date", Value, true);
+        else if (Key==__T("DESCRIPTION"))            Fill(StreamKind_Common,   0, "Description", Value);
+        else if (Key==__T("DISC"))                   Fill(StreamKind_Common,   0, "Part", Value, true);
+        else if (Key==__T("DISCID"))                 {}
+        else if (Key==__T("DISCNUMBER"))             Fill(StreamKind_Common,   0, "Part", Value, true);
+        else if (Key==__T("ENCODEDBY"))              Fill(StreamKind_Common,   0, "EncodedBy", Value);
+        else if (Key==__T("ENCODED-BY"))             Fill(StreamKind_Common,   0, "EncodedBy", Value);
+        else if (Key==__T("ENCODER"))                Fill(StreamKind_Common,   0, "Encoded_Application", Value);
+        else if (Key==__T("ENCODED_USING"))          Fill(StreamKind_Common,   0, "Encoded_Application", Value);
+        else if (Key==__T("ENCODER_URL"))            Fill(StreamKind_Common,   0, "Encoded_Application/Url", Value);
+        else if (Key==__T("ENSEMBLE"))               Accompaniments.push_back(Value);
+        else if (Key==__T("GENRE"))                  Fill(StreamKind_Common,   0, "Genre", Value);
+        else if (Key==__T("FIRST_PLAYED_TIMESTAMP")) Fill(StreamKind_Common,   0, "Played_First_Date", Ztring().Date_From_Milliseconds_1601(Value.To_int64u()/10000));
+        else if (Key==__T("ISRC"))                   Fill(StreamKind_Multiple, 0, "ISRC", Value);
+        else if (Key==__T("LABEL"))                  Fill(StreamKind_Common,   0, "Label", Value);
+        else if (Key==__T("LANGUAGE"))               {if (Value.find(__T("Director"))==0) Fill(StreamKind_Specific, 0, "Language_More", Value); else if (!Value.SubString(__T("["), __T("]")).empty()) Fill(StreamKind_Specific, 0, "Language", Value.SubString(__T("["), __T("]"))); else Fill(StreamKind_Specific, 0, "Language", Value);}
+        else if (Key==__T("LAST_PLAYED_TIMESTAMP"))  Fill(StreamKind_Multiple, 0, "Played_Last_Date", Ztring().Date_From_Milliseconds_1601(Value.To_int64u()/10000));
+        else if (Key==__T("LICENCE"))                Fill(StreamKind_Common,   0, "TermsOfUse", Value);
+        else if (Key==__T("LICENSE"))                Fill(StreamKind_Common,   0, "TermsOfUse", Value);
+        else if (Key==__T("LYRICS"))                 Fill(StreamKind_Common,   0, "Lyrics", Value);
+        else if (Key==__T("LWING_GAIN"))             Fill(StreamKind_Multiple, 0, "ReplayGain_Gain", Value.To_float64(), 2);
+        else if (Key==__T("LOCATION"))               Fill(StreamKind_Common,   0, "Recorded/Location", Value);
+        else if (Key==__T("MUSICBRAINZ_ALBUMID"))    {}
+        else if (Key==__T("MUSICBRAINZ_ALBUMARTISTID")) {}
+        else if (Key==__T("MUSICBRAINZ_ARTISTID"))   {}
+        else if (Key==__T("MUSICBRAINZ_TRACKID"))    {}
+        else if (Key==__T("MUSICBRAINZ_SORTNAME"))   Fill(StreamKind_Common,   0, "Performer/Sort", Value);
+        else if (Key==__T("MUSICBRAINZ_DISCID"))     {}
+        else if (Key==__T("ORGANIZATION"))           Fill(StreamKind_Common,   0, "Producer", Value);
+        else if (Key==__T("PERFORMER"))              Performers.push_back(Value);
+        else if (Key==__T("PLAY_COUNT"))             Fill(StreamKind_Multiple, 0, "Played_Count", Value.To_int64u());
+        else if (Key==__T("RATING"))                 Fill(StreamKind_Multiple, 0, "Rating", Value);
+        else if (Key==__T("REPLAYGAIN_ALBUM_GAIN"))  Fill(StreamKind_Common,   0, "Album_ReplayGain_Gain", Value.To_float64(), 2);
+        else if (Key==__T("REPLAYGAIN_ALBUM_PEAK"))  Fill(StreamKind_Common,   0, "Album_ReplayGain_Peak", Value.To_float64(), 6);
+        else if (Key==__T("REPLAYGAIN_REFERENCE_LOUDNESS")) {}
+        else if (Key==__T("REPLAYGAIN_TRACK_GAIN"))  Fill(StreamKind_Specific, 0, "ReplayGain_Gain",       Value.To_float64(), 2);
+        else if (Key==__T("REPLAYGAIN_TRACK_PEAK"))  Fill(StreamKind_Specific, 0, "ReplayGain_Peak",       Value.To_float64(), 6);
+        else if (Key==__T("TITLE"))                  Fill(StreamKind_Common,   0, "Title", Value);
+        else if (Key==__T("TOTALTRACKS"))            Fill(StreamKind_Common,   0, "Track/Position_Total", Value);
+        else if (Key==__T("TOTALDISCS"))             Fill(StreamKind_Common,   0, "Part/Position_Total", Value);
+        else if (Key==__T("TRACK_COMMENT"))          Fill(StreamKind_Multiple, 0, "Comment", Value);
+        else if (Key==__T("TRACKNUMBER"))            Fill(StreamKind_Multiple, 0, "Track/Position", Value);
+        else if (Key==__T("TRACKTOTAL"))             Fill(StreamKind_Multiple, 0, "Track/Position_Total", Value);
+        else if (Key==__T("VERSION"))                Fill(StreamKind_Common,   0, "Track/More", Value);
+        else if (Key==__T("BPM"))                    Fill(StreamKind_Common,   0, "BPM", Value);
+        else if (Key==__T("WAVEFORMATEXTENSIBLE_CHANNEL_MASK"))
         {
             //This is an hexadecimal value
-            if (Value.size()>2 && Value[0]==_T('0') && Value[1]==_T('x'))
+            if (Value.size()>2 && Value[0]==__T('0') && Value[1]==__T('x'))
             {
                 int16u ValueI=0;
                 for (size_t Pos=2; Pos<Value.size(); Pos++)
                 {
                     ValueI*=16;
-                    if (Value[Pos]>=_T('0') && Value[Pos]<=_T('9'))
-                        ValueI+=Value[Pos]-_T('0');
-                    else if (Value[Pos]>=_T('A') && Value[Pos]<=_T('F'))
-                        ValueI+=10+Value[Pos]-_T('A');
-                    else if (Value[Pos]>=_T('a') && Value[Pos]<=_T('f'))
-                        ValueI+=10+Value[Pos]-_T('a');
+                    if (Value[Pos]>=__T('0') && Value[Pos]<=__T('9'))
+                        ValueI+=Value[Pos]-__T('0');
+                    else if (Value[Pos]>=__T('A') && Value[Pos]<=__T('F'))
+                        ValueI+=10+Value[Pos]-__T('A');
+                    else if (Value[Pos]>=__T('a') && Value[Pos]<=__T('f'))
+                        ValueI+=10+Value[Pos]-__T('a');
                     else
                         break;
                 }
@@ -257,40 +306,40 @@
                 Fill(Stream_Audio, 0, Audio_ChannelPositions_String2, ExtensibleWave_ChannelMask2(ValueI));
             }
         }
-        else if (Key==_T("YEAR"))                   {if (Value!=Retrieve(StreamKind_Common,   0, "Recorded_Date")) Fill(StreamKind_Common,   0, "Recorded_Date", Value);}
-        else if (Key.find(_T("COVERART"))==0)
+        else if (Key==__T("YEAR"))                   {if (Value!=Retrieve(StreamKind_Common,   0, "Recorded_Date")) Fill(StreamKind_Common,   0, "Recorded_Date", Value);}
+        else if (Key.find(__T("COVERART"))==0)
         {
-                 if (Key==_T("COVERARTCOUNT"))
+                 if (Key==__T("COVERARTCOUNT"))
                 ;
-            else if (Key.find(_T("COVERARTMIME"))==0)
+            else if (Key.find(__T("COVERARTMIME"))==0)
                 Fill(Stream_General, 0, General_Cover_Mime, Value);
-            else if (Key.find(_T("COVERARTFILELINK"))==0)
-                Fill(Stream_General, 0, General_Cover_Data, _T("file://")+Value);
-            else if (Key.find(_T("COVERARTTYPE"))==0)
+            else if (Key.find(__T("COVERARTFILELINK"))==0)
+                Fill(Stream_General, 0, General_Cover_Data, __T("file://")+Value);
+            else if (Key.find(__T("COVERARTTYPE"))==0)
                 Fill(Stream_General, 0, General_Cover_Type, Id3v2_PictureType(Value.To_int8u()));
         }
-        else if (Key.find(_T("CHAPTER"))==0)
+        else if (Key.find(__T("CHAPTER"))==0)
         {
             if (Count_Get(Stream_Menu)==0)
             {
                 Stream_Prepare(Stream_Menu);
                 Fill(Stream_Menu, StreamPos_Last, Menu_Chapters_Pos_Begin, Count_Get(Stream_Menu, StreamPos_Last), 10, true);
             }
-            if (Key.find(_T("NAME"))==Error)
+            if (Key.find(__T("NAME"))==Error)
             {
-                Chapter_Pos=Key.SubString(_T("CHAPTER"), _T(""));
+                Chapter_Pos=Key.SubString(__T("CHAPTER"), __T(""));
                 Chapter_Time=Value;
             }
             else
             {
-                Value.FindAndReplace(_T("\n"), _T(""), Count_Get(Stream_Text)-1); //Some chapters names have extra characters, not needed
-                Value.FindAndReplace(_T("\r"), _T(""), Count_Get(Stream_Text)-1); //Some chapters names have extra characters, not needed
-                Value.FindAndReplace(_T(" "),  _T(""), Count_Get(Stream_Text)-1); //Some chapters names have extra characters, not needed
+                Value.FindAndReplace(__T("\n"), __T(""), Count_Get(Stream_Text)-1); //Some chapters names have extra characters, not needed
+                Value.FindAndReplace(__T("\r"), __T(""), Count_Get(Stream_Text)-1); //Some chapters names have extra characters, not needed
+                Value.FindAndReplace(__T(" "),  __T(""), Count_Get(Stream_Text)-1); //Some chapters names have extra characters, not needed
                 Fill(Stream_Menu, 0, Chapter_Time.To_UTF8().c_str(), Value);
             }
             Fill(Stream_Menu, StreamPos_Last, Menu_Chapters_Pos_End, Count_Get(Stream_Menu, StreamPos_Last), 10, true);
         }
-        else                                Fill(Stream_General, 0, comment.SubString(_T(""), _T("=")).To_Local().c_str(), Value);
+        else                                Fill(Stream_General, 0, comment.SubString(__T(""), __T("=")).To_Local().c_str(), Value);
     FILLING_END();
 
     if (user_comment_list_length==0)

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Tag/File_VorbisCom.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Tag/File_VorbisCom.h Changed

@@ -1,17 +1,17 @@
 // File_VorbisCom - Info for VorbisComments tagged files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -28,6 +28,7 @@
 
 //---------------------------------------------------------------------------
 #include "MediaInfo/File__Analyze.h"
+#include "ZenLib/ZtringList.h"
 //---------------------------------------------------------------------------
 
 namespace MediaInfoLib
@@ -49,6 +50,9 @@
     File_VorbisCom();
 
 private :
+    //Streams management
+    void Streams_Fill();
+
     //Buffer - File header
     void FileHeader_Parse();
 
@@ -60,6 +64,10 @@
     int32u user_comment_list_length;
     Ztring Chapter_Pos;
     Ztring Chapter_Time;
+    ZtringList Performers;
+    ZtringList Artists;
+    ZtringList Accompaniments;
+    ZtringList AlbumArtists;
 };
 
 } //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Tag/File__Tags.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Tag/File__Tags.cpp Changed

@@ -1,31 +1,35 @@
 // File__Tags - Info for all kind of framed tags tagged files
-// Copyright (C) 2005-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #include "MediaInfo/Tag/File__Tags.h"
 #if defined(MEDIAINFO_APETAG_YES)
     #include "MediaInfo/Tag/File_ApeTag.h"
@@ -151,33 +155,60 @@
     //ID
     if (Base->Buffer_Offset+Synchro_Offset+3>Base->Buffer_Size)
         return false;
-    switch (CC3(Base->Buffer+Base->Buffer_Offset+Synchro_Offset))
+    switch (Base->Buffer[Base->Buffer_Offset+Synchro_Offset])
     {
-        case 0x494433 : //"ID3"
-                        if (!Synched_Test()) //Handling begin/intermediate Id3v2
-                            return false;
-                        return Synchronize(Tag_Found, Synchro_Offset);
-        case 0x544147 : //"TAG"
-        case 0x4C5952 : //"LYR"
-        case 0x415045 : //"APE"
-                        if (TagSizeIsFinal && Base->File_Offset+Base->Buffer_Offset==Base->File_Size-File_EndTagSize)
-                        {
-                            Tag_Found=true;
-                            return Synched_Test();
-                        }
-                        else if (Base->File_Offset+Base->Buffer_Size==Base->File_Size)
-                        {
-                             while (!TagSizeIsFinal && DetectBeginOfEndTags_Test());
-                             Tag_Found=Base->File_Offset+Base->Buffer_Offset==Base->File_Size-File_EndTagSize;
-                             return true;
-                        }
-                        else
-                            return false; //Need more data
-        default       : if (Base->File_Offset+Base->Buffer_Offset==ApeTag_Offset)
-                        {
-                            Tag_Found=true;
-                            return true;
-                        };
+        case 0x49 : //"ID3"
+                    switch (CC3(Base->Buffer+Base->Buffer_Offset+Synchro_Offset))
+                    {
+                        case 0x494433 : //"ID3"
+                                        if (Synchro_Offset)
+                                        {
+                                            Tag_Found=true; //This is an ID3 tag after a complete chunk, waiting for the chunk to be parsed
+                                            return true;
+                                        }
+                                        if (!Synched_Test()) //Handling begin/intermediate Id3v2
+                                            return false;
+                                        return Synchronize(Tag_Found, Synchro_Offset);
+                        default       : if (Base->File_Offset+Base->Buffer_Offset==ApeTag_Offset)
+                                        {
+                                            Tag_Found=true;
+                                            return true;
+                                        };
+                    }
+                    break;
+        case 0x54 : //"TAG"
+        case 0x4C : //"LYR"
+        case 0x41 : //"APE"
+                    switch (CC3(Base->Buffer+Base->Buffer_Offset+Synchro_Offset))
+                    {
+                        case 0x544147 : //"TAG"
+                        case 0x4C5952 : //"LYR"
+                        case 0x415045 : //"APE"
+                                        if (TagSizeIsFinal && Base->File_Offset+Base->Buffer_Offset==Base->File_Size-File_EndTagSize)
+                                        {
+                                            Tag_Found=true;
+                                            return Synched_Test();
+                                        }
+                                        else if (Base->File_Offset+Base->Buffer_Size==Base->File_Size)
+                                        {
+                                             while (!TagSizeIsFinal && DetectBeginOfEndTags_Test());
+                                             Tag_Found=Base->File_Offset+Base->Buffer_Offset==Base->File_Size-File_EndTagSize;
+                                             return true;
+                                        }
+                                        else
+                                            return false; //Need more data
+                        default       : if (Base->File_Offset+Base->Buffer_Offset==ApeTag_Offset)
+                                        {
+                                            Tag_Found=true;
+                                            return true;
+                                        };
+                    }
+                    break;
+        default   : if (Base->File_Offset+Base->Buffer_Offset==ApeTag_Offset)
+                    {
+                        Tag_Found=true;
+                        return true;
+                    };
     }
 
     Tag_Found=false;
@@ -187,16 +218,17 @@
 //---------------------------------------------------------------------------
 bool File__Tags_Helper::Synched_Test()
 {
-    while (1)
+    for (;;)
     {
         if (!Parser)
         {
             //Must have enough buffer for having header
-            if (Base->Buffer_Offset+3>Base->Buffer_Size)
-                return false;
+            if (Base->Buffer_Offset+4>Base->Buffer_Size)
+                return Base->IsSub; //If IsSub, we consider this is a complete block
 
             //Quick test of synchro
             int32u ID=CC3(Base->Buffer+Base->Buffer_Offset);
+            int32u ID4=CC4(Base->Buffer+Base->Buffer_Offset);
                  if (ID==0x494433) //"ID3"
             {
                 if (Base->Buffer_Offset+10>Base->Buffer_Size)
@@ -215,7 +247,17 @@
                 File_BeginTagSize+=Parser_Buffer_Size;
                 if (Base->File_Offset_FirstSynched==(int64u)-1)
                     Base->Buffer_TotalBytes_FirstSynched_Max+=Parser_Buffer_Size;
-                Base->Element_Begin("Id3v2");
+                Base->Element_Begin1("Id3v2");
+            }
+            else if (ID4==0x5441472B) //"TAG+"
+            {
+                #ifdef MEDIAINFO_ID3_YES
+                    Parser=new File_Id3;
+                #else
+                    Parser=new File_Unknown;
+                #endif
+                Parser_Buffer_Size=227+128;
+                Base->Element_Begin1("Id3+");
             }
             else if (ID==0x544147) //"TAG"
             {
@@ -225,7 +267,7 @@
                     Parser=new File_Unknown;
                 #endif
                 Parser_Buffer_Size=128;
-                Base->Element_Begin("Id3");
+                Base->Element_Begin1("Id3");
             }
             else if (Base->File_Offset+Base->Buffer_Offset==Lyrics3_Offset)
             {
@@ -236,7 +278,7 @@
                     Parser=new File__Analyze;
                 #endif
                 Parser_Buffer_Size=(size_t)Lyrics3_Size;
-                Base->Element_Begin("Lyrics3");
+                Base->Element_Begin1("Lyrics3");
             }
             else if (Base->File_Offset+Base->Buffer_Offset==Lyrics3v2_Offset)
             {
@@ -247,17 +289,17 @@
                     Parser=new File_Unknown;
                 #endif
                 Parser_Buffer_Size=(size_t)Lyrics3v2_Size;
-                Base->Element_Begin("Lyrics3v2");
+                Base->Element_Begin1("Lyrics3v2");
             }
             else if (Base->File_Offset+Base->Buffer_Offset==ApeTag_Offset)
             {
-                #ifdef MEDIAINFO_APE_YES
+                #ifdef MEDIAINFO_APETAG_YES
                     Parser=new File_ApeTag;
                 #else
                     Parser=new File_Unknown;
                 #endif
                 Parser_Buffer_Size=(size_t)ApeTag_Size;
-                Base->Element_Begin("ApeTag");
+                Base->Element_Begin1("ApeTag");
             }
             else
                 break;
@@ -276,6 +318,8 @@
             {
                 if (Base->Status[File__Analyze::IsAccepted] && Parser->Count_Get(Stream_General)>0)
                 {
+                    if (!Base->Status[File__Analyze::IsFilled])
+                        Base->Fill();
                     Parser->Read_Buffer_Finalize();
                     Base->Merge(*Parser, Stream_General, 0, 0, false);
                     Base->Merge(*Parser, Stream_Audio  , 0, 0, false);
@@ -292,7 +336,7 @@
                 if (Parser_Buffer_Size)
                     Base->Skip_XX(Parser_Buffer_Size,           "Data continued");
                 Base->Element_Show();
-                Base->Element_End();
+                Base->Element_End0();
             }
             else
                 break;
@@ -343,7 +387,7 @@
     while (!TagSizeIsFinal && DetectBeginOfEndTags_Test());
 
     //If a jump is requested
-    if (Base->File_GoTo!=(int64u)-1)
+    if (!TagSizeIsFinal)
         return;
 
     //Positionning (if finnished)
@@ -371,8 +415,8 @@
         {
             bool MustElementBegin=Base->Element_Level?true:false;
             if (Base->Element_Level>0)
-                Base->Element_End(); //Element
-            Base->Info(Ztring(ParserName)+_T(", wants to go to somewhere, but not valid"));
+                Base->Element_End0(); //Element
+            Base->Info(Ztring(ParserName)+__T(", wants to go to somewhere, but not valid"));
             if (MustElementBegin)
                 Base->Element_Level++;
         }
@@ -402,8 +446,8 @@
     {
         bool MustElementBegin=Base->Element_Level?true:false;
         if (Base->Element_Level>0)
-            Base->Element_End(); //Element
-        Base->Info(Ztring(ParserName)+_T(", finished but searching tags"));
+            Base->Element_End0(); //Element
+        Base->Info(Ztring(ParserName)+__T(", finished but searching tags"));
         if (MustElementBegin)
             Base->Element_Level++;
     }
@@ -419,17 +463,17 @@
         //Id3v1
         if (Id3v1_Size==0 && File_EndTagSize==0 && Base->File_Size>=128) //Only one, at the end, larger than 128 bytes
         {
-            if (Base->File_Offset>Base->File_Size-128) //Must be at least at the end less 128 bytes
+            if (Base->File_Offset>Base->File_Size-128-32) //Must be at least at the end less 128 bytes
             {
                 Base->GoTo(Base->File_Size-128-32, "Tags detection"); //32 to be able to quickly see another tag system
                 TagSizeIsFinal=false;
                 return false;
             }
 
-            if (Base->File_Offset+Base->Buffer_Size<Base->File_Size-125) //Must be at least at the end less 128 bytes plus 3 bytes of tags
+            if (Base->File_Offset+Base->Buffer_Size<Base->File_Size) //Must be at least at the end less 128 bytes of tags
             {
-                if (Base->File_Offset!=Base->File_Size-128)
-                    Base->GoTo(Base->File_Size-128-32, "Tags detection"); //32 to be able to quickly see another tag system
+                if (Base->File_Offset<Base->File_Size-128-32)
+                    Base->GoTo(Base->File_Size-128-32, "Tags detection");
                 TagSizeIsFinal=false;
                 return false;
             }
@@ -512,7 +556,7 @@
 
             if (CC8(Base->Buffer+((size_t)((Base->File_Size-File_EndTagSize-15+6)-Base->File_Offset)))==CC8("LYRICS20"))
             {
-                Lyrics3v2_Size=Ztring((const char*)(Base->Buffer+((size_t)(Base->Buffer_Size-File_EndTagSize-15))), 6).To_int32u()+15;
+                Lyrics3v2_Size=Ztring((const char*)(Base->Buffer+((size_t)((Base->File_Size-File_EndTagSize-15)-Base->File_Offset))), 6).To_int32u()+15;
                 File_EndTagSize+=Lyrics3v2_Size;
                 Lyrics3v2_Offset=Base->File_Size-File_EndTagSize;
                 TagSizeIsFinal=false;
@@ -539,11 +583,10 @@
 
             if (CC8(Base->Buffer+((size_t)((Base->File_Size-File_EndTagSize-32)-Base->File_Offset)))==CC8("APETAGEX"))
             {
-                ApeTag_Size=LittleEndian2int32u(Base->Buffer+((size_t)(Base->Buffer_Size-File_EndTagSize-32+12)));
-                if (LittleEndian2int32u(Base->Buffer+((size_t)(Base->Buffer_Size-File_EndTagSize-32+8)))==2000)
+                ApeTag_Size=LittleEndian2int32u(Base->Buffer+((size_t)((Base->File_Size-File_EndTagSize-32+12)-Base->File_Offset)));
+                if (LittleEndian2int32u(Base->Buffer+((size_t)((Base->File_Size-File_EndTagSize-32+8)-Base->File_Offset)))==2000)
                     ApeTag_Size+=32;
                 File_EndTagSize+=ApeTag_Size;
-                TagSizeIsFinal=false;
                 ApeTag_Offset=Base->File_Size-File_EndTagSize;
                 TagSizeIsFinal=false;
             }

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Tag/File__Tags.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Tag/File__Tags.h Changed

@@ -1,17 +1,17 @@
 // File__Tags - Info for all kind of framed tags tagged files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -75,9 +75,9 @@
     //End
     void GoTo           (int64u GoTo, const char* ParserName=NULL);
     void GoToFromEnd    (int64u GoToFromEnd=0, const char* ParserName=NULL);
-    void Accept         (const char* ParserName);
-    void Reject         (const char* ParserName);
-    void Finish         (const char* ParserName);
+    void Accept         (const char* ParserName=NULL);
+    void Reject         (const char* ParserName=NULL);
+    void Finish         (const char* ParserName=NULL);
 
 private :
     //Temp

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Text/File_Cdp.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Text/File_Cdp.cpp Changed

@@ -1,31 +1,35 @@
 // File_Cdp - Info for EIA-608 files
-// Copyright (C) 2009-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2009-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_CDP_YES)
 //---------------------------------------------------------------------------
 
@@ -43,6 +47,10 @@
 using namespace std;
 //---------------------------------------------------------------------------
 
+//---------------------------------------------------------------------------
+namespace MediaInfoLib
+{
+//---------------------------------------------------------------------------
 
 //***************************************************************************
 // Info
@@ -77,13 +85,6 @@
         default : return (float32) 0.000;
     }
 }
-    
-//***************************************************************************
-//
-//***************************************************************************
-
-namespace MediaInfoLib
-{
 
 //***************************************************************************
 // Constructor/Destructor
@@ -93,8 +94,11 @@
 File_Cdp::File_Cdp()
 :File__Analyze()
 {
+    //Config
+    PTS_DTS_Needed=true;
+
     //Temp
-    ParserName=_T("CDP");
+    ParserName=__T("CDP");
     #if MEDIAINFO_EVENTS
         ParserIDs[0]=MediaInfo_Parser_Cdp;
         StreamIDs_Width[0]=1;
@@ -103,6 +107,7 @@
     Streams_Count=0;
 
     //In
+    WithAppleHeader=false;
     AspectRatio=0;
 }
 
@@ -118,26 +123,54 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
-void File_Cdp::Streams_Fill()
+void File_Cdp::Streams_Accept()
 {
-    //Filling
+    Fill(Stream_General, 0, General_Format, WithAppleHeader?"Final Cut CDP":"CDP");
+}
+
+//---------------------------------------------------------------------------
+void File_Cdp::Streams_Update()
+{
+    Clear(Stream_Text);
+
+    //Per stream
     for (size_t Pos=0; Pos<Streams.size(); Pos++)
-        if (Streams[Pos] && Streams[Pos]->Parser && Streams[Pos]->Parser->Status[IsFilled])
+        if (Streams[Pos] && Streams[Pos]->Parser && Streams[Pos]->Parser->Status[IsFilled] /*&& Streams[Pos]->Parser->Status[IsUpdated]*/ && Streams[Pos]->Parser->Count_Get(Stream_Text))
+            Streams_Update_PerStream(Pos);
+}
+
+//---------------------------------------------------------------------------
+void File_Cdp::Streams_Update_PerStream(size_t Pos)
+{
+    if (Streams[Pos]==NULL)
+        return;
+
+    Update(Streams[Pos]->Parser);
+
+    if (Streams[Pos]->Parser)
+        for (size_t Pos2=0; Pos2<Streams[Pos]->Parser->Count_Get(Stream_Text); Pos2++)
         {
-            Merge(*Streams[Pos]->Parser);
-            if (Pos<2)
-                Fill(Stream_Text, StreamPos_Last, Text_ID, _T("608-")+Ztring::ToZtring(Pos+1));
-            Fill(Stream_Text, StreamPos_Last, "MuxingMode", _T("CDP"), Unlimited);
+            Stream_Prepare(Stream_Text);
+            Merge(*Streams[Pos]->Parser, Stream_Text, Pos2, StreamPos_Last);
+            if (WithAppleHeader)
+                Fill(Stream_Text, StreamPos_Last, "MuxingMode", "Final Cut");
+            Fill(Stream_Text, StreamPos_Last, "MuxingMode", "CDP");
+            Fill(Stream_Text, StreamPos_Last, Text_ID, Streams[Pos]->Parser->Retrieve(Stream_Text, Pos2, Text_ID), true);
         }
 }
 
 //---------------------------------------------------------------------------
 void File_Cdp::Streams_Finish()
 {
-    //Filling
+    Clear(Stream_Text);
+
+    //Per stream
     for (size_t Pos=0; Pos<Streams.size(); Pos++)
-        if (Streams[Pos] && Streams[Pos]->Parser && Streams[Pos]->Parser->Status[IsFilled])
+        if (Streams[Pos] && Streams[Pos]->Parser && Streams[Pos]->Parser->Status[IsAccepted] /*&& Streams[Pos]->Parser->Status[IsUpdated]*/)
+        {
             Finish(Streams[Pos]->Parser);
+            Streams_Update_PerStream(Pos);
+        }
 }
 
 //***************************************************************************
@@ -160,8 +193,33 @@
 //---------------------------------------------------------------------------
 void File_Cdp::Read_Buffer_Continue()
 {
-    if (!Status[IsAccepted])
-        Accept("CDP");
+    if (Buffer_Size==0)
+        return;
+
+    if (WithAppleHeader)
+    {
+        int32u Size, Magic;
+        Get_B4 (Size,                                           "Size");
+        Get_B4 (Magic,                                          "Magic");
+
+        FILLING_BEGIN();
+            if (Magic!=0x63636470)
+            {
+                Reject("CDP");
+                return;
+            }
+        FILLING_END();
+    }
+
+    //CRC
+    int8u CRC=0;
+    for (size_t Pos=WithAppleHeader?8:0; Pos<Buffer_Size; Pos++)
+        CRC+=Buffer[Pos];
+    if (CRC)
+    {
+        Skip_XX(Element_Size-Element_Offset,                    "Invalid data (CRC fails)");
+        return;
+    }
 
     cdp_header();
     while(Element_Offset<Element_Size)
@@ -190,12 +248,13 @@
 //---------------------------------------------------------------------------
 void File_Cdp::cdp_header()
 {
-    Element_Begin("cdp_header");
+    Element_Begin1("cdp_header");
+    int16u cdp_identifier;
     int8u cdp_frame_rate;
-    Skip_B2(                                                    "cdp_identifier");
+    Get_B2 (   cdp_identifier,                                  "cdp_identifier");
     Skip_B1(                                                    "cdp_length");
     BS_Begin();
-    Get_S1 (4, cdp_frame_rate,                                  "cdp_frame_rate"); Param_Info(Ztring::ToZtring(Cdp_cdp_frame_rate(cdp_frame_rate))+_T(" fps"));
+    Get_S1 (4, cdp_frame_rate,                                  "cdp_frame_rate"); Param_Info1(Ztring::ToZtring(Cdp_cdp_frame_rate(cdp_frame_rate))+__T(" fps"));
     Skip_S1(4,                                                  "Reserved");
     Skip_SB(                                                    "time_code_present");
     Skip_SB(                                                    "ccdata_present");
@@ -207,13 +266,26 @@
     Skip_SB(                                                    "Reserved");
     BS_End();
     Skip_B2(                                                    "cdp_hdr_sequence_cntr");
-    Element_End();
+    Element_End0();
+
+    FILLING_BEGIN();
+        if (!Status[IsAccepted])
+        {
+            if (cdp_identifier!=0x9669)
+            {
+                Reject("CDP");
+                return;
+            }
+
+            Accept("CDP");
+        }
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
 void File_Cdp::time_code_section()
 {
-    Element_Begin("time_code_section");
+    Element_Begin1("time_code_section");
     Skip_B1(                                                    "time_code_section_id");
     BS_Begin();
     Mark_1();
@@ -231,7 +303,7 @@
     Skip_S1(2,                                                  "tc_10fr");
     Skip_S1(4,                                                  "tc_1fr");
     BS_End();
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
@@ -239,7 +311,7 @@
 {
     //Parsing
     int8u cc_count;
-    Element_Begin("ccdata_section");
+    Element_Begin1("ccdata_section");
     Skip_B1(                                                    "ccdata_id");
     BS_Begin();
     Mark_1();
@@ -249,7 +321,7 @@
     BS_End();
     for (int8u Pos=0; Pos<cc_count; Pos++)
     {
-        Element_Begin("cc");
+        Element_Begin1("cc");
         int8u cc_type;
         bool  cc_valid;
         BS_Begin();
@@ -259,11 +331,11 @@
         Mark_1();
         Mark_1();
         Get_SB (   cc_valid,                                    "cc_valid");
-        Get_S1 (2, cc_type,                                     "cc_type"); Param_Info(Cdp_cc_type(cc_type));
+        Get_S1 (2, cc_type,                                     "cc_type"); Param_Info1(Cdp_cc_type(cc_type));
         BS_End();
         if (cc_valid)
         {
-            Element_Begin("cc_data");
+            Element_Begin1("cc_data");
                 //Calculating the parser position
                 int8u Parser_Pos=cc_type==3?2:cc_type; //cc_type 2 and 3 are for the same text
 
@@ -277,11 +349,20 @@
                 {
                     if (cc_type<2)
                     {
-                        Streams[Parser_Pos]->Parser=new File_Eia608();
+                        #if defined(MEDIAINFO_EIA608_YES)
+                            Streams[Parser_Pos]->Parser=new File_Eia608();
+                            ((File_Eia608*)Streams[Parser_Pos]->Parser)->cc_type=cc_type;
+                        #else //defined(MEDIAINFO_EIA608_YES)
+                            Streams[Parser_Pos]->Parser=new File__Analyze();
+                        #endif //defined(MEDIAINFO_EIA608_YES)
                     }
                     else
                     {
-                        Streams[Parser_Pos]->Parser=new File_Eia708();
+                        #if defined(MEDIAINFO_EIA708_YES)
+                            Streams[Parser_Pos]->Parser=new File_Eia708();
+                        #else //defined(MEDIAINFO_EIA708_YES)
+                            Streams[Parser_Pos]->Parser=new File__Analyze();
+                        #endif //defined(MEDIAINFO_EIA708_YES)
                     }
                     Open_Buffer_Init(Streams[Parser_Pos]->Parser);
                 }
@@ -290,14 +371,17 @@
                 {
                     if (Streams[Parser_Pos]->Parser->PTS_DTS_Needed)
                     {
-                        Streams[Parser_Pos]->Parser->PCR=PCR;
-                        Streams[Parser_Pos]->Parser->PTS=PTS;
-                        Streams[Parser_Pos]->Parser->DTS=DTS;
+                        Streams[Parser_Pos]->Parser->FrameInfo.PCR=FrameInfo.PCR;
+                        Streams[Parser_Pos]->Parser->FrameInfo.PTS=FrameInfo.PTS;
+                        Streams[Parser_Pos]->Parser->FrameInfo.DTS=FrameInfo.DTS;
                     }
                     if (Parser_Pos==2)
                     {
-                        ((File_Eia708*)Streams[2]->Parser)->cc_type=cc_type;
-                        ((File_Eia708*)Streams[2]->Parser)->AspectRatio=AspectRatio;
+                        #if defined(MEDIAINFO_EIA708_YES)
+                            ((File_Eia708*)Streams[2]->Parser)->cc_type=cc_type;
+                            if (AspectRatio)
+                                ((File_Eia708*)Streams[2]->Parser)->AspectRatio=AspectRatio;
+                        #endif //defined(MEDIAINFO_EIA708_YES)
                     }
                     else
                     {
@@ -318,13 +402,18 @@
                 }
                 else
                     Skip_XX(2,                                  "Data");
-            Element_End();
+            Element_End0();
         }
         else
             Skip_XX(2,                                          "Junk");
-        Element_End();
+        Element_End0();
     }
-    Element_End();
+    Element_End0();
+
+    Frame_Count++;
+    Frame_Count_InThisBlock++;
+    if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+        Frame_Count_NotParsedIncluded++;
 }
 
 //---------------------------------------------------------------------------
@@ -332,7 +421,7 @@
 {
     //Parsing
     int8u svc_count;
-    Element_Begin("ccsvcinfo_section");
+    Element_Begin1("ccsvcinfo_section");
     Skip_B1(                                                    "ccsvcinfo_id");
     BS_Begin();
     Skip_SB(                                                    "reserved");
@@ -343,7 +432,7 @@
     BS_End();
     for (int8u Pos=0; Pos<svc_count; Pos++)
     {
-        Element_Begin("svc");
+        Element_Begin1("svc");
         bool  csn_size;
         BS_Begin();
         Skip_SB(                                                "reserved");
@@ -358,7 +447,7 @@
         BS_End();
 
         //svc_data_byte - caption_service_descriptor
-        Element_Begin("service");
+        Element_Begin1("service");
         Ztring language;
         bool digital_cc;
         Get_Local(3, language,                                  "language");
@@ -376,20 +465,20 @@
         Skip_SB(                                                "wide_aspect_ratio");
         Skip_S2(14,                                             "reserved");
         BS_End();
-        Element_End();
-        Element_End();
+        Element_End0();
+        Element_End0();
     }
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
 void File_Cdp::cdp_footer()
 {
-    Element_Begin("cdp_footer");
+    Element_Begin1("cdp_footer");
     Skip_B1(                                                    "cdp_footer_id");
     Skip_B2(                                                    "cdp_ftr_sequence_cntr");
     Skip_B1(                                                    "packet_checksum");
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
@@ -397,11 +486,11 @@
 {
     //Parsing
     int8u length;
-    Element_Begin("future_section");
+    Element_Begin1("future_section");
     Skip_B1(                                                    "future_section_id");
     Get_B1 (length,                                             "length");
     Skip_XX(length,                                             "Unknown");
-    Element_End();
+    Element_End0();
 }
 
 //***************************************************************************

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Text/File_Cdp.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Text/File_Cdp.h Changed

@@ -1,17 +1,17 @@
 // File_Cdp - Info for CDP files
-// Copyright (C) 2010-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -42,7 +42,8 @@
 {
 public :
     //In
-    float32 AspectRatio;
+    bool    WithAppleHeader;
+    float64 AspectRatio;
 
     //Constructor/Destructor
     File_Cdp();
@@ -50,7 +51,9 @@
 
 private :
     //Streams management
-    void Streams_Fill();
+    void Streams_Accept();
+    void Streams_Update();
+    void Streams_Update_PerStream(size_t Pos);
     void Streams_Finish();
 
     //Synchro
@@ -71,11 +74,13 @@
     struct stream
     {
         File__Analyze*  Parser;
+        size_t          StreamPos;
         bool            IsFilled;
 
         stream()
         {
             Parser=NULL;
+            StreamPos=(size_t)-1;
             IsFilled=false;
         }

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Text/File_Cmml.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Text/File_Cmml.cpp Changed

@@ -1,17 +1,17 @@
 // File_Cmml - Info for Cmml files
-// Copyright (C) 2009-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2009-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,14 +22,18 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_CMML_YES)
 //---------------------------------------------------------------------------
 
@@ -101,10 +105,10 @@
 
     FILLING_BEGIN();
         Ztring Value;
-        Value=Data.SubString(_T("<head>"), _T("</head>"));
+        Value=Data.SubString(__T("<head>"), __T("</head>"));
         if (!Value.empty())
-            Fill(Stream_Text, 0, Text_Title, Value.SubString(_T("<title>"), _T("</title>")));
-        if (Data.find(_T("<clip"))!=string::npos)
+            Fill(Stream_Text, 0, Text_Title, Value.SubString(__T("<title>"), __T("</title>")));
+        if (Data.find(__T("<clip"))!=string::npos)
             Finish("CMML");
     FILLING_END();
 }

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Text/File_Cmml.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Text/File_Cmml.h Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Text/File_DtvccTransport.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Text/File_DtvccTransport.cpp Changed

@@ -1,31 +1,35 @@
 // File_DtvccTransport - Info for DTVCC Transport strams
-// Copyright (C) 2010-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_DTVCCTRANSPORT_YES)
 //---------------------------------------------------------------------------
 
@@ -73,7 +77,7 @@
 :File__Analyze()
 {
     //Configuration
-    ParserName=_T("DTVCC Transport");
+    ParserName=__T("DTVCC Transport");
     #if MEDIAINFO_EVENTS
         ParserIDs[0]=MediaInfo_Parser_DtvccTransport;
         StreamIDs_Width[0]=1;
@@ -86,7 +90,6 @@
 
     //Temp
     Streams.resize(3); //CEA-608 Field 1, CEA-608 Field 2, CEA-708 Channel
-    Streams_Count=0;
 }
 
 //---------------------------------------------------------------------------
@@ -101,26 +104,46 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
-void File_DtvccTransport::Streams_Fill()
+void File_DtvccTransport::Streams_Update()
 {
-    //Filling
+    Clear(Stream_Text);
+
+    //Per stream
     for (size_t Pos=0; Pos<Streams.size(); Pos++)
-        if (Streams[Pos] && Streams[Pos]->Parser && Streams[Pos]->Parser->Status[IsFilled])
+        if (Streams[Pos] && Streams[Pos]->Parser && Streams[Pos]->Parser->Status[IsFilled] /*&& Streams[Pos]->Parser->Status[IsUpdated]*/ && Streams[Pos]->Parser->Count_Get(Stream_Text))
+            Streams_Update_PerStream(Pos);
+}
+
+//---------------------------------------------------------------------------
+void File_DtvccTransport::Streams_Update_PerStream(size_t Pos)
+{
+    if (Streams[Pos]==NULL)
+        return;
+
+    Update(Streams[Pos]->Parser);
+
+    if (Streams[Pos]->Parser)
+        for (size_t Pos2=0; Pos2<Streams[Pos]->Parser->Count_Get(Stream_Text); Pos2++)
         {
-            Merge(*Streams[Pos]->Parser);
-            if (Pos<2)
-                Fill(Stream_Text, StreamPos_Last, Text_ID, (Format==Format_DVD?_T("DVD-"):_T("608-"))+Ztring::ToZtring(Pos+1));
-            Fill(Stream_Text, StreamPos_Last, "MuxingMode", Format==Format_DVD?_T("DVD-Video"):_T("EIA-708"));
+            Stream_Prepare(Stream_Text);
+            Merge(*Streams[Pos]->Parser, Stream_Text, Pos2, StreamPos_Last);
+            Fill(Stream_Text, StreamPos_Last, "MuxingMode", Format==Format_DVD?__T("DVD-Video"):__T("DTVCC Transport"));
+            Fill(Stream_Text, StreamPos_Last, Text_ID, Streams[Pos]->Parser->Retrieve(Stream_Text, Pos2, Text_ID), true);
         }
 }
 
 //---------------------------------------------------------------------------
 void File_DtvccTransport::Streams_Finish()
 {
-    //Filling
+    Clear(Stream_Text);
+
+    //Per stream
     for (size_t Pos=0; Pos<Streams.size(); Pos++)
-        if (Streams[Pos] && Streams[Pos]->Parser && Streams[Pos]->Parser->Status[IsFilled])
+        if (Streams[Pos] && Streams[Pos]->Parser && Streams[Pos]->Parser->Status[IsAccepted] /*&& Streams[Pos]->Parser->Status[IsUpdated]*/)
+        {
             Finish(Streams[Pos]->Parser);
+            Streams_Update_PerStream(Pos);
+        }
 }
 
 //***************************************************************************
@@ -144,7 +167,7 @@
 void File_DtvccTransport::Read_Buffer_Continue()
 {
     //Parsing
-    Element_Begin(Format==Format_DVD?"DVD Captions":"DTVCC Transport");
+    Element_Begin1(Format==Format_DVD?"DVD Captions":"DTVCC Transport");
     int8u  cc_count;
     bool   process_cc_data_flag, additional_data_flag;
     BS_Begin();
@@ -171,7 +194,7 @@
     {
         for (int8u Pos=0; Pos<cc_count; Pos++)
         {
-            Element_Begin("cc");
+            Element_Begin1("cc");
             int8u cc_type;
             bool  cc_valid;
             BS_Begin();
@@ -185,19 +208,19 @@
                 //Modified DTVCC Transport from DVD
                 Mark_1();
                 Mark_1();
-                Get_S1 (1, cc_type,                             "cc_type"); Param_Info(DtvccTransport_cc_type(cc_type));
+                Get_S1 (1, cc_type,                             "cc_type"); Param_Info1(DtvccTransport_cc_type(cc_type));
                 cc_valid=true;
             }
             else
             {
                 //Normal DTVCC Transport
                 Get_SB (   cc_valid,                            "cc_valid");
-                Get_S1 (2, cc_type,                             "cc_type"); Param_Info(DtvccTransport_cc_type(cc_type));
+                Get_S1 (2, cc_type,                             "cc_type"); Param_Info1(DtvccTransport_cc_type(cc_type));
             }
             BS_End();
             if (cc_valid)
             {
-                Element_Begin("cc_data");
+                Element_Begin1("cc_data");
                     //Calculating the parser position
                     int8u Parser_Pos=cc_type==3?2:cc_type; //cc_type 2 and 3 are for the same text
 
@@ -213,6 +236,7 @@
                         {
                             #if defined(MEDIAINFO_EIA608_YES)
                                 Streams[Parser_Pos]->Parser=new File_Eia608();
+                                ((File_Eia608*)Streams[Parser_Pos]->Parser)->cc_type=cc_type;
                             #else
                                 Streams[Parser_Pos]->Parser=new File__Analyze();
                             #endif
@@ -233,18 +257,23 @@
                         //Parsing
                         if (Streams[Parser_Pos]->Parser->PTS_DTS_Needed)
                         {
-                            Streams[Parser_Pos]->Parser->PCR=PCR;
-                            Streams[Parser_Pos]->Parser->PTS=PTS;
-                            Streams[Parser_Pos]->Parser->DTS=DTS;
+                            Streams[Parser_Pos]->Parser->FrameInfo.PCR=FrameInfo.PCR;
+                            Streams[Parser_Pos]->Parser->FrameInfo.PTS=FrameInfo.PTS;
+                            Streams[Parser_Pos]->Parser->FrameInfo.DTS=FrameInfo.DTS;
                         }
                         if (Parser_Pos==2)
                         {
                             #if defined(MEDIAINFO_EIA708_YES)
                                 ((File_Eia708*)Streams[2]->Parser)->cc_type=cc_type;
-                                ((File_Eia708*)Streams[2]->Parser)->AspectRatio=AspectRatio;
+                                if (AspectRatio)
+                                    ((File_Eia708*)Streams[2]->Parser)->AspectRatio=AspectRatio;
                             #endif
                             if (cc_type==3)
-                                Streams[2]->Parser->Open_Buffer_Unsynch();
+                            {
+                                ((File_Eia708*)Streams[2]->Parser)->cc_type=4; //Magic value saying that the buffer must be kept (this is only a point of synchro from the undelying layer)
+                                Streams[2]->Parser->Open_Buffer_Continue(Streams[Parser_Pos]->Parser, Buffer+(size_t)(Buffer_Offset+Element_Offset), 0);
+                                ((File_Eia708*)Streams[2]->Parser)->cc_type=3;
+                            }
                         }
                         else
                         {
@@ -254,23 +283,16 @@
                         Element_Offset+=2;
 
                         //Filled
-                        if (!Streams[Parser_Pos]->IsFilled && Streams[Parser_Pos]->Parser->Status[IsFilled])
-                        {
-                            if (Count_Get(Stream_General)==0)
-                                Accept("DTVCC Transport");
-                            Streams_Count++;
-                            if (Streams_Count==3)
-                                Fill("DTVCC Transport");
-                            Streams[Parser_Pos]->IsFilled=true;
-                        }
+                        if (!Status[IsAccepted])
+                            Accept("DTVCC Transport");
                     }
                     else
                         Skip_XX(2,                                  "Data");
-                Element_End();
+                Element_End0();
             }
             else
                 Skip_XX(2,                                          "Junk");
-            Element_End();
+            Element_End0();
         }
     }
     else
@@ -301,7 +323,7 @@
         }
     }
 
-    Element_End();
+    Element_End0();
 }
 
 //***************************************************************************

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Text/File_DtvccTransport.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Text/File_DtvccTransport.h Changed

@@ -1,17 +1,17 @@
 // File_DtvccTransport - Info for DTVCC Transport strams
-// Copyright (C) 2010-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -49,7 +49,7 @@
         Format_DVD,             //Unknown standard
     };
     format Format;
-    float32 AspectRatio;
+    float64 AspectRatio;
 
     //Constructor/Destructor
     File_DtvccTransport();
@@ -57,7 +57,8 @@
 
 private :
     //Streams management
-    void Streams_Fill();
+    void Streams_Update();
+    void Streams_Update_PerStream(size_t Pos);
     void Streams_Finish();
 
     //Synchro
@@ -70,12 +71,10 @@
     struct stream
     {
         File__Analyze*  Parser;
-        bool            IsFilled;
 
         stream()
         {
             Parser=NULL;
-            IsFilled=false;
         }
 
         ~stream()
@@ -84,7 +83,6 @@
         }
     };
     std::vector<stream*> Streams;
-    size_t               Streams_Count;
 };
 
 } //NameSpace

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Text/File_DvbSubtitle.cpp Added

@@ -0,0 +1,421 @@
+// File_DvbSubtitle - Info for DVB Subtitle streams
+// Copyright (C) 2011-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_DVBSUBTITLE_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Text/File_DvbSubtitle.h"
+#include "MediaInfo/MediaInfo_Config_MediaInfo.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Info
+//***************************************************************************
+
+const int8u DvbSubtitle_region_depth[8]=
+{
+    0,
+    2,
+    4,
+    8,
+    0,
+    0,
+    0,
+    0,
+};
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File_DvbSubtitle::File_DvbSubtitle()
+:File__Analyze()
+{
+    //Configuration
+    ParserName=__T("DVB Subtitle");
+    #if MEDIAINFO_EVENTS
+        ParserIDs[0]=MediaInfo_Parser_DvbSubtitle;
+    #endif //MEDIAINFO_EVENTS
+    #if MEDIAINFO_TRACE
+        Trace_Layers_Update(8); //Stream
+    #endif //MEDIAINFO_TRACE
+    PTS_DTS_Needed=true;
+    IsRawStream=true;
+    MustSynchronize=true;
+
+    //In
+    Frame_Count_Valid=MediaInfoLib::Config.ParseSpeed_Get()>=0.3?32:2;
+
+    //Temp
+    MustFindDvbHeader=true;
+}
+
+//---------------------------------------------------------------------------
+File_DvbSubtitle::~File_DvbSubtitle()
+{
+}
+
+//***************************************************************************
+// Streams management
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_DvbSubtitle::Streams_Fill()
+{
+    Stream_Prepare(Stream_Text);
+    Fill(Stream_Text, 0, Text_Format, "DVB Subtitle");
+
+    for (std::map<int8u, subtitle_stream_data>::iterator subtitle_stream=subtitle_streams.begin(); subtitle_stream!=subtitle_streams.end(); ++subtitle_stream)
+        for (std::map<int16u, page_data>::iterator page=subtitle_stream->second.pages.begin(); page!=subtitle_stream->second.pages.end(); ++page)
+            for (std::map<int8u, region_data>::iterator region=page->second.regions.begin(); region!=page->second.regions.end(); ++region)
+            {
+                Fill(Stream_Text, 0, "subtitle_stream_id", subtitle_stream->first);
+                (*Stream_More)[Stream_Text][0](Ztring().From_Local("subtitle_stream_id"), Info_Options)=__T("N NI");
+                Fill(Stream_Text, 0, "page_id", page->first);
+                (*Stream_More)[Stream_Text][0](Ztring().From_Local("page_id"), Info_Options)=__T("N NI");
+                Fill(Stream_Text, 0, "region_id", region->first);
+                (*Stream_More)[Stream_Text][0](Ztring().From_Local("region_id"), Info_Options)=__T("N NI");
+                Fill(Stream_Text, 0, "region_horizontal_address", region->second.page_composition_segment?Ztring::ToZtring(region->second.region_horizontal_address):Ztring());
+                (*Stream_More)[Stream_Text][0](Ztring().From_Local("region_horizontal_address"), Info_Options)=__T("N NI");
+                Fill(Stream_Text, 0, "region_vertical_address", region->second.page_composition_segment?Ztring::ToZtring(region->second.region_vertical_address):Ztring());
+                (*Stream_More)[Stream_Text][0](Ztring().From_Local("region_vertical_address"), Info_Options)=__T("N NI");
+                Fill(Stream_Text, 0, "region_width", region->second.region_composition_segment?Ztring::ToZtring(region->second.region_width):Ztring());
+                (*Stream_More)[Stream_Text][0](Ztring().From_Local("region_width"), Info_Options)=__T("N NI");
+                Fill(Stream_Text, 0, "region_height", region->second.region_composition_segment?Ztring::ToZtring(region->second.region_height):Ztring());
+                (*Stream_More)[Stream_Text][0](Ztring().From_Local("region_height"), Info_Options)=__T("N NI");
+                Fill(Stream_Text, 0, "region_depth", region->second.region_composition_segment?Ztring::ToZtring(DvbSubtitle_region_depth[region->second.region_depth]):Ztring());
+                (*Stream_More)[Stream_Text][0](Ztring().From_Local("region_depth"), Info_Options)=__T("N NI");
+            }
+}
+
+//---------------------------------------------------------------------------
+void File_DvbSubtitle::Streams_Finish()
+{
+}
+
+//***************************************************************************
+// Buffer - Synchro
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_DvbSubtitle::Synchronize()
+{
+    //Synchronizing
+    if (MustFindDvbHeader)
+    {
+        while(Buffer_Offset+3<=Buffer_Size)
+        {
+            if (Buffer[Buffer_Offset]==0x20
+             && Buffer[Buffer_Offset+1]==0x00
+             && (Buffer[Buffer_Offset+2]==0x0F
+              || Buffer[Buffer_Offset+1]==0xFF))
+                break;
+            Buffer_Offset++;
+        }
+
+        if (Buffer_Offset+3>Buffer_Size)
+            return false;
+
+        Accept();
+    }
+    else
+    {
+        while(Buffer_Offset<Buffer_Size)
+        {
+            if (Buffer[Buffer_Offset]==0x0F
+             || Buffer[Buffer_Offset]==0xFF)
+                break;
+            Buffer_Offset++;
+        }
+
+        if (Buffer_Offset>=Buffer_Size)
+            return false;
+    }
+
+    //Synched is OK
+    Synched=true;
+    return true;
+}
+
+//---------------------------------------------------------------------------
+bool File_DvbSubtitle::Synched_Test()
+{
+    if (MustFindDvbHeader)
+    {
+        //Must have enough buffer for having header
+        if (Buffer_Offset+1>Buffer_Size)
+            return false;
+
+        if (CC2(Buffer+Buffer_Offset)!=0x2000)
+        {
+            Synched=false;
+            return true;
+        }
+
+        //Displaying it
+        Element_Size=2;
+        Skip_B1(                                                "data_identifier");
+        Get_B1 (subtitle_stream_id,                             "subtitle_stream_id");
+        Buffer_Offset+=2;
+        MustFindDvbHeader=false;
+    }
+
+    //Must have enough buffer for having header
+    if (Buffer_Offset+1>Buffer_Size)
+        return false;
+
+    //Quick test of synchro
+    if (Buffer[Buffer_Offset]!=0x0F
+     && Buffer[Buffer_Offset]!=0xFF)
+    {
+        Synched=false;
+        return true;
+    }
+
+    //We continue
+    return true;
+}
+
+//---------------------------------------------------------------------------
+void File_DvbSubtitle::Read_Buffer_Unsynched()
+{
+    MustParseTheHeaderFile=true;
+    Synched=false;
+}
+
+//***************************************************************************
+// Buffer - Demux
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_DEMUX
+bool File_DvbSubtitle::Demux_UnpacketizeContainer_Test()
+{
+    if (Demux_Offset==0)
+    {
+        Demux_Offset=Buffer_Offset;
+    }
+    while (Demux_Offset<Buffer_Size)
+    {
+        bool MustBreak;
+        switch (Buffer[Demux_Offset])
+        {
+            case 0xFF :
+                        MustBreak=true; break; //0xFF is not in the demuxed frame
+            default   : MustBreak=false;
+        }
+        if (MustBreak)
+            break; //while() loop
+
+        if (Demux_Offset+6>Buffer_Size)
+            return false; //No complete frame
+
+        int16u segment_length=BigEndian2int16u(Buffer+Demux_Offset+4);
+        Demux_Offset+=6+segment_length;
+
+        if (Demux_Offset>=Buffer_Size)
+            return false; //No complete frame
+    }
+
+    if (Demux_Offset>=Buffer_Size)
+        return false; //No complete frame
+
+    Demux_UnpacketizeContainer_Demux();
+
+    Demux_TotalBytes++; //0xFF is not demuxed
+
+    return true;
+}
+#endif //MEDIAINFO_DEMUX
+
+//***************************************************************************
+// Buffer - Per element
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_DvbSubtitle::Header_Parse()
+{
+    //Parsing
+    int8u sync_byte;
+    Get_B1 (sync_byte,                                          "sync_byte");
+    switch (sync_byte)
+    {
+        case 0xFF : //Stuffing
+                    MustFindDvbHeader=true;
+
+                    //Filling
+                    Header_Fill_Code(0xFF, "end_of_PES_data_field_marker");
+                    Header_Fill_Size(1);
+                    return;
+        default   : ; //Normal (0x0F)
+    }
+
+    int16u segment_length;
+    int8u  segment_type;
+    Get_B1 (segment_type,                                       "segment_type");
+    Get_B2 (page_id,                                            "page_id");
+    Get_B2 (segment_length,                                     "segment_length");
+
+    //Filling
+    Header_Fill_Code(segment_type);
+    Header_Fill_Size(Element_Offset+segment_length);
+}
+
+//---------------------------------------------------------------------------
+void File_DvbSubtitle::Data_Parse()
+{
+    switch (Element_Code)
+    {
+        case 0x10 : page_composition_segment(); break;
+        case 0x11 : region_composition_segment(); break;
+        case 0xFF : //end_of_PES_data_field_marker
+                    Frame_Count++;
+                    if (!Status[IsFilled] && Frame_Count>Frame_Count_Valid)
+                    {
+                        Fill();
+                        Finish();
+                    }
+                    return;
+        default   :
+                    if (Element_Size)
+                        Skip_XX(Element_Size,                   "Unknown");
+    }
+}
+
+//***************************************************************************
+// Elements
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_DvbSubtitle::page_composition_segment()
+{
+    Element_Name("page_composition_segment");
+
+    //Parsing
+    Skip_B1(                                                    "page_time_out");
+    BS_Begin();
+    Skip_S1(4,                                                  "page_version_number");
+    Skip_S1(2,                                                  "page_state");
+    Skip_S1(2,                                                  "reserved");
+    BS_End();
+    while(Element_Offset<Element_Size)
+    {
+        Element_Begin1("Region");
+        int16u region_horizontal_address, region_vertical_address;
+        int8u region_id;
+        Get_B1 (region_id,                                      "region_id");
+        Skip_B1(                                                "reserved");
+        Get_B2 (region_horizontal_address,                      "region_horizontal_address");
+        Get_B2 (region_vertical_address,                        "region_vertical_address");
+        Element_End0();
+
+        FILLING_BEGIN();
+            subtitle_streams[subtitle_stream_id].pages[page_id].regions[region_id].page_composition_segment=true;
+            subtitle_streams[subtitle_stream_id].pages[page_id].regions[region_id].region_horizontal_address=region_horizontal_address;
+            subtitle_streams[subtitle_stream_id].pages[page_id].regions[region_id].region_vertical_address=region_vertical_address;
+        FILLING_END();
+    }
+}
+
+//---------------------------------------------------------------------------
+void File_DvbSubtitle::region_composition_segment()
+{
+    Element_Name("region_composition_segment");
+
+    //Parsing
+    int16u region_width, region_height;
+    int8u  region_id, region_depth;
+    Get_B1 (   region_id,                                       "region_id");
+    BS_Begin();
+    Skip_S1(4,                                                  "region_version_number");
+    Skip_S1(1,                                                  "region_fill_flag");
+    Skip_S1(3,                                                  "reserved");
+    BS_End();
+    Get_B2 (   region_width,                                    "region_width");
+    Get_B2 (   region_height,                                   "region_height");
+    BS_Begin();
+    Skip_S1(3,                                                  "region_level_of_compatibility");
+    Get_S1 (3, region_depth,                                    "region_depth"); Param_Info2(DvbSubtitle_region_depth[region_depth], " bits");
+    Skip_S1(2,                                                  "reserved");
+    BS_End();
+    Skip_B1(                                                    "CLUT_id");
+    Skip_B1(                                                    "region_8-bit_pixel_code");
+    BS_Begin();
+    Skip_S1(4,                                                  "region_4-bit_pixel-code");
+    Skip_S1(2,                                                  "region_2-bit_pixel-code");
+    Skip_S1(2,                                                  "reserved");
+    BS_End();
+    while(Element_Offset<Element_Size)
+    {
+        Element_Begin1("Object");
+        int8u object_type;
+        Skip_B2(                                                "object_id");
+        BS_Begin();
+        Get_S1 ( 2, object_type,                                "object_type");
+        Skip_S1( 2,                                             "object_provider_flag");
+        Skip_S1(12,                                             "object_horizontal_position");
+        Skip_S1( 4,                                             "reserved");
+        Skip_S1(12,                                             "object_vertical_position");
+        BS_End();
+        switch (object_type)
+        {
+            case 0x01 :
+            case 0x02 :
+                        Skip_B2(                                 "foreground_pixel_code");
+                        Skip_B2(                                 "background_pixel_code");
+                        break;
+            default   : ;
+        }
+    }
+    Element_End0();
+
+    FILLING_BEGIN();
+        subtitle_streams[subtitle_stream_id].pages[page_id].regions[region_id].region_composition_segment=true;
+        subtitle_streams[subtitle_stream_id].pages[page_id].regions[region_id].region_width=region_width;
+        subtitle_streams[subtitle_stream_id].pages[page_id].regions[region_id].region_height=region_height;
+        subtitle_streams[subtitle_stream_id].pages[page_id].regions[region_id].region_depth=region_depth;
+    FILLING_END();
+}
+
+//***************************************************************************
+// C++
+//***************************************************************************
+
+} //NameSpace
+
+#endif //MEDIAINFO_DVBSUBTITLE_YES
+

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Text/File_DvbSubtitle.h Added

@@ -0,0 +1,110 @@
+// File_DvbSubtitle - Info for DVB Subtitle streams
+// Copyright (C) 2011-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Information about DVB Subtitle streams
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_File_DvbSubtitleH
+#define MediaInfo_File_DvbSubtitleH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+using namespace std;
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Class File_DvbSubtitle
+//***************************************************************************
+
+class File_DvbSubtitle : public File__Analyze
+{
+public :
+    //In
+    int64u Frame_Count_Valid;
+
+    //Constructor/Destructor
+    File_DvbSubtitle();
+    ~File_DvbSubtitle();
+
+private :
+    //Streams management
+    void Streams_Fill();
+    void Streams_Finish();
+
+    //Buffer - Synchro
+    bool Synchronize();
+    bool Synched_Test();
+    void Read_Buffer_Unsynched();
+
+    //Buffer - Demux
+    #if MEDIAINFO_DEMUX
+    bool Demux_UnpacketizeContainer_Test();
+    #endif //MEDIAINFO_DEMUX
+
+    //Buffer - Per element
+    void Header_Parse();
+    void Data_Parse();
+
+    //Elements
+    void page_composition_segment();
+    void region_composition_segment();
+
+    //Temp
+    bool    MustFindDvbHeader;
+    int16u  page_id;
+    int8u   subtitle_stream_id;
+    struct region_data
+    {
+        int16u region_horizontal_address;
+        int16u region_vertical_address;
+
+        int16u region_width;
+        int16u region_height;
+        int16u region_depth;
+
+        bool   page_composition_segment;
+        bool   region_composition_segment;
+
+        region_data()
+        {
+            page_composition_segment=false;
+            region_composition_segment=false;
+        }
+    };
+    struct page_data
+    {
+        std::map<int8u, region_data> regions; //Key is region_id
+    };
+    struct subtitle_stream_data
+    {
+        std::map<int16u, page_data>  pages; //Key is page_id
+    };
+    std::map<int8u, subtitle_stream_data> subtitle_streams; //Key is subtitle_stream_id
+};
+
+} //NameSpace
+
+#endif
+

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Text/File_Eia608.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Text/File_Eia608.cpp Changed

@@ -1,36 +1,41 @@
 // File_Eia608 - Info for EIA-608 files
-// Copyright (C) 2009-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2009-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_EIA608_YES)
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 #include "MediaInfo/Text/File_Eia608.h"
+#include "MediaInfo/MediaInfo_Config_MediaInfo.h"
 using namespace std;
 //---------------------------------------------------------------------------
 
@@ -39,10 +44,6 @@
 // Constants
 //***************************************************************************
 
-/* screen size -- specified by the standard */
-const int8u Eia608_Rows=15;
-const int8u Eia608_Columns=32;
-
 //---------------------------------------------------------------------------
 // CAE-608-E section F.1.1.5
 static const int8u Eia608_PAC_Row[]=
@@ -73,29 +74,29 @@
 :File__Analyze()
 {
     //Configuration
+    #if MEDIAINFO_EVENTS
+        ParserIDs[0]=MediaInfo_Parser_Eia608;
+        StreamIDs_Width[0]=1;
+    #endif //MEDIAINFO_EVENTS
     PTS_DTS_Needed=true;
 
     //In
+    cc_type=(int8u)-1;
 
     //Temp
+    XDS_Level=(size_t)-1;
     TextMode=false;
     DataChannelMode=false;
-    InBack=false;
-    CC_Displayed.resize(Eia608_Rows);
-    for (size_t Pos=0; Pos<CC_Displayed.size(); Pos++)
-        CC_Displayed[Pos].resize(Eia608_Columns);
-    CC_NonDisplayed.resize(Eia608_Rows);
-    for (size_t Pos=0; Pos<CC_NonDisplayed.size(); Pos++)
-        CC_NonDisplayed[Pos].resize(Eia608_Columns);
-    Text_Displayed.resize(Eia608_Rows);
-    for (size_t Pos=0; Pos<Text_Displayed.size(); Pos++)
-        Text_Displayed[Pos].resize(Eia608_Columns);
-    x=0;
-    y=Eia608_Rows-1;
-    Attribute_Current=0;
-    RollUpLines=0;
     cc_data_1_Old=0x00;
     cc_data_2_Old=0x00;
+    HasContent=false;
+}
+
+//---------------------------------------------------------------------------
+File_Eia608::~File_Eia608()
+{
+    for (size_t Pos=0; Pos<Streams.size(); Pos++)
+        delete Streams[Pos];
 }
 
 //***************************************************************************
@@ -105,9 +106,23 @@
 //---------------------------------------------------------------------------
 void File_Eia608::Streams_Fill()
 {
-    Stream_Prepare(Stream_Text);
-    Fill(Stream_Text, 0, Text_Format, "EIA-608");
-    Fill(Stream_Text, 0, Text_StreamSize, 0);
+    if (Config->File_Eia608_DisplayEmptyStream_Get() && Streams.size()<2)
+        Streams.resize(2);
+
+    for (size_t StreamPos=0; StreamPos<Streams.size(); StreamPos++)
+        if (Streams[StreamPos] || (StreamPos<2 && Config->File_Eia608_DisplayEmptyStream_Get()))
+        {
+            Stream_Prepare(Stream_Text);
+            Fill(Stream_Text, StreamPos_Last, Text_Format, "EIA-608");
+            Fill(Stream_Text, StreamPos_Last, Text_StreamSize, 0);
+            Fill(Stream_Text, StreamPos_Last, Text_BitRate_Mode, "CBR");
+            if (cc_type!=(int8u)-1)
+            {
+                string ID=StreamPos<2?"CC":"T";
+                ID+='1'+(cc_type*2)+(StreamPos%2);
+                Fill(Stream_Text, StreamPos_Last, Text_ID, ID);
+            }
+        }
 }
 
 //---------------------------------------------------------------------------
@@ -122,8 +137,28 @@
 //---------------------------------------------------------------------------
 void File_Eia608::Read_Buffer_Unsynched()
 {
-    //Parsing
+    for (size_t StreamPos=0; StreamPos<Streams.size(); StreamPos++)
+        if (Streams[StreamPos])
+        {
+            for (size_t Pos_Y=0; Pos_Y<Streams[StreamPos]->CC_Displayed.size(); Pos_Y++)
+            {
+                for (size_t Pos_X=0; Pos_X<Streams[StreamPos]->CC_Displayed[Pos_Y].size(); Pos_X++)
+                if (Streams[StreamPos])
+                    {
+                        Streams[StreamPos]->CC_Displayed[Pos_Y][Pos_X].Value=L' ';
+                        Streams[StreamPos]->CC_Displayed[Pos_Y][Pos_X].Attribute=0;
+                        if (StreamPos<2)
+                        {
+                            Streams[StreamPos]->CC_NonDisplayed[Pos_Y][Pos_X].Value=L' ';
+                            Streams[StreamPos]->CC_NonDisplayed[Pos_Y][Pos_X].Attribute=0;
+                        }
+                    }
+            }
+            Streams[StreamPos]->Synched=false;
+        }
+
     XDS_Data.clear();
+    XDS_Level=(size_t)-1;
 }
 
 //***************************************************************************
@@ -131,8 +166,45 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
+void File_Eia608::Read_Buffer_Init()
+{
+    #if MEDIAINFO_DEMUX
+        if (Frame_Count_NotParsedIncluded==(int64u)-1)
+            Frame_Count_NotParsedIncluded=Config->Demux_FirstFrameNumber_Get();
+        if (FrameInfo.DUR==(int64u)-1 && Config->Demux_Rate_Get())
+            FrameInfo.DUR=float64_int64s(((float64)1000000000)/Config->Demux_Rate_Get());
+        if (FrameInfo.DTS==(int64u)-1)
+            FrameInfo.DTS=Config->Demux_FirstDts_Get();
+    #endif //MEDIAINFO_DEMUX
+    if (FrameInfo.DUR!=(int64u)-1)
+    {
+        if (FrameInfo.DTS==(int64u)-1)
+            FrameInfo.DTS=0;
+        if (FrameInfo.PTS==(int64u)-1)
+            FrameInfo.PTS=0;
+    }
+
+}
+
+//---------------------------------------------------------------------------
+void File_Eia608::Read_Buffer_AfterParsing()
+{
+    Frame_Count++;
+    Frame_Count_InThisBlock++;
+    if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+        Frame_Count_NotParsedIncluded++;
+    if (FrameInfo.DUR!=(int64u)-1)
+    {
+        FrameInfo.DTS+=FrameInfo.DUR;
+        FrameInfo.PTS=FrameInfo.DTS;
+    }
+}
+
+//---------------------------------------------------------------------------
 void File_Eia608::Read_Buffer_Continue()
 {
+    FrameInfo.PTS=FrameInfo.DTS;
+
     if (!Status[IsAccepted])
         Accept("EIA-608");
 
@@ -147,39 +219,34 @@
     //Test if non-printing chars (0x10-0x1F) are repeated (CEA-608-E section D.2)
     if (cc_data_1_Old)
     {
-        if (cc_data_1_Old==cc_data_1 || cc_data_2_Old==cc_data_2)
+        if (cc_data_1_Old==cc_data_1 && cc_data_2_Old==cc_data_2)
         {
             //This is duplicate
             cc_data_1_Old=0x00;
             cc_data_2_Old=0x00;
             return; //Nothing to do
         }
-        else
+        else if (cc_type==0) // Field 1 only
         {
             //They should be duplicated, there is a problem
         }
         cc_data_1_Old=0x00;
         cc_data_2_Old=0x00;
     }
-    
-    if ((cc_data_1 && cc_data_1<0x10) || !XDS_Data.empty()) //XDS
+
+    if ((cc_data_1 && cc_data_1<0x10) || (XDS_Level!=(size_t)-1 && cc_data_1>=0x20)) //XDS
     {
-        TextMode=false; //This is CC
-        XDS_Data.push_back(cc_data_1);
-        XDS_Data.push_back(cc_data_2);
-        if (cc_data_1==0x0F)
-            XDS();
-        if (XDS_Data.size()>64)
-            XDS_Data.clear(); //This is a security
+        XDS(cc_data_1, cc_data_2);
     }
     else if (cc_data_1>=0x20) //Basic characters
     {
-        if (Synched)
-        {
-            Standard(cc_data_1);
-            if ((cc_data_2&0x7F)>=0x20)
-                Standard(cc_data_2);
-        }
+        size_t StreamPos=TextMode*2+DataChannelMode;
+        if (StreamPos>=Streams.size() || Streams[StreamPos]==NULL || !Streams[StreamPos]->Synched)
+            return; //Not synched
+
+        Standard(cc_data_1);
+        if ((cc_data_2&0x7F)>=0x20)
+            Standard(cc_data_2);
     }
     else if (cc_data_1) //Special
         Special(cc_data_1, cc_data_2);
@@ -190,15 +257,58 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
+void File_Eia608::XDS(int8u cc_data_1, int8u cc_data_2)
+{
+    if (cc_data_1 && cc_data_1<0x10 && cc_data_1%2==0)
+    {
+        // Continue
+        cc_data_1--;
+        for (XDS_Level=0; XDS_Level<XDS_Data.size(); XDS_Level++)
+            if (XDS_Data[XDS_Level].size()>=2 && XDS_Data[XDS_Level][0]==cc_data_1 && XDS_Data[XDS_Level][1]==cc_data_2)
+                break;
+        if (XDS_Level>=XDS_Data.size())
+            XDS_Level=(size_t)-1; // There is a problem
+
+        return;
+    }
+    else if (cc_data_1 && cc_data_1<0x0F)
+    {
+        // Start
+        for (XDS_Level=0; XDS_Level<XDS_Data.size(); XDS_Level++)
+            if (XDS_Data[XDS_Level].size()>=2 && XDS_Data[XDS_Level][0]==cc_data_1 && XDS_Data[XDS_Level][1]==cc_data_2)
+                break;
+        if (XDS_Level>=XDS_Data.size())
+        {
+            XDS_Level=XDS_Data.size();
+            XDS_Data.resize(XDS_Level+1);
+        }
+        else
+            XDS_Data[XDS_Level].clear(); // There is a problem, erasing the previous item
+    }
+
+    if (XDS_Level==(size_t)-1)
+        return; //There is a problem
+
+    XDS_Data[XDS_Level].push_back(cc_data_1);
+    XDS_Data[XDS_Level].push_back(cc_data_2);
+    if (cc_data_1==0x0F)
+        XDS();
+    if (XDS_Level!=(size_t)-1 && XDS_Data[XDS_Level].size()>=36)
+        XDS_Data[XDS_Level].clear(); // Clear, this is a security
+    TextMode=0; // This is CC
+}
+
+//---------------------------------------------------------------------------
 void File_Eia608::XDS()
 {
-    if (XDS_Data.size()<4)
+    if (XDS_Data[XDS_Level].size()<4)
     {
-        XDS_Data.clear();
+        XDS_Data.erase(XDS_Data.begin()+XDS_Level);
+        XDS_Level=(size_t)-1;
         return; //There is a problem
     }
 
-    switch (XDS_Data[0])
+    switch (XDS_Data[XDS_Level][0])
     {
         case 0x01 : XDS_Current(); break;
         case 0x05 : XDS_Channel(); break;
@@ -206,17 +316,14 @@
         default   : ;
     }
 
-    XDS_Data.clear();
-
-    //With have a point of synchro
-    if (!Synched)
-        Synched=true;
+    XDS_Data.erase(XDS_Data.begin()+XDS_Level);
+    XDS_Level=(size_t)-1;
 }
 
 //---------------------------------------------------------------------------
 void File_Eia608::XDS_Current()
 {
-    switch (XDS_Data[1])
+    switch (XDS_Data[XDS_Level][1])
     {
         case 0x03 : XDS_Current_ProgramName(); break;
         case 0x05 : XDS_Current_ContentAdvisory(); break;
@@ -228,7 +335,7 @@
 //---------------------------------------------------------------------------
 void File_Eia608::XDS_Current_ContentAdvisory()
 {
-    if (XDS_Data.size()!=6)
+    if (XDS_Data[XDS_Level].size()!=6)
     {
         return; //There is a problem
     }
@@ -238,17 +345,17 @@
 void File_Eia608::XDS_Current_ProgramName()
 {
     string ValueS;
-    for (size_t Pos=2; Pos<XDS_Data.size()-2; Pos++)
-        ValueS.append(1, (const char)(XDS_Data[Pos]));
+    for (size_t Pos=2; Pos<XDS_Data[XDS_Level].size()-2; Pos++)
+        ValueS.append(1, (const char)(XDS_Data[XDS_Level][Pos]));
     Ztring Value;
     Value.From_UTF8(ValueS.c_str());
-    Element_Info(_T("Program Name=")+Value);
+    Element_Info1(__T("Program Name=")+Value);
 }
 
 //---------------------------------------------------------------------------
 void File_Eia608::XDS_Current_CopyAndRedistributionControlPacket()
 {
-    if (XDS_Data.size()!=6)
+    if (XDS_Data[XDS_Level].size()!=6)
     {
         return; //There is a problem
     }
@@ -257,7 +364,7 @@
 //---------------------------------------------------------------------------
 void File_Eia608::XDS_Channel()
 {
-    switch (XDS_Data[1])
+    switch (XDS_Data[XDS_Level][1])
     {
         case 0x01 : XDS_Channel_NetworkName(); break;
         default   : ;
@@ -268,17 +375,17 @@
 void File_Eia608::XDS_Channel_NetworkName()
 {
     string ValueS;
-    for (size_t Pos=2; Pos<XDS_Data.size()-2; Pos++)
-        ValueS.append(1, (const char)(XDS_Data[Pos]));
+    for (size_t Pos=2; Pos<XDS_Data[XDS_Level].size()-2; Pos++)
+        ValueS.append(1, (const char)(XDS_Data[XDS_Level][Pos]));
     Ztring Value;
     Value.From_UTF8(ValueS.c_str());
-    Element_Info(_T("Network Name=")+Value);
+    Element_Info1(__T("Network Name=")+Value);
 }
 
 //---------------------------------------------------------------------------
 void File_Eia608::XDS_PublicService()
 {
-    switch (XDS_Data[1])
+    switch (XDS_Data[XDS_Level][1])
     {
         case 0x01 : XDS_PublicService_NationalWeatherService(); break;
         default   : ;
@@ -288,7 +395,7 @@
 //---------------------------------------------------------------------------
 void File_Eia608::XDS_PublicService_NationalWeatherService()
 {
-    if (XDS_Data.size()!=20)
+    if (XDS_Data[XDS_Level].size()!=20)
     {
         return; //There is a problem
     }
@@ -299,10 +406,19 @@
 {
     //Data channel check
     DataChannelMode=(cc_data_1&0x08)!=0; //bit3 is the Data Channel number
-    cc_data_1&=~0x08;
 
     //Field check
-    cc_data_1&=~0x01;
+    if (cc_type==(int8u)-1)
+    {
+        if ((cc_data_1==0x14 || cc_data_1==0x1C) && (cc_data_2&0xF0)==0x20)
+            cc_type=0;
+        if ((cc_data_1==0x15 || cc_data_1==0x1D) && (cc_data_2&0xF0)==0x20)
+            cc_type=1;
+    }
+
+    cc_data_1&=0xF7;
+    if (cc_data_1==0x15 && (cc_data_2&0xF0)==0x20)
+        cc_data_1=0x14;
 
     if (cc_data_1>=0x10 && cc_data_1<=0x17 && cc_data_2>=0x40)
     {
@@ -325,10 +441,6 @@
     //Saving data, for repetition of the code
     cc_data_1_Old=cc_data_1;
     cc_data_2_Old=cc_data_2;
-
-    //With have a point of synchro
-    if (!Synched)
-        Synched=true;
 }
 
 //---------------------------------------------------------------------------
@@ -336,32 +448,37 @@
 {
     //CEA-608-E, Section F.1.1.5
 
+    size_t StreamPos=TextMode*2+DataChannelMode;
+    if (StreamPos>=Streams.size() || Streams[StreamPos]==NULL || !Streams[StreamPos]->Synched)
+        return; //Not synched
+    Streams[StreamPos]->x=0; //I am not sure of this, specifications are not precise
+
     //Horizontal position
     if (!TextMode)
     {
-        y=Eia608_PAC_Row[cc_data_1&0x0F]+((cc_data_2&0x20)?1:0);
-        if (y>=Eia608_Rows)
+        Streams[StreamPos]->y=Eia608_PAC_Row[cc_data_1&0x0F]+((cc_data_2&0x20)?1:0);
+        if (Streams[StreamPos]->y>=Eia608_Rows)
         {
-            y=Eia608_Rows-1;
+            Streams[StreamPos]->y=Eia608_Rows-1;
         }
     }
 
     //Attributes (except Underline)
     if (cc_data_2&0x10) //0x5x and 0x7x
     {
-        x=(cc_data_2&0x0E)<<1;
-        Attribute_Current=Attribute_Color_White;
+        Streams[StreamPos]->x=(cc_data_2&0x0E)<<1;
+        Streams[StreamPos]->Attribute_Current=Attribute_Color_White;
     }
     else if ((cc_data_2&0x0E)==0x0E) //0x4E, 0x4F, 0x6E, 0x6F
     {
-        Attribute_Current=Attribute_Color_White|Attribute_Italic;
+        Streams[StreamPos]->Attribute_Current=Attribute_Color_White|Attribute_Italic;
     }
     else //0x40-0x4D, 0x60-0x6D
-        Attribute_Current=(cc_data_2&0x0E)>>1;
+        Streams[StreamPos]->Attribute_Current=(cc_data_2&0x0E)>>1;
 
     //Underline
     if (cc_data_2&0x01)
-        Attribute_Current|=Attribute_Underline;
+        Streams[StreamPos]->Attribute_Current|=Attribute_Underline;
 }
 
 //---------------------------------------------------------------------------
@@ -393,6 +510,10 @@
 //---------------------------------------------------------------------------
 void File_Eia608::Special_11(int8u cc_data_2)
 {
+    size_t StreamPos=TextMode*2+DataChannelMode;
+    if (StreamPos>=Streams.size() || Streams[StreamPos]==NULL || !Streams[StreamPos]->Synched)
+        return; //Not synched
+
     switch (cc_data_2)
     {
         //CEA-608-E, Section F.1.1.3
@@ -414,13 +535,13 @@
         case 0x2F : //
                     //Color or Italic
                     if ((cc_data_2&0xFE)==0x2E) //Italic
-                        Attribute_Current|=Attribute_Italic;
+                        Streams[StreamPos]->Attribute_Current|=Attribute_Italic;
                     else //Other attributes
-                        Attribute_Current=(cc_data_2&0x0F)>>1;
+                        Streams[StreamPos]->Attribute_Current=(cc_data_2&0x0F)>>1;
 
                     //Underline
                     if (cc_data_2&0x01)
-                        Attribute_Current|=Attribute_Underline;
+                        Streams[StreamPos]->Attribute_Current|=Attribute_Underline;
 
                     break;
         //CEA-608-E, Section F.1.1.1
@@ -447,6 +568,13 @@
 //---------------------------------------------------------------------------
 void File_Eia608::Special_12(int8u cc_data_2)
 {
+    size_t StreamPos=TextMode*2+DataChannelMode;
+    if (StreamPos>=Streams.size() || Streams[StreamPos]==NULL || !Streams[StreamPos]->Synched)
+        return; //Not synched
+
+    if (Streams[StreamPos]->x && cc_data_2>=0x20 && cc_data_2<0x40)
+        Streams[StreamPos]->x--; //Erasing previous character
+
     switch (cc_data_2)
     {
         //CEA-608-E, Section 6.4.2
@@ -489,6 +617,13 @@
 //---------------------------------------------------------------------------
 void File_Eia608::Special_13(int8u cc_data_2)
 {
+    size_t StreamPos=TextMode*2+DataChannelMode;
+    if (StreamPos>=Streams.size() || Streams[StreamPos]==NULL || !Streams[StreamPos]->Synched)
+        return; //Not synched
+
+    if (Streams[StreamPos]->x && cc_data_2>=0x20 && cc_data_2<0x40)
+        Streams[StreamPos]->x--; //Erasing previous character
+
     switch (cc_data_2)
     {
         //CEA-608-E, Section 6.4.2
@@ -531,6 +666,8 @@
 //---------------------------------------------------------------------------
 void File_Eia608::Special_14(int8u cc_data_2)
 {
+    size_t StreamPos=TextMode*2+DataChannelMode;
+
     switch (cc_data_2)
     {
         case 0x20 : //RCL - Resume Caption Loading
@@ -538,95 +675,116 @@
         case 0x26 : //RU3 - Roll-Up Captions3 Rows
         case 0x27 : //RU4 - Roll-Up Captions4 Rows
         case 0x29 : //RDC - Resume Direct Captioning
-        case 0x2F : //EOC - End of Caption
-                    TextMode=false; break; //This is CC
         case 0x2A : //TR  - Text Restart
         case 0x2B : //RTD - Resume Text Display
-                    TextMode=true; break; //This is Text
+                    TextMode=cc_data_2>=0x2A;
+                    XDS_Level=(size_t)-1; // No more XDS
+                    StreamPos=TextMode*2+DataChannelMode;
+
+                    //Alloc
+                    if (StreamPos>=Streams.size())
+                        Streams.resize(StreamPos+1);
+                    if (Streams[StreamPos]==NULL)
+                    {
+                        Streams[StreamPos]=new stream();
+                        Streams[StreamPos]->CC_Displayed.resize(Eia608_Rows);
+                        for (size_t Pos=0; Pos<Streams[StreamPos]->CC_Displayed.size(); Pos++)
+                            Streams[StreamPos]->CC_Displayed[Pos].resize(Eia608_Columns);
+                        if (StreamPos<2) //CC only, not in Text
+                        {
+                            Streams[StreamPos]->CC_NonDisplayed.resize(Eia608_Rows);
+                            for (size_t Pos=0; Pos<Streams[StreamPos]->CC_NonDisplayed.size(); Pos++)
+                                Streams[StreamPos]->CC_NonDisplayed[Pos].resize(Eia608_Columns);
+                        }
+                    }
+                    Streams[StreamPos]->Synched=true;
+
+                    break;
+        case 0x2F : //EOC - end of Caption
+                    TextMode=false;
+                    StreamPos=TextMode*2+DataChannelMode;
         default: ;
     }
 
+    if (StreamPos>=Streams.size() || Streams[StreamPos]==NULL || !Streams[StreamPos]->Synched)
+        return; //Not synched
+
     switch (cc_data_2)
     {
         case 0x20 : TextMode=false;
-                    InBack=true;
+                    Streams[StreamPos]->InBack=true;
                     break; //RCL - Resume Caption Loading (Select pop-on style)
-        case 0x21 : if (x)
-                        x--;
-                    (InBack?CC_NonDisplayed:CC_Displayed)[y][x].Value=L' '; //Clear the character
-                    if (!InBack)
+        case 0x21 : if (Streams[StreamPos]->x)
+                        Streams[StreamPos]->x--;
+                    (Streams[StreamPos]->InBack?Streams[StreamPos]->CC_NonDisplayed:Streams[StreamPos]->CC_Displayed)[Streams[StreamPos]->y][Streams[StreamPos]->x].Value=L' '; //Clear the character
+                    if (!Streams[StreamPos]->InBack)
                         HasChanged();
                     break; //BS  - Backspace
         case 0x22 : Special_14(0x2D); //Found 1 file with AOF and non CR
                     break; //AOF - Alarm Off
         case 0x23 : break; //AON - Alarm On
-        case 0x24 : for (size_t Pos=x; Pos<Eia608_Columns; Pos++)
-                        (InBack?CC_NonDisplayed:CC_Displayed)[y][Pos].Value=L' '; //Clear up to the end of line
-                    if (!InBack)
+        case 0x24 : for (size_t Pos=Streams[StreamPos]->x; Pos<Eia608_Columns; Pos++)
+                        (Streams[StreamPos]->InBack?Streams[StreamPos]->CC_NonDisplayed:Streams[StreamPos]->CC_Displayed)[Streams[StreamPos]->y][Pos].Value=L' '; //Clear up to the end of line
+                    if (!Streams[StreamPos]->InBack)
                         HasChanged();
                     break; //DER - Delete to End of Row
         case 0x25 : //RU2 - Roll-Up Captions2 Rows
         case 0x26 : //RU3 - Roll-Up Captions3 Rows
         case 0x27 : //RU4 - Roll-Up Captions4 Rows
-                    RollUpLines=cc_data_2-0x25+2;
-                    InBack=false;
+                    Streams[StreamPos]->RollUpLines=cc_data_2-0x25+2;
+                    Streams[StreamPos]->InBack=false;
                     break; //RUx - Roll-Up Captionsx Rows
         case 0x28 : break; //FON - Flash On
-        case 0x29 : InBack=false;
+        case 0x29 : Streams[StreamPos]->InBack=false;
                     break; //RDC - Resume Direct Captioning (paint-on style)
         case 0x2A : TextMode=true;
-                    RollUpLines=Eia608_Rows; //Roll up all the lines
-                    y=Eia608_Rows-1; //Base is the bottom line
-                    Attribute_Current=0; //Reset all attributes
+                    Streams[StreamPos]->RollUpLines=Eia608_Rows; //Roll up all the lines
+                    Streams[StreamPos]->y=Eia608_Rows-1; //Base is the bottom line
+                    Streams[StreamPos]->Attribute_Current=0; //Reset all attributes
                     Special_14(0x2D); //Next line
                     break; //TR  - Text Restart (clear Text, but not boxes)
         case 0x2B : TextMode=true;
                     break; //RTD - Resume Text Display
         case 0x2C :
-                    for (size_t Pos_Y=0; Pos_Y<Eia608_Rows; Pos_Y++)
-                        for (size_t Pos_X=0; Pos_X<Eia608_Columns; Pos_X++)
-                        {
-                            CC_Displayed[Pos_Y][Pos_X].Value=L' ';
-                            CC_Displayed[Pos_Y][Pos_X].Attribute=0;
-                        }
-                    HasChanged();
+                    if (StreamPos<Streams.size() && Streams[StreamPos])
+                    {
+                        bool HasChanged_=false;
+                        for (size_t Pos_Y=0; Pos_Y<Eia608_Rows; Pos_Y++)
+                            for (size_t Pos_X=0; Pos_X<Eia608_Columns; Pos_X++)
+                                if (Streams[StreamPos]->CC_Displayed[Pos_Y][Pos_X].Value!=L' ')
+                                {
+                                    Streams[StreamPos]->CC_Displayed[Pos_Y][Pos_X].Value=L' ';
+                                    Streams[StreamPos]->CC_Displayed[Pos_Y][Pos_X].Attribute=0;
+                                    HasChanged_=true;
+                                }
+                        if (HasChanged_)
+                            HasChanged();
+                    }
                     break; //EDM - Erase Displayed Memory
-        case 0x2D : for (size_t Pos=1; Pos<RollUpLines; Pos++)
+        case 0x2D : for (size_t Pos=1; Pos<Streams[StreamPos]->RollUpLines; Pos++)
                     {
-                        if (y>=RollUpLines-Pos && y-RollUpLines+Pos+1<Eia608_Rows)
-                        {
-                            if (TextMode)
-                                Text_Displayed[y-RollUpLines+Pos]=Text_Displayed[y-RollUpLines+Pos+1];
-                            else
-                                CC_Displayed[y-RollUpLines+Pos]=CC_Displayed[y-RollUpLines+Pos+1];
-                        }
+                        if (Streams[StreamPos]->y>=Streams[StreamPos]->RollUpLines-Pos && Streams[StreamPos]->y-Streams[StreamPos]->RollUpLines+Pos+1<Eia608_Rows)
+                            Streams[StreamPos]->CC_Displayed[Streams[StreamPos]->y-Streams[StreamPos]->RollUpLines+Pos]=Streams[StreamPos]->CC_Displayed[Streams[StreamPos]->y-Streams[StreamPos]->RollUpLines+Pos+1];
                     }
                     for (size_t Pos_X=0; Pos_X<Eia608_Columns; Pos_X++)
                     {
-                        if (TextMode)
-                        {
-                            Text_Displayed[y][Pos_X].Value=L' ';
-                            Text_Displayed[y][Pos_X].Attribute=0;
-                        }
-                        else
-                        {
-                            CC_Displayed[y][Pos_X].Value=L' ';
-                            CC_Displayed[y][Pos_X].Attribute=0;
-                        }
+                        Streams[StreamPos]->CC_Displayed[Streams[StreamPos]->y][Pos_X].Value=L' ';
+                        Streams[StreamPos]->CC_Displayed[Streams[StreamPos]->y][Pos_X].Attribute=0;
                     }
-                    if (!InBack)
+                    if (!Streams[StreamPos]->InBack)
                         HasChanged();
-                    x=0;
+                    Streams[StreamPos]->x=0;
                     break; //CR  - Carriage Return
-        case 0x2E : for (size_t Pos_Y=0; Pos_Y<Eia608_Rows; Pos_Y++)
-                        for (size_t Pos_X=0; Pos_X<Eia608_Columns; Pos_X++)
+        case 0x2E : for (size_t Pos_Y=0; Pos_Y<Streams[StreamPos]->CC_NonDisplayed.size(); Pos_Y++)
+                        for (size_t Pos_X=0; Pos_X<Streams[StreamPos]->CC_NonDisplayed[Pos_Y].size(); Pos_X++)
                         {
-                            CC_NonDisplayed[Pos_Y][Pos_X].Value=L' ';
-                            CC_NonDisplayed[Pos_Y][Pos_X].Attribute=0;
+                            Streams[StreamPos]->CC_NonDisplayed[Pos_Y][Pos_X].Value=L' ';
+                            Streams[StreamPos]->CC_NonDisplayed[Pos_Y][Pos_X].Attribute=0;
                         }
                     break; //ENM - Erase Non-Displayed Memory
-        case 0x2F : CC_Displayed.swap(CC_NonDisplayed);
-                        HasChanged();
+        case 0x2F : Streams[StreamPos]->CC_Displayed.swap(Streams[StreamPos]->CC_NonDisplayed);
+                    HasChanged();
+                    Streams[StreamPos]->Synched=false;
                     break; //EOC - End of Caption
         default   : Illegal(0x14, cc_data_2);
     }
@@ -635,15 +793,19 @@
 //---------------------------------------------------------------------------
 void File_Eia608::Special_17(int8u cc_data_2)
 {
+    size_t StreamPos=TextMode*2+DataChannelMode;
+    if (StreamPos>=Streams.size() || Streams[StreamPos]==NULL || !Streams[StreamPos]->Synched)
+        return; //Not synched
+
     switch (cc_data_2)
     {
         //CEA-608-E, section B.4
-        case 0x20 : //TO1 - Tab Offset 1 Column
-        case 0x21 : //TO2 - Tab Offset 2 Columns
-        case 0x22 : //TO3 - Tab Offset 3 Columns
-                    x+=cc_data_2&0x03;
-                    if (x>=Eia608_Columns)
-                        x=Eia608_Columns-1;
+        case 0x21 : //TO1 - Tab Offset 1 Column
+        case 0x22 : //TO2 - Tab Offset 2 Columns
+        case 0x23 : //TO3 - Tab Offset 3 Columns
+                    Streams[StreamPos]->x+=cc_data_2&0x03;
+                    if (Streams[StreamPos]->x>=Eia608_Columns)
+                        Streams[StreamPos]->x=Eia608_Columns-1;
                     break;
         //CEA-608-E, section 6.3
         case 0x24 : break;  //Select the standard line 21 character set in normal size
@@ -769,38 +931,30 @@
 //---------------------------------------------------------------------------
 void File_Eia608::Character_Fill(wchar_t Character)
 {
-    if (x==Eia608_Columns)
+    size_t StreamPos=TextMode*2+DataChannelMode;
+    if (StreamPos>=Streams.size() || Streams[StreamPos]==NULL || !Streams[StreamPos]->Synched)
+        return; //Not synched
+
+    if (Streams[StreamPos]->x==Eia608_Columns)
     {
-        x--; //There is a problem
+        Streams[StreamPos]->x--; //There is a problem
 
         //TODO: Put it at the end, for the conversion
         //TODO: Handle special chars
     }
 
-    if (TextMode)
-    {
-        Text_Displayed[y][x].Value=Character;
-    }
-    else if (InBack)
-    {
-        CC_NonDisplayed[y][x].Value=Character;
-    }
+    if (Streams[StreamPos]->InBack)
+        Streams[StreamPos]->CC_NonDisplayed[Streams[StreamPos]->y][Streams[StreamPos]->x].Value=Character;
     else
-    {
-        CC_Displayed[y][x].Value=Character;
-    }
+        Streams[StreamPos]->CC_Displayed[Streams[StreamPos]->y][Streams[StreamPos]->x].Value=Character;
 
-    x++;
-    
-    if (TextMode || !InBack)
+    Streams[StreamPos]->x++;
+
+    if (TextMode || !Streams[StreamPos]->InBack)
         HasChanged();
 
-    if (!Status[IsFilled]) //TODO: separate CC1/CC2/T1/T2
-    {
-        Fill("EIA-608");
-        if (MediaInfoLib::Config.ParseSpeed_Get()<1)
-            Finish("EIA-608");
-    }
+    if (!HasContent)
+        HasContent=true;
 }
 
 //---------------------------------------------------------------------------

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Text/File_Eia608.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Text/File_Eia608.h Changed

@@ -1,17 +1,17 @@
 // File_Eia608 - Info for EIA-608 files
-// Copyright (C) 2009-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2009-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -40,13 +40,17 @@
 // Class File_Eia608
 //***************************************************************************
 
+static const int8u Eia608_Rows=15; //Screen size, specified by the standard
+static const int8u Eia608_Columns=32; //Screen size, specified by the standard
 class File_Eia608 : public File__Analyze
 {
 public :
     //In
+    int8u   cc_type;
 
     //Constructor/Destructor
     File_Eia608();
+    ~File_Eia608();
 
 private :
     //Streams management
@@ -57,16 +61,19 @@
     void Read_Buffer_Unsynched();
 
     //Buffer - Global
+    void Read_Buffer_Init();
     void Read_Buffer_Continue();
+    void Read_Buffer_AfterParsing();
 
     //Function
     void Standard (int8u Character);
 
-    std::vector<int8u> XDS_Data;
+    std::vector<std::vector<int8u> > XDS_Data;
+    size_t XDS_Level;
     bool TextMode; //CC or T
     bool DataChannelMode; //if true, CC2/CC4/T2/T4
-    bool InBack; //The back buffer is written
 
+    void XDS(int8u cc_data_1, int8u cc_data_2);
     void XDS();
     void XDS_Current();
     void XDS_Current_ProgramName();
@@ -112,16 +119,32 @@
     void Character_Fill(wchar_t Character);
     void HasChanged();
     void Illegal(int8u cc_data_1, int8u cc_data_2);
-    vector<vector<character> > CC_Displayed;
-    vector<vector<character> > CC_NonDisplayed;
-    vector<vector<character> > Text_Displayed;
-    int8u Attribute_Current;
-
-    size_t x;
-    size_t y;
-    size_t RollUpLines;
+    struct stream
+    {
+        vector<vector<character> > CC_Displayed;
+        vector<vector<character> > CC_NonDisplayed;
+        bool    InBack; //The back buffer is written
+        size_t  x;
+        size_t  y;
+        int8u   Attribute_Current;
+        size_t  RollUpLines;
+        bool    Synched;
+
+        stream()
+        {
+            InBack=false;
+            x=0;
+            y=Eia608_Rows-1;
+            Attribute_Current=0;
+            RollUpLines=0;
+            Synched=false;
+        }
+    };
+    std::vector<stream*> Streams;
+
     int8u cc_data_1_Old;
     int8u cc_data_2_Old;
+    bool   HasContent;
 };
 
 } //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Text/File_Eia708.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Text/File_Eia708.cpp Changed

@@ -1,36 +1,41 @@
 // File_Eia708 - Info for EIA-708 files
-// Copyright (C) 2009-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2009-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_EIA708_YES)
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
 #include "MediaInfo/Text/File_Eia708.h"
+#include "MediaInfo/MediaInfo_Config_MediaInfo.h"
 //---------------------------------------------------------------------------
 
 namespace MediaInfoLib
@@ -44,6 +49,9 @@
 File_Eia708::File_Eia708()
 :File__Analyze()
 {
+    //Config
+    PTS_DTS_Needed=true;
+
     //In
     cc_type=(int8u)-1;
     AspectRatio=((float32)4)/3; //Default to 4:3
@@ -53,6 +61,7 @@
 
     //Temp
     StandAloneCommand=false;
+    HasContent=false;
 }
 
 //---------------------------------------------------------------------------
@@ -69,10 +78,18 @@
 //---------------------------------------------------------------------------
 void File_Eia708::Streams_Fill()
 {
-    Stream_Prepare(Stream_Text);
-    Fill(Stream_Text, 0, Text_ID, 1); //TODO: fill with the exact service
-    Fill(Stream_Text, 0, Text_Format, "EIA-708");
-    Fill(Stream_Text, 0, Text_StreamSize, 0);
+    if (Config->File_Eia708_DisplayEmptyStream_Get() && Streams.size()<2)
+        Streams.resize(2);
+
+    for (size_t Pos=0; Pos<Streams.size(); Pos++)
+        if (Streams[Pos] || (Pos && Pos<2 && Config->File_Eia708_DisplayEmptyStream_Get()))
+        {
+            Stream_Prepare(Stream_Text);
+            Fill(Stream_Text, StreamPos_Last, Text_ID, Pos);
+            Fill(Stream_Text, StreamPos_Last, Text_Format, "EIA-708");
+            Fill(Stream_Text, StreamPos_Last, Text_StreamSize, 0);
+            Fill(Stream_Text, StreamPos_Last, Text_BitRate_Mode, "CBR");
+        }
 }
 
 //---------------------------------------------------------------------------
@@ -85,8 +102,15 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
+void File_Eia708::Read_Buffer_Init()
+{
+}
+
+//---------------------------------------------------------------------------
 void File_Eia708::Read_Buffer_Continue()
 {
+    FrameInfo.PTS=FrameInfo.DTS;
+
     if (!Status[IsAccepted])
     {
         if (cc_type!=3)
@@ -99,6 +123,42 @@
     }
 }
 
+//---------------------------------------------------------------------------
+void File_Eia708::Read_Buffer_Unsynched()
+{
+    if (cc_type==4) //Magic value saying that the buffer must be kept (this is only a point of synchro from the undelying layer)
+        return;
+
+    for (int8u service_number=1; service_number<Streams.size(); service_number++)
+        if (Streams[service_number])
+        {
+            //Per window
+            for (size_t WindowID=0; WindowID<Streams[service_number]->Windows.size(); WindowID++)
+            {
+                window* Window=Streams[service_number]->Windows[WindowID];
+                if (Window)
+                    for (size_t Pos_Y=0; Pos_Y<Window->Minimal.CC.size(); Pos_Y++)
+                    {
+                        for (size_t Pos_X=0; Pos_X<Window->Minimal.CC[Pos_Y].size(); Pos_X++)
+                        {
+                            Window->Minimal.CC[Pos_Y][Pos_X].Value=L' ';
+                            Window->Minimal.CC[Pos_Y][Pos_X].Attribute=0;
+                        }
+                    }
+            }
+
+            //Global display
+            for (size_t Pos_Y=0; Pos_Y<Streams[service_number]->Minimal.CC.size(); Pos_Y++)
+            {
+                for (size_t Pos_X=0; Pos_X<Streams[service_number]->Minimal.CC[Pos_Y].size(); Pos_X++)
+                {
+                    Streams[service_number]->Minimal.CC[Pos_Y][Pos_X].Value=L' ';
+                    Streams[service_number]->Minimal.CC[Pos_Y][Pos_X].Attribute=0;
+                }
+            }
+        }
+}
+
 //***************************************************************************
 // Buffer - Per element
 //***************************************************************************
@@ -113,7 +173,7 @@
     Get_S1(6, packet_size,                                      "packet_size_code");
     BS_End();
 
-    Header_Fill_Code(0, _T("DTVCC packet"));
+    Header_Fill_Code(0, __T("DTVCC packet"));
     Header_Fill_Size(packet_size==0?128:(packet_size*2));
 }
 
@@ -136,9 +196,9 @@
 
         if (service_number)
         {
-            Element_Begin("Service Block Packet", block_size);
+            Element_Begin1("Service Block Packet");
             Service();
-            Element_End();
+            Element_End0();
         }
     }
 }
@@ -170,15 +230,15 @@
             case 0x0C : FF(); break; //Form Feed
             case 0x0D : CR(); break; //Carriage Return
             case 0x0E : HCR(); break; //Horizontal Carriage Return
-            case 0x01 : 
-            case 0x02 : 
-            case 0x04 : 
-            case 0x05 : 
-            case 0x06 : 
-            case 0x07 : 
-            case 0x09 : 
-            case 0x0A : 
-            case 0x0B : 
+            case 0x01 :
+            case 0x02 :
+            case 0x04 :
+            case 0x05 :
+            case 0x06 :
+            case 0x07 :
+            case 0x09 :
+            case 0x0A :
+            case 0x0B :
             case 0x0F : break; //1-byte long undefined code
             case 0x10 : //EXT1
                         {
@@ -188,11 +248,11 @@
                             switch (cc_data_2)
                             {
                                 //CEA-708-D, Section 7.1.8 (G2)
-                                case 0x00 : Character_Fill(L' '     ); break;
-                                case 0x01 : Character_Fill(L' '     ); break;
-                                case 0x05 : Character_Fill(L'.'     ); Character_Fill(L'.'); Character_Fill(L'.'); break;
-                                case 0x0A : Character_Fill(L'S'     ); break;
-                                case 0x0C : Character_Fill(L'O'     ); Character_Fill(L'E'); break;
+                                case 0x20 : Character_Fill(L' '     ); break;
+                                case 0x21 : Character_Fill(L' '     ); break;
+                                case 0x25 : Character_Fill(L'.'     ); Character_Fill(L'.'); Character_Fill(L'.'); break;
+                                case 0x2A : Character_Fill(L'S'     ); break;
+                                case 0x2C : Character_Fill(L'O'     ); Character_Fill(L'E'); break;
                                 case 0x30 : Character_Fill(L' '     ); break; //(Solid Block)
                                 case 0x31 : Character_Fill(L'\''    ); break;
                                 case 0x32 : Character_Fill(L'\''    ); break;
@@ -255,7 +315,7 @@
                                                 Skip_XX(Length,             "Data");
                                                 Pos+=1+Length;
                                             }
-                                            //CEA-708-D, Section 7.1.8 (G3)
+                                            //CEA-708-D, Section 7.1.9 (G3)
                                             else
                                                 Character_Fill(L'_'     );
                             }
@@ -388,7 +448,7 @@
             case 0x7E : Character_Fill(L'~'     ); break;
             case 0x7F : Character_Fill(L'\x266A'); break;
             //CEA-708-D, Section 7.1.5 (C1)
-            case 0x80 : //CW0 
+            case 0x80 : //CW0
             case 0x81 : //CW1
             case 0x82 : //CW2
             case 0x83 : //CW3
@@ -408,7 +468,7 @@
             case 0x90 : SPA(); Pos+=2; break; //SetPenAttributes
             case 0x91 : SPC(); Pos+=3; break; //SetPenColor
             case 0x92 : SPL(); Pos+=2; break; //SetPenLocation
-            case 0x97 : SWA(); Pos+=2; break; //SetWindowAttributes
+            case 0x97 : SWA(); Pos+=5; break; //SetWindowAttributes
             case 0x98 : //DF0
             case 0x99 : //DF1
             case 0x9A : //DF2
@@ -540,7 +600,7 @@
 //Backspace
 void File_Eia708::BS()
 {
-    Param_Info("Backspace");
+    Param_Info1("Backspace");
 
     int8u WindowID=Streams[service_number]->WindowID;
     if (WindowID==(int8u)-1)
@@ -572,7 +632,7 @@
 //Form Feed
 void File_Eia708::FF()
 {
-    Param_Info("Form Feed");
+    Param_Info1("Form Feed");
 
     int8u WindowID=Streams[service_number]->WindowID;
     if (WindowID==(int8u)-1)
@@ -590,15 +650,18 @@
             if (Window->visible)
             {
                 //Clearing global area
-                if (Window->Minimal.Window_y+Pos_Y<Streams[service_number]->Minimal.CC.size() && Window->Minimal.Window_x+Pos_X<Streams[service_number]->Minimal.CC[Window->Minimal.Window_y+Window->Minimal.y].size())
+                if (Window->Minimal.Window_y+Pos_Y<Streams[service_number]->Minimal.CC.size() && Window->Minimal.Window_x+Pos_X<Streams[service_number]->Minimal.CC[Window->Minimal.Window_y+Pos_Y].size())
                     Streams[service_number]->Minimal.CC[Window->Minimal.Window_y+Pos_Y][Window->Minimal.Window_x+Pos_X]=character();
-
-                //Has changed
-                Window_HasChanged();
-                HasChanged();
             }
         }
 
+    if (Window->visible)
+    {
+        //Has changed
+        Window_HasChanged();
+        HasChanged();
+    }
+
     //SetPenLocation
     Window->Minimal.x=0;
     Window->Minimal.y=0;
@@ -608,7 +671,7 @@
 //Carriage return
 void File_Eia708::CR()
 {
-    Param_Info("Carriage return");
+    Param_Info1("Carriage return");
 
     int8u WindowID=Streams[service_number]->WindowID;
     if (WindowID==(int8u)-1)
@@ -624,7 +687,7 @@
         //Rolling up window
         for (int8u Pos_Y=0; Pos_Y<Window->row_count-1; Pos_Y++)
             Window->Minimal.CC[Pos_Y]=Window->Minimal.CC[Pos_Y+1];
-        
+
         //SetPenLocation
         y=Window->row_count-1;
 
@@ -634,10 +697,10 @@
 
         if (Window->visible)
         {
-            //Updating global area 
+            //Updating global area
             for (int8u Pos_Y=0; Pos_Y<Window->row_count; Pos_Y++)
                 for (int8u Pos_X=0; Pos_X<Window->column_count; Pos_X++)
-                    if (Window->Minimal.Window_y+Pos_Y<(int8u)Streams[service_number]->Minimal.CC.size() && Window->Minimal.Window_x+Pos_X<(int8u)Streams[service_number]->Minimal.CC[Window->Minimal.Window_y+Window->Minimal.y].size())
+                    if (Window->Minimal.Window_y+Pos_Y<(int8u)Streams[service_number]->Minimal.CC.size() && Window->Minimal.Window_x+Pos_X<(int8u)Streams[service_number]->Minimal.CC[Window->Minimal.Window_y+Pos_Y].size())
                         Streams[service_number]->Minimal.CC[Window->Minimal.Window_y+Pos_Y][Window->Minimal.Window_x+Pos_X]=Window->Minimal.CC[Pos_Y][Pos_X];
 
             //Has changed
@@ -655,7 +718,7 @@
 //Horizontal Carriage Return
 void File_Eia708::HCR()
 {
-    Param_Info("Horizontal Carriage Return");
+    Param_Info1("Horizontal Carriage Return");
 
     int8u WindowID=Streams[service_number]->WindowID;
     if (WindowID==(int8u)-1)
@@ -664,7 +727,7 @@
     if (Window==NULL)
         return; //Must wait for the corresponding DFx
     int8u y=Window->Minimal.y;
-    
+
     for (int8u Pos_X=0; Pos_X<Window->column_count; Pos_X++)
     {
         //Clearing window
@@ -690,7 +753,7 @@
 //SetCurrentWindow
 void File_Eia708::CWx(int8u WindowID)
 {
-    Param_Info("SetCurrentWindow"); Param_Info(WindowID);
+    Param_Info1("SetCurrentWindow"); Param_Info1(WindowID);
 
     Streams[service_number]->WindowID=WindowID;
 }
@@ -699,13 +762,13 @@
 //ClearWindows
 void File_Eia708::CLW()
 {
-    Param_Info("ClearWindows");
+    Param_Info1("ClearWindows");
 
     int8u Save_WindowID=Streams[service_number]->WindowID;
     bool  Save_StandAloneCommand=StandAloneCommand;
     StandAloneCommand=false;
 
-    Element_Begin("ClearWindows");
+    Element_Begin1("ClearWindows");
     BS_Begin();
     int8u WindowID=8;
     bool HasChanged_=false;
@@ -713,13 +776,13 @@
     {
         WindowID--;
         bool IsSet;
-        Get_SB (   IsSet,                                       Ztring(_T("window ")+Ztring::ToZtring(WindowID)).To_Local().c_str());
+        Get_SB (   IsSet,                                       Ztring(__T("window ")+Ztring::ToZtring(WindowID)).To_Local().c_str());
 
         if (IsSet)
         {
             Streams[service_number]->WindowID=WindowID;
             window* Window=Streams[service_number]->Windows[WindowID];
-            
+
             //ClearWindow is like Form Feed
             FF();
 
@@ -733,11 +796,11 @@
     }
     while (WindowID>0);
     BS_End();
-    Element_End();
+    Element_End0();
 
     Streams[service_number]->WindowID=Save_WindowID;
     StandAloneCommand=Save_StandAloneCommand;
-    
+
     if (HasChanged_)
     {
         //Has changed
@@ -749,13 +812,13 @@
 //DisplayWindows
 void File_Eia708::DSW()
 {
-    Param_Info("DisplayWindows");
+    Param_Info1("DisplayWindows");
 
     int8u Save_WindowID=Streams[service_number]->WindowID;
     bool  Save_StandAloneCommand=StandAloneCommand;
     StandAloneCommand=false;
 
-    Element_Begin("DisplayWindows");
+    Element_Begin1("DisplayWindows");
     BS_Begin();
     int8u WindowID=8;
     bool HasChanged_=false;
@@ -763,12 +826,12 @@
     {
         WindowID--;
         bool IsSet;
-        Get_SB (   IsSet,                                       Ztring(_T("window ")+Ztring::ToZtring(WindowID)).To_Local().c_str());
+        Get_SB (   IsSet,                                       Ztring(__T("window ")+Ztring::ToZtring(WindowID)).To_Local().c_str());
 
         if (IsSet)
         {
             window* Window=Streams[service_number]->Windows[WindowID];
-            
+
             if (Window && !Window->visible)
             {
                 Window->visible=true;
@@ -777,7 +840,7 @@
                 for (size_t Pos_Y=0; Pos_Y<Window->row_count; Pos_Y++)
                     for (size_t Pos_X=0; Pos_X<Window->column_count; Pos_X++)
                     {
-                        if (Window->Minimal.Window_y+Pos_Y<Streams[service_number]->Minimal.CC.size() && Window->Minimal.Window_x+Pos_X<Streams[service_number]->Minimal.CC[Window->Minimal.Window_y+Window->Minimal.y].size())
+                        if (Window->Minimal.Window_y+Pos_Y<Streams[service_number]->Minimal.CC.size() && Window->Minimal.Window_x+Pos_X<Streams[service_number]->Minimal.CC[Window->Minimal.Window_y+Pos_Y].size())
                             Streams[service_number]->Minimal.CC[Window->Minimal.Window_y+Pos_Y][Window->Minimal.Window_x+Pos_X]=Window->Minimal.CC[Pos_Y][Pos_X];
                     }
 
@@ -789,11 +852,11 @@
     }
     while (WindowID>0);
     BS_End();
-    Element_End();
+    Element_End0();
 
     Streams[service_number]->WindowID=Save_WindowID;
     StandAloneCommand=Save_StandAloneCommand;
-    
+
     if (HasChanged_)
     {
         //Has changed
@@ -805,13 +868,13 @@
 //HideWindows
 void File_Eia708::HDW()
 {
-    Param_Info("HideWindows");
+    Param_Info1("HideWindows");
 
     int8u Save_WindowID=Streams[service_number]->WindowID;
     bool  Save_StandAloneCommand=StandAloneCommand;
     StandAloneCommand=false;
 
-    Element_Begin("HideWindows");
+    Element_Begin1("HideWindows");
     BS_Begin();
     int8u WindowID=8;
     bool HasChanged_=false;
@@ -820,12 +883,12 @@
         WindowID--;
 
         bool IsSet;
-        Get_SB (   IsSet,                                       Ztring(_T("window ")+Ztring::ToZtring(WindowID)).To_Local().c_str());
+        Get_SB (   IsSet,                                       Ztring(__T("window ")+Ztring::ToZtring(WindowID)).To_Local().c_str());
 
         if (IsSet)
         {
             window* Window=Streams[service_number]->Windows[WindowID];
-            
+
             if (Window && Window->visible)
             {
                 Window->visible=false;
@@ -837,7 +900,7 @@
                         Window->Minimal.CC[Pos_Y][Pos_X]=character();
 
                         //Filling global area
-                        if (Window->Minimal.Window_y+Pos_Y<Streams[service_number]->Minimal.CC.size() && Window->Minimal.Window_x+Pos_X<Streams[service_number]->Minimal.CC[Window->Minimal.Window_y+Window->Minimal.y].size())
+                        if (Window->Minimal.Window_y+Pos_Y<Streams[service_number]->Minimal.CC.size() && Window->Minimal.Window_x+Pos_X<Streams[service_number]->Minimal.CC[Window->Minimal.Window_y+Pos_Y].size())
                             Streams[service_number]->Minimal.CC[Window->Minimal.Window_y+Pos_Y][Window->Minimal.Window_x+Pos_X]=character();
                     }
 
@@ -849,11 +912,11 @@
     }
     while (WindowID>0);
     BS_End();
-    Element_End();
+    Element_End0();
 
     Streams[service_number]->WindowID=Save_WindowID;
     StandAloneCommand=Save_StandAloneCommand;
-    
+
     if (HasChanged_)
     {
         //Has changed
@@ -865,13 +928,13 @@
 //ToggleWindows
 void File_Eia708::TGW()
 {
-    Param_Info("ToggleWindows");
+    Param_Info1("ToggleWindows");
 
     int8u Save_WindowID=Streams[service_number]->WindowID;
     bool  Save_StandAloneCommand=StandAloneCommand;
     StandAloneCommand=false;
 
-    Element_Begin("ToggleWindows");
+    Element_Begin1("ToggleWindows");
     BS_Begin();
     int8u WindowID=8;
     bool HasChanged_=false;
@@ -879,12 +942,12 @@
     {
         WindowID--;
         bool IsSet;
-        Get_SB (   IsSet,                                       Ztring(_T("window ")+Ztring::ToZtring(WindowID)).To_Local().c_str());
+        Get_SB (   IsSet,                                       Ztring(__T("window ")+Ztring::ToZtring(WindowID)).To_Local().c_str());
 
         if (IsSet)
         {
             window* Window=Streams[service_number]->Windows[WindowID];
-            
+
             if (Window)
             {
                 Window->visible=!Window->visible;
@@ -893,7 +956,7 @@
                 for (size_t Pos_Y=0; Pos_Y<Window->row_count; Pos_Y++)
                     for (size_t Pos_X=0; Pos_X<Window->column_count; Pos_X++)
                     {
-                        if (Window->Minimal.Window_y+Pos_Y<Streams[service_number]->Minimal.CC.size() && Window->Minimal.Window_x+Pos_X<Streams[service_number]->Minimal.CC[Window->Minimal.Window_y+Window->Minimal.y].size())
+                        if (Window->Minimal.Window_y+Pos_Y<Streams[service_number]->Minimal.CC.size() && Window->Minimal.Window_x+Pos_X<Streams[service_number]->Minimal.CC[Window->Minimal.Window_y+Pos_Y].size())
                             Streams[service_number]->Minimal.CC[Window->Minimal.Window_y+Pos_Y][Window->Minimal.Window_x+Pos_X]=Window->visible?Window->Minimal.CC[Pos_Y][Pos_X]:character();
                     }
 
@@ -905,11 +968,11 @@
     }
     while (WindowID>0);
     BS_End();
-    Element_End();
+    Element_End0();
 
     Streams[service_number]->WindowID=Save_WindowID;
     StandAloneCommand=Save_StandAloneCommand;
-    
+
     if (HasChanged_)
     {
         //Has changed
@@ -921,13 +984,16 @@
 //DeleteWindows
 void File_Eia708::DLW()
 {
-    Param_Info("DeleteWindows");
+    Param_Info1("DeleteWindows");
 
     int8u Save_WindowID=Streams[service_number]->WindowID;
     bool  Save_StandAloneCommand=StandAloneCommand;
     StandAloneCommand=false;
 
-    Element_Begin("DeleteWindows");
+    //Bug in some files
+    bool Bug_WindowOffset=false;
+
+    Element_Begin1("DeleteWindows");
     BS_Begin();
     int8u WindowID=8;
     bool HasChanged_=false;
@@ -935,7 +1001,13 @@
     {
         WindowID--;
         bool IsSet;
-        Get_SB (   IsSet,                                       Ztring(_T("window ")+Ztring::ToZtring(WindowID)).To_Local().c_str());
+        Get_SB (   IsSet,                                       Ztring(__T("window ")+Ztring::ToZtring(WindowID)).To_Local().c_str());
+
+        //Bug in some files
+        if (IsSet && WindowID==1 && Streams[service_number]->Windows[0]!=NULL && Streams[service_number]->Windows[1]==NULL) //Mix between Windows 0 and 1
+            Bug_WindowOffset=true;
+        if (!IsSet && WindowID==0 && Bug_WindowOffset)
+            IsSet=true;
 
         if (IsSet)
         {
@@ -951,7 +1023,7 @@
                         Window->Minimal.CC[Pos_Y][Pos_X]=character();
 
                         //Filling global area
-                        if (Window->Minimal.Window_y+Pos_Y<Streams[service_number]->Minimal.CC.size() && Window->Minimal.Window_x+Pos_X<Streams[service_number]->Minimal.CC[Window->Minimal.Window_y+Window->Minimal.y].size())
+                        if (Window->Minimal.Window_y+Pos_Y<Streams[service_number]->Minimal.CC.size() && Window->Minimal.Window_x+Pos_X<Streams[service_number]->Minimal.CC[Window->Minimal.Window_y+Pos_Y].size())
                             Streams[service_number]->Minimal.CC[Window->Minimal.Window_y+Pos_Y][Window->Minimal.Window_x+Pos_X]=character();
                     }
 
@@ -968,11 +1040,11 @@
     }
     while (WindowID>0);
     BS_End();
-    Element_End();
+    Element_End0();
 
     Streams[service_number]->WindowID=Save_WindowID;
     StandAloneCommand=Save_StandAloneCommand;
-    
+
     if (HasChanged_)
     {
         //Has changed
@@ -984,17 +1056,17 @@
 //Delay
 void File_Eia708::DLY()
 {
-    Param_Info("Delay");
-    Element_Begin("Delay");
+    Param_Info1("Delay");
+    Element_Begin1("Delay");
     Skip_B1(                        "tenths of seconds");
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
 //Delay Cancel
 void File_Eia708::DLC()
 {
-    Param_Info("Delay Cancel");
+    Param_Info1("Delay Cancel");
 }
 
 //---------------------------------------------------------------------------
@@ -1002,15 +1074,15 @@
 void File_Eia708::RST()
 {
     //TODO: Should clear all buffers
-    Param_Info("Reset");
+    Param_Info1("Reset");
 }
 
 //---------------------------------------------------------------------------
 //Set Pen Attributes
 void File_Eia708::SPA()
 {
-    Param_Info("Set Pen Attributes");
-    Element_Begin("Set Pen Attributes");
+    Param_Info1("Set Pen Attributes");
+    Element_Begin1("Set Pen Attributes");
     BS_Begin();
     Skip_S1(4,                                                  "text tag");
     Skip_S1(2,                                                  "offset");
@@ -1020,15 +1092,15 @@
     Skip_S1(3,                                                  "edge type");
     Skip_S1(3,                                                  "font style");
     BS_End();
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
 //Set Pen Color
 void File_Eia708::SPC()
 {
-    Param_Info("Set Pen Color");
-    Element_Begin("Set Pen Color");
+    Param_Info1("Set Pen Color");
+    Element_Begin1("Set Pen Color");
     BS_Begin();
     Skip_S1(2,                                                  "foreground opacity");
     Skip_S1(2,                                                  "foreground red");
@@ -1044,15 +1116,15 @@
     Skip_S1(2,                                                  "edge green");
     Skip_S1(2,                                                  "edge blue");
     BS_End();
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
 //SetPenLocation
 void File_Eia708::SPL()
 {
-    Param_Info("SetPenLocation");
-    Element_Begin("SetPenLocation");
+    Param_Info1("SetPenLocation");
+    Element_Begin1("SetPenLocation");
     int8u row, column;
     BS_Begin();
     Mark_0();
@@ -1064,7 +1136,7 @@
     Mark_0();
     Get_S1 (6, column,                                          "column");
     BS_End();
-    Element_End();
+    Element_End0();
 
     int8u WindowID=Streams[service_number]->WindowID;
     if (WindowID==(int8u)-1)
@@ -1073,16 +1145,25 @@
     if (Window==NULL)
         return; //Must wait for the corresponding DFx
 
-    Window->Minimal.x=column;
-    Window->Minimal.y=row;
+    if (row<Window->Minimal.CC.size() && column<Window->Minimal.CC[Window->Minimal.y].size())
+    {
+        Window->Minimal.x=column;
+        Window->Minimal.y=row;
+    }
+    else
+    {
+        // There is a problem, resetting pen location
+        Window->Minimal.x=0;
+        Window->Minimal.y=0;
+    }
 }
 
 //---------------------------------------------------------------------------
 //SetWindowAttributes
 void File_Eia708::SWA()
 {
-    Param_Info("SetWindowAttributes");
-    Element_Begin("SetWindowAttributes");
+    Param_Info1("SetWindowAttributes");
+    Element_Begin1("SetWindowAttributes");
     BS_Begin();
     Skip_S1(2,                                                  "fill opacity");
     Skip_S1(2,                                                  "fill red");
@@ -1106,16 +1187,16 @@
     Skip_S1(2,                                                  "edge green");
     Skip_S1(2,                                                  "edge blue");
     BS_End();
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
 //DefineWindow
 void File_Eia708::DFx(int8u WindowID)
 {
-    Param_Info("DefineWindow"); Param_Info(WindowID);
-    Element_Begin("DefineWindow");
-    int8u anchor_vertical, anchor_horizontal, row_count, column_count;
+    Param_Info1("DefineWindow"); Param_Info1(WindowID);
+    Element_Begin1("DefineWindow");
+    int8u anchor_vertical, anchor_horizontal, anchor_point, row_count, column_count;
     bool visible, relative_positioning;
     BS_Begin();
     Mark_0();
@@ -1127,7 +1208,7 @@
     Get_SB (   relative_positioning,                            "relative positioning");
     Get_S1 (7, anchor_vertical,                                 "anchor vertical"); //Top left
     Get_S1 (8, anchor_horizontal,                               "anchor horizontal"); //Top left
-    Skip_S1(4,                                                  "anchor point");
+    Get_S1 (4, anchor_point,                                    "anchor point");
     Get_S1 (4, row_count,                                       "row count"); //Maximum=14
     Mark_0();
     Mark_0();
@@ -1137,7 +1218,7 @@
     Skip_S1(4,                                                  "window style");
     Skip_S1(2,                                                  "pen style ID");
     BS_End();
-    Element_End();
+    Element_End0();
 
     Streams[service_number]->WindowID=WindowID;
     if (Streams[service_number]->Windows[WindowID]==NULL)
@@ -1146,16 +1227,75 @@
     Window->visible=visible;
     Window->relative_positioning=relative_positioning;
     Window->anchor_vertical=anchor_vertical;
-    Window->Minimal.Window_y=anchor_vertical/5; //TODO: relative position
+    if (relative_positioning)
+        Window->Minimal.Window_y=(int8u)(((float)15)*anchor_vertical/100);
+    else
+        Window->Minimal.Window_y=anchor_vertical/5;
     Window->anchor_horizontal=anchor_horizontal;
-    Window->Minimal.Window_x=anchor_horizontal/5; //TODO: relative position
+    int8u offset_y;
+    switch (anchor_point)
+    {
+        case 0 :
+        case 1 :
+        case 2 :
+                offset_y=0;
+                break;
+        case 3 :
+        case 4 :
+        case 5 :
+                offset_y=(row_count+1)/2;
+                break;
+        case 6 :
+        case 7 :
+        case 8 :
+                offset_y=(row_count+1);
+                break;
+        default: offset_y=0; //Not valid
+    }
+    if (offset_y<Window->Minimal.Window_y)
+        Window->Minimal.Window_y-=offset_y;
+    if (relative_positioning)
+        Window->Minimal.Window_x=(int8u)(24*AspectRatio*anchor_horizontal/100);
+    else
+        Window->Minimal.Window_x=anchor_horizontal/5;
+    int8u offset_x;
+    switch (anchor_point)
+    {
+        case 0 :
+        case 3 :
+        case 6 :
+                offset_x=0;
+                break;
+        case 1 :
+        case 4 :
+        case 7 :
+                offset_x=(column_count+1)/2;
+                break;
+        case 2 :
+        case 5 :
+        case 8 :
+                offset_x=(column_count+1);
+                break;
+        default: offset_x=0; //Not valid
+    }
+    if (offset_x<Window->Minimal.Window_x)
+        Window->Minimal.Window_x-=offset_x;
     Window->row_count=row_count+1;
     Window->column_count=column_count+1;
     Window->Minimal.x=0;
     Window->Minimal.y=0;
-    Window->Minimal.CC.resize(row_count+1);
-    for (int8u Pos_Y=0; Pos_Y<row_count+1; Pos_Y++)
-        Window->Minimal.CC[Pos_Y].resize(column_count+1);
+
+    if (Window->row_count>12)
+    {
+        Window->row_count=12; //Limitation of specifications
+    }
+    if (AspectRatio && Window->column_count>(int8u)(24*AspectRatio))
+    {
+        Window->column_count=(int8u)(24*AspectRatio); //Limitation of specifications
+    }
+    Window->Minimal.CC.resize(Window->row_count);
+    for (int8u Pos_Y=0; Pos_Y<Window->row_count; Pos_Y++)
+        Window->Minimal.CC[Pos_Y].resize(Window->column_count);
 }
 
 //***************************************************************************
@@ -1165,7 +1305,7 @@
 //---------------------------------------------------------------------------
 void File_Eia708::Character_Fill(wchar_t Character)
 {
-    Param_Info(Ztring(1, Character));
+    Param_Info1(Ztring(1, Character));
 
     int8u WindowID=Streams[service_number]->WindowID;
     if (WindowID==(int8u)-1)
@@ -1191,19 +1331,16 @@
                 Streams[service_number]->Minimal.CC[Window_y+y][Window_x+x].Value=Character;
 
             //Has changed
+            Window_HasChanged();
             HasChanged();
         }
 
         x++;
         Window->Minimal.x=x;
     }
-    
-    if (!Status[IsFilled]) //TODO: separate services
-    {
-        Fill("EIA-708");
-        if (MediaInfoLib::Config.ParseSpeed_Get()<1)
-            Finish("EIA-708");
-    }
+
+    if (!HasContent)
+        HasContent=true;
 }
 
 //---------------------------------------------------------------------------

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Text/File_Eia708.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Text/File_Eia708.h Changed

@@ -1,17 +1,17 @@
 // File_Eia708 - Info for EIA-708 files
-// Copyright (C) 2009-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2009-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -45,7 +45,7 @@
 public :
     //In
     int8u cc_type;
-    float32 AspectRatio;
+    float64 AspectRatio;
 
     //Constructor/Destructor
     File_Eia708();
@@ -57,7 +57,9 @@
     void Streams_Finish();
 
     //Buffer - Global
+    void Read_Buffer_Init();
     void Read_Buffer_Continue();
+    void Read_Buffer_Unsynched();
 
     //Buffer - Per element
     void Header_Parse();
@@ -145,6 +147,7 @@
     std::vector<stream*> Streams;
     int8u service_number;
     int8u block_size;
+    bool   HasContent;
 
     //Elements
     void NUL();                 //NUL
@@ -167,10 +170,10 @@
     void SPL();                 //SetPenLocation
     void SWA();                 //SetWindowAttributes
     void DFx(int8u WindowID);   //DefineWindow
-    
+
     //Temp
     bool StandAloneCommand; //If this is a command simulated from another command
-    
+
     //Helpers
     void Service();
     void Character_Fill(wchar_t Character);

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Text/File_Kate.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Text/File_Kate.cpp Changed

@@ -1,17 +1,17 @@
 // File_Kate - Info for Kate files
-// Copyright (C) 2009-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2009-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,14 +22,18 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_KATE_YES)
 //---------------------------------------------------------------------------
 
@@ -49,36 +53,36 @@
 Ztring Kate_Category(const Ztring &Category)
 {
     //http://wiki.xiph.org/index.php/OggText#Categories_of_Text_Codecs
-    if (Category==_T("CC"))
-        return _T("Closed caption");
-    if (Category==_T("SUB"))
-        return _T("Subtitles");
-    if (Category==_T("TAD"))
-        return _T("Textual audio descriptions");
-    if (Category==_T("KTV"))
-        return _T("Karaoke");
-    if (Category==_T("TIK"))
-        return _T("Ticker text");
-    if (Category==_T("AR"))
-        return _T("Active regions");
-    if (Category==_T("NB"))
-        return _T("Semantic annotations");
-    if (Category==_T("META"))
-        return _T("Metadata, mostly machine-readable");
-    if (Category==_T("TRX"))
-        return _T("Transcript");
-    if (Category==_T("LRC"))
-        return _T("Lyrics");
-    if (Category==_T("LIN"))
-        return _T("Linguistic markup");
-    if (Category==_T("CUE"))
-        return _T("Cue points");
+    if (Category==__T("CC"))
+        return __T("Closed caption");
+    if (Category==__T("SUB"))
+        return __T("Subtitles");
+    if (Category==__T("TAD"))
+        return __T("Textual audio descriptions");
+    if (Category==__T("KTV"))
+        return __T("Karaoke");
+    if (Category==__T("TIK"))
+        return __T("Ticker text");
+    if (Category==__T("AR"))
+        return __T("Active regions");
+    if (Category==__T("NB"))
+        return __T("Semantic annotations");
+    if (Category==__T("META"))
+        return __T("Metadata, mostly machine-readable");
+    if (Category==__T("TRX"))
+        return __T("Transcript");
+    if (Category==__T("LRC"))
+        return __T("Lyrics");
+    if (Category==__T("LIN"))
+        return __T("Linguistic markup");
+    if (Category==__T("CUE"))
+        return __T("Cue points");
 
     //From Kate
-    if (Category==_T("K-SLD-I"))
-        return _T("Slides, as images");
-    if (Category==_T("K-SLD-T"))
-        return _T("Slides, as text");
+    if (Category==__T("K-SLD-I"))
+        return __T("Slides, as images");
+    if (Category==__T("K-SLD-T"))
+        return __T("Slides, as text");
     return Category;
 }

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Text/File_Kate.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Text/File_Kate.h Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Text/File_N19.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Text/File_N19.cpp Changed

@@ -1,31 +1,35 @@
 // File_N19 - Info for N19 files
-// Copyright (C) 2010-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_N19_YES)
 //---------------------------------------------------------------------------
 
@@ -227,11 +231,11 @@
     string TCP;
     int16u LC;
     int8u TCS;
-    Info_C3   (    CPN,                                         "CPN - Code Page Number"); Param_Info(N19_CodePageNumber(CPN));
-    Get_C8    (    DFC,                                         "DFC - Disk Format Code"); Param_Info(N19_DiskFormatCode_FrameRate(DFC));
-    Info_C1   (    DSC,                                         "DSC - Display Standard Code"); Param_Info(N19_DisplayStandardCode(DSC));
+    Info_C3   (    CPN,                                         "CPN - Code Page Number"); Param_Info1(N19_CodePageNumber(CPN));
+    Get_C8    (    DFC,                                         "DFC - Disk Format Code"); Param_Info1(N19_DiskFormatCode_FrameRate(DFC));
+    Info_C1   (    DSC,                                         "DSC - Display Standard Code"); Param_Info1(N19_DisplayStandardCode(DSC));
     Skip_C2   (                                                 "CCT - Character Code Table number");
-    Get_C2    (    LC,                                          "LC - Language Code"); Param_Info(N19_LanguageCode(LC));
+    Get_C2    (    LC,                                          "LC - Language Code"); Param_Info1(N19_LanguageCode(LC));
     Get_Local (32, OPT,                                         "OPT - Original Programme Title");
     Skip_Local(32,                                              "OET - Original Episode Title");
     Skip_Local(32,                                              "TPT - Translated Programme");
@@ -264,9 +268,9 @@
 
         Fill(Stream_General, 0, General_Format, "N19");
         Fill(Stream_General, 0, General_Title, OPT);
-        RD.insert(0, _T("20"));
-        RD.insert(4, _T("-"));
-        RD.insert(7, _T("-"));
+        RD.insert(0, __T("20"));
+        RD.insert(4, __T("-"));
+        RD.insert(7, __T("-"));
         Fill(Stream_General, 0, General_Recorded_Date, RD);
         Fill(Stream_General, 0, General_Country, Ztring(CO).MakeLowerCase());
         Fill(Stream_General, 0, General_DistributedBy, EN);
@@ -305,9 +309,9 @@
             }
         }
         Fill(Stream_Text, 0, Text_Width, MNC.To_int32u());
-        Fill(Stream_Text, 0, Text_Width_String, Ztring::ToZtring(MNC.To_int32u())+_T(" characters"), true);
+        Fill(Stream_Text, 0, Text_Width_String, Ztring::ToZtring(MNC.To_int32u())+__T(" characters"), true);
         Fill(Stream_Text, 0, Text_Height, MNR.To_int32u());
-        Fill(Stream_Text, 0, Text_Height_String, Ztring::ToZtring(MNR.To_int32u())+_T(" characters"), true);
+        Fill(Stream_Text, 0, Text_Height_String, Ztring::ToZtring(MNR.To_int32u())+__T(" characters"), true);
         Fill(Stream_Text, 0, Text_Language, N19_LanguageCode(LC));
 
         //Init
@@ -324,7 +328,7 @@
 {
     //Filling
     Header_Fill_Size(128);
-    Header_Fill_Code(0, _T("TTI"));
+    Header_Fill_Code(0, __T("TTI"));
 }
 
 //---------------------------------------------------------------------------
@@ -341,13 +345,13 @@
       + ((TCI>>16)&0xFF)   *60*1000
       + ((TCI>>8 )&0xFF)      *1000
       +  float32_int32s((TCI     &0xFF)      *1000/N19_DiskFormatCode_FrameRate(DFC));
-    Param_Info(Ztring().Duration_From_Milliseconds((int64u)TCI));
+    Param_Info1(Ztring().Duration_From_Milliseconds((int64u)TCI));
     Get_B4    (TCO,                                             "TCO - Time Code Out");
     TCO=((TCO>>24)&0xFF)*60*60*1000
       + ((TCO>>16)&0xFF)   *60*1000
       + ((TCO>>8 )&0xFF)      *1000
       +  float32_int32s((TCO     &0xFF)      *1000/N19_DiskFormatCode_FrameRate(DFC));
-    Param_Info(Ztring().Duration_From_Milliseconds((int64u)TCO));
+    Param_Info1(Ztring().Duration_From_Milliseconds((int64u)TCO));
     Skip_B1   (                                                 "VP - Vertical Position");
     Skip_B1   (                                                 "JC - Justification Code");
     Skip_B1   (                                                 "CF - Comment Flag");
@@ -358,6 +362,7 @@
         {
             FirstFrame_TCI=TCI;
             Fill(Stream_Text, 0, Text_Delay, TCI);
+            Fill(Stream_Text, 0, Text_Delay_Source, "Container");
         }
         if (File_Offset+Buffer_Offset+Element_Size+128>File_Size)
         {

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Text/File_N19.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Text/File_N19.h Changed

@@ -1,17 +1,17 @@
 // File_N19 - Info for N19 files
-// Copyright (C) 2010-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Text/File_OtherText.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Text/File_OtherText.cpp Changed

@@ -1,31 +1,35 @@
 // File_OtherText - Use magic number to detect only the format (Text)
-// Copyright (C) 2006-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2006-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_OTHERTEXT_YES)
 //---------------------------------------------------------------------------
 
@@ -63,19 +67,19 @@
     }
     if (File.size()>0x1000)
         File.resize(0x1000); //Do not work on too big
-    if (File.find(_T("\x0D\x0A"))!=Error)
+    if (File.find(__T("\x0D\x0A"))!=Error)
     {
-        Lines.Separator_Set(0, _T("\x0D\x0A"));
+        Lines.Separator_Set(0, __T("\x0D\x0A"));
         Lines.Write(File);
     }
-    else if (File.find(_T("\x0D"))!=Error)
+    else if (File.find(__T("\x0D"))!=Error)
     {
-        Lines.Separator_Set(0, _T("\x0D"));
+        Lines.Separator_Set(0, __T("\x0D"));
         Lines.Write(File);
     }
-    else if (File.find(_T("\x0A"))!=Error)
+    else if (File.find(__T("\x0A"))!=Error)
     {
-        Lines.Separator_Set(0, _T("\x0A"));
+        Lines.Separator_Set(0, __T("\x0A"));
         Lines.Write(File);
     }
     else
@@ -91,104 +95,100 @@
     Lines.resize(0x20);
 
          if (Lines[0].size()==1
-          && Lines[0][0]==_T('1')
+          && Lines[0][0]==__T('1')
           && Lines[1].size()==29
-          && Lines[1][ 0]==_T('0') && Lines[1][ 1]==_T('0')
-          && Lines[1][ 2]==_T(':') && Lines[1][ 5]==_T(':') && Lines[1][ 8]==_T(',')
-          && Lines[1][12]==_T(' ') && Lines[1][13]==_T('-') && Lines[1][14]==_T('-') && Lines[1][15]==_T('>') && Lines[1][16]==_T(' ')
-          && Lines[1][17]==_T('0') && Lines[1][18]==_T('0')
-          && Lines[1][19]==_T(':') && Lines[1][22]==_T(':') && Lines[1][25]==_T(',')
-          && Lines.Find(_T("2"))!=Error
+          && Lines[1][ 0]==__T('0') && Lines[1][ 1]==__T('0')
+          && Lines[1][ 2]==__T(':') && Lines[1][ 5]==__T(':') && Lines[1][ 8]==__T(',')
+          && Lines[1][12]==__T(' ') && Lines[1][13]==__T('-') && Lines[1][14]==__T('-') && Lines[1][15]==__T('>') && Lines[1][16]==__T(' ')
+          && Lines[1][17]==__T('0') && Lines[1][18]==__T('0')
+          && Lines[1][19]==__T(':') && Lines[1][22]==__T(':') && Lines[1][25]==__T(',')
+          && Lines.Find(__T("2"))!=Error
           )
     {
-        Format=_T("SubRip");
-        Codec=_T("SubRip");
+        Format=__T("SubRip");
+        Codec=__T("SubRip");
     }
-    else if (Lines[0]==_T("[Script Info]")
-          && Lines.Find(_T("ScriptType: v4.00"))!=Error
-          && Lines.Find(_T("[V4 Styles]"))!=Error
+    else if (Lines[0]==__T("[Script Info]")
+          && Lines.Find(__T("ScriptType: v4.00"))!=Error
+          && Lines.Find(__T("[V4 Styles]"))!=Error
           )
     {
-       Format=_T("SSA");
-       FormatMore=_T("SubStation Alpha");
-       Codec=_T("SSA");
+       Format=__T("SSA");
+       FormatMore=__T("SubStation Alpha");
+       Codec=__T("SSA");
     }
-    else if (Lines[0]==_T("[Script Info]")
-          && Lines.Find(_T("ScriptType: v4.00+"))!=Error
-          && Lines.Find(_T("[V4+ Styles]"))!=Error
+    else if (Lines[0]==__T("[Script Info]")
+          && Lines.Find(__T("ScriptType: v4.00+"))!=Error
+          && Lines.Find(__T("[V4+ Styles]"))!=Error
           )
     {
-       Format=_T("ASS");
-       FormatMore=_T("Advanced SubStation Alpha");
-       Codec=_T("ASS");
+       Format=__T("ASS");
+       FormatMore=__T("Advanced SubStation Alpha");
+       Codec=__T("ASS");
     }
     else if (Lines[0].size()>24
-          && Lines[0][ 0]==_T('0') && Lines[0][ 1]==_T('0')
-          && Lines[0][ 2]==_T(':') && Lines[0][ 5]==_T(':') && Lines[0][ 8]==_T(':')
-          && Lines[0][11]==_T(' ')
-          && Lines[0][12]==_T('0') && Lines[0][13]==_T('0')
-          && Lines[0][14]==_T(':') && Lines[0][17]==_T(':') && Lines[0][20]==_T(':')
-          && Lines[0][23]==_T(' ')
+          && Lines[0][ 0]==__T('0') && Lines[0][ 1]==__T('0')
+          && Lines[0][ 2]==__T(':') && Lines[0][ 5]==__T(':') && Lines[0][ 8]==__T(':')
+          && Lines[0][11]==__T(' ')
+          && Lines[0][12]==__T('0') && Lines[0][13]==__T('0')
+          && Lines[0][14]==__T(':') && Lines[0][17]==__T(':') && Lines[0][20]==__T(':')
+          && Lines[0][23]==__T(' ')
           )
     {
-       Format=_T("Adobe encore DVD");
-       Codec=_T("Adobe");
+       Format=__T("Adobe encore DVD");
+       Codec=__T("Adobe");
     }
     else if (Lines[0].size()==11
-          && Lines[0][0]==_T('-') && Lines[0][1]==_T('-') && Lines[0][2]==_T('>') && Lines[0][3]==_T('>') && Lines[0][4]==_T(' ')
-          && Lines[0][5]==_T('0')
+          && Lines[0][0]==__T('-') && Lines[0][1]==__T('-') && Lines[0][2]==__T('>') && Lines[0][3]==__T('>') && Lines[0][4]==__T(' ')
+          && Lines[0][5]==__T('0')
           && Lines[1].empty()!=true
           )
     {
-       Format=_T("AQTitle");
-       Codec=_T("AQTitle");
+       Format=__T("AQTitle");
+       Codec=__T("AQTitle");
     }
     else if (Lines[0].size()>28
-          && Lines[0][ 0]==_T('0') && Lines[0][ 1]==_T('0')
-          && Lines[0][ 2]==_T(':') && Lines[0][ 5]==_T(':') && Lines[0][ 8]==_T(':')
-          && Lines[0][11]==_T(' ') && Lines[0][12]==_T(',') && Lines[0][13]==_T(' ')
-          && Lines[0][14]==_T('0') && Lines[0][15]==_T('0')
-          && Lines[0][16]==_T(':') && Lines[0][19]==_T(':') && Lines[0][22]==_T(':')
-          && Lines[0][25]==_T(' ') && Lines[0][16]==_T(',') && Lines[0][27]==_T(' ')
+          && Lines[0][ 0]==__T('0') && Lines[0][ 1]==__T('0')
+          && Lines[0][ 2]==__T(':') && Lines[0][ 5]==__T(':') && Lines[0][ 8]==__T(':')
+          && Lines[0][11]==__T(' ') && Lines[0][12]==__T(',') && Lines[0][13]==__T(' ')
+          && Lines[0][14]==__T('0') && Lines[0][15]==__T('0')
+          && Lines[0][16]==__T(':') && Lines[0][19]==__T(':') && Lines[0][22]==__T(':')
+          && Lines[0][25]==__T(' ') && Lines[0][16]==__T(',') && Lines[0][27]==__T(' ')
           )
     {
-       Format=_T("Captions 32");
-       Codec=_T("Caption 32");
+       Format=__T("Captions 32");
+       Codec=__T("Caption 32");
     }
     else if (Lines[0].size()==23
-          && Lines[0]==_T("*Timecode type: PAL/EBU")
+          && Lines[0]==__T("*Timecode type: PAL/EBU")
           && Lines[1].empty()
           && Lines[2].size()==23
-          && Lines[2][ 0]==_T('0') && Lines[2][ 1]==_T('0')
-          && Lines[2][ 2]==_T(':') && Lines[2][ 5]==_T(':') && Lines[2][ 8]==_T(':')
-          && Lines[2][11]==_T(' ')
-          && Lines[2][12]==_T('0') && Lines[2][13]==_T('0')
-          && Lines[2][14]==_T(':') && Lines[2][17]==_T(':') && Lines[2][20]==_T(':')
+          && Lines[2][ 0]==__T('0') && Lines[2][ 1]==__T('0')
+          && Lines[2][ 2]==__T(':') && Lines[2][ 5]==__T(':') && Lines[2][ 8]==__T(':')
+          && Lines[2][11]==__T(' ')
+          && Lines[2][12]==__T('0') && Lines[2][13]==__T('0')
+          && Lines[2][14]==__T(':') && Lines[2][17]==__T(':') && Lines[2][20]==__T(':')
           && Lines[2].size()>0
           )
     {
-       Format=_T("Captions Inc");
-       Codec=_T("Captions inc");
+       Format=__T("Captions Inc");
+       Codec=__T("Captions inc");
     }
     else if (Lines[0].size()>1
-          && Lines[0][0]==_T('*')
-          && Lines.Find(_T("** Caption Number 1"))!=Error
+          && Lines[0][0]==__T('*')
+          && Lines.Find(__T("** Caption Number 1"))!=Error
     )
     {
-       Format=_T("Cheeta");
+       Format=__T("Cheeta");
     }
     else if (Lines[0].size()>10
-          && Lines[0][0]==_T('~') && Lines[0][1]==_T('C') && Lines[0][2]==_T('P') && Lines[0][3]==_T('C') && Lines[0][9]==_T('~')
-          && Lines[1][ 0]==_T('0') && Lines[1][ 1]==_T('0')
-          && Lines[1][ 2]==_T(':') && Lines[1][ 5]==_T(':') && Lines[1][ 8]==_T(':')
-    )
-    {
-       Format=_T("CPC Captioning");
-       Codec=_T("CPC Captioning");
-    }
-    else if (false
+          && Lines[0][0]==__T('~') && Lines[0][1]==__T('C') && Lines[0][2]==__T('P') && Lines[0][3]==__T('C') && Lines[0][9]==__T('~')
+          && Lines[1][ 0]==__T('0') && Lines[1][ 1]==__T('0')
+          && Lines[1][ 2]==__T(':') && Lines[1][ 5]==__T(':') && Lines[1][ 8]==__T(':')
     )
     {
+       Format=__T("CPC Captioning");
+       Codec=__T("CPC Captioning");
     }
     else
         return;
@@ -209,8 +209,8 @@
     Fill(Stream_Text, 0, Text_Codec, Codec);
 
     //No more need data
-    Element_Begin(Format);
-    Element_End();
+    Element_Begin1(Format);
+    Element_End0();
     Finish("Other text");
 }

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Text/File_OtherText.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Text/File_OtherText.h Changed

@@ -1,17 +1,17 @@
 // File_OtherText - Use magic number to detect only the format (Text)
-// Copyright (C) 2006-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2006-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Text/File_Pgs.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Text/File_Pgs.cpp Changed

@@ -1,31 +1,35 @@
 // File_Pgs - Info for PGS files
-// Copyright (C) 2008-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_PGS_YES)
 //---------------------------------------------------------------------------
 
@@ -37,21 +41,31 @@
 {
 
 //***************************************************************************
-// Buffer - Global
+// Streams management
 //***************************************************************************
 
 //---------------------------------------------------------------------------
-void File_Pgs::Read_Buffer_Continue()
+void File_Pgs::Streams_Fill()
 {
-    //Filling
-    Accept("PGS");
-
     Stream_Prepare(Stream_Text); //TODO: This is currenlty only text
     Fill(Stream_Text, 0, Text_Format, "PGS");
     Fill(Stream_Text, 0, Text_Codec, "PGS");
+}
+
+//***************************************************************************
+// Buffer - Global
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Pgs::Read_Buffer_Continue()
+{
+    Skip_XX(Element_Size,                                       "PGS data");
 
-    //No more need data
-    Finish("PGS");
+    if (!Status[IsAccepted])
+    {
+        Accept("PGS");
+        Finish("PGS");
+    }
 }
 
 //***************************************************************************

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Text/File_Pgs.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Text/File_Pgs.h Changed

@@ -1,17 +1,17 @@
 // File_Pgs - Info for PGS files
-// Copyright (C) 2008-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -40,6 +40,9 @@
 class File_Pgs : public File__Analyze
 {
 private :
+    //Streams management
+    void Streams_Fill();
+
     //Buffer - Global
     void Read_Buffer_Continue();
 };

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Text/File_Scc.cpp Added

@@ -0,0 +1,217 @@
+// File_Scc - Info for SCC streams
+// Copyright (C) 2011-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_SCC_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Text/File_Scc.h"
+#include "MediaInfo/MediaInfo_Config_MediaInfo.h"
+#include "MediaInfo/Text/File_Eia608.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File_Scc::File_Scc()
+:File__Analyze()
+{
+    //Configuration
+    ParserName=__T("SCC");
+    #if MEDIAINFO_EVENTS
+        ParserIDs[0]=MediaInfo_Parser_Scc;
+    #endif //MEDIAINFO_EVENTS
+    #if MEDIAINFO_TRACE
+        Trace_Layers_Update(8); //Stream
+    #endif //MEDIAINFO_TRACE
+    PTS_DTS_Needed=true;
+
+    //Temp
+    Parser=NULL;
+}
+
+//---------------------------------------------------------------------------
+File_Scc::~File_Scc()
+{
+    delete Parser; //Parser=NULL;
+}
+
+//***************************************************************************
+// Streams management
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Scc::Streams_Finish()
+{
+    if (Parser && Parser->Status[IsAccepted])
+    {
+        Finish(Parser);
+        for (size_t Pos2=0; Pos2<Parser->Count_Get(Stream_Text); Pos2++)
+        {
+            Stream_Prepare(Stream_Text);
+            Merge(*Parser, Stream_Text, StreamPos_Last, Pos2);
+            Fill(Stream_Text, StreamPos_Last, Text_ID, Parser->Retrieve(Stream_Text, Pos2, Text_ID), true);
+        }
+    }
+}
+
+//***************************************************************************
+// Buffer - File header
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_Scc::FileHeader_Begin()
+{
+    //Element_Size
+    if (File_Size<22)
+    {
+        Reject("N19");
+        return false;
+    }
+    if (Buffer_Size<22)
+        return false; //Must wait for more data
+
+    if (Buffer[ 0]!=0x53
+     || Buffer[ 1]!=0x63
+     || Buffer[ 2]!=0x65
+     || Buffer[ 3]!=0x6E
+     || Buffer[ 4]!=0x61
+     || Buffer[ 5]!=0x72
+     || Buffer[ 6]!=0x69
+     || Buffer[ 7]!=0x73
+     || Buffer[ 8]!=0x74
+     || Buffer[ 9]!=0x5F
+     || Buffer[10]!=0x53
+     || Buffer[11]!=0x43
+     || Buffer[12]!=0x43
+     || Buffer[13]!=0x20
+     || Buffer[14]!=0x56
+     || Buffer[15]!=0x31
+     || Buffer[16]!=0x2E
+     || Buffer[17]!=0x30
+    )
+    {
+        Reject("N19");
+        return false;
+    }
+
+    //Element_Size
+    if (Buffer_Size<File_Size)
+        return false; //Must wait for more data
+
+    //All should be OK...
+    return true;
+}
+
+//---------------------------------------------------------------------------
+void File_Scc::FileHeader_Parse()
+{
+    Skip_String(18,                                             "Magic");
+    while (Element_Offset<Buffer_Size)
+    {
+        if (Buffer[(size_t)Element_Offset]!=0x0D && Buffer[(size_t)Element_Offset]!=0x0A)
+            break;
+        Element_Offset++;
+    }
+
+    Accept();
+    Fill(Stream_General, 0, General_Format, "SCC");
+
+    //Init
+    Parser=new File_Eia608();
+    Open_Buffer_Init(Parser);
+}
+
+//***************************************************************************
+// Buffer - Per element
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Scc::Header_Parse()
+{
+    size_t End=Buffer_Offset;
+
+    //Content
+    while (End<Buffer_Size)
+    {
+        if (Buffer[End]==0x0D || Buffer[End]==0x0A)
+            break;
+        End++;
+    }
+
+    //EOL
+    while (End<Buffer_Size)
+    {
+        if (Buffer[End]!=0x0D && Buffer[End]!=0x0A)
+            break;
+        End++;
+    }
+
+    //Filling
+    Header_Fill_Size(End-Buffer_Offset);
+    Header_Fill_Code(0, __T("Block"));
+}
+
+//---------------------------------------------------------------------------
+void File_Scc::Data_Parse()
+{
+    while (Element_Offset<Element_Size && (Buffer[Buffer_Offset+(size_t)Element_Offset]==0x0D || Buffer[Buffer_Offset+(size_t)Element_Offset]==0x0A))
+        Element_Offset++;
+    if (Element_Offset==Element_Size)
+        return;
+
+    //Parsing
+    Skip_String(11,                                             "TimeStamp");
+    while (Element_Offset+5<=Element_Size)
+    {
+        int8u Buffer_Temp[2];
+        Buffer_Temp[0]=(Buffer[Buffer_Offset+(size_t)Element_Offset+1]-(Buffer[Buffer_Offset+(size_t)Element_Offset+1]>='a'?('a'-10):'0'))<<4
+                     | (Buffer[Buffer_Offset+(size_t)Element_Offset+2]-(Buffer[Buffer_Offset+(size_t)Element_Offset+2]>='a'?('a'-10):'0'));
+        Buffer_Temp[1]=(Buffer[Buffer_Offset+(size_t)Element_Offset+3]-(Buffer[Buffer_Offset+(size_t)Element_Offset+3]>='a'?('a'-10):'0'))<<4
+                     | (Buffer[Buffer_Offset+(size_t)Element_Offset+4]-(Buffer[Buffer_Offset+(size_t)Element_Offset+4]>='a'?('a'-10):'0'));
+        Open_Buffer_Continue(Parser, Buffer_Temp, 2);
+        Element_Offset+=5;
+    }
+}
+
+//***************************************************************************
+// C++
+//***************************************************************************
+
+} //NameSpace
+
+#endif //MEDIAINFO_SCC_YES

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Text/File_Scc.h Added

@@ -0,0 +1,65 @@
+// File_Scc - Info for SCC streams
+// Copyright (C) 2009-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Information about SCC (Scenarist Closed Captioning) files
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_File_SccH
+#define MediaInfo_File_SccH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+#include "ZenLib/ZtringListList.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Class File_Scc
+//***************************************************************************
+
+class File_Scc : public File__Analyze
+{
+public :
+    File_Scc();
+    ~File_Scc();
+
+private :
+    //Streams management
+    void Streams_Finish();
+
+    //Buffer - File header
+    bool FileHeader_Begin();
+    void FileHeader_Parse();
+
+    //Buffer - Per element
+    void Header_Parse();
+    void Data_Parse();
+
+    //Temp
+    File__Analyze* Parser;
+};
+
+} //NameSpace
+
+#endif

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Text/File_Scte20.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Text/File_Scte20.cpp Changed

@@ -1,31 +1,35 @@
 // File_Scte20 - Info for SCTE 20 streams
-// Copyright (C) 2010-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_SCTE20_YES)
 //---------------------------------------------------------------------------
 
@@ -34,9 +38,6 @@
 #if defined(MEDIAINFO_EIA608_YES)
     #include "MediaInfo/Text/File_Eia608.h"
 #endif
-#if defined(MEDIAINFO_EIA708_YES)
-    #include "MediaInfo/Text/File_Eia708.h"
-#endif
 #if MEDIAINFO_EVENTS
     #include "MediaInfo/MediaInfo_Events.h"
 #endif //MEDIAINFO_EVENTS
@@ -73,7 +74,7 @@
 :File__Analyze()
 {
     //Configuration
-    ParserName=_T("SCTE 20");
+    ParserName=__T("SCTE 20");
     #if MEDIAINFO_EVENTS
         ParserIDs[0]=MediaInfo_Parser_Scte20;
         StreamIDs_Width[0]=1;
@@ -104,26 +105,46 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
-void File_Scte20::Streams_Fill()
+void File_Scte20::Streams_Update()
 {
-    //Filling
+    Clear(Stream_Text);
+
+    //Per stream
     for (size_t Pos=0; Pos<Streams.size(); Pos++)
-        if (Streams[Pos] && Streams[Pos]->Parser && Streams[Pos]->Parser->Status[IsFilled])
+        if (Streams[Pos] && Streams[Pos]->Parser && Streams[Pos]->Parser->Status[IsFilled] /*&& Streams[Pos]->Parser->Status[IsUpdated]*/ && Streams[Pos]->Parser->Count_Get(Stream_Text))
+            Streams_Update_PerStream(Pos);
+}
+
+//---------------------------------------------------------------------------
+void File_Scte20::Streams_Update_PerStream(size_t Pos)
+{
+    if (Streams[Pos]==NULL)
+        return;
+
+    Update(Streams[Pos]->Parser);
+
+    if (Streams[Pos]->Parser)
+        for (size_t Pos2=0; Pos2<Streams[Pos]->Parser->Count_Get(Stream_Text); Pos2++)
         {
-            Merge(*Streams[Pos]->Parser);
-            if (Pos<3)
-                Fill(Stream_Text, StreamPos_Last, Text_ID, _T("608-")+Ztring::ToZtring(Pos+1));
-            Fill(Stream_Text, StreamPos_Last, "MuxingMode", _T("SCTE 20"));
+            Stream_Prepare(Stream_Text);
+            Merge(*Streams[Pos]->Parser, Stream_Text, Pos2, StreamPos_Last);
+            Fill(Stream_Text, StreamPos_Last, "MuxingMode", "SCTE 20");
+            Fill(Stream_Text, StreamPos_Last, Text_ID, Streams[Pos]->Parser->Retrieve(Stream_Text, Pos2, Text_ID), true);
         }
 }
 
 //---------------------------------------------------------------------------
 void File_Scte20::Streams_Finish()
 {
-    //Filling
+    Clear(Stream_Text);
+
+    //Per stream
     for (size_t Pos=0; Pos<Streams.size(); Pos++)
-        if (Streams[Pos] && Streams[Pos]->Parser && Streams[Pos]->Parser->Status[IsFilled])
+        if (Streams[Pos] && Streams[Pos]->Parser && Streams[Pos]->Parser->Status[IsAccepted] /*&& Streams[Pos]->Parser->Status[IsUpdated]*/)
+        {
             Finish(Streams[Pos]->Parser);
+            Streams_Update_PerStream(Pos);
+        }
 }
 
 //***************************************************************************
@@ -157,7 +178,7 @@
 void File_Scte20::Read_Buffer_Continue()
 {
     //Parsing
-    Element_Begin("SCTE 20");
+    Element_Begin1("SCTE 20");
     int8u  cc_count;
     bool vbi_data_flag;
     BS_Begin();
@@ -174,22 +195,22 @@
         Get_S1 (5, cc_count,                                    "cc_count");
         for (int8u Pos=0; Pos<cc_count; Pos++)
         {
-            Element_Begin("cc");
+            Element_Begin1("cc");
             int8u cc_data[2];
             int8u field_number, cc_data_1, cc_data_2;
             Skip_S1(2,                                          "cc_priority");
-            Get_S1 (2, field_number,                            "field_number"); Param_Info(Scte20_field_number(field_number));
+            Get_S1 (2, field_number,                            "field_number"); Param_Info1(Scte20_field_number(field_number));
             Skip_S1(5,                                          "line_offset");
             Get_S1 (8, cc_data_1,                               "cc_data_1");
             cc_data[0]=ReverseBits(cc_data_1);
-            Param_Info(Ztring::ToZtring(cc_data[0], 16));
+            Param_Info1(Ztring::ToZtring(cc_data[0], 16));
             Get_S1 (8, cc_data_2,                               "cc_data_2");
             cc_data[1]=ReverseBits(cc_data_2);
-            Param_Info(Ztring::ToZtring(cc_data[1], 16));
+            Param_Info1(Ztring::ToZtring(cc_data[1], 16));
             Mark_1_NoTrustError();
             if (field_number!=0 && picture_structure!=(int8u)-1 && picture_structure!=0)
             {
-                Element_Begin("cc_data");
+                Element_Begin1("cc_data");
 
                 //Finding the corresponding cc_type (CEA-608 1st field or 2nd field)
                 int8u cc_type;
@@ -210,7 +231,12 @@
                     Streams[cc_type]=new stream;
                 if (Streams[cc_type]->Parser==NULL)
                 {
-                    Streams[cc_type]->Parser=new File_Eia608();
+                    #if defined(MEDIAINFO_EIA608_YES)
+                        Streams[cc_type]->Parser=new File_Eia608();
+                        ((File_Eia608*)Streams[cc_type]->Parser)->cc_type=cc_type;
+                    #else //defined(MEDIAINFO_EIA608_YES)
+                        Streams[cc_type]->Parser=new File__Analyze();
+                    #endif //defined(MEDIAINFO_EIA608_YES)
                     Open_Buffer_Init(Streams[cc_type]->Parser);
                 }
                 Demux(cc_data, 2, ContentType_MainStream);
@@ -219,29 +245,22 @@
                     //Parsing
                     if (Streams[cc_type]->Parser->PTS_DTS_Needed)
                     {
-                        Streams[cc_type]->Parser->PCR=PCR;
-                        Streams[cc_type]->Parser->PTS=PTS;
-                        Streams[cc_type]->Parser->DTS=DTS;
+                        Streams[cc_type]->Parser->FrameInfo.PCR=FrameInfo.PCR;
+                        Streams[cc_type]->Parser->FrameInfo.PTS=FrameInfo.PTS;
+                        Streams[cc_type]->Parser->FrameInfo.DTS=FrameInfo.DTS;
                     }
                     Open_Buffer_Continue(Streams[cc_type]->Parser, cc_data, 2);
                     Element_Show();
 
                     //Filled
-                    if (!Streams[cc_type]->IsFilled && Streams[cc_type]->Parser->Status[IsFilled])
-                    {
-                        if (Count_Get(Stream_General)==0)
-                            Accept("SCTE 20");
-                        Streams_Count++;
-                        if (Streams_Count==3)
-                            Fill("SCTE 20");
-                        Streams[cc_type]->IsFilled=true;
-                    }
+                    if (!Status[IsAccepted])
+                        Accept("SCTE 20");
                 }
                 else
                     Skip_XX(2,                                  "Data");
-                Element_End();
+                Element_End0();
             }
-            Element_End();
+            Element_End0();
         }
     }
     Skip_S1(4,                                                  "non_real_time_video_count");
@@ -249,7 +268,7 @@
 
     if (Element_Size-Element_Offset)
         Skip_XX(Element_Size-Element_Offset,                    "non_real_time_video + reserved");
-    Element_End();
+    Element_End0();
     Element_Show();
 }

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Text/File_Scte20.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Text/File_Scte20.h Changed

@@ -1,17 +1,17 @@
 // File_Scte20 - Info for SCTE 20 streams
-// Copyright (C) 2010-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -54,7 +54,8 @@
 
 private :
     //Streams management
-    void Streams_Fill();
+    void Streams_Update();
+    void Streams_Update_PerStream(size_t Pos);
     void Streams_Finish();
 
     //Synchro
@@ -67,11 +68,13 @@
     struct stream
     {
         File__Analyze*  Parser;
+        size_t          StreamPos;
         bool            IsFilled;
 
         stream()
         {
             Parser=NULL;
+            StreamPos=(size_t)-1;
             IsFilled=false;
         }

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Text/File_Teletext.cpp Added

@@ -0,0 +1,101 @@
+// File_Teletext - Info for Teletext streams
+// Copyright (C) 2009-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_DVBSUBTITLE_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Text/File_Teletext.h"
+#include "MediaInfo/MediaInfo_Config_MediaInfo.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File_Teletext::File_Teletext()
+:File__Analyze()
+{
+    //Configuration
+    ParserName=__T("Teletext");
+    #if MEDIAINFO_EVENTS
+        ParserIDs[0]=MediaInfo_Parser_Teletext;
+    #endif //MEDIAINFO_EVENTS
+    #if MEDIAINFO_TRACE
+        Trace_Layers_Update(8); //Stream
+    #endif //MEDIAINFO_TRACE
+    PTS_DTS_Needed=true;
+    IsRawStream=true;
+}
+
+//---------------------------------------------------------------------------
+File_Teletext::~File_Teletext()
+{
+}
+
+//***************************************************************************
+// Streams management
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Teletext::Streams_Fill()
+{
+    Stream_Prepare(Stream_Text);
+}
+
+//---------------------------------------------------------------------------
+void File_Teletext::Streams_Finish()
+{
+}
+
+//***************************************************************************
+// Buffer - Global
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Teletext::Read_Buffer_Continue()
+{
+    Fill();
+    Finish();
+}
+
+//***************************************************************************
+// C++
+//***************************************************************************
+
+} //NameSpace
+
+#endif //MEDIAINFO_DVBSUBTITLE_YES

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Text/File_Teletext.h Added

@@ -0,0 +1,58 @@
+// File_Teletext - Info for Teletext streams
+// Copyright (C) 2009-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Information about Teletext streams
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_File_TeletextH
+#define MediaInfo_File_TeletextH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+using namespace std;
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Class File_Teletext
+//***************************************************************************
+
+class File_Teletext : public File__Analyze
+{
+public :
+    File_Teletext();
+    ~File_Teletext();
+
+private :
+    //Streams management
+    void Streams_Fill();
+    void Streams_Finish();
+
+    //Buffer - Global
+    void Read_Buffer_Continue();
+};
+
+} //NameSpace
+
+#endif

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/TimeCode.cpp Added

@@ -0,0 +1,152 @@
+// TimeCode - Time code operations with drop frame support
+// Copyright (C) 2011-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/TimeCode.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+TimeCode::TimeCode ()
+{
+    Hours=(int8u)-1;
+    Minutes=(int8u)-1;
+    Seconds=(int8u)-1;
+    Frames=(int8u)-1;
+    FramesPerSecond=0;
+    DropFrame=false;
+    MustUseSecondField=false;
+    IsSecondField=false;
+}
+
+//---------------------------------------------------------------------------
+TimeCode::TimeCode (int8u Hours_, int8u Minutes_, int8u Seconds_, int8u Frames_, int8u FramesPerSecond_, bool DropFrame_, bool MustUseSecondField_, bool IsSecondField_)
+{
+    Hours=Hours_;
+    Minutes=Minutes_;
+    Seconds=Seconds_;
+    Frames=Frames_;
+    FramesPerSecond=FramesPerSecond_;
+    DropFrame=DropFrame_;
+    MustUseSecondField=MustUseSecondField_;
+    IsSecondField=IsSecondField_;
+}
+
+//***************************************************************************
+// Helpers
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void TimeCode::PlusOne()
+{
+    if (FramesPerSecond==0)
+        return;
+    if (MustUseSecondField)
+    {
+        if (IsSecondField)
+        {
+            Frames++;
+            IsSecondField=false;
+        }
+        else
+            IsSecondField=true;
+    }
+    else
+        Frames++;
+    if (Frames>=FramesPerSecond)
+    {
+        Seconds++;
+        Frames=0;
+        if (Seconds>=60)
+        {
+            Seconds=0;
+            Minutes++;
+
+            if (DropFrame && Minutes%10)
+                Frames=2; //frames 0 and 1 are dropped for every minutes except 00 10 20 30 40 50
+
+            if (Minutes>=60)
+            {
+                Minutes=0;
+                Hours++;
+                if (Hours>=24)
+                {
+                    Hours=0;
+                }
+            }
+        }
+    }
+}
+
+//---------------------------------------------------------------------------
+void TimeCode::MinusOne()
+{
+    if (FramesPerSecond==0)
+        return;
+    if (MustUseSecondField && IsSecondField)
+        IsSecondField=false;
+    else
+    {
+        if (Frames==0 || (DropFrame && Minutes%10 && Frames<=2))
+        {
+            Frames=FramesPerSecond;
+            if (Seconds==0)
+            {
+                Seconds=60;
+                if (Minutes==0)
+                {
+                    Minutes=60;
+                    if (Hours==0)
+                        Hours=24;
+                    Hours--;
+                }
+                Minutes--;
+            }
+            Seconds--;
+        }
+        Frames--;
+
+        if (MustUseSecondField)
+            IsSecondField=true;
+    }
+}
+
+//***************************************************************************
+//
+//***************************************************************************
+
+} //NameSpace

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/TimeCode.h Added

@@ -0,0 +1,108 @@
+// TimeCode - Time code operations with drop frame support
+// Copyright (C) 2011-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_TimeCodeH
+#define MediaInfo_TimeCodeH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Class File_Unknown
+//***************************************************************************
+
+class TimeCode
+{
+public:
+    //constructor/Destructor
+    TimeCode ();
+    TimeCode (int8u Hours_, int8u Minutes_, int8u Seconds_, int8u Frames_, int8u FramesPerSecond_, bool DropFrame_, bool MustUseSecondField_=false, bool IsSecondField_=false);
+
+    //Operators
+    TimeCode &operator ++()
+    {
+        PlusOne();
+        return *this;
+    }
+    TimeCode operator ++(int)
+    {
+        PlusOne();
+        return *this;
+    }
+    TimeCode &operator --()
+    {
+        MinusOne();
+        return *this;
+    }
+    TimeCode operator --(int)
+    {
+        MinusOne();
+        return *this;
+    }
+    bool operator== (const TimeCode &tc) const
+    {
+        return Hours                ==tc.Hours
+            && Minutes              ==tc.Minutes
+            && Seconds              ==tc.Seconds
+            && Frames               ==tc.Frames
+            && FramesPerSecond      ==tc.FramesPerSecond
+            && DropFrame            ==tc.DropFrame
+            && MustUseSecondField   ==tc.MustUseSecondField
+            && IsSecondField        ==tc.IsSecondField;
+    }
+    bool operator!= (const TimeCode &tc) const
+    {
+        return Hours                !=tc.Hours
+            || Minutes              !=tc.Minutes
+            || Seconds              !=tc.Seconds
+            || Frames               !=tc.Frames
+            || FramesPerSecond      !=tc.FramesPerSecond
+            || DropFrame            !=tc.DropFrame
+            || MustUseSecondField   !=tc.MustUseSecondField
+            || IsSecondField        !=tc.IsSecondField;
+    }
+
+    //Helpers
+    bool IsValid() const
+    {
+        return FramesPerSecond?true:false;
+    }
+    void PlusOne();
+    void MinusOne();
+
+public:
+    int8u Hours;
+    int8u Minutes;
+    int8u Seconds;
+    int8u Frames;
+    int8u FramesPerSecond;
+    bool  DropFrame;
+    bool  MustUseSecondField;
+    bool  IsSecondField;
+};
+
+} //NameSpace
+
+#endif

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Video/File_AfdBarData.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_AfdBarData.cpp Changed

@@ -1,36 +1,36 @@
 // File_AfdBarData - Info for Bar Data Video files
-// Copyright (C) 2010-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
-#if defined(MEDIAINFO_AFDBARDATA_YES)
+#include "MediaInfo/Setup.h"
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
-#include "MediaInfo/Video/File_AfdBarData.h"
+#if defined(MEDIAINFO_AFDBARDATA_YES) || defined(MEDIAINFO_MXF_YES)
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
@@ -65,6 +65,73 @@
 };
 
 //---------------------------------------------------------------------------
+const char* AfdBarData_active_format_4_3[]=
+{
+    "", //Undefined
+    "Reserved",
+    "Letterbox 16:9 image (top)",
+    "Letterbox 14:9 image (top)",
+    "Letterbox image with an aspect ratio greater than 16:9",
+    "Reserved",
+    "Reserved",
+    "Reserved",
+    "Full frame 4:3 image",
+    "Full frame 4:3 image",
+    "Letterbox 16:9 image",
+    "Letterbox 14:9 image",
+    "Reserved",
+    "Full frame 4:3 image, with alternative 14:9 center",
+    "Letterbox 16:9 image, with alternative 14:9 center",
+    "Letterbox 16:9 image, with alternative 4:3 center",
+};
+
+//---------------------------------------------------------------------------
+const char* AfdBarData_active_format_16_9[]=
+{
+    "", //Undefined
+    "Reserved",
+    "Letterbox 16:9 image (top)",
+    "Pillarbox 14:9 image (top)",
+    "Letterbox image with an aspect ratio greater than 16:9",
+    "Reserved",
+    "Reserved",
+    "Reserved",
+    "Full frame 16:9 image",
+    "Pillarbox 4:3 image",
+    "Letterbox 16:9 image",
+    "Pillarbox 14:9 image",
+    "Reserved",
+    "Full frame 4:3 image, with alternative 14:9 center",
+    "Letterbox 16:9 image, with alternative 14:9 center",
+    "Letterbox 16:9 image, with alternative 4:3 center",
+};
+
+//***************************************************************************
+// C++
+//***************************************************************************
+
+} //NameSpace
+
+#endif //defined(MEDIAINFO_AFDBARDATA_YES) || defined(MEDIAINFO_MXF_YES)
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_AFDBARDATA_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Video/File_AfdBarData.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+namespace MediaInfoLib
+{
+//---------------------------------------------------------------------------
+
+//***************************************************************************
+// Infos
+//***************************************************************************
+
+//---------------------------------------------------------------------------
 const char* AfdBarData_aspect_ratio[]=
 {
     "4:3",
@@ -79,8 +146,12 @@
 File_AfdBarData::File_AfdBarData()
 :File__Analyze()
 {
+    //Configuration
+    PTS_DTS_Needed=true;
+
     //In
     Format=Format_Unknown;
+    aspect_ratio_FromContainer=(int8u)-1;
 }
 
 //***************************************************************************
@@ -92,6 +163,24 @@
 {
     //Filling
     Stream_Prepare(Stream_Video);
+    if (active_format!=(int8u)-1)
+    {
+        Fill(Stream_Video, 0, Video_ActiveFormatDescription, Stream.active_format);
+        if (aspect_ratio==(int8u)-1)
+            aspect_ratio=aspect_ratio_FromContainer;
+        if (aspect_ratio!=(int8u)-1)
+        {
+            Fill(Stream_Video, 0, Video_ActiveFormatDescription_String, Stream.aspect_ratio?AfdBarData_active_format_16_9[Stream.active_format]:AfdBarData_active_format_4_3[Stream.active_format]);
+            switch (Format)
+            {
+                case Format_A53_4_DTG1    : Fill(Stream_Video, 0, Video_ActiveFormatDescription_MuxingMode, "A/53"); break;
+                case Format_S2016_3       : Fill(Stream_Video, 0, Video_ActiveFormatDescription_MuxingMode, "SMPTE ST 2016-3"); break;
+                default                   :
+                                            Skip_XX(Element_Size,       "Unknown");
+                                            return;
+            }
+        }
+    }
 }
 
 //***************************************************************************
@@ -138,8 +227,11 @@
         Stream.active_format=active_format;
         Stream.aspect_ratio=aspect_ratio;
 
-        if (!Status[IsFilled])
+        if (!Status[IsAccepted])
+        {
+            Accept("AfdBarData");
             Fill("AfdBarData");
+        }
         if (MediaInfoLib::Config.ParseSpeed_Get()<1)
             Finish("AfdBarData");
     FILLING_END();
@@ -153,13 +245,13 @@
 void File_AfdBarData::afd_data()
 {
     //Parsing
-    Element_Begin("Active Format Description");
+    Element_Begin1("Active Format Description");
     BS_Begin();
     if (Format==Format_S2016_3)
     {
         Mark_0_NoTrustError();
-        Get_S1 (4, active_format,                               "active_format"); Param_Info(AfdBarData_active_format[active_format]);
-        Get_S1 (1, aspect_ratio,                                "aspect_ratio"); Param_Info(AfdBarData_aspect_ratio[aspect_ratio]);
+        Get_S1 (4, active_format,                               "active_format"); Param_Info1(AfdBarData_active_format[active_format]);
+        Get_S1 (1, aspect_ratio,                                "aspect_ratio"); Param_Info1(AfdBarData_aspect_ratio[aspect_ratio]);
         Mark_0_NoTrustError();
         Mark_0_NoTrustError();
     }
@@ -180,18 +272,18 @@
             Mark_1_NoTrustError();
             Mark_1_NoTrustError();
             Mark_1_NoTrustError();
-            Get_S1 (4, active_format,                           "active_format"); Param_Info(AfdBarData_active_format[active_format]);
+            Get_S1 (4, active_format,                           "active_format"); Param_Info1(AfdBarData_active_format[active_format]);
         }
     }
     BS_End();
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
 void File_AfdBarData::bar_data()
 {
     //Parsing
-    Element_Begin("bar_data");
+    Element_Begin1("bar_data");
     bool   top_bar_flag, bottom_bar_flag, left_bar_flag, right_bar_flag;
     BS_Begin();
     Get_SB (top_bar_flag,                                       "top_bar_flag");
@@ -238,15 +330,15 @@
     }
     if (!top_bar_flag && !bottom_bar_flag && !left_bar_flag && !right_bar_flag)
     {
-        Mark_1();
-        Mark_1();
+        Mark_1_NoTrustError();
+        Mark_1_NoTrustError();
         Skip_S2(14,                                             "reserved");
-        Mark_1();
-        Mark_1();
+        Mark_1_NoTrustError();
+        Mark_1_NoTrustError();
         Skip_S2(14,                                             "reserved");
     }
     BS_End();
-    Element_End();
+    Element_End0();
 
     if (Format==Format_A53_4_DTG1)
     {

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Video/File_AfdBarData.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_AfdBarData.h Changed

@@ -1,17 +1,17 @@
 // File_AfdBarData - Info for Bar Data Video files
-// Copyright (C) 2010-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -49,6 +49,7 @@
         Format_S2016_3,         //Active Format Description & Bar Data
     };
     format Format;
+    int8u  aspect_ratio_FromContainer;  //May come from the containing parser
 
     //Constructor/Destructor
     File_AfdBarData();
@@ -56,7 +57,7 @@
 private :
     //Streams management
     void Streams_Fill();
-    
+
     //Buffer - Global
     void Read_Buffer_Continue();

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Video/File_Avc.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_Avc.cpp Changed

@@ -1,30 +1,34 @@
 // File_Avc - Info for AVC Video files
-// Copyright (C) 2006-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2006-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
 //***************************************************************************
 // Constants
 //***************************************************************************
@@ -78,17 +82,16 @@
 
 //---------------------------------------------------------------------------
 #include "MediaInfo/Video/File_Avc.h"
-#include <cstring>
-#include <cmath>
-#if defined(MEDIAINFO_EIA608_YES)
-    #include "MediaInfo/Text/File_Eia608.h"
-#endif
-#if defined(MEDIAINFO_EIA708_YES)
-    #include "MediaInfo/Text/File_Eia708.h"
-#endif
+#if defined(MEDIAINFO_DTVCCTRANSPORT_YES)
+    #include "MediaInfo/Text/File_DtvccTransport.h"
+#endif //defined(MEDIAINFO_DTVCCTRANSPORT_YES)
 #if MEDIAINFO_EVENTS
+    #include "MediaInfo/MediaInfo_Config_MediaInfo.h"
     #include "MediaInfo/MediaInfo_Events.h"
 #endif //MEDIAINFO_EVENTS
+#include <cstring>
+#include <cmath>
+#include <algorithm>
 using namespace std;
 using namespace ZenLib;
 //---------------------------------------------------------------------------
@@ -175,7 +178,7 @@
     "top field",
     "bottom field",
     "top field, bottom field",
-    "bottom field, top field",                                                     
+    "bottom field, top field",
     "top field, bottom field, top field repeated",
     "bottom field, top field, bottom field repeated",
     "frame doubling",
@@ -255,38 +258,9 @@
 };
 
 //---------------------------------------------------------------------------
-const char* Avc_colour_primaries(int8u colour_primaries)
-{
-    switch (colour_primaries)
-    {
-        case  1 : return "BT.709-5, BT.1361, IEC 61966-2-4, SMPTE RP177";
-        case  4 : return "BT.470-6 system M, NTSC, FTC 73.682";
-        case  5 : return "BT.470-6 System B, BT.470-6 System G, BT.601-6 625, BT.1358 625, BT.1700 625 PAL, BT.1700 625 SECAM";
-        case  6 : return "BT.601-6 525, BT.1358 525, BT.1700 NTSC, SMPTE 170M";
-        case  7 : return "SMPTE 240M";
-        case  8 : return "Generic film";
-        default : return "";
-    }
-}
-
-//---------------------------------------------------------------------------
-const char* Avc_transfer_characteristics(int8u transfer_characteristics)
-{
-    switch (transfer_characteristics)
-    {
-        case  1 : return "BT.709-5, BT.1361";
-        case  4 : return "BT.470-6 System M, NTSC, FTC 73.682, BT.1700 625 PAL, BT.1700 625 SECAM";
-        case  5 : return "BT.470-6 System B, BT.470-6 System G";
-        case  6 : return "BT.601-6 525, BT.601-6 625, BT.1358 525, BT.1358 625, BT.1700 NTSC, SMPTE 170M";
-        case  7 : return "SMPTE 240M";
-        case  8 : return "Linear";
-        case  9 : return "Logarithmic (100:1)";
-        case 10 : return "Logarithmic (316.22777:1)";
-        case 11 : return "IEC 61966-2-4";
-        case 12 : return "BT.1361 extended colour gamut system";
-        default : return "";
-    }
-}
+const char* Mpegv_colour_primaries(int8u colour_primaries);
+const char* Mpegv_transfer_characteristics(int8u transfer_characteristics);
+const char* Mpegv_matrix_coefficients(int8u matrix_coefficients);
 
 //---------------------------------------------------------------------------
 const char* Avc_matrix_coefficients(int8u matrix_coefficients)
@@ -317,43 +291,83 @@
     }
 }
 
+//---------------------------------------------------------------------------
+int32u Avc_MaxDpbMbs(int8u level)
+{
+    switch (level)
+    {
+        case  10 : return    1485;
+        case  11 : return    3000;
+        case  12 : return    6000;
+        case  13 :
+        case  20 : return   11880;
+        case  21 : return   19800;
+        case  22 : return   20250;
+        case  30 : return   40500;
+        case  31 : return  108000;
+        case  32 : return  216000;
+        case  40 :
+        case  41 : return  245760;
+        case  42 : return  522240;
+        case  50 : return  589824;
+        case  51 : return  983040;
+        default  : return       0;
+    }
+}
+
 //***************************************************************************
 // Constructor/Destructor
 //***************************************************************************
 
 //---------------------------------------------------------------------------
 File_Avc::File_Avc()
+#if MEDIAINFO_DUPLICATE
 :File__Duplicate()
+#endif //MEDIAINFO_DUPLICATE
 {
     //Config
     #if MEDIAINFO_EVENTS
         ParserIDs[0]=MediaInfo_Parser_Avc;
         StreamIDs_Width[0]=0;
     #endif //MEDIAINFO_EVENTS
+    #if MEDIAINFO_TRACE
+        Trace_Layers_Update(8); //Stream
+    #endif //MEDIAINFO_TRACE
     MustSynchronize=true;
     Buffer_TotalBytes_FirstSynched_Max=64*1024;
     PTS_DTS_Needed=true;
     IsRawStream=true;
+    Frame_Count_NotParsedIncluded=0;
 
     //In
-    Frame_Count_Valid=MediaInfoLib::Config.ParseSpeed_Get()>=0.3?64:2; //Currently no 3:2 pulldown detection
+    Frame_Count_Valid=MediaInfoLib::Config.ParseSpeed_Get()>=0.3?512:2;
     FrameIsAlwaysComplete=false;
     MustParse_SPS_PPS=false;
-    MustParse_SPS_PPS_Only=false;
-    MustParse_SPS_PPS_Done=false;
     SizedBlocks=false;
 
-    //Temp
-    SizeOfNALU_Minus1=(int8u)-1;
-    SPS_IsParsed=false;
-    PPS_IsParsed=false;
+    //Text
+    #if defined(MEDIAINFO_DTVCCTRANSPORT_YES)
+        GA94_03_Parser=NULL;
+    #endif //defined(MEDIAINFO_DTVCCTRANSPORT_YES)
 }
 
 //---------------------------------------------------------------------------
 File_Avc::~File_Avc()
 {
-    for (size_t Pos=0; Pos<GA94_03_CC_Parsers.size(); Pos++)
-        delete GA94_03_CC_Parsers[Pos]; //GA94_03_CC_Parsers[Pos]=NULL;
+    for (size_t Pos=0; Pos<TemporalReferences.size(); Pos++)
+        delete TemporalReferences[Pos]; //TemporalReferences[Pos]=NULL;
+    #if defined(MEDIAINFO_DTVCCTRANSPORT_YES)
+        delete GA94_03_Parser; //GA94_03_Parser=NULL;
+    #endif //defined(MEDIAINFO_DTVCCTRANSPORT_YES)
+
+    for (size_t Pos=0; Pos<seq_parameter_sets.size(); Pos++)
+        delete seq_parameter_sets[Pos]; //TemporalReferences[Pos]=NULL;
+
+    for (size_t Pos=0; Pos<subset_seq_parameter_sets.size(); Pos++)
+        delete subset_seq_parameter_sets[Pos]; //TemporalReferences[Pos]=NULL;
+
+    for (size_t Pos=0; Pos<pic_parameter_sets.size(); Pos++)
+        delete pic_parameter_sets[Pos]; //TemporalReferences[Pos]=NULL;
 }
 
 //***************************************************************************
@@ -363,54 +377,120 @@
 //---------------------------------------------------------------------------
 void File_Avc::Streams_Fill()
 {
+    for (std::vector<seq_parameter_set_struct*>::iterator seq_parameter_set_Item=seq_parameter_sets.begin(); seq_parameter_set_Item!=seq_parameter_sets.end(); ++seq_parameter_set_Item)
+        if ((*seq_parameter_set_Item))
+            Streams_Fill(seq_parameter_set_Item);
+    for (std::vector<seq_parameter_set_struct*>::iterator subset_seq_parameter_set_Item=subset_seq_parameter_sets.begin(); subset_seq_parameter_set_Item!=subset_seq_parameter_sets.end(); ++subset_seq_parameter_set_Item)
+        if ((*subset_seq_parameter_set_Item))
+        {
+            if (seq_parameter_sets.empty())
+                Streams_Fill(subset_seq_parameter_set_Item);
+            else
+                Streams_Fill_subset(subset_seq_parameter_set_Item);
+            Fill(Stream_Video, 0, Video_MultiView_Count, (*subset_seq_parameter_set_Item)->num_views_minus1+1);
+        }
+}
+
+//---------------------------------------------------------------------------
+void File_Avc::Streams_Fill(std::vector<seq_parameter_set_struct*>::iterator seq_parameter_set_Item)
+{
     //Calculating - Pixels
-    int32u Width =(pic_width_in_mbs_minus1       +1)*16;
-    int32u Height=(pic_height_in_map_units_minus1+1)*16*(2-frame_mbs_only_flag);
-    int32u CropUnitX=Avc_SubWidthC [chroma_format_idc];
-    int32u CropUnitY=Avc_SubHeightC[chroma_format_idc]*(2-frame_mbs_only_flag);
-    Width -=(frame_crop_left_offset+frame_crop_right_offset )*CropUnitX;
-    Height-=(frame_crop_top_offset +frame_crop_bottom_offset)*CropUnitY;
-
-    //Calculating - PixelAspectRatio
-    float32 PixelAspectRatio;
-    if (aspect_ratio_idc<Avc_PixelAspectRatio_Size)
-        PixelAspectRatio=Avc_PixelAspectRatio[aspect_ratio_idc];
-    else if (sar_height)
-        PixelAspectRatio=((float)sar_width)/sar_height;
-    else
-        PixelAspectRatio=1; //Unknown
+    int32u Width =((*seq_parameter_set_Item)->pic_width_in_mbs_minus1       +1)*16;
+    int32u Height=((*seq_parameter_set_Item)->pic_height_in_map_units_minus1+1)*16*(2-(*seq_parameter_set_Item)->frame_mbs_only_flag);
+    int32u CropUnitX=Avc_SubWidthC [(*seq_parameter_set_Item)->ChromaArrayType()];
+    int32u CropUnitY=Avc_SubHeightC[(*seq_parameter_set_Item)->ChromaArrayType()]*(2-(*seq_parameter_set_Item)->frame_mbs_only_flag);
+    Width -=((*seq_parameter_set_Item)->frame_crop_left_offset+(*seq_parameter_set_Item)->frame_crop_right_offset )*CropUnitX;
+    Height-=((*seq_parameter_set_Item)->frame_crop_top_offset +(*seq_parameter_set_Item)->frame_crop_bottom_offset)*CropUnitY;
+
+    //From vui_parameters
+    float64 PixelAspectRatio=1;
+    if ((*seq_parameter_set_Item)->vui_parameters)
+    {
+        if ((*seq_parameter_set_Item)->vui_parameters->aspect_ratio_idc<Avc_PixelAspectRatio_Size)
+            PixelAspectRatio=Avc_PixelAspectRatio[(*seq_parameter_set_Item)->vui_parameters->aspect_ratio_idc];
+        else if ((*seq_parameter_set_Item)->vui_parameters->aspect_ratio_idc==0xFF && (*seq_parameter_set_Item)->vui_parameters->sar_height)
+            PixelAspectRatio=((float64)(*seq_parameter_set_Item)->vui_parameters->sar_width)/(*seq_parameter_set_Item)->vui_parameters->sar_height;
+        if ((*seq_parameter_set_Item)->vui_parameters->timing_info_present_flag)
+        {
+            if (!(*seq_parameter_set_Item)->vui_parameters->fixed_frame_rate_flag)
+                Fill(Stream_Video, StreamPos_Last, Video_FrameRate_Mode, "VFR");
+            else if ((*seq_parameter_set_Item)->vui_parameters->time_scale && (*seq_parameter_set_Item)->vui_parameters->num_units_in_tick)
+                Fill(Stream_Video, StreamPos_Last, Video_FrameRate, (float64)(*seq_parameter_set_Item)->vui_parameters->time_scale/(*seq_parameter_set_Item)->vui_parameters->num_units_in_tick/((*seq_parameter_set_Item)->frame_mbs_only_flag?2:((*seq_parameter_set_Item)->pic_order_cnt_type==2?1:2))/FrameRate_Divider);
+        }
+
+        //Colour description
+        if ((*seq_parameter_set_Item)->vui_parameters->video_signal_type_present_flag)
+        {
+            Fill(Stream_Video, 0, Video_Standard, Avc_video_format[(*seq_parameter_set_Item)->vui_parameters->video_format]);
+            if ((*seq_parameter_set_Item)->vui_parameters->colour_description_present_flag)
+            {
+                Fill(Stream_Video, 0, "colour_primaries", Mpegv_colour_primaries((*seq_parameter_set_Item)->vui_parameters->colour_primaries));
+                Fill(Stream_Video, 0, "transfer_characteristics", Mpegv_transfer_characteristics((*seq_parameter_set_Item)->vui_parameters->transfer_characteristics));
+                Fill(Stream_Video, 0, "matrix_coefficients", Mpegv_matrix_coefficients((*seq_parameter_set_Item)->vui_parameters->matrix_coefficients));
+            }
+        }
+
+        //hrd_parameter_sets
+        int32u bit_rate_value=(int32u)-1;
+        bool   bit_rate_value_IsValid=true;
+        bool   cbr_flag=false;
+        bool   cbr_flag_IsSet=false;
+        bool   cbr_flag_IsValid=true;
+        seq_parameter_set_struct::vui_parameters_struct::xxl* NAL=(*seq_parameter_set_Item)->vui_parameters->NAL;
+        if (NAL)
+            for (size_t Pos=0; Pos<NAL->SchedSel.size(); Pos++)
+            {
+                if (NAL->SchedSel[Pos].cpb_size_value!=(int32u)-1)
+                    Fill(Stream_Video, 0, Video_BufferSize, NAL->SchedSel[Pos].cpb_size_value);
+                if (bit_rate_value!=(int32u)-1 && bit_rate_value!=NAL->SchedSel[Pos].bit_rate_value)
+                    bit_rate_value_IsValid=false;
+                if (bit_rate_value==(int32u)-1)
+                    bit_rate_value=NAL->SchedSel[Pos].bit_rate_value;
+                if (cbr_flag_IsSet==true && cbr_flag!=NAL->SchedSel[Pos].cbr_flag)
+                    cbr_flag_IsValid=false;
+                if (cbr_flag_IsSet==0)
+                {
+                    cbr_flag=NAL->SchedSel[Pos].cbr_flag;
+                    cbr_flag_IsSet=true;
+                }
+            }
+        seq_parameter_set_struct::vui_parameters_struct::xxl* VCL=(*seq_parameter_set_Item)->vui_parameters->VCL;
+        if (VCL)
+            for (size_t Pos=0; Pos<VCL->SchedSel.size(); Pos++)
+            {
+                Fill(Stream_Video, 0, Video_BufferSize, VCL->SchedSel[Pos].cpb_size_value);
+                if (bit_rate_value!=(int32u)-1 && bit_rate_value!=VCL->SchedSel[Pos].bit_rate_value)
+                    bit_rate_value_IsValid=false;
+                if (bit_rate_value==(int32u)-1)
+                    bit_rate_value=VCL->SchedSel[Pos].bit_rate_value;
+                if (cbr_flag_IsSet==true && cbr_flag!=VCL->SchedSel[Pos].cbr_flag)
+                    cbr_flag_IsValid=false;
+                if (cbr_flag_IsSet==0)
+                {
+                    cbr_flag=VCL->SchedSel[Pos].cbr_flag;
+                    cbr_flag_IsSet=true;
+                }
+            }
+        if (cbr_flag_IsSet && cbr_flag_IsValid)
+        {
+            Fill(Stream_Video, 0, Video_BitRate_Mode, cbr_flag?"CBR":"VBR");
+            if (bit_rate_value!=(int32u)-1 && bit_rate_value_IsValid)
+                Fill(Stream_Video, 0, cbr_flag?Video_BitRate_Nominal:Video_BitRate_Maximum, bit_rate_value);
+        }
+    }
 
     if (Count_Get(Stream_Video)==0)
         Stream_Prepare(Stream_Video);
     Fill(Stream_Video, 0, Video_Format, "AVC");
     Fill(Stream_Video, 0, Video_Codec, "AVC");
 
-    if (!subset_seq_parameter_set_ids.empty())
-    {
-        std::map<int32u, seq_parameter_set_>::iterator subset_seq_parameter_set_id=subset_seq_parameter_set_ids.begin(); //Currently, only 1 SPS is supported
-        Ztring Profile=Ztring().From_Local(Avc_profile_idc(subset_seq_parameter_set_id->second.profile_idc))+_T("@L")+Ztring().From_Number(((float)subset_seq_parameter_set_id->second.level_idc)/10, 1);
-        Fill(Stream_Video, 0, Video_Format_Profile, Profile);
-        Fill(Stream_Video, 0, Video_MultiView_Count, num_views_minus1+1);
-    }
-    if (!seq_parameter_set_ids.empty())
-    {
-        std::map<int32u, seq_parameter_set_>::iterator seq_parameter_set_id=seq_parameter_set_ids.begin(); //Currently, only 1 SPS is supported
-        Ztring Profile=Ztring().From_Local(Avc_profile_idc(seq_parameter_set_id->second.profile_idc))+_T("@L")+Ztring().From_Number(((float)seq_parameter_set_id->second.level_idc)/10, 1);
-        Fill(Stream_Video, 0, Video_Format_Profile, Profile);
-        Fill(Stream_Video, 0, Video_Codec_Profile, Profile);
-    }
+    Ztring Profile=Ztring().From_Local(Avc_profile_idc((*seq_parameter_set_Item)->profile_idc))+__T("@L")+Ztring().From_Number(((float)(*seq_parameter_set_Item)->level_idc)/10, 1);
+    Fill(Stream_Video, 0, Video_Format_Profile, Profile);
+    Fill(Stream_Video, 0, Video_Codec_Profile, Profile);
     Fill(Stream_Video, StreamPos_Last, Video_Width, Width);
     Fill(Stream_Video, StreamPos_Last, Video_Height, Height);
-    Fill(Stream_Video, 0, Video_Standard, Avc_video_format[video_format]);
     Fill(Stream_Video, 0, Video_PixelAspectRatio, PixelAspectRatio, 3, true);
     Fill(Stream_Video, 0, Video_DisplayAspectRatio, Width*PixelAspectRatio/Height, 3, true); //More precise
-    if (timing_info_present_flag)
-    {
-        if (!fixed_frame_rate_flag)
-            Fill(Stream_Video, StreamPos_Last, Video_FrameRate_Mode, "VFR");
-        else if (time_scale && num_units_in_tick)
-            Fill(Stream_Video, StreamPos_Last, Video_FrameRate, (float)time_scale/num_units_in_tick/(pic_order_cnt_type==2?1:2)/FrameRate_Divider);
-    }
     if (FrameRate_Divider==2)
     {
         Fill(Stream_Video, StreamPos_Last, Video_Format_Settings_FrameMode, "Frame doubling");
@@ -421,221 +501,120 @@
         Fill(Stream_Video, StreamPos_Last, Video_Format_Settings_FrameMode, "Frame tripling");
         Fill(Stream_Video, StreamPos_Last, Video_Format_Settings, "Frame tripling");
     }
-    Fill(Stream_Video, 0, Video_Colorimetry, Avc_Colorimetry_format_idc[chroma_format_idc]);
 
     //Interlacement
-    if (mb_adaptive_frame_field_flag && Structure_Frame>0) //Interlaced macro-block
+    if ((*seq_parameter_set_Item)->mb_adaptive_frame_field_flag && Structure_Frame>0) //Interlaced macro-block
     {
         Fill(Stream_Video, 0, Video_ScanType, "MBAFF");
         Fill(Stream_Video, 0, Video_Interlacement, "MBAFF");
     }
-    else if (frame_mbs_only_flag || Structure_Field==0) //No interlaced frame
+    else if ((*seq_parameter_set_Item)->frame_mbs_only_flag || (Structure_Frame>0 && Structure_Field==0)) //No interlaced frame
     {
         Fill(Stream_Video, 0, Video_ScanType, "Progressive");
         Fill(Stream_Video, 0, Video_Interlacement, "PPF");
     }
-    else
+    else if (Structure_Field>0)
     {
         Fill(Stream_Video, 0, Video_ScanType, "Interlaced");
         Fill(Stream_Video, 0, Video_Interlacement, "Interlaced");
     }
-    std::string TempRef, CodingType;
-    for (size_t Pos=0; Pos<TemporalReference.size(); Pos++)
-        if (TemporalReference[Pos].IsValid)
-        {
-            TempRef+=TemporalReference[Pos].IsTop?"T":"B";
-            CodingType+=Avc_slice_type[TemporalReference[Pos].slice_type];
-        }
-    if (TempRef.find("TBTBTBTB")==0)
-    {
-        Fill(Stream_Video, 0, Video_ScanOrder, "TFF");
-        Fill(Stream_Video, 0, Video_Interlacement, "TFF", Unlimited, true, true);
-    }
-    if (TempRef.find("BTBTBTBT")==0)
-    {
-        Fill(Stream_Video, 0, Video_ScanOrder, "BFF");
-        Fill(Stream_Video, 0, Video_Interlacement, "BFF", Unlimited, true, true);
-    }
-
-    //GOP
-    std::vector<Ztring> GOPs;
-    size_t GOP_Frame_Count=0;
-    size_t GOP_BFrames_Max=0;
-    size_t I_Pos1=CodingType.find(_T('I'));
-    while (I_Pos1!=std::string::npos)
-    {
-        size_t I_Pos2=CodingType.find(_T('I'), I_Pos1+1);
-        if (I_Pos2!=std::string::npos)
-        {
-            std::vector<size_t> P_Positions;
-            size_t P_Position=I_Pos1;
-            do
-            {
-                P_Position=CodingType.find(_T('P'), P_Position+1);
-                if (P_Position<I_Pos2)
-                    P_Positions.push_back(P_Position);
-            }
-            while (P_Position<I_Pos2);
-            Ztring GOP;
-            if (!P_Positions.empty())
-            {
-                GOP+=_T("M=")+Ztring::ToZtring(P_Positions[0]-I_Pos1)+_T(", ");
-                if (P_Positions[0]-I_Pos1>GOP_BFrames_Max)
-                    GOP_BFrames_Max=P_Positions[0]-I_Pos1;
-            }
-            GOP+=_T("N=")+Ztring::ToZtring(I_Pos2-I_Pos1);
-            GOPs.push_back(GOP);
-            GOP_Frame_Count+=I_Pos2-I_Pos1;
-        }
-        I_Pos1=I_Pos2;
+    std::string ScanOrders, PictureTypes(PictureTypes_PreviousFrames);
+    ScanOrders.reserve(TemporalReferences.size());
+    for (size_t Pos=0; Pos<TemporalReferences.size(); Pos++)
+        if (TemporalReferences[Pos])
+        {
+            ScanOrders+=TemporalReferences[Pos]->IsTop?'T':'B';
+            if ((Pos%2)==0)
+                PictureTypes+=Avc_slice_type[TemporalReferences[Pos]->slice_type];
+        }
+        else if (!PictureTypes.empty()) //Only if stream already started
+        {
+            ScanOrders+=' ';
+            if ((Pos%2)==0)
+                PictureTypes+=' ';
+        }
+    Fill(Stream_Video, 0, Video_ScanOrder, ScanOrder_Detect(ScanOrders));
+    { //Legacy
+        string Result=ScanOrder_Detect(ScanOrders);
+        if (!Result.empty())
+            Fill(Stream_Video, 0, Video_Interlacement, Result, true, true);
     }
+    Fill(Stream_Video, 0, Video_Format_Settings_GOP, GOP_Detect(PictureTypes));
 
-    if (GOP_Frame_Count+GOP_BFrames_Max>Frame_Count && !GOPs.empty())
-        GOPs.resize(GOPs.size()-1); //Removing the last one, there may have uncomplete B-frame filling
-
-    if (!GOPs.empty())
-    {
-        size_t Unique=0;
-        for (size_t Pos=1; Pos<GOPs.size(); Pos++)
-            if (GOPs[Pos]!=GOPs[0])
-                Unique++;
-        if ((Frame_Count<Frame_Count_Valid*10 && Unique) || Unique>2) //In order to accept some unsynch //TODO: change the method, synching with next I-Frame
-            GOPs.clear(); //Not a fixed GOP
-    }
-    if (!GOPs.empty())
-        Fill(Stream_Video, 0, Video_Format_Settings_GOP, GOPs[0]);
-    else if (CodingType.size()==1 && Frame_Count>1)
-        Fill(Stream_Video, 0, Video_Format_Settings_GOP, "N=1"); //Only I-Frames, pic_order_cnt_lsb is always 0
-
-    /*
-    if (frame_mbs_only_flag)
-    {
-        Fill(Stream_Video, 0, Video_ScanType, "Progressive");
-        Fill(Stream_Video, 0, Video_Interlacement, "PPF");
-    }
-    if (pic_struct_FirstDetected==1)
-    {
-        Fill(Stream_Video, 0, Video_ScanType, "Interlaced");
-        Fill(Stream_Video, 0, Video_ScanOrder, "TFF");
-        Fill(Stream_Video, 0, Video_Interlacement, "TFF");
-    }
-    if (pic_struct_FirstDetected==2)
-    {
-        Fill(Stream_Video, 0, Video_ScanType, "Interlaced");
-        Fill(Stream_Video, 0, Video_ScanOrder, "BFF");
-        Fill(Stream_Video, 0, Video_Interlacement, "BFF");
-    }
-    */
     Fill(Stream_Video, 0, Video_Encoded_Library, Encoded_Library);
     Fill(Stream_Video, 0, Video_Encoded_Library_Name, Encoded_Library_Name);
     Fill(Stream_Video, 0, Video_Encoded_Library_Version, Encoded_Library_Version);
     Fill(Stream_Video, 0, Video_Encoded_Library_Settings, Encoded_Library_Settings);
     Fill(Stream_Video, 0, Video_BitRate_Nominal, BitRate_Nominal);
     Fill(Stream_Video, 0, Video_MuxingMode, MuxingMode);
-    if (entropy_coding_mode_flag)
-    {
-        Fill(Stream_Video, 0, Video_Format_Settings, "CABAC");
-        Fill(Stream_Video, 0, Video_Format_Settings_CABAC, "Yes");
-        Fill(Stream_Video, 0, Video_Codec_Settings, "CABAC");
-        Fill(Stream_Video, 0, Video_Codec_Settings_CABAC, "Yes");
-    }
-    else
-    {
-        Fill(Stream_Video, 0, Video_Format_Settings_CABAC, "No");
-        Fill(Stream_Video, 0, Video_Codec_Settings_CABAC, "No");
-    }
-    if (max_num_ref_frames>0)
-    {
-        Fill(Stream_Video, 0, Video_Format_Settings, Ztring::ToZtring(max_num_ref_frames)+_T(" Ref Frames"));
-        Fill(Stream_Video, 0, Video_Codec_Settings, Ztring::ToZtring(max_num_ref_frames)+_T(" Ref Frames"));
-    }
-    if (max_num_ref_frames)
-    {
-        Fill(Stream_Video, 0, Video_Format_Settings_RefFrames, max_num_ref_frames);
-        Fill(Stream_Video, 0, Video_Codec_Settings_RefFrames, max_num_ref_frames);
-    }
-    Fill(Stream_Video, 0, Video_ColorSpace, "YUV");
-    if (bit_depth_luma_minus8==bit_depth_chroma_minus8)
-        Fill(Stream_Video, 0, Video_Resolution, bit_depth_luma_minus8+8);
-
-    //Colour description
-    Fill(Stream_Video, 0, "colour_primaries", Avc_colour_primaries(colour_primaries));
-    Fill(Stream_Video, 0, "transfer_characteristics", Avc_transfer_characteristics(transfer_characteristics));
-    Fill(Stream_Video, 0, "matrix_coefficients", Avc_matrix_coefficients(matrix_coefficients));
-
-    if (File_Offset+Buffer_Size<File_Size)
-    {
-        NextCode_Clear();
-
-        //Autorisation of other streams
-        for (int8u Pos=0x00; Pos<0x20; Pos++)
-            Streams[Pos].Searching_Payload=false; //Coded slice...
-    }
-
-    //Buffer
-    if (!MustParse_SPS_PPS_Done)
-    {
-        int32u bit_rate_value=0;
-        bool   bit_rate_value_IsValid=true;
-        bool   cbr_flag=false;
-        bool   cbr_flag_IsSet=false;
-        bool   cbr_flag_IsValid=true;
-        for (size_t Pos=0; Pos<NAL.size(); Pos++)
+    for (std::vector<pic_parameter_set_struct*>::iterator pic_parameter_set_Item=pic_parameter_sets.begin(); pic_parameter_set_Item!=pic_parameter_sets.end(); ++pic_parameter_set_Item)
+        if (*pic_parameter_set_Item && (*pic_parameter_set_Item)->seq_parameter_set_id==seq_parameter_set_Item-(seq_parameter_sets.empty()?subset_seq_parameter_sets.begin():seq_parameter_sets.begin()))
         {
-            Fill(Stream_Video, 0, Video_BufferSize, NAL[Pos].cpb_size_value);
-            if (bit_rate_value && bit_rate_value!=NAL[Pos].bit_rate_value)
-                bit_rate_value_IsValid=false;
-            if (bit_rate_value==0)
-                bit_rate_value=NAL[Pos].bit_rate_value;
-            if (cbr_flag_IsSet==true && cbr_flag!=NAL[Pos].cbr_flag)
-                cbr_flag_IsValid=false;
-            if (cbr_flag_IsSet==0)
-            {
-                cbr_flag=NAL[Pos].cbr_flag;
-                cbr_flag_IsSet=true;
-            }
-        }
-        for (size_t Pos=0; Pos<VCL.size(); Pos++)
-        {
-            Fill(Stream_Video, 0, Video_BufferSize, VCL[Pos].cpb_size_value);
-            if (bit_rate_value && bit_rate_value!=VCL[Pos].bit_rate_value)
-                bit_rate_value_IsValid=false;
-            if (bit_rate_value==0)
-                bit_rate_value=VCL[Pos].bit_rate_value;
-            if (cbr_flag_IsSet==true && cbr_flag!=VCL[Pos].cbr_flag)
-                cbr_flag_IsValid=false;
-            if (cbr_flag_IsSet==0)
+            if ((*pic_parameter_set_Item)->entropy_coding_mode_flag)
             {
-                cbr_flag=VCL[Pos].cbr_flag;
-                cbr_flag_IsSet=true;
+                Fill(Stream_Video, 0, Video_Format_Settings, "CABAC");
+                Fill(Stream_Video, 0, Video_Format_Settings_CABAC, "Yes");
+                Fill(Stream_Video, 0, Video_Codec_Settings, "CABAC");
+                Fill(Stream_Video, 0, Video_Codec_Settings_CABAC, "Yes");
             }
+            else
+            {
+                Fill(Stream_Video, 0, Video_Format_Settings_CABAC, "No");
+                Fill(Stream_Video, 0, Video_Codec_Settings_CABAC, "No");
+            }
+            break; //TODO: currently, testing only the first pic_parameter_set
         }
-        if (cbr_flag_IsSet && cbr_flag_IsValid)
-        {
-            Fill(Stream_Video, 0, Video_BitRate_Mode, cbr_flag?"CBR":"VBR");
-            if (bit_rate_value && bit_rate_value_IsValid)
-                Fill(Stream_Video, 0, cbr_flag?Video_BitRate_Nominal:Video_BitRate_Maximum, bit_rate_value);
-        }
+    if ((*seq_parameter_set_Item)->max_num_ref_frames>0)
+    {
+        Fill(Stream_Video, 0, Video_Format_Settings, Ztring::ToZtring((*seq_parameter_set_Item)->max_num_ref_frames)+__T(" Ref Frames"));
+        Fill(Stream_Video, 0, Video_Codec_Settings, Ztring::ToZtring((*seq_parameter_set_Item)->max_num_ref_frames)+__T(" Ref Frames"));
+        Fill(Stream_Video, 0, Video_Format_Settings_RefFrames, (*seq_parameter_set_Item)->max_num_ref_frames);
+        Fill(Stream_Video, 0, Video_Codec_Settings_RefFrames, (*seq_parameter_set_Item)->max_num_ref_frames);
     }
+    Fill(Stream_Video, 0, Video_ColorSpace, "YUV");
+    Fill(Stream_Video, 0, Video_Colorimetry, Avc_Colorimetry_format_idc[(*seq_parameter_set_Item)->chroma_format_idc]);
+    if ((*seq_parameter_set_Item)->bit_depth_luma_minus8==(*seq_parameter_set_Item)->bit_depth_chroma_minus8)
+        Fill(Stream_Video, 0, Video_BitDepth, (*seq_parameter_set_Item)->bit_depth_luma_minus8+8);
+}
+
+//---------------------------------------------------------------------------
+void File_Avc::Streams_Fill_subset(std::vector<seq_parameter_set_struct*>::iterator seq_parameter_set_Item)
+{
+    Ztring Profile=Ztring().From_Local(Avc_profile_idc((*seq_parameter_set_Item)->profile_idc))+__T("@L")+Ztring().From_Number(((float)(*seq_parameter_set_Item)->level_idc)/10, 1);
+    Ztring Profile_Base=Retrieve(Stream_Video, 0, Video_Format_Profile);
+    Fill(Stream_Video, 0, Video_Format_Profile, Profile, true);
+    if (!Profile_Base.empty())
+        Fill(Stream_Video, 0, Video_Format_Profile, Profile_Base);
 }
 
 //---------------------------------------------------------------------------
 void File_Avc::Streams_Finish()
 {
+    if (PTS_End!=(int64u)-1 && (IsSub || File_Offset+Buffer_Offset+Element_Size==File_Size))
+    {
+        if (PTS_End>PTS_Begin)
+            Fill(Stream_Video, 0, Video_Duration, float64_int64s(((float64)(PTS_End-PTS_Begin))/1000000));
+    }
+
     //GA94 captions
-    for (size_t Pos=0; Pos<GA94_03_CC_Parsers.size(); Pos++)
-        if (GA94_03_CC_Parsers[Pos] && GA94_03_CC_Parsers[Pos]->Status[IsAccepted])
+    #if defined(MEDIAINFO_DTVCCTRANSPORT_YES)
+        if (GA94_03_Parser && GA94_03_Parser->Status[IsAccepted])
         {
-            Finish(GA94_03_CC_Parsers[Pos]);
-            Merge(*GA94_03_CC_Parsers[Pos]);
-            if (Pos<2)
-                Fill(Stream_Text, StreamPos_Last, Text_ID, _T("608-")+Ztring::ToZtring(Pos));
-            Fill(Stream_Text, StreamPos_Last, "MuxingMode", _T("EIA-708"));
+            Finish(GA94_03_Parser);
+            Merge(*GA94_03_Parser);
+
+            for (size_t Pos=0; Pos<Count_Get(Stream_Text); Pos++)
+            {
+                Ztring MuxingMode=Retrieve(Stream_Text, Pos, "MuxingMode");
+                Fill(Stream_Text, Pos, "MuxingMode", __T("SCTE 128 / ")+MuxingMode, true);
+            }
         }
+    #endif //defined(MEDIAINFO_DTVCCTRANSPORT_YES)
 
-    //Purge what is not needed anymore
-    if (!File_Name.empty()) //Only if this is not a buffer, with buffer we can have more data
-        Streams.clear();
+    #if MEDIAINFO_IBI
+        if (seq_parameter_sets.size()==1 && (*seq_parameter_sets.begin())->vui_parameters && (*seq_parameter_sets.begin())->vui_parameters->timing_info_present_flag && (*seq_parameter_sets.begin())->vui_parameters->fixed_frame_rate_flag)
+            Ibi_Stream_Finish((*seq_parameter_sets.begin())->vui_parameters->time_scale, (*seq_parameter_sets.begin())->vui_parameters->num_units_in_tick);
+    #endif //MEDIAINFO_IBI
 }
 
 //***************************************************************************
@@ -651,7 +630,7 @@
     if (!MustSynchronize)
     {
         Synched_Init();
-        Buffer_TotalBytes_FirstSynched+=0;
+        Buffer_TotalBytes_FirstSynched=0;
         File_Offset_FirstSynched=File_Offset;
     }
 
@@ -664,107 +643,245 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
-bool File_Avc::Synched_Test()
+bool File_Avc::Synchronize()
 {
-    //Trailing 0x00
-    while(Buffer_Offset+3<=Buffer_Size && Buffer[Buffer_Offset]==0x00 && CC3(Buffer+Buffer_Offset)!=0x000001)
+    //Synchronizing
+    while(Buffer_Offset+4<=Buffer_Size && (Buffer[Buffer_Offset  ]!=0x00
+                                        || Buffer[Buffer_Offset+1]!=0x00
+                                        || Buffer[Buffer_Offset+2]!=0x01))
+    {
+        Buffer_Offset+=2;
+        while(Buffer_Offset<Buffer_Size && Buffer[Buffer_Offset]!=0x00)
+            Buffer_Offset+=2;
+        if (Buffer_Offset>=Buffer_Size || Buffer[Buffer_Offset-1]==0x00)
+            Buffer_Offset--;
+    }
+    if (Buffer_Offset && Buffer[Buffer_Offset-1]==0x00)
+        Buffer_Offset--;
+
+    //Parsing last bytes if needed
+    if (Buffer_Offset+4==Buffer_Size && (Buffer[Buffer_Offset  ]!=0x00
+                                      || Buffer[Buffer_Offset+1]!=0x00
+                                      || Buffer[Buffer_Offset+2]!=0x00
+                                      || Buffer[Buffer_Offset+3]!=0x01))
+        Buffer_Offset++;
+    if (Buffer_Offset+3==Buffer_Size && (Buffer[Buffer_Offset  ]!=0x00
+                                      || Buffer[Buffer_Offset+1]!=0x00
+                                      || Buffer[Buffer_Offset+2]!=0x01))
         Buffer_Offset++;
+    if (Buffer_Offset+2==Buffer_Size && (Buffer[Buffer_Offset  ]!=0x00
+                                      || Buffer[Buffer_Offset+1]!=0x00))
+        Buffer_Offset++;
+    if (Buffer_Offset+1==Buffer_Size &&  Buffer[Buffer_Offset  ]!=0x00)
+        Buffer_Offset++;
+
+    if (Buffer_Offset+4>Buffer_Size)
+        return false;
 
+    //Synched is OK
+    Synched=true;
+    return true;
+}
+
+//---------------------------------------------------------------------------
+bool File_Avc::Synched_Test()
+{
     //Must have enough buffer for having header
-    if (Buffer_Offset+3>Buffer_Size)
+    if (Buffer_Offset+6>Buffer_Size)
         return false;
 
     //Quick test of synchro
-    if (CC3(Buffer+Buffer_Offset)!=0x000001)
+    if (CC3(Buffer+Buffer_Offset)!=0x000001 && CC4(Buffer+Buffer_Offset)!=0x00000001)
+    {
         Synched=false;
+        return true;
+    }
 
     //Quick search
     if (Synched && !Header_Parser_QuickSearch())
         return false;
 
+    #if MEDIAINFO_IBI
+        bool zero_byte=Buffer[Buffer_Offset+2]==0x00;
+        bool RandomAccess=(Buffer[Buffer_Offset+(zero_byte?4:3)]&0x1F)==0x07 || ((Buffer[Buffer_Offset+(zero_byte?4:3)]&0x1F)==0x09 && ((Buffer[Buffer_Offset+(zero_byte?5:4)]&0xE0)==0x00 || (Buffer[Buffer_Offset+(zero_byte?5:4)]&0xE0)==0xA0)); //seq_parameter_set or access_unit_delimiter with value=0 or 5 (3 bits)
+        if (RandomAccess)
+            Ibi_Add();
+    #endif //MEDIAINFO_IBI
+
     //We continue
     return true;
 }
 
+//***************************************************************************
+// Buffer - Demux
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_DEMUX
+bool File_Avc::Demux_UnpacketizeContainer_Test()
+{
+    bool zero_byte=Buffer[Buffer_Offset+2]==0x00;
+    if (!(((Buffer[Buffer_Offset+(zero_byte?4:3)]&0x1B)==0x01 && (Buffer[Buffer_Offset+(zero_byte?5:4)]&0x80)!=0x80)
+       || (Buffer[Buffer_Offset+(zero_byte?4:3)]&0x1F)==0x0C))
+    {
+        if (Demux_Offset==0)
+        {
+            Demux_Offset=Buffer_Offset;
+            Demux_IntermediateItemFound=false;
+        }
+        while (Demux_Offset+6<=Buffer_Size)
+        {
+            //Synchronizing
+            while(Demux_Offset+6<=Buffer_Size && (Buffer[Demux_Offset  ]!=0x00
+                                               || Buffer[Demux_Offset+1]!=0x00
+                                               || Buffer[Demux_Offset+2]!=0x01))
+            {
+                Demux_Offset+=2;
+                while(Demux_Offset<Buffer_Size && Buffer[Buffer_Offset]!=0x00)
+                    Demux_Offset+=2;
+                if (Demux_Offset>=Buffer_Size || Buffer[Demux_Offset-1]==0x00)
+                    Demux_Offset--;
+            }
+
+            if (Demux_Offset+6<=Buffer_Size)
+            {
+                zero_byte=Buffer[Demux_Offset+2]==0x00;
+                if (Demux_IntermediateItemFound)
+                {
+                    if (!(((Buffer[Demux_Offset+(zero_byte?4:3)]&0x1B)==0x01 && (Buffer[Demux_Offset+(zero_byte?5:4)]&0x80)!=0x80)
+                       || (Buffer[Demux_Offset+(zero_byte?4:3)]&0x1F)==0x0C))
+                        break;
+                }
+                else
+                {
+                    if ((Buffer[Demux_Offset+(zero_byte?4:3)]&0x1B)==0x01 && (Buffer[Demux_Offset+(zero_byte?5:4)]&0x80)==0x80)
+                        Demux_IntermediateItemFound=true;
+                }
+
+                Demux_Offset++;
+            }
+        }
+
+        if (Demux_Offset+6>Buffer_Size && !FrameIsAlwaysComplete && File_Offset+Buffer_Size<File_Size)
+            return false; //No complete frame
+
+        if (Demux_Offset && Buffer[Demux_Offset-1]==0x00)
+            Demux_Offset--;
+
+        zero_byte=Buffer[Buffer_Offset+2]==0x00;
+        size_t Buffer_Offset_Random=Buffer_Offset;
+        if ((Buffer[Buffer_Offset_Random+(zero_byte?4:3)]&0x1F)==0x09)
+        {
+            Buffer_Offset_Random++;
+            if (zero_byte)
+                Buffer_Offset_Random++;
+            while(Buffer_Offset_Random+6<=Buffer_Size && (Buffer[Buffer_Offset_Random  ]!=0x00
+                                                       || Buffer[Buffer_Offset_Random+1]!=0x00
+                                                       || Buffer[Buffer_Offset_Random+2]!=0x01))
+                Buffer_Offset_Random++;
+            zero_byte=Buffer[Buffer_Offset_Random+2]==0x00;
+        }
+        bool RandomAccess=Buffer_Offset_Random+6<=Buffer_Size && (Buffer[Buffer_Offset_Random+(zero_byte?4:3)]&0x1F)==0x07; //seq_parameter_set
+        if (!Status[IsAccepted])
+        {
+            Accept("AVC");
+            if (Config->Demux_EventWasSent)
+                return false;
+        }
+
+        if (IFrame_Count || RandomAccess)
+        {
+            bool Frame_Count_NotParsedIncluded_PlusOne=false;
+            int64u PTS_Temp=FrameInfo.PTS;
+            if (!IsSub)
+                FrameInfo.PTS=(int64u)-1;
+            if (Frame_Count_NotParsedIncluded!=(int64u)-1 && Interlaced_Top!=Interlaced_Bottom)
+            {
+                Frame_Count_NotParsedIncluded--;
+                Frame_Count_NotParsedIncluded_PlusOne=true;
+            }
+            Demux_UnpacketizeContainer_Demux(RandomAccess);
+            if (!IsSub)
+                FrameInfo.PTS=PTS_Temp;
+            if (Frame_Count_NotParsedIncluded_PlusOne)
+                Frame_Count_NotParsedIncluded++;
+        }
+        else
+            Demux_UnpacketizeContainer_Demux_Clear();
+    }
+
+    return true;
+}
+#endif //MEDIAINFO_DEMUX
+
 //---------------------------------------------------------------------------
 void File_Avc::Synched_Init()
 {
+    //FrameInfo
+    PTS_End=0;
+    if (FrameInfo.DTS==(int64u)-1)
+        FrameInfo.DTS=0; //No DTS in container
+    DTS_Begin=FrameInfo.DTS;
+    DTS_End=FrameInfo.DTS;
+
+    //Temporal references
+    TemporalReferences_DelayedElement=NULL;
+    TemporalReferences_Min=0;
+    TemporalReferences_Max=0;
+    TemporalReferences_Reserved=0;
+    TemporalReferences_Offset=0;
+    TemporalReferences_Offset_pic_order_cnt_lsb_Last=0;
+    TemporalReferences_pic_order_cnt_Min=0;
+
+    //Text
+    #if defined(MEDIAINFO_DTVCCTRANSPORT_YES)
+        GA94_03_IsPresent=false;
+    #endif //defined(MEDIAINFO_DTVCCTRANSPORT_YES)
+
+    //File specific
+    SizeOfNALU_Minus1=(int8u)-1;
+
+    //Status
+    IFrame_Count=0;
+    prevPicOrderCntMsb=0;
+    prevPicOrderCntLsb=(int32u)-1;
+    prevTopFieldOrderCnt=(int32u)-1;
+    prevFrameNum=(int32u)-1;
+    prevFrameNumOffset=(int32u)-1;
+
     //Count of a Packets
-    Frame_Count=0;
     Block_Count=0;
-    pic_order_cnt_lsb_Old=(int32u)-1;
     Interlaced_Top=0;
     Interlaced_Bottom=0;
     Structure_Field=0;
     Structure_Frame=0;
+
+    //Temp
     FrameRate_Divider=1;
-    TemporalReference_Offset=0;
-    TemporalReference_Offset_Moved=false;
-    TemporalReference_GA94_03_CC_Offset=0;
-    TemporalReference_Offset_pic_order_cnt_lsb_Last=(size_t)-1;
-
-    //From seq_parameter_set
-    pic_width_in_mbs_minus1=0;
-    pic_height_in_map_units_minus1=0;
-    log2_max_frame_num_minus4=0;
-    log2_max_pic_order_cnt_lsb_minus4=0;
-    num_units_in_tick=0;
-    time_scale=0;
-    chroma_format_idc=1;
-    frame_crop_left_offset=0;
-    frame_crop_right_offset=0;
-    frame_crop_top_offset=0;
-    frame_crop_bottom_offset=0;
-    max_num_ref_frames=0;
-    pic_order_cnt_type=0;
-    pic_order_cnt_lsb_Last=(int32u)-1;
-    bit_depth_luma_minus8=0;
-    bit_depth_chroma_minus8=0;
-    pic_order_cnt_lsb=(int32u)-1;
-    cpb_cnt_minus1=0;
-    initial_cpb_removal_delay=0;
-    initial_cpb_removal_delay_offset=0;
-    cpb_removal_delay=0;
-    sar_width=0;
-    sar_height=0;
-    profile_idc=0;
-    level_idc=0;
-    aspect_ratio_idc=0xFF;
-    video_format=5;
-    initial_cpb_removal_delay_length_minus1=0;
-    cpb_removal_delay_length_minus1=0;
-    dpb_output_delay_length_minus1=0;
-    time_offset_length=0;
-    pic_struct=0;
-    pic_struct_FirstDetected=(int8u)-1;
-    colour_primaries=2;
-    transfer_characteristics=2;
-    matrix_coefficients=2;
-    GA94_03_CC_IsPresent=false;
-    frame_mbs_only_flag=false;
-    timing_info_present_flag=false;
-    pic_struct_present_flag=false;
-    field_pic_flag=false;
-    entropy_coding_mode_flag=false;
-    NalHrdBpPresentFlag=false;
-    VclHrdBpPresentFlag=false;
-    CpbDpbDelaysPresentFlag=false;
-    mb_adaptive_frame_field_flag=false;
-    pic_order_present_flag=false;
-    field_pic_flag_AlreadyDetected=false;
+    FirstPFrameInGop_IsParsed=false;
+    tc=0;
 
     //Default values
     Streams.resize(0x100);
     Streams[0x06].Searching_Payload=true; //sei
     Streams[0x07].Searching_Payload=true; //seq_parameter_set
     Streams[0x09].Searching_Payload=true; //access_unit_delimiter
-    Streams[0x0C].Searching_Payload=true; //filler_data
     Streams[0x0F].Searching_Payload=true; //subset_seq_parameter_set
     for (int8u Pos=0xFF; Pos>=0xB9; Pos--)
         Streams[Pos].Searching_Payload=true; //Testing MPEG-PS
 
     //Options
     Option_Manage();
+
+    //Specific cases
+    #if MEDIAINFO_EVENTS
+        if (Config->ParseUndecodableFrames_Get())
+        {
+            Accept(); //In some case, we must accept the stream very quickly and before the sequence header is detected
+            Streams[0x01].Searching_Payload=true; //slice_header
+            Streams[0x05].Searching_Payload=true; //slice_header
+        }
+    #endif //MEDIAINFO_EVENTS
 }
 
 //***************************************************************************
@@ -774,11 +891,53 @@
 //---------------------------------------------------------------------------
 void File_Avc::Read_Buffer_Unsynched()
 {
-    TemporalReference.clear();
-    TemporalReference_Offset=0;
-    TemporalReference_Offset_Moved=false;
-    TemporalReference_GA94_03_CC_Offset=0;
-    TemporalReference_Offset_pic_order_cnt_lsb_Last=(size_t)-1;
+    //Temporal references
+    for (size_t Pos=0; Pos<TemporalReferences.size(); Pos++)
+        delete TemporalReferences[Pos]; //TemporalReferences[Pos]=NULL;
+    TemporalReferences.clear();
+    delete TemporalReferences_DelayedElement; TemporalReferences_DelayedElement=NULL;
+    TemporalReferences_Min=0;
+    TemporalReferences_Max=0;
+    TemporalReferences_Reserved=0;
+    TemporalReferences_Offset=0;
+    TemporalReferences_Offset_pic_order_cnt_lsb_Last=0;
+    TemporalReferences_pic_order_cnt_Min=0;
+
+    //Text
+    #if defined(MEDIAINFO_DTVCCTRANSPORT_YES)
+        if (GA94_03_Parser)
+            GA94_03_Parser->Open_Buffer_Unsynch();
+    #endif //defined(MEDIAINFO_DTVCCTRANSPORT_YES)
+
+    //parameter_sets
+    for (std::vector<seq_parameter_set_struct*>::iterator seq_parameter_set_Item=seq_parameter_sets.begin(); seq_parameter_set_Item!=seq_parameter_sets.end(); ++seq_parameter_set_Item)
+        if ((*seq_parameter_set_Item))
+            (*seq_parameter_set_Item)->IsSynched=false;
+    for (std::vector<seq_parameter_set_struct*>::iterator subset_seq_parameter_set_Item=subset_seq_parameter_sets.begin(); subset_seq_parameter_set_Item!=subset_seq_parameter_sets.end(); ++subset_seq_parameter_set_Item)
+        if ((*subset_seq_parameter_set_Item))
+            (*subset_seq_parameter_set_Item)->IsSynched=false;
+    for (std::vector<pic_parameter_set_struct*>::iterator pic_parameter_set_Item=pic_parameter_sets.begin(); pic_parameter_set_Item!=pic_parameter_sets.end(); ++pic_parameter_set_Item)
+        if ((*pic_parameter_set_Item))
+            (*pic_parameter_set_Item)->IsSynched=false;
+
+    //Status
+    IFrame_Count=0;
+    Interlaced_Top=0;
+    Interlaced_Bottom=0;
+    prevPicOrderCntMsb=0;
+    prevPicOrderCntLsb=(int32u)-1;
+    prevTopFieldOrderCnt=(int32u)-1;
+    prevFrameNum=(int32u)-1;
+    prevFrameNumOffset=(int32u)-1;
+
+    //Temp
+    FrameRate_Divider=1;
+    FirstPFrameInGop_IsParsed=false;
+    tc=0;
+
+    //Impossible to know TimeStamps now
+    PTS_End=0;
+    DTS_End=0;
 }
 
 //***************************************************************************
@@ -797,12 +956,15 @@
     }
 
     //Parsing
+    int8u nal_unit_type;
     if (!SizedBlocks)
     {
-        Skip_B3(                                                "sync");
+        if (Buffer[Buffer_Offset+2]==0x00)
+            Skip_B1(                                            "zero_byte");
+        Skip_B3(                                                "start_code_prefix_one_3bytes");
         BS_Begin();
         Mark_0 ();
-        Skip_S1( 2,                                             "nal_ref_idc");
+        Get_S1 ( 2, nal_ref_idc,                                "nal_ref_idc");
         Get_S1 ( 5, nal_unit_type,                              "nal_unit_type");
         BS_End();
         if (!Header_Parser_Fill_Size())
@@ -841,7 +1003,7 @@
         }
         BS_Begin();
         Mark_0 ();
-        Skip_S1( 2,                                             "nal_ref_idc");
+        Get_S1 ( 2, nal_ref_idc,                                "nal_ref_idc");
         Get_S1 ( 5, nal_unit_type,                              "nal_unit_type");
         BS_End();
 
@@ -850,7 +1012,12 @@
     }
 
     //Filling
-    Header_Fill_Code(nal_unit_type, Ztring().From_CC1(nal_unit_type));
+    #if MEDIAINFO_TRACE
+        if (Trace_Activated)
+            Header_Fill_Code(nal_unit_type, Ztring().From_CC1(nal_unit_type));
+        else
+    #endif //MEDIAINFO_TRACE
+            Header_Fill_Code(nal_unit_type);
 }
 
 //---------------------------------------------------------------------------
@@ -859,40 +1026,27 @@
     //Look for next Sync word
     if (Buffer_Offset_Temp==0) //Buffer_Offset_Temp is not 0 if Header_Parse_Fill_Size() has already parsed first frames
         Buffer_Offset_Temp=Buffer_Offset+4;
-    while (Buffer_Offset_Temp+4<=Buffer_Size
+    while (Buffer_Offset_Temp+5<=Buffer_Size
         && CC3(Buffer+Buffer_Offset_Temp)!=0x000001)
     {
         Buffer_Offset_Temp+=2;
         while(Buffer_Offset_Temp<Buffer_Size && Buffer[Buffer_Offset_Temp]!=0x00)
             Buffer_Offset_Temp+=2;
-        if (Buffer_Offset_Temp<Buffer_Size && Buffer[Buffer_Offset_Temp-1]==0x00 || Buffer_Offset_Temp>=Buffer_Size)
+        if (Buffer_Offset_Temp>=Buffer_Size || Buffer[Buffer_Offset_Temp-1]==0x00)
             Buffer_Offset_Temp--;
-
-        if (nal_unit_type==0x01 || nal_unit_type==0x05) //slice, we need only few bytes
-        {
-            if (Buffer_Offset_Temp-Buffer_Offset>20)
-            {
-                //OK, we continue, we have enough for a slice
-                Header_Fill_Size(16);
-                Buffer_Offset_Temp=0;
-                return true;
-            }
-        }
     }
 
     //Must wait more data?
-    if (Buffer_Offset_Temp+4>Buffer_Size)
+    if (Buffer_Offset_Temp+5>Buffer_Size)
     {
-        if (FrameIsAlwaysComplete || File_Offset+Buffer_Size==File_Size)
+        if (FrameIsAlwaysComplete || File_Offset+Buffer_Size>=File_Size)
             Buffer_Offset_Temp=Buffer_Size; //We are sure that the next bytes are a start
         else
             return false;
     }
 
-    //Keeping out trailing zeroes
-    if (Buffer_Offset_Temp+3<=Buffer_Size)
-        while (CC3(Buffer+Buffer_Offset_Temp-1)==0x000000)
-            Buffer_Offset_Temp--;
+    if (Buffer[Buffer_Offset_Temp-1]==0x00)
+        Buffer_Offset_Temp--;
 
     //OK, we continue
     Header_Fill_Size(Buffer_Offset_Temp-Buffer_Offset);
@@ -903,13 +1057,18 @@
 //---------------------------------------------------------------------------
 bool File_Avc::Header_Parser_QuickSearch()
 {
-    while (       Buffer_Offset+4<=Buffer_Size
+    while (       Buffer_Offset+6<=Buffer_Size
       &&   Buffer[Buffer_Offset  ]==0x00
       &&   Buffer[Buffer_Offset+1]==0x00
-      &&   Buffer[Buffer_Offset+2]==0x01)
+      &&  (Buffer[Buffer_Offset+2]==0x01
+        || (Buffer[Buffer_Offset+2]==0x00 && Buffer[Buffer_Offset+3]==0x01)))
     {
         //Getting start_code
-        int8u start_code=CC1(Buffer+Buffer_Offset+3)&0x1F;
+        int8u start_code;
+        if (Buffer[Buffer_Offset+2]==0x00)
+            start_code=CC1(Buffer+Buffer_Offset+4)&0x1F;
+        else
+            start_code=CC1(Buffer+Buffer_Offset+3)&0x1F;
 
         //Searching start33
         if (Streams[start_code].Searching_Payload
@@ -919,12 +1078,13 @@
         //Synchronizing
         Buffer_Offset+=4;
         Synched=false;
-        if (!Synchronize_0x000001())
+        if (!Synchronize())
+            return false;
+
+        if (Buffer_Offset+6>Buffer_Size)
             return false;
     }
 
-    if (Buffer_Offset+3==Buffer_Size)
-        return false; //Sync is OK, but start_code is not available
     Trusted_IsNot("AVC, Synchronisation lost");
     return Synchronize();
 }
@@ -939,7 +1099,16 @@
         return;
     }
 
+    //Trailing zeroes
+    int64u Element_Size_SaveBeforeZeroes=Element_Size;
+    if (Element_Size)
+    {
+        while (Element_Size && Buffer[Buffer_Offset+(size_t)Element_Size-1]==0)
+            Element_Size--;
+    }
+
     //svc_extension
+    bool svc_extension_flag=false;
     if (Element_Code==0x0E || Element_Code==0x14)
     {
         BS_Begin();
@@ -966,7 +1135,7 @@
         Element_Offset_3Bytes+=2;
         while(Element_Offset_3Bytes<Element_Size && Buffer[Buffer_Offset+(size_t)Element_Offset_3Bytes]!=0x00)
             Element_Offset_3Bytes+=2;
-        if (Element_Offset_3Bytes<Element_Size && Buffer[Buffer_Offset+(size_t)Element_Offset_3Bytes-1]==0x00 || Element_Offset_3Bytes>=Element_Size)
+        if (Element_Offset_3Bytes>=Element_Size || Buffer[Buffer_Offset+(size_t)Element_Offset_3Bytes-1]==0x00)
             Element_Offset_3Bytes--;
     }
 
@@ -1006,10 +1175,10 @@
         case 0x0B : Element_Name("end_of_stream"); Skip_XX(Element_Size-Element_Offset, "Data"); break;
         case 0x0C : filler_data(); break;
         case 0x0D : Element_Name("seq_parameter_set_extension"); Skip_XX(Element_Size-Element_Offset, "Data"); break;
-        case 0x0E : prefix_nal_unit(); break;
+        case 0x0E : prefix_nal_unit(svc_extension_flag); break;
         case 0x0F : subset_seq_parameter_set(); break;
         case 0x13 : Element_Name("slice_layer_without_partitioning"); Skip_XX(Element_Size-Element_Offset, "Data"); break;
-        case 0x14 : slice_layer_extension(); break;
+        case 0x14 : slice_layer_extension(svc_extension_flag); break;
         default :
             if (Element_Code<0x18)
                 Element_Name("reserved");
@@ -1030,8 +1199,13 @@
     }
 
     //Duplicate
-    if (!Streams.empty() && Streams[(size_t)Element_Code].ShouldDuplicate)
-        File__Duplicate_Write(Element_Code);
+    #if MEDIAINFO_DUPLICATE
+        if (!Streams.empty() && Streams[(size_t)Element_Code].ShouldDuplicate)
+            File__Duplicate_Write(Element_Code);
+    #endif //MEDIAINFO_DUPLICATE
+
+    //Trailing zeroes
+    Element_Size=Element_Size_SaveBeforeZeroes;
 }
 
 //***************************************************************************
@@ -1068,16 +1242,88 @@
 //
 void File_Avc::slice_header()
 {
+    //Encryption management
+    if (CA_system_ID_MustSkipSlices)
+    {
+        //Is not decodable
+        Finish("AVC");
+        return;
+    }
+
     //Parsing
-    pic_order_cnt_lsb=(int32u)-1;
-    int32u first_mb_in_slice, slice_type, frame_num;
-    bool   bottom_field_flag=0;
+    int32u  slice_type, pic_order_cnt_lsb=(int32u)-1;
+    int32u  first_mb_in_slice, pic_parameter_set_id, frame_num, num_ref_idx_l0_active_minus1, num_ref_idx_l1_active_minus1;
+    int32s  delta_pic_order_cnt_bottom=0;
+    bool    field_pic_flag=false, bottom_field_flag=false;
     BS_Begin();
     Get_UE (first_mb_in_slice,                                  "first_mb_in_slice");
-    Get_UE (slice_type,                                         "slice_type"); if (slice_type<9) {Param_Info(Avc_slice_type[slice_type]);Element_Info(Avc_slice_type[slice_type]);}
-    Skip_UE(                                                    "pic_parameter_set_id");
-    Get_BS (log2_max_frame_num_minus4+4, frame_num,             "frame_num");
-    if (!frame_mbs_only_flag)
+    Get_UE (slice_type,                                         "slice_type"); Param_Info1C((slice_type<10), Avc_slice_type[slice_type]);
+    #if MEDIAINFO_EVENTS
+        {
+            struct MediaInfo_Event_Video_SliceInfo_0 Event;
+            Event.EventCode=MediaInfo_EventCode_Create(MediaInfo_Parser_None, MediaInfo_Event_Video_SliceInfo, 0);
+            Event.Stream_Offset=File_Offset+Buffer_Offset;
+            Event.PCR=FrameInfo.PCR;
+            Event.PTS=FrameInfo.PTS;
+            Event.DTS=FrameInfo.DTS;
+            Event.DUR=FrameInfo.DUR;
+            Event.StreamIDs_Size=StreamIDs_Size;
+            Event.StreamIDs=(MediaInfo_int64u*)StreamIDs;
+            Event.StreamIDs_Width=(MediaInfo_int8u*)StreamIDs_Width;
+            Event.ParserIDs=(MediaInfo_int8u* )ParserIDs;
+            Event.FramePosition=Frame_Count;
+            Event.FieldPosition=Field_Count;
+            Event.SlicePosition=Element_IsOK()?first_mb_in_slice:(int64u)-1;
+            switch (slice_type)
+            {
+                case 0 :
+                case 3 :
+                case 5 :
+                case 8 :
+                            Event.SliceType=1; break;
+                case 1 :
+                case 6 :
+                            Event.SliceType=2; break;
+                case 2 :
+                case 4 :
+                case 7 :
+                case 9 :
+                            Event.SliceType=0; break;
+                default:
+                            Event.SliceType=(int8u)-1;
+            }
+            Event.Flags=0;
+            Config->Event_Send((const int8u*)&Event, sizeof(MediaInfo_Event_Video_SliceInfo_0));
+        }
+    #endif //MEDIAINFO_EVENTS
+    if (slice_type>=10)
+    {
+        BS_End();
+        Skip_XX(Element_Size-Element_Offset,                    "Data");
+        return;
+    }
+    Get_UE (pic_parameter_set_id,                               "pic_parameter_set_id");
+    std::vector<pic_parameter_set_struct*>::iterator pic_parameter_set_Item;
+    if (pic_parameter_set_id>=pic_parameter_sets.size() || (*(pic_parameter_set_Item=pic_parameter_sets.begin()+pic_parameter_set_id))==NULL || !(*pic_parameter_set_Item)->IsSynched)
+    {
+        //Not yet present
+        Skip_BS(Data_BS_Remain(),                               "Data (pic_parameter_set is missing)");
+        return;
+    }
+    std::vector<seq_parameter_set_struct*>::iterator seq_parameter_set_Item;
+    if ((*pic_parameter_set_Item)->seq_parameter_set_id>=seq_parameter_sets.size() || (*(seq_parameter_set_Item=seq_parameter_sets.begin()+(*pic_parameter_set_Item)->seq_parameter_set_id))==NULL || !(*seq_parameter_set_Item)->IsSynched)
+    {
+        if ((*pic_parameter_set_Item)->seq_parameter_set_id>=subset_seq_parameter_sets.size() || (*(seq_parameter_set_Item=subset_seq_parameter_sets.begin()+(*pic_parameter_set_Item)->seq_parameter_set_id))==NULL || !(*seq_parameter_set_Item)->IsSynched)
+        {
+            //Not yet present
+            Skip_BS(Data_BS_Remain(),                           "Data (seq_parameter_set is missing)");
+            return;
+        }
+    }
+    num_ref_idx_l0_active_minus1=(*pic_parameter_set_Item)->num_ref_idx_l0_default_active_minus1; //Default
+    num_ref_idx_l1_active_minus1=(*pic_parameter_set_Item)->num_ref_idx_l1_default_active_minus1; //Default
+    Get_BS ((*seq_parameter_set_Item)->log2_max_frame_num_minus4+4, frame_num, "frame_num");
+    if (!(*seq_parameter_set_Item)->frame_mbs_only_flag)
     {
         TEST_SB_GET(field_pic_flag,                             "field_pic_flag");
             Get_SB (bottom_field_flag,                          "bottom_field_flag");
@@ -1085,27 +1331,68 @@
     }
     if (Element_Code==5)
         Skip_UE(                                                "idr_pic_id");
-    if (pic_order_cnt_type==0)
+    if ((*seq_parameter_set_Item)->pic_order_cnt_type==0)
     {
-        Get_BS (log2_max_pic_order_cnt_lsb_minus4+4, pic_order_cnt_lsb, "pic_order_cnt_lsb"); Element_Info(pic_order_cnt_lsb);
-        if (pic_order_present_flag && !field_pic_flag)
-            Skip_SE(                                            "delta_pic_order_cnt_bottom");
+        Get_BS ((*seq_parameter_set_Item)->log2_max_pic_order_cnt_lsb_minus4+4, pic_order_cnt_lsb, "pic_order_cnt_lsb");
+        if ((*pic_parameter_set_Item)->bottom_field_pic_order_in_frame_present_flag && !field_pic_flag)
+            Get_SE (delta_pic_order_cnt_bottom,                 "delta_pic_order_cnt_bottom");
+    }
+    if ((*seq_parameter_set_Item)->pic_order_cnt_type==1 && !(*seq_parameter_set_Item)->delta_pic_order_always_zero_flag )
+    {
+        Skip_SE(                                                "delta_pic_order_cnt[0]");
+        if((*pic_parameter_set_Item)->bottom_field_pic_order_in_frame_present_flag && !field_pic_flag)
+            Skip_SE(                                            "delta_pic_order_cnt[1]");
+    }
+    if((*pic_parameter_set_Item)->redundant_pic_cnt_present_flag)
+        Skip_UE(                                                "redundant_pic_cnt");
+    if (slice_type==1 || slice_type==6) //B-Frame
+        Skip_SB(                                                "direct_spatial_mv_pred_flag");
+    switch (slice_type)
+    {
+        case 0 : //P-Frame
+        case 1 : //B-Frame
+        case 3 : //SP-Frame
+        case 5 : //P-Frame
+        case 6 : //B-Frame
+        case 8 : //SP-Frame
+                    TEST_SB_SKIP(                               "num_ref_idx_active_override_flag");
+                        Get_UE (num_ref_idx_l0_active_minus1,   "num_ref_idx_l0_active_minus1");
+                        switch (slice_type)
+                        {
+                            case 1 : //B-Frame
+                            case 6 : //B-Frame
+                                        Get_UE (num_ref_idx_l1_active_minus1, "num_ref_idx_l1_active_minus1");
+                                        break;
+                            default:    ;
+                        }
+                    TEST_SB_END();
+                    break;
+        default:    ;
     }
+    ref_pic_list_modification(slice_type, Element_Code==20); //nal_unit_type==20 --> ref_pic_list_mvc_modification()
+    if (((*pic_parameter_set_Item)->weighted_pred_flag && (slice_type==0 || slice_type==3 || slice_type==5 || slice_type==8))
+     || ((*pic_parameter_set_Item)->weighted_bipred_idc==1 && (slice_type==1 || slice_type==6)))
+        pred_weight_table(num_ref_idx_l0_active_minus1, num_ref_idx_l1_active_minus1, (*seq_parameter_set_Item)->ChromaArrayType());
+    std::vector<int8u> memory_management_control_operations;
+    if (nal_ref_idc)
+        dec_ref_pic_marking(memory_management_control_operations);
+
     //TODO...
     BS_End();
     Skip_XX(Element_Size-Element_Offset,                        "ToDo...");
-    if (!field_pic_flag)
-        Element_Info("Frame");
-    else
-        Element_Info(bottom_field_flag?"Bottom":"Top");
 
     FILLING_BEGIN_PRECISE();
+        //Count of I-Frames
+        if (first_mb_in_slice==0 && Element_Code!=20 && (slice_type==2 || slice_type==7)) //Not slice_layer_extension, I-Frame
+            IFrame_Count++;
+
         //pic_struct
-        if (field_pic_flag && pic_struct_FirstDetected==(int8u)-1)
-            pic_struct_FirstDetected=bottom_field_flag?2:1; //2=BFF, 1=TFF
+        if (field_pic_flag && (*seq_parameter_set_Item)->pic_struct_FirstDetected==(int8u)-1)
+            (*seq_parameter_set_Item)->pic_struct_FirstDetected=bottom_field_flag?2:1; //2=BFF, 1=TFF
 
         //Saving some info
-        if (pic_order_cnt_type==0)
+        int32s TemporalReferences_Offset_pic_order_cnt_lsb_Diff=0;
+        if ((*seq_parameter_set_Item)->pic_order_cnt_type!=1 && first_mb_in_slice==0 && (Element_Code!=0x14 || seq_parameter_sets.empty())) //Not slice_layer_extension except if MVC only
         {
             if (field_pic_flag)
             {
@@ -1118,96 +1405,467 @@
             else
                 Structure_Frame++;
 
-            // trying to know the order
-            // first  1/4: no change
-            // second 1/4: all is after 0
-            // third  1/4: no change
-            // fourth 1/4: all is before max_frame_num
-            size_t max_frame_num=1<<(log2_max_frame_num_minus4+4)<<1;
-            if (TemporalReference_Offset==0 || (!TemporalReference_Offset_Moved && pic_order_cnt_lsb==max_frame_num*3/4))
-            {
-                TemporalReference_Offset+=max_frame_num;
-                TemporalReference_Offset_Moved=true;
-
-                //Purging the start
-                if (TemporalReference_Offset==2*max_frame_num)
-                {
-                    size_t Pos=0;
-                    for(; Pos<TemporalReference.size(); Pos++)
-                        if (TemporalReference[Pos].IsValid)
+            //Frame order detection
+            int64s pic_order_cnt=0;
+            switch ((*seq_parameter_set_Item)->pic_order_cnt_type)
+            {
+                case 0 :
+                            {
+                            if (Element_Code==5) //IDR
+                            {
+                                prevPicOrderCntMsb=0;
+                                prevPicOrderCntLsb=0;
+                                TemporalReferences_Offset=TemporalReferences_Max;
+                                if (TemporalReferences_Offset%2)
+                                    TemporalReferences_Offset++;
+                                TemporalReferences_pic_order_cnt_Min=0;
+                            }
+                            else
+                            {
+                                bool Has5=false;
+                                for (std::vector<int8u>::iterator Temp=memory_management_control_operations.begin(); Temp!=memory_management_control_operations.end(); ++Temp)
+                                    if ((*Temp)==5)
+                                    {
+                                        Has5=true;
+                                        break;
+                                    }
+                                if (Has5)
+                                {
+                                    prevPicOrderCntMsb=0;
+                                    if (bottom_field_flag)
+                                        prevPicOrderCntLsb=0;
+                                    else
+                                        prevPicOrderCntLsb=prevTopFieldOrderCnt;
+                                }
+                            }
+                            int32s PicOrderCntMsb;
+                            if (prevPicOrderCntLsb==(int32u)-1)
+                            {
+                                PicOrderCntMsb=0;
+                                if ((int32u)(2*((*seq_parameter_set_Item)->max_num_ref_frames+3))<pic_order_cnt_lsb)
+                                    TemporalReferences_Min=pic_order_cnt_lsb-2*((*seq_parameter_set_Item)->max_num_ref_frames+3);
+                            }
+                            else if (pic_order_cnt_lsb<prevPicOrderCntLsb && prevPicOrderCntLsb-pic_order_cnt_lsb>=(*seq_parameter_set_Item)->MaxPicOrderCntLsb/2)
+                                PicOrderCntMsb=prevPicOrderCntMsb+(*seq_parameter_set_Item)->MaxPicOrderCntLsb;
+                            else if (pic_order_cnt_lsb>prevPicOrderCntLsb && pic_order_cnt_lsb-prevPicOrderCntLsb>(*seq_parameter_set_Item)->MaxPicOrderCntLsb/2)
+                                PicOrderCntMsb=prevPicOrderCntMsb-(*seq_parameter_set_Item)->MaxPicOrderCntLsb;
+                            else
+                                PicOrderCntMsb=prevPicOrderCntMsb;
+
+                            int32s TopFieldOrderCnt=PicOrderCntMsb+pic_order_cnt_lsb;
+                            int32s BottomFieldOrderCnt;
+                            if (field_pic_flag)
+                                BottomFieldOrderCnt=TopFieldOrderCnt+delta_pic_order_cnt_bottom;
+                            else
+                                BottomFieldOrderCnt=PicOrderCntMsb+pic_order_cnt_lsb;
+
+                            prevPicOrderCntMsb=PicOrderCntMsb;
+                            prevPicOrderCntLsb=pic_order_cnt_lsb;
+                            prevTopFieldOrderCnt=TopFieldOrderCnt;
+
+                            pic_order_cnt=bottom_field_flag?BottomFieldOrderCnt:TopFieldOrderCnt;
+                            }
+                            break;
+                case 2 :
+                            {
+                            bool Has5=false;
+                            for (std::vector<int8u>::iterator Temp=memory_management_control_operations.begin(); Temp!=memory_management_control_operations.end(); ++Temp)
+                                if ((*Temp)==5)
+                                {
+                                    Has5=true;
+                                    break;
+                                }
+                            if (Has5)
+                                prevFrameNumOffset=0;
+                            int32u FrameNumOffset;
+
+                            if (Element_Code==5) //IdrPicFlag
+                            {
+                                TemporalReferences_Offset=TemporalReferences_Max;
+                                if (TemporalReferences_Offset%2)
+                                    TemporalReferences_Offset++;
+                                FrameNumOffset=0;
+                            }
+                            else if (prevFrameNumOffset==(int32u)-1)
+                                FrameNumOffset=0;
+                            else if (prevFrameNum>frame_num)
+                                FrameNumOffset=prevFrameNumOffset+(*seq_parameter_set_Item)->MaxFrameNum;
+                            else
+                                FrameNumOffset=prevFrameNumOffset;
+
+                            int32u tempPicOrderCnt;
+                            if (Element_Code==5) //IdrPicFlag
+                                tempPicOrderCnt=0;
+                            else if (nal_ref_idc)
+                                tempPicOrderCnt=2*(FrameNumOffset+frame_num);
+                            else
+                                tempPicOrderCnt=2*(FrameNumOffset+frame_num)-1;
+
+                            pic_order_cnt=tempPicOrderCnt;
+
+                            prevFrameNum=frame_num;
+                            prevFrameNumOffset=FrameNumOffset;
+
+                            pic_order_cnt_lsb=frame_num;
+                            }
                             break;
-                    if (Pos && Pos<TemporalReference.size())
+                default:    ;
+            }
+
+            if (pic_order_cnt<TemporalReferences_pic_order_cnt_Min)
+            {
+                if (pic_order_cnt<0)
+                {
+                    size_t Base=(size_t)(TemporalReferences_Offset+TemporalReferences_pic_order_cnt_Min);
+                    size_t ToInsert=(size_t)(TemporalReferences_pic_order_cnt_Min-pic_order_cnt);
+                    if (Base+ToInsert>=4*TemporalReferences_Reserved || Base>=4*TemporalReferences_Reserved || ToInsert+TemporalReferences_Max>=4*TemporalReferences_Reserved || TemporalReferences_Max>=4*TemporalReferences_Reserved || TemporalReferences_Max-Base>=4*TemporalReferences_Reserved)
                     {
-                        TemporalReference.erase(TemporalReference.begin(), TemporalReference.begin()+Pos);
-                        if (Pos<TemporalReference_Offset)
-                            TemporalReference_Offset-=Pos;
-                        else
-                            TemporalReference_Offset=0;
-                        if (Pos<TemporalReference_GA94_03_CC_Offset)
-                            TemporalReference_GA94_03_CC_Offset-=Pos;
-                        else
-                            TemporalReference_GA94_03_CC_Offset=0;
+                        Trusted_IsNot("Problem in temporal references");
+                        return;
                     }
+                    Element_Info1(__T("Offset of ")+Ztring::ToZtring(ToInsert));
+                    TemporalReferences.insert(TemporalReferences.begin()+Base, ToInsert, NULL);
+                    TemporalReferences_Offset+=ToInsert;
+                    TemporalReferences_Max+=ToInsert;
+                    TemporalReferences_pic_order_cnt_Min=pic_order_cnt;
                 }
+                else if (TemporalReferences_Min>(size_t)(TemporalReferences_Offset+pic_order_cnt))
+                    TemporalReferences_Min=(size_t)(TemporalReferences_Offset+pic_order_cnt);
+            }
 
-                //Purging too big array
-                if (TemporalReference.size()>=max_frame_num*4)
+            if (pic_order_cnt<0 && TemporalReferences_Offset<-pic_order_cnt) //Found in playreadyEncryptedBlowUp.ts without encryption test
+            {
+                Trusted_IsNot("Problem in temporal references");
+                return;
+            }
+
+            if ((int64s)(TemporalReferences_Offset+pic_order_cnt)>=3*TemporalReferences_Reserved)
+            {
+                size_t Offset=TemporalReferences_Max-TemporalReferences_Offset;
+                if (Offset%2)
+                    Offset++;
+                if (Offset>=TemporalReferences_Reserved && pic_order_cnt>=(int64s)TemporalReferences_Reserved)
                 {
-                    TemporalReference.erase(TemporalReference.begin(), TemporalReference.begin()+max_frame_num*2);
-                    if (max_frame_num*2<TemporalReference_Offset)
-                        TemporalReference_Offset-=max_frame_num*2;
-                    if (max_frame_num*2<TemporalReference_GA94_03_CC_Offset)
-                        TemporalReference_GA94_03_CC_Offset-=max_frame_num*2;
+                    TemporalReferences_Offset+=TemporalReferences_Reserved;
+                    pic_order_cnt-=TemporalReferences_Reserved;
+                    switch ((*seq_parameter_set_Item)->pic_order_cnt_type)
+                    {
+                        case 0 :
+                                prevPicOrderCntMsb-=(int32u)TemporalReferences_Reserved;
+                                break;
+                        case 2 :
+                                prevFrameNumOffset-=(int32u)TemporalReferences_Reserved/2;
+                                break;
+                        default:;
+                    }
+                }
+                else if (Offset && Offset<=2) //Only I-frames
+                    TemporalReferences_Offset+=2;
+                while (TemporalReferences_Offset+pic_order_cnt>=3*TemporalReferences_Reserved)
+                {
+                    for (size_t Pos=0; Pos<TemporalReferences_Reserved; Pos++)
+                    {
+                        if (TemporalReferences[Pos])
+                        {
+                            if ((Pos%2)==0)
+                                PictureTypes_PreviousFrames+=Avc_slice_type[TemporalReferences[Pos]->slice_type];
+                        }
+                        else if (!PictureTypes_PreviousFrames.empty()) //Only if stream already started
+                        {
+                            if ((Pos%2)==0)
+                                PictureTypes_PreviousFrames+=' ';
+                        }
+                        delete TemporalReferences[Pos];
+                    }
+                    if (PictureTypes_PreviousFrames.size()>=8*TemporalReferences.size())
+                        PictureTypes_PreviousFrames.erase(PictureTypes_PreviousFrames.begin(), PictureTypes_PreviousFrames.begin()+PictureTypes_PreviousFrames.size()-TemporalReferences.size());
+                    TemporalReferences.erase(TemporalReferences.begin(), TemporalReferences.begin()+TemporalReferences_Reserved);
+                    TemporalReferences.resize(4*TemporalReferences_Reserved);
+                    if (TemporalReferences_Reserved<TemporalReferences_Offset)
+                        TemporalReferences_Offset-=TemporalReferences_Reserved;
+                    else
+                        TemporalReferences_Offset=0;
+                    if (TemporalReferences_Reserved<TemporalReferences_Min)
+                        TemporalReferences_Min-=TemporalReferences_Reserved;
+                    else
+                        TemporalReferences_Min=0;
+                    if (TemporalReferences_Reserved<TemporalReferences_Max)
+                        TemporalReferences_Max-=TemporalReferences_Reserved;
                     else
-                        TemporalReference_GA94_03_CC_Offset=0;
+                        TemporalReferences_Max=0;
                 }
             }
-            if ( TemporalReference_Offset_Moved && pic_order_cnt_lsb>=max_frame_num/4 && pic_order_cnt_lsb<=max_frame_num/2)
+
+            TemporalReferences_Offset_pic_order_cnt_lsb_Diff=(int32s)((int32s)(TemporalReferences_Offset+pic_order_cnt)-TemporalReferences_Offset_pic_order_cnt_lsb_Last);
+            TemporalReferences_Offset_pic_order_cnt_lsb_Last=(size_t)(TemporalReferences_Offset+pic_order_cnt);
+            if (TemporalReferences_Max<=TemporalReferences_Offset_pic_order_cnt_lsb_Last)
+                TemporalReferences_Max=TemporalReferences_Offset_pic_order_cnt_lsb_Last+((*seq_parameter_set_Item)->frame_mbs_only_flag?2:1);
+            if (TemporalReferences_Min>TemporalReferences_Offset_pic_order_cnt_lsb_Last)
+                TemporalReferences_Min=TemporalReferences_Offset_pic_order_cnt_lsb_Last;
+            if (TemporalReferences_DelayedElement)
             {
-                TemporalReference_Offset_Moved=false;
+                delete TemporalReferences[TemporalReferences_Offset_pic_order_cnt_lsb_Last]; TemporalReferences[TemporalReferences_Offset_pic_order_cnt_lsb_Last]=TemporalReferences_DelayedElement;
             }
+            if (TemporalReferences[TemporalReferences_Offset_pic_order_cnt_lsb_Last]==NULL)
+                TemporalReferences[TemporalReferences_Offset_pic_order_cnt_lsb_Last]=new temporal_reference();
+            TemporalReferences[TemporalReferences_Offset_pic_order_cnt_lsb_Last]->frame_num=frame_num;
+            TemporalReferences[TemporalReferences_Offset_pic_order_cnt_lsb_Last]->slice_type=(int8u)slice_type;
+            TemporalReferences[TemporalReferences_Offset_pic_order_cnt_lsb_Last]->IsTop=!bottom_field_flag;
+            TemporalReferences[TemporalReferences_Offset_pic_order_cnt_lsb_Last]->IsField=field_pic_flag;
+            if (TemporalReferences_DelayedElement)
+            {
+                TemporalReferences_DelayedElement=NULL;
+                sei_message_user_data_registered_itu_t_t35_GA94_03_Delayed((*pic_parameter_set_Item)->seq_parameter_set_id);
+            }
+        }
 
-            TemporalReference_Offset_pic_order_cnt_lsb_Last=TemporalReference_Offset-(TemporalReference_Offset_Moved && pic_order_cnt_lsb>=max_frame_num/2?max_frame_num:0)+pic_order_cnt_lsb;
-
-            if (TemporalReference_Offset_pic_order_cnt_lsb_Last>=TemporalReference.size())
-                TemporalReference.resize(TemporalReference_Offset_pic_order_cnt_lsb_Last+1);
-            TemporalReference[TemporalReference_Offset_pic_order_cnt_lsb_Last].frame_num=frame_num;
-            TemporalReference[TemporalReference_Offset_pic_order_cnt_lsb_Last].slice_type=(int8u)slice_type;
-            TemporalReference[TemporalReference_Offset_pic_order_cnt_lsb_Last].IsTop=!bottom_field_flag;
-            TemporalReference[TemporalReference_Offset_pic_order_cnt_lsb_Last].IsField=field_pic_flag;
-            TemporalReference[TemporalReference_Offset_pic_order_cnt_lsb_Last].IsValid=true;
+        if ((*seq_parameter_set_Item)->vui_parameters && (*seq_parameter_set_Item)->vui_parameters->num_units_in_tick)
+            tc=float64_int64s(((float64)1000000000)/((float64)(*seq_parameter_set_Item)->vui_parameters->time_scale/(*seq_parameter_set_Item)->vui_parameters->num_units_in_tick/((*seq_parameter_set_Item)->pic_order_cnt_type==2?1:2)/FrameRate_Divider)/((!(*seq_parameter_set_Item)->frame_mbs_only_flag && field_pic_flag)?2:1));
+        if (first_mb_in_slice==0)
+        {
+            if (Frame_Count==0)
+            {
+                if (FrameInfo.PTS==(int64u)-1)
+                    FrameInfo.PTS=FrameInfo.DTS+tc*(TemporalReferences_Offset_pic_order_cnt_lsb_Diff?2:1)*((!(*seq_parameter_set_Item)->frame_mbs_only_flag && field_pic_flag)?2:1); //No PTS in container
+                PTS_Begin=FrameInfo.PTS;
+            }
+            if (slice_type==2 || slice_type==7) //IFrame
+                FirstPFrameInGop_IsParsed=false;
+        }
+        else
+        {
+            if (FrameInfo.PTS!=(int64u)-1)
+                FrameInfo.PTS-=tc;
+            if (FrameInfo.DTS!=(int64u)-1)
+                FrameInfo.DTS-=tc;
         }
 
-        //Name
-        if (Frame_Count && ((!frame_mbs_only_flag && Interlaced_Top==Interlaced_Bottom && field_pic_flag) || first_mb_in_slice!=0 || (Element_Code==0x14 && !seq_parameter_set_ids.empty())))
+        //Frame pos
+        if (Frame_Count!=(int64u)-1 && Frame_Count && ((!(*seq_parameter_set_Item)->frame_mbs_only_flag && Interlaced_Top==Interlaced_Bottom && field_pic_flag) || first_mb_in_slice!=0 || (Element_Code==0x14 && !seq_parameter_sets.empty())))
         {
             Frame_Count--;
+            if (IFrame_Count && Frame_Count_NotParsedIncluded!=(int64u)-1)
+                Frame_Count_NotParsedIncluded--;
             Frame_Count_InThisBlock--;
         }
-        Element_Info(Ztring::ToZtring(Frame_Count));
+        else if (first_mb_in_slice==0)
+        {
+            if ((*seq_parameter_set_Item)->pic_order_cnt_type!=1 && first_mb_in_slice==0 && (Element_Code!=0x14 || seq_parameter_sets.empty())) //Not slice_layer_extension except if MVC only
+            {
+                if ((!IsSub || Frame_Count_InThisBlock) && TemporalReferences_Offset_pic_order_cnt_lsb_Diff && TemporalReferences_Offset_pic_order_cnt_lsb_Diff!=2)
+                    FrameInfo.PTS+=(TemporalReferences_Offset_pic_order_cnt_lsb_Diff-(field_pic_flag?1:2))/((!(*seq_parameter_set_Item)->frame_mbs_only_flag && field_pic_flag)?1:2)*(int64s)tc;
+            }
+
+            if (!FirstPFrameInGop_IsParsed && (slice_type==0 || slice_type==5)) //P-Frame
+            {
+                FirstPFrameInGop_IsParsed=true;
+
+                //Testing if we have enough to test GOP
+                if (Frame_Count<=Frame_Count_Valid)
+                {
+                    std::string PictureTypes(PictureTypes_PreviousFrames);
+                    PictureTypes.reserve(TemporalReferences.size());
+                    for (size_t Pos=0; Pos<TemporalReferences.size(); Pos++)
+                        if (TemporalReferences[Pos])
+                        {
+                            if ((Pos%2)==0)
+                                PictureTypes+=Avc_slice_type[TemporalReferences[Pos]->slice_type];
+                        }
+                        else if (!PictureTypes.empty()) //Only if stream already started
+                        {
+                            if ((Pos%2)==0)
+                                PictureTypes+=' ';
+                        }
+                    if (!GOP_Detect(PictureTypes).empty())
+                        Frame_Count_Valid=Frame_Count; //We have enough frames
+                }
+            }
+        }
+
+        #if MEDIAINFO_TRACE
+            if (Trace_Activated)
+            {
+                Element_Info1(TemporalReferences_Offset_pic_order_cnt_lsb_Last);
+                Element_Info1((((*seq_parameter_set_Item)->frame_mbs_only_flag || !field_pic_flag)?__T("Frame "):(bottom_field_flag?__T("Field (Bottom) "):__T("Field (Top) ")))+Ztring::ToZtring(Frame_Count));
+                if (slice_type<9)
+                    Element_Info1(__T("slice_type ")+Ztring().From_Local(Avc_slice_type[slice_type]));
+                Element_Info1(__T("frame_num ")+Ztring::ToZtring(frame_num));
+                if ((*seq_parameter_set_Item)->vui_parameters && (*seq_parameter_set_Item)->vui_parameters->fixed_frame_rate_flag)
+                {
+                    if (FrameInfo.PCR!=(int64u)-1)
+                        Element_Info1(__T("PCR ")+Ztring().Duration_From_Milliseconds(float64_int64s(((float64)FrameInfo.PCR)/1000000)));
+                    if (FrameInfo.DTS!=(int64u)-1)
+                        Element_Info1(__T("DTS ")+Ztring().Duration_From_Milliseconds(float64_int64s(((float64)FrameInfo.DTS)/1000000)));
+                    if (FrameInfo.PTS!=(int64u)-1)
+                        Element_Info1(__T("PTS ")+Ztring().Duration_From_Milliseconds(float64_int64s(((float64)FrameInfo.PTS)/1000000)));
+                }
+                if ((*seq_parameter_set_Item)->pic_order_cnt_type==0)
+                    Element_Info1(__T("pic_order_cnt_lsb ")+Ztring::ToZtring(pic_order_cnt_lsb));
+                if (first_mb_in_slice)
+                    Element_Info1(__T("first_mb_in_slice ")+Ztring::ToZtring(first_mb_in_slice));
+            }
+        #endif //MEDIAINFO_TRACE
 
         //Counting
-        if (File_Offset+Buffer_Offset+Element_Size==File_Size)
-            Frame_Count_Valid=Frame_Count; //Finish frames in case of there are less than Frame_Count_Valid frames
-        Frame_Count++;
-        Frame_Count_InThisBlock++;
-
-        //Duplicate
-        if (Streams[(size_t)Element_Code].ShouldDuplicate)
-            File__Duplicate_Write(Element_Code, pic_order_cnt_type==0?pic_order_cnt_lsb:frame_num);
+        if (Frame_Count!=(int64u)-1)
+        {
+            if (File_Offset+Buffer_Offset+Element_Size==File_Size)
+                Frame_Count_Valid=Frame_Count; //Finish frames in case of there are less than Frame_Count_Valid frames
+            Frame_Count++;
+            if (IFrame_Count && Frame_Count_NotParsedIncluded!=(int64u)-1)
+                Frame_Count_NotParsedIncluded++;
+            Frame_Count_InThisBlock++;
+        }
+        if ((*seq_parameter_set_Item)->pic_order_cnt_type==0 && field_pic_flag)
+        {
+            Field_Count++;
+            Field_Count_InThisBlock++;
+        }
+        if (FrameInfo.PTS!=(int64u)-1)
+            FrameInfo.PTS+=tc;
+        if (FrameInfo.DTS!=(int64u)-1)
+            FrameInfo.DTS+=tc;
+        if (FrameInfo.PTS!=(int64u)-1 && (FrameInfo.PTS>PTS_End || (PTS_End>1000000000 && FrameInfo.PTS<=PTS_End-1000000000))) //More than current PTS_End or less than current PTS_End minus 1 second (there is a problem?)
+            PTS_End=FrameInfo.PTS;
+
+        #if MEDIAINFO_DUPLICATE
+            if (Streams[(size_t)Element_Code].ShouldDuplicate)
+                File__Duplicate_Write(Element_Code, (*seq_parameter_set_Item)->pic_order_cnt_type==0?pic_order_cnt_lsb:frame_num);
+        #endif //MEDIAINFO_DUPLICATE
 
         //Filling only if not already done
-        if (Frame_Count==2 && !Status[IsAccepted])
+        if (Frame_Count==1 && !Status[IsAccepted])
             Accept("AVC");
-        if (!Status[IsFilled] && ((!GA94_03_CC_IsPresent && Frame_Count>=Frame_Count_Valid) || Frame_Count>=Frame_Count_Valid*10)) //10 times the normal test
+        if (!Status[IsFilled])
         {
-            Fill("AVC");
-            if (!Streams[(size_t)Element_Code].ShouldDuplicate && MediaInfoLib::Config.ParseSpeed_Get()<1.0)
-                Finish("AVC");
+            if (IFrame_Count>=8)
+                Frame_Count_Valid=Frame_Count; //We have enough frames
+            #ifdef MEDIAINFO_DTVCCTRANSPORT_YES
+            if (((!GA94_03_IsPresent && Frame_Count>=Frame_Count_Valid) || Frame_Count>=512)) //Going more far if captions are detected
+            #else //MEDIAINFO_DTVCCTRANSPORT_YES
+            if (Frame_Count>=Frame_Count_Valid)
+            #endif //MEDIAINFO_DTVCCTRANSPORT_YES
+            {
+                Fill("AVC");
+                if (!IsSub && !Streams[(size_t)Element_Code].ShouldDuplicate && MediaInfoLib::Config.ParseSpeed_Get()<1.0)
+                    Finish("AVC");
+            }
         }
     FILLING_END();
+}
+
+//---------------------------------------------------------------------------
+//
+void File_Avc::ref_pic_list_modification(int32u slice_type, bool mvc)
+{
+    if ((slice_type%5)!=2 && (slice_type%5)!=4)
+    {
+        TEST_SB_SKIP(                                           "ref_pic_list_modification_flag_l0");
+            int32u modification_of_pic_nums_idc;
+            do
+            {
+                Get_UE (modification_of_pic_nums_idc,           "modification_of_pic_nums_idc");
+                if (modification_of_pic_nums_idc<2)
+                    Skip_UE(                                    "abs_diff_pic_num_minus1");
+                else if (modification_of_pic_nums_idc==2)
+                    Skip_UE(                                    "long_term_pic_num");
+                else if (mvc && (modification_of_pic_nums_idc==4 || modification_of_pic_nums_idc==5)) //ref_pic_list_mvc_modification only
+                    Skip_UE(                                    "abs_diff_view_idx_minus1");
+                else if (modification_of_pic_nums_idc!=3)
+                {
+                    Trusted_IsNot("ref_pic_list_modification_flag_l0");
+                    Skip_BS(Data_BS_Remain(),                   "(Remaining bits)");
+                }
+            }
+            while (modification_of_pic_nums_idc!=3 && Data_BS_Remain());
+        TEST_SB_END();
+    }
+    if ((slice_type%5)==1)
+    {
+        TEST_SB_SKIP(                                           "ref_pic_list_modification_flag_l1");
+            int32u modification_of_pic_nums_idc;
+            do
+            {
+                Get_UE (modification_of_pic_nums_idc,           "modification_of_pic_nums_idc");
+                if (modification_of_pic_nums_idc<2)
+                    Skip_UE(                                    "abs_diff_pic_num_minus1");
+                else if (modification_of_pic_nums_idc==2)
+                    Skip_UE(                                    "long_term_pic_num");
+                else if (mvc && (modification_of_pic_nums_idc==4 || modification_of_pic_nums_idc==5)) //ref_pic_list_mvc_modification only
+                    Skip_UE(                                    "abs_diff_view_idx_minus1");
+                else if (modification_of_pic_nums_idc!=3)
+                {
+                    Trusted_IsNot("ref_pic_list_modification_flag_l1");
+                    Skip_BS(Data_BS_Remain(),                   "(Remaining bits)");
+                }
+            }
+            while (modification_of_pic_nums_idc!=3 && Data_BS_Remain());
+        TEST_SB_END();
+    }
+}
 
-    Synched=false; //We do not have the complete slice
+//---------------------------------------------------------------------------
+//
+void File_Avc::pred_weight_table(int32u num_ref_idx_l0_active_minus1, int32u num_ref_idx_l1_active_minus1, int8u ChromaArrayType)
+{
+    Skip_UE(                                                    "luma_log2_weight_denom");
+    if (ChromaArrayType)
+        Skip_UE(                                                "chroma_log2_weight_denom");
+    for(int32u i=0; i<=num_ref_idx_l0_active_minus1; i++)
+    {
+        TEST_SB_SKIP(                                           "luma_weight_l0_flag");
+            Skip_SE(                                            "luma_weight_l0");
+            Skip_SE(                                            "luma_offset_l0");
+        TEST_SB_END();
+    }
+    if (ChromaArrayType)
+    {
+        TEST_SB_SKIP(                                           "chroma_weight_l0_flag");
+            Skip_SE(                                            "chroma_weight_l0");
+            Skip_SE(                                            "chroma_offset_l0");
+        TEST_SB_END();
+    }
+}
+
+//---------------------------------------------------------------------------
+//
+void File_Avc::dec_ref_pic_marking(std::vector<int8u> &memory_management_control_operations)
+{
+    if (Element_Code==5) //IdrPicFlag
+    {
+        Skip_SB(                                                "no_output_of_prior_pics_flag");
+        Skip_SB(                                                "long_term_reference_flag");
+    }
+    else
+    {
+        TEST_SB_SKIP(                                           "adaptive_ref_pic_marking_mode_flag");
+            int32u memory_management_control_operation;
+            do
+            {
+                Get_UE (memory_management_control_operation,    "memory_management_control_operation");
+                switch (memory_management_control_operation)
+                {
+                    case 1 :
+                                Skip_UE(                        "difference_of_pic_nums_minus1");
+                                break;
+                    case 2 :
+                                Skip_UE(                        "long_term_pic_num");
+                                break;
+                    case 3 :
+                                Skip_UE(                        "difference_of_pic_nums_minus1");
+                                //break; 3 --> difference_of_pic_nums_minus1 then long_term_frame_idx
+                    case 6 :
+                                Skip_UE(                        "long_term_frame_idx");
+                                break;
+                    case 4 :
+                                Skip_UE(                        "max_long_term_frame_idx_plus1");
+                                break;
+                }
+                memory_management_control_operations.push_back((int8u)memory_management_control_operation);
+            }
+            while (Data_BS_Remain() && memory_management_control_operation);
+        TEST_SB_END()
+    }
 }
 
 //---------------------------------------------------------------------------
@@ -1217,11 +1875,12 @@
     Element_Name("sei");
 
     //Parsing
+    int32u seq_parameter_set_id=(int32u)-1;
     while(Element_Offset+1<Element_Size)
     {
-        Element_Begin("sei message");
-            sei_message();
-        Element_End();
+        Element_Begin1("sei message");
+            sei_message(seq_parameter_set_id);
+        Element_End0();
     }
     BS_Begin();
     Mark_1(                                                     );
@@ -1229,12 +1888,12 @@
 }
 
 //---------------------------------------------------------------------------
-void File_Avc::sei_message()
+void File_Avc::sei_message(int32u &seq_parameter_set_id)
 {
     //Parsing
     int32u payloadType=0, payloadSize=0;
     int8u payload_type_byte, payload_size_byte;
-    Element_Begin("sei message header");
+    Element_Begin1("sei message header");
         do
         {
             Get_B1 (payload_type_byte,                          "payload_type_byte");
@@ -1247,21 +1906,27 @@
             payloadSize+=payload_size_byte;
         }
         while(payload_size_byte==0xFF);
-    Element_End();
+    Element_End0();
 
     int64u Element_Offset_Save=Element_Offset+payloadSize;
+    if (Element_Offset_Save>Element_Size)
+    {
+        Trusted_IsNot("Wrong size");
+        Skip_XX(Element_Size-Element_Offset,                    "unknown");
+        return;
+    }
     int64u Element_Size_Save=Element_Size;
     Element_Size=Element_Offset_Save;
     switch (payloadType)
     {
-        case  0 :   sei_message_buffering_period(payloadSize); break;
-        case  1 :   sei_message_pic_timing(payloadSize); break;
-        case  4 :   sei_message_user_data_registered_itu_t_t35(payloadSize); break;
+        case  0 :   sei_message_buffering_period(seq_parameter_set_id); break;
+        case  1 :   sei_message_pic_timing(payloadSize, seq_parameter_set_id); break;
+        case  4 :   sei_message_user_data_registered_itu_t_t35(); break;
         case  5 :   sei_message_user_data_unregistered(payloadSize); break;
-        case  6 :   sei_message_recovery_point(payloadSize); break;
+        case  6 :   sei_message_recovery_point(); break;
         case 32 :   sei_message_mainconcept(payloadSize); break;
         default :
-                    Element_Info("unknown");
+                    Element_Info1("unknown");
                     Skip_XX(payloadSize,                        "data");
     }
     Element_Offset=Element_Offset_Save; //Positionning in the right place.
@@ -1270,48 +1935,70 @@
 
 //---------------------------------------------------------------------------
 // SEI - 0
-void File_Avc::sei_message_buffering_period(int32u payloadSize)
+void File_Avc::sei_message_buffering_period(int32u &seq_parameter_set_id)
 {
-    Element_Info("buffering_period");
+    Element_Info1("buffering_period");
 
     //Parsing
+    if (Element_Offset==Element_Size)
+        return; //Nothing to do
     BS_Begin();
-    Skip_UE(                                                    "seq_parameter_set_id");
-    if (NalHrdBpPresentFlag)
-        for (int32u SchedSelIdx=0; SchedSelIdx<=cpb_cnt_minus1; SchedSelIdx++)
-        {
-            Get_S4 (initial_cpb_removal_delay_length_minus1+1, initial_cpb_removal_delay, "initial_cpb_removal_delay"); Param_Info(initial_cpb_removal_delay/90, " ms");
-            Get_S4 (initial_cpb_removal_delay_length_minus1+1, initial_cpb_removal_delay_offset, "initial_cpb_removal_delay_offset"); Param_Info(initial_cpb_removal_delay_offset/90, " ms");
-        }
-    if (VclHrdBpPresentFlag)
-        for (int32u SchedSelIdx=0; SchedSelIdx<=cpb_cnt_minus1; SchedSelIdx++)
-        {
-            Get_S4 (initial_cpb_removal_delay_length_minus1+1, initial_cpb_removal_delay, "initial_cpb_removal_delay"); Param_Info(initial_cpb_removal_delay/90, " ms");
-            Get_S4 (initial_cpb_removal_delay_length_minus1+1, initial_cpb_removal_delay_offset, "initial_cpb_removal_delay_offset"); Param_Info(initial_cpb_removal_delay_offset/90, " ms");
-        }
+    Get_UE (seq_parameter_set_id,                               "seq_parameter_set_id");
+    std::vector<seq_parameter_set_struct*>::iterator seq_parameter_set_Item;
+    if (seq_parameter_set_id>=seq_parameter_sets.size() || (*(seq_parameter_set_Item=seq_parameter_sets.begin()+seq_parameter_set_id))==NULL || !(*seq_parameter_set_Item)->IsSynched)
+    {
+        //Not yet present
+        Skip_BS(Data_BS_Remain(),                               "Data (seq_parameter_set is missing)");
+        BS_End();
+        return;
+    }
+    if ((*seq_parameter_set_Item)->NalHrdBpPresentFlag())
+        sei_message_buffering_period_xxl((*seq_parameter_set_Item)->vui_parameters->NAL);
+    if ((*seq_parameter_set_Item)->VclHrdBpPresentFlag())
+        sei_message_buffering_period_xxl((*seq_parameter_set_Item)->vui_parameters->VCL);
+    BS_End();
+}
+
+void File_Avc::sei_message_buffering_period_xxl(void* xxl_)
+{
+    if (xxl_==NULL)
+        return;
+    seq_parameter_set_struct::vui_parameters_struct::xxl* xxl=(seq_parameter_set_struct::vui_parameters_struct::xxl*)xxl_;
+    for (int32u SchedSelIdx=0; SchedSelIdx<xxl->SchedSel.size(); SchedSelIdx++)
+    {
+        Get_S4 (xxl->initial_cpb_removal_delay_length_minus1+1, xxl->SchedSel[SchedSelIdx].initial_cpb_removal_delay, "initial_cpb_removal_delay"); Param_Info2(xxl->SchedSel[SchedSelIdx].initial_cpb_removal_delay/90, " ms");
+        Get_S4 (xxl->initial_cpb_removal_delay_length_minus1+1, xxl->SchedSel[SchedSelIdx].initial_cpb_removal_delay_offset, "initial_cpb_removal_delay_offset"); Param_Info2(xxl->SchedSel[SchedSelIdx].initial_cpb_removal_delay_offset/90, " ms");
+    }
 }
 
 //---------------------------------------------------------------------------
 // SEI - 1
-void File_Avc::sei_message_pic_timing(int32u payloadSize)
+void File_Avc::sei_message_pic_timing(int32u /*payloadSize*/, int32u seq_parameter_set_id)
 {
-    Element_Info("pic_timing");
+    Element_Info1("pic_timing");
 
-    //Testing if we can parsing it now
-    if (!SPS_IsParsed) //There is sometimes one problem in one message, should not untrusting all
+    //Testing if we can parsing it now. TODO: handle case seq_parameter_set_id is unknown (buffering of message, decoding in slice parsing)
+    if (seq_parameter_set_id==(int32u)-1 && seq_parameter_sets.size()==1)
+        seq_parameter_set_id=0;
+    std::vector<seq_parameter_set_struct*>::iterator seq_parameter_set_Item;
+    if (seq_parameter_set_id>=seq_parameter_sets.size() || (*(seq_parameter_set_Item=seq_parameter_sets.begin()+seq_parameter_set_id))==NULL || !(*seq_parameter_set_Item)->IsSynched)
     {
-        Skip_XX(payloadSize,                                    "Data");
+        //Not yet present
+        Skip_BS(Data_BS_Remain(),                               "Data (seq_parameter_set is missing)");
         return;
     }
 
     //Parsing
+    int8u   pic_struct=(int8u)-1;
     BS_Begin();
-    if (CpbDpbDelaysPresentFlag)
+    if ((*seq_parameter_set_Item)->CpbDpbDelaysPresentFlag())
     {
-        Get_S4 (cpb_removal_delay_length_minus1+1, cpb_removal_delay, "cpb_removal_delay");
+        int8u cpb_removal_delay_length_minus1=(*seq_parameter_set_Item)->vui_parameters->NAL?(*seq_parameter_set_Item)->vui_parameters->NAL->cpb_removal_delay_length_minus1:(*seq_parameter_set_Item)->vui_parameters->VCL->cpb_removal_delay_length_minus1; //Spec is not precise, I am not sure
+        int8u dpb_output_delay_length_minus1=(*seq_parameter_set_Item)->vui_parameters->NAL?(*seq_parameter_set_Item)->vui_parameters->NAL->dpb_output_delay_length_minus1:(*seq_parameter_set_Item)->vui_parameters->VCL->dpb_output_delay_length_minus1; //Spec is not precise, I am not sure
+        Skip_S4(cpb_removal_delay_length_minus1+1,              "cpb_removal_delay");
         Skip_S4(dpb_output_delay_length_minus1+1,               "dpb_output_delay");
     }
-    if (pic_struct_present_flag)
+    if ((*seq_parameter_set_Item)->vui_parameters && (*seq_parameter_set_Item)->vui_parameters->pic_struct_present_flag)
     {
         Get_S1 (4, pic_struct,                                  "pic_struct");
         switch (pic_struct)
@@ -1325,20 +2012,20 @@
             case  6 : break;
             case  7 : FrameRate_Divider=2; break;
             case  8 : FrameRate_Divider=3; break;
-            default : Param_Info("Reserved"); return; //NumClockTS is unknown
+            default : Param_Info1("Reserved"); return; //NumClockTS is unknown
         }
-        Param_Info(Avc_pic_struct[pic_struct]);
+        Param_Info1(Avc_pic_struct[pic_struct]);
         int8u NumClockTS=Avc_NumClockTS[pic_struct];
         int8u seconds_value=0, minutes_value=0, hours_value=0; //Here because theses values can be reused in later ClockTSs.
         for (int8u i=0; i<NumClockTS; i++)
         {
-            Element_Begin("ClockTS");
+            Element_Begin1("ClockTS");
             TEST_SB_SKIP(                                       "clock_timestamp_flag");
                 Ztring TimeStamp;
                 int32u time_offset=0;
                 int8u n_frames;
                 bool full_timestamp_flag, nuit_field_based_flag;
-                Info_S1(2, ct_type,                             "ct_type"); Param_Info(Avc_ct_type[ct_type]);
+                Info_S1(2, ct_type,                             "ct_type"); Param_Info1(Avc_ct_type[ct_type]);
                 Get_SB (   nuit_field_based_flag,               "nuit_field_based_flag");
                 Skip_S1(5,                                      "counting_type");
                 Get_SB (   full_timestamp_flag,                 "full_timestamp_flag");
@@ -1363,33 +2050,37 @@
                         TEST_SB_END();
                     TEST_SB_END();
                 }
-                TimeStamp=Ztring::ToZtring(hours_value)+_T(':')+Ztring::ToZtring(minutes_value)+_T(':')+Ztring::ToZtring(seconds_value);
-                if (time_offset_length>0)
-                    Get_S4 (time_offset_length, time_offset,    "time_offset");
-                if (time_scale)
+                TimeStamp=Ztring::ToZtring(hours_value)+__T(':')+Ztring::ToZtring(minutes_value)+__T(':')+Ztring::ToZtring(seconds_value);
+                if ((*seq_parameter_set_Item)->CpbDpbDelaysPresentFlag())
+                {
+                    int8u time_offset_length=(*seq_parameter_set_Item)->vui_parameters->NAL?(*seq_parameter_set_Item)->vui_parameters->NAL->time_offset_length:(*seq_parameter_set_Item)->vui_parameters->VCL->time_offset_length; //Spec is not precise, I am not sure
+                    if (time_offset_length)
+                        Get_S4 (time_offset_length, time_offset,    "time_offset");
+                }
+                if ((*seq_parameter_set_Item)->vui_parameters && (*seq_parameter_set_Item)->vui_parameters->time_scale)
                 {
-                    float32 Milliseconds=((float32)(n_frames*(num_units_in_tick*(1+(nuit_field_based_flag?1:0)))+time_offset))/time_scale;
-                    TimeStamp+=_T('.');
+                    float32 Milliseconds=((float32)(n_frames*((*seq_parameter_set_Item)->vui_parameters->num_units_in_tick*(1+(nuit_field_based_flag?1:0)))+time_offset))/(*seq_parameter_set_Item)->vui_parameters->time_scale;
+                    TimeStamp+=__T('.');
                     TimeStamp+=Ztring::ToZtring(Milliseconds);
                 }
-                Param_Info(TimeStamp);
+                Param_Info1(TimeStamp);
             TEST_SB_END();
-            Element_End();
+            Element_End0();
         }
     }
     BS_End();
 
-    FILLING_BEGIN_PRECISE();
-        if (pic_struct_FirstDetected==(int8u)-1)
-            pic_struct_FirstDetected=pic_struct;
+    FILLING_BEGIN();
+        if ((*seq_parameter_set_Item)->pic_struct_FirstDetected==(int8u)-1 && (*seq_parameter_set_Item)->vui_parameters && (*seq_parameter_set_Item)->vui_parameters->pic_struct_present_flag)
+            (*seq_parameter_set_Item)->pic_struct_FirstDetected=pic_struct;
     FILLING_END();
 }
 
 //---------------------------------------------------------------------------
 // SEI - 5
-void File_Avc::sei_message_user_data_registered_itu_t_t35(int32u payloadSize)
+void File_Avc::sei_message_user_data_registered_itu_t_t35()
 {
-    Element_Info("user_data_registered_itu_t_t35");
+    Element_Info1("user_data_registered_itu_t_t35");
 
     //Parsing
     int8u itu_t_t35_country_code;
@@ -1428,7 +2119,7 @@
 // SEI - 5 - DTG1
 void File_Avc::sei_message_user_data_registered_itu_t_t35_DTG1()
 {
-    Element_Info("Active Format Description");
+    Element_Info1("Active Format Description");
 
     //Parsing
     bool active_format_flag;
@@ -1448,7 +2139,7 @@
         Mark_1_NoTrustError();
         Mark_1_NoTrustError();
         Mark_1_NoTrustError();
-        Info_S1(4, active_format,                               "active_format"); Param_Info(Avc_user_data_DTG1_active_format[active_format]);
+        Info_S1(4, active_format,                               "active_format"); Param_Info1(Avc_user_data_DTG1_active_format[active_format]);
     }
     BS_End();
 }
@@ -1473,138 +2164,100 @@
 // SEI - 5 - GA94 - 0x03
 void File_Avc::sei_message_user_data_registered_itu_t_t35_GA94_03()
 {
-    //Saving date in the right pic_order_cnt_lsb
-    if (pic_order_cnt_lsb!=(int32u)-1)
-    {
-        if (TemporalReference_Offset_pic_order_cnt_lsb_Last<=TemporalReference.size())
-            TemporalReference[TemporalReference_Offset_pic_order_cnt_lsb_Last].GA94_03_CC=TemporalReference_Temp.GA94_03_CC;
-    }
+    #if defined(MEDIAINFO_DTVCCTRANSPORT_YES)
+        GA94_03_IsPresent=true;
+        MustExtendParsingDuration=true;
+        Buffer_TotalBytes_Fill_Max=(int64u)-1; //Disabling this feature for this format, this is done in the parser
 
-    GA94_03_CC_IsPresent=true;
+        Element_Info1("DTVCC Transport");
 
-    Element_Info("Styled captioning");
+        //Coherency
+        delete TemporalReferences_DelayedElement; TemporalReferences_DelayedElement=new temporal_reference();
 
-    //Handling missing frames
-    size_t max_frame_num=1<<(log2_max_frame_num_minus4+4)<<1;
-    if (TemporalReference_GA94_03_CC_Offset+max_frame_num/2<TemporalReference_Offset-(TemporalReference_Offset_Moved && pic_order_cnt_lsb>=max_frame_num/2?max_frame_num:0)+pic_order_cnt_lsb)
-    {
-        size_t Pos=TemporalReference_Offset+pic_order_cnt_lsb;
-        for(; Pos<TemporalReference.size(); Pos++)
-            if (!TemporalReference[Pos].IsValid)
-                break;
-        TemporalReference_GA94_03_CC_Offset=Pos+1;
-    }
+        TemporalReferences_DelayedElement->GA94_03=new temporal_reference::buffer_data;
+        TemporalReferences_DelayedElement->GA94_03->Size=(size_t)(Element_Size-Element_Offset);
+        delete[] TemporalReferences_DelayedElement->GA94_03->Data;
+        TemporalReferences_DelayedElement->GA94_03->Data=new int8u[(size_t)(Element_Size-Element_Offset)];
+        std::memcpy(TemporalReferences_DelayedElement->GA94_03->Data, Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)(Element_Size-Element_Offset));
 
-    //Parsing
-    int8u  cc_count;
-    bool   process_em_data_flag, process_cc_data_flag, additional_data_flag;
-    BS_Begin();
-    Get_SB (process_em_data_flag,                               "process_em_data_flag");
-    Get_SB (process_cc_data_flag,                               "process_cc_data_flag");
-    Get_SB (additional_data_flag,                               "additional_data_flag");
-    Get_S1 (5, cc_count,                                        "cc_count");
-    BS_End();
-    Skip_B1(                                                    process_em_data_flag?"em_data":"junk"); //Emergency message
-    if (TemporalReference_Temp.GA94_03_CC.size()<cc_count)
-        TemporalReference_Temp.GA94_03_CC.resize(cc_count);
-    if (process_cc_data_flag)
-    {
-        for (int8u Pos=0; Pos<cc_count; Pos++)
-        {
-            Element_Begin("cc");
-            int8u cc_type, cc_data_1, cc_data_2;
-            bool   cc_valid;
-            BS_Begin();
-            Mark_1();
-            Mark_1();
-            Mark_1();
-            Mark_1();
-            Mark_1();
-            Get_SB (   cc_valid,                                    "cc_valid");
-            Get_S1 (2, cc_type,                                     "cc_type");
-            BS_End();
-            Get_B1 (cc_data_1,                                      "cc_data_1");
-            Get_B1 (cc_data_2,                                      "cc_data_2");
-            TemporalReference_Temp.GA94_03_CC[Pos].cc_valid=cc_valid;
-            TemporalReference_Temp.GA94_03_CC[Pos].cc_type=cc_type;
-            TemporalReference_Temp.GA94_03_CC[Pos].cc_data[0]=cc_data_1;
-            TemporalReference_Temp.GA94_03_CC[Pos].cc_data[1]=cc_data_2;
-            Element_End();
-        }
+        //Parsing
+        Skip_XX(Element_Size-Element_Offset,                    "CC data");
+    #else //defined(MEDIAINFO_DTVCCTRANSPORT_YES)
+        Skip_XX(Element_Size-Element_Offset,                    "DTVCC Transport data");
+    #endif //defined(MEDIAINFO_DTVCCTRANSPORT_YES)
+}
+
+void File_Avc::sei_message_user_data_registered_itu_t_t35_GA94_03_Delayed(int32u seq_parameter_set_id)
+{
+    // Skipping missing frames
+    if (TemporalReferences_Max-TemporalReferences_Min>(size_t)(4*(seq_parameter_sets[seq_parameter_set_id]->max_num_ref_frames+3))) // max_num_ref_frames ref frame maximum
+    {
+        TemporalReferences_Min=TemporalReferences_Max-4*(seq_parameter_sets[seq_parameter_set_id]->max_num_ref_frames+3);
+        while (TemporalReferences[TemporalReferences_Min]==NULL)
+            TemporalReferences_Min++;
     }
-    else
-        Skip_XX(cc_count*2,                                         "Junk");
 
-    //Parsing Captions after reordering
-    bool CanBeParsed=true;
-    for (size_t GA94_03_CC_Pos=TemporalReference_GA94_03_CC_Offset; GA94_03_CC_Pos<TemporalReference.size(); GA94_03_CC_Pos+=2)
-        if (!TemporalReference[GA94_03_CC_Pos].IsValid)
-            CanBeParsed=false; //There is a missing field/frame
-    if (CanBeParsed)
-    {
-       for (size_t GA94_03_CC_Pos=TemporalReference_GA94_03_CC_Offset; GA94_03_CC_Pos<TemporalReference.size(); GA94_03_CC_Pos+=2)
-            for (int8u Pos=0; Pos<TemporalReference[GA94_03_CC_Pos].GA94_03_CC.size(); Pos++)
-            {
-                if (TemporalReference[GA94_03_CC_Pos].GA94_03_CC[Pos].cc_valid)
-                {
-                    int8u cc_type=TemporalReference[GA94_03_CC_Pos].GA94_03_CC[Pos].cc_type;
-                    size_t Parser_Pos=cc_type;
-                    if (Parser_Pos==3)
-                        Parser_Pos=2; //cc_type 2 and 3 are for the same text
-
-                    while (Parser_Pos>=GA94_03_CC_Parsers.size())
-                        GA94_03_CC_Parsers.push_back(NULL);
-                    if (GA94_03_CC_Parsers[Parser_Pos]==NULL)
-                    {
-                        if (cc_type<2)
-                        {
-                            GA94_03_CC_Parsers[Parser_Pos]=new File_Eia608();
-                        }
-                        else
-                            GA94_03_CC_Parsers[Parser_Pos]=new File_Eia708();
-                    }
-                    if (!GA94_03_CC_Parsers[Parser_Pos]->Status[IsFinished])
-                    {
-                        if (cc_type>=2)
-                            ((File_Eia708*)GA94_03_CC_Parsers[2])->cc_type=cc_type;
-                        Element_Begin(Ztring(_T("ReorderedCaptions,"))+Ztring().From_Local(Avc_user_data_GA94_cc_type(cc_type)));
-                        Open_Buffer_Init(GA94_03_CC_Parsers[Parser_Pos]);
-                        if (cc_type==1)
-                        Open_Buffer_Continue(GA94_03_CC_Parsers[Parser_Pos], TemporalReference[GA94_03_CC_Pos].GA94_03_CC[Pos].cc_data, 2);
-                        Element_End();
-                    }
+    // Parsing captions
+    while (TemporalReferences[TemporalReferences_Min] && TemporalReferences_Min+2*seq_parameter_sets[seq_parameter_set_id]->max_num_ref_frames<TemporalReferences_Max)
+    {
+        #if defined(MEDIAINFO_DTVCCTRANSPORT_YES)
+            Element_Begin1("Reordered DTVCC Transport");
 
-                    //Demux
-                    if (cc_type<2)
-                        Demux(TemporalReference[GA94_03_CC_Pos].GA94_03_CC[Pos].cc_data, 2, ContentType_MainStream);
-                    else
-                        Demux(TemporalReference[GA94_03_CC_Pos].GA94_03_CC[Pos].cc_data, 2, ContentType_MainStream);
+            //Parsing
+            #if MEDIAINFO_DEMUX
+                int64u Element_Code_Old=Element_Code;
+                Element_Code=0x4741393400000003LL;
+            #endif //MEDIAINFO_DEMUX
+            if (GA94_03_Parser==NULL)
+            {
+                GA94_03_Parser=new File_DtvccTransport;
+                Open_Buffer_Init(GA94_03_Parser);
+                ((File_DtvccTransport*)GA94_03_Parser)->Format=File_DtvccTransport::Format_A53_4_GA94_03;
+            }
+            if (((File_DtvccTransport*)GA94_03_Parser)->AspectRatio==0)
+            {
+                float64 PixelAspectRatio=1;
+                std::vector<seq_parameter_set_struct*>::iterator seq_parameter_set_Item=seq_parameter_sets.begin();
+                for (; seq_parameter_set_Item!=seq_parameter_sets.end(); ++seq_parameter_set_Item)
+                    if ((*seq_parameter_set_Item))
+                        break;
+                if (seq_parameter_set_Item!=seq_parameter_sets.end())
+                {
+                    if ((*seq_parameter_set_Item)->vui_parameters->aspect_ratio_idc<Avc_PixelAspectRatio_Size)
+                        PixelAspectRatio=Avc_PixelAspectRatio[(*seq_parameter_set_Item)->vui_parameters->aspect_ratio_idc];
+                    else if ((*seq_parameter_set_Item)->vui_parameters->aspect_ratio_idc==0xFF && (*seq_parameter_set_Item)->vui_parameters->sar_height)
+                        PixelAspectRatio=((float64)(*seq_parameter_set_Item)->vui_parameters->sar_width)/(*seq_parameter_set_Item)->vui_parameters->sar_height;
                 }
+                int32u Width =((*seq_parameter_set_Item)->pic_width_in_mbs_minus1       +1)*16;
+                int32u Height=((*seq_parameter_set_Item)->pic_height_in_map_units_minus1+1)*16*(2-(*seq_parameter_set_Item)->frame_mbs_only_flag);
+                ((File_DtvccTransport*)GA94_03_Parser)->AspectRatio=Width*PixelAspectRatio/Height;
             }
+            if (GA94_03_Parser->PTS_DTS_Needed)
+            {
+                GA94_03_Parser->FrameInfo.PCR=FrameInfo.PCR;
+                GA94_03_Parser->FrameInfo.PTS=FrameInfo.PTS;
+                GA94_03_Parser->FrameInfo.DTS=FrameInfo.DTS;
+            }
+            #if MEDIAINFO_DEMUX
+                if (TemporalReferences[TemporalReferences_Min]->GA94_03)
+                    Demux(TemporalReferences[TemporalReferences_Min]->GA94_03->Data, TemporalReferences[TemporalReferences_Min]->GA94_03->Size, ContentType_MainStream);
+                Element_Code=Element_Code_Old;
+            #endif //MEDIAINFO_DEMUX
+            if (TemporalReferences[TemporalReferences_Min]->GA94_03)
+                Open_Buffer_Continue(GA94_03_Parser, TemporalReferences[TemporalReferences_Min]->GA94_03->Data, TemporalReferences[TemporalReferences_Min]->GA94_03->Size);
 
-        TemporalReference_GA94_03_CC_Offset=TemporalReference.size()+1;
-    }
-
-    BS_Begin();
-    Mark_1();
-    Mark_1();
-    Mark_1();
-    Mark_1();
-    Mark_1();
-    Mark_1();
-    Mark_1();
-    Mark_1();
-    BS_End();
+            Element_End0();
+        #endif //defined(MEDIAINFO_DTVCCTRANSPORT_YES)
 
-    if (additional_data_flag)
-        Skip_XX(Element_Size-Element_Offset,                    "additional_user_data");
+        TemporalReferences_Min+=(seq_parameter_sets[seq_parameter_set_id]->frame_mbs_only_flag?2:1);
+    }
 }
 
 //---------------------------------------------------------------------------
 // SEI - 5 - GA94 - 0x03
 void File_Avc::sei_message_user_data_registered_itu_t_t35_GA94_06()
 {
-    Element_Info("Bar data");
+    Element_Info1("Bar data");
 
     //Parsing
     bool   top_bar_flag, bottom_bar_flag, left_bar_flag, right_bar_flag;
@@ -1660,21 +2313,21 @@
 // SEI - 5
 void File_Avc::sei_message_user_data_unregistered(int32u payloadSize)
 {
-    Element_Info("user_data_unregistered");
+    Element_Info1("user_data_unregistered");
 
     //Parsing
     int128u uuid_iso_iec_11578;
-    Get_GUID(uuid_iso_iec_11578,                               "uuid_iso_iec_11578");
+    Get_GUID(uuid_iso_iec_11578,                                "uuid_iso_iec_11578");
 
     switch (uuid_iso_iec_11578.hi)
     {
-        case  0xB748D9E6BDE945DCLL : Element_Info("x264");
+        case  0xB748D9E6BDE945DCLL : Element_Info1("x264");
                                      sei_message_user_data_unregistered_x264(payloadSize-16); break;
-        case  0x684E92AC604A57FBLL : Element_Info("eavc");
+        case  0x684E92AC604A57FBLL : Element_Info1("eavc");
                                      sei_message_user_data_unregistered_x264(payloadSize-16); break;
         default :
-                    Element_Info("unknown");
-                    Skip_XX(payloadSize-8,                      "data");
+                    Element_Info1("unknown");
+                    Skip_XX(payloadSize-16,                     "data");
     }
 }
 
@@ -1695,18 +2348,18 @@
     size_t Loop=0;
     do
     {
-        Data_Pos=Data.find(_T(" - "), Data_Pos_Before);
+        Data_Pos=Data.find(__T(" - "), Data_Pos_Before);
         if (Data_Pos==std::string::npos)
             Data_Pos=Data.size();
-        if (Data.find(_T("options: "), Data_Pos_Before)==Data_Pos_Before)
+        if (Data.find(__T("options: "), Data_Pos_Before)==Data_Pos_Before)
         {
-            Element_Begin("options");
+            Element_Begin1("options");
             size_t Options_Pos;
             size_t Options_Pos_Before=Data_Pos_Before;
             Encoded_Library_Settings.clear();
             do
             {
-                Options_Pos=Data.find(_T(" "), Options_Pos_Before);
+                Options_Pos=Data.find(__T(" "), Options_Pos_Before);
                 if (Options_Pos==std::string::npos)
                     Options_Pos=Data.size();
                 Ztring option;
@@ -1716,7 +2369,7 @@
                 {
                     Ztring Separator;
                     Peek_Local(1, Separator);
-                    if (Separator==_T(" "))
+                    if (Separator==__T(" "))
                     {
                         Skip_Local(1,                               "separator");
                         Options_Pos_Before+=1;
@@ -1727,17 +2380,17 @@
                 while (Options_Pos_Before!=Data.size());
 
                 //Filling
-                if (option!=_T("options:"))
+                if (option!=__T("options:"))
                 {
                     if (!Encoded_Library_Settings.empty())
-                        Encoded_Library_Settings+=_T(" / ");
+                        Encoded_Library_Settings+=__T(" / ");
                     Encoded_Library_Settings+=option;
-                    if (option.find(_T("bitrate="))==0)
-                        BitRate_Nominal=option.substr(8)+_T("000"); //After "bitrate="
+                    if (option.find(__T("bitrate="))==0)
+                        BitRate_Nominal=option.substr(8)+__T("000"); //After "bitrate="
                 }
             }
             while (Options_Pos_Before!=Data.size());
-            Element_End();
+            Element_End0();
         }
         else
         {
@@ -1754,9 +2407,9 @@
                     Value.erase(Value.end()-1);
                 Encoded_Library=Value;
             }
-            if (Loop==1 && Encoded_Library.find(_T("x264"))==0)
+            if (Loop==1 && Encoded_Library.find(__T("x264"))==0)
             {
-                Encoded_Library+=_T(" - ");
+                Encoded_Library+=__T(" - ");
                 Encoded_Library+=Value;
             }
         }
@@ -1772,20 +2425,20 @@
     while (Data_Pos_Before!=Data.size());
 
     //Encoded_Library
-    if (Encoded_Library.find(_T("eavc "))==0)
+    if (Encoded_Library.find(__T("eavc "))==0)
     {
-        Encoded_Library_Name=_T("eavc");
-        Encoded_Library_Version=Encoded_Library.SubString(_T("eavc "), _T(""));
+        Encoded_Library_Name=__T("eavc");
+        Encoded_Library_Version=Encoded_Library.SubString(__T("eavc "), __T(""));
     }
-    else if (Encoded_Library.find(_T("x264 - "))==0)
+    else if (Encoded_Library.find(__T("x264 - "))==0)
     {
-        Encoded_Library_Name=_T("x264");
-        Encoded_Library_Version=Encoded_Library.SubString(_T("x264 - "), _T(""));
+        Encoded_Library_Name=__T("x264");
+        Encoded_Library_Version=Encoded_Library.SubString(__T("x264 - "), __T(""));
     }
-    else if (Encoded_Library.find(_T("SUPER(C) by eRightSoft "))==0)
+    else if (Encoded_Library.find(__T("SUPER(C) by eRightSoft "))==0)
     {
-        Encoded_Library_Name=_T("SUPER(C) by eRightSoft");
-        Encoded_Library_Date=Ztring(_T("UTC "))+Encoded_Library.SubString(_T("2000-"), _T(" "));
+        Encoded_Library_Name=__T("SUPER(C) by eRightSoft");
+        Encoded_Library_Date=Ztring(__T("UTC "))+Encoded_Library.SubString(__T("2000-"), __T(" "));
     }
     else
         Encoded_Library_Name=Encoded_Library;
@@ -1793,9 +2446,9 @@
 
 //---------------------------------------------------------------------------
 // SEI - 6
-void File_Avc::sei_message_recovery_point(int32u payloadSize)
+void File_Avc::sei_message_recovery_point()
 {
-    Element_Info("recovery_point");
+    Element_Info1("recovery_point");
 
     //Parsing
     BS_Begin();
@@ -1810,17 +2463,17 @@
 // SEI - 32
 void File_Avc::sei_message_mainconcept(int32u payloadSize)
 {
-    Element_Info("MainConcept text");
+    Element_Info1("MainConcept text");
 
     //Parsing
     Ztring Text;
     Get_Local(payloadSize, Text,                                "text");
 
-    if (Text.find(_T("produced by MainConcept H.264/AVC Codec v"))!=std::string::npos)
+    if (Text.find(__T("produced by MainConcept H.264/AVC Codec v"))!=std::string::npos)
     {
-        Encoded_Library=Text.SubString(_T("produced by "), _T(" MainConcept AG"));
-        Encoded_Library_Name=_T("MainConcept H.264/AVC Codec");
-        Encoded_Library_Version=Text.SubString(_T("produced by MainConcept H.264/AVC Codec v"), _T(" (c) "));
+        Encoded_Library=Text.SubString(__T("produced by "), __T(" MainConcept AG"));
+        Encoded_Library_Name=__T("MainConcept H.264/AVC Codec");
+        Encoded_Library_Version=Text.SubString(__T("produced by MainConcept H.264/AVC Codec v"), __T(" (c) "));
         Encoded_Library_Date=MediaInfoLib::Config.Library_Get(InfoLibrary_Format_MainConcept_Avc, Encoded_Library_Version, InfoLibrary_Date);
     }
 }
@@ -1832,7 +2485,9 @@
     Element_Name("seq_parameter_set");
 
     //parsing
-    seq_parameter_set_data();
+    int32u seq_parameter_set_id;
+    if (!seq_parameter_set_data(seq_parameter_sets, seq_parameter_set_id))
+        return;
     Mark_1(                                                     );
     size_t BS_bits=Data_BS_Remain()%8;
     while (BS_bits)
@@ -1871,10 +2526,6 @@
     }
 
     FILLING_BEGIN_PRECISE();
-        //Filling
-        seq_parameter_set_ids[seq_parameter_set_id].profile_idc=profile_idc;
-        seq_parameter_set_ids[seq_parameter_set_id].level_idc=level_idc;
-
         //NextCode
         NextCode_Clear();
         NextCode_Add(0x08);
@@ -1889,9 +2540,6 @@
         Streams[0x0B].Searching_Payload=true; //end_of_stream
         if (Streams[0x07].ShouldDuplicate)
             Streams[0x0B].ShouldDuplicate=true; //end_of_stream
-
-        //Setting as OK
-        SPS_IsParsed=true;
     FILLING_END();
 }
 
@@ -1902,12 +2550,24 @@
     Element_Name("pic_parameter_set");
 
     //Parsing
-    int32u num_slice_groups_minus1;
+    int32u  pic_parameter_set_id, seq_parameter_set_id, num_slice_groups_minus1, num_ref_idx_l0_default_active_minus1, num_ref_idx_l1_default_active_minus1;
+    int8u   weighted_bipred_idc;
+    bool    entropy_coding_mode_flag,bottom_field_pic_order_in_frame_present_flag, redundant_pic_cnt_present_flag, weighted_pred_flag;
     BS_Begin();
-    Skip_UE(                                                    "pic_parameter_set_id");
-    Skip_UE(                                                    "seq_parameter_set_id");
+    Get_UE (pic_parameter_set_id,                               "pic_parameter_set_id");
+    Get_UE (seq_parameter_set_id,                               "seq_parameter_set_id");
+    std::vector<seq_parameter_set_struct*>::iterator seq_parameter_set_Item;
+    if (seq_parameter_set_id>=seq_parameter_sets.size() || (*(seq_parameter_set_Item=seq_parameter_sets.begin()+seq_parameter_set_id))==NULL || !(*seq_parameter_set_Item)->IsSynched)
+    {
+        if (seq_parameter_set_id>=subset_seq_parameter_sets.size() || (*(seq_parameter_set_Item=subset_seq_parameter_sets.begin()+seq_parameter_set_id))==NULL || !(*seq_parameter_set_Item)->IsSynched)
+        {
+            //Not yet present
+            Skip_BS(Data_BS_Remain(),                               "Data (seq_parameter_set is missing)");
+            return;
+        }
+    }
     Get_SB (entropy_coding_mode_flag,                           "entropy_coding_mode_flag");
-    Get_SB (pic_order_present_flag,                             "pic_order_present_flag");
+    Get_SB (bottom_field_pic_order_in_frame_present_flag,       "bottom_field_pic_order_in_frame_present_flag");
     Get_UE (num_slice_groups_minus1,                            "num_slice_groups_minus1");
     if (num_slice_groups_minus1>7)
     {
@@ -1942,10 +2602,10 @@
         {
             int32u pic_size_in_map_units_minus1;
             Get_UE (pic_size_in_map_units_minus1,               "pic_size_in_map_units_minus1");
-            if(pic_size_in_map_units_minus1>(pic_width_in_mbs_minus1+1)*(pic_height_in_map_units_minus1+1))
+            if(pic_size_in_map_units_minus1>((*seq_parameter_set_Item)->pic_width_in_mbs_minus1+1)*((*seq_parameter_set_Item)->pic_height_in_map_units_minus1+1))
             {
                 Trusted_IsNot("pic_size_in_map_units_minus1 too high");
-                pic_size_in_map_units_minus1=0;
+                return;
             }
             #if defined (__mips__)       || defined (__mipsel__)
                 int32u slice_group_id_Size=(int32u)(std::ceil(std::log((double)(num_slice_groups_minus1+1))/std::log((double)10))); //std::log is natural logarithm
@@ -1953,19 +2613,19 @@
                 int32u slice_group_id_Size=(int32u)(std::ceil(std::log((float32)(num_slice_groups_minus1+1))/std::log((float32)10))); //std::log is natural logarithm
             #endif
             for (int32u Pos=0; Pos<=pic_size_in_map_units_minus1; Pos++)
-                Skip_S4(slice_group_id_Size,                    "slice_group_id");
+                Skip_BS(slice_group_id_Size,                    "slice_group_id");
         }
     }
-    Skip_UE(                                                    "num_ref_idx_l0_active_minus1");
-    Skip_UE(                                                    "num_ref_idx_l1_active_minus1");
-    Skip_SB(                                                    "weighted_pred_flag");
-    Skip_S1(2,                                                  "weighted_bipred_idc");
+    Get_UE (num_ref_idx_l0_default_active_minus1,               "num_ref_idx_l0_default_active_minus1");
+    Get_UE (num_ref_idx_l1_default_active_minus1,               "num_ref_idx_l1_default_active_minus1");
+    Get_SB (weighted_pred_flag,                                 "weighted_pred_flag");
+    Get_S1 (2, weighted_bipred_idc,                             "weighted_bipred_idc");
     Skip_SE(                                                    "pic_init_qp_minus26");
     Skip_SE(                                                    "pic_init_qs_minus26");
     Skip_SE(                                                    "chroma_qp_index_offset");
     Skip_SB(                                                    "deblocking_filter_control_present_flag");
     Skip_SB(                                                    "constrained_intra_pred_flag");
-    Skip_SB(                                                    "redundant_pic_cnt_present_flag");
+    Get_SB (redundant_pic_cnt_present_flag,                     "redundant_pic_cnt_present_flag");
     bool more_rbsp_data=false;
     if (Element_Size)
     {
@@ -2006,15 +2666,42 @@
     }
 
     FILLING_BEGIN_PRECISE();
+        //Integrity
+        if (pic_parameter_set_id>=256)
+        {
+            Trusted_IsNot("pic_parameter_set_id not valid");
+            return; //Problem, not valid
+        }
+        if (seq_parameter_set_id>=31)
+        {
+            Trusted_IsNot("seq_parameter_set_id not valid");
+            return; //Problem, not valid
+        }
+
         //NextCode
         NextCode_Clear();
         NextCode_Add(0x05);
         NextCode_Add(0x06);
-        if (!subset_seq_parameter_set_ids.empty())
+        if (!subset_seq_parameter_sets.empty())
             NextCode_Add(0x14); //slice_layer_extension
 
+        //Filling
+        if (pic_parameter_set_id>=pic_parameter_sets.size())
+            pic_parameter_sets.resize(pic_parameter_set_id+1);
+        std::vector<pic_parameter_set_struct*>::iterator pic_parameter_sets_Item=pic_parameter_sets.begin()+pic_parameter_set_id;
+        delete *pic_parameter_sets_Item; *pic_parameter_sets_Item=new pic_parameter_set_struct();
+        (*pic_parameter_sets_Item)->IsSynched                                       =true;
+        (*pic_parameter_sets_Item)->seq_parameter_set_id                            =(int8u)seq_parameter_set_id;
+        (*pic_parameter_sets_Item)->entropy_coding_mode_flag                        =entropy_coding_mode_flag;
+        (*pic_parameter_sets_Item)->bottom_field_pic_order_in_frame_present_flag    =bottom_field_pic_order_in_frame_present_flag;
+        (*pic_parameter_sets_Item)->num_ref_idx_l0_default_active_minus1            =(int8u)num_ref_idx_l0_default_active_minus1;
+        (*pic_parameter_sets_Item)->num_ref_idx_l1_default_active_minus1            =(int8u)num_ref_idx_l1_default_active_minus1;
+        (*pic_parameter_sets_Item)->weighted_pred_flag                              =weighted_pred_flag;
+        (*pic_parameter_sets_Item)->weighted_bipred_idc                             =weighted_bipred_idc;
+        (*pic_parameter_sets_Item)->redundant_pic_cnt_present_flag                  =redundant_pic_cnt_present_flag;
+
         //Autorisation of other streams
-        if (!seq_parameter_set_ids.empty())
+        if (!seq_parameter_sets.empty())
         {
             for (int8u Pos=0x01; Pos<=0x06; Pos++)
             {
@@ -2023,7 +2710,7 @@
                     Streams[Pos].ShouldDuplicate=true;
             }
         }
-        if (!subset_seq_parameter_set_ids.empty())
+        if (!subset_seq_parameter_sets.empty())
         {
             Streams[0x14].Searching_Payload=true; //slice_layer_extension
             if (Streams[0x08].ShouldDuplicate)
@@ -2031,7 +2718,8 @@
         }
 
         //Setting as OK
-        PPS_IsParsed=true;
+        if (!Status[IsAccepted])
+            Accept("AVC");
     FILLING_END();
 }
 
@@ -2043,8 +2731,8 @@
 
     int8u primary_pic_type;
     BS_Begin();
-    Get_S1 ( 3, primary_pic_type,                               "primary_pic_type"); Param_Info(Avc_primary_pic_type[primary_pic_type]);
-    Mark_1(                                                     );
+    Get_S1 ( 3, primary_pic_type,                               "primary_pic_type"); Param_Info1(Avc_primary_pic_type[primary_pic_type]);
+    Mark_1_NoTrustError(                                        ); //Found 1 file without this bit
     BS_End();
 }
 
@@ -2069,7 +2757,7 @@
 
 //---------------------------------------------------------------------------
 // Packet "0E"
-void File_Avc::prefix_nal_unit()
+void File_Avc::prefix_nal_unit(bool svc_extension_flag)
 {
     Element_Name("prefix_nal_unit");
 
@@ -2087,8 +2775,11 @@
     Element_Name("subset_seq_parameter_set");
 
     //Parsing
-    seq_parameter_set_data();
-    if (profile_idc==83 || profile_idc==86)
+    int32u subset_seq_parameter_set_id;
+    if (!seq_parameter_set_data(subset_seq_parameter_sets, subset_seq_parameter_set_id))
+        return;
+    std::vector<seq_parameter_set_struct*>::iterator subset_seq_parameter_sets_Item=subset_seq_parameter_sets.begin()+subset_seq_parameter_set_id;
+    if ((*subset_seq_parameter_sets_Item)->profile_idc==83 || (*subset_seq_parameter_sets_Item)->profile_idc==86)
     {
         //bool svc_vui_parameters_present_flag;
         seq_parameter_set_svc_extension();
@@ -2098,11 +2789,11 @@
             svc_vui_parameters_extension();
         */
     }
-    else if (profile_idc==118 || profile_idc==128)
+    else if ((*subset_seq_parameter_sets_Item)->profile_idc==118 || (*subset_seq_parameter_sets_Item)->profile_idc==128)
     {
         //bool mvc_vui_parameters_present_flag, additional_extension2_flag;
         Mark_1();
-        seq_parameter_set_mvc_extension();
+        seq_parameter_set_mvc_extension(subset_seq_parameter_set_id);
         /* The rest is not yet implemented
         Get_SB (mvc_vui_parameters_present_flag,                "mvc_vui_parameters_present_flag");
         if (mvc_vui_parameters_present_flag)
@@ -2122,10 +2813,6 @@
     BS_End();
 
     FILLING_BEGIN();
-        //Filling
-        subset_seq_parameter_set_ids[seq_parameter_set_id].profile_idc=profile_idc;
-        subset_seq_parameter_set_ids[seq_parameter_set_id].level_idc=level_idc;
-
         //NextCode
         NextCode_Clear();
         NextCode_Add(0x08);
@@ -2145,7 +2832,7 @@
 
 //---------------------------------------------------------------------------
 // Packet "14"
-void File_Avc::slice_layer_extension()
+void File_Avc::slice_layer_extension(bool svc_extension_flag)
 {
     Element_Name("slice_layer_extension");
 
@@ -2166,54 +2853,56 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
-void File_Avc::seq_parameter_set_data()
+bool File_Avc::seq_parameter_set_data(std::vector<seq_parameter_set_struct*> &Data, int32u &Data_id)
 {
+    //Parsing
+    void*   vui_parameters_Item=NULL;
+    int32u  chroma_format_idc=1, bit_depth_luma_minus8=0, bit_depth_chroma_minus8=0, log2_max_frame_num_minus4, pic_order_cnt_type, log2_max_pic_order_cnt_lsb_minus4=(int32u)-1, max_num_ref_frames, pic_width_in_mbs_minus1, pic_height_in_map_units_minus1, frame_crop_left_offset=0, frame_crop_right_offset=0, frame_crop_top_offset=0, frame_crop_bottom_offset=0;
+    int8u   profile_idc, level_idc;
+    bool    constraint_set3_flag, separate_colour_plane_flag=false, delta_pic_order_always_zero_flag=false, frame_mbs_only_flag, mb_adaptive_frame_field_flag=false;
     Get_B1 (profile_idc,                                        "profile_idc");
     BS_Begin();
-    Element_Begin("constraints");
+    Element_Begin1("constraints");
         Skip_SB(                                                "constraint_set0_flag");
         Skip_SB(                                                "constraint_set1_flag");
         Skip_SB(                                                "constraint_set2_flag");
-        Skip_SB(                                                "constraint_set3_flag");
+        Get_SB (constraint_set3_flag,                           "constraint_set3_flag");
         Skip_SB(                                                "reserved_zero_4bits");
         Skip_SB(                                                "reserved_zero_4bits");
         Skip_SB(                                                "reserved_zero_4bits");
         Skip_SB(                                                "reserved_zero_4bits");
-    Element_End();
+    Element_End0();
     Get_S1 ( 8, level_idc,                                      "level_idc");
-    Get_UE (    seq_parameter_set_id,                           "seq_parameter_set_id");
-    if (profile_idc==100
-     || profile_idc==110
-     || profile_idc==122
-     || profile_idc==244
-     || profile_idc== 44
-     || profile_idc== 83
-     || profile_idc== 86
-     || profile_idc==118
-     || profile_idc==128) //High profiles
-    {
-        Element_Begin("high profile specific");
-        Get_UE (chroma_format_idc,                              "chroma_format_idc");
-        if (chroma_format_idc>3)
-        {
-            Trusted_IsNot("chroma_format_idc is too high");
-            chroma_format_idc=1;
-        }
-        Param_Info(Avc_Colorimetry_format_idc[chroma_format_idc]);
-        if (chroma_format_idc==3)
-            Skip_SB(                                            "residual_colour_transform_flag");
-        Get_UE (bit_depth_luma_minus8,                          "bit_depth_luma_minus8");
-        Get_UE (bit_depth_chroma_minus8,                        "bit_depth_chroma_minus8");
-        Skip_SB(                                                "qpprime_y_zero_transform_bypass_flag");
-        TEST_SB_SKIP(                                           "seq_scaling_matrix_present_flag");
-            for (int32u Pos=0; Pos<8; Pos++)
-            {
-                TEST_SB_SKIP(                                   "seq_scaling_list_present_flag");
-                    scaling_list(Pos<6?16:64);
-                TEST_SB_END();
-            }
-        TEST_SB_END();
-        Element_End();
+    Get_UE (    Data_id,                                        "seq_parameter_set_id");
+    switch (profile_idc)
+    {
+        case 100 :
+        case 110 :
+        case 122 :
+        case 244 :
+        case  44 :
+        case  83 :
+        case  86 :
+        case 118 :
+        case 128 :  //High profiles
+                    Element_Begin1("high profile specific");
+                    Get_UE (chroma_format_idc,                  "chroma_format_idc"); Param_Info1C((chroma_format_idc<3), Avc_Colorimetry_format_idc[chroma_format_idc]);
+                    if (chroma_format_idc==3)
+                        Get_SB (separate_colour_plane_flag,     "separate_colour_plane_flag");
+                    Get_UE (bit_depth_luma_minus8,              "bit_depth_luma_minus8");
+                    Get_UE (bit_depth_chroma_minus8,            "bit_depth_chroma_minus8");
+                    Skip_SB(                                    "qpprime_y_zero_transform_bypass_flag");
+                    TEST_SB_SKIP(                               "seq_scaling_matrix_present_flag");
+                        for (int32u Pos=0; Pos<8; Pos++)
+                        {
+                            TEST_SB_SKIP(                       "seq_scaling_list_present_flag");
+                                scaling_list(Pos<6?16:64);
+                            TEST_SB_END();
+                        }
+                    TEST_SB_END();
+                    Element_End0();
+                    break;
+        default  :  ;
     }
     Get_UE (log2_max_frame_num_minus4,                          "log2_max_frame_num_minus4");
     Get_UE (pic_order_cnt_type,                                 "pic_order_cnt_type");
@@ -2222,14 +2911,14 @@
     else if (pic_order_cnt_type==1)
     {
         int32u num_ref_frames_in_pic_order_cnt_cycle;
-        Skip_SB(                                                "delta_pic_order_always_zero_flag");
+        Get_SB (delta_pic_order_always_zero_flag,               "delta_pic_order_always_zero_flag");
         Skip_SE(                                                "offset_for_non_ref_pic");
         Skip_SE(                                                "offset_for_top_to_bottom_field");
         Get_UE (num_ref_frames_in_pic_order_cnt_cycle,          "num_ref_frames_in_pic_order_cnt_cycle");
         if (num_ref_frames_in_pic_order_cnt_cycle>=256)
         {
             Trusted_IsNot("num_ref_frames_in_pic_order_cnt_cycle too high");
-            num_ref_frames_in_pic_order_cnt_cycle=0;
+            return false;
         }
         for(int32u Pos=0; Pos<num_ref_frames_in_pic_order_cnt_cycle; Pos++)
             Skip_SE(                                            "offset_for_ref_frame");
@@ -2249,8 +2938,79 @@
         Get_UE (frame_crop_bottom_offset,                       "frame_crop_bottom_offset");
     TEST_SB_END();
     TEST_SB_SKIP(                                               "vui_parameters_present_flag");
-        vui_parameters();
+        vui_parameters(vui_parameters_Item);
     TEST_SB_END();
+
+    FILLING_BEGIN()
+        //Integrity
+        if (Data_id>=32)
+        {
+            Trusted_IsNot("seq_parameter_set_id not valid");
+            delete (seq_parameter_set_struct::vui_parameters_struct*)vui_parameters_Item;
+            return false; //Problem, not valid
+        }
+        if (pic_order_cnt_type==0 && log2_max_pic_order_cnt_lsb_minus4>12)
+        {
+            Trusted_IsNot("log2_max_pic_order_cnt_lsb_minus4 not valid");
+            delete (seq_parameter_set_struct::vui_parameters_struct*)vui_parameters_Item;
+            return false; //Problem, not valid
+        }
+        if (log2_max_frame_num_minus4>12)
+        {
+            Trusted_IsNot("log2_max_frame_num_minus4 not valid");
+            delete (seq_parameter_set_struct::vui_parameters_struct*)vui_parameters_Item;
+            return false; //Problem, not valid
+        }
+
+        //Creating Data
+        if (Data_id>=Data.size())
+            Data.resize(Data_id+1);
+        std::vector<seq_parameter_set_struct*>::iterator Data_Item=Data.begin()+Data_id;
+        delete *Data_Item; *Data_Item=new seq_parameter_set_struct();
+
+        //Filling from stream
+        (*Data_Item)->IsSynched                                     =true;
+        (*Data_Item)->constraint_set3_flag                          =constraint_set3_flag;
+        (*Data_Item)->profile_idc                                   =profile_idc;
+        (*Data_Item)->level_idc                                     =level_idc;
+        (*Data_Item)->chroma_format_idc                             =(int8u)chroma_format_idc;
+        (*Data_Item)->separate_colour_plane_flag                    =separate_colour_plane_flag;
+        (*Data_Item)->bit_depth_luma_minus8                         =(int8u)bit_depth_luma_minus8;
+        (*Data_Item)->bit_depth_chroma_minus8                       =(int8u)bit_depth_chroma_minus8;
+        (*Data_Item)->log2_max_frame_num_minus4                     =(int8u)log2_max_frame_num_minus4;
+        (*Data_Item)->pic_order_cnt_type                            =(int8u)pic_order_cnt_type;
+        (*Data_Item)->log2_max_pic_order_cnt_lsb_minus4             =(int8u)log2_max_pic_order_cnt_lsb_minus4;
+        (*Data_Item)->delta_pic_order_always_zero_flag              =delta_pic_order_always_zero_flag;
+        (*Data_Item)->max_num_ref_frames                            =(int8u)max_num_ref_frames;
+        (*Data_Item)->pic_width_in_mbs_minus1                       =pic_width_in_mbs_minus1;
+        (*Data_Item)->pic_height_in_map_units_minus1                =pic_height_in_map_units_minus1;
+        (*Data_Item)->frame_mbs_only_flag                           =frame_mbs_only_flag;
+        (*Data_Item)->mb_adaptive_frame_field_flag                  =mb_adaptive_frame_field_flag;
+        (*Data_Item)->frame_crop_left_offset                        =frame_crop_left_offset;
+        (*Data_Item)->frame_crop_right_offset                       =frame_crop_right_offset;
+        (*Data_Item)->frame_crop_top_offset                         =frame_crop_top_offset;
+        (*Data_Item)->frame_crop_bottom_offset                      =frame_crop_bottom_offset;
+        (*Data_Item)->vui_parameters                                =(seq_parameter_set_struct::vui_parameters_struct*)vui_parameters_Item;
+
+        //Computing values (for speed)
+        (*Data_Item)->pic_struct_FirstDetected                      =(int8u)-1; //For stats only, init
+        size_t MaxNumber;
+        switch (pic_order_cnt_type)
+        {
+            case 0 : MaxNumber=(*Data_Item)->MaxPicOrderCntLsb      =(int32u)pow(2.0, (int)(log2_max_pic_order_cnt_lsb_minus4+4)); break;
+            case 2 : MaxNumber=(*Data_Item)->MaxFrameNum            =(int32u)pow(2.0, (int)(log2_max_frame_num_minus4+4)); MaxNumber*=2; break;
+            default: Trusted_IsNot("Not supported"); return false;
+        }
+
+        if (MaxNumber>TemporalReferences_Reserved)
+        {
+            TemporalReferences.resize(4*MaxNumber);
+            TemporalReferences_Reserved=MaxNumber;
+        }
+    FILLING_ELSE()
+        return false;
+    FILLING_END()
+    return true;
 }
 
 //---------------------------------------------------------------------------
@@ -2272,11 +3032,16 @@
 }
 
 //---------------------------------------------------------------------------
-void File_Avc::vui_parameters()
+void File_Avc::vui_parameters(void* &vui_parameters_Item_)
 {
-    bool nal_hrd_parameters_present_flag, vcl_hrd_parameters_present_flag;
-    TEST_SB_SKIP(                                               "aspect_ratio_info_present_flag");
-        Get_S1 (8, aspect_ratio_idc,                            "aspect_ratio_idc"); if (aspect_ratio_idc<Avc_PixelAspectRatio_Size) Param_Info(Avc_PixelAspectRatio[aspect_ratio_idc]);
+    //Parsing
+    void    *NAL=NULL, *VCL=NULL;
+    int32u  num_units_in_tick=(int32u)-1, time_scale=(int32u)-1;
+    int16u  sar_width=(int16u)-1, sar_height=(int16u)-1;
+    int8u   aspect_ratio_idc=0, video_format=5, colour_primaries=2, transfer_characteristics=2, matrix_coefficients=2;
+    bool    aspect_ratio_info_present_flag, video_signal_type_present_flag, colour_description_present_flag=false, timing_info_present_flag, fixed_frame_rate_flag=false, nal_hrd_parameters_present_flag, vcl_hrd_parameters_present_flag, pic_struct_present_flag;
+    TEST_SB_GET (aspect_ratio_info_present_flag,                "aspect_ratio_info_present_flag");
+        Get_S1 (8, aspect_ratio_idc,                            "aspect_ratio_idc"); Param_Info1C((aspect_ratio_idc<Avc_PixelAspectRatio_Size), Avc_PixelAspectRatio[aspect_ratio_idc]);
         if (aspect_ratio_idc==0xFF)
         {
             Get_S2 (16, sar_width,                              "sar_width");
@@ -2286,13 +3051,13 @@
     TEST_SB_SKIP(                                               "overscan_info_present_flag");
         Skip_SB(                                                "overscan_appropriate_flag");
     TEST_SB_END();
-    TEST_SB_SKIP(                                               "video_signal_type_present_flag");
-        Get_S1 (3, video_format,                                "video_format"); Param_Info(Avc_video_format[video_format]);
+    TEST_SB_GET (video_signal_type_present_flag,                "video_signal_type_present_flag");
+        Get_S1 (3, video_format,                                "video_format"); Param_Info1(Avc_video_format[video_format]);
         Skip_SB(                                                "video_full_range_flag");
-        TEST_SB_SKIP(                                           "colour_description_present_flag");
-            Get_S1 (8, colour_primaries,                        "colour_primaries"); Param_Info(Avc_colour_primaries(colour_primaries));
-            Get_S1 (8, transfer_characteristics,                "transfer_characteristics"); Param_Info(Avc_transfer_characteristics(transfer_characteristics));
-            Get_S1 (8, matrix_coefficients,                     "matrix_coefficients"); Param_Info(Avc_matrix_coefficients(matrix_coefficients));
+        TEST_SB_GET (colour_description_present_flag,           "colour_description_present_flag");
+            Get_S1 (8, colour_primaries,                        "colour_primaries"); Param_Info1(Mpegv_colour_primaries(colour_primaries));
+            Get_S1 (8, transfer_characteristics,                "transfer_characteristics"); Param_Info1(Mpegv_transfer_characteristics(transfer_characteristics));
+            Get_S1 (8, matrix_coefficients,                     "matrix_coefficients"); Param_Info1(Mpegv_matrix_coefficients(matrix_coefficients));
         TEST_SB_END();
     TEST_SB_END();
     TEST_SB_SKIP(                                               "chroma_loc_info_present_flag");
@@ -2302,44 +3067,80 @@
     TEST_SB_GET (timing_info_present_flag,                      "timing_info_present_flag");
         Get_S4 (32, num_units_in_tick,                          "num_units_in_tick");
         Get_S4 (32, time_scale,                                 "time_scale");
-        Get_SB (fixed_frame_rate_flag,                          "fixed_frame_rate_flag");
+        Get_SB (    fixed_frame_rate_flag,                      "fixed_frame_rate_flag");
     TEST_SB_END();
     TEST_SB_GET (nal_hrd_parameters_present_flag,               "nal_hrd_parameters_present_flag");
-        hrd_parameters(false);
-        NalHrdBpPresentFlag=true;
+        hrd_parameters(NAL);
     TEST_SB_END();
     TEST_SB_GET (vcl_hrd_parameters_present_flag,               "vcl_hrd_parameters_present_flag");
-        hrd_parameters(true);
-        VclHrdBpPresentFlag=true;
+        hrd_parameters(VCL);
     TEST_SB_END();
-    if(nal_hrd_parameters_present_flag || vcl_hrd_parameters_present_flag)
-    {
-        CpbDpbDelaysPresentFlag=true;
+    if (nal_hrd_parameters_present_flag || vcl_hrd_parameters_present_flag)
         Skip_SB(                                                "low_delay_hrd_flag");
-    }
-    Get_SB (pic_struct_present_flag,                            "pic_struct_present_flag");
+    Get_SB (   pic_struct_present_flag,                         "pic_struct_present_flag");
+    seq_parameter_set_struct::vui_parameters_struct::bitstream_restriction_struct* bitstream_restriction=NULL;
     TEST_SB_SKIP(                                               "bitstream_restriction_flag");
+        bitstream_restriction=new seq_parameter_set_struct::vui_parameters_struct::bitstream_restriction_struct();
+        int32u  num_reorder_frames;
         Skip_SB(                                                "motion_vectors_over_pic_boundaries_flag");
         Skip_UE(                                                "max_bytes_per_pic_denom");
         Skip_UE(                                                "max_bits_per_mb_denom");
         Skip_UE(                                                "log2_max_mv_length_horizontal");
         Skip_UE(                                                "log2_max_mv_length_vertical");
-        Skip_UE(                                                "num_reorder_frames");
+        Get_UE (num_reorder_frames,                             "num_reorder_frames");
         Skip_UE(                                                "max_dec_frame_buffering");
+        bitstream_restriction->num_reorder_frames=(int8u)num_reorder_frames;
     TEST_SB_END();
+
+    FILLING_BEGIN();
+        seq_parameter_set_struct::vui_parameters_struct* vui_parameters_Item=new seq_parameter_set_struct::vui_parameters_struct();
+        vui_parameters_Item_=vui_parameters_Item;
+        vui_parameters_Item->aspect_ratio_info_present_flag=aspect_ratio_info_present_flag;
+        if (aspect_ratio_info_present_flag)
+        {
+            vui_parameters_Item->aspect_ratio_idc=aspect_ratio_idc;
+            if (aspect_ratio_idc==0xFF)
+            {
+                vui_parameters_Item->sar_width=sar_width;
+                vui_parameters_Item->sar_height=sar_height;
+            }
+        }
+        vui_parameters_Item->video_signal_type_present_flag=video_signal_type_present_flag;
+        if (video_signal_type_present_flag)
+        {
+            vui_parameters_Item->video_format=video_format;
+            vui_parameters_Item->colour_description_present_flag=colour_description_present_flag;
+            if (colour_description_present_flag)
+            {
+                vui_parameters_Item->colour_primaries=colour_primaries;
+                vui_parameters_Item->transfer_characteristics=transfer_characteristics;
+                vui_parameters_Item->matrix_coefficients=matrix_coefficients;
+            }
+        }
+        vui_parameters_Item->timing_info_present_flag=timing_info_present_flag;
+        if (timing_info_present_flag)
+        {
+            vui_parameters_Item->num_units_in_tick=num_units_in_tick;
+            vui_parameters_Item->time_scale=time_scale;
+            vui_parameters_Item->fixed_frame_rate_flag=fixed_frame_rate_flag;
+        }
+        vui_parameters_Item->NAL=(seq_parameter_set_struct::vui_parameters_struct::xxl*)NAL;
+        vui_parameters_Item->VCL=(seq_parameter_set_struct::vui_parameters_struct::xxl*)VCL;
+        vui_parameters_Item->pic_struct_present_flag=pic_struct_present_flag;
+        vui_parameters_Item->bitstream_restriction=bitstream_restriction;
+    FILLING_ELSE();
+        delete (seq_parameter_set_struct::vui_parameters_struct::xxl*)NAL;
+        delete (seq_parameter_set_struct::vui_parameters_struct::xxl*)VCL;
+        delete bitstream_restriction;
+    FILLING_END();
 }
 
 //---------------------------------------------------------------------------
-void File_Avc::hrd_parameters(bool vcl)
+void File_Avc::hrd_parameters(void* &hrd_parameters_Item_)
 {
-    //Filling
-    if (vcl)
-        VCL.clear();
-    else
-        NAL.clear();
-
     //Parsing
-    int8u  bit_rate_scale, cpb_size_scale;
+    int32u cpb_cnt_minus1;
+    int8u  bit_rate_scale, cpb_size_scale, initial_cpb_removal_delay_length_minus1, cpb_removal_delay_length_minus1, dpb_output_delay_length_minus1, time_offset_length;
     Get_UE (   cpb_cnt_minus1,                                  "cpb_cnt_minus1");
     Get_S1 (4, bit_rate_scale,                                  "bit_rate_scale");
     Get_S1 (4, cpb_size_scale,                                  "cpb_size_scale");
@@ -2348,35 +3149,44 @@
         Trusted_IsNot("cpb_cnt_minus1 too high");
         cpb_cnt_minus1=0;
     }
+    seq_parameter_set_struct::vui_parameters_struct::xxl* ToTest=new seq_parameter_set_struct::vui_parameters_struct::xxl();
+    hrd_parameters_Item_=ToTest;
+    ToTest->SchedSel.resize(cpb_cnt_minus1+1);
     for (int32u SchedSelIdx=0; SchedSelIdx<=cpb_cnt_minus1; SchedSelIdx++)
     {
-        Element_Begin("ShedSel");
-        xxl Item;
+        Element_Begin1("ShedSel");
         int32u bit_rate_value_minus1, cpb_size_value_minus1;
         Get_UE (bit_rate_value_minus1,                          "bit_rate_value_minus1");
-        Item.bit_rate_value=(int32u)((bit_rate_value_minus1+1)*pow(2.0, 6+bit_rate_scale)); Param_Info(Item.bit_rate_value, " bps");
+        ToTest->SchedSel[SchedSelIdx].bit_rate_value=(int32u)((bit_rate_value_minus1+1)*pow(2.0, 6+bit_rate_scale)); Param_Info2(ToTest->SchedSel[SchedSelIdx].bit_rate_value, " bps");
         Get_UE (cpb_size_value_minus1,                          "cpb_size_value_minus1");
-        Item.cpb_size_value=(int32u)((cpb_size_value_minus1+1)*pow(2.0, cpb_size_scale)); Param_Info(Item.cpb_size_value, " bytes");
-        Get_SB (Item.cbr_flag,                                  "cbr_flag");
-        Element_End();
-
-        //Filling
-        if (vcl)
-            VCL.push_back(Item);
-        else
-            NAL.push_back(Item);
+        ToTest->SchedSel[SchedSelIdx].cpb_size_value=(int32u)((cpb_size_value_minus1+1)*pow(2.0, 4+cpb_size_scale)); Param_Info2(ToTest->SchedSel[SchedSelIdx].cpb_size_value, " bits");
+        Get_SB (ToTest->SchedSel[SchedSelIdx].cbr_flag,         "cbr_flag");
+        Element_End0();
     }
     Get_S1 (5, initial_cpb_removal_delay_length_minus1,         "initial_cpb_removal_delay_length_minus1");
     Get_S1 (5, cpb_removal_delay_length_minus1,                 "cpb_removal_delay_length_minus1");
     Get_S1 (5, dpb_output_delay_length_minus1,                  "dpb_output_delay_length_minus1");
-    Get_S1 (5, time_offset_length,                              "time_offset_length");    
+    Get_S1 (5, time_offset_length,                              "time_offset_length");
+
+    //Validity test
+    if (!Element_IsOK() || (ToTest->SchedSel.size()==1 && ToTest->SchedSel[0].bit_rate_value==64))
+    {
+        delete ToTest; ToTest=NULL; hrd_parameters_Item_=NULL; //We do not trust this kind of data
+        return;
+    }
+
+    //Filling
+    ToTest->initial_cpb_removal_delay_length_minus1                                 =initial_cpb_removal_delay_length_minus1;
+    ToTest->cpb_removal_delay_length_minus1                                         =cpb_removal_delay_length_minus1;
+    ToTest->dpb_output_delay_length_minus1                                          =dpb_output_delay_length_minus1;
+    ToTest->time_offset_length                                                      =time_offset_length;
 }
 
 //---------------------------------------------------------------------------
 void File_Avc::nal_unit_header_svc_extension()
 {
     //Parsing
-    Element_Begin("nal_unit_header_svc_extension");
+    Element_Begin1("nal_unit_header_svc_extension");
     Skip_SB(                                                    "idr_flag");
     Skip_S1( 6,                                                 "priority_id");
     Skip_SB(                                                    "no_inter_layer_pred_flag");
@@ -2387,14 +3197,14 @@
     Skip_SB(                                                    "discardable_flag");
     Skip_SB(                                                    "output_flag");
     Skip_S1( 2,                                                 "reserved_three_2bits");
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
 void File_Avc::nal_unit_header_mvc_extension()
 {
     //Parsing
-    Element_Begin("nal_unit_header_mvc_extension");
+    Element_Begin1("nal_unit_header_mvc_extension");
     Skip_SB(                                                    "non_idr_flag");
     Skip_S1( 6,                                                 "priority_id");
     Skip_S1(10,                                                 "view_id");
@@ -2402,44 +3212,52 @@
     Skip_SB(                                                    "anchor_pic_flag");
     Skip_SB(                                                    "inter_view_flag");
     Skip_SB(                                                    "reserved_one_bit");
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
 void File_Avc::seq_parameter_set_svc_extension()
 {
     //Parsing
-    Element_Begin("seq_parameter_set_svc_extension");
+    Element_Begin1("seq_parameter_set_svc_extension");
     //Skip_SB(                                                    "");
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
 void File_Avc::svc_vui_parameters_extension()
 {
     //Parsing
-    Element_Begin("svc_vui_parameters_extension");
+    Element_Begin1("svc_vui_parameters_extension");
     //Skip_SB(                                                    "");
-    Element_End();
+    Element_End0();
 }
 
 //---------------------------------------------------------------------------
-void File_Avc::seq_parameter_set_mvc_extension()
+void File_Avc::seq_parameter_set_mvc_extension(int32u subset_seq_parameter_sets_id)
 {
     //Parsing
-    Element_Begin("seq_parameter_set_mvc_extension");
+    Element_Begin1("seq_parameter_set_mvc_extension");
+    int32u num_views_minus1;
     Get_UE (num_views_minus1,                                   "num_views_minus1");
     //Skip_SB(                                                    "");
-    Element_End();
+    Element_End0();
+
+    std::vector<seq_parameter_set_struct*>::iterator subset_seq_parameter_sets_Item=subset_seq_parameter_sets.begin()+subset_seq_parameter_sets_id;
+    FILLING_BEGIN()
+        (*subset_seq_parameter_sets_Item)->num_views_minus1                         =(int16u)num_views_minus1;
+    FILLING_ELSE()
+        delete (*subset_seq_parameter_sets_Item); (*subset_seq_parameter_sets_Item)=NULL;
+    FILLING_END()
 }
 
 //---------------------------------------------------------------------------
 void File_Avc::mvc_vui_parameters_extension()
 {
     //Parsing
-    Element_Begin("mvc_vui_parameters_extension");
+    Element_Begin1("mvc_vui_parameters_extension");
     Skip_SB(                                                    "");
-    Element_End();
+    Element_End0();
 }
 
 //***************************************************************************
@@ -2449,15 +3267,12 @@
 //---------------------------------------------------------------------------
 void File_Avc::SPS_PPS()
 {
-    //Configuring
-    Trusted=1; //No error is accepted
-
     //Parsing
     int8u Profile, Level, seq_parameter_set_count, pic_parameter_set_count;
+    if (SizedBlocks)
+        Skip_B1(                                                "Version");
     Get_B1 (Profile,                                            "Profile");
     Skip_B1(                                                    "Compatible profile");
-    if (SizedBlocks)
-        Skip_B1(                                                "Reserved");
     Get_B1 (Level,                                              "Level");
     BS_Begin();
     Skip_S1(6,                                                  "Reserved");
@@ -2467,7 +3282,7 @@
     BS_End();
     for (int8u Pos=0; Pos<seq_parameter_set_count; Pos++)
     {
-        Element_Begin("seq_parameter_set");
+        Element_Begin1("seq_parameter_set");
         int16u Size;
         Get_B2 (Size,                                           "Size");
         BS_Begin();
@@ -2484,18 +3299,18 @@
         int64u Element_Size_Save=Element_Size;
         Buffer_Offset+=(size_t)Element_Offset_Save;
         Element_Offset=0;
-        Element_Size=Size-1;
+        Element_Size=Size-(Size?1:0);
         Element_Code=0x07; //seq_parameter_set
         Data_Parse();
         Buffer_Offset-=(size_t)Element_Offset_Save;
         Element_Offset=Element_Offset_Save+Size-1;
         Element_Size=Element_Size_Save;
-        Element_End();
+        Element_End0();
     }
     Get_B1 (pic_parameter_set_count,                            "pic_parameter_set count");
     for (int8u Pos=0; Pos<pic_parameter_set_count; Pos++)
     {
-        Element_Begin("pic_parameter_set");
+        Element_Begin1("pic_parameter_set");
         int16u Size;
         Get_B2 (Size,                                           "Size");
         BS_Begin();
@@ -2515,7 +3330,7 @@
         Buffer_Offset-=(size_t)Element_Offset_Save;
         Element_Offset=Element_Offset_Save+Size-1;
         Element_Size=Element_Size_Save;
-        Element_End();
+        Element_End0();
     }
     if (Element_Offset<Element_Size)
         Skip_XX(Element_Size-Element_Offset,                    "Padding?");
@@ -2523,18 +3338,173 @@
     //Filling
     FILLING_BEGIN_PRECISE();
         //Detection of some bugs in the file
-        if (Profile!=profile_idc || Level!=level_idc)
-            MuxingMode=Ztring("Container profile=")+Ztring().From_Local(Avc_profile_idc(Profile))+_T("@")+Ztring().From_Number(((float)Level)/10, 1);
+        if (!seq_parameter_sets.empty() && seq_parameter_sets[0] && (Profile!=seq_parameter_sets[0]->profile_idc || Level!=seq_parameter_sets[0]->level_idc))
+            MuxingMode=Ztring("Container profile=")+Ztring().From_Local(Avc_profile_idc(Profile))+__T("@")+Ztring().From_Number(((float)Level)/10, 1);
 
         MustParse_SPS_PPS=false;
-        MustParse_SPS_PPS_Done=true;
         if (!Status[IsAccepted])
             Accept("AVC");
-        if (MustParse_SPS_PPS_Only)
-            Finish("AVC");
     FILLING_END();
 }
 
+//***************************************************************************
+// Helpers
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+std::string File_Avc::GOP_Detect (std::string PictureTypes)
+{
+    //Finding a string without blanks
+    size_t PictureTypes_Limit=PictureTypes.find(' ');
+    if (PictureTypes_Limit!=string::npos)
+    {
+        if (PictureTypes_Limit>PictureTypes.size()/2)
+            PictureTypes.resize(PictureTypes_Limit);
+        else
+        {
+            //Trim
+            size_t TrimPos;
+            TrimPos=PictureTypes.find_first_not_of(' ');
+            if (TrimPos!=string::npos)
+                PictureTypes.erase(0, TrimPos);
+            TrimPos=PictureTypes.find_last_not_of(' ');
+            if (TrimPos!=string::npos)
+                PictureTypes.erase(TrimPos+1);
+
+            //Finding the longest string
+            ZtringList List; List.Separator_Set(0, __T(" "));
+            List.Write(Ztring().From_Local(PictureTypes));
+            size_t MaxLength=0;
+            size_t MaxLength_Pos=0;
+            for (size_t Pos=0; Pos<List.size(); Pos++)
+                if (List[Pos].size()>MaxLength)
+                {
+                    MaxLength=List[Pos].size();
+                    MaxLength_Pos=Pos;
+                }
+            PictureTypes=List[MaxLength_Pos].To_Local();
+
+        }
+    }
+
+    //Creating all GOP values
+    std::vector<Ztring> GOPs;
+    size_t GOP_Frame_Count=0;
+    size_t GOP_BFrames_Max=0;
+    size_t I_Pos1=PictureTypes.find('I');
+    while (I_Pos1!=std::string::npos)
+    {
+        size_t I_Pos2=PictureTypes.find('I', I_Pos1+1);
+        if (I_Pos2!=std::string::npos)
+        {
+            std::vector<size_t> P_Positions;
+            size_t P_Position=I_Pos1;
+            do
+            {
+                P_Position=PictureTypes.find('P', P_Position+1);
+                if (P_Position<I_Pos2)
+                    P_Positions.push_back(P_Position);
+            }
+            while (P_Position<I_Pos2);
+            if (P_Positions.size()>1 && P_Positions[0]>I_Pos1+1 && P_Positions[P_Positions.size()-1]==I_Pos2-1)
+                P_Positions.resize(P_Positions.size()-1); //Removing last P-Frame for next test, this is often a terminating P-Frame replacing a B-Frame
+            Ztring GOP;
+            bool IsOK=true;
+            if (!P_Positions.empty())
+            {
+                size_t Delta=P_Positions[0]-I_Pos1;
+                for (size_t Pos=1; Pos<P_Positions.size(); Pos++)
+                    if (P_Positions[Pos]-P_Positions[Pos-1]!=Delta)
+                    {
+                        IsOK=false;
+                        break;
+                    }
+                if (IsOK)
+                {
+                    GOP+=__T("M=")+Ztring::ToZtring(P_Positions[0]-I_Pos1)+__T(", ");
+                    if (P_Positions[0]-I_Pos1>GOP_BFrames_Max)
+                        GOP_BFrames_Max=P_Positions[0]-I_Pos1;
+                }
+            }
+            if (IsOK)
+            {
+                GOP+=__T("N=")+Ztring::ToZtring(I_Pos2-I_Pos1);
+                GOPs.push_back(GOP);
+            }
+            else
+                GOPs.push_back(Ztring()); //There is a problem, blank
+            GOP_Frame_Count+=I_Pos2-I_Pos1;
+        }
+        I_Pos1=I_Pos2;
+    }
+
+    //Some clean up
+    if (GOP_Frame_Count+GOP_BFrames_Max>Frame_Count && !GOPs.empty())
+        GOPs.resize(GOPs.size()-1); //Removing the last one, there may have uncomplete B-frame filling
+    if (GOPs.size()>4)
+        GOPs.erase(GOPs.begin()); //Removing the first one, it is sometime different and we have enough to deal with
+
+    //Filling
+    if (GOPs.size()>=4)
+    {
+        bool IsOK=true;
+        for (size_t Pos=1; Pos<GOPs.size(); Pos++)
+            if (GOPs[Pos]!=GOPs[0])
+            {
+                IsOK=false;
+                break;
+            }
+        if (IsOK)
+            return GOPs[0].To_Local();
+    }
+
+    return string();
+}
+
+//---------------------------------------------------------------------------
+std::string File_Avc::ScanOrder_Detect (std::string ScanOrders)
+{
+    //Finding a string without blanks
+    size_t ScanOrders_Limit=ScanOrders.find(' ');
+    if (ScanOrders_Limit!=string::npos)
+    {
+        if (ScanOrders_Limit>ScanOrders.size()/2)
+            ScanOrders.resize(ScanOrders_Limit);
+        else
+        {
+            //Trim
+            size_t TrimPos;
+            TrimPos=ScanOrders.find_first_not_of(' ');
+            if (TrimPos!=string::npos)
+                ScanOrders.erase(0, TrimPos);
+            TrimPos=ScanOrders.find_last_not_of(' ');
+            if (TrimPos!=string::npos)
+                ScanOrders.erase(TrimPos+1);
+
+            //Finding the longest string
+            ZtringList List; List.Separator_Set(0, __T(" "));
+            List.Write(Ztring().From_Local(ScanOrders));
+            size_t MaxLength=0;
+            size_t MaxLength_Pos=0;
+            for (size_t Pos=0; Pos<List.size(); Pos++)
+                if (List[Pos].size()>MaxLength)
+                {
+                    MaxLength=List[Pos].size();
+                    MaxLength_Pos=Pos;
+                }
+            ScanOrders=List[MaxLength_Pos].To_Local();
+
+        }
+    }
+
+    //Filling
+    if (ScanOrders.find("TBTBTBTB")==0)
+        return ("TFF");
+    if (ScanOrders.find("BTBTBTBT")==0)
+        return ("BFF");
+    return string();
+}
+
 } //NameSpace
 
 #endif //MEDIAINFO_AVC_YES

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Video/File_Avc.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_Avc.h Changed

@@ -1,17 +1,17 @@
 // File_Avc - Info for AVC Video files
-// Copyright (C) 2006-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2006-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -25,6 +25,7 @@
 //---------------------------------------------------------------------------
 #include "MediaInfo/File__Analyze.h"
 #include "MediaInfo/File__Duplicate.h"
+using namespace std;
 //---------------------------------------------------------------------------
 
 namespace MediaInfoLib
@@ -34,15 +35,18 @@
 // Class File_Avc
 //***************************************************************************
 
-class File_Avc : public File__Duplicate
+class File_Avc :
+#if MEDIAINFO_DUPLICATE
+    public File__Duplicate
+#else //MEDIAINFO_DUPLICATE
+    public File__Analyze
+#endif //MEDIAINFO_DUPLICATE
 {
 public :
     //In
-    size_t Frame_Count_Valid;
+    int64u Frame_Count_Valid;
     bool   FrameIsAlwaysComplete;
     bool   MustParse_SPS_PPS;
-    bool   MustParse_SPS_PPS_Only;
-    bool   MustParse_SPS_PPS_Done;
     bool   SizedBlocks;
 
     //Constructor/Destructor
@@ -50,18 +54,146 @@
     ~File_Avc();
 
 private :
+    //Structures - seq_parameter_set
+    struct seq_parameter_set_struct
+    {
+        struct vui_parameters_struct
+        {
+            struct xxl
+            {
+                struct xxl_data
+                {
+                    //HRD configuration
+                    int32u bit_rate_value;
+                    int32u cpb_size_value;
+                    bool   cbr_flag;
+
+                    //sei_message_buffering_period
+                    int32u initial_cpb_removal_delay;
+                    int32u initial_cpb_removal_delay_offset;
+
+                    xxl_data()
+                    {
+                        //HRD configuration
+                        bit_rate_value=(int32u)-1;
+                        cpb_size_value=(int32u)-1;
+                        cbr_flag=true;
+
+                        //sei_message_buffering_period
+                        initial_cpb_removal_delay=(int32u)-1;
+                        initial_cpb_removal_delay_offset=(int32u)-1;
+                    }
+                };
+                vector<xxl_data> SchedSel;
+                int8u   initial_cpb_removal_delay_length_minus1;
+                int8u   cpb_removal_delay_length_minus1;
+                int8u   dpb_output_delay_length_minus1;
+                int8u   time_offset_length;
+            };
+            struct bitstream_restriction_struct
+            {
+                int8u   num_reorder_frames;
+            };
+            xxl*    NAL;
+            xxl*    VCL;
+            bitstream_restriction_struct* bitstream_restriction;
+            int32u  num_units_in_tick;
+            int32u  time_scale;
+            int16u  sar_width;
+            int16u  sar_height;
+            int8u   aspect_ratio_idc;
+            int8u   video_format;
+            int8u   colour_primaries;
+            int8u   transfer_characteristics;
+            int8u   matrix_coefficients;
+            bool    aspect_ratio_info_present_flag;
+            bool    video_signal_type_present_flag;
+            bool    colour_description_present_flag;
+            bool    timing_info_present_flag;
+            bool    fixed_frame_rate_flag;
+            bool    pic_struct_present_flag;
+        };
+        vui_parameters_struct* vui_parameters;
+        int32u  pic_width_in_mbs_minus1;
+        int32u  pic_height_in_map_units_minus1;
+        int32u  frame_crop_left_offset;
+        int32u  frame_crop_right_offset;
+        int32u  frame_crop_top_offset;
+        int32u  frame_crop_bottom_offset;
+        int32u  MaxPicOrderCntLsb; //Computed value (for speed)
+        int32u  MaxFrameNum; //Computed value (for speed)
+        int16u  num_views_minus1; //MultiView specific field
+        int8u   chroma_format_idc;
+        int8u   profile_idc;
+        int8u   level_idc;
+        int8u   bit_depth_luma_minus8;
+        int8u   bit_depth_chroma_minus8;
+        int8u   log2_max_frame_num_minus4;
+        int8u   pic_order_cnt_type;
+        int8u   log2_max_pic_order_cnt_lsb_minus4;
+        int8u   max_num_ref_frames;
+        int8u   pic_struct_FirstDetected; //For stats only
+        bool    constraint_set3_flag;
+        bool    separate_colour_plane_flag;
+        bool    delta_pic_order_always_zero_flag;
+        bool    frame_mbs_only_flag;
+        bool    mb_adaptive_frame_field_flag;
+        bool    IsSynched; //Computed value
+
+        //Computed values
+        bool    NalHrdBpPresentFlag() {return vui_parameters && vui_parameters->NAL;}
+        bool    VclHrdBpPresentFlag() {return vui_parameters && vui_parameters->VCL;}
+        bool    CpbDpbDelaysPresentFlag() {return vui_parameters && (vui_parameters->NAL || vui_parameters->VCL);}
+        int8u   ChromaArrayType() {return separate_colour_plane_flag?0:chroma_format_idc;}
+
+        //Constructor/Destructor
+        ~seq_parameter_set_struct()
+        {
+            if (vui_parameters)
+            {
+                delete vui_parameters->NAL; //vui_parameters->NAL=NULL;
+                delete vui_parameters->VCL; //vui_parameters->VCL=NULL;
+                delete vui_parameters->bitstream_restriction; //vui_parameters->bitstream_restriction=NULL;
+                delete vui_parameters; //vui_parameters=NULL;
+            }
+        }
+    };
+    typedef vector<seq_parameter_set_struct*> seq_parameter_set_structs;
+
+    //Structures - pic_parameter_set
+    struct pic_parameter_set_struct
+    {
+        int8u   seq_parameter_set_id;
+        int8u   num_ref_idx_l0_default_active_minus1;
+        int8u   num_ref_idx_l1_default_active_minus1;
+        int8u   weighted_bipred_idc;
+        bool    entropy_coding_mode_flag;
+        bool    bottom_field_pic_order_in_frame_present_flag;
+        bool    weighted_pred_flag;
+        bool    redundant_pic_cnt_present_flag;
+        bool    IsSynched; //Computed value
+    };
+    typedef vector<pic_parameter_set_struct*> pic_parameter_set_structs;
+
     //Streams management
     void Streams_Fill();
+    void Streams_Fill(vector<seq_parameter_set_struct*>::iterator seq_parameter_set_Item);
+    void Streams_Fill_subset(vector<seq_parameter_set_struct*>::iterator seq_parameter_set_Item);
     void Streams_Finish();
 
     //Buffer - File header
     bool FileHeader_Begin();
 
     //Buffer - Synchro
-    bool Synchronize() {return Synchronize_0x000001();}
+    bool Synchronize();
     bool Synched_Test();
     void Synched_Init();
 
+    //Buffer - Demux
+    #if MEDIAINFO_DEMUX
+    bool Demux_UnpacketizeContainer_Test();
+    #endif //MEDIAINFO_DEMUX
+
     //Buffer - Global
     void Read_Buffer_Unsynched();
 
@@ -71,9 +203,11 @@
     bool Header_Parser_Fill_Size();
     void Data_Parse();
 
-    //Output buffer
-    size_t Output_Buffer_Get (const String &Value);
-    size_t Output_Buffer_Get (size_t Pos);
+    #if MEDIAINFO_DUPLICATE
+        //Output buffer
+        size_t Output_Buffer_Get (const String &Value);
+        size_t Output_Buffer_Get (size_t Pos);
+    #endif //MEDIAINFO_DUPLICATE
 
     //Options
     void Option_Manage ();
@@ -85,35 +219,40 @@
     void seq_parameter_set();
     void pic_parameter_set();
     void sei();
-    void sei_message();
-    void sei_message_buffering_period(int32u payloadSize);
-    void sei_message_pic_timing(int32u payloadSize);
-    void sei_message_user_data_registered_itu_t_t35(int32u payloadSize);
+    void sei_message(int32u &seq_parameter_set_id);
+    void sei_message_buffering_period(int32u &seq_parameter_set_id);
+    void sei_message_buffering_period_xxl(void* xxl);
+    void sei_message_pic_timing(int32u payloadSize, int32u seq_parameter_set_id);
+    void sei_message_user_data_registered_itu_t_t35();
     void sei_message_user_data_registered_itu_t_t35_DTG1();
     void sei_message_user_data_registered_itu_t_t35_GA94();
     void sei_message_user_data_registered_itu_t_t35_GA94_03();
+    void sei_message_user_data_registered_itu_t_t35_GA94_03_Delayed(int32u seq_parameter_set_id);
     void sei_message_user_data_registered_itu_t_t35_GA94_06();
     void sei_message_user_data_unregistered(int32u payloadSize);
     void sei_message_user_data_unregistered_x264(int32u payloadSize);
-    void sei_message_recovery_point(int32u payloadSize);
+    void sei_message_recovery_point();
     void sei_message_mainconcept(int32u payloadSize);
     void access_unit_delimiter();
     void filler_data();
-    void prefix_nal_unit();
+    void prefix_nal_unit(bool svc_extension_flag);
     void subset_seq_parameter_set();
-    void slice_layer_extension();
+    void slice_layer_extension(bool svc_extension_flag);
 
     //Packets - SubElements
-    void seq_parameter_set_data();
-    void scaling_list(int32u ScalingList_Size);
-    void vui_parameters();
-    void hrd_parameters(bool vcl);
-    void nal_unit_header_svc_extension();
-    void nal_unit_header_mvc_extension();
+    bool seq_parameter_set_data(vector<seq_parameter_set_struct*> &Data, int32u &Data_id);
     void seq_parameter_set_svc_extension();
+    void seq_parameter_set_mvc_extension(int32u subset_seq_parameter_sets_id);
+    void scaling_list(int32u ScalingList_Size);
+    void vui_parameters(void* &vui_parameters_Item);
     void svc_vui_parameters_extension();
-    void seq_parameter_set_mvc_extension();
     void mvc_vui_parameters_extension();
+    void hrd_parameters(void* &hrd_parameters_Item);
+    void nal_unit_header_svc_extension();
+    void nal_unit_header_mvc_extension();
+    void ref_pic_list_modification(int32u slice_type, bool mvc);
+    void pred_weight_table(int32u num_ref_idx_l0_active_minus1, int32u num_ref_idx_l1_active_minus1, int8u ChromaArrayType);
+    void dec_ref_pic_marking(vector<int8u> &memory_management_control_operations);
 
     //Packets - Specific
     void SPS_PPS();
@@ -130,160 +269,124 @@
             ShouldDuplicate=false;
         }
     };
-    std::vector<stream> Streams;
+    vector<stream> Streams;
 
-    //Temporal reference
-    struct temporalreference
+    //Temporal references
+    struct temporal_reference
     {
-        struct cc_data_
+        struct buffer_data
         {
-            int8u cc_type;
-            int8u cc_data[2];
-            bool  cc_valid;
+            size_t Size;
+            int8u* Data;
 
-            cc_data_()
+            buffer_data()
             {
-                cc_valid=false;
+                Size=0;
+                Data=NULL;
             }
-        };
-        std::vector<cc_data_> GA94_03_CC; //Per cc offset
 
-        bool   IsValid;
+            ~buffer_data()
+            {
+                delete[] Data; //Data=NULL;
+            }
+        };
+        #if defined(MEDIAINFO_DTVCCTRANSPORT_YES)
+            buffer_data* GA94_03;
+        #endif //MEDIAINFO_DTVCCTRANSPORT_YES
 
         int32u frame_num;
         int8u  slice_type;
         bool   IsTop;
         bool   IsField;
 
-        temporalreference()
+        temporal_reference()
         {
+            #if defined(MEDIAINFO_DTVCCTRANSPORT_YES)
+                GA94_03=NULL;
+            #endif //MEDIAINFO_DTVCCTRANSPORT_YES
             slice_type=(int8u)-1;
-            IsValid=false;
         }
-    };
-    std::vector<temporalreference> TemporalReference; //per pic_order_cnt_lsb
-    temporalreference              TemporalReference_Temp;
-    size_t                         TemporalReference_Offset;
-    bool                           TemporalReference_Offset_Moved;
-    size_t                         TemporalReference_GA94_03_CC_Offset;
-    size_t                         TemporalReference_Offset_pic_order_cnt_lsb_Last;
-
-    //seq_parameter_set
-    struct seq_parameter_set_
-    {
-        int8u profile_idc;
-        int8u level_idc;
 
-        seq_parameter_set_()
+        ~temporal_reference()
         {
-            profile_idc=0;
-            level_idc=0;
+            #if defined(MEDIAINFO_DTVCCTRANSPORT_YES)
+                delete GA94_03; //GA94_03=NULL;
+            #endif //MEDIAINFO_DTVCCTRANSPORT_YES
         }
     };
-    std::map<int32u, seq_parameter_set_> seq_parameter_set_ids;
-    std::map<int32u, seq_parameter_set_> subset_seq_parameter_set_ids;
-
-    //Temp
-    std::vector<File__Analyze*> GA94_03_CC_Parsers;
-
-    //Replacement of File__Analyze
-    const int8u* Buffer_ToSave;
-    size_t Buffer_Size_ToSave;
+    typedef vector<temporal_reference*> temporal_references;
+    temporal_references                 TemporalReferences; //per pic_order_cnt_lsb
+    temporal_reference*                 TemporalReferences_DelayedElement;
+    size_t                              TemporalReferences_Min;
+    size_t                              TemporalReferences_Max;
+    size_t                              TemporalReferences_Reserved;
+    size_t                              TemporalReferences_Offset;
+    size_t                              TemporalReferences_Offset_pic_order_cnt_lsb_Last;
+    int64s                              TemporalReferences_pic_order_cnt_Min;
+
+    //Text
+    #if defined(MEDIAINFO_DTVCCTRANSPORT_YES)
+        File__Analyze*                  GA94_03_Parser;
+        bool                            GA94_03_IsPresent;
+    #endif //defined(MEDIAINFO_DTVCCTRANSPORT_YES)
+
+    //Replacement of File__Analyze buffer
+    const int8u*                        Buffer_ToSave;
+    size_t                              Buffer_Size_ToSave;
+
+    //parameter_sets
+    seq_parameter_set_structs           seq_parameter_sets;
+    seq_parameter_set_structs           subset_seq_parameter_sets;
+    pic_parameter_set_structs           pic_parameter_sets;
+
+    //File specific
+    int8u                               SizeOfNALU_Minus1;
+
+    //Status
+    size_t                              IFrame_Count;
+    int32s                              prevPicOrderCntMsb;
+    int32u                              prevPicOrderCntLsb;
+    int32u                              prevTopFieldOrderCnt;
+    int32u                              prevFrameNum;
+    int32u                              prevFrameNumOffset;
+    vector<int8u>                       prevMemoryManagementControlOperations;
 
     //Count of a Packets
-    size_t Frame_Count;
-    size_t Block_Count;
-    size_t Interlaced_Top;
-    size_t Interlaced_Bottom;
-    size_t Structure_Field;
-    size_t Structure_Frame;
-    int8u  FrameRate_Divider;
-
-    //From seq_parameter_set
-    struct xxl
-    {
-        int32u bit_rate_value;
-        int32u cpb_size_value;
-        bool   cbr_flag;
-    };
-    std::vector<xxl> NAL;
-    std::vector<xxl> VCL;
-    Ztring Encoded_Library;
-    Ztring Encoded_Library_Name;
-    Ztring Encoded_Library_Version;
-    Ztring Encoded_Library_Date;
-    Ztring Encoded_Library_Settings;
-    Ztring BitRate_Nominal;
-    Ztring MuxingMode;
-    int32u pic_width_in_mbs_minus1;
-    int32u pic_height_in_map_units_minus1;
-    int32u log2_max_frame_num_minus4;
-    int32u log2_max_pic_order_cnt_lsb_minus4;
-    int32u num_units_in_tick;
-    int32u time_scale;
-    int32u chroma_format_idc;
-    int32u frame_crop_left_offset;
-    int32u frame_crop_right_offset;
-    int32u frame_crop_top_offset;
-    int32u frame_crop_bottom_offset;
-    int32u max_num_ref_frames;
-    int32u pic_order_cnt_type;
-    int32u bit_depth_luma_minus8;
-    int32u bit_depth_chroma_minus8;
-    int32u pic_order_cnt_lsb;
-    int32u pic_order_cnt_lsb_Last;
-    int32u seq_parameter_set_id;
-    int32u num_views_minus1;
-    int32u cpb_cnt_minus1;
-    int32u initial_cpb_removal_delay;
-    int32u initial_cpb_removal_delay_offset;
-    int32u cpb_removal_delay;
-    int32u pic_order_cnt_lsb_Old;
-    int16u sar_width;
-    int16u sar_height;
-    int8u  profile_idc;
-    int8u  level_idc;
-    int8u  aspect_ratio_idc;
-    int8u  video_format;
-    int8u  initial_cpb_removal_delay_length_minus1;
-    int8u  cpb_removal_delay_length_minus1;
-    int8u  dpb_output_delay_length_minus1;
-    int8u  time_offset_length;
-    int8u  pic_struct;
-    int8u  pic_struct_FirstDetected;
-    int8u  SizeOfNALU_Minus1;
-    int8u  colour_primaries;
-    int8u  transfer_characteristics;
-    int8u  matrix_coefficients;
-    int8u  nal_unit_type;
-    bool   GA94_03_CC_IsPresent;
-    bool   frame_mbs_only_flag;
-    bool   timing_info_present_flag;
-    bool   fixed_frame_rate_flag;
-    bool   pic_struct_present_flag;
-    bool   field_pic_flag;
-    bool   entropy_coding_mode_flag;
-    bool   NalHrdBpPresentFlag;
-    bool   VclHrdBpPresentFlag;
-    bool   CpbDpbDelaysPresentFlag;
-    bool   mb_adaptive_frame_field_flag;
-    bool   pic_order_present_flag;
-    bool   svc_extension_flag;
-    bool   field_pic_flag_AlreadyDetected;
+    size_t                              Block_Count;
+    size_t                              Interlaced_Top;
+    size_t                              Interlaced_Bottom;
+    size_t                              Structure_Field;
+    size_t                              Structure_Frame;
 
     //Temp
-    bool SPS_IsParsed;
-    bool PPS_IsParsed;
-
-    //File__Duplicate
-    bool   File__Duplicate_Set  (const Ztring &Value); //Fill a new File__Duplicate value
-    void   File__Duplicate_Write (int64u Element_Code, int32u frame_num=(int32u)-1);
-    File__Duplicate__Writer Writer;
-    int8u  Duplicate_Buffer[1024*1024];
-    size_t Duplicate_Buffer_Size;
-    size_t frame_num_Old;
-    bool   SPS_PPS_AlreadyDone;
-    bool   FLV;
+    Ztring                              Encoded_Library;
+    Ztring                              Encoded_Library_Name;
+    Ztring                              Encoded_Library_Version;
+    Ztring                              Encoded_Library_Date;
+    Ztring                              Encoded_Library_Settings;
+    Ztring                              BitRate_Nominal;
+    Ztring                              MuxingMode;
+    string                              PictureTypes_PreviousFrames;
+    int64u                              tc;
+    int32u                              Firstpic_order_cnt_lsbInBlock;
+    int8u                               nal_ref_idc;
+    int8u                               FrameRate_Divider;
+    bool                                FirstPFrameInGop_IsParsed;
+
+    //Helpers
+    string                              GOP_Detect                              (string PictureTypes);
+    string                              ScanOrder_Detect                        (string ScanOrders);
+
+    #if MEDIAINFO_DUPLICATE
+        bool   File__Duplicate_Set  (const Ztring &Value); //Fill a new File__Duplicate value
+        void   File__Duplicate_Write (int64u Element_Code, int32u frame_num=(int32u)-1);
+        File__Duplicate__Writer Writer;
+        int8u  Duplicate_Buffer[1024*1024];
+        size_t Duplicate_Buffer_Size;
+        size_t frame_num_Old;
+        bool   SPS_PPS_AlreadyDone;
+        bool   FLV;
+    #endif //MEDIAINFO_DUPLICATE
 };
 
 } //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Video/File_Avc_Duplicate.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_Avc_Duplicate.cpp Changed

@@ -1,17 +1,17 @@
 // File__Duplicate - Duplication of some formats
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,14 +22,18 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_AVC_YES)
 //---------------------------------------------------------------------------
 
@@ -54,12 +58,14 @@
 //---------------------------------------------------------------------------
 void File_Avc::Option_Manage()
 {
-    //File__Duplicate configuration
-    if (File__Duplicate_HasChanged())
-    {
-        //Autorisation of other streams
-        Streams[0x07].ShouldDuplicate=true;
-    }
+    #if MEDIAINFO_DUPLICATE
+        //File__Duplicate configuration
+        if (File__Duplicate_HasChanged())
+        {
+            //Autorisation of other streams
+            Streams[0x07].ShouldDuplicate=true;
+        }
+    #endif //MEDIAINFO_DUPLICATE
 }
 
 //***************************************************************************
@@ -67,6 +73,7 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
+#if MEDIAINFO_DUPLICATE
 bool File_Avc::File__Duplicate_Set (const Ztring &Value)
 {
     ZtringList List(Value);
@@ -77,22 +84,22 @@
     std::vector<ZtringList::iterator> Targets_ToRemove;
     std::vector<ZtringList::iterator> Orders_ToAdd;
     std::vector<ZtringList::iterator> Orders_ToRemove;
-    for (ZtringList::iterator Current=List.begin(); Current<List.end(); Current++)
+    for (ZtringList::iterator Current=List.begin(); Current<List.end(); ++Current)
     {
         //Detecting if we want to remove
         bool ToRemove=false;
-        if (Current->find(_T('-'))==0)
+        if (Current->find(__T('-'))==0)
         {
             ToRemove=true;
             Current->erase(Current->begin());
         }
 
         //Managing targets
-        if (Current->find(_T("file:"))==0
-         || Current->find(_T("memory:"))==0)
+        if (Current->find(__T("file:"))==0
+         || Current->find(__T("memory:"))==0)
             (ToRemove?Targets_ToRemove:Targets_ToAdd).push_back(Current);
         //Parser name
-        else if (Current->find(_T("parser=Avc"))==0)
+        else if (Current->find(__T("parser=Avc"))==0)
             IsForUs=true;
         //Managing orders
         else
@@ -110,21 +117,23 @@
     FLV=false;
 
     //For each target to add
-    for (std::vector<ZtringList::iterator>::iterator Target=Targets_ToAdd.begin(); Target<Targets_ToAdd.end(); Target++)
+    for (std::vector<ZtringList::iterator>::iterator Target=Targets_ToAdd.begin(); Target<Targets_ToAdd.end(); ++Target)
         Writer.Configure(**Target);
 
     //For each order to add
-    for (std::vector<ZtringList::iterator>::iterator Order=Orders_ToAdd.begin(); Order<Orders_ToAdd.end(); Order++)
-        if ((**Order)==_T("format=Flv"))
+    for (std::vector<ZtringList::iterator>::iterator Order=Orders_ToAdd.begin(); Order<Orders_ToAdd.end(); ++Order)
+        if ((**Order)==__T("format=Flv"))
             FLV=true;
 
     return true;
 }
+#endif //MEDIAINFO_DUPLICATE
 
 //***************************************************************************
 // Write
 //***************************************************************************
 
+#if MEDIAINFO_DUPLICATE
 void File_Avc::File__Duplicate_Write (int64u Element_Code, int32u frame_num)
 {
     const int8u* ToAdd=Buffer+Buffer_Offset-(size_t)Header_Size+3;
@@ -153,8 +162,8 @@
             else
                 Extra=0; //MPEG-4
             int8u Header[32];
-            int64u2BigEndian(Header+ 0, PTS);
-            int64u2BigEndian(Header+ 8, DTS);
+            int64u2BigEndian(Header+ 0, FrameInfo.PTS);
+            int64u2BigEndian(Header+ 8, FrameInfo.DTS);
             int64u2BigEndian(Header+16, 5+Extra+2+Duplicate_Buffer_Size+1+2+ToAdd_Size); //5+Extra for SPS_SQS header, 2 for SPS size, 1 for PPS count, 2 for PPS size
             Header[24]=1;
             int56u2BigEndian(Header+25, 0);
@@ -165,15 +174,15 @@
             if (Extra==1)
             {
                 SPS_SQS[0]=0x01; //Profile FLV
-                SPS_SQS[1]=profile_idc; //Compatible Profile
+                SPS_SQS[1]=(!seq_parameter_sets.empty() && seq_parameter_sets[0])?seq_parameter_sets[0]->profile_idc:0x00; //Compatible Profile. TODO: Handling more than 1 seq_parameter_set
                 SPS_SQS[2]=0x00; //Reserved
             }
             else
             {
-                SPS_SQS[0]=profile_idc; //Profile MPEG-4
+                SPS_SQS[0]=(!seq_parameter_sets.empty() && seq_parameter_sets[0])?seq_parameter_sets[0]->profile_idc:0x00; //Profile MPEG-4. TODO: Handling more than 1 seq_parameter_set
                 SPS_SQS[1]=0x00; //Compatible Profile
             }
-            SPS_SQS[2+Extra]=level_idc; //Level
+            SPS_SQS[2+Extra]=(!seq_parameter_sets.empty() && seq_parameter_sets[0])?seq_parameter_sets[0]->level_idc:0x00; //Level. TODO: Handling more than 1 seq_parameter_set
             SPS_SQS[3+Extra]=0xFF; //Reserved + Size of NALU length minus 1
             SPS_SQS[4+Extra]=0xE1; //Reserved + seq_parameter_set count
             Writer.Write(SPS_SQS, 5+Extra);
@@ -215,8 +224,8 @@
             //  1 byte  : Type (0=Frame, 1=Header);
             //  7 bytes : Reserved
             int8u Header[32];
-            int64u2BigEndian(Header+ 0, PTS);
-            int64u2BigEndian(Header+ 8, DTS);
+            int64u2BigEndian(Header+ 0, FrameInfo.PTS);
+            int64u2BigEndian(Header+ 8, FrameInfo.DTS);
             int64u2BigEndian(Header+16, Duplicate_Buffer_Size);
             Header[24]=0;
             int56u2BigEndian(Header+25, 0);
@@ -236,24 +245,28 @@
         Duplicate_Buffer_Size+=ToAdd_Size;
         frame_num_Old=frame_num;
     }
-
 }
+#endif //MEDIAINFO_DUPLICATE
 
 //***************************************************************************
 // Output_Buffer
 //***************************************************************************
 
 //---------------------------------------------------------------------------
+#if MEDIAINFO_DUPLICATE
 size_t File_Avc::Output_Buffer_Get (const String &)
 {
     return Writer.Output_Buffer_Get();
 }
+#endif //MEDIAINFO_DUPLICATE
 
 //---------------------------------------------------------------------------
+#if MEDIAINFO_DUPLICATE
 size_t File_Avc::Output_Buffer_Get (size_t)
 {
     return Writer.Output_Buffer_Get();
 }
+#endif //MEDIAINFO_DUPLICATE
 
 } //NameSpace

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Video/File_AvsV.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_AvsV.cpp Changed

@@ -1,31 +1,35 @@
 // File_AvsV - Info for AVS Video files
-// Copyright (C) 2006-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2006-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_AVSV_YES)
 //---------------------------------------------------------------------------
 
@@ -71,7 +75,7 @@
         case 0x40 : return "@6.0";
         case 0x42 : return "@6.2";
         default :
-            return _T('@')+Ztring::ToZtring(level_id);
+            return __T('@')+Ztring::ToZtring(level_id);
     }
 }
 
@@ -293,7 +297,6 @@
 void File_AvsV::Synched_Init()
 {
     //Count of a Packets
-    Frame_Count=0;
     progressive_frame_Count=0;
     Interlaced_Top=0;
     Interlaced_Bottom=0;
@@ -381,7 +384,7 @@
         Buffer_Offset_Temp+=2;
         while(Buffer_Offset_Temp<Buffer_Size && Buffer[Buffer_Offset_Temp]!=0x00)
             Buffer_Offset_Temp+=2;
-        if (Buffer_Offset_Temp<Buffer_Size && Buffer[Buffer_Offset_Temp-1]==0x00 || Buffer_Offset_Temp>=Buffer_Size)
+        if (Buffer_Offset_Temp>=Buffer_Size || Buffer[Buffer_Offset_Temp-1]==0x00)
             Buffer_Offset_Temp--;
     }
 
@@ -418,13 +421,13 @@
         default:
             if (Element_Code>=0x00
              && Element_Code<=0xAF) slice();
-            else if (Element_Code==0xE0 && Element_Size>=2 && CC2(Buffer+Buffer_Offset)==0x0000)
+            else
             {
-                Trusted=0; //This is surely an extract from MPEG-TS
+                if (Frame_Count==0 && Buffer_TotalBytes>Buffer_TotalBytes_FirstSynched_Max)
+                    Trusted=0;
                 Trusted_IsNot("Unattended element");
+
             }
-            else
-                Trusted_IsNot("Unattended element");
     }
 
     if (File_Offset+Buffer_Offset+Element_Size==File_Size && Frame_Count>0 && Count_Get(Stream_Video)==0) //Finalize frames in case of there are less than Frame_Count_Valid frames
@@ -470,12 +473,12 @@
     Get_S2 (14, vertical_size,                                  "vertical_size");
     Get_S1 ( 2, chroma_format,                                  "chroma_format");
     Skip_S1( 3,                                                 "sample_precision");
-    Get_S1 ( 4, aspect_ratio,                                   "aspect_ratio"); Param_Info(AvsV_aspect_ratio[aspect_ratio]);
-    Get_S1 ( 4, frame_rate_code,                                "frame_rate_code"); Param_Info(AvsV_frame_rate[frame_rate_code]);
+    Get_S1 ( 4, aspect_ratio,                                   "aspect_ratio"); Param_Info1(AvsV_aspect_ratio[aspect_ratio]);
+    Get_S1 ( 4, frame_rate_code,                                "frame_rate_code"); Param_Info1(AvsV_frame_rate[frame_rate_code]);
     Get_S3 (18, bit_rate_lower,                                 "bit_rate_lower");
     Mark_1 ();
     Get_S3 (12, bit_rate_upper,                                 "bit_rate_upper");
-    bit_rate=(bit_rate_upper<<18)+bit_rate_lower; Param_Info(bit_rate*8, " bps");
+    bit_rate=(bit_rate_upper<<18)+bit_rate_lower; Param_Info2(bit_rate*8, " bps");
     Get_SB (    low_delay,                                      "low_delay");
     Mark_1 ();
     Skip_S3(18,                                                 "bbv_buffer_size");
@@ -580,14 +583,14 @@
     //Parsing
     int8u extension_start_code_identifier;
     BS_Begin();
-    Get_S1 ( 4, extension_start_code_identifier,                "extension_start_code_identifier"); Param_Info(AvsV_extension_start_code_identifier[extension_start_code_identifier]);
-    Element_Info(AvsV_extension_start_code_identifier[extension_start_code_identifier]);
+    Get_S1 ( 4, extension_start_code_identifier,                "extension_start_code_identifier"); Param_Info1(AvsV_extension_start_code_identifier[extension_start_code_identifier]);
+    Element_Info1(AvsV_extension_start_code_identifier[extension_start_code_identifier]);
 
          switch (extension_start_code_identifier)
     {
         case 2  :{ //sequence_display
                     //Parsing
-                    Get_S1 ( 3, video_format,                   "video_format"); Param_Info(AvsV_video_format[video_format]);
+                    Get_S1 ( 3, video_format,                   "video_format"); Param_Info1(AvsV_video_format[video_format]);
                     Skip_SB(                                    "sample_range");
                     TEST_SB_SKIP(                               "colour_description");
                         Skip_S1( 8,                             "colour_primaries");
@@ -613,7 +616,7 @@
                     Mark_1 ();
                     Info_S3(22, copyright_number_2,             "copyright_number_2");
                     Mark_1 ();
-                    Info_S3(22, copyright_number_3,             "copyright_number_3"); Param_Info(Ztring::ToZtring(((int64u)copyright_number_1<<44)+((int64u)copyright_number_2<<22)+(int64u)copyright_number_3, 16));
+                    Info_S3(22, copyright_number_3,             "copyright_number_3"); Param_Info1(Ztring::ToZtring(((int64u)copyright_number_1<<44)+((int64u)copyright_number_2<<22)+(int64u)copyright_number_3, 16));
                     BS_End();
                 }
                 break;
@@ -666,7 +669,7 @@
                 }
 
     }
-    
+
     //Not sure, but the 3 first official files have this
     if (Element_Size-Element_Offset)
     {
@@ -692,9 +695,8 @@
 
     //Name
     Element_Name("picture_start");
-    Element_Info(Ztring::ToZtring(Frame_Count));
-    if (Element_Code==0xB3)
-        Element_Info(_T("I"));
+    Element_Info1(Ztring::ToZtring(Frame_Count));
+    Element_Info1C((Element_Code==0xB3), __T("I"));
 
     //Parsing
     int8u picture_coding_type=(int8u)-1;
@@ -715,7 +717,7 @@
     }
     if (Element_Code==0xB6) //Only P or B
     {
-        Get_S1 ( 2, picture_coding_type,                        "picture_coding_type"); Element_Info(AvsV_picture_coding_type[picture_coding_type]);
+        Get_S1 ( 2, picture_coding_type,                        "picture_coding_type"); Element_Info1(AvsV_picture_coding_type[picture_coding_type]);
     }
     Skip_S1( 8,                                                 "picture_distance");
     if (low_delay)

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Video/File_AvsV.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_AvsV.h Changed

@@ -1,17 +1,17 @@
 // File_AvsV - Info for AVS Video files
-// Copyright (C) 2008-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -42,7 +42,7 @@
 {
 public :
     //In
-    size_t Frame_Count_Valid;
+    int64u Frame_Count_Valid;
     bool   FrameIsAlwaysComplete;
 
     //constructor/Destructor
@@ -60,7 +60,7 @@
     bool Synchronize() {return Synchronize_0x000001();}
     bool Synched_Test();
     void Synched_Init();
-    
+
     //Buffer - Per element
     void Header_Parse();
     bool Header_Parser_QuickSearch();
@@ -76,9 +76,8 @@
     void picture_start();
     void video_edit();
     void reserved();
-    
+
     //Count of a Packets
-    size_t Frame_Count;
     size_t progressive_frame_Count;
     size_t Interlaced_Top;
     size_t Interlaced_Bottom;

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Video/File_Dirac.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_Dirac.cpp Changed

@@ -1,31 +1,35 @@
 // File_Dirac - Info for DIRAC  files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_DIRAC_YES)
 //---------------------------------------------------------------------------
 
@@ -467,15 +471,21 @@
 bool File_Dirac::Synchronize()
 {
     //Synchronizing
-    while (Buffer_Offset+5<=Buffer_Size
-        && CC4(Buffer+Buffer_Offset)!=0x42424344)  //"BBCD"
-        Buffer_Offset++;
+    while(Buffer_Offset+4<=Buffer_Size && (Buffer[Buffer_Offset  ]!=0x42
+                                        || Buffer[Buffer_Offset+1]!=0x42
+                                        || Buffer[Buffer_Offset+2]!=0x43
+                                        || Buffer[Buffer_Offset+3]!=0x44)) //"BBCD"
+    {
+        Buffer_Offset+=2;
+        while(Buffer_Offset<Buffer_Size && Buffer[Buffer_Offset]!=0x42)
+            Buffer_Offset+=2;
+        if (Buffer_Offset>=Buffer_Size || Buffer[Buffer_Offset-1]==0x42)
+            Buffer_Offset--;
+    }
 
     //Parsing last bytes if needed
-    if (Buffer_Offset+5>Buffer_Size)
+    if (Buffer_Offset+4>Buffer_Size)
     {
-        if (Buffer_Offset+4==Buffer_Size && CC4(Buffer+Buffer_Offset)!=0x42424344) //"BBCD"
-            Buffer_Offset++;
         if (Buffer_Offset+3==Buffer_Size && CC3(Buffer+Buffer_Offset)!=0x424243)    //"BBC"
             Buffer_Offset++;
         if (Buffer_Offset+2==Buffer_Size && CC2(Buffer+Buffer_Offset)!=0x4242)      //"BB"
@@ -511,9 +521,6 @@
 //---------------------------------------------------------------------------
 void File_Dirac::Synched_Init()
 {
-    //Count of a Packets
-    Frame_Count=0;
-
     //Temp
     Dirac_base_video_format((int32u)-1, frame_width, frame_height, chroma_format, source_sampling,
                             clean_width, clean_height, clean_left_offset, clean_top_offset,
@@ -616,7 +623,7 @@
 
     if (version_major<=2)
     {
-        Get_UI(base_video_format,                               "base video format"); //Param_Info(Dirac_base_video_format(base_video_format));
+        Get_UI(base_video_format,                               "base video format"); //Param_Info1(Dirac_base_video_format(base_video_format));
         Dirac_base_video_format(base_video_format, frame_width, frame_height, chroma_format, source_sampling,
                                 clean_width, clean_height, clean_left_offset, clean_top_offset,
                                 frame_rate, pixel_aspect_ratio);
@@ -625,14 +632,14 @@
             Get_UI (frame_height,                               "frame height");
         TEST_SB_END();
         TEST_SB_SKIP(                                           "custom chroma format flag");
-            Get_UI (chroma_format,                              "chroma format"); Param_Info(Dirac_chroma_format(chroma_format));
+            Get_UI (chroma_format,                              "chroma format"); Param_Info1(Dirac_chroma_format(chroma_format));
         TEST_SB_END();
         TEST_SB_SKIP(                                           "custom scan format flag");
-            Get_UI (source_sampling,                            "source sampling"); Param_Info(Dirac_source_sampling(source_sampling));
+            Get_UI (source_sampling,                            "source sampling"); Param_Info1(Dirac_source_sampling(source_sampling));
         TEST_SB_END();
         TEST_SB_SKIP(                                           "frame rate flag");
             int32u frame_rate_index;
-            Get_UI (frame_rate_index,                           "index"); Param_Info(Dirac_frame_rate(frame_rate_index));
+            Get_UI (frame_rate_index,                           "index"); Param_Info1(Dirac_frame_rate(frame_rate_index));
             if (frame_rate_index==0)
             {
                 int32u frame_rate_numer, frame_rate_denom;
@@ -645,7 +652,7 @@
         TEST_SB_END();
         TEST_SB_SKIP(                                           "pixel aspect ratio flag");
             int32u pixel_aspect_ratio_index;
-            Get_UI (pixel_aspect_ratio_index,                   "index"); Param_Info(Dirac_pixel_aspect_ratio(pixel_aspect_ratio_index));
+            Get_UI (pixel_aspect_ratio_index,                   "index"); Param_Info1(Dirac_pixel_aspect_ratio(pixel_aspect_ratio_index));
             if (pixel_aspect_ratio_index==0)
             {
                 int32u pixel_aspect_ratio_numer, pixel_aspect_ratio_denom;
@@ -692,7 +699,7 @@
                 TEST_SB_END();
             }
         TEST_SB_END();
-        Info_UI(picture_coding_mode,                            "picture coding mode"); Param_Info(Dirac_picture_coding_mode(picture_coding_mode));
+        Info_UI(picture_coding_mode,                            "picture coding mode"); Param_Info1(Dirac_picture_coding_mode(picture_coding_mode));
     }
     else
     {
@@ -872,7 +879,7 @@
             Frame_Count_Valid=Frame_Count; //Finalize frames in case of there are less than Frame_Count_Valid frames
 
         //Name
-        Element_Info(Ztring::ToZtring(Frame_Count));
+        Element_Info1(Ztring::ToZtring(Frame_Count));
 
         //Filling only if not already done
         Frame_Count++;

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Video/File_Dirac.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_Dirac.h Changed

@@ -1,17 +1,17 @@
 // File_Dirac - Info for Dirac files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -41,7 +41,7 @@
 {
 public :
     //In
-    size_t Frame_Count_Valid;
+    int64u Frame_Count_Valid;
     bool   Ignore_End_of_Sequence;
 
     //Constructor/Destructor
@@ -96,9 +96,6 @@
     };
     std::vector<stream> Streams;
 
-    //Count of a Packets
-    size_t Frame_Count;
-
     //Temp
     int32u frame_width;
     int32u frame_height;

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Video/File_Flic.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_Flic.cpp Changed

@@ -1,17 +1,17 @@
 // File_Flic - Info for Flic files
-// Copyright (C) 2006-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2006-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,14 +22,18 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_FLIC_YES)
 //---------------------------------------------------------------------------
 
@@ -132,7 +136,7 @@
         Fill(Stream_Video, 0, Video_FrameCount, Frames);
         Fill(Stream_Video, StreamPos_Last, Video_Width, Width);
         Fill(Stream_Video, StreamPos_Last, Video_Height, Height);
-        Fill(Stream_Video, 0, Video_Resolution, (BitsPerPixel%3)?BitsPerPixel:(BitsPerPixel/3), 10, true); //If not a multiple of 3, the total resolution is filled
+        Fill(Stream_Video, 0, Video_BitDepth, (BitsPerPixel%3)?BitsPerPixel:(BitsPerPixel/3), 10, true); //If not a multiple of 3, the total resolution is filled
         //No more need data
         Finish("FLIC");
     FILLING_END();

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Video/File_Flic.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_Flic.h Changed

@@ -1,17 +1,17 @@
 // File_Flic - Info for Flic files
-// Copyright (C) 2004-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2004-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Video/File_Fraps.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_Fraps.cpp Changed

@@ -1,31 +1,35 @@
 // File_Fraps - Info for Fraps  files
-// Copyright (C) 2010-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_FRAPS_YES)
 //---------------------------------------------------------------------------
 
@@ -45,7 +49,7 @@
 :File__Analyze()
 {
     //Configuration
-    ParserName=_T("Fraps");
+    ParserName=__T("Fraps");
 }
 
 //***************************************************************************

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Video/File_Fraps.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_Fraps.h Changed

@@ -1,17 +1,17 @@
 // File_Fraps - Info for Fraps files
-// Copyright (C) 2010-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_H263.cpp Added

@@ -0,0 +1,434 @@
+// File_H263 - Info for MPEG Video files
+// Copyright (C) 2012-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_H263_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Video/File_H263.h"
+#include "MediaInfo/MediaInfo_Config_MediaInfo.h"
+#include "ZenLib/BitStream.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+namespace MediaInfoLib
+{
+//---------------------------------------------------------------------------
+
+//***************************************************************************
+// Infos
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+const char* H263_Source_Format[]=
+{
+    "",
+    "sub-QCIF",
+    "QCIF",
+    "CIF",
+    "4CIF",
+    "16CIF",
+    "",
+    "",
+};
+
+//---------------------------------------------------------------------------
+const int16u H263_Source_Format_Width[]=
+{
+    0,
+    128,
+    176,
+    352,
+    704,
+    1408,
+    0,
+    0,
+};
+
+//---------------------------------------------------------------------------
+const int16u H263_Source_Format_Height[]=
+{
+    0,
+    96,
+    144,
+    288,
+    576,
+    1152,
+    0,
+    0,
+};
+
+//---------------------------------------------------------------------------
+const int8u H263_PAR_W[]=
+{
+    0,
+    12,
+    10,
+    16,
+    40,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+};
+
+const int8u H263_PAR_H[]=
+{
+    0,
+    11,
+    11,
+    11,
+    33,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+    0,
+};
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File_H263::File_H263()
+:File__Analyze()
+{
+    //Configuration
+    ParserName=__T("H.263");
+    MustSynchronize=true;
+    Buffer_TotalBytes_FirstSynched_Max=64*1024;
+    IsRawStream=true;
+
+    //In
+    Frame_Count_Valid=MediaInfoLib::Config.ParseSpeed_Get()>=0.3?8:2;
+    FrameIsAlwaysComplete=false;
+}
+
+//---------------------------------------------------------------------------
+File_H263::~File_H263()
+{
+}
+
+//***************************************************************************
+// Streams management
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_H263::Streams_Accept()
+{
+    Stream_Prepare(Stream_Video);
+}
+
+//---------------------------------------------------------------------------
+void File_H263::Streams_Update()
+{
+}
+
+//---------------------------------------------------------------------------
+void File_H263::Streams_Fill()
+{
+    Fill(Stream_General, 0, General_Format_Version, "H.263");
+    Fill(Stream_Video, 0, Video_Format, "H.263");
+    Fill(Stream_Video, 0, Video_Codec, "H.263");
+
+    Fill(Stream_Video, 0, Video_Width, H263_Source_Format_Width[Source_Format]);
+    Fill(Stream_Video, 0, Video_Height, H263_Source_Format_Height[Source_Format]);
+    Fill(Stream_Video, 0, Video_ColorSpace, "YUV");
+    Fill(Stream_Video, 0, Video_Colorimetry, "4:2:0");
+    Fill(Stream_Video, 0, Video_BitDepth, 8);
+    Fill(Stream_Video, 0, Video_PixelAspectRatio, ((float32)PAR_W)/PAR_H, 3);
+}
+
+//---------------------------------------------------------------------------
+void File_H263::Streams_Finish()
+{
+}
+
+//***************************************************************************
+// Buffer - Synchro
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_H263::Synchronize()
+{
+    //Synchronizing
+    while(Buffer_Offset+3<=Buffer_Size && (Buffer[Buffer_Offset  ]!=0x00
+                                        || Buffer[Buffer_Offset+1]!=0x00
+                                        || (Buffer[Buffer_Offset+2]&0xFC)!=0x80))
+    {
+        Buffer_Offset+=2;
+        while(Buffer_Offset<Buffer_Size && Buffer[Buffer_Offset]!=0x00)
+            Buffer_Offset+=2;
+        if ((Buffer_Offset<Buffer_Size && Buffer[Buffer_Offset-1]==0x00) || Buffer_Offset>=Buffer_Size)
+            Buffer_Offset--;
+    }
+
+    //Parsing last bytes if needed
+    if (Buffer_Offset+3==Buffer_Size && (Buffer[Buffer_Offset  ]!=0x00
+                                      || Buffer[Buffer_Offset+1]!=0x00
+                                      || (Buffer[Buffer_Offset+2]&0xFC)!=0x80))
+        Buffer_Offset++;
+    if (Buffer_Offset+2==Buffer_Size && (Buffer[Buffer_Offset  ]!=0x00
+                                      || Buffer[Buffer_Offset+1]!=0x00))
+        Buffer_Offset++;
+    if (Buffer_Offset+1==Buffer_Size &&  Buffer[Buffer_Offset  ]!=0x00)
+        Buffer_Offset++;
+
+    if (Buffer_Offset+3>Buffer_Size)
+        return false;
+
+    //Synched is OK
+    Synched=true;
+    return true;
+}
+
+//---------------------------------------------------------------------------
+bool File_H263::Synched_Test()
+{
+    //Must have enough buffer for having header
+    if (Buffer_Offset+4>Buffer_Size)
+        return false;
+
+    //Quick test of synchro
+    if (Buffer[Buffer_Offset  ]!=0x00
+     || Buffer[Buffer_Offset+1]!=0x00
+     || (Buffer[Buffer_Offset+2]&0xFC)!=0x80)
+    {
+        Synched=false;
+        return true;
+    }
+
+    //We continue
+    return true;
+}
+
+//---------------------------------------------------------------------------
+void File_H263::Synched_Init()
+{
+    //Temp
+    PAR_W=12;
+    PAR_H=11;
+    Temporal_Reference_IsValid=false;
+}
+
+//***************************************************************************
+// Buffer - Global
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_H263::Read_Buffer_Unsynched()
+{
+    Temporal_Reference_IsValid=false;
+}
+
+//***************************************************************************
+// Buffer - Per element
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_H263::Header_Parse()
+{
+    Header_Fill_Code(0x00, "Frame");
+    Header_Parser_Fill_Size();
+}
+
+//---------------------------------------------------------------------------
+bool File_H263::Header_Parser_Fill_Size()
+{
+    //Look for next Sync word
+    if (Buffer_Offset_Temp==0) //Buffer_Offset_Temp is not 0 if Header_Parse_Fill_Size() has already parsed first frames
+        Buffer_Offset_Temp=Buffer_Offset+3;
+    while (Buffer_Offset_Temp+3<=Buffer_Size
+        && (Buffer[Buffer_Offset_Temp  ]!=0x00
+         || Buffer[Buffer_Offset_Temp+1]!=0x00
+         || (Buffer[Buffer_Offset_Temp+2]&0xFC)!=0x80))
+    {
+        Buffer_Offset_Temp+=2;
+        while(Buffer_Offset_Temp<Buffer_Size && Buffer[Buffer_Offset_Temp]!=0x00)
+            Buffer_Offset_Temp+=2;
+        if (Buffer_Offset_Temp>=Buffer_Size || Buffer[Buffer_Offset_Temp-1]==0x00)
+            Buffer_Offset_Temp--;
+    }
+
+    //Must wait more data?
+    if (Buffer_Offset_Temp+3>Buffer_Size)
+    {
+        if (FrameIsAlwaysComplete || File_Offset+Buffer_Size==File_Size)
+            Buffer_Offset_Temp=Buffer_Size; //We are sure that the next bytes are a start
+        else
+            return false;
+    }
+
+    //OK, we continue
+    Header_Fill_Size(Buffer_Offset_Temp-Buffer_Offset);
+    Buffer_Offset_Temp=0;
+    return true;
+
+}
+
+//---------------------------------------------------------------------------
+void File_H263::Data_Parse()
+{
+    //Parsing
+    int8u Temporal_Reference_Temp;
+    BS_Begin();
+    Skip_S3(22,                                                 "Picture Start Code (PSC)");
+    Get_S1 ( 8, Temporal_Reference_Temp,                        "Temporal Reference (TR)");
+    if (!Temporal_Reference_IsValid)
+    {
+        Temporal_Reference=Temporal_Reference_Temp;
+        Temporal_Reference_IsValid=true;
+    }
+    else
+        Temporal_Reference++;
+    if (Temporal_Reference_Temp!=Temporal_Reference)
+    {
+        Trusted_IsNot("Out of Order");
+        Open_Buffer_Unsynch();
+        return;
+    }
+    Element_Begin1("Type Information (PTYPE)");
+        Mark_1();
+        Mark_0();
+        Skip_SB(                                                "Split screen indicator");
+        Skip_SB(                                                "Document camera indicator");
+        Skip_SB(                                                "Full Picture Freeze Release");
+        Get_S1 (3, Source_Format,                               "Source Format"); Param_Info1(H263_Source_Format[Source_Format]);
+        if (Source_Format!=7)
+        {
+            Skip_SB(                                            "Picture Coding Type");
+            Skip_SB(                                            "Unrestricted Motion Vector mode");
+            Skip_SB(                                            "Syntax-based Arithmetic Coding mode");
+            Skip_SB(                                            "Advanced Prediction mode");
+            Skip_SB(                                            "PB-frames mode");
+        }
+    Element_End0();
+    if (Source_Format==7) // Extended PTYPE
+    {
+        Element_Begin1("Plus PTYPE (PLUSPTYPE)");
+            int8u Ufep, PixelAspectRatioCode=0, Width=0, Height=0;
+            Get_S1 ( 3, Ufep,                                   "Update Full Extended PTYPE (UFEP)");
+            switch (Ufep)
+            {
+                case 0  :
+                            break;
+                case 1  :
+                            Element_Begin1("Optional Part of PLUSPTYPE (OPPTYPE)");
+                            Get_S1 (3, Source_Format,           "Source Format"); Param_Info1(H263_Source_Format[Source_Format]);
+                            Skip_SB(                            "Custom PCF");
+                            Skip_SB(                            "Unrestricted Motion Vector (UMV) mode");
+                            Skip_SB(                            "Syntax-based Arithmetic Coding (SAC) mode");
+                            Skip_SB(                            "Advanced Prediction (AP) mode");
+                            Skip_SB(                            "Advanced INTRA Coding (AIC) mode");
+                            Skip_SB(                            "Deblocking Filter (DF) mode");
+                            Skip_SB(                            "Slice Structured (SS) mode");
+                            Skip_SB(                            "Reference Picture Selection (RPS) mode");
+                            Skip_SB(                            "Independent Segment Decoding (ISD) mode");
+                            Skip_SB(                            "Alternative INTER VLC (AIV) mode");
+                            Skip_SB(                            "Modified Quantization (MQ) mode");
+                            Mark_1();
+                            Mark_0();
+                            Mark_0();
+                            Mark_0();
+                            Element_End0();
+                            break;
+                default :
+                            BS_End();
+                            Skip_XX(Element_Size-Element_Offset, "Unknown");
+                            return; //TODO: frame count...
+            }
+            Element_Begin1("mandatory part of PLUSPTYPE when PLUSPTYPE present (MPPTYPE)");
+                Skip_S1(3,                                      "Picture Type Code");
+                Skip_SB(                                        "Reference Picture Resampling (RPR) mode");
+                Skip_SB(                                        "Reduced-Resolution Update (RRU) mode");
+                Skip_SB(                                        "Rounding Type (RTYPE)");
+                Mark_0();
+                Mark_0();
+                Mark_1();
+            Element_End0();
+        Element_End0();
+        Skip_SB(                                                "CPM");
+        Skip_S1(2,                                              "PSBI");
+        Element_Begin1("Custom Picture Format (CPFMT)");
+            Get_S1 (4, PixelAspectRatioCode,                    "Pixel Aspect Ratio Code");
+            Get_S1 (4, Width,                                   "Picture Width Indication");
+            Width++; Width<<=2; Param_Info2(Width, " pixels");
+            Mark_1();
+            Get_S1 (4, Height,                                  "Picture Height Indication");
+            Height<<=2; Param_Info2(Height, " pixels");
+        Element_End0();
+        if (PixelAspectRatioCode==0xF)
+        {
+            Element_Begin1("Extended Pixel Aspect Ratio (EPAR)");
+            Get_S1 (8, PAR_W,                                   "PAR Width");
+            Get_S1 (8, PAR_H,                                   "PAR Height");
+            Element_End0();
+        }
+        else
+        {
+            PAR_W=H263_PAR_W[PixelAspectRatioCode];
+            PAR_H=H263_PAR_H[PixelAspectRatioCode];
+        }
+    }
+    BS_End();
+    Skip_XX(Element_Size-Element_Offset,                        "Other data");
+
+    FILLING_BEGIN();
+        Element_Info1(Frame_Count);
+        Frame_Count++;
+
+        //Filling
+        if (!Status[IsFilled] && Frame_Count>=Frame_Count_Valid)
+        {
+            Accept("H.263");
+            Finish("H.263");
+        }
+    FILLING_END();
+}
+
+} //NameSpace
+
+#endif //MEDIAINFO_H263_YES

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_H263.h Added

@@ -0,0 +1,83 @@
+// File_H263 - Info for MPEG Video files
+// Copyright (C) 2012-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Information about h.263 files
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_H263H
+#define MediaInfo_H263H
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Class File_H263
+//***************************************************************************
+
+class File_H263 : public File__Analyze
+{
+public :
+    //In
+    int64u Frame_Count_Valid;
+    bool   FrameIsAlwaysComplete;
+
+    //Constructor/Destructor
+    File_H263();
+    ~File_H263();
+
+private :
+    //Streams management
+    void Streams_Accept();
+    void Streams_Update();
+    void Streams_Fill();
+    void Streams_Finish();
+
+    //Buffer - Synchro
+    bool Synchronize();
+    bool Synched_Test();
+    void Synched_Init();
+
+    //Buffer - Global
+    void Read_Buffer_Unsynched();
+
+    //Buffer - Per element
+    void Header_Parse();
+    bool Header_Parser_Fill_Size();
+    void Data_Parse();
+
+    //Elements
+
+    //Temp
+    int8u Temporal_Reference;
+    int8u Source_Format;
+    int8u PAR_W;
+    int8u PAR_H;
+    bool  Temporal_Reference_IsValid;
+};
+
+} //NameSpace
+
+#endif

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Video/File_Lagarith.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_Lagarith.cpp Changed

@@ -1,31 +1,35 @@
 // File_Lagarith - Info for Lagarith  files
-// Copyright (C) 2010-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_LAGARITH_YES)
 //---------------------------------------------------------------------------
 
@@ -45,7 +49,7 @@
 :File__Analyze()
 {
     //Configuration
-    ParserName=_T("Lagarith");
+    ParserName=__T("Lagarith");
 }
 
 //***************************************************************************

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Video/File_Lagarith.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_Lagarith.h Changed

@@ -1,17 +1,17 @@
 // File_Lagarith - Info for Lagarith files
-// Copyright (C) 2010-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Video/File_Mpeg4v.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_Mpeg4v.cpp Changed

@@ -1,30 +1,34 @@
 // File_Mpeg4v - Info for MPEG-4 Visual files
-// Copyright (C) 2006-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2006-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
 //***************************************************************************
 // Constants (Common)
 //***************************************************************************
@@ -97,7 +101,7 @@
         case B8(11100110) : return "Core Studio@L2";
         case B8(11100111) : return "Core Studio@L3";
         case B8(11101000) : return "Core Studio@L4";
-        case B8(11110000) : return "Advanced Simple@L1";
+        case B8(11110000) : return "Advanced Simple@L0";
         case B8(11110001) : return "Advanced Simple@L1";
         case B8(11110010) : return "Advanced Simple@L2";
         case B8(11110011) : return "Advanced Simple@L3";
@@ -224,6 +228,11 @@
     "S",
 };
 
+//---------------------------------------------------------------------------
+const char* Mpegv_colour_primaries(int8u colour_primaries);
+const char* Mpegv_transfer_characteristics(int8u transfer_characteristics);
+const char* Mpegv_matrix_coefficients(int8u matrix_coefficients);
+
 //***************************************************************************
 // Constructor/Destructor
 //***************************************************************************
@@ -236,6 +245,8 @@
     Trusted_Multiplier=2;
     MustSynchronize=true;
     Buffer_TotalBytes_FirstSynched_Max=64*1024;
+    PTS_DTS_Needed=true;
+    IsRawStream=true;
 
     //In
     Frame_Count_Valid=MediaInfoLib::Config.ParseSpeed_Get()>=0.3?30:2;
@@ -250,6 +261,7 @@
 {
     //Default stream values
     Synched_Init();
+    Streams[0xB3].Searching_Payload=true; //group_of_vop_start
     Streams[0xB6].Searching_Payload=true; //vop_start
 }
 
@@ -272,6 +284,12 @@
     if (Synched && !Header_Parser_QuickSearch())
         return false;
 
+    #if MEDIAINFO_IBI
+        bool RandomAccess=Buffer[Buffer_Offset+3]==0xB0; //SequenceHeader
+        if (RandomAccess)
+            Ibi_Add();
+    #endif //MEDIAINFO_IBI
+
     //We continue
     return true;
 }
@@ -280,14 +298,17 @@
 void File_Mpeg4v::Synched_Init()
 {
     //Count of a Packets
-    Frame_Count=0;
     IVOP_Count=0;
     PVOP_Count=0;
     BVOP_Count=0;
+    BVOP_Count_Max=0;
     SVOP_Count=0;
     NVOP_Count=0;
     Interlaced_Top=0;
     Interlaced_Bottom=0;
+    Frame_Count_InThisBlock_Max=0;
+    if (Frame_Count_NotParsedIncluded==(int64u)-1)
+        Frame_Count_NotParsedIncluded=0; //No Frame_Count_NotParsedIncluded in the container
 
     //From VOL, needed in VOP
     fixed_vop_time_increment=0;
@@ -309,6 +330,9 @@
     sprite_enable=0;
     estimation_method=0;
     chroma_format=(int8u)-1;
+    colour_primaries=(int8u)-1;
+    transfer_characteristics=(int8u)-1;
+    matrix_coefficients=(int8u)-1;
     quarter_sample=false;
     low_delay=false;
     load_intra_quant_mat=false;
@@ -319,11 +343,8 @@
     newpred_enable=0;
     time_size=0;
     reduced_resolution_vop_enable=0;
-    shape=(int8u)-1;
-    sprite_enable=0;
     scalability=0;
     enhancement_type=0;
-    vop_time_increment_resolution=0;
     complexity_estimation_disable=false;
     opaque=false;
     transparent=false;
@@ -349,6 +370,9 @@
     quarterpel=false;
     quant_type=false;
 
+    if (!IsSub)
+        FrameInfo.DTS=0;
+
     //Default stream values
     Streams.resize(0x100);
     Streams[0x00].Searching_Payload=true; //video_object_start
@@ -395,9 +419,15 @@
         Fill(Stream_Video, StreamPos_Last, Video_DisplayAspectRatio, ((float)object_layer_width)/object_layer_height*PixelAspectRatio_Value, 3, true);
     }
     Fill(Stream_Video, 0, Video_ColorSpace, "YUV");
-    Fill(Stream_Video, 0, Video_Resolution, bits_per_pixel);
+    Fill(Stream_Video, 0, Video_BitDepth, bits_per_pixel);
     if (chroma_format<4)
         Fill(Stream_Video, 0, Video_Colorimetry, Mpeg4v_Colorimetry[chroma_format]);
+    if (colour_primaries!=(int8u)-1)
+    {
+        Fill(Stream_Video, 0, "colour_primaries", Mpegv_colour_primaries(colour_primaries));
+        Fill(Stream_Video, 0, "transfer_characteristics", Mpegv_transfer_characteristics(transfer_characteristics));
+        Fill(Stream_Video, 0, "matrix_coefficients", Mpegv_matrix_coefficients(matrix_coefficients));
+    }
     if (low_delay)
     {
         Fill(Stream_Video, 0, Video_Format_Settings_BVOP, "No");
@@ -412,9 +442,9 @@
     }
     if (no_of_sprite_warping_points)
     {
-        Fill(Stream_Video, 0, Video_Format_Settings, Ztring(_T("GMC"))+Ztring::ToZtring(no_of_sprite_warping_points));
+        Fill(Stream_Video, 0, Video_Format_Settings, Ztring(__T("GMC"))+Ztring::ToZtring(no_of_sprite_warping_points));
         Fill(Stream_Video, 0, Video_Format_Settings_GMC, no_of_sprite_warping_points);
-        Fill(Stream_Video, 0, Video_Codec_Settings, Ztring(_T("GMC"))+Ztring::ToZtring(no_of_sprite_warping_points));
+        Fill(Stream_Video, 0, Video_Codec_Settings, Ztring(__T("GMC"))+Ztring::ToZtring(no_of_sprite_warping_points));
         Fill(Stream_Video, 0, Video_Codec_Settings_GMC, no_of_sprite_warping_points);
     }
     else
@@ -485,37 +515,61 @@
     }
     for (size_t Pos=0; Pos<user_data_start_SNC_Data.size(); Pos++)
     {
-        if (user_data_start_SNC_Data[Pos][0]==_T("CamTim"))
+        if (user_data_start_SNC_Data[Pos][0]==__T("CamTim"))
             Fill(Stream_General, 0, General_Recorded_Date, Ztring().Date_From_String(user_data_start_SNC_Data[Pos][1].To_UTF8().c_str()));
-        if (user_data_start_SNC_Data[Pos][0]==_T("FrmRate"))
+        if (user_data_start_SNC_Data[Pos][0]==__T("FrmRate"))
             Fill(Stream_Video, 0, Video_FrameRate, user_data_start_SNC_Data[Pos][1].To_float32(), 3);
-        if (user_data_start_SNC_Data[Pos][0]==_T("TimStamp"))
+        if (user_data_start_SNC_Data[Pos][0]==__T("TimStamp"))
+        {
             Fill(Stream_Video, 0, Video_Delay, user_data_start_SNC_Data[Pos][1].To_int64u());
-        if (user_data_start_SNC_Data[Pos][0]==_T("CamPos") && user_data_start_SNC_Data[Pos][1].size()==16)
+            Fill(Stream_Video, 0, Video_Delay_Source, "Stream");
+        }
+        if (user_data_start_SNC_Data[Pos][0]==__T("CamPos") && user_data_start_SNC_Data[Pos][1].size()==16)
         {
             Fill(Stream_Video, 0, "Pan / Tilt / Zoom / Status", Ztring(user_data_start_SNC_Data[Pos][1].substr( 3, 4)).To_int8u(16));
             Fill(Stream_Video, 0, "Pan / Tilt / Zoom / Status", Ztring(user_data_start_SNC_Data[Pos][1].substr( 7, 4)).To_int8u(16));
             Fill(Stream_Video, 0, "Pan / Tilt / Zoom / Status", Ztring(user_data_start_SNC_Data[Pos][1].substr(11, 4)).To_int8u(16));
-            if (user_data_start_SNC_Data[Pos][1][15]==_T('M'))
-                Fill(Stream_Video, 0, "Pan / Tilt / Zoom / Status", _T("Move"));
-            else if (user_data_start_SNC_Data[Pos][1][15]==_T('S'))
-                Fill(Stream_Video, 0, "Pan / Tilt / Zoom / Status", _T("Stop"));
+            if (user_data_start_SNC_Data[Pos][1][15]==__T('M'))
+                Fill(Stream_Video, 0, "Pan / Tilt / Zoom / Status", __T("Move"));
+            else if (user_data_start_SNC_Data[Pos][1][15]==__T('S'))
+                Fill(Stream_Video, 0, "Pan / Tilt / Zoom / Status", __T("Stop"));
             else
                 Fill(Stream_Video, 0, "Pan / Tilt / Zoom / Status", user_data_start_SNC_Data[Pos][1][15]);
         }
-        if (user_data_start_SNC_Data[Pos][0]==_T("AlmEvent") && user_data_start_SNC_Data[Pos][1].size()==16)
+        if (user_data_start_SNC_Data[Pos][0]==__T("AlmEvent") && user_data_start_SNC_Data[Pos][1].size()==16)
             Fill(Stream_Video, 0, "Alarm event", user_data_start_SNC_Data[Pos][1]);
     }
     if (video_object_layer_start_IsParsed && shape!=2 && !complexity_estimation_disable)
     {
         Fill(Stream_Video, 0, "data_partitioned", data_partitioned?"Yes":"No");
-        (*Stream_More)[Stream_Video][0](Ztring().From_Local("data_partitioned"), Info_Options)=_T("N NT");
+        (*Stream_More)[Stream_Video][0](Ztring().From_Local("data_partitioned"), Info_Options)=__T("N NT");
         if (data_partitioned)
         {
             Fill(Stream_Video, 0, "reversible_vlc", reversible_vlc?"Yes":"No");
-            (*Stream_More)[Stream_Video][0](Ztring().From_Local("reversible_vlc"), Info_Options)=_T("N NT");
+            (*Stream_More)[Stream_Video][0](Ztring().From_Local("reversible_vlc"), Info_Options)=__T("N NT");
         }
     }
+
+    //BVOPs
+    if (BVOP_Count_Max)
+    {
+        Ztring Format_Settings=Retrieve(Stream_Video, 0, Video_Format_Settings);
+        Format_Settings.FindAndReplace(__T("BVOP"), __T("BVOP")+Ztring::ToZtring(BVOP_Count_Max));
+        Fill(Stream_Video, 0, Video_Format_Settings, Format_Settings, true);
+        Fill(Stream_Video, 0, Video_Format_Settings_BVOP, BVOP_Count_Max, 10, true);
+    }
+
+    //Packed Bitstream
+    if (Frame_Count_InThisBlock_Max==2)
+    {
+        Fill(Stream_Video, 0, Video_MuxingMode, MediaInfoLib::Config.Language_Get("MuxingMode_PackedBitstream"));
+        Fill(Stream_Video, 0, Video_Codec_Settings, "Packed Bitstream");
+        Fill(Stream_Video, 0, Video_Codec_Settings_PacketBitStream, "Yes");
+    }
+    else
+    {
+        Fill(Stream_Video, 0, Video_Codec_Settings_PacketBitStream, "No");
+    }
 }
 
 //---------------------------------------------------------------------------
@@ -530,10 +584,81 @@
         Fill(Stream_Video, 0, Video_Duration, Duration);
     }
 
-    //Purge what is not needed anymore
-    if (!File_Name.empty()) //Only if this is not a buffer, with buffer we can have more data
-        Streams.clear();
+    #if MEDIAINFO_IBI
+        if (fixed_vop_time_increment)
+            Ibi_Stream_Finish(vop_time_increment_resolution, fixed_vop_time_increment);
+    #endif //MEDIAINFO_IBI
 }
+//***************************************************************************
+// Buffer - Demux
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_DEMUX
+bool File_Mpeg4v::Demux_UnpacketizeContainer_Test()
+{
+    if ((Demux_IntermediateItemFound && Buffer[Buffer_Offset+3]==0xB0) || Buffer[Buffer_Offset+3]==0xB3 || Buffer[Buffer_Offset+3]==0xB6)
+    {
+        if (Demux_Offset==0)
+        {
+            Demux_Offset=Buffer_Offset;
+            Demux_IntermediateItemFound=false;
+        }
+        while (Demux_Offset+4<=Buffer_Size)
+        {
+            //Synchronizing
+            while(Demux_Offset+3<=Buffer_Size && (Buffer[Demux_Offset  ]!=0x00
+                                                || Buffer[Demux_Offset+1]!=0x00
+                                                || Buffer[Demux_Offset+2]!=0x01))
+            {
+                Demux_Offset+=2;
+                while(Demux_Offset<Buffer_Size && Buffer[Buffer_Offset]!=0x00)
+                    Demux_Offset+=2;
+                if (Demux_Offset>=Buffer_Size || Buffer[Demux_Offset-1]==0x00)
+                    Demux_Offset--;
+            }
+
+            if (Demux_Offset+4<=Buffer_Size)
+            {
+                if (Demux_IntermediateItemFound)
+                {
+                    bool MustBreak;
+                    switch (Buffer[Demux_Offset+3])
+                    {
+                        case 0xB0 :
+                        case 0xB3 :
+                        case 0xB6 :
+                                    MustBreak=true; break;
+                        default   : MustBreak=false;
+                    }
+                    if (MustBreak)
+                        break; //while() loop
+                }
+                else
+                {
+                    if (Buffer[Demux_Offset+3]==0xB6)
+                        Demux_IntermediateItemFound=true;
+                }
+            }
+            Demux_Offset++;
+        }
+
+        if (Demux_Offset+4>Buffer_Size && File_Offset+Buffer_Size!=File_Size)
+            return false; //No complete frame
+
+        if (!Status[IsAccepted])
+        {
+            Accept("MPEG-4 Visual");
+            if (Config->Demux_EventWasSent)
+                return false;
+        }
+
+        Demux_UnpacketizeContainer_Demux(Buffer[Buffer_Offset+3]==0xB0);
+    }
+
+    return true;
+}
+#endif //MEDIAINFO_DEMUX
 
 //***************************************************************************
 // Buffer - Global
@@ -579,7 +704,7 @@
         Buffer_Offset_Temp+=2;
         while(Buffer_Offset_Temp<Buffer_Size && Buffer[Buffer_Offset_Temp]!=0x00)
             Buffer_Offset_Temp+=2;
-        if (Buffer_Offset_Temp<Buffer_Size && Buffer[Buffer_Offset_Temp-1]==0x00 || Buffer_Offset_Temp>=Buffer_Size)
+        if (Buffer_Offset_Temp>=Buffer_Size || Buffer[Buffer_Offset_Temp-1]==0x00)
             Buffer_Offset_Temp--;
     }
 
@@ -616,7 +741,17 @@
         //Synchronizing
         Buffer_Offset+=4;
         Synched=false;
-        if (!Synchronize_0x000001())
+        if (!Synchronize())
+        {
+            if (File_Offset+Buffer_Size==File_Size)
+            {
+                Synched=true;
+                return true;
+            }
+            return false;
+        }
+
+        if (Buffer_Offset+4>Buffer_Size)
             return false;
     }
 
@@ -660,7 +795,11 @@
                   && Element_Code<=0x4F) fgs_bp_start();
             else if (Element_Code<=0xC5) reserved();
             else
+            {
+                if (Frame_Count==0 && Buffer_TotalBytes>Buffer_TotalBytes_FirstSynched_Max)
+                    Trusted=0;
                 Trusted_IsNot("Unattended element!");
+            }
     }
 }
 
@@ -700,7 +839,7 @@
     Skip_SB(                                                    "random_accessible_vol");
     Skip_S1(8,                                                  "video_object_type_indication");
     TEST_SB_SKIP(                                               "is_object_layer_identifier");
-        Get_S1 (4, video_object_layer_verid,                    "video_object_layer_verid"); Param_Info(Mpeg4v_video_object_layer_verid[video_object_layer_verid]);
+        Get_S1 (4, video_object_layer_verid,                    "video_object_layer_verid"); Param_Info1(Mpeg4v_video_object_layer_verid[video_object_layer_verid]);
         Skip_S1(3,                                              "video_object_layer_priority");
     TEST_SB_END();
     Get_S1 (4, aspect_ratio_info,                               "aspect_ratio_info");
@@ -760,7 +899,7 @@
     }
     Mark_1 ();
     TEST_SB_SKIP(                                               "fixed_vop_rate");
-        Get_BS (time_size, fixed_vop_time_increment,            "fixed_vop_time_increment"); if (vop_time_increment_resolution>0) Param_Info(fixed_vop_time_increment*1000/vop_time_increment_resolution, " ms");
+        Get_BS (time_size, fixed_vop_time_increment,            "fixed_vop_time_increment"); Param_Info2C((vop_time_increment_resolution), fixed_vop_time_increment*1000/vop_time_increment_resolution, " ms");
     TEST_SB_END();
     if (shape!=2) //Shape!=BinaryOnly
     {
@@ -828,7 +967,7 @@
                     {
                         Ztring Value=Ztring::ToZtring(intra_quant_mat, 16);
                         if (Value.size()==1)
-                            Value.insert(0, _T("0"));
+                            Value.insert(0, __T("0"));
                         Matrix_intra+=Value;
                     }
                 }
@@ -852,7 +991,7 @@
                     {
                         Ztring Value=Ztring::ToZtring(nonintra_quant_mat, 16);
                         if (Value.size()==1)
-                            Value.insert(0, _T("0"));
+                            Value.insert(0, __T("0"));
                         Matrix_nonintra+=Value;
                     }
                 }
@@ -1026,7 +1165,7 @@
     Element_Name("visual_object_sequence_start");
 
     //Parsing
-    Get_B1 (profile_and_level_indication,                       "profile_and_level_indication"); Param_Info(Mpeg4v_Profile_Level(profile_and_level_indication));
+    Get_B1 (profile_and_level_indication,                       "profile_and_level_indication"); Param_Info1(Mpeg4v_Profile_Level(profile_and_level_indication));
 
     //Integrity
     if (Element_Size>1)
@@ -1086,15 +1225,13 @@
         bool OK=true;
         for (size_t Pos=0; Pos<4; Pos++)
         {
-            if (!(Buffer[Buffer_Offset+Library_Start_Offset+Pos]==0x20 && Pos
+            if (!((Buffer[Buffer_Offset+Library_Start_Offset+Pos]==0x20 && Pos)
                || Buffer[Buffer_Offset+Library_Start_Offset+Pos]==0x22
                || Buffer[Buffer_Offset+Library_Start_Offset+Pos]==0x27
                || Buffer[Buffer_Offset+Library_Start_Offset+Pos]==0x28
-               || Buffer[Buffer_Offset+Library_Start_Offset+Pos]==0x29 && Pos
-               || Buffer[Buffer_Offset+Library_Start_Offset+Pos]>=0x30
-               && Buffer[Buffer_Offset+Library_Start_Offset+Pos]<=0x3F
-               || Buffer[Buffer_Offset+Library_Start_Offset+Pos]>=0x41
-               && Buffer[Buffer_Offset+Library_Start_Offset+Pos]<=0x7D))
+               || (Buffer[Buffer_Offset+Library_Start_Offset+Pos]==0x29 && Pos)
+               || (Buffer[Buffer_Offset+Library_Start_Offset+Pos]>=0x30 && Buffer[Buffer_Offset+Library_Start_Offset+Pos]<=0x3F)
+               || (Buffer[Buffer_Offset+Library_Start_Offset+Pos]>=0x41 && Buffer[Buffer_Offset+Library_Start_Offset+Pos]<=0x7D)))
             {
                 OK=false;
                 break;
@@ -1115,10 +1252,8 @@
     while (Library_End_Offset<Element_Size
         && (Buffer[Buffer_Offset+Library_End_Offset]==0x0D
          || Buffer[Buffer_Offset+Library_End_Offset]==0x0A
-         || Buffer[Buffer_Offset+Library_End_Offset]>=0x20
-         && Buffer[Buffer_Offset+Library_End_Offset]<=0x3F
-         || Buffer[Buffer_Offset+Library_End_Offset]>=0x41
-         && Buffer[Buffer_Offset+Library_End_Offset]<=0x7D))
+         || (Buffer[Buffer_Offset+Library_End_Offset]>=0x20 && Buffer[Buffer_Offset+Library_End_Offset]<=0x3F)
+         || (Buffer[Buffer_Offset+Library_End_Offset]>=0x41 && Buffer[Buffer_Offset+Library_End_Offset]<=0x7D)))
         Library_End_Offset++;
 
     //Parsing
@@ -1131,41 +1266,41 @@
         Skip_XX(Element_Size-Element_Offset,                    "junk");
 
     //Cleanup
-    while(Temp.size()>3 && Temp[1]==_T('e') && Temp[2]==_T('n') && Temp[3]==_T('c'))
+    while(Temp.size()>3 && Temp[1]==__T('e') && Temp[2]==__T('n') && Temp[3]==__T('c'))
         Temp.erase(0, 1);
-    while(Temp.size()>5 && Temp[3]==_T('M') && Temp[4]==_T('P') && Temp[5]==_T('E'))
+    while(Temp.size()>5 && Temp[3]==__T('M') && Temp[4]==__T('P') && Temp[5]==__T('E'))
         Temp.erase(0, 1);
 
     FILLING_BEGIN();
         if (Temp.size()>=4)
         {
-            if (Temp.find(_T("build"))==0)
-                Library+=Ztring(_T(" "))+Temp;
+            if (Temp.find(__T("build"))==0)
+                Library+=Ztring(__T(" "))+Temp;
             else
                 Library=Temp;
 
             //Library
-            if (Library.find(_T("DivX50"))==0)
+            if (Library.find(__T("DivX50"))==0)
             {
-                Library_Name=_T("DivX");
-                Ztring Version=Library.SubString(_T("Build"), _T(""));
+                Library_Name=__T("DivX");
+                Ztring Version=Library.SubString(__T("Build"), __T(""));
                 if (Version.empty())
-                    Version=Library.SubString(_T("b"), _T("p"));
+                    Version=Library.SubString(__T("b"), __T("p"));
                 if (Version.empty())
-                    Version=Library.SubString(_T("b"), _T(""));
+                    Version=Library.SubString(__T("b"), __T(""));
                 Library_Version=MediaInfoLib::Config.Library_Get(InfoLibrary_Format_DivX, Version, InfoLibrary_Version);
                 if (Library_Version.empty())
                     Library_Version=Version;
                 Library_Date=MediaInfoLib::Config.Library_Get(InfoLibrary_Format_DivX, Version, InfoLibrary_Date);
             }
-            if (Library.find(_T("XviD"))==0)
+            if (Library.find(__T("XviD"))==0)
             {
-                Library_Name=_T("XviD");
-                if (Library.find(_T("build="))==std::string::npos)
+                Library_Name=__T("XviD");
+                if (Library.find(__T("build="))==std::string::npos)
                 {
-                    Ztring Version=Library.SubString(_T("XviD"), _T(""));
-                    Version.FindAndReplace(_T("C"), _T(""));
-                    Version.TrimLeft(_T('0'));
+                    Ztring Version=Library.SubString(__T("XviD"), __T(""));
+                    Version.FindAndReplace(__T("C"), __T(""));
+                    Version.TrimLeft(__T('0'));
                     Library_Version=MediaInfoLib::Config.Library_Get(InfoLibrary_Format_XviD, Version, InfoLibrary_Version);
                     if (Library_Version.empty())
                         Library_Version=Version;
@@ -1173,13 +1308,13 @@
                 }
                 else
                 {
-                    Library_Version=Library.SubString(_T("XviD"), _T(""));
-                    Ztring Date=Library.SubString(_T(" build="), _T(""));
+                    Library_Version=Library.SubString(__T("XviD"), __T(""));
+                    Ztring Date=Library.SubString(__T(" build="), __T(""));
                     if (Date.size()==10)
                     {
-                        Date[4]=_T('-');
-                        Date[7]=_T('-');
-                        Library_Date=_T("UTC ")+Date;
+                        Date[4]=__T('-');
+                        Date[7]=__T('-');
+                        Library_Date=__T("UTC ")+Date;
                     }
                 }
             }
@@ -1191,7 +1326,7 @@
 // Packet "B2", SNC (From Sony SNC surveillance video)
 void File_Mpeg4v::user_data_start_SNC()
 {
-    Element_Info("Sony SNC");
+    Element_Info1("Sony SNC");
 
     if (!user_data_start_SNC_Data.empty())
     {
@@ -1203,8 +1338,8 @@
     Ztring Value;
     Get_Local(Element_Size, Value,                              "Value");
     ZtringListList List;
-    List.Separator_Set(0, _T("\r\n"));
-    List.Separator_Set(1, _T(": "));
+    List.Separator_Set(0, __T("\r\n"));
+    List.Separator_Set(1, __T(": "));
     List.Write(Value);
     for (size_t Pos=0; Pos<List.size(); Pos++)
     {
@@ -1232,12 +1367,12 @@
     BS_End();
     Ztring Time;
     Time+=Ztring::ToZtring(Hours);
-    Time+=_T(':');
+    Time+=__T(':');
     Time+=Ztring::ToZtring(Minutes);
-    Time+=_T(':');
+    Time+=__T(':');
     Time+=Ztring::ToZtring(Seconds);
-    Time+=_T(".000");
-    Element_Info(Time);
+    Time+=__T(".000");
+    Element_Info1(Time);
 
     FILLING_BEGIN();
         //Calculating
@@ -1271,19 +1406,19 @@
     int8u visual_object_type;
     BS_Begin();
     TEST_SB_SKIP(                                               "is_visual_object_identifier");
-        Get_S1 ( 4, visual_object_verid,                        "visual_object_verid");  Param_Info(Mpeg4v_visual_object_verid[visual_object_verid]);
+        Get_S1 ( 4, visual_object_verid,                        "visual_object_verid");  Param_Info1(Mpeg4v_visual_object_verid[visual_object_verid]);
         Skip_BS( 3,                                             "visual_object_priority");
     TEST_SB_END();
-    Get_S1 ( 4, visual_object_type,                             "visual_object_type"); Param_Info(Mpeg4v_visual_object_type[visual_object_type]);
+    Get_S1 ( 4, visual_object_type,                             "visual_object_type"); Param_Info1(Mpeg4v_visual_object_type[visual_object_type]);
     if (visual_object_type==1 || visual_object_type==2)
     {
         TEST_SB_SKIP(                                           "video_signal_type");
             Skip_S1(3,                                          "video_format");
             Skip_SB(                                            "video_range");
             TEST_SB_SKIP(                                       "colour_description");
-                Skip_S1(8,                                      "colour_primaries");
-                Skip_S1(8,                                      "transfer_characteristics");
-                Skip_S1(8,                                      "matrix_coefficients");
+                Get_S1 (8, colour_primaries,                    "colour_primaries"); Param_Info1(Mpegv_colour_primaries(colour_primaries));
+                Get_S1 (8, transfer_characteristics,            "transfer_characteristics"); Param_Info1(Mpegv_transfer_characteristics(transfer_characteristics));
+                Get_S1 (8, matrix_coefficients,                 "matrix_coefficients"); Param_Info1(Mpegv_matrix_coefficients(matrix_coefficients));
             TEST_SB_END();
         TEST_SB_END();
         BS_End();
@@ -1311,23 +1446,29 @@
 // Packet "B6"
 void File_Mpeg4v::vop_start()
 {
+    Element_Info1C( (FrameInfo.DTS!=(int64u)-1), __T("DTS ")+Ztring().Duration_From_Milliseconds(float64_int64s(((float64)FrameInfo.DTS)/1000000)));
+
     //Counting
     if (File_Offset+Buffer_Offset+Element_Size==File_Size)
         Frame_Count_Valid=Frame_Count; //Finish frames in case of there are less than Frame_Count_Valid frames
     Frame_Count++;
     Frame_Count_InThisBlock++;
+    if (Frame_Count_InThisBlock>Frame_Count_InThisBlock_Max)
+        Frame_Count_InThisBlock_Max=Frame_Count_InThisBlock;
+    if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+        Frame_Count_NotParsedIncluded++;
 
     //Name
     Element_Name("vop_start");
-    Element_Info(Ztring(_T("Frame ")+Ztring::ToZtring(Frame_Count)));
+    Element_Info1(Ztring(__T("Frame ")+Ztring::ToZtring(Frame_Count)));
 
     //Parsing
     int32u vop_time_increment;
     int8u vop_coding_type;
     bool  vop_coded;
     BS_Begin();
-    Get_S1 (2, vop_coding_type,                                 "vop_coding_type"); Param_Info(Mpeg4v_vop_coding_type[vop_coding_type]);
-    Element_Info(Mpeg4v_vop_coding_type[vop_coding_type]);
+    Get_S1 (2, vop_coding_type,                                 "vop_coding_type"); Param_Info1(Mpeg4v_vop_coding_type[vop_coding_type]);
+    Element_Info1(Mpeg4v_vop_coding_type[vop_coding_type]);
     bool modulo_time_base_Continue;
     int8u modulo_time_base=0;
     do
@@ -1352,14 +1493,14 @@
         }
     FILLING_END();
 
-    Get_S4 (time_size, vop_time_increment,                      "vop_time_increment"); if (vop_time_increment_resolution) Param_Info(vop_time_increment*1000/vop_time_increment_resolution, " ms");
+    Get_S4 (time_size, vop_time_increment,                      "vop_time_increment"); Param_Info2C((vop_time_increment_resolution), vop_time_increment*1000/vop_time_increment_resolution, " ms");
     Mark_1 ();
     Get_SB (vop_coded,                                          "vop_coded");
     if (vop_coded)
     {
         if (newpred_enable)
         {
-            Skip_S4(time_size+3<15?time_size+3:15,              "vop_id");
+            Skip_S3(time_size+3<15?time_size+3:15,              "vop_id");
             TEST_SB_SKIP(                                       "vop_id_for_prediction_indication");
                 Skip_BS(time_size+3<15?time_size+3:15,          "vop_id_for_prediction");
             TEST_SB_END();
@@ -1508,12 +1649,30 @@
         //...
     }
 
-    if (!vop_coded)              NVOP_Count++; //VOP with no data
-    else if (vop_coding_type==0) IVOP_Count++; //Type I
-    else if (vop_coding_type==1) PVOP_Count++; //Type P
-    else if (vop_coding_type==2) BVOP_Count++; //Type B
-    else if (vop_coding_type==3) SVOP_Count++; //Type S
-
+    if (!vop_coded)              //VOP with no data
+        NVOP_Count++;
+    else if (vop_coding_type==0) //Type I
+    {
+        IVOP_Count++;
+        PVOP_Count=0;
+        BVOP_Count=0;
+    }
+    else if (vop_coding_type==1) //Type P
+    {
+        PVOP_Count++;
+        BVOP_Count=0;
+    }
+    else if (vop_coding_type==2) //Type B
+    {
+        BVOP_Count++;
+        if (BVOP_Count>BVOP_Count_Max)
+            BVOP_Count_Max=BVOP_Count;
+    }
+    else if (vop_coding_type==3)
+    {
+        SVOP_Count++; //Type S
+        BVOP_Count=0;
+    }
 
     FILLING_BEGIN();
         //Duration
@@ -1526,8 +1685,15 @@
             if (Time_Begin_MilliSeconds==(int16u)-1)
                 Time_Begin_MilliSeconds=Time_End_MilliSeconds;
 
-            if (Time_End_Seconds!=(int32u)-1)
-                Element_Info(Ztring().Duration_From_Milliseconds((int64u)(Time_End_Seconds*1000+Time_End_MilliSeconds)));
+            Element_Info1C((Time_End_Seconds!=(int32u)-1), Ztring().Duration_From_Milliseconds((int64u)(Time_End_Seconds*1000+Time_End_MilliSeconds)));
+
+            if (FrameInfo.DTS!=(int64u)-1)
+            {
+                if (fixed_vop_time_increment && vop_time_increment_resolution)
+                    FrameInfo.DTS+=((int64u)fixed_vop_time_increment)*1000000000/vop_time_increment_resolution;
+                else
+                    FrameInfo.DTS=(int64u)-1;
+            }
         }
 
         //NextCode
@@ -1551,9 +1717,48 @@
             else
             {
                 Fill("MPEG-4 Visual");
-                GoToFromEnd(1024*1024, "MPEG-4 Visual");
+                if (Config->ParseSpeed<1.0)
+                {
+                    if (!IsSub)
+                        Open_Buffer_Unsynch();
+                    GoToFromEnd(1024*1024, "MPEG-4 Visual");
+                }
             }
         }
+
+        #if MEDIAINFO_EVENTS
+            {
+                struct MediaInfo_Event_Video_SliceInfo_0 Event;
+                Event.EventCode=MediaInfo_EventCode_Create(MediaInfo_Parser_None, MediaInfo_Event_Video_SliceInfo, 0);
+                Event.Stream_Offset=File_Offset+Buffer_Offset;
+                Event.PCR=FrameInfo.PCR;
+                Event.PTS=FrameInfo.PTS;
+                Event.DTS=FrameInfo.DTS;
+                Event.DUR=FrameInfo.DUR;
+                Event.StreamIDs_Size=StreamIDs_Size;
+                Event.StreamIDs=(MediaInfo_int64u*)StreamIDs;
+                Event.StreamIDs_Width=(MediaInfo_int8u*)StreamIDs_Width;
+                Event.ParserIDs=(MediaInfo_int8u* )ParserIDs;
+                Event.FramePosition=Frame_Count;
+                Event.FieldPosition=Field_Count;
+                Event.SlicePosition=0;
+                switch (vop_coding_type)
+                {
+                    case 0 :
+                                Event.SliceType=0; break;
+                    case 1 :
+                                Event.SliceType=1; break;
+                    case 2 :
+                                Event.SliceType=2; break;
+                    case 3 :
+                                Event.SliceType=3; break;
+                    default:
+                                Event.SliceType=(int8u)-1;
+                }
+                Event.Flags=0;
+                Config->Event_Send((const int8u*)&Event, sizeof(MediaInfo_Event_Video_SliceInfo_0));
+            }
+        #endif //MEDIAINFO_EVENTS
     FILLING_END();
 }
 
@@ -1663,3 +1868,4 @@
 } //NameSpace
 
 #endif //MEDIAINFO_MPEG4V_YES
+

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Video/File_Mpeg4v.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_Mpeg4v.h Changed

@@ -1,17 +1,17 @@
 // File_Avc - Info for MPEG-4 Visual Visual files
-// Copyright (C) 2006-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2006-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -42,7 +42,7 @@
 {
 public :
     //In
-    size_t Frame_Count_Valid;
+    int64u Frame_Count_Valid;
     bool   FrameIsAlwaysComplete;
     void   OnlyVOP(); //Data has only VOPs in it (configuration is elsewhere)
 
@@ -64,7 +64,12 @@
     bool Synchronize() {return Synchronize_0x000001();}
     bool Synched_Test();
     void Synched_Init();
-    
+
+    //Buffer - Demux
+    #if MEDIAINFO_DEMUX
+    bool Demux_UnpacketizeContainer_Test();
+    #endif //MEDIAINFO_DEMUX
+
     //Buffer - Per element
     void Header_Parse();
     bool Header_Parser_QuickSearch();
@@ -111,17 +116,17 @@
     std::vector<stream> Streams;
 
     //Count of a Packets
-    size_t Frame_Count;
     size_t IVOP_Count;
     size_t PVOP_Count;
     size_t BVOP_Count;
+    size_t BVOP_Count_Max;
     size_t SVOP_Count;
     size_t NVOP_Count;
     size_t Interlaced_Top;
     size_t Interlaced_Bottom;
+    int64u Frame_Count_InThisBlock_Max;
 
     //From video_object_layer
-    size_t time_size;
     int32u fixed_vop_time_increment;
     int32u Time_Begin_Seconds;
     int32u Time_End_Seconds;
@@ -130,6 +135,7 @@
     int16u object_layer_width;
     int16u object_layer_height;
     int16u vop_time_increment_resolution;
+    int8u  time_size;
     int8u  visual_object_verid;
     int8u  profile_and_level_indication;
     int8u  no_of_sprite_warping_points;
@@ -141,6 +147,9 @@
     int8u  sprite_enable;
     int8u  estimation_method;
     int8u  chroma_format;
+    int8u  colour_primaries;
+    int8u  transfer_characteristics;
+    int8u  matrix_coefficients;
     bool   quarter_sample;
     bool   low_delay;
     bool   load_intra_quant_mat;

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Video/File_Mpegv.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_Mpegv.cpp Changed

@@ -1,30 +1,107 @@
 // File_Mpegv - Info for MPEG Video files
-// Copyright (C) 2004-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2004-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//***************************************************************************
+// Infos (Global)
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_MPEGV_YES) || defined(MEDIAINFO_MPEG4V_YES) || defined(MEDIAINFO_AVC_YES) || defined(MEDIAINFO_MPEG4_YES) || defined(MEDIAINFO_PRORES_YES)
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+#include "ZenLib/Conf.h"
+using namespace ZenLib;
+
+//---------------------------------------------------------------------------
+extern const char* Mpegv_colour_primaries(int8u colour_primaries)
+{
+    switch (colour_primaries)
+    {
+        case  1 : return "BT.709";
+        case  4 : return "BT.470 System M";
+        case  5 : return "BT.601 PAL";
+        case  6 : return "BT.601 NTSC";
+        case  7 : return "SMPTE 240M"; //Same as BT.601 NTSC
+        case  8 : return "Generic film";
+        default : return "";
+    }
+}
+
+//---------------------------------------------------------------------------
+extern const char* Mpegv_transfer_characteristics(int8u transfer_characteristics)
+{
+    switch (transfer_characteristics)
+    {
+        case  1 : return "BT.709"; //Same as BT.609
+        case  4 : return "BT.470 System M";
+        case  5 : return "BT.470 System B, BT.470 System G";
+        case  6 : return "BT.601";
+        case  7 : return "SMPTE 240M";
+        case  8 : return "Linear";
+        case  9 : return "Logarithmic (100:1)";                         //Added in MPEG-4 Visual
+        case 10 : return "Logarithmic (316.22777:1)";                   //Added in MPEG-4 Visual
+        case 11 : return "IEC 61966-2-4";                               //Added in AVC
+        case 12 : return "BT.1361 extended colour gamut system";        //Added in AVC
+        default : return "";
+    }
+}
+
+//---------------------------------------------------------------------------
+extern const char* Mpegv_matrix_coefficients(int8u matrix_coefficients)
+{
+    switch (matrix_coefficients)
+    {
+        case  0 : return "RGB";                                         //Added in AVC
+        case  1 : return "BT.709";
+        case  4 : return "FCC 73.682";
+        case  5 : return "BT.601";
+        case  6 : return "BT.601";
+        case  7 : return "SMPTE 240M";
+        case  8 : return "YCgCo";                                       //Added in AVC
+        default : return "";
+    }
+}
+
+} //NameSpace
+
+#if !MEDIAINFO_ADVANCED
+    const int64u Config_VariableGopDetection_Occurences=4;
+#endif // MEDIAINFO_ADVANCED
+//---------------------------------------------------------------------------
+#endif //...
+//---------------------------------------------------------------------------
+
 //***************************************************************************
 // Infos (Global)
 //***************************************************************************
@@ -40,16 +117,16 @@
 using namespace ZenLib;
 
 //---------------------------------------------------------------------------
-extern const float32 Mpegv_frame_rate[]=
+extern const float32 Mpegv_frame_rate[16]=
 {
     (float32) 0,
-    (float32)23.976,
+    (float32)24000/(float32)1001,
     (float32)24,
     (float32)25,
-    (float32)29.97,
+    (float32)30000/(float32)1001,
     (float32)30,
     (float32)50,
-    (float32)59.94,
+    (float32)60000/(float32)1001,
     (float32)60,
     (float32) 0,
     (float32) 0,
@@ -61,7 +138,7 @@
 };
 
 //---------------------------------------------------------------------------
-const char* Mpegv_Colorimetry_format[]=
+const char* Mpegv_Colorimetry_format[4]=
 {
     "",
     "4:2:0",
@@ -89,7 +166,7 @@
 {
     "0",
     "High",
-    "Spatial Scalable",
+    "Spatially Scalable",
     "SNR Scalable",
     "Main",
     "Simple",
@@ -138,14 +215,15 @@
 #if defined(MEDIAINFO_SCTE20_YES)
     #include "MediaInfo/Text/File_Scte20.h"
 #endif //defined(MEDIAINFO_SCTE20_YES)
-#if defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_CDP_YES)
+#if defined(MEDIAINFO_CDP_YES)
     #include "MediaInfo/Text/File_Cdp.h"
     #include <cstring>
-#endif //defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_CDP_YES)
+#endif //defined(MEDIAINFO_CDP_YES)
 #if defined(MEDIAINFO_AFDBARDATA_YES)
     #include "MediaInfo/Video/File_AfdBarData.h"
     #include <cstring>
 #endif //defined(MEDIAINFO_AFDBARDATA_YES)
+#include "MediaInfo/MediaInfo_Config_MediaInfo.h"
 #if MEDIAINFO_EVENTS
     #include "MediaInfo/MediaInfo_Events.h"
 #endif //MEDIAINFO_EVENTS
@@ -267,6 +345,686 @@
     "",
 };
 
+//---------------------------------------------------------------------------
+#if MEDIAINFO_MACROBLOCKS
+const int8u Mpegv_block_count[4]=
+{
+    0,
+    6,
+    8,
+   12,
+};
+
+const File__Analyze::vlc Mpegv_macroblock_address_increment[]=
+{
+    //                                  macroblock_address_increment
+    {   1   ,   1   ,   0   ,   0   ,   1   },
+    {   2   ,   2   ,   0   ,   0   ,   3   },
+    {   3   ,   0   ,   0   ,   0   ,   2   },
+    {   2   ,   1   ,   0   ,   0   ,   5   },
+    {   3   ,   0   ,   0   ,   0   ,   4   },
+    {   2   ,   1   ,   0   ,   0   ,   7   },
+    {   3   ,   0   ,   0   ,   0   ,   6   },
+    {   6   ,   2   ,   0   ,   0   ,   9   },
+    {   7   ,   0   ,   0   ,   0   ,   8   },
+    {   6   ,   1   ,   0   ,   0   ,   15  },
+    {   7   ,   0   ,   0   ,   0   ,   14  },
+    {   8   ,   0   ,   0   ,   0   ,   13  },
+    {   9   ,   0   ,   0   ,   0   ,   12  },
+    {   10  ,   0   ,   0   ,   0   ,   11  },
+    {   11  ,   0   ,   0   ,   0   ,   10  },
+    {   18  ,   2   ,   0   ,   0   ,   21  },
+    {   19  ,   0   ,   0   ,   0   ,   20  },
+    {   20  ,   0   ,   0   ,   0   ,   19  },
+    {   21  ,   0   ,   0   ,   0   ,   18  },
+    {   22  ,   0   ,   0   ,   0   ,   17  },
+    {   23  ,   0   ,   0   ,   0   ,   16  },
+    {   8   ,   1   ,   2   ,   0   ,   33  }, //Escape
+    {   24  ,   0   ,   0   ,   0   ,   33  },
+    {   25  ,   0   ,   0   ,   0   ,   32  },
+    {   26  ,   0   ,   0   ,   0   ,   31  },
+    {   27  ,   0   ,   0   ,   0   ,   30  },
+    {   28  ,   0   ,   0   ,   0   ,   29  },
+    {   29  ,   0   ,   0   ,   0   ,   28  },
+    {   30  ,   0   ,   0   ,   0   ,   27  },
+    {   31  ,   0   ,   0   ,   0   ,   26  },
+    {   32  ,   0   ,   0   ,   0   ,   25  },
+    {   33  ,   0   ,   0   ,   0   ,   24  },
+    {   34  ,   0   ,   0   ,   0   ,   23  },
+    {   35  ,   0   ,   0   ,   0   ,   22  },
+    VLC_END
+};
+const File__Analyze::vlc Mpegv_dct_dc_size_luminance[]=
+{
+    {    0,   2,   0,   0,   1},
+    {    1,   0,   0,   0,   2},
+    {    4,   1,   0,   0,   0},
+    {    5,   0,   0,   0,   3},
+    {    6,   0,   0,   0,   4},
+    {   14,   1,   0,   0,   5},
+    {   30,   1,   0,   0,   6},
+    {   62,   1,   0,   0,   7},
+    {  126,   1,   0,   0,   8},
+    {  254,   1,   0,   0,   9},
+    {  510,   1,   0,   0,  10},
+    {  511,   0,   0,   0,  11},
+    VLC_END
+};
+
+const File__Analyze::vlc Mpegv_dct_dc_size_chrominance[]=
+{
+    {    0,   2,   0,   0,   0},
+    {    1,   0,   0,   0,   1},
+    {    2,   0,   0,   0,   2},
+    {    6,   1,   0,   0,   3},
+    {   14,   1,   0,   0,   4},
+    {   30,   1,   0,   0,   5},
+    {   62,   1,   0,   0,   6},
+    {  126,   1,   0,   0,   7},
+    {  254,   1,   0,   0,   8},
+    {  510,   1,   0,   0,   9},
+    { 1022,   1,   0,   0,  10},
+    { 1023,   0,   0,   0,  11},
+    VLC_END
+};
+
+const File__Analyze::vlc Mpegv_dct_coefficients_0[]=
+{
+    //                          Run     Level
+    {   2   ,   2   ,   3   ,   0   ,   1   }, // End of Block (others) or Run=0/Level=1 (first DCT)
+    {   3   ,   0   ,   3   ,   0   ,   -1  }, // End of Block (others) or Run=0/Level=1 (first DCT)
+    {   6   ,   2   ,   0   ,   1   ,   1   },
+    {   7   ,   0   ,   0   ,   1   ,   -1  },
+    {   8   ,   1   ,   0   ,   0   ,   2   },
+    {   9   ,   0   ,   0   ,   0   ,   -2  },
+    {   10  ,   0   ,   0   ,   2   ,   1   },
+    {   11  ,   0   ,   0   ,   2   ,   -1  },
+    {   1   ,   1   ,   2   ,   0   ,   0   }, // Escape
+    {   10  ,   0   ,   0   ,   0   ,   3   },
+    {   11  ,   0   ,   0   ,   0   ,   -3  },
+    {   12  ,   0   ,   0   ,   4   ,   1   },
+    {   13  ,   0   ,   0   ,   4   ,   -1  },
+    {   14  ,   0   ,   0   ,   3   ,   1   },
+    {   15  ,   0   ,   0   ,   3   ,   -1  },
+    {   8   ,   1   ,   0   ,   7   ,   1   },
+    {   9   ,   0   ,   0   ,   7   ,   -1  },
+    {   10  ,   0   ,   0   ,   6   ,   1   },
+    {   11  ,   0   ,   0   ,   6   ,   -1  },
+    {   12  ,   0   ,   0   ,   1   ,   2   },
+    {   13  ,   0   ,   0   ,   1   ,   -2  },
+    {   14  ,   0   ,   0   ,   5   ,   1   },
+    {   15  ,   0   ,   0   ,   5   ,   -1  },
+    {   8   ,   1   ,   0   ,   2   ,   2   },
+    {   9   ,   0   ,   0   ,   2   ,   -2  },
+    {   10  ,   0   ,   0   ,   9   ,   1   },
+    {   11  ,   0   ,   0   ,   9   ,   -1  },
+    {   12  ,   0   ,   0   ,   0   ,   4   },
+    {   13  ,   0   ,   0   ,   0   ,   -4  },
+    {   14  ,   0   ,   0   ,   8   ,   1   },
+    {   15  ,   0   ,   0   ,   8   ,   -1  },
+    {   64  ,   1   ,   0   ,   13  ,   1   },
+    {   65  ,   0   ,   0   ,   13  ,   -1  },
+    {   66  ,   0   ,   0   ,   0   ,   6   },
+    {   67  ,   0   ,   0   ,   0   ,   -6  },
+    {   68  ,   0   ,   0   ,   12  ,   1   },
+    {   69  ,   0   ,   0   ,   12  ,   -1  },
+    {   70  ,   0   ,   0   ,   11  ,   1   },
+    {   71  ,   0   ,   0   ,   11  ,   -1  },
+    {   72  ,   0   ,   0   ,   3   ,   2   },
+    {   73  ,   0   ,   0   ,   3   ,   -2  },
+    {   74  ,   0   ,   0   ,   1   ,   3   },
+    {   75  ,   0   ,   0   ,   1   ,   -3  },
+    {   76  ,   0   ,   0   ,   0   ,   5   },
+    {   77  ,   0   ,   0   ,   0   ,   -5  },
+    {   78  ,   0   ,   0   ,   10  ,   1   },
+    {   79  ,   0   ,   0   ,   10  ,   -1  },
+    {   16  ,   2   ,   0   ,   16  ,   1   },
+    {   17  ,   0   ,   0   ,   16  ,   -1  },
+    {   18  ,   0   ,   0   ,   5   ,   2   },
+    {   19  ,   0   ,   0   ,   5   ,   -2  },
+    {   20  ,   0   ,   0   ,   0   ,   7   },
+    {   21  ,   0   ,   0   ,   0   ,   -7  },
+    {   22  ,   0   ,   0   ,   2   ,   3   },
+    {   23  ,   0   ,   0   ,   2   ,   -3  },
+    {   24  ,   0   ,   0   ,   1   ,   4   },
+    {   25  ,   0   ,   0   ,   1   ,   -4  },
+    {   26  ,   0   ,   0   ,   15  ,   1   },
+    {   27  ,   0   ,   0   ,   15  ,   -1  },
+    {   28  ,   0   ,   0   ,   14  ,   1   },
+    {   29  ,   0   ,   0   ,   14  ,   -1  },
+    {   30  ,   0   ,   0   ,   4   ,   2   },
+    {   31  ,   0   ,   0   ,   4   ,   -2  },
+    {   32  ,   2   ,   0   ,   0   ,   11  },
+    {   33  ,   0   ,   0   ,   0   ,   -11 },
+    {   34  ,   0   ,   0   ,   8   ,   2   },
+    {   35  ,   0   ,   0   ,   8   ,   -2  },
+    {   36  ,   0   ,   0   ,   4   ,   3   },
+    {   37  ,   0   ,   0   ,   4   ,   -3  },
+    {   38  ,   0   ,   0   ,   0   ,   10  },
+    {   39  ,   0   ,   0   ,   0   ,   -10 },
+    {   40  ,   0   ,   0   ,   2   ,   4   },
+    {   41  ,   0   ,   0   ,   2   ,   -4  },
+    {   42  ,   0   ,   0   ,   7   ,   2   },
+    {   43  ,   0   ,   0   ,   7   ,   -2  },
+    {   44  ,   0   ,   0   ,   21  ,   1   },
+    {   45  ,   0   ,   0   ,   21  ,   -1  },
+    {   46  ,   0   ,   0   ,   20  ,   1   },
+    {   47  ,   0   ,   0   ,   20  ,   -1  },
+    {   48  ,   0   ,   0   ,   0   ,   9   },
+    {   49  ,   0   ,   0   ,   0   ,   -9  },
+    {   50  ,   0   ,   0   ,   19  ,   1   },
+    {   51  ,   0   ,   0   ,   19  ,   -1  },
+    {   52  ,   0   ,   0   ,   18  ,   1   },
+    {   53  ,   0   ,   0   ,   18  ,   -1  },
+    {   54  ,   0   ,   0   ,   1   ,   5   },
+    {   55  ,   0   ,   0   ,   1   ,   -5  },
+    {   56  ,   0   ,   0   ,   3   ,   3   },
+    {   57  ,   0   ,   0   ,   3   ,   -3  },
+    {   58  ,   0   ,   0   ,   0   ,   8   },
+    {   59  ,   0   ,   0   ,   0   ,   -8  },
+    {   60  ,   0   ,   0   ,   6   ,   2   },
+    {   61  ,   0   ,   0   ,   6   ,   -2  },
+    {   62  ,   0   ,   0   ,   17  ,   1   },
+    {   63  ,   0   ,   0   ,   17  ,   -1  },
+    {   32  ,   1   ,   0   ,   10  ,   2   },
+    {   33  ,   0   ,   0   ,   10  ,   -2  },
+    {   34  ,   0   ,   0   ,   9   ,   2   },
+    {   35  ,   0   ,   0   ,   9   ,   -2  },
+    {   36  ,   0   ,   0   ,   5   ,   3   },
+    {   37  ,   0   ,   0   ,   5   ,   -3  },
+    {   38  ,   0   ,   0   ,   3   ,   4   },
+    {   39  ,   0   ,   0   ,   3   ,   -4  },
+    {   40  ,   0   ,   0   ,   2   ,   5   },
+    {   41  ,   0   ,   0   ,   2   ,   -5  },
+    {   42  ,   0   ,   0   ,   1   ,   7   },
+    {   43  ,   0   ,   0   ,   1   ,   -7  },
+    {   44  ,   0   ,   0   ,   1   ,   6   },
+    {   45  ,   0   ,   0   ,   1   ,   -6  },
+    {   46  ,   0   ,   0   ,   0   ,   15  },
+    {   47  ,   0   ,   0   ,   0   ,   -15 },
+    {   48  ,   0   ,   0   ,   0   ,   14  },
+    {   49  ,   0   ,   0   ,   0   ,   -14 },
+    {   50  ,   0   ,   0   ,   0   ,   13  },
+    {   51  ,   0   ,   0   ,   0   ,   -13 },
+    {   52  ,   0   ,   0   ,   0   ,   12  },
+    {   53  ,   0   ,   0   ,   0   ,   -12 },
+    {   54  ,   0   ,   0   ,   26  ,   1   },
+    {   55  ,   0   ,   0   ,   26  ,   -1  },
+    {   56  ,   0   ,   0   ,   25  ,   1   },
+    {   57  ,   0   ,   0   ,   25  ,   -1  },
+    {   58  ,   0   ,   0   ,   24  ,   1   },
+    {   59  ,   0   ,   0   ,   24  ,   -1  },
+    {   60  ,   0   ,   0   ,   23  ,   1   },
+    {   61  ,   0   ,   0   ,   23  ,   -1  },
+    {   62  ,   0   ,   0   ,   22  ,   1   },
+    {   63  ,   0   ,   0   ,   22  ,   -1  },
+    {   32  ,   1   ,   0   ,   0   ,   31  },
+    {   33  ,   0   ,   0   ,   0   ,   -31 },
+    {   34  ,   0   ,   0   ,   0   ,   30  },
+    {   35  ,   0   ,   0   ,   0   ,   -30 },
+    {   36  ,   0   ,   0   ,   0   ,   29  },
+    {   37  ,   0   ,   0   ,   0   ,   -29 },
+    {   38  ,   0   ,   0   ,   0   ,   28  },
+    {   39  ,   0   ,   0   ,   0   ,   -28 },
+    {   40  ,   0   ,   0   ,   0   ,   27  },
+    {   41  ,   0   ,   0   ,   0   ,   -27 },
+    {   42  ,   0   ,   0   ,   0   ,   26  },
+    {   43  ,   0   ,   0   ,   0   ,   -26 },
+    {   44  ,   0   ,   0   ,   0   ,   25  },
+    {   45  ,   0   ,   0   ,   0   ,   -25 },
+    {   46  ,   0   ,   0   ,   0   ,   24  },
+    {   47  ,   0   ,   0   ,   0   ,   -24 },
+    {   48  ,   0   ,   0   ,   0   ,   23  },
+    {   49  ,   0   ,   0   ,   0   ,   -23 },
+    {   50  ,   0   ,   0   ,   0   ,   22  },
+    {   51  ,   0   ,   0   ,   0   ,   -22 },
+    {   52  ,   0   ,   0   ,   0   ,   21  },
+    {   53  ,   0   ,   0   ,   0   ,   -21 },
+    {   54  ,   0   ,   0   ,   0   ,   20  },
+    {   55  ,   0   ,   0   ,   0   ,   -20 },
+    {   56  ,   0   ,   0   ,   0   ,   19  },
+    {   57  ,   0   ,   0   ,   0   ,   -19 },
+    {   58  ,   0   ,   0   ,   0   ,   18  },
+    {   59  ,   0   ,   0   ,   0   ,   -18 },
+    {   60  ,   0   ,   0   ,   0   ,   17  },
+    {   61  ,   0   ,   0   ,   0   ,   -17 },
+    {   62  ,   0   ,   0   ,   0   ,   16  },
+    {   63  ,   0   ,   0   ,   0   ,   -16 },
+    {   32  ,   1   ,   0   ,   0   ,   40  },
+    {   33  ,   0   ,   0   ,   0   ,   -40 },
+    {   34  ,   0   ,   0   ,   0   ,   39  },
+    {   35  ,   0   ,   0   ,   0   ,   -39 },
+    {   36  ,   0   ,   0   ,   0   ,   38  },
+    {   37  ,   0   ,   0   ,   0   ,   -38 },
+    {   38  ,   0   ,   0   ,   0   ,   37  },
+    {   39  ,   0   ,   0   ,   0   ,   -37 },
+    {   40  ,   0   ,   0   ,   0   ,   36  },
+    {   41  ,   0   ,   0   ,   0   ,   -36 },
+    {   42  ,   0   ,   0   ,   0   ,   35  },
+    {   43  ,   0   ,   0   ,   0   ,   -35 },
+    {   44  ,   0   ,   0   ,   0   ,   34  },
+    {   45  ,   0   ,   0   ,   0   ,   -34 },
+    {   46  ,   0   ,   0   ,   0   ,   33  },
+    {   47  ,   0   ,   0   ,   0   ,   -33 },
+    {   48  ,   0   ,   0   ,   0   ,   32  },
+    {   49  ,   0   ,   0   ,   0   ,   -32 },
+    {   50  ,   0   ,   0   ,   1   ,   14  },
+    {   51  ,   0   ,   0   ,   1   ,   -14 },
+    {   52  ,   0   ,   0   ,   1   ,   13  },
+    {   53  ,   0   ,   0   ,   1   ,   -13 },
+    {   54  ,   0   ,   0   ,   1   ,   12  },
+    {   55  ,   0   ,   0   ,   1   ,   -12 },
+    {   56  ,   0   ,   0   ,   1   ,   11  },
+    {   57  ,   0   ,   0   ,   1   ,   -11 },
+    {   58  ,   0   ,   0   ,   1   ,   10  },
+    {   59  ,   0   ,   0   ,   1   ,   -10 },
+    {   60  ,   0   ,   0   ,   1   ,   9   },
+    {   61  ,   0   ,   0   ,   1   ,   -9  },
+    {   62  ,   0   ,   0   ,   1   ,   8   },
+    {   63  ,   0   ,   0   ,   1   ,   -8  },
+    {   32  ,   1   ,   0   ,   1   ,   18  },
+    {   33  ,   0   ,   0   ,   1   ,   -18 },
+    {   34  ,   0   ,   0   ,   1   ,   17  },
+    {   35  ,   0   ,   0   ,   1   ,   -17 },
+    {   36  ,   0   ,   0   ,   1   ,   16  },
+    {   37  ,   0   ,   0   ,   1   ,   -16 },
+    {   38  ,   0   ,   0   ,   1   ,   15  },
+    {   39  ,   0   ,   0   ,   1   ,   -15 },
+    {   40  ,   0   ,   0   ,   6   ,   3   },
+    {   41  ,   0   ,   0   ,   6   ,   -3  },
+    {   42  ,   0   ,   0   ,   16  ,   2   },
+    {   43  ,   0   ,   0   ,   16  ,   -2  },
+    {   44  ,   0   ,   0   ,   15  ,   2   },
+    {   45  ,   0   ,   0   ,   15  ,   -2  },
+    {   46  ,   0   ,   0   ,   14  ,   2   },
+    {   47  ,   0   ,   0   ,   14  ,   -2  },
+    {   48  ,   0   ,   0   ,   13  ,   2   },
+    {   49  ,   0   ,   0   ,   13  ,   -2  },
+    {   50  ,   0   ,   0   ,   12  ,   2   },
+    {   51  ,   0   ,   0   ,   12  ,   -2  },
+    {   52  ,   0   ,   0   ,   11  ,   2   },
+    {   53  ,   0   ,   0   ,   11  ,   -2  },
+    {   54  ,   0   ,   0   ,   31  ,   1   },
+    {   55  ,   0   ,   0   ,   31  ,   -1  },
+    {   56  ,   0   ,   0   ,   30  ,   1   },
+    {   57  ,   0   ,   0   ,   30  ,   -1  },
+    {   58  ,   0   ,   0   ,   29  ,   1   },
+    {   59  ,   0   ,   0   ,   29  ,   -1  },
+    {   60  ,   0   ,   0   ,   28  ,   1   },
+    {   61  ,   0   ,   0   ,   28  ,   -1  },
+    {   62  ,   0   ,   0   ,   27  ,   1   },
+    {   63  ,   0   ,   0   ,   27  ,   -1  },
+    {(int32u)-1, (int8u)-1, 1, -1, -1} //
+};
+
+const File__Analyze::vlc Mpegv_dct_coefficients_1[]=
+{
+    //                          Run     Level
+    {   4   ,   3   ,   0   ,   0   ,   1   },
+    {   5   ,   0   ,   0   ,   0   ,   -1  },
+    {   4   ,   1   ,   0   ,   1   ,   1   },
+    {   5   ,   0   ,   0   ,   1   ,   -1  },
+    {   6   ,   0   ,   1   ,   0   ,   0   },
+    {   12  ,   0   ,   0   ,   0   ,   2   },
+    {   13  ,   0   ,   0   ,   0   ,   -2  },
+    {   14  ,   1   ,   0   ,   0   ,   3   },
+    {   15  ,   0   ,   0   ,   0   ,   -3  },
+    {   1   ,   1   ,   2   ,   0   ,   0   },
+    {   10  ,   0   ,   0   ,   2   ,   1   },
+    {   11  ,   0   ,   0   ,   2   ,   -1  },
+    {   12  ,   0   ,   0   ,   1   ,   2   },
+    {   13  ,   0   ,   0   ,   1   ,   -2  },
+    {   14  ,   0   ,   0   ,   3   ,   1   },
+    {   15  ,   0   ,   0   ,   3   ,   -1  },
+    {   56  ,   0   ,   0   ,   0   ,   4   },
+    {   57  ,   0   ,   0   ,   0   ,   -4  },
+    {   58  ,   0   ,   0   ,   0   ,   5   },
+    {   59  ,   0   ,   0   ,   0   ,   -5  },
+    {   8   ,   1   ,   0   ,   0   ,   7   },
+    {   9   ,   0   ,   0   ,   0   ,   -7  },
+    {   10  ,   0   ,   0   ,   0   ,   6   },
+    {   11  ,   0   ,   0   ,   0   ,   -6  },
+    {   12  ,   0   ,   0   ,   4   ,   1   },
+    {   13  ,   0   ,   0   ,   4   ,   -1  },
+    {   14  ,   0   ,   0   ,   5   ,   1   },
+    {   15  ,   0   ,   0   ,   5   ,   -1  },
+    {   8   ,   1   ,   0   ,   7   ,   1   },
+    {   9   ,   0   ,   0   ,   7   ,   -1  },
+    {   10  ,   0   ,   0   ,   8   ,   1   },
+    {   11  ,   0   ,   0   ,   8   ,   -1  },
+    {   12  ,   0   ,   0   ,   6   ,   1   },
+    {   13  ,   0   ,   0   ,   6   ,   -1  },
+    {   14  ,   0   ,   0   ,   2   ,   2   },
+    {   15  ,   0   ,   0   ,   2   ,   -2  },
+    {   240 ,   0   ,   0   ,   9   ,   1   },
+    {   241 ,   0   ,   0   ,   9   ,   -1  },
+    {   242 ,   0   ,   0   ,   1   ,   3   },
+    {   243 ,   0   ,   0   ,   1   ,   -3  },
+    {   244 ,   0   ,   0   ,   10  ,   1   },
+    {   245 ,   0   ,   0   ,   10  ,   -1  },
+    {   246 ,   0   ,   0   ,   0   ,   8   },
+    {   247 ,   0   ,   0   ,   0   ,   -8  },
+    {   248 ,   0   ,   0   ,   0   ,   9   },
+    {   249 ,   0   ,   0   ,   0   ,   -9  },
+    {   64  ,   1   ,   0   ,   1   ,   5   },
+    {   65  ,   0   ,   0   ,   1   ,   -5  },
+    {   66  ,   0   ,   0   ,   11  ,   1   },
+    {   67  ,   0   ,   0   ,   11  ,   -1  },
+    {   68  ,   0   ,   0   ,   0   ,   11  },
+    {   69  ,   0   ,   0   ,   0   ,   -11 },
+    {   70  ,   0   ,   0   ,   0   ,   10  },
+    {   71  ,   0   ,   0   ,   0   ,   -10 },
+    {   72  ,   0   ,   0   ,   13  ,   1   },
+    {   73  ,   0   ,   0   ,   13  ,   -1  },
+    {   74  ,   0   ,   0   ,   12  ,   1   },
+    {   75  ,   0   ,   0   ,   12  ,   -1  },
+    {   76  ,   0   ,   0   ,   3   ,   2   },
+    {   77  ,   0   ,   0   ,   3   ,   -2  },
+    {   78  ,   0   ,   0   ,   1   ,   4   },
+    {   79  ,   0   ,   0   ,   1   ,   -4  },
+    {   500 ,   0   ,   0   ,   0   ,   12  },
+    {   501 ,   0   ,   0   ,   0   ,   -12 },
+    {   502 ,   0   ,   0   ,   0   ,   13  },
+    {   503 ,   0   ,   0   ,   0   ,   -13 },
+    {   504 ,   0   ,   0   ,   2   ,   3   },
+    {   505 ,   0   ,   0   ,   2   ,   -3  },
+    {   506 ,   0   ,   0   ,   4   ,   2   },
+    {   507 ,   0   ,   0   ,   4   ,   -2  },
+    {   508 ,   0   ,   0   ,   0   ,   14  },
+    {   509 ,   0   ,   0   ,   0   ,   -14 },
+    {   510 ,   0   ,   0   ,   0   ,   15  },
+    {   511 ,   0   ,   0   ,   0   ,   -15 },
+    {   8   ,   1   ,   0   ,   5   ,   2   },
+    {   9   ,   0   ,   0   ,   5   ,   -2  },
+    {   10  ,   0   ,   0   ,   14  ,   1   },
+    {   11  ,   0   ,   0   ,   14  ,   -1  },
+    {   14  ,   0   ,   0   ,   15  ,   1   },
+    {   15  ,   0   ,   0   ,   15  ,   -1  },
+    {   24  ,   1   ,   0   ,   2   ,   4   },
+    {   25  ,   0   ,   0   ,   2   ,   -4  },
+    {   26  ,   0   ,   0   ,   16  ,   1   },
+    {   27  ,   0   ,   0   ,   16  ,   -1  },
+    {   34  ,   2   ,   0   ,   8   ,   2   },
+    {   35  ,   0   ,   0   ,   8   ,   -2  },
+    {   36  ,   0   ,   0   ,   4   ,   3   },
+    {   37  ,   0   ,   0   ,   4   ,   -3  },
+    {   42  ,   0   ,   0   ,   7   ,   2   },
+    {   43  ,   0   ,   0   ,   7   ,   -2  },
+    {   44  ,   0   ,   0   ,   21  ,   1   },
+    {   45  ,   0   ,   0   ,   21  ,   -1  },
+    {   46  ,   0   ,   0   ,   20  ,   1   },
+    {   47  ,   0   ,   0   ,   20  ,   -1  },
+    {   50  ,   0   ,   0   ,   19  ,   1   },
+    {   51  ,   0   ,   0   ,   19  ,   -1  },
+    {   52  ,   0   ,   0   ,   18  ,   1   },
+    {   53  ,   0   ,   0   ,   18  ,   -1  },
+    {   56  ,   0   ,   0   ,   3   ,   3   },
+    {   57  ,   0   ,   0   ,   3   ,   -3  },
+    {   60  ,   0   ,   0   ,   6   ,   2   },
+    {   61  ,   0   ,   0   ,   6   ,   -2  },
+    {   62  ,   0   ,   0   ,   17  ,   1   },
+    {   63  ,   0   ,   0   ,   17  ,   -1  },
+    {   32  ,   1   ,   0   ,   10  ,   2   },
+    {   33  ,   0   ,   0   ,   10  ,   -2  },
+    {   34  ,   0   ,   0   ,   9   ,   2   },
+    {   35  ,   0   ,   0   ,   9   ,   -2  },
+    {   36  ,   0   ,   0   ,   5   ,   3   },
+    {   37  ,   0   ,   0   ,   5   ,   -3  },
+    {   38  ,   0   ,   0   ,   3   ,   4   },
+    {   39  ,   0   ,   0   ,   3   ,   -4  },
+    {   40  ,   0   ,   0   ,   2   ,   5   },
+    {   41  ,   0   ,   0   ,   2   ,   -5  },
+    {   42  ,   0   ,   0   ,   1   ,   7   },
+    {   43  ,   0   ,   0   ,   1   ,   -7  },
+    {   44  ,   0   ,   0   ,   1   ,   6   },
+    {   45  ,   0   ,   0   ,   1   ,   -6  },
+    {   54  ,   0   ,   0   ,   26  ,   1   },
+    {   55  ,   0   ,   0   ,   26  ,   -1  },
+    {   56  ,   0   ,   0   ,   25  ,   1   },
+    {   57  ,   0   ,   0   ,   25  ,   -1  },
+    {   58  ,   0   ,   0   ,   24  ,   1   },
+    {   59  ,   0   ,   0   ,   24  ,   -1  },
+    {   60  ,   0   ,   0   ,   23  ,   1   },
+    {   61  ,   0   ,   0   ,   23  ,   -1  },
+    {   62  ,   0   ,   0   ,   22  ,   1   },
+    {   63  ,   0   ,   0   ,   22  ,   -1  },
+    {   32  ,   1   ,   0   ,   0   ,   31  },
+    {   33  ,   0   ,   0   ,   0   ,   -31 },
+    {   34  ,   0   ,   0   ,   0   ,   30  },
+    {   35  ,   0   ,   0   ,   0   ,   -30 },
+    {   36  ,   0   ,   0   ,   0   ,   29  },
+    {   37  ,   0   ,   0   ,   0   ,   -29 },
+    {   38  ,   0   ,   0   ,   0   ,   28  },
+    {   39  ,   0   ,   0   ,   0   ,   -28 },
+    {   40  ,   0   ,   0   ,   0   ,   27  },
+    {   41  ,   0   ,   0   ,   0   ,   -27 },
+    {   42  ,   0   ,   0   ,   0   ,   26  },
+    {   43  ,   0   ,   0   ,   0   ,   -26 },
+    {   44  ,   0   ,   0   ,   0   ,   25  },
+    {   45  ,   0   ,   0   ,   0   ,   -25 },
+    {   46  ,   0   ,   0   ,   0   ,   24  },
+    {   47  ,   0   ,   0   ,   0   ,   -24 },
+    {   48  ,   0   ,   0   ,   0   ,   23  },
+    {   49  ,   0   ,   0   ,   0   ,   -23 },
+    {   50  ,   0   ,   0   ,   0   ,   22  },
+    {   51  ,   0   ,   0   ,   0   ,   -22 },
+    {   52  ,   0   ,   0   ,   0   ,   21  },
+    {   53  ,   0   ,   0   ,   0   ,   -21 },
+    {   54  ,   0   ,   0   ,   0   ,   20  },
+    {   55  ,   0   ,   0   ,   0   ,   -20 },
+    {   56  ,   0   ,   0   ,   0   ,   19  },
+    {   57  ,   0   ,   0   ,   0   ,   -19 },
+    {   58  ,   0   ,   0   ,   0   ,   18  },
+    {   59  ,   0   ,   0   ,   0   ,   -18 },
+    {   60  ,   0   ,   0   ,   0   ,   17  },
+    {   61  ,   0   ,   0   ,   0   ,   -17 },
+    {   62  ,   0   ,   0   ,   0   ,   16  },
+    {   63  ,   0   ,   0   ,   0   ,   -16 },
+    {   32  ,   1   ,   0   ,   0   ,   40  },
+    {   33  ,   0   ,   0   ,   0   ,   -40 },
+    {   34  ,   0   ,   0   ,   0   ,   39  },
+    {   35  ,   0   ,   0   ,   0   ,   -39 },
+    {   36  ,   0   ,   0   ,   0   ,   38  },
+    {   37  ,   0   ,   0   ,   0   ,   -38 },
+    {   38  ,   0   ,   0   ,   0   ,   37  },
+    {   39  ,   0   ,   0   ,   0   ,   -37 },
+    {   40  ,   0   ,   0   ,   0   ,   36  },
+    {   41  ,   0   ,   0   ,   0   ,   -36 },
+    {   42  ,   0   ,   0   ,   0   ,   35  },
+    {   43  ,   0   ,   0   ,   0   ,   -35 },
+    {   44  ,   0   ,   0   ,   0   ,   34  },
+    {   45  ,   0   ,   0   ,   0   ,   -34 },
+    {   46  ,   0   ,   0   ,   0   ,   33  },
+    {   47  ,   0   ,   0   ,   0   ,   -33 },
+    {   48  ,   0   ,   0   ,   0   ,   32  },
+    {   49  ,   0   ,   0   ,   0   ,   -32 },
+    {   50  ,   0   ,   0   ,   1   ,   14  },
+    {   51  ,   0   ,   0   ,   1   ,   -14 },
+    {   52  ,   0   ,   0   ,   1   ,   13  },
+    {   53  ,   0   ,   0   ,   1   ,   -13 },
+    {   54  ,   0   ,   0   ,   1   ,   12  },
+    {   55  ,   0   ,   0   ,   1   ,   -12 },
+    {   56  ,   0   ,   0   ,   1   ,   11  },
+    {   57  ,   0   ,   0   ,   1   ,   -11 },
+    {   58  ,   0   ,   0   ,   1   ,   10  },
+    {   59  ,   0   ,   0   ,   1   ,   -10 },
+    {   60  ,   0   ,   0   ,   1   ,   9   },
+    {   61  ,   0   ,   0   ,   1   ,   -9  },
+    {   62  ,   0   ,   0   ,   1   ,   8   },
+    {   63  ,   0   ,   0   ,   1   ,   -8  },
+    {   32  ,   1   ,   0   ,   1   ,   18  },
+    {   33  ,   0   ,   0   ,   1   ,   -18 },
+    {   34  ,   0   ,   0   ,   1   ,   17  },
+    {   35  ,   0   ,   0   ,   1   ,   -17 },
+    {   36  ,   0   ,   0   ,   1   ,   16  },
+    {   37  ,   0   ,   0   ,   1   ,   -16 },
+    {   38  ,   0   ,   0   ,   1   ,   15  },
+    {   39  ,   0   ,   0   ,   1   ,   -15 },
+    {   40  ,   0   ,   0   ,   6   ,   3   },
+    {   41  ,   0   ,   0   ,   6   ,   -3  },
+    {   42  ,   0   ,   0   ,   16  ,   2   },
+    {   43  ,   0   ,   0   ,   16  ,   -2  },
+    {   44  ,   0   ,   0   ,   15  ,   2   },
+    {   45  ,   0   ,   0   ,   15  ,   -2  },
+    {   46  ,   0   ,   0   ,   14  ,   2   },
+    {   47  ,   0   ,   0   ,   14  ,   -2  },
+    {   48  ,   0   ,   0   ,   13  ,   2   },
+    {   49  ,   0   ,   0   ,   13  ,   -2  },
+    {   50  ,   0   ,   0   ,   12  ,   2   },
+    {   51  ,   0   ,   0   ,   12  ,   -2  },
+    {   52  ,   0   ,   0   ,   11  ,   2   },
+    {   53  ,   0   ,   0   ,   11  ,   -2  },
+    {   54  ,   0   ,   0   ,   31  ,   1   },
+    {   55  ,   0   ,   0   ,   31  ,   -1  },
+    {   56  ,   0   ,   0   ,   30  ,   1   },
+    {   57  ,   0   ,   0   ,   30  ,   -1  },
+    {   58  ,   0   ,   0   ,   29  ,   1   },
+    {   59  ,   0   ,   0   ,   29  ,   -1  },
+    {   60  ,   0   ,   0   ,   28  ,   1   },
+    {   61  ,   0   ,   0   ,   28  ,   -1  },
+    {   62  ,   0   ,   0   ,   27  ,   1   },
+    {   63  ,   0   ,   0   ,   27  ,   -1  },
+    {(int32u)-1, (int8u)-1, 1, -1, -1} //
+};
+
+const File__Analyze::vlc Mpegv_macroblock_type_I[]=
+{
+    {    1,   1,   0,   0, 0x02},
+    {    1,   1,   0,   0, 0x22},
+    VLC_END
+};
+
+const File__Analyze::vlc Mpegv_macroblock_type_P[]=
+{
+    {    1,   1,   0,   0, 0x14},
+    {    1,   1,   0,   0, 0x04},
+    {    1,   1,   0,   0, 0x10},
+    {    3,   2,   0,   0, 0x02},
+    {    2,   0,   0,   0, 0x34},
+    {    1,   0,   0,   0, 0x24},
+    {    1,   1,   0,   0, 0x22},
+    {(int32u)-1,(int8u)-1, 0, 0, 0}
+};
+
+const File__Analyze::vlc Mpegv_macroblock_type_B[]=
+{
+    {   2   ,   2   ,   0   ,   0   ,   0x18    },
+    {   3   ,   0   ,   0   ,   0   ,   0x1C    },
+    {   2   ,   1   ,   0   ,   0   ,   0x08    },
+    {   3   ,   0   ,   0   ,   0   ,   0x0C    },
+    {   2   ,   1   ,   0   ,   0   ,   0x10    },
+    {   3   ,   0   ,   0   ,   0   ,   0x14    },
+    {   3   ,   1   ,   0   ,   0   ,   0x02    },
+    {   2   ,   0   ,   0   ,   0   ,   0x3C    },
+    {   3   ,   1   ,   0   ,   0   ,   0x34    },
+    {   2   ,   0   ,   0   ,   0   ,   0x2C    },
+    {   1   ,   0   ,   0   ,   0   ,   0x22    },
+    VLC_END
+};
+
+const File__Analyze::vlc Mpegv_motion_code[]=
+{
+    {   1   ,   1   ,   0   ,   0   ,   0   },
+    {   1   ,   1   ,   0   ,   0   ,   1   },
+    {   1   ,   1   ,   0   ,   0   ,   2   },
+    {   1   ,   1   ,   0   ,   0   ,   3   },
+    {   3   ,   2   ,   0   ,   0   ,   4   },
+    {   5   ,   1   ,   0   ,   0   ,   5   },
+    {   4   ,   0   ,   0   ,   0   ,   6   },
+    {   3   ,   0   ,   0   ,   0   ,   7   },
+    {   11  ,   2   ,   0   ,   0   ,   8   },
+    {   10  ,   0   ,   0   ,   0   ,   9   },
+    {   9   ,   0   ,   0   ,   0   ,   10  },
+    {   17  ,   1   ,   0   ,   0   ,   11  },
+    {   16  ,   0   ,   0   ,   0   ,   12  },
+    {   15  ,   0   ,   0   ,   0   ,   13  },
+    {   14  ,   0   ,   0   ,   0   ,   14  },
+    {   13  ,   0   ,   0   ,   0   ,   15  },
+    {   12  ,   0   ,   0   ,   0   ,   16  },
+
+    VLC_END
+};
+
+const File__Analyze::vlc Mpegv_dmvector[]=
+{
+    {   0   ,   1   ,   0   ,   0   ,   0   },
+    {   2   ,   1   ,   0   ,   0   ,   1   },
+    {   3   ,   0   ,   0   ,   0   ,   -1  },
+    VLC_END
+};
+
+const File__Analyze::vlc Mpegv_coded_block_pattern[]=
+{
+    //                                  cbp
+    {   7   ,   3   ,   0   ,   0   ,   60  },
+    {   13  ,   1   ,   0   ,   0   ,   4   },
+    {   12  ,   0   ,   0   ,   0   ,   8   },
+    {   11  ,   0   ,   0   ,   0   ,   16  },
+    {   10  ,   0   ,   0   ,   0   ,   32  },
+    {   19  ,   1   ,   0   ,   0   ,   12  },
+    {   18  ,   0   ,   0   ,   0   ,   48  },
+    {   17  ,   0   ,   0   ,   0   ,   20  },
+    {   16  ,   0   ,   0   ,   0   ,   40  },
+    {   15  ,   0   ,   0   ,   0   ,   28  },
+    {   14  ,   0   ,   0   ,   0   ,   44  },
+    {   13  ,   0   ,   0   ,   0   ,   52  },
+    {   12  ,   0   ,   0   ,   0   ,   56  },
+    {   11  ,   0   ,   0   ,   0   ,   1   },
+    {   10  ,   0   ,   0   ,   0   ,   61  },
+    {   9   ,   0   ,   0   ,   0   ,   2   },
+    {   8   ,   0   ,   0   ,   0   ,   62  },
+    {   15  ,   1   ,   0   ,   0   ,   24  },
+    {   14  ,   0   ,   0   ,   0   ,   36  },
+    {   13  ,   0   ,   0   ,   0   ,   3   },
+    {   12  ,   0   ,   0   ,   0   ,   63  },
+    {   23  ,   1   ,   0   ,   0   ,   5   },
+    {   22  ,   0   ,   0   ,   0   ,   9   },
+    {   21  ,   0   ,   0   ,   0   ,   17  },
+    {   20  ,   0   ,   0   ,   0   ,   33  },
+    {   19  ,   0   ,   0   ,   0   ,   6   },
+    {   18  ,   0   ,   0   ,   0   ,   10  },
+    {   17  ,   0   ,   0   ,   0   ,   18  },
+    {   16  ,   0   ,   0   ,   0   ,   34  },
+    {   31  ,   1   ,   0   ,   0   ,   7   },
+    {   30  ,   0   ,   0   ,   0   ,   11  },
+    {   29  ,   0   ,   0   ,   0   ,   19  },
+    {   28  ,   0   ,   0   ,   0   ,   35  },
+    {   27  ,   0   ,   0   ,   0   ,   13  },
+    {   26  ,   0   ,   0   ,   0   ,   49  },
+    {   25  ,   0   ,   0   ,   0   ,   21  },
+    {   24  ,   0   ,   0   ,   0   ,   41  },
+    {   23  ,   0   ,   0   ,   0   ,   14  },
+    {   22  ,   0   ,   0   ,   0   ,   50  },
+    {   21  ,   0   ,   0   ,   0   ,   22  },
+    {   20  ,   0   ,   0   ,   0   ,   42  },
+    {   19  ,   0   ,   0   ,   0   ,   15  },
+    {   18  ,   0   ,   0   ,   0   ,   51  },
+    {   17  ,   0   ,   0   ,   0   ,   23  },
+    {   16  ,   0   ,   0   ,   0   ,   43  },
+    {   15  ,   0   ,   0   ,   0   ,   25  },
+    {   14  ,   0   ,   0   ,   0   ,   37  },
+    {   13  ,   0   ,   0   ,   0   ,   26  },
+    {   12  ,   0   ,   0   ,   0   ,   38  },
+    {   11  ,   0   ,   0   ,   0   ,   29  },
+    {   10  ,   0   ,   0   ,   0   ,   45  },
+    {   9   ,   0   ,   0   ,   0   ,   53  },
+    {   8   ,   0   ,   0   ,   0   ,   57  },
+    {   7   ,   0   ,   0   ,   0   ,   30  },
+    {   6   ,   0   ,   0   ,   0   ,   46  },
+    {   5   ,   0   ,   0   ,   0   ,   54  },
+    {   4   ,   0   ,   0   ,   0   ,   58  },
+    {   7   ,   1   ,   0   ,   0   ,   31  },
+    {   6   ,   0   ,   0   ,   0   ,   47  },
+    {   5   ,   0   ,   0   ,   0   ,   55  },
+    {   4   ,   0   ,   0   ,   0   ,   59  },
+    {   3   ,   0   ,   0   ,   0   ,   27  },
+    {   2   ,   0   ,   0   ,   0   ,   39  },
+    {   1   ,   0   ,   0   ,   0   ,   0   },
+    VLC_END
+};
+
+#endif //MEDIAINFO_MACROBLOCKS
+
 //***************************************************************************
 // Constructor/Destructor
 //***************************************************************************
@@ -276,28 +1034,32 @@
 :File__Analyze()
 {
     //Configuration
-    ParserName=_T("MPEG Video");
+    ParserName=__T("MPEG Video");
     #if MEDIAINFO_EVENTS
         ParserIDs[0]=MediaInfo_Parser_Mpegv;
         StreamIDs_Width[0]=16;
     #endif //MEDIAINFO_EVENTS
+    #if MEDIAINFO_TRACE
+        Trace_Layers_Update(8); //Stream
+    #endif //MEDIAINFO_TRACE
     Trusted_Multiplier=2;
     MustSynchronize=true;
     Buffer_TotalBytes_FirstSynched_Max=64*1024;
     PTS_DTS_Needed=true;
     IsRawStream=true;
+    Frame_Count_NotParsedIncluded=0;
 
     //In
     MPEG_Version=1;
     Frame_Count_Valid=MediaInfoLib::Config.ParseSpeed_Get()>=0.3?40:2;
     FrameIsAlwaysComplete=false;
     TimeCodeIsNotTrustable=false;
-    #if defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_CDP_YES)
-        Cdp_Data=NULL;
-    #endif //defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_CDP_YES)
-    #if defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_AFDBARDATA_YES)
-        AfdBarData_Data=NULL;
-    #endif //defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_AFDBARDATA_YES)
+    #if defined(MEDIAINFO_ANCILLARY_YES)
+        Ancillary=NULL;
+    #endif //defined(MEDIAINFO_ANCILLARY_YES)
+    #if MEDIAINFO_ADVANCED
+        InitDataNotRepeated_Optional=false;
+    #endif // MEDIAINFO_ADVANCED
 
     //temporal_reference
     TemporalReference_Offset=0;
@@ -305,32 +1067,49 @@
         GA94_03_Parser=NULL;
         GA94_03_TemporalReference_Offset=0;
         GA94_03_IsPresent=false;
+        Text_Positions.push_back(text_position(GA94_03_Parser));
         CC___Parser=NULL;
         CC___IsPresent=false;
+        Text_Positions.push_back(text_position(CC___Parser));
     #endif //defined(MEDIAINFO_DTVCCTRANSPORT_YES)
     #if defined(MEDIAINFO_SCTE20_YES)
         Scte_Parser=NULL;
         Scte_TemporalReference_Offset=0;
         Scte_IsPresent=false;
+        Text_Positions.push_back(text_position(Scte_Parser));
     #endif //defined(MEDIAINFO_SCTE20_YES)
     #if defined(MEDIAINFO_AFDBARDATA_YES)
         DTG1_Parser=NULL;
         GA94_06_Parser=NULL;
     #endif //defined(MEDIAINFO_AFDBARDATA_YES)
-    #if defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_CDP_YES)
+    #if defined(MEDIAINFO_CDP_YES)
         Cdp_Parser=NULL;
         Cdp_IsPresent=false;
-    #endif //defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_CDP_YES)
-    #if defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_AFDBARDATA_YES)
+        Text_Positions.push_back(text_position(Cdp_Parser));
+    #endif //defined(MEDIAINFO_CDP_YES)
+    #if defined(MEDIAINFO_AFDBARDATA_YES)
         AfdBarData_Parser=NULL;
-    #endif //defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_AFDBARDATA_YES)
+    #endif //defined(MEDIAINFO_AFDBARDATA_YES)
 
     //Temp
     SizeToAnalyse_Begin=1*1024*1024;
     SizeToAnalyse_End=1*1024*1024;
+    Frame_Count_LastIFrame=(int64u)-1;
     Searching_TimeStamp_Start_DoneOneTime=false;
     sequence_header_IsParsed=false;
+    FrameInfo.DTS=0;
     Parsing_End_ForDTS=false;
+
+    //Macroblocks
+    #if MEDIAINFO_MACROBLOCKS
+        Macroblocks_Parse=false;
+    #endif //MEDIAINFO_MACROBLOCKS
+
+    #if MEDIAINFO_ADVANCED || MEDIAINFO_EVENTS
+        Slices_Count=0;
+        Has_sequence_header=false;
+        Has_sequence_extension=false;
+    #endif // MEDIAINFO_ADVANCED || MEDIAINFO_EVENTS
 }
 
 //---------------------------------------------------------------------------
@@ -349,6 +1128,23 @@
         delete DTG1_Parser; //DTG1_Parser=NULL;
         delete GA94_06_Parser; //GA94_06_Parser=NULL;
     #endif //defined(MEDIAINFO_AFDBARDATA_YES)
+
+    //Macroblocks
+    #if MEDIAINFO_MACROBLOCKS
+        if (Macroblocks_Parse)
+        {
+            delete[] macroblock_address_increment_Vlc.Array; //macroblock_address_increment_Vlc.Array=NULL;
+            delete[] macroblock_address_increment_Vlc.BitsToSkip; //macroblock_address_increment_Vlc.Size=NULL;
+            delete[] dct_dc_size_luminance.Array; //dct_dc_size_luminance.Array=NULL;
+            delete[] dct_dc_size_luminance.BitsToSkip; //dct_dc_size_luminance.Size=NULL;
+            delete[] dct_dc_size_chrominance.Array; //dct_dc_size_chrominance.Array=NULL;
+            delete[] dct_dc_size_chrominance.BitsToSkip; //dct_dc_size_chrominance.Size=NULL;
+            delete[] dct_coefficients_0.Array; //dct_coefficients_0.Array=NULL;
+            delete[] dct_coefficients_0.BitsToSkip; //dct_coefficients_0.Size=NULL;
+            delete[] dct_coefficients_1.Array; //dct_coefficients_1.Array=NULL;
+            delete[] dct_coefficients_1.BitsToSkip; //dct_coefficients_1.Size=NULL;
+        }
+    #endif //MEDIAINFO_MACROBLOCKS
 }
 
 //***************************************************************************
@@ -356,11 +1152,56 @@
 //***************************************************************************
 
 //---------------------------------------------------------------------------
-void File_Mpegv::Streams_Fill()
+void File_Mpegv::Streams_Accept()
 {
-    //Filling
     Stream_Prepare(Stream_Video);
+}
+
+//---------------------------------------------------------------------------
+void File_Mpegv::Streams_Update()
+{
+    for (size_t Text_Positions_Pos=0; Text_Positions_Pos<Text_Positions.size(); Text_Positions_Pos++)
+    {
+        if (*Text_Positions[Text_Positions_Pos].Parser && (*Text_Positions[Text_Positions_Pos].Parser)->Status[IsUpdated])
+        {
+            Update(*Text_Positions[Text_Positions_Pos].Parser);
+            for (size_t Pos=0; Pos<(*Text_Positions[Text_Positions_Pos].Parser)->Count_Get(Stream_Text); Pos++)
+            {
+                bool IsNewStream=false;
+                if (Retrieve(Stream_Text, Text_Positions[Text_Positions_Pos].StreamPos+Pos, Text_ID)!=(*Text_Positions[Text_Positions_Pos].Parser)->Get(Stream_Text, Pos, Text_ID))
+                {
+                    Stream_Prepare(Stream_Text, Text_Positions[Text_Positions_Pos].StreamPos+Pos);
+                    for (size_t Text_Positions_Pos2=Text_Positions_Pos+1; Text_Positions_Pos2<Text_Positions.size(); Text_Positions_Pos2++)
+                        Text_Positions[Text_Positions_Pos2].StreamPos++;
+                    IsNewStream=true;
+                }
+                Merge(*(*Text_Positions[Text_Positions_Pos].Parser), Stream_Text, Pos, Text_Positions[Text_Positions_Pos].StreamPos+Pos);
+
+                if (IsNewStream)
+                {
+                    #if defined(MEDIAINFO_DTVCCTRANSPORT_YES)
+                        if ((*Text_Positions[Text_Positions_Pos].Parser)==GA94_03_Parser)
+                        {
+                            Ztring MuxingMode=Retrieve(Stream_Text, Text_Positions[Text_Positions_Pos].StreamPos+Pos, "MuxingMode");
+                            Fill(Stream_Text, Text_Positions[Text_Positions_Pos].StreamPos+Pos, "MuxingMode", __T("A/53 / ")+MuxingMode, true);
+                        }
+                    #endif //defined(MEDIAINFO_DTVCCTRANSPORT_YES)
+                    #if defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_CDP_YES)
+                    if ((*Text_Positions[Text_Positions_Pos].Parser)==Cdp_Parser)
+                    {
+                        Ztring MuxingMode=Retrieve(Stream_Text, Text_Positions[Text_Positions_Pos].StreamPos+Pos, "MuxingMode");
+                        Fill(Stream_Text, Text_Positions[Text_Positions_Pos].StreamPos+Pos, "MuxingMode", __T("Ancillary data / ")+MuxingMode, true);
+                    }
+                    #endif //defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_CDP_YES)
+                }
+            }
+        }
+    }
+}
 
+//---------------------------------------------------------------------------
+void File_Mpegv::Streams_Fill()
+{
     //Version
     if (MPEG_Version==2)
     {
@@ -385,7 +1226,7 @@
     Fill(Stream_Video, 0, Video_Height, 0x1000*vertical_size_extension+vertical_size_value);
     Fill(Stream_Video, 0, Video_Colorimetry, Mpegv_Colorimetry_format[chroma_format]);
     Fill(Stream_Video, 0, Video_ColorSpace, "YUV");
-    Fill(Stream_Video, 0, Video_Resolution, 8);
+    Fill(Stream_Video, 0, Video_BitDepth, 8);
 
     //AspectRatio
     if (MPEG_Version==2)
@@ -415,10 +1256,8 @@
     //BitRate
     if (vbv_delay==0xFFFF || (MPEG_Version==1 && bit_rate_value==0x3FFFF))
         Fill(Stream_Video, 0, Video_BitRate_Mode, "VBR");
-    else if ((MPEG_Version==1 && bit_rate_value!=0x3FFFF) || MPEG_Version==2)
-        Fill(Stream_Video, 0, Video_BitRate_Mode, "CBR");
     if (bit_rate_value_IsValid && (bit_rate_extension>0 || bit_rate_value!=0x3FFFF))
-        Fill(Stream_Video, 0, Video_BitRate_Nominal, ((((int32u)bit_rate_extension<<12))+bit_rate_value)*400);
+        Fill(Stream_Video, 0, Video_BitRate_Maximum, ((((int32u)bit_rate_extension<<12))+bit_rate_value)*400);
 
     //Interlacement
     if (MPEG_Version==1)
@@ -482,17 +1321,17 @@
         std::vector<Ztring> GOPs;
         size_t GOP_Frame_Count=0;
         size_t GOP_BFrames_Max=0;
-        size_t I_Pos1=CodingType.find(_T('I'));
+        size_t I_Pos1=CodingType.find(__T('I'));
         while (I_Pos1!=std::string::npos)
         {
-            size_t I_Pos2=CodingType.find(_T('I'), I_Pos1+1);
+            size_t I_Pos2=CodingType.find(__T('I'), I_Pos1+1);
             if (I_Pos2!=std::string::npos)
             {
                 std::vector<size_t> P_Positions;
                 size_t P_Position=I_Pos1;
                 do
                 {
-                    P_Position=CodingType.find(_T('P'), P_Position+1);
+                    P_Position=CodingType.find(__T('P'), P_Position+1);
                     if (P_Position<I_Pos2)
                         P_Positions.push_back(P_Position);
                 }
@@ -500,18 +1339,18 @@
                 Ztring GOP;
                 if (!P_Positions.empty())
                 {
-                    GOP+=_T("M=")+Ztring::ToZtring(P_Positions[0]-I_Pos1)+_T(", ");
+                    GOP+=__T("M=")+Ztring::ToZtring(P_Positions[0]-I_Pos1)+__T(", ");
                     if (P_Positions[0]-I_Pos1>GOP_BFrames_Max)
                         GOP_BFrames_Max=P_Positions[0]-I_Pos1;
                 }
-                GOP+=_T("N=")+Ztring::ToZtring(I_Pos2-I_Pos1);
+                GOP+=__T("N=")+Ztring::ToZtring(I_Pos2-I_Pos1);
                 GOPs.push_back(GOP);
                 GOP_Frame_Count+=I_Pos2-I_Pos1;
             }
             I_Pos1=I_Pos2;
         }
 
-        if (GOP_Frame_Count+GOP_BFrames_Max>Frame_Count && !GOPs.empty())
+        if (GOP_Frame_Count+GOP_BFrames_Max>=Frame_Count && !GOPs.empty())
             GOPs.resize(GOPs.size()-1); //Removing the last one, there may have uncomplete B-frame filling
 
         if (!GOPs.empty())
@@ -523,6 +1362,8 @@
             if ((Frame_Count<Frame_Count_Valid*10 && Unique) || Unique>2) //In order to accept some unsynch //TODO: change the method, synching with next I-Frame
                 GOPs.clear(); //Not a fixed GOP
         }
+        else if (TemporalReference.size()==1 && CodingType=="I" && Frame_Count>1)
+            GOPs.push_back(__T("N=1"));
         if (!GOPs.empty())
             Fill(Stream_Video, 0, Video_Format_Settings_GOP, GOPs[0]);
     }
@@ -530,8 +1371,8 @@
     //Profile
     if (!profile_and_level_indication_escape && profile_and_level_indication_profile!=(int8u)-1 && profile_and_level_indication_level!=(int8u)-1)
     {
-        Fill(Stream_Video, 0, Video_Format_Profile, Ztring().From_Local(Mpegv_profile_and_level_indication_profile[profile_and_level_indication_profile])+_T("@")+Ztring().From_Local(Mpegv_profile_and_level_indication_level[profile_and_level_indication_level]));
-        Fill(Stream_Video, 0, Video_Codec_Profile, Ztring().From_Local(Mpegv_profile_and_level_indication_profile[profile_and_level_indication_profile])+_T("@")+Ztring().From_Local(Mpegv_profile_and_level_indication_level[profile_and_level_indication_level]));
+        Fill(Stream_Video, 0, Video_Format_Profile, Ztring().From_Local(Mpegv_profile_and_level_indication_profile[profile_and_level_indication_profile])+__T("@")+Ztring().From_Local(Mpegv_profile_and_level_indication_level[profile_and_level_indication_level]));
+        Fill(Stream_Video, 0, Video_Codec_Profile, Ztring().From_Local(Mpegv_profile_and_level_indication_profile[profile_and_level_indication_profile])+__T("@")+Ztring().From_Local(Mpegv_profile_and_level_indication_level[profile_and_level_indication_level]));
     }
     else if (profile_and_level_indication_escape)
     {
@@ -541,6 +1382,9 @@
 
     //Standard
     Fill(Stream_Video, 0, Video_Standard, Mpegv_video_format[video_format]);
+    Fill(Stream_Video, 0, "colour_primaries", Mpegv_colour_primaries(colour_primaries));
+    Fill(Stream_Video, 0, "transfer_characteristics", Mpegv_transfer_characteristics(transfer_characteristics));
+    Fill(Stream_Video, 0, "matrix_coefficients", Mpegv_matrix_coefficients(matrix_coefficients));
 
     //Matrix
     if (load_intra_quantiser_matrix || load_non_intra_quantiser_matrix)
@@ -570,15 +1414,16 @@
     }
 
     //Delay
-    if (group_start_IsParsed)
+    if (group_start_FirstPass && Time_Begin_Seconds!=Error)
     {
-        size_t Time_Begin=Time_Begin_Seconds*1000;
+        float64 Time_Begin=((float64)Time_Begin_Seconds)*1000;
         if (FrameRate)
-            Time_Begin+=(size_t)(Time_Begin_Frames*1000/FrameRate);
-        Fill(Stream_Video, 0, Video_Delay, Time_Begin);
-        Fill(Stream_Video, 0, Video_Delay_Settings, Ztring(_T("drop_frame_flag="))+(group_start_drop_frame_flag?_T("1"):_T("0")));
-        Fill(Stream_Video, 0, Video_Delay_Settings, Ztring(_T("closed_gop="))+(group_start_closed_gop?_T("1"):_T("0")));
-        Fill(Stream_Video, 0, Video_Delay_Settings, Ztring(_T("broken_link="))+(group_start_broken_link?_T("1"):_T("0")));
+            Time_Begin+=((float64)Time_Begin_Frames)*1000/FrameRate;
+        Fill(Stream_Video, 0, Video_Delay, Time_Begin, 0);
+        Fill(Stream_Video, 0, Video_Delay_Settings, Ztring(__T("drop_frame_flag="))+(group_start_drop_frame_flag?__T("1"):__T("0")));
+        Fill(Stream_Video, 0, Video_Delay_Settings, Ztring(__T("closed_gop="))+(group_start_closed_gop?__T("1"):__T("0")));
+        Fill(Stream_Video, 0, Video_Delay_Settings, Ztring(__T("broken_link="))+(group_start_broken_link?__T("1"):__T("0")));
+        Fill(Stream_Video, 0, Video_Delay_Source, "Stream");
     }
 
     //BVOP
@@ -594,99 +1439,199 @@
     Fill(Stream_Video, 0, Video_BufferSize, 2*1024*((((int32u)vbv_buffer_size_extension)<<10)+vbv_buffer_size_value));
 
     //Autorisation of other streams
-    NextCode_Clear();
-    NextCode_Add(0x00);
-    NextCode_Add(0xB8);
-    for (int8u Pos=0x00; Pos<=0xB9; Pos++)
+    if (!Status[IsAccepted])
+    {
+        NextCode_Clear();
+        NextCode_Add(0x00);
+        NextCode_Add(0xB8);
+    }
+    #if MEDIAINFO_MACROBLOCKS
+        if (!Macroblocks_Parse)
+    #endif //MEDIAINFO_MACROBLOCKS
+    for (int8u Pos=0x01; Pos<=0xAF; Pos++)
         Streams[Pos].Searching_Payload=false;
     Streams[0xB8].Searching_TimeStamp_End=true;
     if (IsSub)
         Streams[0x00].Searching_TimeStamp_End=true;
 
     //Caption may be in user_data, must be activated if full parsing is requested
-    if (MediaInfoLib::Config.ParseSpeed_Get()>=1)
+    #if defined(MEDIAINFO_DTVCCTRANSPORT_YES) || defined(MEDIAINFO_SCTE20_YES) || (defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_CDP_YES))
+    Streams[0x00].Searching_Payload=GA94_03_IsPresent || Cdp_IsPresent;
+    Streams[0xB2].Searching_Payload=GA94_03_IsPresent || CC___IsPresent || Scte_IsPresent;
+    Streams[0xB3].Searching_Payload=GA94_03_IsPresent || Cdp_IsPresent;
+    #endif //defined(MEDIAINFO_DTVCCTRANSPORT_YES) || defined(MEDIAINFO_SCTE20_YES) || (defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_CDP_YES))
+    if (Config->ParseSpeed>=1)
     {
         Streams[0x00].Searching_Payload=true;
         Streams[0xB2].Searching_Payload=true;
         Streams[0xB3].Searching_Payload=true;
         Streams[0xB5].Searching_Payload=true;
     }
+
+    #if defined(MEDIAINFO_AFDBARDATA_YES)
+        if (DTG1_Parser)
+            Merge(*DTG1_Parser, Stream_Video, 0, 0);
+        if (GA94_06_Parser)
+            Merge(*GA94_06_Parser, Stream_Video, 0, 0);
+    #endif //defined(MEDIAINFO_AFDBARDATA_YES)
+    #if defined(MEDIAINFO_AFDBARDATA_YES)
+        if (AfdBarData_Parser)
+            Merge(*AfdBarData_Parser, Stream_Video, 0, 0);
+    #endif //defined(MEDIAINFO_AFDBARDATA_YES)
+
+    //extra
+    if (intra_dc_precision!=(int8u)-1)
+    {
+        Fill(Stream_Video, 0, "intra_dc_precision", 8+intra_dc_precision);
+        (*Stream_More)[Stream_Video][0](Ztring().From_Local("intra_dc_precision"), Info_Options)=__T("N NT");
+    }
+
+    //Commercial name
+    if (Retrieve(Stream_Video, 0, Video_Format_Version)==__T("Version 2")
+     && Retrieve(Stream_Video, 0, Video_DisplayAspectRatio)==__T("1.778")
+     && Retrieve(Stream_Video, 0, Video_BitDepth)==__T("8")
+     && Retrieve(Stream_Video, 0, Video_ChromaSubsampling)==__T("4:2:0"))
+    {
+        //HDV1
+        if (Retrieve(Stream_Video, 0, Video_Width)==__T("1280")
+         && Retrieve(Stream_Video, 0, Video_Height)==__T("720")
+         && Retrieve(Stream_Video, 0, Video_ScanType)==__T("Progressive")
+         && (Retrieve(Stream_Video, 0, Video_FrameRate)==__T("60.000") || Retrieve(Stream_Video, 0, Video_FrameRate)==__T("59.940") || Retrieve(Stream_Video, 0, Video_FrameRate)==__T("30.000") || Retrieve(Stream_Video, 0, Video_FrameRate)==__T("29.970") || Retrieve(Stream_Video, 0, Video_FrameRate)==__T("24.000") || Retrieve(Stream_Video, 0, Video_FrameRate)==__T("23.976") || Retrieve(Stream_Video, 0, Video_FrameRate)==__T("50.000") || Retrieve(Stream_Video, 0, Video_FrameRate)==__T("25.000"))
+         && (Retrieve(Stream_Video, 0, Video_Format_Profile)==__T("Main@High") || Retrieve(Stream_Video, 0, Video_Format_Profile)==__T("Main@High 1440"))
+         && Retrieve(Stream_Video, 0, Video_BitRate).To_int64u()<20000000 && Retrieve(Stream_Video, 0, Video_BitRate_Maximum).To_int64u()<20000000)
+            Fill(Stream_Video, 0, Video_Format_Commercial_IfAny, "HDV 720p");
+
+        //HDV2
+        if (Retrieve(Stream_Video, 0, Video_Width)==__T("1440")
+         && Retrieve(Stream_Video, 0, Video_Height)==__T("1080")
+         && Retrieve(Stream_Video, 0, Video_Format_Profile)==__T("Main@High 1440")
+         && Retrieve(Stream_Video, 0, Video_BitRate).To_int64u()<27000000 && Retrieve(Stream_Video, 0, Video_BitRate_Maximum).To_int64u()<27000000)
+        {
+            //Interlaced
+            if (Retrieve(Stream_Video, 0, Video_ScanType)==__T("Interlaced")
+             && (Retrieve(Stream_Video, 0, Video_FrameRate)==__T("30.000") || Retrieve(Stream_Video, 0, Video_FrameRate)==__T("29.970") || Retrieve(Stream_Video, 0, Video_FrameRate)==__T("50.000") || Retrieve(Stream_Video, 0, Video_FrameRate)==__T("25.000")))
+            Fill(Stream_Video, 0, Video_Format_Commercial_IfAny, "HDV 1080i");
+
+            //Progressive
+            if (Retrieve(Stream_Video, 0, Video_ScanType)==__T("Progressive")
+             && (Retrieve(Stream_Video, 0, Video_FrameRate)==__T("30.000") || Retrieve(Stream_Video, 0, Video_FrameRate)==__T("29.970") || Retrieve(Stream_Video, 0, Video_FrameRate)==__T("24.000") || Retrieve(Stream_Video, 0, Video_FrameRate)==__T("23.976") || Retrieve(Stream_Video, 0, Video_FrameRate)==__T("50.000") || Retrieve(Stream_Video, 0, Video_FrameRate)==__T("25.000")))
+            Fill(Stream_Video, 0, Video_Format_Commercial_IfAny, "HDV 1080p");
+        }
+    }
 }
 
 //---------------------------------------------------------------------------
 void File_Mpegv::Streams_Finish()
 {
     //Duration
-    if (Time_End_NeedComplete && MediaInfoLib::Config.ParseSpeed_Get()!=1)
-        Time_End_Seconds=Error;
-    if (Time_End_Seconds!=Error)
+    if (PTS_End>PTS_Begin)
+        Fill(Stream_Video, 0, Video_Duration, float64_int64s(((float64)(PTS_End-PTS_Begin))/1000000));
+    else if (!TimeCodeIsNotTrustable && Time_End_Seconds!=Error)
     {
-        size_t Time_Begin=Time_Begin_Seconds*1000;
-        size_t Time_End =Time_End_Seconds*1000;
+        float32 Time_Begin=((float32)Time_Begin_Seconds)*1000;
+        float32 Time_End =((float32)Time_End_Seconds)*1000;
         if (FrameRate)
         {
-            Time_Begin+=(size_t)(Time_Begin_Frames*1000/FrameRate);
-            Time_End  +=(size_t)(Time_End_Frames  *1000/FrameRate);
+            float32 FrameRate_Corrected=FrameRate;
+            if (FrameRate>=29.970 && FrameRate<=29.971 && !group_start_drop_frame_flag)
+                FrameRate_Corrected=30;
+            Time_Begin+=Time_Begin_Frames*1000/FrameRate_Corrected;
+            Time_End  +=Time_End_Frames  *1000/FrameRate_Corrected;
         }
-        if (Time_End>Time_Begin)
-            Fill(Stream_Video, 0, Video_Duration, Time_End-Time_Begin);
+        float32 Duration=Time_End-Time_Begin;
+        if (FrameRate>=29.970 && FrameRate<=29.971 && !group_start_drop_frame_flag)
+        {
+            Duration*=1001;
+            Duration/=1000;
+        }
+        Fill(Stream_Video, 0, Video_Duration, Duration, 0);
+    }
+    else if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+    {
+        Fill(Stream_Video, 0, Video_FrameCount, Frame_Count_NotParsedIncluded);
+    }
+
+    //picture_coding_types
+    if (picture_coding_types.size()>1)
+    {
+        int64u MaxCount=0;
+        string MaxCount_type;
+        for (std::map<std::string, int64u>::iterator Temp=picture_coding_types.begin(); Temp!=picture_coding_types.end(); Temp++)
+            if (Temp->second>MaxCount)
+            {
+                MaxCount=Temp->second;
+                MaxCount_type=Temp->first;
+            }
+        int64u Count=0;
+        for (std::map<std::string, int64u>::iterator Temp=picture_coding_types.begin(); Temp!=picture_coding_types.end(); Temp++)
+            if (Temp->first!=MaxCount_type)
+                Count+=Temp->second;
+        if (Count>=Config_VariableGopDetection_Occurences)
+            Clear(Stream_Video, 0, Video_Format_Settings_GOP);
     }
 
+    //InitDataNotRepeated
+    #if MEDIAINFO_ADVANCED
+        if (!InitDataNotRepeated_Optional && InitDataNotRepeated>=Config_InitDataNotRepeated_Occurences)
+            Fill(Stream_Video, 0, "InitDataNotRepeated", "Yes", Unlimited, true, true);
+    #endif // MEDIAINFO_ADVANCED
+
     //Other parsers
     #if defined(MEDIAINFO_DTVCCTRANSPORT_YES)
         if (GA94_03_Parser && !GA94_03_Parser->Status[IsFinished] && GA94_03_Parser->Status[IsAccepted])
-        {
             Finish(GA94_03_Parser);
-            Merge(*GA94_03_Parser);
-        }
         if (CC___Parser && !CC___Parser->Status[IsFinished] && CC___Parser->Status[IsAccepted])
-        {
             Finish(CC___Parser);
-            Merge(*CC___Parser);
-        }
     #endif //defined(MEDIAINFO_DTVCCTRANSPORT_YES)
     #if defined(MEDIAINFO_SCTE20_YES)
         if (Scte_Parser && !Scte_Parser->Status[IsFinished] && Scte_Parser->Status[IsAccepted])
-        {
             Finish(Scte_Parser);
-            Merge(*Scte_Parser);
-        }
     #endif //defined(MEDIAINFO_SCTE20_YES)
     #if defined(MEDIAINFO_AFDBARDATA_YES)
         if (DTG1_Parser && !DTG1_Parser->Status[IsFinished] && DTG1_Parser->Status[IsAccepted])
         {
             Finish(DTG1_Parser);
-            Merge(*DTG1_Parser);
+            Merge(*DTG1_Parser, Stream_Video, 0, 0);
         }
         if (GA94_06_Parser && !GA94_06_Parser->Status[IsFinished] && GA94_06_Parser->Status[IsAccepted])
         {
             Finish(GA94_06_Parser);
-            Merge(*GA94_06_Parser);
+            Merge(*GA94_06_Parser, Stream_Video, 0, 0);
         }
     #endif //defined(MEDIAINFO_AFDBARDATA_YES)
-    #if defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_CDP_YES)
+    #if defined(MEDIAINFO_CDP_YES)
         if (Cdp_Parser && !Cdp_Parser->Status[IsFinished] && Cdp_Parser->Status[IsAccepted])
-        {
             Finish(Cdp_Parser);
-            Merge(*Cdp_Parser);
-        }
-    #endif //defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_CDP_YES)
-    #if defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_AFDBARDATA_YES)
+    #endif //defined(MEDIAINFO_CDP_YES)
+    #if defined(MEDIAINFO_AFDBARDATA_YES)
         if (AfdBarData_Parser && !AfdBarData_Parser->Status[IsFinished] && AfdBarData_Parser->Status[IsAccepted])
         {
             Finish(AfdBarData_Parser);
-            Merge(*AfdBarData_Parser);
+            Merge(*AfdBarData_Parser, Stream_Video, 0, 0);
         }
-    #endif //defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_AFDBARDATA_YES)
+    #endif //defined(MEDIAINFO_AFDBARDATA_YES)
 
-    //Purge what is not needed anymore
-    if (!File_Name.empty()) //Only if this is not a buffer, with buffer we can have more data
-    {
-        Streams.clear();
-        for (size_t Pos=0; Pos<TemporalReference.size(); Pos++)
-            delete TemporalReference[Pos]; //TemporalReference[Pos]=NULL;
-        TemporalReference.clear();
-    }
+    #if MEDIAINFO_IBI
+        int64u Numerator=0, Denominator=0;
+        switch (frame_rate_code)
+        {
+            case 1 : Numerator=24000; Denominator=1001; break;
+            case 2 : Numerator=24;    Denominator=1;    break;
+            case 3 : Numerator=25;    Denominator=1;    break;
+            case 4 : Numerator=30000; Denominator=1001; break;
+            case 5 : Numerator=30;    Denominator=1;    break;
+            case 6 : Numerator=50;    Denominator=1;    break;
+            case 7 : Numerator=60000; Denominator=1001; break;
+            case 8 : Numerator=60;    Denominator=1;    break;
+            default: ;
+        }
+        if (Numerator)
+        {
+            Numerator*=frame_rate_extension_n+1;
+            Denominator*=frame_rate_extension_d+1;
+            Ibi_Stream_Finish(Numerator, Denominator);
+        }
+    #endif //MEDIAINFO_IBI
 }
 
 //***************************************************************************
@@ -696,30 +1641,37 @@
 //---------------------------------------------------------------------------
 bool File_Mpegv::Synched_Test()
 {
-    //Trailing 0xFF
-    while(Buffer_Offset<Buffer_Size && Buffer[Buffer_Offset]==0xFF)
-        Buffer_Offset++;
-
-    //Trailing 0x00
-    while(Buffer_Offset+3<=Buffer_Size && Buffer[Buffer_Offset+2]==0x00
-                                       && Buffer[Buffer_Offset+1]==0x00
-                                       && Buffer[Buffer_Offset  ]==0x00)
-        Buffer_Offset++;
-
     //Must have enough buffer for having header
-    if (Buffer_Offset+3>Buffer_Size)
+    if (Buffer_Offset+4>Buffer_Size)
         return false;
 
     //Quick test of synchro
     if (Buffer[Buffer_Offset  ]!=0x00
      || Buffer[Buffer_Offset+1]!=0x00
      || Buffer[Buffer_Offset+2]!=0x01)
+    {
         Synched=false;
+        return true;
+    }
 
     //Quick search
     if (Synched && !Header_Parser_QuickSearch())
         return false;
 
+    #if MEDIAINFO_IBI
+        if (Ibi_SliceParsed)
+        {
+            if (Buffer_Offset+4>Buffer_Size)
+                return false;
+            if (Buffer[Buffer_Offset+3]==0x00 && Buffer_Offset+5>Buffer_Size)
+                return false;
+            bool RandomAccess=(Buffer[Buffer_Offset+3]==0x00 && (Buffer[Buffer_Offset+5]&0x38)==0x08) || Buffer[Buffer_Offset+3]==0xB3; //picture_start with I-Frame || sequence_header
+            if (RandomAccess)
+                Ibi_Add();
+            Ibi_SliceParsed=false;
+        }
+    #endif //MEDIAINFO_IBI
+
     //We continue
     return true;
 }
@@ -728,7 +1680,6 @@
 void File_Mpegv::Synched_Init()
 {
     //Temp
-    Frame_Count=0;
     BVOP_Count=0;
     progressive_frame_Count=0;
     Interlaced_Top=0;
@@ -737,6 +1688,8 @@
     display_vertical_size=0;
     vbv_delay=0;
     vbv_buffer_size_value=0;
+    Time_Current_Seconds=Error;
+    Time_Current_Frames=(int8u)-1;
     Time_Begin_Seconds=Error;
     Time_Begin_Frames=(int8u)-1;
     Time_End_Seconds=Error;
@@ -758,8 +1711,11 @@
     frame_rate_extension_n=0;
     frame_rate_extension_d=0;
     video_format=5; //Unspecified video format
+    colour_primaries=(int8u)-1;
+    transfer_characteristics=(int8u)-1;
+    matrix_coefficients=(int8u)-1;
     vbv_buffer_size_extension=0;
-    Time_End_NeedComplete=false;
+    intra_dc_precision=(int8u)-1;
     load_intra_quantiser_matrix=false;
     load_non_intra_quantiser_matrix=false;
     progressive_sequence=true; //progressive by default
@@ -767,15 +1723,157 @@
     repeat_first_field=false;
     FirstFieldFound=false;
     group_start_IsParsed=false;
+    group_start_FirstPass=false;
+    PTS_LastIFrame=(int64u)-1;
     bit_rate_value_IsValid=false;
     profile_and_level_indication_escape=false;
+    RefFramesCount=0;
+    BVOPsSinceLastRefFrames=0;
+    temporal_reference_LastIFrame=0;
+    tc=0;
+    IFrame_IsParsed=false;
+    #if MEDIAINFO_IBI
+        Ibi_SliceParsed=true;
+    #endif //MEDIAINFO_IBI
+    #if MEDIAINFO_ADVANCED
+        Config_VariableGopDetection_Occurences=MediaInfoLib::Config.VariableGopDetection_Occurences_Get();
+        Config_VariableGopDetection_GiveUp=MediaInfoLib::Config.VariableGopDetection_GiveUp_Get();
+        InitDataNotRepeated=0;
+        Config_InitDataNotRepeated_Occurences=MediaInfoLib::Config.InitDataNotRepeated_Occurences_Get();
+        Config_InitDataNotRepeated_GiveUp=MediaInfoLib::Config.InitDataNotRepeated_GiveUp_Get();
+    #endif //MEDIAINFO_ADVANCED
 
     //Default stream values
     Streams.resize(0x100);
     Streams[0xB3].Searching_Payload=true;
     for (int8u Pos=0xFF; Pos>=0xB9; Pos--)
         Streams[Pos].Searching_Payload=true; //Testing MPEG-PS
+
+    //Macroblocks
+    #if MEDIAINFO_MACROBLOCKS
+        Macroblocks_Parse=Config->File_Macroblocks_Parse_Get();
+        if (Macroblocks_Parse)
+        {
+            macroblock_address_increment_Vlc.Array=NULL;
+            macroblock_address_increment_Vlc.Vlc=Mpegv_macroblock_address_increment;
+            macroblock_address_increment_Vlc.Size=11;
+            Get_VL_Prepare(macroblock_address_increment_Vlc);
+            dct_dc_size_luminance.Array=NULL;
+            dct_dc_size_luminance.Vlc=Mpegv_dct_dc_size_luminance;
+            dct_dc_size_luminance.Size=9;
+            Get_VL_Prepare(dct_dc_size_luminance);
+            dct_dc_size_chrominance.Array=NULL;
+            dct_dc_size_chrominance.Vlc=Mpegv_dct_dc_size_chrominance;
+            dct_dc_size_chrominance.Size=10;
+            Get_VL_Prepare(dct_dc_size_chrominance);
+            dct_coefficients_0.Array=NULL;
+            dct_coefficients_0.Vlc=Mpegv_dct_coefficients_0;
+            dct_coefficients_0.Size=17;
+            Get_VL_Prepare(dct_coefficients_0);
+            dct_coefficients_1.Array=NULL;
+            dct_coefficients_1.Vlc=Mpegv_dct_coefficients_1;
+            dct_coefficients_1.Size=17;
+            Get_VL_Prepare(dct_coefficients_1);
+            macroblock_type_I.Array=NULL;
+            macroblock_type_I.Vlc=Mpegv_macroblock_type_I;
+            macroblock_type_I.Size=2;
+            Get_VL_Prepare(macroblock_type_I);
+            macroblock_type_P.Array=NULL;
+            macroblock_type_P.Vlc=Mpegv_macroblock_type_P;
+            macroblock_type_P.Size=6;
+            Get_VL_Prepare(macroblock_type_P);
+            macroblock_type_B.Array=NULL;
+            macroblock_type_B.Vlc=Mpegv_macroblock_type_B;
+            macroblock_type_B.Size=6;
+            Get_VL_Prepare(macroblock_type_B);
+            motion_code.Array=NULL;
+            motion_code.Vlc=Mpegv_motion_code;
+            motion_code.Size=11;
+            Get_VL_Prepare(motion_code);
+            dmvector.Array=NULL;
+            dmvector.Vlc=Mpegv_dmvector;
+            dmvector.Size=2;
+            Get_VL_Prepare(dmvector);
+            coded_block_pattern.Array=NULL;
+            coded_block_pattern.Vlc=Mpegv_coded_block_pattern;
+            coded_block_pattern.Size=9;
+            Get_VL_Prepare(coded_block_pattern);
+        }
+    #endif //MEDIAINFO_MACROBLOCKS
+}
+
+//***************************************************************************
+// Buffer - Demux
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_DEMUX
+bool File_Mpegv::Demux_UnpacketizeContainer_Test()
+{
+    if ((Demux_IntermediateItemFound && Buffer[Buffer_Offset+3]==0x00) || Buffer[Buffer_Offset+3]==0xB3)
+    {
+        if (Demux_Offset==0)
+        {
+            Demux_Offset=Buffer_Offset;
+            Demux_IntermediateItemFound=false;
+        }
+        while (Demux_Offset+4<=Buffer_Size)
+        {
+            //Synchronizing
+            while(Demux_Offset+3<=Buffer_Size && (Buffer[Demux_Offset  ]!=0x00
+                                                || Buffer[Demux_Offset+1]!=0x00
+                                                || Buffer[Demux_Offset+2]!=0x01))
+            {
+                Demux_Offset+=2;
+                while(Demux_Offset<Buffer_Size && Buffer[Buffer_Offset]!=0x00)
+                    Demux_Offset+=2;
+                if (Demux_Offset>=Buffer_Size || Buffer[Demux_Offset-1]==0x00)
+                    Demux_Offset--;
+            }
+
+            if (Demux_Offset+4<=Buffer_Size)
+            {
+                if (Demux_IntermediateItemFound)
+                {
+                    bool MustBreak;
+                    switch (Buffer[Demux_Offset+3])
+                    {
+                        case 0x00 :
+                        case 0xB3 :
+                                    MustBreak=true; break;
+                        default   : MustBreak=false;
+                    }
+                    if (MustBreak)
+                        break; //while() loop
+                }
+                else
+                {
+                    if (!Buffer[Demux_Offset+3])
+                        Demux_IntermediateItemFound=true;
+                }
+            }
+            Demux_Offset++;
+        }
+
+        if (Demux_Offset+4>Buffer_Size && File_Offset+Buffer_Size!=File_Size)
+            return false; //No complete frame
+
+        bool RandomAccess=Buffer[Buffer_Offset+3]==0xB3;
+        if (!Status[IsAccepted])
+        {
+            Accept("AVC");
+            if (Config->Demux_EventWasSent)
+                return false;
+        }
+        if (IFrame_IsParsed || RandomAccess)
+            Demux_UnpacketizeContainer_Demux(RandomAccess);
+        else
+            Demux_UnpacketizeContainer_Demux_Clear();
+    }
+
+    return true;
 }
+#endif //MEDIAINFO_DEMUX
 
 //***************************************************************************
 // Buffer - Global
@@ -784,8 +1882,32 @@
 //---------------------------------------------------------------------------
 void File_Mpegv::Read_Buffer_Unsynched()
 {
+    for (int8u Pos=0x00; Pos<0xB9; Pos++)
+    {
+        Streams[Pos].Searching_Payload=false;
+        Streams[Pos].Searching_TimeStamp_Start=false;
+        Streams[Pos].Searching_TimeStamp_End=false;
+    }
+    Streams[0xB3].Searching_TimeStamp_End=true; //sequence_header
+    Streams[0xB8].Searching_TimeStamp_End=true; //group_start
     Time_End_Seconds=Error;
     Time_End_Frames=(int8u)-1;
+    RefFramesCount=0;
+    sequence_header_IsParsed=false;
+    group_start_IsParsed=false;
+    PTS_LastIFrame=(int64u)-1;
+    IFrame_IsParsed=false;
+    picture_coding_types_Current.clear();
+    #if MEDIAINFO_IBI
+        Ibi_SliceParsed=true;
+    #endif //MEDIAINFO_IBI
+    #if MEDIAINFO_MACROBLOCKS
+        if (Macroblocks_Parse)
+        {
+            macroblock_x_PerFrame=0;
+            macroblock_y_PerFrame=0;
+        }
+    #endif //MEDIAINFO_MACROBLOCKS
 
     temporal_reference_Old=(int16u)-1;
     for (size_t Pos=0; Pos<TemporalReference.size(); Pos++)
@@ -810,19 +1932,27 @@
         if (GA94_06_Parser)
             GA94_06_Parser->Open_Buffer_Unsynch();
     #endif //defined(MEDIAINFO_AFDBARDATA_YES)
-    #if defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_CDP_YES)
+    #if defined(MEDIAINFO_CDP_YES)
         if (Cdp_Parser)
             Cdp_Parser->Open_Buffer_Unsynch();
-    #endif //defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_CDP_YES)
-    #if defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_AFDBARDATA_YES)
+    #endif //defined(MEDIAINFO_CDP_YES)
+    #if defined(MEDIAINFO_AFDBARDATA_YES)
         if (AfdBarData_Parser)
             AfdBarData_Parser->Open_Buffer_Unsynch();
-    #endif //defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_AFDBARDATA_YES)
+    #endif //defined(MEDIAINFO_AFDBARDATA_YES)
+
+    #if defined(MEDIAINFO_ANCILLARY_YES)
+        if (Ancillary && *Ancillary && (*Ancillary)->Cdp_Data.empty())
+            (*Ancillary)->AspectRatio=0;
+    #endif //defined(MEDIAINFO_ANCILLARY_YES)
 
     //NextCode
-    NextCode_Clear();
-    NextCode_Add(0x00);
-    NextCode_Add(0xB8);
+    if (!Status[IsAccepted])
+    {
+        NextCode_Clear();
+        NextCode_Add(0xB3);
+        NextCode_Add(0xB8);
+    }
 }
 
 //***************************************************************************
@@ -832,18 +1962,39 @@
 //---------------------------------------------------------------------------
 void File_Mpegv::Header_Parse()
 {
-    //Parsing
-    int8u start_code;
-    Skip_B3(                                                    "synchro");
-    Get_B1 (start_code,                                         "start_code");
-    if (!Header_Parser_Fill_Size())
+    #if MEDIAINFO_TRACE
+    if (Trace_Activated)
     {
-        Element_WaitForMoreData();
-        return;
+        //Parsing
+        int8u start_code;
+        Skip_B3(                                                    "synchro");
+        Get_B1 (start_code,                                         "start_code");
+        if (!Header_Parser_Fill_Size())
+        {
+            Element_WaitForMoreData();
+            return;
+        }
+
+        //Filling
+        Header_Fill_Code(start_code, Ztring().From_CC1(start_code));
     }
+    else
+    {
+    #endif //MEDIAINFO_TRACE
+        //Parsing
+        int8u start_code=Buffer[Buffer_Offset+3];
+        Element_Offset+=4;
+        if (!Header_Parser_Fill_Size())
+        {
+            Element_WaitForMoreData();
+            return;
+        }
 
-    //Filling
-    Header_Fill_Code(start_code, Ztring().From_CC1(start_code));
+        //Filling
+        Header_Fill_Code(start_code, Ztring().From_CC1(start_code));
+    #if MEDIAINFO_TRACE
+    }
+    #endif //MEDIAINFO_TRACE
 }
 
 //---------------------------------------------------------------------------
@@ -858,7 +2009,7 @@
         Buffer_Offset_Temp+=2;
         while(Buffer_Offset_Temp<Buffer_Size && Buffer[Buffer_Offset_Temp]!=0x00)
             Buffer_Offset_Temp+=2;
-        if (Buffer_Offset_Temp<Buffer_Size && Buffer[Buffer_Offset_Temp-1]==0x00 || Buffer_Offset_Temp>=Buffer_Size)
+        if (Buffer_Offset_Temp>=Buffer_Size || Buffer[Buffer_Offset_Temp-1]==0x00)
             Buffer_Offset_Temp--;
     }
 
@@ -894,26 +2045,39 @@
          || Streams[start_code].Searching_TimeStamp_End)
             return true;
 
+        #if MEDIAINFO_ADVANCED || MEDIAINFO_EVENTS
+            if (start_code==0xB3) // sequence_header
+            {
+                //
+                Has_sequence_header=true;
+            }
+            if (start_code==0xB5) // extension_start
+            {
+                if (Buffer_Offset+5>Buffer_Size)
+                    return false;
+
+                if ((Buffer[Buffer_Offset+4]&0xF0)==0x10) // sequence_extension
+                    Has_sequence_extension=true;
+            }
+        #endif // MEDIAINFO_ADVANCED || MEDIAINFO_EVENTS
+
         //Synchronizing
         Buffer_Offset+=4;
         Synched=false;
-        if (!Synchronize_0x000001())
+        if (!Synchronize())
         {
-            if (!IsSub && File_Offset+Buffer_Size==File_Size && !Status[IsFilled] && Frame_Count>=1)
+            if (File_Offset+Buffer_Size==File_Size)
             {
-                //End of file, and we have some frames
-                Accept("MPEG Video");
-                Fill("MPEG Video");
-                Detect_EOF();
-                return false;
+                Synched=true;
+                return true;
             }
+            return false;
         }
+
+        if (Buffer_Offset+4>Buffer_Size)
+            return false;
     }
 
-    if (Buffer_Offset+3==Buffer_Size)
-        return false; //Sync is OK, but start_code is not available
-    if (!Synched)
-        return false;
     Trusted_IsNot("MPEG Video, Synchronisation lost");
     return Synchronize();
 }
@@ -949,15 +2113,17 @@
 //---------------------------------------------------------------------------
 void File_Mpegv::Detect_EOF()
 {
-    if (IsSub && Status[IsFilled]
-     || (!IsSub && File_Size>SizeToAnalyse_Begin+SizeToAnalyse_End && File_Offset+Buffer_Offset+Element_Offset>SizeToAnalyse_Begin && File_Offset+Buffer_Offset+Element_Offset<File_Size-SizeToAnalyse_End && MediaInfoLib::Config.ParseSpeed_Get()<=0.01))
+    if ((IsSub && Status[IsFilled])
+     || (!IsSub && File_Size>SizeToAnalyse_Begin+SizeToAnalyse_End && File_Offset+Buffer_Offset+Element_Offset>SizeToAnalyse_Begin && File_Offset+Buffer_Offset+Element_Offset<File_Size-SizeToAnalyse_End && Config->ParseSpeed<=0.5))
     {
-        if ((GA94_03_IsPresent || CC___IsPresent || Scte_IsPresent || Cdp_IsPresent) && Frame_Count<Frame_Count_Valid*10 //10 times the normal test
+        if (MustExtendParsingDuration && Frame_Count<Frame_Count_Valid*10 //10 times the normal test
          && !(!IsSub && File_Size>SizeToAnalyse_Begin*10+SizeToAnalyse_End*10 && File_Offset+Buffer_Offset+Element_Offset>SizeToAnalyse_Begin*10 && File_Offset+Buffer_Offset+Element_Offset<File_Size-SizeToAnalyse_End*10))
         {
-            Streams[0x00].Searching_Payload=GA94_03_IsPresent || Cdp_IsPresent;
-            Streams[0xB2].Searching_Payload=GA94_03_IsPresent || CC___IsPresent || Scte_IsPresent;
-            Streams[0xB3].Searching_Payload=GA94_03_IsPresent || Cdp_IsPresent;
+            #if defined(MEDIAINFO_DTVCCTRANSPORT_YES) || defined(MEDIAINFO_SCTE20_YES) || (defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_CDP_YES))
+                Streams[0x00].Searching_Payload=GA94_03_IsPresent || Cdp_IsPresent;
+                Streams[0xB2].Searching_Payload=GA94_03_IsPresent || CC___IsPresent || Scte_IsPresent;
+                Streams[0xB3].Searching_Payload=GA94_03_IsPresent || Cdp_IsPresent;
+            #endif defined(MEDIAINFO_DTVCCTRANSPORT_YES) || defined(MEDIAINFO_SCTE20_YES) || (defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_CDP_YES))
             return;
         }
 
@@ -973,7 +2139,9 @@
         if (!Status[IsFilled])
             Fill("MPEG Video");
 
-        GoToFromEnd(SizeToAnalyse_End*2, "MPEG Video");
+        if (!IsSub)
+            Open_Buffer_Unsynch();
+        GoToFromEnd(SizeToAnalyse_End, "MPEG Video");
         EOF_AlreadyDetected=true; //Sometimes called from Filling
     }
 }
@@ -989,13 +2157,17 @@
     Element_Name("picture_start");
 
     //Coherency
-    if (!NextCode_Test())
-        return;
+    if (!Status[IsAccepted])
+    {
+        if (!NextCode_Test())
+            return;
+    }
 
     //Parsing
+    int8u picture_coding_type_Old=picture_coding_type;
     BS_Begin();
     Get_S2 (10, temporal_reference,                             "temporal_reference");
-    Get_S1 ( 3, picture_coding_type,                            "picture_coding_type"); Param_Info(Mpegv_picture_coding_type[picture_coding_type]);
+    Get_S1 ( 3, picture_coding_type,                            "picture_coding_type"); Param_Info1(Mpegv_picture_coding_type[picture_coding_type]);
     Get_S2 (16, vbv_delay,                                      "vbv_delay");
     if (picture_coding_type==2 || picture_coding_type==3) //P or B
     {
@@ -1021,13 +2193,76 @@
     BS_End();
 
     FILLING_BEGIN();
-        if (temporal_reference==temporal_reference_Old)
+        if (picture_coding_type==1)
+            Frame_Count_LastIFrame=Frame_Count_NotParsedIncluded;
+
+        #if MEDIAINFO_MACROBLOCKS
+            if (Macroblocks_Parse)
+            {
+                macroblock_x_PerFrame=0;
+                macroblock_y_PerFrame=0;
+            }
+        #endif //MEDIAINFO_MACROBLOCKS
+
+        #if MEDIAINFO_ADVANCED || MEDIAINFO_EVENTS
+            Slices_Count=0;
+        #endif // MEDIAINFO_ADVANCED || MEDIAINFO_EVENTS
+        #if MEDIAINFO_EVENTS
+            {
+                struct MediaInfo_Event_Video_SliceInfo_0 Event;
+                Event.EventCode=MediaInfo_EventCode_Create(MediaInfo_Parser_None, MediaInfo_Event_Video_SliceInfo, 0);
+                Event.Stream_Offset=File_Offset+Buffer_Offset;
+                Event.PCR=FrameInfo.PCR;
+                Event.PTS=FrameInfo.PTS;
+                Event.DTS=FrameInfo.DTS;
+                Event.DUR=FrameInfo.DUR;
+                Event.StreamIDs_Size=StreamIDs_Size;
+                Event.StreamIDs=(MediaInfo_int64u*)StreamIDs;
+                Event.StreamIDs_Width=(MediaInfo_int8u*)StreamIDs_Width;
+                Event.ParserIDs=(MediaInfo_int8u* )ParserIDs;
+                Event.FramePosition=Frame_Count;
+                Event.FieldPosition=Field_Count;
+                Event.SlicePosition=0;
+                switch (picture_coding_type)
+                {
+                    case 1 :
+                                Event.SliceType=0; break;
+                    case 2 :
+                                Event.SliceType=1; break;
+                    case 3 :
+                                Event.SliceType=2; break;
+                    default:
+                                Event.SliceType=(int8u)-1;
+                }
+                Event.Flags=0;
+                Config->Event_Send((const int8u*)&Event, sizeof(MediaInfo_Event_Video_SliceInfo_0));
+            }
+        #endif //MEDIAINFO_EVENTS
+
+        //Detection of first I-Frame
+        if (!IFrame_IsParsed)
         {
-            Frame_Count--;
-            Frame_Count_InThisBlock--;
+            if (picture_coding_type==1 || picture_coding_type==4) //I-Frame or D-Frame
+                IFrame_IsParsed=true;
         }
-        else
-            temporal_reference_Old=temporal_reference;
+
+        //Config
+        progressive_frame=true;
+        picture_structure=3; //Frame is default
+        #if MEDIAINFO_MACROBLOCKS
+            if (Macroblocks_Parse)
+            {
+                spatial_temporal_weight_code_table_index=0;
+                f_code[0][0]=0;
+                f_code[0][1]=0;
+                f_code[1][0]=0;
+                f_code[1][1]=0;
+                sequence_scalable_extension_Present=false;
+                frame_pred_frame_dct=false;
+                concealment_motion_vectors=false;
+                intra_vlc_format=false;
+            }
+        #endif //MEDIAINFO_MACROBLOCKS
 
         //Temporal reference
         if (TemporalReference_Offset+temporal_reference>=TemporalReference.size())
@@ -1036,42 +2271,284 @@
             TemporalReference[TemporalReference_Offset+temporal_reference]=new temporalreference;
         TemporalReference[TemporalReference_Offset+temporal_reference]->IsValid=true;
 
+        //picture_coding_types
+        if (picture_coding_type==1) //I-Frame
+        {
+            if (!picture_coding_types_Current.empty())
+            {
+                picture_coding_types[picture_coding_types_Current]++;
+
+                #if MEDIAINFO_ADVANCED
+                    // Testing if we must give up
+                    if (Config_VariableGopDetection_GiveUp && picture_coding_types.size()>1)
+                    {
+                        int64u MaxCount=0;
+                        string MaxCount_type;
+                        for (std::map<std::string, int64u>::iterator Temp=picture_coding_types.begin(); Temp!=picture_coding_types.end(); Temp++)
+                            if (Temp->second>MaxCount)
+                            {
+                                MaxCount=Temp->second;
+                                MaxCount_type=Temp->first;
+                            }
+                        int64u Count=0;
+                        for (std::map<std::string, int64u>::iterator Temp=picture_coding_types.begin(); Temp!=picture_coding_types.end(); Temp++)
+                            if (Temp->first!=MaxCount_type)
+                                Count+=Temp->second;
+                        if (Count>=Config_VariableGopDetection_Occurences)
+                            Config->ParseSpeed=0; // Give up
+                    }
+                #endif // MEDIAINFO_ADVANCED
+            }
+            picture_coding_types_Current='I';
+        }
+        else if (!picture_coding_types_Current.empty()) //If an I-Frame is already found
+            picture_coding_types_Current+=Mpegv_picture_coding_type[picture_coding_type];
+
+        //Detecting streams with only I-Frames
+        if (picture_coding_type==1 && picture_coding_type_Old==1)
+            temporal_reference_Old=(int16u)-1; //Resetting temporal_reference_Old
+
+        //NextCode
+        if (!Status[IsAccepted])
+        {
+            NextCode_Clear();
+            for (int64u Element_Name_Next=0x01; Element_Name_Next<=0xAF; Element_Name_Next++)
+                NextCode_Add(Element_Name_Next);
+            NextCode_Add(0xB2);
+            NextCode_Add(0xB5);
+            NextCode_Add(0xB8);
+        }
+
+        //Autorisation of other streams
+        for (int8u Pos=0x01; Pos<=0xAF; Pos++)
+            Streams[Pos].Searching_Payload=true;
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
+// Packet "01" --> "AF"
+void File_Mpegv::slice_start()
+{
+    //Encryption management
+    if (CA_system_ID_MustSkipSlices)
+    {
+        //Is not decodable
+        Finish("MPEG Video");
+        return;
+    }
+
+    if (!Status[IsAccepted])
+    {
+        if (!NextCode_Test())
+            return;
+    }
+    Element_Name("slice_start");
+
+    //Parsing
+    #if MEDIAINFO_MACROBLOCKS
+        if (Macroblocks_Parse && MPEG_Version==2)
+        {
+            BS_Begin();
+
+            bool intra_slice_flag;
+            if (0x1000*vertical_size_extension+vertical_size_value>2800) //vertical_size
+                Skip_S1(3,                                      "slice_vertical_position_extension");
+            if (sequence_scalable_extension_Present)
+                Skip_S1(7,                                      "priority_breakpoint");
+            Skip_S1(5,                                          "quantiser_scale_code");
+            Peek_SB(intra_slice_flag);
+            if (intra_slice_flag)
+            {
+                Skip_SB(                                        "intra_slice_flag");
+                Skip_SB(                                        "intra_slice");
+                Skip_S1(7,                                      "reserved_bits");
+                for (;;)
+                {
+                    bool extra_bit_slice;
+                    Peek_SB(extra_bit_slice);
+                    if (extra_bit_slice)
+                    {
+                        Skip_S1(8,                              "extra_information_slice");
+                    }
+                    else
+                        break;
+                    if (!Data_BS_Remain())
+                    {
+                        Trusted_IsNot("extra_bit_slice is missing");
+                        return;
+                    }
+                }
+            }
+            Skip_SB(                                            "extra_bit_slice (must be 0)");
+
+            macroblock_x=(int64u)-1;
+            while (Synched) //Synched: testing if this is still valid
+            {
+                int8u Remain;
+                if (Data_BS_Remain()%8)
+                    Peek_S1(Data_BS_Remain()%8, Remain);
+                else if (Data_Remain())
+                    Remain=Buffer[Buffer_Offset+(size_t)(Element_Size-Data_Remain())];
+                else
+                    Remain=0;
+                if (Remain==0)
+                {
+                    int32u Remain3;
+                    size_t Bits=Data_BS_Remain();
+                    if (Bits>23)
+                        Bits=23;
+                    Peek_S3((int8u)Bits, Remain3);
+                    if (Remain3==0)
+                        break;
+                }
+                slice_start_macroblock();
+            }
+
+            if (Data_BS_Remain())
+                Skip_BS(Data_BS_Remain(),                       "padding");
+            BS_End();
+        }
+        else
+    #endif //MEDIAINFO_MACROBLOCK
+            Skip_XX(Element_Size,                               "data");
+
+    FILLING_BEGIN();
+        int64u tc_ToAdd=tc/((progressive_sequence || picture_structure==3)?1:2); //Progressive of Frame
+
+        //Timestamp
+        if (!TimeCodeIsNotTrustable && group_start_FirstPass && (Time_Begin_Seconds==Error || (Frame_Count<16 && Time_Current_Seconds*FrameRate+Time_Current_Frames+temporal_reference<Time_Begin_Seconds*FrameRate+Time_Begin_Frames))) //Accepting a lower time code at the beginning of the stream
+        {
+            Time_Begin_Seconds=Time_Current_Seconds;
+            Time_Begin_Frames =Time_Current_Frames+(int8u)temporal_reference;
+        }
+        if (!TimeCodeIsNotTrustable && (Time_Current_Seconds<Time_Begin_Seconds || (Time_Current_Seconds==Time_Begin_Seconds && Time_Current_Frames+(int8u)temporal_reference<Time_Begin_Frames)))
+        {
+            //Time code loop
+            TimeCodeIsNotTrustable=true;
+            Time_End_Seconds=(size_t)-1;
+        }
+        if (!TimeCodeIsNotTrustable && (picture_coding_type==1 || picture_coding_type==2)) //IFrame or PFrame
+        {
+            Time_End_Seconds=Time_Current_Seconds;
+            Time_End_Frames =Time_Current_Frames+(int8u)temporal_reference;
+        }
+
+        if (temporal_reference==temporal_reference_Old)
+        {
+            Frame_Count--;
+            if (IFrame_IsParsed && Frame_Count_NotParsedIncluded!=(int64u)-1)
+                Frame_Count_NotParsedIncluded--;
+            Frame_Count_InThisBlock--;
+            if (FrameInfo.DTS!=(int64u)-1)
+                FrameInfo.DTS-=tc_ToAdd;
+            if (FrameInfo.PTS!=(int64u)-1)
+                FrameInfo.PTS-=tc_ToAdd;
+        }
+        else
+        {
+            temporal_reference_Old=temporal_reference;
+        }
+
+        if (picture_coding_type==1) //IFrame
+        {
+            temporal_reference_LastIFrame=temporal_reference;
+            PTS_LastIFrame=FrameInfo.PTS;
+        }
+        if (PTS_LastIFrame!=(int64u)-1)
+        {
+            FrameInfo.PTS=PTS_LastIFrame+(temporal_reference-temporal_reference_LastIFrame)*tc;
+            if (PTS_Begin==(int64u)-1 && picture_coding_type==1) //IFrame
+                PTS_Begin=FrameInfo.PTS;
+        }
+
         //Info
         #if MEDIAINFO_TRACE
-            Element_Info(_T("Frame ")+Ztring::ToZtring(Frame_Count));
-            Element_Info(_T("picture_coding_type ")+Ztring().From_Local(Mpegv_picture_coding_type[picture_coding_type]));
-            Element_Info(_T("temporal_reference ")+Ztring::ToZtring(temporal_reference));
-            if (PTS!=(int64u)-1)
-                Element_Info(_T("PTS ")+Ztring().Duration_From_Milliseconds(float64_int64s(((float64)PTS)/1000000)));
-            if (DTS!=(int64u)-1)
-                Element_Info(_T("DTS ")+Ztring().Duration_From_Milliseconds(float64_int64s(((float64)DTS)/1000000)));
-            if (Time_End_Seconds!=Error)
-            {
-                int32u Time_End  =Time_End_Seconds  *1000;
-                if (FrameRate)
-                    Time_End  +=(int32u)float32_int32s(Time_End_Frames  *1000/FrameRate);
-                size_t Hours  = Time_End/60/60/1000;
-                size_t Minutes=(Time_End-(Hours*60*60*1000))/60/1000;
-                size_t Seconds=(Time_End-(Hours*60*60*1000)-(Minutes*60*1000))/1000;
-                size_t Milli  =(Time_End-(Hours*60*60*1000)-(Minutes*60*1000)-(Seconds*1000));
-
-                Ztring Time;
-                Time+=Ztring::ToZtring(Hours);
-                Time+=_T(':');
-                Time+=Ztring::ToZtring(Minutes);
-                Time+=_T(':');
-                Time+=Ztring::ToZtring(Seconds);
-                if (FrameRate!=0)
+            if (Trace_Activated)
+            {
+                Element_Info1(__T("Frame ")+Ztring::ToZtring(Frame_Count));
+                if (Frame_Count_LastIFrame!=(int64u)-1)
+                    Element_Info1(__T("Frame reordered ")+Ztring::ToZtring(Frame_Count_LastIFrame+temporal_reference));
+                Element_Info1(__T("picture_coding_type ")+Ztring().From_Local(Mpegv_picture_coding_type[picture_coding_type]));
+                Element_Info1(__T("temporal_reference ")+Ztring::ToZtring(temporal_reference));
+                if (FrameInfo.PTS!=(int64u)-1)
+                    Element_Info1(__T("PTS ")+Ztring().Duration_From_Milliseconds(float64_int64s(((float64)FrameInfo.PTS)/1000000)));
+                if (FrameInfo.DTS!=(int64u)-1)
+                    Element_Info1(__T("DTS ")+Ztring().Duration_From_Milliseconds(float64_int64s(((float64)FrameInfo.DTS)/1000000)));
+                if (Time_End_Seconds!=Error)
                 {
-                    Time+=_T('.');
-                    Time+=Ztring::ToZtring(Milli);
+                    int32u Time_End  =Time_End_Seconds  *1000;
+                    if (FrameRate)
+                        Time_End  +=(int32u)float32_int32s((Time_Current_Frames+temporal_reference)*1000/FrameRate);
+                    size_t Hours  = Time_End/60/60/1000;
+                    size_t Minutes=(Time_End-(Hours*60*60*1000))/60/1000;
+                    size_t Seconds=(Time_End-(Hours*60*60*1000)-(Minutes*60*1000))/1000;
+                    size_t Milli  =(Time_End-(Hours*60*60*1000)-(Minutes*60*1000)-(Seconds*1000));
+
+                    Ztring Time;
+                    Time+=Ztring::ToZtring(Hours);
+                    Time+=__T(':');
+                    Time+=Ztring::ToZtring(Minutes);
+                    Time+=__T(':');
+                    Time+=Ztring::ToZtring(Seconds);
+                    if (FrameRate!=0)
+                    {
+                        Time+=__T('.');
+                        Time+=Ztring::ToZtring(Milli);
+                    }
+                    Element_Info1(__T("time_code ")+Time);
                 }
-                Element_Info(_T("time_code ")+Time);
             }
         #endif //MEDIAINFO_TRACE
 
-        //Time
-        if (Time_End_Seconds!=Error)
+        //CDP
+        #if defined(MEDIAINFO_CDP_YES)
+            if (Ancillary)
+             {
+                Cdp_IsPresent=true;
+                MustExtendParsingDuration=true;
+                Buffer_TotalBytes_Fill_Max=(int64u)-1; //Disabling this feature for this format, this is done in the parser
+
+                Element_Trace_Begin1("CDP");
+                if ((*Ancillary)==NULL)
+                    (*Ancillary)=new File_Ancillary();
+                (*Ancillary)->AspectRatio=MPEG_Version==1?Mpegv_aspect_ratio1[aspect_ratio_information]:Mpegv_aspect_ratio2[aspect_ratio_information];
+                (*Ancillary)->FrameRate=((float)(Mpegv_frame_rate[frame_rate_code] * (frame_rate_extension_n + 1)) / (float)(frame_rate_extension_d + 1));
+                if ((*Ancillary)->Status[IsAccepted]) //In order to test if there is a parser using ancillary data
+                    Open_Buffer_Continue((*Ancillary), Buffer+Buffer_Offset, 0);
+                Element_Trace_End0();
+            }
+        #endif //defined(MEDIAINFO_CDP_YES)
+
+        //Active Format Description & Bar Data
+        #if defined(MEDIAINFO_AFDBARDATA_YES)
+            if (Ancillary && *Ancillary && !(*Ancillary)->AfdBarData_Data.empty())
+            {
+                Element_Trace_Begin1("Active Format Description & Bar Data");
+
+                //Parsing
+                if (AfdBarData_Parser==NULL)
+                {
+                    AfdBarData_Parser=new File_AfdBarData;
+                    Open_Buffer_Init(AfdBarData_Parser);
+                    ((File_AfdBarData*)AfdBarData_Parser)->Format=File_AfdBarData::Format_S2016_3;
+                }
+                if (AfdBarData_Parser->PTS_DTS_Needed)
+                    AfdBarData_Parser->FrameInfo.DTS=FrameInfo.DTS;
+                if (!AfdBarData_Parser->Status[IsFinished])
+                    Open_Buffer_Continue(AfdBarData_Parser, (*Ancillary)->AfdBarData_Data[0]->Data, (*Ancillary)->AfdBarData_Data[0]->Size);
+
+                //Removing data from stack
+                delete (*Ancillary)->AfdBarData_Data[0]; //(*Ancillary)->AfdBarData_Data[0]=NULL;
+                (*Ancillary)->AfdBarData_Data.erase((*Ancillary)->AfdBarData_Data.begin());
+
+                Element_Trace_End0();
+            }
+        #endif //defined(MEDIAINFO_AFDBARDATA_YES)
+
+        //Counting
+        if (File_Offset+Buffer_Offset+Element_Size==File_Size)
+            Frame_Count_Valid=Frame_Count; //Finish frames in case of there are less than Frame_Count_Valid frames
+        if (!TimeCodeIsNotTrustable && (picture_coding_type==1 || picture_coding_type==2)) //IFrame or PFrame
         {
             Time_End_Frames++; //One frame
             if (progressive_sequence && repeat_first_field)
@@ -1081,62 +2558,443 @@
                     Time_End_Frames++; //Frame repeated a third time
             }
         }
-
-        //Counting
-        if (File_Offset+Buffer_Offset+Element_Size==File_Size)
-            Frame_Count_Valid=Frame_Count; //Finish frames in case of there are less than Frame_Count_Valid frames
         Frame_Count++;
         Frame_Count_InThisBlock++;
+        if (IFrame_IsParsed && Frame_Count_NotParsedIncluded!=(int64u)-1)
+            Frame_Count_NotParsedIncluded++;
+        if (!(progressive_sequence || picture_structure==3))
+        {
+            Field_Count++;
+            Field_Count_InThisBlock++;
+        }
         if (picture_coding_type==3)
             BVOP_Count++;
-
-        //Need to parse?
-        if (!Streams[0x00].Searching_Payload)
-            return;
+        else
+            BVOPsSinceLastRefFrames=0;
+        if (RefFramesCount<2 && (picture_coding_type==1 || picture_coding_type==2))
+            RefFramesCount++;
+        if (repeat_first_field)
+        {
+            if (progressive_sequence)
+            {
+                tc_ToAdd+=tc;
+                if (top_field_first)
+                    tc_ToAdd+=tc;
+            }
+            else
+                tc_ToAdd+=tc/2;
+        }
+        if (FrameInfo.DTS!=(int64u)-1)
+        {
+            FrameInfo.DTS+=tc_ToAdd;
+            if (DTS_End<FrameInfo.DTS)
+                DTS_End=FrameInfo.DTS;
+        }
+        if (FrameInfo.PTS!=(int64u)-1)
+        {
+            FrameInfo.PTS+=tc_ToAdd;
+            if (FrameInfo.PTS!=(int64u)-1 && (FrameInfo.PTS>PTS_End || (PTS_End>1000000000 && FrameInfo.PTS<=PTS_End-1000000000))) //More than current PTS_End or less than current PTS_End minus 1 second (there is a problem?)
+                PTS_End=FrameInfo.PTS;
+        }
 
         //NextCode
-        NextCode_Clear();
-        for (int64u Element_Name_Next=0x01; Element_Name_Next<=0x1F; Element_Name_Next++)
-            NextCode_Add(Element_Name_Next);
-        NextCode_Add(0xB2);
-        NextCode_Add(0xB5);
-        NextCode_Add(0xB8);
+        if (!Status[IsAccepted])
+        {
+            NextCode_Clear();
+            NextCode_Add(0x00);
+            NextCode_Add(0xB3);
+            NextCode_Add(0xB8);
+        }
 
         //Autorisation of other streams
-        for (int8u Pos=0x01; Pos<=0x1F; Pos++)
-            Streams[Pos].Searching_Payload=true;
+        #if MEDIAINFO_MACROBLOCKS
+            if (!Macroblocks_Parse)
+        #endif //MEDIAINFO_MACROBLOCKS
+        for (int8u Pos=0x01; Pos<=0xAF; Pos++)
+            Streams[Pos].Searching_Payload=false;
+
+        //Filling only if not already done
+        if (!Status[IsAccepted])
+            Accept("MPEG Video");
+        if ((!Status[IsFilled] && (!MustExtendParsingDuration && Frame_Count>=Frame_Count_Valid)) || Frame_Count>=Frame_Count_Valid*10)
+        {
+            Fill("MPEG Video");
+            if (File_Size==(int64u)-1)
+                Finish("MPEG Video");
+            else if (!IsSub && 2*(File_Offset+Buffer_Size+SizeToAnalyse_End)<File_Size && Config->ParseSpeed<1.0)
+            {
+                Open_Buffer_Unsynch();
+                GoToFromEnd(SizeToAnalyse_End);
+            }
+        }
+
+        //Skipping slices (if already unpacketized)
+        #if MEDIAINFO_DEMUX
+            if (Demux_UnpacketizeContainer && Buffer_TotalBytes+Buffer_Offset<Demux_TotalBytes
+                #if MEDIAINFO_MACROBLOCKS
+                    && !Macroblocks_Parse
+                #endif //MEDIAINFO_MACROBLOCKS
+                )
+            {
+                Element_Offset=Demux_TotalBytes-(Buffer_TotalBytes+Buffer_Offset);
+            }
+        #endif //MEDIAINFO_DEMUX
+
+        #if MEDIAINFO_IBI
+            Ibi_SliceParsed=true;
+        #endif //MEDIAINFO_IBI
+        #if MEDIAINFO_MACROBLOCKS
+            if (Macroblocks_Parse)
+            {
+                macroblock_x++;
+                Element_Info1(Ztring::ToZtring(macroblock_x)+__T(" macroblocks"));
+                macroblock_x_PerFrame+=macroblock_x;
+                macroblock_y_PerFrame++;
+            }
+        #endif //MEDIAINFO_MACROBLOCKS
+
+        #if MEDIAINFO_ADVANCED || MEDIAINFO_EVENTS
+            if (Slices_Count)
+                return;
+            Slices_Count++;
+
+            //sequence_header
+            if (picture_coding_type==1 && (!Has_sequence_header || !Has_sequence_extension))
+            {
+                #if MEDIAINFO_ADVANCED
+                if (!InitDataNotRepeated_Optional && !Has_sequence_header) //Currently we test only sequence_header
+                {
+                    InitDataNotRepeated++;
+
+                    //Testing if we must give up
+                    if (Config_InitDataNotRepeated_GiveUp && InitDataNotRepeated>=Config_InitDataNotRepeated_Occurences)
+                        Config->ParseSpeed=0; // Give up
+                }
+                #endif // MEDIAINFO_ADVANCED
+            }
+        #endif // MEDIAINFO_ADVANCED || MEDIAINFO_EVENTS
+
+        #if MEDIAINFO_ADVANCED || MEDIAINFO_EVENTS
+            //Packets
+            Has_sequence_header=false;
+            Has_sequence_extension=false;
+        #endif // MEDIAINFO_ADVANCED || MEDIAINFO_EVENTS
     FILLING_END();
 }
 
 //---------------------------------------------------------------------------
-// Packet "01" --> "AF"
-void File_Mpegv::slice_start()
+// Packet Packet "01" --> "AF", slice_start, macroblock
+#if MEDIAINFO_MACROBLOCKS
+enum Mpegv_macroblock_type_config //bitwise
+{
+    spatial_temporal_weight_code_flag   =0x01,
+    macroblock_intra                    =0x02,
+    macroblock_pattern                  =0x04,
+    macroblock_motion_backward          =0x08,
+    macroblock_motion_forward           =0x10,
+    macroblock_quant                    =0x20,
+};
+void File_Mpegv::slice_start_macroblock()
 {
-    if (!NextCode_Test())
-        return;
-    Element_Name("slice_start");
+    frame_motion_type=(int8u)-1;
+    spatial_temporal_weight_code=0;
 
-    //Parsing
-    Skip_XX(Element_Size,                                       "data");
+    Element_Trace_Begin1("macroblock");
 
-    FILLING_BEGIN();
-        //NextCode
-        NextCode_Clear();
-        NextCode_Add(0x00);
-        NextCode_Add(0xB3);
-        NextCode_Add(0xB8);
+    size_t macroblock_address_increment;
+    do
+    {
+        Get_VL(macroblock_address_increment_Vlc, macroblock_address_increment, "macroblock_address_increment");
+        Element_Info1(__T("macroblock_address_increment=")+Ztring::ToZtring(Mpegv_macroblock_address_increment[macroblock_address_increment].mapped_to3));
+        if (macroblock_x!=(int64u)-1)
+            macroblock_x+=Mpegv_macroblock_address_increment[macroblock_address_increment].mapped_to3;
+    }
+    while (Mpegv_macroblock_address_increment[macroblock_address_increment].mapped_to1==2); //Escape code
+    if (macroblock_x==(int64u)-1)
+        macroblock_x=0;
+    Element_Info1(__T("macroblock_x=")+Ztring::ToZtring(macroblock_x));
+    Element_Trace_Begin1("macroblock_modes");
+        vlc_fast* macroblock_type_X;
+        switch(picture_coding_type)
+        {
+            case 1: macroblock_type_X=&macroblock_type_I; break;
+            case 2: macroblock_type_X=&macroblock_type_P; break;
+            case 3: macroblock_type_X=&macroblock_type_B; break;
+            default : Element_DoNotTrust("Wrong picture_coding_type");
+                      Element_Trace_End0();
+                      Element_Trace_End0();
+                      return;
+        }
+        size_t macroblock_type_offset;
+        Get_VL(*macroblock_type_X, macroblock_type_offset,   "macroblock_type");
+        macroblock_type=macroblock_type_X->Vlc[macroblock_type_offset].mapped_to3;
+        if (!Synched)
+        {
+            BS_End();
+            Element_Offset=Element_Size;
+            return;
+        }
+        Element_Info1(__T("macroblock_quant=")+Ztring::ToZtring(macroblock_type&macroblock_quant));
+        Element_Info1(__T("macroblock_motion_forward=")+Ztring::ToZtring(macroblock_type&macroblock_motion_forward));
+        Element_Info1(__T("macroblock_motion_backward=")+Ztring::ToZtring(macroblock_type&macroblock_motion_backward));
+        Element_Info1(__T("macroblock_pattern=")+Ztring::ToZtring(macroblock_type&macroblock_pattern));
+        Element_Info1(__T("macroblock_intra=")+Ztring::ToZtring(macroblock_type&macroblock_intra));
+        Element_Info1(__T("spatial_temporal_weight_code_flag=")+Ztring::ToZtring(macroblock_type&spatial_temporal_weight_code_flag));
+        if (macroblock_type&spatial_temporal_weight_code_flag
+         && spatial_temporal_weight_code_table_index)
+            Get_S1 (2, spatial_temporal_weight_code,            "spatial_temporal_weight_code");
+        if (macroblock_type&macroblock_intra
+         && concealment_motion_vectors)
+            frame_motion_type=2;
+        if (macroblock_type&macroblock_motion_forward
+         || macroblock_type&macroblock_motion_backward)
+        {
+            if (picture_structure==3) //Frame
+            {
+                if (!frame_pred_frame_dct)
+                    Get_S1(2, frame_motion_type,                "frame_motion_type");
+                else
+                    frame_motion_type=2;
+            }
+            else
+               Get_S1 (2, field_motion_type,                    "field_motion_type");
+        }
+        if (picture_structure==3 //Frame
+         && !frame_pred_frame_dct
+         && (macroblock_type&macroblock_intra
+          || macroblock_type&macroblock_pattern))
+            Skip_SB(                                            "dct_type");
+    Element_Trace_End0();
+    if (macroblock_type&macroblock_quant)
+        Skip_S1(5,                                              "quantiser_scale_code");
+    if (macroblock_type&macroblock_motion_forward
+    || (macroblock_type&macroblock_intra
+     && concealment_motion_vectors))
+        slice_start_macroblock_motion_vectors(false);
+    if (macroblock_type&macroblock_motion_backward)
+        slice_start_macroblock_motion_vectors(true);
+    if (macroblock_type&macroblock_intra
+     && concealment_motion_vectors)
+        Mark_1();
+    if (macroblock_type&macroblock_pattern)
+        slice_start_macroblock_coded_block_pattern();
+    for (int8u i=0; i<block_count; i++)
+        slice_start_macroblock_block(i);
+    Element_Trace_End0();
+}
+#endif //MEDIAINFO_MACROBLOCKS
+
+//---------------------------------------------------------------------------
+// Packet Packet "01" --> "AF", slice_start, macroblock, motion_vectors
+#if MEDIAINFO_MACROBLOCKS
+void File_Mpegv::slice_start_macroblock_motion_vectors(bool s)
+{
+    Element_Trace_Begin1("motion_vectors");
+    int8u motion_vector_count;
+    switch (frame_motion_type)
+    {
+        case 1  :
+                    switch (spatial_temporal_weight_code)
+                    {
+                        case 0 :
+                        case 1 :
+                                motion_vector_count=2;
+                                break;
+                        case 2 :
+                        case 3 :
+                                motion_vector_count=1;
+                                break;
+                        default: Trusted_IsNot("spatial_temporal_weight_code problem");
+                                 Element_Trace_End0();
+                                 return;
+                    }
+                    break;
+        case 2  :
+                    motion_vector_count=1;
+                    break;
+        case 3  :
+                    switch (spatial_temporal_weight_code)
+                    {
+                        case 1 :
+                                Trusted_IsNot("spatial_temporal_weight_code problem");
+                                Element_Trace_End0();
+                                return;
+                        default:
+                                motion_vector_count=1;
+                                break;
+                    }
+        default :   Trusted_IsNot("frame_motion_type problem");
+                    Element_Trace_End0();
+                    return;
+    }
+    if (motion_vector_count==1)
+    {
+        if (!(picture_structure==3 //Frame
+           && frame_motion_type==2) //mv_format==Frame
+          && frame_motion_type!=3) //dmv!=1
+            Skip_SB(                                            "motion_vertical_field_select[0][s]");
+        slice_start_macroblock_motion_vectors_motion_vector(false, s);
+    }
+    else
+    {
+        Skip_SB(                                                "motion_vertical_field_select[0][s]");
+        slice_start_macroblock_motion_vectors_motion_vector(false, s);
+        Skip_SB(                                                "motion_vertical_field_select[1][s]");
+        slice_start_macroblock_motion_vectors_motion_vector(true, s);
+    }
+    Element_Trace_End0();
+}
+#endif //MEDIAINFO_MACROBLOCKS
 
-        //Autorisation of other streams
-        for (int8u Pos=0x01; Pos<=0x1F; Pos++)
-            Streams[Pos].Searching_Payload=false;
+//---------------------------------------------------------------------------
+// Packet Packet "01" --> "AF", slice_start, macroblock, motion_vectors, motion_vector
+#if MEDIAINFO_MACROBLOCKS
+void File_Mpegv::slice_start_macroblock_motion_vectors_motion_vector(bool r, bool s)
+{
+    Element_Trace_Begin1("motion_vector");
+    size_t motion_code_;
 
-        //Filling only if not already done
-        if (Frame_Count==2 && !Status[IsAccepted])
-            Accept("MPEG Video");
-        if (!Status[IsFilled] && (!CC___IsPresent && !Scte_IsPresent && !GA94_03_IsPresent && !Cdp_IsPresent && Frame_Count>=Frame_Count_Valid || Frame_Count>=Frame_Count_Valid*10))
-            Fill("MPEG Video");
-    FILLING_END();
+    Get_VL(motion_code, motion_code_, "motion_code[r][s][0]"); Param_Info1(Mpegv_motion_code[motion_code_].mapped_to3);
+    if (Mpegv_motion_code[motion_code_].mapped_to3)
+        Skip_SB(                           "motion_code[r][s][0] sign");
+    if (f_code[s][0]>1 && Mpegv_motion_code[motion_code_].mapped_to3)
+        Skip_S1(f_code[s][0]-1,             "motion_residual[r][s][0]");
+    if (frame_motion_type==3) //dmv==1
+    {
+        Info_VL(dmvector, dmvector_,  "dmvector[0]"); Param_Info1(Mpegv_dmvector[dmvector_].mapped_to3);
+    }
+
+    Get_VL(motion_code, motion_code_, "motion_code[r][s][1]"); Param_Info1(Mpegv_motion_code[motion_code_].mapped_to3);
+    if (Mpegv_motion_code[motion_code_].mapped_to3)
+        Skip_SB(                           "motion_code[r][s][1] sign");
+    if (f_code[s][1]>1 && Mpegv_motion_code[motion_code_].mapped_to3)
+        Skip_S1(f_code[s][1]-1,             "motion_residual[r][s][1]");
+    if (frame_motion_type==3) //dmv==1
+    {
+        Info_VL(dmvector, dmvector_,  "dmvector[1]"); Param_Info1(Mpegv_dmvector[dmvector_].mapped_to3);
+    }
+
+    Element_Trace_End0();
+}
+#endif //MEDIAINFO_MACROBLOCKS
+
+//---------------------------------------------------------------------------
+// Packet Packet "01" --> "AF", slice_start, macroblock, coded_block_pattern
+#if MEDIAINFO_MACROBLOCKS
+void File_Mpegv::slice_start_macroblock_coded_block_pattern()
+{
+    Element_Trace_Begin1("coded_block_pattern");
+    size_t coded_block_pattern_;
+    Get_VL(coded_block_pattern, coded_block_pattern_, "coded_block_pattern_420");
+    cbp=Mpegv_coded_block_pattern[coded_block_pattern_].mapped_to3;
+    switch (chroma_format)
+    {
+        case 2 :    //4:2:2
+                    {
+                    int8u coded_block_pattern_1;
+                    Get_S1 (2, coded_block_pattern_1,           "coded_block_pattern_1");
+                    cbp<<=2;
+                    cbp|=coded_block_pattern_1;
+                    }
+                    break;
+        case 3 :    //4:4:4
+                    {
+                    int8u coded_block_pattern;
+                    Get_S1 (8, coded_block_pattern,             "coded_block_pattern_1/2");
+                    cbp<<=8;
+                    cbp|=coded_block_pattern;
+                    }
+                    break;
+        default :   ;
+    }
+    Element_Info1(Ztring::ToZtring((int16u)cbp, 2));
+    Element_Trace_End0();
 }
+#endif //MEDIAINFO_MACROBLOCKS
+
+//---------------------------------------------------------------------------
+// Packet Packet "01" --> "AF", slice_start, macroblock, block
+#if MEDIAINFO_MACROBLOCKS
+void File_Mpegv::slice_start_macroblock_block(int8u i)
+{
+    //pattern_code
+    if (!(macroblock_type&macroblock_intra) && !((macroblock_type&macroblock_pattern) && (cbp&(1<<(block_count-1-i)))))
+        return;
+
+    Element_Trace_Begin1("block"); Element_Info1(i);
+    bool IsFirst;
+    const vlc* Mpegv_dct_coefficients;
+    vlc_fast* Mpegv_dct_coefficients2;
+    if (macroblock_type&macroblock_intra)
+    {
+        IsFirst=false;
+        Mpegv_dct_coefficients=intra_vlc_format?Mpegv_dct_coefficients_1:Mpegv_dct_coefficients_0;
+        Mpegv_dct_coefficients2=&(intra_vlc_format?dct_coefficients_1:dct_coefficients_0);
+        if (i<4)
+        {
+            size_t dct_dc_size_luminance_;
+            Get_VL(dct_dc_size_luminance, dct_dc_size_luminance_, "dct_dc_size_luminance"); Param_Info1(Mpegv_dct_dc_size_luminance[dct_dc_size_luminance_].mapped_to3);
+            if (Mpegv_dct_dc_size_luminance[dct_dc_size_luminance_].mapped_to3)
+                Skip_S2(Mpegv_dct_dc_size_luminance[dct_dc_size_luminance_].mapped_to3, "dct_dc_differential");
+        }
+        else
+        {
+            size_t dct_dc_size_chrominance_;
+            Get_VL(dct_dc_size_chrominance, dct_dc_size_chrominance_, "dct_dc_size_chrominance"); Param_Info1(Mpegv_dct_dc_size_chrominance[dct_dc_size_chrominance_].mapped_to3);
+            if (Mpegv_dct_dc_size_chrominance[dct_dc_size_chrominance_].mapped_to3)
+                Skip_S2((int8u)dct_dc_size_chrominance_, "dct_dc_differential");
+        }
+    }
+    else
+    {
+        IsFirst=true;
+        Mpegv_dct_coefficients=Mpegv_dct_coefficients_0;
+        Mpegv_dct_coefficients2=&dct_coefficients_0;
+    }
+
+    for (;;)
+    {
+        Element_Trace_Begin1("dct_coefficient");
+        size_t dct_coefficient;
+        Get_VL(*Mpegv_dct_coefficients2, dct_coefficient, "dct_coefficient");
+        switch (Mpegv_dct_coefficients[dct_coefficient].mapped_to1)
+        {
+            case 1 :
+                    Element_Trace_End1("End of block");
+                    Element_Trace_End0();
+                    return;
+            case 2 :
+                    #if MEDIAINFO_TRACE
+                    if (Trace_Activated)
+                    {
+                        Info_S1( 6, Run,                        "Run"); Element_Info1(Run);
+                        Info_S2(12, Level,                      "Level"); Element_Info1(Level-(Level>0x800?4096:0));
+                    }
+                    else
+                    #endif //MEDIAINFO_MACROBLOCKS
+                    Skip_S3(18,                                 "Run + Level");
+                    break;
+            case 3 :
+                    if (!IsFirst)
+                    {
+                        if (Mpegv_dct_coefficients[dct_coefficient].bit_increment)
+                        {
+                            Element_Trace_End1("End of block");
+                            Element_Trace_End0();
+                            return;
+                        }
+                        Skip_SB(                                "dct_coefficient sign");
+                    }
+            default:
+                    Element_Info1(Mpegv_dct_coefficients[dct_coefficient].mapped_to2);
+                    Element_Info1(Mpegv_dct_coefficients[dct_coefficient].mapped_to3);
+        }
+        if (IsFirst)
+            IsFirst=false;
+        Element_Trace_End0();
+    }
+}
+#endif //MEDIAINFO_MACROBLOCKS
 
 //---------------------------------------------------------------------------
 // Packet "B2"
@@ -1202,10 +3060,8 @@
     while (Library_End_Offset<Element_Size
         && (Buffer[Buffer_Offset+Library_End_Offset]==0x0D
          || Buffer[Buffer_Offset+Library_End_Offset]==0x0A
-         || Buffer[Buffer_Offset+Library_End_Offset]>=0x20
-         && Buffer[Buffer_Offset+Library_End_Offset]<=0x3F
-         || Buffer[Buffer_Offset+Library_End_Offset]>=0x41
-         && Buffer[Buffer_Offset+Library_End_Offset]<=0x7D))
+         || (Buffer[Buffer_Offset+Library_End_Offset]>=0x20 && Buffer[Buffer_Offset+Library_End_Offset]<=0x3F)
+         || (Buffer[Buffer_Offset+Library_End_Offset]>=0x41 && Buffer[Buffer_Offset+Library_End_Offset]<=0x7D)))
         Library_End_Offset++;
 
     //Parsing
@@ -1218,57 +3074,57 @@
         Skip_XX(Element_Size-Element_Offset,                    "junk");
 
     //Cleanup
-    while(Temp.size()>3 && Temp[1]==_T('e') && Temp[2]==_T('n') && Temp[3]==_T('c'))
+    while(Temp.size()>3 && Temp[1]==__T('e') && Temp[2]==__T('n') && Temp[3]==__T('c'))
         Temp.erase(0, 1);
-    while(Temp.size()>5 && Temp[3]==_T('M') && Temp[4]==_T('P') && Temp[5]==_T('E'))
+    while(Temp.size()>5 && Temp[3]==__T('M') && Temp[4]==__T('P') && Temp[5]==__T('E'))
         Temp.erase(0, 1);
 
     //Cleanup
-    while(!Temp.empty() && Temp[0]==_T('0'))
+    while(!Temp.empty() && Temp[0]==__T('0'))
         Temp.erase(0, 1);
 
     FILLING_BEGIN();
         if (!Temp.empty())
         {
-            if (Temp.find(_T("build"))==0)
-                Library+=Ztring(_T(" "))+Temp;
+            if (Temp.find(__T("build"))==0)
+                Library+=Ztring(__T(" "))+Temp;
             else
                 Library=Temp;
 
             //Library
-            if (Temp.find(_T("Created with Nero"))==0)
+            if (Temp.find(__T("Created with Nero"))==0)
             {
-                Library_Name=_T("Ahead Nero");
+                Library_Name=__T("Ahead Nero");
             }
-            else if (Library.find(_T("encoded by avi2mpg1 ver "))==0)
+            else if (Library.find(__T("encoded by avi2mpg1 ver "))==0)
             {
-                Library_Name=_T("avi2mpg1");
-                Library_Version=Library.SubString(_T("encoded by avi2mpg1 ver "), _T(""));
+                Library_Name=__T("avi2mpg1");
+                Library_Version=Library.SubString(__T("encoded by avi2mpg1 ver "), __T(""));
             }
-            else if (Library.find(_T("encoded by TMPGEnc (ver. "))==0)
+            else if (Library.find(__T("encoded by TMPGEnc (ver. "))==0)
             {
-                Library_Name=_T("TMPGEnc");
-                Library_Version=Library.SubString(_T("encoded by TMPGEnc (ver. "), _T(")"));
+                Library_Name=__T("TMPGEnc");
+                Library_Version=Library.SubString(__T("encoded by TMPGEnc (ver. "), __T(")"));
             }
-            else if (Library.find(_T("encoded by TMPGEnc 4.0 XPress Version. "))==0)
+            else if (Library.find(__T("encoded by TMPGEnc 4.0 XPress Version. "))==0)
             {
-                Library_Name=_T("TMPGEnc XPress");
-                Library_Version=Library.SubString(_T("encoded by TMPGEnc 4.0 XPress Version. "), _T(""));
+                Library_Name=__T("TMPGEnc XPress");
+                Library_Version=Library.SubString(__T("encoded by TMPGEnc 4.0 XPress Version. "), __T(""));
             }
-            else if (Library.find(_T("encoded by TMPGEnc MPEG Editor "))==0)
+            else if (Library.find(__T("encoded by TMPGEnc MPEG Editor "))==0)
             {
-                Library_Name=_T("TMPGEnc MPEG Editor");
-                Library_Version=Library.SubString(_T("Version. "), _T(""));
+                Library_Name=__T("TMPGEnc MPEG Editor");
+                Library_Version=Library.SubString(__T("Version. "), __T(""));
             }
-            else if (Library.find(_T("encoded by TMPGEnc "))==0)
+            else if (Library.find(__T("encoded by TMPGEnc "))==0)
             {
-                Library_Name=_T("TMPGEnc");
-                Library_Version=Library.SubString(_T("encoded by TMPGEnc "), _T(""));
+                Library_Name=__T("TMPGEnc");
+                Library_Version=Library.SubString(__T("encoded by TMPGEnc "), __T(""));
             }
-            else if (Library.find(_T("MPEG Encoder v"))==0)
+            else if (Library.find(__T("MPEG Encoder v"))==0)
             {
-                Library_Name=_T("MPEG Encoder by Tristan Savatier");
-                Library_Version=Library.SubString(_T("MPEG Encoder v"), _T(" by"));
+                Library_Name=__T("MPEG Encoder by Tristan Savatier");
+                Library_Version=Library.SubString(__T("MPEG Encoder v"), __T(" by"));
             }
             else
                 Library_Name=Library;
@@ -1284,7 +3140,7 @@
     Skip_B4(                                                    "identifier");
 
     #if defined(MEDIAINFO_DTVCCTRANSPORT_YES)
-        Element_Info("DVD Captions");
+        Element_Info1("DVD Captions");
 
         //Parsing
         #if MEDIAINFO_DEMUX
@@ -1293,15 +3149,17 @@
         if (CC___Parser==NULL)
         {
             CC___IsPresent=true;
+            MustExtendParsingDuration=true;
+            Buffer_TotalBytes_Fill_Max=(int64u)-1; //Disabling this feature for this format, this is done in the parser
             CC___Parser=new File_DtvccTransport;
             Open_Buffer_Init(CC___Parser);
             ((File_DtvccTransport*)CC___Parser)->Format=File_DtvccTransport::Format_DVD;
         }
         if (CC___Parser->PTS_DTS_Needed)
         {
-            CC___Parser->PCR=PCR;
-            CC___Parser->PTS=PTS;
-            CC___Parser->DTS=DTS;
+            CC___Parser->FrameInfo.PCR=FrameInfo.PCR;
+            CC___Parser->FrameInfo.PTS=FrameInfo.PTS;
+            CC___Parser->FrameInfo.DTS=FrameInfo.DTS;
         }
         Demux(Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)(Element_Size-Element_Offset), ContentType_MainStream);
         Open_Buffer_Continue(CC___Parser, Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)(Element_Size-Element_Offset));
@@ -1319,8 +3177,10 @@
 
     #if defined(MEDIAINFO_SCTE20_YES)
         Scte_IsPresent=true;
+        MustExtendParsingDuration=true;
+        Buffer_TotalBytes_Fill_Max=(int64u)-1; //Disabling this feature for this format, this is done in the parser
 
-        Element_Info("SCTE 20");
+        Element_Info1("SCTE 20");
 
         //Coherency
         if (TemporalReference_Offset+temporal_reference>=TemporalReference.size())
@@ -1332,7 +3192,7 @@
             size_t Pos=TemporalReference_Offset+temporal_reference;
             do
             {
-                if (TemporalReference[Pos]==NULL || !TemporalReference[Pos]->IsValid)
+                if (TemporalReference[Pos]==NULL || !TemporalReference[Pos]->IsValid || TemporalReference[Pos]->Scte.empty())
                     break;
                 Pos--;
             }
@@ -1340,26 +3200,42 @@
             Scte_TemporalReference_Offset=Pos+1;
         }
 
-        if (TemporalReference[TemporalReference_Offset+temporal_reference]->Scte==NULL)
-            TemporalReference[TemporalReference_Offset+temporal_reference]->Scte=new temporalreference::buffer_data;
-        TemporalReference[TemporalReference_Offset+temporal_reference]->Scte->Size=(size_t)(Element_Size-Element_Offset);
-        delete[] TemporalReference[TemporalReference_Offset+temporal_reference]->Scte->Data;
-        TemporalReference[TemporalReference_Offset+temporal_reference]->Scte->Data=new int8u[(size_t)(Element_Size-Element_Offset)];
-        std::memcpy(TemporalReference[TemporalReference_Offset+temporal_reference]->Scte->Data, Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)(Element_Size-Element_Offset));
+        if (TemporalReference_Offset+temporal_reference>=TemporalReference.size())
+            TemporalReference.resize(TemporalReference_Offset+temporal_reference+1);
+        if (TemporalReference[TemporalReference_Offset+temporal_reference]==NULL)
+            TemporalReference[TemporalReference_Offset+temporal_reference]=new temporalreference;
+        temporalreference::buffer_data* BufferData=new temporalreference::buffer_data;
+        BufferData->Size=(size_t)(Element_Size-Element_Offset);
+        BufferData->Data=new int8u[(size_t)(Element_Size-Element_Offset)];
+        std::memcpy(BufferData->Data, Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)(Element_Size-Element_Offset));
+        TemporalReference[TemporalReference_Offset+temporal_reference]->Scte.push_back(BufferData);
+        TemporalReference[TemporalReference_Offset+temporal_reference]->Scte_Parsed.push_back(false);
+        if (TemporalReference[TemporalReference_Offset+temporal_reference]->Scte_Parsed.size()>=2 && TemporalReference[TemporalReference_Offset+temporal_reference]->Scte_Parsed[TemporalReference[TemporalReference_Offset+temporal_reference]->Scte_Parsed.size()-2] && Scte_TemporalReference_Offset==TemporalReference_Offset+temporal_reference+1)
+            Scte_TemporalReference_Offset--;
 
         //Parsing
-        Skip_XX(Element_Size-Element_Offset,                    "CC data");
+        Skip_XX(Element_Size-Element_Offset,                    "SCTE 20 data");
 
         //Parsing Captions after reordering
         bool CanBeParsed=true;
-        for (size_t Scte_Pos=Scte_TemporalReference_Offset; Scte_Pos<TemporalReference.size(); Scte_Pos++)
-            if (TemporalReference[Scte_Pos]==NULL || !TemporalReference[Scte_Pos]->IsValid || TemporalReference[Scte_Pos]->Scte==NULL)
+        size_t FirstSize=(size_t)-1;
+        for (size_t Scte20_Pos=Scte_TemporalReference_Offset; Scte20_Pos<TemporalReference.size(); Scte20_Pos++)
+        {
+            if (TemporalReference[Scte20_Pos]==NULL || !TemporalReference[Scte20_Pos]->IsValid || TemporalReference[Scte20_Pos]->Scte.empty())
                 CanBeParsed=false; //There is a missing field/frame
+            if (CanBeParsed)
+            {
+                if (FirstSize==(size_t)-1)
+                    FirstSize=TemporalReference[Scte20_Pos]->Scte.size();
+                else if (!progressive_sequence && !TemporalReference[Scte20_Pos]->progressive_frame && TemporalReference[Scte20_Pos]->picture_structure==3 && TemporalReference[Scte20_Pos]->Scte.size()!=FirstSize)
+                    CanBeParsed=false; //There is a missing field in a frame duo
+            }
+        }
         if (CanBeParsed)
         {
-            for (size_t Scte_Pos=Scte_TemporalReference_Offset; Scte_Pos<TemporalReference.size(); Scte_Pos++)
+            for (size_t Scte20_Pos=Scte_TemporalReference_Offset; Scte20_Pos<TemporalReference.size(); Scte20_Pos++)
             {
-                Element_Begin("SCTE 20 data");
+                Element_Begin1("Reordered SCTE 20");
 
                 //Parsing
                 #if MEDIAINFO_DEMUX
@@ -1370,21 +3246,27 @@
                     Scte_Parser=new File_Scte20;
                     Open_Buffer_Init(Scte_Parser);
                 }
-                if (Scte_Parser->PTS_DTS_Needed)
-                {
-                    Scte_Parser->PCR=PCR;
-                    Scte_Parser->PTS=PTS;
-                    Scte_Parser->DTS=DTS;
-                }
-                ((File_Scte20*)Scte_Parser)->picture_structure=TemporalReference[Scte_Pos]->picture_structure;
+                //((File_Scte20*)Scte_Parser)->AspectRatio=MPEG_Version==1?Mpegv_aspect_ratio1[aspect_ratio_information]:Mpegv_aspect_ratio2[aspect_ratio_information];
+                ((File_Scte20*)Scte_Parser)->picture_structure=TemporalReference[Scte20_Pos]->picture_structure;
                 ((File_Scte20*)Scte_Parser)->progressive_sequence=progressive_sequence;
-                ((File_Scte20*)Scte_Parser)->progressive_frame=TemporalReference[Scte_Pos]->progressive_frame;
-                ((File_Scte20*)Scte_Parser)->top_field_first=TemporalReference[Scte_Pos]->top_field_first;
-                ((File_Scte20*)Scte_Parser)->repeat_first_field=TemporalReference[Scte_Pos]->repeat_first_field;
-                Demux(TemporalReference[Scte_Pos]->Scte->Data, TemporalReference[Scte_Pos]->Scte->Size, ContentType_MainStream);
-                Open_Buffer_Continue(Scte_Parser, TemporalReference[Scte_Pos]->Scte->Data, TemporalReference[Scte_Pos]->Scte->Size);
+                ((File_Scte20*)Scte_Parser)->progressive_frame=TemporalReference[Scte20_Pos]->progressive_frame;
+                ((File_Scte20*)Scte_Parser)->top_field_first=TemporalReference[Scte20_Pos]->top_field_first;
+                ((File_Scte20*)Scte_Parser)->repeat_first_field=TemporalReference[Scte20_Pos]->repeat_first_field;
+                for (size_t Pos=0; Pos<TemporalReference[Scte20_Pos]->Scte.size(); Pos++)
+                    if (!TemporalReference[Scte20_Pos]->Scte_Parsed[Pos])
+                    {
+                        if (Scte_Parser->PTS_DTS_Needed)
+                        {
+                            Scte_Parser->FrameInfo.PCR=FrameInfo.PCR;
+                            Scte_Parser->FrameInfo.PTS=FrameInfo.PTS-(TemporalReference.size()-1-Scte20_Pos)*tc;
+                            Scte_Parser->FrameInfo.DTS=FrameInfo.DTS-(TemporalReference.size()-1-Scte20_Pos)*tc;
+                        }
+                        Demux(TemporalReference[Scte20_Pos]->Scte[Pos]->Data, TemporalReference[Scte20_Pos]->Scte[Pos]->Size, ContentType_MainStream);
+                        Open_Buffer_Continue(Scte_Parser, TemporalReference[Scte20_Pos]->Scte[Pos]->Data, TemporalReference[Scte20_Pos]->Scte[Pos]->Size);
+                        TemporalReference[Scte20_Pos]->Scte_Parsed[Pos]=true;
+                    }
 
-                Element_End();
+                Element_End0();
             }
             Scte_TemporalReference_Offset=TemporalReference.size();
         }
@@ -1400,7 +3282,7 @@
     Skip_B4(                                                    "identifier");
 
     #if defined(MEDIAINFO_AFDBARDATA_YES)
-        Element_Info("Active Format Description");
+        Element_Info1("Active Format Description");
 
         //Parsing
         if (DTG1_Parser==NULL)
@@ -1408,12 +3290,37 @@
             DTG1_Parser=new File_AfdBarData;
             Open_Buffer_Init(DTG1_Parser);
             ((File_AfdBarData*)DTG1_Parser)->Format=File_AfdBarData::Format_A53_4_DTG1;
+
+            //Aspect ratio for AFD
+            float32 DAR=0;
+            if (MPEG_Version==2)
+            {
+                if (aspect_ratio_information==0)
+                    ; //Forbidden
+                else if (aspect_ratio_information==1)
+                    DAR=((float32)(0x1000*horizontal_size_extension+horizontal_size_value))/(0x1000*vertical_size_extension+vertical_size_value);
+                else if (display_horizontal_size && display_vertical_size)
+                {
+                    if (vertical_size_value && Mpegv_aspect_ratio2[aspect_ratio_information])
+                        DAR=((float32)(0x1000*horizontal_size_extension+horizontal_size_value))/(0x1000*vertical_size_extension+vertical_size_value)
+                                                                                     *Mpegv_aspect_ratio2[aspect_ratio_information]/((float32)display_horizontal_size/display_vertical_size);
+                }
+                else if (Mpegv_aspect_ratio2[aspect_ratio_information])
+                    DAR=Mpegv_aspect_ratio2[aspect_ratio_information];
+            }
+            else //Version 1
+            {
+                if (vertical_size_value && Mpegv_aspect_ratio1[aspect_ratio_information])
+                    DAR=((float32)(0x1000*horizontal_size_extension+horizontal_size_value))/(0x1000*vertical_size_extension+vertical_size_value)/Mpegv_aspect_ratio1[aspect_ratio_information];
+            }
+            if (DAR>=1.330 && DAR<1.336) ((File_AfdBarData*)DTG1_Parser)->aspect_ratio_FromContainer=0; //4/3
+            if (DAR>=1.774 && DAR<1.780) ((File_AfdBarData*)DTG1_Parser)->aspect_ratio_FromContainer=1; //16/9
         }
         if (DTG1_Parser->PTS_DTS_Needed)
         {
-            DTG1_Parser->PCR=PCR;
-            DTG1_Parser->PTS=PTS;
-            DTG1_Parser->DTS=DTS;
+            DTG1_Parser->FrameInfo.PCR=FrameInfo.PCR;
+            DTG1_Parser->FrameInfo.PTS=FrameInfo.PTS;
+            DTG1_Parser->FrameInfo.DTS=FrameInfo.DTS;
         }
         Open_Buffer_Continue(DTG1_Parser, Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)(Element_Size-Element_Offset));
         Element_Offset=Element_Size;
@@ -1444,8 +3351,10 @@
 {
     #if defined(MEDIAINFO_DTVCCTRANSPORT_YES)
         GA94_03_IsPresent=true;
+        MustExtendParsingDuration=true;
+        Buffer_TotalBytes_Fill_Max=(int64u)-1; //Disabling this feature for this format, this is done in the parser
 
-        Element_Info("DTVCC Transport");
+        Element_Info1("DTVCC Transport");
 
         //Coherency
         if (TemporalReference_Offset+temporal_reference>=TemporalReference.size())
@@ -1457,7 +3366,7 @@
             size_t Pos=TemporalReference_Offset+temporal_reference;
             do
             {
-                if (TemporalReference[Pos]==NULL || !TemporalReference[Pos]->IsValid)
+                if (TemporalReference[Pos]==NULL || !TemporalReference[Pos]->IsValid || TemporalReference[Pos]->GA94_03==NULL)
                     break;
                 Pos--;
             }
@@ -1465,6 +3374,10 @@
             GA94_03_TemporalReference_Offset=Pos+1;
         }
 
+        if (TemporalReference_Offset+temporal_reference>=TemporalReference.size())
+            TemporalReference.resize(TemporalReference_Offset+temporal_reference+1);
+        if (TemporalReference[TemporalReference_Offset+temporal_reference]==NULL)
+            TemporalReference[TemporalReference_Offset+temporal_reference]=new temporalreference;
         if (TemporalReference[TemporalReference_Offset+temporal_reference]->GA94_03==NULL)
             TemporalReference[TemporalReference_Offset+temporal_reference]->GA94_03=new temporalreference::buffer_data;
         TemporalReference[TemporalReference_Offset+temporal_reference]->GA94_03->Size=(size_t)(Element_Size-Element_Offset);
@@ -1484,7 +3397,7 @@
         {
             for (size_t GA94_03_Pos=GA94_03_TemporalReference_Offset; GA94_03_Pos<TemporalReference.size(); GA94_03_Pos++)
             {
-                Element_Begin("Reordered DTVCC Transport");
+                Element_Begin1("Reordered DTVCC Transport");
 
                 //Parsing
                 #if MEDIAINFO_DEMUX
@@ -1498,14 +3411,15 @@
                 }
                 if (GA94_03_Parser->PTS_DTS_Needed)
                 {
-                    GA94_03_Parser->PCR=PCR;
-                    GA94_03_Parser->PTS=PTS;
-                    GA94_03_Parser->DTS=DTS;
+                    GA94_03_Parser->FrameInfo.PCR=FrameInfo.PCR;
+                    GA94_03_Parser->FrameInfo.PTS=FrameInfo.PTS-(FrameInfo.PTS!=(int64u)-1?((TemporalReference.size()-1-GA94_03_Pos)*tc):0);
+                    GA94_03_Parser->FrameInfo.DTS=FrameInfo.DTS-(FrameInfo.DTS!=(int64u)-1?((TemporalReference.size()-1-GA94_03_Pos)*tc):0);
                 }
                 Demux(TemporalReference[GA94_03_Pos]->GA94_03->Data, TemporalReference[GA94_03_Pos]->GA94_03->Size, ContentType_MainStream);
+                ((File_DtvccTransport*)GA94_03_Parser)->AspectRatio=MPEG_Version==1?Mpegv_aspect_ratio1[aspect_ratio_information]:Mpegv_aspect_ratio2[aspect_ratio_information];
                 Open_Buffer_Continue(GA94_03_Parser, TemporalReference[GA94_03_Pos]->GA94_03->Data, TemporalReference[GA94_03_Pos]->GA94_03->Size);
 
-                Element_End();
+                Element_End0();
             }
             GA94_03_TemporalReference_Offset=TemporalReference.size();
         }
@@ -1519,7 +3433,7 @@
 void File_Mpegv::user_data_start_GA94_06()
 {
     #if defined(MEDIAINFO_AFDBARDATA_YES)
-        Element_Info("Bar Data");
+        Element_Info1("Bar Data");
 
         //Parsing
         if (GA94_06_Parser==NULL)
@@ -1530,9 +3444,9 @@
         }
         if (GA94_06_Parser->PTS_DTS_Needed)
         {
-            GA94_06_Parser->PCR=PCR;
-            GA94_06_Parser->PTS=PTS;
-            GA94_06_Parser->DTS=DTS;
+            GA94_06_Parser->FrameInfo.PCR=FrameInfo.PCR;
+            GA94_06_Parser->FrameInfo.PTS=FrameInfo.PTS;
+            GA94_06_Parser->FrameInfo.DTS=FrameInfo.DTS;
         }
         Open_Buffer_Init(GA94_06_Parser);
         Open_Buffer_Continue(GA94_06_Parser, Buffer+Buffer_Offset+(size_t)Element_Offset, (size_t)(Element_Size-Element_Offset));
@@ -1550,36 +3464,43 @@
 
     //Reading
     int32u bit_rate_value_temp;
-    bool  load_intra_quantiser_matrix, load_non_intra_quantiser_matrix;
     BS_Begin();
     Get_S2 (12, horizontal_size_value,                          "horizontal_size_value");
     Get_S2 (12, vertical_size_value,                            "vertical_size_value");
-    Get_S1 ( 4, aspect_ratio_information,                       "aspect_ratio_information"); if (vertical_size_value && Mpegv_aspect_ratio1[aspect_ratio_information]) Param_Info((float)horizontal_size_value/vertical_size_value/Mpegv_aspect_ratio1[aspect_ratio_information]); Param_Info(Mpegv_aspect_ratio2[aspect_ratio_information]);
-    Get_S1 ( 4, frame_rate_code,                                "frame_rate_code"); Param_Info(Mpegv_frame_rate[frame_rate_code]);
-    Get_S3 (18, bit_rate_value_temp,                            "bit_rate_value"); Param_Info(bit_rate_value_temp*400);
+    Get_S1 ( 4, aspect_ratio_information,                       "aspect_ratio_information"); Param_Info1C((vertical_size_value && Mpegv_aspect_ratio1[aspect_ratio_information]), (float)horizontal_size_value/vertical_size_value/Mpegv_aspect_ratio1[aspect_ratio_information]); Param_Info1(Mpegv_aspect_ratio2[aspect_ratio_information]);
+    Get_S1 ( 4, frame_rate_code,                                "frame_rate_code"); Param_Info1(Mpegv_frame_rate[frame_rate_code]);
+    Get_S3 (18, bit_rate_value_temp,                            "bit_rate_value"); Param_Info1(bit_rate_value_temp*400);
     Mark_1 ();
-    Get_S2 (10, vbv_buffer_size_value,                          "vbv_buffer_size_value"); Param_Info(2*1024*((int32u)vbv_buffer_size_value), " bytes");
+    Get_S2 (10, vbv_buffer_size_value,                          "vbv_buffer_size_value"); Param_Info2(2*1024*((int32u)vbv_buffer_size_value), " bytes");
     Skip_SB(                                                    "constrained_parameters_flag");
     TEST_SB_GET(load_intra_quantiser_matrix,                    "load_intra_quantiser_matrix");
+        bool FillMatrix=Matrix_intra.empty();
         for (size_t Pos=0; Pos<64; Pos++)
         {
             int8u intra_quantiser;
             Get_S1 (8, intra_quantiser,                         "intra_quantiser");
-            Ztring Value=Ztring::ToZtring(intra_quantiser, 16);
-            if (Value.size()==1)
-                Value.insert(0, _T("0"));
-            Matrix_intra+=Value;
+            if (FillMatrix)
+            {
+                Ztring Value=Ztring::ToZtring(intra_quantiser, 16);
+                if (Value.size()==1)
+                    Value.insert(0, __T("0"));
+                Matrix_intra+=Value;
+            }
         }
     TEST_SB_END();
     TEST_SB_GET(load_non_intra_quantiser_matrix,                "load_non_intra_quantiser_matrix");
+        bool FillMatrix=Matrix_nonintra.empty();
         for (size_t Pos=0; Pos<64; Pos++)
         {
             int8u non_intra_quantiser;
             Get_S1 (8, non_intra_quantiser,                     "non_intra_quantiser");
-            Ztring Value=Ztring::ToZtring(non_intra_quantiser, 16);
-            if (Value.size()==1)
-                Value.insert(0, _T("0"));
-            Matrix_nonintra+=Value;
+            if (FillMatrix)
+            {
+                Ztring Value=Ztring::ToZtring(non_intra_quantiser, 16);
+                if (Value.size()==1)
+                    Value.insert(0, __T("0"));
+                Matrix_nonintra+=Value;
+            }
         }
     TEST_SB_END();
     BS_End();
@@ -1601,6 +3522,8 @@
         TemporalReference_Offset=TemporalReference.size();
         if (TemporalReference_Offset>=0x800)
         {
+            for (size_t Pos=0; Pos<0x400; Pos++)
+                delete TemporalReference[Pos]; //TemporalReference[Pos]=NULL;
             TemporalReference.erase(TemporalReference.begin(), TemporalReference.begin()+0x400);
             if (0x400<TemporalReference_Offset)
                 TemporalReference_Offset-=0x400;
@@ -1629,30 +3552,48 @@
             bit_rate_value_IsValid=true;
         }
 
-        if (sequence_header_IsParsed)
-            return;
-
         //NextCode
-        NextCode_Clear();
-        NextCode_Add(0x00);
-        NextCode_Add(0xB2);
-        NextCode_Add(0xB5);
-        NextCode_Add(0xB8);
+        if (!Status[IsAccepted])
+        {
+            NextCode_Clear();
+            NextCode_Add(0x00);
+            NextCode_Add(0xB2);
+            NextCode_Add(0xB5);
+            NextCode_Add(0xB8);
+        }
 
         //Autorisation of other streams
         Streams[0x00].Searching_Payload=true;
         Streams[0xB2].Searching_Payload=true;
         Streams[0xB5].Searching_Payload=true;
-        Streams[0xB8].Searching_TimeStamp_Start=true;
+        if (Frame_Count==0)
+            Streams[0xB8].Searching_TimeStamp_Start=true;
         Streams[0xB8].Searching_TimeStamp_End=true;
 
         //Temp
-        FrameRate=Mpegv_frame_rate[frame_rate_code];
-        SizeToAnalyse_Begin=bit_rate_value*50*2; //standard delay between TimeStamps is 0.7s, we try 2s to be sure to have at least 2 timestamps (for integrity checking)
-        SizeToAnalyse_End=bit_rate_value*50*2; //standard delay between TimeStamps is 0.7s, we try 2s to be sure
+        if (Mpegv_frame_rate[frame_rate_code])
+            tc=float64_int64s(((float64)1000000000)/Mpegv_frame_rate[frame_rate_code]);
+        if (Frame_Count<Frame_Count_Valid)
+        {
+            FrameRate=Mpegv_frame_rate[frame_rate_code];
+            SizeToAnalyse_Begin=bit_rate_value*50*2; //standard delay between TimeStamps is 0.7s, we try 2s to be sure to have at least 2 timestamps (for integrity checking)
+            SizeToAnalyse_End=bit_rate_value*50*2; //standard delay between TimeStamps is 0.7s, we try 2s to be sure
+        }
+
+        #if MEDIAINFO_MACROBLOCKS
+            if (Macroblocks_Parse)
+                block_count=6; //chroma_format default to 4:2:0
+        #endif //MEDIAINFO_MACROBLOCKS
 
         //Setting as OK
         sequence_header_IsParsed=true;
+        if (Frame_Count==0 && FrameInfo.DTS==(int64u)-1)
+            FrameInfo.DTS=0; //No DTS in container
+
+        #if MEDIAINFO_ADVANCED || MEDIAINFO_EVENTS
+            //
+            Has_sequence_header=true;
+        #endif // MEDIAINFO_ADVANCED || MEDIAINFO_EVENTS
     FILLING_END();
 }
 
@@ -1673,31 +3614,31 @@
     //Parsing
     int8u extension_start_code_identifier;
     BS_Begin();
-    Get_S1 ( 4, extension_start_code_identifier,                "extension_start_code_identifier"); Param_Info(Mpegv_extension_start_code_identifier[extension_start_code_identifier]);
-    Element_Info(Mpegv_extension_start_code_identifier[extension_start_code_identifier]);
+    Get_S1 ( 4, extension_start_code_identifier,                "extension_start_code_identifier"); Param_Info1(Mpegv_extension_start_code_identifier[extension_start_code_identifier]);
+    Element_Info1(Mpegv_extension_start_code_identifier[extension_start_code_identifier]);
 
-         switch (extension_start_code_identifier)
+    switch (extension_start_code_identifier)
     {
-        case 1 :{ //Sequence
+        case  1 :{ //Sequence
                     //Parsing
                     Peek_SB(profile_and_level_indication_escape);
                     if (profile_and_level_indication_escape)
                     {
-                        Get_S1 ( 8, profile_and_level_indication, "profile_and_level_indication"); Param_Info(Mpegv_profile_and_level_indication(profile_and_level_indication));
+                        Get_S1 ( 8, profile_and_level_indication, "profile_and_level_indication"); Param_Info1(Mpegv_profile_and_level_indication(profile_and_level_indication));
                     }
                     else
                     {
                         Skip_SB(                               "profile_and_level_indication_escape");
-                        Get_S1 ( 3, profile_and_level_indication_profile, "profile_and_level_indication_profile"); Param_Info(Mpegv_profile_and_level_indication_profile[profile_and_level_indication_profile]);
-                        Get_S1 ( 4, profile_and_level_indication_level, "profile_and_level_indication_level"); Param_Info(Mpegv_profile_and_level_indication_level[profile_and_level_indication_level]);
+                        Get_S1 ( 3, profile_and_level_indication_profile, "profile_and_level_indication_profile"); Param_Info1(Mpegv_profile_and_level_indication_profile[profile_and_level_indication_profile]);
+                        Get_S1 ( 4, profile_and_level_indication_level, "profile_and_level_indication_level"); Param_Info1(Mpegv_profile_and_level_indication_level[profile_and_level_indication_level]);
                     }
                     Get_SB (    progressive_sequence,           "progressive_sequence");
-                    Get_S1 ( 2, chroma_format,                  "chroma_format"); Param_Info(Mpegv_Colorimetry_format[chroma_format]);
+                    Get_S1 ( 2, chroma_format,                  "chroma_format"); Param_Info1(Mpegv_Colorimetry_format[chroma_format]);
                     Get_S1 ( 2, horizontal_size_extension,      "horizontal_size_extension");
                     Get_S1 ( 2, vertical_size_extension,        "vertical_size_extension");
                     Get_S2 (12, bit_rate_extension,             "bit_rate_extension");
                     Mark_1 ();
-                    Get_S1 ( 8, vbv_buffer_size_extension,      "vbv_buffer_size_extension"); Param_Info(2*1024*((((int32u)vbv_buffer_size_extension)<<10)+vbv_buffer_size_value), " bytes");
+                    Get_S1 ( 8, vbv_buffer_size_extension,      "vbv_buffer_size_extension"); Param_Info2(2*1024*((((int32u)vbv_buffer_size_extension)<<10)+vbv_buffer_size_value), " bytes");
                     Skip_SB(                                    "low_delay");
                     Get_S1 ( 2, frame_rate_extension_n,         "frame_rate_extension_n");
                     Get_S1 ( 5, frame_rate_extension_d,         "frame_rate_extension_d");
@@ -1706,16 +3647,25 @@
                     FILLING_BEGIN();
                         if (frame_rate_extension_d)
                             FrameRate=(float)frame_rate_extension_n/frame_rate_extension_d;
+                        #if MEDIAINFO_MACROBLOCKS
+                            if (Macroblocks_Parse)
+                                block_count=Mpegv_block_count[chroma_format];
+                        #endif //MEDIAINFO_MACROBLOCKS
+
+                        #if MEDIAINFO_ADVANCED || MEDIAINFO_EVENTS
+                            //
+                            Has_sequence_extension=true;
+                        #endif // MEDIAINFO_ADVANCED || MEDIAINFO_EVENTS
                     FILLING_END();
                 }
                 break;
-        case 2 :{ //Sequence Display
+        case  2 :{ //Sequence Display
                     //Parsing
-                    Get_S1 ( 3, video_format,                   "video_format"); Param_Info(Mpegv_video_format[video_format]);
-                    TEST_SB_SKIP(                               "load_intra_quantiser_matrix");
-                        Skip_S1( 8,                             "colour_primaries");
-                        Skip_S1( 8,                             "transfer_characteristics");
-                        Skip_S1( 8,                             "matrix_coefficients");
+                    Get_S1 ( 3, video_format,                   "video_format"); Param_Info1(Mpegv_video_format[video_format]);
+                    TEST_SB_SKIP(                               "colour_description");
+                        Get_S1 (8, colour_primaries,            "colour_primaries"); Param_Info1(Mpegv_colour_primaries(colour_primaries));
+                        Get_S1 (8, transfer_characteristics,    "transfer_characteristics"); Param_Info1(Mpegv_transfer_characteristics(transfer_characteristics));
+                        Get_S1 (8, matrix_coefficients,         "matrix_coefficients"); Param_Info1(Mpegv_matrix_coefficients(matrix_coefficients));
                     TEST_SB_END();
                     Get_S2 (14, display_horizontal_size,        "display_horizontal_size");
                     Mark_1 ();
@@ -1723,20 +3673,71 @@
                     BS_End();
                 }
                 break;
-        case 8 :{ //Picture Coding
+        case  5 :{ //Sequence Scalable Extension
+                    //Parsing
+                    Skip_S2(10,                                 "lower_layer_temporal_reference");
+                    Mark_1();
+                    Skip_S2(15,                                 "lower_layer_horizontal_offset");
+                    Mark_1();
+                    Skip_S2(15,                                 "lower_layer_vertical_offset");
+                    #if MEDIAINFO_MACROBLOCKS
+                    if (Macroblocks_Parse)
+                    {
+                        sequence_scalable_extension_Present=true;
+                        Get_S1 ( 2, spatial_temporal_weight_code_table_index, "spatial_temporal_weight_code_table_index");
+                    }
+                    else
+                    #endif //MEDIAINFO_MACROBLOCKS
+                        Skip_S1( 2,                             "spatial_temporal_weight_code_table_index");
+                    Skip_SB(                                    "lower_layer_progressive_frame");
+                    Skip_SB(                                    "lower_layer_deinterlaced_field_select");
+                    BS_End();
+                }
+                break;
+        case  8 :{ //Picture Coding
                     //Parsing
-                    bool progressive_frame;
-                    Skip_S1( 4,                                 "f_code_forward_horizontal");
-                    Skip_S1( 4,                                 "f_code_forward_vertical");
-                    Skip_S1( 4,                                 "f_code_backward_horizontal");
-                    Skip_S1( 4,                                 "f_code_backward_vertical");
-                    Skip_S1( 2,                                 "intra_dc_precision");
-                    Get_S1 ( 2, picture_structure,              "picture_structure"); Param_Info(Mpegv_picture_structure[picture_structure]);
+                    #if MEDIAINFO_MACROBLOCKS
+                    if (Macroblocks_Parse)
+                    {
+                        Get_S1 ( 4, f_code[0][0],               "f_code_forward_horizontal");
+                        Get_S1 ( 4, f_code[0][1],               "f_code_forward_vertical");
+                        Get_S1 ( 4, f_code[1][0],               "f_code_backward_horizontal");
+                        Get_S1 ( 4, f_code[1][1],               "f_code_backward_vertical");
+                    }
+                    else
+                    #endif //MEDIAINFO_MACROBLOCKS
+                    {
+                        Skip_S1( 4,                             "f_code_forward_horizontal");
+                        Skip_S1( 4,                             "f_code_forward_vertical");
+                        Skip_S1( 4,                             "f_code_backward_horizontal");
+                        Skip_S1( 4,                             "f_code_backward_vertical");
+                    }
+                    Get_S1 ( 2, intra_dc_precision,             "intra_dc_precision");
+                    Get_S1 ( 2, picture_structure,              "picture_structure"); Param_Info1(Mpegv_picture_structure[picture_structure]);
                     Get_SB (    top_field_first,                "top_field_first");
-                    Skip_SB(                                    "frame_pred_frame_dct");
-                    Skip_SB(                                    "concealment_motion_vectors");
+                    #if MEDIAINFO_MACROBLOCKS
+                    if (Macroblocks_Parse)
+                    {
+                        Get_SB (    frame_pred_frame_dct,       "frame_pred_frame_dct");
+                        Get_SB (    concealment_motion_vectors, "concealment_motion_vectors");
+                    }
+                    else
+                    #endif //MEDIAINFO_MACROBLOCKS
+                    {
+                        Skip_SB(                                "frame_pred_frame_dct");
+                        Skip_SB(                                "concealment_motion_vectors");
+                    }
                     Skip_SB(                                    "q_scale_type");
-                    Skip_SB(                                    "intra_vlc_format");
+                    #if MEDIAINFO_MACROBLOCKS
+                    if (Macroblocks_Parse)
+                    {
+                        Get_SB (    intra_vlc_format,           "intra_vlc_format");
+                    }
+                    else
+                    #endif //MEDIAINFO_MACROBLOCKS
+                    {
+                        Skip_SB(                                "intra_vlc_format");
+                    }
                     Skip_SB(                                    "alternate_scan");
                     Get_SB (    repeat_first_field,             "repeat_first_field");
                     Skip_SB(                                    "chroma_420_type");
@@ -1749,123 +3750,78 @@
                         Skip_S1( 8,                             "sub_carrier_phase");
                     TEST_SB_END();
                     BS_End();
+                }
 
-                    FILLING_BEGIN();
-                        if (progressive_frame==false)
+                FILLING_BEGIN();
+                    if (progressive_frame==false)
+                    {
+                        if (picture_structure==3)           //Frame
                         {
-                            if (picture_structure==3)           //Frame
+                            if (top_field_first)
+                                Interlaced_Top++;
+                            else
+                                Interlaced_Bottom++;
+                            FirstFieldFound=false;
+                            if (TemporalReference_Offset+temporal_reference>=TemporalReference.size())
+                                TemporalReference.resize(TemporalReference_Offset+temporal_reference+1);
+                            if (TemporalReference[TemporalReference_Offset+temporal_reference]==NULL)
+                                TemporalReference[TemporalReference_Offset+temporal_reference]=new temporalreference;
+                            TemporalReference[TemporalReference_Offset+temporal_reference]->picture_coding_type=picture_coding_type;
+                            TemporalReference[TemporalReference_Offset+temporal_reference]->progressive_frame=progressive_frame;
+                            TemporalReference[TemporalReference_Offset+temporal_reference]->picture_structure=picture_structure;
+                            TemporalReference[TemporalReference_Offset+temporal_reference]->top_field_first=top_field_first;
+                            TemporalReference[TemporalReference_Offset+temporal_reference]->repeat_first_field=repeat_first_field;
+                            TemporalReference[TemporalReference_Offset+temporal_reference]->HasPictureCoding=true;
+                        }
+                        else                                //Field
+                        {
+                            if (!FirstFieldFound)
                             {
-                                if (top_field_first)
+                                if (picture_structure==1)   //-Top
                                     Interlaced_Top++;
-                                else
+                                else                        //-Bottom
                                     Interlaced_Bottom++;
-                                FirstFieldFound=false;
-                                if (TemporalReference_Offset+temporal_reference>=TemporalReference.size())
-                                    TemporalReference.resize(TemporalReference_Offset+temporal_reference+1);
-                                TemporalReference[TemporalReference_Offset+temporal_reference]->picture_coding_type=picture_coding_type;
-                                TemporalReference[TemporalReference_Offset+temporal_reference]->progressive_frame=progressive_frame;
-                                TemporalReference[TemporalReference_Offset+temporal_reference]->picture_structure=picture_structure;
-                                TemporalReference[TemporalReference_Offset+temporal_reference]->top_field_first=top_field_first;
-                                TemporalReference[TemporalReference_Offset+temporal_reference]->repeat_first_field=repeat_first_field;
-                                TemporalReference[TemporalReference_Offset+temporal_reference]->HasPictureCoding=true;
-                            }
-                            else                                //Field
-                            {
-                                if (!FirstFieldFound)
-                                {
-                                    if (picture_structure==1)   //-Top
-                                        Interlaced_Top++;
-                                    else                        //-Bottom
-                                        Interlaced_Bottom++;
-                                }
-                                FirstFieldFound=!FirstFieldFound;
                             }
+                            FirstFieldFound=!FirstFieldFound;
                         }
+                    }
+                    else
+                    {
+                        progressive_frame_Count++;
+                        if (top_field_first)
+                            Interlaced_Top++;
                         else
+                            Interlaced_Bottom++;
+                        if (picture_structure==3)           //Frame
                         {
-                            progressive_frame_Count++;
-                            if (top_field_first)
-                                Interlaced_Top++;
-                            else
-                                Interlaced_Bottom++;
-                            if (picture_structure==3)           //Frame
-                            {
-                                if (TemporalReference_Offset+temporal_reference>=TemporalReference.size())
-                                    TemporalReference.resize(TemporalReference_Offset+temporal_reference+1);
-                                TemporalReference[TemporalReference_Offset+temporal_reference]->picture_coding_type=picture_coding_type;
-                                TemporalReference[TemporalReference_Offset+temporal_reference]->progressive_frame=progressive_frame;
-                                TemporalReference[TemporalReference_Offset+temporal_reference]->picture_structure=picture_structure;
-                                TemporalReference[TemporalReference_Offset+temporal_reference]->top_field_first=top_field_first;
-                                TemporalReference[TemporalReference_Offset+temporal_reference]->repeat_first_field=repeat_first_field;
-                                TemporalReference[TemporalReference_Offset+temporal_reference]->HasPictureCoding=true;
-                            }
+                            if (TemporalReference_Offset+temporal_reference>=TemporalReference.size())
+                                TemporalReference.resize(TemporalReference_Offset+temporal_reference+1);
+                            if (TemporalReference[TemporalReference_Offset+temporal_reference]==NULL)
+                                TemporalReference[TemporalReference_Offset+temporal_reference]=new temporalreference;
+                            TemporalReference[TemporalReference_Offset+temporal_reference]->picture_coding_type=picture_coding_type;
+                            TemporalReference[TemporalReference_Offset+temporal_reference]->progressive_frame=progressive_frame;
+                            TemporalReference[TemporalReference_Offset+temporal_reference]->picture_structure=picture_structure;
+                            TemporalReference[TemporalReference_Offset+temporal_reference]->top_field_first=top_field_first;
+                            TemporalReference[TemporalReference_Offset+temporal_reference]->repeat_first_field=repeat_first_field;
+                            TemporalReference[TemporalReference_Offset+temporal_reference]->HasPictureCoding=true;
                         }
-
-                        if (picture_structure==2) //Bottom, and we want to add a frame only one time if 2 fields
-                            Time_End_Frames--; //One frame
-
-                        //CDP
-                        #if defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_CDP_YES)
-                            if (Cdp_Data && !Cdp_Data->empty())
-                            {
-                                Cdp_IsPresent=true;
-
-                                Element_Begin("CDP");
-
-                                //Parsing
-                                #if MEDIAINFO_DEMUX
-                                    Element_Code=0x000000B500000000LL;
-                                #endif //MEDIAINFO_DEMUX
-                                if (Cdp_Parser==NULL)
-                                {
-                                    Cdp_Parser=new File_Cdp;
-                                    Open_Buffer_Init(Cdp_Parser);
-                                }
-                                Demux((*Cdp_Data)[0]->Data, (*Cdp_Data)[0]->Size, ContentType_MainStream);
-                                if (!Cdp_Parser->Status[IsFinished])
-                                {
-                                    if (Cdp_Parser->PTS_DTS_Needed)
-                                        Cdp_Parser->DTS=DTS;
-                                    ((File_Cdp*)Cdp_Parser)->AspectRatio=MPEG_Version==1?Mpegv_aspect_ratio1[aspect_ratio_information]:Mpegv_aspect_ratio2[aspect_ratio_information];
-                                    Open_Buffer_Continue(Cdp_Parser, (*Cdp_Data)[0]->Data, (*Cdp_Data)[0]->Size);
-                                }
-
-                                //Removing data from stack
-                                delete (*Cdp_Data)[0]; //Cdp_Data[0]=NULL;
-                                Cdp_Data->erase(Cdp_Data->begin());
-
-                                Element_End();
-                            }
-                        #endif //defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_CDP_YES)
-
-                        //Active Format Description & Bar Data
-                        #if defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_AFDBARDATA_YES)
-                            if (AfdBarData_Data && !AfdBarData_Data->empty())
-                            {
-                                Element_Begin("Active Format Description & Bar Data");
-
-                                //Parsing
-                                if (AfdBarData_Parser==NULL)
-                                {
-                                    AfdBarData_Parser=new File_AfdBarData;
-                                    Open_Buffer_Init(AfdBarData_Parser);
-                                    ((File_AfdBarData*)AfdBarData_Parser)->Format=File_AfdBarData::Format_S2016_3;
-                                }
-                                if (AfdBarData_Parser->PTS_DTS_Needed)
-                                    AfdBarData_Parser->DTS=DTS;
-                                if (!AfdBarData_Parser->Status[IsFinished])
-                                    Open_Buffer_Continue(AfdBarData_Parser, (*AfdBarData_Data)[0]->Data, (*AfdBarData_Data)[0]->Size);
-
-                                //Removing data from stack
-                                delete (*AfdBarData_Data)[0]; //AfdBarData_Data[0]=NULL;
-                                AfdBarData_Data->erase(AfdBarData_Data->begin());
-
-                                Element_End();
-                            }
-                        #endif //defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_AFDBARDATA_YES)
                     FILLING_END();
                 }
                 break;
+        case  9 :{ //Picture Spatial Scalable Extension
+                    //Parsing
+                    Skip_S1(4,                                  "data");
+                    BS_End();
+                    Skip_XX(Element_Size-Element_Offset,        "data");
+                }
+                break;
+        case 10 :{ //Picture Temporal Scalable Extension
+                    //Parsing
+                    Skip_S1(4,                                  "data");
+                    BS_End();
+                    Skip_XX(Element_Size-Element_Offset,        "data");
+                }
+                break;
         default:{
                     //Parsing
                     Skip_S1(4,                                  "data");
@@ -1893,72 +3849,101 @@
 // Packet "B8"
 void File_Mpegv::group_start()
 {
-    if (!NextCode_Test())
-        return;
+    if (!Status[IsAccepted])
+    {
+        if (!NextCode_Test())
+            return;
+    }
     Element_Name("group_start");
 
     //Reading
     int8u Hours, Minutes, Seconds, Frames;
     bool drop_frame_flag, closed_gop, broken_link;
-    BS_Begin();
-    Get_SB (    drop_frame_flag,                                "time_code_drop_frame_flag");
-    Get_S1 ( 5, Hours,                                          "time_code_time_code_hours");
-    Get_S1 ( 6, Minutes,                                        "time_code_time_code_minutes");
-    Mark_1();
-    Get_S1 ( 6, Seconds,                                        "time_code_time_code_seconds");
-    Get_S1 ( 6, Frames,                                         "time_code_time_code_pictures");
-    Get_SB (    closed_gop,                                     "closed_gop");
-    Get_SB (    broken_link,                                    "broken_link");
-    BS_End();
-    Ztring Time;
-    Time+=Ztring::ToZtring(Hours);
-    Time+=_T(':');
-    Time+=Ztring::ToZtring(Minutes);
-    Time+=_T(':');
-    Time+=Ztring::ToZtring(Seconds);
-    if (FrameRate!=0)
+    #if MEDIAINFO_TRACE
+    if (Trace_Activated)
     {
-        Time+=_T('.');
-        Time+=Ztring::ToZtring(Frames*1000/FrameRate, 0);
+        //Parsing
+        BS_Begin();
+        Get_SB (    drop_frame_flag,                            "time_code_drop_frame_flag");
+        Get_S1 ( 5, Hours,                                      "time_code_time_code_hours");
+        Get_S1 ( 6, Minutes,                                    "time_code_time_code_minutes");
+        Mark_1();
+        Get_S1 ( 6, Seconds,                                    "time_code_time_code_seconds");
+        Get_S1 ( 6, Frames,                                     "time_code_time_code_pictures");
+        Get_SB (    closed_gop,                                 "closed_gop");
+        Get_SB (    broken_link,                                "broken_link");
+        BS_End();
+        Ztring Time;
+        Time+=Ztring::ToZtring(Hours);
+        Time+=__T(':');
+        Time+=Ztring::ToZtring(Minutes);
+        Time+=__T(':');
+        Time+=Ztring::ToZtring(Seconds);
+        if (FrameRate!=0)
+        {
+            Time+=__T('.');
+            Time+=Ztring::ToZtring(Frames*1000/FrameRate, 0);
+        }
+        Element_Info1(Time);
     }
-    Element_Info(Time);
+    else
+    {
+    #endif //MEDIAINFO_TRACE
+        //Parsing
+        size_t Buffer_Pos=Buffer_Offset+(size_t)Element_Offset;
+        drop_frame_flag                     = (Buffer[Buffer_Pos  ]&0x80)?true:false;
+        Hours                               =((Buffer[Buffer_Pos  ]&0x7C)>> 2);
+        Minutes                             =((Buffer[Buffer_Pos  ]&0x03)<< 4)
+                                           | ((Buffer[Buffer_Pos+1]     )>> 4);
+        Seconds                             =((Buffer[Buffer_Pos+1]&0x07)<< 3)
+                                           | ((Buffer[Buffer_Pos+2]     )>> 5);
+        Frames                              =((Buffer[Buffer_Pos+2]&0x1F)<< 1)
+                                           | ((Buffer[Buffer_Pos+3]     )>> 7);
+        closed_gop                          = (Buffer[Buffer_Pos+3]&0x40)?true:false;
+        broken_link                         = (Buffer[Buffer_Pos+3]&0x20)?true:false;
+        Element_Offset+=4;
+    #if MEDIAINFO_TRACE
+    }
+    #endif //MEDIAINFO_TRACE
 
     FILLING_BEGIN();
         //NextCode
-        NextCode_Clear();
-        NextCode_Add(0x00);
-        NextCode_Add(0xB2);
-        NextCode_Add(0xB5);
-        NextCode_Add(0xB8);
+        if (!Status[IsAccepted])
+        {
+            NextCode_Clear();
+            NextCode_Add(0x00);
+            NextCode_Add(0xB2);
+            NextCode_Add(0xB5);
+            NextCode_Add(0xB8);
+        }
 
         if (TimeCodeIsNotTrustable)
             return;
 
-        //Calculating
-        if (Time_Begin_Seconds==Error)
+        if (Time_Current_Seconds==0 && Time_Current_Frames==0 && Hours==0 && Minutes==0 && Seconds==0 && Frames==0)
         {
-            Time_Begin_Seconds=60*60*Hours+60*Minutes+Seconds;
-            Time_Begin_Frames =Frames;
-        }
-        if (Time_Begin_Seconds==Error)
-        {
-            //Verifying if time_code is trustable
-            if ((size_t)60*60*Hours+60*Minutes+Seconds==Time_Begin_Seconds && Frames==Time_Begin_Frames)
-                Time_End_NeedComplete=true; //we can't trust time_code
-        }
-        if (!Time_End_NeedComplete)
-        {
-            Time_End_Seconds=60*60*Hours+60*Minutes+Seconds;
-            Time_End_Frames =Frames;
+            //Time code is always 0
+            TimeCodeIsNotTrustable=true;
+            Time_End_Seconds=(size_t)-1;
+            return;
         }
+
+        //Calculating
+        Time_Current_Seconds=60*60*Hours+60*Minutes+Seconds;
+        Time_Current_Frames =Frames;
+
         if (!group_start_IsParsed)
-        {
             group_start_IsParsed=true;
+        if (!group_start_FirstPass)
+        {
+            group_start_FirstPass=true;
             group_start_drop_frame_flag=drop_frame_flag;
             group_start_closed_gop=closed_gop;
             group_start_broken_link=broken_link;
         }
 
+        RefFramesCount=0;
+
         //Autorisation of other streams
         if (Searching_TimeStamp_Start_DoneOneTime)
             Streams[0xB8].Searching_TimeStamp_Start=false; //group_start
@@ -1971,4 +3956,3 @@
 } //NameSpace
 
 #endif //MEDIAINFO_MPEGV_YES
-

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Video/File_Mpegv.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_Mpegv.h Changed

@@ -1,17 +1,17 @@
 // File_Mpegv - Info for MPEG Video files
-// Copyright (C) 2004-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2004-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -28,9 +28,9 @@
 
 //---------------------------------------------------------------------------
 #include "MediaInfo/File__Analyze.h"
-#if defined(MEDIAINFO_GXF_YES) && (defined(MEDIAINFO_CDP_YES) || defined(MEDIAINFO_AFDBARDATA_YES))
-    #include "MediaInfo/Multiple/File_Riff.h"
-#endif //MEDIAINFO_CDP_YES
+#if defined(MEDIAINFO_ANCILLARY_YES)
+    #include <MediaInfo/Multiple/File_Ancillary.h>
+#endif //defined(MEDIAINFO_ANCILLARY_YES)
 //---------------------------------------------------------------------------
 
 namespace MediaInfoLib
@@ -45,15 +45,15 @@
 public :
     //In
     int8u  MPEG_Version;
-    size_t Frame_Count_Valid;
+    int64u Frame_Count_Valid;
     bool   FrameIsAlwaysComplete;
     bool   TimeCodeIsNotTrustable;
-    #if defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_CDP_YES)
-        std::vector<File_Riff::buffered_data*>* Cdp_Data;
-    #endif //defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_CDP_YES)
-    #if defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_AFDBARDATA_YES)
-        std::vector<File_Riff::buffered_data*>* AfdBarData_Data;
-    #endif //defined(MEDIAINFO_GXF_YES) && defined(MEDIAINFO_AFDBARDATA_YES)
+    #if defined(MEDIAINFO_ANCILLARY_YES)
+        File_Ancillary** Ancillary;
+    #endif //defined(MEDIAINFO_ANCILLARY_YES)
+    #if MEDIAINFO_ADVANCED
+        bool    InitDataNotRepeated_Optional;
+    #endif // MEDIAINFO_ADVANCED
 
     //Constructor/Destructor
     File_Mpegv();
@@ -61,18 +61,27 @@
 
 private :
     //Streams management
+    void Streams_Accept();
+    void Streams_Update();
     void Streams_Fill();
     void Streams_Finish();
 
     //Buffer - File header
-    void Read_Buffer_Unsynched();
     bool FileHeader_Begin() {return FileHeader_Begin_0x000001();}
 
     //Buffer - Synchro
     bool Synchronize() {return Synchronize_0x000001();}
     bool Synched_Test();
     void Synched_Init();
-    
+
+    //Buffer - Demux
+    #if MEDIAINFO_DEMUX
+    bool Demux_UnpacketizeContainer_Test();
+    #endif //MEDIAINFO_DEMUX
+
+    //Buffer - Global
+    void Read_Buffer_Unsynched();
+
     //Buffer - Per element
     void Header_Parse();
     bool Header_Parser_QuickSearch();
@@ -85,6 +94,13 @@
     //Elements
     void picture_start();
     void slice_start();
+    #if MEDIAINFO_MACROBLOCKS
+    void slice_start_macroblock();
+    void slice_start_macroblock_motion_vectors(bool s);
+    void slice_start_macroblock_motion_vectors_motion_vector(bool r, bool s);
+    void slice_start_macroblock_coded_block_pattern();
+    void slice_start_macroblock_block(int8u i);
+    #endif //MEDIAINFO_MACROBLOCKS
     void user_data_start();
     void user_data_start_3();
     void user_data_start_CC();
@@ -137,7 +153,8 @@
             buffer_data* GA94_03;
         #endif //MEDIAINFO_DTVCCTRANSPORT_YES
         #if defined(MEDIAINFO_SCTE20_YES)
-            buffer_data* Scte;
+            std::vector<buffer_data*> Scte;
+            std::vector<bool> Scte_Parsed;
         #endif //MEDIAINFO_SCTE20_YES
 
         int8u  picture_coding_type;
@@ -155,9 +172,6 @@
             #if defined(MEDIAINFO_DTVCCTRANSPORT_YES)
                 GA94_03=NULL;
             #endif //MEDIAINFO_DTVCCTRANSPORT_YES
-            #if defined(MEDIAINFO_SCTE20_YES)
-                Scte=NULL;
-            #endif //MEDIAINFO_SCTE20_YES
             picture_coding_type=(int8u)-1;
             picture_structure=(int8u)-1;
             IsValid=false;
@@ -170,12 +184,31 @@
                 delete GA94_03; //GA94_03=NULL;
             #endif //MEDIAINFO_DTVCCTRANSPORT_YES
             #if defined(MEDIAINFO_SCTE20_YES)
-                delete Scte; //Scte=NULL;
+                for (size_t Pos=0; Pos<Scte.size(); Pos++)
+                    delete Scte[Pos]; //Scte[Pos]=NULL;
             #endif //MEDIAINFO_SCTE20_YES
         }
     };
     std::vector<temporalreference*> TemporalReference; //per temporal_reference
     size_t                          TemporalReference_Offset;
+    struct text_position
+    {
+        File__Analyze**  Parser;
+        size_t          StreamPos;
+
+        text_position()
+        {
+            Parser=NULL;
+            StreamPos=(size_t)-1;
+        }
+
+        text_position(File__Analyze* &Parser_)
+        {
+            Parser=&Parser_;
+            StreamPos=0;
+        }
+    };
+    std::vector<text_position> Text_Positions;
     #if defined(MEDIAINFO_DTVCCTRANSPORT_YES)
         File__Analyze*              GA94_03_Parser;
         size_t                      GA94_03_TemporalReference_Offset;
@@ -206,15 +239,16 @@
     Ztring Library_Version;
     Ztring Matrix_intra;
     Ztring Matrix_nonintra;
-    size_t Frame_Count;
     size_t BVOP_Count;
     size_t progressive_frame_Count;
     size_t Interlaced_Top;
     size_t Interlaced_Bottom;
+    size_t Time_Current_Seconds;
     size_t Time_Begin_Seconds;
     size_t Time_End_Seconds;
     int64u SizeToAnalyse_Begin; //Total size of a chunk to analyse, it may be changed by the parser
     int64u SizeToAnalyse_End; //Total size of a chunk to analyse, it may be changed by the parser
+    int64u Frame_Count_LastIFrame;
     int32u bit_rate_value;
     float32 FrameRate;
     int16u horizontal_size_value;
@@ -226,6 +260,7 @@
     int16u display_vertical_size;
     int16u vbv_delay;
     int16u vbv_buffer_size_value;
+    int8u  Time_Current_Frames;
     int8u  Time_Begin_Frames;
     int8u  Time_End_Frames;
     int8u  picture_coding_type;
@@ -240,17 +275,22 @@
     int8u  frame_rate_extension_n;
     int8u  frame_rate_extension_d;
     int8u  video_format;
+    int8u  colour_primaries;
+    int8u  transfer_characteristics;
+    int8u  matrix_coefficients;
     int8u  picture_structure;
     int8u  vbv_buffer_size_extension;
-    bool   Time_End_NeedComplete;
+    int8u  intra_dc_precision;
     bool   load_intra_quantiser_matrix;
     bool   load_non_intra_quantiser_matrix;
     bool   progressive_sequence;
+    bool   progressive_frame;
     bool   top_field_first;
     bool   repeat_first_field;
     bool   FirstFieldFound;
     bool   sequence_header_IsParsed;
     bool   group_start_IsParsed;
+    bool   group_start_FirstPass;
     bool   group_start_drop_frame_flag;
     bool   group_start_closed_gop;
     bool   group_start_broken_link;
@@ -258,9 +298,64 @@
     bool   Parsing_End_ForDTS;
     bool   bit_rate_value_IsValid;
     bool   profile_and_level_indication_escape;
+    int8u  RefFramesCount;
+    int8u  BVOPsSinceLastRefFrames;
+    int16u temporal_reference_LastIFrame;
+    int64u PTS_LastIFrame;
+    int64u tc;
+    bool    IFrame_IsParsed;
+    std::map<std::string, int64u>   picture_coding_types; //per picture_coding_type value ("IPBB..."), updated at each I-frame
+    std::string                     picture_coding_types_Current; //Current picture_coding_type value ("IPBB..."), updated at each frame
+
+    #if MEDIAINFO_MACROBLOCKS
+        int64u  macroblock_x;
+        int64u  macroblock_x_PerFrame;
+        int64u  macroblock_y_PerFrame;
+        int16u  cbp;
+        int8u   frame_motion_type;
+        int8u   field_motion_type;
+        int8u   spatial_temporal_weight_code;
+        int8u   block_count; //Computed from chroma_format
+        int8u   macroblock_type; //Temp
+        int8u   spatial_temporal_weight_code_table_index;
+        int8u   f_code[2][2];
+        bool    Macroblocks_Parse;
+        bool    sequence_scalable_extension_Present;
+        bool    frame_pred_frame_dct;
+        bool    concealment_motion_vectors;
+        bool    intra_vlc_format;
+        vlc_fast macroblock_address_increment_Vlc;
+        vlc_fast dct_dc_size_luminance;
+        vlc_fast dct_dc_size_chrominance;
+        vlc_fast dct_coefficients_0;
+        vlc_fast dct_coefficients_1;
+        vlc_fast macroblock_type_I;
+        vlc_fast macroblock_type_P;
+        vlc_fast macroblock_type_B;
+        vlc_fast motion_code;
+        vlc_fast dmvector;
+        vlc_fast coded_block_pattern;
+    #endif //MEDIAINFO_MACROBLOCKS
+
+    #if MEDIAINFO_IBI
+        bool    Ibi_SliceParsed;
+    #endif //MEDIAINFO_IBI
+
+    #if MEDIAINFO_ADVANCED
+        int64u  InitDataNotRepeated;
+        int64u  Config_InitDataNotRepeated_Occurences;
+        bool    Config_InitDataNotRepeated_GiveUp;
+        int64u  Config_VariableGopDetection_Occurences;
+        bool    Config_VariableGopDetection_GiveUp;
+    #endif // MEDIAINFO_ADVANCED
+
+    #if MEDIAINFO_ADVANCED || MEDIAINFO_EVENTS
+        size_t  Slices_Count;
+        bool    Has_sequence_header;
+        bool    Has_sequence_extension;
+    #endif // MEDIAINFO_ADVANCED || MEDIAINFO_EVENTS
 };
 
 } //NameSpace
 
 #endif
-

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_ProRes.cpp Added

@@ -0,0 +1,200 @@
+// File_Lagarith - Info for ProRes files
+// Copyright (C) 2012-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_PRORES_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Video/File_ProRes.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Infos
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+const char* Mpegv_colour_primaries(int8u colour_primaries);
+const char* Mpegv_transfer_characteristics(int8u transfer_characteristics);
+const char* Mpegv_matrix_coefficients(int8u matrix_coefficients);
+
+//---------------------------------------------------------------------------
+const char* ProRes_chrominance_factor(int8u chrominance_factor)
+{
+    switch (chrominance_factor)
+    {
+        case 0x02 : return "4:2:2";
+        case 0x03 : return "4:4:4";
+        default   : return "";
+    }
+}
+
+//---------------------------------------------------------------------------
+const char* ProRes_frame_type_ScanType(int8u frame_type)
+{
+    switch (frame_type)
+    {
+        case 0x00 : return "Progressive";
+        case 0x01 :
+        case 0x02 : return "Interlaced";
+        default   : return "";
+    }
+}
+
+//---------------------------------------------------------------------------
+const char* ProRes_frame_type_ScanOrder(int8u frame_type)
+{
+    switch (frame_type)
+    {
+        case 0x01 : return "TFF";
+        case 0x02 : return "BFF";
+        default   : return "";
+    }
+}
+
+//---------------------------------------------------------------------------
+Ztring ProRes_creatorID(int32u creatorID)
+{
+    switch (creatorID)
+    {
+        case 0x61706C30 : return __T("Apple"); //apl0
+        case 0x61727269 : return  __T("Arnold & Richter Cine Technik"); //arri
+        case 0x616A6130 : return __T("AJA Kona Hardware"); //aja0
+        default         : return Ztring().From_CC4(creatorID);
+    }
+}
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File_ProRes::File_ProRes()
+:File__Analyze()
+{
+    //Configuration
+    ParserName=__T("ProRes");
+}
+
+//***************************************************************************
+// Streams management
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_ProRes::Streams_Fill()
+{
+    Stream_Prepare(Stream_Video);
+    Fill(Stream_Video, 0, Video_Format, "ProRes");
+}
+
+//***************************************************************************
+// Buffer - Global
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_ProRes::Read_Buffer_Continue()
+{
+    //Parsing
+    int32u  Name, creatorID;
+    int16u  hdrSize, version, frameWidth, frameHeight;
+    int8u   chrominance_factor, frame_type, primaries, transf_func, colorMatrix;
+    bool    IsOk=true, luma, chroma;
+    Element_Begin1("Header");
+        Skip_B4(                                                "Size");
+        Get_C4 (Name,                                           "Name");
+    Element_End();
+    Element_Begin1("Frame header");
+        Get_B2 (hdrSize,                                        "hdrSize");
+        Get_B2 (version,                                        "version");
+        Get_C4 (creatorID,                                      "creatorID");
+        Get_B2 (frameWidth,                                     "frameWidth");
+        Get_B2 (frameHeight,                                    "frameHeight");
+        BS_Begin();
+        Get_S1 (2, chrominance_factor,                          "chrominance factor"); Param_Info1(ProRes_chrominance_factor(chrominance_factor));
+        Skip_S1(2,                                              "reserved");
+        Get_S1 (2, frame_type,                                  "frame type"); Param_Info1(ProRes_frame_type_ScanType(frame_type)); Param_Info1(ProRes_frame_type_ScanOrder(frame_type));
+        Skip_S1(2,                                              "reserved");
+        BS_End();
+        Skip_B1(                                                "reserved");
+        Get_B1 (primaries,                                      "primaries"); Param_Info1(Mpegv_colour_primaries(primaries));
+        Get_B1 (transf_func,                                    "transf_func"); Param_Info1(Mpegv_transfer_characteristics(transf_func));
+        Get_B1 (colorMatrix,                                    "colorMatrix"); Param_Info1(Mpegv_matrix_coefficients(colorMatrix));
+        BS_Begin();
+        Skip_S1(4,                                              "src_pix_fmt");
+        Skip_S1(4,                                              "alpha_info");
+        BS_End();
+        Skip_B1(                                                "reserved");
+        BS_Begin();
+        Skip_S1(6,                                              "reserved");
+        Get_SB (luma,                                           "custom luma quant matrix present");
+        Get_SB (chroma,                                         "custom chroma quant matrix present");
+        BS_End();
+        if (luma)
+            Skip_XX(64,                                         "QMatLuma");
+        if (chroma)
+            Skip_XX(64,                                         "QMatChroma");
+    Element_End();
+    if (Element_Offset!=8+hdrSize)
+        IsOk=false;
+    Skip_XX(Element_Size-Element_Offset,                        "Picture layout");
+
+    FILLING_BEGIN();
+        if (IsOk && Name==0x69637066 && !Status[IsAccepted]) //icpf
+        {
+            Accept();
+            Fill();
+
+            Fill(Stream_Video, 0, Video_Format_Version, __T("Version ")+Ztring::ToZtring(version));
+            Fill(Stream_Video, 0, Video_Width, frameWidth);
+            Fill(Stream_Video, 0, Video_Height, frameHeight);
+            Fill(Stream_Video, 0, Video_Encoded_Library, ProRes_creatorID(creatorID));
+            Fill(Stream_Video, 0, Video_ChromaSubsampling, ProRes_chrominance_factor(chrominance_factor));
+            Fill(Stream_Video, 0, Video_ScanType, ProRes_frame_type_ScanType(frame_type));
+            Fill(Stream_Video, 0, Video_ScanOrder, ProRes_frame_type_ScanOrder(frame_type));
+            Fill(Stream_Video, 0, "colour_primaries", Mpegv_colour_primaries(primaries));
+            Fill(Stream_Video, 0, "transfer_characteristics", Mpegv_transfer_characteristics(transf_func));
+            Fill(Stream_Video, 0, "matrix_coefficients", Mpegv_matrix_coefficients(colorMatrix));
+
+            Finish();
+        }
+    FILLING_END();
+}
+
+//***************************************************************************
+// C++
+//***************************************************************************
+
+} //NameSpace
+
+#endif //MEDIAINFO_PRORES_YES

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_ProRes.h Added

@@ -0,0 +1,56 @@
+// File_Lagarith - Info for ProRes files
+// Copyright (C) 2012-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Information about ProRes files
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_File_ProResH
+#define MediaInfo_File_ProResH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Class File_Lagarith
+//***************************************************************************
+
+class File_ProRes : public File__Analyze
+{
+public :
+    //Constructor/Destructor
+    File_ProRes();
+
+private :
+    //Streams management
+    void Streams_Fill();
+
+    //Buffer - Global
+    void Read_Buffer_Continue ();
+};
+
+} //NameSpace
+
+#endif

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Video/File_Theora.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_Theora.cpp Changed

@@ -1,17 +1,17 @@
 // File_Theora - Info for Theora files
-// Copyright (C) 2008-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -22,14 +22,18 @@
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_THEORA_YES)
 //---------------------------------------------------------------------------

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Video/File_Theora.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_Theora.h Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Video/File_Vc1.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_Vc1.cpp Changed

@@ -1,31 +1,35 @@
 // File_Vc1 - Info for VC-1 files
-// Copyright (C) 2007-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2007-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 //---------------------------------------------------------------------------
-// Compilation conditions
-#include "MediaInfo/Setup.h"
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
 #ifdef __BORLANDC__
     #pragma hdrstop
 #endif
 //---------------------------------------------------------------------------
 
 //---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
 #if defined(MEDIAINFO_VC1_YES)
 //---------------------------------------------------------------------------
 
@@ -41,6 +45,10 @@
     else if (Element_IsOK()) \
     {
 #include <cmath>
+#if MEDIAINFO_EVENTS
+    #include "MediaInfo/MediaInfo_Config_MediaInfo.h"
+    #include "MediaInfo/MediaInfo_Events.h"
+#endif //MEDIAINFO_EVENTS
 using namespace std;
 using namespace ZenLib;
 //---------------------------------------------------------------------------
@@ -56,10 +64,10 @@
 //---------------------------------------------------------------------------
 const char* Vc1_Profile[]=
 {
-    "SP",
-    "MP",
-    "CP",
-    "AP",
+    "Simple",
+    "Main",
+    "Complex",
+    "Advanced",
 };
 
 //---------------------------------------------------------------------------
@@ -152,37 +160,15 @@
 };
 
 //---------------------------------------------------------------------------
-int32u Vc1_ptype(int8u Size, int32u Value)
+const File__Analyze::vlc Vc1_ptype[]=
 {
-    switch (Size)
-    {
-        case 1 :
-                    switch (Value)
-                    {
-                        case 0x0 : return 1;
-                        default  : return (int32u)-1;
-                    }
-        case 2 :
-                    switch (Value)
-                    {
-                        case 0x2 : return 2;
-                        default  : return (int32u)-1;
-                    }
-        case 3 :
-                    switch (Value)
-                    {
-                        case 0x6 : return 0;
-                        default  : return (int32u)-1;
-                    }
-        case 4 :
-                    switch (Value)
-                    {
-                        case 0xE : return 3;
-                        case 0xF : return 4;
-                        default  : return (int32u)-1;
-                    }
-        default: return (int32u)-1;
-    }
+    //                                  macroblock_address_increment
+    {   0   ,   1   ,   0   ,   0   ,   1   },
+    {   2   ,   1   ,   0   ,   0   ,   2   },
+    {   6   ,   1   ,   0   ,   0   ,   0   },
+    {   14  ,   1   ,   0   ,   0   ,   3   },
+    {   15  ,   0   ,   0   ,   0   ,   4   },
+    VLC_END
 };
 
 //---------------------------------------------------------------------------
@@ -236,8 +222,15 @@
 :File__Analyze()
 {
     //Config
+    #if MEDIAINFO_EVENTS
+        ParserIDs[0]=MediaInfo_Parser_Vc1;
+        StreamIDs_Width[0]=0;
+    #endif //MEDIAINFO_EVENTS
     MustSynchronize=true;
     Buffer_TotalBytes_FirstSynched_Max=64*1024;
+    PTS_DTS_Needed=true;
+    IsRawStream=true;
+    Frame_Count_NotParsedIncluded=0;
 
     //In
     Frame_Count_Valid=30;
@@ -247,6 +240,8 @@
 
     //Temp
     EntryPoint_Parsed=false;
+    FrameRate=0;
+    RefFramesCount=0;
 }
 
 //***************************************************************************
@@ -265,25 +260,17 @@
     else
         PixelAspectRatio=1; //Unknown
 
-    //Calculating - FrameRate
-    float32 FrameRate=0;
-    if (framerate_present)
-    {
-        if (framerate_form)
-            FrameRate=((float32)(framerateexp+1))/(float32)32;
-        else if (Vc1_FrameRate_dr(frameratecode_dr))
-            FrameRate=Vc1_FrameRate_enr(frameratecode_enr)/Vc1_FrameRate_dr(frameratecode_dr);
-    }
-
     //Filling
     Stream_Prepare(Stream_Video);
     Fill(Stream_Video, 0, Video_Format, "VC-1");
     Fill(Stream_Video, 0, Video_Codec, From_WMV3?"WMV3":"VC-1"); //For compatibility with the old reaction
-    Fill(Stream_Video, 0, Video_Resolution, 8);
+    Fill(Stream_Video, 0, Video_BitDepth, 8);
 
-    Ztring Profile=Vc1_Profile[profile];
-    if (profile==3)
-        Profile+=_T("@L")+Ztring::ToZtring(level);
+    Ztring Profile;
+    if (profile!=(int8u)-1)
+        Profile=Vc1_Profile[profile];
+    if (profile==3 && level!=(int8u)-1)
+        Profile+=__T("@L")+Ztring::ToZtring(level);
     Fill(Stream_Video, 0, Video_Format_Profile, Profile);
     Fill(Stream_Video, 0, Video_Codec_Profile, Profile);
     Fill(Stream_Video, 0, Video_Colorimetry, Vc1_ColorimetryFormat[colordiff_format]);
@@ -349,9 +336,27 @@
 //---------------------------------------------------------------------------
 void File_Vc1::Streams_Finish()
 {
-    //Purge what is not needed anymore
-    if (!File_Name.empty()) //Only if this is not a buffer, with buffer we can have more data
-        Streams.clear();
+    if (PTS_End>PTS_Begin)
+        Fill(Stream_Video, 0, Video_Duration, float64_int64s(((float64)(PTS_End-PTS_Begin))/1000000));
+
+    #if MEDIAINFO_IBI
+        int64u Numerator=0, Denominator=0;
+        if (framerate_present)
+        {
+            if (framerate_form)
+            {
+                Numerator=framerateexp+1;
+                Denominator=32;
+            }
+            else if (Vc1_FrameRate_dr(frameratecode_dr))
+            {
+                Numerator=(int64u)Vc1_FrameRate_enr(frameratecode_enr);
+                Denominator=(int64u)Vc1_FrameRate_dr(frameratecode_dr);
+            }
+        }
+        if (Numerator)
+            Ibi_Stream_Finish(Numerator, Denominator);
+    #endif //MEDIAINFO_IBI
 }
 
 //***************************************************************************
@@ -394,7 +399,13 @@
     if (Synched && !Header_Parser_QuickSearch())
         return false;
 
-    //We continue
+    #if MEDIAINFO_IBI
+        bool RandomAccess=Buffer[Buffer_Offset+3]==0x0F; //SequenceHeader
+        if (RandomAccess)
+            Ibi_Add();
+    #endif //MEDIAINFO_IBI
+
+        //We continue
     return true;
 }
 
@@ -402,10 +413,11 @@
 void File_Vc1::Synched_Init()
 {
     //Count
-    Frame_Count=0;
     Interlaced_Top=0;
     Interlaced_Bottom=0;
     PictureFormat_Count.resize(4);
+    if (Frame_Count_NotParsedIncluded==(int64u)-1)
+        Frame_Count_NotParsedIncluded=0; //No Frame_Count_NotParsedIncluded in the container
 
     //Temp
     coded_width=0;
@@ -413,8 +425,8 @@
     framerateexp=0;
     frameratecode_enr=0;
     frameratecode_dr=0;
-    profile=0;
-    level=0;
+    profile=(int8u)-1;
+    level=(int8u)-1;
     colordiff_format=0;
     AspectRatio=0;
     AspectRatioX=0;
@@ -431,16 +443,104 @@
     psf=false;
     pulldown=false;
     panscan_flag=false;
+    #if MEDIAINFO_DEMUX
+        Demux_IntermediateItemFound=true;
+    #endif //MEDIAINFO_DEMUX
 
     TemporalReference_Offset=0;
 
+    if (!IsSub)
+        FrameInfo.DTS=0;
+
     //Default stream values
     Streams.resize(0x100);
     Streams[0x0F].Searching_Payload=true;
 }
 
 //***************************************************************************
-// Buffer
+// Buffer - Demux
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_DEMUX
+bool File_Vc1::Demux_UnpacketizeContainer_Test()
+{
+    if ((Demux_IntermediateItemFound && Buffer[Buffer_Offset+3]==0x0D) || Buffer[Buffer_Offset+3]==0x0F)
+    {
+        if (Demux_Offset==0)
+        {
+            Demux_Offset=Buffer_Offset;
+            Demux_IntermediateItemFound=false;
+        }
+        while (Demux_Offset+4<=Buffer_Size)
+        {
+            //Synchronizing
+            while(Demux_Offset+3<=Buffer_Size && (Buffer[Demux_Offset  ]!=0x00
+                                                || Buffer[Demux_Offset+1]!=0x00
+                                                || Buffer[Demux_Offset+2]!=0x01))
+            {
+                Demux_Offset+=2;
+                while(Demux_Offset<Buffer_Size && Buffer[Buffer_Offset]!=0x00)
+                    Demux_Offset+=2;
+                if (Demux_Offset>=Buffer_Size || Buffer[Demux_Offset-1]==0x00)
+                    Demux_Offset--;
+            }
+
+            if (Demux_Offset+4<=Buffer_Size)
+            {
+                if (Demux_IntermediateItemFound)
+                {
+                    bool MustBreak;
+                    switch (Buffer[Demux_Offset+3])
+                    {
+                        case 0x0D :
+                        case 0x0F :
+                                    MustBreak=true; break;
+                        default   : MustBreak=false;
+                    }
+                    if (MustBreak)
+                        break; //while() loop
+                }
+                else
+                {
+                    if (Buffer[Demux_Offset+3]==0x0D)
+                        Demux_IntermediateItemFound=true;
+                }
+            }
+            Demux_Offset++;
+        }
+
+        if (Demux_Offset+4>Buffer_Size && File_Offset+Buffer_Size!=File_Size)
+            return false; //No complete frame
+
+        if (!Status[IsAccepted])
+        {
+            Accept("VC-1");
+            if (Config->Demux_EventWasSent)
+                return false;
+        }
+        Demux_UnpacketizeContainer_Demux(Buffer[Buffer_Offset+3]==0x0F);
+    }
+
+    return true;
+}
+#endif //MEDIAINFO_DEMUX
+
+//***************************************************************************
+// Buffer - Global
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Vc1::Read_Buffer_Unsynched()
+{
+    RefFramesCount=0;
+    #if MEDIAINFO_DEMUX
+        Demux_IntermediateItemFound=true;
+    #endif //MEDIAINFO_DEMUX
+}
+
+//***************************************************************************
+// Buffer - Per element
 //***************************************************************************
 
 //---------------------------------------------------------------------------
@@ -455,7 +555,6 @@
     }
 
     //Parsing
-    int8u start_code;
     Skip_B3(                                                    "synchro");
     Get_B1 (start_code,                                         "start_code");
     if (!Header_Parser_Fill_Size())
@@ -502,8 +601,19 @@
         Buffer_Offset_Temp+=2;
         while(Buffer_Offset_Temp<Buffer_Size && Buffer[Buffer_Offset_Temp]!=0x00)
             Buffer_Offset_Temp+=2;
-        if (Buffer_Offset_Temp<Buffer_Size && Buffer[Buffer_Offset_Temp-1]==0x00 || Buffer_Offset_Temp>=Buffer_Size)
+        if (Buffer_Offset_Temp>=Buffer_Size || Buffer[Buffer_Offset_Temp-1]==0x00)
             Buffer_Offset_Temp--;
+
+        if (start_code==0x0D) //FrameHeader, we need only few bytes
+        {
+            if (Buffer_Offset_Temp-Buffer_Offset>20)
+            {
+                //OK, we continue, we have enough for a slice
+                Header_Fill_Size(16);
+                Buffer_Offset_Temp=0;
+                return true;
+            }
+        }
     }
 
     //Must wait more data?
@@ -539,7 +649,17 @@
         //Synchronizing
         Buffer_Offset+=4;
         Synched=false;
-        if (!Synchronize_0x000001())
+        if (!Synchronize())
+        {
+            if (File_Offset+Buffer_Size==File_Size)
+            {
+                Synched=true;
+                return true;
+            }
+            return false;
+        }
+
+        if (Buffer_Offset+4>Buffer_Size)
             return false;
     }
 
@@ -578,19 +698,26 @@
 // Packet "0D"
 void File_Vc1::FrameHeader()
 {
+    //Name
+    Element_Name("FrameHeader");
+    Element_Info1(Ztring(__T("Frame ")+Ztring::ToZtring(Frame_Count)));
+    if (FrameRate)
+    {
+        Element_Info1C((FrameInfo.PTS!=(int64u)-1), __T("PTS ")+Ztring().Duration_From_Milliseconds(float64_int64s(((float64)FrameInfo.PTS)/1000000+Frame_Count_InThisBlock*1000/FrameRate)));
+        Element_Info1C((FrameInfo.DTS!=(int64u)-1), __T("DTS ")+Ztring().Duration_From_Milliseconds(float64_int64s(((float64)FrameInfo.DTS)/1000000)));
+    }
+
     //Counting
     if (File_Offset+Buffer_Offset+Element_Size==File_Size)
         Frame_Count_Valid=Frame_Count; //Finish frames in case of there are less than Frame_Count_Valid frames
     Frame_Count++;
     Frame_Count_InThisBlock++;
-
-    //Name
-    Element_Name("FrameHeader");
-    Element_Info(Ztring(_T("Frame ")+Ztring::ToZtring(Frame_Count)));
+    if (Frame_Count_NotParsedIncluded!=(int64u)-1)
+        Frame_Count_NotParsedIncluded++;
 
     //Parsing
     BS_Begin();
-    int8u ptype;
+    int8u ptype=(int8u)-1;
     if (profile==3) //Advanced
     {
         int8u PictureFormat=0; //Default=Progressive frame
@@ -605,7 +732,7 @@
                 PictureFormat=fcm_2?2:1; //Interlaced Field : Interlaced Frame
             }
         }
-        Param_Info(Vc1_PictureFormat[PictureFormat]);
+        Param_Info1(Vc1_PictureFormat[PictureFormat]);
         PictureFormat_Count[PictureFormat]++;
 
         if (PictureFormat==2) //Interlaced Field
@@ -614,8 +741,8 @@
             Get_S1 ( 3, ptype_,                                 "ptype");
             if (ptype_<5)
             {
-                Param_Info(Vc1_Type[Vc1_FieldTypeTable[ptype_][0]]); Element_Info(Vc1_Type[Vc1_FieldTypeTable[ptype_][0]]); //First field
-                Param_Info(Vc1_Type[Vc1_FieldTypeTable[ptype_][1]]); Element_Info(Vc1_Type[Vc1_FieldTypeTable[ptype_][1]]); //Second field
+                Param_Info1(Vc1_Type[Vc1_FieldTypeTable[ptype_][0]]); Element_Info1(Vc1_Type[Vc1_FieldTypeTable[ptype_][0]]); //First field
+                Param_Info1(Vc1_Type[Vc1_FieldTypeTable[ptype_][1]]); Element_Info1(Vc1_Type[Vc1_FieldTypeTable[ptype_][1]]); //Second field
                 ptype=Vc1_FieldTypeTable[ptype_][0]; //Saving the ptype from the first field
             }
             else
@@ -626,9 +753,28 @@
         }
         else
         {
-            int32u ptype_;
-            Get_VL (Vc1_ptype, ptype_,                          "ptype"); if (ptype_<5) {Param_Info(Vc1_Type[(size_t)ptype_]); Element_Info(Vc1_Type[(size_t)ptype_]);}
-            ptype=(int8u)ptype_;
+            size_t ptype_;
+            Get_VL (Vc1_ptype, ptype_,                          "ptype"); if (ptype_<5) {Param_Info1(Vc1_Type[Vc1_ptype[ptype_].mapped_to3]); Element_Info1(Vc1_Type[Vc1_ptype[ptype_].mapped_to3]);}
+            ptype=(int8u)Vc1_ptype[ptype_].mapped_to3;
+        }
+        if (RefFramesCount<2 && (ptype==0 || ptype==1))
+            RefFramesCount++;
+        if (FrameInfo.DTS!=(int64u)-1)
+        {
+            if (framerate_present)
+                FrameInfo.DTS+=float64_int64s(((float64)1000000000)/FrameRate);
+        }
+        if (FrameInfo.PTS!=(int64u)-1)
+        {
+            if (PTS_Begin==(int64u)-1 && ptype==0) //IFrame
+                PTS_Begin=FrameInfo.PTS;
+            if ((ptype==0 || ptype==1) && Frame_Count_InThisBlock<=1) //IFrame or PFrame
+                PTS_End=FrameInfo.PTS;
+            if ((ptype==0 || ptype==1) || (Frame_Count_InThisBlock>=2 && RefFramesCount>=2)) //IFrame or PFrame or more than 2 RefFrame for BFrames
+            {
+                if (framerate_present)
+                    PTS_End+=float64_int64s(((float64)1000000000)/FrameRate);
+            }
         }
 
         if (ptype!=4) //!=Skipping
@@ -673,7 +819,6 @@
                     Temp.repeat_first_field=rff;
                     TemporalReference_Waiting.push_back(Temp);
                 }
-
             }
         }
         else
@@ -729,9 +874,51 @@
         Streams[0x0F].Searching_Payload=true;
 
         //Filling only if not already done
-        if (!Status[IsFilled] && Frame_Count>=Frame_Count_Valid && MediaInfoLib::Config.ParseSpeed_Get()<1)
-            Finish("VC-1");
+        if (!Status[IsFilled] && Frame_Count>=Frame_Count_Valid)
+        {
+            Fill("VC-1");
+
+            if (!IsSub && MediaInfoLib::Config.ParseSpeed_Get()<1)
+                Finish("VC-1");
+        }
+
+        #if MEDIAINFO_EVENTS
+            {
+                struct MediaInfo_Event_Video_SliceInfo_0 Event;
+                Event.EventCode=MediaInfo_EventCode_Create(MediaInfo_Parser_None, MediaInfo_Event_Video_SliceInfo, 0);
+                Event.Stream_Offset=File_Offset+Buffer_Offset;
+                Event.PCR=FrameInfo.PCR;
+                Event.PTS=FrameInfo.PTS;
+                Event.DTS=FrameInfo.DTS;
+                Event.DUR=FrameInfo.DUR;
+                Event.StreamIDs_Size=StreamIDs_Size;
+                Event.StreamIDs=(MediaInfo_int64u*)StreamIDs;
+                Event.StreamIDs_Width=(MediaInfo_int8u*)StreamIDs_Width;
+                Event.ParserIDs=(MediaInfo_int8u* )ParserIDs;
+                Event.FramePosition=Frame_Count;
+                Event.FieldPosition=Field_Count;
+                Event.SlicePosition=0;
+                switch (ptype)
+                {
+                    case 0 :
+                                Event.SliceType=0; break;
+                    case 1 :
+                                Event.SliceType=1; break;
+                    case 2 :
+                    case 3 :
+                                Event.SliceType=2; break;
+                    case 4 :
+                                Event.SliceType=3; break;
+                    default:
+                                Event.SliceType=(int8u)-1;
+                }
+                Event.Flags=0;
+                Config->Event_Send((const int8u*)&Event, sizeof(MediaInfo_Event_Video_SliceInfo_0));
+            }
+        #endif //MEDIAINFO_EVENTS
     FILLING_END();
+
+    Synched=false; //We do not have the complete FrameHeader
 }
 
 //---------------------------------------------------------------------------
@@ -757,13 +944,13 @@
     if (hrd_param_flag)
         for (int8u Pos=0; Pos<hrd_num_leaky_buckets; Pos++)
         {
-            Element_Begin("leaky_bucket");
+            Element_Begin1("leaky_bucket");
             Skip_S1( 8,                                         "hrd_full");
-            Element_End();
+            Element_End0();
         }
     TEST_SB_SKIP(                                               "coded_size_flag");
-        Info_S2(12, coded_width,                                "coded_width"); Param_Info((coded_width+1)*2, " pixels");
-        Info_S2(12, coded_height,                               "coded_height"); Param_Info((coded_height+1)*2, " pixels");
+        Info_S2(12, coded_width,                                "coded_width"); Param_Info2((coded_width+1)*2, " pixels");
+        Info_S2(12, coded_height,                               "coded_height"); Param_Info2((coded_height+1)*2, " pixels");
     TEST_SB_END();
     if (extended_mv)
         Skip_SB(                                                "extended_dmv");
@@ -799,7 +986,7 @@
 
     //Parsing
     BS_Begin();
-    Get_S1 ( 2, profile,                                        "profile"); Param_Info(Vc1_Profile[profile]);
+    Get_S1 ( 2, profile,                                        "profile"); Param_Info1(Vc1_Profile[profile]);
     if (profile==0 || profile==1) //Simple or Main
     {
         Skip_S1( 2,                                             "res_sm");
@@ -825,12 +1012,12 @@
     else if (profile==3) //Advanced
     {
         Get_S1 ( 3, level,                                      "level");
-        Get_S1 ( 2, colordiff_format,                           "colordiff_format"); Param_Info(Vc1_ColorimetryFormat[colordiff_format]);
+        Get_S1 ( 2, colordiff_format,                           "colordiff_format"); Param_Info1(Vc1_ColorimetryFormat[colordiff_format]);
         Skip_S1( 3,                                             "frmrtq_postproc");
         Skip_S1( 5,                                             "bitrtq_postproc");
         Skip_SB(                                                "postprocflag");
-        Get_S2 (12, coded_width,                                "max_coded_width"); Param_Info((coded_width+1)*2, " pixels");
-        Get_S2 (12, coded_height,                               "max_coded_height"); Param_Info((coded_height+1)*2, " pixels");
+        Get_S2 (12, coded_width,                                "max_coded_width"); Param_Info2((coded_width+1)*2, " pixels");
+        Get_S2 (12, coded_height,                               "max_coded_height"); Param_Info2((coded_height+1)*2, " pixels");
         Get_SB (    pulldown,                                   "pulldown");
         Get_SB (    interlace,                                  "interlace");
         Get_SB (    tfcntrflag,                                 "tfcntrflag - frame counter");
@@ -838,10 +1025,10 @@
         Skip_SB(                                                "reserved");
         Get_SB (    psf,                                        "psf - progressive segmented frame");
         TEST_SB_SKIP(                                           "display_ext");
-            Info_S2(14, display_x,                              "display_horiz_size"); Param_Info(display_x+1, " pixels");
-            Info_S2(14, display_y,                              "display_vert_size"); Param_Info(display_y+1, " pixels");
+            Info_S2(14, display_x,                              "display_horiz_size"); Param_Info2(display_x+1, " pixels");
+            Info_S2(14, display_y,                              "display_vert_size"); Param_Info2(display_y+1, " pixels");
             TEST_SB_SKIP(                                       "aspectratio_flag");
-                Get_S1 ( 4, AspectRatio,                        "aspect_ratio"); Param_Info(Vc1_PixelAspectRatio[AspectRatio]);
+                Get_S1 ( 4, AspectRatio,                        "aspect_ratio"); Param_Info1(Vc1_PixelAspectRatio[AspectRatio]);
                 if (AspectRatio==0x0F)
                 {
                     Get_S1 ( 8, AspectRatioX,                   "aspect_horiz_size");
@@ -850,10 +1037,10 @@
             TEST_SB_END();
             TEST_SB_GET(framerate_present,                      "framerate_flag");
                 TESTELSE_SB_GET(framerate_form,                 "framerateind");
-                    Get_S2 (16, framerateexp,                   "framerateexp"); Param_Info((float32)((framerateexp+1)/32.0), 3, " fps");
+                    Get_S2 (16, framerateexp,                   "framerateexp"); Param_Info3((float32)((framerateexp+1)/32.0), 3, " fps");
                 TESTELSE_SB_ELSE(                               "framerateind");
-                    Get_S1 ( 8, frameratecode_enr,              "frameratenr"); Param_Info(Vc1_FrameRate_enr(frameratecode_enr));
-                    Get_S1 ( 4, frameratecode_dr,               "frameratedr"); Param_Info(Vc1_FrameRate_dr(frameratecode_dr));
+                    Get_S1 ( 8, frameratecode_enr,              "frameratenr"); Param_Info1(Vc1_FrameRate_enr(frameratecode_enr));
+                    Get_S1 ( 4, frameratecode_dr,               "frameratedr"); Param_Info1(Vc1_FrameRate_dr(frameratecode_dr));
                 TESTELSE_SB_END();
             TEST_SB_END();
             TEST_SB_SKIP(                                       "color_format_flag");
@@ -870,12 +1057,12 @@
             hrd_buffers.clear();
             for (int8u Pos=0; Pos<hrd_num_leaky_buckets; Pos++)
             {
-                Element_Begin("leaky_bucket");
+                Element_Begin1("leaky_bucket");
                 int16u hrd_buffer;
                 Skip_S2(16,                                     "hrd_rate");
                 Get_S2(16, hrd_buffer,                         "hrd_buffer");
-                int32u hrd_buffer_value=(int32u)((hrd_buffer+1)*pow(2.0, 1+buffer_size_exponent)); Param_Info(hrd_buffer_value, " bytes");
-                Element_End();
+                int32u hrd_buffer_value=(int32u)((hrd_buffer+1)*pow(2.0, 1+buffer_size_exponent)); Param_Info2(hrd_buffer_value, " bytes");
+                Element_End0();
 
                 //Filling
                 hrd_buffers.push_back(hrd_buffer_value);
@@ -899,6 +1086,15 @@
         Streams[0x0D].Searching_Payload=true;
         Streams[0x0E].Searching_Payload=true;
 
+        //Frame rate
+        if (framerate_present)
+        {
+            if (framerate_form)
+                FrameRate=((float32)(framerateexp+1))/(float32)32;
+            else if (Vc1_FrameRate_dr(frameratecode_dr))
+                FrameRate=Vc1_FrameRate_enr(frameratecode_enr)/Vc1_FrameRate_dr(frameratecode_dr);
+        }
+
         if (From_WMV3)
         {
             if (!Status[IsAccepted])

libmediainfo_0.7.34.tar.bz2/Source/MediaInfo/Video/File_Vc1.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_Vc1.h Changed

@@ -1,17 +1,17 @@
 // File_Vc1 - Info for MPEG Video files
-// Copyright (C) 2004-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2004-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -41,7 +41,7 @@
 {
 public :
     //In
-    size_t Frame_Count_Valid;
+    int64u Frame_Count_Valid;
     bool   FrameIsAlwaysComplete;
     bool   From_WMV3;
     bool   Only_0D;
@@ -62,6 +62,14 @@
     bool Synched_Test();
     void Synched_Init();
 
+    //Buffer - Demux
+    #if MEDIAINFO_DEMUX
+    bool Demux_UnpacketizeContainer_Test();
+    #endif //MEDIAINFO_DEMUX
+
+    //Buffer - Global
+    void Read_Buffer_Unsynched();
+
     //Buffer - Per element
     void Header_Parse();
     bool Header_Parser_QuickSearch();
@@ -82,7 +90,6 @@
     void UserDefinedSequenceHeader();
 
     //Count
-    size_t Frame_Count;
     size_t Interlaced_Top;
     size_t Interlaced_Bottom;
     std::vector<size_t> PictureFormat_Count;
@@ -112,7 +119,7 @@
     bool   psf;
     bool   pulldown;
     bool   panscan_flag;
-    
+
     //Stream
     struct stream
     {
@@ -144,7 +151,10 @@
     size_t Height;
     size_t RatioValue;
     size_t BitRate;
+    int8u  start_code;
     bool   EntryPoint_Parsed;
+    float32 FrameRate;
+    size_t RefFramesCount;
 
     //Error controls
     std::vector<int8u> Frame_ShouldBe;

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_Vc3.cpp Added

@@ -0,0 +1,383 @@
+// File_Vc3 - Info for VC-3 streams
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_VC3_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Video/File_Vc3.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Infos
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+const int32u Vc3_CompressedFrameSize(int32u CompressionID)
+{
+    switch (CompressionID)
+    {
+        case 1235 : return 917504;
+        case 1237 : return 606208;
+        case 1238 : return 917504;
+        case 1241 : return 917504;
+        case 1242 : return 606208;
+        case 1243 : return 917504;
+        case 1250 : return 458752;
+        case 1251 : return 458752;
+        case 1252 : return 303104;
+        case 1253 : return 188416;
+        default   : return 0;
+    }
+};
+
+//---------------------------------------------------------------------------
+const int8u Vc3_SBD(int32u SBD) //Sample Bit Depth
+{
+    switch (SBD)
+    {
+        case 1 : return  8;
+        case 2 : return 10;
+        default: return  0;
+    }
+};
+
+//---------------------------------------------------------------------------
+const char* Vc3_FFC[4]=
+{
+    "",
+    "Progressive",
+    "Interlaced",
+    "Interlaced",
+};
+
+//---------------------------------------------------------------------------
+const char* Vc3_SST[2]=
+{
+    "Progressive",
+    "Interlaced",
+};
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File_Vc3::File_Vc3()
+:File__Analyze()
+{
+    //Configuration
+    MustSynchronize=true;
+
+    //In
+    Frame_Count_Valid=2;
+    FrameRate=0;
+
+    //Temp
+    Data_ToParse=0;
+}
+
+//***************************************************************************
+// Streams management
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Vc3::Streams_Fill()
+{
+    //Filling
+    Stream_Prepare(Stream_Video);
+    Fill(Stream_Video, 0, Video_Format, "VC-3");
+    Fill(Stream_Video, 0, Video_BitRate_Mode, "CBR");
+    if (FrameRate)
+        Fill(Stream_Video, 0, Video_BitRate, Vc3_CompressedFrameSize(CID)*8*FrameRate, 0);
+    Fill(Stream_Video, 0, Video_Width, SPL);
+    Fill(Stream_Video, 0, Video_Height, ALPF);
+    Fill(Stream_Video, 0, Video_BitDepth, Vc3_SBD(SBD));
+    Fill(Stream_Video, 0, Video_ColorSpace, "YUV");
+    Fill(Stream_Video, 0, Video_ChromaSubsampling, "4:2:2");
+    Fill(Stream_Video, 0, Video_ScanType, Vc3_SST[SST]);
+}
+
+//***************************************************************************
+// Buffer - Per element
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_Vc3::Synchronize()
+{
+    //Synchronizing
+    while (Buffer_Offset+5<=Buffer_Size && (Buffer[Buffer_Offset  ]!=0x00
+                                         || Buffer[Buffer_Offset+1]!=0x00
+                                         || Buffer[Buffer_Offset+2]!=0x02
+                                         || Buffer[Buffer_Offset+3]!=0x80
+                                         || Buffer[Buffer_Offset+4]!=0x01))
+    {
+        Buffer_Offset+=2;
+        while (Buffer_Offset<Buffer_Size && Buffer[Buffer_Offset]!=0x00)
+            Buffer_Offset+=2;
+        if (Buffer_Offset>=Buffer_Size || Buffer[Buffer_Offset-1]==0x00)
+            Buffer_Offset--;
+    }
+
+    //Parsing last bytes if needed
+    if (Buffer_Offset+4==Buffer_Size && (Buffer[Buffer_Offset  ]!=0x00
+                                      || Buffer[Buffer_Offset+1]!=0x00
+                                      || Buffer[Buffer_Offset+2]!=0x02
+                                      || Buffer[Buffer_Offset+3]!=0x80))
+        Buffer_Offset++;
+    if (Buffer_Offset+3==Buffer_Size && (Buffer[Buffer_Offset  ]!=0x00
+                                      || Buffer[Buffer_Offset+1]!=0x00
+                                      || Buffer[Buffer_Offset+2]!=0x02))
+        Buffer_Offset++;
+    if (Buffer_Offset+2==Buffer_Size && (Buffer[Buffer_Offset  ]!=0x00
+                                      || Buffer[Buffer_Offset+1]!=0x00))
+        Buffer_Offset++;
+    if (Buffer_Offset+1==Buffer_Size &&  Buffer[Buffer_Offset  ]!=0x00)
+        Buffer_Offset++;
+
+    if (Buffer_Offset+5>Buffer_Size)
+        return false;
+
+    //Synched is OK
+    Synched=true;
+    return true;
+}
+
+//---------------------------------------------------------------------------
+bool File_Vc3::Synched_Test()
+{
+    //Must have enough buffer for having header
+    if (Buffer_Offset+5>Buffer_Size)
+        return false;
+
+    //Quick test of synchro
+    if (Buffer[Buffer_Offset  ]!=0x00
+     || Buffer[Buffer_Offset+1]!=0x00
+     || Buffer[Buffer_Offset+2]!=0x02
+     || Buffer[Buffer_Offset+3]!=0x80
+     || Buffer[Buffer_Offset+4]!=0x01)
+    {
+        Synched=false;
+        return true;
+    }
+
+    //We continue
+    return true;
+}
+
+//***************************************************************************
+// Buffer - Demux
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+#if MEDIAINFO_DEMUX
+bool File_Vc3::Demux_UnpacketizeContainer_Test()
+{
+    if (Buffer_Offset+0x2C>Buffer_Size)
+        return false;
+
+    int32u CompressionID=BigEndian2int32u(Buffer+Buffer_Offset+0x28);
+    int32u Size=Vc3_CompressedFrameSize(CompressionID);
+    Demux_Offset=Buffer_Offset+Size;
+
+    if (Demux_Offset>Buffer_Size && File_Offset+Buffer_Size!=File_Size)
+        return false; //No complete frame
+
+    Demux_UnpacketizeContainer_Demux();
+
+    return true;
+}
+#endif //MEDIAINFO_DEMUX
+
+//***************************************************************************
+// Buffer - Per element
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_Vc3::Header_Begin()
+{
+    if (Buffer_Offset+0x2C>Buffer_Size)
+        return false;
+
+    return true;
+}
+
+//---------------------------------------------------------------------------
+void File_Vc3::Header_Parse()
+{
+    int32u CompressionID=BigEndian2int32u(Buffer+Buffer_Offset+0x28);
+
+    Header_Fill_Code(0, "Frame");
+    Header_Fill_Size(Vc3_CompressedFrameSize(CompressionID));
+}
+
+//---------------------------------------------------------------------------
+void File_Vc3::Data_Parse()
+{
+    //Parsing
+    Element_Info1(Frame_Count+1);
+    HeaderPrefix();
+    CodingControlA();
+    Skip_XX(16,                                                 "Reserved");
+    ImageGeometry();
+    Skip_XX( 5,                                                 "Reserved");
+    CompressionID();
+
+    Skip_XX(640-Element_Offset,                                 "ToDo");
+    Skip_XX(Element_Size-Element_Offset,                        "Data");
+
+    FILLING_BEGIN();
+        Data_ToParse-=Buffer_Size-(size_t)Buffer_Offset;
+        Frame_Count++;
+        if (!Status[IsFinished] && Frame_Count>=Frame_Count_Valid)
+            Finish("VC-3");
+    FILLING_END();
+}
+
+//***************************************************************************
+// Elements
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Vc3::HeaderPrefix()
+{
+    //Parsing
+    Element_Begin1("Header Prefix");
+    int64u Data;
+    Get_B5 (Data,                                               "Contents");
+    Element_End0();
+
+    FILLING_BEGIN();
+        if (Data==0x0000028001LL)
+            Accept("VC-3");
+        else
+            Reject("VC-3");
+    FILLING_END();
+}
+
+//---------------------------------------------------------------------------
+void File_Vc3::CodingControlA()
+{
+    //Parsing
+    Element_Begin1("Coding Control A");
+    BS_Begin();
+
+    Mark_0();
+    Mark_0();
+    Mark_0();
+    Mark_0();
+    Mark_0();
+    Mark_0();
+    Info_S1(2, FFC,                                             "Field/Frame Count"); Param_Info1(Vc3_FFC[FFC]);
+
+    Mark_1();
+    Mark_0();
+    Mark_0();
+    Get_SB (   CRCF,                                             "CRC flag");
+    Mark_0();
+    Mark_0();
+    Mark_0();
+    Mark_0();
+
+    Mark_1();
+    Mark_0();
+    Mark_1();
+    Mark_0();
+    Mark_0();
+    Mark_0();
+    Mark_0();
+    Mark_0();
+
+    BS_End();
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Vc3::ImageGeometry()
+{
+    //Parsing
+    Element_Begin1("Image Geometry");
+    Get_B2 (ALPF,                                               "Active lines-per-frame");
+    Get_B2 (SPL,                                                "Samples-per-line");
+    Skip_B1(                                                    "Zero");
+    Skip_B2(                                                    "Number of active lines");
+    Skip_B2(                                                    "Zero");
+
+    BS_Begin();
+
+    Get_S1 (3, SBD,                                             "Sample bit depth");
+    Mark_1();
+    Mark_1();
+    Mark_0();
+    Mark_0();
+    Mark_0();
+
+    Mark_1();
+    Mark_0();
+    Mark_0();
+    Mark_0();
+    Mark_1();
+    Get_SB (   SST,                                             "Source scan type");
+    Mark_0();
+    Mark_0();
+
+    BS_End();
+    Element_End0();
+}
+
+//---------------------------------------------------------------------------
+void File_Vc3::CompressionID()
+{
+    //Parsing
+    Element_Begin1("Compression ID");
+    int32u Data;
+    Get_B4 (Data,                                               "Compression ID");
+    Element_End0();
+
+    FILLING_BEGIN();
+        CID=Data;
+        Data_ToParse=Vc3_CompressedFrameSize(Data);
+        if (Data_ToParse==0)
+            Reject("VC-3");
+    FILLING_END();
+}
+
+//***************************************************************************
+// C++
+//***************************************************************************
+
+} //NameSpace
+
+#endif //MEDIAINFO_VC3_*

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_Vc3.h Added

@@ -0,0 +1,91 @@
+// File_Vc3 - Info for VC-3 streams
+// Copyright (C) 2010-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Information about VC-3 video streams
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_Vc3H
+#define MediaInfo_Vc3H
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+#include "MediaInfo/Multiple/File_Mpeg4.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Class File_Avs
+//***************************************************************************
+
+class File_Vc3 : public File__Analyze
+{
+public :
+    //In
+    int64u Frame_Count_Valid;
+    float  FrameRate;
+
+    //constructor/Destructor
+    File_Vc3();
+
+private :
+    //Streams management
+    void Streams_Fill();
+
+    //Buffer - Synchro
+    bool Synchronize();
+    bool Synched_Test();
+
+    //Buffer - Demux
+    #if MEDIAINFO_DEMUX
+    bool Demux_UnpacketizeContainer_Test();
+    #endif //MEDIAINFO_DEMUX
+
+    //Buffer - Per element
+    bool Header_Begin ();
+    void Header_Parse ();
+    void Data_Parse ();
+
+    //Elements
+    void HeaderPrefix();
+    void CodingControlA();
+    void ImageGeometry();
+    void CompressionID();
+    void CodingControlB();
+    void TimeCode();
+    void UserData();
+    void MacroblockScanIndices();
+
+    //Temp
+    int64u  Data_ToParse;
+    int32u  CID;
+    bool    CRCF;
+    int16u  ALPF;
+    int16u  SPL;
+    int8u   SBD;
+    bool    SST;
+};
+
+} //NameSpace
+
+#endif

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_Vp8.cpp Added

@@ -0,0 +1,127 @@
+// File_Vp8 - Info for MPEG Video files
+// Copyright (C) 2004-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_VP8_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Video/File_Vp8.h"
+#include "MediaInfo/MediaInfo_Config_MediaInfo.h"
+#include "ZenLib/BitStream.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+namespace MediaInfoLib
+{
+//---------------------------------------------------------------------------
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File_Vp8::File_Vp8()
+:File__Analyze()
+{
+    //Configuration
+    ParserName=__T("VP8");
+    IsRawStream=true;
+
+    //In
+    Frame_Count_Valid=MediaInfoLib::Config.ParseSpeed_Get()>=0.3?32:4;
+}
+
+//---------------------------------------------------------------------------
+File_Vp8::~File_Vp8()
+{
+}
+
+//***************************************************************************
+// Streams management
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Vp8::Streams_Accept()
+{
+    Stream_Prepare(Stream_Video);
+}
+
+//---------------------------------------------------------------------------
+void File_Vp8::Streams_Update()
+{
+}
+
+//---------------------------------------------------------------------------
+void File_Vp8::Streams_Fill()
+{
+    Fill(Stream_Video, 0, Video_Format, "VP8");
+    Fill(Stream_Video, 0, Video_Codec, "VP8");
+}
+
+//---------------------------------------------------------------------------
+void File_Vp8::Streams_Finish()
+{
+}
+
+//***************************************************************************
+// Buffer - Global
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Vp8::Read_Buffer_Continue()
+{
+    Accept();
+
+    BS_Begin_LE(); //VP8 bitstream is Little Endian
+    bool frame_type;
+    Get_TB (    frame_type,                                     "frame type");
+    Skip_T1( 3,                                                 "version number");
+    Skip_TB(                                                    "show_frame flag");
+    Skip_T3(19,                                                 "size of the first data partition");
+    BS_End();
+
+    if (!frame_type) //I-Frame
+    {
+        Skip_B3(                                                "0x9D012A");
+        Skip_L2(                                                "Width");
+        Skip_L2(                                                "Height");
+    }
+    Skip_XX(Element_Size-Element_Offset,                        "Other data");
+
+    Frame_Count++;
+    if (Frame_Count>=Frame_Count_Valid)
+        Finish();
+}
+
+} //NameSpace
+
+#endif //MEDIAINFO_VP8_YES

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_Vp8.h Added

@@ -0,0 +1,64 @@
+// File_Vp8 - Info for VP8 streams
+// Copyright (C) 2012-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Information about VP8 files
+// http://datatracker.ietf.org/doc/rfc6386/?include_text=1
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_Vp8H
+#define MediaInfo_Vp8H
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Class File_Vp8
+//***************************************************************************
+
+class File_Vp8 : public File__Analyze
+{
+public :
+    //In
+    int64u Frame_Count_Valid;
+
+    //Constructor/Destructor
+    File_Vp8();
+    ~File_Vp8();
+
+private :
+    //Streams management
+    void Streams_Accept();
+    void Streams_Update();
+    void Streams_Fill();
+    void Streams_Finish();
+
+    //Buffer - Global
+    void Read_Buffer_Continue();
+};
+
+} //NameSpace
+
+#endif

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_Y4m.cpp Added

@@ -0,0 +1,242 @@
+// File_Y4m - Info for YUV4MPEG2 files
+// Copyright (C) 2011-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+//
+// Source:
+// http://wiki.multimedia.cx/index.php?title=YUV4MPEG2
+//
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+// Pre-compilation
+#include "MediaInfo/PreComp.h"
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Setup.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#if defined(MEDIAINFO_Y4M_YES)
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/Video/File_Y4m.h"
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+namespace MediaInfoLib
+{
+//---------------------------------------------------------------------------
+
+//***************************************************************************
+// Infos
+//***************************************************************************
+
+//***************************************************************************
+// Constructor/Destructor
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+File_Y4m::File_Y4m()
+:File__Analyze()
+{
+    //Configuration
+    ParserName=__T("YUV4MPEG2");
+    IsRawStream=true;
+    Frame_Count_NotParsedIncluded=0;
+
+    //Temp
+    HeaderEnd=0;
+}
+
+//---------------------------------------------------------------------------
+File_Y4m::~File_Y4m()
+{
+}
+
+//***************************************************************************
+// Streams management
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+void File_Y4m::Streams_Accept()
+{
+    Fill(Stream_General, 0, General_Format, "YUV4MPEG2");
+
+    Stream_Prepare(Stream_Video);
+    Fill(Stream_Video, 0, Video_Format, "YUV");
+    Fill(Stream_Video, 0, Video_ColorSpace, "YUV");
+}
+
+//---------------------------------------------------------------------------
+void File_Y4m::Streams_Fill()
+{
+}
+
+//***************************************************************************
+// Buffer - File header
+//***************************************************************************
+
+//---------------------------------------------------------------------------
+bool File_Y4m::FileHeader_Begin()
+{
+    if (Buffer_Size<10)
+        return false;
+
+    if (!(Buffer[0]==0x59
+       && Buffer[1]==0x55
+       && Buffer[2]==0x56
+       && Buffer[3]==0x34
+       && Buffer[4]==0x4D
+       && Buffer[5]==0x50
+       && Buffer[6]==0x45
+       && Buffer[7]==0x47
+       && Buffer[8]==0x32
+       && Buffer[9]==0x20))
+    {
+        Reject();
+        return false;
+    }
+
+    for (; HeaderEnd<Buffer_Size; HeaderEnd++)
+    {
+        if (Buffer[HeaderEnd]==0x0A)
+        {
+            Accept();
+            return true;
+        }
+    }
+
+    return false;
+}
+
+//---------------------------------------------------------------------------
+void File_Y4m::FileHeader_Parse()
+{
+    //Parsing
+    Ztring Header;
+    Get_Local(HeaderEnd, Header,                                "Data");
+
+    ZtringList List; List.Separator_Set(0, " ");
+    List.Write(Header);
+    int64u Width=0, Height=0, Multiplier=0, Divisor=1;
+    float64 FrameRate=0;
+    for (size_t Pos=1; Pos<List.size(); Pos++)
+    {
+        if (!List[Pos].empty())
+        {
+            switch (List[Pos][0])
+            {
+                case 'A' :  //Pixel aspect ratio
+                            {
+                            ZtringList Value; Value.Separator_Set(0, ":");
+                            Value.Write(List[Pos].substr(1));
+                            if (Value.size()==2)
+                            {
+                                float64 x=Value[0].To_float64();
+                                float64 y=Value[1].To_float64();
+                                if (x && y)
+                                    Fill(Stream_Video, 0, Video_PixelAspectRatio, x/y, 3);
+                            }
+                            }
+                            break;
+                case 'C' :  //Color space
+                            if (List[Pos]==__T("C420jpeg") || List[Pos]==__T("C420paldv") || List[Pos]==__T("C420"))
+                            {
+                                Fill(Stream_Video, 0, Video_ChromaSubsampling, "4:2:0");
+                                Multiplier=3;
+                                Divisor=2;
+                            }
+                            if (List[Pos]==__T("C422"))
+                            {
+                                Fill(Stream_Video, 0, Video_ChromaSubsampling, "4:2:2");
+                                Multiplier=2;
+                            }
+                            if (List[Pos]==__T("C444"))
+                            {
+                                Fill(Stream_Video, 0, Video_ChromaSubsampling, "4:4:4");
+                                Multiplier=3;
+                            }
+                            break;
+                case 'F' :  //Frame rate
+                            {
+                            ZtringList Value; Value.Separator_Set(0, ":");
+                            Value.Write(List[Pos].substr(1));
+                            if (Value.size()==2)
+                            {
+                                float64 N=Value[0].To_float64();
+                                float64 D=Value[1].To_float64();
+                                if (N && D)
+                                {
+                                    FrameRate=N/D;
+                                    Fill(Stream_Video, 0, Video_FrameRate, FrameRate, 3);
+                                }
+                            }
+                            }
+                            break;
+                case 'H' :  //Height
+                            {
+                            Ztring Value=List[Pos].substr(1);
+                            Height=Value.To_int64u();
+                            Fill(Stream_Video, 0, Video_Height, Height); break;
+                            }
+                            break;
+                case 'I' :  //Interlacing
+                            if (List[Pos].size()==2)
+                                switch (List[Pos][1])
+                                {
+                                    case 'p' : Fill(Stream_Video, 0, Video_ScanType, "Progressive"); break;
+                                    case 't' : Fill(Stream_Video, 0, Video_ScanType, "Progressive"); Fill(Stream_Video, 0, Video_ScanOrder, "TFF"); break;
+                                    case 'b' : Fill(Stream_Video, 0, Video_ScanType, "Progressive"); Fill(Stream_Video, 0, Video_ScanOrder, "BFF"); break;
+                                    case 'm' : Fill(Stream_Video, 0, Video_ScanType, "Mixed"); break;
+                                    default  : ;
+                                }
+                            break;
+                case 'W' :  //Width
+                            {
+                            Ztring Value=List[Pos].substr(1);
+                            Width=Value.To_int64u();
+                            Fill(Stream_Video, 0, Video_Width, Width); break;
+                            }
+                            break;
+                default  : ;
+            }
+        }
+    }
+
+    //Duration (we expect no meta per frame)
+    if (Width && Height && Multiplier)
+    {
+        int64u Frame_ByteSize=6+Width*Height*Multiplier/Divisor; //5 for "FRAME\0"
+        Fill(Stream_Video, 0, Video_FrameCount, File_Size/Frame_ByteSize);
+        if (FrameRate)
+            Fill(Stream_Video, 0, Video_BitRate, Width*Height*Multiplier/Divisor*8*FrameRate);
+    }
+
+    Finish();
+}
+
+} //NameSpace
+
+#endif //MEDIAINFO_Y4M_YES

libmediainfo_0.7.60.tar.bz2/Source/MediaInfo/Video/File_Y4m.h Added

@@ -0,0 +1,62 @@
+// File_Y4m - Info for YUV4MPEG2 files
+// Copyright (C) 2011-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Information about YUV4MPEG2 files
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_Y4mH
+#define MediaInfo_Y4mH
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/File__Analyze.h"
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{
+
+//***************************************************************************
+// Class File_Y4m
+//***************************************************************************
+
+class File_Y4m : public File__Analyze
+{
+public :
+    //Constructor/Destructor
+    File_Y4m();
+    ~File_Y4m();
+
+private :
+    //Streams management
+    void Streams_Accept();
+    void Streams_Fill();
+
+    //Buffer - File header
+    bool FileHeader_Begin();
+    void FileHeader_Parse();
+
+    //Temp
+    size_t HeaderEnd;
+};
+
+} //NameSpace
+
+#endif

libmediainfo_0.7.34.tar.bz2/Source/MediaInfoDLL/MediaInfoDLL.JNA.java -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfoDLL/MediaInfoDLL.JNA.java Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfoDLL/MediaInfoDLL.JNative.java -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfoDLL/MediaInfoDLL.JNative.java Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfoDLL/MediaInfoDLL.cpp -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfoDLL/MediaInfoDLL.cpp Changed

@@ -1,17 +1,17 @@
 // MediaInfoDLL - All info about media files, for DLL
-// Copyright (C) 2002-2010 MediaArea.net SARL, Info@MediaArea.net
+// Copyright (C) 2002-2012 MediaArea.net SARL, Info@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -45,7 +45,6 @@
 #include "ZenLib/CriticalSection.h"
 #include <map>
 #include <vector>
-#include <iostream>
 #include <clocale>
 using namespace MediaInfoLib;
 using namespace ZenLib;
@@ -82,17 +81,17 @@
 const char* WC2MB(void* Handle, const wchar_t* Text)
 {
     CriticalSectionLocker Locker(Critical);
-    
+
     //Coherancy
     if (MI_Handle.find(Handle)==MI_Handle.end())
     {
         if (Handle==NULL && v07Mode)
-            MediaInfo_Info_Ansi="Note to developper : you must create an object before using this method";
+            MediaInfo_Info_Ansi="Note to developer : you must create an object before using this method";
         else
             MediaInfo_Info_Ansi="Your software uses an outdated interface, you must use MediaInfo.DLL 0.6 instead"; //Compatibility <0.7 : return a message
         return MediaInfo_Info_Ansi.c_str();
     }
-    
+
     //Adaptation
     if (utf8)
        MI_Handle[Handle]->Ansi=Ztring(Text).To_UTF8();
@@ -111,7 +110,7 @@
         MI_FromAnsi[Handle].Unicode.resize(2);
     }
     MI_FromAnsi[Handle].Pos=(MI_FromAnsi[Handle].Pos==0?1:0); //Changing the position
-       
+
     //Adaptation
     if (utf8)
         return MI_FromAnsi[Handle].Unicode[MI_FromAnsi[Handle].Pos].From_UTF8(Text).c_str();
@@ -177,7 +176,7 @@
             MediaInfo_Info_Unicode=L"Your software uses an outdated interface, You must use MediaInfoList.DLL 0.6 instead"; \
             return MediaInfo_Info_Unicode.c_str(); \
         } \
-        MI_Handle[NULL]->Unicode==L"Note to developper : you must create an object before"; \
+        MI_Handle[NULL]->Unicode==L"Note to developer : you must create an object before"; \
         return MI_Handle[NULL]->Unicode.c_str(); \
     } \
 
@@ -300,6 +299,11 @@
     return MediaInfo_Open_Buffer_Finalize(Handle);
 }
 
+size_t          __stdcall MediaInfoA_Open_NextPacket (void* Handle)
+{
+    return MediaInfo_Open_NextPacket(Handle);
+}
+
 size_t          __stdcall MediaInfoA_Save (void* Handle)
 {
     return MediaInfo_Save(Handle);
@@ -570,6 +574,13 @@
     EXECUTE_SIZE_T(MediaInfo, Open_Buffer_Finalize(), Debug+="MediaInfo_Open_Buffer_Finalize, will return ";Debug+=ZenLib::Ztring::ToZtring((size_t)ToReturn).To_Local().c_str();Debug+="\r\n";)
 }
 
+size_t          __stdcall MediaInfo_Open_NextPacket (void* Handle)
+{
+    INTEGRITY_SIZE_T(Debug+="MediaInfo_Open_NextPacket, Handle=";Debug+=ZenLib::Ztring::ToZtring((size_t)Handle).To_Local().c_str();Debug+=", ";Debug+="\r\n";)
+
+    EXECUTE_SIZE_T(MediaInfo, Open_NextPacket(), Debug+="MediaInfo_Open_NextPacket, will return ";Debug+=ZenLib::Ztring::ToZtring((size_t)ToReturn).To_Local().c_str();Debug+="\r\n";)
+}
+
 size_t          __stdcall MediaInfo_Save (void* Handle)
 {
     MANAGE_INT(MediaInfo, Save(), Debug+="Save, Handle=";Debug+=ZenLib::Ztring::ToZtring((size_t)Handle).To_Local().c_str();Debug+="\r\n";, Debug+="Save, will return ";Debug+=ZenLib::Ztring::ToZtring((size_t)ToReturn).To_Local().c_str();Debug+="\r\n";)
@@ -657,7 +668,7 @@
                 MediaInfo_Info_Unicode=L"Your software uses an outdated interface, You must use MediaInfoList.DLL 0.6 instead";
                 return MediaInfo_Info_Unicode.c_str();
             }
-              MI_Handle[NULL]->Unicode==L"Note to developper : you must create an object before";
+              MI_Handle[NULL]->Unicode==L"Note to developer : you must create an object before";
             return MI_Handle[NULL]->Unicode.c_str();
         }
         EXECUTE_STRING(MediaInfo, Option(Option, Value), Debug+="Option, will return ";Debug+=ToReturn.To_Local().c_str();Debug+="\r\n";)
@@ -855,7 +866,7 @@
                 MediaInfo_Info_Unicode=L"Your software uses an outdated interface, You must use MediaInfoList.DLL 0.6 instead";
                 return MediaInfo_Info_Unicode.c_str();
             }
-            MI_Handle[NULL]->Unicode==L"Note to developper : you must create an object before";
+            MI_Handle[NULL]->Unicode==L"Note to developer : you must create an object before";
             return MI_Handle[NULL]->Unicode.c_str();
         }
         EXECUTE_STRING(MediaInfoList, Option(Option, Value), Debug+="Option(L), will return ";Debug+=ToReturn.To_Local().c_str();Debug+="\r\n";)

libmediainfo_0.7.34.tar.bz2/Source/MediaInfoDLL/MediaInfoDLL.cs -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfoDLL/MediaInfoDLL.cs Changed

@@ -42,6 +42,8 @@
 using System;
 using System.Runtime.InteropServices;
 
+#pragma warning disable 1591 // Disable XML documentation warnings
+
 namespace MediaInfoLib
 {
     public enum StreamKind
@@ -51,7 +53,8 @@
         Audio,
         Text,
         Chapters,
-        Image
+        Image,
+        Menu,
     }
 
     public enum InfoKind
@@ -77,7 +80,7 @@
     public enum InfoFileOptions
     {
         FileOption_Nothing      = 0x00,
-        FileOption_Recursive    = 0x01,
+        FileOption_NoRecursive  = 0x01,
         FileOption_CloseAll     = 0x02,
         FileOption_Max          = 0x04
     };
@@ -85,7 +88,7 @@
 
     public class MediaInfo
     {
-        //Import of DLL functions. DO NOT USE until you know what you do (MediaInfo DLL do NOT use CoTaskMemAlloc to allocate memory)  
+        //Import of DLL functions. DO NOT USE until you know what you do (MediaInfo DLL do NOT use CoTaskMemAlloc to allocate memory)
         [DllImport("MediaInfo.dll")]
         private static extern IntPtr MediaInfo_New();
         [DllImport("MediaInfo.dll")]
@@ -165,7 +168,7 @@
         }
         public Int64 Open_Buffer_Continue_GoTo_Get()
         {
-            return (int)MediaInfo_Open_Buffer_Continue_GoTo_Get(Handle);
+            return MediaInfo_Open_Buffer_Continue_GoTo_Get(Handle);
         }
         public int Open_Buffer_Finalize()
         {
@@ -243,7 +246,7 @@
 
     public class MediaInfoList
     {
-        //Import of DLL functions. DO NOT USE until you know what you do (MediaInfo DLL do NOT use CoTaskMemAlloc to allocate memory)  
+        //Import of DLL functions. DO NOT USE until you know what you do (MediaInfo DLL do NOT use CoTaskMemAlloc to allocate memory)
         [DllImport("MediaInfo.dll")]
         private static extern IntPtr MediaInfoList_New();
         [DllImport("MediaInfo.dll")]

libmediainfo_0.7.34.tar.bz2/Source/MediaInfoDLL/MediaInfoDLL.def -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfoDLL/MediaInfoDLL.def Changed

libmediainfo_0.7.34.tar.bz2/Source/MediaInfoDLL/MediaInfoDLL.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfoDLL/MediaInfoDLL.h Changed

@@ -1,17 +1,17 @@
 /* MediaInfoDLL - All info about media files, for DLL
-// Copyright (C) 2002-2009 Jerome Martinez, Zen@MediaArea.net
+// Copyright (C) 2002-2012 Jerome Martinez, Zen@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -129,7 +129,11 @@
 
 /*-------------------------------------------------------------------------*/
 #if defined (_WIN32) || defined (WIN32)
-    #define MEDIAINFODLL_NAME  "MediaInfo.dll"
+    #ifdef _UNICODE
+        #define MEDIAINFODLL_NAME  L"MediaInfo.dll"
+    #else //_UNICODE
+        #define MEDIAINFODLL_NAME  "MediaInfo.dll"
+    #endif //_UNICODE
 #elif defined(__APPLE__) && defined(__MACH__)
     #define MEDIAINFODLL_NAME  "libmediainfo.0.dylib"
     #define __stdcall
@@ -140,8 +144,8 @@
 
 /*-------------------------------------------------------------------------*/
 /*Char types                                                               */
-#undef  _T
-#define _T(__x)     __T(__x)
+#undef  __T
+#define __T(__x)    __T(__x)
 #if defined(UNICODE) || defined (_UNICODE)
     typedef wchar_t MediaInfo_Char;
     #undef  __T
@@ -176,7 +180,7 @@
 /*-------------------------------------------------------------------------*/
 
 /*-------------------------------------------------------------------------*/
-/*NULL                                                                      */
+/*NULL                                                                     */
 #ifndef NULL
     #define NULL 0
 #endif
@@ -236,36 +240,36 @@
 
 #ifdef MEDIAINFO_GLIBC
     #include <gmodule.h>
-    static GModule* Module=NULL;
+    static GModule* MediaInfo_Module=NULL;
 #elif defined (_WIN32) || defined (WIN32)
     #include <windows.h>
-    static HMODULE  Module=NULL;
+    static HMODULE  MediaInfo_Module=NULL;
 #else
     #include <dlfcn.h>
-    static void*    Module=NULL;
+    static void*    MediaInfo_Module=NULL;
 #endif
 static size_t Module_Count=0;
 
 #ifdef MEDIAINFO_GLIBC
 #define MEDIAINFO_ASSIGN(_Name,_Name2) \
-    if (!g_module_symbol (Module, "MediaInfo"MEDIAINFO_Ansi"_"_Name2, (gpointer*)&MediaInfo_##_Name)) \
+    if (!g_module_symbol (MediaInfo_Module, "MediaInfo" MEDIAINFO_Ansi "_" _Name2, (gpointer*)&MediaInfo_##_Name)) \
         Errors++;
 #define MEDIAINFOLIST_ASSIGN(_Name,_Name2) \
-    if (!g_module_symbol (Module, "MediaInfoList"MEDIAINFO_Ansi"_"_Name2, (gpointer*)&MediaInfoList_##_Name)) \
+    if (!g_module_symbol (MediaInfo_Module, "MediaInfoList" MEDIAINFO_Ansi "_" _Name2, (gpointer*)&MediaInfoList_##_Name)) \
         Errors++;
 #elif defined (_WIN32) || defined (WIN32)
 #define MEDIAINFO_ASSIGN(_Name,_Name2) \
-    MediaInfo_##_Name=(MEDIAINFO_##_Name)GetProcAddress(Module, "MediaInfo"MEDIAINFO_Ansi"_"_Name2); \
+    MediaInfo_##_Name=(MEDIAINFO_##_Name)GetProcAddress(MediaInfo_Module, "MediaInfo" MEDIAINFO_Ansi "_" _Name2); \
     if (MediaInfo_##_Name==NULL) Errors++;
 #define MEDIAINFOLIST_ASSIGN(_Name,_Name2) \
-    MediaInfoList_##_Name=(MEDIAINFOLIST_##_Name)GetProcAddress(Module, "MediaInfoList"MEDIAINFO_Ansi"_"_Name2); \
+    MediaInfoList_##_Name=(MEDIAINFOLIST_##_Name)GetProcAddress(MediaInfo_Module, "MediaInfoList" MEDIAINFO_Ansi "_" _Name2); \
     if (MediaInfoList_##_Name==NULL) Errors++;
 #else
 #define MEDIAINFO_ASSIGN(_Name,_Name2) \
-    MediaInfo_##_Name=(MEDIAINFO_##_Name)dlsym(Module, "MediaInfo"MEDIAINFO_Ansi"_"_Name2); \
+    MediaInfo_##_Name=(MEDIAINFO_##_Name)dlsym(MediaInfo_Module, "MediaInfo" MEDIAINFO_Ansi "_" _Name2); \
     if (MediaInfo_##_Name==NULL) Errors++;
 #define MEDIAINFOLIST_ASSIGN(_Name,_Name2) \
-    MediaInfoList_##_Name=(MEDIAINFOLIST_##_Name)dlsym(Module, "MediaInfoList"MEDIAINFO_Ansi"_"_Name2); \
+    MediaInfoList_##_Name=(MEDIAINFOLIST_##_Name)dlsym(MediaInfo_Module, "MediaInfoList" MEDIAINFO_Ansi "_" _Name2); \
     if (MediaInfoList_##_Name==NULL) Errors++;
 #endif
 
@@ -279,6 +283,7 @@
 typedef size_t (__stdcall *MEDIAINFO_Open_Buffer_Continue)(void*, MediaInfo_int8u* Buffer, size_t Buffer_Size); static MEDIAINFO_Open_Buffer_Continue MediaInfo_Open_Buffer_Continue;
 typedef MediaInfo_int64u (__stdcall *MEDIAINFO_Open_Buffer_Continue_GoTo_Get)(void*); static MEDIAINFO_Open_Buffer_Continue_GoTo_Get MediaInfo_Open_Buffer_Continue_GoTo_Get;
 typedef size_t (__stdcall *MEDIAINFO_Open_Buffer_Finalize)(void*); static MEDIAINFO_Open_Buffer_Finalize MediaInfo_Open_Buffer_Finalize;
+typedef size_t (__stdcall *MEDIAINFO_Open_NextPacket)(void*); static MEDIAINFO_Open_NextPacket MediaInfo_Open_NextPacket;
 typedef void (__stdcall *MEDIAINFO_Close)(void*); static MEDIAINFO_Close MediaInfo_Close;
 typedef void (__stdcall *MEDIAINFOLIST_Close)(void*, size_t); static MEDIAINFOLIST_Close MediaInfoList_Close;
 typedef const MediaInfo_Char* (__stdcall *MEDIAINFO_Inform)(void*, size_t Reserved); static MEDIAINFO_Inform MediaInfo_Inform;
@@ -310,23 +315,23 @@
 
     /* Load library */
     #ifdef MEDIAINFO_GLIBC
-        Module=g_module_open(MEDIAINFODLL_NAME, G_MODULE_BIND_LAZY);
+        MediaInfo_Module=g_module_open(MEDIAINFODLL_NAME, G_MODULE_BIND_LAZY);
     #elif defined (_WIN32) || defined (WIN32)
-        Module=LoadLibrary(_T(MEDIAINFODLL_NAME));
+        MediaInfo_Module=LoadLibrary(MEDIAINFODLL_NAME);
     #else
-        Module=dlopen(MEDIAINFODLL_NAME, RTLD_LAZY);
-        if (!Module)
-            Module=dlopen("./"MEDIAINFODLL_NAME, RTLD_LAZY);
-        if (!Module)
-            Module=dlopen("/usr/local/lib/"MEDIAINFODLL_NAME, RTLD_LAZY);
-        if (!Module)
-            Module=dlopen("/usr/local/lib64/"MEDIAINFODLL_NAME, RTLD_LAZY);
-        if (!Module)
-            Module=dlopen("/usr/lib/"MEDIAINFODLL_NAME, RTLD_LAZY);
-        if (!Module)
-            Module=dlopen("/usr/lib64/"MEDIAINFODLL_NAME, RTLD_LAZY);
+        MediaInfo_Module=dlopen(MEDIAINFODLL_NAME, RTLD_LAZY);
+        if (!MediaInfo_Module)
+            MediaInfo_Module=dlopen("./" MEDIAINFODLL_NAME, RTLD_LAZY);
+        if (!MediaInfo_Module)
+            MediaInfo_Module=dlopen("/usr/local/lib/" MEDIAINFODLL_NAME, RTLD_LAZY);
+        if (!MediaInfo_Module)
+            MediaInfo_Module=dlopen("/usr/local/lib64/" MEDIAINFODLL_NAME, RTLD_LAZY);
+        if (!MediaInfo_Module)
+            MediaInfo_Module=dlopen("/usr/lib/" MEDIAINFODLL_NAME, RTLD_LAZY);
+        if (!MediaInfo_Module)
+            MediaInfo_Module=dlopen("/usr/lib64/" MEDIAINFODLL_NAME, RTLD_LAZY);
     #endif
-    if (!Module)
+    if (!MediaInfo_Module)
         return (size_t)-1;
 
     /* Load methods */
@@ -340,6 +345,7 @@
     MEDIAINFO_ASSIGN    (Open_Buffer_Continue,"Open_Buffer_Continue")
     MEDIAINFO_ASSIGN    (Open_Buffer_Continue_GoTo_Get,"Open_Buffer_Continue_GoTo_Get")
     MEDIAINFO_ASSIGN    (Open_Buffer_Finalize,"Open_Buffer_Finalize")
+    MEDIAINFO_ASSIGN    (Open_NextPacket,"Open_NextPacket")
     MEDIAINFO_ASSIGN    (Close,"Close")
     MEDIAINFOLIST_ASSIGN(Close,"Close")
     MEDIAINFO_ASSIGN    (Inform,"Inform")
@@ -358,7 +364,18 @@
     MEDIAINFOLIST_ASSIGN(Count_Get,"Count_Get")
     MEDIAINFOLIST_ASSIGN(Count_Get_Files,"Count_Get_Files")
     if (Errors>0)
+    {
+        // Unload DLL with errors
+        #ifdef MEDIAINFO_GLIBC
+            g_module_close(MediaInfo_Module);
+        #elif defined (_WIN32) || defined (WIN32)
+            FreeLibrary(MediaInfo_Module);
+        #else
+            dlclose(MediaInfo_Module);
+       #endif
+       MediaInfo_Module=NULL;
        return (size_t)-1;
+    }
 
     Module_Count++;
     return (size_t)1;
@@ -366,7 +383,7 @@
 
 static size_t MediaInfoDLL_IsLoaded()
 {
-    if (Module)
+    if (MediaInfo_Module)
         return 1;
     else
         return 0;
@@ -379,13 +396,13 @@
         return;
 
     #ifdef MEDIAINFO_GLIBC
-        g_module_close(Module);
+        g_module_close(MediaInfo_Module);
     #elif defined (_WIN32) || defined (WIN32)
-        FreeLibrary(Module);
+        FreeLibrary(MediaInfo_Module);
     #else
-        dlclose(Module);
+        dlclose(MediaInfo_Module);
     #endif
-    Module=NULL;
+    MediaInfo_Module=NULL;
 }
 
 #ifdef __cplusplus
@@ -409,8 +426,8 @@
 
 //---------------------------------------------------------------------------
 //MediaInfo_Char types
-#undef  _T
-#define _T(__x)     __T(__x)
+#undef  __T
+#define __T(__x)    __T(__x)
 #if defined(UNICODE) || defined (_UNICODE)
     typedef wchar_t Char;
     #undef  __T
@@ -422,8 +439,10 @@
 #endif
 typedef std::basic_string<Char>        String;
 typedef std::basic_stringstream<Char>  StringStream;
-typedef std::basic_istringstream<Char> tiStringStream;
-typedef std::basic_ostringstream<Char> toStringStream;
+typedef std::basic_istringstream<Char> iStringStream;
+typedef std::basic_ostringstream<Char> oStringStream;
+typedef std::basic_istringstream<Char> tiStringStream; // Legacy
+typedef std::basic_ostringstream<Char> toStringStream; //Legacy
 const size_t Error=(size_t)(-1);
 //---------------------------------------------------------------------------
 
@@ -477,7 +496,7 @@
     FileOption_Max          =0x04
 };
 
-const String Unable_Load_DLL=_T("Unable to load ")_T(MEDIAINFODLL_NAME);
+const String Unable_Load_DLL=__T("Unable to load ")MEDIAINFODLL_NAME;
 #define MEDIAINFO_TEST_VOID \
     if (!IsReady()) return
 #define MEDIAINFO_TEST_INT \
@@ -485,14 +504,14 @@
 #define MEDIAINFO_TEST_STRING \
     if (!IsReady()) return Unable_Load_DLL
 #define MEDIAINFO_TEST_STRING_STATIC \
-    if (!Module) return Unable_Load_DLL
+    if (!MediaInfo_Module) return Unable_Load_DLL
 
 //---------------------------------------------------------------------------
 class MediaInfo
 {
 public :
-    MediaInfo ()                {if (!Module) MediaInfoDLL_Load(); if (!Module) {Handle=NULL; return;}; Handle=MediaInfo_New();};
-    ~MediaInfo ()               {MEDIAINFO_TEST_VOID; MediaInfo_Delete(Handle);};
+    MediaInfo ()        {if (!MediaInfo_Module) MediaInfoDLL_Load(); if (!MediaInfo_Module) {Handle=NULL; return;}; Handle=MediaInfo_New();};
+    ~MediaInfo ()       {MEDIAINFO_TEST_VOID; MediaInfo_Delete(Handle);};
 
     //File
     size_t Open (const String &File) {MEDIAINFO_TEST_INT; return MediaInfo_Open(Handle, File.c_str());};
@@ -500,6 +519,7 @@
     size_t Open_Buffer_Continue (MediaInfo_int8u* Buffer, size_t Buffer_Size) {MEDIAINFO_TEST_INT; return MediaInfo_Open_Buffer_Continue(Handle, Buffer, Buffer_Size);};
     MediaInfo_int64u Open_Buffer_Continue_GoTo_Get () {MEDIAINFO_TEST_INT; return MediaInfo_Open_Buffer_Continue_GoTo_Get(Handle);};
     size_t Open_Buffer_Finalize () {MEDIAINFO_TEST_INT; return MediaInfo_Open_Buffer_Finalize(Handle);};
+    size_t Open_NextPacket () {MEDIAINFO_TEST_INT; return MediaInfo_Open_NextPacket(Handle);};
     //size_t Save () {MEDIAINFO_TEST_INT; return MediaInfo_Save(Handle);};
     void Close () {MEDIAINFO_TEST_VOID; return MediaInfo_Close(Handle);};
 
@@ -507,16 +527,16 @@
     String Inform ()  {MEDIAINFO_TEST_STRING; return MediaInfo_Inform(Handle, 0);};
     String Get (stream_t StreamKind, size_t StreamNumber, size_t Parameter, info_t InfoKind=Info_Text)  {MEDIAINFO_TEST_STRING; return MediaInfo_GetI (Handle, (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter, (MediaInfo_info_C)InfoKind);};
     String Get (stream_t StreamKind, size_t StreamNumber, const String &Parameter, info_t InfoKind=Info_Text, info_t SearchKind=Info_Name)  {MEDIAINFO_TEST_STRING; return MediaInfo_Get (Handle, (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter.c_str(), (MediaInfo_info_C)InfoKind, (MediaInfo_info_C)SearchKind);};
-    //size_t Set (const String &ToSet, stream_t StreamKind, size_t StreamNumber, size_t Parameter, const String &OldValue=_T(""))  {MEDIAINFO_TEST_INT; return MediaInfo_SetI (Handle, ToSet.c_str(), (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter, OldValue.c_str());};
-    //size_t Set (const String &ToSet, stream_t StreamKind, size_t StreamNumber, const String &Parameter, const String &OldValue=_T(""))  {MEDIAINFO_TEST_INT; return MediaInfo_Set (Handle, ToSet.c_str(), (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter.c_str(), OldValue.c_str());};
+    //size_t Set (const String &ToSet, stream_t StreamKind, size_t StreamNumber, size_t Parameter, const String &OldValue=__T(""))  {MEDIAINFO_TEST_INT; return MediaInfo_SetI (Handle, ToSet.c_str(), (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter, OldValue.c_str());};
+    //size_t Set (const String &ToSet, stream_t StreamKind, size_t StreamNumber, const String &Parameter, const String &OldValue=__T(""))  {MEDIAINFO_TEST_INT; return MediaInfo_Set (Handle, ToSet.c_str(), (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter.c_str(), OldValue.c_str());};
     size_t Output_Buffer_Get (const String &Value) {return MediaInfo_Output_Buffer_Get(Handle, Value.c_str());}
     size_t Output_Buffer_Get (size_t Pos) {return MediaInfo_Output_Buffer_GetI(Handle, Pos);}
-    String        Option (const String &Option, const String &Value=_T(""))  {MEDIAINFO_TEST_STRING; return MediaInfo_Option (Handle, Option.c_str(), Value.c_str());};
-    static String Option_Static (const String &Option, const String &Value=_T(""))  {MEDIAINFO_TEST_STRING_STATIC; return MediaInfo_Option (NULL, Option.c_str(), Value.c_str());};
-    size_t                  State_Get ()  {MEDIAINFO_TEST_INT; return MediaInfo_State_Get(Handle);};
-    size_t                  Count_Get (stream_t StreamKind, size_t StreamNumber=(size_t)-1)  {MEDIAINFO_TEST_INT; return MediaInfo_Count_Get(Handle, (MediaInfo_stream_C)StreamKind, StreamNumber);};
+    String        Option (const String &Option, const String &Value=__T(""))  {MEDIAINFO_TEST_STRING; return MediaInfo_Option (Handle, Option.c_str(), Value.c_str());};
+    static String Option_Static (const String &Option, const String &Value=__T(""))  {if (!MediaInfo_Module) MediaInfoDLL_Load(); MEDIAINFO_TEST_STRING_STATIC; return MediaInfo_Option (NULL, Option.c_str(), Value.c_str());};
+    size_t        State_Get () {MEDIAINFO_TEST_INT; return MediaInfo_State_Get(Handle);};
+    size_t        Count_Get (stream_t StreamKind, size_t StreamNumber=(size_t)-1)  {MEDIAINFO_TEST_INT; return MediaInfo_Count_Get(Handle, (MediaInfo_stream_C)StreamKind, StreamNumber);};
 
-    bool IsReady() {return (Handle && Module)?true:false;}
+    bool IsReady() {return (Handle && MediaInfo_Module)?true:false;}
 
 private :
     void* Handle;
@@ -525,8 +545,8 @@
 class MediaInfoList
 {
 public :
-    MediaInfoList ()                {MediaInfoDLL_Load(); if (!MediaInfoDLL_IsLoaded()) {Handle=NULL; return;}; Handle=MediaInfoList_New();};
-    ~MediaInfoList ()               {MEDIAINFO_TEST_VOID; MediaInfoList_Delete(Handle); MediaInfoDLL_UnLoad();};
+    MediaInfoList ()        {MediaInfoDLL_Load(); if (!MediaInfoDLL_IsLoaded()) {Handle=NULL; return;}; Handle=MediaInfoList_New();};
+    ~MediaInfoList ()       {MEDIAINFO_TEST_VOID; MediaInfoList_Delete(Handle); MediaInfoDLL_UnLoad();};
 
     //File
     size_t Open (const String &File, const fileoptions_t Options=FileOption_Nothing) {MEDIAINFO_TEST_INT; return MediaInfoList_Open(Handle, File.c_str(), (MediaInfo_fileoptions_C)Options);};
@@ -537,15 +557,15 @@
     String Inform (size_t FilePos=(size_t)-1)  {MEDIAINFO_TEST_STRING; return MediaInfoList_Inform(Handle, FilePos, 0);};
     String Get (size_t FilePos, stream_t StreamKind, size_t StreamNumber, size_t Parameter, info_t InfoKind=Info_Text)  {MEDIAINFO_TEST_STRING; return MediaInfoList_GetI (Handle, FilePos, (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter, (MediaInfo_info_C)InfoKind);};
     String Get (size_t FilePos, stream_t StreamKind, size_t StreamNumber, const String &Parameter, info_t InfoKind=Info_Text, info_t SearchKind=Info_Name)  {MEDIAINFO_TEST_STRING; return MediaInfoList_Get (Handle, FilePos, (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter.c_str(), (MediaInfo_info_C)InfoKind, (MediaInfo_info_C)SearchKind);};
-    //size_t Set (const String &ToSet, size_t FilePos, stream_t StreamKind, size_t StreamNumber, size_t Parameter, const String &OldValue=_T(""))  {MEDIAINFO_TEST_INT; return MediaInfoList_SetI (Handle, ToSet.c_str(), FilePos, (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter, OldValue.c_str());};
-    //size_t Set (const String &ToSet, size_t FilePos, stream_t StreamKind, size_t StreamNumber, const String &Parameter, const String &OldValue=_T(""))  {MEDIAINFO_TEST_INT; return MediaInfoList_Set (Handle, ToSet.c_str(), FilePos, (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter.c_str(), OldValue.c_str());};
-    String        Option (const String &Option, const String &Value=_T(""))  {MEDIAINFO_TEST_STRING; return MediaInfoList_Option (Handle, Option.c_str(), Value.c_str());};
-    static String Option_Static (const String &Option, const String &Value=_T(""))  {MEDIAINFO_TEST_STRING_STATIC; return MediaInfoList_Option (NULL, Option.c_str(), Value.c_str());};
+    //size_t Set (const String &ToSet, size_t FilePos, stream_t StreamKind, size_t StreamNumber, size_t Parameter, const String &OldValue=__T(""))  {MEDIAINFO_TEST_INT; return MediaInfoList_SetI (Handle, ToSet.c_str(), FilePos, (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter, OldValue.c_str());};
+    //size_t Set (const String &ToSet, size_t FilePos, stream_t StreamKind, size_t StreamNumber, const String &Parameter, const String &OldValue=__T(""))  {MEDIAINFO_TEST_INT; return MediaInfoList_Set (Handle, ToSet.c_str(), FilePos, (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter.c_str(), OldValue.c_str());};
+    String        Option (const String &Option, const String &Value=__T(""))  {MEDIAINFO_TEST_STRING; return MediaInfoList_Option (Handle, Option.c_str(), Value.c_str());};
+    static String Option_Static (const String &Option, const String &Value=__T(""))  {MEDIAINFO_TEST_STRING_STATIC; return MediaInfoList_Option (NULL, Option.c_str(), Value.c_str());};
     size_t        State_Get ()  {MEDIAINFO_TEST_INT; return MediaInfoList_State_Get(Handle);};
     size_t        Count_Get (size_t FilePos, stream_t StreamKind, size_t StreamNumber=(size_t)-1)  {MEDIAINFO_TEST_INT; return MediaInfoList_Count_Get(Handle, FilePos, (MediaInfo_stream_C)StreamKind, StreamNumber);};
     size_t        Count_Get ()  {MEDIAINFO_TEST_INT; return MediaInfoList_Count_Get_Files(Handle);};
 
-    bool IsReady() {return (Handle && Module)?true:false;}
+    bool IsReady() {return (Handle && MediaInfo_Module)?true:false;}
 
 private :
     void* Handle;

libmediainfo_0.7.34.tar.bz2/Source/MediaInfoDLL/MediaInfoDLL.py -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfoDLL/MediaInfoDLL.py Changed

@@ -1,26 +1,26 @@
 ## MediaInfoDLL - All info about media files, for DLL
 #  Copyright (C) 2007-2009 Jerome Martinez, Zen@MediaArea.net
-# 
+#
 #  This library is free software: you can redistribute it and/or modify it
 #  under the terms of the GNU Lesser General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  any later version.
-# 
+#
 #  This library is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #  GNU Lesser General Public License for more details.
-# 
+#
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with this library. If not, see <http://www.gnu.org/licenses/>.
-# 
+#
 # +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 # +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-# 
+#
 #  Public DLL interface implementation
 #  Wrapper for MediaInfo Library
 #  Please see MediaInfo.h for help
-# 
+#
 # +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
 #
 # Converted to python module by Petr Kaderabek
@@ -31,372 +31,372 @@
 import os
 from ctypes import *
 if os.name == "nt" or os.name == "dos" or os.name == "os2" or os.name == "ce":
-	MediaInfoDLL_Handler = windll.MediaInfo
-	MustUseAnsi = 0
+    MediaInfoDLL_Handler = windll.MediaInfo
+    MustUseAnsi = 0
 else:
-	MediaInfoDLL_Handler = CDLL("libmediainfo.so.0")
-	MustUseAnsi = 1
+    MediaInfoDLL_Handler = CDLL("libmediainfo.so.0")
+    MustUseAnsi = 1
 
 
 # types --> C Python:
-# size_t			c_size_t
-# unsigned char*	c_char_p
-# enum				c_size_t
-# const wchar_t*	c_wchar_p,
-# NULL				None,
-# these functions need strings in unicode format 
+# size_t            c_size_t
+# unsigned char*    c_char_p
+# enum              c_size_t
+# const wchar_t*    c_wchar_p,
+# NULL              None,
+# these functions need strings in unicode format
 
 
 
 
 class Stream:
-	General, Video, Audio, Text, Chapters, Image, Menu, Max = range(8)
+    General, Video, Audio, Text, Chapters, Image, Menu, Max = range(8)
 
 class Info:
-	Name, Text, Measure, Options, Name_Text, Measure_Text, Info, HowTo, Max = range(9)
+    Name, Text, Measure, Options, Name_Text, Measure_Text, Info, HowTo, Max = range(9)
 
 class InfoOption:
-	ShowInInform, Reserved, ShowInSupported, TypeOfValue, Max = range(5)
+    ShowInInform, Reserved, ShowInSupported, TypeOfValue, Max = range(5)
 
 class FileOptions:
-	Nothing, Recursive, CloseAll, xxNonexx_3, Max = range(5)
+    Nothing, Recursive, CloseAll, xxNonexx_3, Max = range(5)
 
 
 
 class MediaInfo:
 
-	#MEDIAINFO_EXP void*	     __stdcall MediaInfo_New (); /*you must ALWAYS call MediaInfo_Delete(Handle) in order to free memory*/
-	#/** @brief A 'new' MediaInfo interface (with a quick init of useful options : "**VERSION**;**APP_NAME**;**APP_VERSION**", but without debug information, use it only if you know what you do), return a Handle, don't forget to delete it after using it*/
-	MediaInfo_New = MediaInfoDLL_Handler.MediaInfo_New
-	MediaInfo_New.argtypes = []  
-	MediaInfo_New.restype  = c_void_p
-
-	#MEDIAINFO_EXP void*	     __stdcall MediaInfo_New_Quick (const wchar_t* File, const wchar_t* Options); /*you must ALWAYS call MediaInfo_Delete(Handle) in order to free memory*/
-	MediaInfo_New_Quick = MediaInfoDLL_Handler.MediaInfo_New_Quick
-	MediaInfo_New_Quick.argtypes = [c_wchar_p, c_wchar_p]
-	MediaInfo_New_Quick.restype  = c_void_p
-	MediaInfoA_New_Quick = MediaInfoDLL_Handler.MediaInfoA_New_Quick
-	MediaInfoA_New_Quick.argtypes = [c_char_p, c_char_p]
-	MediaInfoA_New_Quick.restype  = c_void_p
-
-	#/** @brief Delete a MediaInfo interface*/
-	#MEDIAINFO_EXP void	      __stdcall MediaInfo_Delete (void* Handle);
-	MediaInfo_Delete = MediaInfoDLL_Handler.MediaInfo_Delete
-	MediaInfo_Delete.argtypes = [c_void_p]
-	MediaInfo_Delete.restype  = None
-
-	#/** @brief Wrapper for MediaInfoLib::MediaInfo::Open (with a filename)*/
-	#MEDIAINFO_EXP size_t	    __stdcall MediaInfo_Open (void* Handle, const wchar_t* File);
-	MediaInfo_Open = MediaInfoDLL_Handler.MediaInfo_Open
-	MediaInfo_Open.argtype = [c_void_p, c_wchar_p]
-	MediaInfo_Open.restype = c_size_t
-	MediaInfoA_Open = MediaInfoDLL_Handler.MediaInfoA_Open
-	MediaInfoA_Open.argtype = [c_void_p, c_char_p]
-	MediaInfoA_Open.restype = c_size_t
-
-	#/** @brief Wrapper for MediaInfoLib::MediaInfo::Open (with a buffer) */
-	#MEDIAINFO_EXP size_t	    __stdcall MediaInfo_Open_Buffer (void* Handle, const unsigned char* Begin, size_t Begin_Size, const unsigned char* End, size_t End_Size); /*return Handle*/
-	MediaInfo_Open_Buffer = MediaInfoDLL_Handler.MediaInfo_Open_Buffer
-	MediaInfo_Open_Buffer.argtype = [c_void_p, c_void_p, c_size_t, c_void_p, c_size_t]  
-	MediaInfo_Open_Buffer.restype = c_size_t
-
-	#/** @brief Wrapper for MediaInfoLib::MediaInfo::Save */
-	#MEDIAINFO_EXP size_t	    __stdcall MediaInfo_Save (void* Handle);
-	MediaInfo_Save = MediaInfoDLL_Handler.MediaInfo_Save
-	MediaInfo_Save.argtype = [c_void_p]
-	MediaInfo_Save.restype = c_size_t   
-
-	#/** @brief Wrapper for MediaInfoLib::MediaInfo::Close */
-	#MEDIAINFO_EXP void	      __stdcall MediaInfo_Close (void* Handle);
-	MediaInfo_Close = MediaInfoDLL_Handler.MediaInfo_Close
-	MediaInfo_Close.argtype = [c_void_p]
-	MediaInfo_Close.restype = None
-
-	#/** @brief Wrapper for MediaInfoLib::MediaInfo::Inform */
-	#MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfo_Inform (void* Handle, size_t Reserved); /*Default : Reserved=0*/
-	MediaInfo_Inform = MediaInfoDLL_Handler.MediaInfo_Inform
-	MediaInfo_Inform.argtype = [c_void_p, c_size_t]
-	MediaInfo_Inform.restype = c_wchar_p
-	MediaInfoA_Inform = MediaInfoDLL_Handler.MediaInfoA_Inform
-	MediaInfoA_Inform.argtype = [c_void_p, c_size_t]
-	MediaInfoA_Inform.restype = c_char_p
-
-	#/** @brief Wrapper for MediaInfoLib::MediaInfo::Get */
-	#MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfo_GetI (void* Handle, MediaInfo_stream_C StreamKind, size_t StreamNumber, size_t Parameter, MediaInfo_info_C InfoKind); /*Default : InfoKind=Info_Text*/
-	MediaInfo_GetI = MediaInfoDLL_Handler.MediaInfo_GetI
-	MediaInfo_GetI.argtype = [c_void_p, c_size_t, c_size_t, c_size_t, c_size_t]
-	MediaInfo_GetI.restype = c_wchar_p
-	MediaInfoA_GetI = MediaInfoDLL_Handler.MediaInfoA_GetI
-	MediaInfoA_GetI.argtype = [c_void_p, c_size_t, c_size_t, c_size_t, c_size_t]
-	MediaInfoA_GetI.restype = c_char_p
-
-	#/** @brief Wrapper for MediaInfoLib::MediaInfo::Get */
-	#MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfo_Get (void* Handle, MediaInfo_stream_C StreamKind, size_t StreamNumber, const wchar_t* Parameter, MediaInfo_info_C InfoKind, MediaInfo_info_C SearchKind); /*Default : InfoKind=Info_Text, SearchKind=Info_Name*/
-	MediaInfo_Get = MediaInfoDLL_Handler.MediaInfo_Get
-	MediaInfo_Get.argtype = [c_void_p, c_size_t, c_size_t, c_wchar_p, c_size_t, c_size_t]
-	MediaInfo_Get.restype = c_wchar_p
-	MediaInfoA_Get = MediaInfoDLL_Handler.MediaInfoA_Get
-	MediaInfoA_Get.argtype = [c_void_p, c_size_t, c_size_t, c_wchar_p, c_size_t, c_size_t]
-	MediaInfoA_Get.restype = c_char_p
-
-	#/** @brief Wrapper for MediaInfoLib::MediaInfo::Set */
-	#MEDIAINFO_EXP size_t	    __stdcall MediaInfo_SetI (void* Handle, const wchar_t* ToSet, MediaInfo_stream_C StreamKind, size_t StreamNumber, size_t Parameter, const wchar_t* OldParameter);
-	MediaInfo_SetI = MediaInfoDLL_Handler.MediaInfo_SetI
-	MediaInfo_SetI.argtype = [c_void_p, c_wchar_p, c_size_t, c_size_t, c_size_t, c_wchar_p]
-	MediaInfo_SetI.restype = c_void_p
-	MediaInfoA_SetI = MediaInfoDLL_Handler.MediaInfoA_SetI
-	MediaInfoA_SetI.argtype = [c_void_p, c_char_p, c_size_t, c_size_t, c_size_t, c_wchar_p]
-	MediaInfoA_SetI.restype = c_void_p
-
-	#/** @brief Wrapper for MediaInfoLib::MediaInfo::Set */
-	#MEDIAINFO_EXP size_t	    __stdcall MediaInfo_Set (void* Handle, const wchar_t* ToSet, MediaInfo_stream_C StreamKind, size_t StreamNumber, const wchar_t* Parameter, const wchar_t* OldParameter);
-	MediaInfo_Set = MediaInfoDLL_Handler.MediaInfo_Set
-	MediaInfo_Set.argtype = [c_void_p, c_wchar_p, c_size_t, c_size_t, c_wchar_p, c_wchar_p]
-	MediaInfo_Set.restype = c_size_t
-	MediaInfoA_Set = MediaInfoDLL_Handler.MediaInfoA_Set
-	MediaInfoA_Set.argtype = [c_void_p, c_char_p, c_size_t, c_size_t, c_wchar_p, c_wchar_p]
-	MediaInfoA_Set.restype = c_size_t
-
-	#/** @brief Wrapper for MediaInfoLib::MediaInfo::Option */
-	#MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfo_Option (void* Handle, const wchar_t* Option, const wchar_t* Value);
-	MediaInfo_Option = MediaInfoDLL_Handler.MediaInfo_Option
-	MediaInfo_Option.argtype = [c_void_p, c_wchar_p, c_wchar_p]
-	MediaInfo_Option.restype = c_wchar_p
-	MediaInfoA_Option = MediaInfoDLL_Handler.MediaInfoA_Option
-	MediaInfoA_Option.argtype = [c_void_p, c_char_p, c_char_p]
-	MediaInfoA_Option.restype = c_char_p
-
-	#/** @brief Wrapper for MediaInfoLib::MediaInfo::State_Get */
-	#MEDIAINFO_EXP size_t	    __stdcall MediaInfo_State_Get (void* Handle);
-	MediaInfo_State_Get = MediaInfoDLL_Handler.MediaInfo_State_Get
-	MediaInfo_State_Get.argtype = [c_void_p]
-	MediaInfo_State_Get.restype = c_size_t
-
-	#/** @brief Wrapper for MediaInfoLib::MediaInfo::Count_Get */
-	#MEDIAINFO_EXP size_t	    __stdcall MediaInfo_Count_Get (void* Handle, MediaInfo_stream_C StreamKind, size_t StreamNumber); /*Default : StreamNumber=-1*/
-	MediaInfo_Count_Get = MediaInfoDLL_Handler.MediaInfo_Count_Get
-	MediaInfo_Count_Get.argtype = [c_void_p, c_size_t, c_size_t]
-	MediaInfo_Count_Get.restype = c_size_t
-
-	Handle = c_void_p(0)
-	MustUseAnsi = 0
-
-	#Handling
-	def __init__(self):
-		self.Handle=self.MediaInfo_New()
-		self.MediaInfoA_Option(self.Handle, "CharSet", "UTF-8")
-	def __del__(self):
-		self.MediaInfo_Delete(self.Handle)
-	def Open(self, File):
-		if type(File)==str:
-			return self.MediaInfoA_Open (self.Handle, File);
-		elif MustUseAnsi:
-			return self.MediaInfoA_Open (self.Handle, File.encode("utf-8"));
-		else:
-			return self.MediaInfo_Open (self.Handle, File);
-	def Open_Buffer(self, Begin, Begin_Size, End=None, End_Size=0):
-		return self.MediaInfo_Open_Buffer(self.Handle, Begin, Begin_Size, End, End_Size)
-	def Save(self):
-		return self.MediaInfo_Save(self.Handle)
-	def Close(self):
-		return self.MediaInfo_Close(self.Handle)
-
-	#General information
-	def Inform(self):
-		if MustUseAnsi:
-			return unicode(self.MediaInfoA_Inform(self.Handle, 0), "utf_8") 
-		else:
-			return self.MediaInfo_Inform(self.Handle, 0)
-	def Get(self, StreamKind, StreamNumber, Parameter, InfoKind=Info.Text, SearchKind=Info.Name):
-		if type(Parameter)==str:
-			return unicode(self.MediaInfoA_Get(self.Handle, StreamKind, StreamNumber, Parameter, InfoKind, SearchKind), "utf_8") 
-		elif MustUseAnsi:
-			return unicode(self.MediaInfoA_Get(self.Handle, StreamKind, StreamNumber, Parameter.encode("utf-8"), InfoKind, SearchKind), "utf_8") 
-		else:
-			return self.MediaInfo_Get(self.Handle, StreamKind, StreamNumber, Parameter, InfoKind, SearchKind)
-	def GetI(self, StreamKind, StreamNumber, Parameter, InfoKind=Info.Text):
-		if MustUseAnsi:
-			return unicode(self.MediaInfoA_GetI(self.Handle, StreamKind, StreamNumber, Parameter, InfoKind), "utf_8") 
-		else:
-			return self.MediaInfo_GetI(self.Handle, StreamKind, StreamNumber, Parameter, InfoKind)
-	def Set(self, ToSet, StreamKind, StreamNumber, Parameter, OldParameter=u""):
-		if type(Parameter)==str and type(OldParameter)==unicode:
-			Parameter=Parameter.decode("utf-8")
-		if type(Parameter)==unicode and type(OldParameter)==str:
-			OldParameter=OldParameter.decode("utf-8")
-		if type(Parameter)==str:
-			return self.MediaInfoA_Set(self.Handle, ToSet, StreamKind, StreamNumber, Parameter, OldParameter)
-		elif MustUseAnsi:
-			return self.MediaInfoA_Set(self.Handle, ToSet, StreamKind, StreamNumber, Parameter.encode("utf-8"), OldParameter.encode("utf-8"))
-		else:
-			return self.MediaInfo_Set(self.Handle, ToSet, StreamKind, StreamNumber, Parameter, OldParameter)
-	def SetI(self, ToSet, StreamKind, StreamNumber, Parameter, OldValue):
-		if MustUseAnsi:
-			return self.MediaInfoA_SetI(self.Handle, ToSet, StreamKind, StreamNumber, Parameter, OldValue.encode("utf-8"))
-		else:
-			return self.MediaInfo_SetI(self.Handle, ToSet, StreamKind, StreamNumber, Parameter, OldValue)
-
-	#Options
-	def Option(self, Option, Value=u""):
-		if type(Option)==str and type(Value)==unicode:
-			Option=Option.decode("utf-8")
-		if type(Option)==unicode and type(Value)==str:
-			Value=Value.decode("utf-8")
-		if type(Option)==str:
-			return unicode(self.MediaInfoA_Option(self.Handle, Option.encode("utf-8"), Value.encode("utf-8")), "utf_8") 
-		elif MustUseAnsi:
-			return unicode(self.MediaInfoA_Option(self.Handle, Option.encode("utf-8"), Value.encode("utf-8")), "utf_8") 
-		else:
-			return self.MediaInfo_Option(self.Handle, Option, Value)
-	def Option_Static(self, Option, Value=u""):
-		if type(Option)==str and type(Value)==unicode:
-			Option=Option.decode("utf-8")
-		if type(Option)==unicode and type(Value)==str:
-			Value=Value.decode("utf-8")
-		if type(Option)==str:
-			return unicode(self.MediaInfoA_Option(None, Option, Value), "utf_8") 
-		elif MustUseAnsi:
-			return unicode(self.MediaInfoA_Option(None, Option.encode("utf-8"), Value.encode("utf-8")), "utf_8") 
-		else:
-			return self.MediaInfo_Option(None, Option, Value)
-	def State_Get(self):
-		return self.MediaInfo_State_Get(self.Handle)
-	def Count_Get(self, StreamKind, StreamNumber=-1):
-		return self.MediaInfo_Count_Get(self.Handle, StreamKind, StreamNumber)
+    #MEDIAINFO_EXP void*         __stdcall MediaInfo_New (); /*you must ALWAYS call MediaInfo_Delete(Handle) in order to free memory*/
+    #/** @brief A 'new' MediaInfo interface (with a quick init of useful options : "**VERSION**;**APP_NAME**;**APP_VERSION**", but without debug information, use it only if you know what you do), return a Handle, don't forget to delete it after using it*/
+    MediaInfo_New = MediaInfoDLL_Handler.MediaInfo_New
+    MediaInfo_New.argtypes = []
+    MediaInfo_New.restype  = c_void_p
+
+    #MEDIAINFO_EXP void*         __stdcall MediaInfo_New_Quick (const wchar_t* File, const wchar_t* Options); /*you must ALWAYS call MediaInfo_Delete(Handle) in order to free memory*/
+    MediaInfo_New_Quick = MediaInfoDLL_Handler.MediaInfo_New_Quick
+    MediaInfo_New_Quick.argtypes = [c_wchar_p, c_wchar_p]
+    MediaInfo_New_Quick.restype  = c_void_p
+    MediaInfoA_New_Quick = MediaInfoDLL_Handler.MediaInfoA_New_Quick
+    MediaInfoA_New_Quick.argtypes = [c_char_p, c_char_p]
+    MediaInfoA_New_Quick.restype  = c_void_p
+
+    #/** @brief Delete a MediaInfo interface*/
+    #MEDIAINFO_EXP void       __stdcall MediaInfo_Delete (void* Handle);
+    MediaInfo_Delete = MediaInfoDLL_Handler.MediaInfo_Delete
+    MediaInfo_Delete.argtypes = [c_void_p]
+    MediaInfo_Delete.restype  = None
+
+    #/** @brief Wrapper for MediaInfoLib::MediaInfo::Open (with a filename)*/
+    #MEDIAINFO_EXP size_t       __stdcall MediaInfo_Open (void* Handle, const wchar_t* File);
+    MediaInfo_Open = MediaInfoDLL_Handler.MediaInfo_Open
+    MediaInfo_Open.argtype = [c_void_p, c_wchar_p]
+    MediaInfo_Open.restype = c_size_t
+    MediaInfoA_Open = MediaInfoDLL_Handler.MediaInfoA_Open
+    MediaInfoA_Open.argtype = [c_void_p, c_char_p]
+    MediaInfoA_Open.restype = c_size_t
+
+    #/** @brief Wrapper for MediaInfoLib::MediaInfo::Open (with a buffer) */
+    #MEDIAINFO_EXP size_t       __stdcall MediaInfo_Open_Buffer (void* Handle, const unsigned char* Begin, size_t Begin_Size, const unsigned char* End, size_t End_Size); /*return Handle*/
+    MediaInfo_Open_Buffer = MediaInfoDLL_Handler.MediaInfo_Open_Buffer
+    MediaInfo_Open_Buffer.argtype = [c_void_p, c_void_p, c_size_t, c_void_p, c_size_t]
+    MediaInfo_Open_Buffer.restype = c_size_t
+
+    #/** @brief Wrapper for MediaInfoLib::MediaInfo::Save */
+    #MEDIAINFO_EXP size_t       __stdcall MediaInfo_Save (void* Handle);
+    MediaInfo_Save = MediaInfoDLL_Handler.MediaInfo_Save
+    MediaInfo_Save.argtype = [c_void_p]
+    MediaInfo_Save.restype = c_size_t
+
+    #/** @brief Wrapper for MediaInfoLib::MediaInfo::Close */
+    #MEDIAINFO_EXP void       __stdcall MediaInfo_Close (void* Handle);
+    MediaInfo_Close = MediaInfoDLL_Handler.MediaInfo_Close
+    MediaInfo_Close.argtype = [c_void_p]
+    MediaInfo_Close.restype = None
+
+    #/** @brief Wrapper for MediaInfoLib::MediaInfo::Inform */
+    #MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfo_Inform (void* Handle, size_t Reserved); /*Default : Reserved=0*/
+    MediaInfo_Inform = MediaInfoDLL_Handler.MediaInfo_Inform
+    MediaInfo_Inform.argtype = [c_void_p, c_size_t]
+    MediaInfo_Inform.restype = c_wchar_p
+    MediaInfoA_Inform = MediaInfoDLL_Handler.MediaInfoA_Inform
+    MediaInfoA_Inform.argtype = [c_void_p, c_size_t]
+    MediaInfoA_Inform.restype = c_char_p
+
+    #/** @brief Wrapper for MediaInfoLib::MediaInfo::Get */
+    #MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfo_GetI (void* Handle, MediaInfo_stream_C StreamKind, size_t StreamNumber, size_t Parameter, MediaInfo_info_C InfoKind); /*Default : InfoKind=Info_Text*/
+    MediaInfo_GetI = MediaInfoDLL_Handler.MediaInfo_GetI
+    MediaInfo_GetI.argtype = [c_void_p, c_size_t, c_size_t, c_size_t, c_size_t]
+    MediaInfo_GetI.restype = c_wchar_p
+    MediaInfoA_GetI = MediaInfoDLL_Handler.MediaInfoA_GetI
+    MediaInfoA_GetI.argtype = [c_void_p, c_size_t, c_size_t, c_size_t, c_size_t]
+    MediaInfoA_GetI.restype = c_char_p
+
+    #/** @brief Wrapper for MediaInfoLib::MediaInfo::Get */
+    #MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfo_Get (void* Handle, MediaInfo_stream_C StreamKind, size_t StreamNumber, const wchar_t* Parameter, MediaInfo_info_C InfoKind, MediaInfo_info_C SearchKind); /*Default : InfoKind=Info_Text, SearchKind=Info_Name*/
+    MediaInfo_Get = MediaInfoDLL_Handler.MediaInfo_Get
+    MediaInfo_Get.argtype = [c_void_p, c_size_t, c_size_t, c_wchar_p, c_size_t, c_size_t]
+    MediaInfo_Get.restype = c_wchar_p
+    MediaInfoA_Get = MediaInfoDLL_Handler.MediaInfoA_Get
+    MediaInfoA_Get.argtype = [c_void_p, c_size_t, c_size_t, c_wchar_p, c_size_t, c_size_t]
+    MediaInfoA_Get.restype = c_char_p
+
+    #/** @brief Wrapper for MediaInfoLib::MediaInfo::Set */
+    #MEDIAINFO_EXP size_t       __stdcall MediaInfo_SetI (void* Handle, const wchar_t* ToSet, MediaInfo_stream_C StreamKind, size_t StreamNumber, size_t Parameter, const wchar_t* OldParameter);
+    MediaInfo_SetI = MediaInfoDLL_Handler.MediaInfo_SetI
+    MediaInfo_SetI.argtype = [c_void_p, c_wchar_p, c_size_t, c_size_t, c_size_t, c_wchar_p]
+    MediaInfo_SetI.restype = c_void_p
+    MediaInfoA_SetI = MediaInfoDLL_Handler.MediaInfoA_SetI
+    MediaInfoA_SetI.argtype = [c_void_p, c_char_p, c_size_t, c_size_t, c_size_t, c_wchar_p]
+    MediaInfoA_SetI.restype = c_void_p
+
+    #/** @brief Wrapper for MediaInfoLib::MediaInfo::Set */
+    #MEDIAINFO_EXP size_t       __stdcall MediaInfo_Set (void* Handle, const wchar_t* ToSet, MediaInfo_stream_C StreamKind, size_t StreamNumber, const wchar_t* Parameter, const wchar_t* OldParameter);
+    MediaInfo_Set = MediaInfoDLL_Handler.MediaInfo_Set
+    MediaInfo_Set.argtype = [c_void_p, c_wchar_p, c_size_t, c_size_t, c_wchar_p, c_wchar_p]
+    MediaInfo_Set.restype = c_size_t
+    MediaInfoA_Set = MediaInfoDLL_Handler.MediaInfoA_Set
+    MediaInfoA_Set.argtype = [c_void_p, c_char_p, c_size_t, c_size_t, c_wchar_p, c_wchar_p]
+    MediaInfoA_Set.restype = c_size_t
+
+    #/** @brief Wrapper for MediaInfoLib::MediaInfo::Option */
+    #MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfo_Option (void* Handle, const wchar_t* Option, const wchar_t* Value);
+    MediaInfo_Option = MediaInfoDLL_Handler.MediaInfo_Option
+    MediaInfo_Option.argtype = [c_void_p, c_wchar_p, c_wchar_p]
+    MediaInfo_Option.restype = c_wchar_p
+    MediaInfoA_Option = MediaInfoDLL_Handler.MediaInfoA_Option
+    MediaInfoA_Option.argtype = [c_void_p, c_char_p, c_char_p]
+    MediaInfoA_Option.restype = c_char_p
+
+    #/** @brief Wrapper for MediaInfoLib::MediaInfo::State_Get */
+    #MEDIAINFO_EXP size_t       __stdcall MediaInfo_State_Get (void* Handle);
+    MediaInfo_State_Get = MediaInfoDLL_Handler.MediaInfo_State_Get
+    MediaInfo_State_Get.argtype = [c_void_p]
+    MediaInfo_State_Get.restype = c_size_t
+
+    #/** @brief Wrapper for MediaInfoLib::MediaInfo::Count_Get */
+    #MEDIAINFO_EXP size_t       __stdcall MediaInfo_Count_Get (void* Handle, MediaInfo_stream_C StreamKind, size_t StreamNumber); /*Default : StreamNumber=-1*/
+    MediaInfo_Count_Get = MediaInfoDLL_Handler.MediaInfo_Count_Get
+    MediaInfo_Count_Get.argtype = [c_void_p, c_size_t, c_size_t]
+    MediaInfo_Count_Get.restype = c_size_t
+
+    Handle = c_void_p(0)
+    MustUseAnsi = 0
+
+    #Handling
+    def __init__(self):
+        self.Handle=self.MediaInfo_New()
+        self.MediaInfoA_Option(self.Handle, "CharSet", "UTF-8")
+    def __del__(self):
+        self.MediaInfo_Delete(self.Handle)
+    def Open(self, File):
+        if type(File)==str:
+            return self.MediaInfoA_Open (self.Handle, File);
+        elif MustUseAnsi:
+            return self.MediaInfoA_Open (self.Handle, File.encode("utf-8"));
+        else:
+            return self.MediaInfo_Open (self.Handle, File);
+    def Open_Buffer(self, Begin, Begin_Size, End=None, End_Size=0):
+        return self.MediaInfo_Open_Buffer(self.Handle, Begin, Begin_Size, End, End_Size)
+    def Save(self):
+        return self.MediaInfo_Save(self.Handle)
+    def Close(self):
+        return self.MediaInfo_Close(self.Handle)
+
+    #General information
+    def Inform(self):
+        if MustUseAnsi:
+            return unicode(self.MediaInfoA_Inform(self.Handle, 0), "utf_8")
+        else:
+            return self.MediaInfo_Inform(self.Handle, 0)
+    def Get(self, StreamKind, StreamNumber, Parameter, InfoKind=Info.Text, SearchKind=Info.Name):
+        if type(Parameter)==str:
+            return unicode(self.MediaInfoA_Get(self.Handle, StreamKind, StreamNumber, Parameter, InfoKind, SearchKind), "utf_8")
+        elif MustUseAnsi:
+            return unicode(self.MediaInfoA_Get(self.Handle, StreamKind, StreamNumber, Parameter.encode("utf-8"), InfoKind, SearchKind), "utf_8")
+        else:
+            return self.MediaInfo_Get(self.Handle, StreamKind, StreamNumber, Parameter, InfoKind, SearchKind)
+    def GetI(self, StreamKind, StreamNumber, Parameter, InfoKind=Info.Text):
+        if MustUseAnsi:
+            return unicode(self.MediaInfoA_GetI(self.Handle, StreamKind, StreamNumber, Parameter, InfoKind), "utf_8")
+        else:
+            return self.MediaInfo_GetI(self.Handle, StreamKind, StreamNumber, Parameter, InfoKind)
+    def Set(self, ToSet, StreamKind, StreamNumber, Parameter, OldParameter=u""):
+        if type(Parameter)==str and type(OldParameter)==unicode:
+            Parameter=Parameter.decode("utf-8")
+        if type(Parameter)==unicode and type(OldParameter)==str:
+            OldParameter=OldParameter.decode("utf-8")
+        if type(Parameter)==str:
+            return self.MediaInfoA_Set(self.Handle, ToSet, StreamKind, StreamNumber, Parameter, OldParameter)
+        elif MustUseAnsi:
+            return self.MediaInfoA_Set(self.Handle, ToSet, StreamKind, StreamNumber, Parameter.encode("utf-8"), OldParameter.encode("utf-8"))
+        else:
+            return self.MediaInfo_Set(self.Handle, ToSet, StreamKind, StreamNumber, Parameter, OldParameter)
+    def SetI(self, ToSet, StreamKind, StreamNumber, Parameter, OldValue):
+        if MustUseAnsi:
+            return self.MediaInfoA_SetI(self.Handle, ToSet, StreamKind, StreamNumber, Parameter, OldValue.encode("utf-8"))
+        else:
+            return self.MediaInfo_SetI(self.Handle, ToSet, StreamKind, StreamNumber, Parameter, OldValue)
+
+    #Options
+    def Option(self, Option, Value=u""):
+        if type(Option)==str and type(Value)==unicode:
+            Option=Option.decode("utf-8")
+        if type(Option)==unicode and type(Value)==str:
+            Value=Value.decode("utf-8")
+        if type(Option)==str:
+            return unicode(self.MediaInfoA_Option(self.Handle, Option.encode("utf-8"), Value.encode("utf-8")), "utf_8")
+        elif MustUseAnsi:
+            return unicode(self.MediaInfoA_Option(self.Handle, Option.encode("utf-8"), Value.encode("utf-8")), "utf_8")
+        else:
+            return self.MediaInfo_Option(self.Handle, Option, Value)
+    def Option_Static(self, Option, Value=u""):
+        if type(Option)==str and type(Value)==unicode:
+            Option=Option.decode("utf-8")
+        if type(Option)==unicode and type(Value)==str:
+            Value=Value.decode("utf-8")
+        if type(Option)==str:
+            return unicode(self.MediaInfoA_Option(None, Option, Value), "utf_8")
+        elif MustUseAnsi:
+            return unicode(self.MediaInfoA_Option(None, Option.encode("utf-8"), Value.encode("utf-8")), "utf_8")
+        else:
+            return self.MediaInfo_Option(None, Option, Value)
+    def State_Get(self):
+        return self.MediaInfo_State_Get(self.Handle)
+    def Count_Get(self, StreamKind, StreamNumber=-1):
+        return self.MediaInfo_Count_Get(self.Handle, StreamKind, StreamNumber)
 
 
 class MediaInfoList:
-	#/** @brief A 'new' MediaInfoList interface, return a Handle, don't forget to delete it after using it*/
-	#MEDIAINFO_EXP void*		     __stdcall MediaInfoList_New (); /*you must ALWAYS call MediaInfoList_Delete(Handle) in order to free memory*/
-	MediaInfoList_New = MediaInfoDLL_Handler.MediaInfoList_New
-	MediaInfoList_New.argtype = []
-	MediaInfoList_New.restype = c_void_p
-
-	#/** @brief A 'new' MediaInfoList interface (with a quick init of useful options : "**VERSION**;**APP_NAME**;**APP_VERSION**", but without debug information, use it only if you know what you do), return a Handle, don't forget to delete it after using it*/
-	#MEDIAINFO_EXP void*		     __stdcall MediaInfoList_New_Quick (const wchar_t* Files, const wchar_t* Config); /*you must ALWAYS call MediaInfoList_Delete(Handle) in order to free memory*/
-	MediaInfoList_New_Quick = MediaInfoDLL_Handler.MediaInfoList_New_Quick
-	MediaInfoList_New_Quick.argtype = [c_wchar_p, c_wchar_p]
-	MediaInfoList_New_Quick.restype = c_void_p
-
-	#/** @brief Delete a MediaInfoList interface*/
-	#MEDIAINFO_EXP void		      __stdcall MediaInfoList_Delete (void* Handle);
-	MediaInfoList_Delete = MediaInfoDLL_Handler.MediaInfoList_Delete
-	MediaInfoList_Delete.argtype = [c_void_p]
-
-	#/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Open (with a filename)*/
-	#MEDIAINFO_EXP size_t		    __stdcall MediaInfoList_Open (void* Handle, const wchar_t* Files, const MediaInfo_fileoptions_C Options); /*Default : Options=MediaInfo_FileOption_Nothing*/
-	MediaInfoList_Open = MediaInfoDLL_Handler.MediaInfoList_Open
-	MediaInfoList_Open.argtype = [c_void_p, c_wchar_p, c_void_p]
-	MediaInfoList_Open.restype = c_void_p
-
-	#/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Open (with a buffer) */
-	#MEDIAINFO_EXP size_t		    __stdcall MediaInfoList_Open_Buffer (void* Handle, const unsigned char* Begin, size_t Begin_Size, const unsigned char* End, size_t End_Size); /*return Handle*/
-	MediaInfoList_Open_Buffer = MediaInfoDLL_Handler.MediaInfoList_Open_Buffer
-	MediaInfoList_Open_Buffer.argtype = [c_void_p, c_void_p, c_void_p, c_void_p, c_void_p]
-	MediaInfoList_Open_Buffer.restype = c_void_p
-
-	#/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Save */
-	#MEDIAINFO_EXP size_t		    __stdcall MediaInfoList_Save (void* Handle, size_t FilePos);
-	MediaInfoList_Save = MediaInfoDLL_Handler.MediaInfoList_Save
-	MediaInfoList_Save.argtype = [c_void_p, c_void_p]
-	MediaInfoList_Save.restype = c_void_p
-
-	#/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Close */
-	#MEDIAINFO_EXP void		      __stdcall MediaInfoList_Close (void* Handle, size_t FilePos);
-	MediaInfoList_Close = MediaInfoDLL_Handler.MediaInfoList_Close
-	MediaInfoList_Close.argtype = [c_void_p, c_void_p]
-
-	#/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Inform */
-	#MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfoList_Inform (void* Handle, size_t FilePos, size_t Reserved); /*Default : Reserved=0*/
-	MediaInfoList_Inform = MediaInfoDLL_Handler.MediaInfoList_Inform
-	MediaInfoList_Inform.argtype = [c_void_p, c_void_p, c_void_p]
-	MediaInfoList_Inform.restype = c_wchar_p
-
-	#/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Get */
-	#MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfoList_GetI (void* Handle, size_t FilePos, MediaInfo_stream_C StreamKind, size_t StreamNumber, size_t Parameter, MediaInfo_info_C InfoKind); /*Default : InfoKind=Info_Text*/
-	MediaInfoList_GetI = MediaInfoDLL_Handler.MediaInfoList_GetI
-	MediaInfoList_GetI.argtype = [c_void_p, c_void_p, c_void_p, c_void_p, c_void_p, c_void_p]
-	MediaInfoList_GetI.restype = c_wchar_p
-
-	#/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Get */
-	#MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfoList_Get (void* Handle, size_t FilePos, MediaInfo_stream_C StreamKind, size_t StreamNumber, const wchar_t* Parameter, MediaInfo_info_C InfoKind, MediaInfo_info_C SearchKind); /*Default : InfoKind=Info_Text, SearchKind=Info_Name*/
-	MediaInfoList_Get = MediaInfoDLL_Handler.MediaInfoList_Get
-	MediaInfoList_Get.argtype = [c_void_p, c_void_p, c_void_p, c_void_p, c_wchar_p, c_void_p, c_void_p]
-	MediaInfoList_Get.restype = c_wchar_p
-
-	#/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Set */
-	#MEDIAINFO_EXP size_t		    __stdcall MediaInfoList_SetI (void* Handle, const wchar_t* ToSet, size_t FilePos, MediaInfo_stream_C StreamKind, size_t StreamNumber, size_t Parameter, const wchar_t* OldParameter);
-	MediaInfoList_SetI = MediaInfoDLL_Handler.MediaInfoList_SetI
-	MediaInfoList_SetI.argtype = [c_void_p, c_wchar_p, c_void_p, c_void_p, c_void_p, c_void_p, c_wchar_p]
-	MediaInfoList_SetI.restype = c_void_p
-
-	#/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Set */
-	#MEDIAINFO_EXP size_t		    __stdcall MediaInfoList_Set (void* Handle, const wchar_t* ToSet, size_t FilePos, MediaInfo_stream_C StreamKind, size_t StreamNumber, const wchar_t* Parameter, const wchar_t* OldParameter);
-	MediaInfoList_Set = MediaInfoDLL_Handler.MediaInfoList_Set
-	MediaInfoList_Set.argtype = [c_void_p, c_wchar_p, c_void_p, c_void_p, c_void_p, c_wchar_p, c_wchar_p]
-	MediaInfoList_Set.restype = c_void_p
-
-	#/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Option */
-	#MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfoList_Option (void* Handle, const wchar_t* Option, const wchar_t* Value);
-	MediaInfoList_Option = MediaInfoDLL_Handler.MediaInfoList_Option
-	MediaInfoList_Option.argtype = [c_void_p, c_wchar_p, c_wchar_p]
-	MediaInfoList_Option.restype = c_wchar_p
-
-	#/** @brief Wrapper for MediaInfoListLib::MediaInfoList::State_Get */
-	#MEDIAINFO_EXP size_t		    __stdcall MediaInfoList_State_Get (void* Handle);
-	MediaInfoList_State_Get = MediaInfoDLL_Handler.MediaInfoList_State_Get
-	MediaInfoList_State_Get.argtype = [c_void_p]
-	MediaInfoList_State_Get.restype = c_void_p
-
-	#/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Count_Get */
-	#MEDIAINFO_EXP size_t		    __stdcall MediaInfoList_Count_Get (void* Handle, size_t FilePos, MediaInfo_stream_C StreamKind, size_t StreamNumber); /*Default : StreamNumber=-1*/
-	MediaInfoList_Count_Get = MediaInfoDLL_Handler.MediaInfoList_Count_Get
-	MediaInfoList_Count_Get.argtype = [c_void_p, c_void_p, c_void_p, c_void_p]
-	MediaInfoList_Count_Get.restype = c_void_p
-
-	#/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Count_Get */
-	#MEDIAINFO_EXP size_t		    __stdcall MediaInfoList_Count_Get_Files (void* Handle);
-	MediaInfoList_Count_Get_Files = MediaInfoDLL_Handler.MediaInfoList_Count_Get_Files
-	MediaInfoList_Count_Get_Files.argtype = [c_void_p]
-	MediaInfoList_Count_Get_Files.restype = c_void_p
-
-	Handle = c_void_p(0)
-
-	#Handling
-	def __init__(self):		      
-		self.Handle=MediaInfoList_New()
-	def __del__(self):
-		MediaInfoList_Delete(self.Handle)
-	def Open(self, Files, Options=FileOptions.Nothing):
-		return MediaInfoList_Open(self.Handle, Files, Options)
-	def Open_Buffer(self, Begin, Begin_Size, End=None, End_Size=0):
-		return MediaInfoList_Open_Buffer (self.Handle, Begin, Begin_Size, End, End_Size)
-	def Save(self, FilePos):
-		return MediaInfoList_Save(self.Handle, FilePos)
-	def Close(self, FilePos):
-		MediaInfoList_Close (self.Handle, FilePos)
-
-	#General information
-	def Inform(self, FilePos, Reserved=0):
-		return MediaInfoList_Inform (self.Handle, FilePos, Reserved)
-	def GetI(self, FilePos, StreamKind, StreamNumber, Parameter, InfoKind=Info.Text):
-		return MediaInfoList_GetI (self.Handle, FilePos, StreamKind, StreamNumber, Parameter, InfoKind)
-	def Get(self, FilePos, StreamKind, StreamNumber, Parameter, InfoKind=Info.Text, SearchKind=Info.Name):
-		return MediaInfoList_Get (self.Handle, FilePos, StreamKind, StreamNumber, (Parameter), InfoKind, SearchKind)
-	def SetI(self, ToSet, FilePos, StreamKind, StreamNumber, Parameter, OldParameter=u""):
-		return MediaInfoList_SetI (self, Handle, ToSet, FilePos, StreamKind, StreamNumber, Parameter, OldParameter)
-	def Set(self, ToSet, FilePos, StreamKind, StreamNumber, Parameter, OldParameter=u""):
-		return MediaInfoList_Set (self.Handle, ToSet, FilePos, StreamKind, StreamNumber, Parameter, OldParameter)
-
-	#Options
-	def Option(self, Option, Value=u""):
-		return MediaInfoList_Option (self.Handle, Option, Value)
-	def Option_Static(self, Option, Value=u""):
-		return MediaInfoList_Option(None, Option, Value)
-	def State_Get(self):
-		return MediaInfoList_State_Get (self.Handle)
-	def Count_Get(self, FilePos, StreamKind, StreamNumber):
-		return MediaInfoList_Count_Get (self.Handle, FilePos, StreamKind, StreamNumber=-1)
-	def Count_Get_Files(self):
-		return MediaInfoList_Count_Get_Files (self.Handle)
+    #/** @brief A 'new' MediaInfoList interface, return a Handle, don't forget to delete it after using it*/
+    #MEDIAINFO_EXP void*             __stdcall MediaInfoList_New (); /*you must ALWAYS call MediaInfoList_Delete(Handle) in order to free memory*/
+    MediaInfoList_New = MediaInfoDLL_Handler.MediaInfoList_New
+    MediaInfoList_New.argtype = []
+    MediaInfoList_New.restype = c_void_p
+
+    #/** @brief A 'new' MediaInfoList interface (with a quick init of useful options : "**VERSION**;**APP_NAME**;**APP_VERSION**", but without debug information, use it only if you know what you do), return a Handle, don't forget to delete it after using it*/
+    #MEDIAINFO_EXP void*             __stdcall MediaInfoList_New_Quick (const wchar_t* Files, const wchar_t* Config); /*you must ALWAYS call MediaInfoList_Delete(Handle) in order to free memory*/
+    MediaInfoList_New_Quick = MediaInfoDLL_Handler.MediaInfoList_New_Quick
+    MediaInfoList_New_Quick.argtype = [c_wchar_p, c_wchar_p]
+    MediaInfoList_New_Quick.restype = c_void_p
+
+    #/** @brief Delete a MediaInfoList interface*/
+    #MEDIAINFO_EXP void           __stdcall MediaInfoList_Delete (void* Handle);
+    MediaInfoList_Delete = MediaInfoDLL_Handler.MediaInfoList_Delete
+    MediaInfoList_Delete.argtype = [c_void_p]
+
+    #/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Open (with a filename)*/
+    #MEDIAINFO_EXP size_t           __stdcall MediaInfoList_Open (void* Handle, const wchar_t* Files, const MediaInfo_fileoptions_C Options); /*Default : Options=MediaInfo_FileOption_Nothing*/
+    MediaInfoList_Open = MediaInfoDLL_Handler.MediaInfoList_Open
+    MediaInfoList_Open.argtype = [c_void_p, c_wchar_p, c_void_p]
+    MediaInfoList_Open.restype = c_void_p
+
+    #/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Open (with a buffer) */
+    #MEDIAINFO_EXP size_t           __stdcall MediaInfoList_Open_Buffer (void* Handle, const unsigned char* Begin, size_t Begin_Size, const unsigned char* End, size_t End_Size); /*return Handle*/
+    MediaInfoList_Open_Buffer = MediaInfoDLL_Handler.MediaInfoList_Open_Buffer
+    MediaInfoList_Open_Buffer.argtype = [c_void_p, c_void_p, c_void_p, c_void_p, c_void_p]
+    MediaInfoList_Open_Buffer.restype = c_void_p
+
+    #/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Save */
+    #MEDIAINFO_EXP size_t           __stdcall MediaInfoList_Save (void* Handle, size_t FilePos);
+    MediaInfoList_Save = MediaInfoDLL_Handler.MediaInfoList_Save
+    MediaInfoList_Save.argtype = [c_void_p, c_void_p]
+    MediaInfoList_Save.restype = c_void_p
+
+    #/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Close */
+    #MEDIAINFO_EXP void           __stdcall MediaInfoList_Close (void* Handle, size_t FilePos);
+    MediaInfoList_Close = MediaInfoDLL_Handler.MediaInfoList_Close
+    MediaInfoList_Close.argtype = [c_void_p, c_void_p]
+
+    #/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Inform */
+    #MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfoList_Inform (void* Handle, size_t FilePos, size_t Reserved); /*Default : Reserved=0*/
+    MediaInfoList_Inform = MediaInfoDLL_Handler.MediaInfoList_Inform
+    MediaInfoList_Inform.argtype = [c_void_p, c_void_p, c_void_p]
+    MediaInfoList_Inform.restype = c_wchar_p
+
+    #/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Get */
+    #MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfoList_GetI (void* Handle, size_t FilePos, MediaInfo_stream_C StreamKind, size_t StreamNumber, size_t Parameter, MediaInfo_info_C InfoKind); /*Default : InfoKind=Info_Text*/
+    MediaInfoList_GetI = MediaInfoDLL_Handler.MediaInfoList_GetI
+    MediaInfoList_GetI.argtype = [c_void_p, c_void_p, c_void_p, c_void_p, c_void_p, c_void_p]
+    MediaInfoList_GetI.restype = c_wchar_p
+
+    #/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Get */
+    #MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfoList_Get (void* Handle, size_t FilePos, MediaInfo_stream_C StreamKind, size_t StreamNumber, const wchar_t* Parameter, MediaInfo_info_C InfoKind, MediaInfo_info_C SearchKind); /*Default : InfoKind=Info_Text, SearchKind=Info_Name*/
+    MediaInfoList_Get = MediaInfoDLL_Handler.MediaInfoList_Get
+    MediaInfoList_Get.argtype = [c_void_p, c_void_p, c_void_p, c_void_p, c_wchar_p, c_void_p, c_void_p]
+    MediaInfoList_Get.restype = c_wchar_p
+
+    #/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Set */
+    #MEDIAINFO_EXP size_t           __stdcall MediaInfoList_SetI (void* Handle, const wchar_t* ToSet, size_t FilePos, MediaInfo_stream_C StreamKind, size_t StreamNumber, size_t Parameter, const wchar_t* OldParameter);
+    MediaInfoList_SetI = MediaInfoDLL_Handler.MediaInfoList_SetI
+    MediaInfoList_SetI.argtype = [c_void_p, c_wchar_p, c_void_p, c_void_p, c_void_p, c_void_p, c_wchar_p]
+    MediaInfoList_SetI.restype = c_void_p
+
+    #/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Set */
+    #MEDIAINFO_EXP size_t           __stdcall MediaInfoList_Set (void* Handle, const wchar_t* ToSet, size_t FilePos, MediaInfo_stream_C StreamKind, size_t StreamNumber, const wchar_t* Parameter, const wchar_t* OldParameter);
+    MediaInfoList_Set = MediaInfoDLL_Handler.MediaInfoList_Set
+    MediaInfoList_Set.argtype = [c_void_p, c_wchar_p, c_void_p, c_void_p, c_void_p, c_wchar_p, c_wchar_p]
+    MediaInfoList_Set.restype = c_void_p
+
+    #/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Option */
+    #MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfoList_Option (void* Handle, const wchar_t* Option, const wchar_t* Value);
+    MediaInfoList_Option = MediaInfoDLL_Handler.MediaInfoList_Option
+    MediaInfoList_Option.argtype = [c_void_p, c_wchar_p, c_wchar_p]
+    MediaInfoList_Option.restype = c_wchar_p
+
+    #/** @brief Wrapper for MediaInfoListLib::MediaInfoList::State_Get */
+    #MEDIAINFO_EXP size_t           __stdcall MediaInfoList_State_Get (void* Handle);
+    MediaInfoList_State_Get = MediaInfoDLL_Handler.MediaInfoList_State_Get
+    MediaInfoList_State_Get.argtype = [c_void_p]
+    MediaInfoList_State_Get.restype = c_void_p
+
+    #/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Count_Get */
+    #MEDIAINFO_EXP size_t           __stdcall MediaInfoList_Count_Get (void* Handle, size_t FilePos, MediaInfo_stream_C StreamKind, size_t StreamNumber); /*Default : StreamNumber=-1*/
+    MediaInfoList_Count_Get = MediaInfoDLL_Handler.MediaInfoList_Count_Get
+    MediaInfoList_Count_Get.argtype = [c_void_p, c_void_p, c_void_p, c_void_p]
+    MediaInfoList_Count_Get.restype = c_void_p
+
+    #/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Count_Get */
+    #MEDIAINFO_EXP size_t           __stdcall MediaInfoList_Count_Get_Files (void* Handle);
+    MediaInfoList_Count_Get_Files = MediaInfoDLL_Handler.MediaInfoList_Count_Get_Files
+    MediaInfoList_Count_Get_Files.argtype = [c_void_p]
+    MediaInfoList_Count_Get_Files.restype = c_void_p
+
+    Handle = c_void_p(0)
+
+    #Handling
+    def __init__(self):
+        self.Handle=MediaInfoList_New()
+    def __del__(self):
+        MediaInfoList_Delete(self.Handle)
+    def Open(self, Files, Options=FileOptions.Nothing):
+        return MediaInfoList_Open(self.Handle, Files, Options)
+    def Open_Buffer(self, Begin, Begin_Size, End=None, End_Size=0):
+        return MediaInfoList_Open_Buffer (self.Handle, Begin, Begin_Size, End, End_Size)
+    def Save(self, FilePos):
+        return MediaInfoList_Save(self.Handle, FilePos)
+    def Close(self, FilePos):
+        MediaInfoList_Close (self.Handle, FilePos)
+
+    #General information
+    def Inform(self, FilePos, Reserved=0):
+        return MediaInfoList_Inform (self.Handle, FilePos, Reserved)
+    def GetI(self, FilePos, StreamKind, StreamNumber, Parameter, InfoKind=Info.Text):
+        return MediaInfoList_GetI (self.Handle, FilePos, StreamKind, StreamNumber, Parameter, InfoKind)
+    def Get(self, FilePos, StreamKind, StreamNumber, Parameter, InfoKind=Info.Text, SearchKind=Info.Name):
+        return MediaInfoList_Get (self.Handle, FilePos, StreamKind, StreamNumber, (Parameter), InfoKind, SearchKind)
+    def SetI(self, ToSet, FilePos, StreamKind, StreamNumber, Parameter, OldParameter=u""):
+        return MediaInfoList_SetI (self, Handle, ToSet, FilePos, StreamKind, StreamNumber, Parameter, OldParameter)
+    def Set(self, ToSet, FilePos, StreamKind, StreamNumber, Parameter, OldParameter=u""):
+        return MediaInfoList_Set (self.Handle, ToSet, FilePos, StreamKind, StreamNumber, Parameter, OldParameter)
+
+    #Options
+    def Option(self, Option, Value=u""):
+        return MediaInfoList_Option (self.Handle, Option, Value)
+    def Option_Static(self, Option, Value=u""):
+        return MediaInfoList_Option(None, Option, Value)
+    def State_Get(self):
+        return MediaInfoList_State_Get (self.Handle)
+    def Count_Get(self, FilePos, StreamKind, StreamNumber):
+        return MediaInfoList_Count_Get (self.Handle, FilePos, StreamKind, StreamNumber=-1)
+    def Count_Get_Files(self):
+        return MediaInfoList_Count_Get_Files (self.Handle)

libmediainfo_0.7.34.tar.bz2/Source/MediaInfoDLL/MediaInfoDLL3.py -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfoDLL/MediaInfoDLL3.py Changed

@@ -1,26 +1,26 @@
 ## MediaInfoDLL - All info about media files, for DLL
 #  Copyright (C) 2007-2009 Jerome Martinez, Zen@MediaArea.net
-# 
+#
 #  This library is free software: you can redistribute it and/or modify it
 #  under the terms of the GNU Lesser General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  any later version.
-# 
+#
 #  This library is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #  GNU Lesser General Public License for more details.
-# 
+#
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with this library. If not, see <http://www.gnu.org/licenses/>.
-# 
+#
 # +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 # +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-# 
+#
 #  Public DLL interface implementation
 #  Wrapper for MediaInfo Library
 #  Please see MediaInfo.h for help
-# 
+#
 # +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
 #
 # Converted to python module by Petr Kaderabek
@@ -32,350 +32,350 @@
 import os
 from ctypes import *
 if os.name == "nt" or os.name == "dos" or os.name == "os2" or os.name == "ce":
-	MediaInfoDLL_Handler = windll.MediaInfo
-	MustUseAnsi = 0
+    MediaInfoDLL_Handler = windll.MediaInfo
+    MustUseAnsi = 0
 else:
-	MediaInfoDLL_Handler = CDLL("libmediainfo.so.0")
-	MustUseAnsi = 1
+    MediaInfoDLL_Handler = CDLL("libmediainfo.so.0")
+    MustUseAnsi = 1
 
 
 # types --> C Python:
-# size_t			c_size_t
-# unsigned char*	c_char_p
-# enum				c_size_t
-# const wchar_t*	c_wchar_p,
-# NULL				None,
-# these functions need strings in unicode format 
+# size_t            c_size_t
+# unsigned char*    c_char_p
+# enum              c_size_t
+# const wchar_t*    c_wchar_p,
+# NULL              None,
+# these functions need strings in unicode format
 
 
 
 
 class Stream:
-	General, Video, Audio, Text, Chapters, Image, Menu, Max = list(range(8))
+    General, Video, Audio, Text, Chapters, Image, Menu, Max = list(range(8))
 
 class Info:
-	Name, Text, Measure, Options, Name_Text, Measure_Text, Info, HowTo, Max = list(range(9))
+    Name, Text, Measure, Options, Name_Text, Measure_Text, Info, HowTo, Max = list(range(9))
 
 class InfoOption:
-	ShowInInform, Reserved, ShowInSupported, TypeOfValue, Max = list(range(5))
+    ShowInInform, Reserved, ShowInSupported, TypeOfValue, Max = list(range(5))
 
 class FileOptions:
-	Nothing, Recursive, CloseAll, xxNonexx_3, Max = list(range(5))
+    Nothing, Recursive, CloseAll, xxNonexx_3, Max = list(range(5))
 
 
 
 class MediaInfo:
 
-	#MEDIAINFO_EXP void*	     __stdcall MediaInfo_New (); /*you must ALWAYS call MediaInfo_Delete(Handle) in order to free memory*/
-	#/** @brief A 'new' MediaInfo interface (with a quick init of useful options : "**VERSION**;**APP_NAME**;**APP_VERSION**", but without debug information, use it only if you know what you do), return a Handle, don't forget to delete it after using it*/
-	MediaInfo_New = MediaInfoDLL_Handler.MediaInfo_New
-	MediaInfo_New.argtypes = []  
-	MediaInfo_New.restype  = c_void_p
-
-	#MEDIAINFO_EXP void*	     __stdcall MediaInfo_New_Quick (const wchar_t* File, const wchar_t* Options); /*you must ALWAYS call MediaInfo_Delete(Handle) in order to free memory*/
-	MediaInfo_New_Quick = MediaInfoDLL_Handler.MediaInfo_New_Quick
-	MediaInfo_New_Quick.argtypes = [c_wchar_p, c_wchar_p]
-	MediaInfo_New_Quick.restype  = c_void_p
-	MediaInfoA_New_Quick = MediaInfoDLL_Handler.MediaInfoA_New_Quick
-	MediaInfoA_New_Quick.argtypes = [c_char_p, c_char_p]
-	MediaInfoA_New_Quick.restype  = c_void_p
-
-	#/** @brief Delete a MediaInfo interface*/
-	#MEDIAINFO_EXP void	      __stdcall MediaInfo_Delete (void* Handle);
-	MediaInfo_Delete = MediaInfoDLL_Handler.MediaInfo_Delete
-	MediaInfo_Delete.argtypes = [c_void_p]
-	MediaInfo_Delete.restype  = None
-
-	#/** @brief Wrapper for MediaInfoLib::MediaInfo::Open (with a filename)*/
-	#MEDIAINFO_EXP size_t	    __stdcall MediaInfo_Open (void* Handle, const wchar_t* File);
-	MediaInfo_Open = MediaInfoDLL_Handler.MediaInfo_Open
-	MediaInfo_Open.argtype = [c_void_p, c_wchar_p]
-	MediaInfo_Open.restype = c_size_t
-	MediaInfoA_Open = MediaInfoDLL_Handler.MediaInfoA_Open
-	MediaInfoA_Open.argtype = [c_void_p, c_char_p]
-	MediaInfoA_Open.restype = c_size_t
-
-	#/** @brief Wrapper for MediaInfoLib::MediaInfo::Open (with a buffer) */
-	#MEDIAINFO_EXP size_t	    __stdcall MediaInfo_Open_Buffer (void* Handle, const unsigned char* Begin, size_t Begin_Size, const unsigned char* End, size_t End_Size); /*return Handle*/
-	MediaInfo_Open_Buffer = MediaInfoDLL_Handler.MediaInfo_Open_Buffer
-	MediaInfo_Open_Buffer.argtype = [c_void_p, c_void_p, c_size_t, c_void_p, c_size_t]  
-	MediaInfo_Open_Buffer.restype = c_size_t
-
-	#/** @brief Wrapper for MediaInfoLib::MediaInfo::Save */
-	#MEDIAINFO_EXP size_t	    __stdcall MediaInfo_Save (void* Handle);
-	MediaInfo_Save = MediaInfoDLL_Handler.MediaInfo_Save
-	MediaInfo_Save.argtype = [c_void_p]
-	MediaInfo_Save.restype = c_size_t   
-
-	#/** @brief Wrapper for MediaInfoLib::MediaInfo::Close */
-	#MEDIAINFO_EXP void	      __stdcall MediaInfo_Close (void* Handle);
-	MediaInfo_Close = MediaInfoDLL_Handler.MediaInfo_Close
-	MediaInfo_Close.argtype = [c_void_p]
-	MediaInfo_Close.restype = None
-
-	#/** @brief Wrapper for MediaInfoLib::MediaInfo::Inform */
-	#MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfo_Inform (void* Handle, size_t Reserved); /*Default : Reserved=0*/
-	MediaInfo_Inform = MediaInfoDLL_Handler.MediaInfo_Inform
-	MediaInfo_Inform.argtype = [c_void_p, c_size_t]
-	MediaInfo_Inform.restype = c_wchar_p
-	MediaInfoA_Inform = MediaInfoDLL_Handler.MediaInfoA_Inform
-	MediaInfoA_Inform.argtype = [c_void_p, c_size_t]
-	MediaInfoA_Inform.restype = c_char_p
-
-	#/** @brief Wrapper for MediaInfoLib::MediaInfo::Get */
-	#MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfo_GetI (void* Handle, MediaInfo_stream_C StreamKind, size_t StreamNumber, size_t Parameter, MediaInfo_info_C InfoKind); /*Default : InfoKind=Info_Text*/
-	MediaInfo_GetI = MediaInfoDLL_Handler.MediaInfo_GetI
-	MediaInfo_GetI.argtype = [c_void_p, c_size_t, c_size_t, c_size_t, c_size_t]
-	MediaInfo_GetI.restype = c_wchar_p
-	MediaInfoA_GetI = MediaInfoDLL_Handler.MediaInfoA_GetI
-	MediaInfoA_GetI.argtype = [c_void_p, c_size_t, c_size_t, c_size_t, c_size_t]
-	MediaInfoA_GetI.restype = c_char_p
-
-	#/** @brief Wrapper for MediaInfoLib::MediaInfo::Get */
-	#MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfo_Get (void* Handle, MediaInfo_stream_C StreamKind, size_t StreamNumber, const wchar_t* Parameter, MediaInfo_info_C InfoKind, MediaInfo_info_C SearchKind); /*Default : InfoKind=Info_Text, SearchKind=Info_Name*/
-	MediaInfo_Get = MediaInfoDLL_Handler.MediaInfo_Get
-	MediaInfo_Get.argtype = [c_void_p, c_size_t, c_size_t, c_wchar_p, c_size_t, c_size_t]
-	MediaInfo_Get.restype = c_wchar_p
-	MediaInfoA_Get = MediaInfoDLL_Handler.MediaInfoA_Get
-	MediaInfoA_Get.argtype = [c_void_p, c_size_t, c_size_t, c_wchar_p, c_size_t, c_size_t]
-	MediaInfoA_Get.restype = c_char_p
-
-	#/** @brief Wrapper for MediaInfoLib::MediaInfo::Set */
-	#MEDIAINFO_EXP size_t	    __stdcall MediaInfo_SetI (void* Handle, const wchar_t* ToSet, MediaInfo_stream_C StreamKind, size_t StreamNumber, size_t Parameter, const wchar_t* OldParameter);
-	MediaInfo_SetI = MediaInfoDLL_Handler.MediaInfo_SetI
-	MediaInfo_SetI.argtype = [c_void_p, c_wchar_p, c_size_t, c_size_t, c_size_t, c_wchar_p]
-	MediaInfo_SetI.restype = c_void_p
-	MediaInfoA_SetI = MediaInfoDLL_Handler.MediaInfoA_SetI
-	MediaInfoA_SetI.argtype = [c_void_p, c_char_p, c_size_t, c_size_t, c_size_t, c_wchar_p]
-	MediaInfoA_SetI.restype = c_void_p
-
-	#/** @brief Wrapper for MediaInfoLib::MediaInfo::Set */
-	#MEDIAINFO_EXP size_t	    __stdcall MediaInfo_Set (void* Handle, const wchar_t* ToSet, MediaInfo_stream_C StreamKind, size_t StreamNumber, const wchar_t* Parameter, const wchar_t* OldParameter);
-	MediaInfo_Set = MediaInfoDLL_Handler.MediaInfo_Set
-	MediaInfo_Set.argtype = [c_void_p, c_wchar_p, c_size_t, c_size_t, c_wchar_p, c_wchar_p]
-	MediaInfo_Set.restype = c_size_t
-	MediaInfoA_Set = MediaInfoDLL_Handler.MediaInfoA_Set
-	MediaInfoA_Set.argtype = [c_void_p, c_char_p, c_size_t, c_size_t, c_wchar_p, c_wchar_p]
-	MediaInfoA_Set.restype = c_size_t
-
-	#/** @brief Wrapper for MediaInfoLib::MediaInfo::Option */
-	#MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfo_Option (void* Handle, const wchar_t* Option, const wchar_t* Value);
-	MediaInfo_Option = MediaInfoDLL_Handler.MediaInfo_Option
-	MediaInfo_Option.argtype = [c_void_p, c_wchar_p, c_wchar_p]
-	MediaInfo_Option.restype = c_wchar_p
-	MediaInfoA_Option = MediaInfoDLL_Handler.MediaInfoA_Option
-	MediaInfoA_Option.argtype = [c_void_p, c_char_p, c_char_p]
-	MediaInfoA_Option.restype = c_char_p
-
-	#/** @brief Wrapper for MediaInfoLib::MediaInfo::State_Get */
-	#MEDIAINFO_EXP size_t	    __stdcall MediaInfo_State_Get (void* Handle);
-	MediaInfo_State_Get = MediaInfoDLL_Handler.MediaInfo_State_Get
-	MediaInfo_State_Get.argtype = [c_void_p]
-	MediaInfo_State_Get.restype = c_size_t
-
-	#/** @brief Wrapper for MediaInfoLib::MediaInfo::Count_Get */
-	#MEDIAINFO_EXP size_t	    __stdcall MediaInfo_Count_Get (void* Handle, MediaInfo_stream_C StreamKind, size_t StreamNumber); /*Default : StreamNumber=-1*/
-	MediaInfo_Count_Get = MediaInfoDLL_Handler.MediaInfo_Count_Get
-	MediaInfo_Count_Get.argtype = [c_void_p, c_size_t, c_size_t]
-	MediaInfo_Count_Get.restype = c_size_t
-
-	Handle = c_void_p(0)
-	MustUseAnsi = 0
-
-	#Handling
-	def __init__(self):
-		self.Handle=self.MediaInfo_New()
-		self.MediaInfo_Option(self.Handle, "CharSet", "UTF-8")
-	def __del__(self):
-		self.MediaInfo_Delete(self.Handle)
-	def Open(self, File):
-		if MustUseAnsi:
-			return self.MediaInfoA_Open (self.Handle, File.encode("utf-8"));
-		else:
-			return self.MediaInfo_Open (self.Handle, File);
-	def Open_Buffer(self, Begin, Begin_Size, End=None, End_Size=0):
-		return self.MediaInfo_Open_Buffer(self.Handle, Begin, Begin_Size, End, End_Size)
-	def Save(self):
-		return self.MediaInfo_Save(self.Handle)
-	def Close(self):
-		return self.MediaInfo_Close(self.Handle)
-
-	#General information
-	def Inform(self):
-		if MustUseAnsi:
-			return str(self.MediaInfoA_Inform(self.Handle, 0), "utf_8") 
-		else:
-			return self.MediaInfo_Inform(self.Handle, 0)
-	def Get(self, StreamKind, StreamNumber, Parameter, InfoKind=Info.Text, SearchKind=Info.Name):
-		if MustUseAnsi:
-			return str(self.MediaInfoA_Get(self.Handle, StreamKind, StreamNumber, Parameter.encode("utf-8"), InfoKind, SearchKind), "utf_8") 
-		else:
-			return self.MediaInfo_Get(self.Handle, StreamKind, StreamNumber, Parameter, InfoKind, SearchKind)
-	def GetI(self, StreamKind, StreamNumber, Parameter, InfoKind=Info.Text):
-		if MustUseAnsi:
-			return str(self.MediaInfoA_GetI(self.Handle, StreamKind, StreamNumber, Parameter, InfoKind), "utf_8") 
-		else:
-			return self.MediaInfo_GetI(self.Handle, StreamKind, StreamNumber, Parameter, InfoKind)
-	def Set(self, ToSet, StreamKind, StreamNumber, Parameter, OldParameter=""):
-		if MustUseAnsi:
-			return self.MediaInfoA_Set(self.Handle, ToSet, StreamKind, StreamNumber, Parameter.encode("utf-8"), OldParameter.encode("utf-8"))
-		else:
-			return self.MediaInfo_Set(self.Handle, ToSet, StreamKind, StreamNumber, Parameter, OldParameter)
-	def SetI(self, ToSet, StreamKind, StreamNumber, Parameter, OldValue):
-		if MustUseAnsi:
-			return self.MediaInfoA_SetI(self.Handle, ToSet, StreamKind, StreamNumber, Parameter, OldValue.encode("utf-8"))
-		else:
-			return self.MediaInfo_SetI(self.Handle, ToSet, StreamKind, StreamNumber, Parameter, OldValue)
-
-	#Options
-	def Option(self, Option, Value=""):
-		if MustUseAnsi:
-			return str(self.MediaInfoA_Option(self.Handle, Option.encode("utf-8"), Value.encode("utf-8")), "utf_8") 
-		else:
-			return self.MediaInfo_Option(self.Handle, Option, Value)
-	def Option_Static(self, Option, Value=""):
-		if MustUseAnsi:
-			return str(self.MediaInfoA_Option(None, Option.encode("utf-8"), Value.encode("utf-8")), "utf_8") 
-		else:
-			return self.MediaInfo_Option(None, Option, Value)
-	def State_Get(self):
-		return self.MediaInfo_State_Get(self.Handle)
-	def Count_Get(self, StreamKind, StreamNumber=-1):
-		return self.MediaInfo_Count_Get(self.Handle, StreamKind, StreamNumber)
+    #MEDIAINFO_EXP void*         __stdcall MediaInfo_New (); /*you must ALWAYS call MediaInfo_Delete(Handle) in order to free memory*/
+    #/** @brief A 'new' MediaInfo interface (with a quick init of useful options : "**VERSION**;**APP_NAME**;**APP_VERSION**", but without debug information, use it only if you know what you do), return a Handle, don't forget to delete it after using it*/
+    MediaInfo_New = MediaInfoDLL_Handler.MediaInfo_New
+    MediaInfo_New.argtypes = []
+    MediaInfo_New.restype  = c_void_p
+
+    #MEDIAINFO_EXP void*         __stdcall MediaInfo_New_Quick (const wchar_t* File, const wchar_t* Options); /*you must ALWAYS call MediaInfo_Delete(Handle) in order to free memory*/
+    MediaInfo_New_Quick = MediaInfoDLL_Handler.MediaInfo_New_Quick
+    MediaInfo_New_Quick.argtypes = [c_wchar_p, c_wchar_p]
+    MediaInfo_New_Quick.restype  = c_void_p
+    MediaInfoA_New_Quick = MediaInfoDLL_Handler.MediaInfoA_New_Quick
+    MediaInfoA_New_Quick.argtypes = [c_char_p, c_char_p]
+    MediaInfoA_New_Quick.restype  = c_void_p
+
+    #/** @brief Delete a MediaInfo interface*/
+    #MEDIAINFO_EXP void       __stdcall MediaInfo_Delete (void* Handle);
+    MediaInfo_Delete = MediaInfoDLL_Handler.MediaInfo_Delete
+    MediaInfo_Delete.argtypes = [c_void_p]
+    MediaInfo_Delete.restype  = None
+
+    #/** @brief Wrapper for MediaInfoLib::MediaInfo::Open (with a filename)*/
+    #MEDIAINFO_EXP size_t       __stdcall MediaInfo_Open (void* Handle, const wchar_t* File);
+    MediaInfo_Open = MediaInfoDLL_Handler.MediaInfo_Open
+    MediaInfo_Open.argtype = [c_void_p, c_wchar_p]
+    MediaInfo_Open.restype = c_size_t
+    MediaInfoA_Open = MediaInfoDLL_Handler.MediaInfoA_Open
+    MediaInfoA_Open.argtype = [c_void_p, c_char_p]
+    MediaInfoA_Open.restype = c_size_t
+
+    #/** @brief Wrapper for MediaInfoLib::MediaInfo::Open (with a buffer) */
+    #MEDIAINFO_EXP size_t       __stdcall MediaInfo_Open_Buffer (void* Handle, const unsigned char* Begin, size_t Begin_Size, const unsigned char* End, size_t End_Size); /*return Handle*/
+    MediaInfo_Open_Buffer = MediaInfoDLL_Handler.MediaInfo_Open_Buffer
+    MediaInfo_Open_Buffer.argtype = [c_void_p, c_void_p, c_size_t, c_void_p, c_size_t]
+    MediaInfo_Open_Buffer.restype = c_size_t
+
+    #/** @brief Wrapper for MediaInfoLib::MediaInfo::Save */
+    #MEDIAINFO_EXP size_t       __stdcall MediaInfo_Save (void* Handle);
+    MediaInfo_Save = MediaInfoDLL_Handler.MediaInfo_Save
+    MediaInfo_Save.argtype = [c_void_p]
+    MediaInfo_Save.restype = c_size_t
+
+    #/** @brief Wrapper for MediaInfoLib::MediaInfo::Close */
+    #MEDIAINFO_EXP void       __stdcall MediaInfo_Close (void* Handle);
+    MediaInfo_Close = MediaInfoDLL_Handler.MediaInfo_Close
+    MediaInfo_Close.argtype = [c_void_p]
+    MediaInfo_Close.restype = None
+
+    #/** @brief Wrapper for MediaInfoLib::MediaInfo::Inform */
+    #MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfo_Inform (void* Handle, size_t Reserved); /*Default : Reserved=0*/
+    MediaInfo_Inform = MediaInfoDLL_Handler.MediaInfo_Inform
+    MediaInfo_Inform.argtype = [c_void_p, c_size_t]
+    MediaInfo_Inform.restype = c_wchar_p
+    MediaInfoA_Inform = MediaInfoDLL_Handler.MediaInfoA_Inform
+    MediaInfoA_Inform.argtype = [c_void_p, c_size_t]
+    MediaInfoA_Inform.restype = c_char_p
+
+    #/** @brief Wrapper for MediaInfoLib::MediaInfo::Get */
+    #MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfo_GetI (void* Handle, MediaInfo_stream_C StreamKind, size_t StreamNumber, size_t Parameter, MediaInfo_info_C InfoKind); /*Default : InfoKind=Info_Text*/
+    MediaInfo_GetI = MediaInfoDLL_Handler.MediaInfo_GetI
+    MediaInfo_GetI.argtype = [c_void_p, c_size_t, c_size_t, c_size_t, c_size_t]
+    MediaInfo_GetI.restype = c_wchar_p
+    MediaInfoA_GetI = MediaInfoDLL_Handler.MediaInfoA_GetI
+    MediaInfoA_GetI.argtype = [c_void_p, c_size_t, c_size_t, c_size_t, c_size_t]
+    MediaInfoA_GetI.restype = c_char_p
+
+    #/** @brief Wrapper for MediaInfoLib::MediaInfo::Get */
+    #MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfo_Get (void* Handle, MediaInfo_stream_C StreamKind, size_t StreamNumber, const wchar_t* Parameter, MediaInfo_info_C InfoKind, MediaInfo_info_C SearchKind); /*Default : InfoKind=Info_Text, SearchKind=Info_Name*/
+    MediaInfo_Get = MediaInfoDLL_Handler.MediaInfo_Get
+    MediaInfo_Get.argtype = [c_void_p, c_size_t, c_size_t, c_wchar_p, c_size_t, c_size_t]
+    MediaInfo_Get.restype = c_wchar_p
+    MediaInfoA_Get = MediaInfoDLL_Handler.MediaInfoA_Get
+    MediaInfoA_Get.argtype = [c_void_p, c_size_t, c_size_t, c_wchar_p, c_size_t, c_size_t]
+    MediaInfoA_Get.restype = c_char_p
+
+    #/** @brief Wrapper for MediaInfoLib::MediaInfo::Set */
+    #MEDIAINFO_EXP size_t       __stdcall MediaInfo_SetI (void* Handle, const wchar_t* ToSet, MediaInfo_stream_C StreamKind, size_t StreamNumber, size_t Parameter, const wchar_t* OldParameter);
+    MediaInfo_SetI = MediaInfoDLL_Handler.MediaInfo_SetI
+    MediaInfo_SetI.argtype = [c_void_p, c_wchar_p, c_size_t, c_size_t, c_size_t, c_wchar_p]
+    MediaInfo_SetI.restype = c_void_p
+    MediaInfoA_SetI = MediaInfoDLL_Handler.MediaInfoA_SetI
+    MediaInfoA_SetI.argtype = [c_void_p, c_char_p, c_size_t, c_size_t, c_size_t, c_wchar_p]
+    MediaInfoA_SetI.restype = c_void_p
+
+    #/** @brief Wrapper for MediaInfoLib::MediaInfo::Set */
+    #MEDIAINFO_EXP size_t       __stdcall MediaInfo_Set (void* Handle, const wchar_t* ToSet, MediaInfo_stream_C StreamKind, size_t StreamNumber, const wchar_t* Parameter, const wchar_t* OldParameter);
+    MediaInfo_Set = MediaInfoDLL_Handler.MediaInfo_Set
+    MediaInfo_Set.argtype = [c_void_p, c_wchar_p, c_size_t, c_size_t, c_wchar_p, c_wchar_p]
+    MediaInfo_Set.restype = c_size_t
+    MediaInfoA_Set = MediaInfoDLL_Handler.MediaInfoA_Set
+    MediaInfoA_Set.argtype = [c_void_p, c_char_p, c_size_t, c_size_t, c_wchar_p, c_wchar_p]
+    MediaInfoA_Set.restype = c_size_t
+
+    #/** @brief Wrapper for MediaInfoLib::MediaInfo::Option */
+    #MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfo_Option (void* Handle, const wchar_t* Option, const wchar_t* Value);
+    MediaInfo_Option = MediaInfoDLL_Handler.MediaInfo_Option
+    MediaInfo_Option.argtype = [c_void_p, c_wchar_p, c_wchar_p]
+    MediaInfo_Option.restype = c_wchar_p
+    MediaInfoA_Option = MediaInfoDLL_Handler.MediaInfoA_Option
+    MediaInfoA_Option.argtype = [c_void_p, c_char_p, c_char_p]
+    MediaInfoA_Option.restype = c_char_p
+
+    #/** @brief Wrapper for MediaInfoLib::MediaInfo::State_Get */
+    #MEDIAINFO_EXP size_t       __stdcall MediaInfo_State_Get (void* Handle);
+    MediaInfo_State_Get = MediaInfoDLL_Handler.MediaInfo_State_Get
+    MediaInfo_State_Get.argtype = [c_void_p]
+    MediaInfo_State_Get.restype = c_size_t
+
+    #/** @brief Wrapper for MediaInfoLib::MediaInfo::Count_Get */
+    #MEDIAINFO_EXP size_t       __stdcall MediaInfo_Count_Get (void* Handle, MediaInfo_stream_C StreamKind, size_t StreamNumber); /*Default : StreamNumber=-1*/
+    MediaInfo_Count_Get = MediaInfoDLL_Handler.MediaInfo_Count_Get
+    MediaInfo_Count_Get.argtype = [c_void_p, c_size_t, c_size_t]
+    MediaInfo_Count_Get.restype = c_size_t
+
+    Handle = c_void_p(0)
+    MustUseAnsi = 0
+
+    #Handling
+    def __init__(self):
+        self.Handle=self.MediaInfo_New()
+        self.MediaInfo_Option(self.Handle, "CharSet", "UTF-8")
+    def __del__(self):
+        self.MediaInfo_Delete(self.Handle)
+    def Open(self, File):
+        if MustUseAnsi:
+            return self.MediaInfoA_Open (self.Handle, File.encode("utf-8"));
+        else:
+            return self.MediaInfo_Open (self.Handle, File);
+    def Open_Buffer(self, Begin, Begin_Size, End=None, End_Size=0):
+        return self.MediaInfo_Open_Buffer(self.Handle, Begin, Begin_Size, End, End_Size)
+    def Save(self):
+        return self.MediaInfo_Save(self.Handle)
+    def Close(self):
+        return self.MediaInfo_Close(self.Handle)
+
+    #General information
+    def Inform(self):
+        if MustUseAnsi:
+            return str(self.MediaInfoA_Inform(self.Handle, 0), "utf_8")
+        else:
+            return self.MediaInfo_Inform(self.Handle, 0)
+    def Get(self, StreamKind, StreamNumber, Parameter, InfoKind=Info.Text, SearchKind=Info.Name):
+        if MustUseAnsi:
+            return str(self.MediaInfoA_Get(self.Handle, StreamKind, StreamNumber, Parameter.encode("utf-8"), InfoKind, SearchKind), "utf_8")
+        else:
+            return self.MediaInfo_Get(self.Handle, StreamKind, StreamNumber, Parameter, InfoKind, SearchKind)
+    def GetI(self, StreamKind, StreamNumber, Parameter, InfoKind=Info.Text):
+        if MustUseAnsi:
+            return str(self.MediaInfoA_GetI(self.Handle, StreamKind, StreamNumber, Parameter, InfoKind), "utf_8")
+        else:
+            return self.MediaInfo_GetI(self.Handle, StreamKind, StreamNumber, Parameter, InfoKind)
+    def Set(self, ToSet, StreamKind, StreamNumber, Parameter, OldParameter=""):
+        if MustUseAnsi:
+            return self.MediaInfoA_Set(self.Handle, ToSet, StreamKind, StreamNumber, Parameter.encode("utf-8"), OldParameter.encode("utf-8"))
+        else:
+            return self.MediaInfo_Set(self.Handle, ToSet, StreamKind, StreamNumber, Parameter, OldParameter)
+    def SetI(self, ToSet, StreamKind, StreamNumber, Parameter, OldValue):
+        if MustUseAnsi:
+            return self.MediaInfoA_SetI(self.Handle, ToSet, StreamKind, StreamNumber, Parameter, OldValue.encode("utf-8"))
+        else:
+            return self.MediaInfo_SetI(self.Handle, ToSet, StreamKind, StreamNumber, Parameter, OldValue)
+
+    #Options
+    def Option(self, Option, Value=""):
+        if MustUseAnsi:
+            return str(self.MediaInfoA_Option(self.Handle, Option.encode("utf-8"), Value.encode("utf-8")), "utf_8")
+        else:
+            return self.MediaInfo_Option(self.Handle, Option, Value)
+    def Option_Static(self, Option, Value=""):
+        if MustUseAnsi:
+            return str(self.MediaInfoA_Option(None, Option.encode("utf-8"), Value.encode("utf-8")), "utf_8")
+        else:
+            return self.MediaInfo_Option(None, Option, Value)
+    def State_Get(self):
+        return self.MediaInfo_State_Get(self.Handle)
+    def Count_Get(self, StreamKind, StreamNumber=-1):
+        return self.MediaInfo_Count_Get(self.Handle, StreamKind, StreamNumber)
 
 
 class MediaInfoList:
-	#/** @brief A 'new' MediaInfoList interface, return a Handle, don't forget to delete it after using it*/
-	#MEDIAINFO_EXP void*		     __stdcall MediaInfoList_New (); /*you must ALWAYS call MediaInfoList_Delete(Handle) in order to free memory*/
-	MediaInfoList_New = MediaInfoDLL_Handler.MediaInfoList_New
-	MediaInfoList_New.argtype = []
-	MediaInfoList_New.restype = c_void_p
-
-	#/** @brief A 'new' MediaInfoList interface (with a quick init of useful options : "**VERSION**;**APP_NAME**;**APP_VERSION**", but without debug information, use it only if you know what you do), return a Handle, don't forget to delete it after using it*/
-	#MEDIAINFO_EXP void*		     __stdcall MediaInfoList_New_Quick (const wchar_t* Files, const wchar_t* Config); /*you must ALWAYS call MediaInfoList_Delete(Handle) in order to free memory*/
-	MediaInfoList_New_Quick = MediaInfoDLL_Handler.MediaInfoList_New_Quick
-	MediaInfoList_New_Quick.argtype = [c_wchar_p, c_wchar_p]
-	MediaInfoList_New_Quick.restype = c_void_p
-
-	#/** @brief Delete a MediaInfoList interface*/
-	#MEDIAINFO_EXP void		      __stdcall MediaInfoList_Delete (void* Handle);
-	MediaInfoList_Delete = MediaInfoDLL_Handler.MediaInfoList_Delete
-	MediaInfoList_Delete.argtype = [c_void_p]
-
-	#/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Open (with a filename)*/
-	#MEDIAINFO_EXP size_t		    __stdcall MediaInfoList_Open (void* Handle, const wchar_t* Files, const MediaInfo_fileoptions_C Options); /*Default : Options=MediaInfo_FileOption_Nothing*/
-	MediaInfoList_Open = MediaInfoDLL_Handler.MediaInfoList_Open
-	MediaInfoList_Open.argtype = [c_void_p, c_wchar_p, c_void_p]
-	MediaInfoList_Open.restype = c_void_p
-
-	#/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Open (with a buffer) */
-	#MEDIAINFO_EXP size_t		    __stdcall MediaInfoList_Open_Buffer (void* Handle, const unsigned char* Begin, size_t Begin_Size, const unsigned char* End, size_t End_Size); /*return Handle*/
-	MediaInfoList_Open_Buffer = MediaInfoDLL_Handler.MediaInfoList_Open_Buffer
-	MediaInfoList_Open_Buffer.argtype = [c_void_p, c_void_p, c_void_p, c_void_p, c_void_p]
-	MediaInfoList_Open_Buffer.restype = c_void_p
-
-	#/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Save */
-	#MEDIAINFO_EXP size_t		    __stdcall MediaInfoList_Save (void* Handle, size_t FilePos);
-	MediaInfoList_Save = MediaInfoDLL_Handler.MediaInfoList_Save
-	MediaInfoList_Save.argtype = [c_void_p, c_void_p]
-	MediaInfoList_Save.restype = c_void_p
-
-	#/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Close */
-	#MEDIAINFO_EXP void		      __stdcall MediaInfoList_Close (void* Handle, size_t FilePos);
-	MediaInfoList_Close = MediaInfoDLL_Handler.MediaInfoList_Close
-	MediaInfoList_Close.argtype = [c_void_p, c_void_p]
-
-	#/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Inform */
-	#MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfoList_Inform (void* Handle, size_t FilePos, size_t Reserved); /*Default : Reserved=0*/
-	MediaInfoList_Inform = MediaInfoDLL_Handler.MediaInfoList_Inform
-	MediaInfoList_Inform.argtype = [c_void_p, c_void_p, c_void_p]
-	MediaInfoList_Inform.restype = c_wchar_p
-
-	#/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Get */
-	#MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfoList_GetI (void* Handle, size_t FilePos, MediaInfo_stream_C StreamKind, size_t StreamNumber, size_t Parameter, MediaInfo_info_C InfoKind); /*Default : InfoKind=Info_Text*/
-	MediaInfoList_GetI = MediaInfoDLL_Handler.MediaInfoList_GetI
-	MediaInfoList_GetI.argtype = [c_void_p, c_void_p, c_void_p, c_void_p, c_void_p, c_void_p]
-	MediaInfoList_GetI.restype = c_wchar_p
-
-	#/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Get */
-	#MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfoList_Get (void* Handle, size_t FilePos, MediaInfo_stream_C StreamKind, size_t StreamNumber, const wchar_t* Parameter, MediaInfo_info_C InfoKind, MediaInfo_info_C SearchKind); /*Default : InfoKind=Info_Text, SearchKind=Info_Name*/
-	MediaInfoList_Get = MediaInfoDLL_Handler.MediaInfoList_Get
-	MediaInfoList_Get.argtype = [c_void_p, c_void_p, c_void_p, c_void_p, c_wchar_p, c_void_p, c_void_p]
-	MediaInfoList_Get.restype = c_wchar_p
-
-	#/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Set */
-	#MEDIAINFO_EXP size_t		    __stdcall MediaInfoList_SetI (void* Handle, const wchar_t* ToSet, size_t FilePos, MediaInfo_stream_C StreamKind, size_t StreamNumber, size_t Parameter, const wchar_t* OldParameter);
-	MediaInfoList_SetI = MediaInfoDLL_Handler.MediaInfoList_SetI
-	MediaInfoList_SetI.argtype = [c_void_p, c_wchar_p, c_void_p, c_void_p, c_void_p, c_void_p, c_wchar_p]
-	MediaInfoList_SetI.restype = c_void_p
-
-	#/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Set */
-	#MEDIAINFO_EXP size_t		    __stdcall MediaInfoList_Set (void* Handle, const wchar_t* ToSet, size_t FilePos, MediaInfo_stream_C StreamKind, size_t StreamNumber, const wchar_t* Parameter, const wchar_t* OldParameter);
-	MediaInfoList_Set = MediaInfoDLL_Handler.MediaInfoList_Set
-	MediaInfoList_Set.argtype = [c_void_p, c_wchar_p, c_void_p, c_void_p, c_void_p, c_wchar_p, c_wchar_p]
-	MediaInfoList_Set.restype = c_void_p
-
-	#/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Option */
-	#MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfoList_Option (void* Handle, const wchar_t* Option, const wchar_t* Value);
-	MediaInfoList_Option = MediaInfoDLL_Handler.MediaInfoList_Option
-	MediaInfoList_Option.argtype = [c_void_p, c_wchar_p, c_wchar_p]
-	MediaInfoList_Option.restype = c_wchar_p
-
-	#/** @brief Wrapper for MediaInfoListLib::MediaInfoList::State_Get */
-	#MEDIAINFO_EXP size_t		    __stdcall MediaInfoList_State_Get (void* Handle);
-	MediaInfoList_State_Get = MediaInfoDLL_Handler.MediaInfoList_State_Get
-	MediaInfoList_State_Get.argtype = [c_void_p]
-	MediaInfoList_State_Get.restype = c_void_p
-
-	#/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Count_Get */
-	#MEDIAINFO_EXP size_t		    __stdcall MediaInfoList_Count_Get (void* Handle, size_t FilePos, MediaInfo_stream_C StreamKind, size_t StreamNumber); /*Default : StreamNumber=-1*/
-	MediaInfoList_Count_Get = MediaInfoDLL_Handler.MediaInfoList_Count_Get
-	MediaInfoList_Count_Get.argtype = [c_void_p, c_void_p, c_void_p, c_void_p]
-	MediaInfoList_Count_Get.restype = c_void_p
-
-	#/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Count_Get */
-	#MEDIAINFO_EXP size_t		    __stdcall MediaInfoList_Count_Get_Files (void* Handle);
-	MediaInfoList_Count_Get_Files = MediaInfoDLL_Handler.MediaInfoList_Count_Get_Files
-	MediaInfoList_Count_Get_Files.argtype = [c_void_p]
-	MediaInfoList_Count_Get_Files.restype = c_void_p
-
-	Handle = c_void_p(0)
-
-	#Handling
-	def __init__(self):		      
-		self.Handle=MediaInfoList_New()
-	def __del__(self):
-		MediaInfoList_Delete(self.Handle)
-	def Open(self, Files, Options=FileOptions.Nothing):
-		return MediaInfoList_Open(self.Handle, Files, Options)
-	def Open_Buffer(self, Begin, Begin_Size, End=None, End_Size=0):
-		return MediaInfoList_Open_Buffer (self.Handle, Begin, Begin_Size, End, End_Size)
-	def Save(self, FilePos):
-		return MediaInfoList_Save(self.Handle, FilePos)
-	def Close(self, FilePos):
-		MediaInfoList_Close (self.Handle, FilePos)
-
-	#General information
-	def Inform(self, FilePos, Reserved=0):
-		return MediaInfoList_Inform (self.Handle, FilePos, Reserved)
-	def GetI(self, FilePos, StreamKind, StreamNumber, Parameter, InfoKind=Info.Text):
-		return MediaInfoList_GetI (self.Handle, FilePos, StreamKind, StreamNumber, Parameter, InfoKind)
-	def Get(self, FilePos, StreamKind, StreamNumber, Parameter, InfoKind=Info.Text, SearchKind=Info.Name):
-		return MediaInfoList_Get (self.Handle, FilePos, StreamKind, StreamNumber, (Parameter), InfoKind, SearchKind)
-	def SetI(self, ToSet, FilePos, StreamKind, StreamNumber, Parameter, OldParameter=""):
-		return MediaInfoList_SetI (self, Handle, ToSet, FilePos, StreamKind, StreamNumber, Parameter, OldParameter)
-	def Set(self, ToSet, FilePos, StreamKind, StreamNumber, Parameter, OldParameter=""):
-		return MediaInfoList_Set (self.Handle, ToSet, FilePos, StreamKind, StreamNumber, Parameter, OldParameter)
-
-	#Options
-	def Option(self, Option, Value=""):
-		return MediaInfoList_Option (self.Handle, Option, Value)
-	def Option_Static(self, Option, Value=""):
-		return MediaInfoList_Option(None, Option, Value)
-	def State_Get(self):
-		return MediaInfoList_State_Get (self.Handle)
-	def Count_Get(self, FilePos, StreamKind, StreamNumber):
-		return MediaInfoList_Count_Get (self.Handle, FilePos, StreamKind, StreamNumber=-1)
-	def Count_Get_Files(self):
-		return MediaInfoList_Count_Get_Files (self.Handle)
+    #/** @brief A 'new' MediaInfoList interface, return a Handle, don't forget to delete it after using it*/
+    #MEDIAINFO_EXP void*             __stdcall MediaInfoList_New (); /*you must ALWAYS call MediaInfoList_Delete(Handle) in order to free memory*/
+    MediaInfoList_New = MediaInfoDLL_Handler.MediaInfoList_New
+    MediaInfoList_New.argtype = []
+    MediaInfoList_New.restype = c_void_p
+
+    #/** @brief A 'new' MediaInfoList interface (with a quick init of useful options : "**VERSION**;**APP_NAME**;**APP_VERSION**", but without debug information, use it only if you know what you do), return a Handle, don't forget to delete it after using it*/
+    #MEDIAINFO_EXP void*             __stdcall MediaInfoList_New_Quick (const wchar_t* Files, const wchar_t* Config); /*you must ALWAYS call MediaInfoList_Delete(Handle) in order to free memory*/
+    MediaInfoList_New_Quick = MediaInfoDLL_Handler.MediaInfoList_New_Quick
+    MediaInfoList_New_Quick.argtype = [c_wchar_p, c_wchar_p]
+    MediaInfoList_New_Quick.restype = c_void_p
+
+    #/** @brief Delete a MediaInfoList interface*/
+    #MEDIAINFO_EXP void           __stdcall MediaInfoList_Delete (void* Handle);
+    MediaInfoList_Delete = MediaInfoDLL_Handler.MediaInfoList_Delete
+    MediaInfoList_Delete.argtype = [c_void_p]
+
+    #/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Open (with a filename)*/
+    #MEDIAINFO_EXP size_t           __stdcall MediaInfoList_Open (void* Handle, const wchar_t* Files, const MediaInfo_fileoptions_C Options); /*Default : Options=MediaInfo_FileOption_Nothing*/
+    MediaInfoList_Open = MediaInfoDLL_Handler.MediaInfoList_Open
+    MediaInfoList_Open.argtype = [c_void_p, c_wchar_p, c_void_p]
+    MediaInfoList_Open.restype = c_void_p
+
+    #/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Open (with a buffer) */
+    #MEDIAINFO_EXP size_t           __stdcall MediaInfoList_Open_Buffer (void* Handle, const unsigned char* Begin, size_t Begin_Size, const unsigned char* End, size_t End_Size); /*return Handle*/
+    MediaInfoList_Open_Buffer = MediaInfoDLL_Handler.MediaInfoList_Open_Buffer
+    MediaInfoList_Open_Buffer.argtype = [c_void_p, c_void_p, c_void_p, c_void_p, c_void_p]
+    MediaInfoList_Open_Buffer.restype = c_void_p
+
+    #/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Save */
+    #MEDIAINFO_EXP size_t           __stdcall MediaInfoList_Save (void* Handle, size_t FilePos);
+    MediaInfoList_Save = MediaInfoDLL_Handler.MediaInfoList_Save
+    MediaInfoList_Save.argtype = [c_void_p, c_void_p]
+    MediaInfoList_Save.restype = c_void_p
+
+    #/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Close */
+    #MEDIAINFO_EXP void           __stdcall MediaInfoList_Close (void* Handle, size_t FilePos);
+    MediaInfoList_Close = MediaInfoDLL_Handler.MediaInfoList_Close
+    MediaInfoList_Close.argtype = [c_void_p, c_void_p]
+
+    #/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Inform */
+    #MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfoList_Inform (void* Handle, size_t FilePos, size_t Reserved); /*Default : Reserved=0*/
+    MediaInfoList_Inform = MediaInfoDLL_Handler.MediaInfoList_Inform
+    MediaInfoList_Inform.argtype = [c_void_p, c_void_p, c_void_p]
+    MediaInfoList_Inform.restype = c_wchar_p
+
+    #/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Get */
+    #MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfoList_GetI (void* Handle, size_t FilePos, MediaInfo_stream_C StreamKind, size_t StreamNumber, size_t Parameter, MediaInfo_info_C InfoKind); /*Default : InfoKind=Info_Text*/
+    MediaInfoList_GetI = MediaInfoDLL_Handler.MediaInfoList_GetI
+    MediaInfoList_GetI.argtype = [c_void_p, c_void_p, c_void_p, c_void_p, c_void_p, c_void_p]
+    MediaInfoList_GetI.restype = c_wchar_p
+
+    #/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Get */
+    #MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfoList_Get (void* Handle, size_t FilePos, MediaInfo_stream_C StreamKind, size_t StreamNumber, const wchar_t* Parameter, MediaInfo_info_C InfoKind, MediaInfo_info_C SearchKind); /*Default : InfoKind=Info_Text, SearchKind=Info_Name*/
+    MediaInfoList_Get = MediaInfoDLL_Handler.MediaInfoList_Get
+    MediaInfoList_Get.argtype = [c_void_p, c_void_p, c_void_p, c_void_p, c_wchar_p, c_void_p, c_void_p]
+    MediaInfoList_Get.restype = c_wchar_p
+
+    #/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Set */
+    #MEDIAINFO_EXP size_t           __stdcall MediaInfoList_SetI (void* Handle, const wchar_t* ToSet, size_t FilePos, MediaInfo_stream_C StreamKind, size_t StreamNumber, size_t Parameter, const wchar_t* OldParameter);
+    MediaInfoList_SetI = MediaInfoDLL_Handler.MediaInfoList_SetI
+    MediaInfoList_SetI.argtype = [c_void_p, c_wchar_p, c_void_p, c_void_p, c_void_p, c_void_p, c_wchar_p]
+    MediaInfoList_SetI.restype = c_void_p
+
+    #/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Set */
+    #MEDIAINFO_EXP size_t           __stdcall MediaInfoList_Set (void* Handle, const wchar_t* ToSet, size_t FilePos, MediaInfo_stream_C StreamKind, size_t StreamNumber, const wchar_t* Parameter, const wchar_t* OldParameter);
+    MediaInfoList_Set = MediaInfoDLL_Handler.MediaInfoList_Set
+    MediaInfoList_Set.argtype = [c_void_p, c_wchar_p, c_void_p, c_void_p, c_void_p, c_wchar_p, c_wchar_p]
+    MediaInfoList_Set.restype = c_void_p
+
+    #/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Option */
+    #MEDIAINFO_EXP const wchar_t*    __stdcall MediaInfoList_Option (void* Handle, const wchar_t* Option, const wchar_t* Value);
+    MediaInfoList_Option = MediaInfoDLL_Handler.MediaInfoList_Option
+    MediaInfoList_Option.argtype = [c_void_p, c_wchar_p, c_wchar_p]
+    MediaInfoList_Option.restype = c_wchar_p
+
+    #/** @brief Wrapper for MediaInfoListLib::MediaInfoList::State_Get */
+    #MEDIAINFO_EXP size_t           __stdcall MediaInfoList_State_Get (void* Handle);
+    MediaInfoList_State_Get = MediaInfoDLL_Handler.MediaInfoList_State_Get
+    MediaInfoList_State_Get.argtype = [c_void_p]
+    MediaInfoList_State_Get.restype = c_void_p
+
+    #/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Count_Get */
+    #MEDIAINFO_EXP size_t           __stdcall MediaInfoList_Count_Get (void* Handle, size_t FilePos, MediaInfo_stream_C StreamKind, size_t StreamNumber); /*Default : StreamNumber=-1*/
+    MediaInfoList_Count_Get = MediaInfoDLL_Handler.MediaInfoList_Count_Get
+    MediaInfoList_Count_Get.argtype = [c_void_p, c_void_p, c_void_p, c_void_p]
+    MediaInfoList_Count_Get.restype = c_void_p
+
+    #/** @brief Wrapper for MediaInfoListLib::MediaInfoList::Count_Get */
+    #MEDIAINFO_EXP size_t           __stdcall MediaInfoList_Count_Get_Files (void* Handle);
+    MediaInfoList_Count_Get_Files = MediaInfoDLL_Handler.MediaInfoList_Count_Get_Files
+    MediaInfoList_Count_Get_Files.argtype = [c_void_p]
+    MediaInfoList_Count_Get_Files.restype = c_void_p
+
+    Handle = c_void_p(0)
+
+    #Handling
+    def __init__(self):
+        self.Handle=MediaInfoList_New()
+    def __del__(self):
+        MediaInfoList_Delete(self.Handle)
+    def Open(self, Files, Options=FileOptions.Nothing):
+        return MediaInfoList_Open(self.Handle, Files, Options)
+    def Open_Buffer(self, Begin, Begin_Size, End=None, End_Size=0):
+        return MediaInfoList_Open_Buffer (self.Handle, Begin, Begin_Size, End, End_Size)
+    def Save(self, FilePos):
+        return MediaInfoList_Save(self.Handle, FilePos)
+    def Close(self, FilePos):
+        MediaInfoList_Close (self.Handle, FilePos)
+
+    #General information
+    def Inform(self, FilePos, Reserved=0):
+        return MediaInfoList_Inform (self.Handle, FilePos, Reserved)
+    def GetI(self, FilePos, StreamKind, StreamNumber, Parameter, InfoKind=Info.Text):
+        return MediaInfoList_GetI (self.Handle, FilePos, StreamKind, StreamNumber, Parameter, InfoKind)
+    def Get(self, FilePos, StreamKind, StreamNumber, Parameter, InfoKind=Info.Text, SearchKind=Info.Name):
+        return MediaInfoList_Get (self.Handle, FilePos, StreamKind, StreamNumber, (Parameter), InfoKind, SearchKind)
+    def SetI(self, ToSet, FilePos, StreamKind, StreamNumber, Parameter, OldParameter=""):
+        return MediaInfoList_SetI (self, Handle, ToSet, FilePos, StreamKind, StreamNumber, Parameter, OldParameter)
+    def Set(self, ToSet, FilePos, StreamKind, StreamNumber, Parameter, OldParameter=""):
+        return MediaInfoList_Set (self.Handle, ToSet, FilePos, StreamKind, StreamNumber, Parameter, OldParameter)
+
+    #Options
+    def Option(self, Option, Value=""):
+        return MediaInfoList_Option (self.Handle, Option, Value)
+    def Option_Static(self, Option, Value=""):
+        return MediaInfoList_Option(None, Option, Value)
+    def State_Get(self):
+        return MediaInfoList_State_Get (self.Handle)
+    def Count_Get(self, FilePos, StreamKind, StreamNumber):
+        return MediaInfoList_Count_Get (self.Handle, FilePos, StreamKind, StreamNumber=-1)
+    def Count_Get_Files(self):
+        return MediaInfoList_Count_Get_Files (self.Handle)

libmediainfo_0.7.34.tar.bz2/Source/MediaInfoDLL/MediaInfoDLL_Static.h -> libmediainfo_0.7.60.tar.bz2/Source/MediaInfoDLL/MediaInfoDLL_Static.h Changed

@@ -2,16 +2,16 @@
 // Copyright (C) 2002-2009 Jerome Martinez, Zen@MediaArea.net
 //
 // This library is free software: you can redistribute it and/or modify it
-// under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
+// under the terms of the GNU Library General Public License as published by
+// the Free Software Foundation, either version 2 of the License, or
 // any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Lesser General Public License for more details.
+// GNU Library General Public License for more details.
 //
-// You should have received a copy of the GNU Lesser General Public License
+// You should have received a copy of the GNU Library General Public License
 // along with this library. If not, see <http://www.gnu.org/licenses/>.
 //
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -131,7 +131,11 @@
 #undef MEDIAINFO_EXP
 #if defined(__WINDOWS__) && !defined(__MINGW32__) //MinGW32 does not support _declspec
     #ifdef MEDIAINFO_DLL_EXPORT
-        #define MEDIAINFO_EXP extern _declspec(dllexport)
+        #if defined(MEDIAINFODLL_EXPORTS_NODLLEXPORT)
+            #define MEDIAINFO_EXP extern
+        #else //!defined(MEDIAINFODLL_EXPORTS_NODLLEXPORT)
+            #define MEDIAINFO_EXP extern _declspec(dllexport)
+        #endif //!defined(MEDIAINFODLL_EXPORTS_NODLLEXPORT)
     #else
         #define MEDIAINFO_EXP extern _declspec(dllimport)
     #endif
@@ -256,6 +260,8 @@
 MEDIAINFO_EXP MediaInfo_int64u  __stdcall MediaInfo_Open_Buffer_Continue_GoTo_Get (void* Handle);
 /** @brief Wrapper for MediaInfoLib::MediaInfo::Open (with a buffer, Finalize) */
 MEDIAINFO_EXP size_t            __stdcall MediaInfo_Open_Buffer_Finalize (void* Handle);
+/** @brief Wrapper for MediaInfoLib::MediaInfo::Open (NextPacket) */
+MEDIAINFO_EXP size_t            __stdcall MediaInfo_Open_NextPacket (void* Handle);
 /** @brief Wrapper for MediaInfoLib::MediaInfo::Save */
 MEDIAINFO_EXP size_t            __stdcall MediaInfo_Save (void* Handle);
 /** @brief Wrapper for MediaInfoLib::MediaInfo::Close */
@@ -318,6 +324,8 @@
 MEDIAINFO_EXP MediaInfo_int64u  __stdcall MediaInfoA_Open_Buffer_Continue_GoTo_Get (void* Handle);
 /** @brief Wrapper for MediaInfoLib::MediaInfo::Open (with a buffer, Finalize) */
 MEDIAINFO_EXP size_t            __stdcall MediaInfoA_Open_Buffer_Finalize (void* Handle);
+/** @brief Wrapper for MediaInfoLib::MediaInfo::Open (NextPacket) */
+MEDIAINFO_EXP size_t            __stdcall MediaInfoA_Open_NextPacket (void* Handle);
 /** @brief Wrapper for MediaInfoLib::MediaInfo::Save */
 MEDIAINFO_EXP size_t            __stdcall MediaInfoA_Save (void* Handle);
 /** @brief Wrapper for MediaInfoLib::MediaInfo::Close */
@@ -455,8 +463,8 @@
 
 //---------------------------------------------------------------------------
 //Char types
-#undef  _T
-#define _T(__x)     __T(__x)
+#undef  __T
+#define __T(__x)     __T(__x)
 #if defined(UNICODE) || defined (_UNICODE)
     typedef wchar_t Char;
     #undef  __T
@@ -539,10 +547,10 @@
     String Inform ()  {return MediaInfo_Inform(Handle, 0);};
     String Get (stream_t StreamKind, size_t StreamNumber, size_t Parameter, info_t InfoKind=Info_Text)  {return MediaInfo_GetI (Handle, (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter, (MediaInfo_info_C)InfoKind);};
     String Get (stream_t StreamKind, size_t StreamNumber, const String &Parameter, info_t InfoKind=Info_Text, info_t SearchKind=Info_Name)  {return MediaInfo_Get (Handle, (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter.c_str(), (MediaInfo_info_C)InfoKind, (MediaInfo_info_C)SearchKind);};
-    size_t Set (const String &ToSet, stream_t StreamKind, size_t StreamNumber, size_t Parameter, const String &OldValue=_T(""))  {return MediaInfo_SetI (Handle, ToSet.c_str(), (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter, OldValue.c_str());};
-    size_t Set (const String &ToSet, stream_t StreamKind, size_t StreamNumber, const String &Parameter, const String &OldValue=_T(""))  {return MediaInfo_Set (Handle, ToSet.c_str(), (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter.c_str(), OldValue.c_str());};
-    String        Option (const String &Option, const String &Value=_T(""))  {return MediaInfo_Option (Handle, Option.c_str(), Value.c_str());};
-    static String Option_Static (const String &Option, const String &Value=_T(""))  {return MediaInfo_Option (NULL, Option.c_str(), Value.c_str());};
+    size_t Set (const String &ToSet, stream_t StreamKind, size_t StreamNumber, size_t Parameter, const String &OldValue=__T(""))  {return MediaInfo_SetI (Handle, ToSet.c_str(), (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter, OldValue.c_str());};
+    size_t Set (const String &ToSet, stream_t StreamKind, size_t StreamNumber, const String &Parameter, const String &OldValue=__T(""))  {return MediaInfo_Set (Handle, ToSet.c_str(), (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter.c_str(), OldValue.c_str());};
+    String        Option (const String &Option, const String &Value=__T(""))  {return MediaInfo_Option (Handle, Option.c_str(), Value.c_str());};
+    static String Option_Static (const String &Option, const String &Value=__T(""))  {return MediaInfo_Option (NULL, Option.c_str(), Value.c_str());};
     size_t                  State_Get ()  {return MediaInfo_State_Get(Handle);};
     size_t                  Count_Get (stream_t StreamKind, size_t StreamNumber=-1)  {return MediaInfo_Count_Get(Handle, (MediaInfo_stream_C)StreamKind, StreamNumber);};
 
@@ -566,10 +574,10 @@
     String Inform (size_t FilePos=-1)  {return MediaInfoList_Inform(Handle, FilePos, 0);};
     String Get (size_t FilePos, stream_t StreamKind, size_t StreamNumber, size_t Parameter, info_t InfoKind=Info_Text)  {return MediaInfoList_GetI (Handle, FilePos, (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter, (MediaInfo_info_C)InfoKind);};
     String Get (size_t FilePos, stream_t StreamKind, size_t StreamNumber, const String &Parameter, info_t InfoKind=Info_Text, info_t SearchKind=Info_Name)  {return MediaInfoList_Get (Handle, FilePos, (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter.c_str(), (MediaInfo_info_C)InfoKind, (MediaInfo_info_C)SearchKind);};
-    size_t Set (const String &ToSet, size_t FilePos, stream_t StreamKind, size_t StreamNumber, size_t Parameter, const String &OldValue=_T(""))  {return MediaInfoList_SetI (Handle, ToSet.c_str(), FilePos, (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter, OldValue.c_str());};
-    size_t Set (const String &ToSet, size_t FilePos, stream_t StreamKind, size_t StreamNumber, const String &Parameter, const String &OldValue=_T(""))  {return MediaInfoList_Set (Handle, ToSet.c_str(), FilePos, (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter.c_str(), OldValue.c_str());};
-    String        Option (const String &Option, const String &Value=_T(""))  {return MediaInfoList_Option (Handle, Option.c_str(), Value.c_str());};
-    static String Option_Static (const String &Option, const String &Value=_T(""))  {return MediaInfoList_Option (NULL, Option.c_str(), Value.c_str());};
+    size_t Set (const String &ToSet, size_t FilePos, stream_t StreamKind, size_t StreamNumber, size_t Parameter, const String &OldValue=__T(""))  {return MediaInfoList_SetI (Handle, ToSet.c_str(), FilePos, (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter, OldValue.c_str());};
+    size_t Set (const String &ToSet, size_t FilePos, stream_t StreamKind, size_t StreamNumber, const String &Parameter, const String &OldValue=__T(""))  {return MediaInfoList_Set (Handle, ToSet.c_str(), FilePos, (MediaInfo_stream_C)StreamKind, StreamNumber, Parameter.c_str(), OldValue.c_str());};
+    String        Option (const String &Option, const String &Value=__T(""))  {return MediaInfoList_Option (Handle, Option.c_str(), Value.c_str());};
+    static String Option_Static (const String &Option, const String &Value=__T(""))  {return MediaInfoList_Option (NULL, Option.c_str(), Value.c_str());};
     size_t                  State_Get ()  {return MediaInfoList_State_Get(Handle);};
     size_t                  Count_Get (size_t FilePos, stream_t StreamKind, size_t StreamNumber=-1)  {return MediaInfoList_Count_Get(Handle, FilePos, (MediaInfo_stream_C)StreamKind, StreamNumber);};
     size_t                  Count_Get ()  {return MediaInfoList_Count_Get_Files(Handle);};

libmediainfo_0.7.34.tar.bz2/Source/PreRelease/Enums.cpp -> libmediainfo_0.7.60.tar.bz2/Source/PreRelease/Enums.cpp Changed

@@ -62,7 +62,7 @@
 
     //Load header
     Ztring Partial;
-    Result=Enums_Create_Load(L"../Source/Ressource/Text/Enums_.2.txt", Partial);
+    Result=Enums_Create_Load(L"../Source/Resource/Text/Enums_.2.txt", Partial);
     if (!Result.empty())
         return Result;
     Partial.FindAndReplace(L"%Name%", Ztring(Name).MakeLowerCase());
@@ -70,29 +70,29 @@
 
     //Load line template
     Ztring Line;
-    Result=Enums_Create_Load(L"../Source/Ressource/Text/Enums_.5.txt", Line);
+    Result=Enums_Create_Load(L"../Source/Resource/Text/Enums_.5.txt", Line);
     if (!Result.empty())
         return Result;
 
     //Read input file
     ZtringListListF ZLL;
-    ZLL.Load(Ztring(L"../Source/Ressource/Text/")+Directory+L"/"+Name+L".csv");
+    ZLL.Load(Ztring(L"../Source/Resource/Text/")+Directory+L"/"+Name+L".csv");
     for (size_t Pos=0; Pos<ZLL.size(); Pos++)
     {
         Ztring Line_Temp=Line;
         Line_Temp.FindAndReplace(L"%Name%", Name);
         Ztring &ToAdd=ZLL(Pos, 0);
-        ToAdd.FindAndReplace(_T("/"), _T("_")); //C++ does not accept "/" in names
-        ToAdd.FindAndReplace(_T("("), _T("_")); //C++ does not accept "(" in names
-        ToAdd.FindAndReplace(_T(")"), _T("_")); //C++ does not accept ")" in names
-        ToAdd.FindAndReplace(_T("*"), _T("_")); //C++ does not accept "*" in names
-        ToAdd.FindAndReplace(_T("-"), _T("_")); //C++ does not accept "-" in names
+        ToAdd.FindAndReplace(__T("/"), __T("_")); //C++ does not accept "/" in names
+        ToAdd.FindAndReplace(__T("("), __T("_")); //C++ does not accept "(" in names
+        ToAdd.FindAndReplace(__T(")"), __T("_")); //C++ does not accept ")" in names
+        ToAdd.FindAndReplace(__T("*"), __T("_")); //C++ does not accept "*" in names
+        ToAdd.FindAndReplace(__T("-"), __T("_")); //C++ does not accept "-" in names
         Line_Temp.FindAndReplace(L"%Line%", ToAdd);
         Contents+=Line_Temp;
     }
 
     //Load footer template
-    Result=Enums_Create_Load(L"../Source/Ressource/Text/Enums_.8.txt", Partial);
+    Result=Enums_Create_Load(L"../Source/Resource/Text/Enums_.8.txt", Partial);
     if (!Result.empty())
         return Result;
     Contents+=Partial;
@@ -109,7 +109,7 @@
     Ztring Contents;
 
     //Load header
-    Result=Enums_Create_Load(L"../Source/Ressource/Text/Enums_.1.txt", Contents);
+    Result=Enums_Create_Load(L"../Source/Resource/Text/Enums_.1.txt", Contents);
     if (!Result.empty())
         return Result;
     Out+=Contents;
@@ -155,7 +155,7 @@
     Out+=Contents;
 
     //Load footer
-    Result=Enums_Create_Load(L"../Source/Ressource/Text/Enums_.9.txt", Contents);
+    Result=Enums_Create_Load(L"../Source/Resource/Text/Enums_.9.txt", Contents);
     if (!Result.empty())
         return Result;
     Out+=Contents;

libmediainfo_0.7.34.tar.bz2/Source/PreRelease/OldFiles.cpp -> libmediainfo_0.7.60.tar.bz2/Source/PreRelease/OldFiles.cpp Changed

@@ -31,7 +31,7 @@
     I=F.Read(C, 1000000);
     if (!I)
     {
-        ToShow+=_T("Error opening ")+FileName;
+        ToShow+=__T("Error opening ")+FileName;
         return -1;
     }
 
@@ -49,19 +49,19 @@
     //Testing validity
     if (Z.size()!=3 && Z.size()!=7) //non long, no short
     {
-        ToShow+=_T("Error reading ")+FileName;
+        ToShow+=__T("Error reading ")+FileName;
         return -2;
     }
 
     //Reformtation information
-    Z.FindAndReplace(_T(","), _T("."), 0, Ztring_Recursive);
+    Z.FindAndReplace(__T(","), __T("."), 0, Ztring_Recursive);
 
     if (Z!=Version && Z!=Version_Short)
     {
         ToShow+=FileName;
-        ToShow+=_T(" is not good : version is marked ");
+        ToShow+=__T(" is not good : version is marked ");
         ToShow+=Z;
-        ToShow+=_T("\r\n");
+        ToShow+=__T("\r\n");
     }
     return 0;
 }
@@ -73,12 +73,12 @@
     if (!FN.FileExists())
     {
         ToShow+=FileName;
-        ToShow+=_T(" does not exist");
+        ToShow+=__T(" does not exist");
         return -1;
     }
     if (!FN.GetTimes(&Access, NULL, NULL))
     {
-        ToShow+=_T("Error getting date of ");
+        ToShow+=__T("Error getting date of ");
         ToShow+=FileName;
         return -1;
     }
@@ -86,9 +86,9 @@
     if (TS.GetWeeks()>0 || TS.GetDays()>0 || TS.GetHours()>0 || TS.GetMinutes()>0 || TS.GetMinutes()>10)
     {
         ToShow+=FileName;
-        ToShow+=_T(" is old : was compiled");
+        ToShow+=__T(" is old : was compiled");
         ToShow+=TS.Format().c_str();
-        ToShow+=_T(" ago\r\n");
+        ToShow+=__T(" ago\r\n");
     }
     return 0;
 }
@@ -97,24 +97,24 @@
 Ztring OldFiles_Test ()
 {
     //Checking version in Info_Version
-    ToShow+=_T("Version checked : ");
-    F.Open(_T("../Source/MediaInfo/MediaInfo_Config.cpp"));
+    ToShow+=__T("Version checked : ");
+    F.Open(__T("../Source/MediaInfo/MediaInfo_Config.cpp"));
     I=F.Read(C, 1000000);
     if (!I)
     {
-        ToShow+=_T("Error opening ../Source/MediaInfo/MediaInfo_Config.cpp");
+        ToShow+=__T("Error opening ../Source/MediaInfo/MediaInfo_Config.cpp");
         return ToShow;
     }
     C[I]=0;
     Z.From_Local(C);
-    Version=Z.SubString(_T("MediaInfoLib - v"), _T("\")"));
+    Version=Z.SubString(__T("MediaInfoLib - v"), __T("\")"));
     if (Version.size()!=7)
     {
-        ToShow+=_T("Error reading ../Source/MediaInfo/MediaInfo.cpp : \"MediaInfoLib - vX.X.X.X - \" not found");
+        ToShow+=__T("Error reading ../Source/MediaInfo/MediaInfo.cpp : \"MediaInfoLib - vX.X.X.X - \" not found");
         return ToShow;
     }
     Version_Short=Version; Version_Short.resize(3);
-    ToShow+=Version+_T("\r\n");
+    ToShow+=Version+__T("\r\n");
 
     //Checking version in MediaInfo.h
     if (Test_Version("../Source/MediaInfo/MediaInfo.h", "@version ", "\n")) return ToShow;
@@ -124,8 +124,8 @@
     if (Test_Version("../Project/MSVC/Dll/MediaInfo.rc", "            VALUE \"FileVersion\", \"", "\"")) return ToShow;
     if (Test_Version("../Project/MSVC/Dll/MediaInfo.rc", "            VALUE \"ProductVersion\", \"", "\"")) return ToShow;
     if (Test_Version("../History.txt", "Version ", " ")) return ToShow;
-    if (Test_Date(_T("MSVC/Library/MediaInfo.lib"))) return ToShow;
-    if (Test_Date(_T("MSVC/Dll/MediaInfo.dll"))) return ToShow;
+    if (Test_Date(__T("MSVC/Library/MediaInfo.lib"))) return ToShow;
+    if (Test_Date(__T("MSVC/Dll/MediaInfo.dll"))) return ToShow;
 
     return ToShow;
 }

libmediainfo_0.7.60.tar.bz2/Source/PreRelease/Resources.cpp Added

@@ -0,0 +1,277 @@
+//---------------------------------------------------------------------------
+#include <wx/wxprec.h>
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+#include <wx/file.h>
+#include <ZenLib/File.h>
+#include <ZenLib/ZtringListListF.h>
+#include "PreRelease/Resources.h"
+using namespace ZenLib;
+using namespace std;
+#define FILE_MAX 20000
+//---------------------------------------------------------------------------
+
+//---------------------------------------------------------------------------
+// Open a file
+ZenLib::Ztring Resources_Create_Load(Ztring FileName, Ztring &Contents)
+{
+    wxFile F;
+    if (F.Open(FileName.c_str(), wxFile::read)==false)
+    {
+        Ztring ToReturn=L"Problems to open ";
+        ToReturn+=FileName;
+        ToReturn+=L"\r\n";
+        return ToReturn;
+    }
+
+    char C[FILE_MAX];
+    size_t Size=F.Read(C, FILE_MAX-1);
+    Contents.From_Local(C, Size);
+    return L"";
+}
+
+//---------------------------------------------------------------------------
+// Write a file
+ZenLib::Ztring Resources_Create_Save(Ztring FileName, Ztring &Contents)
+{
+    File F;
+    if (F.Create(FileName.c_str(), true)==false)
+    {
+        Ztring ToReturn=L"Problems to create ";
+        ToReturn+=FileName;
+        ToReturn+=L"\r\n";
+        return ToReturn;
+    }
+
+    std::string S1=Contents.To_UTF8();
+    size_t Size=F.Write((const int8u*)S1.c_str(), S1.size());
+    Contents.From_Number(Size);
+    Contents+=L" bytes written";
+    return L"";
+}
+
+//---------------------------------------------------------------------------
+// Open an item
+ZenLib::Ztring Resources_Create_Item(const Ztring &Directory, const Ztring &Name, const Ztring &Class, Ztring &Contents)
+{
+    Contents.clear();
+    Ztring Result;
+
+    //Load header
+    Ztring Partial;
+    Result=Resources_Create_Load(L"../Source/Resource/Text/_.2.txt", Partial);
+    if (!Result.empty())
+        return Result;
+    Partial.FindAndReplace(L"%Name%", Ztring(L"MediaInfo_Config_")+Name);
+    Partial.FindAndReplace(L"%Class%", Class);
+    Contents+=Partial;
+
+    //Load line template
+    Ztring Line;
+    Result=Resources_Create_Load(L"../Source/Resource/Text/_.5.txt", Line);
+    if (!Result.empty())
+        return Result;
+
+    //Read input file
+    ZtringListListF ZLL;
+    ZLL.Load(Ztring(L"../Source/Resource/Text/")+Directory+L"/"+Name+L".csv");
+    for (size_t Pos=0; Pos<ZLL.size(); Pos++)
+    {
+        Ztring Line_Temp=Line;
+        Line_Temp.FindAndReplace(L"%Line%", ZLL.Read(Pos));
+        Contents+=Line_Temp;
+    }
+
+    //Load footer template
+    Result=Resources_Create_Load(L"../Source/Resource/Text/_.8.txt", Partial);
+    if (!Result.empty())
+        return Result;
+    Contents+=Partial;
+
+    return L"";
+}
+
+//---------------------------------------------------------------------------
+// Main
+ZenLib::Ztring Resources_Create()
+{
+    Ztring Out;
+    Ztring Result;
+    Ztring Contents;
+
+    //Load header
+    Result=Resources_Create_Load(L"../Source/Resource/Text/_.1.txt", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    //Load datas
+    Result=Resources_Create_Item(L"Language", L"DefaultLanguage", L"Translation", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"DataBase", L"Format", L"InfoMap", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"DataBase", L"CodecID_General_Mpeg4", L"InfoMap", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"DataBase", L"CodecID_Video_Matroska", L"InfoMap", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"DataBase", L"CodecID_Video_Mpeg4", L"InfoMap", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"DataBase", L"CodecID_Video_Real", L"InfoMap", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"DataBase", L"CodecID_Video_Riff", L"InfoMap", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"DataBase", L"CodecID_Audio_Matroska", L"InfoMap", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"DataBase", L"CodecID_Audio_Mpeg4", L"InfoMap", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"DataBase", L"CodecID_Audio_Real", L"InfoMap", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"DataBase", L"CodecID_Audio_Riff", L"InfoMap", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"DataBase", L"CodecID_Text_Matroska", L"InfoMap", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"DataBase", L"CodecID_Text_Mpeg4", L"InfoMap", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"DataBase", L"CodecID_Text_Riff", L"InfoMap", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"DataBase", L"Codec", L"InfoMap", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"Stream", L"Generic", L"ZtringListList", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"Stream", L"General", L"ZtringListList", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"Stream", L"Video", L"ZtringListList", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"Stream", L"Audio", L"ZtringListList", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"Stream", L"Text", L"ZtringListList", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"Stream", L"Chapters", L"ZtringListList", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"Stream", L"Image", L"ZtringListList", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"Stream", L"Menu", L"ZtringListList", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"DataBase", L"Iso639_1", L"InfoMap", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"DataBase", L"Iso639_2", L"InfoMap", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"DataBase", L"Library_DivX", L"InfoMap", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"DataBase", L"Library_XviD", L"InfoMap", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"DataBase", L"Library_MainConcept_Avc", L"InfoMap", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"DataBase", L"Library_VorbisCom", L"InfoMap", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    Result=Resources_Create_Item(L"MediaInfo", L"Summary", L"ZtringListList", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    //Load footer
+    Result=Resources_Create_Load(L"../Source/Resource/Text/_.9.txt", Contents);
+    if (!Result.empty())
+        return Result;
+    Out+=Contents;
+
+    //Write file
+    Result=Resources_Create_Save(L"../Source/MediaInfo/MediaInfo_Config_Automatic.cpp", Out);
+    if (!Result.empty())
+        return Result;
+
+    return Out;
+
+}
+//---------------------------------------------------------------------------
+

libmediainfo_0.7.60.tar.bz2/Source/PreRelease/Resources.h Added

libmediainfo_0.7.34.tar.bz2/Source/PreRelease/VCL/PreRelease_.cpp -> libmediainfo_0.7.60.tar.bz2/Source/PreRelease/VCL/PreRelease_.cpp Changed

libmediainfo_0.7.34.tar.bz2/Source/PreRelease/VCL/PreRelease_.dfm -> libmediainfo_0.7.60.tar.bz2/Source/PreRelease/VCL/PreRelease_.dfm Changed

libmediainfo_0.7.34.tar.bz2/Source/PreRelease/VCL/PreRelease_.h -> libmediainfo_0.7.60.tar.bz2/Source/PreRelease/VCL/PreRelease_.h Changed

libmediainfo_0.7.34.tar.bz2/Source/PreRelease/WxWidgets/GUI_Main.cpp -> libmediainfo_0.7.60.tar.bz2/Source/PreRelease/WxWidgets/GUI_Main.cpp Changed

@@ -5,12 +5,12 @@
 #include <wx/file.h>
 #include <wx/textctrl.h>
 #include "PreRelease/OldFiles.h"
-#include "PreRelease/Ressources.h"
+#include "PreRelease/Resources.h"
 //----------------------------------------------------------------------------
 //Menu
 BEGIN_EVENT_TABLE(GUI_Main, wxFrame)
     EVT_MENU(1,  GUI_Main::OldFiles)
-    EVT_MENU(2, GUI_Main::Ressources)
+    EVT_MENU(2, GUI_Main::Resources)
 END_EVENT_TABLE()
 
 // ----------------------------------------------------------------------------
@@ -19,18 +19,18 @@
 
 // frame constructor
 GUI_Main::GUI_Main(const wxPoint& pos, const wxSize& size, long style)
-:wxFrame(NULL, -1, _T("MediaInfoLib - Too old files test"), pos, size, style)
+:wxFrame(NULL, -1, __T("MediaInfoLib - Too old files test"), pos, size, style)
 {
     // set the frame icon
     SetIcon(wxICON(mondrian));
 
     //Menu
     wxMenu *Menu_File = new wxMenu;
-    Menu_File->Append(1, _T("Test if there are too old files"));
-    Menu_File->Append(2, _T("Update ressource files"));
+    Menu_File->Append(1, __T("Test if there are too old files"));
+    Menu_File->Append(2, __T("Update ressource files"));
 
     wxMenuBar *menuBar = new wxMenuBar();
-    menuBar->Append(Menu_File, _T("&File"));
+    menuBar->Append(Menu_File, __T("&File"));
     SetMenuBar(menuBar);
 
     Text=new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition,
@@ -47,7 +47,7 @@
     Text->SetValue(OldFiles_Test().c_str());
 }
 
-void GUI_Main::Ressources(wxCommandEvent& WXUNUSED(event))
+void GUI_Main::Resources(wxCommandEvent& WXUNUSED(event))
 {
-    Text->SetValue(Ressources_Create().c_str());
+    Text->SetValue(Resources_Create().c_str());
 }

libmediainfo_0.7.34.tar.bz2/Source/PreRelease/WxWidgets/GUI_Main.h -> libmediainfo_0.7.60.tar.bz2/Source/PreRelease/WxWidgets/GUI_Main.h Changed

libmediainfo_0.7.60.tar.bz2/Source/RegressionTest Added

libmediainfo_0.7.60.tar.bz2/Source/RegressionTest/RegressionTest.cpp Added

libmediainfo_0.7.60.tar.bz2/Source/RegressionTest/RegressionTest.h Added

libmediainfo_0.7.60.tar.bz2/Source/RegressionTest/RegressionTest_Basic.cpp Added

@@ -0,0 +1,133 @@
+// RegressionTest.cpp : Defines the entry point for the console application.
+//
+
+#include <iostream>
+#include "tchar.h"
+#include "MediaInfoDLL\MediaInfoDLL.h"
+#include "ZenLib\ZtringListListF.h"
+#include "ZenLib\File.h"
+#include "ZenLib\Dir.h"
+#include "RegressionTest/RegressionTest.h"
+using namespace MediaInfoDLL;
+using namespace ZenLib;
+using namespace std;
+
+void RegressionTest_Basic(Ztring Files, Ztring DataBaseDirectory, int32u Scenario)
+{
+    ZtringListListF* Ref=new ZtringListListF[Stream_Max];
+    for (size_t StreamKind=0; StreamKind<Stream_Max; StreamKind++)
+        if (File::Exists(DataBaseDirectory+__T("\\Basic\\Ref\\")+Ztring::ToZtring(StreamKind)+__T(".csv")))
+            Ref[StreamKind].Load(DataBaseDirectory+__T("\\Basic\\Ref\\")+Ztring::ToZtring(StreamKind)+__T(".csv"));
+
+    ZtringListListF* New=new ZtringListListF[Stream_Max];
+
+    cout<<" Analyzing"<<endl;
+    MediaInfoList MIL;
+    MIL.Open(Files);
+
+    cout<<" Retrieving new data"<<endl;
+    for (size_t StreamKind=0; StreamKind<Stream_Max; StreamKind++)
+    {
+        for (size_t FilePos=0; FilePos<MIL.Count_Get(); FilePos++)
+            if (MIL.Count_Get(FilePos, (stream_t)StreamKind))
+            {
+                New[StreamKind].push_back(ZtringList());
+                New[StreamKind].at(New[StreamKind].size()-1).push_back(Ztring()); //CompleteFileName
+                for (size_t LinePos=0; LinePos<MIL.Count_Get(FilePos, (stream_t)StreamKind, 0); LinePos++)
+                    New[StreamKind].at(New[StreamKind].size()-1).push_back(MIL.Get(FilePos, (stream_t)StreamKind, 0, LinePos, Info_Name));
+                break;
+            }
+    }
+    for (size_t FilePos=0; FilePos<MIL.Count_Get(); FilePos++)
+        for (size_t StreamKind=0; StreamKind<Stream_Max; StreamKind++)
+            for (size_t StreamPos=0; StreamPos<MIL.Count_Get(FilePos, (stream_t)StreamKind); StreamPos++)
+            {
+                New[StreamKind].push_back(ZtringList());
+                New[StreamKind].at(New[StreamKind].size()-1).push_back(MIL.Get(FilePos, Stream_General, 0, __T("CompleteName")));
+                for (size_t LinePos=0; LinePos<MIL.Count_Get(FilePos, (stream_t)StreamKind, StreamPos); LinePos++)
+                    New[StreamKind].at(New[StreamKind].size()-1).push_back(MIL.Get(FilePos, (stream_t)StreamKind, StreamPos, LinePos));
+            }
+
+    for (size_t StreamKind=0; StreamKind<Stream_Max; StreamKind++)
+    {
+        if (!Dir::Exists(DataBaseDirectory+__T("\\Basic\\New")))
+            Dir::Create(DataBaseDirectory+__T("\\Basic\\New"));
+        New[StreamKind].Save(DataBaseDirectory+__T("\\Basic\\New\\")+Ztring::ToZtring(StreamKind)+__T(".csv"));
+    }
+
+    cout<<" Diff"<<endl;
+    ZtringListListF* Diff=new ZtringListListF[Stream_Max];
+    for (size_t StreamKind=0; StreamKind<Stream_Max; StreamKind++)
+    {
+        size_t Ref_Pos=1;
+        size_t New_Pos=1;
+        while (Ref_Pos<Ref[StreamKind].size() && New_Pos<New[StreamKind].size())
+        {
+            if (New[StreamKind](New_Pos, 0)!=Ref[StreamKind](Ref_Pos, 0))
+            {
+                size_t Ref_PosNext=Ref_Pos;
+                size_t New_PosNext=New_Pos;
+                while (Ref_PosNext<Ref[StreamKind].size() && New[StreamKind](New_Pos, 0)!=Ref[StreamKind](Ref_PosNext, 0))
+                    Ref_PosNext++;
+                if (Ref_PosNext==Ref[StreamKind].size()) //Ref file not found
+                {
+                    Diff[StreamKind].push_back(New[StreamKind](New_Pos));
+                    New_Pos++;
+                }
+                else
+                {
+                    for (; Ref_Pos<Ref_PosNext; Ref_Pos++)
+                        Diff[StreamKind].push_back(Ref[StreamKind](Ref_Pos));
+                }
+            }
+            else
+            {
+                bool IsDiff=false;
+                size_t LinePos_Max=max(New[StreamKind](New_Pos).size(), Ref[StreamKind](Ref_Pos).size());
+                for (size_t LinePos=1; LinePos<LinePos_Max; LinePos++)
+                    if (New[StreamKind](New_Pos, LinePos)!=Ref[StreamKind](Ref_Pos, LinePos))
+                    {
+                        if (!IsDiff)
+                        {
+                            Diff[StreamKind].push_back(ZtringList());
+                            Diff[StreamKind](Diff[StreamKind].size()-1, 0)=New[StreamKind](New_Pos, 0);
+                            IsDiff=true;
+                        }
+                        Diff[StreamKind](Diff[StreamKind].size()-1, LinePos)=New[StreamKind](New_Pos, LinePos)+__T(" --- ")+Ref[StreamKind](Ref_Pos, LinePos);
+                    }
+
+                Ref_Pos++;
+                New_Pos++;
+            }
+
+        }
+
+        for (; Ref_Pos<Ref[StreamKind].size(); Ref_Pos++)
+        {
+            Diff[StreamKind].push_back(ZtringList());
+            Diff[StreamKind](Diff[StreamKind].size()-1, 0)=Ref[StreamKind](Ref_Pos, 0);
+            for (size_t LinePos=1; LinePos<Ref[StreamKind][Ref_Pos].size(); LinePos++)
+                if (!Ref[StreamKind](Ref_Pos, LinePos).empty())
+                    Diff[StreamKind](Diff[StreamKind].size()-1, LinePos)=__T(" --- ")+Ref[StreamKind](Ref_Pos, LinePos);
+        }
+        for (; New_Pos<New[StreamKind].size(); New_Pos++)
+        {
+            Diff[StreamKind].push_back(ZtringList());
+            Diff[StreamKind](Diff[StreamKind].size()-1, 0)=New[StreamKind](New_Pos, 0);
+            for (size_t LinePos=1; LinePos<New[StreamKind][New_Pos].size(); LinePos++)
+                if (!New[StreamKind](New_Pos, LinePos).empty())
+                    Diff[StreamKind](Diff[StreamKind].size()-1, LinePos)=New[StreamKind](New_Pos, LinePos)+__T(" --- ");
+        }
+    }
+
+    for (size_t StreamKind=0; StreamKind<Stream_Max; StreamKind++)
+    {
+        if (!Diff[StreamKind].empty())
+        {
+            Diff[StreamKind].insert(Diff[StreamKind].begin(), New[StreamKind](0));
+            if (!Dir::Exists(DataBaseDirectory+__T("\\Basic\\Diff")))
+                Dir::Create(DataBaseDirectory+__T("\\Basic\\Diff"));
+            Diff[StreamKind].Save(DataBaseDirectory+__T("\\Basic\\Diff\\")+Ztring::ToZtring(StreamKind)+__T(".csv"));
+        }
+    }
+}

libmediainfo_0.7.60.tar.bz2/Source/RegressionTest/RegressionTest_Events.cpp Added

@@ -0,0 +1,464 @@
+// RegressionTest.cpp : Defines the entry point for the console application.
+//
+
+#include <iostream>
+#include <stdio.h>
+#include <map>
+#include "tchar.h"
+#include "MediaInfoDLL\MediaInfoDLL.h"
+#include "MediaInfo\MediaInfo_Events.h"
+#include "ZenLib\ZtringListListF.h"
+#include "ZenLib\Dir.h"
+#include "ZenLib\File.h"
+#include "ZenLib\FileName.h"
+#include "RegressionTest/RegressionTest.h"
+using namespace MediaInfoDLL;
+using namespace ZenLib;
+using namespace std;
+
+const char* F_FileName;
+#define echoF(_format) UserHandle_struct::perevent &PerEvent=UserHandle->PerEvent[Event->EventCode]; if (!PerEvent.F_MoreThanOnce) {fprintf(PerEvent.F, _format); PerEvent.F_MoreThanOnce=true; } fprintf(PerEvent.F, "\n");
+#define echo0(_format) fprintf(PerEvent.F, _format)
+#define echo1(_format, Arg1) fprintf(PerEvent.F, _format, Arg1)
+#define echo2(_format, Arg1, Arg2) fprintf(PerEvent.F, _format, Arg1, Arg2)
+#define echo4(_format, Arg1, Arg2, Arg3, Arg4) fprintf(PerEvent.F, _format, Arg1, Arg2, Arg3, Arg4)
+
+struct UserHandle_struct
+{
+    FileName Name;
+    Ztring Files;
+    Ztring DataBaseDirectory;
+    struct perevent
+    {
+        FILE* F;
+        bool  F_MoreThanOnce;
+        bool  Custom_MoreThanOnce;
+    };
+    map<int32u, perevent> PerEvent;
+    int32u Scenario;
+    bool Custom;
+    bool ParseSpeed;
+    bool NextPacket;
+    bool DemuxContainerOnly;
+    bool Seek;
+
+    UserHandle_struct()
+    {
+        Custom=false;
+        ParseSpeed=false;
+        NextPacket=false;
+        DemuxContainerOnly=false;
+        Seek=false;
+    }
+
+    void Clear()
+    {
+        for (map<int32u, perevent>::iterator Item=PerEvent.begin(); Item!=PerEvent.end(); Item++)
+            fclose (Item->second.F);
+        PerEvent.clear();
+    }
+
+};
+
+void General_Start_0 (struct MediaInfo_Event_General_Start_0* Event, struct UserHandle_struct* UserHandle)
+{
+    echoF("MediaInfo starts\n");
+
+    echo1("Stream_Size=%i\n", Event->Stream_Size);
+}
+
+void General_End_0 (struct MediaInfo_Event_General_End_0* Event, struct UserHandle_struct* UserHandle)
+{
+    echoF("MediaInfo ends\n");
+
+    echo1("Stream_Bytes_Analyzed=%i\n", Event->Stream_Bytes_Analyzed);
+}
+
+void General_Parser_Selected_0 (struct MediaInfo_Event_General_Parser_Selected_0* Event, struct UserHandle_struct* UserHandle)
+{
+    echoF("MediaInfo has selected the parser\n");
+
+    echo1("Name=%s\n", Event->Name);
+}
+
+void General_Move_Request_0 (struct MediaInfo_Event_General_Move_Request_0* Event, struct UserHandle_struct* UserHandle)
+{
+    echoF("MediaInfo has requested to seek\n");
+
+    echo1("Stream_Offset=%08x\n", Event->Stream_Offset);
+}
+
+void General_Move_Done_0 (struct MediaInfo_Event_General_Move_Done_0* Event, struct UserHandle_struct* UserHandle)
+{
+    echoF("MediaInfo has seek\n");
+
+    echo1("Stream_Offset=%08x\n", Event->Stream_Offset);
+}
+
+void General_SubFile_Start_0 (struct MediaInfo_Event_General_SubFile_Start_0* Event, struct UserHandle_struct* UserHandle)
+{
+    echoF("MediaInfo is parsing a new file from the source file\n");
+
+    echo1("FileName_Relative=%s\n", Event->FileName_Relative);
+    echo1("FileName_Absolute=%s\n", Event->FileName_Absolute);
+}
+
+void General_SubFile_End_0 (struct MediaInfo_Event_General_SubFile_End_0* Event, struct UserHandle_struct* UserHandle)
+{
+    echoF("MediaInfo has finished the parsing a new file from the source file\n");
+}
+
+void Global_Demux_3(struct MediaInfo_Event_Global_Demux_3 *Event, struct UserHandle_struct* UserHandle)
+{
+    if (!UserHandle->DemuxContainerOnly)
+        return;
+
+    echoF("MediaInfo Demux\n");
+
+    echo1("Stream_Offset=%08x,", Event->Stream_Offset);
+    echo1(" Frame_Number=%u\n", Event->FrameNumber);
+    echo0("IDs=");
+    for (size_t Pos=0; Pos<Event->StreamIDs_Size; Pos++)
+        switch (Event->StreamIDs_Width[Pos])
+        {
+            case 2: echo1("%02x, ", Event->StreamIDs[Pos]); break;
+            case 4: echo1("%04x, ", Event->StreamIDs[Pos]); break;
+            case 8: echo1("%08x, ", Event->StreamIDs[Pos]); break;
+            default: echo1("%08x, ", Event->StreamIDs[Pos]); break;
+        }
+    echo0("\n");
+    if (Event->PCR!=(int64u)-1)
+        echo1("PCR=%s, ", Ztring().Duration_From_Milliseconds(Event->PCR/1000000).To_Local().c_str());
+    if (Event->PTS!=(int64u)-1)
+        echo1("PTS=%s, ", Ztring().Duration_From_Milliseconds(Event->PTS/1000000).To_Local().c_str());
+    if (Event->DTS!=(int64u)-1)
+        echo1("DTS=%s, ", Ztring().Duration_From_Milliseconds(Event->DTS/1000000).To_Local().c_str());
+    if (Event->DUR!=(int64u)-1)
+        echo1("DUR=%s, ", Ztring().Duration_From_Milliseconds(Event->DUR/1000000).To_Local().c_str());
+    if (Event->PCR!=(int64u)-1 || Event->PTS!=(int64u)-1 || Event->DTS!=(int64u)-1 || Event->DUR!=(int64u)-1)
+        echo0("\n");
+    echo1("Content_Type=%i,", Event->Content_Type);
+    echo1(" Content_Size=%i,", Event->Content_Size);
+    echo1(" Flags=%08x\n", Event->Flags);
+}
+
+void Video_SliceInfo_0(struct MediaInfo_Event_Video_SliceInfo_0 *Event, struct UserHandle_struct* UserHandle)
+{
+    if (!UserHandle->DemuxContainerOnly)
+        return;
+
+    echoF("MediaInfo Demux\n");
+
+    echo1("Stream_Offset=%08x,", Event->Stream_Offset);
+    echo1(" FramePosition=%u,", Event->FramePosition);
+    echo1(" FieldPosition=%u,", Event->FramePosition);
+    echo1(" SlicePosition=%u,", Event->FramePosition);
+    echo0("IDs=");
+    for (size_t Pos=0; Pos<Event->StreamIDs_Size; Pos++)
+        switch (Event->StreamIDs_Width[Pos])
+        {
+            case 2: echo1("%02x, ", Event->StreamIDs[Pos]); break;
+            case 4: echo1("%04x, ", Event->StreamIDs[Pos]); break;
+            case 8: echo1("%08x, ", Event->StreamIDs[Pos]); break;
+            default: echo1("%08x, ", Event->StreamIDs[Pos]); break;
+        }
+    echo0("\n");
+    if (Event->PCR!=(int64u)-1)
+        echo1("PCR=%s, ", Ztring().Duration_From_Milliseconds(Event->PCR/1000000).To_Local().c_str());
+    if (Event->PTS!=(int64u)-1)
+        echo1("PTS=%s, ", Ztring().Duration_From_Milliseconds(Event->PTS/1000000).To_Local().c_str());
+    if (Event->DTS!=(int64u)-1)
+        echo1("DTS=%s, ", Ztring().Duration_From_Milliseconds(Event->DTS/1000000).To_Local().c_str());
+    if (Event->DUR!=(int64u)-1)
+        echo1("DUR=%s, ", Ztring().Duration_From_Milliseconds(Event->DUR/1000000).To_Local().c_str());
+    if (Event->PCR!=(int64u)-1 || Event->PTS!=(int64u)-1 || Event->DTS!=(int64u)-1 || Event->DUR!=(int64u)-1)
+        echo0("\n");
+    echo1("SliceType=%i,", Event->SliceType);
+    echo1(" Flags=%08x\n", Event->Flags);
+}
+
+/***************************************************************************/
+/* The callback function                                                   */
+/***************************************************************************/
+
+#define CASE(_PARSER,_EVENT,_VERSION) \
+    case MediaInfo_Event_##_PARSER##_##_EVENT : if (EventVersion==_VERSION && Data_Size>=sizeof(struct MediaInfo_Event_##_PARSER##_##_EVENT##_##_VERSION)) _PARSER##_##_EVENT##_##_VERSION((struct MediaInfo_Event_##_PARSER##_##_EVENT##_##_VERSION*)Data_Content, UserHandle); break;
+
+void __stdcall Event_CallBackFunction(unsigned char* Data_Content, size_t Data_Size, void* UserHandle_Void)
+{
+    /*Retrieving UserHandle*/
+    struct UserHandle_struct*           UserHandle=(struct UserHandle_struct*)UserHandle_Void;
+    struct MediaInfo_Event_Generic*     Event_Generic=(struct MediaInfo_Event_Generic*) Data_Content;
+    unsigned char                       ParserID;
+    unsigned short                      EventID;
+    unsigned char                       EventVersion;
+
+    /*integrity tests*/
+    if (Data_Size<4)
+        return; //There is a problem
+
+    if (UserHandle->PerEvent[Event_Generic->EventCode].F==NULL)
+    {
+        Ztring Number; Number.From_Number(Event_Generic->EventCode, 16);
+        while (Number.size()<8)
+            Number.insert(0, 1, __T('0'));
+        Ztring Name=Ztring(UserHandle->DataBaseDirectory+__T("\\Events\\New\\")+FileName(UserHandle->Files).Name_Get()+__T("\\")+Ztring::ToZtring(UserHandle->Scenario)+__T("\\")+Number+__T("\\")+UserHandle->Name.Name_Get()+__T(".txt"));
+        if (!Dir::Exists(UserHandle->DataBaseDirectory+__T("\\Events\\New")))
+            Dir::Create(UserHandle->DataBaseDirectory+__T("\\Events\\New"));
+        if (!Dir::Exists(UserHandle->DataBaseDirectory+__T("\\Events\\New\\")+FileName(UserHandle->Files).Name_Get()))
+            Dir::Create(UserHandle->DataBaseDirectory+__T("\\Events\\New\\")+FileName(UserHandle->Files).Name_Get());
+        if (!Dir::Exists(UserHandle->DataBaseDirectory+__T("\\Events\\New\\")+FileName(UserHandle->Files).Name_Get()+__T("\\")+Ztring::ToZtring(UserHandle->Scenario)))
+            Dir::Create(UserHandle->DataBaseDirectory+__T("\\Events\\New\\")+FileName(UserHandle->Files).Name_Get()+__T("\\")+Ztring::ToZtring(UserHandle->Scenario));
+        if (!Dir::Exists(FileName(Name).Path_Get()))
+            Dir::Create(FileName(Name).Path_Get());
+        UserHandle->PerEvent[Event_Generic->EventCode].F=fopen(Name.To_Local().c_str(), "w");
+    }
+
+    /*Retrieving EventID*/
+    ParserID    =(unsigned char) ((Event_Generic->EventCode&0xFF000000)>>24);
+    EventID     =(unsigned short)((Event_Generic->EventCode&0x00FFFF00)>>8 );
+    EventVersion=(unsigned char) ( Event_Generic->EventCode&0x000000FF     );
+
+
+    //*Global to all parsers
+    switch (EventID)
+    {
+                    CASE (Global, Demux, 3)
+                    CASE (Video, SliceInfo, 0)
+                    default                                                                     : ;
+    }
+
+    switch (ParserID)
+    {
+        case MediaInfo_Parser_None :
+                switch (EventID)
+                {
+                    case MediaInfo_Event_General_Start                                          : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_General_Start_0)) General_Start_0((struct MediaInfo_Event_General_Start_0*)Data_Content, UserHandle); break;
+                    case MediaInfo_Event_General_End                                            : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_General_End_0)) General_End_0((struct MediaInfo_Event_General_End_0*)Data_Content, UserHandle); break;
+                    case MediaInfo_Event_General_Parser_Selected                                : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_General_Parser_Selected_0)) General_Parser_Selected_0((struct MediaInfo_Event_General_Parser_Selected_0*)Data_Content, UserHandle); break;
+                    case MediaInfo_Event_General_Move_Request                                   : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_General_Move_Request_0)) General_Move_Request_0((struct MediaInfo_Event_General_Move_Request_0*)Data_Content, UserHandle); break;
+                    case MediaInfo_Event_General_Move_Done                                      : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_General_Move_Done_0)) General_Move_Done_0((struct MediaInfo_Event_General_Move_Done_0*)Data_Content, UserHandle); break;
+                    case MediaInfo_Event_General_SubFile_Start                                  : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_General_SubFile_Start_0)) General_SubFile_Start_0((struct MediaInfo_Event_General_SubFile_Start_0*)Data_Content, UserHandle); break;
+                    case MediaInfo_Event_General_SubFile_End                                    : if (EventVersion==0 && Data_Size==sizeof(struct MediaInfo_Event_General_SubFile_End_0)) General_SubFile_End_0((struct MediaInfo_Event_General_SubFile_End_0*)Data_Content, UserHandle); break;
+                    default                                                                     : ;
+                }
+                break;
+        default : ; //ParserID is unknown
+    }
+}
+
+void RegressionTest_Events(Ztring Files, Ztring DataBaseDirectory, int32u Scenario)
+{
+    // Scenarios:
+    // bit  0 : quick parsing / full parsing
+    // bit  1 : next packet interface
+    // bit  2 : demux (by container only)
+    // bit  3 : do some seeks
+
+
+    cout<<" Analyzing"<<endl;
+    ZtringListListF FilesList_Source;
+    if (FileName(Files).Extension_Get()==__T("csv"))
+        FilesList_Source.Load(DataBaseDirectory+__T("\\Events\\FilesList.csv"));
+    else
+    {
+        FilesList_Source.push_back(ZtringList());
+        //if (File::Exists(Files))
+            FilesList_Source.push_back(Files);
+        //else
+        //    FilesList_Source.push_back(Files+__T("\\*.*"));
+    }
+    vector<UserHandle_struct> FilesList;
+    for (size_t FilesList_Source_Pos=1; FilesList_Source_Pos<FilesList_Source.size(); FilesList_Source_Pos++)
+    {
+        ZtringList Temp=Dir::GetAllFileNames(FilesList_Source[FilesList_Source_Pos](0));
+        for (size_t Temp_Pos=0; Temp_Pos<Temp.size(); Temp_Pos++)
+        {
+            UserHandle_struct ToAdd;
+            ToAdd.Name=Temp[Temp_Pos];
+            ToAdd.DataBaseDirectory=DataBaseDirectory;
+            ToAdd.Files=Files;
+            ToAdd.Scenario=Scenario;
+            if (Scenario&(1<<0))
+                ToAdd.ParseSpeed=true;
+            if (Scenario&(1<<1))
+                ToAdd.NextPacket=true;
+            if (Scenario&(1<<2))
+                ToAdd.DemuxContainerOnly=true;
+            if (Scenario&(1<<3))
+                ToAdd.Seek=true;
+
+            FilesList.push_back(ToAdd);
+        }
+    }
+
+
+    for (size_t FilesList_Pos=0; FilesList_Pos<FilesList.size(); FilesList_Pos++)
+    {
+        cout<<" "<<FilesList_Pos+1<<"/"<<FilesList.size()<<" "<<FilesList[FilesList_Pos].Name.To_Local()<<endl;
+
+        MediaInfo MI;
+        Ztring MI_Result;
+
+        //**********************************************************************
+        // Configuring
+        //**********************************************************************
+
+        // CallBack configuration
+        // MediaInfo need pointer as text (for compatibility with older version) + 64-bit OS handling
+        // form is "CallBack=memory://handlerInDecimal;UserHandler=memory://handlerInDecimal"
+        // UserHandler is a unique value wich will be provided to the callback function, in order to know which MediaInfo instance send the event
+        wostringstream Event_CallBackFunction_Text;
+        Event_CallBackFunction_Text<<__T("CallBack=memory://")<<(MediaInfo_int64u)Event_CallBackFunction<<__T(";UserHandler=memory://")<<(MediaInfo_int64u)&FilesList[FilesList_Pos];
+        MI_Result=MI.Option(__T("File_Event_CallBackFunction"), Event_CallBackFunction_Text.str());
+        if (!MI_Result.empty())
+        {
+            wcout<<__T("MediaInfo error: ")<<MI_Result<<endl;
+            return;
+        }
+
+        //Retrieiving basic data
+        MI.Open(FilesList[FilesList_Pos].Name);
+        Ztring Delay_10s=Ztring().Duration_From_Milliseconds(Ztring(MI.Get(Stream_Video, 0, __T("Delay"))).To_int64u()+10000);
+
+        if (FilesList[FilesList_Pos].ParseSpeed)
+        {
+            MI_Result=MI.Option(__T("ParseSpeed"), __T("1.0"));
+            if (!MI_Result.empty())
+            {
+                wcout<<__T("MediaInfo error: ")<<MI_Result<<endl;
+                return;
+            }
+        }
+
+        if (FilesList[FilesList_Pos].DemuxContainerOnly)
+        {
+            MI_Result=MI.Option(__T("Demux"), __T("container"));
+            if (!MI_Result.empty())
+            {
+                wcout<<__T("MediaInfo error: ")<<MI_Result<<endl;
+                return;
+            }
+
+            MI_Result=MI.Option(__T("File_Demux_Unpacketize"), __T("1"));
+            if (!MI_Result.empty())
+            {
+                wcout<<__T("MediaInfo error: ")<<MI_Result<<endl;
+                return;
+            }
+
+            MI_Result=MI.Option(__T("File_Demux_PCM_20bitTo16bit"), __T("1"));
+            if (!MI_Result.empty())
+            {
+                wcout<<__T("MediaInfo error: ")<<MI_Result<<endl;
+                return;
+            }
+        }
+
+        if (FilesList[FilesList_Pos].NextPacket)
+        {
+            MI_Result=MI.Option(__T("File_NextPacket"), __T("1"));
+            if (!MI_Result.empty())
+            {
+                wcout<<__T("MediaInfo error: ")<<MI_Result<<endl;
+                return;
+            }
+        }
+
+        MI.Open(FilesList[FilesList_Pos].Name);
+
+        if (FilesList[FilesList_Pos].NextPacket)
+        {
+            int Counter=0;
+            while (MI.Open_NextPacket()&0x100)
+            {
+                if (FilesList[FilesList_Pos].Seek)
+                {
+                    Counter++;
+                    if (Counter==0)
+                        MI.Option(__T("File_Seek"), __T("0"));
+                    if (Counter==100)
+                        MI.Option(__T("File_Seek"), Delay_10s);
+                    if (Counter==200)
+                        MI.Option(__T("File_Seek"), __T("Frame=100"));
+                    if (Counter==300)
+                        MI.Option(__T("File_Seek"), __T("95%"));
+                }
+            }
+        }
+
+        FilesList[FilesList_Pos].Clear();
+    }
+
+    cout<<" Diff"<<endl;
+    ZtringList Ref=Dir::GetAllFileNames(DataBaseDirectory+__T("\\Events\\Ref\\")+FileName(Files).Name_Get()+__T("\\")+Ztring::ToZtring(Scenario)+__T("*.*"));
+    ZtringList New=Dir::GetAllFileNames(DataBaseDirectory+__T("\\Events\\New\\")+FileName(Files).Name_Get()+__T("\\")+Ztring::ToZtring(Scenario)+__T("*.*"));
+    for (size_t Ref_Pos=0; Ref_Pos<Ref.size(); Ref_Pos++)
+    {
+        Ztring Ref_ToFind=Ref[Ref_Pos];
+        Ref_ToFind.FindAndReplace(__T("\\Events\\Ref\\"), __T("\\Events\\New\\"));
+        size_t New_RefPos=New.Find(Ref_ToFind);
+        bool IsDiff=false;
+        if (New_RefPos!=(size_t)-1)
+        {
+            File F_Ref; F_Ref.Open(Ref[Ref_Pos]);
+            File F_New; F_New.Open(New[New_RefPos]);
+            if (F_Ref.Size_Get()==F_New.Size_Get())
+            {
+                int64u Size=F_Ref.Size_Get();
+                if (Size>100000000)
+                    Size=100000000;
+                int8u* F_Ref_Buffer=new int8u[(size_t)Size];
+                F_Ref.Read(F_Ref_Buffer, (size_t)Size);
+                int8u* F_New_Buffer=new int8u[(size_t)Size];
+                F_New.Read(F_New_Buffer, (size_t)Size);
+
+                if (memcmp(F_Ref_Buffer, F_New_Buffer, (size_t)Size))
+                    IsDiff=true;
+
+                delete[] F_Ref_Buffer;
+                delete[] F_New_Buffer;
+            }
+            else
+                IsDiff=true;
+        }
+        if (New_RefPos==(size_t)-1 || IsDiff)
+        {
+            //Not in new or is different
+            Ztring Diff_Name=Ref[Ref_Pos];
+            Diff_Name.FindAndReplace(__T("\\Events\\Ref\\"), __T("\\Events\\Diff\\"));
+            if (!Dir::Exists(DataBaseDirectory+__T("\\Events\\Diff")))
+                Dir::Create(DataBaseDirectory+__T("\\Events\\Diff"));
+            if (!Dir::Exists(DataBaseDirectory+__T("\\Events\\Diff\\")+FileName(Files).Name_Get()))
+                Dir::Create(DataBaseDirectory+__T("\\Events\\Diff\\")+FileName(Files).Name_Get());
+            if (!Dir::Exists(DataBaseDirectory+__T("\\Events\\Diff\\")+FileName(Files).Name_Get()+__T("\\")+Ztring::ToZtring(Scenario)))
+                Dir::Create(DataBaseDirectory+__T("\\Events\\Diff\\")+FileName(Files).Name_Get()+__T("\\")+Ztring::ToZtring(Scenario));
+            if (!Dir::Exists(FileName(Diff_Name).Path_Get()))
+                Dir::Create(FileName(Diff_Name).Path_Get());
+            if (!IsDiff)
+                File::Copy(Ref[Ref_Pos], Diff_Name+__T(".RefAlone.txt")); //Not in new
+            else
+            {
+                File::Copy(Ref[Ref_Pos], Diff_Name+__T(".Ref.txt")); //Diff
+                File::Copy(New[New_RefPos], Diff_Name+__T(".New.txt"));
+            }
+        }
+        if (New_RefPos!=(size_t)-1)
+            New.erase(New.begin()+New_RefPos);
+    }
+    for (size_t New_Pos=0; New_Pos<New.size(); New_Pos++)
+    {
+        //Not in ref
+        Ztring Diff_Name=New[New_Pos];
+        Diff_Name.FindAndReplace(__T("\\Events\\New\\"), __T("\\Events\\Diff\\"));
+        if (!Dir::Exists(DataBaseDirectory+__T("\\Events\\Diff")))
+            Dir::Create(DataBaseDirectory+__T("\\Events\\Diff"));
+        if (!Dir::Exists(DataBaseDirectory+__T("\\Events\\Diff\\")+FileName(Files).Name_Get()))
+            Dir::Create(DataBaseDirectory+__T("\\Events\\Diff\\")+FileName(Files).Name_Get());
+        if (!Dir::Exists(DataBaseDirectory+__T("\\Events\\Diff\\")+FileName(Files).Name_Get()+__T("\\")+Ztring::ToZtring(Scenario)))
+            Dir::Create(DataBaseDirectory+__T("\\Events\\Diff\\")+FileName(Files).Name_Get()+__T("\\")+Ztring::ToZtring(Scenario));
+        if (!Dir::Exists(FileName(Diff_Name).Path_Get()))
+            Dir::Create(FileName(Diff_Name).Path_Get());
+         File::Copy(New[New_Pos], Diff_Name+__T(".NewAlone.txt")); //Not in new
+    }
+}

libmediainfo_0.7.60.tar.bz2/Source/Resource Added

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text Added

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/DataBase Added

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/DataBase/Codec.csv Added

@@ -0,0 +1,1079 @@
+ BIT;RGB;4CC;V;RGB;;Uncompressed;
+ JPG;JPEG;4CC;V;JPEG;;;
+ PNG;PNG;4CC;V;RGB;;;
+ RAW;RGB;4CC;V;RGB;;Uncompressed;http://www.fourcc.org/indexrgb.htm
+ RGB;RGB;4CC;V;RGB;;Uncompressed. Basic Windows bitmap format. 1, 4 and 8 bpp versions are palettised. 16, 24 and 32bpp contain Uncompressed RGB samples.;http://www.fourcc.org/indexrgb.htm
+ RL4;RGB;4CC;V;RGB;;RLE 4bpp;http://www.fourcc.org/indexrgb.htm
+ RL8;RGB;4CC;V;RGB;;RLE 8bpp;http://www.fourcc.org/indexrgb.htm
+1978;RGB;4CC;V;JPEG;;A.M.Paredes predictor;http://www.pegasusimaging.com/cgi-bin/download2.cgi?LVIDB
+2VUY;YUV;4CC;V;YUV;;Optibase VideoPump 8-bit 4:2:2 Component YCbCr;
+3IV0;3ivX;4CC;V;MPEG-4V;;3ivX pre-1.0;http://www.3ivx.com/download/
+3IV1;3ivX;4CC;V;MPEG-4V;;3ivX 1.0-3.5;http://www.3ivx.com/download/
+3IV2;3ivX;4CC;V;MPEG-4V;;3ivX 4.0;http://www.3ivx.com/download/
+3IVD;3ivX;4CC;V;MPEG-4V;;;http://ffdshow-tryout.sourceforge.net/
+3IVX;3ivX;4CC;V;MPEG-4V;;;http://www.3ivx.com/download/
+3VID;3ivX;4CC;V;MPEG-4V;;;http://www.3ivx.com/download/
+8BPS;QuickTime 8bps;4CC;V;RGB;;Apple QuickTime Planar RGB with Alpha-channel;http://ffdshow-tryout.sourceforge.net/
+AAS4;Autodesk;4CC;V;RGB;;Autodesk Animator Studio RLE (warning: this is a discoutinued product);http://mirror01.iptelecom.net.ua/~video/codecs/Autodesk.Animator.v1.11.Codec.exe
+AASC;Autodesk;4CC;V;RGB;;Autodesk Animator Studio RLE (warning: this is a discoutinued product);http://mirror01.iptelecom.net.ua/~video/codecs/Autodesk.Animator.v1.11.Codec.exe
+ABYR;Kensigton low;4CC;V;;;Kensington (low resolution, low frame rate (6fps) for digital cameras);
+ACTL;ACT-L2;4CC;V;;;Streambox ACT-L2;http://www.streambox.com/products/act-L2_codec.htm
+ADV1;WaveCodec;4CC;V;Wavelet;;Loronix WaveCodec;http://www.loronix.com/products/video_clips/wavecodec.asp
+ADVJ;Avid;4CC;V;JPEG;;Avid JPEG. Aka AVRn;
+AEIK;Indeo 3.2;4CC;V;;;Intel Indeo Video 3.2 (Vector Quantization);
+AEMI;VideoONE;4CC;V;MPEG-V;;Array VideoONE MPEG-1-I Capture. Array's used for I frame only MPEG-1 AVI files;http://www.array.com
+AFLC;Autodesk;4CC;V;;;Autodesk Animator Studio FLI (256 color) (warning: this is a discoutinued product);http://mirror01.iptelecom.net.ua/~video/codecs/Autodesk.Animator.v1.11.Codec.exe
+AFLI;Autodesk;4CC;V;;;Autodesk Animator Studio FLI (256 color) (warning: this is a discoutinued product);http://mirror01.iptelecom.net.ua/~video/codecs/Autodesk.Animator.v1.11.Codec.exe
+AHDV;CineForm;4CC;V;Wavelet;;CineForm 10-bit Visually Perfect HD (Wavelet);http://www.cineform.com/products/ConnectHD.htm
+AJPG;JPEG;4CC;V;JPEG;;22fps JPEG-based for digital cameras;
+ALPH;Ziracom;4CC;V;;;Ziracom Digital Communications Inc.;
+AMPG;VideoONE;4CC;V;MPEG-1;;Array VideoONE MPEG;http://www.array.com
+AMR ;AMR;4CC;V;;;Speech codec;
+ANIM;RDX;4CC;V;;;Intel RDX;
+AP41;AngelPotion;4CC;V;MPEG-4V;;AngelPotion Definitive 1 (hack of MS MPEG-4 v3);http://www.divxity.com/download/ap4v1-702.exe
+AP42;AngelPotion;4CC;V;MPEG-4V;;AngelPotion Definitive 2 (hack of MS MPEG-4 v3);http://www.divxity.com/download/ap4v1-702.exe
+ASLC;AlparySoft Lossless;4CC;V;;;AlparySoft Lossless;http://www.free-codecs.com/download/Alparysoft_Lossless_Video_Codec.htm
+ASV1;Asus 1;4CC;V;;;Asus Video 1;ftp://ftp.asuscom.de/pub/asuscom/treiber/vga/ASUS_VGA_TOOLS/asv2dec.zip
+ASV2;Asus 2;4CC;V;;;Asus Video 2;ftp://ftp.asuscom.de/pub/asuscom/treiber/vga/ASUS_VGA_TOOLS/asv2dec.zip
+ASVX;Asus X;4CC;V;;;Asus Video X;ftp://ftp.asuscom.de/pub/asuscom/treiber/vga/ASUS_VGA_TOOLS/asv2dec.zip
+ATM4;Nero MPEG-4;4CC;V;MPEG-4V;;Ahead Nero Digital MPEG-4;http://www.nero.com
+AUR2;YUV;4CC;V;YUV;;Auravision Aura 2 - YUV 422;
+AURA;YUV;4CC;V;YUV;;Auravision Aura 1 - YUV 411;
+AUVX;AUVX;4CC;V;;;USH GmbH;
+AV1X;Avid 1:1;4CC;V;;;Avid 1:1x (Quick Time);http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe
+AVC1;AVC;4CC;V;AVC;;Advanced Video Codec;http://ffdshow-tryout.sourceforge.net/
+AVD1;Avid DV;4CC;V;DV;;Avid DV (Quick Time);http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe
+AVDJ;Avid JFIF;4CC;V;JPEG;;Avid Meridien JFIF with Alpha-channel;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe
+AVDN;Avid HD;4CC;V;;;Avid DNxHD (Quick Time);http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe
+AVDV;Avid DV;4CC;V;DV;;Avid DV;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe
+AVI1;MainConcept;4CC;V;JPEG;;MainConcept JPEG;
+AVI2;MainConcept;4CC;V;JPEG;;MainConcept JPEG;
+AVID;Avid JPEG;4CC;V;JPEG;;Avid JPEG;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe
+AVIS;AviSynth;4CC;V;;;Wrapper for AviSynth (Dummy);http://ffdshow-tryout.sourceforge.net/
+AVMP;Avid IMX;4CC;V;;;Avid IMX (Quick Time);http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe
+AVR ;Avid NuVista;4CC;V;JPEG;;Avid ABVB/NuVista JPEG with Alpha-channel;
+AVRn;Avid JPEG;4CC;V;JPEG;;Avid JPEG;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe
+AVRN;Avid JPEG;4CC;V;JPEG;;Avid JPEG;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe
+AVUI;Avid;4CC;V;;;Avid Meridien Uncompressed with Alpha-channel;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe
+AVUP;Avid;4CC;V;;;Avid 10bit Packed (Quick Time);http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe
+AYUV;YUV;4CC;V;YUV;;4:4:4 YUV (AYUV);
+AZPR;QuickTime;4CC;V;;;Quicktime Apple Video;http://www.apple.com/quicktime/download/standalone.html
+AZRP;QuickTime;4CC;V;;;Quicktime Apple Video;http://www.apple.com/quicktime/download/standalone.html
+BGR ;RGB;4CC;V;RGB;;Uncompressed RGB32;
+BHIV;BeHere iVideo;4CC;V;;;BeHere iVideo;
+BINK;Bink;4CC;V;;;RAD Game Tools Bink Video;
+BIT ;RGB;4CC;V;RGB;;Uncompressed. BI_BITFIELDS;
+BITM;H.261;4CC;V;;;Microsoft H.261;
+BLOX;Blox;4CC;V;;;Jan Jezabek BLOX MPEG;http://www.ii.uj.edu.pl/~jezabek/blox/blox-0.1.0b.zip
+BLZ0;DivX;4CC;V;MPEG-4V;;DivX for Blizzard Decoder Filter;http://ffdshow-tryout.sourceforge.net/
+BT20;MediaStream;4CC;V;;;Conexant ProSummer MediaStream;
+BTCV;Composite;4CC;V;;;Conexant Composite Video;
+BTVC;Composite;4CC;V;;;Conexant Composite Video;
+BW00;BergWave;4CC;V;Wavelet;;BergWave (Wavelet);
+BW10;Broadway;4CC;V;MPEG-1;;Data Translation Broadway MPEG Capture/Compression;
+BXBG;Boxx RGB;4CC;V;;;BOXX BGR;
+BXRG;Boxx RGB;4CC;V;;;BOXX RGB;
+BXY2;Boxx YUV;4CC;V;;;BOXX 10-bit YUV;
+BXYV;Boxx YUV;4CC;V;;;BOXX YUV;
+CC12;Intel YUV;4CC;V;YUV;;Intel YUV12;
+CDV5;Canopus DV;4CC;V;DV;;Canopus SD50/DVHD;http://www.cineform.com/products/ConnectHD.htm
+CDVC;Canopus DV;4CC;V;DV;;Canopus DV (DV);http://www.cineform.com/products/ConnectHD.htm
+CDVH;Canopus DV;4CC;V;DV;;Canopus SD50/DVHD;http://www.cineform.com/products/ConnectHD.htm
+CFCC;Perception;4CC;V;;;DPS Perception JPEG (dummy format - only AVI header);
+CFHD;CineForm;4CC;V;;;CineForm 10-bit Visually Perfect HD (Wavelet);
+CGDI;Camcorder;4CC;V;;;Camcorder Video (MS Office 97);
+CHAM;Champagne;4CC;V;;;Winnov Caviara Champagne;
+CJPG;Creative JPEG;4CC;V;JPEG;;Creative Video Blaster Webcam Go JPEG;
+CLJR;YUV;4CC;V;YUV;;Cirrus Logic YUV 4:1:1;http://www.fourcc.org/indexyuv.htm
+CLLC;Canopus;4CC;V;;;Canopus LossLess;
+CLPL;YUV;4CC;V;YUV;;Format similar to YV12 but including a level of indirection.;
+CM10;MediaShow;4CC;V;;;CyberLink Corporation;http://www.cyberlink.com
+CMYK;CMYK;4CC;V;;;Common Data Format in Printing;
+COL0;MS MPEG-4 v3;4CC;V;MPEG-4V;;Hacked MS MPEG-4 v3;http://ffdshow-tryout.sourceforge.net/
+COL1;MS MPEG-4 v3;4CC;V;MPEG-4V;;Hacked MS MPEG-4 v3;http://ffdshow-tryout.sourceforge.net/
+CPLA;YUV;4CC;V;YUV;;Weitek YUV 4:2:0 Planar;
+CRAM;MS Video;4CC;V;;;Microsoft Video 1;
+CSCD;CamStudio;4CC;V;;;RenderSoft CamStudio lossless (LZO & GZIP compression);
+CT10;TalkingShow;4CC;V;;;CyberLink Corporation;http://www.cyberlink.com
+CTRX;Citrix;4CC;V;;;Citrix Scalable Video;
+CUVC;Canopus HQ;4CC;V;;;Canopus HQ;
+CVID;Cinepack;4CC;V;;;Cinepak by CTi (ex. Radius) Vector Quantization;http://www.cinepak.com/text.html
+cvid;Cinepack;4CC;V;;;Cinepak by CTi (ex. Radius) Vector Quantization;http://www.apple.com/quicktime/download/standalone.html
+CWLT;WLT;4CC;V;;;Microsoft Color WLT DIB;
+CYUV;YUV;4CC;V;YUV;;Creative Labs YUV 4:2:2;http://www.fourcc.org/indexyuv.htm
+CYUY;YUV;4CC;V;YUV;;ATI Technologies YUV;http://www.fourcc.org/indexyuv.htm
+D261;H.261;4CC;V;;;DEC H.261;
+D263;H.263;4CC;V;;;DEC H.263;
+DAVC;AVC;4CC;V;AVC;;Dicas MPEGable H.264/MPEG-4 AVC base profile;
+DC25;MainConcept DV;4CC;V;DV;;MainConcept ProDV;
+DCAP;Pinnacle DV25;4CC;V;DV;;Pinnacle DV25;
+DCL1;Data Connextion;4CC;V;;;Data Connection Conferencing;
+DCT0;WniWni;4CC;V;;;WniWni;
+DFSC;VFW;4CC;V;;;DebugMode FrameServer VFW;
+DIB ;RGB;4CC;V;RGB;;Device Independent Bitmap;
+DIV1;FFMpeg;4CC;V;MPEG-4V;;FFmpeg-4 V1 (hacked MS MPEG-4 V1);http://ffdshow-tryout.sourceforge.net/
+DIV2;MS MPEG-4 1/2;4CC;V;MPEG-4V;;;http://ffdshow-tryout.sourceforge.net/
+DIV3;DivX 3 Low;4CC;V;MPEG-4V;;;http://www.divx.com
+DIV4;DivX 3 Fast;4CC;V;MPEG-4V;;;http://www.divx.com
+DIV5;DivX 5;4CC;V;MPEG-4V;;;http://www.divx.com
+DIV6;MS MPEG-4 v3;4CC;V;MPEG-4V;;MS MPEG-4 v3;http://ffdshow-tryout.sourceforge.net/
+DIVX;DivX 4;4CC;V;MPEG-4V;;Project Mayo DivX 4;http://www.divx.com
+divx;DivX;4CC;V;MPEG-4V;;Mainly used by Google;http://www.divx.com
+DJPG;Broadway 101;4CC;V;JPEG;;Data Translation, Inc.;
+DM4V;Dicas;4CC;V;MPEG-4V;;Dicas MPEGable MPEG-4;
+DMB1;Rainbow;4CC;V;JPEG;;Matrox Rainbow Runner hardware compression;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.MJPG.v2.10.27.codec.exe
+DMB2;Paradigm JPEG;4CC;V;JPEG;;JPEG used by Paradigm;
+DMK2;V36 PDA;4CC;V;;;ViewSonic V36 PDA Video;
+DP02;DynaPel;4CC;V;MPEG-4V;;DynaPel MPEG-4;
+DP16;YUV411;4CC;V;YUV;;Matsushita Electric Industrial Co., Ltd. (With DPCM 6-bit compression);
+DP18;YUV411;4CC;V;YUV;;Matsushita Electric Industrial Co., Ltd. (With DPCM 8-bit compression)
+DP26;YUV422;4CC;V;YUV;;Matsushita Electric Industrial Co., Ltd. (With DPCM 6-bit compression)
+DP28;YUV422;4CC;V;YUV;;Matsushita Electric Industrial Co., Ltd. (With DPCM 8-bit compression)
+DP96;YVU9;4CC;V;YUV;;Matsushita Electric Industrial Co., Ltd. (With DPCM 6-bit compression)
+DP98;YVU9;4CC;V;YUV;;Matsushita Electric Industrial Co., Ltd. (With DPCM 8-bit compression)
+DP9L;YVU9;4CC;V;YUV;;Matsushita Electric Industrial Co., Ltd. (With DPCM 6-bit compression)
+DPS0;DPS Reality;4CC;V;JPEG;;DPS Reality JPEG (dummy format - only AVI header)
+DPSC;DPS PAR;4CC;V;JPEG;;DPS PAR JPEG (dummy format - only AVI header)
+DRWX;Pinnacle DV25;4CC;V;DV;;Pinnacle DV25
+DSVD;DV;4CC;V;DV;;Microsoft DirectShow DV
+DTMT;Media-100;4CC;V;;;Media-100
+DTNT;Media-100;4CC;V;;;Media-100
+DUCK;TrueMotion S;4CC;V;;;Duck Corporation True Motion S
+DV10;BlueFish;4CC;V;;;BlueFish444 (lossless RGBA, YUV 10-bit)
+DV25;DVCPro;4CC;V;DV;;Matrox DVCPRO
+DV50;DVCPro5;4CC;V;DV;;Matrox
+DVAN;Pinnacle DV300;4CC;V;DV;;Pinnacle miroVideo DV300 SW only;
+DVC ;Apple DV NTSC;4CC;V;DV;;Apple QuickTime DV (DVCPRO NTSC);http://www.apple.com/quicktime/download/standalone.html
+dvc ;Apple DV NTSC;4CC;V;DV;;Apple QuickTime DV (DVCPRO NTSC);http://www.apple.com/quicktime/download/standalone.html
+DVCP;Apple DV PAL;4CC;V;DV;;Apple QuickTime DV (DVCPRO PAL);http://www.apple.com/quicktime/download/standalone.html
+dvcp;Apple DV PAL;4CC;V;DV;;Apple QuickTime DV (DVCPRO PAL);http://www.apple.com/quicktime/download/standalone.html
+DVCS;MainConcept DV;4CC;V;DV;;MainConcept DV;
+DVE2;Insoft DVE-2;4CC;V;DV;;InSoft DVE-2 Videoconferencing;
+DVH1;Pinnacle DV;4CC;V;DV;;Pinnacle DVHD100;
+dvhd;DV HD;4CC;V;DV;;DV 1125 lines at 30.00 Hz or 1250 lines at 25.00 Hz;
+dvhd;DV HD;4CC;A;DV;;Sony DV (DV), audio part;
+DVIS;DualMoon DV;4CC;V;DV;;VSYNC DualMoon Iris DV;
+DVL ;Radius DV NTSC;4CC;V;DV;;Radius SoftDV 16:9 NTSC;
+DVLP;Radius DV PAL;4CC;V;DV;;Radius SoftDV 16:9 PAL;
+DVMA;Darim DV;4CC;V;DV;;Darim Vision DVMPEG (dummy for MPEG compressor);
+DVNM;DVNM;4CC;V;;;Matsushita Electric Industrial Co., Ltd.;
+DVOR;BlueFish;4CC;V;;;BlueFish444 (lossless RGBA, YUV 10-bit);
+DVPN;Apple DV NTSC;4CC;V;DV;;Apple QuickTime DV (DV NTSC);
+DVPP;Apple DV PAL;4CC;V;DV;;Apple QuickTime DV (DV PAL);
+DVR ;MPEG-2 Video;4CC;V;MPEG-2;;MPEG-2 Video in a ASF container;
+DVR1;Targa2000;4CC;V;;;TARGA2000;
+DVRS;DualMoon DV;4CC;V;DV;;VSYNC DualMoon Iris DV;
+DVSD;DV;4CC;V;DV;;IEC 61834 and SMPTE 314M;
+dvsd;Sony DV;4CC;V;DV;;Sony DV (DV) 525 lines at 29.97 Hz or 625 lines at 25.00 Hz;
+dvsd;Sony DV;4CC;A;DV;;Sony DV (DV), audio part;
+dvsl;Sony DV;4CC;V;DV;;Sony DV (DV) 525 lines at 29.97 Hz or 625 lines at 25.00 Hz;
+dvsl;Sony DV;4CC;A;DV;;Sony DV (DV), audio part;
+DVSL;DSL DV;4CC;V;DV;;DV compressed in SD (SDL);
+DVX1;DVX 1 SP;4CC;V;;;Lucent DVX1000SP Video Decoder;
+DVX2;DVX 2 S;4CC;V;;;Lucent DVX2000S Video Decoder;
+DVX3;DVX 3 S;4CC;V;;;Lucent DVX3000S Video Decoder;
+DX50;DivX 5;4CC;V;MPEG-4V;;;http://www.divx.com
+DXGM;EA GameVideo;4CC;V;;;Electronic Arts Game Video;
+DXSB;DivX.com Subtitle;4CC;T;;;Subtitle in AVI from DivX networks;http://www.divx.com
+DXT1;DirectX TC;4CC;V;;;DirectX Compressed Texture (1bit alpha channel);
+DXT2;DirectX TC;4CC;V;;;DirectX Compressed Texture;
+DXT3;DirectX TC;4CC;V;;;DirectX Compressed Texture (4bit alpha channel);
+DXT4;DirectX TC;4CC;V;;;DirectX Compressed Texture;
+DXT5;DirectX TC;4CC;V;;;DirectX Compressed Texture (3bit alpha channel with interpolation);
+DXTC;DirectX TC;4CC;V;;;DirectX Texture Compression;
+DXTn;DirectX TC;4CC;V;;;Microsoft Compressed Texture;
+DXTN;DirectX TC;4CC;V;;;Microsoft DirectX Compressed Texture (DXTn);
+EKQ0;Elsa KQ;4CC;V;;;Elsa graphics card quick;
+ELK0;Elsa LK;4CC;V;;;Elsa graphics card;
+EM2V;Elymonyx MPEG-2;4CC;V;;;Etymonix MPEG-2 I-frame;
+EMWC;WMA;;A;;;EverAd, Inc.;
+EQK0;Elsa;4CC;V;;;Elsa graphics card quick;
+ESCP;Escape;4CC;V;;;Eidos Escape;
+ETV1;eTreppid 1;4CC;V;;;eTreppid Video 1;
+ETV2;eTreppid 2;4CC;V;;;eTreppid Video 2;
+ETVC;eTreppid C;4CC;V;;;eTreppid Video C;
+FFDS;FFDS;4CC;V;;;;http://ffdshow-tryout.sourceforge.net/
+FFV1;FFV1;4CC;V;;;;http://ffdshow-tryout.sourceforge.net/
+FFVH;FFVH;4CC;V;;;;http://ffdshow-tryout.sourceforge.net/
+FLIC;FLI/FLC;4CC;V;;;Autodesk FLI/FLC Animation;
+FLJP;DField JPEG;4CC;V;;;D-Vision Field Encoded JPEG with LSI (or Targa emulation);
+FLV1;H.263;;4CC;V;;;;http://ffdshow-tryout.sourceforge.net/
+FLV4;VP6;4CC;V;;;Flash, On2 Technologies;http://www.on2.com
+FMJP;D-Vision JPEG;4CC;V;;;D-Vision fieldbased ISO JPEG;
+FMP4;MPEG-4 Visual;4CC;V;MPEG-4V;;;http://ffdshow-tryout.sourceforge.net/
+FPS1;FRAPS;4CC;V;;;;http://www.fraps.com/
+FRLE;SoftLab-Nsk JPEG;4CC;V;;;SoftLab-NSK Y16 + Alpha RLE;
+FRWA;SoftLab-Nsk JPEG (w Alpha);4CC;V;;;SoftLab-NSK Vision Forward JPEG with Alpha-channel;
+FRWD;SoftLab-Nsk JPEG;4CC;V;;;SoftLab-NSK Vision Forward JPEG;
+FRWT;SoftLab-Nsk JPEG;4CC;V;;;SoftLab-NSK Vision Forward JPEG with Alpha-channel;
+FRWU;SoftLab-Nsk JPEG;4CC;V;;;SoftLab-NSK Vision Forward Uncompressed;
+FVF1;Itered Fractal;4CC;V;;;Iterated Systems Fractal Video Frame;
+FVFW;FVFW;4CC;V;;;;http://ffdshow-tryout.sourceforge.net/
+FXT1;3DFX;4CC;V;;;3dfx Interactive, Inc.;
+G2M2;GoToMeeting2;4CC;V;;;Citrix Systems, Inc.;http://www.gotomeeting.com/
+G2M3;GoToMeeting3;4CC;V;;;Citrix Systems, Inc.;http://www.gotomeeting.com/
+GEPJ;White Pine JPEG;4CC;V;;;White Pine JPEG;
+GJPG;Grand Tech GT891x;4CC;V;;;Grand Tech GT891x;
+GLCC;GigaLink;4CC;V;;;GigaLink AV Capture;
+GLZW;Gabest;4CC;V;;;Motion LZW by Gabest;http://sourceforge.net/project/showfiles.php?group_id=82303&package_id=84358
+GPEG;Gabest;4CC;V;JPEG;;JPEG by Gabest (with floating point);http://sourceforge.net/project/showfiles.php?group_id=82303&package_id=84358
+GPJM;Pinnacle JPEG;4CC;V;JPEG;;Pinnacle ReelTime JPEG;
+GREY;YUV;4CC;V;YUV;;Simple grayscale video;http://www.fourcc.org/indexyuv.htm
+GWLT;MS GWLT;4CC;V;;;Microsoft Greyscale WLT DIB;
+GXVE;ViVD V2;4CC;V;;;SoftMedia;
+H260;Intel H.260;4CC;V;;;Intel H.260;
+H261;Intel H.261;4CC;V;;;Intel H.261
+H262;Intel H.262;4CC;V;;;Intel H.262
+H263;Intel H.263;4CC;V;;;Intel H.263
+H264;AVC;4CC;V;AVC;;Intel H.264
+h264;AVC;4CC;V;AVC;;Intel H.264
+H265;Intel H.265;4CC;V;;;Intel H.265
+H266;Intel H.266;4CC;V;;;Intel H.266
+H267;Intel H.267;4CC;V;;;Intel H.267
+H268;Intel H.268;4CC;V;;;Intel H.268
+H269;Intel H.263;4CC;V;;;Intel H.263 for POTS-based videoconferencing
+HD10;BlueFish;4CC;V;;;BlueFish444 (lossless RGBA, YUV 10-bit)
+HDX4;Jomigo;4CC;V;;;Jomigo HDX4
+HFYU;Huffman;4CC;V;;;Huffman Lossless YUV and RGB formats (with Alpha-channel)
+HMCR;Rendition;4CC;V;;;Rendition Motion Compensation Format
+HMRR;Rendition;4CC;V;;;Rendition Motion Compensation Format
+i263;Intel H.263;4CC;V;;;Intel H.263
+I420;YUV;4CC;V;;;
+IAN ;Indeo 4;4CC;V;;;Intel Indeo 4
+ICLB;CellB;4CC;V;;;InSoft CellB Videoconferencing
+IDM0;Wavelets 2;4CC;V;;;IDM Motion Wavelets 2.0
+IF09;H.261;4CC;V;;;Microsoft H.261
+IFO9;YUV9;4CC;V;YUV;;Intel
+IGOR;PowerDVD;4CC;V;;;Power DVD
+IJPG;Intergraph JPEG;4CC;V;JPEG;;Intergraph
+ILVC;Layered Video;4CC;V;;;Intel Layered Video
+ILVR;H.263+;4CC;V;;;Intel H.263+
+IMAC;MotionComp;4CC;V;;;Intel hardware motion compensation.
+IMC1;YUV;4CC;V;YUV;;As YV12, except the U and V planes each have the same stride as the Y plane
+IMC2;YUV;4CC;V;YUV;;Similar to IMC1, except that the U and V lines are interleaved at half stride boundaries
+IMC3;YUV;4CC;V;YUV;;As IMC1, except that U and V are swapped
+IMC4;YUV;4CC;V;YUV;;As IMC2, except that U and V are swapped
+IMG ;YUV;4CC;V;YUV;;
+IMJG;Accom JPEG;4CC;V;;;Accom SphereOUS JPEG with Alpha-channel;
+IPDV;I-O DV;4CC;V;;;I-O Data Device Giga AVI DV;
+IPJ2;JPEG 2000;4CC;V;;;Image Power JPEG 2000;
+IR21;Indeo 2.1;4CC;V;;;Intel Indeo 2.1;
+IRAW;YUV;4CC;V;YUV;;Intel YUV Uncompressed;http://www.fourcc.org/indexyuv.htm
+ISME;ISME;4CC;V;;;Intel;
+IUYV;YUV;4CC;V;YUV;;Lead 16bpp. Interlaced version of UYVY (line order 0, 2, 4,....,1, 3, 5....);
+IV30;Indeo 3;4CC;V;;;Intel Indeo Video 3;
+IV31;Indeo 3;4CC;V;;;Intel Indeo Video 3.1;
+IV32;Indeo 3;4CC;V;;;Intel Indeo Video 3.2;
+IV33;Indeo 3;4CC;V;;;Intel Indeo Video 3.3;
+IV34;Indeo 3;4CC;V;;;Intel Indeo Video 3.4;
+IV35;Indeo 3;4CC;V;;;Intel Indeo Video 3.5;
+IV36;Indeo 3;4CC;V;;;Intel Indeo Video 3.6;
+IV37;Indeo 3;4CC;V;;;Intel Indeo Video 3.7;
+IV38;Indeo 3;4CC;V;;;Intel Indeo Video 3.8;
+IV39;Indeo 3;4CC;V;;;Intel Indeo Video 3.9;
+IV40;Indeo 4;4CC;V;;;Intel Indeo Video 4.0;
+IV41;Indeo 4;4CC;V;;;Intel Indeo Video 4.1;
+IV42;Indeo 4;4CC;V;;;Intel Indeo Video 4.2;
+IV43;Indeo 4;4CC;V;;;Intel Indeo Video 4.3;
+IV44;Indeo 4;4CC;V;;;Intel Indeo Video 4.4;
+IV45;Indeo 4;4CC;V;;;Intel Indeo Video 4.5;
+IV46;Indeo 4;4CC;V;;;Intel Indeo Video 4.6;
+IV47;Indeo 4;4CC;V;;;Intel Indeo Video 4.7;
+IV48;Indeo 4;4CC;V;;;Intel Indeo Video 4.8;
+IV49;Indeo 4;4CC;V;;;Intel Indeo Video 4.9;
+IV50;Indeo 4;4CC;V;;;Intel Indeo Video 5.0 Wavelet;http://www.fourcc.org/indexyuv.htm
+IY41;YUV;4CC;V;YUV;;Lead 16bpp. Interlaced version of Y41P (line order 0, 2, 4,....,1, 3, 5....);http://www.fourcc.org/indexyuv.htm
+IYU1;YUV;4CC;V;YUV;;IEEE1394 12bpp. 12 bit format used in mode 2 of the IEEE 1394 Digital Camera 1.04 spec;http://www.fourcc.org/indexyuv.htm
+IYU2;YUV;4CC;V;YUV;;IEEE1394 24bpp. 24 bit format used in mode 2 of the IEEE 1394 Digital Camera 1.04 spec;
+IYUV;YUV;4CC;V;YUV;;Intel Indeo iYUV 4:2:0;
+JBYR;Kensington;4CC;V;;;Kensington Video;http://ffdshow-tryout.sourceforge.net/
+JFIF;JPEG;4CC;V;JPEG;;;
+JPEG;JPEG;4CC;V;JPEG;;JPEG compressed;http://www.apple.com/quicktime/download/standalone.html
+jpeg;JPEG;4CC;V;JPEG;;JPEG compressed;
+JPG;JPEG;4CC;V;JPEG;;JPEG compressed;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe
+JPGL;Pegasus JPEG;4CC;V;;;DIVIO JPEG Light for WebCams (Pegasus Lossless JPEG);
+KMVC;Karl;4CC;V;;;Karl Morton's Video (presumably);http://www.apple.com/quicktime/download/standalone.html
+kpcd;Photo CD;4CC;V;;;Kodak Photo CD;
+L261;H.261;4CC;V;;;Lead Technologies H.261;
+L263;H.263+;4CC;V;;;Lead Technologies H.263;
+LAGS;Lagarith;4CC;V;;;Lagarith LossLess;
+LBYR;Creative WebCam;4CC;V;;;Creative WebCam;
+LCMW;Lead CMW;4CC;V;;;Lead Technologies Motion CMW;
+LCW2;Lead MCMW;4CC;V;;;LEADTools MCMW 9Motion Wavelet;http://mirror01.iptelecom.net.ua/~video/codecs/LEAD.MCMP-JPEG.v1.016.codec.exe
+LEAD;Lead Video;4CC;V;;;LEAD Video;
+LGRY;Lead GrayScale;4CC;V;;;Lead Technologies Grayscale Image;
+LIA1;Liafail;4CC;V;;;Liafail, Inc.;
+LJ2K;Lead JPEG 2000;4CC;V;;;LEADTools JPEG 2000;http://mirror01.iptelecom.net.ua/~video/codecs/LEAD.MCMP-JPEG.v1.016.codec.exe
+LJPG;Lead JPEG;4CC;V;JPEG;;LEAD JPEG;http://mirror01.iptelecom.net.ua/~video/codecs/LEAD.MCMP-JPEG.v1.016.codec.exe
+Ljpg;Lead JPEG;4CC;V;JPEG;;LEAD JPEG;
+LMP2;Lead MPEG-2;4CC;V;;;LEADTools MPEG-2;
+LOCO;LOCO;4CC;V;;;LOCO Lossless;
+LSCR;Lead Screen capture;4CC;V;;;LEAD Screen Capture;
+LSV0;LSV0;4CC;V;;;Infinop Inc.;
+LSVC;Vmail;4CC;V;;;Vianet Lighting Strike Vmail (Streaming);
+LSVM;Vmail;4CC;V;;;Vianet Lighting Strike Vmail (Streaming);
+LSVW;Infinop;4CC;V;;;Infinop Lightning Strike multiple bit rate video codec.;
+LSVX;Vmail;4CC;V;;;Vianet Lightning Strike Video Codec;
+LZO1;LZO;4CC;V;;;LZO compressed (lossless);
+M101;YUV;4CC;V;YUV;;Matrox;
+M261;H.261;4CC;V;;;Microsoft H.261;
+M263;H.263;4CC;V;;;Microsoft H.263;
+M4CC;ESS Divo;4CC;V;MPEG-4V;;ESS MPEG-4 Divio;
+M4S2;FFmpeg MPEG-4;4CC;V;;;Microsoft MPEG-4 (hacked MS MPEG-4);
+MC12;ATI Motion;4CC;V;;;ATI Motion Compensation Format;
+MC24;MainConcept JPEG;4CC;V;JPEG;;MainConcept JPEG;
+MCAM;ATI Motion;4CC;V;;;ATI Motion Compensation Format;
+MCZM;RGB;4CC;V;RGB;;Theory MicroCosm Lossless 64bit RGB with Alpha-channel;
+MDVD;MicroDVD;4CC;V;;;Alex MicroDVD Video (hacked MS MPEG-4);
+MDVF;Pinnacle DV;4CC;V;DV;;Pinnacle DV/DV50/DVHD100;
+MHFY;YUB;4CC;V;YUV;;A.M.Paredes mhuffyYUV (LossLess);http://mirror01.iptelecom.net.ua/~video/codecs/Pinnacle.ReelTime.v2.5.software.only.codec.exe
+MJ2C;JPEG 2000;4CC;V;;;Morgan Multimedia JPEG 2000 Compression;http://mirror01.iptelecom.net.ua/~video/codecs/Pinnacle.ReelTime.v2.5.software.only.codec.exe
+MJPA;Pinacle JPEG A;4CC;V;;;Pinnacle ReelTime MJPG hardware;http://mediaxw.sourceforge.net
+MJPB;Pinacle JPEG B;4CC;V;JPEG;;JPEG;
+MJPG;JPEG;4CC;V;JPEG;;JPEG including Huffman Tables;
+mJPG;IBM JPEG (w Huffman);4CC;V;JPEG;;IBM JPEG including Huffman Tables;
+MJPX;Pegasus JPEG;4CC;V;;;Pegasus PICVideo JPEG;
+ML20;Webcam;4CC;V;;;Mimic MSN Messenger Webcam;
+MMES;Matrox MPEG-2;4CC;V;MPEG-V;;Matrox MPEG-2 I-frame;
+MMIF;Matrox MPEG-2;4CC;V;MPEG-V;;Matrox MPEG-2 I-frame;
+MNVD;MindVid;4CC;V;;;MindBend MindVid LossLess;
+MP2A;MPEG-2 Audio;4CC;A;MPEG-A;;Media Excel MPEG-2 Audio;
+MP2T;MPEG-2 TS;4CC;M;MPEG-TS;;Media Excel MPEG-2 Transport Stream;
+MP2V;MPEG-2 Video;4CC;V;MPEG-V;;Media Excel MPEG-2 Video;http://ffdshow-tryout.sourceforge.net/
+MP2v;MPEG-2 Video;4CC;V;MPEG-V;;MPEG-2 Video;http://ffdshow-tryout.sourceforge.net/
+MP41;S-Mpeg 4 v1;4CC;V;;;Microsoft MPEG-4 V1 (enhansed H263);http://ffdshow-tryout.sourceforge.net/
+MP42;S-Mpeg 4 v2;4CC;V;;;Microsoft MPEG-4 V2;http://www.apple.com/quicktime/download/standalone.html
+MP43;S-Mpeg 4 v3;4CC;V;;;Microsoft MPEG-4 V3;
+mp4a;AAC;4CC;A;AAC;;AAC;http://ffdshow-tryout.sourceforge.net/
+MP4A;MPEG-4 Audio;4CC;A;AAC;;Media Excel MPEG-4 Audio;http://www.apple.com/quicktime/download/standalone.html
+MP4S;MS MPEG-4 v3;4CC;V;MPEG-4V;;Microsoft MPEG-4 (Windows Media 7.0);
+mp4s;MPEG-4 TS;4CC;M;MPEG-TS;;(MPEG-4) Apple MPEG-4 Transport Stream;http://ffdshow-tryout.sourceforge.net/
+MP4T;MPEG-4 TS;4CC;M;MPEG-TS;;Media Excel MPEG-4 Transport Stream;http://www.apple.com/quicktime/download/standalone.html
+MP4V;MPEG-4 Video;4CC;V;MPEG-4V;;Apple QuickTime MPEG-4 native;http://ffdshow-tryout.sourceforge.net/
+mp4v;MPEG-4 Video;4CC;V;MPEG-4V;;(MPEG-4) Apple MPEG-4 Video;http://www.apple.com/quicktime/download/standalone.html
+MPEG;MPEG;4CC;V;MPEG-V;;Chromatic MPEG 1 Video I Frame;http://ffdshow-tryout.sourceforge.net/
+mpeg;MPEG;4CC;V;MPEG-V;;MPEG-1 Video;http://ffdshow-tryout.sourceforge.net/
+MPG1;FFmpeg MPEG 1/2;4CC;V;MPEG-V;;(MPEG-1/2) FFmpeg;http://ffdshow-tryout.sourceforge.net/
+MPG2;FFmpeg MPEG 1/2;4CC;V;MPEG-V;;(MPEG-1/2) FFmpeg;http://ffdshow-tryout.sourceforge.net/
+MPG3;FFmpeg DivX 3;4CC;V;MPEG-4V;;(MPEG-4) MS MPEG-4 v3;
+MPG4;MS MPEG-4 v1;4CC;V;MPEG-4V;;Microsoft MPEG-4 v1;
+MPGI;Sigma MPEG;4CC;V;MPEG-V;;Sigma Design MPEG-1 I-frame;
+MPNG;PNG;4CC;V;RGB;;Motion PNG;
+MRCA;Mrcodec;4CC;V;;;FAST Multimedia;
+MRLE;RLE;4CC;V;RGB;;Microsoft RLE;
+MSS1;Windows Screen Video;4CC;V;;;Windows Screen Video;
+MSS2;Windows Media;4CC;V;;;Windows Media 9;
+MSUC;MSU;4CC;V;;;MSU LossLess;
+MSUD;MSU;4CC;V;;;MSU LossLess;
+MSV1;Microsoft Video 1;4CC;V;;;Microsoft Video 1;
+MSVC;Microsoft Video 1;4CC;V;;;Microsoft Video 1
+MSZH;AVImszh;4CC;V;;;Lossless (ZIP compression)
+MTGA;TGA;4CC;V;RGB;;Motion TGA images (24, 32 bpp)
+MTX1;Matrox JPEG;4CC;V;JPEG;;Matrox JPEG
+MTX2;Matrox JPEG;4CC;V;JPEG;;Matrox JPEG
+MTX3;Matrox JPEG;4CC;V;JPEG;;Matrox JPEG
+MTX4;Matrox JPEG;4CC;V;JPEG;;Matrox JPEG
+MTX5;Matrox JPEG;4CC;V;JPEG;;Matrox JPEG
+MTX6;Matrox JPEG;4CC;V;JPEG;;Matrox JPEG
+MTX7;Matrox JPEG;4CC;V;JPEG;;Matrox JPEG
+MTX8;Matrox JPEG;4CC;V;JPEG;;Matrox JPEG
+MTX9;Matrox JPEG;4CC;V;JPEG;;Matrox JPEG
+MV10;Nokia;4CC;V;;;Nokia Mobile Phones
+MV11;Nokia;4CC;V;;;Nokia Mobile Phones
+MV12;MVI;4CC;V;;;Motion Pixels (old)
+MV99;Nokia;4CC;V;;;Nokia Mobile Phones
+MVC1;Nokia;4CC;V;;;Nokia Mobile Phones
+MVC2;Nokia;4CC;V;;;Nokia Mobile Phones
+MVC9;Nokia;4CC;V;;;Nokia Mobile Phones
+MVI1;MVI;4CC;V;;;Motion Pixels MVI
+MVI2;MVI;4CC;V;;;Motion Pixels MVI
+MWV1;Aware Motion Wavelets;4CC;V;;;Aware Motion Wavelets
+MYUV;RGB;4CC;V;RGB;;Media-100 844/X Uncompressed
+NAVI;MS MPEG-4;4CC;V;MPEG-4V;;nAVI video (hacked MS MPEG-4)
+NDIG;Ahead MPEG-4;4CC;V;MPEG-4V;;Ahead Nero Digital MPEG-4
+NHVU;Nvidia Texture;4CC;V;;;Nvidia Texture Format (GEForce 3)
+NO16;RGB;4CC;V;RGB;;Theory None16 64bit uncompressed Uncompressed
+NT00;LightWave;4CC;V;YUV;;NewTek LightWave HDTV YUV with Alpha-channel
+NTN1;NogaTech Video 1;4CC;V;;;Nogatech Video Compression 1
+NTN2;NogaTech Video 2;4CC;V;;;Nogatech Video Compression 2 (GrabBee hardware coder)
+NUV1;Nuppel;4CC;V;;;NuppelVideo
+NV12;YUV;4CC;V;YUV;;8-bit Y plane followed by an interleaved U/V plane with 2x2 subsampling
+NV21;YUV;4CC;V;YUV;;As NV12 with U and V reversed in the interleaved plane
+NVDS;Nvidia Texture;4CC;V;;;Nvidia Texture Format
+NVHS;Nvidia Texture;4CC;V;;;Nvidia Texture Format (GeForce 3)
+NVHU;Nvidia Texture;4CC;V;;;Nvidia Texture Format
+NVS0;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format
+NVS1;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format
+NVS2;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format
+NVS3;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format
+NVS4;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format
+NVS5;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format
+NVS6;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format
+NVS7;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format
+NVS8;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format
+NVS9;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format
+NVT0;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format
+NVT1;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format
+NVT2;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format;
+NVT3;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format;
+NVT4;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format;
+NVT5;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format;
+NVT6;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format;
+NVT7;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format;
+NVT8;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format;
+NVT9;Nvidia Texture;4CC;V;;;Nvidia Texture Compression Format;
+NY12;YUV;4CC;V;YUV;;Nogatech Ltd.;
+NYUV;YUV;4CC;V;YUV;;Nogatech Ltd.;
+ONYX;VP7;4CC;V;;;On2 VP7;http://www.on2.com/vp7.php3
+PCLE;Studio400;4CC;V;;;Pinnacle Systems, Inc.;
+PDVC;Panasonic DV;4CC;V;DV;;Panasonic DV;
+PGVV;Radius Video Vision;4CC;V;;;Radius Video Vision Telecast (adaptive JPEG);
+PHMO;Photomotion;4CC;V;;;IBM Photomotion;
+PIM1;Pegasus JPEG;4CC;V;JPEG;;Pinnacle DC1000 hardware (MPEG compression);http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe
+PIM2;Pegasus JPEG;4CC;V;JPEG;;Pegasus Imaging;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe
+PIMJ;Pegasus JPEG;4CC;V;JPEG;;Pegasus Imaging PICvideo Lossless JPEG;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe
+PIXL;Miro JPEG;4CC;V;JPEG;;MiroVideo XL (JPEG);
+PNG;PNG;4CC;V;RGB;;;
+PNG1;PNG;4CC;V;RGB;;Corecodec.org CorePNG;
+PVEZ;PowerEZ;4CC;V;;;Horizons Technology PowerEZ;
+PVMM;Pegasus MPEG-4;4CC;V;MPEG-4V;;PacketVideo Corporation MPEG-4;
+PVW2;Pegasus Wavelet;4CC;V;;;Pegasus Imaging Wavelet 2000;
+PVWV;Pegasus Wavelet;4CC;V;;;Pegasus Imaging Wavelet 2000;
+PXLT;Pixlet;4CC;V;;;Apple Pixlet (Wavelet);
+Q1.0;QPEG 1.0;4CC;V;;;Q-Team QPEG 1.0;http://www.q-team.de
+Q1.1;QPEG 1.1;4CC;V;;;Q-Team QPEG 1.1;http://www.q-team.de
+Qclp;QCLP;4CC;A;;;;
+QDGX;Apple GX;4CC;V;;;Apple QuickDUncompressed GX;
+QDM1;QDesign 1;4CC;A;;;QDesign Music 1;
+QDM2;Qdesign 2;4CC;A;;;QDesign Music 2;
+QDRW;Palettized Video;4CC;V;;;Apple;
+QPEG;QPEG 1.1;4CC;V;;;Q-Team QPEG 1.1;
+QPEQ;QPEG 1.1;4CC;V;;;Q-Team QPEG 1.1;
+R210;YUV;4CC;V;YUV;;BlackMagic YUV (Quick Time);
+R411;Radius DV;4CC;V;DV;;Radius DV NTSC YUV;
+R420;Radius DV;4CC;V;DV;;Radius DV PAL YUV;
+RAV_;GroupTron;4CC;V;MPEG-1;;GroupTRON ReferenceAVI (dummy for MPEG compressor);
+RAVI;GroupTron;4CC;V;MPEG-1;;GroupTRON ReferenceAVI (dummy for MPEG compressor);
+RAW ;RGB;4CC;V;RGB;;Full Frames (Uncompressed);
+raw ;RGB;4CC;V;RGB;;Full Frames (Uncompressed);http://www.apple.com/quicktime/download/standalone.html
+RGB ;RGB;4CC;V;RGB;;Uncompressed RGB32;
+RGB1;RGB;4CC;V;RGB;;Uncompressed RGB332 3:3:2;
+RGBA;RGB;4CC;V;RGB;;Uncompressed w/ Alpha. Uncompressed RGB with alpha. Sample precision and packing is arbitrary and determined using bit masks for each component, as for BI_BITFIELDS.;http://www.fourcc.org/indexrgb.htm
+RGBO;RGB;4CC;V;RGB;;Uncompressed RGB555 5:5:5;
+RGBP;RGB;4CC;V;RGB;;Uncompressed RGB565 5:6:5;
+RGBQ;RGB;4CC;V;RGB;;Uncompressed RGB555X 5:5:5 BE;
+RGBR;RGB;4CC;V;RGB;;Uncompressed RGB565X 5:6:5 BE;
+RGBT;RGB;4CC;V;RGB;;Uncompressed RGB with transparency;http://www.fourcc.org/indexrgb.htm
+RIVA;Swizzled texture;4CC;V;;;Nvidia;
+RL4;RLE;4CC;V;RGB;;RLE 4bpp RGB;
+RL8;RLE;4CC;V;RGB;;RLE 8bpp RGB;
+RLE ;RLE;4CC;V;RGB;;RLE RGB with arbitrary sample packing within a pixel;http://www.fourcc.org/indexrgb.htm
+rle  ;Animation;4CC;V;RGB;;;http://www.apple.com/quicktime/download/standalone.html
+RLE4;RLE;4CC;V;RGB;;RLE 4bpp RGB;http://www.fourcc.org/indexrgb.htm
+RLE8;RLE;4CC;V;RGB;;RLE 8bpp RGB;http://www.fourcc.org/indexrgb.htm
+RLND;Roland;4CC;V;;;Roland Corporation;
+RMP4;RealMagic MPEG-4;4CC;V;MPEG-4V;;REALmagic MPEG-4 Video (Sigma Design, built on XviD);
+ROQV;Id RoQ;4CC;V;;;Id RoQ File Video Decoder;
+rpza;Road Pizza;4CC;V;;;Apple Video 16 bit road pizza;http://www.apple.com/quicktime/download/standalone.html
+RT21;Intel Video 2.1;4CC;V;;;Intel Real Time Video 2.1;
+RTV0;NewTek VideoToaster;4CC;V;;;NewTek VideoToaster (dummy format - only AVI header);
+RUD0;Rududu;4CC;V;;;Rududu video;
+RV10;RealVideo 1;4CC;V;;;H263, RealVideo 5;http://www.real.com
+rv10;RealVideo 1;Real;V;;;H263, RealVideo 5;http://www.real.com
+RV13;RealVideo 1;4CC;V;;;H263, RealVideo 5;http://www.real.com
+rv20;RealVideo 2;Real;V;;;H263, RealVideo 6;http://www.real.com
+RV20;RealVideo 2;4CC;V;;;H263, RealVideo 6;http://www.real.com
+rv30;RealVideo 3;Real;V;;;Between H263 and H264, RealVideo 8;http://www.real.com
+RV30;RealVideo 3;4CC;V;;;Between H263 and H264, RealVideo 8;http://www.real.com
+rv40;RealVideo 4;Real;V;;;H264, RealVideo 9;http://www.real.com
+RV40;RealVideo 4;4CC;V;;;H264, RealVideo 9;http://www.real.com
+RVX ;RDX;4CC;V;;;Intel RDX;
+S263;S263;4CC;V;;;;http://ffdshow-tryout.sourceforge.net/
+S422;VideoCap C210;4CC;V;YUV;;VideoCap C210;
+s422;VideoCap C210;4CC;V;YUV;;VideoCap C210;
+SAMR;AMR;4CC;A;;;;
+SAN3;SAN3;4CC;V;MPEG-4V;;Direct copy of DivX 3.11;
+SANM;Smush v2;4CC;V;;;LucasArts;http://www.lucasarts.com/
+SCCD;SoftCam;4CC;V;;;;
+SDCC;Sun DV;4CC;V;DV;;Sun Digital Camera;
+SEDG;Samsung MPEG-4;4CC;V;MPEG-4V;;Samsung MPEG-4;
+SEG4;Cinepak;4CC;V;;;;http://www.sega.com/
+SEGA;Cinepak;4CC;V;;;;http://www.sega.com/
+SFMC;CrystalNet;4CC;V;;;CrystalNet Surface Fitting Method;
+SHR0;BitJazz SheerVideo;4CC;V;;;BitJazz SheerVideo (realtime lossless);
+SHR1;BitJazz SheerVideo;4CC;V;;;BitJazz SheerVideo (realtime lossless);
+SHR2;BitJazz SheerVideo;4CC;V;;;BitJazz SheerVideo (realtime lossless);
+SHR3;BitJazz SheerVideo;4CC;V;;;BitJazz SheerVideo (realtime lossless);
+SHR4;BitJazz SheerVideo;4CC;V;;;BitJazz SheerVideo (realtime lossless);
+SHR5;BitJazz SheerVideo;4CC;V;;;BitJazz SheerVideo (realtime lossless);
+SHR6;BitJazz SheerVideo;4CC;V;;;BitJazz SheerVideo (realtime lossless);
+SHR7;BitJazz SheerVideo;4CC;V;;;BitJazz SheerVideo (realtime lossless);
+SJPG;CuSeeMe;4CC;V;JPEG;;CuSeeMe;http://mirror01.iptelecom.net.ua/~video/codecs/CUseeMe.JPEG.CODEC.v1.17.exe
+SL25;SoftLab DVCPro;4CC;V;;;SoftLab-NSK DVCPRO;
+SL50;SoftLab DVCPro5;4CC;V;;;SoftLab-NSK ;
+SLDV;SoftLab DV;4CC;V;;;SoftLab-NSK Forward DV Draw;
+SLIF;SoftLab MPEG-2;4CC;V;MPEG-V;;SoftLab-NSK MPEG-2 I-frames;
+SLMJ;SoftLab JPEG;4CC;V;JPEG;;SoftLab-NSK Forward JPEG;
+smc ;SMC;4CC;V;;;Apple Graphics (SMC);http://www.apple.com/quicktime/download/standalone.html
+SMSC;Radius;4CC;V;;;;
+SMSD;Radius;4CC;V;;;;
+SMSV;Wavelet Video;4CC;V;;;WorldConnect Wavelet Streaming Video;
+smsv;Wavelet Video;4CC;V;;;WorldConnect Wavelet Video;
+SNOW;Snow;4CC;V;;;;http://ffdshow-tryout.sourceforge.net/
+SP40;SunPlus YUV;4CC;V;YUV;;SunPlus YUV;
+SP44;MegaCam;4CC;V;;;SunPlus Aiptek MegaCam;
+SP53;MegaCam;4CC;V;;;SunPlus Aiptek MegaCam;
+SP54;MegaCam;4CC;V;;;SunPlus Aiptek MegaCam;
+SP55;MegaCam;4CC;V;;;SunPlus Aiptek MegaCam;
+SP56;MegaCam;4CC;V;;;SunPlus Aiptek MegaCam;
+SP57;MegaCam;4CC;V;;;SunPlus Aiptek MegaCam
+SP58;MegaCam;4CC;V;;;SunPlus Aiptek MegaCam
+SP61;MegaCam;4CC;V;;;SunPlus Aiptek MegaCam
+SPIG;Spigot;4CC;V;;;Radius Spigot
+SPLC;ACM audio;4CC;V;;;Splash Studios ACM Audio
+SPRK;Spark;4CC;V;;;
+SQZ2;VXTreme 2;4CC;V;;;Microsoft VXTreme Video V2
+STVA;ST Imager;4CC;V;;;ST Microelectronics CMOS Imager Data (Bayer)
+STVB;ST Imager;4CC;V;;;ST Microelectronics CMOS Imager Data (Nudged Bayer)
+STVC;ST Imager;4CC;V;;;ST Microelectronics CMOS Imager Data (Bunched)
+STVX;ST Imager;4CC;V;;;ST Microelectronics CMOS Imager Data (Extended Data Format)
+STVY;ST Imager;4CC;V;;;ST Microelectronics CMOS Imager Data (Extended Data Format with Correction Data)
+subp;VobSub;4CC;T;;;The same subtitle format used on DVDs
+SV10;Sorenson;4CC;V;;;Sorenson Media Video R1
+SVQ1;Sorenson 1;4CC;V;;;Sorenson Media Video 1 (Apple QuickTime 3)
+SVQ2;Sorenson 2;4CC;V;;;Sorenson Media Video 2 (Apple QuickTime 4)
+SVQ3;Sorenson 3;4CC;V;;;Sorenson Media Video 3 (Apple QuickTime 5)
+SWC1;MainConcept JPEG;4CC;V;JPEG;;MainConcept JPEG
+T420;Toshiba YUV;4CC;V;YUV;;Toshiba YUV 4:2:0
+TGA ;Apple TGA;4CC;V;;;Apple TGA (with Alpha-channel)
+THEO;Theora;4CC;V;;;FFVFW Supported
+TIFF;Apple TIFF;4CC;V;;;Apple TIFF (with Alpha-channel)
+TIM2;Pinnacle DVI;4CC;V;;;Pinnacle RAL DVI
+TLMS;TeraLogic;4CC;V;;;TeraLogic Motion Intraframe
+TLST;TeraLogic;4CC;V;;;TeraLogic Motion Intraframe
+TM10;Duck;4CC;V;;;Duck TrueMotion
+TM20;Duck 2;4CC;V;;;Duck TrueMotion 2.0
+TM2A;Duck Archiver 2;4CC;V;;;Duck TrueMotion Archiver 2.0
+TM2X;Duck 2;4CC;V;;;Duck TrueMotion 2X
+TMIC;TeraLogic;4CC;V;;;TeraLogic Motion Intraframe
+TMOT;Horizons TM S;4CC;V;;;Horizons Technology TrueMotion Video
+TR20;Duck TM RT2;4CC;V;;;Duck TrueMotion RT 2.0
+TRLE;Akula;4CC;V;;;Akula Alpha Pro Custom AVI (LossLess);
+TSCC;TechSmith;4CC;V;;;TechSmith Screen Capture;
+TV10;Tecomac;4CC;V;;;Tecomac Low-Bit Rate;
+TVJP;Pinnacle/Truevision;4CC;V;;;TrueVision Field Encoded JPEG (Targa emulation);
+TVMJ;Pinnacle/Truevision;4CC;V;;;Truevision TARGA JPEG Hardware (or Targa emulation);
+TY0N;Trident;4CC;V;;;Trident Decompression Driver;
+TY2C;Trident;4CC;V;;;Trident Decompression Driver;
+TY2N;Trident;4CC;V;;;Trident Decompression Driver;
+U<Y ;Discreet YUV;4CC;V;YUV;;Discreet UC YUV 4:2:2:4 10 bit;
+U<YA;Discreet YUV;4CC;V;;;Discreet UC YUV 4:2:2:4 10 bit (with Alpha-channel);
+U263;UB H.263;4CC;V;;;UB Video H.263/H.263+/H.263++ Decoder;http://eMajix.com
+UCOD;ClearVideo;4CC;V;;;ClearVideo (fractal compression-based);
+ULRA;RGBA;Ut Video;Ut Video Lossless Codec;http://umezawa.dyndns.info/archive/utvideo;;;RGBA;4:4:4:4
+ULRG;RGB;Ut Video;Ut Video Lossless Codec;http://umezawa.dyndns.info/archive/utvideo;;;RGB;4:4:4
+ULTI;Ultimotion;4CC;V;;;IBM Ultimotion;
+ULY0;YUV;Ut Video;Ut Video Lossless Codec;http://umezawa.dyndns.info/archive/utvideo;;;YUV;4:2:2
+ULY2;YUV;Ut Video;Ut Video Lossless Codec;http://umezawa.dyndns.info/archive/utvideo;;;YUV;4:2:0
+UMP4;UB MPEG-4;4CC;V;MPEG-4V;;UB Video MPEG 4;http://www.fourcc.org/indexyuv.htm
+UYNV;YUV;4CC;V;YUV;;Nvidia 16bpp. A direct copy of UYVY registered by Nvidia to work around problems in some olds which did not like hardware which offered more than 2 UYVY surfaces.;http://www.fourcc.org/indexyuv.htm
+UYVP;YUV;4CC;V;YUV;;Evans & Sutherland 24bpp. YCbCr 4:2:2 extended precision 10-bits per component in U0Y0V0Y1 order;
+UYVU;SoftLab YUV;4CC;V;YUV;;SoftLab-NSK Forward YUV;http://www.fourcc.org/indexyuv.htm
+UYVY;YUV;4CC;V;YUV;;Uncompressed 16bpp. YUV 4:2:2 (Y sample at every pixel, U and V sampled at every second pixel horizontally on each line). A macropixel contains 2 pixels in 1 u_int32.;
+V210;Optibase;4CC;V;;;Optibase VideoPump 10-bit 4:2:2 Component YCbCr;
+V261;VX3000S;4CC;V;;;Lucent VX3000S;
+V422;Vitec YUV;4CC;V;YUV;;Vitec Multimedia YUV 4:2:2 as for UYVY, but with different component ordering within the u_int32 macropixel;
+V655;Vitec YUV;4CC;V;YUV;;Vitec Multimedia 16 bit YUV 4:2:2 (6:5:5) format;
+VBLE;MarcFD VBLE;4CC;V;;;MarcFD VBLE Lossless;
+VCR1;ATI Video 1;4CC;V;;;ATI VCR 1.0;
+VCR2;ATI Video 2;4CC;V;;;ATI VCR 2.0 (MPEG YV12);
+VCR3;ATI Video 3;4CC;V;;;ATI VCR 3.0;
+VCR4;ATI Video 4;4CC;V;;;ATI VCR 4.0;
+VCR5;ATI Video 5;4CC;V;;;ATI VCR 5.0;
+VCR6;ATI Video 6;4CC;V;;;ATI VCR 6.0;
+VCR7;ATI Video 7;4CC;V;;;ATI VCR 7.0;
+VCR8;ATI Video 8;4CC;V;;;ATI VCR 8.0;
+VCR9;ATI Video 9;4CC;V;;;ATI VCR 9.0;
+VCWV;Wavelet;4CC;V;;;VideoCon;
+VDCT;VideoMaker RGB;4CC;V;RGB;;Video Maker Pro DIB;
+VDOM;VDOWave;4CC;V;;;VDONet Wave;
+VDOW;VDOLive;4CC;V;;;VDONet Live (H,263);
+VDST;VirtualDub;4CC;V;;;VirtualDub remote frameclient ICM driver;
+VDTZ;YUV;4CC;V;YUV;;VideoTizer / Darim Vision YUV;
+VGPX;VGP;4CC;V;;;Alaris VideoGramPixel;
+VIDM;DivX 5 pro;4CC;V;MPEG-4V;;DivX 5.0 Pro Supported;
+VIDS;Vitec;4CC;V;;;Vitec Multimedia YUV 4:2:2;www.yks.ne.jp/~hori/
+VIFP;VFAPI;4CC;V;;;Virtual Frame API (VFAPI dummy format);
+VIV1;H.263;4CC;V;;;Vivo H.263;
+VIV2;H.263;4CC;V;;;Vivo H.263;
+VIVO;H.263;4CC;V;;;Vivo H.263;
+VIXL;Miro XL;4CC;V;JPEG;;Miro Video XL;http://mirror01.iptelecom.net.ua/~video/codecs/miroVIDEO-XL.codec.v2.2.exe
+VJPG;JPEG;4CC;V;JPEG;;;
+VLV1;Videologic;4CC;V;;;;
+VMNC;Vmware;4CC;V;;;;http://www.vmware.com/
+VP30;VP3;4CC;V;;;On2 VP3;
+VP31;VP3;4CC;V;;;On2 VP3;
+VP32;VP3;4CC;V;;;On2 VP3;
+VP40;VP4;4CC;V;;;On2 TrueCast VP4;
+VP50;VP5;4CC;V;;;On2 TrueCast VP5;
+VP60;VP6;4CC;V;;;On2 TrueCast VP6;
+VP61;VP6;4CC;V;;;On2 TrueCast VP6.1;
+VP62;VP6;4CC;V;;;On2 TrueCast VP6.2;http://ftp.pub.cri74.org/pub/win9x/video/codecs/VP6/vp6_vfw_codec.exe
+VP6A;VP6;4CC;V;;;On2 TrueCast VP6.2;http://ftp.pub.cri74.org/pub/win9x/video/codecs/VP6/vp6_vfw_codec.exe
+VP6F;VP6;4CC;V;;;On2 TrueCast VP6.2;http://ftp.pub.cri74.org/pub/win9x/video/codecs/VP6/vp6_vfw_codec.exe
+VP70;VP7;4CC;V;;;On2 TrueMotion VP7;
+VP71;VP7;4CC;V;;;On2 TrueMotion VP7;
+VP72;VP7;4CC;V;;;On2 TrueMotion VP7;
+VQC1;Vector 1;4CC;V;;;Vector-quantised 1 (high compression) http://eprints.ecs.soton.ac.uk/archive/00001310/01/VTC97-js.pdf;
+VQC2;Vector 2;4CC;V;;;Vector-quantised 2 (high robustness against channel errors) http://eprints.ecs.soton.ac.uk/archive/00001310/01/VTC97-js.pdf;
+VQJP;VQ630;4CC;V;;;Dual-mode digital camera;
+VQS4;VQ110;4CC;V;;;DV camera;
+VR21;BlckMagic YUV;4CC;V;YUV;;BlackMagic YUV (Quick Time);
+VSSH;AVC;4CC;V;AVC;;Vanguard VSS H.264;
+VSSV;Vanguard Video;4CC;V;;;Vanguard Software Solutions Video;
+VSSW;AVC;4CC;V;AVC;;Vanguard VSS H.264;
+VTLP;GGP;4CC;V;;;Alaris VideoGramPixel;
+VX1K;DVX 1 S;4CC;V;;;Lucent VX1000S Video;
+VX2K;DVX 2 S;4CC;V;;;Lucent VX2000S Video;
+VXSP;DVX 1 SP;4CC;V;;;Lucent VX1000SP Video;
+VYU9;YUV;4CC;V;YUV;;ATI YUV;
+VYUY;YUV;4CC;V;YUV;;ATI Packed YUV Data;
+WBVC;W9960;4CC;V;;;Winbond Electronics W9960;
+WHAM;Microsoft Video 1;4CC;V;;;;
+WINX;Winnov;4CC;V;;;;
+WJPG;Winbond JPEG;4CC;V;JPEG;;Winbond JPEG (AverMedia USB devices);
+WMV1;WMV1;4CC;V;;;Windows Media Video 7;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx
+WMV2;WMV2;4CC;V;;;Windows Media Video 8;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx
+WMV3;WMV3;4CC;V;VC-1;;Windows Media Video 9;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx
+WMVA;WMV;4CC;V;VC-1;;Windows Media Video;http://ffdshow-tryout.sourceforge.net/
+WMVP;WMV3;4CC;V;;;Windows Media Video V9;
+WNIX;WniWni;4CC;V;;;WniWni;
+WNV1;WinNov;4CC;V;;;WinNov Videum Hardware Compression;http://www.winnov.com/
+WNVA;WinNov;4CC;V;;;WinNov Videum Hardware Compression;http://www.winnov.com/
+WRLE;Apple BMP;4CC;V;RGB;;Apple QuickTime BMP;
+WRPR;AVideoTools;4CC;V;;;VideoTools VideoServer Client (wrapper for AviSynth);
+WV1F;WV1F;4CC;V;;;;http://ffdshow-tryout.sourceforge.net/
+WVC1;VC-1;4CC;V;VC-1;;Microsoft;
+WVLT;IllusionHope Wavelet 9/7;4CC;V;;;IllusionHope Wavelet 9/7;
+WVP2;WVP2;4CC;V;;;;http://ffdshow-tryout.sourceforge.net/
+WZCD;iScan;4CC;V;;;CORE Co. Ltd.;
+WZDC;iSnap;4CC;V;;;CORE Co. Ltd.;
+X263;H.263;4CC;V;;;Xirlink H.263;
+x263;Xirlink;4CC;V;;;;
+X264;AVC;4CC;V;AVC;;XiWave GNU GPL x264 MPEG-4;
+x264;AVC;4CC;V;AVC;;XiWave GNU GPL x264 MPEG-4;
+XJPG;Xirlink;4CC;V;JPEG;;Xirlink, Inc.;
+XLV0;NetXL Video;4CC;V;;;NetXL Inc. XL Video Decoder;
+XMPG;Xing MPEG;4CC;V;MPEG-V;;XING MPEG (I frame only);
+XVID;XviD;4CC;V;MPEG-4V;;XviD project;http://www.xvid.org/Downloads.15.0.html
+XVIX;XviD;4CC;V;MPEG-4V;;Based on XviD MPEG-4;http://www.xvid.org/Downloads.15.0.html
+XWV0;XiWave Video;4CC;V;;;XiWave Video;
+XWV1;XiWave Video;4CC;V;;;XiWave Video;
+XWV2;XiWave Video;4CC;V;;;XiWave Video;
+XWV3;XiWave Video;4CC;V;;;XiWave Video (Xi-3 Video);
+XWV4;XiWave Video;4CC;V;;;XiWave Video;
+XWV5;XiWave Video;4CC;V;;;XiWave Video;
+XWV6;XiWave Video;4CC;V;;;XiWave Video;
+XWV7;XiWave Video;4CC;V;;;XiWave Video;
+XWV8;XiWave Video;4CC;V;;;XiWave Video;
+XWV9;XiWave Video;4CC;V;;;XiWave Video;
+XXAN;Origin VideoGame;4CC;V;;;Origin Video (used in Wing Commander 3 and 4);
+XYZP;PAL;4CC;V;;;Extended PAL format XYZ palette;
+Y211;YUV;4CC;V;YUV;;Packed YUV format with Y sampled at every second pixel across each line and U and V sampled at every fourth pixel;
+Y216;Targa YUV;4CC;V;YUV;;Pinnacle TARGA CineWave YUV (Quick Time);
+Y411;YUV;4CC;V;YUV;;YUV 4:1:1 Packed;
+Y41B;YUV;4CC;V;YUV;;YUV 4:1:1 Planar;
+Y41P;YUV;4CC;V;YUV;;Conexant (ex Brooktree) YUV 4:1:1 Raw;http://www.fourcc.org/indexyuv.htm
+Y41T;YUV;4CC;V;YUV;;Format as for Y41P, but the lsb of each Y component is used to signal pixel transparency;
+Y422;YUV;4CC;V;YUV;;Direct copy of UYVY as used by ADS Technologies Pyro WebCam firewire camera;
+Y42B;YUV;4CC;V;YUV;;YUV 4:2:2 Planar;
+Y42T;YUV;4CC;V;YUV;;Format as for UYVY, but the lsb of each Y component is used to signal pixel transparency;
+Y444;YUV;4CC;V;YUV;;IYU2 (iRez Stealth Fire camera);
+Y8  ;GrayScale;4CC;V;;;Simple grayscale video;
+Y800;GrayScale;4CC;V;;;Simple grayscale video;
+YC12;YUV;4CC;V;YUV;;Intel YUV12;http://www.fourcc.org/indexyuv.htm
+YCCK;YUV;4CC;V;YUV;;;
+YMPG;MPEG-2;4CC;V;MPEG-2;;YMPEG Alpha (dummy for MPEG-2 compressor);
+YU12;YUV;4CC;V;YUV;;ATI YV12 4:2:0 Planar;
+YU92;YUV;4CC;V;YUV;;Intel - YUV;
+YUNV;YUV;4CC;V;YUV;;A direct copy of YUY2 registered by Nvidia to work around problems in some olds which did not like hardware that offered more than 2 YUY2 surfaces;
+YUV2;YUV;4CC;V;YUV;;Apple Component Video (YUV 4:2:2);http://www.apple.com/quicktime/download/standalone.html
+YUV8;YUV;4CC;V;YUV;;Winnov Caviar YUV8 ;http://www.fourcc.org/indexyuv.htm
+YUV9;YUV;4CC;V;YUV;;Intel YUV9;
+YUVP;YUV;4CC;V;YUV;;YCbCr 4:2:2 extended precision 10-bits per component in Y0U0Y1V0 order;
+YUY2;YUV;4CC;V;YUV;;YUV 4:2:2 as for UYVY but with different component ordering within the u_int32 macropixel;http://www.fourcc.org/indexyuv.htm
+YUYP;YUV;4CC;V;YUV;;Evans & Sutherland;
+YUYV;YUV;4CC;V;YUV;;Canopus YUV format;http://www.fourcc.org/indexyuv.htm
+YV12;YUV;4CC;V;YUV;;ATI YVU12 4:2:0 Planar;http://www.fourcc.org/indexyuv.htm
+YV16;YUV;4CC;V;YUV;;Elecard YUV 4:2:2 Planar;
+YV92;YUV;4CC;V;YUV;;Intel Smart Video Recorder YVU9;
+YVU9;YUV;4CC;V;YUV;;Brooktree YVU9 Raw (YVU9 Planar);http://www.fourcc.org/indexyuv.htm
+YVYU;YUV;4CC;V;YUV;;YUV 4:2:2 as for UYVY but with different component ordering within the u_int32 macropixel;
+ZLIB;AVIzlib;4CC;V;RGB;;Lossless (ZIP compression);
+ZMBV;Zip;4CC;V;;;Zip Motion Blocks Video;
+ZPEG;Video Zipper;4CC;V;RGB;;Metheus Video Zipper;
+ZYGO;ZyGo;4CC;V;;;ZyGo Video;
+V_UNCOMPRESSED;Raw;Mk;V;;;Raw uncompressed video frames;
+V_DIRAC;Dirac;Mk;V;;;;http://diracvideo.org/
+V_MPEG4/ISO/SP;MPEG-4 Visual SP;Mk;V;MPEG-4V;;Simple Profile;http://www.divx.com
+V_MPEG4/ISO/ASP;MPEG-4 Visual ASP;Mk;V;MPEG-4V;;Advanced Simple Profile;http://www.xvid.org/Downloads.15.0.html
+V_MPEG4/ISO/AP;MPEG-4 Visual AP;Mk;V;MPEG-4V;;Advanced Profile;http://ffdshow-tryout.sourceforge.net/
+V_MPEG4/ISO/AVC;AVC;Mk;V;AVC;;Advanced Video Codec;http://ffdshow-tryout.sourceforge.net/
+V_MPEG4/MS/V2;MS MPEG-4 v2;Mk;V;MPEG-4V;;MS MPEG-4 v2;http://ffdshow-tryout.sourceforge.net/
+V_MPEG4/MS/V3;MS MPEG-4 v3;Mk;V;MPEG-4V;;MS MPEG-4 v3;http://ffdshow-tryout.sourceforge.net/
+V_MPEG1;MPEG-1 Video;Mk;V;MPEG-V;;MPEG 1 or 2 Video;http://ffdshow-tryout.sourceforge.net/
+V_MPEG2;MPEG-2 Video;Mk;V;MPEG-V;;MPEG 1 or 2 Video;http://ffdshow-tryout.sourceforge.net/
+V_REAL/RV10;Real 1;Mk;V;;;RealVideo 1.0 aka RealVideo 5;http://www.real.com
+V_REAL/RV20;Real 2;Mk;V;;;RealVideo 2.0 aka G2 and RealVideo G2+SVT;http://www.real.com
+V_REAL/RV30;Real 3;Mk;V;;;RealVideo 3.0 aka RealVideo 8;http://www.real.com
+V_REAL/RV40;Real 4;Mk;V;;;RealVideo 4.0 aka RealVideo 9;http://www.real.com
+V_THEORA;Theora;Mk;V;;;;http://www.theora.org
+A_MPEG/L1;MPEG1/2 L1;Mk;A;MPEG-A;;MPEG1 or 2 Audio layer 1;http://www.iis.fraunhofer.de/amm/index.html
+A_MPEG/L2;MPEG1/2 L2;Mk;A;MPEG-A;;MPEG1 or 2 Audio layer 2;http://www.iis.fraunhofer.de/amm/index.html
+A_MPEG/L3;MPEG1/2 L3;Mk;A;MPEG-A;;MPEG1 or 2 Audio Layer 3;http://www.iis.fraunhofer.de/amm/index.html
+A_PCM/INT/BIG;PCM;Mk;A;PCM;;Linear PCM (Big Endian);
+A_PCM/INT/LIT;PCM;Mk;A;PCM;;Linear PCM (Little Endian);
+A_PCM/FLOAT/IEEE;PCM;Mk;A;PCM;;Microsoft Linear PCM, Float;http://www.microsoft.com/windows/
+A_AC3;AC3;Mk;A;AC3;;Dolby AC3;
+A_AC3/BSID9;AC3;Mk;A;AC3;;Dolby AC3;
+A_AC3/BSID10;AC3;Mk;A;AC3;;Dolby AC3;
+A_DTS;DTS;Mk;A;DTS;;;
+A_EAC3;EAC3;Mk;A;EAC3;;Dolby Enhanced AC3;
+A_FLAC;Flac;Mk;A;Flac;;;http://flac.sourceforge.net
+A_OPUS;Opus;;;http://opus-codec.org
+A_TTA1;TTA;Mk;A;TTA;;The True Audio Lossless Codec;http://true-audio.com
+A_VORBIS;Vorbis;Mk;A;Vorbis;VBR;;http://www.vorbis.com
+A_WAVPACK4;WavPack;Mk;A;Real;VBR;;http://www.wavpack.com
+A_REAL/14_4;RealAudio 1;Mk;A;Real;;Real Audio 1 (14.4);http://www.real.com
+A_REAL/28_8;RealAudio 2;Mk;A;Real;;Real Audio 2 (28.8);http://www.real.com
+A_REAL/COOK;RealAudio 7;Mk;A;Real;;Real Audio Cook Codec (codename: Gecko);http://www.real.com
+A_REAL/SIPR;RealAudio 4;Mk;A;Real;;Real & Sipro Voice Codec;http://www.real.com
+A_REAL/RALF;RealAudio Lossless;Mk;A;Real;;Real Audio Lossless Format;http://www.real.com
+A_REAL/ATRC;RealAudio Atrac3;Mk;A;Real;;Real & Sony Atrac3 Codec;http://www.real.com
+A_AAC;AAC;Mk;A;AAC;;;
+A_AAC/MPEG2/MAIN;AAC Main;Mk;A;AAC;;AAC Main;
+A_AAC/MPEG2/LC;AAC LC;Mk;A;AAC;;AAC Low Complexity;
+A_AAC/MPEG2/LC/SBR;AAC LC-SBR;Mk;A;AAC;;AAC Low Complexity with Spectral Band Replication;
+A_AAC/MPEG2/SSR;AAC SSR;Mk;A;AAC;;AAC Scalable Sampling Rate;
+A_AAC/MPEG4/MAIN;AAC Main;Mk;A;AAC;;AAC Low Complexity;
+A_AAC/MPEG4/MAIN/SBR;AAC Main;Mk;A;AAC;;AAC Low Complexity with Spectral Band Replication;
+A_AAC/MPEG4/MAIN/SBR/PS;AAC Main;Mk;A;AAC;;AAC Low Complexity with Spectral Band Replication and Parametric Stereo;
+A_AAC/MPEG4/MAIN/PS;AAC Main;Mk;A;AAC;;AAC Low Complexity with Parametric Stereo;
+A_AAC/MPEG4/LC;AAC LC;Mk;A;AAC;;AAC Low Complexity;
+A_AAC/MPEG4/LC/SBR;AAC LC-SBR;Mk;A;AAC;;AAC Low Complexity with Spectral Band Replication;
+A_AAC/MPEG4/LC/SBR/PS;AAC LC-SBR-PS;Mk;A;AAC;;AAC Low Complexity with Spectral Band Replication and Parametric Stereo;
+A_AAC/MPEG4/LC/PS;AAC LC-PS;Mk;A;AAC;;AAC Low Complexity with Parametric Stereo;
+A_AAC/MPEG4/SSR;AAC SSR;Mk;A;AAC;;AAC Scalable Sampling Rate;
+A_AAC/MPEG4/LTP;AAC LTP;Mk;A;AAC;;AAC Long Term Prediction;
+14_4;VSELP;Real;A;;;EIA/TIA IS-54 VSELP, Real Audio 1 (for streaming 14.4 Kbps);http://www.real.com
+14.4;VSELP;Real;A;;;EIA/TIA IS-54 VSELP, Real Audio 1 (for streaming 14.4 Kbps);http://www.real.com
+lpcJ;VSELP;Real;A;;;EIA/TIA IS-54 VSELP, Real Audio 1 (for streaming 14.4 Kbps);http://www.real.com
+28_8;G.728;Real;A;;;ITU-T G.728, Real Audio 2 (for streaming 28.8 Kbps);http://www.real.com
+28.8;G.728;Real;A;;;ITU-T G.728, Real Audio 2 (for streaming 28.8 Kbps);http://www.real.com
+cook;Cooker;Real;A;;;Real Audio G2/7 Cook (low bitrate);http://www.real.com
+dnet;AC3;Real;A;AC3;;A52/AC3, Real Audio 2;http://www.real.com
+sipr;G.729;Real;A;;;G.729, Real Audio 2;http://www.real.com
+rtrc;RealAudio 8;Real;A;;;Real Audio 8 (RTRC);http://www.real.com
+ralf;Lossless;Real;A;;;Real Audio Lossless Format;http://www.real.com
+whrl;Multi-Channel;Real;A;;;Real Audio Multi-Channel;http://www.real.com
+atrc;Atrac;Real;A;;;Real & Sony Atrac3;http://www.real.com
+raac;AAC-LC;Real;A;AAC;;Real Audio 10 AAC LC;http://www.real.com
+racp;AAC-HE;Real;A;AAC;;Real Audio 10 AAC-HE;http://www.real.com
+OPUS;Opus;Ogg;A;OPUS;;;http://opus-codec.org
+Vorbis;Vorbis;Ogg;A;Vorbis;;;http://www.vorbis.com
+Theora;Theora;Ogg;V;Theora;;;http://www.theora.com
+mp4a;AAC;4CC;A;AAC;;AAC (3GPP);http://www.apple.com/quicktime/download/standalone.html
+mp4v;MPEG-4;4CC;V;MPEG-4V;;MPEG-4 Video (3GPP);http://www.apple.com/quicktime/download/standalone.html
+avc1;AVC;4CC;V;AVC;;Advanced Video Codec;http://www.apple.com/quicktime/download/standalone.html
+h263;H.263;4CC;V;;;H.263 (3GPP);http://www.apple.com/quicktime/download/standalone.html
+s263;H.263;4CC;V;;;H.263 (3GPP);http://www.apple.com/quicktime/download/standalone.html
+samr;AMR-NB;4CC;A;;;AMR narrow band (3GPP);http://www.apple.com/quicktime/download/standalone.html
+sawb;AMR-WB;4CC;A;;;AMR wide band (3GPP);http://www.apple.com/quicktime/download/standalone.html
+sevc;EVRC;4CC;A;;;;http://www.apple.com/quicktime/download/standalone.html
+tx3g;Timed;4CC;T;;;Timed text (3GPP);http://www.apple.com/quicktime/download/standalone.html
+encv;Encrypted;4CC;V;;;Encrypted Video (3GPP);http://www.apple.com/quicktime/download/standalone.html
+enca;Encrypted;4CC;A;;;Encrypted Audio (3GPP);http://www.apple.com/quicktime/download/standalone.html
+enct;Encrypted;4CC;T;;;Encrypted Text (3GPP);http://www.apple.com/quicktime/download/standalone.html
+ima4;ADPCM;4CC;A;ADPCM;;;http://www.apple.com/quicktime/download/standalone.html
+raw ;PCM;4CC;A;PCM;;;http://www.apple.com/quicktime/download/standalone.html
+twos;PCM;4CC;A;PCM;;;http://www.apple.com/quicktime/download/standalone.html
+sowt;PCM;4CC;A;PCM;;;http://www.apple.com/quicktime/download/standalone.html
+alac;Lossless;4CC;A;;;Apple Lossless Format (similar to FLAC);http://www.apple.com/quicktime/download/standalone.html
+sac3;AC3;4CC;A;AC3;;AC3 in MP4 (made in Nero);http://www.nerodigital.com
+in24;PCM;4CC;A;PCM;;;http://www.apple.com/quicktime/download/standalone.html
+in32;PCM;4CC;A;PCM;;;http://www.apple.com/quicktime/download/standalone.html
+fl32;PCM ;4CC;A;PCM;;;http://www.apple.com/quicktime/download/standalone.html
+fl64;PCM;4CC;A;PCM;;;http://www.apple.com/quicktime/download/standalone.html
+alaw;A-Law;4CC;A;ADPCM;;;http://www.apple.com/quicktime/download/standalone.html
+ulaw;U-Law;4CC;A;ADPCM;;;http://www.apple.com/quicktime/download/standalone.html
+.mp3;MPEG-1/2 L3;2CC;A;MPEG-A;;MPEG-1 or 2 layer 3;http://www.iis.fraunhofer.de/amm/index.html
+MPEG-4 AAC main;AAC Main;Mp4v2;A;AAC;;;
+MPEG-4 AAC LC;AAC LC;Mp4v2;A;AAC;;;
+MPEG-4 AAC SSR;AAC SSR;Mp4v2;A;AAC;;;
+MPEG-4 AAC LTP;AAC LTP;Mp4v2;A;AAC;;;
+AVC;AVC;MediaInfo;V;AVC;;Advanced Video Codec;http://developers.videolan.org/x264.html
+MPEG-1V;MPEG-1 Video;MediaInfo;V;MPEG-V;;;
+MPEG-2V;MPEG-2 Video;MediaInfo;V;MPEG-V;;;
+MPEG-4V;MPEG-4 Visual;MediaInfo;V;MPEG-4V;;;
+MPEG-1A;MPEG-1 Audio;MediaInfo;A;MPEG-A;;;
+MPEG-1A L1;MPEG-1 Audio Layer 1;MediaInfo;A;MPEG-A;;;
+MPEG-1A L2;MPEG-1 Audio Layer 2;MediaInfo;A;MPEG-A;;;
+MPEG-1A L3;MPEG-1 Audio Layer 3;MediaInfo;A;MPEG-A;;;
+MPEG-2A;MPEG-2 Audio;MediaInfo;A;MPEG-A;;;
+MPEG-2A L1;MPEG-2 Audio Layer 1;MediaInfo;A;MPEG-A;;;
+MPEG-2A L2;MPEG-2 Audio Layer 2;MediaInfo;A;MPEG-A;;;
+MPEG-2A L3;MPEG-2 Audio Layer 3;MediaInfo;A;MPEG-A;;;
+MPEG-2.5A;MPEG-2.5 Audio;MediaInfo;A;MPEG-A;;;;
+MPEG-2.5A L1;MPEG-2.5 Audio Layer 1;MediaInfo;A;MPEG-A;;;;
+MPEG-2.5A L2;MPEG-2.5 Audio Layer 2;MediaInfo;A;MPEG-A;;;;
+MPEG-2.5A L3;MPEG-2.5 Audio Layer 3;MediaInfo;A;MPEG-A;;;;
+APE;Monkey's Audio;MediaInfo;A;;;;http://www.monkeysaudio.com/;
+ALS;ALS;MediaInfo;A;;;MPEG-4 Audio Lossless Coding;http://www.nue.tu-berlin.de/forschung/projekte/lossless/mp4als.html#downloads;
+Vodei;Vodei MP;MediaInfo;V;;;Video On Demand Exploration Interface;http://www.vodei.com;
+SWF ADPCM;ADPCM;MediaInfo;A;ADPCM;;ADPCM found in SWF/FLV files;http://www.adobe.com;
+AC3+;AC3+;MediaInfo;A;AC3;;Dolby Ehanced AC3;;
+TrueHD;TrueHD;MediaInfo;A;AC3;;Dolby TrueHD (AC3 based);;
+VC-1;VC-1;MediaInfo;V;VC-1;;;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;
+LA;LA;MediaInfo;A;;;Lossless Audio Codec;la;http://www.lossless-audio.com/
+0;Unknown;2CC;A;;;;;
+1;PCM;2CC;A;PCM;;Microsoft PCM;http://www.microsoft.com/windows/;
+2;ADPCM;2CC;A;ADPCM;;Microsoft ADPCM;http://www.microsoft.com/windows/;
+3;PCM;2CC;A;PCM;;IEEE FLOAT;http://www.microsoft.com/windows/;
+4;VSELP;2CC;A;;;Compaq VSELP;
+5;CVSD;2CC;A;;;IBM CVSD;
+6;A-Law;2CC;A;ADPCM;;CCITT A-Law;http://www.microsoft.com/windows/
+7;U-Law;2CC;A;ADPCM;;CCITT U-Law;http://www.microsoft.com/windows/
+8;DTS;2CC;A;DTS;;;
+9;DRM;2CC;A;;;Microsoft;
+A;WMSpeech;2CC;A;;;;
+C;MPEG2 5.1;2CC;A;;;MPEG2 5.1;
+10;ADPCM;2CC;A;ADPCM;;OKI ADPCM;
+11;ADPCM;2CC;A;ADPCM;;Intel ADPCM;
+12;ADPCM;2CC;A;ADPCM;;Mediaspace (Videologic) ADPCM;
+13;ADPCM;2CC;A;ADPCM;;Sierra ADPCM;
+14;ADPCM;2CC;A;ADPCM;;Antex G723 ADPCM;
+15;STD;2CC;A;;;DSP solutions Digi-STD;
+16;FIX;2CC;A;;;DSP solutions Digi-FIX;
+17;ADPCM;2CC;A;ADPCM;;Dialogic-OKI ADPCM;http://www.microsoft.com/windows/
+18;ADPCM;2CC;A;ADPCM;;;
+19;CU;2CC;A;;;HP CU_CODEC;
+1A;Dynamic Voice;2CC;A;;;HP;
+20;ADPCM;2CC;A;ADPCM;;Yamaha ADPCM;
+21;SONARC;2CC;A;;;Speech Compression SONARC;
+22;Truespeech;2CC;A;;;DSP Group TrueSpeech;http://www.microsoft.com/windows/
+23;SC1;2CC;A;;;Echo Speech SC1;
+24;AF36;2CC;A;;;Virtual Music AudioFile 36;
+25;APTX;2CC;A;;;Audio Processing Technology X;
+26;AF10;2CC;A;;;Virtual Music AudioFile 10;
+27;Prosody 1612;2CC;A;;;Aculab plc Prosody 1612;
+28;LRC;2CC;A;;;Merging Technologies LRC;
+30;AC2;2CC;A;;;Dolby Laboratories AC2;
+31;GSM 6.10;2CC;A;;;Microsoft GSM 6.10;http://www.microsoft.com/windows/
+32;MSAUDIO;2CC;A;;;Microsoft Audio;
+33;ADPCM;2CC;A;ADPCM;;Antex ADPCM;
+34;VQLPC;2CC;A;;;Control Resources VQLPC;
+35;REAL;2CC;A;;;DSP Solutions Digi-REAL;
+36;ADPCM;2CC;A;ADPCM;;DSP Solutions Digi-ADPCM;
+37;CR10;2CC;A;;;Control Resources 10;
+38;ADPCM;2CC;A;ADPCM;;Natural MicroSystems VBX ADPCM;
+39;ADPCM;2CC;A;ADPCM;;Crystal Semiconductor IMA ADPCM;
+3A;SC3;2CC;A;;;Echo Speech SC3;
+3B;ADPCM;2CC;A;;;Rockwell ADPCM;
+3C;DigiTalk;2CC;A;;;Rockwell DigiTalk;
+3D;Xebec;2CC;A;;;Xebec Multimedia Solutions;
+40;ADPCM;2CC;A;ADPCM;;Antex Electronics G721 ADPCM;
+41;CELP;2CC;A;;;Antex Electronics G728 CELP;
+42;G.723.1;2CC;A;;;Microsoft G.723.1;http://www.microsoft.com/windows/
+42;ADPCM;2CC;A;;;IBM;
+42;MSG729;2CC;A;;;Microsoft;
+45;ADPCM;2CC;A;ADPCM;;Microsoft G.726;http://www.microsoft.com/windows/
+50;MPEG-1/2 L1;2CC;A;MPEG-1;;;http://www.iis.fraunhofer.de/amm/index.html
+51;MPEG-1/2 L2;2CC;A;MPEG-1;;;http://www.iis.fraunhofer.de/amm/index.html
+52;RT24;2CC;A;;;InSoft, Inc.;
+53;PAC;2CC;A;;;InSoft, Inc.;
+55;MPEG-1/2 L3;2CC;A;MPEG-1;;MPEG-1 or 2 layer 3;http://www.iis.fraunhofer.de/amm/index.html
+59;G723;2CC;A;;;Lucent G723;
+60;Cirrus;2CC;A;;;Cirrus Logic;
+61;PCM;2CC;A;;;ESS Technology PCM;
+62;Voxware;2CC;A;;;;
+63;ATRAC;2CC;A;;;Canopus ATRAC;
+64;ADPCM;2CC;A;ADPCM;;APICOM G726 ADPCM;
+65;ADPCM;2CC;A;ADPCM;;APICOM G722 ADPCM;
+66;DSAT;2CC;A;;;Microsoft DSAT;
+67;DSAT Display;2CC;A;;;Microsoft DSAT DISPLAY;
+69;BYTE_ALIGNED;2CC;A;;;Voxware BYTE_ALIGNED;http://www.voxware.com/
+70;AC8;2CC;A;;;Voxware AC8;http://www.voxware.com/
+71;AC10;2CC;A;;;Voxware AC10;http://www.voxware.com/
+72;AC16;2CC;A;;;Voxware AC16;http://www.voxware.com/
+73;AC20;2CC;A;;;Voxware AC20;http://www.voxware.com/
+74;RT24;2CC;A;;;Voxware RT24 (MetaVoice);http://www.voxware.com/
+75;RT29;2CC;A;;;Voxware RT29 (MetaSound);http://www.voxware.com/
+76;RT29HW;2CC;A;;;Voxware RT29HW;http://www.voxware.com/
+77;VR12;2CC;A;;;Voxware VR12;http://www.voxware.com/
+78;VR18;2CC;A;;;Voxware VR18;http://www.voxware.com/
+79;TQ40;2CC;A;;;Voxware TQ40;http://www.voxware.com/
+7A;SC3;2CC;A;;;Voxware;
+7B;SC3;2CC;A;;;Voxware;
+80;Softsound;2CC;A;;;;
+81;TQ60;2CC;A;;;Voxware TQ60;http://www.voxware.com/
+82;MSRT24;2CC;A;;;Microsoft MSRT24;
+83;G729A;2CC;A;;;AT&T G729A;
+84;MVI_MVI2;2CC;A;;;Motion Pixels MVI_MVI2;
+85;ADPCM;2CC;A;ADPCM;;DataFusion Systems (Pty) G726
+86;GSM6.10;2CC;A;;;DataFusion Systems (Pty) GSM6.10
+88;ISI AUDIO;2CC;A;;;Iterated Systems AUDIO
+89;Onlive;2CC;A;;;OnLive! Technologies
+8A;SX20;2CC;A;;;Multitude
+8B;ADPCM;2CC;A;ADPCM;;Infocom ITS A/S
+8C;G.729;2CC;A;;;Convedia Corporation
+91;SBC24;2CC;A;;;Siemens Business Communications Sys 24
+92;AC3 SPDIF;2CC;A;;;Sonic Foundry AC3 SPDIF
+93;G723;2CC;A;;;MediaSonic G723
+94;Prosody 8KBPS;2CC;A;;;Aculab plc Prosody 8KBPS
+97;ADPCM;2CC;A;ADPCM;;ZyXEL Communications ADPCM
+98;LPCBB;2CC;A;;;Philips Speech Processing LPCBB
+99;Packed;2CC;A;;;Studer Professional Audio AG Packed
+A0;PHONYTALK;2CC;A;;;Malden Electronics PHONYTALK
+A1;GSM;2CC;A;;;Racal Recorders
+A2;G.720a;2CC;A;;;Racal Recorders;
+A3;G.723.1;2CC;A;;;Racal Recorders;
+A4;ACELP;2CC;A;;;Racal Recorders;
+B0;AAC;2CC;A;AAC;;NEC Corporation;
+FF;AAC;2CC;A;AAC;;;
+100;ADPCM;2CC;A;ADPCM;;;
+101;IRAT;2CC;A;;;BeCubed IRAT;
+102;;2CC;A;;;IBM A-law;
+103;;2CC;A;;;IBM AVC ADPCM;
+111;G723;2CC;A;;;Vivo G723;
+112;SIREN;2CC;A;;;Vivo SIREN;
+120;CELP;2CC;A;;;Philips Speech Processing;
+121;Grundig;2CC;A;;;Philips Speech Processing;
+123;G723;2CC;A;;;Digital Equipment Corporation (DEC) G723;
+125;ADPCM;2CC;A;ADPCM;;;
+130;ACEPL;2CC;A;;;Sipro ACEPL.net;http://dividix.host.sk
+131;ACELP4800;2CC;A;;;Sipro ACELP4800;
+132;ACELP8V3;2CC;A;;;Sipro ACELP8V3;
+133;G729;2CC;A;;;Sipro G729;
+134;G729;2CC;A;;;Sipro G729A;
+135;KELVIN;2CC;A;;;Sipro KELVIN;
+135;AMR;2CC;A;;;VoiceAge Corporation;
+140;ADPCM;2CC;A;ADPCM;;Dictaphone Corporation G726 ADPCM;
+140;CELP68;2CC;A;;;Dictaphone Corporation;
+140;CELP54;2CC;A;;;Dictaphone Corporation;
+150;PureVoice;2CC;A;;;Qualcomm PUREVOICE;
+151;HalfRate;2CC;A;;;Qualcomm HALFRATE;
+155;TUBGSM;2CC;A;;;Ring Zero Systems TUBGSM;
+160;WMA1;2CC;A;;;Windows Media Audio 1;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx
+161;WMA2;2CC;A;;;Windows Media Audio 2;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx
+162;WMA3;2CC;A;;;Windows Media Audio 3;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx
+163;WMA Lossless;2CC;A;;;Windows Media Audio 3;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx
+163;WMA Pro;2CC;A;;;WMA Pro over S/PDIF
+170;ADPCM;2CC;A;ADPCM;;Unisys Nap ADPCM
+171;U-Law;2CC;A;ADPCM;;Unisys Nap U-law
+172;A-Law;2CC;A;ADPCM;;Unisys Nap A-law
+173;16K;2CC;A;;;Unisys Nap 16K
+174;G.700;2CC;A;;;SyCom Technologies
+175;ADPCM;2CC;A;ADPCM;;SyCom Technologies
+176;CELP54;2CC;A;;;SyCom Technologies
+177;CELP68;2CC;A;;;SyCom Technologies
+178;ADPCM;2CC;A;ADPCM;;Knowledge Adventure, Inc.
+180;AAC;2CC;A;;;Fraunhofer IIS
+190;DTS;2CC;A;;;
+200;ADPCM;2CC;A;ADPCM;;Creative Labs ADPCM
+202;FastSpeech8;2CC;A;;;Creative Labs Fast Speech 8
+203;FastSpeech10;2CC;A;;;Creative Labs Fast Speech 10
+210;ADPCM;2CC;A;ADPCM;;UHER informatic GmbH ADPCM
+215;;2CC;A;;;Ulead DV ACM
+216;;2CC;A;;;Ulead DV ACM
+220;QuaterDeck;2CC;A;;;Quarterdeck
+230;VC;2CC;A;;;I-link VC
+240;RAW_SPORT;2CC;A;;;Aureal RAW_SPORT
+241;AC3;2CC;A;;;ESST AC3
+250;HSX;2CC;A;;;Interactive Products, Inc. (IPI) HSX
+251;RPELP;2CC;A;;;Interactive Products, Inc. (IPI) RPELP
+260;CS2;2CC;A;;;Consistent Software CS2
+270;SCX;2CC;A;;;Sony
+271;SCY;2CC;A;;;Sony
+272;Atrac3;2CC;A;;;Sony
+273;SPC;2CC;A;;;Sony
+280;Telum;2CC;A;;;
+281;TelumIA;2CC;A;;;
+285;ADPCM;2CC;A;ADPCM;;Norcom Voice Systems
+300;FM_TOWNS_SND;2CC;A;;;Fujitsu FM_TOWNS_SND;
+350;Dev;2CC;A;;;Micronas Semiconductors, Inc.;
+351;CELP833;2CC;A;;;Micronas Semiconductors, Inc.;
+400;BTV_DIGITAL;2CC;A;;;Brooktree (BTV) DIGITAL;
+401;Music Coder;2CC;A;;;Intel Music Coder;http://www.intel.com/
+402;IAC2;2CC;A;;;Ligos IAC2;http://www.ligos.com
+450;Qdesign;2CC;A;;;QDesign Music;
+500;VP7;2CC;A;;;On2
+501;VP6;2CC;A;;;On2
+680;VMPCM;2CC;A;;;AT&T VME_VMPCM;
+681;TPC;2CC;A;;;AT&T TPC;
+700;YMPEG;2CC;A;;;YMPEG Alpha;
+8AE;LiteWave;2CC;A;;;ClearJump LiteWave;
+AAC;AAC;2CC;A;AAC;;;
+1000;GSM;2CC;A;;;Ing C. Olivetti & C., S.p.A. GSM;
+1001;ADPCM;2CC;A;ADPCM;;Ing C. Olivetti & C., S.p.A. ADPCM;
+1002;CELP;2CC;A;;;Ing C. Olivetti & C., S.p.A. CELP;
+1003;SBC;2CC;A;;;Ing C. Olivetti & C., S.p.A. SBC;
+1004;OPR;2CC;A;;;Ing C. Olivetti & C., S.p.A. OPR;
+1100;LH_CODEC;2CC;A;;;Lernout & Hauspie Codec;
+1101;CELP;2CC;A;;;Lernout & Hauspie CELP 4.8 kb/s;http://www.microsoft.com/windows/
+1102;SBC;2CC;A;;;Lernout & Hauspie SBC 8 kb/s;http://www.microsoft.com/windows/
+1103;SBC;2CC;A;;;Lernout & Hauspie SBC 12 kb/s;http://www.microsoft.com/windows/
+1104;SBC;2CC;A;;;Lernout & Hauspie SBC 16 kb/s;http://www.microsoft.com/windows/
+1400;NORRIS;2CC;A;;;Norris Communications, Inc.;
+1401;ISIAUDIO;2CC;A;;;ISIAudio;
+1500;MUSICOMPRESS;2CC;A;;;Soundspace Music Compression;
+181C;RT24;2CC;A;;;VoxWare RT24 speech codec;
+181E;AX24000P;2CC;A;;;Lucent elemedia AX24000P Music codec;
+1971;SonicFoundry;2CC;A;;;Lossless;
+1C03;ADPCM;2CC;A;ADPCM;;Lucent SX5363S G.723 compliant codec;
+1C07;SX8300P;2CC;A;;;Lucent SX8300P speech codec;
+1C0C;ADPCM;2CC;A;ADPCM;;Lucent SX5363S G.723 compliant codec
+1F03;DigiTalk;2CC;A;;;CUseeMe DigiTalk (ex-Rocwell)
+1FC4;ALF2CD;2CC;A;;;NCT Soft ALF2CD ACM
+2000;AC3;2CC;A;AC3;CBR;Dolby AC3
+2001;DTS;2CC;A;DTS;;Digital Theater Systems
+2002;Real Audio 1;2CC;A;;;RealAudio 1/2 14.4
+2003;Real Audio 1;2CC;A;;;RealAudio 1/2 28.8
+2004;Real Audio 2;2CC;A;;;RealAudio G2/8 Cook (low bitrate)
+2005;Real Audio 3;2CC;A;;;RealAudio 3/4/5 Music (DNET)
+2006;AAC;2CC;A;AAC;;RealAudio 10 AAC (RAAC)
+2007;AAC+;2CC;A;AAC;;RealAudio 10 AAC+ (RACP)
+3313;AviSynth;2CC;A;;;makeAVIS (fake AVI sound from AviSynth scripts)
+4143;AAC;2CC;A;AAC;;Divio MPEG-4 AAC audio
+4201;Nokia;2CC;A;;;
+4243;ADPCM;2CC;A;ADPCM;;G726
+43AC;Lead Speech;2CC;A;;;
+564C;Lead Vorbis;2CC;A;;;;
+566F;Vorbis;2CC;A;Vorbis;;;http://www.vorbis.com
+5756;WavPack;2CC;A;;;;http://www.wavpack.com/
+674F;Vorbis;2CC;A;Vorbis;;Mode 1;http://www.vorbis.com
+6750;Vorbis;2CC;A;Vorbis;;Mode 2;http://www.vorbis.com
+6751;Vorbis;2CC;A;Vorbis;;Mode 3;http://www.vorbis.com
+676F;Vorbis;2CC;A;Vorbis;;Mode 1+;http://www.vorbis.com
+6770;Vorbis;2CC;A;Vorbis;;Mode 2+;http://www.vorbis.com
+6771;Vorbis;2CC;A;Vorbis;;Mode 2+;http://www.vorbis.com
+7A21;AMR;2CC;A;;CBR;GSM-AMR (CBR, no SID);http://www.microsoft.com
+7A22;AMR;2CC;A;;VBR;GSM-AMR (VBR, including SID);http://www.microsoft.com
+A100;G723.1;2CC;A;;;;
+A101;AVQSBC;2CC;A;;;;
+A102;ODSBC;2CC;A;;;;
+A103;G729A;2CC;A;;;;
+A104;AMR-WB;2CC;A;;;;
+A105;ADPCM;2CC;A;ADPCM;;G726;
+A106;AAC;2CC;A;;;;
+A107;ADPCM;2CC;A;ADPCM;;G726;
+A109;Speex;2CC;A;;;;http://www.speex.org/
+DFAC;FrameServer;2CC;A;;;DebugMode SonicFoundry Vegas FrameServer ACM Codec;
+F1AC;FLAC;2CC;A;;;Free Lossless Audio Codec FLAC;
+FFFE;PCM;2CC;A;PCM;;Extensible wave format;
+FFFF;In Development;2CC;A;;;In Development / Unregistered;
+S_TEXT/UTF8;UTF-8;Mk;T;;;UTF-8 Plain Text;
+S_TEXT/SSA;SSA;Mk;T;;;Sub Station Alpha;
+S_TEXT/ASS;ASS;Mk;T;;;Advanced Sub Station Alpha;
+S_TEXT/USF;USF;Mk;T;;;Universal Subtitle Format;
+S_IMAGE/BMP;Bitmap;Mk;T;;;Basic image based subtitle format;
+S_VOBSUB;VobSub;Mk;T;;;The same subtitle format used on DVDs;

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/DataBase/CodecID_Audio_Matroska.csv Added

@@ -0,0 +1,36 @@
+A_MPEG/L1;MPEG Audio;MP1;;http://www.iis.fraunhofer.de/amm/index.html
+A_MPEG/L2;MPEG Audio;MP2;;http://www.iis.fraunhofer.de/amm/index.html
+A_MPEG/L3;MPEG Audio;MP3;;http://www.iis.fraunhofer.de/amm/index.html
+A_PCM/INT/BIG;PCM;;;
+A_PCM/INT/LIT;PCM;;;
+A_PCM/FLOAT/IEEE;PCM;;;
+A_AC3;AC-3;;;
+A_AC3/BSID9;AC-3;;;
+A_AC3/BSID10;AC-3;;;
+A_DTS;DTS;;;
+A_EAC3;E-AC-3;;;
+A_FLAC;Flac;;;http://flac.sourceforge.net
+A_OPUS;Opus;;;http://opus-codec.org
+A_TTA1;TTA;;The True Audio Lossless Codec;http://true-audio.com
+A_VORBIS;Vorbis;;;http://www.vorbis.com
+A_WAVPACK4;WavPack;;;http://www.wavpack.com
+A_REAL/14_4;VSELP;;Real Audio 1 (14.4);http://www.real.com
+A_REAL/28_8;G.728;;Real Audio 2 (28.8);http://www.real.com
+A_REAL/COOK;Cooker;;Real Audio Cook Codec (codename: Gecko);http://www.real.com
+A_REAL/SIPR;G.729;;Real & Sipro Voice Codec;http://www.real.com
+A_REAL/RALF;RealAudio Lossless;;Real Audio Lossless Format;http://www.real.com
+A_REAL/ATRC;Atrac;;Real & Sony Atrac3 Codec;http://www.real.com
+A_TRUEHD;TrueHD;;;http://www.dolby.com/consumer/technology/trueHD.html
+A_MLP;MLP;;Meridian Lossless Packing;http://www.meridian-audio.com
+A_AAC;AAC;;;
+A_AAC/MPEG2/MAIN;AAC;;;
+A_AAC/MPEG2/LC;AAC;;;
+A_AAC/MPEG2/LC/SBR;AAC;;;
+A_AAC/MPEG2/SSR;AAC;;;
+A_AAC/MPEG4/MAIN;AAC;;;
+A_AAC/MPEG4/LC;AAC;;;
+A_AAC/MPEG4/LC/SBR;AAC;;;
+A_AAC/MPEG4/LC/SBR/PS;AAC;;;
+A_AAC/MPEG4/SSR;AAC
+A_AAC/MPEG4/LTP;AAC
+A_ALAC;ALAC;;Apple Lossless Audio Codec;http://www.apple.com/quicktime/download/standalone.html

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/DataBase/CodecID_Audio_Mpeg4.csv Added

@@ -0,0 +1,37 @@
+.mp3;MPEG Audio;;;;
+A104;AMR;;;http://www.apple.com/quicktime/download/standalone.html;Wide band
+ac-3;AC-3;;;;
+alac;ALAC;;Apple Lossless Audio Codec;http://www.apple.com/quicktime/download/standalone.html;
+alaw;ADPCM;;;http://www.apple.com/quicktime/download/standalone.html;
+dtsc;DTS;;Digital Theater Systems;http://www.dts.com;
+dtsh;DTS;HRA;Digital Theater Systems High Res;http://www.dts.com;
+dtsl;DTS;MA;Digital Theater Systems Master Audio;http://www.dts.com;
+dtse;DTS;Express;;Digital Theater Systems Low Bitrate;http://www.dts.com;
+dvca;PCM;;;http://www.apple.com/quicktime/download/standalone.html;
+ec-3;E-AC-3;;;;
+enca;(Encrypted);;;;
+fl32;PCM ; ;;http://www.apple.com/quicktime/download/standalone.html;
+fl64;PCM;;;http://www.apple.com/quicktime/download/standalone.html;
+ima4;ADPCM;;;http://www.apple.com/quicktime/download/standalone.html;
+in24;PCM;;;http://www.apple.com/quicktime/download/standalone.html;
+in32;PCM;;;http://www.apple.com/quicktime/download/standalone.html;
+lpcm;PCM;;;;
+MAC3;MACE 3;;;;
+MAC6;MACE 6;;;;
+nmos;Nellymoser;;;http://www.nellymoser.com/;
+NONE;PCM;;;http://www.apple.com/quicktime/download/standalone.html;
+owma;WMA Pro;;Smooth Streaming Media Audio;http://alexzambelli.com/blog/2009/02/10/smooth-streaming-architecture/;
+Qclp;QCELP;;Qualcomm PureVoice;;
+QDM1;QDesign 1;;QDesign Music 1;http://www.apple.com/quicktime/download/standalone.html;
+QDM2;Qdesign 2;;QDesign Music 2;http://www.apple.com/quicktime/download/standalone.html;
+QDMC;Qdesign 2;(Old);QDesign Music 2 (old version, rare);http://www.apple.com/quicktime/download/standalone.html;
+raw ;PCM;;;http://www.apple.com/quicktime/download/standalone.html;
+sac3;AC-3;;Made by Nero;http://www.nerodigital.com;
+samr;AMR;;;http://www.apple.com/quicktime/download/standalone.html;Narrow band
+sawb;AMR;;;http://www.apple.com/quicktime/download/standalone.html;Wide band
+sevc;EVRC;;;http://www.apple.com/quicktime/download/standalone.html;
+sowt;PCM;;;http://www.apple.com/quicktime/download/standalone.html;
+twos;PCM;;;http://www.apple.com/quicktime/download/standalone.html;
+ulaw;ADPCM;;;http://www.apple.com/quicktime/download/standalone.html;
+vdva;PCM;;;http://www.apple.com/quicktime/download/standalone.html;
+WMA2;WMA;;Windows Media Audio;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;;Version 2

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/DataBase/CodecID_Audio_Real.csv Added

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/DataBase/CodecID_Audio_Riff.csv Added

@@ -0,0 +1,241 @@
+0;;;;;
+1;PCM;;;http://www.microsoft.com/windows/;
+2;ADPCM;;;http://www.microsoft.com/windows/;
+3;PCM;IEEE ;;http://www.microsoft.com/windows/;Float
+4;VSELP;Compaq;;;
+5;CVSD;IBM;;;
+6;ADPCM;CCITT;;http://www.microsoft.com/windows/;A-Law
+7;ADPCM;CCITT;;http://www.microsoft.com/windows/;U-Law
+8;DTS;;Digital Theater Systems;;
+9;DRM;Microsoft;;;
+A;WMA;;Windows Media Audio;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;Voice
+C;MPEG Audio;;;;MPEG-2 5.1
+10;ADPCM;OKI;;;
+11;ADPCM;Intel;;;
+12;ADPCM;Mediaspace;;;
+13;ADPCM;Sierra;;;
+14;ADPCM;Antex;G.723;
+15;STD;DSP solutions;;
+16;FIX;DSP solutions;;
+17;ADPCM;Dialogic-OKI;;http://www.microsoft.com/windows/
+18;ADPCM;;;
+19;CU;HP;;
+1A;Dynamic Voice;HP;;
+20;ADPCM;Yamaha;;
+21;SONARC;Speech Compression;;
+22;Truespeech;DSP Group;;http://www.microsoft.com/windows/
+23;SC1;Echo Speech;;
+24;AudioFile 36;Virtual Music ;;
+25;APTX;;Audio Processing Technology X;
+26;AudioFile 10;Virtual Music;;
+27;Prosody 1612;Aculab plc;;
+28;LRC;Merging Technologies;;
+30;AC-2;Dolby Laboratories;;
+31;GSM 6.10;Microsoft;;http://www.microsoft.com/windows/
+32;Microsoft Audio;;;
+33;ADPCM;Antex;;
+34;VQLPC;Control Resources;;
+35;REAL;DSP Solutions;;
+36;ADPCM;DSP Solutions;;
+37;CR10;;Control Resources 10;
+38;ADPCM;Natural MicroSystems VBX;;
+39;ADPCM;Crystal Semiconductor IMA;;
+3A;SC3;Echo Speech;;
+3B;ADPCM;Rockwell;;
+3C;DigiTalk;Rockwell DigiTalk;;
+3D;Xebec;;Xebec Multimedia Solutions;
+40;ADPCM;Antex Electronics;G.721;
+41;CELP;Antex Electronics;G.728;
+42;G.723.1;Microsoft;;http://www.microsoft.com/windows/;;
+42;ADPCM;;IBM;;;
+42;G.729;Microsoft;;;;
+45;ADPCM;Microsoft;G.726;http://www.microsoft.com/windows/;;
+50;MPEG Audio;;;http://www.iis.fraunhofer.de/amm/index.html;;Version 1
+51;MPEG Audio;;;http://www.iis.fraunhofer.de/amm/index.html;;Version 2
+52;RT24;InSoft, Inc.;;;;
+53;PAC;InSoft, Inc.;;;;
+55;MPEG Audio;MP3;;http://www.iis.fraunhofer.de/amm/index.html;;
+59;G.723;Lucent;G.723;;;
+60;Cirrus;;Cirrus Logic;;;
+61;PCM;ESS Technology;;;;
+62;Voxware;;;;;
+63;Atrac;Canopus;;;;
+64;ADPCM;APICOM;G.726;;;
+65;ADPCM;APICOM;G.722;;;
+66;DSAT;Microsoft;;
+67;DSAT Display;Microsoft;;
+69;BYTE_ALIGNED;Voxware;;http://www.voxware.com/
+70;AC8;Voxware;;http://www.voxware.com/
+71;AC10;Voxware;;http://www.voxware.com/
+72;AC16;Voxware;;http://www.voxware.com/
+73;AC20;Voxware;;http://www.voxware.com/
+74;RT24;Voxware;MetaVoice;http://www.voxware.com/
+75;RT29;Voxware;MetaSound;http://www.voxware.com/
+76;RT29HW;Voxware;;http://www.voxware.com/
+77;VR12;Voxware;;http://www.voxware.com/
+78;VR18;Voxware;;http://www.voxware.com/
+79;TQ40;Voxware;;http://www.voxware.com/
+7A;SC3;Voxware;;
+7B;SC3;Voxware;;
+80;Softsound;;;
+81;TQ60;Voxware;;http://www.voxware.com/
+82;MSRT24;Microsoft;;
+83;G.729a;AT&T;;
+84;MVI_MVI2;Motion Pixels;;
+85;ADPCM;DataFusion Systems;G.726;
+86;GSM 6.10;DataFusion Systems;;
+88;ISI AUDIO;;Iterated Systems AUDIO;
+89;Onlive;;OnLive! Technologies;
+8A;SX20;Multitude;;
+8B;ADPCM;Infocom ITS A/S;;
+8C;G.729;Convedia Corporation;;
+91;SBC24;;Siemens Business Communications Sys 24;
+92;AC-3;Sonic Foundry;;
+93;G.723;MediaSonic;;
+94;Prosody 8KBPS;Aculab plc;;
+97;ADPCM;ZyXEL Communications;;
+98;LPCBB;Philips Speech Processing;;;
+99;Packed;;Studer Professional Audio AG Packed;;
+A0;PHONYTALK;Malden Electronics;;;
+A1;GSM;Racal Recorders;;;
+A2;G.720a;Racal Recorders;;;
+A3;G.723.1;Racal Recorders;;;
+A4;ACELP;Racal Recorders;;;
+B0;AAC;NEC Corporation;;;
+FF;AAC;;;;
+100;ADPCM;;;;
+101;IRAT;BeCubed;;;
+102;ADPCM;IBM;;;A-law
+103;ADPCM;IBM AVC;;;
+111;G.723;Vivo;;;
+112;SIREN;Vivo;;;
+120;CELP;Philips Speech Processing;;;
+121;Grundig;Philips Speech Processing;;;
+123;G.723;Digital Equipment Corporation;;;
+125;ADPCM;;;;
+130;ACELP;Sipro;;http://dividix.host.sk;.net
+131;ACELP;Sipro;;;4800
+132;ACELP;Sipro;;;8V3
+133;G.729;Sipro;;;
+134;G.729a;Sipro;;;
+135;KELVIN;Sipro;;;
+135;AMR;VoiceAge Corporation;;;
+140;ADPCM;Dictaphone Corporation;G.726;;
+140;CELP68;Dictaphone Corporation;;;
+140;CELP54;Dictaphone Corporation;;;
+150;PureVoice;Qualcomm;;;
+151;HalfRate;Qualcomm;;;
+155;TUBGSM;Ring Zero Systems;;;
+160;WMA;;Windows Media Audio;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;;Version 1
+161;WMA;;Windows Media Audio;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;;Version 2
+162;WMA;;Windows Media Audio;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;Pro;
+163;WMA;;Windows Media Audio;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;Lossless;
+170;ADPCM;Unisys Nap;;;;
+171;ADPCM;Unisys Nap;;;U-law;
+172;ADPCM;Unisys Nap;;;A-law;
+173;16K;Unisys Nap;;;;
+174;G.700;SyCom Technologies;;;;
+175;ADPCM;SyCom Technologies;;;;
+176;CELP54;SyCom Technologies;;;;
+177;CELP68;SyCom Technologies;;;;
+178;ADPCM;Knowledge Adventure, Inc.;;;;
+180;AAC;Fraunhofer IIS;;;;
+190;DTS;;Digital Theater Systems;;;
+200;ADPCM;Creative Labs;;;;
+202;Fast Speech 8;Creative Labs;
+203;Fast Speech 10;Creative Labs;
+210;ADPCM;UHER informatic GmbH;
+215;ACM;Ulead;
+216;ACM;Ulead;
+220;QuaterDeck;;
+230;VC;;I-link VC
+240;RAW_SPORT;;Aureal
+241;AC-3;ESST;
+250;HSX;Interactive Products, Inc.;
+251;RPELP;Interactive Products, Inc.;
+260;CS2;Consistent Software;
+270;Atrac3;Sony;
+271;SCY;Sony;
+272;Atrac3;Sony;
+273;SPC;Sony;
+280;Telum;;;
+281;TelumIA;;;
+285;ADPCM;Norcom Voice Systems;;
+300;FM_TOWNS_SND;Fujitsu;;
+350;Dev;Micronas Semiconductors, Inc.;;
+351;CELP833;Micronas Semiconductors, Inc.;;
+400;DIGITAL;Brooktree;;
+401;Music Coder;Intel;;http://www.intel.com/
+402;IAC2;Ligos;;http://www.ligos.com
+450;Qdesign;;QDesign Music;
+500;VP7;;On2
+501;VP6;;On2
+680;VM;;AT&T VME_VMPCM;
+681;TPC;;AT&T TPC;
+700;YMPEG;;YMPEG Alpha;
+8AE;LiteWave;;ClearJump LiteWave;
+AAC;AAC;;;;
+1000;GSM;Ing C. Olivetti & C., S.p.A.;;;
+1001;ADPCM;Ing C. Olivetti & C., S.p.A.;;;
+1002;CELP;Ing C. Olivetti & C., S.p.A.;;;
+1003;SBC;Ing C. Olivetti & C., S.p.A.;;;
+1004;OPR;Ing C. Olivetti & C., S.p.A.;;;
+1100;LH_CODEC;Lernout & Hauspie; Codec;;
+1101;CELP;Lernout & Hauspie;;http://www.microsoft.com/windows/;4.8 kb/s
+1102;SBC;Lernout & Hauspie;;http://www.microsoft.com/windows/;8 kb/s
+1103;SBC;Lernout & Hauspie;;http://www.microsoft.com/windows/;12 kb/s
+1104;SBC;Lernout & Hauspie;;http://www.microsoft.com/windows/;16 kb/s
+1400;Norris;;Norris Communications, Inc.;;
+1401;ISIAudio;;;;
+1500;MUSICOMPRESS;;Soundspace Music Compression;;
+181C;RT24;VoxWare;;;
+181E;AX24000P;Lucent elemedia;;;
+1971;SonicFoundry;;Lossless
+1C03;ADPCM;Lucent;G.723
+1C07;SX8300P;Lucent;
+1C0C;ADPCM;Lucent;G.723
+1F03;DigiTalk;;CUseeMe (ex-Rocwell)
+1FC4;ALF2CD;NCT Soft;
+2000;AC-3;;
+2001;DTS;;Digital Theater Systems
+2002;VSELP;;RealAudio 1/2 14.4
+2003;VSELP;;RealAudio 1/2 28.8
+2004;Cooker;;RealAudio G2/8 Cook (low bitrate)
+2005;DNET;;RealAudio 3/4/5 Music (DNET)
+2006;AAC;;RealAudio 10 AAC (RAAC)
+2007;AAC;;RealAudio 10 AAC+ (RACP)
+2048;Sonic;;
+3313;AviSynth;;makeAVIS (fake AVI sound from AviSynth scripts)
+4143;AAC;;Divio MPEG-4 AAC audio;;;
+4201;Nokia;;;;;
+4243;ADPCM;;G.726;;;
+43AC;Speex;;;;;
+564C;Vorbis;;;;;
+566F;Vorbis;;;http://www.vorbis.com;;
+5756;WavPack;;;http://www.wavpack.com/;;
+674F;Vorbis;;;http://www.vorbis.com;;Mode 1
+6750;Vorbis;;;http://www.vorbis.com;;Mode 2
+6751;Vorbis;;;http://www.vorbis.com;;Mode 3
+676F;Vorbis;;;http://www.vorbis.com;;Mode 1+
+6770;Vorbis;;;http://www.vorbis.com;;Mode 2+
+6771;Vorbis;;;http://www.vorbis.com;;Mode 3+
+8180;AAC
+7A21;AMR;;GSM-AMR (CBR, no SID);http://www.microsoft.com;;
+7A22;AMR;;GSM-AMR (VBR, including SID);http://www.microsoft.com;;
+A100;G.723.1;;;;;
+A101;AVQSBC;;;
+A102;ODSBC;;;
+A103;G729A;;;
+A104;AMR;;;
+A105;ADPCM;;G.726;
+A106;AAC;;;
+A107;ADPCM;;G.726;
+A109;Speex;;;http://www.speex.org/
+DFAC;FrameServer;;DebugMode SonicFoundry Vegas FrameServer ACM Codec;
+F1AC;FLAC;;Free Lossless Audio Codec;
+FFFE;Extensible;;;
+FFFF;In Development;;;
+58CB7144-23E9-BFAA-A119-FFFA01E4CE62;Atrac3;;;
+AD98D184-AAC3-11D0-A41C-00A0C9223196;VC;;;
+05589F81-C356-11CE-BF01-00AA0055595A;WaveFormatEx;;;
+518590A2-A184-11D0-8522-00C04FD9BAF3;DSound;;;

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/DataBase/CodecID_General_Mpeg4.csv Added

@@ -0,0 +1,59 @@
+M4V ;MPEG-4;;;;
+isom;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;Base Media
+iso2;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;Base Media
+mp41;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;Base Media / Version 1
+mp42;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;Base Media / Version 2
+avc1;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;JVT
+3gp1;MPEG-4;;;http://www.3gpp.org/;3GPP Media Release 1
+3gp2;MPEG-4;;;http://www.3gpp.org/;3GPP Media Release 2
+3gp3;MPEG-4;;;http://www.3gpp.org/;3GPP Media Release 3
+3gp4;MPEG-4;;;http://www.3gpp.org/;3GPP Media Release 4
+3gp5;MPEG-4;;;http://www.3gpp.org/;3GPP Media Release 5
+3gp6;MPEG-4;;;http://www.3gpp.org/;3GPP Media Release 6 Basic
+3gp6;MPEG-4;;;http://www.3gpp.org/;3GPP Media Release 6 Progressive Download
+3gp6;MPEG-4;;;http://www.3gpp.org/;3GPP Media Release 6 Streaming Servers
+3gp7;MPEG-4;;;http://www.3gpp.org/;3GPP Media Release 7 Streaming Servers
+3g2a;MPEG-4;;;http://www.3gpp2.org/;3GPP2 Media
+3ge6;MPEG-4;;;http://www.3gpp.org/;3GPP Release 6 MBMS Extended Presentation
+3ge7;MPEG-4;;;http://www.3gpp.org/;3GPP Release 7 MBMS Extended Presentation
+3gg6;MPEG-4;;;http://www.3gpp.org/;3GPP Release 6 General
+3gp8;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;
+3gp9;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;
+CAQV;MPEG-4;;;http://world.casio.com/;Casio
+FACE;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;Facebook
+isml;MPEG-4;IIS Smooth Streaming file format;;http://www.apple.com/quicktime/download/standalone.html;ISML
+JP20;MPEG-4;;;http://gpac.sourceforge.net/;JPEG 2000
+JPM ;MPEG-4;;;http://www.iso.org/;JPEG 2000 Compound Image
+JPX ;MPEG-4;;;http://www.iso.org/;JPEG 2000 w/ extensions
+KDDI;MPEG-4;;;http://www.3gpp2.org/;3GPP2 EZMovie for KDDI 3G Cellphones
+MJ2S;MPEG-4;;;http://www.iso.org/;Motion JPEG 2000 Simple Profile
+MJP2;MPEG-4;;;http://www.iso.org/;Motion JPEG 2000 General Profile
+MQT ;MPEG-4;;;http://www.sony.com/;Sony/Mobile QuickTime
+MSNV;MPEG-4;;;http://www.sony.com/;Sony PSP
+ndas;MPEG-4;;;http://www.nerodigital.com;Nero Digital AAC Audio
+ndsc;MPEG-4;;;http://www.nerodigital.com;Nero Digital Cinema Profile
+ndsh;MPEG-4;;;http://www.nerodigital.com;Nero Digital HDTV Profile
+ndsm;MPEG-4;;;http://www.nerodigital.com;Nero Digital Mobile Profile
+ndsp;MPEG-4;;;http://www.nerodigital.com;Nero Digital Portable Profile
+ndss;MPEG-4;;;http://www.nerodigital.com;Nero Digital Standard Profile
+ndxc;MPEG-4;;;http://www.nerodigital.com;Nero Digital AVC Cinema Profile
+ndxh;MPEG-4;;;http://www.nerodigital.com;Nero Digital AVC HDTV Profile
+ndxm;MPEG-4;;;http://www.nerodigital.com;Nero Digital AVC Mobile Profile
+ndxp;MPEG-4;;;http://www.nerodigital.com;Nero Digital AVC Portable Profile
+ndxs;MPEG-4;;;http://www.nerodigital.com;Nero Digital AVC Standard Profile
+mmp4;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;Mobile version
+mp71;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;ISO 14496-12 MPEG-7 meta data
+mp7b;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;ISO 14496-12 MPEG-7 meta data
+piff;MPEG-4;Protected Interoperable File Format;;http://www.apple.com/quicktime/download/standalone.html;PIFF
+qt  ;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;QuickTime
+SDV ;MPEG-4;;;http://www.sdcard.org/;SD Memory Card Video
+M4A ;MPEG-4;;;http://www.apple.com/itunes/;Apple audio with iTunes info
+M4B ;MPEG-4;;;http://www.apple.com/itunes/;Apple audio with iTunes position
+M4P ;MPEG-4;;;http://www.apple.com/itunes/;AES encrypted audio
+M4VP;MPEG-4;;;http://www.apple.com/iphone/;Apple iPhone
+iphE;MPEG-4;;;http://www.apple.com/iphone/;Apple iPhone (Cellular)
+M4VH;MPEG-4;;;http://www.apple.com/appletv/;Apple TV
+QTCA;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;Quicktime compressed archive
+CAQV;MPEG-4;;;;Casio Digital Camera
+QTI ;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;QuickTime Image
+f4v ;MPEG-4;;;http://www.apple.com/quicktime/download/standalone.html;Adobe Flash

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/DataBase/CodecID_Text_Matroska.csv Changed

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/DataBase/CodecID_Text_Mpeg4.csv Added

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/DataBase/CodecID_Text_Riff.csv Changed

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/DataBase/CodecID_Video_Matroska.csv Added

@@ -0,0 +1,21 @@
+V_UNCOMPRESSED;RGB;;Raw uncompressed video frames;
+V_DIRAC;Dirac;;;http://diracvideo.org/
+V_MPEG4/IS0/SP;MPEG-4 Visual;;There is a zero instead of a O, may be a problem;http://www.divx.com
+V_MPEG4/IS0/ASP;MPEG-4 Visual;;There is a zero instead of a O, may be a problem;http://www.xvid.org/Downloads.15.0.html
+V_MPEG4/IS0/AP;MPEG-4 Visual;;There is a zero instead of a O, may be a problem;http://ffdshow-tryout.sourceforge.net/
+V_MPEG4/IS0/AVC;AVC;;There is a zero instead of a O, may be a problem;http://ffdshow-tryout.sourceforge.net/
+V_MPEG4/ISO/SP;MPEG-4 Visual;;Simple Profile;http://www.divx.com
+V_MPEG4/ISO/ASP;MPEG-4 Visual;;Advanced Simple Profile;http://www.xvid.org/Downloads.15.0.html
+V_MPEG4/ISO/AP;MPEG-4 Visual;;Advanced Profile;http://ffdshow-tryout.sourceforge.net/
+V_MPEG4/ISO/AVC;AVC;;;http://ffdshow-tryout.sourceforge.net/
+V_MPEG4/MS/V2;MPEG-4 Visual;MS MPEG-4 v2;MS MPEG-4 v2;http://ffdshow-tryout.sourceforge.net/
+V_MPEG4/MS/V3;MPEG-4 Visual;MS MPEG-4 v3;MS MPEG-4 v3;http://ffdshow-tryout.sourceforge.net/
+V_MPEG1;MPEG Video;;MPEG 1 or 2 Video;http://ffdshow-tryout.sourceforge.net/
+V_MPEG2;MPEG Video;;MPEG 1 or 2 Video;http://ffdshow-tryout.sourceforge.net/
+V_PRORES;ProRes;;;http://www.apple.com/quicktime/download/standalone.html
+V_REAL/RV10;RealVideo 1;;RealVideo 1.0 aka RealVideo 5;http://www.real.com
+V_REAL/RV20;RealVideo 2;;RealVideo 2.0 aka G2 and RealVideo G2+SVT;http://www.real.com
+V_REAL/RV30;RealVideo 3;;RealVideo 3.0 aka RealVideo 8;http://www.real.com
+V_REAL/RV40;RealVideo 4;;RealVideo 4.0 aka RealVideo 9;http://www.real.com
+V_THEORA;Theora;;;http://www.theora.org
+V_VP8;VP8;;;http://www.webmproject.org/

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/DataBase/CodecID_Video_Mpeg4.csv Added

@@ -0,0 +1,156 @@
+2vuy;YUV;;;;;;YUV;4:2:2
+2Vuy;YUV;;;;;;YUV;4:2:2
+8BPS;RGB;;;;;;RGB;8:8:8
+ac16;YUV;;;;;;YUV;4:2:2
+ac32;YUV;;;;;;YUV;4:2:2
+acBG;YUV;;;;;;YUV;4:2:2
+apch;ProRes;;;http://www.apple.com/quicktime/download/standalone.html;High;;YUV;4:2:2
+apcn;ProRes;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
+apcs;ProRes;;;http://www.apple.com/quicktime/download/standalone.html;LT;;YUV;4:2:2
+apco;ProRes;;;http://www.apple.com/quicktime/download/standalone.html;Proxy;;YUV;4:2:2
+ap4c;ProRes;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:4:4
+ap4h;ProRes;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:4:4
+ai12;AVC;;Advanced Video Coding;http://ffdshow-tryout.sourceforge.net;;;
+ai15;AVC;;Advanced Video Coding;http://ffdshow-tryout.sourceforge.net;;;
+ai1q;AVC;;Advanced Video Coding;http://ffdshow-tryout.sourceforge.net;;;
+ai5q;AVC;;Advanced Video Coding;http://ffdshow-tryout.sourceforge.net;;;
+avc1;AVC;;Advanced Video Coding;http://www.apple.com/quicktime/download/standalone.html;;;;
+avcp;AVC;;Advanced Video Coding Parameters;http://www.apple.com/quicktime/download/standalone.html;;;;
+AVdv;DV;;Avid;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
+AVdn;VC-3;DNxHD;Avid;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
+AVmp;MPEG Video;Avid IMX;;;;Version 2;;;
+avr ;JPEG;;;;;;;
+b16g;Gray;;;;;;Y;16
+b32a;Gray/Alpha;;;;;;YA;16:16
+b48r;RGB;;;;;;RGB;16:16:16
+b64a;RGBA;;;;;;RGBA;16:16:16:16
+base;RGBA;;;;;;RGBA;16:16:16:16
+blit;RGBA;;;;;;RGBA;16:16:16:16
+blnd;Alpha Compositor;;;;;;;
+blur;Blur;;;;;;CMYK;
+CFHD;CineForm;;CineForm High-Definition (HD) wavelet codec;http://www.cineform.com/;;;;
+cmyk;CMYK;;;;;;;
+cvid;Cinepack;;;http://www.apple.com/quicktime/download/standalone.html;;;;
+drac;Dirac;;Dirac Video Coder;http://www.bbc.co.uk/rd/projects/dirac/index.shtml;;;;
+dslv;Cross Fade;;;http://www.apple.com/quicktime/download/standalone.html;;;;
+DV10;Digital Voodoo;;Digital Voodoo 10 bit Uncompressed 4:2:2 codec;http://www.digitalvoodoo.net/;;;;
+dv5n;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
+dv5p;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
+dvc ;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
+dvcp;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
+dvh1;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
+dvh2;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
+dvh3;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
+dvh4;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
+dvh5;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
+dvh6;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
+dvhp;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
+dvhq;DV;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
+DVOO;Digital Voodoo;;Digital Voodoo 8 bit Uncompressed 4:2:2 codec;http://www.digitalvoodoo.net/;;;;
+DVOR;Digital Voodoo;;Digital Voodoo intermediate raw;http://www.digitalvoodoo.net/;;;;
+dvpp;DV;DVCPRO;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;4:2:2
+DVTV;Digital Voodoo;;Digital Voodoo intermediate 2vuy;http://www.digitalvoodoo.net/;;;;
+DVVT;Digital Voodoo;;Digital Voodoo intermediate v210;http://www.digitalvoodoo.net/;;;;
+encv;(Encrypted);;;http://www.apple.com/quicktime/download/standalone.html;;;;
+gif ;M-GIF;;;;;;;
+h261;H.261;;;http://www.apple.com/quicktime/download/standalone.html;;;;
+h263;H.263;;;http://www.apple.com/quicktime/download/standalone.html;;;;
+H263;H.263;;;http://www.apple.com/quicktime/download/standalone.html;;;;
+h264;H.264;;;http://www.apple.com/quicktime/download/standalone.html;;;;
+hcpa;ProRes;;;http://www.apple.com/quicktime/download/standalone.html;High;;YUV;4:2:2
+HD10;Digital Voodoo;;Digital Voodoo 10 bit Uncompressed 4:2:2 HD codec;http://www.digitalvoodoo.net/;;;;
+hdv1;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;
+hdv2;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;
+hdv3;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;
+hdv4;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;
+hdv5;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;
+hdv6;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;
+hdv7;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;
+hdv8;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;
+hdv9;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;
+hdva;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;
+hdvb;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;
+hdvc;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;
+hdvd;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;
+hdve;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;
+hdvf;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;
+icod;Intermediate Codec;Apple;;http://www.apple.com/quicktime/download/standalone.html;;;;
+j420;YUV;;;;;;YUV;4:2:0
+jpeg;JPEG;;;http://www.apple.com/quicktime/download/standalone.html;;;;
+kpcd;Photo CD;;;;;;;
+LMP2;MPEG Video;;;;;;YUV;
+M105;Matrox;;;http://www.matrox.com/;;;;
+MMES;MPEG Video;;;;;;YUV;
+mmes;MPEG Video;;;;;;YUV;
+mjp2;JPEG 2000;;;;;;;
+mjpa;JPEG;;;;;;;
+mjpb;JPEG;;;;;;;
+mp4v;MPEG-4 Visual;;;;;;;
+mpeg;MPEG Video;;;;;;;
+mx3n;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;
+mx3p;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;
+mx4n;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;
+mx4p;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;
+mx5n;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;
+mx5p;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV;
+myuv;YUV;;;;;;YUV;4:2:0
+ncpa;ProRes;;;http://www.apple.com/quicktime/download/standalone.html;Normal;;YUV;4:2:2
+ovc1;VC-1;;Smooth Streaming Media Video;http://alexzambelli.com/blog/2009/02/10/smooth-streaming-architecture/;;;;
+png ;PNG;;;;;;;
+PIM1;MPEG Video;;;;;;YUV;
+PIM2;MPEG Video;;;;;;YUV;
+PNTG;MacPaint;;Apple MacPaint image format;http://www.apple.com/quicktime/download/standalone.html;;;;
+rle ;RLE;;;http://www.apple.com/quicktime/download/standalone.html;;;;
+rpza;Road Pizza;;;http://www.apple.com/quicktime/download/standalone.html;;;;
+s263;H.263;;;http://www.apple.com/quicktime/download/standalone.html;;;;
+Shr0;SheerVideo;;Generic SheerVideo codec;http://www.bitjazz.com/;;;;
+Shr1;SheerVideo;;SheerVideo RGB;http://www.bitjazz.com/;;;;
+Shr2;SheerVideo;;SheerVideo Y'CbCr[A] 4:4:4;http://www.bitjazz.com/;;;;
+Shr3;SheerVideo;;SheerVideo Y'CbCr 4:2:2;http://www.bitjazz.com/;;;;
+Shr4;SheerVideo;;SheerVideo Y'CbCr 4:2:2;http://www.bitjazz.com/;;;;
+SV10;Sorenson;;Sorenson Media Video R1;http://www.apple.com/quicktime/download/standalone.html;;;;
+SVQ1;Sorenson 1;;Sorenson Media Video 1 (Apple QuickTime 3);http://www.apple.com/quicktime/download/standalone.html;;;;
+SVQ2;Sorenson 2;;Sorenson Media Video 2 (Apple QuickTime 4);http://www.apple.com/quicktime/download/standalone.html;;;;
+SVQ3;Sorenson 3;;Sorenson Media Video 3 (Apple QuickTime 5);http://www.apple.com/quicktime/download/standalone.html;;;;
+v210;YUV;AJA Video Systems Xena;;;;;YUV;4:2:2
+vc-1;VC-1;;SMPTE VC-1;http://www.smpte.org/;;;YUV;
+WMV3;VC-1;WMV3;Windows Media Video 9;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;;;;
+WRLE;Bitmap;;Windows BMP image format;http://www.apple.com/quicktime/download/standalone.html;;;YUV;
+xd50;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xd51;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xd52;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xd53;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xd54;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xd55;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xd56;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xd57;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xd58;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xd59;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xd5a;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xd5b;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xd5c;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xd5d;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xd5e;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xd5f;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xdhd;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xdh2;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xdv0;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xdv1;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xdv2;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xdv3;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xdv4;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xdv5;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xdv6;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xdv7;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xdv8;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xdv9;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xdva;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xdvb;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xdvc;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xdvd;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xdve;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+xdvf;MPEG Video;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+yuv2;YUV;;;;;;YUV;4:2:2
+yuvs;YUV;;;;;;YUV;4:2:2
+yuvu;YUV;;;;;;YUV;4:2:2
+yuvx;YUV;;;;;;YUV;4:2:2

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/DataBase/CodecID_Video_Real.csv Changed

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/DataBase/CodecID_Video_Riff.csv Added

@@ -0,0 +1,707 @@
+0x00000000;RGB;;Basic Windows bitmap format. 1, 4 and 8 bpp versions are palettised. 16, 24 and 32bpp contain raw RGB samples;http://www.fourcc.org/indexrgb.htm;;;;;
+0x00000001;RLE;;Run length encoded 8bpp RGB image;http://www.fourcc.org/indexrgb.htm;;;;;
+0x00000002;RLE;;Run length encoded 4bpp RGB image;http://www.fourcc.org/indexrgb.htm;;;;;
+0x00000003;RGB;;Raw RGB with arbitrary sample packing within a pixel. Packing and precision of R, G and B components is determined by bit masks for each;http://www.fourcc.org/indexrgb.htm;;;;;
+1978;RGB;A.M.Paredes predictor;;http://www.pegasusimaging.com/cgi-bin/download2.cgi?LVIDB;;;RGB;;
+ BIT;RGB;;;;;;RGB;;
+ JPG;JPEG;;;;;;YUV
+ PNG;PNG;;;;;;RGB;;
+ RAW;RGB;;;http://www.fourcc.org/indexrgb.htm;;;RGB;;
+ raw;RGB;;;http://www.fourcc.org/indexrgb.htm;;;RGB;;
+ RGB;RGB;;;http://www.fourcc.org/indexrgb.htm;;;RGB;;
+ RL4;RLE;;;http://www.fourcc.org/indexrgb.htm;;;RGB;;4
+ RL8;RLE;;;http://www.fourcc.org/indexrgb.htm;;;RGB;;8
+2VUY;YUV;Optibase VideoPump;;;;;YUV;4:2:2;
+3IV0;MPEG-4 Visual;3ivX;3ivX pre-1.0;http://www.3ivx.com/download/;;;YUV;4:2:0;
+3IV1;MPEG-4 Visual;3ivX;3ivX 1.0-3.5;http://www.3ivx.com/download/;;;YUV;4:2:0;
+3IV2;MPEG-4 Visual;3ivX;3ivX 4.0;http://www.3ivx.com/download/;;;YUV;4:2:0
+3IVD;MPEG-4 Visual;3ivX;;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
+3IVX;MPEG-4 Visual;3ivX;;http://www.3ivx.com/download/;;;YUV;4:2:0
+3VID;MPEG-4 Visual;3ivX;;http://www.3ivx.com/download/;;;YUV;4:2:0
+8BPS;RGB;Apple;;http://ffdshow-tryout.sourceforge.net/;;;RGBA;
+AAS4;RLE;Autodesk;;http://mirror01.iptelecom.net.ua/~video/codecs/Autodesk.Animator.v1.11.Codec.exe;;;RGB;
+AASC;RLE;Autodesk;;http://mirror01.iptelecom.net.ua/~video/codecs/Autodesk.Animator.v1.11.Codec.exe;;;RGB;
+ABYR;Kensigton low;Kensington;Low resolution, low frame rate (6fps) for digital cameras;;;;;
+ACTL;ACT-L2;Streambox;;http://www.streambox.com/products/act-L2_codec.htm;;;;
+ADV1;WaveCodec;Loronix;;http://www.loronix.com/products/video_clips/wavecodec.asp;;;;
+ADVJ;JPEG;Avid;;;;;YUV
+AEIK;Indeo 3.2;;Vector Quantization;;;;;
+AEMI;MPEG Video;VideoONE;MPEG-1-I Capture;http://www.array.com;;;YUV;4:2:0
+AFLC;FLC;Autodesk;;http://mirror01.iptelecom.net.ua/~video/codecs/Autodesk.Animator.v1.11.Codec.exe;;;;
+AFLI;FLI;Autodesk;;http://mirror01.iptelecom.net.ua/~video/codecs/Autodesk.Animator.v1.11.Codec.exe;;;;
+AHDV;CineForm;CineForm HD;;http://www.cineform.com/products/ConnectHD.htm;;;;
+AJPG;JPEG;;22fps for digital cameras;;;;YUV
+ALPH;Ziracom;;Ziracom Digital Communications Inc.;;;;;
+AMM2;AMV2 MT;AMV2 MT Video Codec Version 2;;http://amamaman.hp.infoseek.co.jp/english/amv2_e.html;;;;
+AMPG;MPEG-1;VideoONE;;http://www.array.com;;;YUV;4:2:0
+AMR ;AMR;;Speech codec;;;;;
+AMV3;AMV3;AMV3 Video Codec Version 3;;http://amamaman.hp.infoseek.co.jp/english/amv2_e.html;;;YUV;4:2:0
+ANIM;RDX;Intel;;;;;;
+AP41;MPEG-4 Visual;AngelPotion;Hack of MS MPEG-4 v3;http://www.divxity.com/download/ap4v1-702.exe;;;YUV;4:2:0
+AP42;MPEG-4 Visual;AngelPotion;Hack of MS MPEG-4 v3;http://www.divxity.com/download/ap4v1-702.exe;;;YUV;4:2:0
+ASLC;AlparySoft Lossless;;;http://www.free-codecs.com/download/Alparysoft_Lossless_Video_Codec.htm;;;;
+ASV1;Asus 1;;;ftp://ftp.asuscom.de/pub/asuscom/treiber/vga/ASUS_VGA_TOOLS/asv2dec.zip;;;;
+ASV2;Asus 2;;;ftp://ftp.asuscom.de/pub/asuscom/treiber/vga/ASUS_VGA_TOOLS/asv2dec.zip;;;;
+ASVX;Asus X;;;ftp://ftp.asuscom.de/pub/asuscom/treiber/vga/ASUS_VGA_TOOLS/asv2dec.zip;;;;
+ATM4;MPEG-4 Visual;Nero;;http://www.nero.com;;;YUV;4:2:0
+AUR2;YUV;;Auravision Aura 2;;;;YUV;4:2:2
+AURA;YUV;;Auravision Aura 1;;;;YUV;4:1:1
+AUVX;AUVX;;USH GmbH;;;;;
+AV1X;Avid 1:1;;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;;
+AVC1;AVC;;;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0;
+avc1;AVC;;;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0;
+AVD1;DV;Avid;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;YUV;;
+AVDJ;JPEG;Avid;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;YUV
+AVDN;Avid HD;;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;;;
+AVDV;DV;Avid;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;YUV;;
+AVI1;JPEG;MainConcept;;;;;YUV
+AVI2;JPEG;MainConcept;;;;;YUV
+AVID;JPEG;Avid;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;YUV
+AVIS;AviSynth;;Wrapper for AviSynth (Dummy);http://ffdshow-tryout.sourceforge.net/;;;;;
+AVMP;Avid IMX;;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;;;
+AVR ;JPEG;Avid NuVista;Avid ABVB/NuVista JPEG with Alpha-channel;;;;YUV
+AVRn;JPEG;Avid JPEG;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;YUV
+AVRN;JPEG;Avid JPEG;;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;YUV;
+AVUI;Avid;;Avid Meridien Uncompressed with Alpha-channel;http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;;;
+AVUP;Avid;;Avid 10bit Packed (Quick Time);http://mirror01.iptelecom.net.ua/~video/codecs/Avid.VfW.codec.v2.0d2.exe;;;;;
+AYUV;YUV;YUV;;;;;YUVA;4:4:4;8
+AZPR;QuickTime;;;http://www.apple.com/quicktime/download/standalone.html;;;;
+AZRP;QuickTime;;;http://www.apple.com/quicktime/download/standalone.html;;;;
+BGR ;RGB;RGB;;;;;RGB;
+BHIV;BeHere iVideo;;;;;;;
+BINK;Bink;;;;;;;
+BIT ;RGB;RGB;;;;;RGB;
+BITM;H.261;Microsoft;;;;;YUV;
+BLOX;MPEG Video;Blox;;http://www.ii.uj.edu.pl/~jezabek/blox/blox-0.1.0b.zip;;;YUV;4:2:0
+BLZ0;MPEG-4 Visual;DivX;DivX for Blizzard Decoder Filter;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
+BT20;MediaStream;;Conexant ProSummer MediaStream;;;;;
+BTCV;Composite;;Conexant Composite Video;;;;;
+BTVC;Composite;;Conexant Composite Video;;;;;
+BW00;Wavelet;BergWave;;;;;;
+BW10;MPEG-1;Broadway;Data Translation Broadway MPEG Capture/Compression;;;;YUV;
+BXBG;RGB;Boxx;;;;;RGB;
+BXRG;RGB;Boxx;;;;;RGB;
+BXY2;YUV;Boxx;10-bit;;;;YUV;
+BXYV;YUV;Boxx;;;;;YUV;
+CC12;YUV;Intel;;;;;YUV;
+CDV5;DV;Canopus;Canopus SD50/DVHD;http://www.cineform.com/products/ConnectHD.htm;;;YUV;
+CDVC;DV;Canopus;Canopus DV (DV);http://www.cineform.com/products/ConnectHD.htm;;;YUV;
+CDVH;DV;Canopus;Canopus SD50/DVHD;http://www.cineform.com/products/ConnectHD.htm;;;YUV;
+CFCC;JPEG;DPS Perception;Dummy format - only AVI header;;;;YUV
+CFHD;CineForm;;CineForm 10-bit Visually Perfect HD (Wavelet);;;;;
+CGDI;Camcorder;;Camcorder Video (MS Office 97);;;;;
+CHAM;Champagne;;Winnov Caviara Champagne;;;;;
+CJPG;JPEG;Creative;Creative Video Blaster Webcam Go JPEG;;;;YUV
+CLJR;YUV;Cirrus Logic;Less than 8 bits per Y, U and V sample.;http://www.fourcc.org/indexyuv.htm;;;YUV;4:1:1
+CLLC;Canopus;;Canopus LossLess;;;;;
+CLPL;YUV;;Format similar to YV12 but including a level of indirection.;;;;YUV;
+CM10;MediaShow;;CyberLink Corporation;http://www.cyberlink.com;;;;
+CMYK;CMYK;;Common Data Format in Printing;;;;;
+COL0;MPEG-4 Visual;;Hacked MS MPEG-4 v3;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
+COL1;MPEG-4 Visual;;Hacked MS MPEG-4 v3;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
+CPLA;YUV;Weitek;;;;;YUV;4:2:0
+CRAM;MS Video;;Microsoft Video 1;;;;;
+CSCD;CamStudio;;RenderSoft CamStudio lossless (LZO & GZIP compression);;;;;
+CT10;TalkingShow;;CyberLink Corporation;http://www.cyberlink.com;;;;
+CTRX;Citrix;;Citrix Scalable Video;;;;;
+CUVC;Canopus HQ;;Canopus HQ;;;;;
+CVID;Cinepack;;;http://www.cinepak.com/text.html;;;;
+cvid;Cinepack;;;http://www.cinepak.com/text.html;;;;
+CWLT;WLT;;Microsoft Color WLT DIB;;;;;
+CYUV;YUV;Creative Labs;;http://www.fourcc.org/indexyuv.htm;;;YUV;4:2:2
+cyuv;YUV;;;http://www.fourcc.org/indexyuv.htm;;;YUV;4:2:2
+CYUY;YUV;ATI;;http://www.fourcc.org/indexyuv.htm;;;YUV;4:2:2
+D261;H.261;DEC;;;;;;
+D263;H.263;DEC;;;;;;
+DAVC;AVC;Dicas;;;;;YUV;4:2:0
+DC25;DV;MainConcept;;;;;YUV;
+DCAP;DV;Pinnacle;;;;;YUV;
+DCL1;Data Connextion;;Conferencing;;;;;
+DCT0;WniWni;;;;;;;
+DFSC;VFW;;DebugMode FrameServer VFW;;;;;
+DIB ;RGB;;;;;;RGB;
+DIV1;MPEG-4 Visual;FFMpeg;Hacked MS MPEG-4 V1;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
+DIV2;MPEG-4 Visual;MS MPEG-4 1/2;;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
+DIV3;MPEG-4 Visual;DivX 3 Low;;http://www.divx.com;;;YUV;4:2:0
+DIV4;MPEG-4 Visual;DivX 3 Fast;;http://www.divx.com;;;YUV;4:2:0
+DIV5;MPEG-4 Visual;DivX 5;;http://www.divx.com;;;YUV;4:2:0
+DIV6;MPEG-4 Visual;MS MPEG-4 v3;;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
+DIVX;MPEG-4 Visual;DivX 4;Project Mayo;http://mediaarea.net/DIVX;;;YUV;4:2:0
+divx;MPEG-4 Visual;DivX;Mainly used by Google;http://www.divx.com;;;YUV;4:2:0
+DJPG;JPEG;Broadway 101;Data Translation, Inc.;;;;YUV
+DM4V;MPEG-4 Visual;Dicas;;;;;YUV;4:2:0
+DMB1;JPEG;Rainbow;Matrox Rainbow Runner hardware compression;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.MJPG.v2.10.27.codec.exe;;;YUV
+DMB2;JPEG;Paradigm;;;;;YUV
+DMK2;V36 PDA;;ViewSonic V36 PDA Video;;;;;
+DP02;MPEG-4 Visual;DynaPel;;;;;YUV;4:2:0
+DP16;YUV;Matsushita;With DPCM 6-bit compression;;;;YUV;4:1:1
+DP18;YUV;Matsushita;With DPCM 8-bit compression;;;;YUV;4:1:1
+DP26;YUV;Matsushita;With DPCM 6-bit compression;;;;YUV;4:2:2
+DP28;YUV;Matsushita;With DPCM 8-bit compression;;;;YUV;4:2:2
+DP96;YUV;Matsushita;With DPCM 6-bit compression;;;;YUV;
+DP98;YUV;Matsushita;With DPCM 8-bit compression;;;;YUV;
+DP9L;YUV;Matsushita;With DPCM 6-bit compression;;;;YUV;
+DPS0;JPEG;DPS Reality;Dummy format - only AVI header;;;;YUV
+DPSC;JPEG;DPS PAR;Dummy format - only AVI header;;;;YUV
+DRWX;DV;Pinnacle;;;;;YUV;
+DSVD;DV;Microsoft;;;;;YUV;
+DTMT;Media-100;;;;;;
+DTNT;Media-100;;;;;;
+DUCK;TrueMotion S;Duck Corporation;;;;;
+DV10;RGB;BlueFish;BlueFish444 (lossless RGBA, YUV 10-bit);;;;RGB
+DV25;DV;DVCPro;;;;;YUV
+dv25;DV;DVCPro;;;;;YUV
+DV50;DV;DVCPro5;;;;;YUV
+dv50;DV;DVCPro5;;;;;YUV
+DVAN;DV;Pinnacle DV300;;;;;YUV
+DVC ;DV;Apple;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+DVCP;DV;Apple;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+DVCS;DV;MainConcept;;;;;YUV
+DVE2;DV;Insoft DVE-2;InSoft DVE-2 Videoconferencing;;;;YUV
+DVH1;DV;Pinnacle;;;;;YUV
+dvhd;DV;HD;;;;;YUV
+DVIS;DV;DualMoon;;;;;YUV
+DVL ;DV;Radius;;;;;YUV
+DVLP;DV;Radius;;;;;YUV
+DVMA;DV;Darim;;;;;YUV;
+DVNM;DVNM;;Matsushita Electric Industrial Co., Ltd.;;;;;
+DVOR;RGB;BlueFish;BlueFish444 (lossless RGBA, YUV 10-bit);;;;RGB;
+DVPN;DV;Apple;;;;;YUV;
+DVPP;DV;Apple;;;;;YUV;
+DVR ;MPEG Video;ASF;;;;;YUV;4:2:0
+DVR1;Targa2000;;;;;;;
+DVRS;DV;DualMoon;;;;;YUV;
+dvsd;DV;Sony;;;;;YUV;
+dvsl;DV;Sony;;;;;YUV;
+DVSL;DV;;;;;;YUV;
+DVX1;DVX 1 SP;;Lucent DVX1000SP Video Decoder;;;;;
+DVX2;DVX 2 S;;Lucent DVX2000S Video Decoder;;;;;
+DVX3;DVX 3 S;;Lucent DVX3000S Video Decoder;;;;;
+DX50;MPEG-4 Visual;DivX 5;;http://mediaarea.net/DX50;;;YUV;4:2:0
+DXGM;EA GameVideo;;;;;;;
+DXT1;DirectX TC;;DirectX Compressed Texture (1bit alpha channel)
+DXT2;DirectX TC;;DirectX Compressed Texture
+DXT3;DirectX TC;;DirectX Compressed Texture (4bit alpha channel)
+DXT4;DirectX TC;;DirectX Compressed Texture
+DXT5;DirectX TC;;DirectX Compressed Texture (3bit alpha channel with interpolation)
+DXTC;DirectX TC;;DirectX Texture Compression
+DXTn;DirectX TC;;Microsoft Compressed Texture
+DXTN;DirectX TC;;Microsoft DirectX Compressed Texture (DXTn)
+EKQ0;Elsa KQ;;Elsa graphics card quick
+ELK0;Elsa LK;;Elsa graphics card
+EM2V;Elymonyx MPEG-2;;Etymonix MPEG-2 I-frame
+EQK0;Elsa;;Elsa graphics card quick
+ESCP;Escape;;Eidos Escape
+ETV1;eTreppid 1;;eTreppid Video 1
+ETV2;eTreppid 2;;eTreppid Video 2
+ETVC;eTreppid C;;eTreppid Video C
+FFDS;FFDS;;;http://ffdshow-tryout.sourceforge.net/;;;;
+FFV1;FFV1;;;http://ffdshow-tryout.sourceforge.net/;;;;
+FFV2;FFV2;;;http://ffdshow-tryout.sourceforge.net/;;;;
+FFVH;FFVH;;;http://ffdshow-tryout.sourceforge.net/;;;;
+FLIC;FLI/FLC;Autodesk;;;;;;
+FLJP;DField JPEG;;D-Vision Field Encoded JPEG with LSI (or Targa emulation);;;;;
+FLV1;Sorenson Spark;;;http://ffdshow-tryout.sourceforge.net/;;;;
+FLV4;VP6;On2;;http://ftp.pub.cri74.org/pub/win9x/video/codecs/VP6/vp6_vfw_codec.exe;Heightened Sharpness;;;
+FMJP;JPEG;D-Vision;;;;;YUV
+FMP4;MPEG-4 Visual;;;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
+FPS1;Fraps;;;http://www.fraps.com/;;;;
+FRLE;JPEG;SoftLab-Nsk;SoftLab-NSK Y16 + Alpha RLE;;;;YUV
+FRWA;JPEG;SoftLab-Nsk;SoftLab-NSK Vision Forward JPEG with Alpha-channel;;;;YUV
+FRWD;JPEG;SoftLab-Nsk;SoftLab-NSK Vision Forward JPEG;;;;YUV
+FRWT;JPEG;SoftLab-Nsk;SoftLab-NSK Vision Forward JPEG with Alpha-channel;;;;YUV
+FRWU;JPEG;SoftLab-Nsk;SoftLab-NSK Vision Forward Uncompressed;;;;YUV
+FVF1;Itered Fractal;;;;;;;
+FVFW;FVFW;;;http://ffdshow-tryout.sourceforge.net/;;;;
+FXT1;3DFX;;;;;;;
+G2M2;GoToMeeting2;;Citrix Systems, Inc.;http://www.gotomeeting.com/;;;;
+G2M3;GoToMeeting3;;Citrix Systems, Inc.;http://www.gotomeeting.com/;;;;
+GEPJ;JPEG;White Pine;;;;;YUV
+GJPG;Grand Tech GT891x;;;;;;;
+GLCC;GigaLink;;;;;;;
+GLZW;LZW;Gabest;;http://sourceforge.net/project/showfiles.php?group_id=82303&package_id=84358;;;;
+GMP4;GeoVision Advanced MPEG-4;;;http://www.geovision.com.tw/;;;;
+GM40;GeoVision Advanced MPEG-4;;;http://www.geovision.com.tw/;;;;
+GPEG;JPEG;Gabest;;http://sourceforge.net/project/showfiles.php?group_id=82303&package_id=84358;;;YUV
+GPJM;JPEG;Pinnacle;;;;;YUV
+GREY;YUV;;Simple grayscale video;http://www.fourcc.org/indexyuv.htm;;;YUV;
+GWLT;MS GWLT;;Microsoft Greyscale WLT DIB;;;;;
+GXVE;ViVD V2;SoftMedia;;;;;;
+H260;H.260;;;;;;;
+H261;H.261;;;;;;;
+H262;MPEG Video;;;;;;YUV;4:2:0
+H263;H.263;;;;;;;
+h263;H.263;;;http://www.apple.com/quicktime/download/standalone.html;;;;
+H264;AVC;;;;;;YUV;4:2:0
+h264;AVC;;;;;;YUV;4:2:0
+H265;H.265;;;;;;;
+H266;H.266;;;;;;;
+H267;H.267;;;;;;;
+H268;H.268;;;;;;;
+H269;H.263;;;;;;;
+HD10;RGB;BlueFish;BlueFish444 (lossless RGBA, YUV 10-bit);;;;RGB;
+HDX4;Jomigo HDX4;;;;;;;
+HFYU;Huffman;;;;;;;
+HMCR;Rendition;;Rendition Motion Compensation Format;;;;;
+HMRR;Rendition;;Rendition Motion Compensation Format;;;;;
+i263;H.263;;;;;;;
+I420;YUV;;8 bit Y plane followed by 8 bit 2x2 subsampled U and V planes.;;;;;
+IAN ;Indeo 4;;;;;;;
+ICLB;CellB;;InSoft CellB Videoconferencing;;;;;
+IDM0;Wavelets 2;;IDM Motion Wavelets 2.0;;;;;
+IF09;H.261;Microsoft;;;;;;
+IFO9;YUV;Intel;;;;;YUV;
+IGOR;PowerDVD;;;;;;;
+IJPG;JPEG;Intergraph;;;;;YUV
+ILVC;Layered Video;Intel;;;;;;
+ILVR;H.263+;;;;;;;
+IMAC;MotionComp;;Intel hardware motion compensation.;;;;;
+IMC1;YUV;;As YV12, except the U and V planes each have the same stride as the Y plane;;;;YUV;
+IMC2;YUV;;Similar to IMC1, except that the U and V lines are interleaved at half stride boundaries;;;;YUV;
+IMC3;YUV;;As IMC1, except that U and V are swapped;;;;YUV;
+IMC4;YUV;;As IMC2, except that U and V are swapped;;;;YUV;
+IMG ;YUV;;;;;;YUV;
+IMJG;Accom JPEG;;Accom SphereOUS JPEG with Alpha-channel;;;;;
+IPDV;I-O DV;;I-O Data Device Giga AVI DV;;;;
+IPJ2;JPEG 2000;;Image Power JPEG 2000;;;;
+IR21;Indeo 2.1;;;;;;
+IRAW;YUV;;;http://www.fourcc.org/indexyuv.htm;;;YUV
+ISME;ISME;;Intel;;;;
+IUYV;YUV;;Lead 16bpp. Interlaced version of UYVY (line order 0, 2, 4,....,1, 3, 5....);;;;YUV
+IV30;Indeo 3;;Intel Indeo Video 3;;;;
+IV31;Indeo 3;;Intel Indeo Video 3.1;;;;
+IV32;Indeo 3;;Intel Indeo Video 3.2;;;;
+IV33;Indeo 3;;Intel Indeo Video 3.3;;;;
+IV34;Indeo 3;;Intel Indeo Video 3.4;;;;
+IV35;Indeo 3;;Intel Indeo Video 3.5;;;;
+IV36;Indeo 3;;Intel Indeo Video 3.6;;;;
+IV37;Indeo 3;;Intel Indeo Video 3.7;;;;
+IV38;Indeo 3;;Intel Indeo Video 3.8;;;;
+IV39;Indeo 3;;Intel Indeo Video 3.9;;;;
+IV40;Indeo 4;;Intel Indeo Video 4.0;;;;
+IV41;Indeo 4;;Intel Indeo Video 4.1;;;;
+IV42;Indeo 4;;Intel Indeo Video 4.2;;;;
+IV43;Indeo 4;;Intel Indeo Video 4.3;;;;
+IV44;Indeo 4;;Intel Indeo Video 4.4;;;;
+IV45;Indeo 4;;Intel Indeo Video 4.5;;;;
+IV46;Indeo 4;;Intel Indeo Video 4.6;;;;
+IV47;Indeo 4;;Intel Indeo Video 4.7;;;;
+IV48;Indeo 4;;Intel Indeo Video 4.8;;;;
+IV49;Indeo 4;;Intel Indeo Video 4.9;;;;
+IV50;Indeo 4;;Intel Indeo Video 5.0 Wavelet;http://www.fourcc.org/indexyuv.htm;;;
+IY41;YUV;;Lead 16bpp. Interlaced version of Y41P (line order 0, 2, 4,....,1, 3, 5....);http://www.fourcc.org/indexyuv.htm;;;YUV
+IYU1;YUV;;IEEE1394 12bpp. 12 bit format used in mode 2 of the IEEE 1394 Digital Camera 1.04 spec;http://www.fourcc.org/indexyuv.htm;;;YUV
+IYU2;YUV;;IEEE1394 24bpp. 24 bit format used in mode 2 of the IEEE 1394 Digital Camera 1.04 spec;;;;YUV
+IYUV;YUV;;Intel Indeo iYUV 4:2:0;;;;YUV
+JBYR;Kensington;;Kensington Video;http://ffdshow-tryout.sourceforge.net/;;;
+JFIF;JPEG;;;;;;YUV
+JPEG;JPEG;;;http://www.apple.com/quicktime/download/standalone.html;;;YUV
+JPG;JPEG;;;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe;;;YUV
+JPGL;JPEG;Pegasus;DIVIO JPEG Light for WebCams (Pegasus Lossless JPEG);;;;YUV
+KMVC;Karl;;Karl Morton's Video (presumably);http://www.apple.com/quicktime/download/standalone.html;;;;
+kpcd;Photo CD;;Kodak Photo CD;;;;;
+L261;H.261;Lead Technologies;;;;;;
+L263;H.263+;Lead Technologies;;;;;;
+LAGS;Lagarith;;;;;;;
+LBYR;Creative WebCam;;;;;;;
+LCMW;Lead CMW;;Lead Technologies Motion CMW;;;;;
+LCW2;Lead MCMW;;LEADTools MCMW 9Motion Wavelet;http://mirror01.iptelecom.net.ua/~video/codecs/LEAD.MCMP-JPEG.v1.016.codec.exe;;;;
+LEAD;Lead Video;;;;;;;
+LGRY;Lead GrayScale;;;;;;;
+LIA1;Liafail;;Liafail, Inc.;;;;;
+LJ2K;JPEG 2000;Lead;;http://mirror01.iptelecom.net.ua/~video/codecs/LEAD.MCMP-JPEG.v1.016.codec.exe;;;;
+LJPG;JPEG;Lead;;http://mirror01.iptelecom.net.ua/~video/codecs/LEAD.MCMP-JPEG.v1.016.codec.exe;;;YUV
+Ljpg;JPEG;Lead;;;;;YUV
+LMP2;MPEG-PS;Lead;;;;;;
+LOCO;LOCO;;Lossless;;;;;
+LSCR;Lead Screen capture;;;;;;;
+LSV0;LSV0;;Infinop Inc.;;;;;
+LSVC;Vmail;;Vianet Lighting Strike Vmail (Streaming);;;;;
+LSVM;Vmail;;Vianet Lighting Strike Vmail (Streaming);;;;;
+LSVW;Infinop;;Infinop Lightning Strike multiple bit rate video codec.;;;;;
+LSVX;Vmail;;Vianet Lightning Strike Video Codec;;;;;
+LZO1;LZO;;LZO compressed (lossless);;;;;
+M101;YUV;Matrox;;;;;YUV;
+M261;H.261;Microsoft;;;;;;
+M263;H.263;Microsoft;;;;;;
+M4CC;MPEG-4 Visual;ESS Divo;;;;;YUV;4:2:0
+M4S2;MPEG-4 Visual;Microsoft;;;;;YUV;4:2:0
+MC12;ATI Motion;;ATI Motion Compensation Format;;;;;
+MC24;JPEG;MainConcept;;;;;YUV
+MCAM;ATI Motion;;ATI Motion Compensation Format;;;;;
+MCZM;RGB;;Theory MicroCosm Lossless 64bit RGB with Alpha-channel;;;;RGB;
+MDVD;MicroDVD;;Alex MicroDVD Video (hacked MS MPEG-4);;;;;
+MDVF;DV;Pinnacle;Pinnacle DV/DV50/DVHD100;;;;YUV;
+MHFY;YUV;;A.M.Paredes mhuffyYUV (LossLess);http://mirror01.iptelecom.net.ua/~video/codecs/Pinnacle.ReelTime.v2.5.software.only.codec.exe;;;YUV;
+MJ2C;JPEG 2000;;Morgan Multimedia JPEG 2000 Compression;http://mirror01.iptelecom.net.ua/~video/codecs/Pinnacle.ReelTime.v2.5.software.only.codec.exe;;;;
+MJPA;JPEG;Pinacle;Pinnacle ReelTime MJPG hardware;http://mediaxw.sourceforge.net;;;YUV
+MJPB;JPEG;Pinacle B;;;;;YUV
+MJPG;JPEG;;;;;;YUV
+mJPG;JPEG;IBM;Including Huffman Tables;;;;YUV
+MJPX;JPEG;Pegasus;Pegasus PICVideo JPEG;;;;YUV
+ML20;Webcam;;Mimic MSN Messenger Webcam;;;;;
+MLCY;MLC;;MLC Lossless Codec;http://www.linek.sk/mlc/;;;;;;Lossless
+MMES;MPEG Video;Matrox;I-frame;;;;YUV;4:2:0
+MMIF;MPEG Video;Matrox;I-frame;;;;YUV;4:2:0
+MNVD;MindVid;;MindBend MindVid LossLess;;;;;
+MP2V;MPEG Video;;Media Excel MPEG-2 Video;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
+MP2v;MPEG Video;;MPEG-2 Video;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
+MP41;MPEG-4 Visual;Microsoft;Microsoft MPEG-4 v1 (pre-standard);http://ffdshow-tryout.sourceforge.net/;;;;
+MP42;MPEG-4 Visual;Microsoft;Microsoft MPEG-4 v2 (pre-standard);http://www.apple.com/quicktime/download/standalone.html;;;;
+MP43;MPEG-4 Visual;Microsoft;Microsoft MPEG-4 v3 (pre-standard);;;;;
+MP4S;MPEG-4 Visual;MS MPEG-4 v3;Microsoft MPEG-4 (Windows Media 7.0);;;;YUV;4:2:0
+MP4V;MPEG-4 Visual;;Apple QuickTime MPEG-4 native;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
+MPEG;MPEG Video;;Chromatic MPEG 1 Video I Frame;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
+mpeg;MPEG Video;;MPEG-1 Video;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
+MPG1;MPEG Video;Ffmpeg;(MPEG-1/2) FFmpeg;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
+mpg1;MPEG Video;Ffmpeg;(MPEG-1/2) FFmpeg;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
+MPG2;MPEG Video;Ffmpeg;(MPEG-1/2) FFmpeg;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
+mpg2;MPEG Video;Ffmpeg;(MPEG-1/2) FFmpeg;http://ffdshow-tryout.sourceforge.net/;;;YUV;4:2:0
+MPG3;MPEG-4 Visual;FFmpeg DivX 3;(MPEG-4) MS MPEG-4 v3;;;;YUV;4:2:0
+MPG4;MPEG-4 Visual;MS MPEG-4 v1;Microsoft MPEG-4 v1;;;;YUV;4:2:0
+MPGI;MPEG Video;Sigma;Sigma Design MPEG-1 I-frame;;;;YUV;4:2:0
+MPNG;PNG;;Motion PNG;;;;;
+MRCA;Mrcodec;;FAST Multimedia;;;;;
+MRLE;RLE;;Microsoft RLE;;;;RGB;
+MSS1;Screen Video;Windows;Windows Screen Video;;;;;
+MSS2;Windows Media;;Windows Media 9;;;;;
+MSUC;MSU;;MSU LossLess;;;;;
+MSUD;MSU;;MSU LossLess;;;;;
+MSV1;Microsoft Video 1;;Microsoft Video 1;;;;;
+MSVC;Microsoft Video 1;;Microsoft Video 1;;;;;
+MSZH;AVImszh;;Lossless (ZIP compression);;;;;
+MTGA;TGA;;Motion TGA images (24, 32 bpp);;;;;
+MTX1;JPEG;Matrox;;;;;YUV
+MTX2;JPEG;Matrox;;;;;YUV
+MTX3;JPEG;Matrox;;;;;YUV
+MTX4;JPEG;Matrox;;;;;YUV
+MTX5;JPEG;Matrox;;;;;YUV
+MTX6;JPEG;Matrox;;;;;YUV
+MTX7;JPEG;Matrox;;;;;YUV
+MTX8;JPEG;Matrox;;;;;YUV;
+MTX9;JPEG;Matrox;;;;;YUV
+MV10;Nokia;;Nokia Mobile Phones;;;;;
+MV11;Nokia;;Nokia Mobile Phones;;;;;
+MV12;MVI;;Motion Pixels (old);;;;;
+MV99;Nokia;;Nokia Mobile Phones;;;;;
+MVC1;Nokia;;Nokia Mobile Phones;;;;;
+MVC2;Nokia;;Nokia Mobile Phones;;;;;
+MVC9;Nokia;;Nokia Mobile Phones;;;;;
+MVI1;MVI;;Motion Pixels MVI;;;;;
+MVI2;MVI;;Motion Pixels MVI;;;;;
+MWV1;Aware Motion Wavelets;;Aware Motion Wavelets;;;;;
+MYUV;RGB;;Media-100 844/X Uncompressed;;;;RGB;
+NAVI;MPEG-4 Visual;;nAVI video (hacked MS MPEG-4);;;;YUV;4:2:0
+NDIG;MPEG-4 Visual;Ahead;Ahead Nero Digital MPEG-4;;;;YUV;4:2:0
+NHVU;Nvidia Texture;;Nvidia Texture Format (GEForce 3);;;;;
+NO16;RGB;;Theory None16 64bit uncompressed Uncompressed;;;;RGB;
+NT00;YUV;LightWave;NewTek LightWave HDTV YUV with Alpha-channel;;;;YUV;
+NTN1;NogaTech Video 1;;Nogatech Video Compression 1;;;;;
+NTN2;NogaTech Video 2;;Nogatech Video Compression 2 (GrabBee hardware coder);;;;;
+NUV1;Nuppel;;NuppelVideo;;;;;
+NV12;YUV;;8-bit Y plane followed by an interleaved U/V plane with 2x2 subsampling;;;;YUV;
+NV21;YUV;;As NV12 with U and V reversed in the interleaved plane;;;;YUV;
+NVDS;Nvidia Texture;;Nvidia Texture Format;;;;;
+NVHS;Nvidia Texture;;Nvidia Texture Format (GeForce 3);;;;;
+NVHU;Nvidia Texture;;Nvidia Texture Format;;;;;
+NVS0;Nvidia Texture;;Nvidia Texture Compression Format;;;;;
+NVS1;Nvidia Texture;;Nvidia Texture Compression Format;;;;;
+NVS2;Nvidia Texture;;Nvidia Texture Compression Format;;;;;
+NVS3;Nvidia Texture;;Nvidia Texture Compression Format
+NVS4;Nvidia Texture;;Nvidia Texture Compression Format
+NVS5;Nvidia Texture;;Nvidia Texture Compression Format
+NVS6;Nvidia Texture;;Nvidia Texture Compression Format
+NVS7;Nvidia Texture;;Nvidia Texture Compression Format
+NVS8;Nvidia Texture;;Nvidia Texture Compression Format
+NVS9;Nvidia Texture;;Nvidia Texture Compression Format
+NVT0;Nvidia Texture;;Nvidia Texture Compression Format
+NVT1;Nvidia Texture;;Nvidia Texture Compression Format
+NVT2;Nvidia Texture;;Nvidia Texture Compression Format
+NVT3;Nvidia Texture;;Nvidia Texture Compression Format
+NVT4;Nvidia Texture;;Nvidia Texture Compression Format
+NVT5;Nvidia Texture;;Nvidia Texture Compression Format
+NVT6;Nvidia Texture;;Nvidia Texture Compression Format
+NVT7;Nvidia Texture;;Nvidia Texture Compression Format
+NVT8;Nvidia Texture;;Nvidia Texture Compression Format
+NVT9;Nvidia Texture;;Nvidia Texture Compression Format;;;;;
+NY12;YUV;Nogatech;;;;;YUV;
+NYUV;YUV;Nogatech;;;;;YUV;
+ONYX;VP7;On2;;http://www.on2.com/vp7.php3;;;;
+PCLE;Studio400;Pinnacle;;;;;;
+PDVC;DV;Panasonic;;;;;YUV;
+PGVV;Radius Video Vision;;;;;;;
+PHMO;Photomotion;IBM;;;;;;
+PIM1;JPEG;Pegasus;Pinnacle DC1000 hardware (MPEG compression);http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe;;;YUV
+PIM2;JPEG;Pegasus;Pegasus Imaging;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe;;;YUV
+PIMJ;JPEG;Pegasus;Pegasus Imaging PICvideo Lossless JPEG;http://mirror01.iptelecom.net.ua/~video/codecs/PICVideo.Lossless.JPEG.codec.v2.10.27.exe;;;YUV
+PIXL;JPEG;Miro;MiroVideo XL (JPEG);;;;YUV
+PNG;PNG;;;;;;;
+PNG1;PNG;;Corecodec.org CorePNG;;;;;
+PVEZ;PowerEZ;;Horizons Technology PowerEZ;;;;;
+PVMM;MPEG-4 Visual;Pegasus;PacketVideo Corporation MPEG-4;;;;YUV;4:2:0
+PVW2;Wavelet;Pegasus;Pegasus Imaging Wavelet 2000;;;;;
+PVWV;Wavelet;Pegasus;Pegasus Imaging Wavelet 2000;;;;;
+PXLT;Pixlet;;Apple Pixlet (Wavelet);;;;;
+Q1.0;QPEG 1.0;;Q-Team QPEG 1.0;http://www.q-team.de;;;;
+Q1.1;QPEG 1.1;;Q-Team QPEG 1.1;http://www.q-team.de;;;;
+QDGX;Apple GX;;Apple QuickDUncompressed GX;;;;;
+QDRW;Palettized Video;;Apple;;;;;
+QPEG;QPEG 1.1;;Q-Team QPEG 1.1;;;;;
+QPEQ;QPEG 1.1;;Q-Team QPEG 1.1;;;;;
+R210;YUV;;BlackMagic YUV (Quick Time);;;;YUV;
+R411;DV;Radius;Radius DV NTSC YUV;;;;YUV;
+R420;DV;Radius;Radius DV PAL YUV;;;;YUV;
+RAV_;MPEG-1;GroupTron;GroupTRON ReferenceAVI (dummy for MPEG compressor);;;;YUV;4:2:0
+RAVI;MPEG-1;GroupTron;GroupTRON ReferenceAVI (dummy for MPEG compressor);;;;YUV;4:2:0
+RAW ;RGB;;Full Frames (Uncompressed);;;;RGB;
+raw ;RGB;;Full Frames (Uncompressed);http://www.apple.com/quicktime/download/standalone.html;;;RGB;
+RGB ;RGB;;;;;;RGB;8:8:8
+RGB1;RGB;;;;;;RGB 3:3:2;3:3:2
+RGB2;RGB;;;;;;RGB 3:3:2;3:3:2
+RGBA;RGB;;;http://www.fourcc.org/indexrgb.htm;;;RGB;
+RGBO;RGB;;Little Endian;;;;RGB 5:5:5;5:5:5
+RGBP;RGB;;Little Endian;;;;RGB 5:6:5;5:6:5
+RGBQ;RGB;;Big Endian;;;;RGB 5:5:5;5:5:5
+RGBR;RGB;;Big Endian;;;;RGB 5:6:5;5:6:5
+RGBT;RGBA;;;http://www.fourcc.org/indexrgb.htm;;;RGBA;
+RIVA;Swizzled texture;;Nvidia;;;;;
+RL4;RLE;;RLE 4bpp RGB;;;;RGB;
+RL8;RLE;;RLE 8bpp RGB;;;;RGB;
+RLE ;RLE;;RLE RGB with arbitrary sample packing within a pixel;http://www.fourcc.org/indexrgb.htm;;;RGB;
+RLE4;RLE;;RLE 4bpp RGB;http://www.fourcc.org/indexrgb.htm;;;RGB;
+RLE8;RLE;;RLE 8bpp RGB;http://www.fourcc.org/indexrgb.htm;;;RGB;
+RLND;Roland;;Roland Corporation;;;;;
+RMP4;MPEG-4 Visual;RealMagic;REALmagic MPEG-4 Video (Sigma Design, built on XviD);;;;YUV;4:2:0
+ROQV;Id RoQ;;Id RoQ File Video Decoder;;;;;
+RT21;Intel Video 2.1;;Intel Real Time Video 2.1;;;;;
+RTV0;NewTek VideoToaster;;NewTek VideoToaster (dummy format - only AVI header);;;;;
+RUD0;Rududu;;Rududu video;;;;;
+RV10;RealVideo 1;;H263, RealVideo 5;http://www.real.com;;;;
+RV13;RealVideo 1;;H263, RealVideo 5;http://www.real.com;;;;
+RV20;RealVideo 2;;H263, RealVideo 6;http://www.real.com;;;;
+RV30;RealVideo 3;;Between H263 and H264, RealVideo 8;http://www.real.com;;;;
+RV40;RealVideo 4;;H264, RealVideo 9;http://www.real.com;;;;
+RVX ;RDX;;Intel RDX;;;;;
+S263;H.263;;;http://ffdshow-tryout.sourceforge.net/;;;;
+S422;YUV;VideoCap C210;VideoCap C210;;;;YUV;
+SAN3;MPEG-4 Visual;;Direct copy of DivX 3.11;;;;YUV;4:2:0
+SANM;Smush v2;;LucasArts;http://www.lucasarts.com/;;;;
+SCCD;SoftCam;;;;;;;
+SDCC;DV;Sun;Sun Digital Camera;;;;YUV;4:1:1
+SEDG;MPEG-4 Visual;Samsung;Samsung MPEG-4;;;;YUV;4:2:0
+SEG4;Cinepak;;;http://www.sega.com/;;;;
+SEGA;Cinepak;;;http://www.sega.com/;;;;
+SFMC;CrystalNet;;CrystalNet Surface Fitting Method;;;;;
+SHR0;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless);;;;;
+SHR1;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless);;;;;
+SHR2;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless);;;;;
+SHR3;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless);;;;;
+SHR4;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless);;;;;
+SHR5;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless);;;;;
+SHR6;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless);;;;;
+SHR7;BitJazz SheerVideo;;BitJazz SheerVideo (realtime lossless);;;;;
+SIF1;SIF1;;;http://mysif.ru/SIF1_dd_Eng.htm;;;;
+SJPG;JPEG;CuSeeMe;CuSeeMe;http://mirror01.iptelecom.net.ua/~video/codecs/CUseeMe.JPEG.CODEC.v1.17.exe;;;YUV
+SL25;DV;SoftLab DVCPro;SoftLab-NSK DVCPRO;;;;YUV;4:1:1
+SL50;DV;SoftLab DVCPro5;SoftLab-NSK ;;;;YUV;4:1:1
+SLDV;DV;SoftLab;SoftLab-NSK Forward DV Draw;;;;YUV;4:1:1
+SLIF;MPEG Video;SoftLab;SoftLab-NSK MPEG-2 I-frames;;;;YUV;4:2:0
+SLMJ;JPEG;SoftLab;SoftLab-NSK Forward JPEG;;;;YUV
+smc ;SMC;;Apple Graphics (SMC);http://www.apple.com/quicktime/download/standalone.html;;;;
+SMSC;Radius;;;;;;;
+SMSD;Radius;;;;;;;
+SMSV;Wavelet Video;;WorldConnect Wavelet Streaming Video;;;;;
+SNOW;Snow;;;http://ffdshow-tryout.sourceforge.net/;;;;
+SP40;YUV;SunPlus;SunPlus YUV;;;;YUV;
+SP44;MegaCam;;SunPlus Aiptek MegaCam;;;;;
+SP53;MegaCam;;SunPlus Aiptek MegaCam;;;;;
+SP54;MegaCam;;SunPlus Aiptek MegaCam;;;;;
+SP55;MegaCam;;SunPlus Aiptek MegaCam;;;;;
+SP56;MegaCam;;SunPlus Aiptek MegaCam;;;;;
+SP57;MegaCam;;SunPlus Aiptek MegaCam;;;;;
+SP58;MegaCam;;SunPlus Aiptek MegaCam;;;;;
+SP61;MegaCam;;SunPlus Aiptek MegaCam;;;;;
+SPIG;Spigot;;Radius Spigot;;;;;
+SPLC;ACM audio;;Splash Studios ACM Audio;;;;;
+SPRK;Spark;;;;;;;
+SQZ2;VXTreme 2;;Microsoft VXTreme Video V2;;;;;
+STVA;ST Imager;;ST Microelectronics CMOS Imager Data (Bayer);;;;;
+STVB;ST Imager;;ST Microelectronics CMOS Imager Data (Nudged Bayer);;;;;
+STVC;ST Imager;;ST Microelectronics CMOS Imager Data (Bunched);;;;;
+STVX;ST Imager;;ST Microelectronics CMOS Imager Data (Extended Data Format);;;;;
+STVY;ST Imager;;ST Microelectronics CMOS Imager Data (Extended Data Format with Correction Data);;;;;
+SV10;Sorenson;;Sorenson Media Video R1;;;;;
+SVQ1;AVC;Sorenson 1;Sorenson Media Video 1 (Apple QuickTime 3);;;;;
+SVQ2;AVC;Sorenson 2;Sorenson Media Video 2 (Apple QuickTime 4);;;;;
+SVQ3;AVC;Sorenson 3;Sorenson Media Video 3 (Apple QuickTime 5);;;;;
+SWC1;JPEG;MainConcept;MainConcept JPEG;;;;YUV
+T420;YUV;Toshiba;Toshiba YUV 4:2:0;;;;YUV;
+TGA ;TGA;Apple;Apple TGA (with Alpha-channel)
+THEO;Theora;;FFVFW Supported
+TIFF;Apple TIFF;;Apple TIFF (with Alpha-channel)
+TIM2;Pinnacle DVI;;Pinnacle RAL DVI
+TLMS;TeraLogic;;TeraLogic Motion Intraframe
+TLST;TeraLogic;;TeraLogic Motion Intraframe
+TM10;Duck;;Duck TrueMotion
+TM20;Duck 2;;Duck TrueMotion 2.0
+TM2A;Duck Archiver 2;;Duck TrueMotion Archiver 2.0
+TM2X;Duck 2;;Duck TrueMotion 2X
+TMIC;TeraLogic;;TeraLogic Motion Intraframe
+TMOT;Horizons TM S;;Horizons Technology TrueMotion Video
+TR20;Duck TM RT2;;Duck TrueMotion RT 2.0
+TRLE;Akula;;Akula Alpha Pro Custom AVI (LossLess)
+TSCC;TechSmith;;TechSmith Screen Capture
+tscc;TechSmith;;TechSmith Screen Capture
+TV10;Tecomac;;Tecomac Low-Bit Rate;;;;;
+TVJP;Pinnacle/Truevision;;TrueVision Field Encoded JPEG (Targa emulation);;;;;
+TVMJ;Pinnacle/Truevision;;Truevision TARGA JPEG Hardware (or Targa emulation);;;;;
+TY0N;Trident;;Trident Decompression Driver;;;;;
+TY2C;Trident;;Trident Decompression Driver;;;;;
+TY2N;Trident;;Trident Decompression Driver;;;;;
+U<Y ;YUV;Discreet;Discreet UC YUV 4:2:2:4 10 bit;;;;YUV;
+U<YA;YUV;Discreet;Discreet UC YUV 4:2:2:4 10 bit (with Alpha-channel);;;;YUV;
+U263;H.263;UB;UB Video H.263/H.263+/H.263++ Decoder;http://eMajix.com;;;;
+UCOD;ClearVideo;;ClearVideo (fractal compression-based);;;;;
+ULRA;RGBA;Ut Video;Ut Video Lossless Codec;http://umezawa.dyndns.info/archive/utvideo;;;RGBA;4:4:4:4
+ULRG;RGB;Ut Video;Ut Video Lossless Codec;http://umezawa.dyndns.info/archive/utvideo;;;RGB;4:4:4
+ULTI;Ultimotion;;IBM Ultimotion;;;;;
+ULY0;YUV;Ut Video;Ut Video Lossless Codec;http://umezawa.dyndns.info/archive/utvideo;;;YUV;4:2:0
+ULY2;YUV;Ut Video;Ut Video Lossless Codec;http://umezawa.dyndns.info/archive/utvideo;;;YUV;4:2:2
+UMP4;MPEG-4 Visual;UB;UB Video MPEG 4;http://www.fourcc.org/indexyuv.htm;;;YUV;4:2:0
+UYNV;YUV;;Nvidia 16bpp. A direct copy of UYVY registered by Nvidia to work around problems in some olds which did not like hardware which offered more than 2 UYVY surfaces.;http://www.fourcc.org/indexyuv.htm;;;YUV;
+UYVP;YUV;;Evans & Sutherland 24bpp. YUV 4:2:2 extended precision 10-bits per component in U0Y0V0Y1 order;;;;YUV;
+UYVU;YUV;SoftLab;SoftLab-NSK Forward YUV;http://www.fourcc.org/indexyuv.htm;;;YUV;
+UYVY;YUV;;Uncompressed 16bpp. YUV 4:2:2 (Y sample at every pixel, U and V sampled at every second pixel horizontally on each line). A macropixel contains 2 pixels in 1 u_int32.;;;;YUV;4:2:2
+V210;YUV;;Optibase VideoPump 10-bit 4:2:2 Component YUV;;;;;
+v210;YUV;AJA Video Systems Xena;;;;;YUV;4:2:2
+V261;VX3000S;;Lucent VX3000S;;;;;
+V422;YUV;Vitec;;;;;YUV;4:2:2
+V655;YUV;Vitec;Vitec Multimedia 16 bit YUV 4:2:2 (6:5:5) format;;;;YUV;
+VBLE;MarcFD VBLE;;MarcFD VBLE Lossless;;;;;
+VCR1;ATI Video 1;;ATI VCR 1.0;;;;;
+VCR2;ATI Video 2;;ATI VCR 2.0 (MPEG YV12);;;;;
+VCR3;ATI Video 3;;ATI VCR 3.0;;;;;
+VCR4;ATI Video 4;;ATI VCR 4.0;;;;;
+VCR5;ATI Video 5;;ATI VCR 5.0;;;;;
+VCR6;ATI Video 6;;ATI VCR 6.0;;;;;
+VCR7;ATI Video 7;;ATI VCR 7.0;;;;;
+VCR8;ATI Video 8;;ATI VCR 8.0;;;;;
+VCR9;ATI Video 9;;ATI VCR 9.0;;;;;
+VCWV;Wavelet;;VideoCon;;;;;
+VDCT;RGB;VideoMaker;Video Maker Pro DIB;;;;RGB;
+VDOM;VDOWave;;VDONet Wave;;;;;
+VDOW;VDOLive;;VDONet Live (H,263);;;;;
+VDST;VirtualDub;;VirtualDub remote frameclient ICM driver;;;;;
+VDTZ;YUV;;VideoTizer / Darim Vision YUV;;;;YUV;4:2:2
+VGPX;VGP;;Alaris VideoGramPixel;;;;;
+VIDM;MPEG-4 Visual;DivX 5 Pro;DivX 5.0 Pro Supported;;;;YUV;4:2:0
+VIDS;Vitec;;Vitec Multimedia YUV 4:2:2;www.yks.ne.jp/~hori/;;;;
+VIFP;VFAPI;;Virtual Frame API (VFAPI dummy format);;;;;
+VIV1;H.263;Vivo;;;;;;
+VIV2;H.263;Vivo;;;;;;
+VIVO;H.263;Vivo;;;;;;
+VIXL;JPEG;Miro XL;Miro Video XL;http://mirror01.iptelecom.net.ua/~video/codecs/miroVIDEO-XL.codec.v2.2.exe;;;YUV
+VJPG;JPEG;;;;;;YUV
+VLV1;Videologic;;;;;;;
+VMNC;Vmware;;;http://www.vmware.com/;;;;
+VP30;VP3;On2;;;;;;
+VP31;VP3;On2;;;;;;
+VP32;VP3;On2;;;;;;
+VP40;VP4;On2;;;;;;
+VP50;VP5;On2;;;;;;
+VP60;VP6;On2;;http://ftp.pub.cri74.org/pub/win9x/video/codecs/VP6/vp6_vfw_codec.exe;Simple;;;
+VP61;VP6;On2;;http://ftp.pub.cri74.org/pub/win9x/video/codecs/VP6/vp6_vfw_codec.exe;Advanced;;;
+VP62;VP6;On2;;http://ftp.pub.cri74.org/pub/win9x/video/codecs/VP6/vp6_vfw_codec.exe;Heightened Sharpness;;;
+VP6A;VP6;On2;;http://ftp.pub.cri74.org/pub/win9x/video/codecs/VP6/vp6_vfw_codec.exe;Alpha;;;
+VP6F;VP6;On2;;http://ftp.pub.cri74.org/pub/win9x/video/codecs/VP6/vp6_vfw_codec.exe;Heightened Sharpness;;;
+VP70;VP7;On2;;;General;;;
+VP71;VP7;On2;;;Error Resilient;;;
+VP72;VP7;On2;;;;;;
+VP80;VP8;;;http://www.webmproject.org;;;YUV;4:2:0
+VQC1;Vector 1;;Vector-quantised 1 (high compression) http://eprints.ecs.soton.ac.uk/archive/00001310/01/VTC97-js.pdf;;;;;
+VQC2;Vector 2;;Vector-quantised 2 (high robustness against channel errors) http://eprints.ecs.soton.ac.uk/archive/00001310/01/VTC97-js.pdf;;;;;
+VQJP;VQ630;;Dual-mode digital camera;;;;;
+VQS4;VQ110;;DV camera;;;;;
+VR21;YUV;BlckMagic;BlackMagic YUV (Quick Time);;;;YUV;
+VSSH;AVC;Vanguard VSS;;;;;YUV;4:2:0
+VSSV;Vanguard Video;Vanguard VSS;;;;;;
+VSSW;AVC;Vanguard VSS;;;;;YUV;4:2:0
+VTLP;GGP;;Alaris VideoGramPixel;;;;;
+VX1K;DVX 1 S;;Lucent VX1000S Video;;;;;
+VX2K;DVX 2 S;;Lucent VX2000S Video;;;;;
+VXSP;DVX 1 SP;;Lucent VX1000SP Video;;;;;
+VYU9;YUV;ATI;;;;;YUV;
+VYUY;YUV;ATI;;;;;YUV;
+WBVC;W9960;;Winbond Electronics W9960;;;;;
+WHAM;Microsoft Video 1;;;;;;;
+WINX;Winnov;;;;;;;
+WJPG;JPEG;Winbond ;Winbond JPEG (AverMedia USB devices);;;;YUV
+WMV1;WMV1;;Windows Media Video 7;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;;;;
+WMV2;WMV2;;Windows Media Video 8;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;;;;
+WMV3;VC-1;WMV3;Windows Media Video 9;http://www.microsoft.com/windows/windowsmedia/format/codecdownload.aspx;;;;
+WMVA;VC-1;WMV;Windows Media Video;http://ffdshow-tryout.sourceforge.net/;;;;
+WMVP;WMV3;;Windows Media Video V9;;;;;
+WNIX;WniWni;;WniWni;;;;;
+WNV1;WinNov;;WinNov Videum Hardware Compression;http://www.winnov.com/;;;;
+WNVA;WinNov;;WinNov Videum Hardware Compression;http://www.winnov.com/;;;;
+WRLE;RGB;Apple;Apple QuickTime BMP;;;;RGB;
+WRPR;AVideoTools;;VideoTools VideoServer Client (wrapper for AviSynth);;;;;
+WV1F;;;;http://ffdshow-tryout.sourceforge.net/;;;;
+WVC1;VC-1;Microsoft;;;;;;
+WVLT;IllusionHope Wavelet 9/7;;IllusionHope Wavelet 9/7;;;;;
+WVP2;;;;http://ffdshow-tryout.sourceforge.net/;;;;
+WZCD;iScan;;CORE Co. Ltd.;;;;;
+WZDC;iSnap;;CORE Co. Ltd.;;;;;
+X263;H.263;Xirlink;;;;;;
+X264;AVC;;XiWave GNU GPL x264 MPEG-4;;;;;
+XJPG;JPEG;Xirlink;;;;;YUV
+XLV0;NetXL Video;;NetXL Inc. XL Video Decoder;;;;;
+XMPG;MPEG Video;Xing;XING MPEG (I frame only);;;;YUV;4:2:0
+XVID;MPEG-4 Visual;XviD;;http://mediaarea.net/XVID;;;YUV;4:2:0
+XVIX;MPEG-4 Visual;XviD;Based on XviD MPEG-4;http://www.xvid.org/Downloads.15.0.html;;;YUV;4:2:0
+XWV0;XiWave Video;;;;;;;
+XWV1;XiWave Video;;;;;;;
+XWV2;XiWave Video;;;;;;;
+XWV3;XiWave Video;;;;;;;
+XWV4;XiWave Video;;;;;;;
+XWV5;XiWave Video;;;;;;;
+XWV6;XiWave Video;;;;;;;
+XWV7;XiWave Video;;;;;;;
+XWV8;XiWave Video;;;;;;;
+XWV9;XiWave Video;;;;;;;
+XXAN;Origin VideoGame;;Used in Wing Commander 3 and 4;;;;;
+XYZP;YUV;;Extended PAL format XYZ palette;;;;YUV;
+Y211;YUV;;Packed YUV format with Y sampled at every second pixel across each line and U and V sampled at every fourth pixel;;;;YUV;
+Y216;YUV;Targa;Pinnacle TARGA CineWave YUV (Quick Time);;;;YUV;
+Y411;YUV;;YUV 4:1:1 Packed;;;;YUV;4:1:1
+Y41B;YUV;;YUV 4:1:1 Planar;;;;YUV;4:1:1
+Y41P;YUV;;Conexant (ex Brooktree) YUV 4:1:1 Raw;http://www.fourcc.org/indexyuv.htm;;;YUV;4:1:1
+Y41T;YUV;;Format as for Y41P, but the lsb of each Y component is used to signal pixel transparency;;;;YUVA;4:1:1
+Y422;YUV;;Direct copy of UYVY as used by ADS Technologies Pyro WebCam firewire camera;;;;YUV;4:2:2
+Y42B;YUV;;YUV 4:2:2 Planar;;;;YUV;4:2:2
+Y42T;YUV;;Format as for UYVY, but the lsb of each Y component is used to signal pixel transparency;;;;YUVA;4:2:2
+Y444;YUV;;IYU2 (iRez Stealth Fire camera);;;;YUV;
+Y8  ;GrayScale;;Simple grayscale video;;;;Y;
+Y800;GrayScale;;Simple grayscale video;;;;Y;
+YC12;YUV;;Intel YUV12;http://www.fourcc.org/indexyuv.htm;;;YUV;
+YCCK;YUV;;;;;;YUV;
+YMPG;MPEG-PS;;YMPEG Alpha (dummy for MPEG-2 compressor);;;;;
+YU12;YUV;;ATI YV12 4:2:0 Planar;;;;YUV;4:2:0
+YU92;YUV;;Intel - YUV;;;;YUV;
+YUNV;YUV;;A direct copy of YUY2 registered by Nvidia to work around problems in some olds which did not like hardware that offered more than 2 YUY2 surfaces;;;;YUV;
+YUV2;YUV;;Apple Component Video (YUV 4:2:2);http://www.apple.com/quicktime/download/standalone.html;;;YUV;;
+YUV8;YUV;;Winnov Caviar YUV8 ;http://www.fourcc.org/indexyuv.htm;;;YUV;;
+YUV9;YUV;;Intel YUV9;;;;YUV;;
+YUVP;YUV;;YUV 4:2:2 extended precision 10-bits per component in Y0U0Y1V0 order;;;;YUV;4:2:2;10
+YUY2;YUV;;YUV 4:2:2 as for UYVY but with different component ordering within the u_int32 macropixel;http://www.fourcc.org/indexyuv.htm;;;YUV;4:2:2;
+YUYP;YUV;;Evans & Sutherland;;;;YUV;;
+YUYV;YUV;;Canopus YUV format;http://www.fourcc.org/indexyuv.htm;;;YUV;;
+YV12;YUV;;ATI YVU12 4:2:0 Planar;http://www.fourcc.org/indexyuv.htm;;;YUV;4:2:0;
+YV16;YUV;;Elecard YUV 4:2:2 Planar;;;;YUV;4:2:2;
+YV92;YUV;;Intel Smart Video Recorder YVU9;;;;YUV;;
+YVU9;YUV;;Brooktree YVU9 Raw (YVU9 Planar);http://www.fourcc.org/indexyuv.htm;;;YUV;;
+YVYU;YUV;;YUV 4:2:2 as for UYVY but with different component ordering within the u_int32 macropixel;;;;YUV;4:2:2;
+ZLIB;AVIzlib;;Lossless (ZIP compression);;;;;;
+ZMBV;Zip;;Zip Motion Blocks Video;;;;;;
+ZPEG;Video Zipper;;Metheus Video Zipper;;;;;;
+ZYGO;ZyGo;;ZyGo Video;;;;;;

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/DataBase/Format.csv Added

@@ -0,0 +1,135 @@
+AIFF;;;M;Riff;Apple/SGI;aiff aifc aif;audio/x-aiff;;
+AMV;;;M;Riff;Chinese hack of AVI;amv;;http://en.wikipedia.org/wiki/AMV_video_format;
+AVI;;;M;Riff;Audio Video Interleave;avi;video/vnd.avi;;
+BDAV;;;M;Bdav;Blu-ray Video;m2ts;;;
+Blu-ray Clip info;;;M;Bdmv;;clpi;;;
+Blu-ray Index;;;M;Bdmv;;bdmv;;;
+Blu-ray Movie object;;;M;Bdmv;;bdmv;;;
+Blu-ray Playlist;;;M;Bdmv;;mpls;;;
+CDDA;;;M;Riff;;cda;;;
+CDXA;;;M;Cdxa;;dat;;;
+DV;;;M;DvdDif;;dv dif;video/DV;;Lossy
+DivX;;;M;Riff;Hack of AVI;divx;video/vnd.avi;http://www.divx.com;
+DPG;;;M;Dpg;Nintendo DS;dpg;;;
+DVD Video;;;M;Dvdv;;ifo;;;
+Flash Video;;;M;Flv;;flv;application/x-shockwave-flash;http://www.macromedia.com/go/getflashplayer;
+GXF;;;M;Gxf;SMPTE 360M;gxf;;;
+HLS;;;M;Hls;;m3u8;;
+Google Video;;;M;Riff;Hack of AVI;gvi;;http://video.google.com/playerdownload.html;
+ISM;Internet Streaming Media;;M;Ism;;ism;;;
+IVF;;;M;Ivf;;ivf;;;
+LXF;;;M;Lxf;;lxf;video/lxf;;
+Matroska;;;M;Mk;;mkv mk3d mka mks;;http://packs.matroska.org/;
+MPEG-PS;;;M;MpegPs;;mpeg mpg m2p vob pss;video/MP2P;;
+MPEG-TS;;;M;MpegTs;;ts m2t m2s m4t m4s ts tp trp;video/MP2T;;
+MPEG-4;;;M;Mpeg4;;mp4 m4v m4a m4b m4p 3gpp 3gp 3gpp2 3g2 k3g jpm jpx mqv ismv isma f4v;video/mp4;;
+MTV;;;M;Other;Chinese hack of MPEG-1 layer 3;mtv;;http://en.wikipedia.org/wiki/Chinese_MP4/MTV_Player;
+MXF;;;M;Mxf;;mxf;application/mxf;;
+NSV;;;M;Nsv;Nullsoft Streaming Video;nsv;;http://winamp.com;
+Ogg;;;M;Ogg;;ogg ogm opus;video/ogg;http://www.free-codecs.com/Ogg_DirectShow_Filters_download.htm;
+QuickTime;;;M;Mpeg4;Original Apple specifications;mov qt;video/quicktime;http://www.apple.com/quicktime/download/standalone.html;
+RealMedia;;;M;Rm;;rm rmvb ra;application/vnd.rn-realmedia;;
+RIFF-MMP;;;M;Riff;RIFF Multimedia Movie;;;;
+ShockWave;;;M;Swf;;swf;application/x-shockwave;http://www.macromedia.com/go/getflashplayer;
+SKM;;;M;Skm;Sky Korean Mobilephone;skm;;http://www.isky.co.kr/html/cs/download.jsp;
+Windows Media;;;M;Wm;;asf wmv wma;video/x-ms-wmv;;
+WebM;;;M;Mkv;;webm;video/webm;http://www.webmproject.org/;
+AVC;;;V;Avc;Advanced Video Codec;avc h264;video/H264;http://developers.videolan.org/x264.html
+AVS Video;;;V;AvsV;Audio Video Standart, Video part;;;http://www.avs.org.cn/;Lossy
+Dirac;;;V;Dirac;;drc;;http://diracvideo.org/;Lossy
+FFV1;;;V;;;;;;Lossless
+FFV2;;;V;;;;;;Lossless
+FLC;;;V;Flic;;fli flc;;http://www.chem.nott.ac.uk/flc.html;Lossy
+FLI;;;V;Flic;;fli flc;;http://www.chem.nott.ac.uk/flc.html;Lossy
+FLIC;;;V;Flic;;fli flc;;http://www.chem.nott.ac.uk/flc.html;Lossy
+H.261;;;V;;;h261;video/H261;;Lossy
+H.263;;;V;;;h263;video/H263;;Lossy
+MPEG Video;;;V;Mpegv;;mpgv mpv mp1v m1v mp2v m2v;video/MPV;;Lossy
+MPEG-4 Visual;;;V;Mpeg4;;m4v mp4v;video/MP4V-ES;;Lossy
+Theora;;;V;;;;;http://www.theora.org/;Lossy
+VC-1;;;V;Vc1;;vc1;video/vc1;;Lossy
+YUV4MPEG2;;;V;Y4m;;y4m;;;Lossless
+VP8;;;V;;;;;http://www.webmproject.org/;Lossy
+YUV;;;V;;;;;;Lossless
+AAC;;;A;;Advanced Audio Codec;aac;;;Lossy
+AC-3;;;A;Ac3;Audio Coding 3;ac3;;;Lossy
+ADIF;;;A;Adif;Audio Data Interchange Format;aac;;;
+ADTS;;;A;Adts;Audio Data Transport Stream;aac;;;
+ALS;;;A;Als;MPEG-4 Audio Lossless Coding;als;;http://www.nue.tu-berlin.de/forschung/projekte/lossless/mp4als.html#downloads;Lossless
+AMR;;;A;Amr;Adaptive Multi-Rate;amr;audio/AMR;http://www.apple.com/quicktime/download/standalone.html;
+Atrac;;;A;;;;audio/ATRAC;;Lossy
+Atrac3;;;A;;;;audio/ATRAC3;;Lossy
+AU;;;A;Au;uLaw/AU Audio File;au;audio/basic;;
+DolbyE;;;A;Aes3;;dde
+DTS;;;A;Dts;Digital Theater Systems;dts;;;Lossy
+DTS-HD;;;A;Dts;Digital Theater Systems;dts;;;Lossy
+E-AC-3;;;A;Ac3;Audio Coding 3;dd+ ec3;audio/eac3;;Lossy
+Extended Module;;;A;ExtendedModule;;xm;;;
+FLAC;;;A;Flac;Free Lossless Audio Codec;flac;;http://flac.sourceforge.net/;
+G.719;;;A;;;;audio/G719;;Lossy
+G.722;;;A;;;;audio/G722;;Lossy
+G.722.1;;;A;;;;audio/G7221;;Lossy
+G.723;;;A;;;;audio/G723;;Lossy
+G.729;;;A;;;;audio/G729;;Lossy
+G.729.1;;;A;;;;audio/G7291;;Lossy
+Impulse Tracker;;;A;ImpulseTracker;;it;;;
+LA;;;A;La;Lossless Audio Codec;la;;http://www.lossless-audio.com/;Lossless
+MIDI;;;A;Riff;RIFF Musical Instrument Digital Interface;midi mid kar;audio/midi;;
+Module;;;A;Module;;mod;;;
+Monkey's Audio;;;A;Ape;;ape mac;;http://www.monkeysaudio.com/;Lossless
+MPEG Audio;;;A;Mpega;;m1a mpa1 mp1 m2a mpa2 mp2 mp3;audio/mpeg;;Lossy
+Musepack SV7;;;A;Mpc;;mpc;;http://www.musepack.net;Lossy
+Musepack SV8;;;A;Mpc;;mp+;;http://www.musepack.net;Lossy
+QCELP;;;A;;;;audio/QCELP;;
+RIFF-MIDI;;;A;Riff;RIFF Musical Instrument Digital Interface;;;;
+RKAU;RK Audio;;A;Rkau;;rka;;http://www.msoftware.co.nz;
+Scream Tracker 3;;;A;S3m;;s3m;;;
+Shorten;;;A;;;shn;;http://etree.org/shnutils/shorten/;Lossless
+SLS;;;A;;MPEG-4 Scalable Lossless Coding;sls;;http://www.chiariglione.org/mpeg/technologies/mp04-sls/index.htm;Lossless
+Speex;;;A;;;;audio/speex;http://www.speex.org/;Lossy
+Opus;;;A;;;;audio/opus;http://opus-codec.org/;Lossy
+TAK;;;A;;;tak;;http://thbeck.de/Tak/Tak.html;Lossless
+TrueHD;;;A;Ac3;;dts;;;Lossless
+TwinVQ;;;A;TwinVQ;Transform domain Weighted INterleave Vector Quantization;vqf;;http://www.twinvq.org/english/index_en.html;
+Vorbis;;;A;;;;audio/vorbis;http://www.vorbis.com/;Lossy
+Wave;;;A;Riff;;wav;audio/vnd.wave;;
+Wave64;;;A;Riff;;w64;;;
+WavPack;;;A;Wvpk;;wv wvc;;http://www.wavpack.com;
+Bitmap;;;I;Bmp;;bmp;image/bmp;;Lossless
+DPX;;;I;Dpx;;dpx cin;;;Lossless
+EXR;;;I;Exr;;exr;;;Lossless
+DIB;;;I;Riff;RIFF Device Independent Bitmap;;;;Lossless
+GIF;;;I;Gif;Graphics Interchange Format;gif;image/gif;;Lossless
+ICO;;;I;Ico;;ico;image/vnd.microsoft.icon;;Lossless
+JNG;;;I;Jng;JPEG Network Graphic;jng;;;Lossy
+JPEG;;;I;Jpeg;;jpeg jpg jpe;image/jpeg;;Lossy
+JPEG 2000;;;I;Jpeg;;jp2;image/jp2;http://www.morgan-multimedia.com/JPEG 2000/;
+LZ77;;;I;;;;;;
+MNG;;;I;Mng;Multiple-Image Network Graphic;mng;;;Lossless
+PCX;;;I;pcx;Personal Computer eXchange;pcx;image/pcx;;Lossless
+PNG;;;I;Png;Portable Network Graphic;png;image/png;;Lossless
+PSD;;;I;Psd;Photoshop File Format;psd;image/psd;http://www.adobe.com/;Lossless
+RIFF Palette;;;I;Riff;RIFF Palette;;;;
+RLE;;;I;;Run-length encoding;rle;;;
+TIFF;;;I;Tiff;;tiff tif;image/tiff;;
+TGA;;;I;Tga;;tga;image/tga;;
+7-Zip;;;C;7z;;7z;;http://7-zip.org;
+ACE;;;C;Ace;;ace;;http://winace.com;
+ELF;;;C;Elf;;so;;;
+ISO 9660;;;C;Iso9660;;iso;;;
+MZ;;;C;Mz;;exe dll;;;
+RAR;;;C;Rar;From Rarlabs;rar;application/x-rar-compressed;http://rarlabs.com;
+ZIP;;;C;Zip;;zip;application/zip;http://winzip.com;
+Adobe encore DVD;;;T;Other;;txt;;http://www.adobe.fr/products/encore/;Lossless
+AQTitle;;;T;Other;;aqt;;http://www.volny.cz/aberka/czech/aqt.html;Lossless
+ASS;;;T;Other;;ssa;;http://ffdshow.sourceforge.net/tikiwiki/tiki-index.php?page=Getting+ffdshow;Lossless
+Captions 32;;;T;Other;;txt;;;Lossless
+Captions Inc;;;T;Other;;txt;;;Lossless
+CPC Captioning;;;T;Other;;txt;;http://www.cpcweb.com/Captioning/cap_software.htm;Lossless
+Cheeta;;;T;Other;;asc;;;Lossless
+SSA;;;T;Other;;ssa;;http://ffdshow.sourceforge.net/tikiwiki/tiki-index.php?page=Getting+ffdshow;Lossless
+SubRip;;;T;Other;;srt;;http://ffdshow.sourceforge.net/tikiwiki/tiki-index.php?page=Getting+ffdshow;Lossless
+Blender;;;O;Other;;blenders;;http://www.blender3d.com;
+AutoCAD;;;O;Other;;;;http://www.autodesk.com;
+N19;;;T;N19;;stl;;;Lossless
+PlayLater Video;;;V;Other;;;;http://www.playon.tv/playlater;

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/DataBase/Iso639_1.csv Changed

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/DataBase/Iso639_2.csv Changed

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/DataBase/Library_DivX.csv Changed

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/DataBase/Library_MainConcept_Avc.csv Changed

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/DataBase/Library_VorbisCom.csv Changed

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/DataBase/Library_XviD.csv Changed

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/Enums_.1.txt Added

@@ -0,0 +1,32 @@
+// Enums - Automaticly generated enums for MediaInfo
+// Copyright (C) 2008-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Automaticly generated methods for MediaInfo
+// Don't modify, this will be deleted at the next automatic update
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#ifndef MediaInfo_File__Analyze_AutomaticH
+#define MediaInfo_File__Analyze_AutomaticH
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/Enums_.2.txt Changed

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/Enums_.5.txt Changed

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/Enums_.8.txt Changed

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/Enums_.9.txt Changed

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/Language Added

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/Language/DefaultLanguage.csv Added

@@ -0,0 +1,979 @@
+  Language_ISO639;en
+  Author_Email;Zen@mediaarea.net
+  Author_Name;Zen
+  Author_OldNames;Initial translator
+  Language_Name;English
+  Config_Text_ColumnSize;40
+  Config_Text_Separator; : 
+  Config_Text_NumberTag; #
+  Config_Text_FloatSeparator;.
+  Config_Text_ThousandsSeparator; 
+ audio stream1; audio stream
+ audio stream2; audio streams
+ audio stream3; audio streams
+ bit1; bit
+ bit2; bits
+ bit3; bits
+ bps; bps
+ Bps; Bps
+ Byte1; Byte
+ Byte2; Bytes
+ Byte3; Bytes
+ channel1; channel
+ channel2; channels
+ channel3; channels
+ chapter1; chapter
+ chapter2; chapters
+ chapter3; chapters
+ chapters stream1; chapters stream
+ chapters stream2; chapters streams
+ chapters stream3; chapters streams
+ day1; day
+ day2; days
+ day3; days
+ dB1; dB
+ dB2; dB
+ dB3; dB
+ file1; file
+ file2; files
+ file3; files
+ frame1; frame
+ frame2; frames
+ frame3; frames
+ fps1; fps
+ fps2; fps
+ fps3; fps
+ GB; GB
+ Gb; Gb
+ Gbps; Gbps
+ GBps; GBps
+ GHz; GHz
+ GiB; GiB
+ GibiByte1; GibiBytes
+ GibiByte2; GibiBytes
+ GibiByte3; GibiBytes
+ GiBps; GiBps
+ GigaBit1; GigaBit
+ GigaBit2; GigaBits
+ GigaBit3; GigaBits
+ GigaByte1; GigaByte
+ GigaByte2; GigaBytes
+ GigaByte3; GigaBytes
+ hour1; hour
+ hour2; hours
+ hour3; hours
+ Hz; Hz
+ image stream1; image stream
+ image stream2; image streams
+ image stream3; image streams
+ KB; KB
+ Kb; Kb
+ KBps; KBps
+ Kbps; Kbps
+ KHz; KHz
+ KiB; KiB
+ KibiBit1; KibiBit
+ KibiBit2; KibiBits
+ KibiBit3; KibiBits
+ KibiByte1; KibiByte
+ KibiByte2; KibiBytes
+ KibiByte3; KibiBytes
+ KiBps; KiBps
+ KiloBit1; KiloBit
+ KiloBit2; KiloBits
+ KiloBit3; KiloBits
+ KiloByte1; KiloByte
+ KiloByte2; KiloBytes
+ KiloByte3; KiloBytes
+ MB; MB
+ Mb; Mb
+ Mbps; Mbps
+ MBps; MebiBytes
+ MebiBit1; MebiBit
+ MebiBit2; MebiBits
+ MebiBit3; MebiBits
+ MebiByte1; MebiByte
+ MebiByte2; MebiBytes
+ MebiByte3; MebiBytes
+ MegaBit1; MegaBit
+ MegaBit2; MegaBits
+ MegaBit3; MegaBits
+ MegaByte1; MegaByte
+ MegaByte2; MegaBytes
+ MegaByte3; MegaBytes
+ MHz; MHz
+ MiB; MiB
+ Mib; Mib
+ MiBps; MiBps
+ millisecond1; millisecond
+ millisecond2; milliseconds
+ millisecond3; milliseconds
+ minute1; minute
+ minute2; minutes
+ minute3; minutes
+ month1; month
+ month2; months
+ month3; months
+ pixel1; pixel
+ pixel2; pixels
+ pixel3; pixels
+ second1; second
+ second2; seconds
+ second3; seconds
+ text stream1; text stream
+ text stream2; text streams
+ text stream3; text streams
+ video frames1; video frame
+ video frames2; video frames
+ video frames3; video frames
+ video stream1; video stream
+ video stream2; video streams
+ video stream3; video streams
+ warppoint0;No warppoints
+ warppoint1; warppoint
+ warppoint2; warppoints
+ warppoint3; warppoints
+ week1; week
+ week2; weeks
+ week3; weeks
+ year1; year
+ year2; years
+ year3; years
+, ;, 
+: ;: 
+About;About
+About_Hint;How to contact me and find last version
+Accompaniment;Accompaniment
+ActiveFormatDescription;Active Format Description
+ActiveFormatDescription_MuxingMode;Active Format Description, Muxing mode
+Actor;Actor
+Actor_Character;Character played
+Added_Date;Added date
+Address;Address
+Advanced;Advanced
+Advanced mode;Advanced mode
+Album;Album
+Album_ReplayGain_Gain;Album replay gain
+Album_ReplayGain_Peak;Album replay gain peak
+Alignment;Alignment
+Alignment_Aligned;Aligned on interleaves
+Alignment_Split;Split accross interleaves
+All;All
+Archival_Location;Archival location
+Arranger;Arranger
+ArtDirector;ArtDirector
+AspectRatio;Aspect ratio
+AssistantDirector;AssistantDirector
+at;at
+At least one file;(You must at least open one file)
+Audio;Audio
+Audio stream(s);Audio streams
+Audio_Codec_List;Audio codecs
+Audio_No;No audio
+Audio1;First audio stream
+Audio2;Second audio stream
+AudioCount;Count of audio streams
+Author;Author
+BarCode;BarCode
+Basic;Basic
+Basic_Note;Note : for more information about this file, you must select a different view (Sheet, Tree...)
+BitDepth;Bit depth
+BitRate;Bit rate
+BitRate_Maximum;Maximum bit rate
+BitRate_Minimum;Minimum bit rate
+BitRate_Mode;Bit rate mode
+BitRate_Mode_CBR;Constant
+BitRate_Mode_VBR;Variable
+BitRate_Nominal;Nominal bit rate
+BitRate_Encoded;Encoded bit rate
+Bits-(Pixel*Frame);Bits/(Pixel*Frame)
+BufferSize;Buffer size
+Cancel;Cancel
+Channel(s);Channel(s)
+ChannelPositions;Channel positions
+Chapter(s);Chapter(s)
+Chapters;Chapters
+Chapters stream(s);Chapters stream(s)
+Chapters_Codec_List;Chapters Codecs
+Chapters_No;No chapters
+ChaptersCount;Count of chapter streams
+CheckNewVersion;Check for new version
+Choose custom;Choose custom
+Choose custom sheet;Choose your desired custom sheet
+Choose custom text;Choose your desired custom text
+Choose export format;Choose your desired export format
+Choose file(s);Choose the files to open
+Choose filename;Choose your desired filename
+Choose language;Choose your desired language
+Choregrapher;Choregrapher
+Chroma;Chroma
+ChromaSubsampling;Chroma subsampling
+Close;Close
+Close all before open;Close all before open
+Codec;Codec
+Codec_Description;Codec description
+Codec_Info;Details for codec
+Codec_Settings;Codec settings
+Codec_Settings_PacketBitStream;Codec settings, Packet bitstream
+Codec_Settings_BVOP;Codec settings, BVOP
+Codec_Settings_QPel;Codec settings, QPel
+Codec_Settings_GMC;Codec settings, GMC
+Codec_Settings_Matrix;Codec settings, Matrix
+Codec_Settings_Floor;Codec settings, Floor
+Codec_Settings_CABAC;Codec settings, CABAC
+Codec_Settings_Firm;Codec settings, Firm
+Codec_Settings_Endianness;Codec settings, Endianness
+Codec_Settings_Sign;Codec settings, Sign
+Codec_Settings_Law;Codec settings, Law
+Codec_Settings_ITU;Codec settings, ITU
+Codec_Profile;Codec profile
+Codec_Url;Weblink for codec
+CodecID;Codec ID
+CodecID_Description;Description of the codec
+Collection;Collection
+Colorimetry;Colorimetry
+ColorSpace;Color space
+colour_primaries;Color primaries
+Comment;Comment
+CommissionedBy;Commissioned by
+Compilation;Compilation
+CompleteName;Complete name
+Composer;Composer
+Compression_Mode;Compression mode
+Compression_Mode_Lossless;Lossless
+Compression_Mode_Lossy;Lossy
+Compression_Ratio;Compression ratio
+Conductor;Conductor
+Container and general information;Container and general information
+ContentType;ContentType
+CoProducer;Coproducer
+Copyright;Copyright
+CostumeDesigner;Costume designer
+Count;Count
+Country;Country
+Cover;Cover
+Cover_Datas;Cover datas
+Cover_Description;Cover description
+Cover_Mime;Cover MIME
+Cover_Type;Cover type
+Cropped;Crop dimensions
+Custom;Custom
+Customize;Customize
+Date;Date
+Debug;Debug
+Decimal point;Decimal point
+Delay;Delay
+Delay_Source;Delay, origin
+Delay_Source_Container;Container
+Delay_Source_Stream;Raw stream
+Delete;Delete
+Description;Description
+Digitized_Date;Digitized date
+Dimensions;Dimensions
+Director;Director
+DirectorOfPhotography;Director of photography
+DisplayAspectRatio;Display aspect ratio
+DisplayAspectRatio_Original;Original display aspect ratio
+DistributedBy;Distributed by
+Donate;Donate
+DotsPerInch;Dots per inch
+Duration;Duration
+Duration_End;End time
+Duration_Start;Start time
+Edit;Edit
+EditedBy;Edited by
+EMail;E-Mail
+Encoded_Application;Writing application
+Encoded_Date;Encoded date
+Encoded_Library;Writing library
+Encoded_Library_Settings;Encoding settings
+Encoded_Original;Original support
+EncodedBy;Encoded by
+EPG_Positions;EPG positions (internal)
+Error_File;Error while reading file
+ExecutiveProducer;Executive producer
+Exit;Exit
+Exit_Hint;Quit the program
+Export;Export
+Export_Hint;Export in a customized format
+Extensions;Extensions usually used
+Family;Family
+Fax;Fax
+File;File
+File size;File size
+File_Append;Append to the existing file (Warning : be careful to have the same parameters)
+File_Created_Date;File creation date
+File_Created_Date_Local;File creation date (local)
+File_Hint;Select a multimedia file to examine
+File_Modified_Date;File last modification date
+File_Modified_Date_Local;File last modification date (local)
+FileExtension;File extension
+FileName;File name
+FileSize;File size
+Folder;Folder
+Folder (R);Folder (R)
+Folder (R)_Hint;Select a folder to examine (with all folders recursively)
+Folder (Recursively);Folder (Recursively)
+Folder_Hint;Select a folder to examine
+FolderName;Folder name
+Format;Format
+Format_Commercial;Commercial name
+Format_Commercial_IfAny;Commercial name
+Format_Description;Format description
+Format_Info;Details for format
+Format_Profile;Format profile
+Format_Settings;Format settings
+Format_Settings_PacketBitStream;Format settings, Packet bitstream
+Format_Settings_BVOP;Format settings, BVOP
+Format_Settings_QPel;Format settings, QPel
+Format_Settings_GMC;Format settings, GMC
+Format_Settings_Matrix;Format settings, Matrix
+Format_Settings_Matrix_Custom;Custom
+Format_Settings_Matrix_Default;Default
+Format_Settings_Floor;Format settings, Floor
+Format_Settings_CABAC;Format settings, CABAC
+Format_Settings_Firm;Format settings, Firm
+Format_Settings_Endianness;Format settings, Endianness
+Format_Settings_RefFrames;Format settings, ReFrames
+Format_Settings_Sign;Format settings, Sign
+Format_Settings_Law;Format settings, Law
+Format_Settings_ITU;Format settings, ITU
+Format_Settings_SBR;Format settings, SBR
+Format_Settings_PS;Format settings, PS
+Format_Settings_Pulldown;Format settings, Pulldown
+Format_Settings_Mode;Mode
+Format_Settings_FrameMode;Frame mode
+Format_Settings_Emphasis;Emphasis
+Format_Settings_ModeExtension;Mode extension
+Format_Settings_GOP;Format settings, GOP
+Format_Version;Format version
+Format_Url;Weblink for format
+FrameCount;Frame count
+FrameRate;Frame rate
+FrameRate_Mode;Frame rate mode
+FrameRate_Mode_CFR;Constant
+FrameRate_Mode_VFR;Variable
+FrameRate_Minimum;Minimum frame rate
+FrameRate_Nominal;Nominal frame rate
+FrameRate_Maximum;Maximum frame rate
+FrameRate_Original;Original frame rate
+General;General
+Genre;Genre
+Genre_000;Blues
+Genre_001;Classic Rock
+Genre_002;Country
+Genre_003;Dance
+Genre_004;Disco
+Genre_005;Funk
+Genre_006;Grunge
+Genre_007;Hip-Hop
+Genre_008;Jazz
+Genre_009;Metal
+Genre_010;New Age
+Genre_011;Oldies
+Genre_012;Other
+Genre_013;Pop
+Genre_014;R&B
+Genre_015;Rap
+Genre_016;Reggae
+Genre_017;Rock
+Genre_018;Techno
+Genre_019;Industrial
+Genre_020;Alternative
+Genre_021;Ska
+Genre_022;Death Metal
+Genre_023;Pranks
+Genre_024;Soundtrack
+Genre_025;Euro-Techno
+Genre_026;Ambient
+Genre_027;Trip-Hop
+Genre_028;Vocal
+Genre_029;Jazz+Funk
+Genre_030;Fusion
+Genre_031;Trance
+Genre_032;Classical
+Genre_033;Instrumental
+Genre_034;Acid
+Genre_035;House
+Genre_036;Game
+Genre_037;Sound Clip
+Genre_038;Gospel
+Genre_039;Noise
+Genre_040;AlternRock
+Genre_041;Bass
+Genre_042;Soul
+Genre_043;Punk
+Genre_044;Space
+Genre_045;Meditative
+Genre_046;Instrumental Pop
+Genre_047;Instrumental Rock
+Genre_048;Ethnic
+Genre_049;Gothic
+Genre_050;Darkwave
+Genre_051;Techno-Industrial
+Genre_052;Electronic
+Genre_053;Pop-Folk
+Genre_054;Eurodance
+Genre_055;Dream
+Genre_056;Southern Rock
+Genre_057;Comedy
+Genre_058;Cult
+Genre_059;Gangsta
+Genre_060;Top 40
+Genre_061;Christian Rap
+Genre_062;Pop/Funk
+Genre_063;Jungle
+Genre_064;Native American
+Genre_065;Cabaret
+Genre_066;New Wave
+Genre_067;Psychadelic
+Genre_068;Rave
+Genre_069;Showtunes
+Genre_070;Trailer
+Genre_071;Lo-Fi
+Genre_072;Tribal
+Genre_073;Acid Punk
+Genre_074;Acid Jazz
+Genre_075;Polka
+Genre_076;Retro
+Genre_077;Musical
+Genre_078;Rock & Roll
+Genre_079;Hard Rock
+Genre_080;Folk
+Genre_081;Folk-Rock
+Genre_082;National Folk
+Genre_083;Swing
+Genre_084;Fast Fusion
+Genre_085;Bebob
+Genre_086;Latin
+Genre_087;Revival
+Genre_088;Celtic
+Genre_089;Bluegrass
+Genre_090;Avantgarde
+Genre_091;Gothic Rock
+Genre_092;Progressive Rock
+Genre_093;Psychedelic Rock
+Genre_094;Symphonic Rock
+Genre_095;Slow Rock
+Genre_096;Big Band
+Genre_097;Chorus
+Genre_098;Easy Listening
+Genre_099;Acoustic
+Genre_100;Humour
+Genre_101;Speech
+Genre_102;Chanson
+Genre_103;Opera
+Genre_104;Chamber Music
+Genre_105;Sonata
+Genre_106;Symphony
+Genre_107;Booty Bass
+Genre_108;Primus
+Genre_109;Porn Groove
+Genre_110;Satire
+Genre_111;Slow Jam
+Genre_112;Club
+Genre_113;Tango
+Genre_114;Samba
+Genre_115;Folklore
+Genre_116;Ballad
+Genre_117;Power Ballad
+Genre_118;Rhythmic Soul
+Genre_119;Freestyle
+Genre_120;Duet
+Genre_121;Punk Rock
+Genre_122;Drum Solo
+Genre_123;A capella
+Genre_124;Euro-House
+Genre_125;Dance Hall
+Genre_126;Goa
+Genre_127;Drum & Bass
+Genre_128;Club-House
+Genre_129;Hardcore
+Genre_130;Terror
+Genre_131;Indie
+Genre_132;Britpop
+Genre_133;Negerpunk
+Genre_134;Polsk Punk
+Genre_135;Beat
+Genre_136;Christian Gangsta Rap
+Genre_137;Heavy Metal
+Genre_138;Black Metal
+Genre_139;Crossover
+Genre_140;Contemporary Christian
+Genre_141;Christian Rock
+Genre_142;Merengue
+Genre_143;Salsa
+Genre_144;Trash Metal
+Genre_145;Anime
+Genre_146;JPop
+Genre_147;Synthpop
+Go to WebSite;Go to website
+Grouping;Grouping
+h;h
+Header file;Create a header file
+Height;Height
+Height_Original;Original height
+Help;Help
+Hint;Hint
+How many audio streams?;How many audio streams?
+How many chapters streams?;How many chapters streams?
+How many text streams?;How many text streams?
+How many video streams?;How many video streams?
+HTML;HTML
+ID;ID
+Image;Image
+Image stream(s);Image streams
+Image_Codec_List;Codecs Image
+ImageCount;Count of image streams
+Info;Info
+Instruments;Instruments
+Interlacement;Interlacement
+Interlaced_Interlaced;Interlaced
+Interlaced_TFF;Top Field First
+Interlaced_BFF;Bottom Field First
+Interlaced_PPF;Progressive
+Interlaced_Progressive;Progressive
+Interleaved;Interleaved
+Interleave_Duration;Interleave, duration
+Interleave_Preload;Interleave, preload duration
+Interleave_VideoFrames;Interleave, duration
+InternetMediaType;Internet media type
+IRCA;IRCA
+ISBN;ISBN
+ISRC;ISRC
+Keywords;Keywords
+Known codecs;Known codecs
+Known formats;Known formats
+Known parameters;Known parameters
+Label;Label
+Language;Language
+Language_More;Language, more info
+Language_aa;Afar
+Language_ab;Abkhazian
+Language_ae;Avestan
+Language_af;Afrikaans
+Language_ak;Akan
+Language_am;Amharic
+Language_an;Aragonese
+Language_ar;Arabic
+Language_as;Assamese
+Language_av;Avaric
+Language_ay;Aymara
+Language_az;Azerbaijani
+Language_ba;Bashkir
+Language_be;Belarusian
+Language_bg;Bulgarian
+Language_bh;Bihari
+Language_bi;Bislama
+Language_bm;Bambara
+Language_bn;Bengali
+Language_bo;Tibetan
+Language_br;Breton
+Language_bs;Bosnian
+Language_ca;Catalan
+Language_ce;Chechen
+Language_ch;Chamorro
+Language_co;Corsican
+Language_cr;Cree
+Language_cs;Czech
+Language_cu;Slave
+Language_cv;Chuvash
+Language_cy;Welsh
+Language_da;Danish
+Language_de;German
+Language_dv;Divehi
+Language_dz;Dzongkha
+Language_ee;Ewe
+Language_el;Greek
+Language_en;English
+Language_en-gb;English (Great Britain)
+Language_en-us;English (United States)
+Language_eo;Esperanto
+Language_es;Spanish
+Language_et;Estonian
+Language_eu;Basque
+Language_fa;Persian
+Language_ff;Fulah
+Language_fi;Finnish
+Language_fj;Fijian
+Language_fo;Faroese
+Language_fr;French
+Language_fy;Frisian
+Language_ga;Irish
+Language_gd;Gaelic
+Language_gl;Galician
+Language_gn;Guarani
+Language_gu;Gujarati
+Language_gv;Manx
+Language_ha;Hausa
+Language_he;Hebrew
+Language_hi;Hindi
+Language_ho;Hiri Motu
+Language_hr;Croatian
+Language_ht;Haitian
+Language_hu;Hungarian
+Language_hy;Armenian
+Language_hz;Herero
+Language_ia;Auxiliary Language Association
+Language_id;Indonesian
+Language_ie;Interlingue
+Language_ig;Igbo
+Language_ii;Sichuan Yi
+Language_ik;Inupiaq
+Language_Info;Language info
+Language_io;Ido
+Language_is;Icelandic
+Language_it;Italian
+Language_iu;Inuktitut
+Language_ja;Japanese
+Language_jv;Javanese
+Language_ka;Georgian
+Language_kg;Kongo
+Language_ki;Kikuyu
+Language_kj;Kuanyama
+Language_kk;Kazakh
+Language_kl;Kalaallisut
+Language_km;Khmer
+Language_kn;Kannada
+Language_ko;Korean
+Language_kr;Kanuri
+Language_ks;Kashmiri
+Language_ku;Kurdish
+Language_kv;Komi
+Language_kw;Cornish
+Language_ky;Kirghiz
+Language_la;Latin
+Language_lb;Luxembourgish
+Language_lg;Ganda
+Language_li;Limburgish
+Language_ln;Lingala
+Language_lo;Lao
+Language_lt;Lithuanian
+Language_lu;Luba-Katanga
+Language_lv;Latvian
+Language_mg;Malagasy
+Language_mh;Marshallese
+Language_mi;Maori
+Language_mk;Macedonian
+Language_ml;Malayalam
+Language_mn;Mongolian
+Language_mo;Moldavian
+Language_mr;Marathi
+Language_ms;Malay
+Language_mt;Maltese
+Language_mul;Multiple languages
+Language_my;Burmese
+Language_na;Nauru
+Language_nb;Norwegian Bokmal
+Language_nd;Ndebele
+Language_ne;Nepali
+Language_ng;Ndonga
+Language_nl;Dutch
+Language_nn;Norwegian Nynorsk
+Language_no;Norwegian
+Language_nr;Ndebele
+Language_nv;Navaho
+Language_ny;Nyanja
+Language_oc;Occitan
+Language_oj;Ojibwa
+Language_om;Oromo
+Language_or;Oriya
+Language_os;Ossetic
+Language_pa;Panjabi
+Language_pi;Pali
+Language_pl;Polish
+Language_ps;Pushto
+Language_pt;Portuguese
+Language_pt-br;Portuguese (Brazil)
+Language_qu;Quechua
+Language_rm;Raeto-Romance
+Language_rn;Rundi
+Language_ro;Romanian
+Language_ru;Russian
+Language_rw;Kinyarwanda
+Language_sa;Sanskrit
+Language_sc;Sardinian
+Language_sd;Sindhi
+Language_se;Northern Sami
+Language_sg;Sango
+Language_si;Sinhala
+Language_sk;Slovak
+Language_sl;Slovenian
+Language_sm;Samoan
+Language_sn;Shona
+Language_so;Somali
+Language_sq;Albanian
+Language_sr;Serbian
+Language_ss;Swati
+Language_st;Sotho
+Language_su;Sundanese
+Language_sv;Swedish
+Language_sw;Swahili
+Language_ta;Tamil
+Language_te;Telugu
+Language_tg;Tajik
+Language_th;Thai
+Language_ti;Tigrinya
+Language_tk;Turkmen
+Language_tl;Tagalog
+Language_tn;Tswana
+Language_to;Tonga
+Language_tr;Turkish
+Language_ts;Tsonga
+Language_tt;Tatar
+Language_tw;Twi
+Language_ty;Tahitian
+Language_ug;Uighur
+Language_uk;Ukrainian
+Language_ur;Urdu
+Language_uz;Uzbek
+Language_ve;Venda
+Language_vi;Vietnamese
+Language_vo;Volapuk
+Language_wa;Walloon
+Language_wo;Wolof
+Language_xh;Xhosa
+Language_yi;Yiddish
+Language_yo;Yoruba
+Language_za;Zhuang
+Language_zh;Chinese
+Language_zh-cn;Chinese (China)
+Language_zh-tw;Chinese (Taiwan)
+Language_zu;Zulu
+LawRating;Law rating
+LCCN;LCCN
+Library;Muxing library
+Lightness;Lightness
+List;List
+Lyrics;Lyrics
+Lyricist;Lyricist
+Mastered_Date;Mastered date
+MasteredBy;Mastered by
+matrix_coefficients;Matrix coefficients
+MediaInfo_About;Supply very detailled information\r\nabout a multimedia file:\r\nMatroska, OGG (including OGM)\r\nMPEG1 (including VCD)\r\nMPEG2 (including DVD and SVCD)\r\nMPEG4 (including Itunes M4A)\r\nQuicktime\r\nRealMedia\r\nWindowsMedia (including WMV, WMA)\r\nMicrosoft RIFF (including AVI, WAV)\r\nSound-only formats (AC3, DTS, AAC, AU, AIFF...)
+Menu;Menu
+Menu stream(s);Menu streams
+Menu_Codec_List;Menu codecs
+Menu_No;No menu
+MenuCount;Count of menu streams
+Menu_Hint;More possibilities
+MenuID;Menu ID
+mn;mn
+Mood;Mood
+More;More
+Movie;Movie name
+ms;ms
+MSDI;MSDI
+MusicBy;Music by
+MuxingMode;Muxing mode
+MuxingMode_MoreInfo;Muxing mode, more info
+MuxingMode_PackedBitstream;Packed bitstream
+Name;Name
+Nationality;Nationality
+NetworkName;Network name
+New;New
+Newest version;Check for new versions (requires Internet connection)
+NewVersion_Menu;A new version is available
+NewVersion_Question_Title;A new version was released!
+NewVersion_Question_Content;A new version (v%Version%) is available, would you like to download it?
+No;No
+Not yet;Not yet
+NumColors;Number of colors
+OK;OK
+One output file per input file;One output file per input file
+Open;Open
+OpenCandy_01;Downloading ________
+OpenCandy_02;__% Complete
+OpenCandy_03;Internet connection interrupted
+OpenCandy_04;________ download complete
+OpenCandy_05;Click to install ________
+OpenCandy_06;Are you sure you wish to cancel the install?\r\nIf you wish to postpone the install until later, select 'No'.\r\nNote: You may select Exit from the menu to defer installation until after the next time you reboot.
+OpenCandy_07;Download of ________ has been paused.\r\nClick on the tray icon to resume downloading.
+OpenCandy_08;A critical error has occurred. Installation of _________ will be aborted.
+OpenCandy_09;Pause download
+OpenCandy_10;Cancel install
+OpenCandy_11;Resume download
+OpenCandy_12;Exit Installer
+OpenCandy_13;___________ - Recommended by ____________
+OpenCandy_14;Downloading _________
+OpenCandy_15;___________, the software recommended to you by ___________, is now downloading at your requestWe will let you know when it is ready to be installed.
+OpenCandy_16;___________ is ready for installation
+OpenCandy_17;___________ is now fully downloaded. Please click on 'Install' to proceed.
+OpenCandy_18;___________ of ___________ downloaded
+OpenCandy_19;Powered by OpenCandy
+OpenCandy_20;Learn more at OpenCandy.com
+OpenCandy_21;Install
+OpenCandy_22;Installation of ___________
+OpenCandy_23;This will cancel the installation of ___________\r\nAre you sure you wish to exit?
+OpenCandy_24;Pause
+OpenCandy_25;Your download has been paused. Click 'Resume' when you are ready to continue.
+OpenCandy_26;Resume
+OpenCandy_27;Install Now
+OpenCandy_28;Pause Download
+OpenCandy_29;Resume Download
+OpenCandy_30;Cancel Install
+OpenCandy_31;Please choose an installation option
+OpenCandy_32;Install ___________
+OpenCandy_33;Don't Install
+OpenCandy_34;Please select an install option
+OpenCandy_35;______ recommends this software
+OpenCandy_36;Your current installation will not be interrupted
+Options;Options
+Options_Hint;Preferences
+Original;Original
+OriginalNetworkName;Original network name
+OriginalSourceForm;Original source form
+OriginalSourceMedium;Original source medium
+Other;Other
+Output;Output
+Output format;Output format
+OverallBitRate;Overall bit rate
+OverallBitRate_Maximum;Maximum Overall bit rate
+OverallBitRate_Minimum;Minimum Overall bit rate
+OverallBitRate_Mode;Overall bit rate mode
+OverallBitRate_Nominal;Nominal Overall bit rate
+Part;Part
+Part_Count;Total count
+Performer;Performer
+Period;Period
+Phone;Phone
+PixelAspectRatio;Pixel aspect ratio
+PixelAspectRatio_Original;Original pixel aspect ratio
+PlayCounter;PlayCounter
+Played_Count;Times played
+Played_First_Date;First played
+Played_Last_Date;Last played
+PlayTime;PlayTime
+Position;Position
+Position_Total;Total
+Preferences;Preferences
+Producer;Producer
+ProductionDesigner;Production designer
+ProductionStudio;Production studio
+Publisher;Publisher
+Purchased_Date;purchased date
+Quote character;Quote character
+RadioStation;Radio station
+Rating;Rating
+Recorded_Date;Recorded date
+Recorded_Location;Recorded location
+Released_Date;Released date
+RemixedBy;Remixed by
+ReplayGain_Gain;Replay gain
+ReplayGain_Peak;Replay gain peak
+Resolution;Resolution
+s;s
+SamplingRate;Sampling rate
+Save;Save
+ScanType;Scan type
+ScanOrder;Scan order
+ScreenplayBy;Screenplay by
+Season;Season
+see below;see below
+Send HeaderFile;Please send me the Header file here : http://sourceforge.net/projects/mediainfo/ (Bug section)
+Separator_Columns;columns separator
+Separator_Lines;lines separator
+ServiceChannel;Service channel number
+ServiceName;Service name
+ServiceProvider;Service provider
+ServiceType;Service type
+Set;Set
+Set_Count;Set count
+Setup;Setup
+Sharpness;Sharpness
+Sheet;Sheet
+Sheet (Complete);Sheet (Complete)
+Shell extension;Explorer extension (in Windows Explorer, right click on a file, there will be a MediaInfo option)
+Shell extension, folder;For folders too
+Shell InfoTip;Explorer Tooltip (in Windows Explorer, move the mouse over the file, info will be displayed)
+Show menu;Show menu
+Show toolbar;Show toolbar
+Sort;Sorted by
+SamplingCount;Samples count
+SoundEngineer;Sound engineer
+Source;Source
+Source_Duration;Source duration
+Source_FrameCount;Source frame count
+Source_SamplingCount;Source sample count
+Source_StreamSize;Source stream size
+Source_StreamSize_Encoded;Source encoded stream size
+Standard;Standard
+Stream;Stream
+Stream_MoreInfo;More information about the stream
+StreamCount;Count of stream of this kind
+StreamID;Stream ID
+StreamKind;Kind of stream
+StreamKindID;Stream identifier
+StreamKindPos;Stream identifier
+StreamSize;Stream size
+StreamSize_Encoded;Encoded stream size
+StreamSize_Proportion;Proportion of this stream
+Subject;Subject
+SubTrack;SubTrack
+Summary;Summary
+Supported formats;Supported formats
+Supported?;Supported?
+Synopsis;Synopsis
+SystemId;Id
+Tagged_Application;Tagging application
+Tagged_Date;Tagged date
+Technician;Technician
+TermsOfUse;Terms of use
+Text;Text
+Text - Custom;Text - Custom
+Text (HTML);Text (HTML)
+Text stream(s);Text streams
+Text streams;Text streams
+Text_Codec_List;Text codecs
+Text_No;No text
+Text1;First text stream
+Text2;Second text stream
+Text3;Third text stream
+TextCount;Count of text streams
+ThanksTo;Thanks to
+Thousands separator;Thousands separator
+Title;Title
+Title_More;Title, more info
+TimeZone;Timezone
+Total;Total
+Track;Track name
+Track_Count;Track count
+transfer_characteristics;Transfer characteristics
+Translator;Translator
+Tree;Tree
+Tree & Text;Tree & Text
+UniqueID;Unique ID
+Unknown;Unknown
+Url;Url
+Video;Video
+Video stream(s);Video stream(s)
+Video_Codec_List;Codecs Video
+Video_Delay;Delay relative to video
+Video_No;No video
+Video0_Delay;Video0 delay
+Video1;First video stream
+VideoCount;Count of video streams
+View;View
+View_Hint;Change the means of viewing information
+Warning : more streams in the files;Warning : there are more streams in the files
+Web;Web
+WebSite_Audio;Go to the web site of this audio codec
+WebSite_Audio_More;Go to the web site (%Url%) to find this audio codec
+WebSite_General;Go to the web site of a player for this file
+WebSite_General_More;Go to the web site of a player for this file
+WebSite_Text;Go to the web site of this text codec
+WebSite_Text_More;Go to the web site (%Url%) to find this text codec
+WebSite_Url;http://mediainfo.sourceforge.net
+WebSite_Video;Go to the web site of this video codec
+WebSite_Video_More;Go to the web site (%Url%) to find this video codec
+Width;Width
+Width_Original;Original width
+WriteMe;Write mail to author
+WriteToTranslator;Write to translator
+Written_Date;Written date
+Written_Location;Written location
+WrittenBy;Written by
+Yes;Yes
+Your system;Your system
+ZZ_Automatic_Percent;100
+ZZ_AutomaticLanguage_Percent;100
\ No newline at end of file

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/MediaInfo Added

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/MediaInfo/Summary.csv Added

@@ -0,0 +1,6 @@
+General;[%Format%][ (%Format_Profile%)][ (%Format_Commercial_IfAny%)]$if(%Format%,$: $)%FileSize/String%[, %Duration/String%]
+Video;[%Language/String%, ][%BitRate/String%$if(%BitRate_Nominal/String%, \$%BitRate_Nominal/String%\$), ][%Width%*][%Height%][ (%DisplayAspectRatio/String%), ][$at$ %FrameRate/String%, ][%Format%][ (%CodecID/Hint%)][ (%Standard%)]$if(%MuxingMode%, \$%MuxingMode%\$)$if(%Format_Version%, \$%Format_Version%\$)$if(%Format_Profile%, \$%Format_Profile%\$)$if(%Format_Settings%, \$%Format_Settings%\$)[ (%Format_Commercial_IfAny%)]
+Audio;[%Language/String%, ][%BitRate/String%$if(%BitRate_Nominal/String%, \$%BitRate_Nominal/String%\$), ][%SamplingRate/String%, ][%BitDepth/String%, ][%Channel(s)/String%, ][%Format%][ (%CodecID/Hint%)]$if(%MuxingMode%, \$%MuxingMode%\$)$if(%Format_Version%, \$%Format_Version%\$)$if(%Format_Profile%, \$%Format_Profile%\$)$if(%Format_Settings%, \$%Format_Settings%\$)[ (%Format_Commercial_IfAny%)]
+Text;[%Language/String%, ][%Format%][ (%Format_Commercial_IfAny%)]$if(%MuxingMode%, \$%MuxingMode%\$)
+Image;[%Language/String%, ][%Width%*][%Height%][ (%DisplayAspectRatio/String%)][, %Format%]
+Chapters;[%Language/String%, ]%Total% chapters[, %Format%][ (%Format_Commercial_IfAny%)]

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/Stream Added

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/Stream/Audio.csv Added

@@ -0,0 +1,217 @@
+Count;;;N NI;;;Number of objects available in this stream;;
+Status;;;N NI;;;bit field (0=IsAccepted, 1=IsFilled, 2=IsUpdated, 3=IsFinished)
+StreamCount;;;N NI;;;Number of streams of this kind available;;
+StreamKind;Audio;;N NI;;;Stream type name;;
+StreamKind/String;;;N NI;;;Stream type name;;
+StreamKindID;;;N NI;;;Number of the stream (base=0);;
+StreamKindPos;;;N NI;;;When multiple streams, number of the stream (base=1);;
+StreamOrder;;;N NI;;;Stream order in the file, whatever is the kind of stream (base=0);;
+Inform;;;N NT;;;Last **Inform** call;;
+ID;;;N YI;;;The ID of this stream in this file;;
+ID/String;;;Y NT;;;The ID of this stream in this file;;
+UniqueID;;;N YI;;;A unique ID for this stream, should be copied with stream copy;;
+UniqueID/String;;;Y NT;;;A unique ID for this stream, should be copied with stream copy
+MenuID;;;N YI;;;The menu ID for this stream in this file;;
+MenuID/String;;;Y NT;;;The menu ID for this stream in this file;;
+Format;;;Y YT;;;Format used;;
+Format/Info;;;Y NT;;;Info about the format;;
+Format/Url;;;N NT;;;Homepage of this format;;
+Format_Commercial;;;N NT;;;Commercial name used by vendor for theses setings or Format field if there is no difference;;
+Format_Commercial_IfAny;;;Y NT;;;Commercial name used by vendor for theses setings if there is one;;
+Format_Version;;;Y NT;;;Version of this format;;
+Format_Profile;;;Y NT;;;Profile of this Format;;
+Format_Compression;;;Y NT;;;Compression method used;;
+Format_Settings;;;N NT;;;Settings needed for decoder used, summary;;
+Format_Settings_SBR;;Yes;N YT;;;;;
+Format_Settings_SBR/String;;;N NT;;;;;
+Format_Settings_PS;;Yes;N YT;;;;;
+Format_Settings_PS/String;;;N NT;;;;;
+Format_Settings_Mode;;;Y YT;;;;;
+Format_Settings_ModeExtension;;;Y YT;;;;;
+Format_Settings_Emphasis;;;Y YT;;;;;
+Format_Settings_Floor;;;Y YT;;;;;
+Format_Settings_Firm;;;Y YT;;;;;
+Format_Settings_Endianness;;;Y YT;;;;;
+Format_Settings_Sign;;;Y YT;;;;;
+Format_Settings_Law;;;Y YT;;;;;
+Format_Settings_ITU;;;Y YT;;;;;
+Format_Settings_Wrapping;;;Y YT;;;Wrapping mode (Frame wrapped or Clip wrapped)
+InternetMediaType;;;N YT;;;Internet Media Type (aka MIME Type, Content-Type);;
+MuxingMode;;;Y NT;;;How this stream is muxed in the container;;
+MuxingMode_MoreInfo;;;Y NT;;;More info (text) about the muxing mode;;
+CodecID;;;Y NT;;;Codec ID (found in some containers);;
+CodecID/String;;;Y NT;;;Codec ID (found in some containers);;
+CodecID/Info;;;Y NT;;;Info about codec ID;;
+CodecID/Hint;;;Y NT;;;Hint/popular name for this codec ID;;
+CodecID/Url;;;N NT;;;Homepage for more details about this codec ID;;
+CodecID_Description;;;Y NT;;;Manual description given by the container;;
+Codec;;;N NT;;;Deprecated, do not use in new projects;;
+Codec/String;;;N NT;;;Deprecated, do not use in new projects;;
+Codec/Family;;;N NT;;;Deprecated, do not use in new projects;;
+Codec/Info;;;N NT;;;Deprecated, do not use in new projects;;
+Codec/Url;;;N NT;;;Deprecated, do not use in new projects;;
+Codec/CC;;;N NT;;;Deprecated, do not use in new projects;;
+Codec_Description;;;N NT;;;Deprecated, do not use in new projects;;
+Codec_Profile;;;N NT;;;Deprecated, do not use in new projects;;
+Codec_Settings;;;N NT;;;Deprecated, do not use in new projects;;
+Codec_Settings_Automatic;;;N NT;;;Deprecated, do not use in new projects;;
+Codec_Settings_Floor;;;N NT;;;Deprecated, do not use in new projects;;
+Codec_Settings_Firm;;;N NT;;;Deprecated, do not use in new projects;;
+Codec_Settings_Endianness;;;N NT;;;Deprecated, do not use in new projects;;
+Codec_Settings_Sign;;;N NT;;;Deprecated, do not use in new projects;;
+Codec_Settings_Law;;;N NT;;;Deprecated, do not use in new projects;;
+Codec_Settings_ITU;;;N NT;;;Deprecated, do not use in new projects;;
+Duration;; ms;N YI;;;Play time of the stream;;
+Duration/String;;;Y NT;;;Play time in format : XXx YYy only, YYy omited if zero;;
+Duration/String1;;;N NT;;;Play time in format : HHh MMmn SSs MMMms, XX omited if zero;;
+Duration/String2;;;N NT;;;Play time in format : XXx YYy only, YYy omited if zero;;
+Duration/String3;;;N NT;;;Play time in format : HH:MM:SS.MMM;;
+Duration_FirstFrame;; ms;N YI;;;Duration of the first frame if it is longer than others, in ms;
+Duration_FirstFrame/String;;;Y NT;;;Duration of the first frame if it is longer than others, in format : XXx YYy only, YYy omited if zero;
+Duration_FirstFrame/String1;;;N NT;;;Duration of the first frame if it is longer than others, in format : HHh MMmn SSs MMMms, XX omited if zero;
+Duration_FirstFrame/String2;;;N NT;;;Duration of the first frame if it is longer than others, in format : XXx YYy only, YYy omited if zero;
+Duration_FirstFrame/String3;;;N NT;;;Duration of the first frame if it is longer than others, in format : HH:MM:SS.MMM;
+Duration_LastFrame;; ms;N YI;;;Duration of the last frame if it is longer than others, in ms;
+Duration_LastFrame/String;;;Y NT;;;Duration of the last frame if it is longer than others, in format : XXx YYy only, YYy omited if zero;
+Duration_LastFrame/String1;;;N NT;;;Duration of the last frame if it is longer than others, in format : HHh MMmn SSs MMMms, XX omited if zero;
+Duration_LastFrame/String2;;;N NT;;;Duration of the last frame if it is longer than others, in format : XXx YYy only, YYy omited if zero;
+Duration_LastFrame/String3;;;N NT;;;Duration of the last frame if it is longer than others, in format : HH:MM:SS.MMM;
+Source_Duration;; ms;N YI;;;Source Play time of the stream;;
+Source_Duration/String;;;Y NT;;;Source Play time in format : XXx YYy only, YYy omited if zero;;
+Source_Duration/String1;;;N NT;;;Source Play time in format : HHh MMmn SSs MMMms, XX omited if zero;;
+Source_Duration/String2;;;N NT;;;Source Play time in format : XXx YYy only, YYy omited if zero;;
+Source_Duration/String3;;;N NT;;;Source Play time in format : HH:MM:SS.MMM;;
+Source_Duration_FirstFrame;; ms;N YI;;;Source Duration of the first frame if it is longer than others, in ms;
+Source_Duration_FirstFrame/String;;;Y NT;;;Source Duration of the first frame if it is longer than others, in format : XXx YYy only, YYy omited if zero;
+Source_Duration_FirstFrame/String1;;;N NT;;;Source Duration of the first frame if it is longer than others, in format : HHh MMmn SSs MMMms, XX omited if zero;
+Source_Duration_FirstFrame/String2;;;N NT;;;Source Duration of the first frame if it is longer than others, in format : XXx YYy only, YYy omited if zero;
+Source_Duration_FirstFrame/String3;;;N NT;;;Source Duration of the first frame if it is longer than others, in format : HH:MM:SS.MMM;
+Source_Duration_LastFrame;; ms;N YI;;;Source Duration of the last frame if it is longer than others, in ms;
+Source_Duration_LastFrame/String;;;Y NT;;;Source Duration of the last frame if it is longer than others, in format : XXx YYy only, YYy omited if zero;
+Source_Duration_LastFrame/String1;;;N NT;;;Source Duration of the last frame if it is longer than others, in format : HHh MMmn SSs MMMms, XX omited if zero;
+Source_Duration_LastFrame/String2;;;N NT;;;Source Duration of the last frame if it is longer than others, in format : XXx YYy only, YYy omited if zero;
+Source_Duration_LastFrame/String3;;;N NT;;;Source Duration of the last frame if it is longer than others, in format : HH:MM:SS.MMM;
+BitRate_Mode;;;N YT;;;Bit rate mode (VBR, CBR);;
+BitRate_Mode/String;;;Y NT;;;Bit rate mode (Constant, Variable);;
+BitRate;; bps;N YF;;;Bit rate in bps;;
+BitRate/String;;;Y NT;;;Bit rate (with measurement);;
+BitRate_Minimum;; bps;N YF;;;Minimum Bit rate in bps;;
+BitRate_Minimum/String;;;Y NT;;;Minimum Bit rate (with measurement);;
+BitRate_Nominal;; bps;N YF;;;Nominal Bit rate in bps;;
+BitRate_Nominal/String;;;Y NT;;;Nominal Bit rate (with measurement);;
+BitRate_Maximum;; bps;N YF;;;Maximum Bit rate in bps;;
+BitRate_Maximum/String;;;Y NT;;;Maximum Bit rate (with measurement);;
+BitRate_Encoded;; bps;N YF;;;Encoded (with forced padding) bit rate in bps, if some container padding is present
+BitRate_Encoded/String;;;Y NT;;;Encoded (with forced padding) bit rate (with measurement), if some container padding is present
+Channel(s);; channel;N YF;;;Number of channels;;
+Channel(s)/String;;;Y NT;;;Number of channels (with measurement);;
+ChannelPositions;;;Y YT;;;Position of channels;;
+ChannelPositions/String2;;;N NT;;;Position of channels (x/y.z format);;
+ChannelLayout;;;N YT;;;Layout of channels (in the stream);;
+SamplingRate;; Hz;N YF;;;Sampling rate;;
+SamplingRate/String;;;Y NT;;;in KHz;;
+SamplingCount;;;N NI;;;Sample count (based on sampling rate);;
+Source_SamplingCount;;;N NI;;;Source Sample count (based on sampling rate);;
+FrameRate;; fps;N YF;;;Frames per second
+FrameRate/String;;;N NT;;;Frames per second (with measurement)
+FrameCount;;;N NI;;;Frame count (a frame contains a count of samples depends of the format);;
+Source_FrameCount;;;N NI;;;Source Frame count (a frame contains a count of samples depends of the format);;
+Resolution;; bit;N NI;;;Deprecated, do not use in new projects;;
+Resolution/String;;;N NT;;;Deprecated, do not use in new projects;;
+BitDepth;; bit;N YI;;;Resolution in bits (8, 16, 20, 24);;
+BitDepth/String;;;Y NT;;;Resolution in bits (8, 16, 20, 24);;
+Compression_Mode;;;N YT;;;Compression mode (Lossy or Lossless)
+Compression_Mode/String;;;Y NT;;;Compression mode (Lossy or Lossless)
+Compression_Ratio;;;Y YF;;;Current stream size divided by uncompressed stream size;;
+Delay;; ms;N NI;;;Delay fixed in the stream (relative) IN MS;
+Delay/String;;;N NT;;;Delay with measurement;
+Delay/String1;;;N NT;;;Delay with measurement;
+Delay/String2;;;N NT;;;Delay with measurement;
+Delay/String3;;;N NT;;;Delay in format : HH:MM:SS.MMM;
+Delay/String4;;;N NT;;;Delay in format : HH:MM:SS:FF (HH:MM:SS;FF for drop frame, if available)
+Delay_Settings;;;N NT;;;Delay settings (in case of timecode for example);
+Delay_Source;;;N NT;;;Delay source (Container or Stream or empty);
+Delay_Source/String;;;N NT;;;Delay source (Container or Stream or empty);
+Delay_Original;; ms;N NI;;;Delay fixed in the raw stream (relative) IN MS;
+Delay_Original/String;;;N NT;;;Delay with measurement;
+Delay_Original/String1;;;N NT;;;Delay with measurement;
+Delay_Original/String2;;;N NT;;;Delay with measurement;
+Delay_Original/String3;;;N NT;;;Delay in format: HH:MM:SS.MMM;;
+Delay_Original/String4;;;N NT;;;Delay in format: HH:MM:SS:FF (HH:MM:SS;FF for drop frame, if available);
+Delay_Original_Settings;;;N NT;;;Delay settings (in case of timecode for example);;
+Delay_Original_Source;;;N NT;;;Delay source (Stream or empty);
+Video_Delay;; ms;N NI;;;Delay fixed in the stream (absolute / video)
+Video_Delay/String;;;Y NT;;;
+Video_Delay/String1;;;N NT;;;
+Video_Delay/String2;;;N NT;;;
+Video_Delay/String3;;;N NT;;;
+Video_Delay/String4;;;N NT;;;
+Video0_Delay;; ms;N NI;;;Deprecated, do not use in new projects
+Video0_Delay/String;;;N NT;;;Deprecated, do not use in new projects
+Video0_Delay/String1;;;N NT;;;Deprecated, do not use in new projects
+Video0_Delay/String2;;;N NT;;;Deprecated, do not use in new projects
+Video0_Delay/String3;;;N NT;;;Deprecated, do not use in new projects
+Video0_Delay/String4;;;N NT;;;Deprecated, do not use in new projects
+ReplayGain_Gain;; dB;N YT;;;The gain to apply to reach 89dB SPL on playback;;
+ReplayGain_Gain/String;;;Y YT;;;;;
+ReplayGain_Peak;;;Y YT;;;The maximum absolute peak value of the item;;
+StreamSize;; byte;N YI;;;Streamsize in bytes;;
+StreamSize/String;;;Y NT;;;Streamsize in with percentage value;;
+StreamSize/String1;;;N NT;;;;;
+StreamSize/String2;;;N NT;;;;;
+StreamSize/String3;;;N NT;;;;;
+StreamSize/String4;;;N NT;;;;;
+StreamSize/String5;;;N NT;;;Streamsize in with percentage value;;
+StreamSize_Proportion;;;N NT;;;Stream size divided by file size;;
+Source_StreamSize;; byte;N YI;;;Source Streamsize in bytes;;
+Source_StreamSize/String;;;Y NT;;;Source Streamsize in with percentage value;;
+Source_StreamSize/String1;;;N NT;;;;;
+Source_StreamSize/String2;;;N NT;;;;;
+Source_StreamSize/String3;;;N NT;;;;;
+Source_StreamSize/String4;;;N NT;;;;;
+Source_StreamSize/String5;;;N NT;;;Source Streamsize in with percentage value;;
+Source_StreamSize_Proportion;;;N NT;;;Source Stream size divided by file size;;
+StreamSize_Encoded;; byte;N YI;;;Encoded Streamsize in bytes;;
+StreamSize_Encoded/String;;;Y NT;;;Encoded Streamsize in with percentage value;;
+StreamSize_Encoded/String1;;;N NT;;;;;
+StreamSize_Encoded/String2;;;N NT;;;;;
+StreamSize_Encoded/String3;;;N NT;;;;;
+StreamSize_Encoded/String4;;;N NT;;;;;
+StreamSize_Encoded/String5;;;N NT;;;Encoded Streamsize in with percentage value;;
+StreamSize_Encoded_Proportion;;;N NT;;;Encoded Stream size divided by file size;;
+Source_StreamSize_Encoded;; byte;N YI;;;Source Encoded Streamsize in bytes;;
+Source_StreamSize_Encoded/String;;;Y NT;;;Source Encoded Streamsize in with percentage value;;
+Source_StreamSize_Encoded/String1;;;N NT;;;;;
+Source_StreamSize_Encoded/String2;;;N NT;;;;;
+Source_StreamSize_Encoded/String3;;;N NT;;;;;
+Source_StreamSize_Encoded/String4;;;N NT;;;;;
+Source_StreamSize_Encoded/String5;;;N NT;;;Source Encoded Streamsize in with percentage value;;
+Source_StreamSize_Encoded_Proportion;;;N NT;;;Source Encoded Stream size divided by file size;;
+Alignment;;;N YT;;;How this stream file is aligned in the container;;
+Alignment/String;;;Y NT;;;Where this stream file is aligned in the container;;
+Interleave_VideoFrames;;;N YF;;;Between how many video frames the stream is inserted;;
+Interleave_Duration;;;N YI;;;Between how much time (ms) the stream is inserted;;
+Interleave_Duration/String;;;Y NT;;;Between how much time and video frames the stream is inserted (with measurement);;
+Interleave_Preload;;;N YI;;;How much time is buffered before the first video frame;;
+Interleave_Preload/String;;;Y NT;;;How much time is buffered before the first video frame (with measurement);;
+Title;;;Y YI;;;Name of the track;;
+Encoded_Library;;;N YT;;;Software used to create the file;;
+Encoded_Library/String;;;Y NT;;;Software used to create the file;;
+Encoded_Library/Name;;;N NT;;;Info from the software;;
+Encoded_Library/Version;;;N NT;;;Version of software;;
+Encoded_Library/Date;;;N NT;;;Release date of software;;
+Encoded_Library_Settings;;;Y YT;;;Parameters used by the software;;
+Language;;;N YT;;;Language (2-letter ISO 639-1 if exists, else 3-letter ISO 639-2, and with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn);;
+Language/String;;;Y NT;;;Language (full);;
+Language/String1;;;N NT;;;Language (full);;
+Language/String2;;;N NT;;;Language (2-letter ISO 639-1 if exists, else empty);;
+Language/String3;;;N NT;;;Language (3-letter ISO 639-2 if exists, else empty);;
+Language/String4;;;N NT;;;Language (2-letter ISO 639-1 if exists with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn, else empty);;
+Language_More;;;Y YT;;;More info about Language (e.g. Director's Comment);;
+Default;;Yes;N YT;;;Set if that track should be used if no language found matches the user preference.
+Default/String;;;Y NT;;;Set if that track should be used if no language found matches the user preference.
+Forced;;Yes;N YT;;;Set if that track should be used if no language found matches the user preference.
+Forced/String;;;Y NT;;;Set if that track should be used if no language found matches the user preference.
+Encoded_Date;;;Y YT;;;UTC time that the encoding of this item was completed began.;;Temporal
+Tagged_Date;;;Y YT;;;UTC time that the tags were done for this item.;;Temporal
+Encryption;;;Y YT;;;;;

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/Stream/Chapters.csv Added

@@ -0,0 +1,32 @@
+Count;;;N NI;;;Count of objects available in this stream
+StreamCount;;;N NI;;;Count of streams of that kind available
+StreamKind;Chapters;;N NI;;;Stream type name
+StreamKind/String;;;N NI;;;Stream type name
+StreamKindID;;;N NI;;;Number of the stream (base=0)
+StreamKindPos;;;N NI;;;When multiple streams, number of the stream (base=1)
+StreamOrder;;;N NI;;;Stream order in the file, whatever is the kind of stream (base=0)
+Inform;;;N NT;;;Last **Inform** call
+ID;;;N YI;;;A ID for this stream in this file
+ID/String;;;Y NT;;;A ID for this stream in this file
+UniqueID;;;N YI;;;A unique ID for this stream, should be copied with stream copy
+MenuID;;;N YI;;;The menu ID for this stream in this file
+MenuID/String;;;Y NT;;;The menu ID for this stream in this file
+Format;;;Y YT;;;Format used
+Format/Info;;;Y NT;;;Info about Format
+Format/Url;;;N NT;;;Link
+Codec;;;N YT;;;Deprecated
+Codec/String;;;Y NT;;;Deprecated
+Codec/Info;;;Y NT;;;Deprecated
+Codec/Url;;;Y YT;;;Deprecated
+Total;;;N YT;;;Total number of chapters
+Title;;;Y YI;;;Name of the track
+Language/String;;;Y NT;;;Language (full);;
+Language/String1;;;N NT;;;Language (full);;
+Language/String2;;;N NT;;;Language (2-letter ISO 639-1 if exists, else empty);;
+Language/String3;;;N NT;;;Language (3-letter ISO 639-2 if exists, else empty);;
+Language/String4;;;N NT;;;Language (2-letter ISO 639-1 if exists with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn, else empty);;
+Language_More;;;Y YT;;;More info about Language (e.g. Director's Comment);;
+Default;;Yes;N YT;;;Set if that track should be used if no language found matches the user preference.
+Default/String;;;Y NT;;;Set if that track should be used if no language found matches the user preference.
+Forced;;Yes;N YT;;;Set if that track should be used if no language found matches the user preference.
+Forced/String;;;Y NT;;;Set if that track should be used if no language found matches the user preference.

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/Stream/General.csv Added

@@ -0,0 +1,279 @@
+Count;;;N NI;;;Number of objects available in this stream
+Status;;;N NI;;;bit field (0=IsAccepted, 1=IsFilled, 2=IsUpdated, 3=IsFinished)
+StreamCount;;;N NI;;;Number of streams of this kind available
+StreamKind;General;;N NI;;;Stream type name
+StreamKind/String;;;N NI;;;Stream type name
+StreamKindID;;;N NI;;;Number of the stream (base=0)
+StreamKindPos;;;N NI;;;When multiple streams, number of the stream (base=1)
+StreamOrder;;;N NI;;;Stream order in the file, whatever is the kind of stream (base=0)
+Inform;;;N NT;;;Last **Inform** call
+ID;;;N YI;;;The ID for this stream in this file
+ID/String;;;Y NT;;;The ID for this stream in this file
+UniqueID;;;N YI;;;The unique ID for this stream, should be copied with stream copy
+UniqueID/String;;;Y NT;;;A unique ID for this stream, should be copied with stream copy
+MenuID;;;N YI;;;The menu ID for this stream in this file
+MenuID/String;;;Y NT;;;The menu ID for this stream in this file
+GeneralCount;1;;N NI;;;Number of general streams
+VideoCount;;;N NI;;;Number of video streams
+AudioCount;;;N NI;;;Number of audio streams
+TextCount;;;N NI;;;Number of text streams
+ChaptersCount;;;N NI;;;Number of chapters streams
+ImageCount;;;N NI;;;Number of image streams
+MenuCount;;;N NI;;;Number of menu streams
+Video_Format_List;;;N NT;;;Video Codecs in this file, separated by /
+Video_Format_WithHint_List;;;N NT;;;Video Codecs in this file with popular name (hint), separated by /
+Video_Codec_List;;;N NT;;;Deprecated, do not use in new projects
+Video_Language_List;;;N NT;;;Video languagesin this file, full names, separated by /
+Audio_Format_List;;;N NT;;;Audio Codecs in this file,separated by /
+Audio_Format_WithHint_List;;;N NT;;;Audio Codecs in this file with popular name (hint), separated by /
+Audio_Codec_List;;;N NT;;;Deprecated, do not use in new projects
+Audio_Language_List;;;N NT;;;Audio languages in this file separated by /
+Text_Format_List;;;N NT;;;Text Codecs in this file, separated by /
+Text_Format_WithHint_List;;;N NT;;;Text Codecs in this file with popular name (hint),separated by /
+Text_Codec_List;;;N NT;;;Deprecated, do not use in new projects
+Text_Language_List;;;N NT;;;Text languages in this file, separated by /
+Chapters_Format_List;;;N NT;;;Chapters Codecs in this file, separated by /
+Chapters_Format_WithHint_List;;;N NT;;;Chapters Codecs in this file with popular name (hint), separated by /
+Chapters_Codec_List;;;N NT;;;Deprecated, do not use in new projects
+Chapters_Language_List;;;N NT;;;Chapters languages in this file, separated by /
+Image_Format_List;;;N NT;;;Image Codecs in this file, separated by /
+Image_Format_WithHint_List;;;N NT;;;Image Codecs in this file with popular name (hint), separated by /
+Image_Codec_List;;;N NT;;;Deprecated, do not use in new projects
+Image_Language_List;;;N NT;;;Image languages in this file, separated by /
+Menu_Format_List;;;N NT;;;Menu Codecsin this file, separated by /
+Menu_Format_WithHint_List;;;N NT;;;Menu Codecs in this file with popular name (hint),separated by /
+Menu_Codec_List;;;N NT;;;Deprecated, do not use in new projects
+Menu_Language_List;;;N NT;;;Menu languages in this file, separated by /
+CompleteName;;;Y NT;;;Complete name (Folder+Name+Extension)
+FolderName;;;N NT;;;Folder name only
+FileName;;;N NT;;;File name only
+FileExtension;;;N NT;;;File extension only
+Format;;;Y YT;;;Format used
+Format/String;;;N NT;;;Deprecated, do not use in new projects
+Format/Info;;;Y NT;;;Info about this Format
+Format/Url;;;N NT;;;Link to a description of this format
+Format/Extensions;;;N NT;;;Known extensions of this format
+Format_Commercial;;;N NT;;;Commercial name used by vendor for theses setings or Format field if there is no difference
+Format_Commercial_IfAny;;;Y NT;;;Commercial name used by vendor for theses setings if there is one
+Format_Version;;;Y NT;;;Version of this format
+Format_Profile;;;Y NT;;;Profile of the Format
+Format_Compression;;;Y NT;;;Compression method used;;
+Format_Settings;;;Y NT;;;Settings needed for decoder used
+InternetMediaType;;;N YT;;;Internet Media Type (aka MIME Type, Content-Type)
+CodecID;;;Y NT;;;Codec ID (found in some containers);;
+CodecID/String;;;Y NT;;;Codec ID (found in some containers);;
+CodecID/Info;;;Y NT;;;Info about this codec
+CodecID/Hint;;;Y NT;;;A hint/popular name for this codec
+CodecID/Url;;;N NT;;;A link to more details about this codec ID
+CodecID_Description;;;Y NT;;;Manual description given by the container
+Interleaved;;;N NT;;;If Audio and video are muxed
+Codec;;;N NT;;;Deprecated, do not use in new projects
+Codec/String;;;N NT;;;Deprecated, do not use in new projects
+Codec/Info;;;N NT;;;Deprecated, do not use in new projects
+Codec/Url;;;N NT;;;Deprecated, do not use in new projects
+Codec/Extensions;;;N NT;;;Deprecated, do not use in new projects
+Codec_Settings;;;N NT;;;Deprecated, do not use in new projects
+Codec_Settings_Automatic;;;N NT;;;Deprecated, do not use in new projects
+FileSize;; byte;N NT;;;File size in bytes
+FileSize/String;;;Y NT;;;File size (with measure)
+FileSize/String1;;;N NT;;;File size (with measure, 1 digit mini)
+FileSize/String2;;;N NT;;;File size (with measure, 2 digit mini)
+FileSize/String3;;;N NT;;;File size (with measure, 3 digit mini)
+FileSize/String4;;;N NT;;;File size (with measure, 4 digit mini)
+Duration;; ms;N YI;;;Play time of the stream in ms
+Duration/String;;;Y NT;;;Play time in format : XXx YYy only, YYy omited if zero
+Duration/String1;;;N NT;;;Play time in format : HHh MMmn SSs MMMms, XX omited if zero
+Duration/String2;;;N NT;;;Play time in format : XXx YYy only, YYy omited if zero
+Duration/String3;;;N NT;;;Play time in format : HH:MM:SS.MMM
+Duration_Start;;;Y YT;;;
+Duration_End;;;Y YT;;;
+OverallBitRate_Mode;;;N YT;;;Bit rate mode of all streams (VBR, CBR)
+OverallBitRate_Mode/String;;;Y NT;;;Bit rate mode of all streams (Variable, Constant)
+OverallBitRate;; bps;N YF;;;Bit rate of all streams in bps
+OverallBitRate/String;;;Y NT;;;Bit rate of all streams (with measure)
+OverallBitRate_Minimum;; bps;N YF;;;Minimum Bit rate in bps
+OverallBitRate_Minimum/String;;;Y NT;;;Minimum Bit rate (with measurement)
+OverallBitRate_Nominal;; bps;N YF;;;Nominal Bit rate in bps
+OverallBitRate_Nominal/String;;;Y NT;;;Nominal Bit rate (with measurement)
+OverallBitRate_Maximum;; bps;N YF;;;Maximum Bit rate in bps
+OverallBitRate_Maximum/String;;;Y NT;;;Maximum Bit rate (with measurement)
+Delay;; ms;N NI;;;Delay fixed in the stream (relative) IN MS
+Delay/String;;;N NT;;;Delay with measurement
+Delay/String1;;;N NT;;;Delay with measurement
+Delay/String2;;;N NT;;;Delay with measurement
+Delay/String3;;;N NT;;;format : HH:MM:SS.MMM
+StreamSize;; byte;N YI;;;Stream size in bytes
+StreamSize/String;;;N NT;;;
+StreamSize/String1;;;N NT;;;
+StreamSize/String2;;;N NT;;;
+StreamSize/String3;;;N NT;;;
+StreamSize/String4;;;N NT;;;
+StreamSize/String5;;;N NT;;;With proportion
+StreamSize_Proportion;;;N NT;;;Stream size divided by file size
+HeaderSize;;;N NI;;;
+DataSize;;;N NI;;;
+FooterSize;;;N NI;;;
+IsStreamable;;;N NT;;;
+Album_ReplayGain_Gain;; dB;N YT;;;The gain to apply to reach 89dB SPL on playback
+Album_ReplayGain_Gain/String;;;Y YT;;;
+Album_ReplayGain_Peak;;;Y YT;;;The maximum absolute peak value of the item;;
+Encryption;;;Y YT;;;;;
+Title;;;N NT;;;(Generic)Title of file;;Title
+Title/More;;;N NT;;;(Generic)More info about the title of file;;Title
+Title/Url;;;N NT;;;(Generic)Url;;Title
+Domain;;;Y YT;;;Univers movies belong to, e.g. Starwars, Stargate, Buffy, Dragonballs;;Title
+Collection;;;Y YT;;;Name of the series, e.g. Starwars movies, Stargate SG-1, Stargate Atlantis, Buffy, Angel;;Title
+Season;;;Y YT;;;Name of the season, e.g. Strawars first Trilogy, Season 1;;Title
+Season_Position;;;Y YI;;;Number of the Season;;Title
+Season_Position_Total;;;Y YI;;;Place of the season e.g. 2 of 7;;Title
+Movie;;;Y YT;;;Name of the movie. Eg : Starwars, a new hope;;Title
+Movie/More;;;Y YT;;;More infos about the movie;;Title
+Movie/Country;;;Y YT;;;Country, where the movie was procuced;;Title
+Movie/Url;;;Y YT;;;Homepage for the movie;;Title
+Album;;;Y YT;;;Name of an audio-album. Eg : The joshua tree;;Title
+Album/More;;;Y YT;;;More infos about the album;;Title
+Album/Sort;;;Y YT;;;;;Title
+Album/Performer;;;Y YT;;;Album performer/artist of this file;;Entity
+Album/Performer/Sort;;;Y YT;;;;;Entity
+Album/Performer/Url;;;Y YT;;;Homepage of the album performer/artist;;Entity
+Comic;;;Y YT;;;Name of the comic.;;Title
+Comic/More;;;Y YT;;;;;Title
+Comic/Position_Total;;;Y YI;;;;;Title
+Part;;;Y YT;;;Name of the part. e.g. CD1, CD2;;Title
+Part/Position;;;Y YI;;;Number of the part;;Title
+Part/Position_Total;;;Y YI;;;Place of the part e.g. 2 of 3;;Title
+Track;;;Y YT;;;Name of the track. e.g. track1, track 2;;Title
+Track/More;;;Y YT;;;More infos about the track;;Title
+Track/Url;;;Y YT;;;Link to a site about this track;;Title
+Track/Sort;;;Y YT;;;;;Title
+Track/Position;;;Y YI;;;Number of this track;;Title
+Track/Position_Total;;;Y YI;;;Place of this track, e.g. 3 of 15;;Title
+Grouping;;;Y YT;;;iTunes grouping;;Title
+Chapter;;;Y YT;;;Name of the chapter.;;Title
+SubTrack;;;Y YT;;;Name of the subtrack.;;Title
+Original/Album;;;Y YT;;;Original name of album, serie...;;Title
+Original/Movie;;;Y YT;;;Original name of the movie;;Title
+Original/Part;;;Y YT;;;Original name of the part in the original support;;Title
+Original/Track;;;Y YT;;;Original name of the track in the original support;;Title
+Compilation;;;Y YT;;;iTunes compilation;;Title
+Compilation/String;;Yes;Y YT;;;iTunes compilation;;Title
+Performer;;;Y YT;;;Main performer/artist of this file;;Entity
+Performer/Sort;;;Y YT;;;;;Entity
+Performer/Url;;;Y YT;;;Homepage of the performer/artist;;Entity
+Original/Performer;;;Y YT;;;Original artist(s)/performer(s).;;Entity
+Accompaniment;;;Y YT;;;Band/orchestra/accompaniment/musician.;;Entity
+Composer;;;Y YT;;;Name of the original composer.;;Entity
+Composer/Nationality;;;Y YT;;;Nationality of the main composer of the item, mostly for classical music.;;Entity
+Arranger;;;Y YT;;;The person who arranged the piece. e.g. Ravel.;;Entity
+Lyricist;;;Y YT;;;The person who wrote the lyrics for a musical item.;;Entity
+Original/Lyricist;;;Y YT;;;Original lyricist(s)/text writer(s).;;Entity
+Conductor;;;Y YT;;;The artist(s) who performed the work. In classical music this would be the conductor, orchestra, soloists.;;Entity
+Director;;;Y YT;;;Name of the director.;;Entity
+AssistantDirector;;;Y YT;;;Name of the assistant director.;;Entity
+DirectorOfPhotography;;;Y YT;;;The name of the director of photography, also known as cinematographer.;;Entity
+SoundEngineer;;;Y YT;;;The name of the sound engineer or sound recordist.;;Entity
+ArtDirector;;;Y YT;;;The person who oversees the artists and craftspeople who build the sets.;;Entity
+ProductionDesigner;;;Y YT;;;The person responsible for designing the Overall visual appearance of a movie.;;Entity
+Choregrapher;;;Y YT;;;The name of the choregrapher.;;Entity
+CostumeDesigner;;;Y YT;;;The name of the costume designer.;;Entity
+Actor;;;Y YT;;;Real name of an actor or actress playing a role in the movie.;;Entity
+Actor_Character;;;Y YT;;;Name of the character an actor or actress plays in this movie.;;Entity
+WrittenBy;;;Y YT;;;The author of the story or script.;;Entity
+ScreenplayBy;;;Y YT;;;The author of the screenplay or scenario (used for movies and TV shows).;;Entity
+EditedBy;;;Y YT;;;Editors name;;Entity
+CommissionedBy;;;Y YT;;;name of the person or organization that commissioned the subject of the file;;Entity
+Producer;;;Y YT;;;Name of the producer of the movie.;;Entity
+CoProducer;;;Y YT;;;The name of a co-producer.;;Entity
+ExecutiveProducer;;;Y YT;;;The name of an executive producer.;;Entity
+MusicBy;;;Y YT;;;Main music-artist for a movie;;Entity
+DistributedBy;;;Y YT;;;Company the item is mainly distributed by ;;Entity
+OriginalSourceForm/DistributedBy;;;Y YT;;;Name of the person or organization who supplied the original subject;;Entity
+MasteredBy;;;Y YT;;;The engineer who mastered the content for a physical medium or for digital distribution.;;Entity
+EncodedBy;;;Y YT;;;Name of the person or organisation that encoded/ripped the audio file.;;Entity
+RemixedBy;;;Y YT;;;Name of the artist(s), that interpreted, remixed, or otherwise modified the item.;;Entity
+ProductionStudio;;;Y YT;;;Main production studio ;;Entity
+ThanksTo;;;Y YT;;;A very general tag for everyone else that wants to be listed.;;Entity
+Publisher;;;Y YT;;;Name of the organization publishing the album (i.e. the 'record label') or movie.;;Entity
+Publisher/URL;;;Y YT;;;Publishers official webpage.;;Entity
+Label;;;Y YT;;;Brand or trademark associated with the marketing of music recordings and music videos.;;Entity
+Genre;;;Y YT;;;The main genre of the audio or video. e.g. classical, ambient-house, synthpop, sci-fi, drama, etc.;;Classification
+Mood;;;Y YT;;;Intended to reflect the mood of the item with a few keywords, e.g. Romantic, Sad, Uplifting, etc.;;Classification
+ContentType;;;Y YT;;;The type of the item. e.g. Documentary, Feature Film, Cartoon, Music Video, Music, Sound FX, etc.;;Classification
+Subject;;;Y YT;;;Describes the topic of the file, such as Aerial view of Seattle..;;Classification
+Description;;;Y YT;;;A short description of the contents, such as Two birds flying.;;Classification
+Keywords;;;Y YT;;;Keywords to the item separated by a comma, used for searching.;;Classification
+Summary;;;Y YT;;;A plot outline or a summary of the story.;;Classification
+Synopsis;;;Y YT;;;A description of the story line of the item.;;Classification
+Period;;;Y YT;;;Describes the period that the piece is from or about. e.g. Renaissance.;;Classification
+LawRating;;;Y YT;;;Depending on the country it's the format of the rating of a movie (P, R, X in the USA, an age in other countries or a URI defining a logo).;;Classification
+LawRating_Reason;;;Y YT;;;Reason for the law rating;;Classification
+ICRA;;;Y YT;;;The ICRA rating. (Previously RSACi);;Classification
+Released_Date;;;Y YT;;;The date/year that the item was released.;;Temporal
+Original/Released_Date;;;Y YT;;;The date/year that the item was originaly released.;;Temporal
+Recorded_Date;;;Y YT;;;The time/date/year that the recording began.;;Temporal
+Encoded_Date;;;Y YT;;;The time/date/year that the encoding of this item was completed began.;;Temporal
+Tagged_Date;;;Y YT;;;The time/date/year that the tags were done for this item.;;Temporal
+Written_Date;;;Y YT;;;The time/date/year that the composition of the music/script began.;;Temporal
+Mastered_Date;;;Y YT;;;The time/date/year that the item was tranfered to a digitalmedium.;;Temporal
+File_Created_Date;;;N NT;;;The time that the file was created on the file system;;Temporal
+File_Created_Date_Local;;;N NT;;;The time that the file was created on the file system (Warning: this field depends of local configuration, do not use it in an international database);;Temporal
+File_Modified_Date;;;N NT;;;The time that the file was modified on the file system;;Temporal
+File_Modified_Date_Local;;;N NT;;;The time that the file was modified on the file system (Warning: this field depends of local configuration, do not use it in an international database);;Temporal
+Recorded_Location;;;Y YT;;;Location where track was recorded. (See COMPOSITION_LOCATION for format);;Spatial
+Written_Location;;;Y YT;;;Location that the item was originaly designed/written. Information should be stored in the following format: country code, state/province, city where the coutry code is the same 2 octets as in Internet domains, or possibly ISO-3166. e.g. US, Texas, Austin or US, , Austin.;;Spatial
+Archival_Location;;;Y YT;;;Location, where an item is archived, e.eg. Louvre,Paris,France;;Spatial
+Encoded_Application;;;Y YT;;;Name of the software package used to create the file, such as Microsoft WaveEdit.;;Technical
+Encoded_Application/Url;;;N YT;;;Name of the software package used to create the file, such as Microsoft WaveEdit.;;Technical
+Encoded_Library;;;N YT;;;Software used to create the file;;Technical
+Encoded_Library/String;;;Y NT;;;Software used to create the file;;Technical
+Encoded_Library/Name;;;N NT;;;Name of the the encoding-software;;Technical
+Encoded_Library/Version;;;N NT;;;Version of encoding-software;;Technical
+Encoded_Library/Date;;;N NT;;;Release date of software;;Technical
+Encoded_Library_Settings;;;Y YT;;;Parameters used by the software;;Technical
+Cropped;;;Y YT;;;Describes whether an image has been cropped and, if so, how it was cropped.;;Technical
+Dimensions;;;Y YT;;;Specifies the size of the original subject of the file. eg 8.5 in h, 11 in w;;Technical
+DotsPerInch;;;Y YT;;;Stores dots per inch setting of the digitizer used to produce the file;;Technical
+Lightness;;;Y YT;;;Describes the changes in lightness settings on the digitizer required to produce the file;;Technical
+OriginalSourceMedium;;;Y YT;;;Original medium of the material, e.g. vinyl, Audio-CD, Super8 or BetaMax;;Technical
+OriginalSourceForm;;;Y YT;;;Original form of the material, e.g. slide, paper, map;;Technical
+OriginalSourceForm/NumColors;;;Y YT;;;Number of colors requested when digitizing, e.g. 256 for images or 32 bit RGB for video;;Technical
+OriginalSourceForm/Name;;;Y YT;;;Name of the product the file was originally intended for;;Technical
+OriginalSourceForm/Cropped;;;Y YT;;;Describes whether an image has been cropped and, if so, how it was cropped. e.g. 16:9 to 4:3, top and bottom;;Technical
+OriginalSourceForm/Sharpness;;;Y YT;;;Identifies the changes in sharpness for the digitizer requiered to produce the file;;Technical
+Tagged_Application;;;Y YT;;;Software used to tag this file;;Technical
+BPM;;;Y YT;;;Average number of beats per minute;;Technical
+ISRC;;;Y YT;;;International Standard Recording Code, excluding the ISRC prefix and including hyphens.;;Identifier
+ISBN;;;Y YT;;;International Standard Book Number.;;Identifier
+BarCode;;;Y YT;;;EAN-13 (13-digit European Article Numbering) or UPC-A (12-digit Universal Product Code) bar code identifier.;;Identifier
+LCCN;;;Y YT;;;Library of Congress Control Number.;;Identifier
+CatalogNumber;;;Y YT;;;A label-specific catalogue number used to identify the release. e.g. TIC 01.;;Identifier
+LabelCode;;;Y YT;;;A 4-digit or 5-digit number to identify the record label, typically printed as (LC) xxxx or (LC) 0xxxx on CDs medias or covers, with only the number being stored.;;Identifier
+Owner;;;Y YT;;;Owner of the file;;Legal
+Copyright;;;Y YT;;;Copyright attribution.;;Legal
+Copyright/Url;;;Y YT;;;Link to a site with copyright/legal information.;;Legal
+Producer_Copyright;;;Y YT;;;The copyright information as per the productioncopyright holder.;;Legal
+TermsOfUse;;;Y YT;;;License information, e.g., All Rights Reserved,Any Use Permitted.;;Legal
+ServiceName;;;Y YT;;;;;Legal
+ServiceChannel;;;Y YT;;;;;Legal
+Service/Url;;;Y YT;;;;;Legal
+ServiceProvider;;;Y YT;;;;;Legal
+ServiceProviderr/Url;;;Y YT;;;;;Legal
+ServiceType;;;Y YT;;;;;Legal
+NetworkName;;;Y YT;;;;;Legal
+OriginalNetworkName;;;Y YT;;;;;Legal
+Country;;;Y YT;;;;;Legal
+TimeZone;;;Y YT;;;;;Legal
+Cover;;;Y YT;;;Is there a cover;;Info
+Cover_Description;;;Y YT;;;short descriptio, e.g. Earth in space;;Info
+Cover_Type;;;Y YT;;;;;Info
+Cover_Mime;;;Y YT;;;;;Info
+Cover_Data;;;N YT;;;Cover, in binary format encoded BASE64;;Info
+Lyrics;;;Y YT;;;Text of a song;;Info
+Comment;;;Y YT;;;Any comment related to the content.;;Personal
+Rating;;;Y YT;;;A numeric value defining how much a person likes the song/movie. The number is between 0 and 5 with decimal values possible (e.g. 2.7), 5(.0) being the highest possible rating.;;Personal
+Added_Date;;;Y YT;;;Date/year the item was added to the owners collection;;Personal
+Played_First_Date;;;Y YT;;;The date, the owner first played an item;;Personal
+Played_Last_Date;;;Y YT;;;The date, the owner last played an item;;Personal
+Played_Count;;;Y YI;;;Number of times an item was played;;Personal
+EPG_Positions_Begin;;;N NI;;;;;
+EPG_Positions_End;;;N NI;;;;;

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/Stream/General_Info_About_Levels.csv Changed

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/Stream/Generic.csv Added

@@ -0,0 +1,111 @@
+Format
+Format/Info
+Format/Url
+Format_Commercial
+Format_Commercial_IfAny
+Format_Version
+Format_Profile
+Format_Compression
+Format_Settings
+InternetMediaType
+CodecID
+CodecID/Info
+CodecID/Hint
+CodecID/Url
+CodecID_Description
+Codec
+Codec/String
+Codec/Info
+Codec/Url
+Codec/CC
+Duration
+Duration/String
+Duration/String1
+Duration/String2
+Duration/String3
+Source_Duration
+Source_Duration/String
+Source_Duration/String1
+Source_Duration/String2
+Source_Duration/String3
+BitRate_Mode
+BitRate_Mode/String
+BitRate
+BitRate/String
+BitRate_Minimum
+BitRate_Minimum/String
+BitRate_Nominal
+BitRate_Nominal/String
+BitRate_Maximum
+BitRate_Maximum/String
+BitRate_Encoded
+BitRate_Encoded/String
+FrameCount
+Source_FrameCount
+ColorSpace
+ChromaSubsampling
+Resolution
+Resolution/String
+BitDepth
+BitDepth/String
+Compression_Mode
+Compression_Mode/String
+Compression_Ratio
+Delay
+Delay/String
+Delay/String1
+Delay/String2
+Delay/String3
+Delay/String4
+Delay_Settings
+Delay_Source
+Delay_Source/String
+Delay_Original
+Delay_Original/String
+Delay_Original/String1
+Delay_Original/String2
+Delay_Original/String3
+Delay_Original/String4
+Delay_Original_Settings
+Delay_Original_Source
+Video_Delay
+Video_Delay/String
+Video_Delay/String1
+Video_Delay/String2
+Video_Delay/String3
+Video_Delay/String4
+StreamSize
+StreamSize/String
+StreamSize/String1
+StreamSize/String2
+StreamSize/String3
+StreamSize/String4
+StreamSize/String5
+StreamSize_Proportion
+Source_StreamSize
+Source_StreamSize/String
+Source_StreamSize/String1
+Source_StreamSize/String2
+Source_StreamSize/String3
+Source_StreamSize/String4
+Source_StreamSize/String5
+Source_StreamSize_Proportion
+StreamSize_Encoded
+StreamSize_Encoded/String
+StreamSize_Encoded/String1
+StreamSize_Encoded/String2
+StreamSize_Encoded/String3
+StreamSize_Encoded/String4
+StreamSize_Encoded/String5
+StreamSize_Encoded_Proportion
+Source_StreamSize_Encoded
+Source_StreamSize_Encoded/String
+Source_StreamSize_Encoded/String1
+Source_StreamSize_Encoded/String2
+Source_StreamSize_Encoded/String3
+Source_StreamSize_Encoded/String4
+Source_StreamSize_Encoded/String5
+Source_StreamSize_Encoded_Proportion
+Language
+ServiceName
+ServiceProvider

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/Stream/Image.csv Added

@@ -0,0 +1,96 @@
+Count;;;N YI;;;Count of objects available in this stream
+Status;;;N NI;;;bit field (0=IsAccepted, 1=IsFilled, 2=IsUpdated, 3=IsFinished)
+StreamCount;;;N YI;;;Count of streams of that kind available
+StreamKind;Image;;N NI;;;Stream type name
+StreamKind/String;;;N NI;;;Stream type name
+StreamKindID;;;N NI;;;Number of the stream (base=0)
+StreamKindPos;;;N NI;;;When multiple streams, number of the stream (base=1)
+StreamOrder;;;N NI;;;Stream order in the file, whatever is the kind of stream (base=0)
+Inform;;;N NT;;;Last **Inform** call
+ID;;;N YI;;;A ID for this stream in this file
+ID/String;;;Y NT;;;The ID for this stream in this file
+UniqueID;;;N YI;;;A unique ID for this stream, should be copied with stream copy
+UniqueID/String;;;Y NT;;;A unique ID for this stream, should be copied with stream copy
+MenuID;;;N YI;;;The menu ID for this stream in this file
+MenuID/String;;;Y NT;;;The menu ID for this stream in this file
+Title;;;Y YI;;;Name of the track
+Format;;;Y YT;;;Format used
+Format/Info;;;Y NT;;;Info about Format
+Format/Url;;;N NT;;;Link
+Format_Commercial;;;N NT;;;Commercial name used by vendor for theses setings or Format field if there is no difference
+Format_Commercial_IfAny;;;Y NT;;;Commercial name used by vendor for theses setings if there is one
+Format_Version;;;Y NT;;;Version of this format
+Format_Profile;;;Y NT;;;Profile of the Format
+Format_Compression;;;N YT;;;Compression mode of the Format
+Format_Settings;;;Y NT;;;Settings needed for decoder used
+Format_Settings_Wrapping;;;Y YT;;;Wrapping mode (Frame wrapped or Clip wrapped)
+InternetMediaType;;;N YT;;;Internet Media Type (aka MIME Type, Content-Type)
+CodecID;;;Y NT;;;Codec ID (found in some containers);;
+CodecID/String;;;Y NT;;;Codec ID (found in some containers);;
+CodecID/Info;;;Y NT;;;Info about codec ID
+CodecID/Hint;;;Y NT;;;A hint for this codec ID
+CodecID/Url;;;N NT;;;A link for more details about this codec ID
+CodecID_Description;;;Y NT;;;Manual description given by the container
+Codec;;;N NT;;;Deprecated, do not use in new projects
+Codec/String;;;N NT;;;Deprecated, do not use in new projects
+Codec/Family;;;N NT;;;Deprecated, do not use in new projects
+Codec/Info;;;N NT;;;Deprecated, do not use in new projects
+Codec/Url;;;N NT;;;Deprecated, do not use in new projects
+Width;; pixel;N YI;;;Width (aperture size if present) in pixel
+Width/String;;;Y NT;;;Width (aperture size if present) with measurement (pixel)
+Width_Offset;; pixel;N YI;;;Offset between original width and displayed width (aperture size) in pixel
+Width_Offset/String;;;N NT;;;Offset between original width and displayed width (aperture size)  in pixel
+Width_Original;; pixel;N YI;;;Original (in the raw stream) width in pixel
+Width_Original/String;;;Y NT;;;Original (in the raw stream) width with measurement (pixel)
+Height;; pixel;N YI;;;Height (aperture size if present) in pixel
+Height/String;;;Y NT;;;Height (aperture size if present) with measurement (pixel)
+Height_Offset;; pixel;N YI;;;Offset between original height and displayed height (aperture size) in pixel
+Height_Offset/String;;;N NT;;;Offset between original height and displayed height (aperture size)  in pixel
+Height_Original;; pixel;N YI;;;Original (in the raw stream) height in pixel
+Height_Original/String;;;Y NT;;;Original (in the raw stream) height with measurement (pixel)
+PixelAspectRatio;;;N YF;;;Pixel Aspect ratio
+PixelAspectRatio/String;;;N NT;;;Pixel Aspect ratio
+PixelAspectRatio_Original;;;N YF;;;Original (in the raw stream) Pixel Aspect ratio
+PixelAspectRatio_Original/String;;;N NT;;;Original (in the raw stream) Pixel Aspect ratio
+DisplayAspectRatio;;;N YF;;;Display Aspect ratio
+DisplayAspectRatio/String;;;Y NT;;;Display Aspect ratio
+DisplayAspectRatio_Original;;;N YF;;;Original (in the raw stream) Display Aspect ratio
+DisplayAspectRatio_Original/String;;;Y NT;;;Original (in the raw stream) Display Aspect ratio
+ColorSpace;;;Y YT;;;
+ChromaSubsampling;;;Y YT;;;
+Resolution;; bit;N NI;;;Deprecated, do not use in new projects
+Resolution/String;;;N NT;;;Deprecated, do not use in new projects
+BitDepth;; bit;N YI;;;
+BitDepth/String;;;Y NT;;;
+Compression_Mode;;;N YT;;;Compression mode (Lossy or Lossless)
+Compression_Mode/String;;;Y NT;;;Compression mode (Lossy or Lossless)
+Compression_Ratio;;;Y YF;;;Current stream size divided by uncompressed stream size;;
+StreamSize;; byte;N YI;;;Stream size in bytes
+StreamSize/String;;;Y NT;;;
+StreamSize/String1;;;N NT;;;
+StreamSize/String2;;;N NT;;;
+StreamSize/String3;;;N NT;;;
+StreamSize/String4;;;N NT;;;
+StreamSize/String5;;;N NT;;;With proportion;;
+StreamSize_Proportion;;;N NT;;;Stream size divided by file size;;
+Encoded_Library;;;N YT;;;Software used to create the file;;
+Encoded_Library/String;;;Y NT;;;Software used to create the file;;
+Encoded_Library/Name;;;N NT;;;Info from the software;;
+Encoded_Library/Version;;;N NT;;;Version of software;;
+Encoded_Library/Date;;;N NT;;;Release date of software;;
+Encoded_Library_Settings;;;Y YT;;;Parameters used by the software;;
+Language;;;N YT;;;Language (2-letter ISO 639-1 if exists, else 3-letter ISO 639-2, and with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn);;
+Language/String;;;Y NT;;;Language (full);;
+Language/String1;;;N NT;;;Language (full);;
+Language/String2;;;N NT;;;Language (2-letter ISO 639-1 if exists, else empty);;
+Language/String3;;;N NT;;;Language (3-letter ISO 639-2 if exists, else empty);;
+Language/String4;;;N NT;;;Language (2-letter ISO 639-1 if exists with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn, else empty);;
+Language_More;;;Y YT;;;More info about Language (e.g. Director's Comment);;
+Default;;Yes;N YT;;;Set if that track should be used if no language found matches the user preference.
+Default/String;;;Y NT;;;Set if that track should be used if no language found matches the user preference.
+Forced;;Yes;N YT;;;Set if that track should be used if no language found matches the user preference.
+Forced/String;;;Y NT;;;Set if that track should be used if no language found matches the user preference.
+Summary;;;N NT;;;;;
+Encoded_Date;;;Y YT;;;The time that the encoding of this item was completed began.;;Temporal
+Tagged_Date;;;Y YT;;;The time that the tags were done for this item.;;Temporal
+Encryption;;;Y YT;;;;;

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/Stream/Menu.csv Added

@@ -0,0 +1,73 @@
+Count;;;N NI;;;Count of objects available in this stream
+Status;;;N NI;;;bit field (0=IsAccepted, 1=IsFilled, 2=IsUpdated, 3=IsFinished)
+StreamCount;;;N NI;;;Count of streams of that kind available
+StreamKind;Menu;;N NI;;;Stream type name
+StreamKind/String;;;N NI;;;Stream type name
+StreamKindID;;;N NI;;;Number of the stream (base=0)
+StreamKindPos;;;N NI;;;When multiple streams, number of the stream (base=1)
+StreamOrder;;;N NI;;;Stream order in the file, whatever is the kind of stream (base=0)
+Inform;;;N NT;;;Last **Inform** call
+ID;;;N YI;;;A ID for this stream in this file
+ID/String;;;Y NT;;;A ID for this stream in this file
+UniqueID;;;N YI;;;A unique ID for this stream, should be copied with stream copy
+UniqueID/String;;;Y NT;;;A unique ID for this stream, should be copied with stream copy
+MenuID;;;N YI;;;A menu ID for this stream in this file
+MenuID/String;;;Y NT;;;A menu ID for this stream in this file
+Format;;;N YT;;;Format used
+Format/Info;;;N NT;;;Info about Format
+Format/Url;;;N NT;;;Link
+Format_Commercial;;;N NT;;;Commercial name used by vendor for theses setings or Format field if there is no difference
+Format_Commercial_IfAny;;;Y NT;;;Commercial name used by vendor for theses setings if there is one
+Format_Version;;;Y NT;;;Version of this format
+Format_Profile;;;Y NT;;;Profile of the Format
+Format_Compression;;;Y NT;;;Compression method used;;
+Format_Settings;;;Y NT;;;Settings needed for decoder used
+CodecID;;;Y NT;;;Codec ID (found in some containers);;
+CodecID/String;;;Y NT;;;Codec ID (found in some containers);;
+CodecID/Info;;;Y NT;;;Info about this codec
+CodecID/Hint;;;Y NT;;;A hint/popular name for this codec
+CodecID/Url;;;N NT;;;A link to more details about this codec ID
+CodecID_Description;;;Y NT;;;Manual description given by the container
+Codec;;;N YT;;;Deprecated
+Codec/String;;;N NT;;;Deprecated
+Codec/Info;;;N NT;;;Deprecated
+Codec/Url;;;N NT;;;Deprecated
+Duration;; ms;N YI;;;Play time of the stream in ms
+Duration/String;;;Y NT;;;Play time in format : XXx YYy only, YYy omited if zero
+Duration/String1;;;N NT;;;Play time in format : HHh MMmn SSs MMMms, XX omited if zero
+Duration/String2;;;N NT;;;Play time in format : XXx YYy only, YYy omited if zero
+Duration/String3;;;N NT;;;Play time in format : HH:MM:SS.MMM
+Duration_Start;;;Y YT;;;
+Duration_End;;;Y YT;;;
+Delay;; ms;N NI;;;Delay fixed in the stream (relative) IN MS;
+Delay/String;;;N NT;;;Delay with measurement;
+Delay/String1;;;N NT;;;Delay with measurement;
+Delay/String2;;;N NT;;;Delay with measurement;
+Delay/String3;;;N NT;;;Delay in format : HH:MM:SS.MMM;
+Delay/String4;;;N NT;;;Delay in format : HH:MM:SS:FF (HH:MM:SS;FF for drop frame, if available)
+Delay_Settings;;;N NT;;;Delay settings (in case of timecode for example);
+Delay_Source;;;N NT;;;Delay source (Container or Stream or empty);
+List_StreamKind;;;N YT;;;List of programs available
+List_StreamPos;;;N YT;;;List of programs available
+List;;;N YT;;;List of programs available
+List/String;;;Y NT;;;List of programs available
+Title;;;Y YI;;;Name of this menu
+Language;;;N YT;;;Language (2-letter ISO 639-1 if exists, else 3-letter ISO 639-2, and with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn)
+Language/String;;;Y NT;;;Language (full)
+Language/String1;;;N NT;;;Language (full);;
+Language/String2;;;N NT;;;Language (2-letter ISO 639-1 if exists, else empty);;
+Language/String3;;;N NT;;;Language (3-letter ISO 639-2 if exists, else empty);;
+Language/String4;;;N NT;;;Language (2-letter ISO 639-1 if exists with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn, else empty);;
+Language_More;;;Y YT;;;More info about Language (e.g. Director's Comment);;
+ServiceName;;;Y YT;;;;;Legal
+ServiceChannel;;;Y YT;;;;;Legal
+Service/Url;;;Y YT;;;;;Legal
+ServiceProvider;;;Y YT;;;;;Legal
+ServiceProviderr/Url;;;Y YT;;;;;Legal
+ServiceType;;;Y YT;;;;;Legal
+NetworkName;;;Y YT;;;;;Legal
+Original/NetworkName;;;Y YT;;;;;Legal
+Countries;;;Y YT;;;;;Legal
+TimeZones;;;Y YT;;;;;Legal
+Chapters_Pos_Begin;;;N NI;;;Used by third-party developers to know about the beginning of the chapters list, to be used by Get(Stream_Menu, x, Pos), where Pos is an Integer between Chapters_Pos_Begin and Chapters_Pos_End;;
+Chapters_Pos_End;;;N NI;;;Used by third-party developers to know about the end of the chapters list (this position excluded)

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/Stream/Text.csv Added

@@ -0,0 +1,192 @@
+Count;;;N NI;;;Count of objects available in this stream
+Status;;;N NI;;;bit field (0=IsAccepted, 1=IsFilled, 2=IsUpdated, 3=IsFinished)
+StreamCount;;;N NI;;;Count of streams of that kind available
+StreamKind;Text;;N NI;;;Stream type name
+StreamKind/String;;;N NI;;;Stream type name
+StreamKindID;;;N NI;;;Number of the stream (base=0)
+StreamKindPos;;;N NI;;;When multiple streams, number of the stream (base=1)
+StreamOrder;;;N NI;;;Stream order in the file, whatever is the kind of stream (base=0)
+Inform;;;N NT;;;Last **Inform** call
+ID;;;N YI;;;A ID for this stream in this file
+ID/String;;;Y NT;;;A ID for this stream in this file
+UniqueID;;;N YI;;;A unique ID for this stream, should be copied with stream copy
+UniqueID/String;;;Y NT;;;A unique ID for this stream, should be copied with stream copy
+MenuID;;;N YI;;;A menu ID for this stream in this file
+MenuID/String;;;Y NT;;;A menu ID for this stream in this file
+Format;;;Y YT;;;Format used
+Format/Info;;;Y NT;;;Info about Format
+Format/Url;;;N NT;;;Link
+Format_Commercial;;;N NT;;;Commercial name used by vendor for theses setings or Format field if there is no difference
+Format_Commercial_IfAny;;;Y NT;;;Commercial name used by vendor for theses setings if there is one
+Format_Version;;;Y NT;;;Version of this format
+Format_Profile;;;Y NT;;;Profile of the Format
+Format_Compression;;;Y NT;;;Compression method used;;
+Format_Settings;;;Y NT;;;Settings needed for decoder used
+Format_Settings_Wrapping;;;Y YT;;;Wrapping mode (Frame wrapped or Clip wrapped)
+InternetMediaType;;;N YT;;;Internet Media Type (aka MIME Type, Content-Type)
+MuxingMode;;;Y NT;;;How this stream is muxed in the container
+MuxingMode_MoreInfo;;;Y NT;;;More info (text) about the muxing mode
+CodecID;;;Y NT;;;Codec ID (found in some containers);;
+CodecID/String;;;Y NT;;;Codec ID (found in some containers);;
+CodecID/Info;;;Y NT;;;Info about codec ID
+CodecID/Hint;;;Y NT;;;A hint for this codec ID
+CodecID/Url;;;N NT;;;A link for more details about this codec ID
+CodecID_Description;;;Y NT;;;Manual description given by the container
+Codec;;;N YT;;;Deprecated
+Codec/String;;;N NT;;;Deprecated
+Codec/Info;;;N NT;;;Deprecated
+Codec/Url;;;N NT;;;Deprecated
+Codec/CC;;;N NT;;;Deprecated;
+Duration;; ms;N YI;;;Play time of the stream;
+Duration/String;;;Y NT;;;Play time (formated);
+Duration/String1;;;N NT;;;Play time in format : HHh MMmn SSs MMMms, XX omited if zero;
+Duration/String2;;;N NT;;;Play time in format : XXx YYy only, YYy omited if zero;
+Duration/String3;;;N NT;;;Play time in format : HH:MM:SS.MMM;
+Duration/String4;;;N NT;;;Play time in format : HH:MM:SS:FF (HH:MM:SS;FF for drop frame, if available)
+Duration_FirstFrame;; ms;N YI;;;Duration of the first frame if it is longer than others, in ms;
+Duration_FirstFrame/String;;;Y NT;;;Duration of the first frame if it is longer than others, in format : XXx YYy only, YYy omited if zero;
+Duration_FirstFrame/String1;;;N NT;;;Duration of the first frame if it is longer than others, in format : HHh MMmn SSs MMMms, XX omited if zero;
+Duration_FirstFrame/String2;;;N NT;;;Duration of the first frame if it is longer than others, in format : XXx YYy only, YYy omited if zero;
+Duration_FirstFrame/String3;;;N NT;;;Duration of the first frame if it is longer than others, in format : HH:MM:SS.MMM;
+Duration_LastFrame;; ms;N YI;;;Duration of the last frame if it is longer than others, in ms;
+Duration_LastFrame/String;;;Y NT;;;Duration of the last frame if it is longer than others, in format : XXx YYy only, YYy omited if zero;
+Duration_LastFrame/String1;;;N NT;;;Duration of the last frame if it is longer than others, in format : HHh MMmn SSs MMMms, XX omited if zero;
+Duration_LastFrame/String2;;;N NT;;;Duration of the last frame if it is longer than others, in format : XXx YYy only, YYy omited if zero;
+Duration_LastFrame/String3;;;N NT;;;Duration of the last frame if it is longer than others, in format : HH:MM:SS.MMM;
+Source_Duration;; ms;N YI;;;Source Play time of the stream;;
+Source_Duration/String;;;Y NT;;;Source Play time in format : XXx YYy only, YYy omited if zero;;
+Source_Duration/String1;;;N NT;;;Source Play time in format : HHh MMmn SSs MMMms, XX omited if zero;;
+Source_Duration/String2;;;N NT;;;Source Play time in format : XXx YYy only, YYy omited if zero;;
+Source_Duration/String3;;;N NT;;;Source Play time in format : HH:MM:SS.MMM;;
+Source_Duration_FirstFrame;; ms;N YI;;;Source Duration of the first frame if it is longer than others, in ms;
+Source_Duration_FirstFrame/String;;;Y NT;;;Source Duration of the first frame if it is longer than others, in format : XXx YYy only, YYy omited if zero;
+Source_Duration_FirstFrame/String1;;;N NT;;;Source Duration of the first frame if it is longer than others, in format : HHh MMmn SSs MMMms, XX omited if zero;
+Source_Duration_FirstFrame/String2;;;N NT;;;Source Duration of the first frame if it is longer than others, in format : XXx YYy only, YYy omited if zero;
+Source_Duration_FirstFrame/String3;;;N NT;;;Source Duration of the first frame if it is longer than others, in format : HH:MM:SS.MMM;
+Source_Duration_LastFrame;; ms;N YI;;;Source Duration of the last frame if it is longer than others, in ms;
+Source_Duration_LastFrame/String;;;Y NT;;;Source Duration of the last frame if it is longer than others, in format : XXx YYy only, YYy omited if zero;
+Source_Duration_LastFrame/String1;;;N NT;;;Source Duration of the last frame if it is longer than others, in format : HHh MMmn SSs MMMms, XX omited if zero;
+Source_Duration_LastFrame/String2;;;N NT;;;Source Duration of the last frame if it is longer than others, in format : XXx YYy only, YYy omited if zero;
+Source_Duration_LastFrame/String3;;;N NT;;;Source Duration of the last frame if it is longer than others, in format : HH:MM:SS.MMM;
+BitRate_Mode;;;N YT;;;Bit rate mode (VBR, CBR);
+BitRate_Mode/String;;;Y NT;;;Bit rate mode (Constant, Variable);
+BitRate;; bps;N YF;;;Bit rate in bps;
+BitRate/String;;;Y NT;;;Bit rate (with measurement);
+BitRate_Minimum;; bps;N YF;;;Minimum Bit rate in bps;
+BitRate_Minimum/String;;;Y NT;;;Minimum Bit rate (with measurement);
+BitRate_Nominal;; bps;N YF;;;Nominal Bit rate in bps;
+BitRate_Nominal/String;;;Y NT;;;Nominal Bit rate (with measurement);
+BitRate_Maximum;; bps;N YF;;;Maximum Bit rate in bps;
+BitRate_Maximum/String;;;Y NT;;;Maximum Bit rate (with measurement)
+BitRate_Encoded;; bps;N YF;;;Encoded (with forced padding) bit rate in bps, if some container padding is present
+BitRate_Encoded/String;;;Y NT;;;Encoded (with forced padding) bit rate (with measurement), if some container padding is present
+Width;; pixel;N YI;;;Width
+Width/String;;;Y NT;;;
+Height;; pixel;N YI;;;Height
+Height/String;;;Y NT;;;
+FrameRate_Mode;;;N YT;;;Frame rate mode (CFR, VFR)
+FrameRate_Mode/String;;;Y NT;;;Frame rate mode (Constant, Variable)
+FrameRate;; fps;N YF;;;Frames per second
+FrameRate/String;;;Y NT;;;Frames per second (with measurement)
+FrameRate_Minimum;; fps;N YF;;;Minimum Frames per second
+FrameRate_Minimum/String;;;Y NT;;;Minimum Frames per second (with measurement)
+FrameRate_Nominal;; fps;N YF;;;Nominal Frames per second
+FrameRate_Nominal/String;;;Y NT;;;Nominal Frames per second (with measurement)
+FrameRate_Maximum;; fps;N YF;;;Maximum Frames per second
+FrameRate_Maximum/String;;;Y NT;;;Maximum Frames per second (with measurement)
+FrameRate_Original;; fps;N YF;;;Original (in the raw stream) Frames per second
+FrameRate_Original/String;;;Y NT;;;Original (in the raw stream) Frames per second (with measurement)
+FrameCount;;;N NI;;;Number of frames
+Source_FrameCount;;;N NI;;;Source Number of frames
+ColorSpace;;;Y YT;;;
+ChromaSubsampling;;;Y YT;;;
+Resolution;; bit;N NI;;;Deprecated, do not use in new projects
+Resolution/String;;;N NT;;;Deprecated, do not use in new projects
+BitDepth;; bit;N YI;;;
+BitDepth/String;;;Y NT;;;
+Compression_Mode;;;N YT;;;Compression mode (Lossy or Lossless)
+Compression_Mode/String;;;Y NT;;;Compression mode (Lossy or Lossless)
+Compression_Ratio;;;Y YF;;;Current stream size divided by uncompressed stream size;;
+Delay;; ms;N NI;;;Delay fixed in the stream (relative) IN MS;
+Delay/String;;;N NT;;;Delay with measurement;
+Delay/String1;;;N NT;;;Delay with measurement;
+Delay/String2;;;N NT;;;Delay with measurement;
+Delay/String3;;;N NT;;;Delay in format : HH:MM:SS.MMM;
+Delay/String4;;;N NT;;;Delay in format : HH:MM:SS:FF (HH:MM:SS;FF for drop frame, if available)
+Delay_Settings;;;N NT;;;Delay settings (in case of timecode for example);
+Delay_Source;;;N NT;;;Delay source (Container or Stream or empty);
+Delay_Source/String;;;N NT;;;Delay source (Container or Stream or empty);
+Delay_Original;; ms;N NI;;;Delay fixed in the raw stream (relative) IN MS;
+Delay_Original/String;;;N NT;;;Delay with measurement;
+Delay_Original/String1;;;N NT;;;Delay with measurement;
+Delay_Original/String2;;;N NT;;;Delay with measurement;
+Delay_Original/String3;;;N NT;;;Delay in format: HH:MM:SS.MMM;;
+Delay_Original/String4;;;N NT;;;Delay in format: HH:MM:SS:FF (HH:MM:SS;FF for drop frame, if available);
+Delay_Original_Settings;;;N NT;;;Delay settings (in case of timecode for example);;
+Delay_Original_Source;;;N NT;;;Delay source (Stream or empty);
+Video_Delay;; ms;N NI;;;Delay fixed in the stream (absolute / video)
+Video_Delay/String;;;Y NT;;;
+Video_Delay/String1;;;N NT;;;
+Video_Delay/String2;;;N NT;;;
+Video_Delay/String3;;;N NT;;;
+Video_Delay/String4;;;N NT;;;
+Video0_Delay;; ms;N NI;;;Deprecated, do not use in new projects
+Video0_Delay/String;;;N NT;;;Deprecated, do not use in new projects
+Video0_Delay/String1;;;N NT;;;Deprecated, do not use in new projects
+Video0_Delay/String2;;;N NT;;;Deprecated, do not use in new projects
+Video0_Delay/String3;;;N NT;;;Deprecated, do not use in new projects
+Video0_Delay/String4;;;N NT;;;Deprecated, do not use in new projects
+StreamSize;; byte;N YI;;;Streamsize in bytes;;
+StreamSize/String;;;Y NT;;;Streamsize in with percentage value;;
+StreamSize/String1;;;N NT;;;;;
+StreamSize/String2;;;N NT;;;;;
+StreamSize/String3;;;N NT;;;;;
+StreamSize/String4;;;N NT;;;;;
+StreamSize/String5;;;N NT;;;Streamsize in with percentage value;;
+StreamSize_Proportion;;;N NT;;;Stream size divided by file size;;
+Source_StreamSize;; byte;N YI;;;Source Streamsize in bytes;;
+Source_StreamSize/String;;;Y NT;;;Source Streamsize in with percentage value;;
+Source_StreamSize/String1;;;N NT;;;;;
+Source_StreamSize/String2;;;N NT;;;;;
+Source_StreamSize/String3;;;N NT;;;;;
+Source_StreamSize/String4;;;N NT;;;;;
+Source_StreamSize/String5;;;N NT;;;Source Streamsize in with percentage value;;
+Source_StreamSize_Proportion;;;N NT;;;Source Stream size divided by file size;;
+StreamSize_Encoded;; byte;N YI;;;Encoded Streamsize in bytes;;
+StreamSize_Encoded/String;;;Y NT;;;Encoded Streamsize in with percentage value;;
+StreamSize_Encoded/String1;;;N NT;;;;;
+StreamSize_Encoded/String2;;;N NT;;;;;
+StreamSize_Encoded/String3;;;N NT;;;;;
+StreamSize_Encoded/String4;;;N NT;;;;;
+StreamSize_Encoded/String5;;;N NT;;;Encoded Streamsize in with percentage value;;
+StreamSize_Encoded_Proportion;;;N NT;;;Encoded Stream size divided by file size;;
+Source_StreamSize_Encoded;; byte;N YI;;;Source Encoded Streamsize in bytes;;
+Source_StreamSize_Encoded/String;;;Y NT;;;Source Encoded Streamsize in with percentage value;;
+Source_StreamSize_Encoded/String1;;;N NT;;;;;
+Source_StreamSize_Encoded/String2;;;N NT;;;;;
+Source_StreamSize_Encoded/String3;;;N NT;;;;;
+Source_StreamSize_Encoded/String4;;;N NT;;;;;
+Source_StreamSize_Encoded/String5;;;N NT;;;Source Encoded Streamsize in with percentage value;;
+Source_StreamSize_Encoded_Proportion;;;N NT;;;Source Encoded Stream size divided by file size;;
+Title;;;Y YI;;;Name of the track
+Encoded_Library;;;N YT;;;Software used to create the file
+Encoded_Library/String;;;Y NT;;;Software used to create the file
+Encoded_Library/Name;;;N NT;;;Info from the software
+Encoded_Library/Version;;;N NT;;;Version of software
+Encoded_Library/Date;;;N NT;;;Release date of software
+Encoded_Library_Settings;;;Y YT;;;Parameters used by the software
+Language;;;N YT;;;Language (2-letter ISO 639-1 if exists, else 3-letter ISO 639-2, and with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn)
+Language/String;;;Y NT;;;Language (full)
+Language/String1;;;N NT;;;Language (full)
+Language/String2;;;N NT;;;Language (2-letter ISO 639-1 if exists, else empty)
+Language/String3;;;N NT;;;Language (3-letter ISO 639-2 if exists, else empty);;
+Language/String4;;;N NT;;;Language (2-letter ISO 639-1 if exists with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn, else empty);;
+Language_More;;;Y YT;;;More info about Language (e.g. Director's Comment);;
+Default;;Yes;N YT;;;Set if that track should be used if no language found matches the user preference.
+Default/String;;;Y NT;;;Set if that track should be used if no language found matches the user preference.
+Forced;;Yes;N YT;;;Set if that track should be used if no language found matches the user preference.
+Forced/String;;;Y NT;;;Set if that track should be used if no language found matches the user preference.
+Summary;;;N NT;;;;;
+Encoded_Date;;;Y YT;;;The time that the encoding of this item was completed began.;;Temporal
+Tagged_Date;;;Y YT;;;The time that the tags were done for this item.;;Temporal
+Encryption;;;Y YT;;;;;

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/Stream/Video.csv Added

@@ -0,0 +1,248 @@
+Count;;;N NI;;;Number of objects available in this stream
+Status;;;N NI;;;bit field (0=IsAccepted, 1=IsFilled, 2=IsUpdated, 3=IsFinished)
+StreamCount;;;N NI;;;Number of streams of this kind available
+StreamKind;Video;;N NI;;;Stream type name
+StreamKind/String;;;N NI;;;Stream type name
+StreamKindID;;;N NI;;;Number of the stream (base=0)
+StreamKindPos;;;N NI;;;When multiple streams, number of the stream (base=1)
+StreamOrder;;;N NI;;;Stream order in the file, whatever is the kind of stream (base=0)
+Inform;;;N NT;;;Last **Inform** call
+ID;;;N YI;;;The ID for this stream in this file
+ID/String;;;Y NT;;;The ID for this stream in this file
+UniqueID;;;N YI;;;The unique ID for this stream, should be copied with stream copy
+UniqueID/String;;;Y NT;;;A unique ID for this stream, should be copied with stream copy
+MenuID;;;N YI;;;The menu ID for this stream in this file
+MenuID/String;;;Y NT;;;The menu ID for this stream in this file
+Format;;;Y YT;;;Format used
+Format/Info;;;Y NT;;;Info about Format
+Format/Url;;;N NT;;;Link
+Format_Commercial;;;N NT;;;Commercial name used by vendor for theses setings or Format field if there is no difference
+Format_Commercial_IfAny;;;Y NT;;;Commercial name used by vendor for theses setings if there is one
+Format_Version;;;Y NT;;;Version of this format
+Format_Profile;;;Y NT;;;Profile of the Format
+Format_Compression;;;N YT;;;Compression mode of the Format
+MultiView_BaseProfile;;;Y NT;;;Multiview, profile of the base stream
+MultiView_Count;;;Y NT;;;Multiview, count of views
+MultiView_Layout;;;Y NT;;;Multiview, how views are muxed in the container in case of it is not muxing in the stream
+Format_Settings;;;N NT;;;Settings needed for decoder used, summary
+Format_Settings_BVOP;;Yes;N YT;;;Settings needed for decoder used, detailled
+Format_Settings_BVOP/String;;;Y NT;;;Settings needed for decoder used, detailled
+Format_Settings_QPel;;Yes;N YT;;;Settings needed for decoder used, detailled
+Format_Settings_QPel/String;;;Y NT;;;Settings needed for decoder used, detailled
+Format_Settings_GMC;; warppoint;N YI;;;Settings needed for decoder used, detailled
+Format_Settings_GMC/String;;;Y NT;;;
+Format_Settings_Matrix;;;N YT;;;Settings needed for decoder used, detailled
+Format_Settings_Matrix/String;;;Y NT;;;Settings needed for decoder used, detailled
+Format_Settings_Matrix_Data;;;N NT;;;Matrix, in binary format encoded BASE64. Order = intra, non-intra, gray intra, gray non-intra
+Format_Settings_CABAC;;Yes;N YT;;;Settings needed for decoder used, detailled
+Format_Settings_CABAC/String;;;Y NT;;;Settings needed for decoder used, detailled
+Format_Settings_RefFrames;; frame;N YI;;;Settings needed for decoder used, detailled
+Format_Settings_RefFrames/String;;;Y NT;;;Settings needed for decoder used, detailled
+Format_Settings_Pulldown;;;Y YT;;;Settings needed for decoder used, detailled
+Format_Settings_FrameMode;;;Y YT;;;Settings needed for decoder used, detailled
+Format_Settings_GOP;;;Y YT;;;Settings needed for decoder used, detailled (M=x N=y)
+Format_Settings_FrameStructures;;;Y YT;;;Settings needed for decoder used, detailled (Type of frame, and field/frame info)
+Format_Settings_Wrapping;;;Y YT;;;Wrapping mode (Frame wrapped or Clip wrapped)
+InternetMediaType;;;N YT;;;Internet Media Type (aka MIME Type, Content-Type)
+MuxingMode;;;Y NT;;;How this file is muxed in the container
+CodecID;;;Y NT;;;Codec ID (found in some containers);;
+CodecID/String;;;Y NT;;;Codec ID (found in some containers);;
+CodecID/Info;;;Y NT;;;Info on the codec
+CodecID/Hint;;;Y NT;;;Hint/popular name for this codec
+CodecID/Url;;;N NT;;;Homepage for more details about this codec
+CodecID_Description;;;Y NT;;;Manual description given by the container
+Codec;;;N NT;;;Deprecated, do not use in new projects
+Codec/String;;;N NT;;;Deprecated, do not use in new projects
+Codec/Family;;;N NT;;;Deprecated, do not use in new projects
+Codec/Info;;;N NT;;;Deprecated, do not use in new projects
+Codec/Url;;;N NT;;;Deprecated, do not use in new projects
+Codec/CC;;;N NT;;;Deprecated, do not use in new projects
+Codec_Profile;;;N NT;;;Deprecated, do not use in new projects
+Codec_Description;;;N NT;;;Deprecated, do not use in new projects
+Codec_Settings;;;N NT;;;Deprecated, do not use in new projects
+Codec_Settings_PacketBitStream;;;N NT;;;Deprecated, do not use in new projects
+Codec_Settings_BVOP;;;N NT;;;Deprecated, do not use in new projects
+Codec_Settings_QPel;;;N NT;;;Deprecated, do not use in new projects
+Codec_Settings_GMC;; warppoint;N NT;;;Deprecated, do not use in new projects
+Codec_Settings_GMC/String;;;N NT;;;Deprecated, do not use in new projects
+Codec_Settings_Matrix;;;N NT;;;Deprecated, do not use in new projects
+Codec_Settings_Matrix_Data;;;N NT;;;Deprecated, do not use in new projects
+Codec_Settings_CABAC;;;N NT;;;Deprecated, do not use in new projects
+Codec_Settings_RefFrames;;;N NT;;;Deprecated, do not use in new projects
+Duration;; ms;N YI;;;Play time of the stream in ms;
+Duration/String;;;Y NT;;;Play time in format : XXx YYy only, YYy omited if zero;
+Duration/String1;;;N NT;;;Play time in format : HHh MMmn SSs MMMms, XX omited if zero;
+Duration/String2;;;N NT;;;Play time in format : XXx YYy only, YYy omited if zero;
+Duration/String3;;;N NT;;;Play time in format : HH:MM:SS.MMM;
+Duration/String4;;;N NT;;;Play time in format : HH:MM:SS:FF (HH:MM:SS;FF for drop frame, if available)
+Duration_FirstFrame;; ms;N YI;;;Duration of the first frame if it is longer than others, in ms;
+Duration_FirstFrame/String;;;Y NT;;;Duration of the first frame if it is longer than others, in format : XXx YYy only, YYy omited if zero;
+Duration_FirstFrame/String1;;;N NT;;;Duration of the first frame if it is longer than others, in format : HHh MMmn SSs MMMms, XX omited if zero;
+Duration_FirstFrame/String2;;;N NT;;;Duration of the first frame if it is longer than others, in format : XXx YYy only, YYy omited if zero;
+Duration_FirstFrame/String3;;;N NT;;;Duration of the first frame if it is longer than others, in format : HH:MM:SS.MMM;
+Duration_LastFrame;; ms;N YI;;;Duration of the last frame if it is longer than others, in ms;
+Duration_LastFrame/String;;;Y NT;;;Duration of the last frame if it is longer than others, in format : XXx YYy only, YYy omited if zero;
+Duration_LastFrame/String1;;;N NT;;;Duration of the last frame if it is longer than others, in format : HHh MMmn SSs MMMms, XX omited if zero;
+Duration_LastFrame/String2;;;N NT;;;Duration of the last frame if it is longer than others, in format : XXx YYy only, YYy omited if zero;
+Duration_LastFrame/String3;;;N NT;;;Duration of the last frame if it is longer than others, in format : HH:MM:SS.MMM;
+Source_Duration;; ms;N YI;;;Source Play time of the stream;;
+Source_Duration/String;;;Y NT;;;Source Play time in format : XXx YYy only, YYy omited if zero;;
+Source_Duration/String1;;;N NT;;;Source Play time in format : HHh MMmn SSs MMMms, XX omited if zero;;
+Source_Duration/String2;;;N NT;;;Source Play time in format : XXx YYy only, YYy omited if zero;;
+Source_Duration/String3;;;N NT;;;Source Play time in format : HH:MM:SS.MMM;;
+Source_Duration_FirstFrame;; ms;N YI;;;Source Duration of the first frame if it is longer than others, in ms;
+Source_Duration_FirstFrame/String;;;Y NT;;;Source Duration of the first frame if it is longer than others, in format : XXx YYy only, YYy omited if zero;
+Source_Duration_FirstFrame/String1;;;N NT;;;Source Duration of the first frame if it is longer than others, in format : HHh MMmn SSs MMMms, XX omited if zero;
+Source_Duration_FirstFrame/String2;;;N NT;;;Source Duration of the first frame if it is longer than others, in format : XXx YYy only, YYy omited if zero;
+Source_Duration_FirstFrame/String3;;;N NT;;;Source Duration of the first frame if it is longer than others, in format : HH:MM:SS.MMM;
+Source_Duration_LastFrame;; ms;N YI;;;Source Duration of the last frame if it is longer than others, in ms;
+Source_Duration_LastFrame/String;;;Y NT;;;Source Duration of the last frame if it is longer than others, in format : XXx YYy only, YYy omited if zero;
+Source_Duration_LastFrame/String1;;;N NT;;;Source Duration of the last frame if it is longer than others, in format : HHh MMmn SSs MMMms, XX omited if zero;
+Source_Duration_LastFrame/String2;;;N NT;;;Source Duration of the last frame if it is longer than others, in format : XXx YYy only, YYy omited if zero;
+Source_Duration_LastFrame/String3;;;N NT;;;Source Duration of the last frame if it is longer than others, in format : HH:MM:SS.MMM;
+BitRate_Mode;;;N YT;;;Bit rate mode (VBR, CBR);
+BitRate_Mode/String;;;Y NT;;;Bit rate mode (Variable, Cconstant);
+BitRate;; bps;N YF;;;Bit rate in bps;
+BitRate/String;;;Y NT;;;Bit rate (with measurement);
+BitRate_Minimum;; bps;N YF;;;Minimum Bit rate in bps;
+BitRate_Minimum/String;;;Y NT;;;Minimum Bit rate (with measurement)
+BitRate_Nominal;; bps;N YF;;;Nominal Bit rate in bps
+BitRate_Nominal/String;;;Y NT;;;Nominal Bit rate (with measurement)
+BitRate_Maximum;; bps;N YF;;;Maximum Bit rate in bps
+BitRate_Maximum/String;;;Y NT;;;Maximum Bit rate (with measurement)
+BitRate_Encoded;; bps;N YF;;;Encoded (with forced padding) bit rate in bps, if some container padding is present
+BitRate_Encoded/String;;;Y NT;;;Encoded (with forced padding) bit rate (with measurement), if some container padding is present
+Width;; pixel;N YI;;;Width (aperture size if present) in pixel
+Width/String;;;Y NT;;;Width (aperture size if present) with measurement (pixel)
+Width_Offset;; pixel;N YI;;;Offset between original width and displayed width (aperture size) in pixel
+Width_Offset/String;;;N NT;;;Offset between original width and displayed width (aperture size)  in pixel
+Width_Original;; pixel;N YI;;;Original (in the raw stream) width in pixel
+Width_Original/String;;;Y NT;;;Original (in the raw stream) width with measurement (pixel)
+Height;; pixel;N YI;;;Height (aperture size if present) in pixel
+Height/String;;;Y NT;;;Height (aperture size if present) with measurement (pixel)
+Height_Offset;; pixel;N YI;;;Offset between original height and displayed height (aperture size) in pixel
+Height_Offset/String;;;N NT;;;Offset between original height and displayed height (aperture size)  in pixel
+Height_Original;; pixel;N YI;;;Original (in the raw stream) height in pixel
+Height_Original/String;;;Y NT;;;Original (in the raw stream) height with measurement (pixel)
+PixelAspectRatio;;;N YF;;;Pixel Aspect ratio
+PixelAspectRatio/String;;;N NT;;;Pixel Aspect ratio
+PixelAspectRatio_Original;;;N YF;;;Original (in the raw stream) Pixel Aspect ratio
+PixelAspectRatio_Original/String;;;N NT;;;Original (in the raw stream) Pixel Aspect ratio
+DisplayAspectRatio;;;N YF;;;Display Aspect ratio
+DisplayAspectRatio/String;;;Y NT;;;Display Aspect ratio
+DisplayAspectRatio_Original;;;N YF;;;Original (in the raw stream) Display Aspect ratio
+DisplayAspectRatio_Original/String;;;Y NT;;;Original (in the raw stream) Display Aspect ratio
+ActiveFormatDescription;;;N YN;;;Active Format Description (AFD value)
+ActiveFormatDescription/String;;;Y NT;;;Active Format Description (text)
+ActiveFormatDescription_MuxingMode;;;N YT;;;Active Format Description (AFD value) muxing mode (Ancillary or Raw stream)
+Rotation;;;N YT;;;Rotation
+Rotation/String;;;Y NT;;;Rotation (if not horizontal)
+FrameRate_Mode;;;N YT;;;Frame rate mode (CFR, VFR)
+FrameRate_Mode/String;;;Y NT;;;Frame rate mode (Constant, Variable)
+FrameRate_Mode_Original;;;N YT;;;Original frame rate mode (CFR, VFR)
+FrameRate_Mode_Original/String;;;Y NT;;;Original frame rate mode (Constant, Variable)
+FrameRate;; fps;N YF;;;Frames per second
+FrameRate/String;;;Y NT;;;Frames per second (with measurement)
+FrameRate_Original;; fps;N YF;;;Original (in the raw stream) frames per second
+FrameRate_Original/String;;;Y NT;;;Original (in the raw stream) frames per second (with measurement)
+FrameRate_Minimum;; fps;N YF;;;Minimum Frames per second
+FrameRate_Minimum/String;;;Y NT;;;Minimum Frames per second (with measurement)
+FrameRate_Nominal;; fps;N YF;;;Nominal Frames per second
+FrameRate_Nominal/String;;;Y NT;;;Nominal Frames per second (with measurement)
+FrameRate_Maximum;; fps;N YF;;;Maximum Frames per second
+FrameRate_Maximum/String;;;Y NT;;;Maximum Frames per second (with measurement)
+FrameCount;;;N NI;;;Number of frames
+Source_FrameCount;;;N NI;;;Source Number of frames
+Standard;;;Y NT;;;NTSC or PAL
+Resolution;; bit;N NI;;;Deprecated, do not use in new projects
+Resolution/String;;;N NT;;;Deprecated, do not use in new projects
+Colorimetry;;;N NT;;;Deprecated, do not use in new projects
+ColorSpace;;;Y YT;;;
+ChromaSubsampling;;;Y YT;;;
+BitDepth;; bit;N YI;;;16/24/32
+BitDepth/String;;;Y NT;;;16/24/32 bits
+ScanType;;;N YT;;;
+ScanType/String;;;Y NT;;;
+ScanOrder;;;N YT;;;;
+ScanOrder/String;;;Y NT;;;;
+Interlacement;;;N NT;;;Deprecated, do not use in new projects;
+Interlacement/String;;;N NT;;;Deprecated, do not use in new projects;
+Compression_Mode;;;N YT;;;Compression mode (Lossy or Lossless)
+Compression_Mode/String;;;Y NT;;;Compression mode (Lossy or Lossless)
+Compression_Ratio;;;Y YF;;;Current stream size divided by uncompressed stream size;;
+Bits-(Pixel*Frame);;;Y YF;;;bits/(Pixel*Frame) (like Gordian Knot);
+Delay;; ms;N NI;;;Delay fixed in the stream (relative) IN MS;
+Delay/String;;;N NT;;;Delay with measurement;
+Delay/String1;;;N NT;;;Delay with measurement;
+Delay/String2;;;N NT;;;Delay with measurement;
+Delay/String3;;;N NT;;;Delay in format : HH:MM:SS.MMM;
+Delay/String4;;;N NT;;;Delay in format : HH:MM:SS:FF (HH:MM:SS;FF for drop frame, if available)
+Delay_Settings;;;N NT;;;Delay settings (in case of timecode for example);
+Delay_Source;;;N NT;;;Delay source (Container or Stream or empty);
+Delay_Source/String;;;N NT;;;Delay source (Container or Stream or empty);
+Delay_Original;; ms;N NI;;;Delay fixed in the raw stream (relative) IN MS;
+Delay_Original/String;;;N NT;;;Delay with measurement;
+Delay_Original/String1;;;N NT;;;Delay with measurement;
+Delay_Original/String2;;;N NT;;;Delay with measurement;
+Delay_Original/String3;;;N NT;;;Delay in format: HH:MM:SS.MMM;;
+Delay_Original/String4;;;N NT;;;Delay in format: HH:MM:SS:FF (HH:MM:SS;FF for drop frame, if available);
+Delay_Original_Settings;;;N NT;;;Delay settings (in case of timecode for example);;
+Delay_Original_Source;;;N NT;;;Delay source (Stream or empty);
+StreamSize;; byte;N YI;;;Streamsize in bytes;;
+StreamSize/String;;;Y NT;;;Streamsize in with percentage value;;
+StreamSize/String1;;;N NT;;;;;
+StreamSize/String2;;;N NT;;;;;
+StreamSize/String3;;;N NT;;;;;
+StreamSize/String4;;;N NT;;;;;
+StreamSize/String5;;;N NT;;;Streamsize in with percentage value;;
+StreamSize_Proportion;;;N NT;;;Stream size divided by file size;;
+Source_StreamSize;; byte;N YI;;;Source Streamsize in bytes;;
+Source_StreamSize/String;;;Y NT;;;Source Streamsize in with percentage value;;
+Source_StreamSize/String1;;;N NT;;;;;
+Source_StreamSize/String2;;;N NT;;;;;
+Source_StreamSize/String3;;;N NT;;;;;
+Source_StreamSize/String4;;;N NT;;;;;
+Source_StreamSize/String5;;;N NT;;;Source Streamsize in with percentage value;;
+Source_StreamSize_Proportion;;;N NT;;;Source Stream size divided by file size;;
+StreamSize_Encoded;; byte;N YI;;;Encoded Streamsize in bytes;;
+StreamSize_Encoded/String;;;Y NT;;;Encoded Streamsize in with percentage value;;
+StreamSize_Encoded/String1;;;N NT;;;;;
+StreamSize_Encoded/String2;;;N NT;;;;;
+StreamSize_Encoded/String3;;;N NT;;;;;
+StreamSize_Encoded/String4;;;N NT;;;;;
+StreamSize_Encoded/String5;;;N NT;;;Encoded Streamsize in with percentage value;;
+StreamSize_Encoded_Proportion;;;N NT;;;Encoded Stream size divided by file size;;
+Source_StreamSize_Encoded;; byte;N YI;;;Source Encoded Streamsize in bytes;;
+Source_StreamSize_Encoded/String;;;Y NT;;;Source Encoded Streamsize in with percentage value;;
+Source_StreamSize_Encoded/String1;;;N NT;;;;;
+Source_StreamSize_Encoded/String2;;;N NT;;;;;
+Source_StreamSize_Encoded/String3;;;N NT;;;;;
+Source_StreamSize_Encoded/String4;;;N NT;;;;;
+Source_StreamSize_Encoded/String5;;;N NT;;;Source Encoded Streamsize in with percentage value;;
+Source_StreamSize_Encoded_Proportion;;;N NT;;;Source Encoded Stream size divided by file size;;
+Alignment;;;Y NT;;;How this stream file is aligned in the container;;
+Alignment/String;;;N YT;;;;;
+Title;;;Y YI;;;Name of the track;;
+Encoded_Application;;;Y YT;;;Software. Identifies the name of the software package used to create the file, such as Microsoft WaveEdit.;;Technical
+Encoded_Application/Url;;;N YT;;;Software. Identifies the name of the software package used to create the file, such as Microsoft WaveEdit.;;Technical
+Encoded_Library;;;N YT;;;Software used to create the file;;
+Encoded_Library/String;;;Y NT;;;Software used to create the file;;
+Encoded_Library/Name;;;N NT;;;Info from the software;;
+Encoded_Library/Version;;;N NT;;;Version of software;;
+Encoded_Library/Date;;;N NT;;;Release date of software;;
+Encoded_Library_Settings;;;Y YT;;;Parameters used by the software;;
+Language;;;N YT;;;Language (2-letter ISO 639-1 if exists, else 3-letter ISO 639-2, and with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn);;
+Language/String;;;Y NT;;;Language (full);;
+Language/String1;;;N NT;;;Language (full);;
+Language/String2;;;N NT;;;Language (2-letter ISO 639-1 if exists, else empty);;
+Language/String3;;;N NT;;;Language (3-letter ISO 639-2 if exists, else empty);;
+Language/String4;;;N NT;;;Language (2-letter ISO 639-1 if exists with optional ISO 3166-1 country separated by a dash if available, e.g. en, en-us, zh-cn, else empty);;
+Language_More;;;Y YT;;;More info about Language (e.g. Director's Comment);;
+Default;;Yes;N YT;;;Set if that track should be used if no language found matches the user preference.
+Default/String;;;Y NT;;;Set if that track should be used if no language found matches the user preference.
+Forced;;Yes;N YT;;;Set if that track should be used if no language found matches the user preference.
+Forced/String;;;Y NT;;;Set if that track should be used if no language found matches the user preference.
+Encoded_Date;;;Y YT;;;UTC time that the encoding of this item was completed began.;;Temporal
+Tagged_Date;;;Y YT;;;UTC time that the tags were done for this item.;;Temporal
+Encryption;;;Y YT;;;;;
+BufferSize;;;N YT;;;Defines the size of the buffer needed to decode the sequence.

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/_.1.txt Added

@@ -0,0 +1,36 @@
+// File__Analyze - Base for analyze files
+// Copyright (C) 2005-2012 MediaArea.net SARL, Info@MediaArea.net
+//
+// 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
+// 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, see <http://www.gnu.org/licenses/>.
+//
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//
+// Automaticly generated methods for MediaInfo
+// Don't modify, this will be deleted at the next automatic update
+//
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+//---------------------------------------------------------------------------
+#include "MediaInfo/PreComp.h"
+#include "ZenLib/ZtringListList.h"
+#include "ZenLib/InfoMap.h"
+#include "ZenLib/Translation.h"
+using namespace ZenLib;
+//---------------------------------------------------------------------------
+
+namespace MediaInfoLib
+{

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/_.2.txt Added

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/_.5.txt Changed

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/_.8.txt Changed

libmediainfo_0.7.60.tar.bz2/Source/Resource/Text/_.9.txt Changed

libmediainfo_0.7.60.tar.bz2/Source/ThirdParty Added

libmediainfo_0.7.60.tar.bz2/Source/ThirdParty/base64 Added

libmediainfo_0.7.60.tar.bz2/Source/ThirdParty/base64/base64.h Added

@@ -0,0 +1,158 @@
+// &#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f; //
+// &#x7f;####   ###     ##                -= Base64 library =-                &#x7f; //
+// &#x7f;#   # #       # # Base64.h - Base64 encoder/decoder                  &#x7f; //
+// &#x7f;####  ####   #  #                                                    &#x7f; //
+// &#x7f;#   # #   # ##### Encodes and decodes base64 strings                 &#x7f; //
+// &#x7f;#   # #   #     # Ideas taken from work done by Bob Withers          &#x7f; //
+// &#x7f;####   ###      # R1                      2002-05-07 by Markus Ewald &#x7f; //
+// &#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f;&#x7f; //
+#ifndef B64_BASE64_H
+#define B64_BASE64_H
+
+#include <string>
+
+namespace Base64 {
+
+  /// Encode string to base64
+  inline std::string encode(const std::string &sString);
+  /// Encode base64 into string
+  inline std::string decode(const std::string &sString);
+
+}; // namespace Base64
+
+// ####################################################################### //
+// # Base64::encode()                                                    # //
+// ####################################################################### //
+/** Encodes the specified string to base64
+
+    @param  sString  String to encode
+    @return Base64 encoded string
+*/
+inline std::string Base64::encode(const std::string &sString) {
+  static const std::string sBase64Table(
+  // 0000000000111111111122222222223333333333444444444455555555556666
+  // 0123456789012345678901234567890123456789012345678901234567890123
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
+  );
+  static const char cFillChar = '=';
+  std::string::size_type   nLength = sString.length();
+  std::string              sResult;
+
+  // Allocate memory for the converted string
+  sResult.reserve(nLength * 8 / 6 + 1);
+
+  for(std::string::size_type nPos = 0; nPos < nLength; nPos++) {
+    char cCode;
+  
+    // Encode the first 6 bits
+    cCode = (sString[nPos] >> 2) & 0x3f;
+    sResult.append(1, sBase64Table[cCode]);
+
+    // Encode the remaining 2 bits with the next 4 bits (if present)
+    cCode = (sString[nPos] << 4) & 0x3f;
+    if(++nPos < nLength)
+      cCode |= (sString[nPos] >> 4) & 0x0f;
+    sResult.append(1, sBase64Table[cCode]);
+
+    if(nPos < nLength) {
+      cCode = (sString[nPos] << 2) & 0x3f;
+      if(++nPos < nLength)
+        cCode |= (sString[nPos] >> 6) & 0x03;
+
+      sResult.append(1, sBase64Table[cCode]);
+    } else {
+      ++nPos;
+      sResult.append(1, cFillChar);
+    }
+
+    if(nPos < nLength) {
+      cCode = sString[nPos] & 0x3f;
+      sResult.append(1, sBase64Table[cCode]);
+    } else {
+      sResult.append(1, cFillChar);
+    }
+  }
+
+  return sResult;
+}
+
+// ####################################################################### //
+// # Base64::decode()                                                    # //
+// ####################################################################### //
+/** Decodes the specified base64 string
+
+    @param  sString  Base64 string to decode
+    @return Decoded string
+*/
+inline std::string Base64::decode(const std::string &sString) {
+  static const std::string::size_type np = std::string::npos;
+  static const std::string::size_type DecodeTable[] = {
+  // 0   1   2   3   4   5   6   7   8   9 
+    np, np, np, np, np, np, np, np, np, np,  //   0 -   9
+    np, np, np, np, np, np, np, np, np, np,  //  10 -  19
+    np, np, np, np, np, np, np, np, np, np,  //  20 -  29
+    np, np, np, np, np, np, np, np, np, np,  //  30 -  39
+    np, np, np, 62, np, np, np, 63, 52, 53,  //  40 -  49
+    54, 55, 56, 57, 58, 59, 60, 61, np, np,  //  50 -  59
+    np, np, np, np, np,  0,  1,  2,  3,  4,  //  60 -  69
+     5,  6,  7,  8,  9, 10, 11, 12, 13, 14,  //  70 -  79
+    15, 16, 17, 18, 19, 20, 21, 22, 23, 24,  //  80 -  89
+    25, np, np, np, np, np, np, 26, 27, 28,  //  90 -  99
+    29, 30, 31, 32, 33, 34, 35, 36, 37, 38,  // 100 - 109
+    39, 40, 41, 42, 43, 44, 45, 46, 47, 48,  // 110 - 119
+    49, 50, 51, np, np, np, np, np, np, np,  // 120 - 129
+    np, np, np, np, np, np, np, np, np, np,  // 130 - 139
+    np, np, np, np, np, np, np, np, np, np,  // 140 - 149
+    np, np, np, np, np, np, np, np, np, np,  // 150 - 159
+    np, np, np, np, np, np, np, np, np, np,  // 160 - 169
+    np, np, np, np, np, np, np, np, np, np,  // 170 - 179
+    np, np, np, np, np, np, np, np, np, np,  // 180 - 189
+    np, np, np, np, np, np, np, np, np, np,  // 190 - 199
+    np, np, np, np, np, np, np, np, np, np,  // 200 - 209
+    np, np, np, np, np, np, np, np, np, np,  // 210 - 219
+    np, np, np, np, np, np, np, np, np, np,  // 220 - 229
+    np, np, np, np, np, np, np, np, np, np,  // 230 - 239
+    np, np, np, np, np, np, np, np, np, np,  // 240 - 249
+    np, np, np, np, np, np                   // 250 - 256
+  };
+  static const char cFillChar = '=';
+
+  std::string::size_type nLength = sString.length();
+  std::string            sResult;
+
+  sResult.reserve(nLength);
+
+  for(std::string::size_type nPos = 0; nPos < nLength; nPos++) {
+    unsigned char c, c1;
+
+    c = (char) DecodeTable[(unsigned char)sString[nPos]];
+    nPos++;
+    c1 = (char) DecodeTable[(unsigned char)sString[nPos]];
+    c = (c << 2) | ((c1 >> 4) & 0x3);
+    sResult.append(1, c);
+
+    if(++nPos < nLength) {
+      c = sString[nPos];
+      if(cFillChar == c)
+        break;
+
+      c = (char) DecodeTable[(unsigned char)sString[nPos]];
+      c1 = ((c1 << 4) & 0xf0) | ((c >> 2) & 0xf);
+      sResult.append(1, c1);
+    }
+
+    if(++nPos < nLength) {
+      c1 = sString[nPos];
+      if(cFillChar == c1)
+        break;
+
+      c1 = (char) DecodeTable[(unsigned char)sString[nPos]];
+      c = ((c << 6) & 0xc0) | c1;
+      sResult.append(1, c);
+    }
+  }
+
+  return sResult;
+}
+
+#endif // B64_BASE64_H

libmediainfo_0.7.60.tar.bz2/Source/ThirdParty/tinyxml2 Added

libmediainfo_0.7.60.tar.bz2/Source/ThirdParty/tinyxml2/tinyxml2.cpp Added

@@ -0,0 +1,2020 @@
+/*
+Original code by Lee Thomason (www.grinninglizard.com)
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any
+damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any
+purpose, including commercial applications, and to alter it and
+redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must
+not claim that you wrote the original software. If you use this
+software in a product, an acknowledgment in the product documentation
+would be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and
+must not be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+distribution.
+*/
+
+#include "tinyxml2.h"
+
+#include <cstdio>
+#include <cstdlib>
+#include <new>
+#include <cstddef>
+
+using namespace tinyxml2;
+using namespace std;
+
+static const char LINE_FEED				= (char)0x0a;			// all line endings are normalized to LF
+static const char LF = LINE_FEED;
+static const char CARRIAGE_RETURN		= (char)0x0d;			// CR gets filtered out
+static const char CR = CARRIAGE_RETURN;
+static const char SINGLE_QUOTE			= '\'';
+static const char DOUBLE_QUOTE			= '\"';
+
+// Bunch of unicode info at:
+//		http://www.unicode.org/faq/utf_bom.html
+//	ef bb bf (Microsoft "lead bytes") - designates UTF-8
+
+static const unsigned char TIXML_UTF_LEAD_0 = 0xefU;
+static const unsigned char TIXML_UTF_LEAD_1 = 0xbbU;
+static const unsigned char TIXML_UTF_LEAD_2 = 0xbfU;
+
+
+#define DELETE_NODE( node )	{			\
+	if ( node ) {						\
+		MemPool* pool = node->memPool;	\
+		node->~XMLNode();				\
+		pool->Free( node );				\
+	}									\
+}
+#define DELETE_ATTRIBUTE( attrib ) {		\
+	if ( attrib ) {							\
+		MemPool* pool = attrib->memPool;	\
+		attrib->~XMLAttribute();			\
+		pool->Free( attrib );				\
+	}										\
+}
+
+struct Entity {
+	const char* pattern;
+	int length;
+	char value;
+};
+
+static const int NUM_ENTITIES = 5;
+static const Entity entities[NUM_ENTITIES] = 
+{
+	{ "quot", 4,	DOUBLE_QUOTE },
+	{ "amp", 3,		'&'  },
+	{ "apos", 4,	SINGLE_QUOTE },
+	{ "lt",	2, 		'<'	 },
+	{ "gt",	2,		'>'	 }
+};
+
+
+StrPair::~StrPair()
+{
+	Reset();
+}
+
+
+void StrPair::Reset()
+{
+	if ( flags & NEEDS_DELETE ) {
+		delete [] start;
+	}
+	flags = 0;
+	start = 0;
+	end = 0;
+}
+
+
+void StrPair::SetStr( const char* str, int flags )
+{
+	Reset();
+	size_t len = strlen( str );
+	start = new char[ len+1 ];
+	memcpy( start, str, len+1 );
+	end = start + len;
+	this->flags = flags | NEEDS_DELETE;
+}
+
+
+char* StrPair::ParseText( char* p, const char* endTag, int strFlags )
+{
+	TIXMLASSERT( endTag && *endTag );
+
+	char* start = p;	// fixme: hides a member
+	char  endChar = *endTag;
+	size_t length = strlen( endTag );
+
+	// Inner loop of text parsing.
+	while ( *p ) {
+		if ( *p == endChar && strncmp( p, endTag, length ) == 0 ) {
+			Set( start, p, strFlags );
+			return p + length;
+		}
+		++p;
+	}	
+	return 0;
+}
+
+
+char* StrPair::ParseName( char* p )
+{
+	char* start = p;
+
+	if ( !start || !(*start) ) {
+		return 0;
+	}
+
+	if ( !XMLUtil::IsAlpha( *p ) ) {
+		return 0;
+	}
+
+	while( *p && (
+			   XMLUtil::IsAlphaNum( (unsigned char) *p ) 
+			|| *p == '_'
+			|| *p == '-'
+			|| *p == '.'
+			|| *p == ':' ))
+	{
+		++p;
+	}
+
+	if ( p > start ) {
+		Set( start, p, 0 );
+		return p;
+	}
+	return 0;
+}
+
+
+
+const char* StrPair::GetStr()
+{
+	if ( flags & NEEDS_FLUSH ) {
+		*end = 0;
+		flags ^= NEEDS_FLUSH;
+
+		if ( flags ) {
+			char* p = start;	// the read pointer
+			char* q = start;	// the write pointer
+
+			while( p < end ) {
+				if ( (flags & NEEDS_NEWLINE_NORMALIZATION) && *p == CR ) {
+					// CR-LF pair becomes LF
+					// CR alone becomes LF
+					// LF-CR becomes LF
+					if ( *(p+1) == LF ) {
+						p += 2;
+					}
+					else {
+						++p;
+					}
+					*q++ = LF;
+				}
+				else if ( (flags & NEEDS_NEWLINE_NORMALIZATION) && *p == LF ) {
+					if ( *(p+1) == CR ) {
+						p += 2;
+					}
+					else {
+						++p;
+					}
+					*q++ = LF;
+				}
+				else if ( (flags & NEEDS_ENTITY_PROCESSING) && *p == '&' ) {
+					// Entities handled by tinyXML2:
+					// - special entities in the entity table [in/out]
+					// - numeric character reference [in]
+					//   &#20013; or &#x4e2d;
+
+					if ( *(p+1) == '#' ) {
+						char buf[10] = { 0 };
+						int len;
+						p = const_cast<char*>( XMLUtil::GetCharacterRef( p, buf, &len ) );
+						for( int i=0; i<len; ++i ) {
+							*q++ = buf[i];
+						}
+						TIXMLASSERT( q <= p );
+					}
+					else {
+						int i=0;
+						for(; i<NUM_ENTITIES; ++i ) {
+							if (    strncmp( p+1, entities[i].pattern, entities[i].length ) == 0
+								 && *(p+entities[i].length+1) == ';' ) 
+							{
+								// Found an entity convert;
+								*q = entities[i].value;
+								++q;
+								p += entities[i].length + 2;
+								break;
+							}
+						}
+						if ( i == NUM_ENTITIES ) {
+							// fixme: treat as error?
+							++p;
+							++q;
+						}
+					}
+				}
+				else {
+					*q = *p;
+					++p;
+					++q;
+				}
+			}
+			*q = 0;
+		}
+		flags = (flags & NEEDS_DELETE);
+	}
+	return start;
+}
+
+
+
+
+// --------- XMLUtil ----------- //
+
+const char* XMLUtil::ReadBOM( const char* p, bool* bom )
+{
+	*bom = false;
+	const unsigned char* pu = reinterpret_cast<const unsigned char*>(p);
+	// Check for BOM:
+	if (    *(pu+0) == TIXML_UTF_LEAD_0 
+		 && *(pu+1) == TIXML_UTF_LEAD_1
+		 && *(pu+2) == TIXML_UTF_LEAD_2 ) 
+	{
+		*bom = true;
+		p += 3;
+	}
+	return p;
+}
+
+
+void XMLUtil::ConvertUTF32ToUTF8( unsigned long input, char* output, int* length )
+{
+	const unsigned long BYTE_MASK = 0xBF;
+	const unsigned long BYTE_MARK = 0x80;
+	const unsigned long FIRST_BYTE_MARK[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
+
+	if (input < 0x80) 
+		*length = 1;
+	else if ( input < 0x800 )
+		*length = 2;
+	else if ( input < 0x10000 )
+		*length = 3;
+	else if ( input < 0x200000 )
+		*length = 4;
+	else
+		{ *length = 0; return; }	// This code won't covert this correctly anyway.
+
+	output += *length;
+
+	// Scary scary fall throughs.
+	switch (*length) 
+	{
+		case 4:
+			--output; 
+			*output = (char)((input | BYTE_MARK) & BYTE_MASK); 
+			input >>= 6;
+		case 3:
+			--output; 
+			*output = (char)((input | BYTE_MARK) & BYTE_MASK); 
+			input >>= 6;
+		case 2:
+			--output; 
+			*output = (char)((input | BYTE_MARK) & BYTE_MASK); 
+			input >>= 6;
+		case 1:
+			--output; 
+			*output = (char)(input | FIRST_BYTE_MARK[*length]);
+	}
+}
+
+
+const char* XMLUtil::GetCharacterRef( const char* p, char* value, int* length )
+{
+	// Presume an entity, and pull it out.
+	*length = 0;
+
+	if ( *(p+1) == '#' && *(p+2) )
+	{
+		unsigned long ucs = 0;
+		ptrdiff_t delta = 0;
+		unsigned mult = 1;
+
+		if ( *(p+2) == 'x' )
+		{
+			// Hexadecimal.
+			if ( !*(p+3) ) return 0;
+
+			const char* q = p+3;
+			q = strchr( q, ';' );
+
+			if ( !q || !*q ) return 0;
+
+			delta = q-p;
+			--q;
+
+			while ( *q != 'x' )
+			{
+				if ( *q >= '0' && *q <= '9' )
+					ucs += mult * (*q - '0');
+				else if ( *q >= 'a' && *q <= 'f' )
+					ucs += mult * (*q - 'a' + 10);
+				else if ( *q >= 'A' && *q <= 'F' )
+					ucs += mult * (*q - 'A' + 10 );
+				else 
+					return 0;
+				mult *= 16;
+				--q;
+			}
+		}
+		else
+		{
+			// Decimal.
+			if ( !*(p+2) ) return 0;
+
+			const char* q = p+2;
+			q = strchr( q, ';' );
+
+			if ( !q || !*q ) return 0;
+
+			delta = q-p;
+			--q;
+
+			while ( *q != '#' )
+			{
+				if ( *q >= '0' && *q <= '9' )
+					ucs += mult * (*q - '0');
+				else 
+					return 0;
+				mult *= 10;
+				--q;
+			}
+		}
+		// convert the UCS to UTF-8
+		ConvertUTF32ToUTF8( ucs, value, length );
+		return p + delta + 1;
+	}
+	return p+1;
+}
+
+
+void XMLUtil::ToStr( int v, char* buffer, int bufferSize ) 
+{
+	TIXML_SNPRINTF( buffer, bufferSize, "%d", v );	
+}
+
+
+void XMLUtil::ToStr( unsigned v, char* buffer, int bufferSize )
+{
+	TIXML_SNPRINTF( buffer, bufferSize, "%u", v );	
+}
+
+
+void XMLUtil::ToStr( bool v, char* buffer, int bufferSize )
+{
+	TIXML_SNPRINTF( buffer, bufferSize, "%d", v ? 1 : 0 );	
+}
+
+
+void XMLUtil::ToStr( float v, char* buffer, int bufferSize )
+{
+	TIXML_SNPRINTF( buffer, bufferSize, "%f", v );	
+}
+
+
+void XMLUtil::ToStr( double v, char* buffer, int bufferSize )
+{
+	TIXML_SNPRINTF( buffer, bufferSize, "%f", v );	
+}
+
+
+bool XMLUtil::ToInt( const char* str, int* value )
+{
+	if ( TIXML_SSCANF( str, "%d", value ) == 1 )
+		return true;
+	return false;
+}
+
+bool XMLUtil::ToUnsigned( const char* str, unsigned *value )
+{
+	if ( TIXML_SSCANF( str, "%u", value ) == 1 )
+		return true;
+	return false;
+}
+
+bool XMLUtil::ToBool( const char* str, bool* value )
+{
+	int ival = 0;
+	if ( ToInt( str, &ival )) {
+		*value = (ival==0) ? false : true;
+		return true;
+	}
+	if ( StringEqual( str, "true" ) ) {
+		*value = true;
+		return true;
+	}
+	else if ( StringEqual( str, "false" ) ) {
+		*value = false;
+		return true;
+	}
+	return false;
+}
+
+
+bool XMLUtil::ToFloat( const char* str, float* value )
+{
+	if ( TIXML_SSCANF( str, "%f", value ) == 1 ) {
+		return true;
+	}
+	return false;
+}
+
+bool XMLUtil::ToDouble( const char* str, double* value )
+{
+	if ( TIXML_SSCANF( str, "%lf", value ) == 1 ) {
+		return true;
+	}
+	return false;
+}
+
+
+char* XMLDocument::Identify( char* p, XMLNode** node ) 
+{
+	XMLNode* returnNode = 0;
+	char* start = p;
+	p = XMLUtil::SkipWhiteSpace( p );
+	if( !p || !*p )
+	{
+		return p;
+	}
+
+	// What is this thing? 
+	// - Elements start with a letter or underscore, but xml is reserved.
+	// - Comments: 
+	//
+	// With a special case:
+	//		<foo>
+	//		</foo>
+	//		
+	//		
+	// Where the closing element (/foo) *must* be the next thing after the opening
+	// element, and the names must match. BUT the tricky bit is that the closing
+	// element will be read by the child.
+	// 
+	// 'endTag' is the end tag for this node, it is returned by a call to a child.
+	// 'parentEnd' is the end tag for the parent, which is filled in and returned.
+
+	while( p && *p ) {
+		XMLNode* node = 0;
+
+		p = document->Identify( p, &node );
+		if ( p == 0 || node == 0 ) {
+			break;
+		}
+
+		StrPair endTag;
+		p = node->ParseDeep( p, &endTag );
+		if ( !p ) {
+			DELETE_NODE( node );
+			node = 0;
+			if ( !document->Error() ) {
+				document->SetError( XML_ERROR_PARSING, 0, 0 );
+			}
+			break;
+		}
+
+		// We read the end tag. Return it to the parent.
+		if ( node->ToElement() && node->ToElement()->ClosingType() == XMLElement::CLOSING ) {
+			if ( parentEnd ) {
+				*parentEnd = static_cast<XMLElement*>(node)->value;
+			}
+			DELETE_NODE( node );
+			return p;
+		}
+
+		// Handle an end tag returned to this level.
+		// And handle a bunch of annoying errors.
+		XMLElement* ele = node->ToElement();
+		if ( ele ) {
+			if ( endTag.Empty() && ele->ClosingType() == XMLElement::OPEN ) {
+				document->SetError( XML_ERROR_MISMATCHED_ELEMENT, node->Value(), 0 );
+				p = 0;
+			}
+			else if ( !endTag.Empty() && ele->ClosingType() != XMLElement::OPEN ) {
+				document->SetError( XML_ERROR_MISMATCHED_ELEMENT, node->Value(), 0 );
+				p = 0;
+			}
+			else if ( !endTag.Empty() ) {
+				if ( !XMLUtil::StringEqual( endTag.GetStr(), node->Value() )) { 
+					document->SetError( XML_ERROR_MISMATCHED_ELEMENT, node->Value(), 0 );
+					p = 0;
+				}
+			}
+		}
+		if ( p == 0 ) {
+			DELETE_NODE( node );
+			node = 0;
+		}
+		if ( node ) {
+			this->InsertEndChild( node );
+		}
+	}
+	return 0;
+}
+
+// --------- XMLText ---------- //
+char* XMLText::ParseDeep( char* p, StrPair* )
+{
+	const char* start = p;
+	if ( this->CData() ) {
+		p = value.ParseText( p, "]]>", StrPair::NEEDS_NEWLINE_NORMALIZATION );
+		if ( !p ) {
+			document->SetError( XML_ERROR_PARSING_CDATA, start, 0 );
+		}
+		return p;
+	}
+	else {
+		p = value.ParseText( p, "<", document->ProcessEntities() ? StrPair::TEXT_ELEMENT : StrPair::TEXT_ELEMENT_LEAVE_ENTITIES );
+		if ( !p ) {
+			document->SetError( XML_ERROR_PARSING_TEXT, start, 0 );
+		}
+		if ( p && *p ) {
+			return p-1;
+		}
+	}
+	return 0;
+}
+
+
+XMLNode* XMLText::ShallowClone( XMLDocument* doc ) const
+{
+	if ( !doc ) {
+		doc = document;
+	}
+	XMLText* text = doc->NewText( Value() );	// fixme: this will always allocate memory. Intern?
+	text->SetCData( this->CData() );
+	return text;
+}
+
+
+bool XMLText::ShallowEqual( const XMLNode* compare ) const
+{
+	return ( compare->ToText() && XMLUtil::StringEqual( compare->ToText()->Value(), Value() ));
+}
+
+
+bool XMLText::Accept( XMLVisitor* visitor ) const
+{
+	return visitor->Visit( *this );
+}
+
+
+// --------- XMLComment ---------- //
+
+XMLComment::XMLComment( XMLDocument* doc ) : XMLNode( doc )
+{
+}
+
+
+XMLComment::~XMLComment()
+{
+	//printf( "~XMLComment\n" );
+}
+
+
+char* XMLComment::ParseDeep( char* p, StrPair* )
+{
+	// Comment parses as text.
+	const char* start = p;
+	p = value.ParseText( p, "-->", StrPair::COMMENT );
+	if ( p == 0 ) {
+		document->SetError( XML_ERROR_PARSING_COMMENT, start, 0 );
+	}
+	return p;
+}
+
+
+XMLNode* XMLComment::ShallowClone( XMLDocument* doc ) const
+{
+	if ( !doc ) {
+		doc = document;
+	}
+	XMLComment* comment = doc->NewComment( Value() );	// fixme: this will always allocate memory. Intern?
+	return comment;
+}
+
+
+bool XMLComment::ShallowEqual( const XMLNode* compare ) const
+{
+	return ( compare->ToComment() && XMLUtil::StringEqual( compare->ToComment()->Value(), Value() ));
+}
+
+
+bool XMLComment::Accept( XMLVisitor* visitor ) const
+{
+	return visitor->Visit( *this );
+}
+
+
+// --------- XMLDeclaration ---------- //
+
+XMLDeclaration::XMLDeclaration( XMLDocument* doc ) : XMLNode( doc )
+{
+}
+
+
+XMLDeclaration::~XMLDeclaration()
+{
+	//printf( "~XMLDeclaration\n" );
+}
+
+
+char* XMLDeclaration::ParseDeep( char* p, StrPair* )
+{
+	// Declaration parses as text.
+	const char* start = p;
+	p = value.ParseText( p, "?>", StrPair::NEEDS_NEWLINE_NORMALIZATION );
+	if ( p == 0 ) {
+		document->SetError( XML_ERROR_PARSING_DECLARATION, start, 0 );
+	}
+	return p;
+}
+
+
+XMLNode* XMLDeclaration::ShallowClone( XMLDocument* doc ) const
+{
+	if ( !doc ) {
+		doc = document;
+	}
+	XMLDeclaration* dec = doc->NewDeclaration( Value() );	// fixme: this will always allocate memory. Intern?
+	return dec;
+}
+
+
+bool XMLDeclaration::ShallowEqual( const XMLNode* compare ) const
+{
+	return ( compare->ToDeclaration() && XMLUtil::StringEqual( compare->ToDeclaration()->Value(), Value() ));
+}
+
+
+
+bool XMLDeclaration::Accept( XMLVisitor* visitor ) const
+{
+	return visitor->Visit( *this );
+}
+
+// --------- XMLUnknown ---------- //
+
+XMLUnknown::XMLUnknown( XMLDocument* doc ) : XMLNode( doc )
+{
+}
+
+
+XMLUnknown::~XMLUnknown()
+{
+}
+
+
+char* XMLUnknown::ParseDeep( char* p, StrPair* )
+{
+	// Unknown parses as text.
+	const char* start = p;
+
+	p = value.ParseText( p, ">", StrPair::NEEDS_NEWLINE_NORMALIZATION );
+	if ( !p ) {
+		document->SetError( XML_ERROR_PARSING_UNKNOWN, start, 0 );
+	}
+	return p;
+}
+
+
+XMLNode* XMLUnknown::ShallowClone( XMLDocument* doc ) const
+{
+	if ( !doc ) {
+		doc = document;
+	}
+	XMLUnknown* text = doc->NewUnknown( Value() );	// fixme: this will always allocate memory. Intern?
+	return text;
+}
+
+
+bool XMLUnknown::ShallowEqual( const XMLNode* compare ) const
+{
+	return ( compare->ToUnknown() && XMLUtil::StringEqual( compare->ToUnknown()->Value(), Value() ));
+}
+
+
+bool XMLUnknown::Accept( XMLVisitor* visitor ) const
+{
+	return visitor->Visit( *this );
+}
+
+// --------- XMLAttribute ---------- //
+char* XMLAttribute::ParseDeep( char* p, bool processEntities )
+{
+	// Parse using the name rules: bug fix, was using ParseText before
+	p = name.ParseName( p );
+	if ( !p || !*p ) return 0;
+
+	// Skip white space before =
+	p = XMLUtil::SkipWhiteSpace( p );
+	if ( !p || *p != '=' ) return 0;
+
+	++p;	// move up to opening quote
+	p = XMLUtil::SkipWhiteSpace( p );
+	if ( *p != '\"' && *p != '\'' ) return 0;
+
+	char endTag[2] = { *p, 0 };
+	++p;	// move past opening quote
+
+	p = value.ParseText( p, endTag, processEntities ? StrPair::ATTRIBUTE_VALUE : StrPair::ATTRIBUTE_VALUE_LEAVE_ENTITIES );
+	return p;
+}
+
+
+void XMLAttribute::SetName( const char* n )
+{
+	name.SetStr( n );
+}
+
+
+int XMLAttribute::QueryIntValue( int* value ) const
+{
+	if ( XMLUtil::ToInt( Value(), value ))
+		return XML_NO_ERROR;
+	return XML_WRONG_ATTRIBUTE_TYPE;
+}
+
+
+int XMLAttribute::QueryUnsignedValue( unsigned int* value ) const
+{
+	if ( XMLUtil::ToUnsigned( Value(), value ))
+		return XML_NO_ERROR;
+	return XML_WRONG_ATTRIBUTE_TYPE;
+}
+
+
+int XMLAttribute::QueryBoolValue( bool* value ) const
+{
+	if ( XMLUtil::ToBool( Value(), value )) {
+		return XML_NO_ERROR;
+	}
+	return XML_WRONG_ATTRIBUTE_TYPE;
+}
+
+
+int XMLAttribute::QueryFloatValue( float* value ) const
+{
+	if ( XMLUtil::ToFloat( Value(), value ))
+		return XML_NO_ERROR;
+	return XML_WRONG_ATTRIBUTE_TYPE;
+}
+
+
+int XMLAttribute::QueryDoubleValue( double* value ) const
+{
+	if ( XMLUtil::ToDouble( Value(), value ))
+		return XML_NO_ERROR;
+	return XML_WRONG_ATTRIBUTE_TYPE;
+}
+
+
+void XMLAttribute::SetAttribute( const char* v )
+{
+	value.SetStr( v );
+}
+
+
+void XMLAttribute::SetAttribute( int v )
+{
+	char buf[BUF_SIZE];
+	XMLUtil::ToStr( v, buf, BUF_SIZE );
+	value.SetStr( buf );
+}
+
+
+void XMLAttribute::SetAttribute( unsigned v )
+{
+	char buf[BUF_SIZE];
+	XMLUtil::ToStr( v, buf, BUF_SIZE );
+	value.SetStr( buf );
+}
+
+
+void XMLAttribute::SetAttribute( bool v )
+{
+	char buf[BUF_SIZE];
+	XMLUtil::ToStr( v, buf, BUF_SIZE );
+	value.SetStr( buf );
+}
+
+void XMLAttribute::SetAttribute( double v )
+{
+	char buf[BUF_SIZE];
+	XMLUtil::ToStr( v, buf, BUF_SIZE );
+	value.SetStr( buf );
+}
+
+void XMLAttribute::SetAttribute( float v )
+{
+	char buf[BUF_SIZE];
+	XMLUtil::ToStr( v, buf, BUF_SIZE );
+	value.SetStr( buf );
+}
+
+
+// --------- XMLElement ---------- //
+XMLElement::XMLElement( XMLDocument* doc ) : XMLNode( doc ),
+	closingType( 0 ),
+	rootAttribute( 0 )
+{
+}
+
+
+XMLElement::~XMLElement()
+{
+	while( rootAttribute ) {
+		XMLAttribute* next = rootAttribute->next;
+		DELETE_ATTRIBUTE( rootAttribute );
+		rootAttribute = next;
+	}
+}
+
+
+XMLAttribute* XMLElement::FindAttribute( const char* name )
+{
+	XMLAttribute* a = 0;
+	for( a=rootAttribute; a; a = a->next ) {
+		if ( XMLUtil::StringEqual( a->Name(), name ) )
+			return a;
+	}
+	return 0;
+}
+
+
+const XMLAttribute* XMLElement::FindAttribute( const char* name ) const
+{
+	XMLAttribute* a = 0;
+	for( a=rootAttribute; a; a = a->next ) {
+		if ( XMLUtil::StringEqual( a->Name(), name ) )
+			return a;
+	}
+	return 0;
+}
+
+
+const char* XMLElement::Attribute( const char* name, const char* value ) const
+{ 
+	const XMLAttribute* a = FindAttribute( name ); 
+	if ( !a ) 
+		return 0; 
+	if ( !value || XMLUtil::StringEqual( a->Value(), value ))
+		return a->Value();
+	return 0;
+}
+
+
+const char* XMLElement::GetText() const
+{
+	if ( FirstChild() && FirstChild()->ToText() ) {
+		return FirstChild()->ToText()->Value();
+	}
+	return 0;
+}
+
+
+int XMLElement::QueryIntText( int* _value ) const
+{
+	if ( FirstChild() && FirstChild()->ToText() ) {
+		const char* t = FirstChild()->ToText()->Value();
+		if ( XMLUtil::ToInt( t, _value ) ) {
+			return XML_SUCCESS;
+		}
+		return XML_CAN_NOT_CONVERT_TEXT;
+	}
+	return XML_NO_TEXT_NODE;
+}
+
+
+int XMLElement::QueryUnsignedText( unsigned* _value ) const
+{
+	if ( FirstChild() && FirstChild()->ToText() ) {
+		const char* t = FirstChild()->ToText()->Value();
+		if ( XMLUtil::ToUnsigned( t, _value ) ) {
+			return XML_SUCCESS;
+		}
+		return XML_CAN_NOT_CONVERT_TEXT;
+	}
+	return XML_NO_TEXT_NODE;
+}
+
+
+int XMLElement::QueryBoolText( bool* _value ) const
+{
+	if ( FirstChild() && FirstChild()->ToText() ) {
+		const char* t = FirstChild()->ToText()->Value();
+		if ( XMLUtil::ToBool( t, _value ) ) {
+			return XML_SUCCESS;
+		}
+		return XML_CAN_NOT_CONVERT_TEXT;
+	}
+	return XML_NO_TEXT_NODE;
+}
+
+
+int XMLElement::QueryDoubleText( double* _value ) const
+{
+	if ( FirstChild() && FirstChild()->ToText() ) {
+		const char* t = FirstChild()->ToText()->Value();
+		if ( XMLUtil::ToDouble( t, _value ) ) {
+			return XML_SUCCESS;
+		}
+		return XML_CAN_NOT_CONVERT_TEXT;
+	}
+	return XML_NO_TEXT_NODE;
+}
+
+
+int XMLElement::QueryFloatText( float* _value ) const
+{
+	if ( FirstChild() && FirstChild()->ToText() ) {
+		const char* t = FirstChild()->ToText()->Value();
+		if ( XMLUtil::ToFloat( t, _value ) ) {
+			return XML_SUCCESS;
+		}
+		return XML_CAN_NOT_CONVERT_TEXT;
+	}
+	return XML_NO_TEXT_NODE;
+}
+
+
+
+XMLAttribute* XMLElement::FindOrCreateAttribute( const char* name )
+{
+	XMLAttribute* last = 0;
+	XMLAttribute* attrib = 0;
+	for( attrib = rootAttribute;
+		 attrib;
+		 last = attrib, attrib = attrib->next )
+	{		 
+		if ( XMLUtil::StringEqual( attrib->Name(), name ) ) {
+			break;
+		}
+	}
+	if ( !attrib ) {
+		attrib = new (document->attributePool.Alloc() ) XMLAttribute();
+		attrib->memPool = &document->attributePool;
+		if ( last ) {
+			last->next = attrib;
+		}
+		else {
+			rootAttribute = attrib;
+		}
+		attrib->SetName( name );
+	}
+	return attrib;
+}
+
+
+void XMLElement::DeleteAttribute( const char* name )
+{
+	XMLAttribute* prev = 0;
+	for( XMLAttribute* a=rootAttribute; a; a=a->next ) {
+		if ( XMLUtil::StringEqual( name, a->Name() ) ) {
+			if ( prev ) {
+				prev->next = a->next;
+			}
+			else {
+				rootAttribute = a->next;
+			}
+			DELETE_ATTRIBUTE( a );
+			break;
+		}
+		prev = a;
+	}
+}
+
+
+char* XMLElement::ParseAttributes( char* p )
+{
+	const char* start = p;
+	XMLAttribute* prevAttribute = 0;
+
+	// Read the attributes.
+	while( p ) {
+		p = XMLUtil::SkipWhiteSpace( p );
+		if ( !p || !(*p) ) {
+			document->SetError( XML_ERROR_PARSING_ELEMENT, start, Name() );
+			return 0;
+		}
+
+		// attribute.
+		if ( XMLUtil::IsAlpha( *p ) ) {
+			XMLAttribute* attrib = new (document->attributePool.Alloc() ) XMLAttribute();
+			attrib->memPool = &document->attributePool;
+
+			p = attrib->ParseDeep( p, document->ProcessEntities() );
+			if ( !p || Attribute( attrib->Name() ) ) {
+				DELETE_ATTRIBUTE( attrib );
+				document->SetError( XML_ERROR_PARSING_ATTRIBUTE, start, p );
+				return 0;
+			}
+			// There is a minor bug here: if the attribute in the source xml
+			// document is duplicated, it will not be detected and the
+			// attribute will be doubly added. However, tracking the 'prevAttribute'
+			// avoids re-scanning the attribute list. Preferring performance for
+			// now, may reconsider in the future.
+			if ( prevAttribute ) { 
+				prevAttribute->next = attrib;
+			}
+			else {
+				rootAttribute = attrib;
+			}	
+			prevAttribute = attrib;
+		}
+		// end of the tag
+		else if ( *p == '/' && *(p+1) == '>' ) {
+			closingType = CLOSED;
+			return p+2;	// done; sealed element.
+		}
+		// end of the tag
+		else if ( *p == '>' ) {
+			++p;
+			break;
+		}
+		else {
+			document->SetError( XML_ERROR_PARSING_ELEMENT, start, p );
+			return 0;
+		}
+	}
+	return p;
+}
+
+
+//
+//	<ele></ele>
+//	<ele>foo<b>bar</b></ele>
+//
+char* XMLElement::ParseDeep( char* p, StrPair* strPair )
+{
+	// Read the element name.
+	p = XMLUtil::SkipWhiteSpace( p );
+	if ( !p ) return 0;
+
+	// The closing element is the </element> form. It is
+	// parsed just like a regular element then deleted from
+	// the DOM.
+	if ( *p == '/' ) {
+		closingType = CLOSING;
+		++p;
+	}
+
+	p = value.ParseName( p );
+	if ( value.Empty() ) return 0;
+
+	p = ParseAttributes( p );
+	if ( !p || !*p || closingType ) 
+		return p;
+
+	p = XMLNode::ParseDeep( p, strPair );
+	return p;
+}
+
+
+
+XMLNode* XMLElement::ShallowClone( XMLDocument* doc ) const
+{
+	if ( !doc ) {
+		doc = document;
+	}
+	XMLElement* element = doc->NewElement( Value() );					// fixme: this will always allocate memory. Intern?
+	for( const XMLAttribute* a=FirstAttribute(); a; a=a->Next() ) {
+		element->SetAttribute( a->Name(), a->Value() );					// fixme: this will always allocate memory. Intern?
+	}
+	return element;
+}
+
+
+bool XMLElement::ShallowEqual( const XMLNode* compare ) const
+{
+	const XMLElement* other = compare->ToElement();
+	if ( other && XMLUtil::StringEqual( other->Value(), Value() )) {
+
+		const XMLAttribute* a=FirstAttribute();
+		const XMLAttribute* b=other->FirstAttribute();
+
+		while ( a && b ) {
+			if ( !XMLUtil::StringEqual( a->Value(), b->Value() ) ) {
+				return false;
+			}
+			a = a->Next();
+			b = b->Next();
+		}	
+		if ( a || b ) {
+			// different count
+			return false;
+		}
+		return true;
+	}
+	return false;
+}
+
+
+bool XMLElement::Accept( XMLVisitor* visitor ) const
+{
+	if ( visitor->VisitEnter( *this, rootAttribute ) ) 
+	{
+		for ( const XMLNode* node=FirstChild(); node; node=node->NextSibling() )
+		{
+			if ( !node->Accept( visitor ) )
+				break;
+		}
+	}
+	return visitor->VisitExit( *this );
+}
+
+
+// --------- XMLDocument ----------- //
+XMLDocument::XMLDocument( bool _processEntities ) :
+	XMLNode( 0 ),
+	writeBOM( false ),
+	processEntities( _processEntities ),
+	errorID( 0 ),
+	errorStr1( 0 ),
+	errorStr2( 0 ),
+	charBuffer( 0 )
+{
+	document = this;	// avoid warning about 'this' in initializer list
+}
+
+
+XMLDocument::~XMLDocument()
+{
+	DeleteChildren();
+	delete [] charBuffer;
+
+#if 0
+	textPool.Trace( "text" );
+	elementPool.Trace( "element" );
+	commentPool.Trace( "comment" );
+	attributePool.Trace( "attribute" );
+#endif
+
+	TIXMLASSERT( textPool.CurrentAllocs() == 0 );
+	TIXMLASSERT( elementPool.CurrentAllocs() == 0 );
+	TIXMLASSERT( commentPool.CurrentAllocs() == 0 );
+	TIXMLASSERT( attributePool.CurrentAllocs() == 0 );
+}
+
+
+void XMLDocument::InitDocument()
+{
+	errorID = XML_NO_ERROR;
+	errorStr1 = 0;
+	errorStr2 = 0;
+
+	delete [] charBuffer;
+	charBuffer = 0;
+
+}
+
+
+XMLElement* XMLDocument::NewElement( const char* name )
+{
+	XMLElement* ele = new (elementPool.Alloc()) XMLElement( this );
+	ele->memPool = &elementPool;
+	ele->SetName( name );
+	return ele;
+}
+
+
+XMLComment* XMLDocument::NewComment( const char* str )
+{
+	XMLComment* comment = new (commentPool.Alloc()) XMLComment( this );
+	comment->memPool = &commentPool;
+	comment->SetValue( str );
+	return comment;
+}
+
+
+XMLText* XMLDocument::NewText( const char* str )
+{
+	XMLText* text = new (textPool.Alloc()) XMLText( this );
+	text->memPool = &textPool;
+	text->SetValue( str );
+	return text;
+}
+
+
+XMLDeclaration* XMLDocument::NewDeclaration( const char* str )
+{
+	XMLDeclaration* dec = new (commentPool.Alloc()) XMLDeclaration( this );
+	dec->memPool = &commentPool;
+	dec->SetValue( str ? str : "xml version=\"1.0\" encoding=\"UTF-8\"" );
+	return dec;
+}
+
+
+XMLUnknown* XMLDocument::NewUnknown( const char* str )
+{
+	XMLUnknown* unk = new (commentPool.Alloc()) XMLUnknown( this );
+	unk->memPool = &commentPool;
+	unk->SetValue( str );
+	return unk;
+}
+
+
+int XMLDocument::LoadFile( const char* filename )
+{
+	DeleteChildren();
+	InitDocument();
+
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable : 4996 )		// Fail to see a compelling reason why this should be deprecated.
+#endif
+	FILE* fp = fopen( filename, "rb" );
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
+	if ( !fp ) {
+		SetError( XML_ERROR_FILE_NOT_FOUND, filename, 0 );
+		return errorID;
+	}
+	LoadFile( fp );
+	fclose( fp );
+	return errorID;
+}
+
+
+int XMLDocument::LoadFile( FILE* fp ) 
+{
+	DeleteChildren();
+	InitDocument();
+
+	fseek( fp, 0, SEEK_END );
+	unsigned size = ftell( fp );
+	fseek( fp, 0, SEEK_SET );
+
+	if ( size == 0 ) {
+		return errorID;
+	}
+
+	charBuffer = new char[size+1];
+	size_t read = fread( charBuffer, 1, size, fp );
+	if ( read != size ) {
+		SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 );
+		return errorID;
+	}
+	
+	charBuffer[size] = 0;
+
+	const char* p = charBuffer;
+	p = XMLUtil::SkipWhiteSpace( p );
+	p = XMLUtil::ReadBOM( p, &writeBOM );
+	if ( !p || !*p ) {
+		SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 );
+		return errorID;
+	}
+
+	ParseDeep( charBuffer + (p-charBuffer), 0 );
+	return errorID;
+}
+
+
+int XMLDocument::SaveFile( const char* filename )
+{
+#if defined(_MSC_VER)
+#pragma warning ( push )
+#pragma warning ( disable : 4996 )		// Fail to see a compelling reason why this should be deprecated.
+#endif
+	FILE* fp = fopen( filename, "w" );
+#if defined(_MSC_VER)
+#pragma warning ( pop )
+#endif
+	if ( !fp ) {
+		SetError( XML_ERROR_FILE_COULD_NOT_BE_OPENED, filename, 0 );
+		return errorID;
+	}
+	SaveFile(fp);
+	fclose( fp );
+	return errorID;
+}
+
+
+int XMLDocument::SaveFile( FILE* fp )
+{
+	XMLPrinter stream( fp );
+	Print( &stream );
+	return errorID;
+}
+
+
+int XMLDocument::Parse( const char* p )
+{
+	DeleteChildren();
+	InitDocument();
+
+	if ( !p || !*p ) {
+		SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 );
+		return errorID;
+	}
+	p = XMLUtil::SkipWhiteSpace( p );
+	p = XMLUtil::ReadBOM( p, &writeBOM );
+	if ( !p || !*p ) {
+		SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 );
+		return errorID;
+	}
+
+	size_t len = strlen( p );
+	charBuffer = new char[ len+1 ];
+	memcpy( charBuffer, p, len+1 );
+
+	
+	ParseDeep( charBuffer, 0 );
+	return errorID;
+}
+
+
+void XMLDocument::Print( XMLPrinter* streamer ) 
+{
+	XMLPrinter stdStreamer( stdout );
+	if ( !streamer )
+		streamer = &stdStreamer;
+	Accept( streamer );
+}
+
+
+void XMLDocument::SetError( int error, const char* str1, const char* str2 )
+{
+	errorID = error;
+	errorStr1 = str1;
+	errorStr2 = str2;
+}
+
+
+void XMLDocument::PrintError() const 
+{
+	if ( errorID ) {
+		static const int LEN = 20;
+		char buf1[LEN] = { 0 };
+		char buf2[LEN] = { 0 };
+		
+		if ( errorStr1 ) {
+			TIXML_SNPRINTF( buf1, LEN, "%s", errorStr1 );
+		}
+		if ( errorStr2 ) {
+			TIXML_SNPRINTF( buf2, LEN, "%s", errorStr2 );
+		}
+
+		printf( "XMLDocument error id=%d str1=%s str2=%s\n",
+			    errorID, buf1, buf2 );
+	}
+}
+
+
+XMLPrinter::XMLPrinter( std::FILE* file, bool compact ) :
+	elementJustOpened( false ), 
+	firstElement( true ),
+	fp( file ), 
+	depth( 0 ), 
+	textDepth( -1 ),
+	processEntities( true ),
+	compactMode( compact )
+{
+	for( int i=0; i<ENTITY_RANGE; ++i ) {
+		entityFlag[i] = false;
+		restrictedEntityFlag[i] = false;
+	}
+	for( int i=0; i<NUM_ENTITIES; ++i ) {
+		TIXMLASSERT( entities[i].value < ENTITY_RANGE );
+		if ( entities[i].value < ENTITY_RANGE ) {
+			entityFlag[ (int)entities[i].value ] = true;
+		}
+	}
+	restrictedEntityFlag[(int)'&'] = true;
+	restrictedEntityFlag[(int)'<'] = true;
+	restrictedEntityFlag[(int)'>'] = true;	// not required, but consistency is nice
+	buffer.Push( 0 );
+}
+
+
+void XMLPrinter::Print( const char* format, ... )
+{
+    va_list     va;
+    va_start( va, format );
+
+	if ( fp ) {
+		vfprintf( fp, format, va );
+	}
+	else {
+		// This seems brutally complex. Haven't figured out a better
+		// way on windows.
+		#ifdef _MSC_VER
+			int len = -1;
+			int expand = 1000;
+			while ( len < 0 ) {
+				len = vsnprintf_s( accumulator.Mem(), accumulator.Capacity(), _TRUNCATE, format, va );
+				if ( len < 0 ) {
+					expand *= 3/2;
+					accumulator.PushArr( expand );
+				}
+			}
+			char* p = buffer.PushArr( len ) - 1;
+			memcpy( p, accumulator.Mem(), len+1 );
+		#else
+			int len = vsnprintf( 0, 0, format, va );
+			// Close out and re-start the va-args
+			va_end( va );
+			va_start( va, format );		
+			char* p = buffer.PushArr( len ) - 1;
+			vsnprintf( p, len+1, format, va );
+		#endif
+	}
+    va_end( va );
+}
+
+
+void XMLPrinter::PrintSpace( int depth )
+{
+	for( int i=0; i<depth; ++i ) {
+		Print( "    " );
+	}
+}
+
+
+void XMLPrinter::PrintString( const char* p, bool restricted )
+{
+	// Look for runs of bytes between entities to print.
+	const char* q = p;
+	const bool* flag = restricted ? restrictedEntityFlag : entityFlag;
+
+	if ( processEntities ) {
+		while ( *q ) {
+			// Remember, char is sometimes signed. (How many times has that bitten me?)
+			if ( *q > 0 && *q < ENTITY_RANGE ) {
+				// Check for entities. If one is found, flush
+				// the stream up until the entity, write the 
+				// entity, and keep looking.
+				if ( flag[(unsigned)(*q)] ) {
+					while ( p < q ) {
+						Print( "%c", *p );
+						++p;
+					}
+					for( int i=0; i<NUM_ENTITIES; ++i ) {
+						if ( entities[i].value == *q ) {
+							Print( "&%s;", entities[i].pattern );
+							break;
+						}
+					}
+					++p;
+				}
+			}
+			++q;
+		}
+	}
+	// Flush the remaining string. This will be the entire
+	// string if an entity wasn't found.
+	if ( !processEntities || (q-p > 0) ) {
+		Print( "%s", p );
+	}
+}
+
+
+void XMLPrinter::PushHeader( bool writeBOM, bool writeDec )
+{
+	static const unsigned char bom[] = { TIXML_UTF_LEAD_0, TIXML_UTF_LEAD_1, TIXML_UTF_LEAD_2, 0 };
+	if ( writeBOM ) {
+		Print( "%s", bom );
+	}
+	if ( writeDec ) {
+		PushDeclaration( "xml version=\"1.0\"" );
+	}
+}
+
+
+void XMLPrinter::OpenElement( const char* name )
+{
+	if ( elementJustOpened ) {
+		SealElement();
+	}
+	stack.Push( name );
+
+	if ( textDepth < 0 && !firstElement && !compactMode ) {
+		Print( "\n" );
+		PrintSpace( depth );
+	}
+
+	Print( "<%s", name );
+	elementJustOpened = true;
+	firstElement = false;
+	++depth;
+}
+
+
+void XMLPrinter::PushAttribute( const char* name, const char* value )
+{
+	TIXMLASSERT( elementJustOpened );
+	Print( " %s=\"", name );
+	PrintString( value, false );
+	Print( "\"" );
+}
+
+
+void XMLPrinter::PushAttribute( const char* name, int v )
+{
+	char buf[BUF_SIZE];
+	XMLUtil::ToStr( v, buf, BUF_SIZE );
+	PushAttribute( name, buf );
+}
+
+
+void XMLPrinter::PushAttribute( const char* name, unsigned v )
+{
+	char buf[BUF_SIZE];
+	XMLUtil::ToStr( v, buf, BUF_SIZE );
+	PushAttribute( name, buf );
+}
+
+
+void XMLPrinter::PushAttribute( const char* name, bool v )
+{
+	char buf[BUF_SIZE];
+	XMLUtil::ToStr( v, buf, BUF_SIZE );
+	PushAttribute( name, buf );
+}
+
+
+void XMLPrinter::PushAttribute( const char* name, double v )
+{
+	char buf[BUF_SIZE];
+	XMLUtil::ToStr( v, buf, BUF_SIZE );
+	PushAttribute( name, buf );
+}
+
+
+void XMLPrinter::CloseElement()
+{
+	--depth;
+	const char* name = stack.Pop();
+
+	if ( elementJustOpened ) {
+		Print( "/>" );
+	}
+	else {
+		if ( textDepth < 0 && !compactMode) {
+			Print( "\n" );
+			PrintSpace( depth );
+		}
+		Print( "</%s>", name );
+	}
+
+	if ( textDepth == depth )
+		textDepth = -1;
+	if ( depth == 0 && !compactMode)
+		Print( "\n" );
+	elementJustOpened = false;
+}
+
+
+void XMLPrinter::SealElement()
+{
+	elementJustOpened = false;
+	Print( ">" );
+}
+
+
+void XMLPrinter::PushText( const char* text, bool cdata )
+{
+	textDepth = depth-1;
+
+	if ( elementJustOpened ) {
+		SealElement();
+	}
+	if ( cdata ) {
+		Print( "<![CDATA[" );
+		Print( "%s", text );
+		Print( "]]>" );
+	}
+	else {
+		PrintString( text, true );
+	}
+}
+
+void XMLPrinter::PushText( int value ) 
+{
+	char buf[BUF_SIZE];
+	XMLUtil::ToStr( value, buf, BUF_SIZE );
+	PushText( buf, false );
+}
+
+
+void XMLPrinter::PushText( unsigned value ) 
+{
+	char buf[BUF_SIZE];
+	XMLUtil::ToStr( value, buf, BUF_SIZE );
+	PushText( buf, false );
+}
+
+
+void XMLPrinter::PushText( bool value ) 
+{
+	char buf[BUF_SIZE];
+	XMLUtil::ToStr( value, buf, BUF_SIZE );
+	PushText( buf, false );
+}
+
+
+void XMLPrinter::PushText( float value ) 
+{
+	char buf[BUF_SIZE];
+	XMLUtil::ToStr( value, buf, BUF_SIZE );
+	PushText( buf, false );
+}
+
+
+void XMLPrinter::PushText( double value ) 
+{
+	char buf[BUF_SIZE];
+	XMLUtil::ToStr( value, buf, BUF_SIZE );
+	PushText( buf, false );
+}
+
+
+void XMLPrinter::PushComment( const char* comment )
+{
+	if ( elementJustOpened ) {
+		SealElement();
+	}
+	if ( textDepth < 0 && !firstElement && !compactMode) {
+		Print( "\n" );
+		PrintSpace( depth );
+	}
+	firstElement = false;
+	Print( "", comment );
+}
+
+
+void XMLPrinter::PushDeclaration( const char* value )
+{
+	if ( elementJustOpened ) {
+		SealElement();
+	}
+	if ( textDepth < 0 && !firstElement && !compactMode) {
+		Print( "\n" );
+		PrintSpace( depth );
+	}
+	firstElement = false;
+	Print( "<?%s?>", value );
+}
+
+
+void XMLPrinter::PushUnknown( const char* value )
+{
+	if ( elementJustOpened ) {
+		SealElement();
+	}
+	if ( textDepth < 0 && !firstElement && !compactMode) {
+		Print( "\n" );
+		PrintSpace( depth );
+	}
+	firstElement = false;
+	Print( "<!%s>", value );
+}
+
+
+bool XMLPrinter::VisitEnter( const XMLDocument& doc )
+{
+	processEntities = doc.ProcessEntities();
+	if ( doc.HasBOM() ) {
+		PushHeader( true, false );
+	}
+	return true;
+}
+
+
+bool XMLPrinter::VisitEnter( const XMLElement& element, const XMLAttribute* attribute )
+{
+	OpenElement( element.Name() );
+	while ( attribute ) {
+		PushAttribute( attribute->Name(), attribute->Value() );
+		attribute = attribute->Next();
+	}
+	return true;
+}
+
+
+bool XMLPrinter::VisitExit( const XMLElement& )
+{
+	CloseElement();
+	return true;
+}
+
+
+bool XMLPrinter::Visit( const XMLText& text )
+{
+	PushText( text.Value(), text.CData() );
+	return true;
+}
+
+
+bool XMLPrinter::Visit( const XMLComment& comment )
+{
+	PushComment( comment.Value() );
+	return true;
+}
+
+bool XMLPrinter::Visit( const XMLDeclaration& declaration )
+{
+	PushDeclaration( declaration.Value() );
+	return true;
+}
+
+
+bool XMLPrinter::Visit( const XMLUnknown& unknown )
+{
+	PushUnknown( unknown.Value() );
+	return true;
+}

libmediainfo_0.7.60.tar.bz2/Source/ThirdParty/tinyxml2/tinyxml2.h Added

@@ -0,0 +1,1480 @@
+/*
+Original code by Lee Thomason (www.grinninglizard.com)
+
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any
+damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any
+purpose, including commercial applications, and to alter it and
+redistribute it freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must
+not claim that you wrote the original software. If you use this
+software in a product, an acknowledgment in the product documentation
+would be appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and
+must not be misrepresented as being the original software.
+
+3. This notice may not be removed or altered from any source
+distribution.
+*/
+
+#ifndef TINYXML2_INCLUDED
+#define TINYXML2_INCLUDED
+
+#include <cctype>
+#include <climits>
+#include <cstdio>
+#include <cstring>
+#include <cstdarg>
+
+/* 
+   TODO: intern strings instead of allocation.
+*/
+/*
+	gcc: g++ -Wall tinyxml2.cpp xmltest.cpp -o gccxmltest.exe
+*/
+
+#if defined( _DEBUG ) || defined( DEBUG ) || defined (__DEBUG__)
+	#ifndef DEBUG
+		#define DEBUG
+	#endif
+#endif
+
+
+#if defined(DEBUG)
+        #if defined(_MSC_VER)
+                #define TIXMLASSERT( x )           if ( !(x)) { __debugbreak(); } //if ( !(x)) WinDebugBreak()
+        #elif defined (ANDROID_NDK)
+                #include <android/log.h>
+                #define TIXMLASSERT( x )           if ( !(x)) { __android_log_assert( "assert", "grinliz", "ASSERT in '%s' at %d.", __FILE__, __LINE__ ); }
+        #else
+                #include <assert.h>
+                #define TIXMLASSERT                assert
+        #endif
+#else
+        #define TIXMLASSERT( x )           {}
+#endif
+
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1400 )
+	// Microsoft visual studio, version 2005 and higher.
+	/*int _snprintf_s(
+	   char *buffer,
+	   size_t sizeOfBuffer,
+	   size_t count,	
+	   const char *format [,
+		  argument] ... 
+	);*/
+	inline int TIXML_SNPRINTF( char* buffer, size_t size, const char* format, ... ) {
+	    va_list va;
+		va_start( va, format );
+		int result = vsnprintf_s( buffer, size, _TRUNCATE, format, va );
+	    va_end( va );
+		return result;
+	}
+	#define TIXML_SSCANF   sscanf_s
+#else
+	// GCC version 3 and higher
+	//#warning( "Using sn* functions." )
+	#define TIXML_SNPRINTF snprintf
+	#define TIXML_SSCANF   sscanf
+#endif
+
+static const int TIXML2_MAJOR_VERSION = 1;
+static const int TIXML2_MINOR_VERSION = 0;
+static const int TIXML2_PATCH_VERSION = 6;
+
+namespace tinyxml2
+{
+class XMLDocument;
+class XMLElement;
+class XMLAttribute;
+class XMLComment;
+class XMLNode;
+class XMLText;
+class XMLDeclaration;
+class XMLUnknown;
+
+class XMLPrinter;
+
+/*
+	A class that wraps strings. Normally stores the start and end
+	pointers into the XML file itself, and will apply normalization
+	and entity translation if actually read. Can also store (and memory
+	manage) a traditional char[]
+*/
+class StrPair
+{
+public:
+	enum {
+		NEEDS_ENTITY_PROCESSING			= 0x01,
+		NEEDS_NEWLINE_NORMALIZATION		= 0x02,
+
+		TEXT_ELEMENT		= NEEDS_ENTITY_PROCESSING | NEEDS_NEWLINE_NORMALIZATION,
+		TEXT_ELEMENT_LEAVE_ENTITIES		= NEEDS_NEWLINE_NORMALIZATION,
+		ATTRIBUTE_NAME		= 0,
+		ATTRIBUTE_VALUE		= NEEDS_ENTITY_PROCESSING | NEEDS_NEWLINE_NORMALIZATION,
+		ATTRIBUTE_VALUE_LEAVE_ENTITIES		= NEEDS_NEWLINE_NORMALIZATION,
+		COMMENT				= NEEDS_NEWLINE_NORMALIZATION
+	};
+
+	StrPair() : flags( 0 ), start( 0 ), end( 0 ) {}
+	~StrPair();
+
+	void Set( char* _start, char* _end, int _flags ) {
+		Reset();
+		this->start = _start; this->end = _end; this->flags = _flags | NEEDS_FLUSH;
+	}
+	const char* GetStr();
+	bool Empty() const { return start == end; }
+
+	void SetInternedStr( const char* str ) { Reset(); this->start = const_cast<char*>(str); }
+	void SetStr( const char* str, int flags=0 );
+
+	char* ParseText( char* in, const char* endTag, int strFlags );	
+	char* ParseName( char* in );
+
+
+private:
+	void Reset();
+
+	enum {
+		NEEDS_FLUSH = 0x100,
+		NEEDS_DELETE = 0x200
+	};
+
+	// After parsing, if *end != 0, it can be set to zero.
+	int flags;
+	char* start;	
+	char* end;
+};
+
+
+/*
+	A dynamic array of Plain Old Data. Doesn't support constructors, etc.
+	Has a small initial memory pool, so that low or no usage will not
+	cause a call to new/delete
+*/
+template <class T, int INIT>
+class DynArray
+{
+public:
+	DynArray< T, INIT >() 
+	{
+		mem = pool;
+		allocated = INIT;
+		size = 0;
+	}
+	~DynArray()
+	{
+		if ( mem != pool ) {
+			delete [] mem;
+		}
+	}
+	void Push( T t )
+	{
+		EnsureCapacity( size+1 );
+		mem[size++] = t;
+	}
+
+	T* PushArr( int count )
+	{
+		EnsureCapacity( size+count );
+		T* ret = &mem[size];
+		size += count;
+		return ret;
+	}
+	T Pop() {
+		return mem[--size];
+	}
+	void PopArr( int count ) 
+	{
+		TIXMLASSERT( size >= count );
+		size -= count;
+	}
+
+	bool Empty() const					{ return size == 0; }
+	T& operator[](int i)				{ TIXMLASSERT( i>= 0 && i < size ); return mem[i]; }
+	const T& operator[](int i) const	{ TIXMLASSERT( i>= 0 && i < size ); return mem[i]; }
+	int Size() const					{ return size; }
+	int Capacity() const				{ return allocated; }
+	const T* Mem() const				{ return mem; }
+	T* Mem()							{ return mem; }
+
+
+private:
+	void EnsureCapacity( int cap ) {
+		if ( cap > allocated ) {
+			int newAllocated = cap * 2;
+			T* newMem = new T[newAllocated];
+			memcpy( newMem, mem, sizeof(T)*size );	// warning: not using constructors, only works for PODs
+			if ( mem != pool ) delete [] mem;
+			mem = newMem;
+			allocated = newAllocated;
+		}
+	}
+
+	T* mem;
+	T pool[INIT];
+	int allocated;		// objects allocated
+	int size;			// number objects in use
+};
+
+
+/*
+	Parent virtual class of a pool for fast allocation
+	and deallocation of objects.
+*/
+class MemPool
+{
+public:
+	MemPool() {}
+	virtual ~MemPool() {}
+
+	virtual int ItemSize() const = 0;
+	virtual void* Alloc() = 0;
+	virtual void Free( void* ) = 0; 
+};
+
+
+/*
+	Template child class to create pools of the correct type.
+*/
+template< int SIZE >
+class MemPoolT : public MemPool
+{
+public:
+	MemPoolT() : root(0), currentAllocs(0), nAllocs(0), maxAllocs(0)	{}
+	~MemPoolT() {
+		// Delete the blocks.
+		for( int i=0; i<blockPtrs.Size(); ++i ) {
+			delete blockPtrs[i];
+		}
+	}
+
+	virtual int ItemSize() const	{ return SIZE; }
+	int CurrentAllocs() const		{ return currentAllocs; }
+
+	virtual void* Alloc() {
+		if ( !root ) {
+			// Need a new block.
+			Block* block = new Block();
+			blockPtrs.Push( block );
+
+			for( int i=0; i<COUNT-1; ++i ) {
+				block->chunk[i].next = &block->chunk[i+1];
+			}
+			block->chunk[COUNT-1].next = 0;
+			root = block->chunk;
+		}
+		void* result = root;
+		root = root->next;
+
+		++currentAllocs;
+		if ( currentAllocs > maxAllocs ) maxAllocs = currentAllocs;
+		nAllocs++;
+		return result;
+	}
+	virtual void Free( void* mem ) {
+		if ( !mem ) return;
+		--currentAllocs;
+		Chunk* chunk = (Chunk*)mem;
+		memset( chunk, 0xfe, sizeof(Chunk) );
+		chunk->next = root;
+		root = chunk;
+	}
+	void Trace( const char* name ) {
+		printf( "Mempool %s watermark=%d [%dk] current=%d size=%d nAlloc=%d blocks=%d\n",
+				 name, maxAllocs, maxAllocs*SIZE/1024, currentAllocs, SIZE, nAllocs, blockPtrs.Size() );
+	}
+
+private:
+	enum { COUNT = 1024/SIZE };
+	union Chunk {
+		Chunk* next;
+		char mem[SIZE];
+	};
+	struct Block {
+		Chunk chunk[1024/SIZE];
+	};
+	DynArray< Block*, 10 > blockPtrs;
+	Chunk* root;
+
+	int currentAllocs;
+	int nAllocs;
+	int maxAllocs;
+};
+
+
+
+/**
+	Implements the interface to the "Visitor pattern" (see the Accept() method.)
+	If you call the Accept() method, it requires being passed a XMLVisitor
+	class to handle callbacks. For nodes that contain other nodes (Document, Element)
+	you will get called with a VisitEnter/VisitExit pair. Nodes that are always leafs
+	are simply called with Visit().
+
+	If you return 'true' from a Visit method, recursive parsing will continue. If you return
+	false, <b>no children of this node or its sibilings</b> will be visited.
+
+	All flavors of Visit methods have a default implementation that returns 'true' (continue 
+	visiting). You need to only override methods that are interesting to you.
+
+	Generally Accept() is called on the TiXmlDocument, although all nodes support visiting.
+
+	You should never change the document from a callback.
+
+	@sa XMLNode::Accept()
+*/
+class XMLVisitor
+{
+public:
+	virtual ~XMLVisitor() {}
+
+	/// Visit a document.
+	virtual bool VisitEnter( const XMLDocument& /*doc*/ )			{ return true; }
+	/// Visit a document.
+	virtual bool VisitExit( const XMLDocument& /*doc*/ )			{ return true; }
+
+	/// Visit an element.
+	virtual bool VisitEnter( const XMLElement& /*element*/, const XMLAttribute* /*firstAttribute*/ )	{ return true; }
+	/// Visit an element.
+	virtual bool VisitExit( const XMLElement& /*element*/ )			{ return true; }
+
+	/// Visit a declaration.
+	virtual bool Visit( const XMLDeclaration& /*declaration*/ )		{ return true; }
+	/// Visit a text node.
+	virtual bool Visit( const XMLText& /*text*/ )					{ return true; }
+	/// Visit a comment node.
+	virtual bool Visit( const XMLComment& /*comment*/ )				{ return true; }
+	/// Visit an unknown node.
+	virtual bool Visit( const XMLUnknown& /*unknown*/ )				{ return true; }
+};
+
+
+/*
+	Utility functionality.
+*/
+class XMLUtil
+{
+public:
+	// Anything in the high order range of UTF-8 is assumed to not be whitespace. This isn't 
+	// correct, but simple, and usually works.
+	static const char* SkipWhiteSpace( const char* p )	{ while( !IsUTF8Continuation(*p) && std::isspace( *reinterpret_cast<const unsigned char*>(p) ) ) { ++p; } return p; }
+	static char* SkipWhiteSpace( char* p )				{ while( !IsUTF8Continuation(*p) && std::isspace( *reinterpret_cast<unsigned char*>(p) ) )		{ ++p; } return p; }
+
+	inline static bool StringEqual( const char* p, const char* q, int nChar=INT_MAX )  {
+		int n = 0;
+		if ( p == q ) {
+			return true;
+		}
+		while( *p && *q && *p == *q && n<nChar ) {
+			++p; ++q; ++n;
+		}
+		if ( (n == nChar) || ( *p == 0 && *q == 0 ) ) {
+			return true;
+		}
+		return false;
+	}
+	inline static int IsUTF8Continuation( const char p ) { return p & 0x80; }
+	inline static int IsAlphaNum( unsigned char anyByte )	{ return ( anyByte < 128 ) ? std::isalnum( anyByte ) : 1; }
+	inline static int IsAlpha( unsigned char anyByte )		{ return ( anyByte < 128 ) ? std::isalpha( anyByte ) : 1; }
+
+	static const char* ReadBOM( const char* p, bool* hasBOM );
+	// p is the starting location,
+	// the UTF-8 value of the entity will be placed in value, and length filled in.
+	static const char* GetCharacterRef( const char* p, char* value, int* length );
+	static void ConvertUTF32ToUTF8( unsigned long input, char* output, int* length );
+
+	// converts primitive types to strings
+	static void ToStr( int v, char* buffer, int bufferSize );
+	static void ToStr( unsigned v, char* buffer, int bufferSize );
+	static void ToStr( bool v, char* buffer, int bufferSize );
+	static void ToStr( float v, char* buffer, int bufferSize );
+	static void ToStr( double v, char* buffer, int bufferSize );
+
+	// converts strings to primitive types
+	static bool	ToInt( const char* str, int* value );
+	static bool ToUnsigned( const char* str, unsigned* value );
+	static bool	ToBool( const char* str, bool* value );
+	static bool	ToFloat( const char* str, float* value );
+	static bool ToDouble( const char* str, double* value );
+};
+
+
+/** XMLNode is a base class for every object that is in the
+	XML Document Object Model (DOM), except XMLAttributes.
+	Nodes have siblings, a parent, and children which can
+	be navigated. A node is always in a XMLDocument.
+	The type of a XMLNode can be queried, and it can 
+	be cast to its more defined type.
+
+	A XMLDocument allocates memory for all its Nodes.
+	When the XMLDocument gets deleted, all its Nodes
+	will also be deleted.
+
+	@verbatim
+	A Document can contain:	Element	(container or leaf)
+							Comment (leaf)
+							Unknown (leaf)
+							Declaration( leaf )
+
+	An Element can contain:	Element (container or leaf)
+							Text	(leaf)
+							Attributes (not on tree)
+							Comment (leaf)
+							Unknown (leaf)
+
+	@endverbatim
+*/
+class XMLNode
+{
+	friend class XMLDocument;
+	friend class XMLElement;
+public:
+
+	/// Get the XMLDocument that owns this XMLNode.
+	const XMLDocument* GetDocument() const	{ return document; }
+	/// Get the XMLDocument that owns this XMLNode.
+	XMLDocument* GetDocument()				{ return document; }
+
+	virtual XMLElement*		ToElement()		{ return 0; }	///< Safely cast to an Element, or null.
+	virtual XMLText*		ToText()		{ return 0; }	///< Safely cast to Text, or null.
+	virtual XMLComment*		ToComment()		{ return 0; }	///< Safely cast to a Comment, or null.
+	virtual XMLDocument*	ToDocument()	{ return 0; }	///< Safely cast to a Document, or null.
+	virtual XMLDeclaration*	ToDeclaration()	{ return 0; }	///< Safely cast to a Declaration, or null.
+	virtual XMLUnknown*		ToUnknown()		{ return 0; }	///< Safely cast to an Unknown, or null.
+
+	virtual const XMLElement*		ToElement() const		{ return 0; }
+	virtual const XMLText*			ToText() const			{ return 0; }
+	virtual const XMLComment*		ToComment() const		{ return 0; }
+	virtual const XMLDocument*		ToDocument() const		{ return 0; }
+	virtual const XMLDeclaration*	ToDeclaration() const	{ return 0; }
+	virtual const XMLUnknown*		ToUnknown() const		{ return 0; }
+
+	/** The meaning of 'value' changes for the specific type.
+		@verbatim
+		Document:	empty
+		Element:	name of the element
+		Comment:	the comment text
+		Unknown:	the tag contents
+		Text:		the text string
+		@endverbatim
+	*/
+	const char* Value() const			{ return value.GetStr(); }
+	/** Set the Value of an XML node.
+		@sa Value()
+	*/
+	void SetValue( const char* val, bool staticMem=false );
+
+	/// Get the parent of this node on the DOM.
+	const XMLNode*	Parent() const			{ return parent; }
+	XMLNode* Parent()						{ return parent; }
+
+	/// Returns true if this node has no children.
+	bool NoChildren() const					{ return !firstChild; }
+
+	/// Get the first child node, or null if none exists.
+	const XMLNode*  FirstChild() const		{ return firstChild; }
+	XMLNode*		FirstChild()			{ return firstChild; }
+	/** Get the first child element, or optionally the first child
+	    element with the specified name.
+	*/
+	const XMLElement* FirstChildElement( const char* value=0 ) const;
+	XMLElement* FirstChildElement( const char* _value=0 )	{ return const_cast<XMLElement*>(const_cast<const XMLNode*>(this)->FirstChildElement( _value )); }
+
+	/// Get the last child node, or null if none exists.
+	const XMLNode*	LastChild() const						{ return lastChild; }
+	XMLNode*		LastChild()								{ return const_cast<XMLNode*>(const_cast<const XMLNode*>(this)->LastChild() ); }
+
+	/** Get the last child element or optionally the last child
+	    element with the specified name.
+	*/
+	const XMLElement* LastChildElement( const char* value=0 ) const;
+	XMLElement* LastChildElement( const char* _value=0 )	{ return const_cast<XMLElement*>(const_cast<const XMLNode*>(this)->LastChildElement(_value) ); }
+	
+	/// Get the previous (left) sibling node of this node.
+	const XMLNode*	PreviousSibling() const					{ return prev; }
+	XMLNode*	PreviousSibling()							{ return prev; }
+
+	/// Get the previous (left) sibling element of this node, with an opitionally supplied name.
+	const XMLElement*	PreviousSiblingElement( const char* value=0 ) const ;
+	XMLElement*	PreviousSiblingElement( const char* _value=0 ) { return const_cast<XMLElement*>(const_cast<const XMLNode*>(this)->PreviousSiblingElement( _value ) ); }
+	
+	/// Get the next (right) sibling node of this node.
+	const XMLNode*	NextSibling() const						{ return next; }
+	XMLNode*	NextSibling()								{ return next; }
+		
+	/// Get the next (right) sibling element of this node, with an opitionally supplied name.
+	const XMLElement*	NextSiblingElement( const char* value=0 ) const;
+ 	XMLElement*	NextSiblingElement( const char* _value=0 )	{ return const_cast<XMLElement*>(const_cast<const XMLNode*>(this)->NextSiblingElement( _value ) ); }
+
+	/**
+		Add a child node as the last (right) child.
+	*/
+	XMLNode* InsertEndChild( XMLNode* addThis );
+
+	XMLNode* LinkEndChild( XMLNode* addThis )	{ return InsertEndChild( addThis ); }
+	/**
+		Add a child node as the first (left) child.
+	*/
+	XMLNode* InsertFirstChild( XMLNode* addThis );
+	/**
+		Add a node after the specified child node.
+	*/
+	XMLNode* InsertAfterChild( XMLNode* afterThis, XMLNode* addThis );
+	
+	/**
+		Delete all the children of this node.
+	*/
+	void DeleteChildren();
+
+	/**
+		Delete a child of this node.
+	*/
+	void DeleteChild( XMLNode* node );
+
+	/**
+		Make a copy of this node, but not its children.
+		You may pass in a Document pointer that will be
+		the owner of the new Node. If the 'document' is 
+		null, then the node returned will be allocated
+		from the current Document. (this->GetDocument())
+
+		Note: if called on a XMLDocument, this will return null.
+	*/
+	virtual XMLNode* ShallowClone( XMLDocument* document ) const = 0;
+
+	/**
+		Test if 2 nodes are the same, but don't test children.
+		The 2 nodes do not need to be in the same Document.
+
+		Note: if called on a XMLDocument, this will return false.
+	*/
+	virtual bool ShallowEqual( const XMLNode* compare ) const = 0;
+
+	/** Accept a hierarchical visit of the nodes in the TinyXML DOM. Every node in the 
+		XML tree will be conditionally visited and the host will be called back
+		via the TiXmlVisitor interface.
+
+		This is essentially a SAX interface for TinyXML. (Note however it doesn't re-parse
+		the XML for the callbacks, so the performance of TinyXML is unchanged by using this
+		interface versus any other.)
+
+		The interface has been based on ideas from:
+
+		- http://www.saxproject.org/
+		- http://c2.com/cgi/wiki?HierarchicalVisitorPattern 
+
+		Which are both good references for "visiting".
+
+		An example of using Accept():
+		@verbatim
+		TiXmlPrinter printer;
+		tinyxmlDoc.Accept( &printer );
+		const char* xmlcstr = printer.CStr();
+		@endverbatim
+	*/
+	virtual bool Accept( XMLVisitor* visitor ) const = 0;
+
+	// internal
+	virtual char* ParseDeep( char*, StrPair* );
+
+protected:
+	XMLNode( XMLDocument* );
+	virtual ~XMLNode();
+	XMLNode( const XMLNode& );	// not supported
+	XMLNode& operator=( const XMLNode& );	// not supported
+	
+	XMLDocument*	document;
+	XMLNode*		parent;
+	mutable StrPair	value;
+
+	XMLNode*		firstChild;
+	XMLNode*		lastChild;
+
+	XMLNode*		prev;
+	XMLNode*		next;
+
+private:
+	MemPool*		memPool;
+	void Unlink( XMLNode* child );
+};
+
+
+/** XML text.
+
+	Note that a text node can have child element nodes, for example:
+	@verbatim
+	<root>This is <b>bold</b></root>
+	@endverbatim
+
+	A text node can have 2 ways to output the next. "normal" output 
+	and CDATA. It will default to the mode it was parsed from the XML file and
+	you generally want to leave it alone, but you can change the output mode with 
+	SetCDATA() and query it with CDATA().
+*/
+class XMLText : public XMLNode
+{
+	friend class XMLBase;
+	friend class XMLDocument;
+public:
+	virtual bool Accept( XMLVisitor* visitor ) const;
+
+	virtual XMLText*	ToText()			{ return this; }
+	virtual const XMLText*	ToText() const	{ return this; }
+
+	/// Declare whether this should be CDATA or standard text.
+	void SetCData( bool _isCData )			{ this->isCData = _isCData; }
+	/// Returns true if this is a CDATA text element.
+	bool CData() const						{ return isCData; }
+
+	char* ParseDeep( char*, StrPair* endTag );
+	virtual XMLNode* ShallowClone( XMLDocument* document ) const;
+	virtual bool ShallowEqual( const XMLNode* compare ) const;
+
+
+protected:
+	XMLText( XMLDocument* doc )	: XMLNode( doc ), isCData( false )	{}
+	virtual ~XMLText()												{}
+	XMLText( const XMLText& );	// not supported
+	XMLText& operator=( const XMLText& );	// not supported
+
+private:
+	bool isCData;
+};
+
+
+/** An XML Comment. */
+class XMLComment : public XMLNode
+{
+	friend class XMLDocument;
+public:
+	virtual XMLComment*	ToComment()					{ return this; }
+	virtual const XMLComment* ToComment() const		{ return this; }
+
+	virtual bool Accept( XMLVisitor* visitor ) const;
+
+	char* ParseDeep( char*, StrPair* endTag );
+	virtual XMLNode* ShallowClone( XMLDocument* document ) const;
+	virtual bool ShallowEqual( const XMLNode* compare ) const;
+
+protected:
+	XMLComment( XMLDocument* doc );
+	virtual ~XMLComment();
+	XMLComment( const XMLComment& );	// not supported
+	XMLComment& operator=( const XMLComment& );	// not supported
+
+private:
+};
+
+
+/** In correct XML the declaration is the first entry in the file.
+	@verbatim
+		<?xml version="1.0" standalone="yes"?>
+	@endverbatim
+
+	TinyXML2 will happily read or write files without a declaration,
+	however.
+
+	The text of the declaration isn't interpreted. It is parsed
+	and written as a string.
+*/
+class XMLDeclaration : public XMLNode
+{
+	friend class XMLDocument;
+public:
+	virtual XMLDeclaration*	ToDeclaration()					{ return this; }
+	virtual const XMLDeclaration* ToDeclaration() const		{ return this; }
+
+	virtual bool Accept( XMLVisitor* visitor ) const;
+
+	char* ParseDeep( char*, StrPair* endTag );
+	virtual XMLNode* ShallowClone( XMLDocument* document ) const;
+	virtual bool ShallowEqual( const XMLNode* compare ) const;
+
+protected:
+	XMLDeclaration( XMLDocument* doc );
+	virtual ~XMLDeclaration();
+	XMLDeclaration( const XMLDeclaration& );	// not supported
+	XMLDeclaration& operator=( const XMLDeclaration& );	// not supported
+};
+
+
+/** Any tag that tinyXml doesn't recognize is saved as an
+	unknown. It is a tag of text, but should not be modified.
+	It will be written back to the XML, unchanged, when the file
+	is saved.
+
+	DTD tags get thrown into TiXmlUnknowns.
+*/
+class XMLUnknown : public XMLNode
+{
+	friend class XMLDocument;
+public:
+	virtual XMLUnknown*	ToUnknown()					{ return this; }
+	virtual const XMLUnknown* ToUnknown() const		{ return this; }
+
+	virtual bool Accept( XMLVisitor* visitor ) const;
+
+	char* ParseDeep( char*, StrPair* endTag );
+	virtual XMLNode* ShallowClone( XMLDocument* document ) const;
+	virtual bool ShallowEqual( const XMLNode* compare ) const;
+
+protected:
+	XMLUnknown( XMLDocument* doc );
+	virtual ~XMLUnknown();
+	XMLUnknown( const XMLUnknown& );	// not supported
+	XMLUnknown& operator=( const XMLUnknown& );	// not supported
+};
+
+
+enum {
+	XML_NO_ERROR = 0,
+	XML_SUCCESS = 0,
+
+	XML_NO_ATTRIBUTE,
+	XML_WRONG_ATTRIBUTE_TYPE,
+
+	XML_ERROR_FILE_NOT_FOUND,
+	XML_ERROR_FILE_COULD_NOT_BE_OPENED,
+	XML_ERROR_FILE_READ_ERROR,
+	XML_ERROR_ELEMENT_MISMATCH,
+	XML_ERROR_PARSING_ELEMENT,
+	XML_ERROR_PARSING_ATTRIBUTE,
+	XML_ERROR_IDENTIFYING_TAG,
+	XML_ERROR_PARSING_TEXT,
+	XML_ERROR_PARSING_CDATA,
+	XML_ERROR_PARSING_COMMENT,
+	XML_ERROR_PARSING_DECLARATION,
+	XML_ERROR_PARSING_UNKNOWN,
+	XML_ERROR_EMPTY_DOCUMENT,
+	XML_ERROR_MISMATCHED_ELEMENT,
+	XML_ERROR_PARSING,
+
+	XML_CAN_NOT_CONVERT_TEXT,
+	XML_NO_TEXT_NODE
+};
+
+
+/** An attribute is a name-value pair. Elements have an arbitrary
+	number of attributes, each with a unique name.
+
+	@note The attributes are not XMLNodes. You may only query the
+	Next() attribute in a list.
+*/
+class XMLAttribute
+{
+	friend class XMLElement;
+public:
+	const char* Name() const { return name.GetStr(); }			///< The name of the attribute.
+	const char* Value() const { return value.GetStr(); }		///< The value of the attribute.
+	const XMLAttribute* Next() const { return next; }			///< The next attribute in the list.
+
+	/** IntAttribute interprets the attribute as an integer, and returns the value.
+	    If the value isn't an integer, 0 will be returned. There is no error checking;
+		use QueryIntAttribute() if you need error checking.
+	*/
+	int		 IntValue() const				{ int i=0;		QueryIntValue( &i );		return i; }
+	/// Query as an unsigned integer. See IntAttribute()
+	unsigned UnsignedValue() const			{ unsigned i=0; QueryUnsignedValue( &i );	return i; }
+	/// Query as a boolean. See IntAttribute()
+	bool	 BoolValue() const				{ bool b=false; QueryBoolValue( &b );		return b; }
+	/// Query as a double. See IntAttribute()
+	double 	 DoubleValue() const			{ double d=0;	QueryDoubleValue( &d );		return d; }
+	/// Query as a float. See IntAttribute()
+	float	 FloatValue() const				{ float f=0;	QueryFloatValue( &f );		return f; }
+
+	/** QueryIntAttribute interprets the attribute as an integer, and returns the value
+		in the provided paremeter. The function will return XML_NO_ERROR on success,
+		and XML_WRONG_ATTRIBUTE_TYPE if the conversion is not successful.
+	*/
+	int QueryIntValue( int* value ) const;
+	/// See QueryIntAttribute
+	int QueryUnsignedValue( unsigned int* value ) const;
+	/// See QueryIntAttribute
+	int QueryBoolValue( bool* value ) const;
+	/// See QueryIntAttribute
+	int QueryDoubleValue( double* value ) const;
+	/// See QueryIntAttribute
+	int QueryFloatValue( float* value ) const;
+
+	/// Set the attribute to a string value.
+	void SetAttribute( const char* value );
+	/// Set the attribute to value.
+	void SetAttribute( int value );
+	/// Set the attribute to value.
+	void SetAttribute( unsigned value );
+	/// Set the attribute to value.
+	void SetAttribute( bool value );
+	/// Set the attribute to value.
+	void SetAttribute( double value );
+	/// Set the attribute to value.
+	void SetAttribute( float value );
+
+private:
+	enum { BUF_SIZE = 200 };
+
+	XMLAttribute() : next( 0 ) {}
+	virtual ~XMLAttribute()	{}
+	XMLAttribute( const XMLAttribute& );	// not supported
+	void operator=( const XMLAttribute& );	// not supported
+	void SetName( const char* name );
+
+	char* ParseDeep( char* p, bool processEntities );
+
+	mutable StrPair name;
+	mutable StrPair value;
+	XMLAttribute* next;
+	MemPool* memPool;
+};
+
+
+/** The element is a container class. It has a value, the element name,
+	and can contain other elements, text, comments, and unknowns.
+	Elements also contain an arbitrary number of attributes.
+*/
+class XMLElement : public XMLNode
+{
+	friend class XMLBase;
+	friend class XMLDocument;
+public:
+	/// Get the name of an element (which is the Value() of the node.)
+	const char* Name() const		{ return Value(); }
+	/// Set the name of the element.
+	void SetName( const char* str, bool staticMem=false )	{ SetValue( str, staticMem ); }
+
+	virtual XMLElement* ToElement()				{ return this; }
+	virtual const XMLElement* ToElement() const { return this; }
+	virtual bool Accept( XMLVisitor* visitor ) const;
+
+	/** Given an attribute name, Attribute() returns the value
+		for the attribute of that name, or null if none 
+		exists. For example:
+
+		@verbatim
+		const char* value = ele->Attribute( "foo" );
+		@endverbatim
+
+		The 'value' parameter is normally null. However, if specified, 
+		the attribute will only be returned if the 'name' and 'value' 
+		match. This allow you to write code:
+
+		@verbatim
+		if ( ele->Attribute( "foo", "bar" ) ) callFooIsBar();
+		@endverbatim
+
+		rather than:
+		@verbatim
+		if ( ele->Attribute( "foo" ) ) {
+			if ( strcmp( ele->Attribute( "foo" ), "bar" ) == 0 ) callFooIsBar();
+		}
+		@endverbatim
+	*/
+	const char* Attribute( const char* name, const char* value=0 ) const;
+
+	/** Given an attribute name, IntAttribute() returns the value
+		of the attribute interpreted as an integer. 0 will be
+		returned if there is an error. For a method with error 
+		checking, see QueryIntAttribute()
+	*/
+	int		 IntAttribute( const char* name ) const		{ int i=0;		QueryIntAttribute( name, &i );		return i; }
+	/// See IntAttribute()
+	unsigned UnsignedAttribute( const char* name ) const{ unsigned i=0; QueryUnsignedAttribute( name, &i ); return i; }
+	/// See IntAttribute()
+	bool	 BoolAttribute( const char* name ) const	{ bool b=false; QueryBoolAttribute( name, &b );		return b; }
+	/// See IntAttribute()
+	double 	 DoubleAttribute( const char* name ) const	{ double d=0;	QueryDoubleAttribute( name, &d );	return d; }
+	/// See IntAttribute()
+	float	 FloatAttribute( const char* name ) const	{ float f=0;	QueryFloatAttribute( name, &f );	return f; }
+
+	/** Given an attribute name, QueryIntAttribute() returns 
+		XML_NO_ERROR, XML_WRONG_ATTRIBUTE_TYPE if the conversion
+		can't be performed, or XML_NO_ATTRIBUTE if the attribute
+		doesn't exist. If successful, the result of the conversion
+		will be written to 'value'. If not successful, nothing will
+		be written to 'value'. This allows you to provide default
+		value:
+
+		@verbatim
+		int value = 10;
+		QueryIntAttribute( "foo", &value );		// if "foo" isn't found, value will still be 10
+		@endverbatim
+	*/
+	int QueryIntAttribute( const char* name, int* _value ) const				{ const XMLAttribute* a = FindAttribute( name ); if ( !a ) return XML_NO_ATTRIBUTE; return a->QueryIntValue( _value ); } 
+	/// See QueryIntAttribute()
+	int QueryUnsignedAttribute( const char* name, unsigned int* _value ) const	{ const XMLAttribute* a = FindAttribute( name ); if ( !a ) return XML_NO_ATTRIBUTE; return a->QueryUnsignedValue( _value ); }
+	/// See QueryIntAttribute()
+	int QueryBoolAttribute( const char* name, bool* _value ) const				{ const XMLAttribute* a = FindAttribute( name ); if ( !a ) return XML_NO_ATTRIBUTE; return a->QueryBoolValue( _value ); }
+	/// See QueryIntAttribute()
+	int QueryDoubleAttribute( const char* name, double* _value ) const			{ const XMLAttribute* a = FindAttribute( name ); if ( !a ) return XML_NO_ATTRIBUTE; return a->QueryDoubleValue( _value ); }
+	/// See QueryIntAttribute()
+	int QueryFloatAttribute( const char* name, float* _value ) const			{ const XMLAttribute* a = FindAttribute( name ); if ( !a ) return XML_NO_ATTRIBUTE; return a->QueryFloatValue( _value ); }
+
+	/// Sets the named attribute to value.
+	void SetAttribute( const char* name, const char* _value )	{ XMLAttribute* a = FindOrCreateAttribute( name ); a->SetAttribute( _value ); }
+	/// Sets the named attribute to value.
+	void SetAttribute( const char* name, int _value )			{ XMLAttribute* a = FindOrCreateAttribute( name ); a->SetAttribute( _value ); }
+	/// Sets the named attribute to value.
+	void SetAttribute( const char* name, unsigned _value )		{ XMLAttribute* a = FindOrCreateAttribute( name ); a->SetAttribute( _value ); }
+	/// Sets the named attribute to value.
+	void SetAttribute( const char* name, bool _value )			{ XMLAttribute* a = FindOrCreateAttribute( name ); a->SetAttribute( _value ); }
+	/// Sets the named attribute to value.
+	void SetAttribute( const char* name, double _value )		{ XMLAttribute* a = FindOrCreateAttribute( name ); a->SetAttribute( _value ); }
+
+	/**
+		Delete an attribute.
+	*/
+	void DeleteAttribute( const char* name );
+
+	/// Return the first attribute in the list.
+	const XMLAttribute* FirstAttribute() const { return rootAttribute; }
+	/// Query a specific attribute in the list.
+	const XMLAttribute* FindAttribute( const char* name ) const;
+
+	/** Convenience function for easy access to the text inside an element. Although easy
+		and concise, GetText() is limited compared to getting the TiXmlText child
+		and accessing it directly.
+	
+		If the first child of 'this' is a TiXmlText, the GetText()
+		returns the character string of the Text node, else null is returned.
+
+		This is a convenient method for getting the text of simple contained text:
+		@verbatim
+		<foo>This is text</foo>
+			const char* str = fooElement->GetText();
+		@endverbatim
+
+		'str' will be a pointer to "This is text". 
+		
+		Note that this function can be misleading. If the element foo was created from
+		this XML:
+		@verbatim
+			<foo><b>This is text</b></foo> 
+		@endverbatim
+
+		then the value of str would be null. The first child node isn't a text node, it is
+		another element. From this XML:
+		@verbatim
+			<foo>This is <b>text</b></foo> 
+		@endverbatim
+		GetText() will return "This is ".
+	*/
+	const char* GetText() const;
+
+	/** 
+		Convenience method to query the value of a child text node. This is probably best
+		shown by example. Given you have a document is this form:
+		@verbatim
+			<point>
+				<x>1</x>
+				<y>1.4</y>
+			</point>
+		@endverbatim
+
+		The QueryIntText() and similar functions provide a safe and easier way to get to the
+		"value" of x and y.
+
+		@verbatim
+			int x = 0;
+			float y = 0;	// types of x and y are contrived for example
+			const XMLElement* xElement = pointElement->FirstChildElement( "x" );
+			const XMLElement* yElement = pointElement->FirstChildElement( "y" );
+			xElement->QueryIntText( &x );
+			yElement->QueryFloatText( &y );
+		@endverbatim
+
+		@returns XML_SUCCESS (0) on success, XML_CAN_NOT_CONVERT_TEXT if the text cannot be converted
+				 to the requested type, and XML_NO_TEXT_NODE if there is no child text to query.
+			
+	*/
+	int QueryIntText( int* _value ) const;
+	/// See QueryIntText()
+	int QueryUnsignedText( unsigned* _value ) const;
+	/// See QueryIntText()
+	int QueryBoolText( bool* _value ) const;
+	/// See QueryIntText()
+	int QueryDoubleText( double* _value ) const;
+	/// See QueryIntText()
+	int QueryFloatText( float* _value ) const;
+
+	// internal:
+	enum {
+		OPEN,		// <foo>
+		CLOSED,		// <foo/>
+		CLOSING		// </foo>
+	};
+	int ClosingType() const { return closingType; }
+	char* ParseDeep( char* p, StrPair* endTag );
+	virtual XMLNode* ShallowClone( XMLDocument* document ) const;
+	virtual bool ShallowEqual( const XMLNode* compare ) const;
+
+private:
+	XMLElement( XMLDocument* doc );
+	virtual ~XMLElement();
+	XMLElement( const XMLElement& );	// not supported
+	void operator=( const XMLElement& );	// not supported
+
+	XMLAttribute* FindAttribute( const char* name );
+	XMLAttribute* FindOrCreateAttribute( const char* name );
+	//void LinkAttribute( XMLAttribute* attrib );
+	char* ParseAttributes( char* p );
+
+	int closingType;
+	// The attribute list is ordered; there is no 'lastAttribute'
+	// because the list needs to be scanned for dupes before adding
+	// a new attribute.
+	XMLAttribute* rootAttribute;
+};
+
+
+/** A Document binds together all the functionality. 
+	It can be saved, loaded, and printed to the screen.
+	All Nodes are connected and allocated to a Document.
+	If the Document is deleted, all its Nodes are also deleted.
+*/
+class XMLDocument : public XMLNode
+{
+	friend class XMLElement;
+public:
+	/// constructor
+	XMLDocument( bool processEntities = true ); 
+	~XMLDocument();
+
+	virtual XMLDocument* ToDocument()				{ return this; }
+	virtual const XMLDocument* ToDocument() const	{ return this; }
+
+	/**
+		Parse an XML file from a character string.
+		Returns XML_NO_ERROR (0) on success, or
+		an errorID.
+	*/
+	int Parse( const char* xml );
+	
+	/**
+		Load an XML file from disk.
+		Returns XML_NO_ERROR (0) on success, or
+		an errorID.
+	*/	
+	int LoadFile( const char* filename );
+	
+	/**
+		Load an XML file from disk. You are responsible
+		for providing and closing the FILE*.
+
+		Returns XML_NO_ERROR (0) on success, or
+		an errorID.
+	*/	
+	int LoadFile( std::FILE* );
+	
+	/**
+		Save the XML file to disk.
+		Returns XML_NO_ERROR (0) on success, or
+		an errorID.
+	*/
+	int SaveFile( const char* filename );
+
+	/**
+		Save the XML file to disk. You are responsible
+		for providing and closing the FILE*.
+
+		Returns XML_NO_ERROR (0) on success, or
+		an errorID.
+	*/
+	int SaveFile( std::FILE* );
+
+	bool ProcessEntities() const						{ return processEntities; }
+
+	/**
+		Returns true if this document has a leading Byte Order Mark of UTF8.
+	*/
+	bool HasBOM() const { return writeBOM; }
+	/** Sets whether to write the BOM when writing the file.
+	*/
+	void SetBOM( bool useBOM ) { writeBOM = useBOM; }
+
+	/** Return the root element of DOM. Equivalent to FirstChildElement().
+	    To get the first node, use FirstChild().
+	*/
+	XMLElement* RootElement()				{ return FirstChildElement(); }
+	const XMLElement* RootElement() const	{ return FirstChildElement(); }
+
+	/** Print the Document. If the Printer is not provided, it will
+	    print to stdout. If you provide Printer, this can print to a file:
+		@verbatim
+		XMLPrinter printer( fp );
+		doc.Print( &printer );
+		@endverbatim
+
+		Or you can use a printer to print to memory:
+		@verbatim
+		XMLPrinter printer;
+		doc->Print( &printer );
+		// printer.CStr() has a const char* to the XML
+		@endverbatim
+	*/
+	void Print( XMLPrinter* streamer=0 );
+	virtual bool Accept( XMLVisitor* visitor ) const;
+
+	/**
+		Create a new Element associated with
+		this Document. The memory for the Element
+		is managed by the Document.
+	*/
+	XMLElement* NewElement( const char* name );
+	/**
+		Create a new Comment associated with
+		this Document. The memory for the Comment
+		is managed by the Document.
+	*/
+	XMLComment* NewComment( const char* comment );
+	/**
+		Create a new Text associated with
+		this Document. The memory for the Text
+		is managed by the Document.
+	*/
+	XMLText* NewText( const char* text );
+	/**
+		Create a new Declaration associated with
+		this Document. The memory for the object
+		is managed by the Document.
+
+		If the 'text' param is null, the standard
+		declaration is used.:
+		@verbatim
+			<?xml version="1.0" encoding="UTF-8"?>
+		@endverbatim
+	*/
+	XMLDeclaration* NewDeclaration( const char* text=0 );
+	/**
+		Create a new Unknown associated with
+		this Document. The memory for the object
+		is managed by the Document.
+	*/
+	XMLUnknown* NewUnknown( const char* text );
+
+	/**
+		Delete a node associated with this document.
+		It will be unlinked from the DOM.
+	*/
+	void DeleteNode( XMLNode* node )	{ node->parent->DeleteChild( node ); }
+
+	void SetError( int error, const char* str1, const char* str2 );
+	
+	/// Return true if there was an error parsing the document.
+	bool Error() const { return errorID != XML_NO_ERROR; }
+	/// Return the errorID.
+	int  ErrorID() const { return errorID; }
+	/// Return a possibly helpful diagnostic location or string.
+	const char* GetErrorStr1() const { return errorStr1; }
+	/// Return a possibly helpful secondary diagnostic location or string.
+	const char* GetErrorStr2() const { return errorStr2; }
+	/// If there is an error, print it to stdout.
+	void PrintError() const;
+
+	// internal
+	char* Identify( char* p, XMLNode** node );
+
+	virtual XMLNode* ShallowClone( XMLDocument* /*document*/ ) const	{ return 0; }
+	virtual bool ShallowEqual( const XMLNode* /*compare*/ ) const	{ return false; }
+
+private:
+	XMLDocument( const XMLDocument& );	// not supported
+	void operator=( const XMLDocument& );	// not supported
+	void InitDocument();
+
+	bool writeBOM;
+	bool processEntities;
+	int errorID;
+	const char* errorStr1;
+	const char* errorStr2;
+	char* charBuffer;
+
+	MemPoolT< sizeof(XMLElement) >	elementPool;
+	MemPoolT< sizeof(XMLAttribute) > attributePool;
+	MemPoolT< sizeof(XMLText) >		textPool;
+	MemPoolT< sizeof(XMLComment) >	commentPool;
+};
+
+
+/**
+	A XMLHandle is a class that wraps a node pointer with null checks; this is
+	an incredibly useful thing. Note that XMLHandle is not part of the TinyXML
+	DOM structure. It is a separate utility class.
+
+	Take an example:
+	@verbatim
+	<Document>
+		<Element attributeA = "valueA">
+			<Child attributeB = "value1" />
+			<Child attributeB = "value2" />
+		</Element>
+	</Document>
+	@endverbatim
+
+	Assuming you want the value of "attributeB" in the 2nd "Child" element, it's very 
+	easy to write a *lot* of code that looks like:
+
+	@verbatim
+	XMLElement* root = document.FirstChildElement( "Document" );
+	if ( root )
+	{
+		XMLElement* element = root->FirstChildElement( "Element" );
+		if ( element )
+		{
+			XMLElement* child = element->FirstChildElement( "Child" );
+			if ( child )
+			{
+				XMLElement* child2 = child->NextSiblingElement( "Child" );
+				if ( child2 )
+				{
+					// Finally do something useful.
+	@endverbatim
+
+	And that doesn't even cover "else" cases. XMLHandle addresses the verbosity
+	of such code. A XMLHandle checks for null pointers so it is perfectly safe 
+	and correct to use:
+
+	@verbatim
+	XMLHandle docHandle( &document );
+	XMLElement* child2 = docHandle.FirstChild( "Document" ).FirstChild( "Element" ).FirstChild().NextSibling().ToElement();
+	if ( child2 )
+	{
+		// do something useful
+	@endverbatim
+
+	Which is MUCH more concise and useful.
+
+	It is also safe to copy handles - internally they are nothing more than node pointers.
+	@verbatim
+	XMLHandle handleCopy = handle;
+	@endverbatim
+
+	See also XMLConstHandle, which is the same as XMLHandle, but operates on const objects.
+*/
+class XMLHandle
+{
+public:
+	/// Create a handle from any node (at any depth of the tree.) This can be a null pointer.
+	XMLHandle( XMLNode* _node )												{ node = _node; }
+	/// Create a handle from a node.
+	XMLHandle( XMLNode& _node )												{ node = &_node; }
+	/// Copy constructor
+	XMLHandle( const XMLHandle& ref )										{ node = ref.node; }
+	/// Assignment
+	XMLHandle& operator=( const XMLHandle& ref )							{ node = ref.node; return *this; }
+
+	/// Get the first child of this handle.
+	XMLHandle FirstChild() 													{ return XMLHandle( node ? node->FirstChild() : 0 ); }
+	/// Get the first child element of this handle.
+	XMLHandle FirstChildElement( const char* value=0 )						{ return XMLHandle( node ? node->FirstChildElement( value ) : 0 ); }
+	/// Get the last child of this handle.
+	XMLHandle LastChild()													{ return XMLHandle( node ? node->LastChild() : 0 ); }
+	/// Get the last child element of this handle.
+	XMLHandle LastChildElement( const char* _value=0 )						{ return XMLHandle( node ? node->LastChildElement( _value ) : 0 ); }
+	/// Get the previous sibling of this handle.
+	XMLHandle PreviousSibling()												{ return XMLHandle( node ? node->PreviousSibling() : 0 ); }
+	/// Get the previous sibling element of this handle.
+	XMLHandle PreviousSiblingElement( const char* _value=0 )				{ return XMLHandle( node ? node->PreviousSiblingElement( _value ) : 0 ); }
+	/// Get the next sibling of this handle.
+	XMLHandle NextSibling()													{ return XMLHandle( node ? node->NextSibling() : 0 ); }		
+	/// Get the next sibling element of this handle.
+	XMLHandle NextSiblingElement( const char* _value=0 )					{ return XMLHandle( node ? node->NextSiblingElement( _value ) : 0 ); }
+
+	/// Safe cast to XMLNode. This can return null.
+	XMLNode* ToNode()							{ return node; } 
+	/// Safe cast to XMLElement. This can return null.
+	XMLElement* ToElement() 					{ return ( ( node && node->ToElement() ) ? node->ToElement() : 0 ); }
+	/// Safe cast to XMLText. This can return null.
+	XMLText* ToText() 							{ return ( ( node && node->ToText() ) ? node->ToText() : 0 ); }
+	/// Safe cast to XMLUnknown. This can return null.
+	XMLUnknown* ToUnknown() 					{ return ( ( node && node->ToUnknown() ) ? node->ToUnknown() : 0 ); }
+	/// Safe cast to XMLDeclaration. This can return null.
+	XMLDeclaration* ToDeclaration() 			{ return ( ( node && node->ToDeclaration() ) ? node->ToDeclaration() : 0 ); }
+
+private:
+	XMLNode* node;
+};
+
+
+/**
+	A variant of the XMLHandle class for working with const XMLNodes and Documents. It is the
+	same in all regards, except for the 'const' qualifiers. See XMLHandle for API.
+*/
+class XMLConstHandle
+{
+public:
+	XMLConstHandle( const XMLNode* _node )											{ node = _node; }
+	XMLConstHandle( const XMLNode& _node )											{ node = &_node; }
+	XMLConstHandle( const XMLConstHandle& ref )										{ node = ref.node; }
+
+	XMLConstHandle& operator=( const XMLConstHandle& ref )							{ node = ref.node; return *this; }
+
+	const XMLConstHandle FirstChild() const											{ return XMLConstHandle( node ? node->FirstChild() : 0 ); }
+	const XMLConstHandle FirstChildElement( const char* value=0 ) const				{ return XMLConstHandle( node ? node->FirstChildElement( value ) : 0 ); }
+	const XMLConstHandle LastChild()	const										{ return XMLConstHandle( node ? node->LastChild() : 0 ); }
+	const XMLConstHandle LastChildElement( const char* _value=0 ) const				{ return XMLConstHandle( node ? node->LastChildElement( _value ) : 0 ); }
+	const XMLConstHandle PreviousSibling() const									{ return XMLConstHandle( node ? node->PreviousSibling() : 0 ); }
+	const XMLConstHandle PreviousSiblingElement( const char* _value=0 ) const		{ return XMLConstHandle( node ? node->PreviousSiblingElement( _value ) : 0 ); }
+	const XMLConstHandle NextSibling() const										{ return XMLConstHandle( node ? node->NextSibling() : 0 ); }
+	const XMLConstHandle NextSiblingElement( const char* _value=0 ) const			{ return XMLConstHandle( node ? node->NextSiblingElement( _value ) : 0 ); }
+
+
+	const XMLNode* ToNode() const				{ return node; } 
+	const XMLElement* ToElement() const			{ return ( ( node && node->ToElement() ) ? node->ToElement() : 0 ); }
+	const XMLText* ToText() const				{ return ( ( node && node->ToText() ) ? node->ToText() : 0 ); }
+	const XMLUnknown* ToUnknown() const			{ return ( ( node && node->ToUnknown() ) ? node->ToUnknown() : 0 ); }
+	const XMLDeclaration* ToDeclaration() const	{ return ( ( node && node->ToDeclaration() ) ? node->ToDeclaration() : 0 ); }
+
+private:
+	const XMLNode* node;
+};
+
+
+/**
+	Printing functionality. The XMLPrinter gives you more
+	options than the XMLDocument::Print() method.
+
+	It can:
+	-# Print to memory.
+	-# Print to a file you provide.
+	-# Print XML without a XMLDocument.
+
+	Print to Memory
+
+	@verbatim
+	XMLPrinter printer;
+	doc->Print( &printer );
+	SomeFunction( printer.CStr() );
+	@endverbatim
+
+	Print to a File
+	
+	You provide the file pointer.
+	@verbatim
+	XMLPrinter printer( fp );
+	doc.Print( &printer );
+	@endverbatim
+
+	Print without a XMLDocument
+
+	When loading, an XML parser is very useful. However, sometimes
+	when saving, it just gets in the way. The code is often set up
+	for streaming, and constructing the DOM is just overhead.
+
+	The Printer supports the streaming case. The following code
+	prints out a trivially simple XML file without ever creating
+	an XML document.
+
+	@verbatim
+	XMLPrinter printer( fp );
+	printer.OpenElement( "foo" );
+	printer.PushAttribute( "foo", "bar" );
+	printer.CloseElement();
+	@endverbatim
+*/
+class XMLPrinter : public XMLVisitor
+{
+public:
+	/** Construct the printer. If the FILE* is specified,
+		this will print to the FILE. Else it will print
+		to memory, and the result is available in CStr().
+		If 'compact' is set to true, then output is created
+		with only required whitespace and newlines.
+	*/
+	XMLPrinter( std::FILE* file=0, bool compact = false );
+	~XMLPrinter()	{}
+
+	/** If streaming, write the BOM and declaration. */
+	void PushHeader( bool writeBOM, bool writeDeclaration );
+	/** If streaming, start writing an element.
+	    The element must be closed with CloseElement()
+	*/
+	void OpenElement( const char* name );
+	/// If streaming, add an attribute to an open element.
+	void PushAttribute( const char* name, const char* value );
+	void PushAttribute( const char* name, int value );
+	void PushAttribute( const char* name, unsigned value );
+	void PushAttribute( const char* name, bool value );
+	void PushAttribute( const char* name, double value );
+	/// If streaming, close the Element.
+	void CloseElement();
+
+	/// Add a text node.
+	void PushText( const char* text, bool cdata=false );
+	/// Add a text node from an integer.
+	void PushText( int value );
+	/// Add a text node from an unsigned.
+	void PushText( unsigned value );
+	/// Add a text node from a bool.
+	void PushText( bool value );
+	/// Add a text node from a float.
+	void PushText( float value );
+	/// Add a text node from a double.
+	void PushText( double value );
+
+	/// Add a comment
+	void PushComment( const char* comment );
+
+	void PushDeclaration( const char* value );
+	void PushUnknown( const char* value );
+
+	virtual bool VisitEnter( const XMLDocument& /*doc*/ );
+	virtual bool VisitExit( const XMLDocument& /*doc*/ )			{ return true; }
+
+	virtual bool VisitEnter( const XMLElement& element, const XMLAttribute* attribute );
+	virtual bool VisitExit( const XMLElement& element );
+
+	virtual bool Visit( const XMLText& text );
+	virtual bool Visit( const XMLComment& comment );
+	virtual bool Visit( const XMLDeclaration& declaration );
+	virtual bool Visit( const XMLUnknown& unknown );
+
+	/**
+		If in print to memory mode, return a pointer to
+		the XML file in memory.
+	*/
+	const char* CStr() const { return buffer.Mem(); }
+	/**
+   		If in print to memory mode, return the size 
+		of the XML file in memory. (Note the size returned
+		includes the terminating null.)
+  	*/
+  	int CStrSize() const { return buffer.Size(); }
+
+private:
+	void SealElement();
+	void PrintSpace( int depth );
+	void PrintString( const char*, bool restrictedEntitySet );	// prints out, after detecting entities.
+	void Print( const char* format, ... );
+
+	bool elementJustOpened;
+	bool firstElement;
+	std::FILE* fp;
+	int depth;
+	int textDepth;
+	bool processEntities;
+	bool compactMode;
+
+	enum {
+		ENTITY_RANGE = 64,
+		BUF_SIZE = 200
+	};
+	bool entityFlag[ENTITY_RANGE];
+	bool restrictedEntityFlag[ENTITY_RANGE];
+
+	DynArray< const char*, 10 > stack;
+	DynArray< char, 20 > buffer;
+#ifdef _MSC_VER
+	DynArray< char, 20 > accumulator;
+#endif
+};
+
+
+}	// tinyxml2
+
+
+#endif // TINYXML2_INCLUDED

libmediainfo_0.7.34.tar.bz2/ToDo.txt -> libmediainfo_0.7.60.tar.bz2/ToDo.txt Changed

libmediainfo_0.7.34.tar.bz2/debian/changelog -> libmediainfo_0.7.60.tar.bz2/debian/changelog Changed

libmediainfo_0.7.34.tar.bz2/debian/control -> libmediainfo_0.7.60.tar.bz2/debian/control Changed

@@ -1,39 +1,71 @@
 Source: libmediainfo
 Priority: optional
-Maintainer: Jerome Martinez <zen@mediaarea.net>
-Build-Depends: debhelper (>= 5), doxygen, tofrodos, libzen0-dev (>= 0.4.14), zlib1g-dev, pkg-config, automake, autoconf, libtool
+Maintainer: MediaArea.net SARL <info@mediaarea.net>
+Build-Depends: debhelper (>= 5), doxygen, tofrodos, libzen-dev (>= 0.4.25), zlib1g-dev, pkg-config, automake, autoconf, libtool
 Standards-Version: 3.7.3
 Section: libs
 Homepage: http://mediainfo.sourceforge.net
 Vcs-Svn: https://mediainfo.svn.sourceforge.net/svnroot/mediainfo/MediaInfoLib/
 Vcs-Browser: http://mediainfo.svn.sourceforge.net/viewvc/mediainfo/MediaInfoLib/
 
-Package: libmediainfo0-dev
-Section: libdevel
-Architecture: any
-Depends: libmediainfo0 (>= 0.7.34), libzen0-dev (>= 0.4.14)
-Description: MediaInfo supplies information about a video or audio file
- This package includes the development support files of the libmediainfo
-
 Package: libmediainfo0
 Section: libs
 Architecture: any
-Depends: libzen0 (>= 0.4.14), zlib1g
-Description: MediaInfo supplies information about a video or audio file
- MediaInfo supplies technical and tag information about a video or audio file
+Depends: libzen0 (>= 0.4.25), zlib1g
+Description: MediaInfo is a convenient unified display of the most relevant technical
+ and tag data for video and audio files.
+ .
+ The MediaInfo data display includes:
+ - Container: format, profile, commercial name of the format, duration,
+   overall bit rate, writing application and library, title, author,
+   director, album, track number, date, duration...
+ - Video: format, codec id, aspect, frame rate, bit rate, color space,
+   chroma subsampling, bit depth, scan type, scan order...
+ - Audio: format, codec id, sample rate, channels, bit depth, language,
+   bit rate...
+ - Text: format, codec id, language of subtitle...
+ - Chapters: count of chapters, list of chapters...
+ .
+ MediaInfo analyticals include:
+ - Container: MPEG-4, QuickTime, Matroska, AVI, MPEG-PS (including DVD),
+   MPEG-TS (including Blu-ray), MXF, GXF, LXF, WMV, FLV, Real...
+ - Tags: Id3v1, Id3v2, Vorbis comments, APE tags...
+ - Video: MPEG-1/2 Video, H.263, MPEG-4 Visual (including DivX, XviD),
+   H.264/AVC, Dirac...
+ - Audio: MPEG Audio (including MP3), AC3, DTS, AAC, Dolby E, AES3, FLAC...
+ - Subtitles: CEA-608, CEA-708, DTVCC, SCTE-20, SCTE-128, ATSC/53, CDP, 
+   DVB Subtitle, Teletext, SRT, SSA, ASS, SAMI...
+ .
+ This package contains the shared library for MediaInfo.
+
+Package: libmediainfo-dev
+Section: libdevel
+Architecture: any
+Depends: libmediainfo0 (>= 0.7.60), libzen-dev (>= 0.4.25)
+Replaces: libmediainfo0-dev
+Description: MediaInfo is a convenient unified display of the most relevant technical
+ and tag data for video and audio files.
  .
- What information can I get from MediaInfo?
- General: title, author, director, album, track number, date, duration...
- Video: codec, aspect, fps, bitrate...
- Audio: codec, sample rate, channels, language, bitrate...
- Text: language of subtitle
- Chapters: number of chapters, list of chapters
+ The MediaInfo data display includes:
+ - Container: format, profile, commercial name of the format, duration,
+   overall bit rate, writing application and library, title, author,
+   director, album, track number, date, duration...
+ - Video: format, codec id, aspect, frame rate, bit rate, color space,
+   chroma subsampling, bit depth, scan type, scan order...
+ - Audio: format, codec id, sample rate, channels, bit depth, language,
+   bit rate...
+ - Text: format, codec id, language of subtitle...
+ - Chapters: count of chapters, list of chapters...
  .
- What format (container) does MediaInfo support?
- Video: MKV, OGM, AVI, DivX, WMV, QuickTime, Real, MPEG-1, MPEG-2,
-        MPEG-4, DVD (VOB)...
- (Codecs: DivX, XviD, MSMPEG4, ASP, H.264, AVC...)
- Audio: OGG, MP3, WAV, RA, AC3, DTS, AAC, M4A, AU, AIFF...
- Subtitles: SRT, SSA, ASS, SAMI...
+ MediaInfo analyticals include:
+ - Container: MPEG-4, QuickTime, Matroska, AVI, MPEG-PS (including DVD),
+   MPEG-TS (including Blu-ray), MXF, GXF, LXF, WMV, FLV, Real...
+ - Tags: Id3v1, Id3v2, Vorbis comments, APE tags...
+ - Video: MPEG-1/2 Video, H.263, MPEG-4 Visual (including DivX, XviD),
+   H.264/AVC, Dirac...
+ - Audio: MPEG Audio (including MP3), AC3, DTS, AAC, Dolby E, AES3, FLAC...
+ - Subtitles: CEA-608, CEA-708, DTVCC, SCTE-20, SCTE-128, ATSC/53, CDP, 
+   DVB Subtitle, Teletext, SRT, SSA, ASS, SAMI...
  .
- This package includes the shared library
+ This package contains the development support files needed for compiling
+ and linking applications and libraries which use MediaInfo shared library.

libmediainfo_0.7.34.tar.bz2/debian/copyright -> libmediainfo_0.7.60.tar.bz2/debian/copyright Changed

libmediainfo_0.7.60.tar.bz2/debian/libmediainfo-dev.dirs Added

libmediainfo_0.7.60.tar.bz2/debian/libmediainfo-dev.install Added

libmediainfo_0.7.34.tar.bz2/debian/rules -> libmediainfo_0.7.60.tar.bz2/debian/rules Changed

@@ -22,7 +22,7 @@
 	cp Source/Doc/*.html ./
 	cd Project/GNU/Library && chmod u+x autogen
 	cd Project/GNU/Library && ./autogen
-	cd Project/GNU/Library && ./configure --enable-shared --prefix=/usr --enable-visibility --disable-libcurl --disable-libmms
+	cd Project/GNU/Library && ./configure --disable-static --enable-shared --prefix=/usr --enable-visibility --disable-libcurl --disable-libmms
 
 	touch $@
 
@@ -76,15 +76,15 @@
 	install -m 644 Release/ReadMe_DLL_Linux.txt $(CURDIR)/debian/tmp/usr/share/doc/libmediainfo0/ReadMe.txt
 	install -m 644 History_DLL.txt $(CURDIR)/debian/tmp/usr/share/doc/libmediainfo0/History.txt
 	install -m 644 License.html $(CURDIR)/debian/tmp/usr/share/doc/libmediainfo0
-	install -dm 755 $(CURDIR)/debian/tmp/usr/share/doc/libmediainfo0-dev
-	install -m 644 Changes.txt $(CURDIR)/debian/tmp/usr/share/doc/libmediainfo0-dev
-	install -m 644 Documentation.html $(CURDIR)/debian/tmp/usr/share/doc/libmediainfo0-dev
-	install -dm 755 $(CURDIR)/debian/tmp/usr/share/doc/libmediainfo0-dev/Doc
-	install -m 644 Doc/*.* $(CURDIR)/debian/tmp/usr/share/doc/libmediainfo0-dev/Doc
-	if test -d Doc/search/ ; then install -dm 755 $(CURDIR)/debian/tmp/usr/share/doc/libmediainfo0-dev/Doc/search ; fi
-	if test -d Doc/search/ ; then install -m 644 Doc/search/*.* $(CURDIR)/debian/tmp/usr/share/doc/libmediainfo0-dev/Doc/search ; fi
-	install -dm 755 $(CURDIR)/debian/tmp/usr/share/doc/libmediainfo0-dev/Examples
-	install -m 644 Source/Example/HowToUse* $(CURDIR)/debian/tmp/usr/share/doc/libmediainfo0-dev/Examples
+	install -dm 755 $(CURDIR)/debian/tmp/usr/share/doc/libmediainfo-dev
+	install -m 644 Changes.txt $(CURDIR)/debian/tmp/usr/share/doc/libmediainfo-dev
+	install -m 644 Documentation.html $(CURDIR)/debian/tmp/usr/share/doc/libmediainfo-dev
+	install -dm 755 $(CURDIR)/debian/tmp/usr/share/doc/libmediainfo-dev/Doc
+	install -m 644 Doc/*.* $(CURDIR)/debian/tmp/usr/share/doc/libmediainfo-dev/Doc
+	if test -d Doc/search/ ; then install -dm 755 $(CURDIR)/debian/tmp/usr/share/doc/libmediainfo-dev/Doc/search ; fi
+	if test -d Doc/search/ ; then install -m 644 Doc/search/*.* $(CURDIR)/debian/tmp/usr/share/doc/libmediainfo-dev/Doc/search ; fi
+	install -dm 755 $(CURDIR)/debian/tmp/usr/share/doc/libmediainfo-dev/Examples
+	install -m 644 Source/Example/HowToUse* $(CURDIR)/debian/tmp/usr/share/doc/libmediainfo-dev/Examples
 
 
 # Build architecture-independent files here.

Build Results
RPM Lint

Refresh

Comments for request 285 0

Request History

marguerite created request over 11 years ago

bump version 0.7.60

pbleser accepted request about 12 years ago