change to cpp file

dev
xufulong 4 years ago
parent 074787e36b
commit 91b08a07d2
  1. 7
      app/CMakeLists.txt
  2. 0
      app/src/main/cpp/visualizer/execute_fft.cpp
  3. 4
      app/src/main/cpp/visualizer/execute_fft.h
  4. 2
      app/src/main/cpp/visualizer/fft.cpp
  5. 2
      app/src/main/cpp/visualizer/window.cpp

@ -34,11 +34,10 @@ add_library( # Sets the name of the library.
src/main/cpp/video_filter.c src/main/cpp/video_filter.c
src/main/cpp/fast_start.c src/main/cpp/fast_start.c
src/main/cpp/ffprobe_cmd.cpp src/main/cpp/ffprobe_cmd.cpp
src/main/cpp/visualizer/fft.c src/main/cpp/visualizer/fft.cpp
src/main/cpp/visualizer/fixed_fft.c
src/main/cpp/visualizer/block_queue.c src/main/cpp/visualizer/block_queue.c
src/main/cpp/visualizer/execute_fft.c src/main/cpp/visualizer/execute_fft.cpp
src/main/cpp/visualizer/window.c src/main/cpp/visualizer/window.cpp
) )
add_library( ffmpeg add_library( ffmpeg

@ -7,14 +7,14 @@
#include <math.h> #include <math.h>
#include <unistd.h> #include <unistd.h>
#include "fft.h"
#include "window.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include "block_queue.h" #include "block_queue.h"
#include "fft.h"
#include "window.h"
typedef struct typedef struct
{ {

@ -59,7 +59,7 @@ fft_state *visual_fft_init(void)
fft_state *p_state; fft_state *p_state;
unsigned int i; unsigned int i;
p_state = malloc( sizeof(*p_state) ); p_state = (fft_state *) malloc( sizeof(*p_state) );
if(! p_state ) if(! p_state )
return NULL; return NULL;

@ -113,6 +113,7 @@ no_preset:
bool window_init(int i_buffer_size, window_param * p_param, window_context * p_ctx) bool window_init(int i_buffer_size, window_param * p_param, window_context * p_ctx)
{ {
float * pf_table = NULL; float * pf_table = NULL;
int i_buffer_size_minus_1 = i_buffer_size - 1;
window_type wind_type = p_param->wind_type; window_type wind_type = p_param->wind_type;
if( wind_type != HANN && wind_type != FLATTOP 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; return false;
} }
int i_buffer_size_minus_1 = i_buffer_size - 1;
switch( wind_type ) switch( wind_type )
{ {
case HANN: case HANN:
Loading…
Cancel
Save