Merge branch 'master' into scene-detection

Author: vibhoothi

.github/workflows/rav1e.yml

@@ -123,17 +123,33 @@ jobs:
         run: |
           echo "$LINK/nasm_${NASM_VERSION}_amd64.deb" >> DEBS
           echo "$NASM_SHA256 nasm_${NASM_VERSION}_amd64.deb" >> CHECKSUMS
+      - name: Add libvmaf
+        if: >
+          matrix.conf == '1.51.0-tests' || matrix.conf == 'aom-tests' ||
+          matrix.conf == 'grcov-coveralls'
+        env:
+          LINK: https://www.deb-multimedia.org/pool/main/v/vmaf-dmo
+          LIBVMAF_VERSION: 2.1.1-dmo0~bpo10+3
+          LIBVMAF_SHA256: >-
+            d9c2e708399af37cac52090453aadf8ad4311c3ed40addf02c3158c7f7a705a6
+          LIBVMAF_DEV_SHA256: >-
+            957a21b4a4b3cea4b27ab068fc41e85776d19c69fbede949b6eecd9631aa697f
+        run: |
+          echo "$LINK/libvmaf1_${LIBVMAF_VERSION}_amd64.deb" >> DEBS
+          echo "$LINK/libvmaf-dev_${LIBVMAF_VERSION}_amd64.deb" >> DEBS
+          echo "$LIBVMAF_SHA256 libvmaf1_${LIBVMAF_VERSION}_amd64.deb" >> CHECKSUMS
+          echo "$LIBVMAF_DEV_SHA256 libvmaf-dev_${LIBVMAF_VERSION}_amd64.deb" >> CHECKSUMS
       - name: Add aom
         if: >
           matrix.conf == '1.51.0-tests' || matrix.conf == 'aom-tests' ||
           matrix.conf == 'grcov-coveralls'
         env:
           LINK: https://www.deb-multimedia.org/pool/main/a/aom-dmo
-          AOM_VERSION: 3.1.0-dmo0~bpo10+1
+          AOM_VERSION: 3.1.1-dmo0~bpo10+2
           AOM_DEV_SHA256: >-
-            1a78ad10714c0cd9ed2324007369c20a5d9047d98e7098f932f48edb01056f36
+            881ec275a01169378e19c1779fec3fb5d4b80e1afe61d8b576a7c66419702a90
           AOM_LIB_SHA256: >-
-            a2e1f0a0ab1be6b93a1582d68b869d27e88c1fb8df7fae7bd793ebc0322c76a2
+            a2a75cda5eacbddad70c508a7113d0ba572aad29934bb31905773e9adb555413
         run: |
           echo "$LINK/libaom-dev_${AOM_VERSION}_amd64.deb" >> DEBS
           echo "$LINK/libaom3_${AOM_VERSION}_amd64.deb" >> DEBS

.travis/install-aom.sh

@@ -1,21 +1,29 @@
 #!/bin/bash
 set -ex
 
-AOM_VERSION="3.1.0-dmo0~bpo10+1"
+AOM_VERSION="3.1.1-dmo0~bpo10+1"
+LIBVMAF_VERSION="2.1.1-dmo0~bpo10+3"
 PKG_URL="https://www.deb-multimedia.org/pool/main/a/aom-dmo"
+LIBVMAF_URL="https://www.deb-multimedia.org/pool/main/v/vmaf-dmo"
 ARCH="arm64"
 
 cd "$DEPS_DIR"
 
-[ -f "libaom-dev_${AOM_VERSION}_${ARCH}.deb" ] &&
+[ -f "libvmaf-dev_${LIBVMAF_VERSION}_${ARCH}.deb" ] && [ -f "libvmaf1_${LIBVMAF_VERSION}_${ARCH}.deb" ] && [ -f "libaom-dev_${AOM_VERSION}_${ARCH}.deb" ] &&
 [ -f "libaom2_${AOM_VERSION}_${ARCH}.deb" ] ||
-curl -O "${PKG_URL}/libaom-dev_${AOM_VERSION}_${ARCH}.deb" \
+curl -O "${LIBVMAF_URL}/libvmaf1_${LIBVMAF_VERSION}_${ARCH}.deb" \
+     -O "${LIBVMAF_URL}/libvmaf-dev_${LIBVMAF_VERSION}_${ARCH}.deb" \
+     -O "${PKG_URL}/libaom-dev_${AOM_VERSION}_${ARCH}.deb" \
      -O "${PKG_URL}/libaom3_${AOM_VERSION}_${ARCH}.deb"
 
 sha256sum --check --ignore-missing <<EOF
-1846784bceba7d3c46c9672872c25292001aebd488a2035df49c9cae9a674c2a  libaom3_${AOM_VERSION}_${ARCH}.deb
-1c2e509cd7fbb30304c2311f46509a68ebf939adaf9f7fd81cdc466866d06c05  libaom-dev_${AOM_VERSION}_${ARCH}.deb
+fe9321dd8d5901ddf74e407c1b213243c357430a03fad17249ec4d07c3cf8e93  libaom3_${AOM_VERSION}_${ARCH}.deb
+f926f0af6db4faac5f9bd67051115ce3dfa4324ddb41647e773d17ff11fa8f3   libaom-dev_${AOM_VERSION}_${ARCH}.deb
+d9dd550ab3a296019333ced63b80d47743eacef072b17cad96a990f67f587a42  libvmaf1_${LIBVMAF_VERSION}_${ARCH}.deb
+ea706661c22df60005200608f54e29fc7f1cf41b47c1fc2def9df56dea10eac1  libvmaf-dev_${LIBVMAF_VERSION}_${ARCH}.deb
 EOF
 
-sudo dpkg -i "libaom3_${AOM_VERSION}_${ARCH}.deb" \
+sudo dpkg -i "libvmaf1_${LIBVMAF_VERSION}_${ARCH}.deb" \
+	     "libvmaf-dev_${LIBVMAF_VERSION}_${ARCH}.deb" \
+	     "libaom3_${AOM_VERSION}_${ARCH}.deb" \
              "libaom-dev_${AOM_VERSION}_${ARCH}.deb"

README.md

@@ -178,5 +178,4 @@ Find a full list in feature-table in [`Cargo.toml`](Cargo.toml)
 Please read our guide to [contributing to rav1e](CONTRIBUTING.md).
 
 ## Getting in Touch
-Come chat with us on the IRC channel #daala on Freenode! If you don't have IRC set
-up you can easily connect from your [web browser](http://webchat.freenode.net/?channels=%23daala).
+Come chat with us on the IRC channel #daala on [Libera.Chat](https://libera.chat/)! You can also use a [web client](https://web.libera.chat/?channel=#daala) to join with a web browser.

src/asm/x86/predict.rs

@@ -170,7 +170,7 @@ pub fn dispatch_predict_intra<T: Pixel>(
     let angle = angle as libc::c_int;
 
     match T::type_enum() {
-      PixelType::U8 => {
+      PixelType::U8 if cpu >= CpuFeatureLevel::SSSE3 => {
         let dst_ptr = dst.data_ptr_mut() as *mut _;
         let edge_ptr =
           edge_buf.data.as_ptr().offset(2 * MAX_TX_SIZE as isize) as *const _;

src/encoder.rs

@@ -1209,12 +1209,20 @@ pub fn encode_tx_block<T: Pixel, W: Writer>(
       residual,
       &ts.input_tile.planes[p].subregion(area),
       &rec.subregion(area),
-      visible_tx_w,
+      tx_size.width(),
       visible_tx_h,
     );
+    if visible_tx_w < tx_size.width() {
+      for row in residual.chunks_mut(tx_size.width()).take(visible_tx_h) {
+        for a in &mut row[visible_tx_w..] {
+          *a = 0;
+        }
+      }
+    }
   }
-  let visible_area = visible_tx_w * visible_tx_h;
-  for a in residual[visible_area..].iter_mut() {
+  let initialized_area =
+    if visible_tx_w == 0 { 0 } else { tx_size.width() * visible_tx_h };
+  for a in residual[initialized_area..].iter_mut() {
     *a = 0;
   }