From e3616a66141f4e1e3bc8de7af94c59a083936b48 Mon Sep 17 00:00:00 2001
From: Sasi Inguva <isasi@google.com>
Date: Thu, 12 Mar 2015 00:09:02 -0700
Subject: [PATCH] Add support to parse stereo mode, display width and display
 height in mkvparser

Change-Id: I7ff99275b70e96b84601c32836f1b79f95fcf0d4
---
 mkvparser.cpp | 32 ++++++++++++++++++++++++++++++++
 mkvparser.hpp |  7 +++++++
 2 files changed, 39 insertions(+)

diff --git a/mkvparser.cpp b/mkvparser.cpp
index 571b360..5c8735d 100644
--- a/mkvparser.cpp
+++ b/mkvparser.cpp
@@ -5352,6 +5352,10 @@ long VideoTrack::Parse(Segment* pSegment, const Info& info,
 
   long long width = 0;
   long long height = 0;
+  long long display_width = 0;
+  long long display_height = 0;
+  long long stereo_mode = 0;
+
   double rate = 0.0;
 
   IMkvReader* const pReader = pSegment->m_pReader;
@@ -5383,6 +5387,21 @@ long VideoTrack::Parse(Segment* pSegment, const Info& info,
 
       if (height <= 0)
         return E_FILE_FORMAT_INVALID;
+    } else if (id == 0x14B0) { // display width
+      display_width = UnserializeUInt(pReader, pos, size);
+
+      if (display_width <= 0)
+        return E_FILE_FORMAT_INVALID;
+    } else if (id == 0x14BA) { // display height
+      display_height = UnserializeUInt(pReader, pos, size);
+
+      if (display_height <= 0)
+        return E_FILE_FORMAT_INVALID;
+    } else if (id == 0x13B8) { // stereo mode
+      stereo_mode = UnserializeUInt(pReader, pos, size);
+
+      if (stereo_mode < 0)
+        return E_FILE_FORMAT_INVALID;
     } else if (id == 0x0383E3) {  // frame rate
       const long status = UnserializeFloat(pReader, pos, size, rate);
 
@@ -5414,6 +5433,9 @@ long VideoTrack::Parse(Segment* pSegment, const Info& info,
 
   pTrack->m_width = width;
   pTrack->m_height = height;
+  pTrack->m_display_width = display_width;
+  pTrack->m_display_height = display_height;
+  pTrack->m_stereo_mode = stereo_mode;
   pTrack->m_rate = rate;
 
   pResult = pTrack;
@@ -5526,6 +5548,16 @@ long long VideoTrack::GetWidth() const { return m_width; }
 
 long long VideoTrack::GetHeight() const { return m_height; }
 
+long long VideoTrack::GetDisplayWidth() const {
+  return m_display_width > 0 ? m_display_width : GetWidth();
+}
+
+long long VideoTrack::GetDisplayHeight() const {
+  return m_display_height > 0 ? m_display_height : GetHeight();
+}
+
+long long VideoTrack::GetStereoMode() const { return m_stereo_mode; }
+
 double VideoTrack::GetFrameRate() const { return m_rate; }
 
 AudioTrack::AudioTrack(Segment* pSegment, long long element_start,
diff --git a/mkvparser.hpp b/mkvparser.hpp
index 3e17d07..33a05ad 100644
--- a/mkvparser.hpp
+++ b/mkvparser.hpp
@@ -398,6 +398,9 @@ class VideoTrack : public Track {
 
   long long GetWidth() const;
   long long GetHeight() const;
+  long long GetDisplayWidth() const;
+  long long GetDisplayHeight() const;
+  long long GetStereoMode() const;
   double GetFrameRate() const;
 
   bool VetEntry(const BlockEntry*) const;
@@ -406,6 +409,10 @@ class VideoTrack : public Track {
  private:
   long long m_width;
   long long m_height;
+  long long m_display_width;
+  long long m_display_height;
+  long long m_stereo_mode;
+
   double m_rate;
 };