From 07c180a3b0d435b23377b2506eeba87dfa614da0 Mon Sep 17 00:00:00 2001
From: niksedk <nikse.dk@gmail.com>
Date: Fri, 30 Sep 2011 20:22:20 +0000
Subject: [PATCH] Added video res to mp4 properties

git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@679 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
---
 src/Logic/Mp4/Boxes/Tkhd.cs | 36 +++++++++++++++++++++++-------------
 src/Logic/Mp4/Mp4Parser.cs  |  3 +++
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/Logic/Mp4/Boxes/Tkhd.cs b/src/Logic/Mp4/Boxes/Tkhd.cs
index fa7eea24f..ce20b8de1 100644
--- a/src/Logic/Mp4/Boxes/Tkhd.cs
+++ b/src/Logic/Mp4/Boxes/Tkhd.cs
@@ -7,29 +7,39 @@ namespace Nikse.SubtitleEdit.Logic.Mp4.Boxes
 {
     public class Tkhd : Box
     {
-
+        public readonly uint TrackId;
+        public readonly ulong Duration;
         public readonly uint Width;
         public readonly uint Height;
 
         public Tkhd(FileStream fs, ulong maximumLength)
         {
-            buffer = new byte[38];
+            buffer = new byte[84];
             int bytesRead = fs.Read(buffer, 0, buffer.Length);
             if (bytesRead < buffer.Length)
                 return;
 
-            //System.Windows.Forms.MessageBox.Show(Helper.GetUInt(buffer, 04).ToString());
-            //System.Windows.Forms.MessageBox.Show(Helper.GetUInt(buffer, 06).ToString());
-            //System.Windows.Forms.MessageBox.Show(Helper.GetUInt(buffer, 08).ToString());
-            //System.Windows.Forms.MessageBox.Show(Helper.GetUInt(buffer, 10).ToString());
-            //System.Windows.Forms.MessageBox.Show(Helper.GetUInt(buffer, 12).ToString());
-            //System.Windows.Forms.MessageBox.Show(Helper.GetUInt(buffer, 14).ToString());
-            //System.Windows.Forms.MessageBox.Show(Helper.GetUInt(buffer, 16).ToString());
-            //System.Windows.Forms.MessageBox.Show(Helper.GetUInt(buffer, 19).ToString());
-            //System.Windows.Forms.MessageBox.Show(Helper.GetUInt(buffer, 20).ToString());
-            //System.Windows.Forms.MessageBox.Show(Helper.GetUInt(buffer, 22).ToString());
-            //System.Windows.Forms.MessageBox.Show(Helper.GetUInt(buffer, 24).ToString());
+            int version = buffer[0];
+            int addToIndex64Bit = 0;
+            if (version == 1)
+                addToIndex64Bit = 8;
 
+            TrackId = GetUInt(12 + addToIndex64Bit);
+            if (version == 1)
+            {
+                Duration = GetUInt64(20 + addToIndex64Bit);
+                addToIndex64Bit += 4;
+            }
+            else
+            {
+                Duration = GetUInt(20 + addToIndex64Bit);
+            }
+
+            Width = (uint)GetWord(76 + addToIndex64Bit); // skip decimals
+            Height = (uint)GetWord(80 + addToIndex64Bit); // skip decimals
+
+            //System.Windows.Forms.MessageBox.Show("Width: " + GetWord(76 + addToIndex64Bit).ToString() + "." + GetWord(78 + addToIndex64Bit).ToString());
+            //System.Windows.Forms.MessageBox.Show("Height: " + GetWord(80 + addToIndex64Bit).ToString() + "." + GetWord(82 + addToIndex64Bit).ToString());
         }
     }
 }
diff --git a/src/Logic/Mp4/Mp4Parser.cs b/src/Logic/Mp4/Mp4Parser.cs
index 05c2c1440..e44211ad3 100644
--- a/src/Logic/Mp4/Mp4Parser.cs
+++ b/src/Logic/Mp4/Mp4Parser.cs
@@ -39,6 +39,9 @@ namespace Nikse.SubtitleEdit.Logic.Mp4
             }
         }
 
+        /// <summary>
+        /// Resolution of first video track. If not present returns 0.0
+        /// </summary>
         public System.Drawing.Point VideoResolution
         {
             get