Update default engine(hybrid engine) 24/130124/2 accepted/tizen/4.0/unified/20170816.012624 accepted/tizen/4.0/unified/20170829.020359 accepted/tizen/unified/20170519.200355 submit/tizen/20170519.082101 submit/tizen_4.0/20170811.094300 submit/tizen_4.0/20170828.100004 tizen_4.0.IoT.p1_release tizen_4.0.IoT.p2_release tizen_4.0.m1_release tizen_4.0.m2_release
authorSuyeon Hwang <stom.hwang@samsung.com>
Fri, 19 May 2017 07:33:57 +0000 (16:33 +0900)
committerSuyeon Hwang <stom.hwang@samsung.com>
Fri, 19 May 2017 07:48:55 +0000 (16:48 +0900)
Change-Id: I63a600a2380cd8d289922d641d062ff940a0420d
Signed-off-by: Suyeon Hwang <stom.hwang@samsung.com>
85 files changed:
CMakeLists.txt
LICENSE
LICENSE_embedded [deleted file]
NOTICE
engine_data/AM/eng/MC.opt/feat.params [moved from engine_data_embedded/AM/kor/Baseline_MC.opt/feat.params with 100% similarity]
engine_data/AM/eng/MC.opt/mdef [moved from engine_data_embedded/AM/eng/MC.opt/mdef with 100% similarity]
engine_data/AM/eng/MC.opt/means [moved from engine_data_embedded/AM/eng/MC.opt/means with 100% similarity]
engine_data/AM/eng/MC.opt/noisedict [moved from engine_data_embedded/AM/eng/MC.opt/noisedict with 100% similarity]
engine_data/AM/eng/MC.opt/sendump [moved from engine_data_embedded/AM/eng/MC.opt/sendump with 100% similarity]
engine_data/AM/eng/MC.opt/transition_matrices [moved from engine_data_embedded/AM/eng/MC.opt/transition_matrices with 100% similarity]
engine_data/AM/eng/MC.opt/variances [moved from engine_data_embedded/AM/eng/MC.opt/variances with 100% similarity]
engine_data/AM/kor/Baseline_MC.opt/feat.params [moved from engine_data_embedded/AM/eng/MC.opt/feat.params with 100% similarity]
engine_data/AM/kor/Baseline_MC.opt/mdef [moved from engine_data_embedded/AM/kor/Baseline_MC.opt/mdef with 100% similarity]
engine_data/AM/kor/Baseline_MC.opt/means [moved from engine_data_embedded/AM/kor/Baseline_MC.opt/means with 100% similarity]
engine_data/AM/kor/Baseline_MC.opt/noisedict [moved from engine_data_embedded/AM/kor/Baseline_MC.opt/noisedict with 100% similarity]
engine_data/AM/kor/Baseline_MC.opt/sendump [moved from engine_data_embedded/AM/kor/Baseline_MC.opt/sendump with 100% similarity]
engine_data/AM/kor/Baseline_MC.opt/transition_matrices [moved from engine_data_embedded/AM/kor/Baseline_MC.opt/transition_matrices with 100% similarity]
engine_data/AM/kor/Baseline_MC.opt/variances [moved from engine_data_embedded/AM/kor/Baseline_MC.opt/variances with 100% similarity]
engine_data/config.tizen.v01.ini [moved from engine_data_embedded/config.tizen.v01.ini with 97% similarity]
engine_data/config.tizen.v02.ini [moved from engine_data_embedded/config.tizen.v02.ini with 95% similarity]
engine_data/shared/res/CommandFile.txt [deleted file]
engine_data/shared/res/CommandFile1.txt [deleted file]
engine_data/shared/res/am/feat.params [deleted file]
engine_data/shared/res/am/mdef [deleted file]
engine_data/shared/res/am/mdef.org [deleted file]
engine_data/shared/res/am/means [deleted file]
engine_data/shared/res/am/noisedict [deleted file]
engine_data/shared/res/am/sendump [deleted file]
engine_data/shared/res/am/sendump.org [deleted file]
engine_data/shared/res/am/transition_matrices [deleted file]
engine_data/shared/res/am/variances [deleted file]
engine_data/shared/res/en_US/config -TYPES.txt [deleted file]
engine_data/shared/res/en_US/config.txt [deleted file]
engine_data/shared/res/en_US/db/PersonalDataDatabase_FullContact.sqlite [deleted file]
engine_data/shared/res/en_US/db/PersonalDataDatabase_FullContact.sqlite-journal [deleted file]
engine_data/shared/res/en_US/dict/zero.base.dic [deleted file]
engine_data/shared/res/en_US/dict/zero.template.dic [deleted file]
engine_data/shared/res/en_US/lm/AliasApplication.txt [deleted file]
engine_data/shared/res/en_US/lm/reject.hyp [deleted file]
engine_data/shared/res/en_US/lm/zero.detmin.wo.wakeup.fsg [deleted file]
engine_data/shared/res/en_US/lm/zero.detmin.wo.wakeup.fsg.org [deleted file]
engine_data/shared/res/en_US/nlu/nlu.cfg [deleted file]
engine_data/shared/res/en_US/nlu/rule_PROC_NLU.fst [deleted file]
engine_data/shared/res/en_US/nlu/slot.list [deleted file]
engine_data/shared/res/en_US/plm.config.json [deleted file]
engine_data/shared/res/vcfwtestapp.png [deleted file]
engine_data/task/tizen.v01/tizen.dyn.class [moved from engine_data_embedded/task/tizen.v01/tizen.dyn.class with 100% similarity]
engine_data/task/tizen.v01/tizen.dyn.fsg_class_count [moved from engine_data_embedded/task/tizen.v01/tizen.dyn.fsg_class_count with 100% similarity]
engine_data/task/tizen.v01/tizen.dyn.rmeps.detmin.out.fsg [moved from engine_data_embedded/task/tizen.v01/tizen.dyn.rmeps.detmin.out.fsg with 100% similarity]
engine_data/task/tizen.v01/tizen.sta.rmeps.detmin.out.fsg [moved from engine_data_embedded/task/tizen.v01/tizen.sta.rmeps.detmin.out.fsg with 100% similarity]
engine_data/task/tizen.v01/tizen.test.dic [moved from engine_data_embedded/task/tizen.v01/tizen.test.dic with 100% similarity]
engine_data/task/tizen.v01/tizen.test.dic2 [moved from engine_data_embedded/task/tizen.v01/tizen.test.dic2 with 100% similarity]
engine_data/task/tizen.v01/tizen.test.eng.dic [moved from engine_data_embedded/task/tizen.v01/tizen.test.eng.dic with 100% similarity]
engine_data/task/tizen.v01/tizen.test.vocab [moved from engine_data_embedded/task/tizen.v01/tizen.test.vocab with 100% similarity]
engine_data/task/tizen.v01/vad-com [moved from engine_data_embedded/task/tizen.v01/vad-com with 100% similarity]
lib/aarch64/libasr-nlu.so [deleted file]
lib/aarch64/libsvoice.so [deleted file]
lib/aarch64/libsvoiceclientdp.so [deleted file]
lib/aarch64/libsvoiceparser.so [deleted file]
lib/aarch64/libvc-engine-default.so [moved from lib_embedded/aarch64/libvc-engine-default.so with 83% similarity, mode: 0755]
lib/aarch64/libvoice-transport.so [deleted file]
lib/aarch64/libvoiceactivity.so [deleted file]
lib/arm/libasr-nlu.so [deleted file]
lib/arm/libsvoice.so [deleted file]
lib/arm/libsvoiceclientdp.so [deleted file]
lib/arm/libsvoiceparser.so [deleted file]
lib/arm/libvc-engine-default.so [moved from lib_embedded/arm/libvc-engine-default.so with 89% similarity, mode: 0755]
lib/arm/libvoice-transport.so [deleted file]
lib/arm/libvoiceactivity.so [deleted file]
lib/i586/libasr-nlu.so [deleted file]
lib/i586/libsvoice.so [deleted file]
lib/i586/libsvoiceclientdp.so [deleted file]
lib/i586/libsvoiceparser.so [deleted file]
lib/i586/libvc-engine-default.so [moved from lib_embedded/i586/libvc-engine-default.so with 80% similarity, mode: 0755]
lib/i586/libvoice-transport.so [deleted file]
lib/i586/libvoiceactivity.so [deleted file]
lib/x86_64/libasr-nlu.so [deleted file]
lib/x86_64/libsvoice.so [deleted file]
lib/x86_64/libsvoiceclientdp.so [deleted file]
lib/x86_64/libsvoiceparser.so [deleted file]
lib/x86_64/libvc-engine-default.so [moved from lib_embedded/x86_64/libvc-engine-default.so with 79% similarity, mode: 0755]
lib/x86_64/libvoice-transport.so [deleted file]
lib/x86_64/libvoiceactivity.so [deleted file]
packaging/vc-engine-default.spec
vc-default-info-embedded.xml [deleted file]

index 2c9fb08..e5817a5 100644 (file)
@@ -17,18 +17,6 @@ ELSEIF("${ARCH}" MATCHES "^x86_64.*")
 SET(INSTALL_ARCH x86_64)
 ENDIF()
 
-# FLORA LICENSED (TV) FILES
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib_embedded/${INSTALL_ARCH}/libvc-engine-default.so DESTINATION ${TZ_SYS_RO_SHARE}/voice/vc/1.0/engine/flora/ COMPONENT RuntimeLibraries)
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/engine_data_embedded/ DESTINATION ${TZ_SYS_RO_SHARE}/voice/vc/engine_data/flora/)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/vc-default-info-embedded.xml DESTINATION ${TZ_SYS_RO_SHARE}/voice/vc/1.0/engine-info/flora/ RENAME vc-default-info.xml)
-
-# PROPRIETARY (non-TV) FILES
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/${INSTALL_ARCH}/libasr-nlu.so DESTINATION ${LIBDIR})
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/${INSTALL_ARCH}/libsvoiceclientdp.so DESTINATION ${LIBDIR})
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/${INSTALL_ARCH}/libsvoiceparser.so DESTINATION ${LIBDIR})
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/${INSTALL_ARCH}/libvoiceactivity.so DESTINATION ${LIBDIR})
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/${INSTALL_ARCH}/libvoice-transport.so DESTINATION ${LIBDIR})
-
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/${INSTALL_ARCH}/libsvoice.so DESTINATION ${TZ_SYS_RO_SHARE}/voice/vc/1.0/engine/ COMPONENT RuntimeLibraries)
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/engine_data/shared DESTINATION ${TZ_SYS_RO_SHARE}/voice/vc/1.0/engine-data/n66)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/${INSTALL_ARCH}/libvc-engine-default.so DESTINATION ${TZ_SYS_RO_SHARE}/voice/vc/1.0/engine/ COMPONENT RuntimeLibraries)
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/engine_data/ DESTINATION ${TZ_SYS_RO_SHARE}/voice/vc/engine_data)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/vc-default-info.xml DESTINATION ${TZ_SYS_RO_SHARE}/voice/vc/1.0/engine-info/)
diff --git a/LICENSE b/LICENSE
index 3583c2b..571fe79 100644 (file)
--- a/LICENSE
+++ b/LICENSE
-Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved 
+Flora License
 
-PROPRIETARY/CONFIDENTIAL
+Version 1.1, April, 2013
 
-This software is the confidential and proprietary information of SAMSUNG ELECTRONICS ("Confidential Information").
-You shall not disclose such Confidential Information and shall use it only in accordance with the terms of the license agreement you entered into with SAMSUNG ELECTRONICS.
-SAMSUNG make no representations or warranties about the suitability of the software, 
-either express or implied, including but not limited to the implied warranties of merchantability, fitness for a particular purpose, or non-infringement.
-SAMSUNG shall not be liable for any damages suffered by licensee as a result of using, modifying or distributing this software or its derivatives.
+http://floralicense.org/license/
+
+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.
+
+"Tizen Certified Platform" shall mean a software platform that complies
+with the standards set forth in the Tizen Compliance Specification
+and passes the Tizen Compliance Tests as defined from time to time
+by the Tizen Technical Steering Group and certified by the Tizen
+Association or its designated agent.
+
+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
+solely as incorporated into a Tizen Certified Platform, 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 solely
+as incorporated into a Tizen Certified Platform 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 pursuant to the copyright license
+above, in any medium, with or without modifications, and in Source or
+Object form, provided that You meet the following conditions:
+
+  1. You must give any other recipients of the Work or Derivative Works
+     a copy of this License; and
+  2. You must cause any modified files to carry prominent notices stating
+     that You changed the files; and
+  3. 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
+  4. 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
+     and your own copyright statement or terms and conditions do not conflict
+     the conditions stated in the License including section 3.
+
+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 Flora License to your work
+
+To apply the Flora 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 Flora License, Version 1.1 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://floralicense.org/license/
+
+   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.
 
diff --git a/LICENSE_embedded b/LICENSE_embedded
deleted file mode 100644 (file)
index 571fe79..0000000
+++ /dev/null
@@ -1,206 +0,0 @@
-Flora License
-
-Version 1.1, April, 2013
-
-http://floralicense.org/license/
-
-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.
-
-"Tizen Certified Platform" shall mean a software platform that complies
-with the standards set forth in the Tizen Compliance Specification
-and passes the Tizen Compliance Tests as defined from time to time
-by the Tizen Technical Steering Group and certified by the Tizen
-Association or its designated agent.
-
-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
-solely as incorporated into a Tizen Certified Platform, 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 solely
-as incorporated into a Tizen Certified Platform 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 pursuant to the copyright license
-above, in any medium, with or without modifications, and in Source or
-Object form, provided that You meet the following conditions:
-
-  1. You must give any other recipients of the Work or Derivative Works
-     a copy of this License; and
-  2. You must cause any modified files to carry prominent notices stating
-     that You changed the files; and
-  3. 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
-  4. 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
-     and your own copyright statement or terms and conditions do not conflict
-     the conditions stated in the License including section 3.
-
-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 Flora License to your work
-
-To apply the Flora 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 Flora License, Version 1.1 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://floralicense.org/license/
-
-   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.
-
diff --git a/NOTICE b/NOTICE
index 81781eb..5d7b4ce 100644 (file)
--- a/NOTICE
+++ b/NOTICE
@@ -1,22 +1,3 @@
-Copyright (c) 2012-2016 Samsung Electronics Co., Ltd. All rights reserved.
-Except as noted, this software is licensed under Samsung proprietary.
-Please, see the LICENSE file for Samsung proprietary
-
-
-files under the "lib" and "engine_data" directories are licensed under Samsung proprietary
-Please, see the LICENSE file for Samsung proprietary
-
-
-files under the "lib_embedded" and "engine_data_embedded" directories are copyrighted by other entity.
-Copyright (c) 2012-2016 Samsung Electronics Co., Ltd. All rights reserved.
-licensed under Flora License, Version 1.1.
-Please, see the LICENSE_embedded file for Flora License, Version 1.1.
-
-
-[IP Rights Notice: The following file(s) and feature(s) is(are) intellectual property(ies) of other entities.
-Tizen device manufacturers may be required to pay royalty to such entities to use following file(s) and feature(s) on their devices.
- - files under the "lib" directory (libasr-nlu.so, libsvoice.so, libsvoiceclientdp.so, libsvoiceparser.so, libvoice-transport.so, libvoiceactivity.so)
- - files under the "engine_data" directory
- - feature : speech recognition with files under the "lib" and "engine_data" directories
- - feature : voice control with files under the "lib" and "engine_data" directories
- - feature : natural language processing(understanding) with files under the "lib" and "engine_data" directories]
+Copyright (c) 2017 Samsung Electronics Co., Ltd. All rights reserved.
+Except as noted, this software is licensed under Flora License, Version 1.1
+Please, see the LICENSE.Flora file for Flora License, Version 1.1 terms and conditions.
\ No newline at end of file
similarity index 97%
rename from engine_data_embedded/config.tizen.v01.ini
rename to engine_data/config.tizen.v01.ini
index 143ca4b..691e21e 100644 (file)
@@ -7,7 +7,7 @@
 -pncc yes
 -pncc_vadstats /usr/share/voice/vc/engine_data/task/tizen.v01/vad-com
 -frate 80
--cmninit -0.16,-0.06,0.00,0.01,-0.01,0.01,-0.02,0.02,0.01,-0.01,-0.00,0.00,-0.00 
+-cmninit -0.16,-0.06,0.00,0.01,-0.01,0.01,-0.02,0.02,0.01,-0.01,-0.00,0.00,-0.00
 -cmn none
 #-rawlogdir /tmp/raw
 #-snrlogdir ./snrlog
similarity index 95%
rename from engine_data_embedded/config.tizen.v02.ini
rename to engine_data/config.tizen.v02.ini
index 4c0ce18..46197ac 100644 (file)
@@ -7,7 +7,7 @@
 -pncc yes
 -pncc_vadstats /usr/share/voice/vc/engine_data/task/tizen.v01/vad-com
 -frate 80
--cmninit -0.16,-0.06,0.00,0.01,-0.01,0.01,-0.02,0.02,0.01,-0.01,-0.00,0.00,-0.00 
+-cmninit -0.16,-0.06,0.00,0.01,-0.01,0.01,-0.02,0.02,0.01,-0.01,-0.00,0.00,-0.00
 -cmn none
 #-rawlogdir ./raw
 #-snrlogdir ./snrlog
diff --git a/engine_data/shared/res/CommandFile.txt b/engine_data/shared/res/CommandFile.txt
deleted file mode 100644 (file)
index 218aeee..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Play Music,Bluetooth Off,Start Recording,Stop Recording,Take Off,call jack#
diff --git a/engine_data/shared/res/CommandFile1.txt b/engine_data/shared/res/CommandFile1.txt
deleted file mode 100644 (file)
index 854f85e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Play Music,Bluetooth Off,Start Recording,Stop Recording,Take Off,ashok#
diff --git a/engine_data/shared/res/am/feat.params b/engine_data/shared/res/am/feat.params
deleted file mode 100644 (file)
index 27fea15..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
--nfilt 40
--lowerf 133.3334
--upperf 6855.4976
--feat 1s_c_d_dd
--svspec 0-12/13-25/26-38
--agc none
--cmn current
--varnorm no
--vad_threshold 2  
--lifter 22
--transform dct
--cmninit 40
diff --git a/engine_data/shared/res/am/mdef b/engine_data/shared/res/am/mdef
deleted file mode 100644 (file)
index a117240..0000000
Binary files a/engine_data/shared/res/am/mdef and /dev/null differ
diff --git a/engine_data/shared/res/am/mdef.org b/engine_data/shared/res/am/mdef.org
deleted file mode 100644 (file)
index 9665f67..0000000
Binary files a/engine_data/shared/res/am/mdef.org and /dev/null differ
diff --git a/engine_data/shared/res/am/means b/engine_data/shared/res/am/means
deleted file mode 100644 (file)
index d972659..0000000
Binary files a/engine_data/shared/res/am/means and /dev/null differ
diff --git a/engine_data/shared/res/am/noisedict b/engine_data/shared/res/am/noisedict
deleted file mode 100644 (file)
index 0fc0014..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-<s>    SIL
-</s>   SIL
-<sil>  SIL
-_SILENCE       SIL
\ No newline at end of file
diff --git a/engine_data/shared/res/am/sendump b/engine_data/shared/res/am/sendump
deleted file mode 100644 (file)
index d6f0393..0000000
Binary files a/engine_data/shared/res/am/sendump and /dev/null differ
diff --git a/engine_data/shared/res/am/sendump.org b/engine_data/shared/res/am/sendump.org
deleted file mode 100644 (file)
index 5c807ad..0000000
Binary files a/engine_data/shared/res/am/sendump.org and /dev/null differ
diff --git a/engine_data/shared/res/am/transition_matrices b/engine_data/shared/res/am/transition_matrices
deleted file mode 100644 (file)
index 0d6b44a..0000000
Binary files a/engine_data/shared/res/am/transition_matrices and /dev/null differ
diff --git a/engine_data/shared/res/am/variances b/engine_data/shared/res/am/variances
deleted file mode 100644 (file)
index c881a29..0000000
Binary files a/engine_data/shared/res/am/variances and /dev/null differ
diff --git a/engine_data/shared/res/en_US/config -TYPES.txt b/engine_data/shared/res/en_US/config -TYPES.txt
deleted file mode 100644 (file)
index 707d177..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#en_us_drone
--hmm   am  - String
-#-fsg  lm/zero.detmin.fsg 
-#-fsg2 lm/zero.detmin.wo.wakeup.fsg
--fsg   lm/zero.detmin.wo.wakeup.fsg - String
--dict  dict/zero.base.dic - String
--rnlu  nlu/nlu.cfg  - String
-#-reject_list  lm/reject.hyp
--conf_max_llr_th       25     - Float
--conf_use_ci   yes            - Boolean 
--pip   0.5                - Float      
--bestpath      0               - Boolean
--pl_window     1               - Int
--no_silence    1               - Boolean
--conf_thresh   40              - NA    
--lang  1                       - Int   
--wake-up-cmd   1               - Int
diff --git a/engine_data/shared/res/en_US/config.txt b/engine_data/shared/res/en_US/config.txt
deleted file mode 100644 (file)
index 20cb6b2..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#en_us_v1.1.1
--hmm   am
--fsg   lm/zero.detmin.wo.wakeup.fsg
--dict  dict/zero.base.dic
--rnlu  nlu/nlu.cfg
--reject_list   lm/reject.hyp
--conf_max_llr_th       25
--conf_use_ci   yes
--pip   0.5
--ns    0
--bestpath      0
--pl_window     1
--no_silence    1
--conf_thresh   48
--lang  1
--wake-up-cmd   1
--backtrace     yes
\ No newline at end of file
diff --git a/engine_data/shared/res/en_US/db/PersonalDataDatabase_FullContact.sqlite b/engine_data/shared/res/en_US/db/PersonalDataDatabase_FullContact.sqlite
deleted file mode 100644 (file)
index 125def3..0000000
Binary files a/engine_data/shared/res/en_US/db/PersonalDataDatabase_FullContact.sqlite and /dev/null differ
diff --git a/engine_data/shared/res/en_US/db/PersonalDataDatabase_FullContact.sqlite-journal b/engine_data/shared/res/en_US/db/PersonalDataDatabase_FullContact.sqlite-journal
deleted file mode 100644 (file)
index 03b5bd0..0000000
Binary files a/engine_data/shared/res/en_US/db/PersonalDataDatabase_FullContact.sqlite-journal and /dev/null differ
diff --git a/engine_data/shared/res/en_US/dict/zero.base.dic b/engine_data/shared/res/en_US/dict/zero.base.dic
deleted file mode 100644 (file)
index 874210e..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-slot_list_commands_start__Bluetooth_Off__slot_list_commands_end        B L UW T UW TH AO F
-slot_list_commands_start__Navigate__slot_list_commands_end     N AE V AH G EY T
-slot_list_commands_start__Play_Music__slot_list_commands_end   P L EY M Y UW Z IH K
-slot_list_commands_start__Start_Recording__slot_list_commands_end      S T AA R T R AH K AO R D IH NG
-slot_list_commands_start__Start_Recording__slot_list_commands_end(2)   S T AA R T R IH K AO R D IH NG
-slot_list_commands_start__Stop_Recording__slot_list_commands_end       S T AA P R AH K AO R D IH NG
-slot_list_commands_start__Stop_Recording__slot_list_commands_end(2)    S T AA P R IH K AO R D IH NG
-slot_list_commands_start__Take_Off__slot_list_commands_end     T EY K AO F
diff --git a/engine_data/shared/res/en_US/dict/zero.template.dic b/engine_data/shared/res/en_US/dict/zero.template.dic
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/engine_data/shared/res/en_US/lm/AliasApplication.txt b/engine_data/shared/res/en_US/lm/AliasApplication.txt
deleted file mode 100644 (file)
index 9f97934..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-S플래너,calendar
-S플래너,s_planner
-S플래너,schedule
-S플래너,diary
-S Planner,calendar
-S Planner,s planner
-S Planner,schedule
-S Planner,diary
-Play 무비 & TV,play_movie_&_tv
-Play 뮤직,play_music
-Play 매거진,play_magazine
-Play 북,play_book
-Play 게임,play_game
-Play 스토어,play_store
-Play 스토어,google_store
-Play 스토어,google_play_store
-Play 뉴스스탠드,play_newsstand
-Google 설정,google_settings
-사진,photos
-S헬스,s_health
-S번역기,s_translator
-S보이스,s_voice
-S메모,s_memo
-S메모,s_note
-S노트,s_memo
-S노트,s_note
-S Memo,s_note
-S Note,s_memo
-환경설정,settings
-음성녹음,voice_recorder
-이메일,email
-인터넷,internet
-지도,maps
-갤러리,gallery
-계산기,calculator
-내 파일,my files
-도움말,help
-뮤직,music
-번역,translate
-비디오,video
-메시지,messages
-메시지,sms
-Messages,sms
-삼성 북스,samsung_books
-삼성전자 서비스,samsung_service
-알람/시간,clock
-알람/시간,alarm
-알람/시간,time
-Clock,alarm,time
-연락처,contacts
-연락처,address_book
-contacts,address_book
-전화,phone
-전화,call
-최근기록,call_log
-카메라,camera
-행아웃,hangout
-V3 Mobile 2.0,v3
-V3 Mobile 2.0,v3_mobile
-호핀,hoppin
-멜론,melon
-크롬,chrome
-U+스토어,u+store
-U+앱타운,u+app_town
-U+쇼핑,u+shopping
-서울버스,seoul_bus
-티몬,T_MON
-쿠팡,coupang
-Advanced Task Killer Free,advanced_task_killer
-ASTRO 파일 관리자,astro_file_manager
-NYTimes,new_york_times
-티빙,t_ving
-이메일,email
-스마트월렛,smart_wallet
-모바일 T world,mobile_t_world
-모바일티머니,mobile_t_money
-N드라이브,n_drive
-OK캐쉬백,ok_cash_back
-올레wifi,olle_wifi
-T 서비스,t_service
-카카오톡,kakao_talk
-카카오톡,ka_talk
-카카오스토리,kakao_story
-카카오스토리,kaas
-트위터,twitter
\ No newline at end of file
diff --git a/engine_data/shared/res/en_US/lm/reject.hyp b/engine_data/shared/res/en_US/lm/reject.hyp
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/engine_data/shared/res/en_US/lm/zero.detmin.wo.wakeup.fsg b/engine_data/shared/res/en_US/lm/zero.detmin.wo.wakeup.fsg
deleted file mode 100644 (file)
index 24a98b4..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-FSG_BEGIN <n66_cmd_eng>\r
-NUM_STATES 3\r
-START_STATE 0\r
-FINAL_STATE 2\r
-TRANSITION 0 1 1.0 slot_list_commands_start__Bluetooth_Off__slot_list_commands_end
-TRANSITION 0 1 1.0 slot_list_commands_start__Navigate__slot_list_commands_end
-TRANSITION 0 1 1.0 slot_list_commands_start__Play_Music__slot_list_commands_end
-TRANSITION 0 1 1.0 slot_list_commands_start__Start_Recording__slot_list_commands_end
-TRANSITION 0 1 1.0 slot_list_commands_start__Stop_Recording__slot_list_commands_end
-TRANSITION 0 1 1.0 slot_list_commands_start__Take_Off__slot_list_commands_end
-TRANSITION 1 2 1.0\r
-TRANSITION 0 2 1.0\r
-FSG_END\r
diff --git a/engine_data/shared/res/en_US/lm/zero.detmin.wo.wakeup.fsg.org b/engine_data/shared/res/en_US/lm/zero.detmin.wo.wakeup.fsg.org
deleted file mode 100644 (file)
index c592e09..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-FSG_BEGIN <n66_cmd_eng>\r
-NUM_STATES 3\r
-START_STATE 0\r
-FINAL_STATE 2\r
-TRANSITION 0 1 1.0 LIST_COMMAND\r
-TRANSITION 1 2 1.0\r
-TRANSITION 0 2 1.0\r
-FSG_END\r
diff --git a/engine_data/shared/res/en_US/nlu/nlu.cfg b/engine_data/shared/res/en_US/nlu/nlu.cfg
deleted file mode 100644 (file)
index 192ae7b..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-nbest=1
-language=en-us
-slotlist=slot.list
-nlu_rl_model=rule_PROC_NLU.fst
diff --git a/engine_data/shared/res/en_US/nlu/rule_PROC_NLU.fst b/engine_data/shared/res/en_US/nlu/rule_PROC_NLU.fst
deleted file mode 100644 (file)
index 9e3ed2d..0000000
Binary files a/engine_data/shared/res/en_US/nlu/rule_PROC_NLU.fst and /dev/null differ
diff --git a/engine_data/shared/res/en_US/nlu/slot.list b/engine_data/shared/res/en_US/nlu/slot.list
deleted file mode 100644 (file)
index 1934f6e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-list_commands
\ No newline at end of file
diff --git a/engine_data/shared/res/en_US/plm.config.json b/engine_data/shared/res/en_US/plm.config.json
deleted file mode 100644 (file)
index ee91887..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-       "Locale": "en_US",
-       "OrgLM": "lm/zero.detmin.wo.wakeup.fsg.org",
-       "Dic": "dict/zero.template.dic",
-       "UpdateCheck": [{
-               "Table": "UpdateCheck",
-               "Column": ["TableName",
-               "IsUpdated"],
-               "Slot": "",
-               "SlotInFSG": ""
-       }],
-       "PLM": [{
-               "Table": "VoiceControl",
-               "Column": ["cCommand"],
-               "Combination": ["1"],
-               "ID": "_id",
-               "UniqID": "nid",
-               "Slot": "list_commands",
-               "SlotInFSG": "LIST_COMMAND"
-       }],
-       "WakeupWord": [{
-               "Table": "WakeupWords",
-               "Column": ["formal"],
-               "Slot": "wakeup",
-               "SlotInFSG": "WAKEUP"
-       }]
-}
\ No newline at end of file
diff --git a/engine_data/shared/res/vcfwtestapp.png b/engine_data/shared/res/vcfwtestapp.png
deleted file mode 100644 (file)
index 9765b1b..0000000
Binary files a/engine_data/shared/res/vcfwtestapp.png and /dev/null differ
diff --git a/lib/aarch64/libasr-nlu.so b/lib/aarch64/libasr-nlu.so
deleted file mode 100644 (file)
index 55492f6..0000000
Binary files a/lib/aarch64/libasr-nlu.so and /dev/null differ
diff --git a/lib/aarch64/libsvoice.so b/lib/aarch64/libsvoice.so
deleted file mode 100755 (executable)
index 9d51c03..0000000
Binary files a/lib/aarch64/libsvoice.so and /dev/null differ
diff --git a/lib/aarch64/libsvoiceclientdp.so b/lib/aarch64/libsvoiceclientdp.so
deleted file mode 100644 (file)
index 5defb86..0000000
Binary files a/lib/aarch64/libsvoiceclientdp.so and /dev/null differ
diff --git a/lib/aarch64/libsvoiceparser.so b/lib/aarch64/libsvoiceparser.so
deleted file mode 100644 (file)
index 7b77c7c..0000000
Binary files a/lib/aarch64/libsvoiceparser.so and /dev/null differ
old mode 100644 (file)
new mode 100755 (executable)
similarity index 83%
rename from lib_embedded/aarch64/libvc-engine-default.so
rename to lib/aarch64/libvc-engine-default.so
index 567b1b0..6554478
Binary files a/lib_embedded/aarch64/libvc-engine-default.so and b/lib/aarch64/libvc-engine-default.so differ
diff --git a/lib/aarch64/libvoice-transport.so b/lib/aarch64/libvoice-transport.so
deleted file mode 100644 (file)
index fb0ee3b..0000000
Binary files a/lib/aarch64/libvoice-transport.so and /dev/null differ
diff --git a/lib/aarch64/libvoiceactivity.so b/lib/aarch64/libvoiceactivity.so
deleted file mode 100644 (file)
index 224cb44..0000000
Binary files a/lib/aarch64/libvoiceactivity.so and /dev/null differ
diff --git a/lib/arm/libasr-nlu.so b/lib/arm/libasr-nlu.so
deleted file mode 100644 (file)
index 5e1e85c..0000000
Binary files a/lib/arm/libasr-nlu.so and /dev/null differ
diff --git a/lib/arm/libsvoice.so b/lib/arm/libsvoice.so
deleted file mode 100755 (executable)
index 64c0f5d..0000000
Binary files a/lib/arm/libsvoice.so and /dev/null differ
diff --git a/lib/arm/libsvoiceclientdp.so b/lib/arm/libsvoiceclientdp.so
deleted file mode 100644 (file)
index 1db6fac..0000000
Binary files a/lib/arm/libsvoiceclientdp.so and /dev/null differ
diff --git a/lib/arm/libsvoiceparser.so b/lib/arm/libsvoiceparser.so
deleted file mode 100644 (file)
index 066d168..0000000
Binary files a/lib/arm/libsvoiceparser.so and /dev/null differ
old mode 100644 (file)
new mode 100755 (executable)
similarity index 89%
rename from lib_embedded/arm/libvc-engine-default.so
rename to lib/arm/libvc-engine-default.so
index 19b897f..43a923f
Binary files a/lib_embedded/arm/libvc-engine-default.so and b/lib/arm/libvc-engine-default.so differ
diff --git a/lib/arm/libvoice-transport.so b/lib/arm/libvoice-transport.so
deleted file mode 100644 (file)
index 56a6d3c..0000000
Binary files a/lib/arm/libvoice-transport.so and /dev/null differ
diff --git a/lib/arm/libvoiceactivity.so b/lib/arm/libvoiceactivity.so
deleted file mode 100644 (file)
index 8bb2d89..0000000
Binary files a/lib/arm/libvoiceactivity.so and /dev/null differ
diff --git a/lib/i586/libasr-nlu.so b/lib/i586/libasr-nlu.so
deleted file mode 100644 (file)
index 398bb52..0000000
Binary files a/lib/i586/libasr-nlu.so and /dev/null differ
diff --git a/lib/i586/libsvoice.so b/lib/i586/libsvoice.so
deleted file mode 100755 (executable)
index ecbf604..0000000
Binary files a/lib/i586/libsvoice.so and /dev/null differ
diff --git a/lib/i586/libsvoiceclientdp.so b/lib/i586/libsvoiceclientdp.so
deleted file mode 100644 (file)
index bd4d3b5..0000000
Binary files a/lib/i586/libsvoiceclientdp.so and /dev/null differ
diff --git a/lib/i586/libsvoiceparser.so b/lib/i586/libsvoiceparser.so
deleted file mode 100644 (file)
index e101940..0000000
Binary files a/lib/i586/libsvoiceparser.so and /dev/null differ
old mode 100644 (file)
new mode 100755 (executable)
similarity index 80%
rename from lib_embedded/i586/libvc-engine-default.so
rename to lib/i586/libvc-engine-default.so
index da6f245..d7196bb
Binary files a/lib_embedded/i586/libvc-engine-default.so and b/lib/i586/libvc-engine-default.so differ
diff --git a/lib/i586/libvoice-transport.so b/lib/i586/libvoice-transport.so
deleted file mode 100644 (file)
index d6ba28d..0000000
Binary files a/lib/i586/libvoice-transport.so and /dev/null differ
diff --git a/lib/i586/libvoiceactivity.so b/lib/i586/libvoiceactivity.so
deleted file mode 100644 (file)
index 6b8a5d7..0000000
Binary files a/lib/i586/libvoiceactivity.so and /dev/null differ
diff --git a/lib/x86_64/libasr-nlu.so b/lib/x86_64/libasr-nlu.so
deleted file mode 100644 (file)
index 3c593b4..0000000
Binary files a/lib/x86_64/libasr-nlu.so and /dev/null differ
diff --git a/lib/x86_64/libsvoice.so b/lib/x86_64/libsvoice.so
deleted file mode 100755 (executable)
index b47acef..0000000
Binary files a/lib/x86_64/libsvoice.so and /dev/null differ
diff --git a/lib/x86_64/libsvoiceclientdp.so b/lib/x86_64/libsvoiceclientdp.so
deleted file mode 100644 (file)
index a7bd4e7..0000000
Binary files a/lib/x86_64/libsvoiceclientdp.so and /dev/null differ
diff --git a/lib/x86_64/libsvoiceparser.so b/lib/x86_64/libsvoiceparser.so
deleted file mode 100644 (file)
index 15bad11..0000000
Binary files a/lib/x86_64/libsvoiceparser.so and /dev/null differ
old mode 100644 (file)
new mode 100755 (executable)
similarity index 79%
rename from lib_embedded/x86_64/libvc-engine-default.so
rename to lib/x86_64/libvc-engine-default.so
index d5f34f8..a54447f
Binary files a/lib_embedded/x86_64/libvc-engine-default.so and b/lib/x86_64/libvc-engine-default.so differ
diff --git a/lib/x86_64/libvoice-transport.so b/lib/x86_64/libvoice-transport.so
deleted file mode 100644 (file)
index fb6d94b..0000000
Binary files a/lib/x86_64/libvoice-transport.so and /dev/null differ
diff --git a/lib/x86_64/libvoiceactivity.so b/lib/x86_64/libvoiceactivity.so
deleted file mode 100644 (file)
index 86e49c4..0000000
Binary files a/lib/x86_64/libvoiceactivity.so and /dev/null differ
index 821d41d..adca64e 100644 (file)
@@ -3,38 +3,15 @@ Summary:    Voice control default engine library
 Version:    0.2.1
 Release:    1
 Group:      Graphics & UI Framework/Voice Framework
-License:    Samsung proprietary or Flora-1.1
+License:    Flora-1.1
 Source0:    %{name}-%{version}.tar.gz
 Source1001: %{name}.manifest
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(libtzplatform-config)
-Requires:   %{name}-compat
-Recommends:    %{name}-profile_common
 
 %description
 Description: Voice control default engine library
 
-%package profile_tv
-Summary:    vc-engine-default flora
-License:    Flora-1.1
-Provides:   %{name}-compat = %{version}-%{release}
-Conflicts:  %{name}-profile_common
-
-%description profile_tv
-vc-enging-default binaries with Flora 1.1 license.
-
-%package profile_common
-Summary:    vc-engine-default proprietary
-License:    Samsung proprietary
-Provides:   %{name}-compat = %{version}-%{release}
-Provides:   %{name}-profile_mobile = %{version}-%{release}
-Provides:   %{name}-profile_wearable = %{version}-%{release}
-Provides:   %{name}-profile_ivi = %{version}-%{release}
-Conflicts:  %{name}-profile_tv
-
-%description profile_common
-vc-enging-default binaries with priorietary license.
-
 %prep
 %setup -q
 cp %{SOURCE1001} .
@@ -47,40 +24,10 @@ make %{?jobs:-j%jobs}
 rm -rf %{buildroot}
 %make_install
 
-%post profile_tv
-echo "Moving files to destination..."
-mv -f %{TZ_SYS_RO_SHARE}/voice/vc/1.0/engine/flora/lib*.so %{TZ_SYS_RO_SHARE}/voice/vc/1.0/engine/
-mv -f %{TZ_SYS_RO_SHARE}/voice/vc/1.0/engine-info/flora/vc-default-info.xml %{TZ_SYS_RO_SHARE}/voice/vc/1.0/engine-info/
-mv -f %{TZ_SYS_RO_SHARE}/voice/vc/engine_data/flora/* %{TZ_SYS_RO_SHARE}/voice/vc/engine_data/
-rm -rf %{TZ_SYS_RO_SHARE}/voice/vc/engine_data/flora
-
-%preun profile_tv
-echo "Moving files for rpm uninstall..."
-mv -f %{TZ_SYS_RO_SHARE}/voice/vc/1.0/engine/lib*.so %{TZ_SYS_RO_SHARE}/voice/vc/1.0/engine/flora/
-mv %{TZ_SYS_RO_SHARE}/voice/vc/1.0/engine-info/vc-default-info.xml %{TZ_SYS_RO_SHARE}/voice/vc/1.0/engine-info/flora/
-mkdir -p %{TZ_SYS_RO_SHARE}/voice/vc/tmp
-mv -f %{TZ_SYS_RO_SHARE}/voice/vc/engine_data/* %{TZ_SYS_RO_SHARE}/voice/vc/tmp
-mv -f %{TZ_SYS_RO_SHARE}/voice/vc/tmp %{TZ_SYS_RO_SHARE}/voice/vc/engine_data/flora
-
 %files
-
-%files profile_tv
-%license LICENSE_embedded
-%manifest vc-engine-default.manifest
-%defattr(-,root,root,-)
-%{TZ_SYS_RO_SHARE}/voice/vc/1.0/engine/flora/lib*.so
-%{TZ_SYS_RO_SHARE}/voice/vc/1.0/engine-info/flora/vc-default-info.xml
-%{TZ_SYS_RO_SHARE}/voice/vc/engine_data/flora/*
-
-%files profile_common
 %license LICENSE
 %manifest vc-engine-default.manifest
 %defattr(-,root,root,-)
 %{TZ_SYS_RO_SHARE}/voice/vc/1.0/engine/lib*.so
 %{TZ_SYS_RO_SHARE}/voice/vc/1.0/engine-info/vc-default-info.xml
-%{TZ_SYS_RO_SHARE}/voice/vc/1.0/engine-data/*
-%{_libdir}/libasr-nlu.so
-%{_libdir}/libsvoiceclientdp.so
-%{_libdir}/libsvoiceparser.so
-%{_libdir}/libvoiceactivity.so
-%{_libdir}/libvoice-transport.so
+%{TZ_SYS_RO_SHARE}/voice/vc/engine_data/*
\ No newline at end of file
diff --git a/vc-default-info-embedded.xml b/vc-default-info-embedded.xml
deleted file mode 100644 (file)
index bc6b1b3..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<voice-control-engine>
-        <name>Samsung voice control engine</name>
-        <id>C7AEDE1D-90F7-41ea-9AB4-FD99966D2654</id>
-        <languages>
-                <lang>en_US</lang>
-                <lang>ko_KR</lang>
-        </languages>
-        <non-fixed-support>true</non-fixed-support>
-</voice-control-engine>
\ No newline at end of file