feat(sdk): add OGG Vorbis and Opus C2PA manifest support#2073
Open
harsha-verda wants to merge 8 commits into
Open
feat(sdk): add OGG Vorbis and Opus C2PA manifest support#2073harsha-verda wants to merge 8 commits into
harsha-verda wants to merge 8 commits into
Conversation
Implement C2PA spec v2.3 Section A.3.5 for OGG containers. The manifest
store is embedded as a dedicated logical bitstream with the `\x00c2pa`
packet identifier. Hash binding follows Section 18.7.3.7, mapping each
bitstream to a box named `Stream-{serial}`.
Supports both OGG Vorbis and OGG Opus containers via the same handler,
since the embedding mechanism operates at the OGG container level.
No new crate dependencies — OGG page parsing/writing is implemented
inline (~150 lines of binary I/O).
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
- Restructure write ordering so all BOS pages appear before any data pages (RFC 3533 compliance). For multi-page manifests, C2PA BOS is in the BOS group while continuation/EOS pages follow after. - Rewrite BoxHash to emit one entry per contiguous run of pages, handling the case where C2PA pages are split across the BOS group and the data section. - Remove RemoteRefEmbed impl (C2PA spec does not define XMP for OGG). remote_ref_writer_ref() now returns None instead of falsely advertising support. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
After the BOS-grouping fix, C2PA pages can be split (BOS in the BOS group, continuation pages after). Fix get_object_locations_from_stream to emit multiple Cai/Other regions as needed rather than assuming a single contiguous C2PA block. Also: - Add TooManyManifestStores unit test - Fix clippy map_or → is_some_and suggestions Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
- Replace custom tempfile::Builder + reopen() with the codebase tempfile_builder() utility (handles WASI correctly) - Narrow #[allow(dead_code)] to specific struct fields instead of the whole struct - Remove unused Clone derive from OggPage Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
- Fix ogg.md incorrectly listing RemoteRefEmbed as implemented - Add test for 255-byte boundary (zero-length terminator segment) - Add test for BOS grouping with large multi-page manifest - Add BoxMap contiguity assertion (no gaps between entries) Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
- Move ogg/opus rows after mov, before pdf (alphabetical order) - Update ogg.md layout to match BOS-compliant write ordering: C2PA BOS → Audio BOS → C2PA data → Audio data Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
- Use single OpenOptions read+write open instead of two separate file opens, eliminating race condition window - Fix ogg.md Write flow description to match BOS-compliant ordering Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
- Make test_read_cai_too_short match specific error (InvalidCapture) - Add test_get_box_map_large_manifest: verifies non-contiguous C2PA BoxMap entries for multi-page manifests - Add test_audio_preserved_after_write_remove: verifies original audio pages are byte-identical after sign+remove cycle Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changes in this pull request
Add OGG Vorbis and Opus C2PA manifest support, implementing the first reference for C2PA spec v2.3 Section A.3.5.
Resolves #2072.
What it does
The manifest store is embedded as a dedicated OGG logical bitstream whose first packet begins with the 5-byte identifier
\x00c2pa(per spec Section A.3.5). Hash binding follows Section 18.7.3.7, treating each logical bitstream as a "box" namedStream-{serial}(decimal). Both OGG Vorbis and OGG Opus containers are supported via the same handler since the embedding mechanism operates at the OGG container level.Implementation highlights
byteorderdependency. CRC-32 uses a const precomputed lookup table for the OGG polynomial0x04c11db7.CAIReader,CAIWriter,AssetIO,AssetPatch,AssetBoxHashogg,audio/ogg,opus,audio/opusRemoteRefEmbedis not implemented -- the C2PA spec does not define XMP embedding for OGG containers.Files changed
sdk/src/asset_handlers/ogg_io.rssdk/src/asset_handlers/mod.rssdk/src/error.rsOggErrorvariantsdk/src/jumbf_io.rssdk/src/utils/mime.rsopus/audio/opusMIME mappingssdk/tests/fixtures/sample1.oggsdk/tests/fixtures/sample1.opusdocs/formats/ogg.mddocs/supported-formats.mdsdk/src/asset_handlers/README.mdCHANGELOG.mdChecklist
TO DOitems (or similar) have been entered as GitHub issues and the link to that issue has been included in a comment.Test plan
jumbf_io.rs(test_streams_ogg,test_streams_opus)c2patoolon real 9MB+ audio files (Steve Jobs speech) --validation_state: Validfor both Vorbis and Opusffprobeandffmpegdecode (full 10:30 duration, no errors)