Mercurial > hg > btrack
changeset 28:7af87d3f2ce2 develop
Added a function to allow updates to the hop and frame size of the beat tracker
line wrap: on
line diff
--- a/doc/html/_b_track_8cpp.html Tue Jan 28 00:19:21 2014 +0000 +++ b/doc/html/_b_track_8cpp.html Tue Jan 28 00:31:17 2014 +0000 @@ -103,7 +103,7 @@ </div></div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Mon Jan 27 2014 22:01:21 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> +Generated on Tue Jan 28 2014 00:29:23 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.2 </small></address>
--- a/doc/html/_b_track_8h.html Tue Jan 28 00:19:21 2014 +0000 +++ b/doc/html/_b_track_8h.html Tue Jan 28 00:31:17 2014 +0000 @@ -92,6 +92,7 @@ <p><a class="el" href="class_b_track.html">BTrack</a> - a real-time beat tracker. <a href="#details">More...</a></p> <div class="textblock"><code>#include "<a class="el" href="_onset_detection_function_8h_source.html">OnsetDetectionFunction.h</a>"</code><br/> +<code>#include <vector></code><br/> </div> <p><a href="_b_track_8h_source.html">Go to the source code of this file.</a></p> <table class="memberdecls"> @@ -110,7 +111,7 @@ </div></div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Mon Jan 27 2014 22:01:21 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> +Generated on Tue Jan 28 2014 00:29:23 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.2 </small></address>
--- a/doc/html/_b_track_8h_source.html Tue Jan 28 00:19:21 2014 +0000 +++ b/doc/html/_b_track_8h_source.html Tue Jan 28 00:31:17 2014 +0000 @@ -93,111 +93,116 @@ <div class="line"><a name="l00023"></a><span class="lineno"> 23</span> <span class="preprocessor"></span><span class="preprocessor">#define __BTRACK_H</span></div> <div class="line"><a name="l00024"></a><span class="lineno"> 24</span> <span class="preprocessor"></span></div> <div class="line"><a name="l00025"></a><span class="lineno"> 25</span> <span class="preprocessor">#include "<a class="code" href="_onset_detection_function_8h.html" title="A class for calculating onset detection functions.">OnsetDetectionFunction.h</a>"</span></div> -<div class="line"><a name="l00026"></a><span class="lineno"> 26</span> </div> -<div class="line"><a name="l00027"></a><span class="lineno"> 27</span> <span class="comment">//=======================================================================</span></div> -<div class="line"><a name="l00033"></a><span class="lineno"><a class="code" href="class_b_track.html"> 33</a></span> <span class="comment"></span><span class="keyword">class </span><a class="code" href="class_b_track.html">BTrack</a> {</div> -<div class="line"><a name="l00034"></a><span class="lineno"> 34</span>  </div> -<div class="line"><a name="l00035"></a><span class="lineno"> 35</span> <span class="keyword">public</span>:</div> -<div class="line"><a name="l00036"></a><span class="lineno"> 36</span>  </div> -<div class="line"><a name="l00037"></a><span class="lineno"> 37</span>  <span class="comment">//=======================================================================</span></div> -<div class="line"><a name="l00039"></a><span class="lineno"> 39</span> <span class="comment"></span> <a class="code" href="class_b_track.html#a243ac408666ce0301fecd9b0a2a6f307">BTrack</a>();</div> -<div class="line"><a name="l00040"></a><span class="lineno"> 40</span>  </div> -<div class="line"><a name="l00044"></a><span class="lineno"> 44</span>  <a class="code" href="class_b_track.html#a243ac408666ce0301fecd9b0a2a6f307">BTrack</a>(<span class="keywordtype">int</span> hopSize_);</div> -<div class="line"><a name="l00045"></a><span class="lineno"> 45</span>  </div> -<div class="line"><a name="l00050"></a><span class="lineno"> 50</span>  <a class="code" href="class_b_track.html#a243ac408666ce0301fecd9b0a2a6f307">BTrack</a>(<span class="keywordtype">int</span> hopSize_,<span class="keywordtype">int</span> frameSize_);</div> -<div class="line"><a name="l00051"></a><span class="lineno"> 51</span>  </div> -<div class="line"><a name="l00052"></a><span class="lineno"> 52</span>  <span class="comment">//=======================================================================</span></div> -<div class="line"><a name="l00057"></a><span class="lineno"> 57</span> <span class="comment"></span> <span class="keywordtype">void</span> <a class="code" href="class_b_track.html#abb7ce7253095e6f859ef7b30f06ce051">processAudioFrame</a>(<span class="keywordtype">double</span> *frame);</div> -<div class="line"><a name="l00058"></a><span class="lineno"> 58</span>  </div> -<div class="line"><a name="l00062"></a><span class="lineno"> 62</span>  <span class="keywordtype">void</span> <a class="code" href="class_b_track.html#a6fab18732bef8c87152e93dec9e4f854">processOnsetDetectionFunctionSample</a>(<span class="keywordtype">double</span> sample);</div> -<div class="line"><a name="l00063"></a><span class="lineno"> 63</span>  </div> -<div class="line"><a name="l00064"></a><span class="lineno"> 64</span>  <span class="comment">//=======================================================================</span></div> -<div class="line"><a name="l00066"></a><span class="lineno"> 66</span> <span class="comment"></span> <span class="keywordtype">int</span> <a class="code" href="class_b_track.html#ac06aa079977062bfa2930cdca45e69fb">getHopSize</a>();</div> -<div class="line"><a name="l00067"></a><span class="lineno"> 67</span>  </div> -<div class="line"><a name="l00069"></a><span class="lineno"> 69</span>  <span class="keywordtype">bool</span> <a class="code" href="class_b_track.html#ac92eaea0e42dd18c79de10bf852d7f4a">beatDueInCurrentFrame</a>();</div> -<div class="line"><a name="l00070"></a><span class="lineno"> 70</span> </div> -<div class="line"><a name="l00072"></a><span class="lineno"> 72</span>  <span class="keywordtype">double</span> <a class="code" href="class_b_track.html#a17cea0a4dff3908660e4117e9a6c42bb">getCurrentTempoEstimate</a>();</div> -<div class="line"><a name="l00073"></a><span class="lineno"> 73</span>  </div> -<div class="line"><a name="l00075"></a><span class="lineno"> 75</span>  <span class="keywordtype">double</span> <a class="code" href="class_b_track.html#a7ccb5059d0f00e3217ea686e4c1e156d">getLatestCumulativeScoreValue</a>();</div> -<div class="line"><a name="l00076"></a><span class="lineno"> 76</span>  </div> -<div class="line"><a name="l00077"></a><span class="lineno"> 77</span>  <span class="comment">//=======================================================================</span></div> -<div class="line"><a name="l00081"></a><span class="lineno"> 81</span> <span class="comment"></span> <span class="keywordtype">void</span> <a class="code" href="class_b_track.html#a96cf4088e40dff66ce15ada1f671a186">setTempo</a>(<span class="keywordtype">double</span> tempo);</div> -<div class="line"><a name="l00082"></a><span class="lineno"> 82</span>  </div> -<div class="line"><a name="l00087"></a><span class="lineno"> 87</span>  <span class="keywordtype">void</span> <a class="code" href="class_b_track.html#a550829be9b4c58cd53195ec4900c7c71">fixTempo</a>(<span class="keywordtype">double</span> tempo);</div> -<div class="line"><a name="l00088"></a><span class="lineno"> 88</span>  </div> -<div class="line"><a name="l00090"></a><span class="lineno"> 90</span>  <span class="keywordtype">void</span> <a class="code" href="class_b_track.html#a22917ea231d2efd5670a764dd5a98983">doNotFixTempo</a>();</div> -<div class="line"><a name="l00091"></a><span class="lineno"> 91</span>  </div> -<div class="line"><a name="l00092"></a><span class="lineno"> 92</span>  <span class="comment">//=======================================================================</span></div> -<div class="line"><a name="l00100"></a><span class="lineno"> 100</span> <span class="comment"></span> <span class="keyword">static</span> <span class="keywordtype">double</span> <a class="code" href="class_b_track.html#aa66d0b9dfb4408e8cf84398f03b60a56">getBeatTimeInSeconds</a>(<span class="keywordtype">long</span> frameNumber,<span class="keywordtype">int</span> hopSize,<span class="keywordtype">int</span> fs);</div> -<div class="line"><a name="l00101"></a><span class="lineno"> 101</span>  </div> -<div class="line"><a name="l00109"></a><span class="lineno"> 109</span>  <span class="keyword">static</span> <span class="keywordtype">double</span> <a class="code" href="class_b_track.html#aa66d0b9dfb4408e8cf84398f03b60a56">getBeatTimeInSeconds</a>(<span class="keywordtype">int</span> frameNumber,<span class="keywordtype">int</span> hopSize,<span class="keywordtype">int</span> fs);</div> -<div class="line"><a name="l00110"></a><span class="lineno"> 110</span>  </div> -<div class="line"><a name="l00111"></a><span class="lineno"> 111</span>  </div> -<div class="line"><a name="l00112"></a><span class="lineno"> 112</span> <span class="keyword">private</span>:</div> -<div class="line"><a name="l00113"></a><span class="lineno"> 113</span>  </div> -<div class="line"><a name="l00118"></a><span class="lineno"> 118</span>  <span class="keywordtype">void</span> initialise(<span class="keywordtype">int</span> hopSize_,<span class="keywordtype">int</span> frameSize_);</div> -<div class="line"><a name="l00119"></a><span class="lineno"> 119</span>  </div> -<div class="line"><a name="l00123"></a><span class="lineno"> 123</span>  <span class="keywordtype">void</span> setHopSize(<span class="keywordtype">int</span> hopSize_);</div> -<div class="line"><a name="l00124"></a><span class="lineno"> 124</span>  </div> -<div class="line"><a name="l00126"></a><span class="lineno"> 126</span>  <span class="keywordtype">void</span> resampleOnsetDetectionFunction();</div> +<div class="line"><a name="l00026"></a><span class="lineno"> 26</span> <span class="preprocessor">#include <vector></span></div> +<div class="line"><a name="l00027"></a><span class="lineno"> 27</span> </div> +<div class="line"><a name="l00028"></a><span class="lineno"> 28</span> <span class="comment">//=======================================================================</span></div> +<div class="line"><a name="l00034"></a><span class="lineno"><a class="code" href="class_b_track.html"> 34</a></span> <span class="comment"></span><span class="keyword">class </span><a class="code" href="class_b_track.html">BTrack</a> {</div> +<div class="line"><a name="l00035"></a><span class="lineno"> 35</span>  </div> +<div class="line"><a name="l00036"></a><span class="lineno"> 36</span> <span class="keyword">public</span>:</div> +<div class="line"><a name="l00037"></a><span class="lineno"> 37</span>  </div> +<div class="line"><a name="l00038"></a><span class="lineno"> 38</span>  <span class="comment">//=======================================================================</span></div> +<div class="line"><a name="l00040"></a><span class="lineno"> 40</span> <span class="comment"></span> <a class="code" href="class_b_track.html#a243ac408666ce0301fecd9b0a2a6f307">BTrack</a>();</div> +<div class="line"><a name="l00041"></a><span class="lineno"> 41</span>  </div> +<div class="line"><a name="l00045"></a><span class="lineno"> 45</span>  <a class="code" href="class_b_track.html#a243ac408666ce0301fecd9b0a2a6f307">BTrack</a>(<span class="keywordtype">int</span> hopSize_);</div> +<div class="line"><a name="l00046"></a><span class="lineno"> 46</span>  </div> +<div class="line"><a name="l00051"></a><span class="lineno"> 51</span>  <a class="code" href="class_b_track.html#a243ac408666ce0301fecd9b0a2a6f307">BTrack</a>(<span class="keywordtype">int</span> hopSize_,<span class="keywordtype">int</span> frameSize_);</div> +<div class="line"><a name="l00052"></a><span class="lineno"> 52</span>  </div> +<div class="line"><a name="l00053"></a><span class="lineno"> 53</span>  <span class="comment">//=======================================================================</span></div> +<div class="line"><a name="l00058"></a><span class="lineno"> 58</span> <span class="comment"></span> <span class="keywordtype">void</span> <a class="code" href="class_b_track.html#a70244e9a5aa8f860533fa56f942b7ede">updateHopAndFrameSize</a>(<span class="keywordtype">int</span> hopSize_,<span class="keywordtype">int</span> frameSize_);</div> +<div class="line"><a name="l00059"></a><span class="lineno"> 59</span>  </div> +<div class="line"><a name="l00060"></a><span class="lineno"> 60</span>  <span class="comment">//=======================================================================</span></div> +<div class="line"><a name="l00065"></a><span class="lineno"> 65</span> <span class="comment"></span> <span class="keywordtype">void</span> <a class="code" href="class_b_track.html#abb7ce7253095e6f859ef7b30f06ce051">processAudioFrame</a>(<span class="keywordtype">double</span> *frame);</div> +<div class="line"><a name="l00066"></a><span class="lineno"> 66</span>  </div> +<div class="line"><a name="l00070"></a><span class="lineno"> 70</span>  <span class="keywordtype">void</span> <a class="code" href="class_b_track.html#a6fab18732bef8c87152e93dec9e4f854">processOnsetDetectionFunctionSample</a>(<span class="keywordtype">double</span> sample);</div> +<div class="line"><a name="l00071"></a><span class="lineno"> 71</span>  </div> +<div class="line"><a name="l00072"></a><span class="lineno"> 72</span>  <span class="comment">//=======================================================================</span></div> +<div class="line"><a name="l00074"></a><span class="lineno"> 74</span> <span class="comment"></span> <span class="keywordtype">int</span> <a class="code" href="class_b_track.html#ac06aa079977062bfa2930cdca45e69fb">getHopSize</a>();</div> +<div class="line"><a name="l00075"></a><span class="lineno"> 75</span>  </div> +<div class="line"><a name="l00077"></a><span class="lineno"> 77</span>  <span class="keywordtype">bool</span> <a class="code" href="class_b_track.html#ac92eaea0e42dd18c79de10bf852d7f4a">beatDueInCurrentFrame</a>();</div> +<div class="line"><a name="l00078"></a><span class="lineno"> 78</span> </div> +<div class="line"><a name="l00080"></a><span class="lineno"> 80</span>  <span class="keywordtype">double</span> <a class="code" href="class_b_track.html#a17cea0a4dff3908660e4117e9a6c42bb">getCurrentTempoEstimate</a>();</div> +<div class="line"><a name="l00081"></a><span class="lineno"> 81</span>  </div> +<div class="line"><a name="l00083"></a><span class="lineno"> 83</span>  <span class="keywordtype">double</span> <a class="code" href="class_b_track.html#a7ccb5059d0f00e3217ea686e4c1e156d">getLatestCumulativeScoreValue</a>();</div> +<div class="line"><a name="l00084"></a><span class="lineno"> 84</span>  </div> +<div class="line"><a name="l00085"></a><span class="lineno"> 85</span>  <span class="comment">//=======================================================================</span></div> +<div class="line"><a name="l00089"></a><span class="lineno"> 89</span> <span class="comment"></span> <span class="keywordtype">void</span> <a class="code" href="class_b_track.html#a96cf4088e40dff66ce15ada1f671a186">setTempo</a>(<span class="keywordtype">double</span> tempo);</div> +<div class="line"><a name="l00090"></a><span class="lineno"> 90</span>  </div> +<div class="line"><a name="l00095"></a><span class="lineno"> 95</span>  <span class="keywordtype">void</span> <a class="code" href="class_b_track.html#a550829be9b4c58cd53195ec4900c7c71">fixTempo</a>(<span class="keywordtype">double</span> tempo);</div> +<div class="line"><a name="l00096"></a><span class="lineno"> 96</span>  </div> +<div class="line"><a name="l00098"></a><span class="lineno"> 98</span>  <span class="keywordtype">void</span> <a class="code" href="class_b_track.html#a22917ea231d2efd5670a764dd5a98983">doNotFixTempo</a>();</div> +<div class="line"><a name="l00099"></a><span class="lineno"> 99</span>  </div> +<div class="line"><a name="l00100"></a><span class="lineno"> 100</span>  <span class="comment">//=======================================================================</span></div> +<div class="line"><a name="l00108"></a><span class="lineno"> 108</span> <span class="comment"></span> <span class="keyword">static</span> <span class="keywordtype">double</span> <a class="code" href="class_b_track.html#aa66d0b9dfb4408e8cf84398f03b60a56">getBeatTimeInSeconds</a>(<span class="keywordtype">long</span> frameNumber,<span class="keywordtype">int</span> hopSize,<span class="keywordtype">int</span> fs);</div> +<div class="line"><a name="l00109"></a><span class="lineno"> 109</span>  </div> +<div class="line"><a name="l00117"></a><span class="lineno"> 117</span>  <span class="keyword">static</span> <span class="keywordtype">double</span> <a class="code" href="class_b_track.html#aa66d0b9dfb4408e8cf84398f03b60a56">getBeatTimeInSeconds</a>(<span class="keywordtype">int</span> frameNumber,<span class="keywordtype">int</span> hopSize,<span class="keywordtype">int</span> fs);</div> +<div class="line"><a name="l00118"></a><span class="lineno"> 118</span>  </div> +<div class="line"><a name="l00119"></a><span class="lineno"> 119</span>  </div> +<div class="line"><a name="l00120"></a><span class="lineno"> 120</span> <span class="keyword">private</span>:</div> +<div class="line"><a name="l00121"></a><span class="lineno"> 121</span>  </div> +<div class="line"><a name="l00126"></a><span class="lineno"> 126</span>  <span class="keywordtype">void</span> initialise(<span class="keywordtype">int</span> hopSize_,<span class="keywordtype">int</span> frameSize_);</div> <div class="line"><a name="l00127"></a><span class="lineno"> 127</span>  </div> -<div class="line"><a name="l00131"></a><span class="lineno"> 131</span>  <span class="keywordtype">void</span> updateCumulativeScore(<span class="keywordtype">double</span> odfSample);</div> +<div class="line"><a name="l00131"></a><span class="lineno"> 131</span>  <span class="keywordtype">void</span> setHopSize(<span class="keywordtype">int</span> hopSize_);</div> <div class="line"><a name="l00132"></a><span class="lineno"> 132</span>  </div> -<div class="line"><a name="l00134"></a><span class="lineno"> 134</span>  <span class="keywordtype">void</span> predictBeat();</div> +<div class="line"><a name="l00134"></a><span class="lineno"> 134</span>  <span class="keywordtype">void</span> resampleOnsetDetectionFunction();</div> <div class="line"><a name="l00135"></a><span class="lineno"> 135</span>  </div> -<div class="line"><a name="l00137"></a><span class="lineno"> 137</span>  <span class="keywordtype">void</span> calculateTempo();</div> -<div class="line"><a name="l00138"></a><span class="lineno"> 138</span>  </div> -<div class="line"><a name="l00144"></a><span class="lineno"> 144</span>  <span class="keywordtype">void</span> adaptiveThreshold(<span class="keywordtype">double</span> *x,<span class="keywordtype">int</span> N);</div> -<div class="line"><a name="l00145"></a><span class="lineno"> 145</span>  </div> -<div class="line"><a name="l00152"></a><span class="lineno"> 152</span>  <span class="keywordtype">double</span> calculateMeanOfArray(<span class="keywordtype">double</span> *array,<span class="keywordtype">int</span> startIndex,<span class="keywordtype">int</span> endIndex);</div> +<div class="line"><a name="l00139"></a><span class="lineno"> 139</span>  <span class="keywordtype">void</span> updateCumulativeScore(<span class="keywordtype">double</span> odfSample);</div> +<div class="line"><a name="l00140"></a><span class="lineno"> 140</span>  </div> +<div class="line"><a name="l00142"></a><span class="lineno"> 142</span>  <span class="keywordtype">void</span> predictBeat();</div> +<div class="line"><a name="l00143"></a><span class="lineno"> 143</span>  </div> +<div class="line"><a name="l00145"></a><span class="lineno"> 145</span>  <span class="keywordtype">void</span> calculateTempo();</div> +<div class="line"><a name="l00146"></a><span class="lineno"> 146</span>  </div> +<div class="line"><a name="l00152"></a><span class="lineno"> 152</span>  <span class="keywordtype">void</span> adaptiveThreshold(<span class="keywordtype">double</span> *x,<span class="keywordtype">int</span> N);</div> <div class="line"><a name="l00153"></a><span class="lineno"> 153</span>  </div> -<div class="line"><a name="l00158"></a><span class="lineno"> 158</span>  <span class="keywordtype">void</span> normaliseArray(<span class="keywordtype">double</span> *array,<span class="keywordtype">int</span> N);</div> -<div class="line"><a name="l00159"></a><span class="lineno"> 159</span>  </div> -<div class="line"><a name="l00163"></a><span class="lineno"> 163</span>  <span class="keywordtype">void</span> calculateBalancedACF(<span class="keywordtype">double</span> *onsetDetectionFunction);</div> -<div class="line"><a name="l00164"></a><span class="lineno"> 164</span>  </div> -<div class="line"><a name="l00166"></a><span class="lineno"> 166</span>  <span class="keywordtype">void</span> calculateOutputOfCombFilterBank();</div> +<div class="line"><a name="l00160"></a><span class="lineno"> 160</span>  <span class="keywordtype">double</span> calculateMeanOfArray(<span class="keywordtype">double</span> *array,<span class="keywordtype">int</span> startIndex,<span class="keywordtype">int</span> endIndex);</div> +<div class="line"><a name="l00161"></a><span class="lineno"> 161</span>  </div> +<div class="line"><a name="l00166"></a><span class="lineno"> 166</span>  <span class="keywordtype">void</span> normaliseArray(<span class="keywordtype">double</span> *array,<span class="keywordtype">int</span> N);</div> <div class="line"><a name="l00167"></a><span class="lineno"> 167</span>  </div> -<div class="line"><a name="l00168"></a><span class="lineno"> 168</span>  <span class="comment">//=======================================================================</span></div> -<div class="line"><a name="l00169"></a><span class="lineno"> 169</span> </div> -<div class="line"><a name="l00171"></a><span class="lineno"> 171</span>  <a class="code" href="class_onset_detection_function.html">OnsetDetectionFunction</a> odf;</div> +<div class="line"><a name="l00171"></a><span class="lineno"> 171</span>  <span class="keywordtype">void</span> calculateBalancedACF(<span class="keywordtype">double</span> *onsetDetectionFunction);</div> <div class="line"><a name="l00172"></a><span class="lineno"> 172</span>  </div> -<div class="line"><a name="l00173"></a><span class="lineno"> 173</span>  <span class="comment">//=======================================================================</span></div> -<div class="line"><a name="l00174"></a><span class="lineno"> 174</span>  <span class="comment">// buffers</span></div> -<div class="line"><a name="l00175"></a><span class="lineno"> 175</span>  <span class="keywordtype">double</span> *onsetDF; </div> -<div class="line"><a name="l00176"></a><span class="lineno"> 176</span>  <span class="keywordtype">double</span> resampledOnsetDF[512]; </div> -<div class="line"><a name="l00177"></a><span class="lineno"> 177</span>  <span class="keywordtype">double</span> *cumulativeScore; </div> -<div class="line"><a name="l00179"></a><span class="lineno"> 179</span>  <span class="keywordtype">double</span> acf[512]; </div> -<div class="line"><a name="l00181"></a><span class="lineno"> 181</span>  <span class="keywordtype">double</span> weightingVector[128]; </div> -<div class="line"><a name="l00183"></a><span class="lineno"> 183</span>  <span class="keywordtype">double</span> combFilterBankOutput[128]; </div> -<div class="line"><a name="l00184"></a><span class="lineno"> 184</span>  <span class="keywordtype">double</span> tempoObservationVector[41]; </div> -<div class="line"><a name="l00186"></a><span class="lineno"> 186</span>  <span class="keywordtype">double</span> delta[41]; </div> -<div class="line"><a name="l00187"></a><span class="lineno"> 187</span>  <span class="keywordtype">double</span> prevDelta[41]; </div> -<div class="line"><a name="l00188"></a><span class="lineno"> 188</span>  <span class="keywordtype">double</span> prevDeltaFixed[41]; </div> -<div class="line"><a name="l00190"></a><span class="lineno"> 190</span>  <span class="keywordtype">double</span> tempoTransitionMatrix[41][41]; </div> -<div class="line"><a name="l00193"></a><span class="lineno"> 193</span>  <span class="comment">//=======================================================================</span></div> -<div class="line"><a name="l00194"></a><span class="lineno"> 194</span>  <span class="comment">// parameters</span></div> -<div class="line"><a name="l00195"></a><span class="lineno"> 195</span>  </div> -<div class="line"><a name="l00196"></a><span class="lineno"> 196</span>  </div> -<div class="line"><a name="l00197"></a><span class="lineno"> 197</span>  <span class="keywordtype">double</span> tightness; </div> -<div class="line"><a name="l00199"></a><span class="lineno"> 199</span>  <span class="keywordtype">double</span> alpha; </div> -<div class="line"><a name="l00201"></a><span class="lineno"> 201</span>  <span class="keywordtype">double</span> beatPeriod; </div> -<div class="line"><a name="l00203"></a><span class="lineno"> 203</span>  <span class="keywordtype">double</span> tempo; </div> -<div class="line"><a name="l00205"></a><span class="lineno"> 205</span>  <span class="keywordtype">double</span> estimatedTempo; </div> -<div class="line"><a name="l00207"></a><span class="lineno"> 207</span>  <span class="keywordtype">double</span> latestCumulativeScoreValue; </div> -<div class="line"><a name="l00209"></a><span class="lineno"> 209</span>  <span class="keywordtype">double</span> tempoToLagFactor; </div> -<div class="line"><a name="l00211"></a><span class="lineno"> 211</span>  <span class="keywordtype">int</span> m0; </div> -<div class="line"><a name="l00213"></a><span class="lineno"> 213</span>  <span class="keywordtype">int</span> beatCounter; </div> -<div class="line"><a name="l00215"></a><span class="lineno"> 215</span>  <span class="keywordtype">int</span> hopSize; </div> -<div class="line"><a name="l00217"></a><span class="lineno"> 217</span>  <span class="keywordtype">int</span> onsetDFBufferSize; </div> -<div class="line"><a name="l00219"></a><span class="lineno"> 219</span>  <span class="keywordtype">bool</span> tempoFixed; </div> -<div class="line"><a name="l00221"></a><span class="lineno"> 221</span>  <span class="keywordtype">bool</span> beatDueInFrame; </div> -<div class="line"><a name="l00223"></a><span class="lineno"> 223</span> };</div> -<div class="line"><a name="l00224"></a><span class="lineno"> 224</span> </div> -<div class="line"><a name="l00225"></a><span class="lineno"> 225</span> <span class="preprocessor">#endif</span></div> +<div class="line"><a name="l00174"></a><span class="lineno"> 174</span>  <span class="keywordtype">void</span> calculateOutputOfCombFilterBank();</div> +<div class="line"><a name="l00175"></a><span class="lineno"> 175</span>  </div> +<div class="line"><a name="l00176"></a><span class="lineno"> 176</span>  <span class="comment">//=======================================================================</span></div> +<div class="line"><a name="l00177"></a><span class="lineno"> 177</span> </div> +<div class="line"><a name="l00179"></a><span class="lineno"> 179</span>  <a class="code" href="class_onset_detection_function.html">OnsetDetectionFunction</a> odf;</div> +<div class="line"><a name="l00180"></a><span class="lineno"> 180</span>  </div> +<div class="line"><a name="l00181"></a><span class="lineno"> 181</span>  <span class="comment">//=======================================================================</span></div> +<div class="line"><a name="l00182"></a><span class="lineno"> 182</span>  <span class="comment">// buffers</span></div> +<div class="line"><a name="l00183"></a><span class="lineno"> 183</span>  </div> +<div class="line"><a name="l00184"></a><span class="lineno"> 184</span>  std::vector<double> onsetDF; </div> +<div class="line"><a name="l00185"></a><span class="lineno"> 185</span>  std::vector<double> cumulativeScore; </div> +<div class="line"><a name="l00187"></a><span class="lineno"> 187</span>  <span class="keywordtype">double</span> resampledOnsetDF[512]; </div> +<div class="line"><a name="l00189"></a><span class="lineno"> 189</span>  <span class="keywordtype">double</span> acf[512]; </div> +<div class="line"><a name="l00191"></a><span class="lineno"> 191</span>  <span class="keywordtype">double</span> weightingVector[128]; </div> +<div class="line"><a name="l00193"></a><span class="lineno"> 193</span>  <span class="keywordtype">double</span> combFilterBankOutput[128]; </div> +<div class="line"><a name="l00194"></a><span class="lineno"> 194</span>  <span class="keywordtype">double</span> tempoObservationVector[41]; </div> +<div class="line"><a name="l00196"></a><span class="lineno"> 196</span>  <span class="keywordtype">double</span> delta[41]; </div> +<div class="line"><a name="l00197"></a><span class="lineno"> 197</span>  <span class="keywordtype">double</span> prevDelta[41]; </div> +<div class="line"><a name="l00198"></a><span class="lineno"> 198</span>  <span class="keywordtype">double</span> prevDeltaFixed[41]; </div> +<div class="line"><a name="l00200"></a><span class="lineno"> 200</span>  <span class="keywordtype">double</span> tempoTransitionMatrix[41][41]; </div> +<div class="line"><a name="l00203"></a><span class="lineno"> 203</span>  <span class="comment">//=======================================================================</span></div> +<div class="line"><a name="l00204"></a><span class="lineno"> 204</span>  <span class="comment">// parameters</span></div> +<div class="line"><a name="l00205"></a><span class="lineno"> 205</span>  </div> +<div class="line"><a name="l00206"></a><span class="lineno"> 206</span>  </div> +<div class="line"><a name="l00207"></a><span class="lineno"> 207</span>  <span class="keywordtype">double</span> tightness; </div> +<div class="line"><a name="l00209"></a><span class="lineno"> 209</span>  <span class="keywordtype">double</span> alpha; </div> +<div class="line"><a name="l00211"></a><span class="lineno"> 211</span>  <span class="keywordtype">double</span> beatPeriod; </div> +<div class="line"><a name="l00213"></a><span class="lineno"> 213</span>  <span class="keywordtype">double</span> tempo; </div> +<div class="line"><a name="l00215"></a><span class="lineno"> 215</span>  <span class="keywordtype">double</span> estimatedTempo; </div> +<div class="line"><a name="l00217"></a><span class="lineno"> 217</span>  <span class="keywordtype">double</span> latestCumulativeScoreValue; </div> +<div class="line"><a name="l00219"></a><span class="lineno"> 219</span>  <span class="keywordtype">double</span> tempoToLagFactor; </div> +<div class="line"><a name="l00221"></a><span class="lineno"> 221</span>  <span class="keywordtype">int</span> m0; </div> +<div class="line"><a name="l00223"></a><span class="lineno"> 223</span>  <span class="keywordtype">int</span> beatCounter; </div> +<div class="line"><a name="l00225"></a><span class="lineno"> 225</span>  <span class="keywordtype">int</span> hopSize; </div> +<div class="line"><a name="l00227"></a><span class="lineno"> 227</span>  <span class="keywordtype">int</span> onsetDFBufferSize; </div> +<div class="line"><a name="l00229"></a><span class="lineno"> 229</span>  <span class="keywordtype">bool</span> tempoFixed; </div> +<div class="line"><a name="l00231"></a><span class="lineno"> 231</span>  <span class="keywordtype">bool</span> beatDueInFrame; </div> +<div class="line"><a name="l00233"></a><span class="lineno"> 233</span> };</div> +<div class="line"><a name="l00234"></a><span class="lineno"> 234</span> </div> +<div class="line"><a name="l00235"></a><span class="lineno"> 235</span> <span class="preprocessor">#endif</span></div> </div><!-- fragment --></div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Mon Jan 27 2014 22:01:21 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> +Generated on Tue Jan 28 2014 00:29:23 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.2 </small></address>
--- a/doc/html/_onset_detection_function_8cpp.html Tue Jan 28 00:19:21 2014 +0000 +++ b/doc/html/_onset_detection_function_8cpp.html Tue Jan 28 00:31:17 2014 +0000 @@ -101,7 +101,7 @@ </div></div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Mon Jan 27 2014 22:01:21 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> +Generated on Tue Jan 28 2014 00:29:23 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.2 </small></address>
--- a/doc/html/_onset_detection_function_8h.html Tue Jan 28 00:19:21 2014 +0000 +++ b/doc/html/_onset_detection_function_8h.html Tue Jan 28 00:31:17 2014 +0000 @@ -93,6 +93,7 @@ <p>A class for calculating onset detection functions. <a href="#details">More...</a></p> <div class="textblock"><code>#include "fftw3.h"</code><br/> +<code>#include <vector></code><br/> </div> <p><a href="_onset_detection_function_8h_source.html">Go to the source code of this file.</a></p> <table class="memberdecls"> @@ -167,7 +168,7 @@ </div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Mon Jan 27 2014 22:01:21 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> +Generated on Tue Jan 28 2014 00:29:23 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.2 </small></address>
--- a/doc/html/_onset_detection_function_8h_source.html Tue Jan 28 00:19:21 2014 +0000 +++ b/doc/html/_onset_detection_function_8h_source.html Tue Jan 28 00:31:17 2014 +0000 @@ -93,111 +93,112 @@ <div class="line"><a name="l00023"></a><span class="lineno"> 23</span> <span class="preprocessor"></span><span class="preprocessor">#define __ONSETDETECTIONFUNCTION_H</span></div> <div class="line"><a name="l00024"></a><span class="lineno"> 24</span> <span class="preprocessor"></span></div> <div class="line"><a name="l00025"></a><span class="lineno"> 25</span> <span class="preprocessor">#include "fftw3.h"</span></div> -<div class="line"><a name="l00026"></a><span class="lineno"> 26</span> </div> -<div class="line"><a name="l00027"></a><span class="lineno"> 27</span> <span class="comment">//=======================================================================</span></div> -<div class="line"><a name="l00029"></a><span class="lineno"><a class="code" href="_onset_detection_function_8h.html#a36dbf81d14d771e0712d0316ec06612b"> 29</a></span> <span class="comment"></span><span class="keyword">enum</span> <a class="code" href="_onset_detection_function_8h.html#a36dbf81d14d771e0712d0316ec06612b">OnsetDetectionFunctionType</a></div> -<div class="line"><a name="l00030"></a><span class="lineno"> 30</span> {</div> -<div class="line"><a name="l00031"></a><span class="lineno"> 31</span>  EnergyEnvelope,</div> -<div class="line"><a name="l00032"></a><span class="lineno"> 32</span>  EnergyDifference,</div> -<div class="line"><a name="l00033"></a><span class="lineno"> 33</span>  SpectralDifference,</div> -<div class="line"><a name="l00034"></a><span class="lineno"> 34</span>  SpectralDifferenceHWR,</div> -<div class="line"><a name="l00035"></a><span class="lineno"> 35</span>  PhaseDeviation,</div> -<div class="line"><a name="l00036"></a><span class="lineno"> 36</span>  ComplexSpectralDifference,</div> -<div class="line"><a name="l00037"></a><span class="lineno"> 37</span>  ComplexSpectralDifferenceHWR,</div> -<div class="line"><a name="l00038"></a><span class="lineno"> 38</span>  HighFrequencyContent,</div> -<div class="line"><a name="l00039"></a><span class="lineno"> 39</span>  HighFrequencySpectralDifference,</div> -<div class="line"><a name="l00040"></a><span class="lineno"> 40</span>  HighFrequencySpectralDifferenceHWR</div> -<div class="line"><a name="l00041"></a><span class="lineno"> 41</span> };</div> -<div class="line"><a name="l00042"></a><span class="lineno"> 42</span> </div> -<div class="line"><a name="l00043"></a><span class="lineno"> 43</span> <span class="comment">//=======================================================================</span></div> -<div class="line"><a name="l00045"></a><span class="lineno"><a class="code" href="_onset_detection_function_8h.html#a476342970f954b62d70552bcbb5ee509"> 45</a></span> <span class="comment"></span><span class="keyword">enum</span> <a class="code" href="_onset_detection_function_8h.html#a476342970f954b62d70552bcbb5ee509">WindowType</a></div> -<div class="line"><a name="l00046"></a><span class="lineno"> 46</span> {</div> -<div class="line"><a name="l00047"></a><span class="lineno"> 47</span>  RectangularWindow,</div> -<div class="line"><a name="l00048"></a><span class="lineno"> 48</span>  HanningWindow,</div> -<div class="line"><a name="l00049"></a><span class="lineno"> 49</span>  HammingWindow,</div> -<div class="line"><a name="l00050"></a><span class="lineno"> 50</span>  BlackmanWindow,</div> -<div class="line"><a name="l00051"></a><span class="lineno"> 51</span>  TukeyWindow</div> -<div class="line"><a name="l00052"></a><span class="lineno"> 52</span> };</div> -<div class="line"><a name="l00053"></a><span class="lineno"> 53</span> </div> -<div class="line"><a name="l00054"></a><span class="lineno"> 54</span> <span class="comment">//=======================================================================</span></div> -<div class="line"><a name="l00056"></a><span class="lineno"><a class="code" href="class_onset_detection_function.html"> 56</a></span> <span class="comment"></span><span class="keyword">class </span><a class="code" href="class_onset_detection_function.html">OnsetDetectionFunction</a></div> -<div class="line"><a name="l00057"></a><span class="lineno"> 57</span> {</div> -<div class="line"><a name="l00058"></a><span class="lineno"> 58</span> <span class="keyword">public</span>:</div> -<div class="line"><a name="l00059"></a><span class="lineno"> 59</span>  </div> -<div class="line"><a name="l00066"></a><span class="lineno"> 66</span>  <a class="code" href="class_onset_detection_function.html#a7b4e4ab1b0be5f57682c52141eb959d6">OnsetDetectionFunction</a>(<span class="keywordtype">int</span> hopSize_,<span class="keywordtype">int</span> frameSize_,<span class="keywordtype">int</span> onsetDetectionFunctionType_,<span class="keywordtype">int</span> windowType);</div> -<div class="line"><a name="l00067"></a><span class="lineno"> 67</span>  </div> -<div class="line"><a name="l00069"></a><span class="lineno"> 69</span>  <a class="code" href="class_onset_detection_function.html#aa01f8125c950f3def45154878107e503">~OnsetDetectionFunction</a>();</div> -<div class="line"><a name="l00070"></a><span class="lineno"> 70</span>  </div> -<div class="line"><a name="l00077"></a><span class="lineno"> 77</span>  <span class="keywordtype">void</span> <a class="code" href="class_onset_detection_function.html#a654ed22782f6dc62e8347df44c90fbeb">initialise</a>(<span class="keywordtype">int</span> hopSize_,<span class="keywordtype">int</span> frameSize_,<span class="keywordtype">int</span> onsetDetectionFunctionType_,<span class="keywordtype">int</span> windowType);</div> -<div class="line"><a name="l00078"></a><span class="lineno"> 78</span>  </div> -<div class="line"><a name="l00083"></a><span class="lineno"> 83</span>  <span class="keywordtype">double</span> <a class="code" href="class_onset_detection_function.html#a7b8fffe6221d3bd4f6cac82c17db0e92">calculateOnsetDetectionFunctionSample</a>(<span class="keywordtype">double</span> *buffer);</div> -<div class="line"><a name="l00084"></a><span class="lineno"> 84</span>  </div> -<div class="line"><a name="l00088"></a><span class="lineno"> 88</span>  <span class="keywordtype">void</span> <a class="code" href="class_onset_detection_function.html#a51fdab443155aaaa935956645e8f9131">setOnsetDetectionFunctionType</a>(<span class="keywordtype">int</span> onsetDetectionFunctionType_);</div> -<div class="line"><a name="l00089"></a><span class="lineno"> 89</span>  </div> -<div class="line"><a name="l00090"></a><span class="lineno"> 90</span> <span class="keyword">private</span>:</div> -<div class="line"><a name="l00091"></a><span class="lineno"> 91</span>  </div> -<div class="line"><a name="l00093"></a><span class="lineno"> 93</span>  <span class="keywordtype">void</span> performFFT();</div> -<div class="line"><a name="l00094"></a><span class="lineno"> 94</span> </div> -<div class="line"><a name="l00095"></a><span class="lineno"> 95</span>  <span class="comment">//=======================================================================</span></div> -<div class="line"><a name="l00097"></a><span class="lineno"> 97</span> <span class="comment"></span> <span class="keywordtype">double</span> energyEnvelope();</div> -<div class="line"><a name="l00098"></a><span class="lineno"> 98</span>  </div> -<div class="line"><a name="l00100"></a><span class="lineno"> 100</span>  <span class="keywordtype">double</span> energyDifference();</div> -<div class="line"><a name="l00101"></a><span class="lineno"> 101</span>  </div> -<div class="line"><a name="l00103"></a><span class="lineno"> 103</span>  <span class="keywordtype">double</span> spectralDifference();</div> -<div class="line"><a name="l00104"></a><span class="lineno"> 104</span>  </div> -<div class="line"><a name="l00106"></a><span class="lineno"> 106</span>  <span class="keywordtype">double</span> spectralDifferenceHWR();</div> -<div class="line"><a name="l00107"></a><span class="lineno"> 107</span>  </div> -<div class="line"><a name="l00109"></a><span class="lineno"> 109</span>  <span class="keywordtype">double</span> phaseDeviation();</div> -<div class="line"><a name="l00110"></a><span class="lineno"> 110</span>  </div> -<div class="line"><a name="l00112"></a><span class="lineno"> 112</span>  <span class="keywordtype">double</span> complexSpectralDifference();</div> -<div class="line"><a name="l00113"></a><span class="lineno"> 113</span>  </div> -<div class="line"><a name="l00115"></a><span class="lineno"> 115</span>  <span class="keywordtype">double</span> complexSpectralDifferenceHWR();</div> -<div class="line"><a name="l00116"></a><span class="lineno"> 116</span>  </div> -<div class="line"><a name="l00118"></a><span class="lineno"> 118</span>  <span class="keywordtype">double</span> highFrequencyContent();</div> -<div class="line"><a name="l00119"></a><span class="lineno"> 119</span>  </div> -<div class="line"><a name="l00121"></a><span class="lineno"> 121</span>  <span class="keywordtype">double</span> highFrequencySpectralDifference();</div> -<div class="line"><a name="l00122"></a><span class="lineno"> 122</span>  </div> -<div class="line"><a name="l00124"></a><span class="lineno"> 124</span>  <span class="keywordtype">double</span> highFrequencySpectralDifferenceHWR();</div> -<div class="line"><a name="l00125"></a><span class="lineno"> 125</span> </div> -<div class="line"><a name="l00126"></a><span class="lineno"> 126</span>  <span class="comment">//=======================================================================</span></div> -<div class="line"><a name="l00128"></a><span class="lineno"> 128</span> <span class="comment"></span> <span class="keywordtype">void</span> calculateRectangularWindow();</div> -<div class="line"><a name="l00129"></a><span class="lineno"> 129</span>  </div> -<div class="line"><a name="l00131"></a><span class="lineno"> 131</span>  <span class="keywordtype">void</span> calculateHanningWindow();</div> -<div class="line"><a name="l00132"></a><span class="lineno"> 132</span>  </div> -<div class="line"><a name="l00134"></a><span class="lineno"> 134</span>  <span class="keywordtype">void</span> calclulateHammingWindow();</div> -<div class="line"><a name="l00135"></a><span class="lineno"> 135</span>  </div> -<div class="line"><a name="l00137"></a><span class="lineno"> 137</span>  <span class="keywordtype">void</span> calculateBlackmanWindow();</div> -<div class="line"><a name="l00138"></a><span class="lineno"> 138</span>  </div> -<div class="line"><a name="l00140"></a><span class="lineno"> 140</span>  <span class="keywordtype">void</span> calculateTukeyWindow();</div> -<div class="line"><a name="l00141"></a><span class="lineno"> 141</span> </div> -<div class="line"><a name="l00142"></a><span class="lineno"> 142</span>  <span class="comment">//=======================================================================</span></div> -<div class="line"><a name="l00147"></a><span class="lineno"> 147</span> <span class="comment"></span> <span class="keywordtype">double</span> princarg(<span class="keywordtype">double</span> phaseVal);</div> -<div class="line"><a name="l00148"></a><span class="lineno"> 148</span>  </div> +<div class="line"><a name="l00026"></a><span class="lineno"> 26</span> <span class="preprocessor">#include <vector></span></div> +<div class="line"><a name="l00027"></a><span class="lineno"> 27</span> </div> +<div class="line"><a name="l00028"></a><span class="lineno"> 28</span> <span class="comment">//=======================================================================</span></div> +<div class="line"><a name="l00030"></a><span class="lineno"><a class="code" href="_onset_detection_function_8h.html#a36dbf81d14d771e0712d0316ec06612b"> 30</a></span> <span class="comment"></span><span class="keyword">enum</span> <a class="code" href="_onset_detection_function_8h.html#a36dbf81d14d771e0712d0316ec06612b">OnsetDetectionFunctionType</a></div> +<div class="line"><a name="l00031"></a><span class="lineno"> 31</span> {</div> +<div class="line"><a name="l00032"></a><span class="lineno"> 32</span>  EnergyEnvelope,</div> +<div class="line"><a name="l00033"></a><span class="lineno"> 33</span>  EnergyDifference,</div> +<div class="line"><a name="l00034"></a><span class="lineno"> 34</span>  SpectralDifference,</div> +<div class="line"><a name="l00035"></a><span class="lineno"> 35</span>  SpectralDifferenceHWR,</div> +<div class="line"><a name="l00036"></a><span class="lineno"> 36</span>  PhaseDeviation,</div> +<div class="line"><a name="l00037"></a><span class="lineno"> 37</span>  ComplexSpectralDifference,</div> +<div class="line"><a name="l00038"></a><span class="lineno"> 38</span>  ComplexSpectralDifferenceHWR,</div> +<div class="line"><a name="l00039"></a><span class="lineno"> 39</span>  HighFrequencyContent,</div> +<div class="line"><a name="l00040"></a><span class="lineno"> 40</span>  HighFrequencySpectralDifference,</div> +<div class="line"><a name="l00041"></a><span class="lineno"> 41</span>  HighFrequencySpectralDifferenceHWR</div> +<div class="line"><a name="l00042"></a><span class="lineno"> 42</span> };</div> +<div class="line"><a name="l00043"></a><span class="lineno"> 43</span> </div> +<div class="line"><a name="l00044"></a><span class="lineno"> 44</span> <span class="comment">//=======================================================================</span></div> +<div class="line"><a name="l00046"></a><span class="lineno"><a class="code" href="_onset_detection_function_8h.html#a476342970f954b62d70552bcbb5ee509"> 46</a></span> <span class="comment"></span><span class="keyword">enum</span> <a class="code" href="_onset_detection_function_8h.html#a476342970f954b62d70552bcbb5ee509">WindowType</a></div> +<div class="line"><a name="l00047"></a><span class="lineno"> 47</span> {</div> +<div class="line"><a name="l00048"></a><span class="lineno"> 48</span>  RectangularWindow,</div> +<div class="line"><a name="l00049"></a><span class="lineno"> 49</span>  HanningWindow,</div> +<div class="line"><a name="l00050"></a><span class="lineno"> 50</span>  HammingWindow,</div> +<div class="line"><a name="l00051"></a><span class="lineno"> 51</span>  BlackmanWindow,</div> +<div class="line"><a name="l00052"></a><span class="lineno"> 52</span>  TukeyWindow</div> +<div class="line"><a name="l00053"></a><span class="lineno"> 53</span> };</div> +<div class="line"><a name="l00054"></a><span class="lineno"> 54</span> </div> +<div class="line"><a name="l00055"></a><span class="lineno"> 55</span> <span class="comment">//=======================================================================</span></div> +<div class="line"><a name="l00057"></a><span class="lineno"><a class="code" href="class_onset_detection_function.html"> 57</a></span> <span class="comment"></span><span class="keyword">class </span><a class="code" href="class_onset_detection_function.html">OnsetDetectionFunction</a></div> +<div class="line"><a name="l00058"></a><span class="lineno"> 58</span> {</div> +<div class="line"><a name="l00059"></a><span class="lineno"> 59</span> <span class="keyword">public</span>:</div> +<div class="line"><a name="l00060"></a><span class="lineno"> 60</span>  </div> +<div class="line"><a name="l00067"></a><span class="lineno"> 67</span>  <a class="code" href="class_onset_detection_function.html#a7b4e4ab1b0be5f57682c52141eb959d6">OnsetDetectionFunction</a>(<span class="keywordtype">int</span> hopSize_,<span class="keywordtype">int</span> frameSize_,<span class="keywordtype">int</span> onsetDetectionFunctionType_,<span class="keywordtype">int</span> windowType);</div> +<div class="line"><a name="l00068"></a><span class="lineno"> 68</span>  </div> +<div class="line"><a name="l00070"></a><span class="lineno"> 70</span>  <a class="code" href="class_onset_detection_function.html#aa01f8125c950f3def45154878107e503">~OnsetDetectionFunction</a>();</div> +<div class="line"><a name="l00071"></a><span class="lineno"> 71</span>  </div> +<div class="line"><a name="l00078"></a><span class="lineno"> 78</span>  <span class="keywordtype">void</span> <a class="code" href="class_onset_detection_function.html#a654ed22782f6dc62e8347df44c90fbeb">initialise</a>(<span class="keywordtype">int</span> hopSize_,<span class="keywordtype">int</span> frameSize_,<span class="keywordtype">int</span> onsetDetectionFunctionType_,<span class="keywordtype">int</span> windowType);</div> +<div class="line"><a name="l00079"></a><span class="lineno"> 79</span>  </div> +<div class="line"><a name="l00084"></a><span class="lineno"> 84</span>  <span class="keywordtype">double</span> <a class="code" href="class_onset_detection_function.html#a7b8fffe6221d3bd4f6cac82c17db0e92">calculateOnsetDetectionFunctionSample</a>(<span class="keywordtype">double</span> *buffer);</div> +<div class="line"><a name="l00085"></a><span class="lineno"> 85</span>  </div> +<div class="line"><a name="l00089"></a><span class="lineno"> 89</span>  <span class="keywordtype">void</span> <a class="code" href="class_onset_detection_function.html#a51fdab443155aaaa935956645e8f9131">setOnsetDetectionFunctionType</a>(<span class="keywordtype">int</span> onsetDetectionFunctionType_);</div> +<div class="line"><a name="l00090"></a><span class="lineno"> 90</span>  </div> +<div class="line"><a name="l00091"></a><span class="lineno"> 91</span> <span class="keyword">private</span>:</div> +<div class="line"><a name="l00092"></a><span class="lineno"> 92</span>  </div> +<div class="line"><a name="l00094"></a><span class="lineno"> 94</span>  <span class="keywordtype">void</span> performFFT();</div> +<div class="line"><a name="l00095"></a><span class="lineno"> 95</span> </div> +<div class="line"><a name="l00096"></a><span class="lineno"> 96</span>  <span class="comment">//=======================================================================</span></div> +<div class="line"><a name="l00098"></a><span class="lineno"> 98</span> <span class="comment"></span> <span class="keywordtype">double</span> energyEnvelope();</div> +<div class="line"><a name="l00099"></a><span class="lineno"> 99</span>  </div> +<div class="line"><a name="l00101"></a><span class="lineno"> 101</span>  <span class="keywordtype">double</span> energyDifference();</div> +<div class="line"><a name="l00102"></a><span class="lineno"> 102</span>  </div> +<div class="line"><a name="l00104"></a><span class="lineno"> 104</span>  <span class="keywordtype">double</span> spectralDifference();</div> +<div class="line"><a name="l00105"></a><span class="lineno"> 105</span>  </div> +<div class="line"><a name="l00107"></a><span class="lineno"> 107</span>  <span class="keywordtype">double</span> spectralDifferenceHWR();</div> +<div class="line"><a name="l00108"></a><span class="lineno"> 108</span>  </div> +<div class="line"><a name="l00110"></a><span class="lineno"> 110</span>  <span class="keywordtype">double</span> phaseDeviation();</div> +<div class="line"><a name="l00111"></a><span class="lineno"> 111</span>  </div> +<div class="line"><a name="l00113"></a><span class="lineno"> 113</span>  <span class="keywordtype">double</span> complexSpectralDifference();</div> +<div class="line"><a name="l00114"></a><span class="lineno"> 114</span>  </div> +<div class="line"><a name="l00116"></a><span class="lineno"> 116</span>  <span class="keywordtype">double</span> complexSpectralDifferenceHWR();</div> +<div class="line"><a name="l00117"></a><span class="lineno"> 117</span>  </div> +<div class="line"><a name="l00119"></a><span class="lineno"> 119</span>  <span class="keywordtype">double</span> highFrequencyContent();</div> +<div class="line"><a name="l00120"></a><span class="lineno"> 120</span>  </div> +<div class="line"><a name="l00122"></a><span class="lineno"> 122</span>  <span class="keywordtype">double</span> highFrequencySpectralDifference();</div> +<div class="line"><a name="l00123"></a><span class="lineno"> 123</span>  </div> +<div class="line"><a name="l00125"></a><span class="lineno"> 125</span>  <span class="keywordtype">double</span> highFrequencySpectralDifferenceHWR();</div> +<div class="line"><a name="l00126"></a><span class="lineno"> 126</span> </div> +<div class="line"><a name="l00127"></a><span class="lineno"> 127</span>  <span class="comment">//=======================================================================</span></div> +<div class="line"><a name="l00129"></a><span class="lineno"> 129</span> <span class="comment"></span> <span class="keywordtype">void</span> calculateRectangularWindow();</div> +<div class="line"><a name="l00130"></a><span class="lineno"> 130</span>  </div> +<div class="line"><a name="l00132"></a><span class="lineno"> 132</span>  <span class="keywordtype">void</span> calculateHanningWindow();</div> +<div class="line"><a name="l00133"></a><span class="lineno"> 133</span>  </div> +<div class="line"><a name="l00135"></a><span class="lineno"> 135</span>  <span class="keywordtype">void</span> calclulateHammingWindow();</div> +<div class="line"><a name="l00136"></a><span class="lineno"> 136</span>  </div> +<div class="line"><a name="l00138"></a><span class="lineno"> 138</span>  <span class="keywordtype">void</span> calculateBlackmanWindow();</div> +<div class="line"><a name="l00139"></a><span class="lineno"> 139</span>  </div> +<div class="line"><a name="l00141"></a><span class="lineno"> 141</span>  <span class="keywordtype">void</span> calculateTukeyWindow();</div> +<div class="line"><a name="l00142"></a><span class="lineno"> 142</span> </div> +<div class="line"><a name="l00143"></a><span class="lineno"> 143</span>  <span class="comment">//=======================================================================</span></div> +<div class="line"><a name="l00148"></a><span class="lineno"> 148</span> <span class="comment"></span> <span class="keywordtype">double</span> princarg(<span class="keywordtype">double</span> phaseVal);</div> <div class="line"><a name="l00149"></a><span class="lineno"> 149</span>  </div> -<div class="line"><a name="l00150"></a><span class="lineno"> 150</span>  <span class="keywordtype">double</span> pi; </div> -<div class="line"><a name="l00152"></a><span class="lineno"> 152</span>  <span class="keywordtype">int</span> frameSize; </div> -<div class="line"><a name="l00153"></a><span class="lineno"> 153</span>  <span class="keywordtype">int</span> hopSize; </div> -<div class="line"><a name="l00154"></a><span class="lineno"> 154</span>  <span class="keywordtype">int</span> onsetDetectionFunctionType; </div> -<div class="line"><a name="l00156"></a><span class="lineno"> 156</span>  fftw_plan p; </div> -<div class="line"><a name="l00157"></a><span class="lineno"> 157</span>  fftw_complex *complexIn; </div> -<div class="line"><a name="l00158"></a><span class="lineno"> 158</span>  fftw_complex *complexOut; </div> -<div class="line"><a name="l00160"></a><span class="lineno"> 160</span>  <span class="keywordtype">int</span> initialised; </div> -<div class="line"><a name="l00162"></a><span class="lineno"> 162</span>  <span class="keywordtype">double</span> *frame; </div> -<div class="line"><a name="l00163"></a><span class="lineno"> 163</span>  <span class="keywordtype">double</span> *window; </div> -<div class="line"><a name="l00165"></a><span class="lineno"> 165</span>  <span class="keywordtype">double</span> prevEnergySum; </div> -<div class="line"><a name="l00167"></a><span class="lineno"> 167</span>  <span class="keywordtype">double</span> *magSpec; </div> -<div class="line"><a name="l00168"></a><span class="lineno"> 168</span>  <span class="keywordtype">double</span> *prevMagSpec; </div> -<div class="line"><a name="l00170"></a><span class="lineno"> 170</span>  <span class="keywordtype">double</span> *phase; </div> -<div class="line"><a name="l00171"></a><span class="lineno"> 171</span>  <span class="keywordtype">double</span> *prevPhase; </div> -<div class="line"><a name="l00172"></a><span class="lineno"> 172</span>  <span class="keywordtype">double</span> *prevPhase2; </div> -<div class="line"><a name="l00174"></a><span class="lineno"> 174</span> };</div> -<div class="line"><a name="l00175"></a><span class="lineno"> 175</span> </div> +<div class="line"><a name="l00150"></a><span class="lineno"> 150</span>  </div> +<div class="line"><a name="l00151"></a><span class="lineno"> 151</span>  <span class="keywordtype">double</span> pi; </div> +<div class="line"><a name="l00153"></a><span class="lineno"> 153</span>  <span class="keywordtype">int</span> frameSize; </div> +<div class="line"><a name="l00154"></a><span class="lineno"> 154</span>  <span class="keywordtype">int</span> hopSize; </div> +<div class="line"><a name="l00155"></a><span class="lineno"> 155</span>  <span class="keywordtype">int</span> onsetDetectionFunctionType; </div> +<div class="line"><a name="l00157"></a><span class="lineno"> 157</span>  fftw_plan p; </div> +<div class="line"><a name="l00158"></a><span class="lineno"> 158</span>  fftw_complex *complexIn; </div> +<div class="line"><a name="l00159"></a><span class="lineno"> 159</span>  fftw_complex *complexOut; </div> +<div class="line"><a name="l00161"></a><span class="lineno"> 161</span>  <span class="keywordtype">bool</span> initialised; </div> +<div class="line"><a name="l00163"></a><span class="lineno"> 163</span>  std::vector<double> frame; </div> +<div class="line"><a name="l00164"></a><span class="lineno"> 164</span>  std::vector<double> window; </div> +<div class="line"><a name="l00166"></a><span class="lineno"> 166</span>  <span class="keywordtype">double</span> prevEnergySum; </div> +<div class="line"><a name="l00168"></a><span class="lineno"> 168</span>  std::vector<double> magSpec; </div> +<div class="line"><a name="l00169"></a><span class="lineno"> 169</span>  std::vector<double> prevMagSpec; </div> +<div class="line"><a name="l00171"></a><span class="lineno"> 171</span>  std::vector<double> phase; </div> +<div class="line"><a name="l00172"></a><span class="lineno"> 172</span>  std::vector<double> prevPhase; </div> +<div class="line"><a name="l00173"></a><span class="lineno"> 173</span>  std::vector<double> prevPhase2; </div> +<div class="line"><a name="l00175"></a><span class="lineno"> 175</span> };</div> <div class="line"><a name="l00176"></a><span class="lineno"> 176</span> </div> -<div class="line"><a name="l00177"></a><span class="lineno"> 177</span> <span class="preprocessor">#endif</span></div> +<div class="line"><a name="l00177"></a><span class="lineno"> 177</span> </div> +<div class="line"><a name="l00178"></a><span class="lineno"> 178</span> <span class="preprocessor">#endif</span></div> </div><!-- fragment --></div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Mon Jan 27 2014 22:01:21 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> +Generated on Tue Jan 28 2014 00:29:23 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.2 </small></address>
--- a/doc/html/annotated.html Tue Jan 28 00:19:21 2014 +0000 +++ b/doc/html/annotated.html Tue Jan 28 00:31:17 2014 +0000 @@ -92,7 +92,7 @@ </div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Mon Jan 27 2014 22:01:21 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> +Generated on Tue Jan 28 2014 00:29:23 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.2 </small></address>
--- a/doc/html/class_b_track-members.html Tue Jan 28 00:19:21 2014 +0000 +++ b/doc/html/class_b_track-members.html Tue Jan 28 00:31:17 2014 +0000 @@ -100,10 +100,11 @@ <tr><td class="entry"><a class="el" href="class_b_track.html#abb7ce7253095e6f859ef7b30f06ce051">processAudioFrame</a>(double *frame)</td><td class="entry"><a class="el" href="class_b_track.html">BTrack</a></td><td class="entry"></td></tr> <tr class="even"><td class="entry"><a class="el" href="class_b_track.html#a6fab18732bef8c87152e93dec9e4f854">processOnsetDetectionFunctionSample</a>(double sample)</td><td class="entry"><a class="el" href="class_b_track.html">BTrack</a></td><td class="entry"></td></tr> <tr><td class="entry"><a class="el" href="class_b_track.html#a96cf4088e40dff66ce15ada1f671a186">setTempo</a>(double tempo)</td><td class="entry"><a class="el" href="class_b_track.html">BTrack</a></td><td class="entry"></td></tr> + <tr class="even"><td class="entry"><a class="el" href="class_b_track.html#a70244e9a5aa8f860533fa56f942b7ede">updateHopAndFrameSize</a>(int hopSize_, int frameSize_)</td><td class="entry"><a class="el" href="class_b_track.html">BTrack</a></td><td class="entry"></td></tr> </table></div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Mon Jan 27 2014 22:01:21 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> +Generated on Tue Jan 28 2014 00:29:23 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.2 </small></address>
--- a/doc/html/class_b_track.html Tue Jan 28 00:19:21 2014 +0000 +++ b/doc/html/class_b_track.html Tue Jan 28 00:31:17 2014 +0000 @@ -98,6 +98,8 @@ <tr class="separator:ac4dbda7c90ce1a3080def2d5da875171"><td class="memSeparator" colspan="2"> </td></tr> <tr class="memitem:afce9e207a2f6ff71d96125dee16797de"><td class="memItemLeft" align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" href="class_b_track.html#afce9e207a2f6ff71d96125dee16797de">BTrack</a> (int hopSize_, int frameSize_)</td></tr> <tr class="separator:afce9e207a2f6ff71d96125dee16797de"><td class="memSeparator" colspan="2"> </td></tr> +<tr class="memitem:a70244e9a5aa8f860533fa56f942b7ede"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="class_b_track.html#a70244e9a5aa8f860533fa56f942b7ede">updateHopAndFrameSize</a> (int hopSize_, int frameSize_)</td></tr> +<tr class="separator:a70244e9a5aa8f860533fa56f942b7ede"><td class="memSeparator" colspan="2"> </td></tr> <tr class="memitem:abb7ce7253095e6f859ef7b30f06ce051"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="class_b_track.html#abb7ce7253095e6f859ef7b30f06ce051">processAudioFrame</a> (double *frame)</td></tr> <tr class="separator:abb7ce7253095e6f859ef7b30f06ce051"><td class="memSeparator" colspan="2"> </td></tr> <tr class="memitem:a6fab18732bef8c87152e93dec9e4f854"><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="class_b_track.html#a6fab18732bef8c87152e93dec9e4f854">processOnsetDetectionFunctionSample</a> (double sample)</td></tr> @@ -139,7 +141,7 @@ </tr> </table> </div><div class="memdoc"> -<p>constructor assuming hop size of 512 and frame size of 1024 </p> +<p>Constructor assuming hop size of 512 and frame size of 1024 </p> </div> </div> @@ -156,7 +158,7 @@ </tr> </table> </div><div class="memdoc"> -<p>constructor assuming frame size will be double the hopSize </p> +<p>Constructor assuming frame size will be double the hopSize </p> <dl class="params"><dt>Parameters</dt><dd> <table class="params"> <tr><td class="paramname">hopSize</td><td>the hop size in audio samples </td></tr> @@ -189,7 +191,7 @@ </tr> </table> </div><div class="memdoc"> -<p>constructor taking both hopSize and frameSize </p> +<p>Constructor taking both hopSize and frameSize </p> <dl class="params"><dt>Parameters</dt><dd> <table class="params"> <tr><td class="paramname">hopSize</td><td>the hop size in audio samples </td></tr> @@ -229,7 +231,7 @@ </tr> </table> </div><div class="memdoc"> -<p>tell the algorithm to not fix the tempo anymore </p> +<p>Tell the algorithm to not fix the tempo anymore </p> </div> </div> @@ -246,7 +248,7 @@ </tr> </table> </div><div class="memdoc"> -<p>fix tempo to roughly around some value, so that the algorithm will only try to track tempi around the given tempo </p> +<p>Fix tempo to roughly around some value, so that the algorithm will only try to track tempi around the given tempo </p> <dl class="params"><dt>Parameters</dt><dd> <table class="params"> <tr><td class="paramname">tempo</td><td>the tempo in beats per minute (bpm) </td></tr> @@ -293,7 +295,7 @@ </tr> </table> </div><div class="memdoc"> -<p>calculates a beat time in seconds, given the frame number, hop size and sampling frequency. This version uses a long to represent the frame number </p> +<p>Calculates a beat time in seconds, given the frame number, hop size and sampling frequency. This version uses a long to represent the frame number </p> <dl class="params"><dt>Parameters</dt><dd> <table class="params"> <tr><td class="paramname">frameNumber</td><td>the index of the current frame </td></tr> @@ -343,7 +345,7 @@ </tr> </table> </div><div class="memdoc"> -<p>calculates a beat time in seconds, given the frame number, hop size and sampling frequency. This version uses an int to represent the frame number </p> +<p>Calculates a beat time in seconds, given the frame number, hop size and sampling frequency. This version uses an int to represent the frame number </p> <dl class="params"><dt>Parameters</dt><dd> <table class="params"> <tr><td class="paramname">frameNumber</td><td>the index of the current frame </td></tr> @@ -473,6 +475,40 @@ </div> </div> +<a class="anchor" id="a70244e9a5aa8f860533fa56f942b7ede"></a> +<div class="memitem"> +<div class="memproto"> + <table class="memname"> + <tr> + <td class="memname">void BTrack::updateHopAndFrameSize </td> + <td>(</td> + <td class="paramtype">int </td> + <td class="paramname"><em>hopSize_</em>, </td> + </tr> + <tr> + <td class="paramkey"></td> + <td></td> + <td class="paramtype">int </td> + <td class="paramname"><em>frameSize_</em> </td> + </tr> + <tr> + <td></td> + <td>)</td> + <td></td><td></td> + </tr> + </table> +</div><div class="memdoc"> +<p>Updates the hop and frame size used by the beat tracker </p> +<dl class="params"><dt>Parameters</dt><dd> + <table class="params"> + <tr><td class="paramname">hopSize</td><td>the hop size in audio samples </td></tr> + <tr><td class="paramname">frameSize</td><td>the frame size in audio samples </td></tr> + </table> + </dd> +</dl> + +</div> +</div> <hr/>The documentation for this class was generated from the following files:<ul> <li>src/<a class="el" href="_b_track_8h_source.html">BTrack.h</a></li> <li>src/<a class="el" href="_b_track_8cpp.html">BTrack.cpp</a></li> @@ -480,7 +516,7 @@ </div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Mon Jan 27 2014 22:01:21 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> +Generated on Tue Jan 28 2014 00:29:23 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.2 </small></address>
--- a/doc/html/class_onset_detection_function-members.html Tue Jan 28 00:19:21 2014 +0000 +++ b/doc/html/class_onset_detection_function-members.html Tue Jan 28 00:31:17 2014 +0000 @@ -94,7 +94,7 @@ </table></div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Mon Jan 27 2014 22:01:21 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> +Generated on Tue Jan 28 2014 00:29:23 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.2 </small></address>
--- a/doc/html/class_onset_detection_function.html Tue Jan 28 00:19:21 2014 +0000 +++ b/doc/html/class_onset_detection_function.html Tue Jan 28 00:31:17 2014 +0000 @@ -272,7 +272,7 @@ </div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Mon Jan 27 2014 22:01:21 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> +Generated on Tue Jan 28 2014 00:29:23 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.2 </small></address>
--- a/doc/html/classes.html Tue Jan 28 00:19:21 2014 +0000 +++ b/doc/html/classes.html Tue Jan 28 00:31:17 2014 +0000 @@ -96,7 +96,7 @@ </div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Mon Jan 27 2014 22:01:21 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> +Generated on Tue Jan 28 2014 00:29:23 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.2 </small></address>
--- a/doc/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html Tue Jan 28 00:19:21 2014 +0000 +++ b/doc/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html Tue Jan 28 00:31:17 2014 +0000 @@ -99,7 +99,7 @@ </div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Mon Jan 27 2014 22:01:21 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> +Generated on Tue Jan 28 2014 00:29:23 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.2 </small></address>
--- a/doc/html/files.html Tue Jan 28 00:19:21 2014 +0000 +++ b/doc/html/files.html Tue Jan 28 00:31:17 2014 +0000 @@ -94,7 +94,7 @@ </div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Mon Jan 27 2014 22:01:21 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> +Generated on Tue Jan 28 2014 00:29:23 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.2 </small></address>
--- a/doc/html/functions.html Tue Jan 28 00:19:21 2014 +0000 +++ b/doc/html/functions.html Tue Jan 28 00:31:17 2014 +0000 @@ -131,6 +131,9 @@ <li>setTempo() : <a class="el" href="class_b_track.html#a96cf4088e40dff66ce15ada1f671a186">BTrack</a> </li> +<li>updateHopAndFrameSize() +: <a class="el" href="class_b_track.html#a70244e9a5aa8f860533fa56f942b7ede">BTrack</a> +</li> <li>~OnsetDetectionFunction() : <a class="el" href="class_onset_detection_function.html#aa01f8125c950f3def45154878107e503">OnsetDetectionFunction</a> </li> @@ -138,7 +141,7 @@ </div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Mon Jan 27 2014 22:01:21 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> +Generated on Tue Jan 28 2014 00:29:23 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.2 </small></address>
--- a/doc/html/functions_func.html Tue Jan 28 00:19:21 2014 +0000 +++ b/doc/html/functions_func.html Tue Jan 28 00:31:17 2014 +0000 @@ -131,6 +131,9 @@ <li>setTempo() : <a class="el" href="class_b_track.html#a96cf4088e40dff66ce15ada1f671a186">BTrack</a> </li> +<li>updateHopAndFrameSize() +: <a class="el" href="class_b_track.html#a70244e9a5aa8f860533fa56f942b7ede">BTrack</a> +</li> <li>~OnsetDetectionFunction() : <a class="el" href="class_onset_detection_function.html#aa01f8125c950f3def45154878107e503">OnsetDetectionFunction</a> </li> @@ -138,7 +141,7 @@ </div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Mon Jan 27 2014 22:01:21 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> +Generated on Tue Jan 28 2014 00:29:23 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.2 </small></address>
--- a/doc/html/globals.html Tue Jan 28 00:19:21 2014 +0000 +++ b/doc/html/globals.html Tue Jan 28 00:31:17 2014 +0000 @@ -95,7 +95,7 @@ </div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Mon Jan 27 2014 22:01:21 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> +Generated on Tue Jan 28 2014 00:29:23 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.2 </small></address>
--- a/doc/html/globals_enum.html Tue Jan 28 00:19:21 2014 +0000 +++ b/doc/html/globals_enum.html Tue Jan 28 00:31:17 2014 +0000 @@ -95,7 +95,7 @@ </div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Mon Jan 27 2014 22:01:21 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> +Generated on Tue Jan 28 2014 00:29:23 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.2 </small></address>
--- a/doc/html/index.html Tue Jan 28 00:19:21 2014 +0000 +++ b/doc/html/index.html Tue Jan 28 00:31:17 2014 +0000 @@ -120,7 +120,7 @@ </div></div><!-- contents --> <!-- start footer part --> <hr class="footer"/><address class="footer"><small> -Generated on Mon Jan 27 2014 22:01:21 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> +Generated on Tue Jan 28 2014 00:29:23 for BTrack - A Real-Time Beat Tracker by  <a href="http://www.doxygen.org/index.html"> <img class="footer" src="doxygen.png" alt="doxygen"/> </a> 1.8.2 </small></address>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/html/search/all_75.html Tue Jan 28 00:31:17 2014 +0000 @@ -0,0 +1,25 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html><head><title></title> +<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/> +<link rel="stylesheet" type="text/css" href="search.css"/> +<script type="text/javascript" src="all_75.js"></script> +<script type="text/javascript" src="search.js"></script> +</head> +<body class="SRPage"> +<div id="SRIndex"> +<div class="SRStatus" id="Loading">Loading...</div> +<div id="SRResults"></div> +<script type="text/javascript"><!-- +createResults(); +--></script> +<div class="SRStatus" id="Searching">Searching...</div> +<div class="SRStatus" id="NoMatches">No Matches</div> +<script type="text/javascript"><!-- +document.getElementById("Loading").style.display="none"; +document.getElementById("NoMatches").style.display="none"; +var searchResults = new SearchResults("searchResults"); +searchResults.Search(); +--></script> +</div> +</body> +</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/html/search/all_75.js Tue Jan 28 00:31:17 2014 +0000 @@ -0,0 +1,4 @@ +var searchData= +[ + ['updatehopandframesize',['updateHopAndFrameSize',['../class_b_track.html#a70244e9a5aa8f860533fa56f942b7ede',1,'BTrack']]] +];
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/html/search/functions_75.html Tue Jan 28 00:31:17 2014 +0000 @@ -0,0 +1,25 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html><head><title></title> +<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/> +<link rel="stylesheet" type="text/css" href="search.css"/> +<script type="text/javascript" src="functions_75.js"></script> +<script type="text/javascript" src="search.js"></script> +</head> +<body class="SRPage"> +<div id="SRIndex"> +<div class="SRStatus" id="Loading">Loading...</div> +<div id="SRResults"></div> +<script type="text/javascript"><!-- +createResults(); +--></script> +<div class="SRStatus" id="Searching">Searching...</div> +<div class="SRStatus" id="NoMatches">No Matches</div> +<script type="text/javascript"><!-- +document.getElementById("Loading").style.display="none"; +document.getElementById("NoMatches").style.display="none"; +var searchResults = new SearchResults("searchResults"); +searchResults.Search(); +--></script> +</div> +</body> +</html>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/html/search/functions_75.js Tue Jan 28 00:31:17 2014 +0000 @@ -0,0 +1,4 @@ +var searchData= +[ + ['updatehopandframesize',['updateHopAndFrameSize',['../class_b_track.html#a70244e9a5aa8f860533fa56f942b7ede',1,'BTrack']]] +];
--- a/doc/html/search/search.js Tue Jan 28 00:19:21 2014 +0000 +++ b/doc/html/search/search.js Tue Jan 28 00:31:17 2014 +0000 @@ -7,10 +7,10 @@ var indexSectionsWithContent = { - 0: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000011101101000001100100010000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + 0: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000011101101000001100101010000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", 1: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", 2: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", - 3: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000011101101000001100100000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + 3: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000011101101000001100101000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", 4: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", 5: "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" };
--- a/modules-and-plug-ins/vamp-plugin/BTrackVamp.cpp Tue Jan 28 00:19:21 2014 +0000 +++ b/modules-and-plug-ins/vamp-plugin/BTrackVamp.cpp Tue Jan 28 00:31:17 2014 +0000 @@ -198,7 +198,8 @@ m_stepSize = stepSize; m_blockSize = blockSize; - // Real initialisation work goes here! + b.updateHopAndFrameSize(m_stepSize,m_blockSize); + return true; } @@ -212,26 +213,32 @@ BTrackVamp::FeatureSet BTrackVamp::process(const float *const *inputBuffers, Vamp::RealTime timestamp) { + // create an array to hold our audio frame double frame[m_blockSize]; + // copy samples into our frame for (int i = 0;i < m_blockSize;i++) { frame[i] = (double) inputBuffers[0][i]; } + // process the frame in the beat tracker b.processAudioFrame(frame); + // create a FeatureSet FeatureSet featureSet; + // if there is a beat in this frame if (b.beatDueInCurrentFrame()) { + // add a beat to the FeatureSet Feature beat; beat.hasTimestamp = true; beat.timestamp = timestamp - Vamp::RealTime::frame2RealTime(m_stepSize, int(m_inputSampleRate + 0.5)); featureSet[0].push_back(beat); } - // Do actual work! + // return the feature set return featureSet; }
--- a/src/BTrack.cpp Tue Jan 28 00:19:21 2014 +0000 +++ b/src/BTrack.cpp Tue Jan 28 00:31:17 2014 +0000 @@ -149,6 +149,16 @@ } //======================================================================= +void BTrack::updateHopAndFrameSize(int hopSize_,int frameSize_) +{ + // update the onset detection function object + odf.initialise(hopSize_, frameSize_, ComplexSpectralDifferenceHWR, HanningWindow); + + // update the hop size being used by the beat tracker + setHopSize(hopSize_); +} + +//======================================================================= bool BTrack::beatDueInCurrentFrame() { return beatDueInFrame;
--- a/src/BTrack.h Tue Jan 28 00:19:21 2014 +0000 +++ b/src/BTrack.h Tue Jan 28 00:31:17 2014 +0000 @@ -51,6 +51,13 @@ BTrack(int hopSize_,int frameSize_); //======================================================================= + /** Updates the hop and frame size used by the beat tracker + * @param hopSize the hop size in audio samples + * @param frameSize the frame size in audio samples + */ + void updateHopAndFrameSize(int hopSize_,int frameSize_); + + //======================================================================= /** Process a single audio frame * @param frame a pointer to an array containing an audio frame. The number of samples should * match the frame size that the algorithm was initialised with.