[Merged] media: Properly tell whether the buffer is encrypted

media/base/decrypt_config.h

Index: media/base/decrypt_config.h
diff --git a/media/base/decrypt_config.h b/media/base/decrypt_config.h
index c90a3bc1a99610ac99da9d4a439ae5b3c3929c09..84b3874886d6bc4134975c3b8cf46c483dcdfe4a 100644
--- a/media/base/decrypt_config.h
+++ b/media/base/decrypt_config.h
@@ -56,6 +56,10 @@ class MEDIA_EXPORT DecryptConfig {
   const std::string& iv() const { return iv_; }
   const std::vector<SubsampleEntry>& subsamples() const { return subsamples_; }
 
+  // Returns true if the corresponding decoder buffer requires decryption and
+  // false if that buffer is clear despite the presense of DecryptConfig.
+  bool is_encrypted() const { return !key_id_.empty() && !iv_.empty(); }
+
   // Returns true if all fields in |config| match this config.
   bool Matches(const DecryptConfig& config) const;