From eab309e217d03b648f077b15f4022987e8171ab9 Mon Sep 17 00:00:00 2001 From: sharpshooter_t Date: Thu, 14 Jul 2022 12:19:11 +0800 Subject: [PATCH] change media_standard to player_framework Signed-off-by: sharpshooter_t Change-Id: I2b18786a3f2938bbc5ee92df498569194c928d62 --- bundle.json | 2 +- distributedscreen.gni | 2 +- .../native_cpp/test/unittest/screensinktest/BUILD.gn | 2 +- .../native_cpp/test/unittest/screensourcetest/BUILD.gn | 2 +- services/common/test/unittest/BUILD.gn | 2 +- services/screendemo/BUILD.gn | 4 ++-- services/screenservice/sinkservice/BUILD.gn | 2 +- services/screentransport/screensinktrans/BUILD.gn | 2 +- services/screentransport/screensourcetrans/BUILD.gn | 2 +- services/screentransport/test/unittest/BUILD.gn | 8 ++++---- .../test/unittest/screendatachannel/BUILD.gn | 2 +- .../test/unittest/screensinkprocessor/BUILD.gn | 2 +- .../test/unittest/screensinktrans/BUILD.gn | 2 +- .../test/unittest/screensourceprocessor/BUILD.gn | 2 +- .../test/unittest/screensourcetrans/BUILD.gn | 2 +- services/softbusadapter/test/unittest/BUILD.gn | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/bundle.json b/bundle.json index a6596764..8d0589b8 100644 --- a/bundle.json +++ b/bundle.json @@ -38,7 +38,7 @@ "safwk", "hitrace_native", "utils_base", - "multimedia_media_standard", + "multimedia_player_framework", "window_manager" ], "third_party":[ diff --git a/distributedscreen.gni b/distributedscreen.gni index b778f5f8..b1791497 100644 --- a/distributedscreen.gni +++ b/distributedscreen.gni @@ -15,7 +15,7 @@ distributedscreen_path = "//foundation/distributedhardware/distributed_screen" distributedhardwarefwk_path = "//foundation/distributedhardware/distributed_hardware_fwk" windowmanager_path = "//foundation/window/window_manager" -mediastandard_path = "//foundation/multimedia/media_standard" +mediastandard_path = "//foundation/multimedia/player_framework" graphicstandard_path = "//foundation/graphic/graphic_2d" common_path = "${distributedscreen_path}/common" services_path = "${distributedscreen_path}/services" diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn index 7807f5c9..aff0cda5 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/BUILD.gn @@ -61,7 +61,7 @@ ohos_unittest("ScreenSinkTest") { "dsoftbus:softbus_client", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimedia_media_standard:media_client", + "multimedia_player_framework:media_client", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", ] diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn index f8410e43..2fafd5d2 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn +++ b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/BUILD.gn @@ -66,7 +66,7 @@ ohos_unittest("ScreenSourceTest") { "dsoftbus:softbus_client", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimedia_media_standard:media_client", + "multimedia_player_framework:media_client", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", ] diff --git a/services/common/test/unittest/BUILD.gn b/services/common/test/unittest/BUILD.gn index 2f28638c..95b6e68d 100644 --- a/services/common/test/unittest/BUILD.gn +++ b/services/common/test/unittest/BUILD.gn @@ -17,4 +17,4 @@ group("service_common_test") { "databuffer:data_buffer_test", "utils:utils_test", ] -} \ No newline at end of file +} diff --git a/services/screendemo/BUILD.gn b/services/screendemo/BUILD.gn index 9d0b7d99..2d7f2031 100644 --- a/services/screendemo/BUILD.gn +++ b/services/screendemo/BUILD.gn @@ -29,7 +29,7 @@ ohos_executable("distributedScreenTest") { ] include_dirs += - [ "foundation/multimedia/media_standard/interfaces/inner_api/native" ] + [ "foundation/multimedia/player_framework/interfaces/inner_api/native" ] sources = [ "./decoder_demo.cpp", @@ -57,7 +57,7 @@ ohos_executable("distributedScreenTest") { external_deps = [ "hiviewdfx_hilog_native:libhilog", - "multimedia_media_standard:media_client", + "multimedia_player_framework:media_client", ] cflags = [ "-Wall" ] diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn index 5f8aceec..4a61f61d 100644 --- a/services/screenservice/sinkservice/BUILD.gn +++ b/services/screenservice/sinkservice/BUILD.gn @@ -73,7 +73,7 @@ ohos_shared_library("distributed_screen_sink") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - "multimedia_media_standard:media_client", + "multimedia_player_framework:media_client", "safwk:system_ability_fwk", "samgr_standard:samgr_proxy", ] diff --git a/services/screentransport/screensinktrans/BUILD.gn b/services/screentransport/screensinktrans/BUILD.gn index 1e16cabc..ce6eaffa 100644 --- a/services/screentransport/screensinktrans/BUILD.gn +++ b/services/screentransport/screensinktrans/BUILD.gn @@ -66,7 +66,7 @@ ohos_shared_library("distributed_screen_sinktrans") { "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", - "multimedia_media_standard:media_client", + "multimedia_player_framework:media_client", ] subsystem_name = "distributedhardware" diff --git a/services/screentransport/screensourcetrans/BUILD.gn b/services/screentransport/screensourcetrans/BUILD.gn index 161226d1..c2e17c7f 100644 --- a/services/screentransport/screensourcetrans/BUILD.gn +++ b/services/screentransport/screensourcetrans/BUILD.gn @@ -65,7 +65,7 @@ ohos_shared_library("distributed_screen_sourcetrans") { "hisysevent_native:libhisysevent", "hitrace_native:hitrace_meter", "hiviewdfx_hilog_native:libhilog", - "multimedia_media_standard:media_client", + "multimedia_player_framework:media_client", ] subsystem_name = "distributedhardware" diff --git a/services/screentransport/test/unittest/BUILD.gn b/services/screentransport/test/unittest/BUILD.gn index 4a59c82f..121e52c9 100644 --- a/services/screentransport/test/unittest/BUILD.gn +++ b/services/screentransport/test/unittest/BUILD.gn @@ -14,10 +14,10 @@ group("screen_transport_test") { testonly = true deps = [ - "screensinktrans:sink_trans_test", + "screendatachannel:data_channel_test", "screensinkprocessor:sink_processor_test", - "screensourcetrans:source_trans_test", + "screensinktrans:sink_trans_test", "screensourceprocessor:source_processor_test", - "screendatachannel:data_channel_test", + "screensourcetrans:source_trans_test", ] -} \ No newline at end of file +} diff --git a/services/screentransport/test/unittest/screendatachannel/BUILD.gn b/services/screentransport/test/unittest/screendatachannel/BUILD.gn index 0b2396c7..cb219e20 100644 --- a/services/screentransport/test/unittest/screendatachannel/BUILD.gn +++ b/services/screentransport/test/unittest/screendatachannel/BUILD.gn @@ -62,7 +62,7 @@ ohos_unittest("DataChannelTest") { external_deps = [ "dsoftbus:softbus_client", "hiviewdfx_hilog_native:libhilog", - "multimedia_media_standard:media_client", + "multimedia_player_framework:media_client", ] defines = [ diff --git a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn index 63c6f2b3..e08aa5d9 100644 --- a/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensinkprocessor/BUILD.gn @@ -67,7 +67,7 @@ ohos_unittest("SinkProcessorTest") { external_deps = [ "dsoftbus:softbus_client", "hiviewdfx_hilog_native:libhilog", - "multimedia_media_standard:media_client", + "multimedia_player_framework:media_client", ] defines = [ diff --git a/services/screentransport/test/unittest/screensinktrans/BUILD.gn b/services/screentransport/test/unittest/screensinktrans/BUILD.gn index 9b651ed2..2ebc15bd 100644 --- a/services/screentransport/test/unittest/screensinktrans/BUILD.gn +++ b/services/screentransport/test/unittest/screensinktrans/BUILD.gn @@ -63,7 +63,7 @@ ohos_unittest("SinkTransTest") { external_deps = [ "dsoftbus:softbus_client", "hiviewdfx_hilog_native:libhilog", - "multimedia_media_standard:media_client", + "multimedia_player_framework:media_client", ] defines = [ diff --git a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn index 24ad1edc..8ac4dd6c 100644 --- a/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn +++ b/services/screentransport/test/unittest/screensourceprocessor/BUILD.gn @@ -66,7 +66,7 @@ ohos_unittest("SourceProcessorTest") { external_deps = [ "dsoftbus:softbus_client", "hiviewdfx_hilog_native:libhilog", - "multimedia_media_standard:media_client", + "multimedia_player_framework:media_client", ] } diff --git a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn index 87d3776e..8b70ed70 100644 --- a/services/screentransport/test/unittest/screensourcetrans/BUILD.gn +++ b/services/screentransport/test/unittest/screensourcetrans/BUILD.gn @@ -66,7 +66,7 @@ ohos_unittest("SourceTransTest") { external_deps = [ "dsoftbus:softbus_client", "hiviewdfx_hilog_native:libhilog", - "multimedia_media_standard:media_client", + "multimedia_player_framework:media_client", ] } diff --git a/services/softbusadapter/test/unittest/BUILD.gn b/services/softbusadapter/test/unittest/BUILD.gn index 73a5fd9a..f435aea5 100644 --- a/services/softbusadapter/test/unittest/BUILD.gn +++ b/services/softbusadapter/test/unittest/BUILD.gn @@ -61,7 +61,7 @@ ohos_unittest("SoftBusAdapterTest") { external_deps = [ "dsoftbus:softbus_client", "hiviewdfx_hilog_native:libhilog", - "multimedia_media_standard:media_client", + "multimedia_player_framework:media_client", ] } -- Gitee