From 45a86b53042f1b5638538204ca9d954ed23a6b18 Mon Sep 17 00:00:00 2001
From: Yushin Cho <ycho@mozilla.com>
Date: Wed, 18 Jul 2018 15:45:19 -0400
Subject: [PATCH] Enable Scalability
---
README.md | 2 +-
build.rs | 1 +
src/lib.rs | 2 ++
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index b24e4dd7..0eb36a09 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ cargo run --release --bin rav1e -- input.y4m -o output.ivf
```
mkdir aom_test
cd aom_test
-cmake ../aom_build/aom -DAOM_TARGET_CPU=generic -DCONFIG_AV1_ENCODER=0 -DCONFIG_UNIT_TESTS=0 -DENABLE_DOCS=0 -DCONFIG_EXT_PARTITION_TYPES=0 -DCONFIG_INTRA_EDGE2=0 -DCONFIG_KF_CTX=0 -DCONFIG_OBU=1 -DCONFIG_FILTER_INTRA=1 -DCONFIG_MONO_VIDEO=1 -DCONFIG_Q_ADAPT_PROBS=1 -DCONFIG_SCALABILITY=0 -DCONFIG_OBU_SIZING=1 -DCONFIG_TIMING_INFO_IN_SEQ_HEADERS=0 -DCONFIG_FILM_GRAIN=0
+cmake ../aom_build/aom -DAOM_TARGET_CPU=generic -DCONFIG_AV1_ENCODER=0 -DCONFIG_UNIT_TESTS=0 -DENABLE_DOCS=0 -DCONFIG_EXT_PARTITION_TYPES=0 -DCONFIG_INTRA_EDGE2=0 -DCONFIG_OBU=1 -DCONFIG_FILTER_INTRA=1 -DCONFIG_MONO_VIDEO=1 -DCONFIG_Q_ADAPT_PROBS=1 -DCONFIG_SCALABILITY=1 -DCONFIG_OBU_SIZING=1 -DCONFIG_TIMING_INFO_IN_SEQ_HEADERS=0 -DCONFIG_FILM_GRAIN=0
make -j8
./aomdec ../output.ivf -o output.y4m
```
diff --git a/build.rs b/build.rs
index f91b81b9..c916d261 100644
--- a/build.rs
+++ b/build.rs
@@ -47,6 +47,7 @@ fn main() {
.define("CONFIG_ANALYZER", "0")
.define("CONFIG_Q_ADAPT_PROBS", "1")
.define("CONFIG_INTRA_EDGE", "0")
+ .define("CONFIG_SCALABILITY", "1")
.define("ENABLE_DOCS", "0")
.build();
diff --git a/src/lib.rs b/src/lib.rs
index 97b47320..4e335436 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -558,6 +558,8 @@ impl<'a> UncompressedHeader for BitWriter<'a, BE> {
//self.write(1, 0)?; // reduced_still_picture
self.write(4, 0)?; // level
+ self.write(2, 0)?; // # of enhancement_layers = 0
+
if seq.reduced_still_picture_hdr {
assert!(false);
} else {
--
GitLab