ref: 7281c0b9086c10f1397aff9eb4b4d70e1c283369
parent: 02b8baf35e76bbb04effa5dee5ca16e2898e7af8
parent: 4aa8ea5917f1a3bf0f82caab9485e5755109a175
author: Tom Finegan <tomfinegan@google.com>
date: Tue Mar 4 09:31:16 EST 2014
Merge "vp8_decrypt_test.c: Silence MSVC data loss warning."
--- a/test/vp8_boolcoder_test.cc
+++ b/test/vp8_boolcoder_test.cc
@@ -35,14 +35,14 @@
0x89, 0x9a, 0xab, 0xbc, 0xcd, 0xde, 0xef, 0xf0
};
-void encrypt_buffer(uint8_t *buffer, int size) {- for (int i = 0; i < size; ++i) {+void encrypt_buffer(uint8_t *buffer, size_t size) {+ for (size_t i = 0; i < size; ++i) {buffer[i] ^= secret_key[i & 15];
}
}
void test_decrypt_cb(void *decrypt_state, const uint8_t *input,
- uint8_t *output, int count) {+ uint8_t *output, int count) {const size_t offset = input - reinterpret_cast<uint8_t*>(decrypt_state);
for (int i = 0; i < count; i++) {output[i] = input[i] ^ secret_key[(offset + i) & 15];
--- a/test/vp8_decrypt_test.cc
+++ b/test/vp8_decrypt_test.cc
@@ -26,9 +26,9 @@
0x89, 0x9a, 0xab, 0xbc, 0xcd, 0xde, 0xef, 0xf0
};
-void encrypt_buffer(const uint8_t *src, uint8_t *dst,
- int size, int offset = 0) {- for (int i = 0; i < size; ++i) {+void encrypt_buffer(const uint8_t *src, uint8_t *dst, size_t size,
+ ptrdiff_t offset) {+ for (size_t i = 0; i < size; ++i) {dst[i] = src[i] ^ test_key[(offset + i) & 15];
}
}
@@ -61,7 +61,7 @@
#if CONFIG_DECRYPT
std::vector<uint8_t> encrypted(video.frame_size());
- encrypt_buffer(video.cxdata(), &encrypted[0], video.frame_size());
+ encrypt_buffer(video.cxdata(), &encrypted[0], video.frame_size(), 0);
vp8_decrypt_init di = { test_decrypt_cb, &encrypted[0] };decoder.Control(VP8D_SET_DECRYPTOR, &di);
#endif // CONFIG_DECRYPT
--
⑨