From 7fb56db2dcadda21355a18966eb4026aba5b960f Mon Sep 17 00:00:00 2001 From: Noel Victor Date: Thu, 6 Feb 2020 13:20:14 -0500 Subject: [PATCH] ARCore Android SDK v1.15.0 --- LICENSE | 616 +----------------- libraries/include/arcore_c_api.h | 41 +- samples/augmented_image_c/app/build.gradle | 12 +- samples/augmented_image_java/app/build.gradle | 2 +- .../common/rendering/BackgroundRenderer.java | 7 +- samples/cloud_anchor_java/app/build.gradle | 2 +- .../common/rendering/BackgroundRenderer.java | 7 +- samples/computervision_c/app/build.gradle | 12 +- samples/computervision_java/app/build.gradle | 2 +- .../common/rendering/BackgroundRenderer.java | 7 +- samples/hello_ar_c/app/build.gradle | 12 +- samples/hello_ar_java/app/build.gradle | 2 +- .../common/rendering/BackgroundRenderer.java | 7 +- samples/shared_camera_java/app/build.gradle | 2 +- .../common/rendering/BackgroundRenderer.java | 7 +- .../sharedcamera/SharedCameraActivity.java | 18 +- 16 files changed, 90 insertions(+), 666 deletions(-) diff --git a/LICENSE b/LICENSE index 9e986071e..3d412cf8f 100644 --- a/LICENSE +++ b/LICENSE @@ -9540,7 +9540,7 @@ Error Prone limitations under the License. ******************************************************************************* -Firebase for Android Common +Firebase ******************************************************************************* Apache License Version 2.0, January 2004 @@ -9743,6 +9743,7 @@ Firebase for Android Common WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + ******************************************************************************* Glide ******************************************************************************* @@ -11319,619 +11320,6 @@ TCMalloc limitations under the License. ******************************************************************************* -firebase_components -******************************************************************************* - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - 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 - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - -******************************************************************************* -firebase_database -******************************************************************************* - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - 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 - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -******************************************************************************* -firebase_database_collection -******************************************************************************* - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - 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 - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -******************************************************************************* glm ******************************************************************************* The MIT License diff --git a/libraries/include/arcore_c_api.h b/libraries/include/arcore_c_api.h index bf7028a40..b2246f27c 100644 --- a/libraries/include/arcore_c_api.h +++ b/libraries/include/arcore_c_api.h @@ -582,8 +582,7 @@ AR_DEFINE_ENUM(ArTrackableType){ /// /// All currently defined features are mutually compatible. AR_DEFINE_ENUM(ArSessionFeature){ - /// Indicates the end of a features list. This must be the last entry in - /// the + /// Indicates the end of a features list. This must be the last entry in the /// array passed to ArSession_createWithFeatures(). AR_SESSION_FEATURE_END_OF_LIST = 0, @@ -806,7 +805,7 @@ AR_DEFINE_ENUM(ArCloudAnchorState){ AR_CLOUD_ANCHOR_STATE_ERROR_HOSTING_DATASET_PROCESSING_FAILED = -5, /// Resolving failed, because the ARCore Cloud Anchor service could not find - /// the provided cloud anchor ID. + /// the provided Cloud Anchor ID. AR_CLOUD_ANCHOR_STATE_ERROR_CLOUD_ID_NOT_FOUND = -6, AR_CLOUD_ANCHOR_STATE_ERROR_RESOLVING_LOCALIZATION_NO_MATCH AR_DEPRECATED( @@ -1321,7 +1320,7 @@ void ArConfig_setUpdateMode(const ArSession *session, ArConfig *config, ArUpdateMode update_mode); -/// Gets the current cloud anchor mode from the ::ArConfig. +/// Gets the current Cloud Anchor mode from the ::ArConfig. void ArConfig_getCloudAnchorMode(const ArSession *session, const ArConfig *config, ArCloudAnchorMode *out_cloud_anchor_mode); @@ -1607,7 +1606,7 @@ ArStatus ArSession_checkSupported(const ArSession *session, /// /// The following configurations are not supported: /// -/// - When using the back-facing camera (default): +/// - When using the (default) back-facing camera: /// - #AR_AUGMENTED_FACE_MODE_MESH3D. /// - When using the front-facing (selfie) camera /// (#AR_SESSION_FEATURE_FRONT_CAMERA): @@ -1663,9 +1662,8 @@ ArStatus ArSession_resume(ArSession *session); ArStatus ArSession_pause(ArSession *session); /// Sets the OpenGL texture name (id) that will allow GPU access to the camera -/// image. The provided ID should have been created with @c glGenTextures(). The -/// resulting texture must be bound to the @c GL_TEXTURE_EXTERNAL_OES target for -/// use. Shaders accessing this texture must use a @c samplerExternalOES +/// image. The texture must be bound to the @c GL_TEXTURE_EXTERNAL_OES target +/// for use. Shaders accessing this texture must use a @c samplerExternalOES /// sampler. See sample code for an example. void ArSession_setCameraTextureName(ArSession *session, uint32_t texture_id); @@ -1763,7 +1761,7 @@ void ArSession_getAllTrackables(const ArSession *session, ArTrackableType filter_type, ArTrackableList *out_trackable_list); -/// This will create a new cloud anchor using pose and other metadata from +/// This will create a new Cloud Anchor using the pose and other metadata from /// @c anchor. /// /// If the function returns #AR_SUCCESS, the cloud state of @c out_cloud_anchor @@ -1775,7 +1773,7 @@ void ArSession_getAllTrackables(const ArSession *session, /// /// @param[in] session The ARCore session /// @param[in] anchor The anchor to be hosted -/// @param[inout] out_cloud_anchor The new cloud anchor +/// @param[inout] out_cloud_anchor The new Cloud Anchor /// @return #AR_SUCCESS or any of: /// - #AR_ERROR_NOT_TRACKING /// - #AR_ERROR_SESSION_PAUSED @@ -1786,8 +1784,11 @@ ArStatus ArSession_hostAndAcquireNewCloudAnchor(ArSession *session, const ArAnchor *anchor, ArAnchor **out_cloud_anchor); -/// This will create a new cloud anchor, and schedule a resolving task to -/// resolve the anchor's pose using the given cloud anchor ID. +/// This will create a new Cloud Anchor, and schedule a task to resolve the +/// anchor's pose using the given Cloud Anchor ID. You don’t need to +/// wait for a call to resolve a Cloud Anchor to complete before initiating +/// another call. A session can be resolving up to 20 Cloud Anchors at a given +/// time. /// /// If this function returns #AR_SUCCESS, the cloud state of @c out_cloud_anchor /// will be #AR_CLOUD_ANCHOR_STATE_TASK_IN_PROGRESS, and its tracking state will @@ -1799,7 +1800,7 @@ ArStatus ArSession_hostAndAcquireNewCloudAnchor(ArSession *session, /// /// @param[in] session The ARCore session /// @param[in] cloud_anchor_id The cloud ID of the anchor to be resolved -/// @param[inout] out_cloud_anchor The new cloud anchor +/// @param[inout] out_cloud_anchor The new Cloud Anchor /// @return #AR_SUCCESS or any of: /// - #AR_ERROR_NOT_TRACKING /// - #AR_ERROR_SESSION_PAUSED @@ -1845,6 +1846,8 @@ ArStatus ArSession_resolveAndAcquireNewCloudAnchor(ArSession *session, /// @deprecated in release 1.11.0. Please use instead: @code /// void ArSession_getSupportedCameraConfigsWithFilter(const ArSession* session, /// const ArCameraConfigFilter* filter, ArCameraConfigList* list); @endcode +// TODO(b/146903940): Change ArSession_getSupportedCameraConfigs to return +// ArStatus. void ArSession_getSupportedCameraConfigs(const ArSession *session, ArCameraConfigList *list) AR_DEPRECATED( @@ -1893,6 +1896,12 @@ void ArSession_getCameraConfig(const ArSession *session, /// capabilities. Overly restrictive filtering can result in the returned list /// being empty on one or more devices. /// +/// Beginning with ARCore SDK 1.15.0, some devices support additional camera +/// configs with lower GPU texture resolutions than the device's default GPU +/// texture resolution. See the ARCore supported devices +/// (https://developers.google.com/ar/discover/supported-devices) page for +/// details. +/// /// Element 0 will contain the camera config that best matches the filter /// settings, according to the following priority: /// @@ -1907,6 +1916,8 @@ void ArSession_getCameraConfig(const ArSession *session, /// Can be called at any time. /// /// @return list of supported camera configs. +// TODO(b/146903940): Change ArSession_getSupportedCameraConfigsWithFilter to +// return ArStatus. void ArSession_getSupportedCameraConfigsWithFilter( const ArSession *session, const ArCameraConfigFilter *filter, @@ -2850,7 +2861,7 @@ void ArAnchor_detach(ArSession *session, ArAnchor *anchor); /// This method may safely be called with @c NULL - it will do nothing. void ArAnchor_release(ArAnchor *anchor); -/// Acquires the cloud anchor ID of the anchor. The ID acquired is an ASCII +/// Acquires the Cloud Anchor ID of the anchor. The ID acquired is an ASCII /// null-terminated string. The acquired ID must be released after use by the /// @c ArString_release function. For anchors with cloud state /// #AR_CLOUD_ANCHOR_STATE_NONE or #AR_CLOUD_ANCHOR_STATE_TASK_IN_PROGRESS, this @@ -2863,7 +2874,7 @@ void ArAnchor_acquireCloudAnchorId(ArSession *session, ArAnchor *anchor, char **out_cloud_anchor_id); -/// Gets the current cloud anchor state of the anchor. This state is guaranteed +/// Gets the current Cloud Anchor state of the anchor. This state is guaranteed /// not to change until update() is called. /// /// @param[in] session The ARCore session. diff --git a/samples/augmented_image_c/app/build.gradle b/samples/augmented_image_c/app/build.gradle index d3d0d4e10..6aab751db 100644 --- a/samples/augmented_image_c/app/build.gradle +++ b/samples/augmented_image_c/app/build.gradle @@ -20,13 +20,13 @@ def setVersionName = { -> } android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { applicationId "com.google.ar.core.examples.c.augmentedimage" // 24 is the minimum since ARCore only works with 24 and higher. minSdkVersion 24 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 1 versionName setVersionName() @@ -62,11 +62,11 @@ android { dependencies { // ARCore library - implementation 'com.google.ar:core:1.14.0' - natives 'com.google.ar:core:1.14.0' + implementation 'com.google.ar:core:1.15.0' + natives 'com.google.ar:core:1.15.0' - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support:design:27.1.1' + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support:design:28.0.0' // Glide - An image loading and caching library for Android // https://github.com/bumptech/glide diff --git a/samples/augmented_image_java/app/build.gradle b/samples/augmented_image_java/app/build.gradle index d178c5065..1167f8f50 100644 --- a/samples/augmented_image_java/app/build.gradle +++ b/samples/augmented_image_java/app/build.gradle @@ -35,7 +35,7 @@ android { dependencies { // ARCore library - implementation 'com.google.ar:core:1.14.0' + implementation 'com.google.ar:core:1.15.0' // Obj - a simple Wavefront OBJ file loader // https://github.com/javagl/Obj diff --git a/samples/augmented_image_java/app/src/main/java/com/google/ar/core/examples/java/common/rendering/BackgroundRenderer.java b/samples/augmented_image_java/app/src/main/java/com/google/ar/core/examples/java/common/rendering/BackgroundRenderer.java index d0070af29..44695c5f6 100644 --- a/samples/augmented_image_java/app/src/main/java/com/google/ar/core/examples/java/common/rendering/BackgroundRenderer.java +++ b/samples/augmented_image_java/app/src/main/java/com/google/ar/core/examples/java/common/rendering/BackgroundRenderer.java @@ -49,6 +49,7 @@ public class BackgroundRenderer { private int quadPositionParam; private int quadTexCoordParam; private int textureId = -1; + private boolean suppressTimestampZeroRendering = true; public int getTextureId() { return textureId; @@ -108,6 +109,10 @@ public void createOnGlThread(Context context) throws IOException { ShaderUtil.checkGLError(TAG, "Program parameters"); } + public void suppressTimestampZeroRendering(boolean suppressTimestampZeroRendering) { + this.suppressTimestampZeroRendering = suppressTimestampZeroRendering; + } + /** * Draws the AR background image. The image will be drawn such that virtual content rendered with * the matrices provided by {@link com.google.ar.core.Camera#getViewMatrix(float[], int)} and @@ -128,7 +133,7 @@ public void draw(@NonNull Frame frame) { quadTexCoords); } - if (frame.getTimestamp() == 0) { + if (frame.getTimestamp() == 0 && suppressTimestampZeroRendering) { // Suppress rendering if the camera did not produce the first frame yet. This is to avoid // drawing possible leftover data from previous sessions if the texture is reused. return; diff --git a/samples/cloud_anchor_java/app/build.gradle b/samples/cloud_anchor_java/app/build.gradle index e04938c4b..1f915521b 100644 --- a/samples/cloud_anchor_java/app/build.gradle +++ b/samples/cloud_anchor_java/app/build.gradle @@ -35,7 +35,7 @@ android { dependencies { // ARCore library - implementation 'com.google.ar:core:1.14.0' + implementation 'com.google.ar:core:1.15.0' // Obj - a simple Wavefront OBJ file loader // https://github.com/javagl/Obj diff --git a/samples/cloud_anchor_java/app/src/main/java/com/google/ar/core/examples/java/common/rendering/BackgroundRenderer.java b/samples/cloud_anchor_java/app/src/main/java/com/google/ar/core/examples/java/common/rendering/BackgroundRenderer.java index d0070af29..44695c5f6 100644 --- a/samples/cloud_anchor_java/app/src/main/java/com/google/ar/core/examples/java/common/rendering/BackgroundRenderer.java +++ b/samples/cloud_anchor_java/app/src/main/java/com/google/ar/core/examples/java/common/rendering/BackgroundRenderer.java @@ -49,6 +49,7 @@ public class BackgroundRenderer { private int quadPositionParam; private int quadTexCoordParam; private int textureId = -1; + private boolean suppressTimestampZeroRendering = true; public int getTextureId() { return textureId; @@ -108,6 +109,10 @@ public void createOnGlThread(Context context) throws IOException { ShaderUtil.checkGLError(TAG, "Program parameters"); } + public void suppressTimestampZeroRendering(boolean suppressTimestampZeroRendering) { + this.suppressTimestampZeroRendering = suppressTimestampZeroRendering; + } + /** * Draws the AR background image. The image will be drawn such that virtual content rendered with * the matrices provided by {@link com.google.ar.core.Camera#getViewMatrix(float[], int)} and @@ -128,7 +133,7 @@ public void draw(@NonNull Frame frame) { quadTexCoords); } - if (frame.getTimestamp() == 0) { + if (frame.getTimestamp() == 0 && suppressTimestampZeroRendering) { // Suppress rendering if the camera did not produce the first frame yet. This is to avoid // drawing possible leftover data from previous sessions if the texture is reused. return; diff --git a/samples/computervision_c/app/build.gradle b/samples/computervision_c/app/build.gradle index 3dba944dd..63a51ea1e 100644 --- a/samples/computervision_c/app/build.gradle +++ b/samples/computervision_c/app/build.gradle @@ -20,13 +20,13 @@ def setVersionName = { -> } android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { applicationId "com.google.ar.core.examples.c.computervision" // 24 is the minimum since ARCore only works with 24 and higher. minSdkVersion 24 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 1 versionName setVersionName() @@ -62,11 +62,11 @@ android { dependencies { // ARCore library - implementation 'com.google.ar:core:1.14.0' - natives 'com.google.ar:core:1.14.0' + implementation 'com.google.ar:core:1.15.0' + natives 'com.google.ar:core:1.15.0' - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support:design:27.1.1' + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support:design:28.0.0' } // Extracts the shared libraries from aars in the natives configuration. diff --git a/samples/computervision_java/app/build.gradle b/samples/computervision_java/app/build.gradle index ba795be9f..903b3b430 100644 --- a/samples/computervision_java/app/build.gradle +++ b/samples/computervision_java/app/build.gradle @@ -35,7 +35,7 @@ android { dependencies { // ARCore library - implementation 'com.google.ar:core:1.14.0' + implementation 'com.google.ar:core:1.15.0' // Obj - a simple Wavefront OBJ file loader // https://github.com/javagl/Obj diff --git a/samples/computervision_java/app/src/main/java/com/google/ar/core/examples/java/common/rendering/BackgroundRenderer.java b/samples/computervision_java/app/src/main/java/com/google/ar/core/examples/java/common/rendering/BackgroundRenderer.java index d0070af29..44695c5f6 100644 --- a/samples/computervision_java/app/src/main/java/com/google/ar/core/examples/java/common/rendering/BackgroundRenderer.java +++ b/samples/computervision_java/app/src/main/java/com/google/ar/core/examples/java/common/rendering/BackgroundRenderer.java @@ -49,6 +49,7 @@ public class BackgroundRenderer { private int quadPositionParam; private int quadTexCoordParam; private int textureId = -1; + private boolean suppressTimestampZeroRendering = true; public int getTextureId() { return textureId; @@ -108,6 +109,10 @@ public void createOnGlThread(Context context) throws IOException { ShaderUtil.checkGLError(TAG, "Program parameters"); } + public void suppressTimestampZeroRendering(boolean suppressTimestampZeroRendering) { + this.suppressTimestampZeroRendering = suppressTimestampZeroRendering; + } + /** * Draws the AR background image. The image will be drawn such that virtual content rendered with * the matrices provided by {@link com.google.ar.core.Camera#getViewMatrix(float[], int)} and @@ -128,7 +133,7 @@ public void draw(@NonNull Frame frame) { quadTexCoords); } - if (frame.getTimestamp() == 0) { + if (frame.getTimestamp() == 0 && suppressTimestampZeroRendering) { // Suppress rendering if the camera did not produce the first frame yet. This is to avoid // drawing possible leftover data from previous sessions if the texture is reused. return; diff --git a/samples/hello_ar_c/app/build.gradle b/samples/hello_ar_c/app/build.gradle index c06a1bcc8..f6422af0f 100644 --- a/samples/hello_ar_c/app/build.gradle +++ b/samples/hello_ar_c/app/build.gradle @@ -20,13 +20,13 @@ def setVersionName = { -> } android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { applicationId "com.google.ar.core.examples.c.helloar" // 24 is the minimum since ARCore only works with 24 and higher. minSdkVersion 24 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 1 versionName setVersionName() @@ -62,11 +62,11 @@ android { dependencies { // ARCore library - implementation 'com.google.ar:core:1.14.0' - natives 'com.google.ar:core:1.14.0' + implementation 'com.google.ar:core:1.15.0' + natives 'com.google.ar:core:1.15.0' - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support:design:27.1.1' + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support:design:28.0.0' } // Extracts the shared libraries from aars in the natives configuration. diff --git a/samples/hello_ar_java/app/build.gradle b/samples/hello_ar_java/app/build.gradle index 66a275034..790e09c38 100644 --- a/samples/hello_ar_java/app/build.gradle +++ b/samples/hello_ar_java/app/build.gradle @@ -37,7 +37,7 @@ android { dependencies { // ARCore library // Dependency version is rewritten at build time. - implementation 'com.google.ar:core:1.14.0' + implementation 'com.google.ar:core:1.15.0' // Obj - a simple Wavefront OBJ file loader // https://github.com/javagl/Obj diff --git a/samples/hello_ar_java/app/src/main/java/com/google/ar/core/examples/java/common/rendering/BackgroundRenderer.java b/samples/hello_ar_java/app/src/main/java/com/google/ar/core/examples/java/common/rendering/BackgroundRenderer.java index d0070af29..44695c5f6 100644 --- a/samples/hello_ar_java/app/src/main/java/com/google/ar/core/examples/java/common/rendering/BackgroundRenderer.java +++ b/samples/hello_ar_java/app/src/main/java/com/google/ar/core/examples/java/common/rendering/BackgroundRenderer.java @@ -49,6 +49,7 @@ public class BackgroundRenderer { private int quadPositionParam; private int quadTexCoordParam; private int textureId = -1; + private boolean suppressTimestampZeroRendering = true; public int getTextureId() { return textureId; @@ -108,6 +109,10 @@ public void createOnGlThread(Context context) throws IOException { ShaderUtil.checkGLError(TAG, "Program parameters"); } + public void suppressTimestampZeroRendering(boolean suppressTimestampZeroRendering) { + this.suppressTimestampZeroRendering = suppressTimestampZeroRendering; + } + /** * Draws the AR background image. The image will be drawn such that virtual content rendered with * the matrices provided by {@link com.google.ar.core.Camera#getViewMatrix(float[], int)} and @@ -128,7 +133,7 @@ public void draw(@NonNull Frame frame) { quadTexCoords); } - if (frame.getTimestamp() == 0) { + if (frame.getTimestamp() == 0 && suppressTimestampZeroRendering) { // Suppress rendering if the camera did not produce the first frame yet. This is to avoid // drawing possible leftover data from previous sessions if the texture is reused. return; diff --git a/samples/shared_camera_java/app/build.gradle b/samples/shared_camera_java/app/build.gradle index 4a12a27af..b29265b15 100644 --- a/samples/shared_camera_java/app/build.gradle +++ b/samples/shared_camera_java/app/build.gradle @@ -37,7 +37,7 @@ android { dependencies { // ARCore library - implementation 'com.google.ar:core:1.14.0' + implementation 'com.google.ar:core:1.15.0' // Obj - a simple Wavefront OBJ file loader // https://github.com/javagl/Obj diff --git a/samples/shared_camera_java/app/src/main/java/com/google/ar/core/examples/java/common/rendering/BackgroundRenderer.java b/samples/shared_camera_java/app/src/main/java/com/google/ar/core/examples/java/common/rendering/BackgroundRenderer.java index d0070af29..44695c5f6 100644 --- a/samples/shared_camera_java/app/src/main/java/com/google/ar/core/examples/java/common/rendering/BackgroundRenderer.java +++ b/samples/shared_camera_java/app/src/main/java/com/google/ar/core/examples/java/common/rendering/BackgroundRenderer.java @@ -49,6 +49,7 @@ public class BackgroundRenderer { private int quadPositionParam; private int quadTexCoordParam; private int textureId = -1; + private boolean suppressTimestampZeroRendering = true; public int getTextureId() { return textureId; @@ -108,6 +109,10 @@ public void createOnGlThread(Context context) throws IOException { ShaderUtil.checkGLError(TAG, "Program parameters"); } + public void suppressTimestampZeroRendering(boolean suppressTimestampZeroRendering) { + this.suppressTimestampZeroRendering = suppressTimestampZeroRendering; + } + /** * Draws the AR background image. The image will be drawn such that virtual content rendered with * the matrices provided by {@link com.google.ar.core.Camera#getViewMatrix(float[], int)} and @@ -128,7 +133,7 @@ public void draw(@NonNull Frame frame) { quadTexCoords); } - if (frame.getTimestamp() == 0) { + if (frame.getTimestamp() == 0 && suppressTimestampZeroRendering) { // Suppress rendering if the camera did not produce the first frame yet. This is to avoid // drawing possible leftover data from previous sessions if the texture is reused. return; diff --git a/samples/shared_camera_java/app/src/main/java/com/google/ar/core/examples/java/sharedcamera/SharedCameraActivity.java b/samples/shared_camera_java/app/src/main/java/com/google/ar/core/examples/java/sharedcamera/SharedCameraActivity.java index da3923acb..7ab2a51cd 100644 --- a/samples/shared_camera_java/app/src/main/java/com/google/ar/core/examples/java/sharedcamera/SharedCameraActivity.java +++ b/samples/shared_camera_java/app/src/main/java/com/google/ar/core/examples/java/sharedcamera/SharedCameraActivity.java @@ -118,9 +118,6 @@ public class SharedCameraActivity extends AppCompatActivity // Linear layout that contains preview image and status text. private LinearLayout imageTextLinearLayout; - // Switch to allow pausing and resuming of ARCore. - private Switch arcoreSwitch; - // ARCore session that supports camera sharing. private Session sharedSession; @@ -362,11 +359,11 @@ protected void onCreate(Bundle savedInstanceState) { imageTextLinearLayout = findViewById(R.id.image_text_layout); statusTextView = findViewById(R.id.text_view); - arcoreSwitch = findViewById(R.id.arcore_switch); + // Switch to allow pausing and resuming of ARCore. + Switch arcoreSwitch = findViewById(R.id.arcore_switch); // Ensure initial switch position is set based on initial value of `arMode` variable. arcoreSwitch.setChecked(arMode); - arcoreSwitch.setOnCheckedChangeListener( (view, checked) -> { Log.i(TAG, "Switching to " + (checked ? "AR" : "non-AR") + " mode."); @@ -385,7 +382,7 @@ protected void onCreate(Bundle savedInstanceState) { updateSnackbarMessage(); } - private synchronized void waitUntilCameraCaptureSesssionIsActive() { + private synchronized void waitUntilCameraCaptureSessionIsActive() { while (!captureSessionChangesPossible) { try { this.wait(); @@ -398,7 +395,7 @@ private synchronized void waitUntilCameraCaptureSesssionIsActive() { @Override protected void onResume() { super.onResume(); - waitUntilCameraCaptureSesssionIsActive(); + waitUntilCameraCaptureSessionIsActive(); startBackgroundThread(); surfaceView.onResume(); @@ -415,7 +412,7 @@ protected void onResume() { public void onPause() { shouldUpdateSurfaceTexture.set(false); surfaceView.onPause(); - waitUntilCameraCaptureSesssionIsActive(); + waitUntilCameraCaptureSessionIsActive(); displayRotationHelper.onPause(); if (arMode) { pauseARCore(); @@ -439,6 +436,9 @@ private void resumeARCore() { if (!arcoreActive) { try { + // To avoid flicker when resuming ARCore mode inform the renderer to not suppress rendering + // of the frames with zero timestamp. + backgroundRenderer.suppressTimestampZeroRendering(false); // Resume ARCore. sharedSession.resume(); arcoreActive = true; @@ -668,7 +668,7 @@ private void closeCamera() { captureSession = null; } if (cameraDevice != null) { - waitUntilCameraCaptureSesssionIsActive(); + waitUntilCameraCaptureSessionIsActive(); safeToExitApp.close(); cameraDevice.close(); safeToExitApp.block();