From 98328863fa0a985e17698ac5798f0ec2e1bdcaf1 Mon Sep 17 00:00:00 2001 From: qinlong0101 Date: Mon, 30 May 2022 13:19:53 +0800 Subject: [PATCH] add screen demo Signed-off-by: qinlong0101 --- services/screendemo/BUILD.gn | 90 ++++++++++++++-------------- services/screendemo/common.h | 11 ++-- services/screendemo/decoder_demo.cpp | 60 ++++++++++--------- services/screendemo/test.cpp | 3 - 4 files changed, 82 insertions(+), 82 deletions(-) diff --git a/services/screendemo/BUILD.gn b/services/screendemo/BUILD.gn index a464d4f..98c9f41 100644 --- a/services/screendemo/BUILD.gn +++ b/services/screendemo/BUILD.gn @@ -12,58 +12,58 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/distributedhardware/distributedscreen/distributedscreen.gni") +import( + "//foundation/distributedhardware/distributedscreen/distributedscreen.gni") ohos_executable("distributedScreenTest") { - install_enable = false - include_dirs = [ - "${services_path}/common/utils/include", - "${interfaces_path}/innerkits/native_cpp/screen_sink/include", - "${interfaces_path}/innerkits/native_cpp/screen_source/include", - "${interfaces_path}/innerkits/native_cpp/screen_source/include/callback", - "${fwk_common_path}/utils/include", - "${windowmanager_path}/interfaces/innerkits/dm", - "${services_path}/screenclient/include", - "${windowmanager_path}/interfaces/innerkits/wm", - "${common_path}/include", - ] + install_enable = false + include_dirs = [ + "${services_path}/common/utils/include", + "${interfaces_path}/innerkits/native_cpp/screen_sink/include", + "${interfaces_path}/innerkits/native_cpp/screen_source/include", + "${interfaces_path}/innerkits/native_cpp/screen_source/include/callback", + "${fwk_common_path}/utils/include", + "${windowmanager_path}/interfaces/innerkits/dm", + "${services_path}/screenclient/include", + "${windowmanager_path}/interfaces/innerkits/wm", + "${common_path}/include", + ] - include_dirs += [ - "foundation/multimedia/media_standard/interfaces/inner_api/native", - ] + include_dirs += + [ "foundation/multimedia/media_standard/interfaces/inner_api/native" ] - sources = [ - "./test.cpp", - "./decoder_demo.cpp", - ] + sources = [ + "./decoder_demo.cpp", + "./test.cpp", + ] - deps = [ - "${services_path}/screenclient:distributed_screen_client", - "${common_path}:distributed_screen_utils", - "${interfaces_path}/innerkits/native_cpp/screen_sink:distributed_screen_sink_sdk", - "${interfaces_path}/innerkits/native_cpp/screen_source:distributed_screen_source_sdk", - "${windowmanager_path}/dm:libdm", - "${windowmanager_path}/wm:libwm", - "//foundation/communication/dsoftbus/adapter:softbus_adapter", - "//foundation/communication/dsoftbus/sdk:softbus_client", - "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", - ] + deps = [ + "${common_path}:distributed_screen_utils", + "${interfaces_path}/innerkits/native_cpp/screen_sink:distributed_screen_sink_sdk", + "${interfaces_path}/innerkits/native_cpp/screen_source:distributed_screen_source_sdk", + "${services_path}/screenclient:distributed_screen_client", + "${windowmanager_path}/dm:libdm", + "${windowmanager_path}/wm:libwm", + "//foundation/communication/dsoftbus/adapter:softbus_adapter", + "//foundation/communication/dsoftbus/sdk:softbus_client", + "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", + "//foundation/graphic/graphic_2d/rosen/modules/render_service_client:librender_service_client", + ] - defines = [ - "HI_LOG_ENABLE", - "DH_LOG_TAG=\"distributedScreenTest\"", - "LOG_DOMAIN=0xD004100", - ] + defines = [ + "HI_LOG_ENABLE", + "DH_LOG_TAG=\"distributedScreenTest\"", + "LOG_DOMAIN=0xD004100", + ] - external_deps = [ - "hiviewdfx_hilog_native:libhilog", - "multimedia_media_standard:media_client", - ] + external_deps = [ + "hiviewdfx_hilog_native:libhilog", + "multimedia_media_standard:media_client", + ] - cflags = ["-Wall"] - cflags_cc = cflags + cflags = [ "-Wall" ] + cflags_cc = cflags - part_name = "distributed_screen" - subsystem_name = "distributedhardware" + part_name = "distributed_screen" + subsystem_name = "distributedhardware" } diff --git a/services/screendemo/common.h b/services/screendemo/common.h index 4ba467b..797c75d 100644 --- a/services/screendemo/common.h +++ b/services/screendemo/common.h @@ -17,11 +17,10 @@ #define DISTRIBUTED_SCREEN_TEST_SA_H #include +#include +#include #include #include -#include -#include -#include #include #include #include @@ -36,7 +35,8 @@ namespace DistributedHardware { class DScreenMockRegisterCallback : public RegisterCallback { public: virtual ~DScreenMockRegisterCallback() = default; - int32_t OnRegisterResult(const std::string &devId, const std::string &dhId, int32_t status, const std::string &data) + int32_t OnRegisterResult(const std::string &devId, const std::string &dhId, int32_t status, + const std::string &data) { std::cout << "Register devId: " << devId << " dhId: " << dhId << ", status: " << status << std::endl; return 0; @@ -46,7 +46,8 @@ public: class DScreenMockUnRegisterCallback : public UnregisterCallback { public: virtual ~DScreenMockUnRegisterCallback() = default; - int32_t OnUnregisterResult(const std::string &devId, const std::string &dhId, int32_t status, const std::string &data) + int32_t OnUnregisterResult(const std::string &devId, const std::string &dhId, int32_t status, + const std::string &data) { std::cout << "Unregister devId: " << devId << " dhId: " << dhId << ", status: " << status << std::endl; return 0; diff --git a/services/screendemo/decoder_demo.cpp b/services/screendemo/decoder_demo.cpp index f320b1b..f294abf 100644 --- a/services/screendemo/decoder_demo.cpp +++ b/services/screendemo/decoder_demo.cpp @@ -25,36 +25,38 @@ #include "window.h" #include "window_option.h" -static const int32_t ES_R[325] = - { 11895, 8109, 1578, 1616, 1313, 572, 805, 837, 755, 706, 952, 879, 13193, 422, 389, 509, 725, 465, 479, 959, - 677, 364, 541, 696, 9306, 322, 318, 767, 590, 422, 530, 403, 505, 566, 445, 508, 7783, 460, 405, 343, 451, - 608, 431, 411, 543, 487, 527, 400, 6287, 385, 418, 391, 592, 434, 412, 398, 504, 492, 479, 561, 5413, 317, - 355, 422, 467, 452, 476, 460, 490, 492, 485, 451, 5036, 312, 408, 460, 432, 502, 388, 475, 407, 544, 401, - 487, 4404, 362, 378, 427, 416, 426, 456, 414, 438, 424, 442, 444, 4310, 362, 388, 393, 390, 441, 398, 423, - 369, 443, 406, 392, 4231, 343, 363, 355, 390, 459, 371, 378, 381, 405, 392, 426, 3975, 387, 337, 393, 439, - 378, 355, 374, 484, 381, 373, 423, 3869, 312, 350, 400, 345, 356, 320, 473, 431, 386, 338, 431, 3426, 268, - 315, 416, 383, 373, 381, 354, 383, 328, 348, 418, 3715, 324, 361, 331, 350, 302, 409, 377, 359, 384, 334, - 326, 3439, 266, 324, 329, 353, 405, 303, 357, 332, 292, 361, 333, 3542, 294, 284, 247, 331, 306, 322, 287, - 367, 341, 276, 258, 3980, 246, 245, 259, 309, 333, 250, 275, 334, 281, 253, 371, 3640, 213, 231, 301, 302, - 228, 289, 290, 281, 201, 284, 277, 4242, 205, 328, 237, 283, 295, 266, 230, 321, 348, 212, 308, 4103, 259, - 238, 245, 298, 330, 265, 271, 287, 267, 286, 290, 3856, 269, 242, 209, 314, 267, 278, 280, 314, 250, 433, - 238, 3654, 195, 246, 301, 298, 250, 270, 320, 269, 305, 258, 368, 3810, 231, 212, 279, 289, 252, 303, 287, - 295, 206, 264, 349, 4071, 242, 296, 271, 231, 307, 265, 254, 267, 317, 232, 348, 4077, 259, 222, 268, 235, - 324, 266, 256, 312, 246, 248, 325, 4000, 266, 201, 230, 293, 264, 265, 273, 301, 304, 253, 266, 3978, 228, - 232, 250, 248, 281, 219, 243, 293, 287, 253, 328, 3719 }; +static const int32_t ES_R[325] = { + 11895, 8109, 1578, 1616, 1313, 572, 805, 837, 755, 706, 952, 879, 13193, 422, 389, 509, 725, 465, 479, 959, + 677, 364, 541, 696, 9306, 322, 318, 767, 590, 422, 530, 403, 505, 566, 445, 508, 7783, 460, 405, 343, 451, + 608, 431, 411, 543, 487, 527, 400, 6287, 385, 418, 391, 592, 434, 412, 398, 504, 492, 479, 561, 5413, 317, + 355, 422, 467, 452, 476, 460, 490, 492, 485, 451, 5036, 312, 408, 460, 432, 502, 388, 475, 407, 544, 401, + 487, 4404, 362, 378, 427, 416, 426, 456, 414, 438, 424, 442, 444, 4310, 362, 388, 393, 390, 441, 398, 423, + 369, 443, 406, 392, 4231, 343, 363, 355, 390, 459, 371, 378, 381, 405, 392, 426, 3975, 387, 337, 393, 439, + 378, 355, 374, 484, 381, 373, 423, 3869, 312, 350, 400, 345, 356, 320, 473, 431, 386, 338, 431, 3426, 268, + 315, 416, 383, 373, 381, 354, 383, 328, 348, 418, 3715, 324, 361, 331, 350, 302, 409, 377, 359, 384, 334, + 326, 3439, 266, 324, 329, 353, 405, 303, 357, 332, 292, 361, 333, 3542, 294, 284, 247, 331, 306, 322, 287, + 367, 341, 276, 258, 3980, 246, 245, 259, 309, 333, 250, 275, 334, 281, 253, 371, 3640, 213, 231, 301, 302, + 228, 289, 290, 281, 201, 284, 277, 4242, 205, 328, 237, 283, 295, 266, 230, 321, 348, 212, 308, 4103, 259, + 238, 245, 298, 330, 265, 271, 287, 267, 286, 290, 3856, 269, 242, 209, 314, 267, 278, 280, 314, 250, 433, + 238, 3654, 195, 246, 301, 298, 250, 270, 320, 269, 305, 258, 368, 3810, 231, 212, 279, 289, 252, 303, 287, + 295, 206, 264, 349, 4071, 242, 296, 271, 231, 307, 265, 254, 267, 317, 232, 348, 4077, 259, 222, 268, 235, + 324, 266, 256, 312, 246, 248, 325, 4000, 266, 201, 230, 293, 264, 265, 273, 301, 304, 253, 266, 3978, 228, + 232, 250, 248, 281, 219, 243, 293, 287, 253, 328, 3719 +}; -static const int32_t ES_W[183] = - { 2111, 109091, 9316, 969, 13656, 1349, 959, 10484, 1219, 14839, 1092, 23378, 1653, 1725, 1526, 8500, 15407, - 2058, 1346, 21066, 3758, 1734, 1950, 19955, 3997, 1732, 1784, 22687, 4392, 2448, 2180, 17456, 3930, 1851, - 1802, 24227, 4393, 2639, 2778, 18314, 4023, 2392, 2283, 20566, 4118, 2664, 2013, 18964, 2624, 45258, 5860, - 4124, 3473, 27772, 4687, 3140, 2939, 26288, 3808, 2967, 2823, 27219, 3943, 3242, 2667, 27372, 3522, 2899, - 2316, 26608, 3284, 2853, 2285, 19581, 2894, 2436, 24898, 4002, 2876, 2807, 25730, 3903, 2874, 2975, 26309, - 3771, 2763, 2666, 23404, 3826, 2410, 2644, 24629, 4145, 3121, 2878, 50773, 7040, 3945, 3292, 30828, 5210, - 2883, 3277, 31501, 4809, 3068, 3220, 30746, 4715, 3461, 3583, 32278, 4798, 3398, 3389, 31404, 4921, 3382, - 3766, 31821, 5848, 3860, 4047, 37642, 5793, 4271, 4094, 29853, 6163, 4399, 4063, 32151, 6038, 4332, 4041, - 30390, 5679, 4098, 3921, 29401, 5307, 3996, 3945, 45997, 7060, 3716, 4183, 26357, 6190, 3714, 4250, 29086, - 5929, 3491, 4489, 27772, 6656, 4219, 4348, 25851, 6088, 3617, 4477, 25722, 6303, 3856, 4208, 25348, 5896, - 3816, 4521, 22462, 5914, 3673, 4594, 18091, 6474, 3878, 4492, 10890, 4823, 4148 }; +static const int32_t ES_W[183] = { + 2111, 109091, 9316, 969, 13656, 1349, 959, 10484, 1219, 14839, 1092, 23378, 1653, 1725, 1526, 8500, 15407, + 2058, 1346, 21066, 3758, 1734, 1950, 19955, 3997, 1732, 1784, 22687, 4392, 2448, 2180, 17456, 3930, 1851, + 1802, 24227, 4393, 2639, 2778, 18314, 4023, 2392, 2283, 20566, 4118, 2664, 2013, 18964, 2624, 45258, 5860, + 4124, 3473, 27772, 4687, 3140, 2939, 26288, 3808, 2967, 2823, 27219, 3943, 3242, 2667, 27372, 3522, 2899, + 2316, 26608, 3284, 2853, 2285, 19581, 2894, 2436, 24898, 4002, 2876, 2807, 25730, 3903, 2874, 2975, 26309, + 3771, 2763, 2666, 23404, 3826, 2410, 2644, 24629, 4145, 3121, 2878, 50773, 7040, 3945, 3292, 30828, 5210, + 2883, 3277, 31501, 4809, 3068, 3220, 30746, 4715, 3461, 3583, 32278, 4798, 3398, 3389, 31404, 4921, 3382, + 3766, 31821, 5848, 3860, 4047, 37642, 5793, 4271, 4094, 29853, 6163, 4399, 4063, 32151, 6038, 4332, 4041, + 30390, 5679, 4098, 3921, 29401, 5307, 3996, 3945, 45997, 7060, 3716, 4183, 26357, 6190, 3714, 4250, 29086, + 5929, 3491, 4489, 27772, 6656, 4219, 4348, 25851, 6088, 3617, 4477, 25722, 6303, 3856, 4208, 25348, 5896, + 3816, 4521, 22462, 5914, 3673, 4594, 18091, 6474, 3878, 4492, 10890, 4823, 4148 +}; using namespace OHOS; using namespace OHOS::Media; diff --git a/services/screendemo/test.cpp b/services/screendemo/test.cpp index ed32f37..2c64473 100644 --- a/services/screendemo/test.cpp +++ b/services/screendemo/test.cpp @@ -13,9 +13,6 @@ * limitations under the License. */ -#include -#include - #include "display.h" #include "display_manager.h" #include "dscreen_source_handler.h"