Mercurial > hg > orthanc
annotate OrthancFramework/Sources/DicomParsing/DcmtkTranscoder.cpp @ 5363:3c8286e5d07b multiple-jpeg-decoders
wip: try to add a jpeg decoder without colorspace conversion: not working now
author | Alain Mazy <am@osimis.io> |
---|---|
date | Tue, 11 Jul 2023 10:25:58 +0200 |
parents | 0ea402b4d901 |
children |
rev | line source |
---|---|
3893 | 1 /** |
2 * Orthanc - A Lightweight, RESTful DICOM Store | |
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
4 * Department, University Hospital of Liege, Belgium | |
5185
0ea402b4d901
upgrade to year 2023
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4870
diff
changeset
|
5 * Copyright (C) 2017-2023 Osimis S.A., Belgium |
0ea402b4d901
upgrade to year 2023
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4870
diff
changeset
|
6 * Copyright (C) 2021-2023 Sebastien Jodogne, ICTEAM UCLouvain, Belgium |
3893 | 7 * |
8 * This program is free software: you can redistribute it and/or | |
4119
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
9 * modify it under the terms of the GNU Lesser General Public License |
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
10 * as published by the Free Software Foundation, either version 3 of |
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
11 * the License, or (at your option) any later version. |
3893 | 12 * |
13 * This program is distributed in the hope that it will be useful, but | |
14 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
4119
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
16 * Lesser General Public License for more details. |
3893 | 17 * |
4119
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
18 * You should have received a copy of the GNU Lesser General Public |
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
19 * License along with this program. If not, see |
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
20 * <http://www.gnu.org/licenses/>. |
3893 | 21 **/ |
22 | |
23 | |
24 #include "../PrecompiledHeaders.h" | |
25 #include "DcmtkTranscoder.h" | |
26 | |
27 | |
28 #if !defined(ORTHANC_ENABLE_DCMTK_JPEG) | |
29 # error Macro ORTHANC_ENABLE_DCMTK_JPEG must be defined | |
30 #endif | |
31 | |
32 #if !defined(ORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS) | |
33 # error Macro ORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS must be defined | |
34 #endif | |
35 | |
36 | |
37 #include "FromDcmtkBridge.h" | |
4304 | 38 #include "../Logging.h" |
3893 | 39 #include "../OrthancException.h" |
40 | |
41 #include <dcmtk/dcmdata/dcdeftag.h> | |
42 #include <dcmtk/dcmjpeg/djrploss.h> // for DJ_RPLossy | |
43 #include <dcmtk/dcmjpeg/djrplol.h> // for DJ_RPLossless | |
44 #include <dcmtk/dcmjpls/djrparam.h> // for DJLSRepresentationParameter | |
45 | |
4304 | 46 #include <boost/lexical_cast.hpp> |
47 | |
3893 | 48 |
49 namespace Orthanc | |
50 { | |
4297 | 51 DcmtkTranscoder::DcmtkTranscoder() : |
52 lossyQuality_(90) | |
53 { | |
54 } | |
55 | |
56 | |
3938 | 57 static bool GetBitsStored(uint16_t& bitsStored, |
58 DcmDataset& dataset) | |
3893 | 59 { |
3938 | 60 return dataset.findAndGetUint16(DCM_BitsStored, bitsStored).good(); |
3893 | 61 } |
62 | |
63 | |
64 void DcmtkTranscoder::SetLossyQuality(unsigned int quality) | |
65 { | |
4200 | 66 if (quality == 0 || |
3893 | 67 quality > 100) |
68 { | |
3939
c205f670098e
new configuration options: BuiltinDecoderTranscoderOrder and IngestTranscoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3938
diff
changeset
|
69 throw OrthancException( |
c205f670098e
new configuration options: BuiltinDecoderTranscoderOrder and IngestTranscoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3938
diff
changeset
|
70 ErrorCode_ParameterOutOfRange, |
c205f670098e
new configuration options: BuiltinDecoderTranscoderOrder and IngestTranscoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3938
diff
changeset
|
71 "The quality for lossy transcoding must be an integer between 1 and 100, received: " + |
c205f670098e
new configuration options: BuiltinDecoderTranscoderOrder and IngestTranscoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3938
diff
changeset
|
72 boost::lexical_cast<std::string>(quality)); |
3893 | 73 } |
74 else | |
75 { | |
3939
c205f670098e
new configuration options: BuiltinDecoderTranscoderOrder and IngestTranscoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3938
diff
changeset
|
76 LOG(INFO) << "Quality for lossy transcoding using DCMTK is set to: " << quality; |
3893 | 77 lossyQuality_ = quality; |
78 } | |
79 } | |
80 | |
4297 | 81 unsigned int DcmtkTranscoder::GetLossyQuality() const |
82 { | |
83 return lossyQuality_; | |
84 } | |
85 | |
86 | |
3951
5fe8c6d3212e
removed useless information "hasSopInstanceUidChanged"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3946
diff
changeset
|
87 bool DcmtkTranscoder::InplaceTranscode(DicomTransferSyntax& selectedSyntax /* out */, |
3894
8f7ad4989fec
transcoding to uncompressed transfer syntaxes over DICOM protocol is implemented
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3893
diff
changeset
|
88 DcmFileFormat& dicom, |
3893 | 89 const std::set<DicomTransferSyntax>& allowedSyntaxes, |
5363
3c8286e5d07b
wip: try to add a jpeg decoder without colorspace conversion: not working now
Alain Mazy <am@osimis.io>
parents:
5185
diff
changeset
|
90 bool allowNewSopInstanceUid, |
3c8286e5d07b
wip: try to add a jpeg decoder without colorspace conversion: not working now
Alain Mazy <am@osimis.io>
parents:
5185
diff
changeset
|
91 bool enableColorMapConversion) |
3893 | 92 { |
93 if (dicom.getDataset() == NULL) | |
94 { | |
95 throw OrthancException(ErrorCode_InternalError); | |
96 } | |
97 | |
98 DicomTransferSyntax syntax; | |
99 if (!FromDcmtkBridge::LookupOrthancTransferSyntax(syntax, dicom)) | |
100 { | |
101 throw OrthancException(ErrorCode_BadFileFormat, | |
102 "Cannot determine the transfer syntax"); | |
103 } | |
104 | |
3938 | 105 uint16_t bitsStored; |
106 bool hasBitsStored = GetBitsStored(bitsStored, *dicom.getDataset()); | |
107 | |
3893 | 108 if (allowedSyntaxes.find(syntax) != allowedSyntaxes.end()) |
109 { | |
110 // No transcoding is needed | |
111 return true; | |
112 } | |
113 | |
114 if (allowedSyntaxes.find(DicomTransferSyntax_LittleEndianImplicit) != allowedSyntaxes.end() && | |
5363
3c8286e5d07b
wip: try to add a jpeg decoder without colorspace conversion: not working now
Alain Mazy <am@osimis.io>
parents:
5185
diff
changeset
|
115 FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_LittleEndianImplicit, NULL, enableColorMapConversion)) |
3893 | 116 { |
3946
1f33ed7f82e6
automatic test of transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3945
diff
changeset
|
117 selectedSyntax = DicomTransferSyntax_LittleEndianImplicit; |
3893 | 118 return true; |
119 } | |
120 | |
121 if (allowedSyntaxes.find(DicomTransferSyntax_LittleEndianExplicit) != allowedSyntaxes.end() && | |
5363
3c8286e5d07b
wip: try to add a jpeg decoder without colorspace conversion: not working now
Alain Mazy <am@osimis.io>
parents:
5185
diff
changeset
|
122 FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_LittleEndianExplicit, NULL, enableColorMapConversion)) |
3893 | 123 { |
3946
1f33ed7f82e6
automatic test of transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3945
diff
changeset
|
124 selectedSyntax = DicomTransferSyntax_LittleEndianExplicit; |
3893 | 125 return true; |
126 } | |
127 | |
128 if (allowedSyntaxes.find(DicomTransferSyntax_BigEndianExplicit) != allowedSyntaxes.end() && | |
5363
3c8286e5d07b
wip: try to add a jpeg decoder without colorspace conversion: not working now
Alain Mazy <am@osimis.io>
parents:
5185
diff
changeset
|
129 FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_BigEndianExplicit, NULL, enableColorMapConversion)) |
3893 | 130 { |
3946
1f33ed7f82e6
automatic test of transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3945
diff
changeset
|
131 selectedSyntax = DicomTransferSyntax_BigEndianExplicit; |
3893 | 132 return true; |
133 } | |
134 | |
135 if (allowedSyntaxes.find(DicomTransferSyntax_DeflatedLittleEndianExplicit) != allowedSyntaxes.end() && | |
5363
3c8286e5d07b
wip: try to add a jpeg decoder without colorspace conversion: not working now
Alain Mazy <am@osimis.io>
parents:
5185
diff
changeset
|
136 FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_DeflatedLittleEndianExplicit, NULL, enableColorMapConversion)) |
3893 | 137 { |
3946
1f33ed7f82e6
automatic test of transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3945
diff
changeset
|
138 selectedSyntax = DicomTransferSyntax_DeflatedLittleEndianExplicit; |
3893 | 139 return true; |
140 } | |
141 | |
142 #if ORTHANC_ENABLE_DCMTK_JPEG == 1 | |
143 if (allowedSyntaxes.find(DicomTransferSyntax_JPEGProcess1) != allowedSyntaxes.end() && | |
144 allowNewSopInstanceUid && | |
3938 | 145 (!hasBitsStored || bitsStored == 8)) |
3893 | 146 { |
147 // Check out "dcmjpeg/apps/dcmcjpeg.cc" | |
148 DJ_RPLossy parameters(lossyQuality_); | |
149 | |
5363
3c8286e5d07b
wip: try to add a jpeg decoder without colorspace conversion: not working now
Alain Mazy <am@osimis.io>
parents:
5185
diff
changeset
|
150 if (FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_JPEGProcess1, ¶meters, enableColorMapConversion)) |
3893 | 151 { |
3946
1f33ed7f82e6
automatic test of transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3945
diff
changeset
|
152 selectedSyntax = DicomTransferSyntax_JPEGProcess1; |
3893 | 153 return true; |
154 } | |
155 } | |
156 #endif | |
157 | |
158 #if ORTHANC_ENABLE_DCMTK_JPEG == 1 | |
159 if (allowedSyntaxes.find(DicomTransferSyntax_JPEGProcess2_4) != allowedSyntaxes.end() && | |
160 allowNewSopInstanceUid && | |
3938 | 161 (!hasBitsStored || bitsStored <= 12)) |
3893 | 162 { |
163 // Check out "dcmjpeg/apps/dcmcjpeg.cc" | |
164 DJ_RPLossy parameters(lossyQuality_); | |
5363
3c8286e5d07b
wip: try to add a jpeg decoder without colorspace conversion: not working now
Alain Mazy <am@osimis.io>
parents:
5185
diff
changeset
|
165 if (FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_JPEGProcess2_4, ¶meters, enableColorMapConversion)) |
3893 | 166 { |
3946
1f33ed7f82e6
automatic test of transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3945
diff
changeset
|
167 selectedSyntax = DicomTransferSyntax_JPEGProcess2_4; |
3893 | 168 return true; |
169 } | |
170 } | |
171 #endif | |
172 | |
173 #if ORTHANC_ENABLE_DCMTK_JPEG == 1 | |
3902
7459fcb1bdf7
transcoding to 1.2.840.10008.1.2.4.57
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3894
diff
changeset
|
174 if (allowedSyntaxes.find(DicomTransferSyntax_JPEGProcess14) != allowedSyntaxes.end()) |
7459fcb1bdf7
transcoding to 1.2.840.10008.1.2.4.57
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3894
diff
changeset
|
175 { |
7459fcb1bdf7
transcoding to 1.2.840.10008.1.2.4.57
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3894
diff
changeset
|
176 // Check out "dcmjpeg/apps/dcmcjpeg.cc" |
7459fcb1bdf7
transcoding to 1.2.840.10008.1.2.4.57
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3894
diff
changeset
|
177 DJ_RPLossless parameters(6 /* opt_selection_value */, |
7459fcb1bdf7
transcoding to 1.2.840.10008.1.2.4.57
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3894
diff
changeset
|
178 0 /* opt_point_transform */); |
5363
3c8286e5d07b
wip: try to add a jpeg decoder without colorspace conversion: not working now
Alain Mazy <am@osimis.io>
parents:
5185
diff
changeset
|
179 if (FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_JPEGProcess14, ¶meters, enableColorMapConversion)) |
3902
7459fcb1bdf7
transcoding to 1.2.840.10008.1.2.4.57
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3894
diff
changeset
|
180 { |
3946
1f33ed7f82e6
automatic test of transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3945
diff
changeset
|
181 selectedSyntax = DicomTransferSyntax_JPEGProcess14; |
3902
7459fcb1bdf7
transcoding to 1.2.840.10008.1.2.4.57
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3894
diff
changeset
|
182 return true; |
7459fcb1bdf7
transcoding to 1.2.840.10008.1.2.4.57
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3894
diff
changeset
|
183 } |
7459fcb1bdf7
transcoding to 1.2.840.10008.1.2.4.57
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3894
diff
changeset
|
184 } |
7459fcb1bdf7
transcoding to 1.2.840.10008.1.2.4.57
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3894
diff
changeset
|
185 #endif |
7459fcb1bdf7
transcoding to 1.2.840.10008.1.2.4.57
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3894
diff
changeset
|
186 |
7459fcb1bdf7
transcoding to 1.2.840.10008.1.2.4.57
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3894
diff
changeset
|
187 #if ORTHANC_ENABLE_DCMTK_JPEG == 1 |
3893 | 188 if (allowedSyntaxes.find(DicomTransferSyntax_JPEGProcess14SV1) != allowedSyntaxes.end()) |
189 { | |
190 // Check out "dcmjpeg/apps/dcmcjpeg.cc" | |
191 DJ_RPLossless parameters(6 /* opt_selection_value */, | |
192 0 /* opt_point_transform */); | |
5363
3c8286e5d07b
wip: try to add a jpeg decoder without colorspace conversion: not working now
Alain Mazy <am@osimis.io>
parents:
5185
diff
changeset
|
193 if (FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_JPEGProcess14SV1, ¶meters, enableColorMapConversion)) |
3893 | 194 { |
3946
1f33ed7f82e6
automatic test of transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3945
diff
changeset
|
195 selectedSyntax = DicomTransferSyntax_JPEGProcess14SV1; |
3893 | 196 return true; |
197 } | |
198 } | |
199 #endif | |
200 | |
201 #if ORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS == 1 | |
202 if (allowedSyntaxes.find(DicomTransferSyntax_JPEGLSLossless) != allowedSyntaxes.end()) | |
203 { | |
204 // Check out "dcmjpls/apps/dcmcjpls.cc" | |
205 DJLSRepresentationParameter parameters(2 /* opt_nearlossless_deviation */, | |
206 OFTrue /* opt_useLosslessProcess */); | |
207 | |
208 /** | |
209 * WARNING: This call results in a segmentation fault if using | |
210 * the DCMTK package 3.6.2 from Ubuntu 18.04. | |
211 **/ | |
5363
3c8286e5d07b
wip: try to add a jpeg decoder without colorspace conversion: not working now
Alain Mazy <am@osimis.io>
parents:
5185
diff
changeset
|
212 if (FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_JPEGLSLossless, ¶meters, enableColorMapConversion)) |
3893 | 213 { |
3946
1f33ed7f82e6
automatic test of transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3945
diff
changeset
|
214 selectedSyntax = DicomTransferSyntax_JPEGLSLossless; |
3893 | 215 return true; |
216 } | |
217 } | |
218 #endif | |
219 | |
220 #if ORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS == 1 | |
221 if (allowNewSopInstanceUid && | |
222 allowedSyntaxes.find(DicomTransferSyntax_JPEGLSLossy) != allowedSyntaxes.end()) | |
223 { | |
224 // Check out "dcmjpls/apps/dcmcjpls.cc" | |
225 DJLSRepresentationParameter parameters(2 /* opt_nearlossless_deviation */, | |
226 OFFalse /* opt_useLosslessProcess */); | |
227 | |
228 /** | |
229 * WARNING: This call results in a segmentation fault if using | |
230 * the DCMTK package 3.6.2 from Ubuntu 18.04. | |
231 **/ | |
5363
3c8286e5d07b
wip: try to add a jpeg decoder without colorspace conversion: not working now
Alain Mazy <am@osimis.io>
parents:
5185
diff
changeset
|
232 if (FromDcmtkBridge::Transcode(dicom, DicomTransferSyntax_JPEGLSLossy, ¶meters, enableColorMapConversion)) |
3893 | 233 { |
3946
1f33ed7f82e6
automatic test of transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3945
diff
changeset
|
234 selectedSyntax = DicomTransferSyntax_JPEGLSLossy; |
3893 | 235 return true; |
236 } | |
237 } | |
238 #endif | |
239 | |
240 return false; | |
241 } | |
242 | |
3904
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
243 bool DcmtkTranscoder::IsSupported(DicomTransferSyntax syntax) |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
244 { |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
245 if (syntax == DicomTransferSyntax_LittleEndianImplicit || |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
246 syntax == DicomTransferSyntax_LittleEndianExplicit || |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
247 syntax == DicomTransferSyntax_BigEndianExplicit || |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
248 syntax == DicomTransferSyntax_DeflatedLittleEndianExplicit) |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
249 { |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
250 return true; |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
251 } |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
252 |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
253 #if ORTHANC_ENABLE_DCMTK_JPEG == 1 |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
254 if (syntax == DicomTransferSyntax_JPEGProcess1 || |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
255 syntax == DicomTransferSyntax_JPEGProcess2_4 || |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
256 syntax == DicomTransferSyntax_JPEGProcess14 || |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
257 syntax == DicomTransferSyntax_JPEGProcess14SV1) |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
258 { |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
259 return true; |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
260 } |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
261 #endif |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
262 |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
263 #if ORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS == 1 |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
264 if (syntax == DicomTransferSyntax_JPEGLSLossless || |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
265 syntax == DicomTransferSyntax_JPEGLSLossy) |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
266 { |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
267 return true; |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
268 } |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
269 #endif |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
270 |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
271 return false; |
c62f84c7eda9
fixing incorrect behavior in MemoryBufferTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3902
diff
changeset
|
272 } |
3906
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
273 |
f0dd5ded8927
refactoring using IDicomTranscoder::TranscodedDicom
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3904
diff
changeset
|
274 |
3944
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
275 bool DcmtkTranscoder::Transcode(DicomImage& target, |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
276 DicomImage& source /* in, "GetParsed()" possibly modified */, |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
277 const std::set<DicomTransferSyntax>& allowedSyntaxes, |
5363
3c8286e5d07b
wip: try to add a jpeg decoder without colorspace conversion: not working now
Alain Mazy <am@osimis.io>
parents:
5185
diff
changeset
|
278 bool allowNewSopInstanceUid, |
3c8286e5d07b
wip: try to add a jpeg decoder without colorspace conversion: not working now
Alain Mazy <am@osimis.io>
parents:
5185
diff
changeset
|
279 bool enableColorMapConversion) |
3944
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
280 { |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
281 target.Clear(); |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
282 |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
283 DicomTransferSyntax sourceSyntax; |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
284 if (!FromDcmtkBridge::LookupOrthancTransferSyntax(sourceSyntax, source.GetParsed())) |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
285 { |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
286 LOG(ERROR) << "Unsupport transfer syntax for transcoding"; |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
287 return false; |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
288 } |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
289 |
3981
31252a887f0b
info log about dcmtk transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3951
diff
changeset
|
290 { |
31252a887f0b
info log about dcmtk transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3951
diff
changeset
|
291 std::string s; |
31252a887f0b
info log about dcmtk transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3951
diff
changeset
|
292 for (std::set<DicomTransferSyntax>::const_iterator |
31252a887f0b
info log about dcmtk transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3951
diff
changeset
|
293 it = allowedSyntaxes.begin(); it != allowedSyntaxes.end(); ++it) |
31252a887f0b
info log about dcmtk transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3951
diff
changeset
|
294 { |
31252a887f0b
info log about dcmtk transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3951
diff
changeset
|
295 if (!s.empty()) |
31252a887f0b
info log about dcmtk transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3951
diff
changeset
|
296 { |
31252a887f0b
info log about dcmtk transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3951
diff
changeset
|
297 s += ", "; |
31252a887f0b
info log about dcmtk transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3951
diff
changeset
|
298 } |
31252a887f0b
info log about dcmtk transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3951
diff
changeset
|
299 |
31252a887f0b
info log about dcmtk transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3951
diff
changeset
|
300 s += GetTransferSyntaxUid(*it); |
31252a887f0b
info log about dcmtk transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3951
diff
changeset
|
301 } |
31252a887f0b
info log about dcmtk transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3951
diff
changeset
|
302 |
31252a887f0b
info log about dcmtk transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3951
diff
changeset
|
303 if (s.empty()) |
31252a887f0b
info log about dcmtk transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3951
diff
changeset
|
304 { |
31252a887f0b
info log about dcmtk transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3951
diff
changeset
|
305 s = "<none>"; |
31252a887f0b
info log about dcmtk transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3951
diff
changeset
|
306 } |
31252a887f0b
info log about dcmtk transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3951
diff
changeset
|
307 |
31252a887f0b
info log about dcmtk transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3951
diff
changeset
|
308 LOG(INFO) << "DCMTK transcoding from " << GetTransferSyntaxUid(sourceSyntax) |
31252a887f0b
info log about dcmtk transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3951
diff
changeset
|
309 << " to one of: " << s; |
31252a887f0b
info log about dcmtk transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3951
diff
changeset
|
310 } |
31252a887f0b
info log about dcmtk transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3951
diff
changeset
|
311 |
3946
1f33ed7f82e6
automatic test of transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3945
diff
changeset
|
312 #if !defined(NDEBUG) |
1f33ed7f82e6
automatic test of transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3945
diff
changeset
|
313 const std::string sourceSopInstanceUid = GetSopInstanceUid(source.GetParsed()); |
1f33ed7f82e6
automatic test of transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3945
diff
changeset
|
314 #endif |
1f33ed7f82e6
automatic test of transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3945
diff
changeset
|
315 |
1f33ed7f82e6
automatic test of transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3945
diff
changeset
|
316 DicomTransferSyntax targetSyntax; |
3944
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
317 if (allowedSyntaxes.find(sourceSyntax) != allowedSyntaxes.end()) |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
318 { |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
319 // No transcoding is needed |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
320 target.AcquireParsed(source); |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
321 target.AcquireBuffer(source); |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
322 return true; |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
323 } |
3951
5fe8c6d3212e
removed useless information "hasSopInstanceUidChanged"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3946
diff
changeset
|
324 else if (InplaceTranscode(targetSyntax, source.GetParsed(), |
5363
3c8286e5d07b
wip: try to add a jpeg decoder without colorspace conversion: not working now
Alain Mazy <am@osimis.io>
parents:
5185
diff
changeset
|
325 allowedSyntaxes, allowNewSopInstanceUid, enableColorMapConversion)) |
3946
1f33ed7f82e6
automatic test of transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3945
diff
changeset
|
326 { |
3944
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
327 // Sanity check |
3946
1f33ed7f82e6
automatic test of transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3945
diff
changeset
|
328 DicomTransferSyntax targetSyntax2; |
1f33ed7f82e6
automatic test of transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3945
diff
changeset
|
329 if (FromDcmtkBridge::LookupOrthancTransferSyntax(targetSyntax2, source.GetParsed()) && |
1f33ed7f82e6
automatic test of transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3945
diff
changeset
|
330 targetSyntax == targetSyntax2 && |
1f33ed7f82e6
automatic test of transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3945
diff
changeset
|
331 allowedSyntaxes.find(targetSyntax2) != allowedSyntaxes.end()) |
3944
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
332 { |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
333 target.AcquireParsed(source); |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
334 source.Clear(); |
3946
1f33ed7f82e6
automatic test of transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3945
diff
changeset
|
335 |
1f33ed7f82e6
automatic test of transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3945
diff
changeset
|
336 #if !defined(NDEBUG) |
1f33ed7f82e6
automatic test of transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3945
diff
changeset
|
337 // Only run the sanity check in debug mode |
3951
5fe8c6d3212e
removed useless information "hasSopInstanceUidChanged"
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3946
diff
changeset
|
338 CheckTranscoding(target, sourceSyntax, sourceSopInstanceUid, |
3946
1f33ed7f82e6
automatic test of transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3945
diff
changeset
|
339 allowedSyntaxes, allowNewSopInstanceUid); |
1f33ed7f82e6
automatic test of transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3945
diff
changeset
|
340 #endif |
1f33ed7f82e6
automatic test of transcoding
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3945
diff
changeset
|
341 |
3944
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
342 return true; |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
343 } |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
344 else |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
345 { |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
346 throw OrthancException(ErrorCode_InternalError); |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
347 } |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
348 } |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
349 else |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
350 { |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
351 // Cannot transcode |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
352 return false; |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
353 } |
aae045f802f4
preparing simplified interface for IDicomTranscoder
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
3939
diff
changeset
|
354 } |
3893 | 355 } |