Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MRG] Update data dicts to 2024d #2157

Merged
merged 5 commits into from
Nov 8, 2024
Merged

[MRG] Update data dicts to 2024d #2157

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8242e52
Add JPEG XL transfer syntaxes
aaronzs Oct 14, 2024
610ca06
Update DICOM dictionary to 2024d
aaronzs Oct 15, 2024
0d9c9b6
Update release notes
aaronzs Oct 15, 2024
aad2508
Merge branch 'main' into jxl_transfer_syntax_uids
scaramallion Oct 29, 2024
a52c2aa
Ensure consistency of retired placeholder element names
scaramallion Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add JPEG XL transfer syntaxes
  • Loading branch information
@aaronzs
aaronzs committed Oct 14, 2024
commit 8242e52225042195547fe9fcc39a20cb9b9c1beb
6 changes: 5 additions & 1 deletion doc/reference/uid.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,15 @@ Transfer Syntax UIDs
MPEG4HP42STEREOF
HEVCMP51
HEVCM10P51
RLELossless
JPEGXLLossless
JPEGXLJPEGRecompression
JPEGXL
HTJ2KLossless
HTJ2KLosslessRPCL
HTJ2K
JPIPHTJ2KReferenced
JPIPHTJ2KReferencedDeflate
RLELossless
SMPTEST211020UncompressedProgressiveActiveVideo
SMPTEST211020UncompressedInterlacedActiveVideo
SMPTEST211030PCMDigitalAudio
Expand All @@ -64,6 +67,7 @@ Transfer Syntax Lists
JPEGTransferSyntaxes
JPEGLSTransferSyntaxes
JPEG2000TransferSyntaxes
JPEGXLTransferSyntaxes
MPEGTransferSyntaxes
RLETransferSyntaxes
UncompressedTransferSyntaxes
Expand Down
3 changes: 3 additions & 0 deletions src/pydicom/_uid_dict.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@
'1.2.840.10008.1.2.4.106.1': ('Fragmentable MPEG-4 AVC/H.264 Stereo High Profile / Level 4.2', 'Transfer Syntax', '', '', 'MPEG4HP42STEREOF'),
'1.2.840.10008.1.2.4.107': ('HEVC/H.265 Main Profile / Level 5.1', 'Transfer Syntax', '', '', 'HEVCMP51'),
'1.2.840.10008.1.2.4.108': ('HEVC/H.265 Main 10 Profile / Level 5.1', 'Transfer Syntax', '', '', 'HEVCM10P51'),
'1.2.840.10008.1.2.4.110': ('JPEG XL Lossless', 'Transfer Syntax', '', '', 'JPEGXLLossless'),
'1.2.840.10008.1.2.4.111': ('JPEG XL JPEG Recompression', 'Transfer Syntax', '', '', 'JPEGXLJPEGRecompression'),
'1.2.840.10008.1.2.4.112': ('JPEG XL', 'Transfer Syntax', '', '', 'JPEGXL'),
'1.2.840.10008.1.2.4.201': ('High-Throughput JPEG 2000 Image Compression (Lossless Only)', 'Transfer Syntax', '', '', 'HTJ2KLossless'),
'1.2.840.10008.1.2.4.202': ('High-Throughput JPEG 2000 with RPCL Options Image Compression (Lossless Only)', 'Transfer Syntax', '', '', 'HTJ2KLosslessRPCL'),
'1.2.840.10008.1.2.4.203': ('High-Throughput JPEG 2000 Image Compression', 'Transfer Syntax', '', '', 'HTJ2K'),
Expand Down
12 changes: 12 additions & 0 deletions src/pydicom/uid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,12 @@ def set_private_encoding(self, implicit_vr: bool, little_endian: bool) -> None:
"""1.2.840.10008.1.2.4.107"""
HEVCM10P51 = UID("1.2.840.10008.1.2.4.108")
"""1.2.840.10008.1.2.4.108"""
JPEGXLLossless = UID("1.2.840.10008.1.2.4.110")
"""1.2.840.10008.1.2.4.110"""
JPEGXLJPEGRecompression = UID("1.2.840.10008.1.2.4.111")
"""1.2.840.10008.1.2.4.111"""
JPEGXL = UID("1.2.840.10008.1.2.4.112")
"""1.2.840.10008.1.2.4.112"""
HTJ2KLossless = UID("1.2.840.10008.1.2.4.201")
"""1.2.840.10008.1.2.4.201"""
HTJ2KLosslessRPCL = UID("1.2.840.10008.1.2.4.202")
Expand Down Expand Up @@ -376,6 +382,9 @@ def set_private_encoding(self, implicit_vr: bool, little_endian: bool) -> None:
MPEG4HP42STEREOF,
HEVCMP51,
HEVCM10P51,
JPEGXLLossless,
JPEGXLJPEGRecompression,
JPEGXL,
HTJ2KLossless,
HTJ2KLosslessRPCL,
HTJ2K,
Expand Down Expand Up @@ -410,6 +419,9 @@ def set_private_encoding(self, implicit_vr: bool, little_endian: bool) -> None:
]
"""JPEG 2000 (ISO/IEC 15444-1) transfer syntaxes."""

JPEGXLTransferSyntaxes = [JPEGXLLossless, JPEGXLJPEGRecompression, JPEGXL]
"""JPEG XL (ISO/IEC 18181-1) transfer syntaxes."""

MPEGTransferSyntaxes = [
MPEG2MPML,
MPEG2MPMLF,
Expand Down
Loading