k
/
FFmpegAndroid
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modify struct param

Browse Source
dev
xufulong 3 years ago
parent 4ae77b69c9
commit d728c1136e
2 changed files with 10 additions and 10 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 18
      app/src/main/cpp/visualizer/execute_fft.cpp
  2. 2
      app/src/main/cpp/visualizer/execute_fft.h

18
app/src/main/cpp/visualizer/execute_fft.cpp
Unescape View File

@ -23,10 +23,10 @@ int open_visualizer(filter_sys_t *p_sys)
p_sys->p_prev_s16_buff = nullptr; p_sys->p_prev_s16_buff = nullptr;
auto *w_param = (window_param*) malloc(sizeof(window_param)); auto *w_param = (window_param*) malloc(sizeof(window_param));
p_sys->wind_param = *w_param; p_sys->wind_param = w_param;
/* Fetch the FFT window parameters */ /* Fetch the FFT window parameters */
window_get_param(&p_sys->wind_param); window_get_param(p_sys->wind_param);
/* Create the FIFO for the audio data. */ /* Create the FIFO for the audio data. */
vlc_queue_t *queue = vlc_queue_init(5); vlc_queue_t *queue = vlc_queue_init(5);
@ -51,7 +51,7 @@ void close_visualizer(filter_sys_t *p_filter)
pthread_join(p_sys->thread, nullptr); pthread_join(p_sys->thread, nullptr);
free(p_sys->p_prev_s16_buff); free(p_sys->p_prev_s16_buff);
free(&p_sys->wind_param); free(p_sys->wind_param);
if (p_sys->data) { if (p_sys->data) {
free(p_sys->data); free(p_sys->data);
} }
@ -128,7 +128,7 @@ static void *fft_thread(void *p_data)
LOGE("unable to initialize FFT transform..."); LOGE("unable to initialize FFT transform...");
goto release; goto release;
} }
if (!window_init(FFT_BUFFER_SIZE, &p_sys->wind_param, &wind_ctx)) if (!window_init(FFT_BUFFER_SIZE, p_sys->wind_param, &wind_ctx))
{ {
LOGE("unable to initialize FFT window..."); LOGE("unable to initialize FFT window...");
goto release; goto release;
@ -194,10 +194,10 @@ int init_visualizer(filter_sys_t *p_filter)
auto *w_param = (window_param*) malloc(sizeof(window_param)); auto *w_param = (window_param*) malloc(sizeof(window_param));
if (!w_param) return -1; if (!w_param) return -1;
p_filter->wind_param = *w_param; p_filter->wind_param = w_param;
/* Fetch the FFT window parameters */ /* Fetch the FFT window parameters */
window_get_param(&p_filter->wind_param); window_get_param(p_filter->wind_param);
p_filter->data = nullptr; p_filter->data = nullptr;
p_filter->data_size = 0; p_filter->data_size = 0;
@ -223,7 +223,7 @@ void release_visualizer(filter_sys_t *p_filter)
if (p_filter->p_prev_s16_buff) { if (p_filter->p_prev_s16_buff) {
free(p_filter->p_prev_s16_buff); free(p_filter->p_prev_s16_buff);
} }
free(&p_filter->wind_param); free(p_filter->wind_param);
if (p_filter->data) { if (p_filter->data) {
free(p_filter->data); free(p_filter->data);
} }
@ -285,7 +285,7 @@ void fft_float(filter_sys_t *p_sys)
LOGE("unable to initialize FFT transform..."); LOGE("unable to initialize FFT transform...");
goto release; goto release;
} }
if (!window_init(out_samples, &p_sys->wind_param, &wind_ctx)) { if (!window_init(out_samples, p_sys->wind_param, &wind_ctx)) {
LOGE("unable to initialize FFT window..."); LOGE("unable to initialize FFT window...");
goto release; goto release;
} }
@ -354,7 +354,7 @@ void fft_fixed(filter_sys_t *p_sys)
goto release; goto release;
} }
if (!window_init(out_samples, &p_sys->wind_param, &wind_ctx)) { if (!window_init(out_samples, p_sys->wind_param, &wind_ctx)) {
LOGE("unable to initialize FFT window..."); LOGE("unable to initialize FFT window...");
goto release; goto release;
} }

2
app/src/main/cpp/visualizer/execute_fft.h
Unescape View File

@ -32,7 +32,7 @@ typedef struct
int16_t *p_prev_s16_buff; int16_t *p_prev_s16_buff;
/* FFT window parameters */ /* FFT window parameters */
window_param wind_param; window_param *wind_param;
uint8_t *data; uint8_t *data;
int data_size; int data_size;

Write Preview
Loading…
Cancel
Save