Updated photometric interpretation handling in encoder

Author: PantelisGeorgiadis

CMakeLists.txt

@@ -8,7 +8,7 @@ project(
 
 set(DCMTKHTJ2K_VERSION_MAJOR 1)
 set(DCMTKHTJ2K_VERSION_MINOR 0)
-set(DCMTKHTJ2K_VERSION_BUILD 3)
+set(DCMTKHTJ2K_VERSION_BUILD 4)
 set(DCMTKHTJ2K_VERSION
     "${DCMTKHTJ2K_VERSION_MAJOR}.${DCMTKHTJ2K_VERSION_MINOR}.${DCMTKHTJ2K_VERSION_BUILD}"
 )

include/dcmtkhtj2k/djcodecd.h

@@ -268,7 +268,7 @@ class DCMTKHTJ2K_EXPORT HtJ2kDecoderBase : public DcmCodec {
    *  frame in the compressed pixel sequence. This method uses various
    * approaches to compute the number of fragments for a frame, including a
    * check of the offset table and checking the start of each fragment for JPEG
-   * SOI markers.
+   * SOC markers.
    *  @param numberOfFrames total number of frames of the DICOM object
    *  @param currentFrame index of current frame (0..numberOfFrames-1)
    *  @param startItem index of fragment (pixel item) the frame starts with
@@ -285,8 +285,8 @@ class DCMTKHTJ2K_EXPORT HtJ2kDecoderBase : public DcmCodec {
   /** check whether the given buffer contains a HT-J2K start-of-image code
    *  @param fragmentData pointer to 4 or more bytes of HT-J2K data
    *  @returns true if the first four bytes of the code stream indicate that
-   *     this fragment is the start of a new HT-J2K image, i.e. starts with
-   *     an SOI marker followed by SOF, COM or APPn.
+   *     this fragment is the start of a new HT-J2K image,
+   *     i.e. codestream starts with SOC (FF4F), followed by SIZ (FF51).
    */
   static OFBool isJ2KStartOfImage(Uint8 *fragmentData);
 

libsrc/djcodece.cc

@@ -529,6 +529,13 @@ OFCondition HtJ2kEncoderBase::losslessRawEncode(
 
   if (compressedSize > 0) compressionRatio = uncompressedSize / compressedSize;
 
+  // update photometric interpretation for color images
+  if (result.good() && samplesPerPixel > 1) {
+    result = dataset->putAndInsertString(
+        DCM_PhotometricInterpretation,
+        djrp->useLosslessProcess() ? "YBR_RCT" : "YBR_ICT");
+  }
+
   // byte swap pixel data back to local endian if necessary
   if (byteSwapped) {
     swapIfNecessary(gLocalByteOrder, EBO_LittleEndian,
@@ -708,6 +715,10 @@ OFCondition HtJ2kEncoderBase::RenderedEncode(
       dataset->findAndGetUint16(DCM_PixelRepresentation, pixelRepresentation);
   if (result.bad()) return result;
 
+  Uint16 samplesPerPixel = 0;
+  result = dataset->findAndGetUint16(DCM_SamplesPerPixel, samplesPerPixel);
+  if (result.bad()) return result;
+
   DcmPixelSequence *pixelSequence = NULL;
   DcmPixelItem *offsetTable = NULL;
 
@@ -762,9 +773,6 @@ OFCondition HtJ2kEncoderBase::RenderedEncode(
     unsigned long frameCount = dimage->getFrameCount();
 
     // compute original image size in bytes, ignoring any padding bits.
-    Uint16 samplesPerPixel = 0;
-    if ((dataset->findAndGetUint16(DCM_SamplesPerPixel, samplesPerPixel)).bad())
-      samplesPerPixel = 1;
     uncompressedSize = dimage->getWidth() * dimage->getHeight() *
                        bitsPerSample * frameCount * samplesPerPixel / 8.0;
 
@@ -804,6 +812,12 @@ OFCondition HtJ2kEncoderBase::RenderedEncode(
       result = dataset->putAndInsertUint16(DCM_BitsStored, bitsPerSample);
     if (result.good())
       result = dataset->putAndInsertUint16(DCM_HighBit, bitsPerSample - 1);
+    // update photometric interpretation for color images
+    if (result.good() && samplesPerPixel > 1) {
+      result = dataset->putAndInsertString(
+          DCM_PhotometricInterpretation,
+          djrp->useLosslessProcess() ? "YBR_RCT" : "YBR_ICT");
+    }
   }
 
   if (compressedSize > 0) compressionRatio = uncompressedSize / compressedSize;

libsrc/djcparam.cc

@@ -29,8 +29,10 @@ HtJ2kCodecParameter::HtJ2kCodecParameter(
     HTJ2K_PlanarConfiguration planarConfiguration, OFBool ignoreOffsetTble)
     : DcmCodecParameter(),
       jp2k_optionsEnabled_(OFFalse),
-      jp2k_cblkwidth_(0),
-      jp2k_cblkheight_(1),
+      jp2k_decompositions_(5),
+      jp2k_cblkwidth_(64),
+      jp2k_cblkheight_(64),
+      jp2k_progressionOrder_(EHTJ2KPO_default),
       fragmentSize_(0),
       createOffsetTable_(OFTrue),
       preferCookedEncoding_(OFTrue),
@@ -40,12 +42,12 @@ HtJ2kCodecParameter::HtJ2kCodecParameter(
       ignoreOffsetTable_(ignoreOffsetTble) {}
 
 HtJ2kCodecParameter::HtJ2kCodecParameter(HtJ2kCodecParameter const &arg)
-    : DcmCodecParameter(arg)
-
-      ,
+    : DcmCodecParameter(arg),
       jp2k_optionsEnabled_(arg.jp2k_optionsEnabled_),
+      jp2k_decompositions_(arg.jp2k_decompositions_),
       jp2k_cblkwidth_(arg.jp2k_cblkwidth_),
       jp2k_cblkheight_(arg.jp2k_cblkheight_),
+      jp2k_progressionOrder_(arg.jp2k_progressionOrder_),
       fragmentSize_(arg.fragmentSize_),
       createOffsetTable_(arg.createOffsetTable_),
       preferCookedEncoding_(arg.preferCookedEncoding_),

tests/test.cc

@@ -399,6 +399,14 @@ TEST(CodecTest, BasicColorCompressDecompressLossless) {
           .good());
   ASSERT_TRUE(readDataset->canWriteXfer(EXS_LittleEndianExplicit));
 
+  // Verify photometric interpretation is updated to YBR_RCT
+  OFString photometricInterpretation;
+  ASSERT_TRUE(readDataset
+                  ->findAndGetOFString(DCM_PhotometricInterpretation,
+                                       photometricInterpretation)
+                  .good());
+  ASSERT_EQ(photometricInterpretation, "YBR_RCT");
+
   Uint8 const *decoded = nullptr;
   unsigned long decodedCount = 0;
   ASSERT_TRUE(