Mercurial > hg > match-vamp
comparison src/MatchFeatureFeeder.cpp @ 78:9be9182d4321 refactors
Remove more friend-classes
author | Chris Cannam |
---|---|
date | Wed, 19 Nov 2014 14:14:52 +0000 |
parents | b9aa663a607b |
children | 42381e437fcd |
comparison
equal
deleted
inserted
replaced
74:b9aa663a607b | 78:9be9182d4321 |
---|---|
64 { | 64 { |
65 if (m_q1.empty()) { // ended | 65 if (m_q1.empty()) { // ended |
66 feed2(); | 66 feed2(); |
67 } else if (m_q2.empty()) { // ended | 67 } else if (m_q2.empty()) { // ended |
68 feed1(); | 68 feed1(); |
69 } else if (m_pm1->m_frameCount < m_pm1->m_blockSize) { // fill initial block | 69 } else if (m_pm1->getFrameCount() < m_pm1->getBlockSize()) { // fill initial block |
70 feed1(); | 70 feed1(); |
71 feed2(); | 71 feed2(); |
72 } else if (m_pm1->m_runCount >= m_pm1->m_params.maxRunCount) { // slope constraints | 72 } else if (m_pm1->isOverrunning()) { // slope constraints |
73 feed2(); | 73 feed2(); |
74 } else if (m_pm2->m_runCount >= m_pm2->m_params.maxRunCount) { | 74 } else if (m_pm2->isOverrunning()) { |
75 feed1(); | 75 feed1(); |
76 } else { | 76 } else { |
77 switch (m_finder->getExpandDirection | 77 switch (m_finder->getExpandDirection |
78 (m_pm1->m_frameCount-1, m_pm2->m_frameCount-1)) { | 78 (m_pm1->getFrameCount()-1, m_pm2->getFrameCount()-1)) { |
79 case Matcher::AdvanceThis: | 79 case Matcher::AdvanceThis: |
80 feed1(); | 80 feed1(); |
81 break; | 81 break; |
82 case Matcher::AdvanceOther: | 82 case Matcher::AdvanceOther: |
83 feed2(); | 83 feed2(); |