commit 96147b216691c5b9ea417f5c4c46ecf1f415badb
author Wan-Teh Chang <wtc@google.com> Tue Jan 11 08:48:30 2022 -0800
committer Wan-Teh Chang <wtc@google.com> Tue Jan 11 21:25:38 2022 +0000
tree 1365c424cc07ff6b587363cd5ff29c76ae1a4311
parent 0ef883438c8e26aaa9048626639922ca0250ce61

Simplify InvalidParams, add InvalidControlId

Simplify the DecodeAPI.InvalidParams test and add the
DecodeAPI.InvalidControlId.

This carries over the changes Elliott made to test/encode_api_test.cc in
the following CL to test/decode_api_test.cc:
https://aomedia-review.googlesource.com/c/aom/+/110641

Change-Id: Ic975b3c0afb04034c724723490d664d61a28dbce

test/decode_api_test.cc

diff --git a/test/decode_api_test.cc b/test/decode_api_test.cc
index 6acd50f..f3cf7cc 100644
--- a/test/decode_api_test.cc
+++ b/test/decode_api_test.cc
@@ -19,11 +19,6 @@
 namespace {
 
 TEST(DecodeAPI, InvalidParams) {
-  static aom_codec_iface_t *kCodecs[] = {
-#if CONFIG_AV1_DECODER
-    aom_codec_av1_dx(),
-#endif
-  };
   uint8_t buf[1] = { 0 };
   aom_codec_ctx_t dec;
 
@@ -39,17 +34,24 @@
   EXPECT_TRUE(aom_codec_error(NULL) != NULL);
   EXPECT_TRUE(aom_codec_error_detail(NULL) == NULL);
 
-  for (aom_codec_iface_t *iface : kCodecs) {
-    EXPECT_EQ(AOM_CODEC_INVALID_PARAM,
-              aom_codec_dec_init(NULL, iface, NULL, 0));
+  aom_codec_iface_t *iface = aom_codec_av1_dx();
+  EXPECT_EQ(AOM_CODEC_INVALID_PARAM, aom_codec_dec_init(NULL, iface, NULL, 0));
 
-    EXPECT_EQ(AOM_CODEC_OK, aom_codec_dec_init(&dec, iface, NULL, 0));
-    EXPECT_EQ(AOM_CODEC_INVALID_PARAM,
-              aom_codec_decode(&dec, NULL, sizeof(buf), NULL));
-    EXPECT_EQ(AOM_CODEC_INVALID_PARAM, aom_codec_decode(&dec, buf, 0, NULL));
+  EXPECT_EQ(AOM_CODEC_OK, aom_codec_dec_init(&dec, iface, NULL, 0));
+  EXPECT_EQ(AOM_CODEC_INVALID_PARAM,
+            aom_codec_decode(&dec, NULL, sizeof(buf), NULL));
+  EXPECT_EQ(AOM_CODEC_INVALID_PARAM, aom_codec_decode(&dec, buf, 0, NULL));
 
-    EXPECT_EQ(AOM_CODEC_OK, aom_codec_destroy(&dec));
-  }
+  EXPECT_EQ(AOM_CODEC_OK, aom_codec_destroy(&dec));
+}
+
+TEST(DecodeAPI, InvalidControlId) {
+  aom_codec_iface_t *iface = aom_codec_av1_dx();
+  aom_codec_ctx_t dec;
+  EXPECT_EQ(AOM_CODEC_OK, aom_codec_dec_init(&dec, iface, NULL, 0));
+  EXPECT_EQ(AOM_CODEC_ERROR, aom_codec_control(&dec, -1, 0));
+  EXPECT_EQ(AOM_CODEC_INVALID_PARAM, aom_codec_control(&dec, 0, 0));
+  EXPECT_EQ(AOM_CODEC_OK, aom_codec_destroy(&dec));
 }
 
 }  // namespace