diff --git a/hdf_interfaces/distributed_audio/audio/v1_0/BUILD.gn b/hdf_interfaces/distributed_audio/audio/v1_0/BUILD.gn
index 05f1c7e2f3b5a8eaa00919fd932e900d43823213..333eb2161c47519c655cc4698aeb70904a4ba81b 100644
--- a/hdf_interfaces/distributed_audio/audio/v1_0/BUILD.gn
+++ b/hdf_interfaces/distributed_audio/audio/v1_0/BUILD.gn
@@ -24,6 +24,6 @@ hdi("daudio") {
   ]
   language = "cpp"
   root = "ohos.hdi://foundation/distributedhardware/distributed_audio/hdf_interfaces/"
-  subsystem_name = "distributedhardware"
+  subsystem_name = "hdf"
   part_name = "drivers_interface_distributed_audio"
 }
diff --git a/hdf_interfaces/distributed_audio/audioext/v1_0/BUILD.gn b/hdf_interfaces/distributed_audio/audioext/v1_0/BUILD.gn
index 7c8160df54e5aa0139ef663746e39d69fa7d25e0..22a30fba844e41d93103da71e304a69cd99b38c4 100644
--- a/hdf_interfaces/distributed_audio/audioext/v1_0/BUILD.gn
+++ b/hdf_interfaces/distributed_audio/audioext/v1_0/BUILD.gn
@@ -21,6 +21,6 @@ hdi("daudioext") {
   ]
   language = "cpp"
   root = "ohos.hdi://foundation/distributedhardware/distributed_audio/hdf_interfaces/"
-  subsystem_name = "distributedhardware"
+  subsystem_name = "hdf"
   part_name = "drivers_interface_distributed_audio"
 }
diff --git a/services/audiohdiproxy/include/idaudio_hdi_callback.h b/services/audiohdiproxy/include/idaudio_hdi_callback.h
index bf31d81fe43731a6a96821edf24a14ce776ea25c..2502031a62f29fbae5f597c666482066072be5b6 100644
--- a/services/audiohdiproxy/include/idaudio_hdi_callback.h
+++ b/services/audiohdiproxy/include/idaudio_hdi_callback.h
@@ -39,7 +39,7 @@ public:
     virtual int32_t ReadStreamData(const std::string &devId, const int32_t dhId, std::shared_ptr<AudioData> &data) = 0;
 
     virtual int32_t ReadMmapPosition(const std::string &devId, const int32_t dhId,
-        uint64_t frames, CurrentTimeHDF &time) = 0;
+        uint64_t &frames, CurrentTimeHDF &time) = 0;
 
     virtual int32_t RefreshAshmemInfo(const std::string &devId, const int32_t dhId,
         int32_t fd, int32_t ashmemLength, int32_t lengthPerTrans) = 0;
diff --git a/services/audiohdiproxy/test/unittest/daudio_hdi_handler/include/audio_test_utils.h b/services/audiohdiproxy/test/unittest/daudio_hdi_handler/include/audio_test_utils.h
index 7e99332d8ee10c9767895be4c31d31052c3cbd2b..8a4e8c2c6991c2dd2b6d29bb4ad39417c169949c 100644
--- a/services/audiohdiproxy/test/unittest/daudio_hdi_handler/include/audio_test_utils.h
+++ b/services/audiohdiproxy/test/unittest/daudio_hdi_handler/include/audio_test_utils.h
@@ -86,7 +86,7 @@ public:
     }
 
     int32_t ReadMmapPosition(const std::string &devId, const int32_t dhId,
-        uint64_t frames, CurrentTimeHDF &time)
+        uint64_t &frames, CurrentTimeHDF &time)
     {
         return DH_SUCCESS;
     }
diff --git a/services/audiohdiproxy/test/unittest/daudio_manager_callback/include/audio_test_utils.h b/services/audiohdiproxy/test/unittest/daudio_manager_callback/include/audio_test_utils.h
index 50deca2d75b77e22e59152026b0ca3fc2ce4d594..ff79cb6f7853d5c6bf560fefc58b16f645630c04 100644
--- a/services/audiohdiproxy/test/unittest/daudio_manager_callback/include/audio_test_utils.h
+++ b/services/audiohdiproxy/test/unittest/daudio_manager_callback/include/audio_test_utils.h
@@ -59,7 +59,7 @@ public:
     }
 
     int32_t ReadMmapPosition(const std::string &devId, const int32_t dhId,
-        uint64_t frames, CurrentTimeHDF &time)
+        uint64_t &frames, CurrentTimeHDF &time)
     {
         return DH_SUCCESS;
     }
diff --git a/services/audiomanager/managersource/include/dmic_dev.h b/services/audiomanager/managersource/include/dmic_dev.h
index 9430e029173181a16b29d9795fc395a650a2d48b..3c328b4d3fe560c8d7fc1d8c7416cca5fad7655a 100644
--- a/services/audiomanager/managersource/include/dmic_dev.h
+++ b/services/audiomanager/managersource/include/dmic_dev.h
@@ -52,7 +52,7 @@ public:
     int32_t ReadStreamData(const std::string &devId, const int32_t dhId, std::shared_ptr<AudioData> &data) override;
     int32_t NotifyEvent(const std::string &devId, const int32_t dhId, const AudioEvent &event) override;
     int32_t ReadMmapPosition(const std::string &devId, const int32_t dhId,
-        uint64_t frames, CurrentTimeHDF &time) override;
+        uint64_t &frames, CurrentTimeHDF &time) override;
     int32_t RefreshAshmemInfo(const std::string &devId, const int32_t dhId,
         int32_t fd, int32_t ashmemLength, int32_t lengthPerTrans) override;
     int32_t MmapStart();
diff --git a/services/audiomanager/managersource/include/dspeaker_dev.h b/services/audiomanager/managersource/include/dspeaker_dev.h
index 4996c251152a3dff96d48bb10d59110cbc11eed3..401d37cf989f6d23ff30fde993f692272527aa86 100644
--- a/services/audiomanager/managersource/include/dspeaker_dev.h
+++ b/services/audiomanager/managersource/include/dspeaker_dev.h
@@ -51,7 +51,7 @@ public:
     int32_t ReadStreamData(const std::string &devId, const int32_t dhId, std::shared_ptr<AudioData> &data) override;
     int32_t NotifyEvent(const std::string &devId, const int32_t dhId, const AudioEvent &event) override;
     int32_t ReadMmapPosition(const std::string &devId, const int32_t dhId,
-        uint64_t frames, CurrentTimeHDF &time) override;
+        uint64_t &frames, CurrentTimeHDF &time) override;
     int32_t RefreshAshmemInfo(const std::string &devId, const int32_t dhId,
         int32_t fd, int32_t ashmemLength, int32_t lengthPerTrans) override;
     int32_t MmapStart();
diff --git a/services/audiomanager/managersource/src/dmic_dev.cpp b/services/audiomanager/managersource/src/dmic_dev.cpp
index d07286f41f76e5c5a7abc6cd6ca653d7ea9e7d39..2863579cdd340a9219255159b6d814fc676a1b96 100644
--- a/services/audiomanager/managersource/src/dmic_dev.cpp
+++ b/services/audiomanager/managersource/src/dmic_dev.cpp
@@ -296,7 +296,7 @@ int32_t DMicDev::ReadStreamData(const std::string &devId, const int32_t dhId, st
 }
 
 int32_t DMicDev::ReadMmapPosition(const std::string &devId, const int32_t dhId,
-    uint64_t frames, CurrentTimeHDF &time)
+    uint64_t &frames, CurrentTimeHDF &time)
 {
     DHLOGI("Read mmap position. frames: %lu, tvsec: %lu, tvNSec:%lu",
         writeNum_, writeTvSec_, writeTvNSec_);
diff --git a/services/audiomanager/managersource/src/dspeaker_dev.cpp b/services/audiomanager/managersource/src/dspeaker_dev.cpp
index 2876e7a56f790bbd3d89827c35a241addb205c8a..b963cd0b0eaf84fd2c9b2c3b102eb376b5eda079 100644
--- a/services/audiomanager/managersource/src/dspeaker_dev.cpp
+++ b/services/audiomanager/managersource/src/dspeaker_dev.cpp
@@ -311,7 +311,7 @@ int32_t DSpeakerDev::WriteStreamData(const std::string &devId, const int32_t dhI
 }
 
 int32_t DSpeakerDev::ReadMmapPosition(const std::string &devId, const int32_t dhId,
-    uint64_t frames, CurrentTimeHDF &time)
+    uint64_t &frames, CurrentTimeHDF &time)
 {
     DHLOGI("Read mmap position. frames: %lu, tvsec: %lu, tvNSec:%lu",
         readNum_, readTvSec_, readTvNSec_);
diff --git a/services/audiomanager/test/unittest/BUILD.gn b/services/audiomanager/test/unittest/BUILD.gn
index e9e5589c85afd17ab345609b747a44b7183be0e5..38dae039bd2590080e439ad30389ba2b02bb1c57 100644
--- a/services/audiomanager/test/unittest/BUILD.gn
+++ b/services/audiomanager/test/unittest/BUILD.gn
@@ -22,7 +22,7 @@ group("daudio_manager_test") {
     "${services_path}/audiomanager/test/unittest/managersink:manager_sink_test",
     "${services_path}/audiomanager/test/unittest/servicesink:DaudioSinkServiceTest",
     "${services_path}/audiomanager/test/unittest/servicesource:DaudioSourceServiceTest",
-    "${services_path}/audiomanager/test/unittest/source_device:daudio_source_dev_test",
+    "${services_path}/audiomanager/test/unittest/sourcedevice:daudio_source_dev_test",
     "${services_path}/audiomanager/test/unittest/sourcemanager:daudio_source_mgr_test",
     "${services_path}/common/test/unittest/audiodata:audio_data_test",
   ]
diff --git a/services/audiomanager/test/unittest/source_device/BUILD.gn b/services/audiomanager/test/unittest/sourcedevice/BUILD.gn
similarity index 100%
rename from services/audiomanager/test/unittest/source_device/BUILD.gn
rename to services/audiomanager/test/unittest/sourcedevice/BUILD.gn
diff --git a/services/audiomanager/test/unittest/source_device/include/daudio_source_dev_test.h b/services/audiomanager/test/unittest/sourcedevice/include/daudio_source_dev_test.h
similarity index 100%
rename from services/audiomanager/test/unittest/source_device/include/daudio_source_dev_test.h
rename to services/audiomanager/test/unittest/sourcedevice/include/daudio_source_dev_test.h
diff --git a/services/audiomanager/test/unittest/source_device/include/dmic_dev_test.h b/services/audiomanager/test/unittest/sourcedevice/include/dmic_dev_test.h
similarity index 100%
rename from services/audiomanager/test/unittest/source_device/include/dmic_dev_test.h
rename to services/audiomanager/test/unittest/sourcedevice/include/dmic_dev_test.h
diff --git a/services/audiomanager/test/unittest/source_device/include/dspeaker_dev_test.h b/services/audiomanager/test/unittest/sourcedevice/include/dspeaker_dev_test.h
similarity index 100%
rename from services/audiomanager/test/unittest/source_device/include/dspeaker_dev_test.h
rename to services/audiomanager/test/unittest/sourcedevice/include/dspeaker_dev_test.h
diff --git a/services/audiomanager/test/unittest/source_device/src/daudio_source_dev_test.cpp b/services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp
similarity index 100%
rename from services/audiomanager/test/unittest/source_device/src/daudio_source_dev_test.cpp
rename to services/audiomanager/test/unittest/sourcedevice/src/daudio_source_dev_test.cpp
diff --git a/services/audiomanager/test/unittest/source_device/src/dmic_dev_test.cpp b/services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp
similarity index 100%
rename from services/audiomanager/test/unittest/source_device/src/dmic_dev_test.cpp
rename to services/audiomanager/test/unittest/sourcedevice/src/dmic_dev_test.cpp
diff --git a/services/audiomanager/test/unittest/source_device/src/dspeaker_dev_test.cpp b/services/audiomanager/test/unittest/sourcedevice/src/dspeaker_dev_test.cpp
similarity index 100%
rename from services/audiomanager/test/unittest/source_device/src/dspeaker_dev_test.cpp
rename to services/audiomanager/test/unittest/sourcedevice/src/dspeaker_dev_test.cpp