Bump the decoder versions

And fix the code to use aom-2.0.

Author: lu-zero

.github/workflows/rav1e.yml

@@ -118,17 +118,17 @@ jobs:
         matrix.conf == '1.36.0-tests' || matrix.conf == 'aom-tests' ||
         matrix.conf == 'grcov-coveralls'
       env:
-        LINK: http://ppa.launchpad.net/jonathonf/ffmpeg-4/ubuntu/pool/main/a/aom
-        AOM_VERSION: 1.0.0.errata1-3~18.04.york0
+        LINK: http://www.deb-multimedia.org/pool/main/a/aom-dmo/
+        AOM_VERSION: 2.0.0-dmo1
         AOM_DEV_SHA256: >-
-          93e6f64f33722cf9c80a920b3d722713869793e5e1438c05ff9331791728ca90
+          3a151112c942cef784c4010e6ab72761b40eb9573a3f5d223aa83f33c908ad9a
         AOM_LIB_SHA256: >-
-          e1ff5093f077685e4e45ce74264f9ee7ccda4634be58e401ac180b73f4232b63
+          a9080e8e3d043d7b435e6636be997421c5bb39c626772478bacf23a2cc648bd5
       run: |
         echo "$LINK/libaom-dev_${AOM_VERSION}_amd64.deb" >> DEBS
-        echo "$LINK/libaom0_${AOM_VERSION}_amd64.deb" >> DEBS
+        echo "$LINK/libaom2_${AOM_VERSION}_amd64.deb" >> DEBS
         echo "$AOM_DEV_SHA256 libaom-dev_${AOM_VERSION}_amd64.deb" >> CHECKSUMS
-        echo "$AOM_LIB_SHA256 libaom0_${AOM_VERSION}_amd64.deb" >> CHECKSUMS
+        echo "$AOM_LIB_SHA256 libaom2_${AOM_VERSION}_amd64.deb" >> CHECKSUMS
     - name: Add dav1d
       if: >
         matrix.conf == '1.36.0-tests' || matrix.conf == 'dav1d-tests' ||

Cargo.toml

@@ -65,8 +65,8 @@ num-derive = "0.3"
 paste = "0.1"
 noop_proc_macro = "0.2.0"
 serde = { version = "1.0", features = ["derive"], optional = true }
-dav1d-sys = { version = "0.3.1", optional = true }
-aom-sys = { version = "0.1.4", optional = true }
+dav1d-sys = { version = "0.3.2", optional = true }
+aom-sys = { version = "0.2.0", optional = true }
 scan_fmt = { version = "0.2.3", optional = true, default-features = false }
 ivf = { version = "0.1", path = "ivf/", optional = true }
 v_frame = { version = "0.1", path = "v_frame/" }

src/test_encode_decode/aom.rs

@@ -31,7 +31,6 @@ impl<T: Pixel> TestDecoder<T> for AomDecoder<T> {
         w: w as u32,
         h: h as u32,
         allow_lowbitdepth: 1,
-        cfg: cfg_options { ext_partition: 1 },
       };
 
       let mut dec = MaybeUninit::uninit();
@@ -91,7 +90,7 @@ impl<T: Pixel> TestDecoder<T> for AomDecoder<T> {
             return DecodeResult::Done;
           }
           let mut corrupted = 0;
-          let ret = aom_codec_control_(
+          let ret = aom_codec_control(
             &mut self.dec,
             aom_dec_control_id::AOMD_GET_FRAME_CORRUPTED as i32,
             &mut corrupted,