From ede7b2bf4efc563176652f948c7c9ba4c5dea5c7 Mon Sep 17 00:00:00 2001 From: renhw001 Date: Sun, 29 Oct 2023 07:05:38 +0000 Subject: [PATCH 1/3] update README_zh.md. Signed-off-by: renhw001 --- README_zh.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_zh.md b/README_zh.md index 551a33b..5262ff3 100644 --- a/README_zh.md +++ b/README_zh.md @@ -28,6 +28,6 @@ astc-encoder编译框架时编译，使用BUILD.gn进行配置编译。 ## OpenHarmony使用方法 -提供生成ASTC码流的能力，码流可以直接由GPU解码显示 +提供生成ASTC码流的能力，码流可以直接由GPU解码显示。 -- Gitee From 6e7f92665eef3f286aec30b8f7876436c84f622a Mon Sep 17 00:00:00 2001 From: renhw001 Date: Sun, 29 Oct 2023 07:09:52 +0000 Subject: [PATCH 2/3] update patches/patches.json. Signed-off-by: renhw001 --- patches/patches.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/patches/patches.json b/patches/patches.json index 83db518..27267f4 100644 --- a/patches/patches.json +++ b/patches/patches.json @@ -4,6 +4,11 @@ "project":"image_framework", "patch":"foundation/multimedia/image_framework", "pr_url":"https://gitee.com/openharmony/multimedia_image_framework/pulls/1034" + }, + { + "project":"vendor_hihope", + "path":"vendor/hihope/rk3568", + "pr_url":"https://gitee.com/openharmony/vendor_hihope/pulls/964" } ] } \ No newline at end of file -- Gitee From 080f0e4acb5efbcb3ead38f74df25f208593ada0 Mon Sep 17 00:00:00 2001 From: renhw001 Date: Sun, 29 Oct 2023 07:50:26 +0000 Subject: [PATCH 3/3] update patches/patches.json. Signed-off-by: renhw001 --- BUILD.gn | 31 +++++++++++++++++++++++++++---- patches/patches.json | 7 +------ 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/BUILD.gn b/BUILD.gn index f609029..38c1dd7 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -51,12 +51,35 @@ ohos_source_set("astc_encoder_static") { } ohos_shared_library("astc_encoder_shared") { - deps = [ - ":astc_encoder_static", + public_configs = [":astc_encoder_config"] + sources = [ + "//third_party/astc-encoder/Source/astcenc_averages_and_directions.cpp", + "//third_party/astc-encoder/Source/astcenc_block_sizes.cpp", + "//third_party/astc-encoder/Source/astcenc_color_quantize.cpp", + "//third_party/astc-encoder/Source/astcenc_color_unquantize.cpp", + "//third_party/astc-encoder/Source/astcenc_compress_symbolic.cpp", + "//third_party/astc-encoder/Source/astcenc_compute_variance.cpp", + "//third_party/astc-encoder/Source/astcenc_decompress_symbolic.cpp", + "//third_party/astc-encoder/Source/astcenc_diagnostic_trace.cpp", + "//third_party/astc-encoder/Source/astcenc_entry.cpp", + "//third_party/astc-encoder/Source/astcenc_find_best_partitioning.cpp", + "//third_party/astc-encoder/Source/astcenc_ideal_endpoints_and_weights.cpp", + "//third_party/astc-encoder/Source/astcenc_image.cpp", + "//third_party/astc-encoder/Source/astcenc_integer_sequence.cpp", + "//third_party/astc-encoder/Source/astcenc_mathlib_softfloat.cpp", + "//third_party/astc-encoder/Source/astcenc_mathlib.cpp", + "//third_party/astc-encoder/Source/astcenc_partition_tables.cpp", + "//third_party/astc-encoder/Source/astcenc_percentile_tables.cpp", + "//third_party/astc-encoder/Source/astcenc_pick_best_endpoint_format.cpp", + "//third_party/astc-encoder/Source/astcenc_platform_isa_detection.cpp", + "//third_party/astc-encoder/Source/astcenc_quantization.cpp", + "//third_party/astc-encoder/Source/astcenc_symbolic_physical.cpp", + "//third_party/astc-encoder/Source/astcenc_weight_align.cpp", + "//third_party/astc-encoder/Source/astcenc_weight_quant_xfer_tables.cpp", ] output_extension = "so" - install_enable = true + # install_enable = true part_name = "astc-encoder" subsystem_name = "thirdparty" - install_images = ["system"] + # install_images = ["system"] } diff --git a/patches/patches.json b/patches/patches.json index 27267f4..fcd206d 100644 --- a/patches/patches.json +++ b/patches/patches.json @@ -1,14 +1,9 @@ { "patches":[ { - "project":"image_framework", + "project":"multimedia_image_framework", "patch":"foundation/multimedia/image_framework", "pr_url":"https://gitee.com/openharmony/multimedia_image_framework/pulls/1034" - }, - { - "project":"vendor_hihope", - "path":"vendor/hihope/rk3568", - "pr_url":"https://gitee.com/openharmony/vendor_hihope/pulls/964" } ] } \ No newline at end of file -- Gitee