new update

Makefile

@@ -6,13 +6,13 @@ CC      = g++ -Wall -O3 -Wno-unused-result $(CINC)
 all: ${BIN}/build ${BIN}/recog
 
 # Generates a compiler for an d_lang language,
-${BIN}/build: $(SRC)/build.cpp $(SRC)/hash.cpp $(SRC)/fingerprint.cpp $(SRC)/wav.cpp $(SRC)/bmp.cpp
+${BIN}/build: $(SRC)/build.cpp $(SRC)/hash.cpp $(SRC)/fingerprint.cpp $(SRC)/wav.cpp
 	mkdir -p ${BIN}
-	$(CC) -o $(BIN)/build $(SRC)/build.cpp $(SRC)/hash.cpp $(SRC)/fingerprint.cpp $(SRC)/bmp.cpp $(SRC)/wav.cpp -ll -lm -lfftw3
+	$(CC) -o $(BIN)/build $(SRC)/build.cpp $(SRC)/hash.cpp $(SRC)/fingerprint.cpp $(SRC)/wav.cpp -lfftw3
 
-${BIN}/recog: $(SRC)/recog.cpp $(SRC)/hash.cpp $(SRC)/fingerprint.cpp $(SRC)/wav.cpp $(SRC)/bmp.cpp
+${BIN}/recog: $(SRC)/recog.cpp $(SRC)/hash.cpp $(SRC)/fingerprint.cpp $(SRC)/wav.cpp
 	mkdir -p ${BIN}
-	$(CC) -o $(BIN)/recog $(SRC)/recog.cpp $(SRC)/hash.cpp $(SRC)/fingerprint.cpp $(SRC)/bmp.cpp $(SRC)/wav.cpp -ll -lm -lfftw3
+	$(CC) -o $(BIN)/recog $(SRC)/recog.cpp $(SRC)/hash.cpp $(SRC)/fingerprint.cpp $(SRC)/wav.cpp -lfftw3
 
 clean:
 	rm -f *.BAK *.o core *~* *.a 

data/dataset.txt

@@ -0,0 +1,39 @@
+/root/ws/AudioRecognition/data/
+007.wav
+Fly-Me-To-The-Moon.wav
+Halo.wav
+Heart-And-Soul.wav
+Historia-De-Un-Amor.wav
+Just-Dance.wav
+Just-One-Last-Dance.wav
+Loving-You.wav
+Moves-Like-Jagger.wav
+Never-Say-Goodbye.wav
+Never-Say-Never.wav
+Only-Time.wav
+Only-You.wav
+Part-Of-Me.wav
+Poker-Face.wav
+Pretty-Boy.wav
+Price-Tag.wav
+Rolling-In-The-Deep.wav
+Safe---Sound-.wav
+Satin-Doll.wav
+Seven-Years.wav
+She-Is-My-Sin.wav
+Solitude.wav
+Stronger--What-Doesn-t-Kill-You-.wav
+Summer.wav
+That-Place-In-Your-Heart.wav
+The-Promise.wav
+Trespassing.wav
+Trouble-Is-A-Friend.wav
+Unforgivable-Sinner.wav
+Vertigo.wav
+Wake-Up-Call.wav
+Walking-In-The-Sun.wav
+We-Will-Rock-You.wav
+What-A-Wonderful-World.wav
+Whataya-Want-From-Me.wav
+Work-Out.wav
+Yellow.wav

data/getdata.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+axel http://home.ustc.edu.cn/~kaiki/dataset/007.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Fly-Me-To-The-Moon.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Halo.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Heart-And-Soul.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Historia-De-Un-Amor.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Just-Dance.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Just-One-Last-Dance.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Loving-You.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Moves-Like-Jagger.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Never-Say-Goodbye.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Never-Say-Never.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Only-Time.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Only-You.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Part-Of-Me.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Poker-Face.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Pretty-Boy.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Price-Tag.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Rolling-In-The-Deep.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Safe---Sound-.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Satin-Doll.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Seven-Years.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/She-Is-My-Sin.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Solitude.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Stronger--What-Doesn-t-Kill-You-.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Summer.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/That-Place-In-Your-Heart.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/The-Promise.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Trespassing.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Trouble-Is-A-Friend.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Unforgivable-Sinner.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Vertigo.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Wake-Up-Call.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Walking-In-The-Sun.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/We-Will-Rock-You.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/What-A-Wonderful-World.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Whataya-Want-From-Me.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Work-Out.wav &
+axel http://home.ustc.edu.cn/~kaiki/dataset/Yellow.wav

include/fingerprint.h

@@ -23,7 +23,6 @@
 #include <assert.h>
 #include <wav.h>
 #include <hash.h>
-#include <bmp.h>
 #include <stdint.h>
 
 #define FRAME_SIZE 512