Mercurial > hg > orthanc

changeset 3765:4a25727401cd transcoding

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
first transcoding to jpeg 8bpp
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 16 Mar 2020 18:39:23 +0100
parents d55768319f8e
children 711d2ec2db34
files Core/DicomParsing/FromDcmtkBridge.cpp Resources/CMake/DcmtkConfiguration.cmake UnitTestsSources/FromDcmtkTests.cpp
diffstat 3 files changed, 97 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/Core/DicomParsing/FromDcmtkBridge.cpp	Mon Mar 16 15:21:35 2020 +0100
+++ b/Core/DicomParsing/FromDcmtkBridge.cpp	Mon Mar 16 18:39:23 2020 +0100
@@ -123,6 +123,7 @@
 #include <dcmtk/dcmdata/dcrledrg.h>
 #if ORTHANC_ENABLE_DCMTK_TRANSCODING == 1
 #  include <dcmtk/dcmdata/dcrleerg.h>
+#  include <dcmtk/dcmimage/diregist.h>  // include to support color images
 #endif
 
 
@@ -1223,7 +1224,9 @@
     dicom.transferInit();
     OFCondition c = dicom.write(ob, xfer, encodingType, NULL,
                                 /*opt_groupLength*/ EGL_recalcGL,
-                                /*opt_paddingType*/ EPD_withoutPadding);
+                                /*opt_paddingType*/ EPD_noChange,
+                                /*padlen*/ 0, /*subPadlen*/ 0, /*instanceLength*/ 0,
+                                EWM_updateMeta /* creates new SOP instance UID on lossy */);
     dicom.transferEnd();
 
     if (c.good())
--- a/Resources/CMake/DcmtkConfiguration.cmake	Mon Mar 16 15:21:35 2020 +0100
+++ b/Resources/CMake/DcmtkConfiguration.cmake	Mon Mar 16 18:39:23 2020 +0100
@@ -38,6 +38,10 @@
 
   if (ENABLE_DCMTK_TRANSCODING)
     AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmimgle/libsrc DCMTK_SOURCES)
+    AUX_SOURCE_DIRECTORY(${DCMTK_SOURCES_DIR}/dcmimage/libsrc DCMTK_SOURCES)
+    include_directories(
+      ${DCMTK_SOURCES_DIR}/dcmimage/include
+      )
   endif()
   
   if (ENABLE_DCMTK_JPEG)
--- a/UnitTestsSources/FromDcmtkTests.cpp	Mon Mar 16 15:21:35 2020 +0100
+++ b/UnitTestsSources/FromDcmtkTests.cpp	Mon Mar 16 18:39:23 2020 +0100
@@ -1922,6 +1922,8 @@
 #include <dcmtk/dcmdata/dcostrmb.h>
 #include <dcmtk/dcmdata/dcpixel.h>
 #include <dcmtk/dcmdata/dcpxitem.h>
+#include <dcmtk/dcmjpeg/djrploss.h>   // for DJ_RPLossy
+#include <dcmtk/dcmjpeg/djrplol.h>    // for DJ_RPLossless
 
 
 namespace Orthanc
@@ -1962,9 +1964,13 @@
     DicomTransferSyntax               transferSyntax_;
     std::string                       sopClassUid_;
     std::string                       sopInstanceUid_;
+    uint16_t                          bitsStored_;
+    unsigned int                      lossyQuality_;
 
     void Setup(DcmFileFormat* dicom)
     {
+      lossyQuality_ = 90;
+      
       dicom_.reset(dicom);
       
       if (dicom == NULL ||
@@ -1995,6 +2001,12 @@
           "Unsupported transfer syntax: " + boost::lexical_cast<std::string>(xfer));
       }
 
+      if (!dataset.findAndGetUint16(DCM_BitsStored, bitsStored_).good())
+      {
+        throw OrthancException(ErrorCode_BadFileFormat,
+                               "Missing \"Bits Stored\" tag in DICOM instance");
+      }      
+
       const char* a = NULL;
       const char* b = NULL;
 
@@ -2023,6 +2035,29 @@
       Setup(FromDcmtkBridge::LoadFromMemoryBuffer(dicom, size));
     }
 
+    void SetLossyQuality(unsigned int quality)
+    {
+      if (quality <= 0 ||
+          quality > 100)
+      {
+        throw OrthancException(ErrorCode_ParameterOutOfRange);
+      }
+      else
+      {
+        lossyQuality_ = quality;
+      }
+    }
+
+    unsigned int GetLossyQuality() const
+    {
+      return lossyQuality_;
+    }
+
+    unsigned int GetBitsStored() const
+    {
+      return bitsStored_;
+    }
+
     virtual DicomTransferSyntax GetTransferSyntax() ORTHANC_OVERRIDE
     {
       return transferSyntax_;
@@ -2068,6 +2103,19 @@
                            std::set<DicomTransferSyntax> syntaxes,
                            bool allowNewSopInstanceUid) ORTHANC_OVERRIDE
     {
+      if (syntaxes.find(GetTransferSyntax()) != syntaxes.end())
+      {
+        printf("NO TRANSCODING\n");
+        
+        // No change in the transfer syntax => simply serialize the current dataset
+        WriteToMemoryBuffer(target);
+        return true;
+      }
+      
+      printf(">> %d\n", bitsStored_);
+
+      DJ_RPLossy rpLossy(lossyQuality_);
+
       if (syntaxes.find(DicomTransferSyntax_LittleEndianImplicit) != syntaxes.end() &&
           FromDcmtkBridge::Transcode(target, *dicom_, DicomTransferSyntax_LittleEndianImplicit, NULL))
       {
@@ -2083,6 +2131,11 @@
       {
         return true;
       }
+      else if (syntaxes.find(DicomTransferSyntax_JPEGProcess1) != syntaxes.end() &&
+               FromDcmtkBridge::Transcode(target, *dicom_, DicomTransferSyntax_JPEGProcess1, &rpLossy))
+      {
+        return true;
+      }
       else
       {
         return false;
@@ -2163,14 +2216,16 @@
   }
 }
 
-#include "dcmtk/dcmjpeg/djrploss.h"  /* for DJ_RPLossy */
-#include "dcmtk/dcmjpeg/djrplol.h"   /* for DJ_RPLossless */
 
 #include <boost/filesystem.hpp>
 
 
 static void TestFile(const std::string& path)
 {
+  static unsigned int count = 0;
+  count++;
+  
+
   printf("** %s\n", path.c_str());
 
   std::string s;
@@ -2178,6 +2233,16 @@
 
   Orthanc::DcmtkTranscoder transcoder(s.c_str(), s.size());
 
+  if (transcoder.GetBitsStored() != 8)  // TODO
+    return; 
+
+  {
+    char buf[1024];
+    sprintf(buf, "/tmp/source-%06d.dcm", count);
+    printf(">> %s\n", buf);
+    Orthanc::SystemToolbox::WriteFile(s, buf);
+  }
+
   printf("[%s] [%s] [%s] %d %d\n", GetTransferSyntaxUid(transcoder.GetTransferSyntax()),
          transcoder.GetSopClassUid().c_str(), transcoder.GetSopInstanceUid().c_str(),
          transcoder.GetFramesCount(), transcoder.GetTransferSyntax());
@@ -2189,9 +2254,8 @@
 
     if (i == 0)
     {
-      static unsigned int i = 0;
       char buf[1024];
-      sprintf(buf, "/tmp/frame-%06d.dcm", i++);
+      sprintf(buf, "/tmp/frame-%06d.raw", count);
       printf(">> %s\n", buf);
       Orthanc::SystemToolbox::WriteFile(f, buf);
     }
@@ -2202,12 +2266,12 @@
     transcoder.WriteToMemoryBuffer(t);
 
     Orthanc::DcmtkTranscoder transcoder2(t.c_str(), t.size());
-    printf(">> %d %d ; %d bytes\n", transcoder.GetTransferSyntax(), transcoder2.GetTransferSyntax(), t.size());
+    printf(">> %d %d ; %lu bytes\n", transcoder.GetTransferSyntax(), transcoder2.GetTransferSyntax(), t.size());
   }
 
   {
     std::set<DicomTransferSyntax> syntaxes;
-    syntaxes.insert(DicomTransferSyntax_LittleEndianExplicit);
+    syntaxes.insert(DicomTransferSyntax_JPEGProcess1);
 
     std::string t;
     bool ok = transcoder.Transcode(t, syntaxes, false);
@@ -2215,8 +2279,15 @@
 
     if (ok)
     {
+      {
+        char buf[1024];
+        sprintf(buf, "/tmp/transcoded-%06d.dcm", count);
+        printf(">> %s\n", buf);
+        Orthanc::SystemToolbox::WriteFile(t, buf);
+      }
+
       Orthanc::DcmtkTranscoder transcoder2(t.c_str(), t.size());
-      printf("  => transcoded transfer syntax %d ; %d bytes\n", transcoder2.GetTransferSyntax(), t.size());
+      printf("  => transcoded transfer syntax %d ; %lu bytes\n", transcoder2.GetTransferSyntax(), t.size());
     }
   }
   
@@ -2225,10 +2296,10 @@
 
 TEST(Toto, DISABLED_Transcode)
 {
+  //OFLog::configure(OFLogger::DEBUG_LOG_LEVEL);
+
   if (0)
   {
-    OFLog::configure(OFLogger::DEBUG_LOG_LEVEL);
-
     std::string s;
     //SystemToolbox::ReadFile(s, "/home/jodogne/Subversion/orthanc-tests/Database/TransferSyntaxes/1.2.840.10008.1.2.4.50.dcm");
     //SystemToolbox::ReadFile(s, "/home/jodogne/DICOM/Alain.dcm");
@@ -2276,10 +2347,18 @@
         TestFile(it->path().string());
       }
     }
-
+  }
+
+  if (0)
+  {
     TestFile("/home/jodogne/Subversion/orthanc-tests/Database/Multiframe.dcm");
     TestFile("/home/jodogne/Subversion/orthanc-tests/Database/Issue44/Monochrome1-Jpeg.dcm");
   }
+
+  if (0)
+  {
+    TestFile("/home/jodogne/Subversion/orthanc-tests/Database/TransferSyntaxes/1.2.840.10008.1.2.1.dcm");
+  }
 }
 
 #endif