Index: media/base/video_decoder_config.h |
diff --git a/media/base/video_decoder_config.h b/media/base/video_decoder_config.h |
index 3de0d2f9314e31b435655377b47715952255cc00..01d60c73a4033355a92df8a067570cec59f15c57 100644 |
--- a/media/base/video_decoder_config.h |
+++ b/media/base/video_decoder_config.h |
@@ -9,6 +9,7 @@ |
#include <vector> |
#include "base/basictypes.h" |
+#include "media/base/encryption_scheme.h" |
#include "media/base/media_export.h" |
#include "media/base/video_codecs.h" |
#include "media/base/video_types.h" |
@@ -36,7 +37,7 @@ class MEDIA_EXPORT VideoDecoderConfig { |
const gfx::Rect& visible_rect, |
const gfx::Size& natural_size, |
const std::vector<uint8_t>& extra_data, |
- bool is_encrypted); |
+ const EncryptionScheme& encryption_scheme); |
~VideoDecoderConfig(); |
@@ -49,7 +50,7 @@ class MEDIA_EXPORT VideoDecoderConfig { |
const gfx::Rect& visible_rect, |
const gfx::Size& natural_size, |
const std::vector<uint8_t>& extra_data, |
- bool is_encrypted); |
+ const EncryptionScheme& encryption_scheme); |
// Returns true if this object has appropriate configuration values, false |
// otherwise. |
@@ -94,7 +95,12 @@ class MEDIA_EXPORT VideoDecoderConfig { |
// Whether the video stream is potentially encrypted. |
// Note that in a potentially encrypted video stream, individual buffers |
// can be encrypted or not encrypted. |
- bool is_encrypted() const { return is_encrypted_; } |
+ bool is_encrypted() const { return encryption_scheme_.is_encrypted(); } |
ddorwin
2015/12/10 18:36:01
ditto * 2
dougsteed
2015/12/14 21:19:02
Done.
|
+ |
+ // Encryption scheme used for encrypted buffers. |
+ const EncryptionScheme& encryption_scheme() const { |
+ return encryption_scheme_; |
+ } |
private: |
VideoCodec codec_; |
@@ -109,7 +115,7 @@ class MEDIA_EXPORT VideoDecoderConfig { |
std::vector<uint8_t> extra_data_; |
- bool is_encrypted_; |
+ EncryptionScheme encryption_scheme_; |
// Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler |
// generated copy constructor and assignment operator. Since the extra data is |