1 --- strigi-0.7.8/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp.orig 2016-03-17 08:28:32.500019547 +0100
2 +++ strigi-0.7.8/libstreamanalyzer/plugins/endplugins/ffmpegendanalyzer.cpp 2016-03-17 08:29:07.623793917 +0100
4 outs << stream.r_frame_rate.num / stream.r_frame_rate.den;
5 ar.addTriplet(streamuri, frameRatePropertyName, outs.str());
7 - if (codec.pix_fmt != PIX_FMT_NONE) {}//FIXME pixel format
8 + if (codec.pix_fmt != AV_PIX_FMT_NONE) {}//FIXME pixel format
12 --- strigi-0.7.8/libstreamanalyzer/include/strigi/analysisresult.h~ 2013-02-05 22:34:52.000000000 +0100
13 +++ strigi-0.7.8/libstreamanalyzer/include/strigi/analysisresult.h 2016-03-17 08:32:18.266187062 +0100
15 * @param field the registered field
16 * @param value the value to add
18 + void addValue(const RegisteredField* field, int64_t value);
20 + * Associate a value for a field with the file.
22 + * addValue() may only be called <tt>field->properties.maxCardinality()</tt> times
23 + * for any given field on any given AnalysisResult.
25 + * @param field the registered field
26 + * @param value the value to add
28 void addValue(const RegisteredField* field, double value);
30 * Associate an RDF triplet with the file.
31 --- strigi-0.7.8/libstreamanalyzer/lib/analysisresult.cpp~ 2013-02-05 22:34:52.000000000 +0100
32 +++ strigi-0.7.8/libstreamanalyzer/lib/analysisresult.cpp 2016-03-17 08:32:59.133366612 +0100
34 p->m_writer.addValue(this, field, value);
37 +AnalysisResult::addValue(const RegisteredField* field, int64_t value) {
38 + if (!p->checkCardinality(field))
40 + p->m_writer.addValue(this, field, value);
43 AnalysisResult::addValue(const RegisteredField* field, double value) {
44 if (!p->checkCardinality(field))
46 --- strigi-0.7.8/libstreamanalyzer/include/strigi/indexwriter.h~ 2013-02-05 22:34:52.000000000 +0100
47 +++ strigi-0.7.8/libstreamanalyzer/include/strigi/indexwriter.h 2016-03-17 08:34:12.897625598 +0100
49 * @param value value of the field
51 virtual void addValue(const AnalysisResult* result, const RegisteredField* field,
54 + * @brief Add a field to the index.
56 + * See AnalysisResult::addValue() for more information.
58 + * @param result the AnalysisResult for the object that is
60 + * @param field description of the field
61 + * @param value value of the field
63 + virtual void addValue(const AnalysisResult* result, const RegisteredField* field,
66 * @brief Add a field to the index.
67 --- strigi-0.7.8/libstreamanalyzer/plugins/indexers/cluceneindexer/cluceneindexwriter.h~ 2013-02-05 22:34:52.000000000 +0100
68 +++ strigi-0.7.8/libstreamanalyzer/plugins/indexers/cluceneindexer/cluceneindexwriter.h 2016-03-17 08:36:27.902652819 +0100
70 void addValue(const Strigi::AnalysisResult*,
71 const Strigi::RegisteredField* fieldname, int32_t value);
72 void addValue(const Strigi::AnalysisResult*,
73 + const Strigi::RegisteredField* fieldname, int64_t value);
74 + void addValue(const Strigi::AnalysisResult*,
75 const Strigi::RegisteredField* fieldname, double value);
76 void addTriplet(const std::string& subject,
77 const std::string& predicate, const std::string& object) {}
78 --- strigi-0.7.8/libstreamanalyzer/plugins/indexers/cluceneindexer/cluceneindexwriter.cpp~ 2013-02-05 22:34:52.000000000 +0100
79 +++ strigi-0.7.8/libstreamanalyzer/plugins/indexers/cluceneindexer/cluceneindexwriter.cpp 2016-03-17 08:37:00.066389665 +0100
83 CLuceneIndexWriter::addValue(const Strigi::AnalysisResult* idx,
84 + const Strigi::RegisteredField* field, int64_t value) {
87 + addValue(idx, field, o.str());
90 +CLuceneIndexWriter::addValue(const Strigi::AnalysisResult* idx,
91 const Strigi::RegisteredField* field,
92 const unsigned char* data, uint32_t size) {
93 addValue(idx, field, string((const char*)data, (string::size_type)size));
94 --- strigi-0.7.8/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexwriter.h~ 2013-02-05 22:34:52.000000000 +0100
95 +++ strigi-0.7.8/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexwriter.h 2016-03-17 08:37:17.009935558 +0100
97 void addValue(const Strigi::AnalysisResult*,
98 const Strigi::RegisteredField* fieldname, int32_t value);
99 void addValue(const Strigi::AnalysisResult*,
100 + const Strigi::RegisteredField* fieldname, int64_t value);
101 + void addValue(const Strigi::AnalysisResult*,
102 const Strigi::RegisteredField* fieldname, double value);
103 void addTriplet(const std::string& subject,
104 const std::string& predicate, const std::string& object) {}
105 --- strigi-0.7.8/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexwriter.cpp~ 2013-02-05 22:34:52.000000000 +0100
106 +++ strigi-0.7.8/libstreamanalyzer/plugins/indexers/clucenengindexer/cluceneindexwriter.cpp 2016-03-17 08:37:37.820196621 +0100
110 CLuceneIndexWriter::addValue(const Strigi::AnalysisResult* idx,
111 + const Strigi::RegisteredField* field, int64_t value) {
114 + addValue(idx, field, o.str());
117 +CLuceneIndexWriter::addValue(const Strigi::AnalysisResult* idx,
118 const Strigi::RegisteredField* field,
119 const unsigned char* data, uint32_t size) {
120 addValue(idx, field, string((const char*)data, (string::size_type)size));
121 --- strigi-0.7.8/strigiutils/bin/xmlindexer/xmlindexwriter.h~ 2013-01-03 13:30:53.000000000 +0100
122 +++ strigi-0.7.8/strigiutils/bin/xmlindexer/xmlindexwriter.h 2016-03-17 08:39:43.025100536 +0100
124 d->values.insert(std::make_pair(field, v.str()));
126 void addValue(const Strigi::AnalysisResult* ar,
127 + const Strigi::RegisteredField* field, int64_t value) {
128 + Data* d = static_cast<Data*>(ar->writerData());
129 + static std::ostringstream v;
132 + d->values.insert(std::make_pair(field, v.str()));
134 + void addValue(const Strigi::AnalysisResult* ar,
135 const Strigi::RegisteredField* field, double value) {
136 Data* d = static_cast<Data*>(ar->writerData());
137 static std::ostringstream v;
138 --- strigi-0.7.8/strigiutils/bin/xmlindexer/rdfindexwriter.h~ 2013-01-03 13:30:53.000000000 +0100
139 +++ strigi-0.7.8/strigiutils/bin/xmlindexer/rdfindexwriter.h 2016-03-17 08:40:07.508740974 +0100
141 d->values.insert(std::make_pair(field, v.str()));
143 void addValue(const Strigi::AnalysisResult* ar,
144 + const Strigi::RegisteredField* field, int64_t value) {
145 + Data* d = static_cast<Data*>(ar->writerData());
146 + static std::ostringstream v;
149 + d->values.insert(std::make_pair(field, v.str()));
151 + void addValue(const Strigi::AnalysisResult* ar,
152 const Strigi::RegisteredField* field, double value) {
153 Data* d = static_cast<Data*>(ar->writerData());
154 static std::ostringstream v;
155 --- strigi-0.7.8/strigiutils/bin/deepfind/grepindexwriter.h~ 2013-01-03 13:30:53.000000000 +0100
156 +++ strigi-0.7.8/strigiutils/bin/deepfind/grepindexwriter.h 2016-03-17 08:40:49.115929517 +0100
158 void addValue(const Strigi::AnalysisResult* idx,
159 const Strigi::RegisteredField* field, int32_t value) {}
160 void addValue(const Strigi::AnalysisResult* idx,
161 + const Strigi::RegisteredField* field, int64_t value) {}
162 + void addValue(const Strigi::AnalysisResult* idx,
163 const Strigi::RegisteredField* field, double value) {}
164 void addTriplet(const std::string& subject,
165 const std::string& predicate, const std::string& object) {}
166 --- strigi-0.7.8/strigiutils/bin/deepfind/grepindexreader.cpp~ 2013-01-03 13:30:53.000000000 +0100
167 +++ strigi-0.7.8/strigiutils/bin/deepfind/grepindexreader.cpp 2016-03-17 08:41:25.403051321 +0100
169 void addValue(const AnalysisResult* result, const RegisteredField* field,
171 void addValue(const AnalysisResult* result, const RegisteredField* field,
173 + void addValue(const AnalysisResult* result, const RegisteredField* field,
175 void addValue(const AnalysisResult* result, const RegisteredField* field,
176 const std::string& name, const std::string& value) {}
177 --- strigi-0.7.8/strigiutils/bin/deepfind/dummyindexwriter.h~ 2013-01-03 13:30:53.000000000 +0100
178 +++ strigi-0.7.8/strigiutils/bin/deepfind/dummyindexwriter.h 2016-03-17 08:41:50.093360996 +0100
180 void addValue(const Strigi::AnalysisResult* ar,
181 const Strigi::RegisteredField* fieldname, int32_t value) {}
182 void addValue(const Strigi::AnalysisResult* ar,
183 + const Strigi::RegisteredField* fieldname, int64_t value) {}
184 + void addValue(const Strigi::AnalysisResult* ar,
185 const Strigi::RegisteredField* fieldname, double value) {}
186 void addTriplet(const std::string& subject,
187 const std::string& predicate, const std::string& object) {}
188 --- strigi-0.7.8/strigiutils/bin/deepfind/analyzerlatencytester.cpp~ 2013-01-03 13:30:53.000000000 +0100
189 +++ strigi-0.7.8/strigiutils/bin/deepfind/analyzerlatencytester.cpp 2016-03-17 08:45:08.202512266 +0100
191 void addValue(const AnalysisResult*, const RegisteredField*, const unsigned char*, uint32_t) {}
192 void addValue(const AnalysisResult*, const RegisteredField*, int32_t) {}
193 void addValue(const AnalysisResult*, const RegisteredField*, uint32_t) {}
194 + void addValue(const AnalysisResult*, const RegisteredField*, int64_t) {}
195 void addValue(const AnalysisResult*, const RegisteredField*, double) {}
196 void addValue(const AnalysisResult*, const RegisteredField*, const string&, const string&) {}
197 void finishAnalysis(const AnalysisResult*) {}