diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000000000000000000000000000000000000..5471dc10377b76db85a2feca7a99a7eef4980ba8
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,203 @@
+
+
+ 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.
diff --git a/src/gst-audio-source.cc b/src/gst-audio-source.cc
index 3d644abaec9d73b5ec2ae71654032480f77c5b46..ae17dc962777e8ddb013e5f54edbc6fbbcf411e1 100644
--- a/src/gst-audio-source.cc
+++ b/src/gst-audio-source.cc
@@ -2,7 +2,7 @@
// Copyright 2013 Tanel Alumae, Tallinn University of Technology
-// See ../../COPYING for clarification regarding multiple authors
+// See ../COPYING for clarification regarding multiple authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
#include <algorithm>
-#include "gst-audio-source.h"
+#include "./gst-audio-source.h"
namespace kaldi {
@@ -65,7 +65,8 @@ void GstBufferSource::SetEnded(bool ended) {
bool GstBufferSource::Read(Vector<BaseFloat> *data) {
uint32 nsamples_req = data->Dim(); // (16bit) samples requested
- int16 buf[data->Dim()];
+ uint32 kDim = data->Dim();
+ int16 buf[kDim];
uint32 nbytes_transferred = 0;
while ((nbytes_transferred < nsamples_req * sizeof(SampleType))) {
diff --git a/src/gst-audio-source.h b/src/gst-audio-source.h
index 4cfcc6bf22628b84a2b4b92b37777802af593019..029c108da8ff64e7e25c9ad4c261a36564fe3527 100644
--- a/src/gst-audio-source.h
+++ b/src/gst-audio-source.h
@@ -17,8 +17,8 @@
// See the Apache 2 License for the specific language governing permissions and
// limitations under the License.
-#ifndef KALDI_GST_PLUGIN_GST_AUDIO_SOURCE_H_
-#define KALDI_GST_PLUGIN_GST_AUDIO_SOURCE_H_
+#ifndef KALDI_SRC_GST_AUDIO_SOURCE_H_
+#define KALDI_SRC_GST_AUDIO_SOURCE_H_
#include <matrix/kaldi-vector.h>
#include <gst/gst.h>
@@ -55,4 +55,4 @@ class GstBufferSource {
} // namespace kaldi
-#endif // KALDI_GST_PLUGIN_GST_AUDIO_SOURCE_H_
+#endif // KALDI_SRC_GST_AUDIO_SOURCE_H_
diff --git a/src/gstkaldinnet2onlinedecoder.cc b/src/gstkaldinnet2onlinedecoder.cc
index 6b6604af2cc2c8fa4241f78595b988dbfb399754..baffc99458dee7d140ce412f56127f5d985719d0 100644
--- a/src/gstkaldinnet2onlinedecoder.cc
+++ b/src/gstkaldinnet2onlinedecoder.cc
@@ -44,8 +44,8 @@
#include <gst/gst.h>
-#include "kaldimarshal.h"
-#include "gstkaldinnet2onlinedecoder.h"
+#include "./kaldimarshal.h"
+#include "./gstkaldinnet2onlinedecoder.h"
#include "fstext/fstext-lib.h"
@@ -121,7 +121,7 @@ static GstFlowReturn gst_kaldinnet2onlinedecoder_chain(GstPad * pad,
static GstStateChangeReturn gst_kaldinnet2onlinedecoder_change_state(
GstElement *element, GstStateChange transition);
-static gboolean gst_kaldinnet2onlinedecoder_query (GstPad *pad, GstObject * parent, GstQuery * query);
+static gboolean gst_kaldinnet2onlinedecoder_query(GstPad *pad, GstObject * parent, GstQuery * query);
static void gst_kaldinnet2onlinedecoder_finalize(GObject * object);
@@ -696,7 +696,6 @@ static GstFlowReturn gst_kaldinnet2onlinedecoder_chain(GstPad * pad,
GstBuffer * buf) {
Gstkaldinnet2onlinedecoder *filter = GST_KALDINNET2ONLINEDECODER(parent);
-
if (G_UNLIKELY(!filter->audio_source))
goto not_negotiated;
if (!filter->silent) {
diff --git a/src/gstkaldinnet2onlinedecoder.h b/src/gstkaldinnet2onlinedecoder.h
index d77bcac404ab663bf276048f758e7d0b1b2e0bff..b24ce1037b17ad84ea8378177dcc5db5a4f4b5d8 100644
--- a/src/gstkaldinnet2onlinedecoder.h
+++ b/src/gstkaldinnet2onlinedecoder.h
@@ -1,56 +1,29 @@
-/*
- * GStreamer
- * Copyright (C) 2005 Thomas Vander Stichele <thomas@apestaart.org>
- * Copyright (C) 2005 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
- * Copyright (C) 2014 Tanel Alumae <<user@hostname.org>>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Alternatively, the contents of this file may be used under the
- * GNU Lesser General Public License Version 2.1 (the "LGPL"), in
- * which case the following provisions apply instead of the ones
- * mentioned above:
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef __GST_KALDINNET2ONLINEDECODER_H__
-#define __GST_KALDINNET2ONLINEDECODER_H__
-
+// gstkaldinnet2onlinedecoder.h
+
+// Copyright 2014 Tanel Alumäe
+
+// See ../COPYING for clarification regarding multiple authors
+//
+// 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
+//
+// THIS CODE IS PROVIDED *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+// WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+// MERCHANTABLITY OR NON-INFRINGEMENT.
+// See the Apache 2 License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef KALDI_SRC_GSTKALDINNET2ONLINEDECODER_H_
+#define KALDI_SRC_GSTKALDINNET2ONLINEDECODER_H_
#include <gst/gst.h>
-#include "simple-options-gst.h"
-#include "gst-audio-source.h"
+#include "./simple-options-gst.h"
+#include "./gst-audio-source.h"
#include "online2/online-nnet2-decoding.h"
#include "online2/onlinebin-util.h"
@@ -75,11 +48,10 @@ G_BEGIN_DECLS
#define GST_IS_KALDINNET2ONLINEDECODER_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_KALDINNET2ONLINEDECODER))
-typedef struct _Gstkaldinnet2onlinedecoder Gstkaldinnet2onlinedecoder;
+typedef struct _Gstkaldinnet2onlinedecoder Gstkaldinnet2onlinedecoder;
typedef struct _Gstkaldinnet2onlinedecoderClass Gstkaldinnet2onlinedecoderClass;
-struct _Gstkaldinnet2onlinedecoder
-{
+struct _Gstkaldinnet2onlinedecoder {
GstElement element;
GstPad *sinkpad, *srcpad;
@@ -108,15 +80,14 @@ struct _Gstkaldinnet2onlinedecoder
gboolean decoding;
};
-struct _Gstkaldinnet2onlinedecoderClass
-{
+struct _Gstkaldinnet2onlinedecoderClass {
GstElementClass parent_class;
void (*partial_result)(GstElement *element, const gchar *result_str);
void (*final_result)(GstElement *element, const gchar *result_str);
};
-GType gst_kaldinnet2onlinedecoder_get_type (void);
+GType gst_kaldinnet2onlinedecoder_get_type(void);
G_END_DECLS
}
-#endif /* __GST_KALDINNET2ONLINEDECODER_H__ */
+#endif // KALDI_SRC_GSTKALDINNET2ONLINEDECODER_H_
diff --git a/src/simple-options-gst.cc b/src/simple-options-gst.cc
index ac787083ceb56159781f8c54be9c40dfe46dda7e..3d0b5c62be9556f966bd11ae6cc1338061b7c42e 100644
--- a/src/simple-options-gst.cc
+++ b/src/simple-options-gst.cc
@@ -2,7 +2,7 @@
// Copyright 2014 Tanel Alumae, Tallinn University of Technology
-// See ../../COPYING for clarification regarding multiple authors
+// See ../COPYING for clarification regarding multiple authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -17,48 +17,48 @@
// See the Apache 2 License for the specific language governing permissions and
// limitations under the License.
-#include "simple-options-gst.h"
+#include "./simple-options-gst.h"
#include <algorithm>
namespace kaldi {
-void SimpleOptionsGst::Register(const std::string &name,
- bool *ptr,
- const std::string &doc) {
+void SimpleOptionsGst::Register(const std::string &name, bool *ptr,
+ const std::string &doc) {
std::string new_name = TransformName(name);
SimpleOptions::Register(new_name, ptr, doc);
}
-void SimpleOptionsGst::Register(const std::string &name, int32 *ptr, const std::string &doc) {
+void SimpleOptionsGst::Register(const std::string &name, int32 *ptr,
+ const std::string &doc) {
std::string new_name = TransformName(name);
SimpleOptions::Register(new_name, ptr, doc);
}
-void SimpleOptionsGst::Register(const std::string &name, uint32 *ptr, const std::string &doc) {
+void SimpleOptionsGst::Register(const std::string &name, uint32 *ptr,
+ const std::string &doc) {
std::string new_name = TransformName(name);
SimpleOptions::Register(new_name, ptr, doc);
}
-
-void SimpleOptionsGst::Register(const std::string &name, float *ptr, const std::string &doc) {
+void SimpleOptionsGst::Register(const std::string &name, float *ptr,
+ const std::string &doc) {
std::string new_name = TransformName(name);
SimpleOptions::Register(new_name, ptr, doc);
}
-void SimpleOptionsGst::Register(const std::string &name, double *ptr, const std::string &doc) {
+void SimpleOptionsGst::Register(const std::string &name, double *ptr,
+ const std::string &doc) {
std::string new_name = TransformName(name);
SimpleOptions::Register(new_name, ptr, doc);
}
void SimpleOptionsGst::Register(const std::string &name, std::string *ptr,
- const std::string &doc) {
+ const std::string &doc) {
std::string new_name = TransformName(name);
SimpleOptions::Register(new_name, ptr, doc);
}
-
std::string SimpleOptionsGst::TransformName(const std::string &name) {
std::string new_name = name;
- std::replace( new_name.begin(), new_name.end(), '.', '-');
+ std::replace(new_name.begin(), new_name.end(), '.', '-');
return new_name;
}
-
}
diff --git a/src/simple-options-gst.h b/src/simple-options-gst.h
index 80d69f7f3a7761c5b27eb6b7c224c93897907458..4d9974d5a0cb67d133888881fdb1c7361d6b1863 100644
--- a/src/simple-options-gst.h
+++ b/src/simple-options-gst.h
@@ -1,5 +1,24 @@
-#ifndef SIMPLE_OPTIONS_GST_H_
-#define SIMPLE_OPTIONS_GST_H_
+// simple-options-gst.h
+
+// Copyright 2014 Tanel Alumäe
+
+// See ../COPYING for clarification regarding multiple authors
+//
+// 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
+//
+// THIS CODE IS PROVIDED *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+// WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+// MERCHANTABLITY OR NON-INFRINGEMENT.
+// See the Apache 2 License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef KALDI_SRC_SIMPLE_OPTIONS_GST_H_
+#define KALDI_SRC_SIMPLE_OPTIONS_GST_H_
#include <string>
@@ -11,7 +30,6 @@ namespace kaldi {
// it transforms all '.' characters to '-' in options names,
// in order to avoid GStreamer doing it itself
class SimpleOptionsGst : public SimpleOptions {
-
void Register(const std::string &name, bool *ptr, const std::string &doc);
void Register(const std::string &name, int32 *ptr, const std::string &doc);
void Register(const std::string &name, uint32 *ptr, const std::string &doc);
@@ -20,9 +38,8 @@ class SimpleOptionsGst : public SimpleOptions {
void Register(const std::string &name, std::string *ptr,
const std::string &doc);
-private:
+ private:
std::string TransformName(const std::string &name);
};
-
}
-#endif // SIMPLE_OPTIONS_GST_H_
+#endif // KALDI_SRC_SIMPLE_OPTIONS_GST_H_