mirror of
https://github.com/openharmony/multimedia_media_lite.git
synced 2026-07-01 06:41:50 -04:00
repair utils/lite to media_utils_lite
Signed-off-by: huang-jianfei200 <huangjianfei3@huawei.com> Change-Id: I45def3b8b71a3e2fa7c42184ba891923b96380e1
This commit is contained in:
@@ -12,7 +12,7 @@
|
||||
# limitations under the License.
|
||||
import("//build/lite/config/component/lite_component.gni")
|
||||
import("//build/lite/ndk/ndk.gni")
|
||||
import("//foundation/multimedia/utils/lite/config.gni")
|
||||
import("//foundation/multimedia/media_utils_lite/config.gni")
|
||||
|
||||
shared_library("recorder_lite") {
|
||||
sources = [ "recorder.cpp" ]
|
||||
@@ -21,7 +21,7 @@ shared_library("recorder_lite") {
|
||||
include_dirs = [
|
||||
"//foundation/multimedia/media_lite/frameworks/recorder_lite/binder",
|
||||
"//foundation/multimedia/media_lite/services/recorder_lite/impl/include",
|
||||
"//foundation/multimedia/utils/lite/hals",
|
||||
"//foundation/multimedia/media_utils_lite/hals",
|
||||
"//foundation/systemabilitymgr/samgr_lite/interfaces/kits/registry",
|
||||
"//foundation/systemabilitymgr/samgr_lite/interfaces/kits/samgr",
|
||||
"//foundation/multimedia/media_lite/services/recorder_lite/server/include",
|
||||
@@ -53,7 +53,7 @@ shared_library("recorder_lite") {
|
||||
public_configs = [ ":recorder_external_library_config" ]
|
||||
public_deps = [
|
||||
"//foundation/graphic/surface:lite_surface",
|
||||
"//foundation/multimedia/utils/lite:media_common",
|
||||
"//foundation/multimedia/media_utils_lite:media_common",
|
||||
"//third_party/bounds_checking_function:libsec_shared",
|
||||
]
|
||||
}
|
||||
@@ -66,6 +66,6 @@ config("recorder_external_library_config") {
|
||||
"//drivers/peripheral/format/interfaces/include",
|
||||
"//foundation/multimedia/audio_lite/interfaces/kits",
|
||||
"//foundation/multimedia/media_lite/interfaces/kits/recorder_lite",
|
||||
"//foundation/multimedia/utils/lite/interfaces/kits",
|
||||
"//foundation/multimedia/media_utils_lite/interfaces/kits",
|
||||
]
|
||||
}
|
||||
|
||||
@@ -38,12 +38,12 @@ if (config_ohos_multimedia_media_lite_player_path == "") {
|
||||
include_dirs += [
|
||||
"//foundation/multimedia/media_lite/interfaces/kits/player_lite/js/builtin/include",
|
||||
"//foundation/multimedia/media_lite/interfaces/kits/player_lite",
|
||||
"//foundation/multimedia/utils/lite/interfaces/kits",
|
||||
"//foundation/multimedia/media_utils_lite/interfaces/kits",
|
||||
]
|
||||
|
||||
public_deps = [
|
||||
"//foundation/multimedia/media_lite/frameworks/player_lite",
|
||||
"//foundation/multimedia/utils/lite:media_common",
|
||||
"//foundation/multimedia/media_utils_lite:media_common",
|
||||
]
|
||||
|
||||
if (ohos_kernel_type == "liteos_m") {
|
||||
|
||||
+6
-6
@@ -12,7 +12,7 @@
|
||||
# limitations under the License.
|
||||
import("//build/lite/config/component/lite_component.gni")
|
||||
import("//build/lite/ndk/ndk.gni")
|
||||
import("//foundation/multimedia/utils/lite/config.gni")
|
||||
import("//foundation/multimedia/media_utils_lite/config.gni")
|
||||
|
||||
executable("media_server") {
|
||||
ldflags = [ "-Wl,-Map=media_server.map" ]
|
||||
@@ -29,8 +29,8 @@ executable("media_server") {
|
||||
"//foundation/multimedia/media_lite/interfaces/innerkits",
|
||||
"//foundation/multimedia/camera_lite/services/server/include",
|
||||
"//foundation/multimedia/camera_lite/services/impl/include",
|
||||
"//foundation/multimedia/utils/lite/interfaces/kits",
|
||||
"//foundation/multimedia/utils/lite/hals",
|
||||
"//foundation/multimedia/media_utils_lite/interfaces/kits",
|
||||
"//foundation/multimedia/media_utils_lite/hals",
|
||||
"//foundation/multimedia/audio_lite/interfaces/kits",
|
||||
"//foundation/multimedia/media_lite/services/recorder_lite",
|
||||
"//foundation/multimedia/media_lite/services/player_lite",
|
||||
@@ -83,7 +83,7 @@ executable("media_server") {
|
||||
lite_component("media_lite") {
|
||||
features = [
|
||||
":media_server",
|
||||
"//foundation/multimedia/utils/lite:media_common",
|
||||
"//foundation/multimedia/media_utils_lite:media_common",
|
||||
"//foundation/multimedia/camera_lite/frameworks:camera_lite",
|
||||
"//foundation/multimedia/media_lite/frameworks/player_lite:player_lite",
|
||||
"//foundation/multimedia/media_lite/frameworks/recorder_lite:recorder_lite",
|
||||
@@ -99,10 +99,10 @@ ndk_lib("media_ndk") {
|
||||
"//foundation/multimedia/camera_lite/frameworks:camera_lite",
|
||||
"//foundation/multimedia/media_lite/frameworks/player_lite:player_lite",
|
||||
"//foundation/multimedia/media_lite/frameworks/recorder_lite:recorder_lite",
|
||||
"//foundation/multimedia/utils/lite:media_common",
|
||||
"//foundation/multimedia/media_utils_lite:media_common",
|
||||
]
|
||||
head_files = [
|
||||
"//foundation/multimedia/utils/lite/interfaces/kits",
|
||||
"//foundation/multimedia/media_utils_lite/interfaces/kits",
|
||||
"//foundation/multimedia/camera_lite/interfaces/kits",
|
||||
"//foundation/multimedia/audio_lite/interfaces/kits",
|
||||
"//foundation/multimedia/media_lite/interfaces/kits/player_lite",
|
||||
|
||||
@@ -35,8 +35,8 @@ shared_library("player_impl") {
|
||||
]
|
||||
include_dirs = [
|
||||
"//third_party/bounds_checking_function/include",
|
||||
"//foundation/multimedia/utils/lite/hals",
|
||||
"//foundation/multimedia/utils/lite/interfaces/kits",
|
||||
"//foundation/multimedia/media_utils_lite/hals",
|
||||
"//foundation/multimedia/media_utils_lite/interfaces/kits",
|
||||
"//drivers/peripheral/display/interfaces/include",
|
||||
"//drivers/peripheral/base",
|
||||
"//foundation/multimedia/media_lite/interfaces/innerkits",
|
||||
@@ -51,7 +51,7 @@ shared_library("player_impl") {
|
||||
public_deps = [
|
||||
"//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared",
|
||||
"//foundation/graphic/surface:lite_surface",
|
||||
"//foundation/multimedia/utils/lite:media_common",
|
||||
"//foundation/multimedia/media_utils_lite:media_common",
|
||||
"//third_party/bounds_checking_function:libsec_shared",
|
||||
]
|
||||
ldflags += [ "-lstdc++" ]
|
||||
@@ -70,7 +70,7 @@ config("player_impl_external_library_config") {
|
||||
include_dirs += [ "//foundation/multimedia/media_lite/services/player_lite/impl/buffersource/include" ]
|
||||
include_dirs += [ "//foundation/multimedia/media_lite/services/player_lite/impl/player_control/include" ]
|
||||
include_dirs += [ "//foundation/multimedia/media_lite/services/player_lite/impl/player_control/player" ]
|
||||
include_dirs += [ "//foundation/multimedia/utils/lite/interfaces/kits" ]
|
||||
include_dirs += [ "//foundation/multimedia/media_utils_lite/interfaces/kits" ]
|
||||
include_dirs += [ "//drivers/peripheral/format/interfaces/include" ]
|
||||
include_dirs += [ "//foundation/multimedia/media_lite/services/player_lite/impl/player_control/player/fsm/src" ]
|
||||
include_dirs += [ "//foundation/multimedia/media_lite/services/player_lite/impl/player_control/player/fsm/include" ]
|
||||
@@ -96,8 +96,8 @@ shared_library("player_server") {
|
||||
"//drivers/peripheral/display/interfaces/include",
|
||||
"//drivers/peripheral/base",
|
||||
"//foundation/multimedia/histreamer/interface",
|
||||
"//foundation/multimedia/utils/lite/hals",
|
||||
"//foundation/multimedia/utils/lite/interfaces/kits",
|
||||
"//foundation/multimedia/media_utils_lite/hals",
|
||||
"//foundation/multimedia/media_utils_lite/interfaces/kits",
|
||||
"//foundation/multimedia/media_lite/interfaces/innerkits",
|
||||
"//foundation/multimedia/media_lite/frameworks/player_lite/binder",
|
||||
"//base/startup/init/interfaces/innerkits/include/syspara",
|
||||
@@ -127,7 +127,7 @@ shared_library("player_server") {
|
||||
public_deps = [
|
||||
"//base/startup/init/interfaces/innerkits:libbegetutil",
|
||||
"//foundation/multimedia/media_lite/services/player_lite:player_impl",
|
||||
"//foundation/multimedia/utils/lite:media_common",
|
||||
"//foundation/multimedia/media_utils_lite:media_common",
|
||||
]
|
||||
}
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
import("//build/lite/config/component/lite_component.gni")
|
||||
import("//foundation/multimedia/utils/lite/config.gni")
|
||||
import("//foundation/multimedia/media_utils_lite/config.gni")
|
||||
|
||||
static_library("recorder_server") {
|
||||
sources = [
|
||||
@@ -34,7 +34,7 @@ static_library("recorder_server") {
|
||||
"//foundation/multimedia/media_lite/services/recorder_lite/impl/include",
|
||||
"//foundation/multimedia/media_lite/services/recorder_lite/server/include",
|
||||
"//foundation/multimedia/media_lite/interfaces/kits/recorder_lite",
|
||||
"//foundation/multimedia/utils/lite/interfaces/kits",
|
||||
"//foundation/multimedia/media_utils_lite/interfaces/kits",
|
||||
"//foundation/multimedia/audio_lite/interfaces/kits",
|
||||
"//foundation/multimedia/audio_lite/services/impl",
|
||||
]
|
||||
@@ -48,7 +48,7 @@ static_library("recorder_server") {
|
||||
"//foundation/graphic/surface:lite_surface",
|
||||
"//foundation/multimedia/audio_lite/services:audio_capturer_impl",
|
||||
"//foundation/multimedia/media_lite/services/recorder_lite:recorder_impl",
|
||||
"//foundation/multimedia/utils/lite:media_common",
|
||||
"//foundation/multimedia/media_utils_lite:media_common",
|
||||
"//foundation/systemabilitymgr/samgr_lite/samgr:samgr",
|
||||
"//third_party/bounds_checking_function:libsec_shared",
|
||||
]
|
||||
@@ -80,7 +80,7 @@ shared_library("recorder_impl") {
|
||||
"//drivers/peripheral/codec/interfaces/include",
|
||||
"//drivers/peripheral/format/interfaces/include",
|
||||
"//foundation/multimedia/media_lite/services/recorder_lite/impl/include",
|
||||
"//foundation/multimedia/utils/lite/interfaces/kits",
|
||||
"//foundation/multimedia/media_utils_lite/interfaces/kits",
|
||||
"//foundation/multimedia/audio_lite/interfaces/kits",
|
||||
"//foundation/multimedia/audio_lite/services/impl",
|
||||
]
|
||||
@@ -95,7 +95,7 @@ shared_library("recorder_impl") {
|
||||
deps = [
|
||||
"//device/soc/hisilicon/common/hal/media:hardware_media_sdk",
|
||||
"//foundation/multimedia/audio_lite/services:audio_capturer_impl",
|
||||
"//foundation/multimedia/utils/lite:media_common",
|
||||
"//foundation/multimedia/media_utils_lite:media_common",
|
||||
"//third_party/bounds_checking_function:libsec_shared",
|
||||
]
|
||||
}
|
||||
|
||||
+2
-2
@@ -11,7 +11,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
import("//build/lite/config/component/lite_component.gni")
|
||||
import("//foundation/multimedia/utils/lite/config.gni")
|
||||
import("//foundation/multimedia/media_utils_lite/config.gni")
|
||||
|
||||
executable("test_play_file_h265") {
|
||||
sources = [ "test_play_file_h265.cpp" ]
|
||||
@@ -21,7 +21,7 @@ executable("test_play_file_h265") {
|
||||
include_dirs = [
|
||||
"//third_party/bounds_checking_function/include",
|
||||
"//drivers/peripheral/codec/interfaces/include",
|
||||
"//foundation/multimedia/utils/lite/hals",
|
||||
"//foundation/multimedia/media_utils_lite/hals",
|
||||
]
|
||||
|
||||
if (enable_media_passthrough_mode == true) {
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
# limitations under the License.
|
||||
|
||||
import("//build/lite/config/test.gni")
|
||||
import("//foundation/multimedia/utils/lite/config.gni")
|
||||
import("//foundation/multimedia/media_utils_lite/config.gni")
|
||||
|
||||
group("lite_medialite_test") {
|
||||
if (ohos_build_type == "debug") {
|
||||
@@ -34,7 +34,7 @@ if (ohos_build_type == "debug") {
|
||||
"//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/base",
|
||||
"//foundation/arkui/ace_engine_lite/interfaces/inner_api/builtin/async",
|
||||
"//foundation/multimedia/media_lite/interfaces/kits/player_lite",
|
||||
"//foundation/multimedia/utils/lite/include",
|
||||
"//foundation/multimedia/media_utils_lite/include",
|
||||
"//foundation/multimedia/media_lite/test/unittest/player_lite",
|
||||
]
|
||||
|
||||
@@ -44,7 +44,7 @@ if (ohos_build_type == "debug") {
|
||||
|
||||
deps = [
|
||||
"//foundation/multimedia/media_lite/frameworks/player_lite:player_lite",
|
||||
"//foundation/multimedia/utils/lite:media_common",
|
||||
"//foundation/multimedia/media_utils_lite:media_common",
|
||||
"//third_party/bounds_checking_function:libsec_shared",
|
||||
]
|
||||
}
|
||||
@@ -57,7 +57,7 @@ if (ohos_build_type == "debug") {
|
||||
include_dirs = [
|
||||
"//third_party/bounds_checking_function/include",
|
||||
"//drivers/peripheral/codec/interfaces/include",
|
||||
"//foundation/multimedia/utils/lite/hals",
|
||||
"//foundation/multimedia/media_utils_lite/hals",
|
||||
"//foundation/multimedia/media_lite/test/unittest/recorder_lite",
|
||||
"//foundation/multimedia/media_lite/interfaces/kits/recorder_lite",
|
||||
"//foundation/multimedia/media_lite/frameworks/recorder_lite",
|
||||
|
||||
Reference in New Issue
Block a user