<zhaochen69@huawei.com>

Signed-off-by: Nz_apperception <zhaochen69@huawei.com>

build_lite/BUILD.gn

@@ -12,8 +12,8 @@
 # limitations under the License.
 
 import("//build/lite/config/subsystem/aafwk/config.gni")
-import("//test/xts/tools/lite/build/suite_lite.gni")
 import("//build/lite/config/test.gni")
+import("//test/xts/tools/lite/build/suite_lite.gni")
 
 lite_component("acts_component") {
   all_features = []
@@ -40,6 +40,7 @@ lite_component("acts_component") {
         "//test/xts/acts/iot_hardware_lite/iot_controller_hal:ActsWifiIotTest",
         "//test/xts/acts/kernel_lite/kernelcmsis_hal:ActsCMSISTest",
         "//test/xts/acts/utils_lite/kv_store_hal:ActsKvStoreTest",
+
         #"//test/xts/acts/security_lite/huks_hal:ActsSecurityDataTest",
         "//test/xts/acts/hiviewdfx_lite/hilog_hal:ActsDfxFuncTest",
         "//test/xts/acts/hiviewdfx_lite/hievent_hal:ActsHieventLiteTest",
@@ -59,7 +60,8 @@ lite_component("acts_component") {
         "//test/xts/acts/startup_lite/bootstrap_posix:ActsBootstrapTest",
         "//test/xts/acts/multimedia_lite/camera_lite_posix/camera_native:ActsMediaCameraTest",
         "//test/xts/acts/open_posix_testsuite/conformance/interfaces:ActsOpenPosixTest",
-        #"//test/xts/acts/multimedia_lite/media_lite_posix/player_native:ActsMediaPlayerTest",
+        "//test/xts/acts/multimedia_lite/media_lite_posix/player_native:ActsMediaPlayerTest",
+        "//test/xts/acts/multimedia_lite/media_lite_posix/audio_native:ActsMediaAudioTest",
         "//test/xts/acts/distributed_schedule_lite/system_ability_manager_posix:ActsSamgrTest",
 
         #"//test/xts/acts/distributedschedule_lite/distributed_schedule_posix:ActsDMSTest",
@@ -85,6 +87,7 @@ lite_component("acts_component") {
       all_features += [
         "//test/xts/acts/utils_lite/kv_store_posix:ActsKvStoreTest",
         "//test/xts/acts/startup_lite/syspara_posix:ActsParameterTest",
+
         #"//test/xts/acts/security_lite/huks_posix:ActsSecurityDataTest",
         #"//test/xts/acts/multimedia_lite/camera_lite_posix/camera_native:ActsMediaCameraTest",
         #"//test/xts/acts/multimedia_lite/media_lite_posix/player_native:ActsMediaPlayerTest",

multimedia_lite/media_lite_posix/audio_native/BUILD.gn

+#  Copyright (C) 2021 Huawei Device Co., Ltd.
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+
+import("//test/xts/tools/lite/build/suite_lite.gni")
+
+hcpptest_suite("ActsMediaAudioTest") {
+  suite_name = "acts"
+  sources = [ "src/ActsMediaAudioTest.cpp" ]
+  ldflags = [ "-lstdc++" ]
+  ldflags += [ "-lm" ]
+  if (ohos_kernel_type == "linux") {
+    ldflags += [ "-lpthread" ]
+  }
+  ldflags += [ "-Wl,-rpath-link=$ohos_root_path/$root_out_dir" ]
+
+  include_dirs = [
+    "src",
+    "//test/xts/acts/multimedia_lite/utils_posix/common/include",
+    "//foundation/multimedia/audio_lite/frameworks/audio_encoder/include",
+    "//foundation/multimedia/audio_lite/frameworks/audio_source/include",
+    "//foundation/multimedia/audio_lite/interfaces/kits",
+    "//foundation/multimedia/utils/lite/include",
+    "//drivers/peripheral/audio/interfaces/include",
+    "//drivers/peripheral/codec/interfaces/include",
+    "//drivers/peripheral/format/interfaces/include",
+    "//foundation/multimedia/audio_lite/test/unittest",
+  ]
+
+  deps = [
+    "//foundation/multimedia/audio_lite/frameworks:audio_capturer_lite",
+    "//foundation/multimedia/utils/lite:media_common",
+    "//third_party/bounds_checking_function:libsec_shared",
+  ]
+
+  cflags = [ "-Wno-error" ]
+}

multimedia_lite/media_lite_posix/audio_native/Test.json

+{
+    "description": "Config for hcpptest demo test cases",
+    "environment": [
+        {
+            "type": "device",
+            "label": "ipcamera"
+        }
+    ],
+    "kits": [
+        {
+            "type": "MountKit",
+            "server": "NfsServer",
+            "mount": [
+                {
+                    "source": "testcases/multimedia",
+                    "target": "/test_root/multimedia"
+                }
+            ]
+        }
+    ],
+    "driver": {
+        "type": "CppTestLite",
+        "execute": "/test_root/multimedia/ActsMediaAudioTest.bin"
+    }
+}
\ No newline at end of file

multimedia_lite/media_lite_posix/audio_native/src/ActsMediaAudioTest.h

+/*
+ * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef AUDIOLITETEST_H
+#define AUDIOLITETEST_H
+
+#include <sys/time.h>
+
+#include "gtest/gtest.h"
+#include "audio_capturer.h"
+
+
+namespace OHOS {
+const int RET_SUCCESS = 0;
+const int RET_FAILURE = -1;
+
+struct OHOS::Audio::AudioCapturerInfo audioCapInfo;
+
+class AudioliteTest : public testing::Test {
+public:
+    // SetUpTestCase: before all testcasee
+    static void SetUpTestCase(void);
+    // TearDownTestCase: after all testcase
+    static void TearDownTestCase(void);
+    // SetUp
+    void SetUp(void);
+    // TearDown
+    void TearDown(void);
+};
+} // namespace OHOS
+#endif // AUDIOLITETEST_H

multimedia_lite/media_lite_posix/player_native/BUILD.gn

@@ -11,27 +11,33 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//build/lite/config/subsystem/aafwk/config.gni")
 import("//test/xts/tools/lite/build/suite_lite.gni")
 
 hcpptest_suite("ActsMediaPlayerTest") {
   suite_name = "acts"
-  sources = [ "src/ActsAudioPlayerTest.cpp" ]
-  if (ohos_kernel_type == "liteos_a" &&
-      enable_ohos_appexecfwk_feature_ability == true) {
-    sources += [ "src/ActsVideoPlayerTest.cpp" ]
-  }
-  include_dirs = [ "src" ]
+  sources = [ "src/ActsMediaPlayerTest.cpp" ]
   ldflags = [ "-lstdc++" ]
   ldflags += [ "-lm" ]
   if (ohos_kernel_type == "linux") {
     ldflags += [ "-lpthread" ]
   }
   ldflags += [ "-Wl,-rpath-link=$ohos_root_path/$root_out_dir" ]
+
+  include_dirs = [
+    "src",
+    "//test/xts/acts/multimedia_lite/utils_posix/common/include",
+    "//third_party/bounds_checking_function/include",
+    "//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin/base",
+    "//foundation/ace/ace_engine_lite/interfaces/innerkits/builtin/async",
+    "//foundation/multimedia/media_lite/interfaces/kits/player_lite",
+    "//foundation/multimedia/utils/lite/include",
+    "//foundation/multimedia/media_lite/test/unittest/player_lite",
+  ]
+
   deps = [
     "//foundation/multimedia/media_lite/frameworks/player_lite:player_lite",
-    #"//foundation/multimedia/camera_lite/frameworks:camera_lite",
-    #"//foundation/multimedia/media_lite/frameworks/recorder_lite:recorder_lite",
+    "//foundation/multimedia/utils/lite:media_common",
+    "//third_party/bounds_checking_function:libsec_shared",
   ]
 
   cflags = [ "-Wno-error" ]

multimedia_lite/media_lite_posix/player_native/Test.json

@@ -14,9 +14,6 @@
                 {
                     "source": "testcases/multimedia",
                     "target": "/test_root/multimedia"
-                },{
-                    "source": "resource/multimedia",
-                    "target": "/test_root/multimedia"
                 }
             ]
         }

multimedia_lite/media_lite_posix/player_native/src/ActsMediaPlayerTest.h

+/*
+ * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
+#ifndef PLAYER_LITE_TEST_H
+#define PLAYER_LITE_TEST_H
+
+#include "gtest/gtest.h"
+#include "player.h"
+
+namespace OHOS {
+using OHOS::Media::Player;
+using OHOS::Media::PlayerSeekMode;
+using OHOS::Media::Source;
+using OHOS::Media::Format;
+using OHOS::Media::StreamSource;
+using OHOS::Media::StreamCallback;
+using OHOS::Media::SourceType;
+using OHOS::Media::PlayerCallback;
+
+using namespace std;
+using namespace OHOS::Media;
+using namespace testing::ext;
+
+const int FILE_PATH_LEN = 2048;
+
+using TestSample = struct TagTestSample {
+    std::shared_ptr<Player> adaptr;
+    char filePath[FILE_PATH_LEN];
+};
+
+static TagTestSample g_tagTestSample;
+static Surface *g_surface = Surface::CreateSurface();
+} // namespace OHOS
+#endif // PLAYER_LITE_TEST_H
\ No newline at end of file

multimedia_lite/media_lite_posix/player_native/src/PlayerTest.h

-/* Copyright (c) 2021 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
- 
-#ifndef TEST_XTS_ACTS_MULTIMEDIA_LITE_MULTIMEDIA_POSIX_PLAYER_SRC_PLAYERTEST_H
-#define TEST_XTS_ACTS_MULTIMEDIA_LITE_MULTIMEDIA_POSIX_PLAYER_SRC_PLAYERTEST_H
-#include <sys/prctl.h>
-#include "unistd.h"
-#include <fcntl.h>
-#include "securec.h"
-#include "gtest/gtest.h"
-#include "source.h"
-#include "player.h"
-#include "format.h"
-#include "fstream"
-#include "iostream"
-#include "thread"
-#include <climits>
-#endif
-
-const int FRAME_RATE_DEFAULT = 30;
-const int FILE_PATH_LEN = 2048;
-
-#define DOFUNC_STR_NORET(func, str)                                                              \
-    do {                                                                                         \
-        HI_S32 s32Ret = 0;                                                                       \
-        s32Ret = func;                                                                           \
-        if (s32Ret != HI_SUCCESS) {                                                              \
-            printf("[liteplayer_sample][%s:%d] ret:%d, %s \n", __FILE__, __LINE__, s32Ret, str); \
-            return NULL;                                                                         \
-        }                                                                                        \
-    } while (0)
-
-#define DOFUNC_STR_RET(func, str)                                                                \
-    do {                                                                                         \
-        HI_S32 s32Ret = 0;                                                                       \
-        s32Ret = func;                                                                           \
-        if (s32Ret != HI_SUCCESS) {                                                              \
-            printf("[liteplayer_sample][%s:%d] ret:%d, %s \n", __FILE__, __LINE__, s32Ret, str); \
-            return HI_FAILURE;                                                                   \
-        }                                                                                        \
-    } while (0)
-
-#define IS_OK(ret)                                                \
-    do {                                                          \
-        if (ret != 0) {                                           \
-            printf("[%s: %d] ret:%d\n", __func__, __LINE__, ret); \
-        }                                                         \
-    } while (0)
-
-namespace OHOS {
-using OHOS::Media::Player;
-using OHOS::Media::PlayerSeekMode;
-using OHOS::Media::Source;
-using OHOS::Media::Format;
-using OHOS::Media::StreamSource;
-using OHOS::Media::StreamCallback;
-using OHOS::Media::SourceType;
-using OHOS::Media::PlayerCallback;
-
-using namespace std;
-using namespace OHOS::Media;
-using namespace testing::ext;
-
-class StreamSourceSample;
-using TestSample = struct TagTestSample {
-    std::shared_ptr<Player> adaptr;
-    pthread_t process;
-    pthread_mutex_t mutex;
-    int32_t isThreadRunning;
-    int32_t sourceType;
-    char filePath[FILE_PATH_LEN];
-    std::shared_ptr<StreamSourceSample> streamSample;
-};
-
-using IdleBuffer =  struct TagIdleBuffer {
-    size_t idx;
-    size_t offset;
-    size_t size;
-};
-
-class StreamSourceSample : public StreamSource {
-public:
-    StreamSourceSample(void);
-    ~StreamSourceSample(void);
-    void OnBufferAvailable(size_t index, size_t offset, size_t size);
-    void SetStreamCallback(const std::shared_ptr<StreamCallback> &callback);
-    uint8_t *GetBufferAddress(size_t idx);
-    void QueueBuffer(size_t index, size_t offset, size_t size, int64_t timestampUs, uint32_t flags);
-    int GetAvailableBuffer(IdleBuffer *buffer);
-    std::weak_ptr<StreamCallback> m_callBack;
-    pthread_mutex_t m_mutex;
-private:
-    std::vector<IdleBuffer> aviableBuffer;
-};
-
-void *StreamProcess(const void *arg);
-void SetSchParam(void);
-} // namespace OHOS
-
-using namespace OHOS;
-const int HI_SUCCESS = 0;
-const int HI_FAILURE = -1;
-static TagTestSample g_tagTestSample;
-static Surface *g_surface = Surface::CreateSurface();