Source release v3.0.2

2015-10-08 16:57:59 -07:00
parent b5d6be97cb
commit 7a64ef6641
43 changed files with 644 additions and 7803 deletions
--- a/core/src/initialization_data.cpp
+++ b/core/src/initialization_data.cpp
@@ -55,7 +55,7 @@ bool InitializationData::ExtractWidevinePssh(const CdmInitData& init_data,
  // (optional, if version == 1) K * 16 byte key ID.
  // 4 byte size of PSSH data, exclusive. (N)
  // N byte PSSH data.
-  while (1) {
+  while (!reader.IsEOF()) {
    size_t start_pos = reader.pos();

    // atom size, used for skipping.
@@ -128,6 +128,7 @@ bool InitializationData::ExtractWidevinePssh(const CdmInitData& init_data,
             "the atom.");
        return false;
      }
+      LOGV("CdmEngine::ExtractWidevinePssh: Skipping non-Widevine PSSH.");
      continue;
    }