From ec5606557ea99279c1aa934e762ba0f8c7249732 Mon Sep 17 00:00:00 2001
From: "xiaoxu.chen" <xiaoxu.chen@rock-chips.com>
Date: Tue, 9 Sep 2025 17:14:27 +0800
Subject: [PATCH] chore[mpp]: Delete mpp_enc_cfg_impl.h

Change-Id: Iee8dcf523d0d3018dd73b2b5da21b0a58736214f
Signed-off-by: xiaoxu.chen <xiaoxu.chen@rock-chips.com>
---
 kmpp/kmpp.c                       |  2 +-
 mpp/base/inc/mpp_enc_cfg_impl.h   | 13 -------------
 mpp/base/mpp_enc_cfg.c            |  2 +-
 mpp/base/test/mpp_enc_cfg_test.c  |  2 +-
 mpp/codec/enc/h264/h264e_api_v2.c |  3 ++-
 mpp/codec/enc/h265/h265e_api.c    |  3 ++-
 mpp/codec/enc/jpeg/jpege_api_v2.c |  2 +-
 mpp/codec/enc/vp8/vp8e_api_v2.c   |  2 +-
 mpp/codec/inc/mpp_enc_impl.h      |  3 +++
 mpp/codec/mpp_enc_impl.c          |  2 +-
 mpp/codec/mpp_enc_v2.c            |  2 +-
 11 files changed, 14 insertions(+), 22 deletions(-)
 delete mode 100644 mpp/base/inc/mpp_enc_cfg_impl.h

diff --git a/kmpp/kmpp.c b/kmpp/kmpp.c
index 7f3c7a13..be227e21 100644
--- a/kmpp/kmpp.c
+++ b/kmpp/kmpp.c
@@ -31,7 +31,7 @@
 #include "mpp_packet_impl.h"
 #include "kmpp_packet.h"
 #include "mpp_vcodec_client.h"
-#include "mpp_enc_cfg_impl.h"
+#include "mpp_enc_cfg.h"
 
 typedef struct KmppFrameInfos_t {
     RK_U32  width;
diff --git a/mpp/base/inc/mpp_enc_cfg_impl.h b/mpp/base/inc/mpp_enc_cfg_impl.h
deleted file mode 100644
index 616c0bc1..00000000
--- a/mpp/base/inc/mpp_enc_cfg_impl.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0 OR MIT */
-/*
- * Copyright (c) 2015 Rockchip Electronics Co., Ltd.
- */
-
-#ifndef __MPP_ENC_CFG_IMPL_H__
-#define __MPP_ENC_CFG_IMPL_H__
-
-#include "mpp_enc_cfg.h"
-
-extern RK_U8 uuid_refresh_cfg[16];
-
-#endif /*__MPP_ENC_CFG_IMPL_H__*/
diff --git a/mpp/base/mpp_enc_cfg.c b/mpp/base/mpp_enc_cfg.c
index 4b4d713d..415ef29a 100644
--- a/mpp/base/mpp_enc_cfg.c
+++ b/mpp/base/mpp_enc_cfg.c
@@ -19,7 +19,7 @@
 
 #include "mpp_cfg.h"
 #include "mpp_trie.h"
-#include "mpp_enc_cfg_impl.h"
+#include "mpp_enc_cfg.h"
 
 #define ENC_CFG_DBG_FUNC            (0x00000001)
 #define ENC_CFG_DBG_INFO            (0x00000002)
diff --git a/mpp/base/test/mpp_enc_cfg_test.c b/mpp/base/test/mpp_enc_cfg_test.c
index 97757353..d53815d8 100644
--- a/mpp/base/test/mpp_enc_cfg_test.c
+++ b/mpp/base/test/mpp_enc_cfg_test.c
@@ -11,7 +11,7 @@
 #include "mpp_common.h"
 
 #include "rk_venc_cfg.h"
-#include "mpp_enc_cfg_impl.h"
+#include "mpp_enc_cfg.h"
 
 int main()
 {
diff --git a/mpp/codec/enc/h264/h264e_api_v2.c b/mpp/codec/enc/h264/h264e_api_v2.c
index 3cec4e95..cd907254 100644
--- a/mpp/codec/enc/h264/h264e_api_v2.c
+++ b/mpp/codec/enc/h264/h264e_api_v2.c
@@ -39,7 +39,8 @@
 #include "mpp_soc.h"
 
 #include "enc_impl_api.h"
-#include "mpp_enc_cfg_impl.h"
+#include "mpp_enc_cfg.h"
+#include "mpp_enc_impl.h"
 
 RK_U32 h264e_debug = 0;
 
diff --git a/mpp/codec/enc/h265/h265e_api.c b/mpp/codec/enc/h265/h265e_api.c
index 0958a036..d2d095b0 100644
--- a/mpp/codec/enc/h265/h265e_api.c
+++ b/mpp/codec/enc/h265/h265e_api.c
@@ -24,8 +24,9 @@
 
 #include "rc.h"
 #include "mpp_soc.h"
-#include "mpp_enc_cfg_impl.h"
+#include "mpp_enc_cfg.h"
 #include "mpp_packet_impl.h"
+#include "mpp_enc_impl.h"
 
 #include "h265e_api.h"
 #include "h265e_slice.h"
diff --git a/mpp/codec/enc/jpeg/jpege_api_v2.c b/mpp/codec/enc/jpeg/jpege_api_v2.c
index 18588f00..13513613 100644
--- a/mpp/codec/enc/jpeg/jpege_api_v2.c
+++ b/mpp/codec/enc/jpeg/jpege_api_v2.c
@@ -23,7 +23,7 @@
 #include "mpp_mem.h"
 #include "mpp_common.h"
 #include "mpp_2str.h"
-#include "mpp_enc_cfg_impl.h"
+#include "mpp_enc_cfg.h"
 #include "mpp_bitwrite.h"
 #include "mpp_soc.h"
 
diff --git a/mpp/codec/enc/vp8/vp8e_api_v2.c b/mpp/codec/enc/vp8/vp8e_api_v2.c
index 6c72788c..004ba755 100644
--- a/mpp/codec/enc/vp8/vp8e_api_v2.c
+++ b/mpp/codec/enc/vp8/vp8e_api_v2.c
@@ -23,7 +23,7 @@
 #include "mpp_debug.h"
 #include "mpp_common.h"
 #include "mpp_rc.h"
-#include "mpp_enc_cfg_impl.h"
+#include "mpp_enc_cfg.h"
 
 #include "vp8e_api_v2.h"
 #include "vp8e_syntax.h"
diff --git a/mpp/codec/inc/mpp_enc_impl.h b/mpp/codec/inc/mpp_enc_impl.h
index 1280ea01..ed8a95a7 100644
--- a/mpp/codec/inc/mpp_enc_impl.h
+++ b/mpp/codec/inc/mpp_enc_impl.h
@@ -22,6 +22,7 @@
 #include "mpp_enc_ref.h"
 #include "mpp_enc_refs.h"
 #include "mpp_device.h"
+#include "mpp_task_impl.h"
 
 #include "rc.h"
 #include "hal_info.h"
@@ -151,6 +152,8 @@ typedef struct MppEncImpl_t {
     MppEncCfgSet        *cfg;
 } MppEncImpl;
 
+extern RK_U8 uuid_refresh_cfg[16];
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/mpp/codec/mpp_enc_impl.c b/mpp/codec/mpp_enc_impl.c
index 3e24ef30..48482a8f 100644
--- a/mpp/codec/mpp_enc_impl.c
+++ b/mpp/codec/mpp_enc_impl.c
@@ -22,7 +22,7 @@
 #include "mpp.h"
 #include "mpp_soc.h"
 #include "mpp_enc_debug.h"
-#include "mpp_enc_cfg_impl.h"
+#include "mpp_enc_cfg.h"
 #include "mpp_enc_impl.h"
 #include "mpp_enc_cb_param.h"
 
diff --git a/mpp/codec/mpp_enc_v2.c b/mpp/codec/mpp_enc_v2.c
index 6a55404e..c92f3984 100644
--- a/mpp/codec/mpp_enc_v2.c
+++ b/mpp/codec/mpp_enc_v2.c
@@ -15,7 +15,7 @@
 
 #include "mpp.h"
 #include "mpp_enc_debug.h"
-#include "mpp_enc_cfg_impl.h"
+#include "mpp_enc_cfg.h"
 #include "mpp_enc_impl.h"
 #include "mpp_enc_cb_param.h"