annotate Matcher.cpp @ 0:640f92242cc1

* initial import
author cannam
date Wed, 24 Oct 2007 12:13:43 +0000
parents
children de792b8c2801
rev   line source
cannam@0 1 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */
cannam@0 2
cannam@0 3 /*
cannam@0 4 Vamp feature extraction plugin using the MATCH audio alignment
cannam@0 5 algorithm.
cannam@0 6
cannam@0 7 Centre for Digital Music, Queen Mary, University of London.
cannam@0 8 This file copyright 2007 Simon Dixon, Chris Cannam and QMUL.
cannam@0 9
cannam@0 10 This program is free software; you can redistribute it and/or
cannam@0 11 modify it under the terms of the GNU General Public License as
cannam@0 12 published by the Free Software Foundation; either version 2 of the
cannam@0 13 License, or (at your option) any later version. See the file
cannam@0 14 COPYING included with this distribution for more information.
cannam@0 15 */
cannam@0 16
cannam@0 17 #include "Matcher.h"
cannam@0 18 #include "Finder.h"
cannam@0 19
cannam@0 20 #include <iostream>
cannam@0 21
cannam@0 22 bool Matcher::silent = true;
cannam@0 23
cannam@0 24 Matcher::Matcher(float rate, Matcher *p)
cannam@0 25 {
cannam@0 26 std::cerr << "Matcher::Matcher(" << rate << ", " << p << ")" << std::endl;
cannam@0 27
cannam@0 28 sampleRate = rate;
cannam@0 29 otherMatcher = p; // the first matcher will need this to be set later
cannam@0 30 firstPM = (!p);
cannam@0 31 matchFileOffset = 0;
cannam@0 32 ltAverage = 0;
cannam@0 33 frameCount = 0;
cannam@0 34 runCount = 0;
cannam@0 35 paused = false;
cannam@0 36 hopSize = 0;
cannam@0 37 fftSize = 0;
cannam@0 38 blockSize = 0;
cannam@0 39 hopTime = 0.020; // DEFAULT, overridden with -h //!!!
cannam@0 40 fftTime = 0.04644; // DEFAULT, overridden with -f
cannam@0 41 blockTime = 10.0; // DEFAULT, overridden with -c
cannam@0 42 normalise1 = true;
cannam@0 43 normalise2 = false;
cannam@0 44 normalise3 = false;
cannam@0 45 normalise4 = true;
cannam@0 46 useSpectralDifference = true;
cannam@0 47 useChromaFrequencyMap = false;
cannam@0 48 scale = 90;
cannam@0 49 maxFrames = 0; // stop at EOF
cannam@0 50
cannam@0 51 hopSize = lrint(sampleRate * hopTime);
cannam@0 52 fftSize = lrint(pow(2, lrint(log(fftTime * sampleRate) / log(2))));
cannam@0 53 blockSize = lrint(blockTime / hopTime);
cannam@0 54
cannam@0 55 distance = 0;
cannam@0 56 bestPathCost = 0;
cannam@0 57 distYSizes = 0;
cannam@0 58 distXSize = 0;
cannam@0 59
cannam@0 60 initialised = false;
cannam@0 61
cannam@0 62 } // default constructor
cannam@0 63
cannam@0 64 Matcher::~Matcher()
cannam@0 65 {
cannam@0 66 std::cerr << "Matcher(" << this << ")::~Matcher()" << std::endl;
cannam@0 67
cannam@0 68 if (initialised) {
cannam@0 69
cannam@0 70 for (int i = 0; i < distXSize; ++i) {
cannam@0 71 if (distance[i]) {
cannam@0 72 free(distance[i]);
cannam@0 73 free(bestPathCost[i]);
cannam@0 74 }
cannam@0 75 }
cannam@0 76 free(distance);
cannam@0 77 free(bestPathCost);
cannam@0 78
cannam@0 79 free(first);
cannam@0 80 free(last);
cannam@0 81
cannam@0 82 free(distYSizes);
cannam@0 83 }
cannam@0 84 }
cannam@0 85
cannam@0 86 void
cannam@0 87 Matcher::print()
cannam@0 88 {
cannam@0 89 cerr << toString() << endl;
cannam@0 90 } // print()
cannam@0 91
cannam@0 92 string
cannam@0 93 Matcher::toString()
cannam@0 94 {
cannam@0 95 std::stringstream os;
cannam@0 96 os << "Matcher " << this << ": (" << sampleRate
cannam@0 97 << "kHz)"
cannam@0 98 << "\n\tHop size: " << hopSize
cannam@0 99 << "\n\tFFT size: " << fftSize
cannam@0 100 << "\n\tBlock size: " << blockSize;
cannam@0 101 return os.str();
cannam@0 102 } // toString()
cannam@0 103
cannam@0 104 void
cannam@0 105 Matcher::init()
cannam@0 106 {
cannam@0 107 if (initialised) return;
cannam@0 108
cannam@0 109 initialised = true;
cannam@0 110
cannam@0 111 makeFreqMap(fftSize, sampleRate);
cannam@0 112
cannam@0 113 initVector<double>(prevFrame, freqMapSize);
cannam@0 114 initVector<double>(newFrame, freqMapSize);
cannam@0 115 initMatrix<double>(frames, blockSize, freqMapSize + 1);
cannam@0 116
cannam@0 117 int distSize = (MAX_RUN_COUNT + 1) * blockSize;
cannam@0 118
cannam@0 119 distXSize = blockSize * 2;
cannam@0 120
cannam@0 121 // std::cerr << "Matcher::init: distXSize = " << distXSize << std::endl;
cannam@0 122
cannam@0 123 distance = (unsigned char **)malloc(distXSize * sizeof(unsigned char *));
cannam@0 124 bestPathCost = (int **)malloc(distXSize * sizeof(int *));
cannam@0 125 distYSizes = (int *)malloc(distXSize * sizeof(int));
cannam@0 126
cannam@0 127 for (int i = 0; i < blockSize; ++i) {
cannam@0 128 distance[i] = (unsigned char *)malloc(distSize * sizeof(unsigned char));
cannam@0 129 bestPathCost[i] = (int *)malloc(distSize * sizeof(int));
cannam@0 130 distYSizes[i] = distSize;
cannam@0 131 }
cannam@0 132 for (int i = blockSize; i < distXSize; ++i) {
cannam@0 133 distance[i] = 0;
cannam@0 134 }
cannam@0 135
cannam@0 136 first = (int *)malloc(distXSize * sizeof(int));
cannam@0 137 last = (int *)malloc(distXSize * sizeof(int));
cannam@0 138
cannam@0 139 frameCount = 0;
cannam@0 140 runCount = 0;
cannam@0 141 // frameRMS = 0;
cannam@0 142 ltAverage = 0;
cannam@0 143
cannam@0 144 if (!silent) print();
cannam@0 145 } // init
cannam@0 146
cannam@0 147 void
cannam@0 148 Matcher::makeFreqMap(int fftSize, float sampleRate)
cannam@0 149 {
cannam@0 150 initVector<int>(freqMap, fftSize/2 + 1);
cannam@0 151 if (useChromaFrequencyMap)
cannam@0 152 makeChromaFrequencyMap(fftSize, sampleRate);
cannam@0 153 else
cannam@0 154 makeStandardFrequencyMap(fftSize, sampleRate);
cannam@0 155 } // makeFreqMap()
cannam@0 156
cannam@0 157 void
cannam@0 158 Matcher::makeStandardFrequencyMap(int fftSize, float sampleRate)
cannam@0 159 {
cannam@0 160 double binWidth = sampleRate / fftSize;
cannam@0 161 int crossoverBin = (int)(2 / (pow(2, 1/12.0) - 1));
cannam@0 162 int crossoverMidi = lrint(log(crossoverBin*binWidth/440)/
cannam@0 163 log(2) * 12 + 69);
cannam@0 164 // freq = 440 * Math.pow(2, (midi-69)/12.0) / binWidth;
cannam@0 165 int i = 0;
cannam@0 166 while (i <= crossoverBin) {
cannam@0 167 freqMap[i] = i;
cannam@0 168 ++i;
cannam@0 169 }
cannam@0 170 while (i <= fftSize/2) {
cannam@0 171 double midi = log(i*binWidth/440) / log(2) * 12 + 69;
cannam@0 172 if (midi > 127)
cannam@0 173 midi = 127;
cannam@0 174 freqMap[i++] = crossoverBin + lrint(midi) - crossoverMidi;
cannam@0 175 }
cannam@0 176 freqMapSize = freqMap[i-1] + 1;
cannam@0 177 if (!silent) {
cannam@0 178 cerr << "Standard map size: " << freqMapSize
cannam@0 179 << "; Crossover at: " << crossoverBin << endl;
cannam@0 180 //!!! for (i = 0; i < fftSize / 2; i++)
cannam@0 181 // cerr << "freqMap[" << i << "] = " << freqMap[i] << endl;
cannam@0 182 }
cannam@0 183 } // makeStandardFrequencyMap()
cannam@0 184
cannam@0 185 void
cannam@0 186 Matcher::makeChromaFrequencyMap(int fftSize, float sampleRate)
cannam@0 187 {
cannam@0 188 double binWidth = sampleRate / fftSize;
cannam@0 189 int crossoverBin = (int)(1 / (pow(2, 1/12.0) - 1));
cannam@0 190 // freq = 440 * Math.pow(2, (midi-69)/12.0) / binWidth;
cannam@0 191 int i = 0;
cannam@0 192 while (i <= crossoverBin)
cannam@0 193 freqMap[i++] = 0;
cannam@0 194 while (i <= fftSize/2) {
cannam@0 195 double midi = log(i*binWidth/440) / log(2) * 12 + 69;
cannam@0 196 freqMap[i++] = (lrint(midi)) % 12 + 1;
cannam@0 197 }
cannam@0 198 freqMapSize = 13;
cannam@0 199 if (!silent) {
cannam@0 200 cerr << "Chroma map size: " << freqMapSize
cannam@0 201 << "; Crossover at: " << crossoverBin << endl;
cannam@0 202 for (i = 0; i < fftSize / 2; i++)
cannam@0 203 cerr << "freqMap[" << i << "] = " << freqMap[i] << endl;
cannam@0 204 }
cannam@0 205 } // makeChromaFrequencyMap()
cannam@0 206
cannam@0 207 void
cannam@0 208 Matcher::processFrame(double *reBuffer, double *imBuffer)
cannam@0 209 {
cannam@0 210 if (!initialised) init();
cannam@0 211
cannam@0 212 for (int i = 0; i < (int)newFrame.size(); ++i) {
cannam@0 213 newFrame[i] = 0;
cannam@0 214 }
cannam@0 215 double rms = 0;
cannam@0 216 for (int i = 0; i <= fftSize/2; i++) {
cannam@0 217 double mag = reBuffer[i] * reBuffer[i] +
cannam@0 218 imBuffer[i] * imBuffer[i];
cannam@0 219 rms += mag;
cannam@0 220 newFrame[freqMap[i]] += mag;
cannam@0 221 }
cannam@0 222 rms = sqrt(rms / (fftSize/2));
cannam@0 223
cannam@0 224 int frameIndex = frameCount % blockSize;
cannam@0 225
cannam@0 226 if (frameCount >= distXSize) {
cannam@0 227 // std::cerr << "Resizing " << distXSize << " -> " << distXSize * 2 << std::endl;
cannam@0 228 distXSize *= 2;
cannam@0 229 distance = (unsigned char **)realloc(distance, distXSize * sizeof(unsigned char *));
cannam@0 230 bestPathCost = (int **)realloc(bestPathCost, distXSize * sizeof(int *));
cannam@0 231 distYSizes = (int *)realloc(distYSizes, distXSize * sizeof(int));
cannam@0 232 first = (int *)realloc(first, distXSize * sizeof(int));
cannam@0 233 last = (int *)realloc(last, distXSize * sizeof(int));
cannam@0 234
cannam@0 235 for (int i = distXSize/2; i < distXSize; ++i) {
cannam@0 236 distance[i] = 0;
cannam@0 237 }
cannam@0 238 }
cannam@0 239
cannam@0 240 if (firstPM && (frameCount >= blockSize)) {
cannam@0 241
cannam@0 242 int len = last[frameCount - blockSize] -
cannam@0 243 first[frameCount - blockSize];
cannam@0 244
cannam@0 245 // We need to copy distance[frameCount-blockSize] to
cannam@0 246 // distance[frameCount], and then truncate
cannam@0 247 // distance[frameCount-blockSize] to its first len elements.
cannam@0 248 // Same for bestPathCost.
cannam@0 249 /*
cannam@0 250 std::cerr << "moving " << distYSizes[frameCount - blockSize] << " from " << frameCount - blockSize << " to "
cannam@0 251 << frameCount << ", allocating " << len << " for "
cannam@0 252 << frameCount - blockSize << std::endl;
cannam@0 253 */
cannam@0 254 distance[frameCount] = distance[frameCount - blockSize];
cannam@0 255
cannam@0 256 distance[frameCount - blockSize] = (unsigned char *)
cannam@0 257 malloc(len * sizeof(unsigned char));
cannam@0 258 for (int i = 0; i < len; ++i) {
cannam@0 259 distance[frameCount - blockSize][i] =
cannam@0 260 distance[frameCount][i];
cannam@0 261 }
cannam@0 262
cannam@0 263 bestPathCost[frameCount] = bestPathCost[frameCount - blockSize];
cannam@0 264
cannam@0 265 bestPathCost[frameCount - blockSize] = (int *)
cannam@0 266 malloc(len * sizeof(int));
cannam@0 267 for (int i = 0; i < len; ++i) {
cannam@0 268 bestPathCost[frameCount - blockSize][i] =
cannam@0 269 bestPathCost[frameCount][i];
cannam@0 270 }
cannam@0 271
cannam@0 272 distYSizes[frameCount] = distYSizes[frameCount - blockSize];
cannam@0 273 distYSizes[frameCount - blockSize] = len;
cannam@0 274 }
cannam@0 275
cannam@0 276 double totalEnergy = 0;
cannam@0 277 if (useSpectralDifference) {
cannam@0 278 for (int i = 0; i < freqMapSize; i++) {
cannam@0 279 totalEnergy += newFrame[i];
cannam@0 280 if (newFrame[i] > prevFrame[i]) {
cannam@0 281 frames[frameIndex][i] = newFrame[i] - prevFrame[i];
cannam@0 282 } else {
cannam@0 283 frames[frameIndex][i] = 0;
cannam@0 284 }
cannam@0 285 }
cannam@0 286 } else {
cannam@0 287 for (int i = 0; i < freqMapSize; i++) {
cannam@0 288 frames[frameIndex][i] = newFrame[i];
cannam@0 289 totalEnergy += frames[frameIndex][i];
cannam@0 290 }
cannam@0 291 }
cannam@0 292 frames[frameIndex][freqMapSize] = totalEnergy;
cannam@0 293
cannam@0 294 double decay = frameCount >= 200 ? 0.99:
cannam@0 295 (frameCount < 100? 0: (frameCount - 100) / 100.0);
cannam@0 296
cannam@0 297 if (ltAverage == 0)
cannam@0 298 ltAverage = totalEnergy;
cannam@0 299 else
cannam@0 300 ltAverage = ltAverage * decay + totalEnergy * (1.0 - decay);
cannam@0 301
cannam@0 302 // System.err.println(Format.d(ltAverage,4) + " " +
cannam@0 303 // Format.d(totalEnergy) + " " +
cannam@0 304 // Format.d(frameRMS));
cannam@0 305
cannam@0 306 // std::cerr << "ltAverage: " << ltAverage << ", totalEnergy: " << totalEnergy << ", frameRMS: " << rms << std::endl;
cannam@0 307
cannam@0 308 if (rms <= 0.01) //!!! silenceThreshold)
cannam@0 309 for (int i = 0; i < freqMapSize; i++)
cannam@0 310 frames[frameIndex][i] = 0;
cannam@0 311 else if (normalise1)
cannam@0 312 for (int i = 0; i < freqMapSize; i++)
cannam@0 313 frames[frameIndex][i] /= totalEnergy;
cannam@0 314 else if (normalise3)
cannam@0 315 for (int i = 0; i < freqMapSize; i++)
cannam@0 316 frames[frameIndex][i] /= ltAverage;
cannam@0 317
cannam@0 318 int stop = otherMatcher->frameCount;
cannam@0 319 int index = stop - blockSize;
cannam@0 320 if (index < 0)
cannam@0 321 index = 0;
cannam@0 322 first[frameCount] = index;
cannam@0 323 last[frameCount] = stop;
cannam@0 324
cannam@0 325 bool overflow = false;
cannam@0 326 int mn= -1;
cannam@0 327 int mx= -1;
cannam@0 328 for ( ; index < stop; index++) {
cannam@0 329 int dMN = calcDistance(frames[frameIndex],
cannam@0 330 otherMatcher->frames[index % blockSize]);
cannam@0 331 if (mx<0)
cannam@0 332 mx = mn = dMN;
cannam@0 333 else if (dMN > mx)
cannam@0 334 mx = dMN;
cannam@0 335 else if (dMN < mn)
cannam@0 336 mn = dMN;
cannam@0 337 if (dMN >= 255) {
cannam@0 338 overflow = true;
cannam@0 339 dMN = 255;
cannam@0 340 }
cannam@0 341 if ((frameCount == 0) && (index == 0)) // first element
cannam@0 342 setValue(0, 0, 0, 0, dMN);
cannam@0 343 else if (frameCount == 0) // first row
cannam@0 344 setValue(0, index, ADVANCE_OTHER,
cannam@0 345 getValue(0, index-1, true), dMN);
cannam@0 346 else if (index == 0) // first column
cannam@0 347 setValue(frameCount, index, ADVANCE_THIS,
cannam@0 348 getValue(frameCount - 1, 0, true), dMN);
cannam@0 349 else if (index == otherMatcher->frameCount - blockSize) {
cannam@0 350 // missing value(s) due to cutoff
cannam@0 351 // - no previous value in current row (resp. column)
cannam@0 352 // - no diagonal value if prev. dir. == curr. dirn
cannam@0 353 int min2 = getValue(frameCount - 1, index, true);
cannam@0 354 // if ((firstPM && (first[frameCount - 1] == index)) ||
cannam@0 355 // (!firstPM && (last[index-1] < frameCount)))
cannam@0 356 if (first[frameCount - 1] == index)
cannam@0 357 setValue(frameCount, index, ADVANCE_THIS, min2, dMN);
cannam@0 358 else {
cannam@0 359 int min1 = getValue(frameCount - 1, index - 1, true);
cannam@0 360 if (min1 + dMN <= min2)
cannam@0 361 setValue(frameCount, index, ADVANCE_BOTH, min1,dMN);
cannam@0 362 else
cannam@0 363 setValue(frameCount, index, ADVANCE_THIS, min2,dMN);
cannam@0 364 }
cannam@0 365 } else {
cannam@0 366 int min1 = getValue(frameCount, index-1, true);
cannam@0 367 int min2 = getValue(frameCount - 1, index, true);
cannam@0 368 int min3 = getValue(frameCount - 1, index-1, true);
cannam@0 369 if (min1 <= min2) {
cannam@0 370 if (min3 + dMN <= min1)
cannam@0 371 setValue(frameCount, index, ADVANCE_BOTH, min3,dMN);
cannam@0 372 else
cannam@0 373 setValue(frameCount, index, ADVANCE_OTHER,min1,dMN);
cannam@0 374 } else {
cannam@0 375 if (min3 + dMN <= min2)
cannam@0 376 setValue(frameCount, index, ADVANCE_BOTH, min3,dMN);
cannam@0 377 else
cannam@0 378 setValue(frameCount, index, ADVANCE_THIS, min2,dMN);
cannam@0 379 }
cannam@0 380 }
cannam@0 381 otherMatcher->last[index]++;
cannam@0 382 } // loop for row (resp. column)
cannam@0 383
cannam@0 384 vector<double> tmp = prevFrame;
cannam@0 385 prevFrame = newFrame;
cannam@0 386 newFrame = tmp;
cannam@0 387
cannam@0 388 frameCount++;
cannam@0 389 runCount++;
cannam@0 390
cannam@0 391 otherMatcher->runCount = 0;
cannam@0 392
cannam@0 393 if (overflow && !silent)
cannam@0 394 cerr << "WARNING: overflow in distance metric: "
cannam@0 395 << "frame " << frameCount << ", val = " << mx << endl;
cannam@0 396
cannam@0 397 if (!silent)
cannam@0 398 std::cerr << "Frame " << frameCount << ", d = " << (mx-mn) << std::endl;
cannam@0 399
cannam@0 400 if ((frameCount % 100) == 0) {
cannam@0 401 if (!silent) {
cannam@0 402 cerr << "Progress:" << frameCount << " " << ltAverage << endl;
cannam@0 403 // Profile.report();
cannam@0 404 }
cannam@0 405 }
cannam@0 406 //!!! if (frameCount == maxFrames)
cannam@0 407 // closeStreams();
cannam@0 408 // }
cannam@0 409 } // processFrame()
cannam@0 410
cannam@0 411 int
cannam@0 412 Matcher::calcDistance(const vector<double> &f1, const vector<double> &f2)
cannam@0 413 {
cannam@0 414 double d = 0;
cannam@0 415 double sum = 0;
cannam@0 416 for (int i = 0; i < freqMapSize; i++) {
cannam@0 417 d += fabs(f1[i] - f2[i]);
cannam@0 418 sum += f1[i] + f2[i];
cannam@0 419 }
cannam@0 420 // System.err.print(" " + Format.d(d,3));
cannam@0 421 if (sum == 0)
cannam@0 422 return 0;
cannam@0 423 if (normalise2)
cannam@0 424 return (int)(scale * d / sum); // 0 <= d/sum <= 2
cannam@0 425 if (!normalise4)
cannam@0 426 return (int)(scale * d);
cannam@0 427 // double weight = (5 + Math.log(f1[freqMapSize] + f2[freqMapSize]))/10.0;
cannam@0 428 double weight = (8 + log(sum)) / 10.0;
cannam@0 429 // if (weight < mins) {
cannam@0 430 // mins = weight;
cannam@0 431 // System.err.println(Format.d(mins,3) + " " + Format.d(maxs));
cannam@0 432 // }
cannam@0 433 // if (weight > maxs) {
cannam@0 434 // maxs = weight;
cannam@0 435 // System.err.println(Format.d(mins,3) + " " + Format.d(maxs));
cannam@0 436 // }
cannam@0 437 if (weight < 0)
cannam@0 438 weight = 0;
cannam@0 439 else if (weight > 1)
cannam@0 440 weight = 1;
cannam@0 441 return (int)(scale * d / sum * weight);
cannam@0 442 } // calcDistance()
cannam@0 443
cannam@0 444 int
cannam@0 445 Matcher::getValue(int i, int j, bool firstAttempt)
cannam@0 446 {
cannam@0 447 if (firstPM)
cannam@0 448 return bestPathCost[i][j - first[i]];
cannam@0 449 else
cannam@0 450 return otherMatcher->bestPathCost[j][i - otherMatcher->first[j]];
cannam@0 451 } // getValue()
cannam@0 452
cannam@0 453 void
cannam@0 454 Matcher::setValue(int i, int j, int dir, int value, int dMN)
cannam@0 455 {
cannam@0 456 if (firstPM) {
cannam@0 457 distance[i][j - first[i]] = (unsigned char)((dMN & MASK) | dir);
cannam@0 458 bestPathCost[i][j - first[i]] =
cannam@0 459 (value + (dir==ADVANCE_BOTH? dMN*2: dMN));
cannam@0 460 } else {
cannam@0 461 if (dir == ADVANCE_THIS)
cannam@0 462 dir = ADVANCE_OTHER;
cannam@0 463 else if (dir == ADVANCE_OTHER)
cannam@0 464 dir = ADVANCE_THIS;
cannam@0 465 int idx = i - otherMatcher->first[j];
cannam@0 466 if (idx == (int)otherMatcher->distYSizes[j]) {
cannam@0 467 // This should never happen, but if we allow arbitrary
cannam@0 468 // pauses in either direction, and arbitrary lengths at
cannam@0 469 // end, it is better than a segmentation fault.
cannam@0 470 std::cerr << "Emergency resize: " << idx << " -> " << idx * 2 << std::endl;
cannam@0 471 otherMatcher->distYSizes[j] = idx * 2;
cannam@0 472 otherMatcher->bestPathCost[j] =
cannam@0 473 (int *)realloc(otherMatcher->bestPathCost[j],
cannam@0 474 idx * 2 * sizeof(int));
cannam@0 475 otherMatcher->distance[j] =
cannam@0 476 (unsigned char *)realloc(otherMatcher->distance[j],
cannam@0 477 idx * 2 * sizeof(unsigned char));
cannam@0 478 }
cannam@0 479 otherMatcher->distance[j][idx] = (unsigned char)((dMN & MASK) | dir);
cannam@0 480 otherMatcher->bestPathCost[j][idx] =
cannam@0 481 (value + (dir==ADVANCE_BOTH? dMN*2: dMN));
cannam@0 482 }
cannam@0 483 } // setValue()
cannam@0 484