update

audio-analysis/pom.xml

@@ -69,4 +69,13 @@
 			<version>4.1.68.Final</version>
 		</dependency>
 	</dependencies>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
 </project>

audio-analysis/src/main/java/com/yonge/nettty/dto/HardLevelEnum.java

@@ -3,7 +3,7 @@ package com.yonge.nettty.dto;
 import com.ym.mec.common.enums.BaseEnum;
 
 public enum HardLevelEnum implements BaseEnum<String, HardLevelEnum> {
-	BEGINNER("入门级", 5, 5, 50, 60, 10), ADVANCED("进阶级", 5, 5, 50, 60, 10), PERFORMER("大师级", 5, 5, 50, 60, 10);
+	BEGINNER("入门级", 5, 5, 50, 60, 10), ADVANCED("进阶级", 5, 5, 50, 50, 10), PERFORMER("大师级", 5, 5, 50, 60, 10);
 
 	private String msg;
 

audio-analysis/src/main/java/com/yonge/nettty/dto/UserChannelContext.java

@@ -32,7 +32,7 @@ public class UserChannelContext {
 	
 	private final static Logger LOGGER = LoggerFactory.getLogger(UserChannelContext.class);
 	
-	private final double offsetMS = 350;
+	private final double offsetMS = 300;
 	
 	private Long recordId;
 	
@@ -547,6 +547,7 @@ public class UserChannelContext {
 					.intValue());
 		}
 	}
+	
 	private int computeFrequency(List<ChunkAnalysis> chunkAnalysisList, ChunkAnalysis lastChunkAnalysis, int offsetRange) {
 		
 		List<ChunkAnalysis> chunkList = new ArrayList<ChunkAnalysis>(chunkAnalysisList);
@@ -612,7 +613,7 @@ public class UserChannelContext {
 			if (i == chunkFrequencyList.size() - 1) {
 				if (maxChunkSize <= chunkSize) {
 					maxChunkSize = chunkSize;
-					frequency = avgFrequency;
+					frequency = totalFrequency / chunkSize;
 				}
 			}
 		}
@@ -803,4 +804,21 @@ public class UserChannelContext {
 		return tempo;
 	}
 	
+	public static void main(String[] args) {
+		UserChannelContext context = new UserChannelContext();
+		
+		//int[] frequencys = {286,291,291,291,291,291,291};
+		int[] frequencys = {312,43,295,294,294,295};
+		
+		ChunkAnalysis lastChunkAnalysis = new ChunkAnalysis(624, 0, 0);
+		
+		List<ChunkAnalysis> chunkAnalysisList = new ArrayList<ChunkAnalysis>();
+		for(int f : frequencys) {
+			chunkAnalysisList.add(new ChunkAnalysis(f, 0, 0));
+		}
+		
+		//System.out.println(context.computeFrequency(chunkAnalysisList, lastChunkAnalysis, 5));
+		System.out.println(context.computeTempoWithFrequency(chunkAnalysisList, lastChunkAnalysis));
+	}
+	
 }