Skip to content

Commit 46f168f

Browse files
committed
fix: abs for fft data
1 parent 4f67b6e commit 46f168f

File tree

9 files changed

+7
-25
lines changed

9 files changed

+7
-25
lines changed

audiovisualize/src/main/java/com/zjy/audiovisualize/view/AudioVisualizeView.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public abstract class AudioVisualizeView extends View implements MediaManagerLis
5555
/**
5656
* audio data transform by hypot
5757
*/
58-
protected byte[] mRawAudioBytes;
58+
protected float[] mRawAudioBytes;
5959

6060
protected RectF mRect;
6161
protected Paint mPaint;
@@ -160,7 +160,7 @@ public void onPrepare() {
160160
}
161161

162162
@Override
163-
public void onFftDataCapture(byte[] parseData) {
163+
public void onFftDataCapture(float[] parseData) {
164164
if (!isVisualizationEnabled) {
165165
return;
166166
}

audiovisualize/src/main/java/com/zjy/audiovisualize/view/CircleVisualizeView.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ protected void drawChild(Canvas canvas) {
4343
mPaint.setStyle(Paint.Style.FILL);
4444
mPath.moveTo(0, centerY);
4545
for (int i = 0; i < mSpectrumCount; i++) {
46-
if (mRawAudioBytes[i] < 0) {
47-
mRawAudioBytes[i] = 127;
48-
}
4946
double angel = ((360d/ mSpectrumCount *1.0d) * (i+1));
5047
double startX = centerX + (radius + mStrokeWidth/2) * Math.sin(Math.toRadians(angel));
5148
double startY = centerY + (radius + mStrokeWidth/2) * Math.cos(Math.toRadians(angel));

audiovisualize/src/main/java/com/zjy/audiovisualize/view/GrainVisualizeView.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ protected void drawChild(Canvas canvas) {
4646
mPaint.setStrokeWidth(mStrokeWidth);
4747
mPaint.setStyle(Paint.Style.FILL);
4848
for (int i = 0; i < mSpectrumCount; i++) {
49-
if (mRawAudioBytes[i] < 0) {
50-
mRawAudioBytes[i] = 127;
51-
}
5249
switch (mOrientation) {
5350
case HORIZONTAL_LINE_TOP:
5451
drawGrain(canvas, mRect.width() * i / mSpectrumCount, mRect.height() / 2, 2 + mRect.height() / 2 - mRawAudioBytes[i]);

audiovisualize/src/main/java/com/zjy/audiovisualize/view/NetVisualizeView.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ protected void drawChild(Canvas canvas) {
4545
mPaint.setStyle(Paint.Style.FILL);
4646
mPath.moveTo(0, centerY);
4747
for (int i = 0; i < mSpectrumCount; i++) {
48-
if (mRawAudioBytes[i] < 0) {
49-
mRawAudioBytes[i] = 127;
50-
}
5148

5249
double angel = ((360d/ mSpectrumCount *1.0d) * (i+1));
5350
double startX = centerX + (radius + mStrokeWidth/2) * Math.sin(Math.toRadians(angel));

audiovisualize/src/main/java/com/zjy/audiovisualize/view/ReflectVisualizeView.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ protected void drawChild(Canvas canvas) {
3838
mPaint.setStrokeWidth(mStrokeWidth);
3939
mPaint.setStyle(Paint.Style.FILL);
4040
for (int i = 0; i < mSpectrumCount; i++) {
41-
if (mRawAudioBytes[i] < 0) {
42-
mRawAudioBytes[i] = 127;
43-
}
4441
canvas.drawLine(mRect.width() * i / mSpectrumCount, mRect.height() / 2,mRect.width() * i / mSpectrumCount, 2 + mRect.height() / 2 - mSpectrumRatio * mRawAudioBytes[i], mPaint);
4542
canvas.drawLine(mRect.width() * i / mSpectrumCount, mRect.height() / 2,mRect.width() * i / mSpectrumCount, 2 + mRect.height() / 2 + mSpectrumRatio * mRawAudioBytes[i], mPaint);
4643
}

audiovisualize/src/main/java/com/zjy/audiovisualize/view/SingleVisualizeView.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ protected void drawChild(Canvas canvas) {
4646
mPaint.setStrokeWidth(mStrokeWidth);
4747
mPaint.setStyle(Paint.Style.FILL);
4848
for (int i = 0; i < mSpectrumCount; i++) {
49-
if (mRawAudioBytes[i] < 0) {
50-
mRawAudioBytes[i] = 127;
51-
}
5249
switch (mOrientation) {
5350
case HORIZONTAL_LINE_TOP:
5451
canvas.drawLine(mRect.width() * i / mSpectrumCount, mRect.height() / 2,mRect.width() * i / mSpectrumCount, 2 + mRect.height() / 2 - mRawAudioBytes[i], mPaint);

audiovisualize/src/main/java/com/zjy/audiovisualize/view/WaveVisualizeView.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ protected void drawChild(Canvas canvas) {
4040
mPath.moveTo(0, centerY);
4141

4242
for (int i = 0; i < mSpectrumCount; i++) {
43-
if (mRawAudioBytes[i] < 0) {
44-
mRawAudioBytes[i] = 127;
45-
}
4643
mPath.lineTo(mRect.width() * i / mSpectrumCount, 2 + mRect.height() / 2 + mRawAudioBytes[i]);
4744
}
4845
mPath.lineTo(mRect.width(), centerY);

audiovisualize/src/main/java/com/zjy/audiovisualize/visualize/VisualizeCallback.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
*/
88
public interface VisualizeCallback {
99

10-
void onFftDataCapture(byte[] parseData);
10+
void onFftDataCapture(float[] parseData);
1111

1212
}

audiovisualize/src/main/java/com/zjy/audiovisualize/visualize/VisualizerHelper.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@ public void onWaveFormDataCapture(Visualizer visualizer, byte[] bytes,
4343
@Override
4444
public void onFftDataCapture(Visualizer visualizer, byte[] fft,
4545
int samplingRate) {
46-
byte[] model = new byte[fft.length / 2 + 1];
47-
model[0] = (byte) Math.abs(fft[1]);
46+
float[] model = new float[fft.length / 2 + 1];
47+
model[0] = (float) Math.abs(fft[1]);
4848
int j = 1;
4949

5050
for (int i = 2; i < mCount *2;) {
5151

52-
model[j] = (byte) Math.hypot(fft[i], fft[i + 1]);
52+
model[j] = (float) Math.hypot(fft[i], fft[i + 1]);
5353
i += 2;
5454
j++;
55-
55+
model[j] = (float) Math.abs(fft[j]);
5656
}
5757
if (mCallback != null) {
5858
mCallback.onFftDataCapture(model);

0 commit comments

Comments
 (0)