mkvparser: Cluster::GetLast should load block entries

Change-Id: Ia8606be6c316591b1dc97bf684361dc9492e64c1

mkvparser.cpp

@@ -2839,7 +2839,8 @@ void Cluster::ParseBlockGroup(long long start, long long size, size_t index)
     assert(m_entriesCount);
     assert(index < m_entriesCount);
 
-    BlockGroup* const pGroup = new BlockGroup(this, index, start, size);
+    BlockGroup* const pGroup =
+        new (std::nothrow) BlockGroup(this, index, start, size);
     assert(pGroup);  //TODO
 
     m_pEntries[index] = pGroup;
@@ -2863,18 +2864,33 @@ void Cluster::ParseSimpleBlock(long long start, long long size, size_t index)
 
 const BlockEntry* Cluster::GetFirst()
 {
-    LoadBlockEntries();
+    //TODO: handle empty cluster
 
-    return m_pEntries[0];
+    LoadBlockEntries();
+    assert(m_pEntries);
+    assert(m_entriesCount >= 1);
+
+    const BlockEntry* const pFirst = m_pEntries[0];
+    assert(pFirst);
+
+    return pFirst;
 }
 
 
 const BlockEntry* Cluster::GetLast()
 {
-    if (m_entriesCount == 0)
+    //TODO: handle empty cluster
-        return m_pEntries[0];
 
-    return m_pEntries[m_entriesCount-1];
+    LoadBlockEntries();
+    assert(m_pEntries);
+    assert(m_entriesCount >= 1);
+
+    const size_t idx = m_entriesCount - 1;
+
+    const BlockEntry* const pLast = m_pEntries[idx];
+    assert(pLast);
+
+    return pLast;
 }
 
 
@@ -2896,7 +2912,6 @@ const BlockEntry* Cluster::GetNext(const BlockEntry* pEntry) const
 
 const BlockEntry* Cluster::GetEntry(const Track* pTrack)
 {
-
     assert(pTrack);
 
     if (m_pSegment == NULL)  //EOS

mkvparser_2008.vcproj

@@ -48,7 +48,7 @@
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -109,7 +109,7 @@
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 			/>
 			<Tool

sample.cpp

@@ -6,9 +6,8 @@
 // in the file PATENTS.  All contributing project authors may
 // be found in the AUTHORS file in the root of the source tree.
 //
-// This sample application is designed to help clients understand how to use
+// This sample application demonstrates how to use the matroska parser
-// mkvparser library.
+// library, which allows clients to handle a matroska format file.
-// By using the mkvparser lib clients are able to handle a matroska format file.
 
 #include "mkvreader.hpp"
 #include "mkvparser.hpp"
@@ -56,10 +55,10 @@ int main(int argc, char* argv[])
         return -1;
     }
 
-    int major, minor, build, revision;
+    int maj, min, build, rev;
 
-    GetVersion(major, minor, build, revision);
+    GetVersion(maj, min, build, rev);
-    printf("\t\t libmkv verison: %d.%d.%d.%d\n", major, minor, build, revision);
+    printf("\t\t libmkv verison: %d.%d.%d.%d\n", maj, min, build, rev);
 
     long long pos = 0;
 
@@ -94,9 +93,15 @@ int main(int argc, char* argv[])
 
     const long long timeCodeScale = pSegmentInfo->GetTimeCodeScale();
     const long long duration_ns = pSegmentInfo->GetDuration();
-    const wchar_t* const pTitle = utf8towcs(pSegmentInfo->GetTitleAsUTF8());
+
-    const wchar_t* const pMuxingApp = utf8towcs(pSegmentInfo->GetMuxingAppAsUTF8());
+    const char* const pTitle_ = pSegmentInfo->GetTitleAsUTF8();
-    const wchar_t* const pWritingApp = utf8towcs(pSegmentInfo->GetWritingAppAsUTF8());
+    const wchar_t* const pTitle = utf8towcs(pTitle_);
+
+    const char* const pMuxingApp_ = pSegmentInfo->GetMuxingAppAsUTF8();
+    const wchar_t* const pMuxingApp = utf8towcs(pMuxingApp_);
+
+    const char* const pWritingApp_ = pSegmentInfo->GetWritingAppAsUTF8();
+    const wchar_t* const pWritingApp = utf8towcs(pWritingApp_);
 
     printf("\n");
     printf("\t\t\t   Segment Info\n");
@@ -121,8 +126,11 @@ int main(int argc, char* argv[])
     else
         printf("\t\tWriting App\t\t: %ls\n", pWritingApp);
 
-    printf("\t\tPosition(Segment)\t: %lld\n", pSegment->m_start); // position of segment payload
+    // pos of segment payload
-    printf("\t\tSize(Segment)\t\t: %lld\n", pSegment->m_size);  // size of segment payload
+    printf("\t\tPosition(Segment)\t: %lld\n", pSegment->m_start);
+
+    // size of segment payload
+    printf("\t\tSize(Segment)\t\t: %lld\n", pSegment->m_size);
 
     mkvparser::Tracks* const pTracks = pSegment->GetTracks();
 
@@ -161,7 +169,8 @@ int main(int argc, char* argv[])
         else
             printf("\t\tCodec Id\t\t: %s\n", pCodecId);
 
-        const wchar_t* const pCodecName = utf8towcs(pTrack->GetCodecNameAsUTF8());
+        const char* const pCodecName_ = pTrack->GetCodecNameAsUTF8();
+        const wchar_t* const pCodecName = utf8towcs(pCodecName_);
 
         if (pCodecName == NULL)
             printf("\t\tCodec Name\t\t: NULL\n");
@@ -170,25 +179,31 @@ int main(int argc, char* argv[])
 
         if (trackType == VIDEO_TRACK)
         {
-            const VideoTrack* const pVideoTrack = static_cast<const VideoTrack* const>(pTrack);
+            const VideoTrack* const pVideoTrack =
-            long long width =  pVideoTrack->GetWidth();
+                static_cast<const VideoTrack*>(pTrack);
-            long long height = pVideoTrack->GetHeight();
-            double rate = pVideoTrack->GetFrameRate();
 
+            const long long width =  pVideoTrack->GetWidth();
             printf("\t\tVideo Width\t\t: %lld\n", width);
+
+            const long long height = pVideoTrack->GetHeight();
             printf("\t\tVideo Height\t\t: %lld\n", height);
+
+            const double rate = pVideoTrack->GetFrameRate();
             printf("\t\tVideo Rate\t\t: %f\n",rate);
         }
 
         if (trackType == AUDIO_TRACK)
         {
-            const AudioTrack* const pAudioTrack = static_cast<const AudioTrack* const>(pTrack);
+            const AudioTrack* const pAudioTrack =
-            long long channels =  pAudioTrack->GetChannels();
+                static_cast<const AudioTrack*>(pTrack);
-            long long bitDepth = pAudioTrack->GetBitDepth();
-            double sampleRate = pAudioTrack->GetSamplingRate();
 
+            const long long channels =  pAudioTrack->GetChannels();
             printf("\t\tAudio Channels\t\t: %lld\n", channels);
+
+            const long long bitDepth = pAudioTrack->GetBitDepth();
             printf("\t\tAudio BitDepth\t\t: %lld\n", bitDepth);
+
+            const double sampleRate = pAudioTrack->GetSamplingRate();
             printf("\t\tAddio Sample Rate\t: %.3f\n", sampleRate);
         }
     }
@@ -221,9 +236,8 @@ int main(int argc, char* argv[])
         {
             const Block* const pBlock  = pBlockEntry->GetBlock();
             const unsigned long trackNum = pBlock->GetTrackNumber();
-            const Track *pTrack = pTracks->GetTrackByNumber(trackNum);
+            const Track* const pTrack = pTracks->GetTrackByNumber(trackNum);
-            const long long trackType_ = pTrack->GetType();
+            const long long trackType = pTrack->GetType();
-            const unsigned long trackType = static_cast<unsigned long>(trackType_);
             const long size = pBlock->GetSize();
             const long long time_ns = pBlock->GetTime(pCluster);
 

sample_2008.vcproj

@@ -48,7 +48,7 @@
 				RuntimeLibrary="3"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -121,7 +121,7 @@
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
+				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 			/>
 			<Tool