diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-08 22:23:17 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-08 22:23:17 +0000 |
| commit | dcd57350ed464493780247174db6a7c3628c01a2 (patch) | |
| tree | c0ee4511c106a7825b8894c6620f6fabb3aead9a /media/base/decrypt_config.cc | |
| parent | 3b10e258f6ebf230e6c0a2c8096346eb002461c6 (diff) | |
| download | chromium_src-dcd57350ed464493780247174db6a7c3628c01a2.zip chromium_src-dcd57350ed464493780247174db6a7c3628c01a2.tar.gz chromium_src-dcd57350ed464493780247174db6a7c3628c01a2.tar.bz2 | |
Drop DecryptConfig::data_offset_.
This CL drops DecryptConfig::data_offset_ and moves the offset parsing code into WebM demuxers. This allows us to remove offset passing/calculation code in several layers of the media pipeline.
Background:
We used to have HMAC check in encrypted WebM RFC, which requires us to keep the IV together with the encrypted frame, hence the offset. Now the HMAC check is dropped from the RFC so offset is not necessary anymore.
BUG=298569
Review URL: https://codereview.chromium.org/119203003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243672 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/decrypt_config.cc')
| -rw-r--r-- | media/base/decrypt_config.cc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/media/base/decrypt_config.cc b/media/base/decrypt_config.cc index 53e2014..a478065 100644 --- a/media/base/decrypt_config.cc +++ b/media/base/decrypt_config.cc @@ -10,16 +10,13 @@ namespace media { DecryptConfig::DecryptConfig(const std::string& key_id, const std::string& iv, - const int data_offset, const std::vector<SubsampleEntry>& subsamples) : key_id_(key_id), iv_(iv), - data_offset_(data_offset), subsamples_(subsamples) { CHECK_GT(key_id.size(), 0u); CHECK(iv.size() == static_cast<size_t>(DecryptConfig::kDecryptionKeySize) || iv.empty()); - CHECK_GE(data_offset, 0); } DecryptConfig::~DecryptConfig() {} |