media config: expand is_encrypted to a struct.

media/base/encryption_scheme.cc

+// Copyright 2015 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "media/base/encryption_scheme.h"
+
+namespace media {
+
+EncryptionScheme::Pattern::Pattern() : encrypt_blocks_(0), skip_blocks_(0) {}

[xhwang, 2016/03/04 20:00:48]

initialization list not needed any more since you have default values

[dougsteed, 2016/03/07 17:49:13]

Done.

+
+EncryptionScheme::Pattern::Pattern(uint32_t encrypt_blocks,
+                                   uint32_t skip_blocks)
+    : encrypt_blocks_(encrypt_blocks), skip_blocks_(skip_blocks) {}
+
+EncryptionScheme::Pattern::~Pattern() {}
+
+bool EncryptionScheme::Pattern::Matches(const Pattern& other) const {
+  return encrypt_blocks_ == other.encrypt_blocks() &&
+         skip_blocks_ == other.skip_blocks();
+}
+
+bool EncryptionScheme::Pattern::IsInEffect() const {
+  return encrypt_blocks_ != 0 && skip_blocks_ != 0;
+}
+
+EncryptionScheme::EncryptionScheme()
+    : mode_(kCipherModeUnencrypted), pattern_() {}

[xhwang, 2016/03/04 20:00:48]

ditto

[xhwang, 2016/03/04 20:00:48]

pattern_() not needed

[dougsteed, 2016/03/07 17:49:13]

Done.

+
+EncryptionScheme::EncryptionScheme(CipherMode mode) : mode_(mode), pattern_() {}
+
+EncryptionScheme::EncryptionScheme(CipherMode mode, const Pattern& pattern)
+    : mode_(mode), pattern_(pattern) {}
+
+EncryptionScheme::~EncryptionScheme() {}
+
+bool EncryptionScheme::Matches(const EncryptionScheme& other) const {
+  return mode_ == other.mode_ && pattern_.Matches(other.pattern_);
+}
+
+}  // namespace media