From d98fbcfe2a954eb4ade9492f3780ede25145d811 Mon Sep 17 00:00:00 2001
From: Johnson Ding <johnson.ding@rock-chips.com>
Date: Wed, 13 Jul 2022 14:34:53 +0800
Subject: [PATCH] [mpp]: Activate AVS2 decoder

Change-Id: I7fb596b050c1791b046f6c2179e8775a8b3df068
Signed-off-by: Johnson Ding <johnson.ding@rock-chips.com>
---
 mpp/codec/mpp_parser.cpp | 4 ++++
 mpp/hal/mpp_hal.cpp      | 4 ++++
 mpp/mpi.cpp              | 3 +++
 3 files changed, 11 insertions(+)

diff --git a/mpp/codec/mpp_parser.cpp b/mpp/codec/mpp_parser.cpp
index cfd69d1a..4825156c 100644
--- a/mpp/codec/mpp_parser.cpp
+++ b/mpp/codec/mpp_parser.cpp
@@ -29,6 +29,7 @@
 #include "h265d_api.h"
 #include "vp9d_api.h"
 #include "avsd_api.h"
+#include "avs2d_api.h"
 #include "m2vd_api.h"
 #include "mpg4d_api.h"
 #include "vp8d_api.h"
@@ -45,6 +46,9 @@ static const ParserApi *parsers[] = {
 #if HAVE_AVSD
     &api_avsd_parser,
 #endif
+#if HAVE_AVS2D
+    &api_avs2d_parser,
+#endif
 #if HAVE_H263D
     &api_h263d_parser,
 #endif
diff --git a/mpp/hal/mpp_hal.cpp b/mpp/hal/mpp_hal.cpp
index c88ec99b..cda9024a 100644
--- a/mpp/hal/mpp_hal.cpp
+++ b/mpp/hal/mpp_hal.cpp
@@ -30,6 +30,7 @@
 #include "hal_vp8d_api.h"
 #include "hal_vp9d_api.h"
 #include "hal_avsd_api.h"
+#include "hal_avs2d_api.h"
 #include "hal_m2vd_api.h"
 #include "hal_mpg4d_api.h"
 #include "hal_jpegd_api.h"
@@ -46,6 +47,9 @@ static const MppHalApi *hw_apis[] = {
 #if HAVE_AVSD
     &hal_api_avsd,
 #endif
+#if HAVE_AVS2D
+    &hal_api_avs2d,
+#endif
 #if HAVE_H263D
     &hal_api_h263d,
 #endif
diff --git a/mpp/mpi.cpp b/mpp/mpi.cpp
index ad6a17aa..219a241b 100644
--- a/mpp/mpi.cpp
+++ b/mpp/mpi.cpp
@@ -62,6 +62,9 @@ static MppCodingTypeInfo support_list[] = {
 #if HAVE_AVSD
     {   MPP_CTX_DEC,    MPP_VIDEO_CodingAVSPLUS,    "dec",  "avs+",         },
 #endif
+#if HAVE_AVS2D
+    {   MPP_CTX_DEC,    MPP_VIDEO_CodingAVS2,       "dec",  "avs2",         },
+#endif
 #if HAVE_JPEGD
     {   MPP_CTX_DEC,    MPP_VIDEO_CodingMJPEG,      "dec",  "jpeg",         },
 #endif