From 91b08a07d2a1caeb721b5702da4565fdff936c11 Mon Sep 17 00:00:00 2001 From: xufulong Date: Sun, 26 Sep 2021 17:55:41 +0800 Subject: [PATCH] change to cpp file --- app/CMakeLists.txt | 7 +++---- .../main/cpp/visualizer/{execute_fft.c => execute_fft.cpp} | 0 app/src/main/cpp/visualizer/execute_fft.h | 4 ++-- app/src/main/cpp/visualizer/{fft.c => fft.cpp} | 2 +- app/src/main/cpp/visualizer/{window.c => window.cpp} | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) rename app/src/main/cpp/visualizer/{execute_fft.c => execute_fft.cpp} (100%) rename app/src/main/cpp/visualizer/{fft.c => fft.cpp} (99%) rename app/src/main/cpp/visualizer/{window.c => window.cpp} (100%) diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 8088e62..528ba70 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -34,11 +34,10 @@ add_library( # Sets the name of the library. src/main/cpp/video_filter.c src/main/cpp/fast_start.c src/main/cpp/ffprobe_cmd.cpp - src/main/cpp/visualizer/fft.c - src/main/cpp/visualizer/fixed_fft.c + src/main/cpp/visualizer/fft.cpp src/main/cpp/visualizer/block_queue.c - src/main/cpp/visualizer/execute_fft.c - src/main/cpp/visualizer/window.c + src/main/cpp/visualizer/execute_fft.cpp + src/main/cpp/visualizer/window.cpp ) add_library( ffmpeg diff --git a/app/src/main/cpp/visualizer/execute_fft.c b/app/src/main/cpp/visualizer/execute_fft.cpp similarity index 100% rename from app/src/main/cpp/visualizer/execute_fft.c rename to app/src/main/cpp/visualizer/execute_fft.cpp diff --git a/app/src/main/cpp/visualizer/execute_fft.h b/app/src/main/cpp/visualizer/execute_fft.h index e1c7940..6218b6c 100644 --- a/app/src/main/cpp/visualizer/execute_fft.h +++ b/app/src/main/cpp/visualizer/execute_fft.h @@ -7,14 +7,14 @@ #include #include +#include "fft.h" +#include "window.h" #ifdef __cplusplus extern "C" { #endif #include "block_queue.h" -#include "fft.h" -#include "window.h" typedef struct { diff --git a/app/src/main/cpp/visualizer/fft.c b/app/src/main/cpp/visualizer/fft.cpp similarity index 99% rename from app/src/main/cpp/visualizer/fft.c rename to app/src/main/cpp/visualizer/fft.cpp index e40b9ca..30a8779 100644 --- a/app/src/main/cpp/visualizer/fft.c +++ b/app/src/main/cpp/visualizer/fft.cpp @@ -59,7 +59,7 @@ fft_state *visual_fft_init(void) fft_state *p_state; unsigned int i; - p_state = malloc( sizeof(*p_state) ); + p_state = (fft_state *) malloc( sizeof(*p_state) ); if(! p_state ) return NULL; diff --git a/app/src/main/cpp/visualizer/window.c b/app/src/main/cpp/visualizer/window.cpp similarity index 100% rename from app/src/main/cpp/visualizer/window.c rename to app/src/main/cpp/visualizer/window.cpp index c436df7..781cfc8 100644 --- a/app/src/main/cpp/visualizer/window.c +++ b/app/src/main/cpp/visualizer/window.cpp @@ -113,6 +113,7 @@ no_preset: bool window_init(int i_buffer_size, window_param * p_param, window_context * p_ctx) { float * pf_table = NULL; + int i_buffer_size_minus_1 = i_buffer_size - 1; window_type wind_type = p_param->wind_type; if( wind_type != HANN && wind_type != FLATTOP @@ -131,7 +132,6 @@ bool window_init(int i_buffer_size, window_param * p_param, window_context * p_c return false; } - int i_buffer_size_minus_1 = i_buffer_size - 1; switch( wind_type ) { case HANN: