From bf6db5732ceb76bb2cca107ef297ad0104987a96 Mon Sep 17 00:00:00 2001 From: Fei Wang Date: Wed, 2 Sep 2020 15:31:28 +0800 Subject: [PATCH] avcodec/cbs_av1: add missing frame restoration type enum values Signed-off-by: Fei Wang Signed-off-by: James Almer --- libavcodec/av1.h | 8 ++++++++ libavcodec/cbs_av1_syntax_template.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libavcodec/av1.h b/libavcodec/av1.h index 6c0e32485b..0f99ae4829 100644 --- 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 2d2e240e3e..bcaa334134 100644 --- 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;