[FFmpeg-devel] [PATCH] libavutil/encryption_info: Add unit tests.
Jacob Trimble
modmaker at google.com
Fri Jun 1 22:51:48 EEST 2018
Signed-off-by: Jacob Trimble <modmaker at google.com>
---
libavutil/Makefile | 1 +
libavutil/encryption_info.h | 2 +-
libavutil/tests/.gitignore | 2 +
libavutil/tests/encryption_info.c | 176 ++++++++++++++++++++++++++++++
tests/fate/libavutil.mak | 4 +
tests/ref/fate/encryption-info | 0
6 files changed, 184 insertions(+), 1 deletion(-)
create mode 100644 libavutil/tests/encryption_info.c
create mode 100644 tests/ref/fate/encryption-info
diff --git a/libavutil/Makefile b/libavutil/Makefile
index d0632f16a6..9ed24cfc82 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -200,6 +200,7 @@ TESTPROGS = adler32 \
des \
dict \
display \
+ encryption_info \
error \
eval \
file \
diff --git a/libavutil/encryption_info.h b/libavutil/encryption_info.h
index 9140968fde..8fe7ebfe43 100644
--- a/libavutil/encryption_info.h
+++ b/libavutil/encryption_info.h
@@ -129,7 +129,7 @@ typedef struct AVEncryptionInitInfo {
*
* @param subsample_count The number of subsamples.
* @param key_id_size The number of bytes in the key ID, should be 16.
- * @param key_id_size The number of bytes in the IV, should be 16.
+ * @param iv_size The number of bytes in the IV, should be 16.
*
* @return The new AVEncryptionInfo structure, or NULL on error.
*/
diff --git a/libavutil/tests/.gitignore b/libavutil/tests/.gitignore
index 71f75a8ee9..9d90827954 100644
--- a/libavutil/tests/.gitignore
+++ b/libavutil/tests/.gitignore
@@ -17,6 +17,7 @@
/dict
/display
/error
+/encryption_info
/eval
/fifo
/file
@@ -24,6 +25,7 @@
/hmac
/hwdevice
/imgutils
+/integer
/lfg
/lls
/log
diff --git a/libavutil/tests/encryption_info.c b/libavutil/tests/encryption_info.c
new file mode 100644
index 0000000000..d489612b7d
--- /dev/null
+++ b/libavutil/tests/encryption_info.c
@@ -0,0 +1,176 @@
+/*
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "libavutil/encryption_info.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#include "libavutil/avassert.h"
+
+static const AVSubsampleEncryptionInfo test_subsamples[] = {{1, 2}, {3, 4}, {5, 6}, {7, 8}};
+static const size_t test_subsample_count = sizeof(test_subsamples) / sizeof(test_subsamples[0]);
+static const uint8_t test_iv[] = {0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18};
+static const uint8_t test_key_id[] = {0x21, 0x22, 0x23, 0x24};
+static const uint8_t test_key_id_2[] = {0x31, 0x32, 0x33, 0x34};
+static const uint8_t test_system_id[] = {0x41, 0x42, 0x43};
+static const uint8_t test_data[] = {0x51, 0x52};
+
+static int compare_encryption_info(const AVEncryptionInfo *a, const AVEncryptionInfo *b) {
+ if (!a || !b || a->scheme != b->scheme || a->crypt_byte_block != b->crypt_byte_block ||
+ a->skip_byte_block != b->skip_byte_block || a->key_id_size != b->key_id_size ||
+ a->iv_size != b->iv_size || a->subsample_count != b->subsample_count)
+ return 1;
+
+ if (memcmp(a->key_id, b->key_id, a->key_id_size) != 0 ||
+ memcmp(a->iv, b->iv, a->iv_size) != 0 ||
+ memcmp(a->subsamples, b->subsamples, a->subsample_count * sizeof(a->subsamples[0])))
+ return 1;
+
+ return 0;
+}
+
+static int compare_encryption_init_info(const AVEncryptionInitInfo *a, const AVEncryptionInitInfo *b) {
+ if (!a || !b || a->system_id_size != b->system_id_size ||
+ a->num_key_ids != b->num_key_ids || a->key_id_size != b->key_id_size ||
+ a->data_size != b->data_size)
+ return 1;
+
+ if (memcmp(a->system_id, b->system_id, a->system_id_size) != 0 ||
+ memcmp(a->data, b->data, a->data_size) != 0)
+ return 1;
+
+ for (uint32_t i = 0; i < a->num_key_ids; i++) {
+ if (memcmp(a->key_ids[i], b->key_ids[i], a->key_id_size) != 0)
+ return 1;
+ }
+
+ if (a->next || b->next) {
+ if (!a->next || !b->next)
+ return 1;
+ if (compare_encryption_init_info(a->next, b->next) != 0)
+ return 1;
+ }
+
+ return 0;
+}
+
+static void run_encryption_info_test(void)
+{
+ AVEncryptionInfo *info, *copy;
+ uint8_t *side_data;
+ size_t side_data_size;
+
+ info = av_encryption_info_alloc(test_subsample_count, sizeof(test_key_id), sizeof(test_iv));
+ av_assert0(info);
+ av_assert0(info->key_id);
+ av_assert0(info->key_id_size == sizeof(test_key_id));
+ av_assert0(info->iv);
+ av_assert0(info->iv_size == sizeof(test_iv));
+ av_assert0(info->subsamples);
+ av_assert0(info->subsample_count == test_subsample_count);
+
+ info->scheme = 1234;
+ info->crypt_byte_block = 333;
+ info->skip_byte_block = 444;
+ memcpy(info->key_id, test_key_id, sizeof(test_key_id));
+ memcpy(info->iv, test_iv, sizeof(test_iv));
+ memcpy(info->subsamples, test_subsamples, sizeof(test_subsamples));
+
+ copy = av_encryption_info_clone(info);
+ av_assert0(copy);
+ av_assert0(copy != info);
+ av_assert0(compare_encryption_info(info, copy) == 0);
+ av_encryption_info_free(copy);
+
+ side_data = av_encryption_info_add_side_data(info, &side_data_size);
+ av_assert0(side_data);
+ av_assert0(side_data_size > 0);
+
+ copy = av_encryption_info_get_side_data(side_data, side_data_size);
+ av_assert0(copy);
+ av_assert0(copy != info);
+ av_assert0(compare_encryption_info(info, copy) == 0);
+ av_encryption_info_free(copy);
+ av_free(side_data);
+
+ av_encryption_info_free(info);
+}
+
+static AVEncryptionInitInfo *create_init_info(void)
+{
+ AVEncryptionInitInfo *info;
+
+ info = av_encryption_init_info_alloc(sizeof(test_system_id), 2, sizeof(test_key_id), sizeof(test_data));
+ av_assert0(info);
+ av_assert0(info->system_id);
+ av_assert0(info->system_id_size == sizeof(test_system_id));
+ av_assert0(info->key_ids);
+ av_assert0(info->num_key_ids == 2);
+ av_assert0(info->key_id_size == sizeof(test_key_id));
+ av_assert0(info->key_ids[0]);
+ av_assert0(info->key_ids[1]);
+ av_assert0(info->data);
+ av_assert0(info->data_size == sizeof(test_data));
+ av_assert0(!info->next);
+
+ memcpy(info->system_id, test_system_id, sizeof(test_system_id));
+ memcpy(info->key_ids[0], test_key_id, sizeof(test_key_id));
+ memcpy(info->key_ids[1], test_key_id_2, sizeof(test_key_id_2));
+ memcpy(info->data, test_data, sizeof(test_data));
+
+ return info;
+}
+
+static void run_encryption_init_info_test(void)
+{
+ AVEncryptionInitInfo *info, *copy;
+ uint8_t *side_data;
+ size_t side_data_size;
+
+ info = create_init_info();
+
+ side_data = av_encryption_init_info_add_side_data(info, &side_data_size);
+ av_assert0(side_data);
+ av_assert0(side_data_size > 0);
+ copy = av_encryption_init_info_get_side_data(side_data, side_data_size);
+ av_assert0(copy);
+ av_assert0(compare_encryption_init_info(info, copy) == 0);
+ av_encryption_init_info_free(copy);
+ av_free(side_data);
+
+ // Make the first init info different from the second to test the correct order.
+ memset(info->system_id, 0, info->system_id_size);
+ info->next = create_init_info();
+ side_data = av_encryption_init_info_add_side_data(info, &side_data_size);
+ av_assert0(side_data);
+ copy = av_encryption_init_info_get_side_data(side_data, side_data_size);
+ av_assert0(copy);
+ av_assert0(compare_encryption_init_info(info, copy) == 0);
+ av_encryption_init_info_free(copy);
+ av_free(side_data);
+
+ av_encryption_init_info_free(info);
+}
+
+int main(int argc, char **argv)
+{
+ run_encryption_info_test();
+ run_encryption_init_info_test();
+ return 0;
+}
diff --git a/tests/fate/libavutil.mak b/tests/fate/libavutil.mak
index 9b32d880f5..a1d9313c3d 100644
--- a/tests/fate/libavutil.mak
+++ b/tests/fate/libavutil.mak
@@ -70,6 +70,10 @@ FATE_LIBAVUTIL += fate-dict
fate-dict: libavutil/tests/dict$(EXESUF)
fate-dict: CMD = run libavutil/tests/dict
+FATE_LIBAVUTIL += fate-encryption-info
+fate-encryption-info: libavutil/tests/encryption_info$(EXESUF)
+fate-encryption-info: CMD = run libavutil/tests/encryption_info
+
FATE_LIBAVUTIL += fate-eval
fate-eval: libavutil/tests/eval$(EXESUF)
fate-eval: CMD = run libavutil/tests/eval
diff --git a/tests/ref/fate/encryption-info b/tests/ref/fate/encryption-info
new file mode 100644
index 0000000000..e69de29bb2
--
2.17.1.1185.g55be947832-goog
More information about the ffmpeg-devel
mailing list