Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(893)

Unified Diff: media/base/decrypt_config.h

Issue 119203003: Drop DecryptConfig::data_offset_. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/base/decrypt_config.h
diff --git a/media/base/decrypt_config.h b/media/base/decrypt_config.h
index be0bb4d61b1e51e6e22b8d399247a53eb7d50fb7..86480aa9eed29fceac570d0bdc3d9b5a29e1e19e 100644
--- a/media/base/decrypt_config.h
+++ b/media/base/decrypt_config.h
@@ -38,23 +38,16 @@ class MEDIA_EXPORT DecryptConfig {
// |iv| is the initialization vector defined by the encrypted format.
// Currently |iv| must be 16 bytes as defined by WebM and ISO. Or must be
// empty which signals an unencrypted frame.
- // |data_offset| is the amount of data that should be discarded from the
- // head of the sample buffer before applying subsample information. A
- // decrypted buffer will be shorter than an encrypted buffer by this amount.
// |subsamples| defines the clear and encrypted portions of the sample as
// described above. A decrypted buffer will be equal in size to the sum
// of the subsample sizes.
- //
- // |data_offset| is applied before |subsamples|.
DecryptConfig(const std::string& key_id,
const std::string& iv,
- const int data_offset,
const std::vector<SubsampleEntry>& subsamples);
~DecryptConfig();
const std::string& key_id() const { return key_id_; }
const std::string& iv() const { return iv_; }
- int data_offset() const { return data_offset_; }
const std::vector<SubsampleEntry>& subsamples() const { return subsamples_; }
private:
@@ -63,11 +56,6 @@ class MEDIA_EXPORT DecryptConfig {
// Initialization vector.
const std::string iv_;
- // TODO(fgalligan): Remove |data_offset_| if there is no plan to use it in
- // the future.
- // Amount of data to be discarded before applying subsample information.
- const int data_offset_;
-
// Subsample information. May be empty for some formats, meaning entire frame
// (less data ignored by data_offset_) is encrypted.
const std::vector<SubsampleEntry> subsamples_;

Powered by Google App Engine
This is Rietveld 408576698