Source release v3.0.5

2015-12-16 10:08:48 -08:00
parent 973eb25a17
commit 7a7f78d654
11 changed files with 118 additions and 72 deletions
--- a/cdm/test/cdm_test.cpp
+++ b/cdm/test/cdm_test.cpp
@@ -160,6 +160,13 @@ class CdmTest : public Test,
    SetDefaultServerCertificate();
  }

+  virtual void TearDown() OVERRIDE {
+    // So the OEMCrypto nonce flood check does not trigger.
+    // A 500ms delay allows up to 10 nonces to be generated per test without
+    // triggering an OEMCrypto error.
+    usleep(500 * 1000);
+  }
+
  void RecreateCdm(bool privacy_mode) {
    CreateAdditionalCdm(privacy_mode, &cdm_);
  }