Merge branch 'master' of https://widevine-partner.googlesource.com/media_cas_packager_sdk_source into moe_writing_branch_from_947b950d950a5a5777a84d953e88af7358e3086c

This commit is contained in:
Widevine Buildbot
2018-10-23 19:37:03 +00:00
parent b8b62e31d6
commit 10eb5a09a3
3 changed files with 3 additions and 4 deletions

Binary file not shown.

Binary file not shown.

View File

@@ -17,9 +17,6 @@
#include <vector> #include <vector>
#include "util/status.h" #include "util/status.h"
#include "media_cas_packager_sdk/internal/ecm.h"
#include "media_cas_packager_sdk/internal/ecm_generator.h"
#include "protos/public/media_cas.pb.h"
namespace widevine { namespace widevine {
namespace cas { namespace cas {
@@ -106,7 +103,9 @@ class WvCasEcm {
private: private:
bool initialized_ = false; bool initialized_ = false;
EcmInitParameters ecm_init_params_; int content_iv_size_;
bool key_rotation_enabled_;
int crypto_mode_;
}; };
} // namespace cas } // namespace cas