Mercurial > hg > audiodb
comparison index.cpp @ 427:adaa6a688a04 api-inversion
Move sequence_foo() functions out of audioDB:: namespace...
... and into the internals header, mostly to get them out of the way.
That means they have to be inline, which is probably suboptimal but will
do for now.
author | mas01cr |
---|---|
date | Wed, 24 Dec 2008 10:55:24 +0000 |
parents | 4a22a0bdf9a9 |
children | 8632cd387e24 |
comparison
equal
deleted
inserted
replaced
426:4a22a0bdf9a9 | 427:adaa6a688a04 |
---|---|
102 memcpy(*spp, powerTable, *dvp * sizeof(double)); | 102 memcpy(*spp, powerTable, *dvp * sizeof(double)); |
103 | 103 |
104 | 104 |
105 for(Uns32T i = 0; i < dbH->numFiles; i++){ | 105 for(Uns32T i = 0; i < dbH->numFiles; i++){ |
106 if(trackTable[i] >= sequenceLength) { | 106 if(trackTable[i] >= sequenceLength) { |
107 sequence_sum(snpp, trackTable[i], sequenceLength); | 107 audiodb_sequence_sum(snpp, trackTable[i], sequenceLength); |
108 sequence_sqrt(snpp, trackTable[i], sequenceLength); | 108 audiodb_sequence_sqrt(snpp, trackTable[i], sequenceLength); |
109 | 109 |
110 sequence_sum(sppp, trackTable[i], sequenceLength); | 110 audiodb_sequence_sum(sppp, trackTable[i], sequenceLength); |
111 sequence_average(sppp, trackTable[i], sequenceLength); | 111 audiodb_sequence_average(sppp, trackTable[i], sequenceLength); |
112 } | 112 } |
113 snpp += trackTable[i]; | 113 snpp += trackTable[i]; |
114 sppp += trackTable[i]; | 114 sppp += trackTable[i]; |
115 } | 115 } |
116 | 116 |
300 insertPowerData(trackTable[trackID], powerfd, *sPowerp); | 300 insertPowerData(trackTable[trackID], powerfd, *sPowerp); |
301 if (0 < powerfd) { | 301 if (0 < powerfd) { |
302 close(powerfd); | 302 close(powerfd); |
303 } | 303 } |
304 | 304 |
305 sequence_sum(*sPowerp, trackTable[trackID], sequenceLength); | 305 audiodb_sequence_sum(*sPowerp, trackTable[trackID], sequenceLength); |
306 sequence_average(*sPowerp, trackTable[trackID], sequenceLength); | 306 audiodb_sequence_average(*sPowerp, trackTable[trackID], sequenceLength); |
307 powerTable = 0; | 307 powerTable = 0; |
308 | 308 |
309 // Allocate and calculate the l2norm sequence | 309 // Allocate and calculate the l2norm sequence |
310 *sNormpp = new double[trackTable[trackID]]; | 310 *sNormpp = new double[trackTable[trackID]]; |
311 assert(*sNormpp); | 311 assert(*sNormpp); |
312 *snPtrp = *sNormpp; | 312 *snPtrp = *sNormpp; |
313 audiodb_l2norm_buffer(fvp, dbH->dim, trackTable[trackID], *sNormpp); | 313 audiodb_l2norm_buffer(fvp, dbH->dim, trackTable[trackID], *sNormpp); |
314 sequence_sum(*sNormpp, trackTable[trackID], sequenceLength); | 314 audiodb_sequence_sum(*sNormpp, trackTable[trackID], sequenceLength); |
315 sequence_sqrt(*sNormpp, trackTable[trackID], sequenceLength); | 315 audiodb_sequence_sqrt(*sNormpp, trackTable[trackID], sequenceLength); |
316 } | 316 } |
317 } | 317 } |
318 | 318 |
319 void audioDB::index_insert_tracks(Uns32T start_track, Uns32T end_track, | 319 void audioDB::index_insert_tracks(Uns32T start_track, Uns32T end_track, |
320 double** fvpp, double** sNormpp,double** snPtrp, | 320 double** fvpp, double** sNormpp,double** snPtrp, |