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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/cdm/aes_decryptor_unittest.cc

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
« no previous file with comments | « media/cdm/aes_decryptor.cc ('k') | media/cdm/ppapi/external_clear_key/clear_key_cdm.cc » ('j') | media/webm/webm_cluster_parser.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/aes_decryptor_unittest.cc
diff --git a/media/cdm/aes_decryptor_unittest.cc b/media/cdm/aes_decryptor_unittest.cc
index 3076d5a3f2e94213907ce95fab11590321cf69dc..8fb6a56c7c5a8afe04bbd9596f900bde8050ac83 100644
--- a/media/cdm/aes_decryptor_unittest.cc
+++ b/media/cdm/aes_decryptor_unittest.cc
@@ -177,12 +177,10 @@ static scoped_refptr<DecoderBuffer> CreateEncryptedBuffer(
const std::vector<uint8>& data,
const std::vector<uint8>& key_id,
const std::vector<uint8>& iv,
- int offset,
const std::vector<SubsampleEntry>& subsample_entries) {
DCHECK(!data.empty());
- int padded_size = offset + data.size();
- scoped_refptr<DecoderBuffer> encrypted_buffer(new DecoderBuffer(padded_size));
- memcpy(encrypted_buffer->writable_data() + offset, &data[0], data.size());
+ scoped_refptr<DecoderBuffer> encrypted_buffer(new DecoderBuffer(data.size()));
+ memcpy(encrypted_buffer->writable_data(), &data[0], data.size());
CHECK(encrypted_buffer.get());
std::string key_id_string(
reinterpret_cast<const char*>(key_id.empty() ? NULL : &key_id[0]),
@@ -190,7 +188,7 @@ static scoped_refptr<DecoderBuffer> CreateEncryptedBuffer(
std::string iv_string(
reinterpret_cast<const char*>(iv.empty() ? NULL : &iv[0]), iv.size());
encrypted_buffer->set_decrypt_config(scoped_ptr<DecryptConfig>(
- new DecryptConfig(key_id_string, iv_string, offset, subsample_entries)));
+ new DecryptConfig(key_id_string, iv_string, subsample_entries)));
return encrypted_buffer;
}
@@ -381,22 +379,14 @@ TEST_F(AesDecryptorTest, NormalDecryption) {
uint32 session_id = CreateSession(key_id_);
UpdateSessionAndExpect(session_id, kKeyAsJWK, SESSION_READY);
scoped_refptr<DecoderBuffer> encrypted_buffer = CreateEncryptedBuffer(
- encrypted_data_, key_id_, iv_, 0, no_subsample_entries_);
- DecryptAndExpect(encrypted_buffer, original_data_, SUCCESS);
-}
-
-TEST_F(AesDecryptorTest, DecryptionWithOffset) {
- uint32 session_id = CreateSession(key_id_);
- UpdateSessionAndExpect(session_id, kKeyAsJWK, SESSION_READY);
- scoped_refptr<DecoderBuffer> encrypted_buffer = CreateEncryptedBuffer(
- encrypted_data_, key_id_, iv_, 23, no_subsample_entries_);
+ encrypted_data_, key_id_, iv_, no_subsample_entries_);
DecryptAndExpect(encrypted_buffer, original_data_, SUCCESS);
}
TEST_F(AesDecryptorTest, UnencryptedFrame) {
// An empty iv string signals that the frame is unencrypted.
scoped_refptr<DecoderBuffer> encrypted_buffer = CreateEncryptedBuffer(
- original_data_, key_id_, std::vector<uint8>(), 0, no_subsample_entries_);
+ original_data_, key_id_, std::vector<uint8>(), no_subsample_entries_);
DecryptAndExpect(encrypted_buffer, original_data_, SUCCESS);
}
@@ -404,13 +394,13 @@ TEST_F(AesDecryptorTest, WrongKey) {
uint32 session_id = CreateSession(key_id_);
UpdateSessionAndExpect(session_id, kWrongKeyAsJWK, SESSION_READY);
scoped_refptr<DecoderBuffer> encrypted_buffer = CreateEncryptedBuffer(
- encrypted_data_, key_id_, iv_, 0, no_subsample_entries_);
+ encrypted_data_, key_id_, iv_, no_subsample_entries_);
DecryptAndExpect(encrypted_buffer, original_data_, DATA_MISMATCH);
}
TEST_F(AesDecryptorTest, NoKey) {
scoped_refptr<DecoderBuffer> encrypted_buffer = CreateEncryptedBuffer(
- encrypted_data_, key_id_, iv_, 0, no_subsample_entries_);
+ encrypted_data_, key_id_, iv_, no_subsample_entries_);
EXPECT_CALL(*this, BufferDecrypted(AesDecryptor::kNoKey, IsNull()));
decryptor_.Decrypt(Decryptor::kVideo, encrypted_buffer, decrypt_cb_);
}
@@ -418,7 +408,7 @@ TEST_F(AesDecryptorTest, NoKey) {
TEST_F(AesDecryptorTest, KeyReplacement) {
uint32 session_id = CreateSession(key_id_);
scoped_refptr<DecoderBuffer> encrypted_buffer = CreateEncryptedBuffer(
- encrypted_data_, key_id_, iv_, 0, no_subsample_entries_);
+ encrypted_data_, key_id_, iv_, no_subsample_entries_);
UpdateSessionAndExpect(session_id, kWrongKeyAsJWK, SESSION_READY);
ASSERT_NO_FATAL_FAILURE(DecryptAndExpect(
@@ -438,7 +428,7 @@ TEST_F(AesDecryptorTest, MultipleKeysAndFrames) {
uint32 session_id = CreateSession(key_id_);
UpdateSessionAndExpect(session_id, kKeyAsJWK, SESSION_READY);
scoped_refptr<DecoderBuffer> encrypted_buffer = CreateEncryptedBuffer(
- encrypted_data_, key_id_, iv_, 10, no_subsample_entries_);
+ encrypted_data_, key_id_, iv_, no_subsample_entries_);
ASSERT_NO_FATAL_FAILURE(
DecryptAndExpect(encrypted_buffer, original_data_, SUCCESS));
@@ -454,7 +444,6 @@ TEST_F(AesDecryptorTest, MultipleKeysAndFrames) {
kEncryptedData2 + arraysize(kEncryptedData2)),
std::vector<uint8>(kKeyId2, kKeyId2 + arraysize(kKeyId2)),
std::vector<uint8>(kIv2, kIv2 + arraysize(kIv2)),
- 30,
no_subsample_entries_);
ASSERT_NO_FATAL_FAILURE(DecryptAndExpect(
encrypted_buffer,
@@ -471,7 +460,7 @@ TEST_F(AesDecryptorTest, CorruptedIv) {
bad_iv[1]++;
scoped_refptr<DecoderBuffer> encrypted_buffer = CreateEncryptedBuffer(
- encrypted_data_, key_id_, bad_iv, 0, no_subsample_entries_);
+ encrypted_data_, key_id_, bad_iv, no_subsample_entries_);
DecryptAndExpect(encrypted_buffer, original_data_, DATA_MISMATCH);
}
@@ -484,7 +473,7 @@ TEST_F(AesDecryptorTest, CorruptedData) {
bad_data[1]++;
scoped_refptr<DecoderBuffer> encrypted_buffer = CreateEncryptedBuffer(
- bad_data, key_id_, iv_, 0, no_subsample_entries_);
+ bad_data, key_id_, iv_, no_subsample_entries_);
DecryptAndExpect(encrypted_buffer, original_data_, DATA_MISMATCH);
}
@@ -492,7 +481,7 @@ TEST_F(AesDecryptorTest, EncryptedAsUnencryptedFailure) {
uint32 session_id = CreateSession(key_id_);
UpdateSessionAndExpect(session_id, kKeyAsJWK, SESSION_READY);
scoped_refptr<DecoderBuffer> encrypted_buffer = CreateEncryptedBuffer(
- encrypted_data_, key_id_, std::vector<uint8>(), 0, no_subsample_entries_);
+ encrypted_data_, key_id_, std::vector<uint8>(), no_subsample_entries_);
DecryptAndExpect(encrypted_buffer, original_data_, DATA_MISMATCH);
}
@@ -500,7 +489,7 @@ TEST_F(AesDecryptorTest, SubsampleDecryption) {
uint32 session_id = CreateSession(key_id_);
UpdateSessionAndExpect(session_id, kKeyAsJWK, SESSION_READY);
scoped_refptr<DecoderBuffer> encrypted_buffer = CreateEncryptedBuffer(
- subsample_encrypted_data_, key_id_, iv_, 0, normal_subsample_entries_);
+ subsample_encrypted_data_, key_id_, iv_, normal_subsample_entries_);
DecryptAndExpect(encrypted_buffer, original_data_, SUCCESS);
}
@@ -511,7 +500,7 @@ TEST_F(AesDecryptorTest, SubsampleDecryptionWithOffset) {
uint32 session_id = CreateSession(key_id_);
UpdateSessionAndExpect(session_id, kKeyAsJWK, SESSION_READY);
scoped_refptr<DecoderBuffer> encrypted_buffer = CreateEncryptedBuffer(
- subsample_encrypted_data_, key_id_, iv_, 23, normal_subsample_entries_);
+ subsample_encrypted_data_, key_id_, iv_, normal_subsample_entries_);
DecryptAndExpect(encrypted_buffer, original_data_, SUCCESS);
}
@@ -524,7 +513,7 @@ TEST_F(AesDecryptorTest, SubsampleWrongSize) {
kSubsampleEntriesWrongSize + arraysize(kSubsampleEntriesWrongSize));
scoped_refptr<DecoderBuffer> encrypted_buffer = CreateEncryptedBuffer(
- subsample_encrypted_data_, key_id_, iv_, 0, subsample_entries_wrong_size);
+ subsample_encrypted_data_, key_id_, iv_, subsample_entries_wrong_size);
DecryptAndExpect(encrypted_buffer, original_data_, DATA_MISMATCH);
}
@@ -538,7 +527,7 @@ TEST_F(AesDecryptorTest, SubsampleInvalidTotalSize) {
arraysize(kSubsampleEntriesInvalidTotalSize));
scoped_refptr<DecoderBuffer> encrypted_buffer = CreateEncryptedBuffer(
- subsample_encrypted_data_, key_id_, iv_, 0,
+ subsample_encrypted_data_, key_id_, iv_,
subsample_entries_invalid_total_size);
DecryptAndExpect(encrypted_buffer, original_data_, DECRYPT_ERROR);
}
@@ -553,7 +542,7 @@ TEST_F(AesDecryptorTest, SubsampleClearBytesOnly) {
kSubsampleEntriesClearOnly + arraysize(kSubsampleEntriesClearOnly));
scoped_refptr<DecoderBuffer> encrypted_buffer = CreateEncryptedBuffer(
- original_data_, key_id_, iv_, 0, clear_only_subsample_entries);
+ original_data_, key_id_, iv_, clear_only_subsample_entries);
DecryptAndExpect(encrypted_buffer, original_data_, SUCCESS);
}
@@ -567,14 +556,14 @@ TEST_F(AesDecryptorTest, SubsampleCypherBytesOnly) {
kSubsampleEntriesCypherOnly + arraysize(kSubsampleEntriesCypherOnly));
scoped_refptr<DecoderBuffer> encrypted_buffer = CreateEncryptedBuffer(
- encrypted_data_, key_id_, iv_, 0, cypher_only_subsample_entries);
+ encrypted_data_, key_id_, iv_, cypher_only_subsample_entries);
DecryptAndExpect(encrypted_buffer, original_data_, SUCCESS);
}
TEST_F(AesDecryptorTest, ReleaseSession) {
uint32 session_id = CreateSession(key_id_);
scoped_refptr<DecoderBuffer> encrypted_buffer = CreateEncryptedBuffer(
- encrypted_data_, key_id_, iv_, 0, no_subsample_entries_);
+ encrypted_data_, key_id_, iv_, no_subsample_entries_);
UpdateSessionAndExpect(session_id, kKeyAsJWK, SESSION_READY);
ASSERT_NO_FATAL_FAILURE(
@@ -586,7 +575,7 @@ TEST_F(AesDecryptorTest, ReleaseSession) {
TEST_F(AesDecryptorTest, NoKeyAfterReleaseSession) {
uint32 session_id = CreateSession(key_id_);
scoped_refptr<DecoderBuffer> encrypted_buffer = CreateEncryptedBuffer(
- encrypted_data_, key_id_, iv_, 0, no_subsample_entries_);
+ encrypted_data_, key_id_, iv_, no_subsample_entries_);
UpdateSessionAndExpect(session_id, kKeyAsJWK, SESSION_READY);
ASSERT_NO_FATAL_FAILURE(
@@ -600,7 +589,7 @@ TEST_F(AesDecryptorTest, NoKeyAfterReleaseSession) {
TEST_F(AesDecryptorTest, LatestKeyUsed) {
uint32 session_id1 = CreateSession(key_id_);
scoped_refptr<DecoderBuffer> encrypted_buffer = CreateEncryptedBuffer(
- encrypted_data_, key_id_, iv_, 0, no_subsample_entries_);
+ encrypted_data_, key_id_, iv_, no_subsample_entries_);
// Add alternate key, buffer should not be decoded properly.
UpdateSessionAndExpect(session_id1, kKeyAlternateAsJWK, SESSION_READY);
@@ -619,7 +608,7 @@ TEST_F(AesDecryptorTest, LatestKeyUsed) {
TEST_F(AesDecryptorTest, LatestKeyUsedAfterReleaseSession) {
uint32 session_id1 = CreateSession(key_id_);
scoped_refptr<DecoderBuffer> encrypted_buffer = CreateEncryptedBuffer(
- encrypted_data_, key_id_, iv_, 0, no_subsample_entries_);
+ encrypted_data_, key_id_, iv_, no_subsample_entries_);
UpdateSessionAndExpect(session_id1, kKeyAsJWK, SESSION_READY);
ASSERT_NO_FATAL_FAILURE(
DecryptAndExpect(encrypted_buffer, original_data_, SUCCESS));
« no previous file with comments | « media/cdm/aes_decryptor.cc ('k') | media/cdm/ppapi/external_clear_key/clear_key_cdm.cc » ('j') | media/webm/webm_cluster_parser.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698