unci tiling is not experimental anymore

Author: farindk

examples/heif_enc.cc

@@ -261,8 +261,17 @@ void show_help(const char* argv0)
             << "  --tiled-image-height #    override image height of tiled image\n"
             << "  --tiled-input-x-y         usually, the first number in the input tile filename should be the y position.\n"
             << "                            With this option, this can be swapped so that the first number is x, the second number y.\n"
+#if HEIF_ENABLE_EXPERIMENTAL_FEATURES || WITH_UNCOMPRESSED_CODEC
+            << "  --tiling-method METHOD    choose one of these methods: grid"
+#if HEIF_ENABLE_EXPERIMENTAL_FEATURES
+               ", tili"
+#endif
+#if WITH_UNCOMPRESSED_CODEC
+               ", unci"
+#endif
+               ". The default is 'grid'.\n"
+#endif
 #if HEIF_ENABLE_EXPERIMENTAL_FEATURES
-            << "  --tiling-method METHOD    choose one of these methods: grid, tili, unci. The default is 'grid'.\n"
             << "  --add-pyramid-group       when several images are given, put them into a multi-resolution pyramid group.\n"
             << "\n"
             << "sequences:\n"
@@ -892,6 +901,7 @@ heif_image_handle* encode_tiled(heif_context* ctx, heif_encoder* encoder, heif_e
       return nullptr;
     }
   }
+#endif
   else if (tiling_method == "unci") {
     heif_unci_image_parameters params{};
     params.version = 1;
@@ -903,13 +913,12 @@ heif_image_handle* encode_tiled(heif_context* ctx, heif_encoder* encoder, heif_e
 
     InputImage prototype_image = tile_generator->get_image(0,0, output_bit_depth);
 
-    heif_error error = heif_context_add_unci_image(ctx, &params, options, prototype_image.image.get(), &tiled_image);
+    heif_error error = heif_context_add_empty_unci_image(ctx, &params, options, prototype_image.image.get(), &tiled_image);
     if (error.code != 0) {
       std::cerr << "Could not generate unci image: " << error.message << "\n";
       return nullptr;
     }
   }
-#endif
   else {
     assert(false);
     exit(10);
@@ -1085,8 +1094,9 @@ int main(int argc, char** argv)
       case OPTION_TILING_METHOD:
         tiling_method = optarg;
         if (tiling_method != "grid"
+            && tiling_method != "unci"
 #if HEIF_ENABLE_EXPERIMENTAL_FEATURES
-            && tiling_method != "tili" && tiling_method != "unci"
+            && tiling_method != "tili"
 #endif
           ) {
           std::cerr << "Invalid tiling method '" << tiling_method << "'\n";

libheif/api/libheif/heif_uncompressed.cc

@@ -76,11 +76,11 @@ void heif_unci_image_parameters_release(struct heif_unci_image_parameters* param
 }
 
 
-struct heif_error heif_context_add_unci_image(struct heif_context* ctx,
-                                              const struct heif_unci_image_parameters* parameters,
-                                              const struct heif_encoding_options* encoding_options,
-                                              const heif_image* prototype,
-                                              struct heif_image_handle** out_unci_image_handle)
+struct heif_error heif_context_add_empty_unci_image(struct heif_context* ctx,
+                                                    const struct heif_unci_image_parameters* parameters,
+                                                    const struct heif_encoding_options* encoding_options,
+                                                    const heif_image* prototype,
+                                                    struct heif_image_handle** out_unci_image_handle)
 {
 #if WITH_UNCOMPRESSED_CODEC
   if (prototype == nullptr) {

libheif/api/libheif/heif_uncompressed.h

@@ -78,7 +78,7 @@ void heif_unci_image_parameters_release(struct heif_unci_image_parameters*);
 
 /*
  * This adds an empty iso23001-17 (uncompressed) image to the HEIF file.
- * The actual image data is addded later using heif_context_add_image_tile().
+ * The actual image data is added later using heif_context_add_image_tile().
  * If you do not need tiling, you can use heif_context_encode_image() instead.
  * However, this will by default disable any compression and any control about
  * the data layout.
@@ -95,11 +95,11 @@ void heif_unci_image_parameters_release(struct heif_unci_image_parameters*);
  *         If ISO23001-17 images are not supported, returns heif_error_Unsupported_feature.
  */
 LIBHEIF_API
-struct heif_error heif_context_add_unci_image(struct heif_context* ctx,
-                                              const struct heif_unci_image_parameters* parameters,
-                                              const struct heif_encoding_options* encoding_options,
-                                              const struct heif_image* prototype,
-                                              struct heif_image_handle** out_unci_image_handle);
+struct heif_error heif_context_add_empty_unci_image(struct heif_context* ctx,
+                                                    const struct heif_unci_image_parameters* parameters,
+                                                    const struct heif_encoding_options* encoding_options,
+                                                    const struct heif_image* prototype,
+                                                    struct heif_image_handle** out_unci_image_handle);
 
 #ifdef __cplusplus
 }