mirror of
https://github.com/storytold/filmcraft.git
synced 2026-11-19 08:53:21 +01:00
refactor(codecs): route MJPEG through craft-jpeg (#4773)
* refactor(mjpeg): decode through shared craft-jpeg * fix(mjpeg): satisfy fixed-width chunk lint * fix(mjpeg): pin shared crates and attribute fixtures
This commit is contained in:
1 parent
4d82e518c5
commit
221f042557
16 files changed
+420
-64
No files matched your search
@@ -9,6 +9,9 @@ iconography, images or other Adobe assets; open licences only; every asset attri
|
||||
|
||||
| Asset | Author | Source | Licence |
|
||||
|---|---|---|---|
|
||||
| `crates/codecs/tests/fixtures/mjpeg-avi1-baseline.jpg` | libjpeg-turbo contributors | `testorig.jpg` from [libjpeg-turbo 3.0.0 testimages](https://github.com/libjpeg-turbo/libjpeg-turbo/tree/3.0.0/testimages) | IJG License (`README.ijg` in the source distribution) |
|
||||
| `crates/codecs/tests/fixtures/mjpeg-cmyk.jpg` | craft-libs contributors | Original CMYK test fixture from [craft-libs prepress tests](https://github.com/storytold/craft-libs/tree/24a472717/crates/prepress/tests/fixtures) | MIT OR Apache-2.0 (craft-libs) |
|
||||
| `crates/codecs/tests/fixtures/mjpeg-progressive-huffman.jpg` | libjpeg-turbo contributors; FilmCraft contributors | Derived from `testorig.jpg` in [libjpeg-turbo 3.0.0 testimages](https://github.com/libjpeg-turbo/libjpeg-turbo/tree/3.0.0/testimages), decoded by FFmpeg and re-encoded with libjpeg-turbo `cjpeg -progressive -quality 88` | IJG License (`README.ijg` in the source distribution) |
|
||||
| `crates/ui-egui/src/i18n/sv.tsv` | FilmCraft contributors | Original work: clean-room Swedish interface translations | MIT OR Apache-2.0 |
|
||||
| `crates/ui-egui/src/i18n/it.tsv` | FilmCraft contributors | Original work: clean-room Italian interface translations | MIT OR Apache-2.0 |
|
||||
| `crates/ui-egui/src/i18n/tr.tsv` | FilmCraft contributors | Original work: clean-room Turkish interface translations | MIT OR Apache-2.0 |
|
||||
|
||||
Generated
+12
-3
@@ -1061,7 +1061,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "craft-audio"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/storytold/craft-libs?rev=47107f660191de2f0b425569506f4daa4faadac9#47107f660191de2f0b425569506f4daa4faadac9"
|
||||
source = "git+https://github.com/storytold/craft-libs?rev=b577b219e96a1aa8cba5ed2966c6b32ea9cfc7b2#b577b219e96a1aa8cba5ed2966c6b32ea9cfc7b2"
|
||||
dependencies = [
|
||||
"craft-media",
|
||||
"log",
|
||||
@@ -1113,10 +1113,18 @@ dependencies = [
|
||||
"writeable",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "craft-jpeg"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/storytold/craft-libs?rev=b577b219e96a1aa8cba5ed2966c6b32ea9cfc7b2#b577b219e96a1aa8cba5ed2966c6b32ea9cfc7b2"
|
||||
dependencies = [
|
||||
"thiserror 2.0.21",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "craft-media"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/storytold/craft-libs?rev=47107f660191de2f0b425569506f4daa4faadac9#47107f660191de2f0b425569506f4daa4faadac9"
|
||||
source = "git+https://github.com/storytold/craft-libs?rev=b577b219e96a1aa8cba5ed2966c6b32ea9cfc7b2#b577b219e96a1aa8cba5ed2966c6b32ea9cfc7b2"
|
||||
dependencies = [
|
||||
"chrono",
|
||||
"thiserror 2.0.21",
|
||||
@@ -1181,7 +1189,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "craft-video"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/storytold/craft-libs?rev=47107f660191de2f0b425569506f4daa4faadac9#47107f660191de2f0b425569506f4daa4faadac9"
|
||||
source = "git+https://github.com/storytold/craft-libs?rev=b577b219e96a1aa8cba5ed2966c6b32ea9cfc7b2#b577b219e96a1aa8cba5ed2966c6b32ea9cfc7b2"
|
||||
dependencies = [
|
||||
"craft-media",
|
||||
"rayon",
|
||||
@@ -2041,6 +2049,7 @@ name = "filmcraft-codecs"
|
||||
version = "0.20.1"
|
||||
dependencies = [
|
||||
"craft-audio",
|
||||
"craft-jpeg",
|
||||
"craft-media",
|
||||
"craft-video",
|
||||
"filmcraft-bitstream",
|
||||
|
||||
+3
-3
@@ -60,10 +60,10 @@ roxmltree = "0.21"
|
||||
craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "47107f660191de2f0b425569506f4daa4faadac9" }
|
||||
# The audio codecs (AAC, AC-3, FLAC, MP1/MP2, Opus) and the containers come from craft-libs. Both
|
||||
# are on one commit, so the types they share (CodecParams, ByteSource) are the same.
|
||||
craft-media = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "47107f660191de2f0b425569506f4daa4faadac9", default-features = false }
|
||||
craft-audio = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "47107f660191de2f0b425569506f4daa4faadac9", default-features = false, features = ["aac-decode", "aac-encode", "rayon", "ac3-decode", "mpa-decode", "mp3-decode", "decode-native", "symphonia", "opus-decode", "flac-encode", "mp3-encode"] }
|
||||
craft-media = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "b577b219e96a1aa8cba5ed2966c6b32ea9cfc7b2", default-features = false }
|
||||
craft-audio = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "b577b219e96a1aa8cba5ed2966c6b32ea9cfc7b2", default-features = false, features = ["aac-decode", "aac-encode", "rayon", "ac3-decode", "mpa-decode", "mp3-decode", "decode-native", "symphonia", "opus-decode", "flac-encode", "mp3-encode"] }
|
||||
# The video decoders (H.264, HEVC, VP9, AV1, MPEG-2, APV with its encoder), on the same commit as craft-media.
|
||||
craft-video = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "47107f660191de2f0b425569506f4daa4faadac9", features = ["h264-decode", "hevc-decode", "vp9-decode", "av1-decode", "vp8-decode", "mpeg2", "apv", "vp8-decode", "threads"] }
|
||||
craft-video = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "b577b219e96a1aa8cba5ed2966c6b32ea9cfc7b2", features = ["h264-decode", "hevc-decode", "vp9-decode", "av1-decode", "vp8-decode", "mpeg2", "apv", "vp8-decode", "threads"] }
|
||||
# Exact time, EDL / ALE and the interchange report; serde for the project file's time fields.
|
||||
craft-timeline = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "47107f660191de2f0b425569506f4daa4faadac9", features = ["serde"] }
|
||||
craft-captions = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "47107f660191de2f0b425569506f4daa4faadac9" }
|
||||
|
||||
@@ -22,15 +22,16 @@ craft-media = { workspace = true, features = ["avi", "mpegts", "mxf", "ogg"] }
|
||||
filmcraft-bitstream = { workspace = true }
|
||||
filmcraft-prores = { workspace = true }
|
||||
filmcraft-dnx = { workspace = true }
|
||||
craft-jpeg = { git = "https://github.com/storytold/craft-libs", rev = "b577b219e96a1aa8cba5ed2966c6b32ea9cfc7b2" }
|
||||
rayon = { workspace = true }
|
||||
thiserror = { workspace = true }
|
||||
log = { workspace = true }
|
||||
# Decode timing counters (`gop_stats`); std's Instant panics on wasm32.
|
||||
web-time = "1"
|
||||
image = { version = "0.25", default-features = false, features = ["jpeg"] }
|
||||
# Bootstrap audio decoding (MPL-2.0, used unmodified); replaced by own decoders over time.
|
||||
symphonia = { version = "0.5.5", default-features = false, features = ["aac", "mp1", "mp2", "mp3", "flac", "alac", "pcm", "wav", "aiff", "ogg", "vorbis", "isomp4"] }
|
||||
|
||||
[dev-dependencies]
|
||||
filmcraft-testkit = { workspace = true }
|
||||
serde_json = { workspace = true }
|
||||
image = { version = "0.25", default-features = false, features = ["jpeg"] }
|
||||
@@ -202,7 +202,7 @@ fn jpeg_without_huffman_tables_uses_the_standard_ones() {
|
||||
let b = d.decode(&stripped, 0).unwrap().remove(0).frame.to_rgba8();
|
||||
assert!(a == b);
|
||||
// the inserted segment is 418 bytes and well-formed: 4 tables of 12, 12, 162, 162 codes
|
||||
let with = crate::video::with_default_huffman(&stripped);
|
||||
let with = craft_jpeg::with_avi1_default_huffman(&stripped);
|
||||
assert_eq!(with.len(), stripped.len() + 420);
|
||||
}
|
||||
|
||||
|
||||
@@ -202,6 +202,8 @@ mod audio_timing_tests;
|
||||
#[cfg(test)]
|
||||
mod avi_tests;
|
||||
#[cfg(test)]
|
||||
mod mjpeg_tests;
|
||||
#[cfg(test)]
|
||||
mod rounded_pts_tests;
|
||||
#[cfg(test)]
|
||||
mod stream_color_tests;
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
use crate::video::{MjpegDecoder, VideoDecoder};
|
||||
use filmcraft_frame::PixelData;
|
||||
|
||||
fn shared_rgba(bytes: &[u8]) -> Vec<u8> {
|
||||
let mut dec = MjpegDecoder;
|
||||
let frames = dec.decode(bytes, 0).unwrap();
|
||||
let [frame] = frames.as_slice() else { panic!("expected one MJPEG frame") };
|
||||
match &frame.frame.data {
|
||||
PixelData::Rgba8(data) => data.as_ref().clone(),
|
||||
other => panic!("unexpected FilmCraft pixel data: {other:?}"),
|
||||
}
|
||||
}
|
||||
|
||||
fn without_dht(jpeg: &[u8]) -> Vec<u8> {
|
||||
let mut out = jpeg[..2].to_vec();
|
||||
let mut at = 2;
|
||||
while at + 1 < jpeg.len() {
|
||||
assert_eq!(jpeg[at], 0xFF, "expected marker at {at}");
|
||||
let marker = jpeg[at + 1];
|
||||
if marker == 0xDA {
|
||||
out.extend_from_slice(&jpeg[at..]);
|
||||
break;
|
||||
}
|
||||
let len = usize::from(u16::from_be_bytes([jpeg[at + 2], jpeg[at + 3]]));
|
||||
if marker != 0xC4 {
|
||||
out.extend_from_slice(&jpeg[at..at + 2 + len]);
|
||||
}
|
||||
at += 2 + len;
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn shared_mjpeg_matches_image_oracle_for_progressive_and_avi1_missing_dht() {
|
||||
let progressive = include_bytes!("../tests/fixtures/mjpeg-progressive-huffman.jpg");
|
||||
let oracle = image::load_from_memory_with_format(progressive, image::ImageFormat::Jpeg).unwrap().to_rgba8().into_raw();
|
||||
let decoded = shared_rgba(progressive);
|
||||
assert_eq!(decoded.len(), oracle.len());
|
||||
let mad = decoded.iter().zip(&oracle).map(|(&a, &b)| f32::from(a.abs_diff(b))).sum::<f32>() / decoded.len() as f32;
|
||||
assert!(mad < 2.0, "progressive JPEG mean absolute difference {mad}");
|
||||
|
||||
let baseline = include_bytes!("../tests/fixtures/mjpeg-avi1-baseline.jpg");
|
||||
let baseline_expected = shared_rgba(baseline);
|
||||
let baseline_oracle = image::load_from_memory_with_format(baseline, image::ImageFormat::Jpeg).unwrap().to_rgba8().into_raw();
|
||||
let baseline_mad = baseline_expected.iter().zip(&baseline_oracle).map(|(&a, &b)| f32::from(a.abs_diff(b))).sum::<f32>() / baseline_expected.len() as f32;
|
||||
eprintln!("baseline JPEG image-decoder mean absolute difference {baseline_mad:.4} levels/channel");
|
||||
assert!(baseline_mad < 2.0, "baseline JPEG mean absolute difference {baseline_mad}");
|
||||
let avi1 = without_dht(baseline);
|
||||
assert_eq!(shared_rgba(&avi1), baseline_expected, "AVI1 Annex K fallback should restore baseline pixels");
|
||||
|
||||
let cmyk = include_bytes!("../tests/fixtures/mjpeg-cmyk.jpg");
|
||||
let oracle = image::load_from_memory_with_format(cmyk, image::ImageFormat::Jpeg).unwrap().to_rgba8().into_raw();
|
||||
let decoded = shared_rgba(cmyk);
|
||||
assert_eq!(decoded.len(), oracle.len());
|
||||
let mad = decoded.iter().zip(&oracle).map(|(&a, &b)| f32::from(a.abs_diff(b))).sum::<f32>() / decoded.len() as f32;
|
||||
assert!(mad < 2.0, "CMYK JPEG mean absolute difference {mad}");
|
||||
}
|
||||
+55
-56
@@ -181,59 +181,29 @@ pub fn hvcc_length_size_and_tid(hvcc: &[u8]) -> (usize, Option<u8>) {
|
||||
/// A factory returns `None` when it does not handle the entry.
|
||||
pub type VideoDecoderFactory = fn(&SampleEntry) -> Option<Result<Box<dyn VideoDecoder>>>;
|
||||
|
||||
/// The typical Huffman tables of ITU-T T.81 Annex K.3 as one DHT segment (luminance and
|
||||
/// chrominance, DC and AC): what a Motion JPEG frame without its own tables is coded with (AVI's
|
||||
/// "MJPG", the AVI1 convention of capture cards and cameras).
|
||||
const DEFAULT_DHT: &[u8] = &[
|
||||
0xFF, 0xC4, 0x01, 0xA2, //
|
||||
0x00, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, //
|
||||
0x01, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, //
|
||||
0x10, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7D, //
|
||||
0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07, 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xA1, 0x08, //
|
||||
0x23, 0x42, 0xB1, 0xC1, 0x15, 0x52, 0xD1, 0xF0, 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0A, 0x16, 0x17, 0x18, 0x19, 0x1A, 0x25, 0x26, 0x27, 0x28, //
|
||||
0x29, 0x2A, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, //
|
||||
0x5A, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, //
|
||||
0x8A, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6, //
|
||||
0xB7, 0xB8, 0xB9, 0xBA, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xE1, 0xE2, //
|
||||
0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, //
|
||||
0x11, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77, //
|
||||
0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21, 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71, 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91, //
|
||||
0xA1, 0xB1, 0xC1, 0x09, 0x23, 0x33, 0x52, 0xF0, 0x15, 0x62, 0x72, 0xD1, 0x0A, 0x16, 0x24, 0x34, 0xE1, 0x25, 0xF1, 0x17, 0x18, 0x19, 0x1A, 0x26, //
|
||||
0x27, 0x28, 0x29, 0x2A, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3A, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4A, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, //
|
||||
0x59, 0x5A, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6A, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7A, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, //
|
||||
0x88, 0x89, 0x8A, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9A, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xB2, 0xB3, 0xB4, //
|
||||
0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, //
|
||||
0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA,
|
||||
];
|
||||
|
||||
/// A JPEG with the [`DEFAULT_DHT`] inserted before its first scan when it defines no Huffman
|
||||
/// table of its own (else unchanged, borrowed).
|
||||
pub fn with_default_huffman(jpeg: &[u8]) -> std::borrow::Cow<'_, [u8]> {
|
||||
use std::borrow::Cow;
|
||||
if jpeg.get(..2) != Some(&[0xFF, 0xD8]) {
|
||||
return Cow::Borrowed(jpeg);
|
||||
}
|
||||
// walk the marker segments up to the start of scan
|
||||
/// Read the Adobe APP14 transform byte needed for RGB/CMYK JPEG interpretation.
|
||||
fn jpeg_adobe_transform(jpeg: &[u8]) -> Option<u8> {
|
||||
let mut at = 2usize;
|
||||
while let (Some(&0xFF), Some(&m)) = (jpeg.get(at), jpeg.get(at + 1)) {
|
||||
match m {
|
||||
0xFF => at += 1, // fill byte
|
||||
0xC4 => return Cow::Borrowed(jpeg),
|
||||
0xDA => {
|
||||
let mut out = Vec::with_capacity(jpeg.len() + DEFAULT_DHT.len());
|
||||
out.extend_from_slice(jpeg.get(..at).unwrap_or_default());
|
||||
out.extend_from_slice(DEFAULT_DHT);
|
||||
out.extend_from_slice(jpeg.get(at..).unwrap_or_default());
|
||||
return Cow::Owned(out);
|
||||
}
|
||||
0xD0..=0xD9 | 0x01 => at += 2,
|
||||
_ => {
|
||||
let Some(len) = jpeg.get(at + 2..at + 4).map(|b| usize::from(u16::from_be_bytes([b[0], b[1]]))) else { break };
|
||||
at += 2 + len;
|
||||
}
|
||||
}
|
||||
if jpeg.get(..2) != Some(&[0xFF, 0xD8]) {
|
||||
return None;
|
||||
}
|
||||
Cow::Borrowed(jpeg)
|
||||
while at + 1 < jpeg.len() && jpeg[at] == 0xFF {
|
||||
let marker = jpeg[at + 1];
|
||||
if marker == 0xDA {
|
||||
return None;
|
||||
}
|
||||
let len = usize::from(u16::from_be_bytes([*jpeg.get(at + 2)?, *jpeg.get(at + 3)?]));
|
||||
if len < 2 {
|
||||
return None;
|
||||
}
|
||||
let end = at.checked_add(2 + len)?;
|
||||
let segment = jpeg.get(at + 4..end)?;
|
||||
if marker == 0xEE && segment.get(..5) == Some(b"Adobe") {
|
||||
return segment.get(11).copied();
|
||||
}
|
||||
at = end;
|
||||
}
|
||||
None
|
||||
}
|
||||
|
||||
/// Motion-JPEG / Photo-JPEG (each sample is a complete JPEG).
|
||||
@@ -241,12 +211,41 @@ pub struct MjpegDecoder;
|
||||
|
||||
impl VideoDecoder for MjpegDecoder {
|
||||
fn decode(&mut self, sample: &[u8], pts: i64) -> Result<Vec<DecodedFrame>> {
|
||||
let sample = with_default_huffman(sample);
|
||||
let sample = craft_jpeg::with_avi1_default_huffman(sample);
|
||||
// mjpa samples may contain two fields; decode the first image (field-merging lands with interlace support).
|
||||
let img = image::load_from_memory_with_format(&sample, image::ImageFormat::Jpeg).map_err(|e| CodecError::Decode(e.to_string()))?;
|
||||
let rgba = img.to_rgba8();
|
||||
let (w, h) = rgba.dimensions();
|
||||
Ok(vec![DecodedFrame { pts, frame: VideoFrame::rgba8(w, h, rgba.into_raw()), draft: false }])
|
||||
let adobe = jpeg_adobe_transform(&sample);
|
||||
// `image::load_from_memory` previously used image::Limits::default(), which caps decoder
|
||||
// allocations at 512 MiB and has no pixel-count limit. Keep that memory ceiling and avoid
|
||||
// adding a separate pixel limit when routing through craft-jpeg.
|
||||
let mut limits = craft_jpeg::Limits::default();
|
||||
limits.max_pixels = u64::MAX;
|
||||
limits.max_alloc = 512 << 20;
|
||||
let decoded = craft_jpeg::decode(&sample, &limits, adobe).map_err(|e| CodecError::Decode(e.to_string()))?;
|
||||
let craft_jpeg::Samples::U8(samples) = decoded.samples else {
|
||||
return Err(CodecError::Decode("12-bit Motion JPEG is not supported by FilmCraft frames".into()));
|
||||
};
|
||||
let mut rgba = Vec::with_capacity(samples.len().saturating_mul(4));
|
||||
match decoded.components {
|
||||
1 => {
|
||||
for &gray in &samples {
|
||||
rgba.extend_from_slice(&[gray, gray, gray, 255]);
|
||||
}
|
||||
}
|
||||
3 => {
|
||||
for rgb in samples.as_chunks::<3>().0 {
|
||||
rgba.extend_from_slice(&[rgb[0], rgb[1], rgb[2], 255]);
|
||||
}
|
||||
}
|
||||
4 => {
|
||||
for cmyk in samples.as_chunks::<4>().0 {
|
||||
let (c, m, y, k) = (u16::from(cmyk[0]), u16::from(cmyk[1]), u16::from(cmyk[2]), u16::from(cmyk[3]));
|
||||
let rgb = [((255 - c) * (255 - k) / 255) as u8, ((255 - m) * (255 - k) / 255) as u8, ((255 - y) * (255 - k) / 255) as u8];
|
||||
rgba.extend_from_slice(&[rgb[0], rgb[1], rgb[2], 255]);
|
||||
}
|
||||
}
|
||||
n => return Err(CodecError::Decode(format!("unsupported JPEG component count {n}"))),
|
||||
}
|
||||
Ok(vec![DecodedFrame { pts, frame: VideoFrame::rgba8(decoded.width, decoded.height, rgba), draft: false }])
|
||||
}
|
||||
fn flush(&mut self) -> Vec<DecodedFrame> {
|
||||
Vec::new()
|
||||
|
||||
+258
@@ -0,0 +1,258 @@
|
||||
libjpeg-turbo note: This file has been modified by The libjpeg-turbo Project
|
||||
to include only information relevant to libjpeg-turbo, to wordsmith certain
|
||||
sections, and to remove impolitic language that existed in the libjpeg v8
|
||||
README. It is included only for reference. Please see README.md for
|
||||
information specific to libjpeg-turbo.
|
||||
|
||||
|
||||
The Independent JPEG Group's JPEG software
|
||||
==========================================
|
||||
|
||||
This distribution contains a release of the Independent JPEG Group's free JPEG
|
||||
software. You are welcome to redistribute this software and to use it for any
|
||||
purpose, subject to the conditions under LEGAL ISSUES, below.
|
||||
|
||||
This software is the work of Tom Lane, Guido Vollbeding, Philip Gladstone,
|
||||
Bill Allombert, Jim Boucher, Lee Crocker, Bob Friesenhahn, Ben Jackson,
|
||||
Julian Minguillon, Luis Ortiz, George Phillips, Davide Rossi, Ge' Weijers,
|
||||
and other members of the Independent JPEG Group.
|
||||
|
||||
IJG is not affiliated with the ISO/IEC JTC1/SC29/WG1 standards committee
|
||||
(also known as JPEG, together with ITU-T SG16).
|
||||
|
||||
|
||||
DOCUMENTATION ROADMAP
|
||||
=====================
|
||||
|
||||
This file contains the following sections:
|
||||
|
||||
OVERVIEW General description of JPEG and the IJG software.
|
||||
LEGAL ISSUES Copyright, lack of warranty, terms of distribution.
|
||||
REFERENCES Where to learn more about JPEG.
|
||||
ARCHIVE LOCATIONS Where to find newer versions of this software.
|
||||
FILE FORMAT WARS Software *not* to get.
|
||||
TO DO Plans for future IJG releases.
|
||||
|
||||
Other documentation files in the distribution are:
|
||||
|
||||
User documentation:
|
||||
usage.txt Usage instructions for cjpeg, djpeg, jpegtran,
|
||||
rdjpgcom, and wrjpgcom.
|
||||
*.1 Unix-style man pages for programs (same info as usage.txt).
|
||||
wizard.txt Advanced usage instructions for JPEG wizards only.
|
||||
change.log Version-to-version change highlights.
|
||||
Programmer and internal documentation:
|
||||
libjpeg.txt How to use the JPEG library in your own programs.
|
||||
example.c Sample code for calling the JPEG library.
|
||||
structure.txt Overview of the JPEG library's internal structure.
|
||||
coderules.txt Coding style rules --- please read if you contribute code.
|
||||
|
||||
Please read at least usage.txt. Some information can also be found in the JPEG
|
||||
FAQ (Frequently Asked Questions) article. See ARCHIVE LOCATIONS below to find
|
||||
out where to obtain the FAQ article.
|
||||
|
||||
If you want to understand how the JPEG code works, we suggest reading one or
|
||||
more of the REFERENCES, then looking at the documentation files (in roughly
|
||||
the order listed) before diving into the code.
|
||||
|
||||
|
||||
OVERVIEW
|
||||
========
|
||||
|
||||
This package contains C software to implement JPEG image encoding, decoding,
|
||||
and transcoding. JPEG (pronounced "jay-peg") is a standardized compression
|
||||
method for full-color and grayscale images. JPEG's strong suit is compressing
|
||||
photographic images or other types of images that have smooth color and
|
||||
brightness transitions between neighboring pixels. Images with sharp lines or
|
||||
other abrupt features may not compress well with JPEG, and a higher JPEG
|
||||
quality may have to be used to avoid visible compression artifacts with such
|
||||
images.
|
||||
|
||||
JPEG is normally lossy, meaning that the output pixels are not necessarily
|
||||
identical to the input pixels. However, on photographic content and other
|
||||
"smooth" images, very good compression ratios can be obtained with no visible
|
||||
compression artifacts, and extremely high compression ratios are possible if
|
||||
you are willing to sacrifice image quality (by reducing the "quality" setting
|
||||
in the compressor.)
|
||||
|
||||
This software implements JPEG baseline, extended-sequential, progressive, and
|
||||
lossless compression processes. Provision is made for supporting all variants
|
||||
of these processes, although some uncommon parameter settings aren't
|
||||
implemented yet. We have made no provision for supporting the hierarchical
|
||||
processes defined in the standard.
|
||||
|
||||
We provide a set of library routines for reading and writing JPEG image files,
|
||||
plus two sample applications "cjpeg" and "djpeg", which use the library to
|
||||
perform conversion between JPEG and some other popular image file formats.
|
||||
The library is intended to be reused in other applications.
|
||||
|
||||
In order to support file conversion and viewing software, we have included
|
||||
considerable functionality beyond the bare JPEG coding/decoding capability;
|
||||
for example, the color quantization modules are not strictly part of JPEG
|
||||
decoding, but they are essential for output to colormapped file formats or
|
||||
colormapped displays. These extra functions can be compiled out of the
|
||||
library if not required for a particular application.
|
||||
|
||||
We have also included "jpegtran", a utility for lossless transcoding between
|
||||
different JPEG processes, and "rdjpgcom" and "wrjpgcom", two simple
|
||||
applications for inserting and extracting textual comments in JFIF files.
|
||||
|
||||
The emphasis in designing this software has been on achieving portability and
|
||||
flexibility, while also making it fast enough to be useful. In particular,
|
||||
the software is not intended to be read as a tutorial on JPEG. (See the
|
||||
REFERENCES section for introductory material.) Rather, it is intended to
|
||||
be reliable, portable, industrial-strength code. We do not claim to have
|
||||
achieved that goal in every aspect of the software, but we strive for it.
|
||||
|
||||
We welcome the use of this software as a component of commercial products.
|
||||
No royalty is required, but we do ask for an acknowledgement in product
|
||||
documentation, as described under LEGAL ISSUES.
|
||||
|
||||
|
||||
LEGAL ISSUES
|
||||
============
|
||||
|
||||
In plain English:
|
||||
|
||||
1. We don't promise that this software works. (But if you find any bugs,
|
||||
please let us know!)
|
||||
2. You can use this software for whatever you want. You don't have to pay us.
|
||||
3. You may not pretend that you wrote this software. If you use it in a
|
||||
program, you must acknowledge somewhere in your documentation that
|
||||
you've used the IJG code.
|
||||
|
||||
In legalese:
|
||||
|
||||
The authors make NO WARRANTY or representation, either express or implied,
|
||||
with respect to this software, its quality, accuracy, merchantability, or
|
||||
fitness for a particular purpose. This software is provided "AS IS", and you,
|
||||
its user, assume the entire risk as to its quality and accuracy.
|
||||
|
||||
This software is copyright (C) 1991-2020, Thomas G. Lane, Guido Vollbeding.
|
||||
All Rights Reserved except as specified below.
|
||||
|
||||
Permission is hereby granted to use, copy, modify, and distribute this
|
||||
software (or portions thereof) for any purpose, without fee, subject to these
|
||||
conditions:
|
||||
(1) If any part of the source code for this software is distributed, then this
|
||||
README file must be included, with this copyright and no-warranty notice
|
||||
unaltered; and any additions, deletions, or changes to the original files
|
||||
must be clearly indicated in accompanying documentation.
|
||||
(2) If only executable code is distributed, then the accompanying
|
||||
documentation must state that "this software is based in part on the work of
|
||||
the Independent JPEG Group".
|
||||
(3) Permission for use of this software is granted only if the user accepts
|
||||
full responsibility for any undesirable consequences; the authors accept
|
||||
NO LIABILITY for damages of any kind.
|
||||
|
||||
These conditions apply to any software derived from or based on the IJG code,
|
||||
not just to the unmodified library. If you use our work, you ought to
|
||||
acknowledge us.
|
||||
|
||||
Permission is NOT granted for the use of any IJG author's name or company name
|
||||
in advertising or publicity relating to this software or products derived from
|
||||
it. This software may be referred to only as "the Independent JPEG Group's
|
||||
software".
|
||||
|
||||
We specifically permit and encourage the use of this software as the basis of
|
||||
commercial products, provided that all warranty or liability claims are
|
||||
assumed by the product vendor.
|
||||
|
||||
|
||||
REFERENCES
|
||||
==========
|
||||
|
||||
We recommend reading one or more of these references before trying to
|
||||
understand the innards of the JPEG software.
|
||||
|
||||
The best short technical introduction to the JPEG compression algorithm is
|
||||
Wallace, Gregory K. "The JPEG Still Picture Compression Standard",
|
||||
Communications of the ACM, April 1991 (vol. 34 no. 4), pp. 30-44.
|
||||
(Adjacent articles in that issue discuss MPEG motion picture compression,
|
||||
applications of JPEG, and related topics.) If you don't have the CACM issue
|
||||
handy, a PDF file containing a revised version of Wallace's article is
|
||||
available at http://www.ijg.org/files/Wallace.JPEG.pdf. The file (actually
|
||||
a preprint for an article that appeared in IEEE Trans. Consumer Electronics)
|
||||
omits the sample images that appeared in CACM, but it includes corrections
|
||||
and some added material. Note: the Wallace article is copyright ACM and IEEE,
|
||||
and it may not be used for commercial purposes.
|
||||
|
||||
A somewhat less technical, more leisurely introduction to JPEG can be found in
|
||||
"The Data Compression Book" by Mark Nelson and Jean-loup Gailly, published by
|
||||
M&T Books (New York), 2nd ed. 1996, ISBN 1-55851-434-1. This book provides
|
||||
good explanations and example C code for a multitude of compression methods
|
||||
including JPEG. It is an excellent source if you are comfortable reading C
|
||||
code but don't know much about data compression in general. The book's JPEG
|
||||
sample code is far from industrial-strength, but when you are ready to look
|
||||
at a full implementation, you've got one here...
|
||||
|
||||
The best currently available description of JPEG is the textbook "JPEG Still
|
||||
Image Data Compression Standard" by William B. Pennebaker and Joan L.
|
||||
Mitchell, published by Van Nostrand Reinhold, 1993, ISBN 0-442-01272-1.
|
||||
Price US$59.95, 638 pp. The book includes the complete text of the ISO JPEG
|
||||
standards (DIS 10918-1 and draft DIS 10918-2).
|
||||
|
||||
The original JPEG standard is divided into two parts, Part 1 being the actual
|
||||
specification, while Part 2 covers compliance testing methods. Part 1 is
|
||||
titled "Digital Compression and Coding of Continuous-tone Still Images,
|
||||
Part 1: Requirements and guidelines" and has document numbers ISO/IEC IS
|
||||
10918-1, ITU-T T.81. Part 2 is titled "Digital Compression and Coding of
|
||||
Continuous-tone Still Images, Part 2: Compliance testing" and has document
|
||||
numbers ISO/IEC IS 10918-2, ITU-T T.83.
|
||||
|
||||
The JPEG standard does not specify all details of an interchangeable file
|
||||
format. For the omitted details, we follow the "JFIF" conventions, revision
|
||||
1.02. JFIF version 1 has been adopted as ISO/IEC 10918-5 (05/2013) and
|
||||
Recommendation ITU-T T.871 (05/2011): Information technology - Digital
|
||||
compression and coding of continuous-tone still images: JPEG File Interchange
|
||||
Format (JFIF). It is available as a free download in PDF file format from
|
||||
https://www.iso.org/standard/54989.html and http://www.itu.int/rec/T-REC-T.871.
|
||||
A PDF file of the older JFIF 1.02 specification is available at
|
||||
http://www.w3.org/Graphics/JPEG/jfif3.pdf.
|
||||
|
||||
The TIFF 6.0 file format specification can be obtained from
|
||||
http://mirrors.ctan.org/graphics/tiff/TIFF6.ps.gz. The JPEG incorporation
|
||||
scheme found in the TIFF 6.0 spec of 3-June-92 has a number of serious
|
||||
problems. IJG does not recommend use of the TIFF 6.0 design (TIFF Compression
|
||||
tag 6). Instead, we recommend the JPEG design proposed by TIFF Technical Note
|
||||
#2 (Compression tag 7). Copies of this Note can be obtained from
|
||||
http://www.ijg.org/files/. It is expected that the next revision
|
||||
of the TIFF spec will replace the 6.0 JPEG design with the Note's design.
|
||||
Although IJG's own code does not support TIFF/JPEG, the free libtiff library
|
||||
uses our library to implement TIFF/JPEG per the Note.
|
||||
|
||||
|
||||
ARCHIVE LOCATIONS
|
||||
=================
|
||||
|
||||
The "official" archive site for this software is www.ijg.org.
|
||||
The most recent released version can always be found there in
|
||||
directory "files".
|
||||
|
||||
The JPEG FAQ (Frequently Asked Questions) article is a source of some
|
||||
general information about JPEG. It is available at
|
||||
http://www.faqs.org/faqs/jpeg-faq.
|
||||
|
||||
|
||||
FILE FORMAT COMPATIBILITY
|
||||
=========================
|
||||
|
||||
This software implements ITU T.81 | ISO/IEC 10918 with some extensions from
|
||||
ITU T.871 | ISO/IEC 10918-5 (JPEG File Interchange Format-- see REFERENCES).
|
||||
Informally, the term "JPEG image" or "JPEG file" most often refers to JFIF or
|
||||
a subset thereof, but there are other formats containing the name "JPEG" that
|
||||
are incompatible with the original JPEG standard or with JFIF (for instance,
|
||||
JPEG 2000 and JPEG XR). This software therefore does not support these
|
||||
formats. Indeed, one of the original reasons for developing this free software
|
||||
was to help force convergence on a common, interoperable format standard for
|
||||
JPEG files.
|
||||
|
||||
JFIF is a minimal or "low end" representation. TIFF/JPEG (TIFF revision 6.0 as
|
||||
modified by TIFF Technical Note #2) can be used for "high end" applications
|
||||
that need to record a lot of additional data about an image.
|
||||
|
||||
|
||||
TO DO
|
||||
=====
|
||||
|
||||
Please send bug reports, offers of help, etc. to jpeg-info@jpegclub.org.
|
||||
+9
@@ -0,0 +1,9 @@
|
||||
# MJPEG decoder fixtures
|
||||
|
||||
`mjpeg-avi1-baseline.jpg` is `testorig.jpg` from libjpeg-turbo 3.0.0 `testimages/`, under the
|
||||
IJG License included in `README.ijg`. The source is documented in the [libjpeg-turbo 3.0.0
|
||||
fixture directory](https://github.com/libjpeg-turbo/libjpeg-turbo/tree/3.0.0/testimages).
|
||||
|
||||
`mjpeg-progressive-huffman.jpg` is derived from the same image: FFmpeg decoded it to PPM, then
|
||||
libjpeg-turbo `cjpeg -progressive -quality 88` encoded it as SOF2. It is covered by the same
|
||||
license. `mjpeg-cmyk.jpg` is the 16×16 CMYK fixture from craft-libs `crates/prepress/tests/fixtures`.
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 5.6 KiB |
@@ -0,0 +1,6 @@
|
||||
asset: crates/codecs/tests/fixtures/mjpeg-avi1-baseline.jpg
|
||||
title: libjpeg-turbo testorig JPEG used as an AVI1 baseline decoder fixture
|
||||
author: libjpeg-turbo contributors
|
||||
source: https://github.com/libjpeg-turbo/libjpeg-turbo/tree/3.0.0/testimages (testorig.jpg)
|
||||
license: IJG License (README.ijg in the libjpeg-turbo 3.0.0 source distribution)
|
||||
added: 2026-11-13
|
||||
BIN
Binary file not shown.
|
After Width: | Height: | Size: 297 B |
@@ -0,0 +1,6 @@
|
||||
asset: crates/codecs/tests/fixtures/mjpeg-cmyk.jpg
|
||||
title: CMYK JPEG decoder parity fixture copied from craft-libs prepress tests
|
||||
author: craft-libs contributors
|
||||
source: https://github.com/storytold/craft-libs/tree/24a472717/crates/prepress/tests/fixtures/cyan-cmyk.jpg
|
||||
license: MIT OR Apache-2.0 (craft-libs)
|
||||
added: 2026-11-13
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 6.6 KiB |
@@ -0,0 +1,6 @@
|
||||
asset: crates/codecs/tests/fixtures/mjpeg-progressive-huffman.jpg
|
||||
title: Progressive Huffman JPEG decoder fixture derived from libjpeg-turbo testorig
|
||||
author: libjpeg-turbo contributors; FilmCraft contributors
|
||||
source: https://github.com/libjpeg-turbo/libjpeg-turbo/tree/3.0.0/testimages (testorig.jpg), decoded with FFmpeg to PPM and re-encoded using libjpeg-turbo cjpeg -progressive -quality 88
|
||||
license: IJG License (README.ijg in the libjpeg-turbo 3.0.0 source distribution)
|
||||
added: 2026-11-13
|
||||
Reference in new issue
Block a user