ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(cc_resampler.c) Remove some unneeded header includes / make it more 

backwards compatible
This commit is contained in:
twinaphex 2014-05-07 00:42:59 +02:00
parent 069491f488
commit 7d3b436c2a
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
audio/cc_resampler.c
View File

@ -17,8 +17,6 @@
// Convoluted Cosine Resampler // Convoluted Cosine Resampler
#include "resampler.h" #include "resampler.h"
#include "../libretro.h"
#include "../performance.h"
#include <math.h> #include <math.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
@ -186,15 +184,15 @@ static inline void add_to(const audio_frame_float_t *source, audio_frame_float_t
static void resampler_CC_downsample(void *re_, struct resampler_data *data) static void resampler_CC_downsample(void *re_, struct resampler_data *data)
{ {
float ratio, b;
rarch_CC_resampler_t *re = (rarch_CC_resampler_t*)re_; rarch_CC_resampler_t *re = (rarch_CC_resampler_t*)re_;
audio_frame_float_t *inp = (audio_frame_float_t*)data->data_in; audio_frame_float_t *inp = (audio_frame_float_t*)data->data_in;
audio_frame_float_t *inp_max = (audio_frame_float_t*)(inp + data->input_frames); audio_frame_float_t *inp_max = (audio_frame_float_t*)(inp + data->input_frames);
audio_frame_float_t *outp = (audio_frame_float_t*)data->data_out; audio_frame_float_t *outp = (audio_frame_float_t*)data->data_out;
float ratio = 1.0 / data->ratio; ratio = 1.0 / data->ratio;
b = data->ratio; // cutoff frequency
float b = data->ratio; // cutoff frequency
while (inp != inp_max) while (inp != inp_max)
{ {
@ -229,14 +227,15 @@ static void resampler_CC_downsample(void *re_, struct resampler_data *data)
static void resampler_CC_upsample(void *re_, struct resampler_data *data) static void resampler_CC_upsample(void *re_, struct resampler_data *data)
{ {
float b, ratio;
rarch_CC_resampler_t *re = (rarch_CC_resampler_t*)re_; rarch_CC_resampler_t *re = (rarch_CC_resampler_t*)re_;
audio_frame_float_t *inp = (audio_frame_float_t*)data->data_in; audio_frame_float_t *inp = (audio_frame_float_t*)data->data_in;
audio_frame_float_t *inp_max = inp + data->input_frames; audio_frame_float_t *inp_max = inp + data->input_frames;
audio_frame_float_t *outp = (audio_frame_float_t*)data->data_out; audio_frame_float_t *outp = (audio_frame_float_t*)data->data_out;
float b = min(data->ratio, 1.00); // cutoff frequency b = min(data->ratio, 1.00); // cutoff frequency
float ratio = 1.0 / data->ratio; ratio = 1.0 / data->ratio;
while (inp != inp_max) while (inp != inp_max)
{ {