Merge branch 'master' into AJC-master

acolwell · May 24, 2024 · ede560c · ede560c
2 parents e65248e + c05d785
commit ede560c
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/OIIO/WriteOIIO.cpp b/OIIO/WriteOIIO.cpp
@@ -1015,8 +1015,16 @@ WriteOIIOPlugin::beginEncodeParts(void* user_data,
     string compression;
 
     switch ((EParamCompression)compression_i) {
-    case eParamCompressionAuto:
-        break;
+    case eParamCompressionAuto: {
+        // Set compression string for formats that only have a single compression type.
+        static const char* formats[] = {"jpeg", "webp", "heic", "avif", nullptr};
+        for (int i = 0; formats[i] != nullptr; ++i) {
+            if (strcmp(data->output->format_name(), formats[i]) == 0) {
+                compression = formats[i];
+                break;
+            }
+        }
+    } break;
     case eParamCompressionNone: // EXR, TIFF, IFF
         compression = "none";
         break;