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

Jump to bottom

Add HTJ2K transfer syntaxes #499

Merged
merged 1 commit into from
Oct 27, 2024
Merged

Add HTJ2K transfer syntaxes #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 52 additions & 0 deletions transfer-syntax-registry/src/entries.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,13 @@ pub const JPIP_REFERENCED_DEFLATE: Ts = Ts::new_ele(
Codec::Dataset(None),
);

/// **Stub descriptor:** JPIP Referenced Deflate
pub const JPIP_HTJ2K_REFERENCED_DEFLATE: Ts = Ts::new_ele(
"1.2.840.10008.1.2.4.205",
"JPIP HTJ2K Referenced Deflate",
Codec::Dataset(None),
);

// --- JPEG 2000 support ---

/// An alias for a transfer syntax specifier with [`Jpeg2000Adapter`]
Expand Down Expand Up @@ -264,6 +271,48 @@ pub const JPEG_2000_PART2_MULTI_COMPONENT_IMAGE_COMPRESSION: Ts = create_ts_stub
"JPEG 2000 Part 2 Multi-component Image Compression",
);

// --- HTJ2K ---

/// **Decoder implementation:** High-Throughput JPEG 2000 Image Compression (Lossless Only)
#[cfg(any(feature = "openjp2", feature = "openjpeg-sys"))]
pub const HIGH_THROUGHPUT_JPEG_2000_IMAGE_COMPRESSION_LOSSLESS_ONLY: Jpeg2000Ts = create_ts_jpeg2k(
"1.2.840.10008.1.2.4.201",
"High-Throughput JPEG 2000 Image Compression (Lossless Only)",
);
/// **Stub descriptor:** High-Throughput JPEG 2000 Image Compression (Lossless Only)
#[cfg(not(any(feature = "openjp2", feature = "openjpeg-sys")))]
pub const HIGH_THROUGHPUT_JPEG_2000_IMAGE_COMPRESSION_LOSSLESS_ONLY: Ts = create_ts_stub(
"1.2.840.10008.1.2.4.201",
"High-Throughput JPEG 2000 Image Compression (Lossless Only)",
);

/// **Decoder implementation:** High-Throughput JPEG 2000 with RPCL Options Image Compression (Lossless Only)
#[cfg(any(feature = "openjp2", feature = "openjpeg-sys"))]
pub const HIGH_THROUGHPUT_JPEG_2000_WITH_RPCL_OPTIONS_IMAGE_COMPRESSION_LOSSLESS_ONLY: Jpeg2000Ts = create_ts_jpeg2k(
"1.2.840.10008.1.2.4.202",
"High-Throughput JPEG 2000 with RPCL Options Image Compression (Lossless Only)",
);
/// **Stub descriptor:** High-Throughput JPEG 2000 Image Compression (Lossless Only)
#[cfg(not(any(feature = "openjp2", feature = "openjpeg-sys")))]
pub const HIGH_THROUGHPUT_JPEG_2000_WITH_RPCL_OPTIONS_IMAGE_COMPRESSION_LOSSLESS_ONLY: Ts = create_ts_stub(
"1.2.840.10008.1.2.4.202",
"High-Throughput JPEG 2000 with RPCL Options Image Compression (Lossless Only)",
);

/// **Decoder implementation:** High-Throughput JPEG 2000 Image Compression
#[cfg(any(feature = "openjp2", feature = "openjpeg-sys"))]
pub const HIGH_THROUGHPUT_JPEG_2000_IMAGE_COMPRESSION: Jpeg2000Ts = create_ts_jpeg2k(
"1.2.840.10008.1.2.4.203",
"High-Throughput JPEG 2000 Image Compression",
);
/// **Stub descriptor:** High-Throughput JPEG 2000 Image Compression
#[cfg(not(any(feature = "openjp2", feature = "openjpeg-sys")))]
pub const HIGH_THROUGHPUT_JPEG_2000_IMAGE_COMPRESSION: Ts = create_ts_stub(
"1.2.840.10008.1.2.4.203",
"High-Throughput JPEG 2000 Image Compression",
);


// --- JPEG-LS ---

/// An alias for a transfer syntax specifier with [`JpegLSAdapter`] as the decoder
Expand Down Expand Up @@ -355,6 +404,9 @@ pub const JPEG_LS_LOSSY_IMAGE_COMPRESSION: Ts = create_ts_stub(
/// **Stub descriptor:** JPIP Referenced
pub const JPIP_REFERENCED: Ts = create_ts_stub("1.2.840.10008.1.2.4.94", "JPIP Referenced");

/// **Stub descriptor:** JPIP HT2JK Referenced
pub const JPIP_HTJ2K_REFERENCED: Ts = create_ts_stub("1.2.840.10008.1.2.4.204", "JPIP HTJ2K Referenced");

/// **Stub descriptor:** MPEG2 Main Profile / Main Level
pub const MPEG2_MAIN_PROFILE_MAIN_LEVEL: Ts =
create_ts_stub("1.2.840.10008.1.2.4.100", "MPEG2 Main Profile / Main Level");
Expand Down
14 changes: 12 additions & 2 deletions transfer-syntax-registry/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@
//! | JPEG 2000 | Cargo feature `openjp2` or `openjpeg-sys` | x |
//! | JPEG 2000 Part 2 Multi-component Image Compression (Lossless Only) | Cargo feature `openjp2` or `openjpeg-sys` | x |
//! | JPEG 2000 Part 2 Multi-component Image Compression | Cargo feature `openjp2` or `openjpeg-sys` | x |
//! | High-Throughput JPEG 2000 (Lossless Only) | Cargo feature `openjp2` or `openjpeg-sys` | x |
//! | High-Throughput JPEG 2000 with RPCL Options (Lossless Only) | Cargo feature `openjp2` or `openjpeg-sys` | x |
//! | High-Throughput JPEG 2000 | Cargo feature `openjp2` or `openjpeg-sys` | x |
//! | JPEG XL Lossless | Cargo feature `jpegxl` | ✓ |
//! | JPEG XL Recompression | Cargo feature `jpegxl` | x |
//! | JPEG XL | Cargo feature `jpegxl` | ✓ |
Expand Down Expand Up @@ -97,7 +100,8 @@
//! These stubs may also be replaced by separate libraries
//! if using the inventory-based registry.
//!
//! [inventory]: https://docs.rs/inventory/0.3.12/inventory
//! [inventory]: https://docs.rs/inventory/0.3.15/inventory

use dicom_encoding::transfer_syntax::{
AdapterFreeTransferSyntax as Ts, Codec, TransferSyntaxIndex,
};
Expand Down Expand Up @@ -233,7 +237,7 @@ lazy_static! {
};

use self::entries::*;
let built_in_ts: [TransferSyntax; 40] = [
let built_in_ts: [TransferSyntax; 45] = [
IMPLICIT_VR_LITTLE_ENDIAN.erased(),
EXPLICIT_VR_LITTLE_ENDIAN.erased(),
EXPLICIT_VR_BIG_ENDIAN.erased(),
Expand All @@ -242,6 +246,8 @@ lazy_static! {

DEFLATED_EXPLICIT_VR_LITTLE_ENDIAN.erased(),
JPIP_REFERENCED_DEFLATE.erased(),
JPIP_HTJ2K_REFERENCED_DEFLATE.erased(),

JPEG_BASELINE.erased(),
JPEG_EXTENDED.erased(),
JPEG_LOSSLESS_NON_HIERARCHICAL.erased(),
Expand All @@ -252,10 +258,14 @@ lazy_static! {
JPEG_2000_IMAGE_COMPRESSION.erased(),
JPEG_2000_PART2_MULTI_COMPONENT_IMAGE_COMPRESSION_LOSSLESS_ONLY.erased(),
JPEG_2000_PART2_MULTI_COMPONENT_IMAGE_COMPRESSION.erased(),
HIGH_THROUGHPUT_JPEG_2000_IMAGE_COMPRESSION_LOSSLESS_ONLY.erased(),
HIGH_THROUGHPUT_JPEG_2000_WITH_RPCL_OPTIONS_IMAGE_COMPRESSION_LOSSLESS_ONLY.erased(),
HIGH_THROUGHPUT_JPEG_2000_IMAGE_COMPRESSION.erased(),
JPEG_XL_LOSSLESS.erased(),
JPEG_XL_RECOMPRESSION.erased(),
JPEG_XL.erased(),
JPIP_REFERENCED.erased(),
JPIP_HTJ2K_REFERENCED.erased(),
MPEG2_MAIN_PROFILE_MAIN_LEVEL.erased(),
FRAGMENTABLE_MPEG2_MAIN_PROFILE_MAIN_LEVEL.erased(),
MPEG2_MAIN_PROFILE_HIGH_LEVEL.erased(),
Expand Down
Loading