From d48246a9839ba54dd4e2121fdb0d1f7e7986ce80 Mon Sep 17 00:00:00 2001 From: acgist <289547414@qq.com> Date: Sat, 4 May 2024 19:45:54 +0800 Subject: [PATCH] =?UTF-8?q?[*]=20=E8=B0=83=E6=95=B4=E8=A7=A3=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../taoyao/media/src/main/cpp/CMakeLists.txt | 6 ++++++ .../taoyao/media/src/main/cpp/bind.cpp | 20 +++++++++---------- .../src/main/cpp/include/AudioCapturer.hpp | 5 ----- .../media/src/main/cpp/include/Capturer.hpp | 4 ++++ .../media/src/main/cpp/include/Client.hpp | 6 ++++++ .../src/main/cpp/include/LocalClient.hpp | 10 ---------- .../src/main/cpp/include/MediaManager.hpp | 2 ++ .../media/src/main/cpp/include/Palyer.hpp | 18 +++++++++++++++++ .../src/main/cpp/include/RemoteClient.hpp | 10 ---------- .../media/src/main/cpp/include/RoomClient.hpp | 10 ---------- .../src/main/cpp/include/VideoCapturer.hpp | 5 ----- .../src/main/cpp/media/AudioCapturer.cpp | 0 .../media/src/main/cpp/media/AudioPlayer.cpp | 0 .../media/src/main/cpp/media/Capturer.cpp | 0 .../media/src/main/cpp/media/Player.cpp | 0 .../src/main/cpp/media/VideoCapturer.cpp | 0 .../media/src/main/cpp/media/VideoPlayer.cpp | 0 .../src/main/cpp/types/libtaoyao/index.d.ts | 7 +------ 18 files changed, 47 insertions(+), 56 deletions(-) delete mode 100644 taoyao-client-openharmony/taoyao/media/src/main/cpp/include/AudioCapturer.hpp delete mode 100644 taoyao-client-openharmony/taoyao/media/src/main/cpp/include/LocalClient.hpp create mode 100644 taoyao-client-openharmony/taoyao/media/src/main/cpp/include/Palyer.hpp delete mode 100644 taoyao-client-openharmony/taoyao/media/src/main/cpp/include/RemoteClient.hpp delete mode 100644 taoyao-client-openharmony/taoyao/media/src/main/cpp/include/RoomClient.hpp delete mode 100644 taoyao-client-openharmony/taoyao/media/src/main/cpp/include/VideoCapturer.hpp create mode 100644 taoyao-client-openharmony/taoyao/media/src/main/cpp/media/AudioCapturer.cpp create mode 100644 taoyao-client-openharmony/taoyao/media/src/main/cpp/media/AudioPlayer.cpp create mode 100644 taoyao-client-openharmony/taoyao/media/src/main/cpp/media/Capturer.cpp create mode 100644 taoyao-client-openharmony/taoyao/media/src/main/cpp/media/Player.cpp create mode 100644 taoyao-client-openharmony/taoyao/media/src/main/cpp/media/VideoCapturer.cpp create mode 100644 taoyao-client-openharmony/taoyao/media/src/main/cpp/media/VideoPlayer.cpp diff --git a/taoyao-client-openharmony/taoyao/media/src/main/cpp/CMakeLists.txt b/taoyao-client-openharmony/taoyao/media/src/main/cpp/CMakeLists.txt index 9ed047f..72d6093 100644 --- a/taoyao-client-openharmony/taoyao/media/src/main/cpp/CMakeLists.txt +++ b/taoyao-client-openharmony/taoyao/media/src/main/cpp/CMakeLists.txt @@ -34,6 +34,12 @@ add_library( media/RoomClient.cpp media/LocalClient.cpp media/RemoteClient.cpp + media/Player.cpp + media/AudioPlayer.cpp + media/VideoPlayer.cpp + media/Capturer.cpp + media/AudioCapturer.cpp + media/VideoCapturer.cpp media/MediaManager.cpp ) diff --git a/taoyao-client-openharmony/taoyao/media/src/main/cpp/bind.cpp b/taoyao-client-openharmony/taoyao/media/src/main/cpp/bind.cpp index 45731a2..25a9bc7 100644 --- a/taoyao-client-openharmony/taoyao/media/src/main/cpp/bind.cpp +++ b/taoyao-client-openharmony/taoyao/media/src/main/cpp/bind.cpp @@ -32,19 +32,19 @@ static void shutdown() { // this->roomMap } -static napi_value mediaConsume(napi_env env, napi_callback_info info) { return 0; } -static napi_value mediaConsumerClose(napi_env env, napi_callback_info info) { return 0; } -static napi_value mediaConsumerPause(napi_env env, napi_callback_info info) { return 0; } +static napi_value mediaConsume(napi_env env, napi_callback_info info) { return 0; } +static napi_value mediaConsumerClose(napi_env env, napi_callback_info info) { return 0; } +static napi_value mediaConsumerPause(napi_env env, napi_callback_info info) { return 0; } static napi_value mediaConsumerResume(napi_env env, napi_callback_info info) { return 0; } -static napi_value mediaProducerClose(napi_env env, napi_callback_info info) { return 0; } -static napi_value mediaProducerPause(napi_env env, napi_callback_info info) { return 0; } +static napi_value mediaProducerClose(napi_env env, napi_callback_info info) { return 0; } +static napi_value mediaProducerPause(napi_env env, napi_callback_info info) { return 0; } static napi_value mediaProducerResume(napi_env env, napi_callback_info info) { return 0; } -static napi_value roomClientList(napi_env env, napi_callback_info info) { return 0; } -static napi_value roomClose(napi_env env, napi_callback_info info) { return 0; } -static napi_value roomEnter(napi_env env, napi_callback_info info) { return 0; } -static napi_value roomExpel(napi_env env, napi_callback_info info) { return 0; } +static napi_value roomClientList(napi_env env, napi_callback_info info) { return 0; } +static napi_value roomClose(napi_env env, napi_callback_info info) { return 0; } +static napi_value roomEnter(napi_env env, napi_callback_info info) { return 0; } +static napi_value roomExpel(napi_env env, napi_callback_info info) { return 0; } static napi_value roomInvite(napi_env env, napi_callback_info info) { return 0; } -static napi_value roomLeave(napi_env env, napi_callback_info info) { return 0; } +static napi_value roomLeave(napi_env env, napi_callback_info info) { return 0; } } diff --git a/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/AudioCapturer.hpp b/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/AudioCapturer.hpp deleted file mode 100644 index d42b9de..0000000 --- a/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/AudioCapturer.hpp +++ /dev/null @@ -1,5 +0,0 @@ - -#ifndef TAOYAO_AUDIOCAPTURER_H -#define TAOYAO_AUDIOCAPTURER_H - -#endif //TAOYAO_AUDIOCAPTURER_H diff --git a/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/Capturer.hpp b/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/Capturer.hpp index 73f54d2..beefda9 100644 --- a/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/Capturer.hpp +++ b/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/Capturer.hpp @@ -19,6 +19,10 @@ public: }; +class AudioCapturer {}; + +class VideoCapturer {}; + } #endif // taoyao_Capturer_HPP diff --git a/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/Client.hpp b/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/Client.hpp index 4c63735..c30aa96 100644 --- a/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/Client.hpp +++ b/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/Client.hpp @@ -14,6 +14,12 @@ public: }; +class RoomClient {}; + +class LocalClient {}; + +class RemoteClient {}; + } #endif // taoyao_Client_HPP diff --git a/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/LocalClient.hpp b/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/LocalClient.hpp deleted file mode 100644 index f9d734c..0000000 --- a/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/LocalClient.hpp +++ /dev/null @@ -1,10 +0,0 @@ -/** - * 房间本地终端 - * - * @author acgist - */ - -#ifndef taoyao_LocalClient_HPP -#define taoyao_LocalClient_HPP - -#endif // taoyao_LocalClient_HPP diff --git a/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/MediaManager.hpp b/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/MediaManager.hpp index 377e6cd..8257900 100644 --- a/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/MediaManager.hpp +++ b/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/MediaManager.hpp @@ -3,6 +3,8 @@ * 提供通道等等创建 * * @author acgist + * + * https://docs.openharmony.cn/pages/v4.0/zh-cn/application-dev/media/obtain-supported-codecs.md */ #ifndef taoyao_MediaManager_HPP diff --git a/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/Palyer.hpp b/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/Palyer.hpp new file mode 100644 index 0000000..b263055 --- /dev/null +++ b/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/Palyer.hpp @@ -0,0 +1,18 @@ +/** + * 播放器 + */ + +#ifndef TAOYAO_PALYER_H +#define TAOYAO_PALYER_H + +namespace acgist { + +class Player {}; + +class AudioPlayer {}; + +class VideoPlayer {}; + +} + +#endif //TAOYAO_PALYER_H diff --git a/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/RemoteClient.hpp b/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/RemoteClient.hpp deleted file mode 100644 index ee18992..0000000 --- a/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/RemoteClient.hpp +++ /dev/null @@ -1,10 +0,0 @@ -/** - * 房间远程终端 - * - * @author acgist - */ - -#ifndef taoyao_RemoteClient_HPP -#define taoyao_RemoteClient_HPP - -#endif // taoyao_RemoteClient_HPP diff --git a/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/RoomClient.hpp b/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/RoomClient.hpp deleted file mode 100644 index 415c970..0000000 --- a/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/RoomClient.hpp +++ /dev/null @@ -1,10 +0,0 @@ -/** - * 房间终端 - * - * @author acgist - */ - -#ifndef taoyao_RoomClient_HPP -#define taoyao_RoomClient_HPP - -#endif // taoyao_RoomClient_HPP diff --git a/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/VideoCapturer.hpp b/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/VideoCapturer.hpp deleted file mode 100644 index a51e0b4..0000000 --- a/taoyao-client-openharmony/taoyao/media/src/main/cpp/include/VideoCapturer.hpp +++ /dev/null @@ -1,5 +0,0 @@ - -#ifndef TAOYAO_VIDEOCAPTURER_H -#define TAOYAO_VIDEOCAPTURER_H - -#endif //TAOYAO_VIDEOCAPTURER_H diff --git a/taoyao-client-openharmony/taoyao/media/src/main/cpp/media/AudioCapturer.cpp b/taoyao-client-openharmony/taoyao/media/src/main/cpp/media/AudioCapturer.cpp new file mode 100644 index 0000000..e69de29 diff --git a/taoyao-client-openharmony/taoyao/media/src/main/cpp/media/AudioPlayer.cpp b/taoyao-client-openharmony/taoyao/media/src/main/cpp/media/AudioPlayer.cpp new file mode 100644 index 0000000..e69de29 diff --git a/taoyao-client-openharmony/taoyao/media/src/main/cpp/media/Capturer.cpp b/taoyao-client-openharmony/taoyao/media/src/main/cpp/media/Capturer.cpp new file mode 100644 index 0000000..e69de29 diff --git a/taoyao-client-openharmony/taoyao/media/src/main/cpp/media/Player.cpp b/taoyao-client-openharmony/taoyao/media/src/main/cpp/media/Player.cpp new file mode 100644 index 0000000..e69de29 diff --git a/taoyao-client-openharmony/taoyao/media/src/main/cpp/media/VideoCapturer.cpp b/taoyao-client-openharmony/taoyao/media/src/main/cpp/media/VideoCapturer.cpp new file mode 100644 index 0000000..e69de29 diff --git a/taoyao-client-openharmony/taoyao/media/src/main/cpp/media/VideoPlayer.cpp b/taoyao-client-openharmony/taoyao/media/src/main/cpp/media/VideoPlayer.cpp new file mode 100644 index 0000000..e69de29 diff --git a/taoyao-client-openharmony/taoyao/media/src/main/cpp/types/libtaoyao/index.d.ts b/taoyao-client-openharmony/taoyao/media/src/main/cpp/types/libtaoyao/index.d.ts index 1e8719e..22fdab1 100644 --- a/taoyao-client-openharmony/taoyao/media/src/main/cpp/types/libtaoyao/index.d.ts +++ b/taoyao-client-openharmony/taoyao/media/src/main/cpp/types/libtaoyao/index.d.ts @@ -1,9 +1,4 @@ -export const sessionCall : () => void; -export const sessionPause : () => void; -export const sessionResume : () => void; -export const sessionExchange: () => void; -export const sessionClose : () => void; -export const mediaConsume : () => void; +export const mediaConsume : () => void; export const mediaConsumerClose : () => void; export const mediaConsumerPause : () => void; export const mediaConsumerResume: () => void;