avcodec/cbs_av1: add missing frame restoration type enum values

Signed-off-by: Fei Wang <fei.w.wang@intel.com>
Signed-off-by: James Almer <jamrial@gmail.com>

diff --git a/libavcodec/av1.h b/libavcodec/av1.h
index 6c0e32485bf3b77fa272042264de59803e2b80f0..0f99ae4829d99e1e6ad4e8d5df226c18b509e538 100644 (file)
--- a/libavcodec/av1.h
+++ b/libavcodec/av1.h
@@ -160,4 +160,12 @@ enum {
     AV1_SCALABILITY_L4T7_KEY_SHIFT = 28,
 };
 
+// Frame Restoration types (section 6.10.15)
+enum {
+    AV1_RESTORE_NONE       = 0,
+    AV1_RESTORE_WIENER     = 1,
+    AV1_RESTORE_SGRPROJ    = 2,
+    AV1_RESTORE_SWITCHABLE = 3,
+};
+
 #endif /* AVCODEC_AV1_H */

diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c
index 2d2e240e3e588e2a95d066e3377700fb5b064c35..bcaa334134e2a408c68f037943263c613d40e3dd 100644 (file)
--- a/libavcodec/cbs_av1_syntax_template.c
+++ b/libavcodec/cbs_av1_syntax_template.c
@@ -940,7 +940,7 @@ static int FUNC(lr_params)(CodedBitstreamContext *ctx, RWContext *rw,
     for (i = 0; i < priv->num_planes; i++) {
         fbs(2, lr_type[i], 1, i);
 
-        if (current->lr_type[i] != 0) {
+        if (current->lr_type[i] != AV1_RESTORE_NONE) {
             uses_lr = 1;
             if (i > 0)
                 uses_chroma_lr = 1;