mj2: add tests

Author: Grok Compression

src/lib/codec/CMakeLists.txt

@@ -30,7 +30,6 @@ set(GROK_CODEC_SRCS
   ${CMAKE_CURRENT_SOURCE_DIR}/formats/ImageFormat.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/formats/fileio/FileStandardIO.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/formats/fileio/FileOrchestratorIO.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/formats/YUVFormat.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/common/common.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/apps/GrkCompress.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/apps/GrkDecompress.cpp

src/lib/codec/apps/GrkCompareImages.cpp

@@ -27,7 +27,6 @@
 #include "BMPFormat.h"
 #include "PGXFormat.h"
 #include "PNMFormat.h"
-#include "YUVFormat.h"
 #include "common.h"
 #ifdef GROK_HAVE_LIBPNG
 #include "PNGFormat.h"

src/lib/codec/apps/GrkCompress.cpp

@@ -48,7 +48,6 @@ using namespace grk;
 #include "PNMFormat.h"
 #include "PGXFormat.h"
 #include "BMPFormat.h"
-#include "YUVFormat.h"
 #ifdef GROK_HAVE_LIBJPEG
 #include "JPEGFormat.h"
 #endif
@@ -196,7 +195,6 @@ static bool isDecodedFormatSupported(GRK_SUPPORTED_FILE_FMT format)
     case GRK_FMT_RAWL:
     case GRK_FMT_PNG:
     case GRK_FMT_JPG:
-    case GRK_FMT_YUV:
       break;
     default:
       return false;
@@ -311,11 +309,6 @@ static grk_image* loadInputImage(const char* filename, grk_cparameters* paramete
       image = raw.readImage(filename, parameters);
     }
     break;
-    case GRK_FMT_YUV: {
-      YUVFormat yuv;
-      image = yuv.readImage(filename, parameters);
-    }
-    break;
 #ifdef GROK_HAVE_LIBPNG
     case GRK_FMT_PNG: {
       PNGFormat<int32_t> png;
@@ -2144,17 +2137,6 @@ static uint64_t pluginCompressCallback(grk_plugin_compress_user_callback_info* i
       }
       break;
 
-      case GRK_FMT_YUV: {
-        YUVFormat yuv;
-        image = yuv.readImage(info->input_file_name, info->compressor_parameters);
-        if(!image)
-        {
-          spdlog::error("Unable to load raw file");
-          goto cleanup;
-        }
-      }
-      break;
-
 #ifdef GROK_HAVE_LIBPNG
       case GRK_FMT_PNG: {
         PNGFormat<int32_t> png;

src/lib/codec/apps/GrkDecompress.cpp

@@ -40,7 +40,6 @@
 #include "decompress_help.h"
 #include "spdlogwrapper.h"
 #include "RAWFormat.h"
-#include "YUVFormat.h"
 #include "PNMFormat.h"
 #include "PGXFormat.h"
 #include "BMPFormat.h"
@@ -488,15 +487,12 @@ GrkRC GrkDecompress::parseCommandLine(int argc, const char* argv[],
       case GRK_FMT_RAWL:
         inputFolder->out_format = "rawl";
         break;
-      case GRK_FMT_YUV:
-        inputFolder->out_format = "yuv";
-        break;
       case GRK_FMT_PNG:
         inputFolder->out_format = "png";
         break;
       default:
         spdlog::error("Unknown output format image {} [only *.png, *.pnm, *.pgm, "
-                      "*.ppm, *.pgx, *.bmp, *.tif, *.jpg, *.jpeg, *.yuv, *.raw or *.rawl]",
+                      "*.ppm, *.pgx, *.bmp, *.tif, *.jpg, *.jpeg, *.raw or *.rawl]",
                       outformat);
         return GrkRCParseArgsFailed;
     }
@@ -513,13 +509,12 @@ GrkRC GrkDecompress::parseCommandLine(int argc, const char* argv[],
       case GRK_FMT_TIF:
       case GRK_FMT_RAW:
       case GRK_FMT_RAWL:
-      case GRK_FMT_YUV:
       case GRK_FMT_PNG:
       case GRK_FMT_JPG:
         break;
       default:
         spdlog::error("Unknown output format image {} [only *.png, *.pnm, *.pgm, *.ppm, *.pgx, "
-                      "*.bmp, *.tif, *.tiff, *jpg, *jpeg, *.yuv, *.raw or *rawl]",
+                      "*.bmp, *.tif, *.tiff, *jpg, *jpeg, *.raw or *rawl]",
                       outfile);
         return GrkRCParseArgsFailed;
     }
@@ -1011,9 +1006,6 @@ int GrkDecompress::preProcess(grk_plugin_decompress_callback_info* info)
     case GRK_FMT_RAWL:
       imageFormat = new RAWFormat<int32_t>(false);
       break;
-    case GRK_FMT_YUV:
-      imageFormat = new YUVFormat();
-      break;
     case GRK_FMT_JPG:
 #ifdef GROK_HAVE_LIBJPEG
       imageFormat = new JPEGFormat<int32_t>();
@@ -1460,9 +1452,6 @@ int GrkDecompress::main(int argc, const char* argv[])
             case GRK_FMT_RAWL:
               fmt = new RAWFormat<int32_t>(false);
               break;
-            case GRK_FMT_YUV:
-              fmt = new YUVFormat();
-              break;
 #ifdef GROK_HAVE_LIBJPEG
             case GRK_FMT_JPG:
               fmt = new JPEGFormat<int32_t>();

src/lib/codec/common/common.cpp

@@ -87,9 +87,6 @@ std::string convertFileFmtToString(GRK_SUPPORTED_FILE_FMT fmt)
     case GRK_FMT_RAW:
       return "RAW";
       break;
-    case GRK_FMT_YUV:
-      return "YUV";
-      break;
     case GRK_FMT_PNG:
       return "PNG";
       break;
@@ -253,7 +250,7 @@ GRK_SUPPORTED_FILE_FMT grk_get_file_format(const char* filename, bool& isHTJ2K)
         {"pgx", GRK_FMT_PGX},   {"pam", GRK_FMT_PXM}, {"pnm", GRK_FMT_PXM},  {"pgm", GRK_FMT_PXM},
         {"ppm", GRK_FMT_PXM},   {"pbm", GRK_FMT_PXM}, {"bmp", GRK_FMT_BMP},  {"tif", GRK_FMT_TIF},
         {"tiff", GRK_FMT_TIF},  {"jpg", GRK_FMT_JPG}, {"jpeg", GRK_FMT_JPG}, {"raw", GRK_FMT_RAW},
-        {"rawl", GRK_FMT_RAWL}, {"yuv", GRK_FMT_YUV}, {"png", GRK_FMT_PNG},  {"j2k", GRK_FMT_J2K},
+        {"rawl", GRK_FMT_RAWL}, {"png", GRK_FMT_PNG},  {"j2k", GRK_FMT_J2K},
         {"jp2", GRK_FMT_JP2},   {"j2c", GRK_FMT_J2K}, {"jpc", GRK_FMT_J2K},  {"jph", GRK_FMT_JP2},
         {"jhc", GRK_FMT_J2K},   {"mj2", GRK_FMT_MJ2}};
 

src/lib/core/grok.h

@@ -310,7 +310,6 @@ typedef enum _GRK_SUPPORTED_FILE_FMT
   GRK_FMT_PNG, /* PNG */
   GRK_FMT_RAWL, /* RAW Little Endian */
   GRK_FMT_JPG, /* JPG */
-  GRK_FMT_YUV, /* YUV */
   GRK_FMT_MJ2 /* MJ2 */
 } GRK_SUPPORTED_FILE_FMT;
 

src/lib/core/plugin/gpup/gpu_plugin_shared.h

@@ -105,7 +105,6 @@ typedef enum
   GPUP_FMT_PNG,
   GPUP_FMT_RAWL,
   GPUP_FMT_JPG,
-  GPUP_FMT_YUV,
   GPUP_FMT_MJ2
 } gpup_file_fmt;
 

tests/CMakeLists.txt

@@ -51,6 +51,10 @@ add_executable(grk_jp2_metadata_test grk_jp2_metadata_test.cpp GrkJP2MetadataTes
 target_link_libraries(grk_jp2_metadata_test ${GROK_CORE_NAME} spdlog::spdlog)
 add_test(NAME grk_jp2_metadata_test COMMAND grk_jp2_metadata_test)
 
+add_executable(grk_mj2_test grk_mj2_test.cpp GrkMJ2Test.cpp)
+target_link_libraries(grk_mj2_test ${GROK_CORE_NAME} spdlog::spdlog)
+add_test(NAME grk_mj2_test COMMAND grk_mj2_test)
+
 add_executable(grk_messenger_test grk_messenger_test.cpp GrkMessengerTest.cpp)
 target_include_directories(grk_messenger_test PRIVATE
   ${GROK_SOURCE_DIR}/src/lib/codec/shared