Merge "Update SilkFX test images" into udc-dev

2023-04-04 00:05:22 +00:00
parent c2e476c3da 8e9d995ead
commit ecabe75d9f
17 changed files with 2 additions and 2 deletions
--- a/tests/SilkFX/assets/gainmaps/cave.jpg
+++ b/tests/SilkFX/assets/gainmaps/cave.jpg
--- a/tests/SilkFX/assets/gainmaps/city_night.jpg
+++ b/tests/SilkFX/assets/gainmaps/city_night.jpg
--- a/tests/SilkFX/assets/gainmaps/desert_palms.jpg
+++ b/tests/SilkFX/assets/gainmaps/desert_palms.jpg
--- a/tests/SilkFX/assets/gainmaps/desert_sunset.jpg
+++ b/tests/SilkFX/assets/gainmaps/desert_sunset.jpg
--- a/tests/SilkFX/assets/gainmaps/desert_wanda.jpg
+++ b/tests/SilkFX/assets/gainmaps/desert_wanda.jpg
--- a/tests/SilkFX/assets/gainmaps/fountain_night.jpg
+++ b/tests/SilkFX/assets/gainmaps/fountain_night.jpg
--- a/tests/SilkFX/assets/gainmaps/grand_canyon.jpg
+++ b/tests/SilkFX/assets/gainmaps/grand_canyon.jpg
--- a/tests/SilkFX/assets/gainmaps/granddam.jpg
+++ b/tests/SilkFX/assets/gainmaps/granddam.jpg
--- a/tests/SilkFX/assets/gainmaps/lamps.jpg
+++ b/tests/SilkFX/assets/gainmaps/lamps.jpg
--- a/tests/SilkFX/assets/gainmaps/lightbulb.jpg
+++ b/tests/SilkFX/assets/gainmaps/lightbulb.jpg
--- a/tests/SilkFX/assets/gainmaps/mountain_lake.jpg
+++ b/tests/SilkFX/assets/gainmaps/mountain_lake.jpg
--- a/tests/SilkFX/assets/gainmaps/mountains.jpg
+++ b/tests/SilkFX/assets/gainmaps/mountains.jpg
--- a/tests/SilkFX/assets/gainmaps/porsche911.jpg
+++ b/tests/SilkFX/assets/gainmaps/porsche911.jpg
--- a/tests/SilkFX/assets/gainmaps/sunflower.jpg
+++ b/tests/SilkFX/assets/gainmaps/sunflower.jpg
--- a/tests/SilkFX/assets/gainmaps/train_station_night.jpg
+++ b/tests/SilkFX/assets/gainmaps/train_station_night.jpg
--- a/tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapDecodeTest.kt
+++ b/tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapDecodeTest.kt
@@ -38,7 +38,7 @@ class GainmapDecodeTest(context: Context, attrs: AttributeSet?) : LinearLayout(c

    private fun decode(mode: DecodeMode) {
        val source = ImageDecoder.createSource(resources.assets,
-            "gainmaps/cave.jpg")
+                "gainmaps/${context.assets.list("gainmaps")!![0]}")

        val sourceInfo = findViewById<TextView>(R.id.source_info)!!

--- a/tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapImage.kt
+++ b/tests/SilkFX/src/com/android/test/silkfx/hdr/GainmapImage.kt
@@ -92,7 +92,7 @@ class GainmapImage(context: Context, attrs: AttributeSet?) : FrameLayout(context
            }
        }

-        setImage(gainmapImages.indexOf("cave.jpg"))
+        setImage(0)

        imageView.apply {
            isClickable = true