commit 210ff1edcb4c68447fd2a08725a60d8dc429cbe3
author Ray Essick <essick@google.com> Wed Apr 03 23:25:23 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 03 23:25:23 2019 +0000
tree 7b1bcb4faeca3ccc9d68860a5cda503cb07f37d1
parent 34e548f91d575296898b39f942f82df89efe412b
parent 6ecd1c5c838f4988f2eadb2e93a3a7b23122374f

Merge "mkvCue Entry's id is wrong"

media/extractors/mkv/MatroskaExtractor.cpp

diff --git a/media/extractors/mkv/MatroskaExtractor.cpp b/media/extractors/mkv/MatroskaExtractor.cpp
index d6d24c1..e284cda 100644
--- a/media/extractors/mkv/MatroskaExtractor.cpp
+++ b/media/extractors/mkv/MatroskaExtractor.cpp
@@ -20,6 +20,7 @@
 
 #include "FLACDecoder.h"
 #include "MatroskaExtractor.h"
+#include "common/webmids.h"
 
 #include <media/DataSourceBase.h>
 #include <media/ExtractorUtils.h>
@@ -461,7 +462,7 @@
         for (size_t index = 0; index < count; index++) {
             pEntry = pSH->GetEntry(index);
 
-            if (pEntry->id == 0x0C53BB6B) { // Cues ID
+            if (pEntry->id == libwebm::kMkvCues) { // Cues ID
                 long len; long long pos;
                 pSegment->ParseCues(pEntry->pos, pos, len);
                 pCues = pSegment->GetCues();
@@ -1282,7 +1283,7 @@
                 const mkvparser::SeekHead::Entry* mEntry;
                 for (size_t index = 0; index < count; index++) {
                     mEntry = mSH->GetEntry(index);
-                    if (mEntry->id == 0x0C53BB6B) {  // Cues ID
+                    if (mEntry->id == libwebm::kMkvCues) { // Cues ID
                         long len;
                         long long pos;
                         mSegment->ParseCues(mEntry->pos, pos, len);