diff --git a/build-profile.json5 b/build-profile.json5 index 03f4960a358792fed33c87a77e2e9be05fd28f9b..1815ec954858856c064717ebf77b92daa55e221c 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -13,21 +13,6 @@ "name": "release" } ], - "signingConfigs": [ - { - "name": "default", - "type": "HarmonyOS", - "material": { - "certpath": "C:\\Users\\lwx1314738\\.ohos\\config\\default_vap-product_lQC1CIxmHOg3mX9iRHAcw8DejHnM7Ow7Njnr0sPk5rs=.cer", - "storePassword": "0000001A1C5E5436E65C23FEE35FFBE3B6CD91AB8AAAD712F1287B1621D0B1B1F1201B5491891FA8D969", - "keyAlias": "debugKey", - "keyPassword": "0000001A8F7AC46C9DED174F4D7B971A927EAB6CBBCA6C4E320FB7DEB5D026D4C303209ABF7B81E15CEB", - "profile": "C:\\Users\\lwx1314738\\.ohos\\config\\default_vap-product_lQC1CIxmHOg3mX9iRHAcw8DejHnM7Ow7Njnr0sPk5rs=.p7b", - "signAlg": "SHA256withECDSA", - "storeFile": "C:\\Users\\lwx1314738\\.ohos\\config\\default_vap-product_lQC1CIxmHOg3mX9iRHAcw8DejHnM7Ow7Njnr0sPk5rs=.p12" - } - } - ] }, "modules": [ { diff --git a/entry/oh-package-lock.json5 b/entry/oh-package-lock.json5 index 7a4afc718703e29b1dda510cb205040b7b625ec0..b79e40b31ce2b0d5102b21ea5f1da99a6fd39fb3 100644 --- a/entry/oh-package-lock.json5 +++ b/entry/oh-package-lock.json5 @@ -4,25 +4,6 @@ }, "lockfileVersion": 3, "ATTENTION": "THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.", - "specifiers": { - "libvap.so@../oh_modules/.ohpm/vap_module@kqcvp2lepzmnuthykcfhrcqbqvy=/oh_modules/vap_module/src/main/cpp/types/libvap": "libvap.so@../oh_modules/.ohpm/vap_module@kqcvp2lepzmnuthykcfhrcqbqvy=/oh_modules/vap_module/src/main/cpp/types/libvap", - "vap_module@../vap_module": "vap_module@../vap_module/build/default/outputs/default/vap_module.har" - }, - "packages": { - "libvap.so@../oh_modules/.ohpm/vap_module@kqcvp2lepzmnuthykcfhrcqbqvy=/oh_modules/vap_module/src/main/cpp/types/libvap": { - "name": "libvap.so", - "version": "1", - "resolved": "../oh_modules/.ohpm/vap_module@kqcvp2lepzmnuthykcfhrcqbqvy=/oh_modules/vap_module/src/main/cpp/types/libvap", - "registryType": "local" - }, - "vap_module@../vap_module/build/default/outputs/default/vap_module.har": { - "name": "vap_module", - "version": "1.0.0", - "resolved": "../vap_module/build/default/outputs/default/vap_module.har", - "registryType": "local", - "dependencies": { - "libvap.so": "file:./src/main/cpp/types/libvap" - } - } - } + "specifiers": {}, + "packages": {} } \ No newline at end of file diff --git a/entry/oh-package.json5 b/entry/oh-package.json5 index ffa9ce24a817f16cce7d5462035f563ee4b08d6f..4ba6afd537b9953f42e0b083a6c11c9315d8f4a7 100644 --- a/entry/oh-package.json5 +++ b/entry/oh-package.json5 @@ -8,6 +8,5 @@ "main": "", "version": "1.0.0", "dependencies": { - "vap_module": "file:../vap_module" } } diff --git a/entry/src/main/ets/pages/GeneralAnimation.ets b/entry/src/main/ets/pages/GeneralAnimation.ets index 32a3be476850532ee808765e63cbdb6e3e5a913c..2b053f23b530636dbcc87663ce23432fd9f58051 100644 --- a/entry/src/main/ets/pages/GeneralAnimation.ets +++ b/entry/src/main/ets/pages/GeneralAnimation.ets @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/entry/src/main/ets/pages/VAPXAnimation.ets b/entry/src/main/ets/pages/VAPXAnimation.ets index 141a482d4d60abbef7e8aaa17281171097e9b6aa..129c94505fa9db03dcbbdc8973bb277b6f6d74e5 100644 --- a/entry/src/main/ets/pages/VAPXAnimation.ets +++ b/entry/src/main/ets/pages/VAPXAnimation.ets @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/oh-package-lock.json5 b/oh-package-lock.json5 index a984c1dc3184446fc8d3731534bb5ec0acc1412c..c459bc9e515a895529efbcf670edb1973211b089 100644 --- a/oh-package-lock.json5 +++ b/oh-package-lock.json5 @@ -7,7 +7,7 @@ "specifiers": { "@ohos/hamock@1.0.1-rc2": "@ohos/hamock@1.0.1-rc2", "@ohos/hypium@1.0.18": "@ohos/hypium@1.0.18", - "libvap.so@oh_modules/.ohpm/vap_module@kqcvp2lepzmnuthykcfhrcqbqvy=/oh_modules/vap_module/src/main/cpp/types/libvap": "libvap.so@oh_modules/.ohpm/vap_module@kqcvp2lepzmnuthykcfhrcqbqvy=/oh_modules/vap_module/src/main/cpp/types/libvap", + "libvap.so@oh_modules/.ohpm/vap_module@qblwjgjke8t+co7rbc2rja10zwq=/oh_modules/vap_module/src/main/cpp/types/libvap": "libvap.so@oh_modules/.ohpm/vap_module@qblwjgjke8t+co7rbc2rja10zwq=/oh_modules/vap_module/src/main/cpp/types/libvap", "vap_module@vap_module/build/default/outputs/default/vap_module.har": "vap_module@vap_module/build/default/outputs/default/vap_module.har" }, "packages": { @@ -27,10 +27,10 @@ "shasum": "cdbaf30436c45461a0c527da1aab0e916c7e1195", "registryType": "npm" }, - "libvap.so@oh_modules/.ohpm/vap_module@kqcvp2lepzmnuthykcfhrcqbqvy=/oh_modules/vap_module/src/main/cpp/types/libvap": { + "libvap.so@oh_modules/.ohpm/vap_module@qblwjgjke8t+co7rbc2rja10zwq=/oh_modules/vap_module/src/main/cpp/types/libvap": { "name": "libvap.so", "version": "1", - "resolved": "oh_modules/.ohpm/vap_module@kqcvp2lepzmnuthykcfhrcqbqvy=/oh_modules/vap_module/src/main/cpp/types/libvap", + "resolved": "oh_modules/.ohpm/vap_module@qblwjgjke8t+co7rbc2rja10zwq=/oh_modules/vap_module/src/main/cpp/types/libvap", "registryType": "local" }, "vap_module@vap_module/build/default/outputs/default/vap_module.har": { @@ -40,7 +40,8 @@ "registryType": "local", "dependencies": { "libvap.so": "file:./src/main/cpp/types/libvap" - } + }, + "maskedByOverrideDependencyMap": true } } } \ No newline at end of file diff --git a/vap_module/src/main/cpp/audio_decoder.cpp b/vap_module/src/main/cpp/audio_decoder.cpp index 8ca73cea6707a4f26b664fce51e436896b8ed375..3ef9ece6fc7758597f0343d04ba7d6d28a9665e2 100644 --- a/vap_module/src/main/cpp/audio_decoder.cpp +++ b/vap_module/src/main/cpp/audio_decoder.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/audio_player.cpp b/vap_module/src/main/cpp/audio_player.cpp index 19819ae4bcb1a0cd24261779669b7aa3062cd1bd..0e17031943ddc488fc4e5c824d9b87905e9c9a66 100644 --- a/vap_module/src/main/cpp/audio_player.cpp +++ b/vap_module/src/main/cpp/audio_player.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/decoder.cpp b/vap_module/src/main/cpp/decoder.cpp index 6cc23b4900ae9ce44016e356d5b08636353fd1b4..7b480c9212d39783dd70461dd079430884c90227 100644 --- a/vap_module/src/main/cpp/decoder.cpp +++ b/vap_module/src/main/cpp/decoder.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -13,9 +13,11 @@ * limitations under the License. */ +#include "decoder.h" + #include #include -#include "decoder.h" + #include "log.h" #undef LOG_TAG diff --git a/vap_module/src/main/cpp/demuxer.cpp b/vap_module/src/main/cpp/demuxer.cpp index ff34eef99fd88d7e7155dd252b3d8f4c34ec7bdb..8e6b2b0a499abf8b6a5eb357ffee845333214867 100644 --- a/vap_module/src/main/cpp/demuxer.cpp +++ b/vap_module/src/main/cpp/demuxer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/include/audio_decoder.h b/vap_module/src/main/cpp/include/audio_decoder.h index 739aead63362d0ca4dbc83d30832f64e98188ca2..fb0780408f002d19bc70de6ffe5dc493a715a246 100644 --- a/vap_module/src/main/cpp/include/audio_decoder.h +++ b/vap_module/src/main/cpp/include/audio_decoder.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/include/audio_player.h b/vap_module/src/main/cpp/include/audio_player.h index 1417fad67379ff0f121dcb40a110b74105211694..7dd899358cb112ed5d81a5bca1191c327073d7c3 100644 --- a/vap_module/src/main/cpp/include/audio_player.h +++ b/vap_module/src/main/cpp/include/audio_player.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/include/decoder.h b/vap_module/src/main/cpp/include/decoder.h index bde0cf99a73088ad5802d0b180d9650563483801..72f3f4f4398b2c0994dcfdd3e39c6a6da61d6efb 100644 --- a/vap_module/src/main/cpp/include/decoder.h +++ b/vap_module/src/main/cpp/include/decoder.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/include/demuxer.h b/vap_module/src/main/cpp/include/demuxer.h index e41d49d4784c1f7063b443e72cd920f835a8e366..c2e09ee409e1451db5c2d01570f93a596ad7118b 100644 --- a/vap_module/src/main/cpp/include/demuxer.h +++ b/vap_module/src/main/cpp/include/demuxer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -20,6 +20,8 @@ #include "multimedia/player_framework/native_avdemuxer.h" #include "sample_info.h" +static constexpr int32_t ONE_K = 1024; + class Demuxer { public: ~Demuxer(); diff --git a/vap_module/src/main/cpp/include/mask/mask_config.h b/vap_module/src/main/cpp/include/mask/mask_config.h index 54c177a8b3665455ce15afa64838b5dd29423ee4..4e3d1d639eb94847bb8258ad61bf7932207dfab9 100644 --- a/vap_module/src/main/cpp/include/mask/mask_config.h +++ b/vap_module/src/main/cpp/include/mask/mask_config.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,11 +16,12 @@ #ifndef VAP_MASK_CONFIG_H #define VAP_MASK_CONFIG_H -#include "texture_load_util.h" -#include "vertex_util.h" #include #include +#include "texture_load_util.h" +#include "vertex_util.h" + class MaskConfig { public: MaskConfig(int32_t width, int32_t height); diff --git a/vap_module/src/main/cpp/include/mask/mask_render.h b/vap_module/src/main/cpp/include/mask/mask_render.h index df5b30c2e823d8366a8cdd4eb18ed80fc3125936..b4790d77531fc5fe1e08e5ce877a009c2ab54e1d 100644 --- a/vap_module/src/main/cpp/include/mask/mask_render.h +++ b/vap_module/src/main/cpp/include/mask/mask_render.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/include/mask/mask_shader.h b/vap_module/src/main/cpp/include/mask/mask_shader.h index ae6682308ba765709703111ce5190118ec0b8b34..a4d334ee8b1dab30f9b695076b16b4411f2be084 100644 --- a/vap_module/src/main/cpp/include/mask/mask_shader.h +++ b/vap_module/src/main/cpp/include/mask/mask_shader.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/include/mix/frame.h b/vap_module/src/main/cpp/include/mix/frame.h index efe28cb1f7abd91bc2bf0fddb3dd3a7ffa2c69fe..493b3d70b233e668b3ba3f7490ba33a0e1644e5a 100644 --- a/vap_module/src/main/cpp/include/mix/frame.h +++ b/vap_module/src/main/cpp/include/mix/frame.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/include/mix/mix_render.h b/vap_module/src/main/cpp/include/mix/mix_render.h index bdb916f395f2a15b0c564126549bbca373b562ec..6d34961117c1143fea1b669b4d22c15f1136c40f 100644 --- a/vap_module/src/main/cpp/include/mix/mix_render.h +++ b/vap_module/src/main/cpp/include/mix/mix_render.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/include/mix/mix_shader.h b/vap_module/src/main/cpp/include/mix/mix_shader.h index 559400846b6af3e59a02283ddac93ea31392753a..d6fd8aeb6e3922b3690e389e031f036e714bbabb 100644 --- a/vap_module/src/main/cpp/include/mix/mix_shader.h +++ b/vap_module/src/main/cpp/include/mix/mix_shader.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/include/mix/src.h b/vap_module/src/main/cpp/include/mix/src.h index df8a96fc42507f9807c9f0fff800f26c0f60c3b2..9beb42858505e74dc27ba00c430c0747a021359d 100644 --- a/vap_module/src/main/cpp/include/mix/src.h +++ b/vap_module/src/main/cpp/include/mix/src.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/include/player.h b/vap_module/src/main/cpp/include/player.h index d7e08f3416d753b1745868c8fdbab157860c5e4d..8f1f9acac0948221464df54fc9c31d24bec6c9a0 100644 --- a/vap_module/src/main/cpp/include/player.h +++ b/vap_module/src/main/cpp/include/player.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/include/plugin_manager.h b/vap_module/src/main/cpp/include/plugin_manager.h index 24a7ee3498f97c4be65e2ffa7f0242d64cc487db..d98a60d77e2c5e65ca3e99e74fca0b43fcc40e48 100644 --- a/vap_module/src/main/cpp/include/plugin_manager.h +++ b/vap_module/src/main/cpp/include/plugin_manager.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/include/render/anim_config.h b/vap_module/src/main/cpp/include/render/anim_config.h index 10854fc06fde2b7a965084fc52de9f1f1768b196..7c7cc97c6fcac8de5b0d60afc11e317aa9d98487 100644 --- a/vap_module/src/main/cpp/include/render/anim_config.h +++ b/vap_module/src/main/cpp/include/render/anim_config.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/include/render/egl_core.h b/vap_module/src/main/cpp/include/render/egl_core.h index 230e74477eb60b5f5bbc1a95d97d40a3cd23e9c3..8b8a663b1cadb28bc9047ec4fab1eeced11c9374 100644 --- a/vap_module/src/main/cpp/include/render/egl_core.h +++ b/vap_module/src/main/cpp/include/render/egl_core.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/include/render/plugin_render.h b/vap_module/src/main/cpp/include/render/plugin_render.h index a641e0823d5fb764e05ff4ee19ae0a96a6fbda1a..4506a4238c6985550222829b2253476712b002c4 100644 --- a/vap_module/src/main/cpp/include/render/plugin_render.h +++ b/vap_module/src/main/cpp/include/render/plugin_render.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -50,8 +50,8 @@ public: static OH_NativeXComponent_Callback m_callback; static std::unordered_map m_jsCallback; // id+type - void ParseCallback(void *&playDoneCallbackData, napi_env env, - napi_value val, std::string id, std::string type); + void ParseCallback(void *&playDoneCallbackData, napi_env env, + napi_value val, std::string id, std::string type); void PutRef(std::string key, napi_ref ref) // type { diff --git a/vap_module/src/main/cpp/include/render/shader_util.h b/vap_module/src/main/cpp/include/render/shader_util.h index 36265bd397ed53502eefaf6f50ad2ce772b32da2..b5ef815c9521d32788f072a8ae79dac8e4ac328d 100644 --- a/vap_module/src/main/cpp/include/render/shader_util.h +++ b/vap_module/src/main/cpp/include/render/shader_util.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/include/render/yuv_render.h b/vap_module/src/main/cpp/include/render/yuv_render.h index b93ba3c1fac6c25ec50d0c9acceb0dddda204c7c..fde10b490cdeb3960b0ef1af409ed5bf23dab006 100644 --- a/vap_module/src/main/cpp/include/render/yuv_render.h +++ b/vap_module/src/main/cpp/include/render/yuv_render.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/include/resource_request.h b/vap_module/src/main/cpp/include/resource_request.h index 19ac6bcef98217edbbb4301c6227d8976a868f8d..25a5548a5190cd702e9318a002a852bf8c8f9419 100644 --- a/vap_module/src/main/cpp/include/resource_request.h +++ b/vap_module/src/main/cpp/include/resource_request.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/include/sample_info.h b/vap_module/src/main/cpp/include/sample_info.h index 65fe017894ec7fc82acd15daecb1bc0ac66c8fab..7c26528bd067d00411f59b162b258a1330fc78d1 100644 --- a/vap_module/src/main/cpp/include/sample_info.h +++ b/vap_module/src/main/cpp/include/sample_info.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/include/util/log.h b/vap_module/src/main/cpp/include/util/log.h index 1bf258a3fe8730d6e10c41ff84ee87aee086254d..96e775ba04579051fff4fce53443e1094370467e 100644 --- a/vap_module/src/main/cpp/include/util/log.h +++ b/vap_module/src/main/cpp/include/util/log.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/include/util/shader_util.h b/vap_module/src/main/cpp/include/util/shader_util.h index a3337ebf3e6313c2a6e47bdb5ee84e6b32444a42..c1df15f1fd2c0db6aae155a86aa44f8a6d306f63 100644 --- a/vap_module/src/main/cpp/include/util/shader_util.h +++ b/vap_module/src/main/cpp/include/util/shader_util.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/include/util/tex_coords_util.h b/vap_module/src/main/cpp/include/util/tex_coords_util.h index 9bc9c90ae7f6897781521d429412230120a10f1b..d9134b703e772ff237a4f3dc12a12e04e7f08827 100644 --- a/vap_module/src/main/cpp/include/util/tex_coords_util.h +++ b/vap_module/src/main/cpp/include/util/tex_coords_util.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/include/util/texture_load_util.h b/vap_module/src/main/cpp/include/util/texture_load_util.h index 8fc76cd7263903b9aff0046ed0263a52a5adf3fa..1f4e0d6dfecfdb9dabcc5ee17d7732c257863fe9 100644 --- a/vap_module/src/main/cpp/include/util/texture_load_util.h +++ b/vap_module/src/main/cpp/include/util/texture_load_util.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/include/util/vertex_util.h b/vap_module/src/main/cpp/include/util/vertex_util.h index 8213407fc0f49970cf010730add5c4fd3146449d..484126e0050a74f20abb92d1db5c4ac218411242 100644 --- a/vap_module/src/main/cpp/include/util/vertex_util.h +++ b/vap_module/src/main/cpp/include/util/vertex_util.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/manager/plugin_manager.cpp b/vap_module/src/main/cpp/manager/plugin_manager.cpp index e51d413a9b69e97a81c49e3bfd0ba61d5dde3594..2a2fbf3d7ef8d2f5a030a69a3b0196e3e5d91be2 100644 --- a/vap_module/src/main/cpp/manager/plugin_manager.cpp +++ b/vap_module/src/main/cpp/manager/plugin_manager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -43,7 +43,7 @@ PluginManager::~PluginManager() for (auto iter = m_pluginRenderMap.begin(); iter != m_pluginRenderMap.end(); ++iter) { if (nullptr != iter->second) { - // delete iter->second; + delete iter->second; iter->second = nullptr; } } diff --git a/vap_module/src/main/cpp/mask/mask_config.cpp b/vap_module/src/main/cpp/mask/mask_config.cpp index 5c3c877b89819d2f855eebbd4a90afa71ab63d74..e98c171c417917980eecfe3776c2e0b4e021bc40 100644 --- a/vap_module/src/main/cpp/mask/mask_config.cpp +++ b/vap_module/src/main/cpp/mask/mask_config.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -23,7 +23,7 @@ MaskConfig::MaskConfig(int32_t width, int32_t height) MaskConfig::~MaskConfig() { - if(maskTexId_) { + if (maskTexId_) { glDeleteTextures(1, &maskTexId_); } } diff --git a/vap_module/src/main/cpp/mask/mask_render.cpp b/vap_module/src/main/cpp/mask/mask_render.cpp index 8a99d543d423dc040cb1c3e6b64b2dffdc01230b..73038f0035de0a76138ddd2bce2654bb00078cb0 100644 --- a/vap_module/src/main/cpp/mask/mask_render.cpp +++ b/vap_module/src/main/cpp/mask/mask_render.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/mask/mask_shader.cpp b/vap_module/src/main/cpp/mask/mask_shader.cpp index 7b886cdf918220ac176e8d2148c37f9f935f4b24..1beaa04ae7263385ebaeea1f4ca5365955851d40 100644 --- a/vap_module/src/main/cpp/mask/mask_shader.cpp +++ b/vap_module/src/main/cpp/mask/mask_shader.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/mix/frame.cpp b/vap_module/src/main/cpp/mix/frame.cpp index 07b78ddcda391b1b2b2eae15e8d06bf127d231e5..94f0067425527ad27751a8be30080b50bfe0a04b 100644 --- a/vap_module/src/main/cpp/mix/frame.cpp +++ b/vap_module/src/main/cpp/mix/frame.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,8 +14,9 @@ */ #include "frame.h" -#include "log.h" + #include +#include "log.h" Frame::Frame(json jsonFrame) { diff --git a/vap_module/src/main/cpp/mix/mix_render.cpp b/vap_module/src/main/cpp/mix/mix_render.cpp index 74a84356cde2ea3e9a254e98eaaf31e5f590db9b..fd99fc1c7e875a93035b98c57e0b93e344258ca4 100644 --- a/vap_module/src/main/cpp/mix/mix_render.cpp +++ b/vap_module/src/main/cpp/mix/mix_render.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -91,7 +91,6 @@ void MixRender::Init() } } - GLuint textureId; bitmap.imgWidth = src.w; bitmap.imgHeight = src.h; @@ -148,17 +147,10 @@ void MixRender::RenderFrame(MixConfigSize config, Frame frame, Src src) m_srcArray.SetArray(m_srcArray.array.get()); m_srcArray.EnableVertexAttrib(m_shader->m_aTextureSrcCoordinatesLocation); - // 绑定 src纹理 glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, src.srcTextureId); glUniform1i(m_shader->m_uTextureSrcUnitLocation, 0); - GLenum error = glGetError(); - if (error != GL_NO_ERROR) { - LOGE("glGetError bind src texture error: %{public}x", error); - } - - // mask 纹理 TexCoordsUtil::Create(config.videoWidth, config.videoHeight, frame.mFrame, m_maskArray.array.get()); m_maskArray.SetArray(m_maskArray.array.get()); if (frame.mt == 90) { @@ -166,24 +158,12 @@ void MixRender::RenderFrame(MixConfigSize config, Frame frame, Src src) m_maskArray.SetArray(m_maskArray.array.get()); } m_maskArray.EnableVertexAttrib(m_shader->m_aTextureMaskCoordinatesLocation); - - error = glGetError(); - if (error != GL_NO_ERROR) { - LOGE("glGetError before bind mask texture error: %{public}x", error); - } - // 绑定 mask纹理 glActiveTexture(GL_TEXTURE1); glBindTexture(GL_TEXTURE_2D, videoTextureId); glUniform1i(m_shader->m_uTextureMaskUnitLocation, 1); - error = glGetError(); - if (error != GL_NO_ERROR) { - LOGE("glGetError bind mask texture error: %{public}x", error); - } - - // 属性处理 - if (src.srcType == SrcType::TXT) { // // 文字需要颜色填充 + if (src.srcType == SrcType::TXT) { glUniform1i(m_shader->m_uIsFillLocation, 1); std::vector argb; transColor(src.color, argb); @@ -194,16 +174,8 @@ void MixRender::RenderFrame(MixConfigSize config, Frame frame, Src src) } glEnable(GL_BLEND); - // 基于源象素alpha通道值的半透明混合函数 glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA); - // draw glDrawArrays(GL_TRIANGLE_STRIP, 0, 4); - - error = glGetError(); - if (error != GL_NO_ERROR) { - LOGE("glGetError draw error: %{public}x", error); - } - glDisable(GL_BLEND); } diff --git a/vap_module/src/main/cpp/mix/mix_shader.cpp b/vap_module/src/main/cpp/mix/mix_shader.cpp index 1e326108ae96cda61e04871fc5177c99c66aaf5f..f69fecdc27a7b99adb50a3a4dd9fbc0755962eed 100644 --- a/vap_module/src/main/cpp/mix/mix_shader.cpp +++ b/vap_module/src/main/cpp/mix/mix_shader.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/mix/src.cpp b/vap_module/src/main/cpp/mix/src.cpp index 33b1830ea14710fe0e0e36b482a10f89ba7f7d96..751475ddada7d7211dd39d75628025b5291aad65 100644 --- a/vap_module/src/main/cpp/mix/src.cpp +++ b/vap_module/src/main/cpp/mix/src.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/napi/n_func_arg.h b/vap_module/src/main/cpp/napi/n_func_arg.h index 04b3d2f1897c091a469708ca77a03f7a987936af..b230a104ec534ed62c512d4567bd057772fc433f 100644 --- a/vap_module/src/main/cpp/napi/n_func_arg.h +++ b/vap_module/src/main/cpp/napi/n_func_arg.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/napi/n_val.cpp b/vap_module/src/main/cpp/napi/n_val.cpp index db531c431530ed80fae530879a6c9a4368466348..5fae0096308a9d6ccc8c87ed4756df5c354d1399 100644 --- a/vap_module/src/main/cpp/napi/n_val.cpp +++ b/vap_module/src/main/cpp/napi/n_val.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/napi/n_val.h b/vap_module/src/main/cpp/napi/n_val.h index 772afc447a97294758fd604e8a43e53fe60262ec..68d30c4b9af84a647f159813bcfe0dedbb91f3d9 100644 --- a/vap_module/src/main/cpp/napi/n_val.h +++ b/vap_module/src/main/cpp/napi/n_val.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/napi_init.cpp b/vap_module/src/main/cpp/napi_init.cpp index 90b6c675b553e7221f4b549c96373b854c2e83d5..e2009b7dcb184ef368d365c58f555639f8c80689 100644 --- a/vap_module/src/main/cpp/napi_init.cpp +++ b/vap_module/src/main/cpp/napi_init.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/player.cpp b/vap_module/src/main/cpp/player.cpp index f6d0c726ca3a00fdaa2e62e7842fac1d97557a6e..3dea562532a0049d30dfecf9805947df11f6cf52 100644 --- a/vap_module/src/main/cpp/player.cpp +++ b/vap_module/src/main/cpp/player.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -35,7 +35,7 @@ using namespace std::chrono_literals; Player::~Player() { - Player::StartRelease(); +// Player::StartRelease(); } int32_t OpenFile(SampleInfo &sampleInfo) @@ -221,10 +221,9 @@ void Player::StartRelease() { LOGI("StartRelease %{public}d %{public}d", isVideoEnd_.load(), isAudioEnd_.load()); - if (isReleased_) return; - // 获取锁 std::unique_lock lock(mutex_); + if (isReleased_) return; if (!isVideoEnd_ || !isAudioEnd_) return; diff --git a/vap_module/src/main/cpp/render/anim_config.cpp b/vap_module/src/main/cpp/render/anim_config.cpp index 41fbbb2acee47510684c472784acf48f7cf5624d..3241ed1005952ee73345b8580e38edb87ef5f870 100644 --- a/vap_module/src/main/cpp/render/anim_config.cpp +++ b/vap_module/src/main/cpp/render/anim_config.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -19,7 +19,7 @@ AnimConfig::~AnimConfig() { - if(srcMapPtr) { + if (srcMapPtr) { srcMapPtr->srcSMap.clear(); } if (frameAllPtr) { @@ -70,7 +70,7 @@ int AnimConfig::GetJson(std::string &jsonStr, std::string uri) bool AnimConfig::ParseJson(std::string uri) { LOGI("Enter ParseJson"); - if(isInit) { + if (isInit) { LOGI("Json data has been initialized"); return true; } @@ -125,7 +125,7 @@ bool AnimConfig::ParseJson(std::string uri) void AnimConfig::GetSrc(std::map &src) { - if(!srcMapPtr) { + if (!srcMapPtr) { LOGW("this file not have src prop"); } else { src = srcMapPtr->srcSMap; diff --git a/vap_module/src/main/cpp/render/egl_core.cpp b/vap_module/src/main/cpp/render/egl_core.cpp index 9e9550f98495f72e05151099a8bd7fb80807a7b0..fdf58aff7f4aa9d47243b412518ab8866fee78f1 100644 --- a/vap_module/src/main/cpp/render/egl_core.cpp +++ b/vap_module/src/main/cpp/render/egl_core.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/render/plugin_render.cpp b/vap_module/src/main/cpp/render/plugin_render.cpp index ada994c7970189167b7106896b227ecc15d26456..956539c009ddd07ac93569981deaa8d8ccad7207 100644 --- a/vap_module/src/main/cpp/render/plugin_render.cpp +++ b/vap_module/src/main/cpp/render/plugin_render.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -387,12 +387,17 @@ void Callback(void *asyncContext) } uv_loop_s *loop = nullptr; CallbackContext *context = (CallbackContext *)asyncContext; - napi_get_uv_event_loop(context->env, &loop); + napi_status status = napi_get_uv_event_loop(context->env, &loop); + if (status != napi_ok) { + LOGE("Callback con not napi_get_uv_event_loop %{public}d", status); + return; + } uv_work_t *work = new uv_work_t; work->data = context; uv_queue_work( loop, work, [](uv_work_t *work) { LOGI("enter uv_work_t Callback"); }, - [](uv_work_t *work, int status) { + [](uv_work_t *work, int status) + { LOGI("enter complete Callback"); CallbackContext *context = (CallbackContext *)work->data; napi_handle_scope scope = nullptr; @@ -616,7 +621,7 @@ void PluginRender::Release(std::string &id) PluginRender *render = PluginRender::GetInstance(id); if (nullptr != render) { if (!render->refMap_.empty()) { - for (auto it = render->refMap_.begin(); it != render->refMap_.end(); ) { + for (auto it = render->refMap_.begin(); it != render->refMap_.end();) { napi_delete_reference(render->env_, it->second); it = render->refMap_.erase(it); } @@ -628,8 +633,8 @@ void PluginRender::Release(std::string &id) m_jsCallback.erase(m_jsCallback.find(key)); } } - delete render; - render = nullptr; +// delete render; +// render = nullptr; m_instance.erase(m_instance.find(id)); } } \ No newline at end of file diff --git a/vap_module/src/main/cpp/render/yuv_render.cpp b/vap_module/src/main/cpp/render/yuv_render.cpp index e233e4f59f7c9513f276a63b61c486d8deedfed0..c1277c7c65e2ed4c8b7bc221a56cfe2849fd73b8 100644 --- a/vap_module/src/main/cpp/render/yuv_render.cpp +++ b/vap_module/src/main/cpp/render/yuv_render.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/resource_request.cpp b/vap_module/src/main/cpp/resource_request.cpp index 9f208c5b589723e584abf1e3af99ae73e0115b32..dddf4936ad6fd9f87e6d419261ab4be56f4b7df0 100644 --- a/vap_module/src/main/cpp/resource_request.cpp +++ b/vap_module/src/main/cpp/resource_request.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/util/shader_util.cpp b/vap_module/src/main/cpp/util/shader_util.cpp index b822e5615c34dcd441adc44bb4e8390088fb73b8..5a652c71d7042d65e45fe1f4512f5dbc771129b5 100644 --- a/vap_module/src/main/cpp/util/shader_util.cpp +++ b/vap_module/src/main/cpp/util/shader_util.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/util/tex_coords_util.cpp b/vap_module/src/main/cpp/util/tex_coords_util.cpp index ea652e757b9d121807e52c0db57365324be881a8..3fd1aa67ef7f3b49e2db39acb89f1af2ec1d3814 100644 --- a/vap_module/src/main/cpp/util/tex_coords_util.cpp +++ b/vap_module/src/main/cpp/util/tex_coords_util.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git a/vap_module/src/main/cpp/util/texture_load_util.cpp b/vap_module/src/main/cpp/util/texture_load_util.cpp index 95a3ec87e6b8b08b086acb20567f6513cbd5067c..fc5aaefb6ef570cda7bcb96f2b2bad7ca553b4bf 100644 --- a/vap_module/src/main/cpp/util/texture_load_util.cpp +++ b/vap_module/src/main/cpp/util/texture_load_util.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -14,12 +14,13 @@ */ #include "texture_load_util.h" -#include "log.h" + #include +#include "log.h" void TextureLoadUtil::loadTexture(BitMap bitmap, GLuint *textureId) { - if(!textureId) { + if (!textureId) { LOGE("textureId nullptr"); return; } @@ -39,7 +40,8 @@ void TextureLoadUtil::loadTexture(BitMap bitmap, GLuint *textureId) glBindTexture(GL_TEXTURE_2D, textures[0]); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, bitmap.imgWidth, bitmap.imgHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, bitmap.pixelsData.data()); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, bitmap.imgWidth, bitmap.imgHeight, 0, GL_RGBA, + GL_UNSIGNED_BYTE, bitmap.pixelsData.data()); glGenerateMipmap(GL_TEXTURE_2D); glBindTexture(GL_TEXTURE_2D, 0); diff --git a/vap_module/src/main/cpp/util/vertex_util.cpp b/vap_module/src/main/cpp/util/vertex_util.cpp index 0ed205b007c71e0066d80d57c8d460be895bb104..88aadc2cb9fd3f4d21d2ab824ee1beb87d275623 100644 --- a/vap_module/src/main/cpp/util/vertex_util.cpp +++ b/vap_module/src/main/cpp/util/vertex_util.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at diff --git "a/\347\244\272\344\276\213\344\273\243\347\240\201.ets" "b/\347\244\272\344\276\213\344\273\243\347\240\201.ets" index 41390b3a74190c4dc27234ade09bd236cf8feda0..ca78f731725d60a247e64f37b81136179991037e 100644 --- "a/\347\244\272\344\276\213\344\273\243\347\240\201.ets" +++ "b/\347\244\272\344\276\213\344\273\243\347\240\201.ets" @@ -1,5 +1,5 @@ /* - * Copyright (c) 2024 Huawei Device Co., Ltd. + * Copyright (c) Huawei Technologies Co., Ltd. 2024-2024. All rights reserved. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at