Merge pull request #327 from mozilla/no-pixi-permitted

Add "missing-pixi-permitted" feature

Author: baumanj

.github/workflows/build.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    name: Build Rust ${{ matrix.rust }} on ${{ matrix.os }}, release=${{ matrix.release }}
+    name: Build Rust ${{ matrix.rust }} on ${{ matrix.os }}, release=${{ matrix.release }} features=${{ matrix.features }}
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ matrix.experimental }}
     strategy:
@@ -18,6 +18,7 @@ jobs:
         rust: [stable]
         release: [true, false]
         experimental: [false]
+        features: ["", "missing-pixi-permitted"]
         include:
           - os: ubuntu-20.04
             rust: nightly
@@ -54,12 +55,12 @@ jobs:
 
     - name: Test (release)
       shell: bash
-      run: rustup run ${{ matrix.rust }} cargo test --all --verbose --release
+      run: rustup run ${{ matrix.rust }} cargo test --all --features "${{ matrix.features }}" --verbose --release
       if: matrix.release
 
     - name: Test (debug)
       shell: bash
-      run: rustup run ${{ matrix.rust }} cargo test --all --verbose
+      run: rustup run ${{ matrix.rust }} cargo test --all --features "${{ matrix.features }}" --verbose
       if: ${{ !matrix.release }}
 
     - name: Doc (release)

mp4parse/Cargo.toml

@@ -40,6 +40,7 @@ walkdir = "2.3.1"
 criterion = "0.3"
 
 [features]
+missing-pixi-permitted = []
 3gpp = []
 meta-xml = []
 unstable-api = []

mp4parse/src/lib.rs

@@ -1710,8 +1710,16 @@ pub fn read_avif<T: Read>(f: &mut T, strictness: ParseStrictness) -> Result<Avif
             .map_or(false, |opt| opt.is_some())
     };
     if !has_pixi(primary_item_id) || !alpha_item_id.map_or(true, has_pixi) {
+        // The requirement to include pixi is in the process of being changed
+        // to allowing its omission to imply a default value. In anticipation
+        // of that, only give an error in strict mode
+        // See https://github.com/MPEGGroup/MIAF/issues/9
         fail_if(
-            strictness != ParseStrictness::Permissive,
+            if cfg!(feature = "missing-pixi-permitted") {
+                strictness == ParseStrictness::Strict
+            } else {
+                strictness != ParseStrictness::Permissive
+            },
             "The pixel information property shall be associated with every image \
              that is displayable (not hidden) \
              per MIAF (ISO/IEC 23000-22:2019) specification § 7.3.6.6",

mp4parse/tests/public.rs

@@ -923,8 +923,14 @@ fn public_avif_pixi_present_for_displayable_images() {
     let expected_msg = "The pixel information property shall be associated with every image \
                         that is displayable (not hidden) \
                         per MIAF (ISO/IEC 23000-22:2019) specification § 7.3.6.6";
-    assert_avif_shall(IMAGE_AVIF_NO_PIXI, expected_msg);
-    assert_avif_shall(IMAGE_AVIF_NO_ALPHA_PIXI, expected_msg);
+    let pixi_test = if cfg!(feature = "missing-pixi-permitted") {
+        assert_avif_should
+    } else {
+        assert_avif_shall
+    };
+
+    pixi_test(IMAGE_AVIF_NO_PIXI, expected_msg);
+    pixi_test(IMAGE_AVIF_NO_ALPHA_PIXI, expected_msg);
 }
 
 #[test]

mp4parse_capi/Cargo.toml

@@ -34,6 +34,7 @@ num-traits = "0.2.14"
 env_logger = "0.8"
 
 [features]
+missing-pixi-permitted = ["mp4parse/missing-pixi-permitted"]
 3gpp = ["mp4parse/3gpp"]
 meta-xml = ["mp4parse/meta-xml"]
 mp4v = ["mp4parse/mp4v"]