From 49dd74df893ce3f2f3796ef06da4d8ddad55e06f Mon Sep 17 00:00:00 2001 From: xiayan Date: Tue, 11 Apr 2023 18:30:57 +0800 Subject: [PATCH] Update to 3.2Release Signed-off-by: xiayan --- README.en.md | 4 +- README.md | 4 +- ..._framework=services_engine_gstreamer.patch | 53 ------------------- .../d2000/preinstall-config/install_list.json | 4 ++ .../install_list_capability.json | 13 ++++- 5 files changed, 20 insertions(+), 58 deletions(-) delete mode 100644 device_board_phytium/d2000/patch/0005=foundation-multimedia-player_framework=services_engine_gstreamer.patch diff --git a/README.en.md b/README.en.md index 22d176f..329e77a 100644 --- a/README.en.md +++ b/README.en.md @@ -1,6 +1,6 @@ # Phytium-OpenHarmony-D2000-device ## Intro -This project introduces how to run OpenHarmony standard system ([ver 3.2 Beta5](https://gitee.com/openharmony/docs/blob/master/zh-cn/release-notes/OpenHarmony-v3.2-beta5.md)) on Phytium D2000 + X100 DEV hardware platform from Phytium Technology Co., Ltd. +This project introduces how to run OpenHarmony standard system ([ver 3.2 Release](https://gitee.com/openharmony/docs/blob/master/zh-cn/release-notes/OpenHarmony-v3.2-release.md)) on Phytium D2000 + X100 DEV hardware platform from Phytium Technology Co., Ltd. It supports video decoding hardware acceleration and graphics display hardware acceleration provided by the X100. It supports Linux kernel 5.10. @@ -35,7 +35,7 @@ export PROJ_ROOT=$WORK_SPACE/OpenHarmony mkdir $WORK_SPACE mkdir $PROJ_ROOT cd &PROJ_ROOT -repo init -u git@gitee.com:openharmony/manifest.git -b OpenHarmony-3.2-Beta5 --no-repo-verify +repo init -u git@gitee.com:openharmony/manifest.git -b OpenHarmony-3.2-Release --no-repo-verify repo sync -c repo forall -c 'git lfs pull' ``` diff --git a/README.md b/README.md index 4e78617..c092a0e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Phytium-OpenHarmony-D2000-device ## 介绍 -该项目介绍，如何在飞腾信息科技有限公司的 Phytium D2000 + X100 DEV硬件平台上运行 OpenHarmony 标准系统（[ver 3.2Beta5](https://gitee.com/openharmony/docs/blob/master/zh-cn/release-notes/OpenHarmony-v3.2-beta5.md)）。 +该项目介绍，如何在飞腾信息科技有限公司的 Phytium D2000 + X100 DEV硬件平台上运行 OpenHarmony 标准系统（[ver 3.2Release](https://gitee.com/openharmony/docs/blob/master/zh-cn/release-notes/OpenHarmony-v3.2-release.md)）。 支持X100提供的视频解码硬件加速，以及图形显示硬件加速。 支持Linux kernel 5.10。 @@ -34,7 +34,7 @@ export PROJ_ROOT=$WORK_SPACE/OpenHarmony mkdir $WORK_SPACE mkdir $PROJ_ROOT cd &PROJ_ROOT -repo init -u git@gitee.com:openharmony/manifest.git -b OpenHarmony-3.2-Beta5 --no-repo-verify +repo init -u git@gitee.com:openharmony/manifest.git -b OpenHarmony-3.2-Release --no-repo-verify repo sync -c repo forall -c 'git lfs pull' ``` diff --git a/device_board_phytium/d2000/patch/0005=foundation-multimedia-player_framework=services_engine_gstreamer.patch b/device_board_phytium/d2000/patch/0005=foundation-multimedia-player_framework=services_engine_gstreamer.patch deleted file mode 100644 index a5dd353..0000000 --- a/device_board_phytium/d2000/patch/0005=foundation-multimedia-player_framework=services_engine_gstreamer.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/services/engine/gstreamer/common/playbin_adapter/playbin2_ctrler.cpp b/services/engine/gstreamer/common/playbin_adapter/playbin2_ctrler.cpp -index 5f467f89..da882663 100644 ---- a/services/engine/gstreamer/common/playbin_adapter/playbin2_ctrler.cpp -+++ b/services/engine/gstreamer/common/playbin_adapter/playbin2_ctrler.cpp -@@ -47,7 +47,8 @@ PlayBin2Ctrler::~PlayBin2Ctrler() - - int32_t PlayBin2Ctrler::OnInit() - { -- playbin_ = reinterpret_cast(gst_element_factory_make("playbin", "playbin")); -+ // playbin_ = reinterpret_cast(gst_element_factory_make("playbin", "playbin")); -+ playbin_ = reinterpret_cast(gst_parse_launch ("playbin", nullptr)); - if (playbin_ == nullptr) { - MEDIA_LOGE("create playbin failed"); - return MSERR_UNKNOWN; -diff --git a/services/engine/gstreamer/common/playbin_adapter/playbin_ctrler_base.cpp b/services/engine/gstreamer/common/playbin_adapter/playbin_ctrler_base.cpp -index 23393e09..3b298704 100644 ---- a/services/engine/gstreamer/common/playbin_adapter/playbin_ctrler_base.cpp -+++ b/services/engine/gstreamer/common/playbin_adapter/playbin_ctrler_base.cpp -@@ -690,7 +690,33 @@ void PlayBinCtrlerBase::SetupCustomElement() - } - videoSink_ = sinkProvider_->CreateVideoSink(); - if (videoSink_ != nullptr) { -- g_object_set(playbin_, "video-sink", videoSink_, nullptr); -+ -+ GstElement *bin, *convert; -+ GstPad *pad, *ghost_pad; -+ convert = gst_element_factory_make ("videoconvert", "convert"); -+ if (!convert ) { -+ MEDIA_LOGE ("videoconvert elements could be created.\n"); -+ } -+ /* Create the sink bin, add the elements and link them */ -+ bin = gst_bin_new ("video_sink_bin"); -+ if(!bin) -+ MEDIA_LOGE ("video_sink_bin could be created.\n"); -+ if(!bin || !convert){ -+ MEDIA_LOGD("Set playbind use default vido-sink"); -+ g_object_set(playbin_, "video-sink", videoSink_, nullptr); -+ } -+ else{ -+ gst_bin_add_many (GST_BIN (bin), convert, videoSink_, nullptr); -+ gst_element_link_many (convert, videoSink_, nullptr); -+ /* Set playbin's video sink to be our sink bin */ -+ pad = gst_element_get_static_pad (convert, "sink"); -+ ghost_pad = gst_ghost_pad_new ("sink", pad); -+ gst_pad_set_active (ghost_pad, TRUE); -+ gst_element_add_pad (bin, ghost_pad); -+ gst_object_unref (pad); -+ MEDIA_LOGD("Set playbin's video sink to be our sink bin"); -+ g_object_set (playbin_, "video-sink", bin, nullptr); -+ } - } else if (audioSink_ != nullptr) { - g_object_set(playbin_, "video-sink", audioSink_, nullptr); - } diff --git a/vendor_phytium/d2000/preinstall-config/install_list.json b/vendor_phytium/d2000/preinstall-config/install_list.json index 98ff9c7..13fdc0c 100644 --- a/vendor_phytium/d2000/preinstall-config/install_list.json +++ b/vendor_phytium/d2000/preinstall-config/install_list.json @@ -171,6 +171,10 @@ { "app_dir": "/system/app/com.ohos.notificationdialog", "removable": true + }, + { + "app_dir": "/system/app/com.ohos.formrenderservice", + "removable": false } ] } diff --git a/vendor_phytium/d2000/preinstall-config/install_list_capability.json b/vendor_phytium/d2000/preinstall-config/install_list_capability.json index ba7a035..6c45b3d 100644 --- a/vendor_phytium/d2000/preinstall-config/install_list_capability.json +++ b/vendor_phytium/d2000/preinstall-config/install_list_capability.json @@ -53,7 +53,9 @@ { "bundleName": "com.ohos.devicetest", "app_signature" : ["8E93863FC32EE238060BF69A9B37E2608FFFB21F93C862DD511CBAC9F30024B5"], - "runningResourcesApply": true + "runningResourcesApply": true, + "associatedWakeUp": true, + "allowAppUsePrivilegeExtension": true }, { "bundleName": "com.ohos.contactsdataability", @@ -78,6 +80,7 @@ { "bundleName": "cn.openharmony.inputmethodchoosedialog", "app_signature" : ["8E93863FC32EE238060BF69A9B37E2608FFFB21F93C862DD511CBAC9F30024B5"], + "allowAppDesktopIconHide": true, "allowAppUsePrivilegeExtension": true }, { @@ -94,6 +97,7 @@ { "bundleName": "com.ohos.devicemanagerui", "app_signature": ["8E93863FC32EE238060BF69A9B37E2608FFFB21F93C862DD511CBAC9F30024B5"], + "allowAppDesktopIconHide": true, "allowAppUsePrivilegeExtension": true }, { @@ -150,6 +154,13 @@ "app_signature" : ["49D779C85200D36A00DE63E2D85AEF22FE5C72FB268BE13923E589B49BFAFFDA"], "singleton": true, "allowAppDesktopIconHide": true + }, + { + "bundleName": "com.ohos.formrenderservice", + "app_signature": ["8E93863FC32EE238060BF69A9B37E2608FFFB21F93C862DD511CBAC9F30024B5"], + "singleton": true, + "allowAppUsePrivilegeExtension": true, + "allowAppDesktopIconHide": true } ] } -- Gitee