Add 'nearest' resampler

This commit is contained in:
twinaphex 2014-09-13 00:10:15 +02:00
parent 61b5e099e7
commit d4a4dd14bf
10 changed files with 89 additions and 5 deletions

View File

@ -43,6 +43,7 @@ OBJ = frontend/frontend.o \
audio/resamplers/resampler.o \
audio/dsp_filter.o \
audio/resamplers/sinc.o \
audio/resamplers/nearest.o \
audio/resamplers/cc_resampler.o \
location/nulllocation.o \
camera/nullcamera.o \

View File

@ -47,6 +47,7 @@ OBJ = frontend/platform/platform_emscripten.o \
gfx/filter.o \
audio/resamplers/resampler.o \
audio/resamplers/sinc.o \
audio/resamplers/nearest.o \
audio/resamplers/cc_resampler.o \
audio/nullaudio.o \
performance.o \

View File

@ -48,6 +48,7 @@ OBJ = frontend/frontend.o \
audio/resamplers/resampler.o \
audio/dsp_filter.o \
audio/resamplers/sinc.o \
audio/resamplers/nearest.o \
audio/resamplers/cc_resampler.o \
location/nulllocation.o \
camera/nullcamera.o \

View File

@ -320,7 +320,7 @@ static void *resampler_CC_init(double bandwidth_mod)
}
#endif
const rarch_resampler_t CC_resampler = {
rarch_resampler_t CC_resampler = {
resampler_CC_init,
resampler_CC_process,
resampler_CC_free,

View File

@ -0,0 +1,78 @@
#include "resampler.h"
#include "../../libretro.h"
#include "../../performance.h"
#include <math.h>
#include <stdint.h>
#include <stdlib.h>
#include <stdio.h>
#ifndef RESAMPLER_TEST
#include "../../general.h"
#else
#define RARCH_LOG(...) fprintf(stderr, __VA_ARGS__)
#endif
typedef struct rarch_nearest_resampler
{
float fraction;
}rarch_nearest_resampler_t;
static void resampler_nearest_process(void *re_, struct resampler_data *data)
{
(void)re_;
float ratio;
rarch_nearest_resampler_t *re = (rarch_nearest_resampler_t*)re_;
typedef struct audio_frame_float
{
float l;
float r;
}audio_frame_float_t;
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 *outp = (audio_frame_float_t*)data->data_out;
ratio = 1.0/data->ratio;
while(inp!=inp_max){
while(re->fraction>1){
*outp++=*inp;
re->fraction-=ratio;
}
re->fraction++;
inp++;
}
data->output_frames = (outp - (audio_frame_float_t*)data->data_out);
}
static void resampler_nearest_free(void *re_)
{
rarch_nearest_resampler_t *re = (rarch_nearest_resampler_t*)re_;
if (re)
free(re);
}
static void *resampler_nearest_init(double bandwidth_mod)
{
rarch_nearest_resampler_t *re = (rarch_nearest_resampler_t*)calloc(1, sizeof(rarch_nearest_resampler_t));
if (!re)
return NULL;
re->fraction = 0;
RARCH_LOG("\nNearest resampler : \n");
return re;
}
rarch_resampler_t nearest_resampler = {
resampler_nearest_init,
resampler_nearest_process,
resampler_nearest_free,
"nearest",
};

View File

@ -27,6 +27,7 @@ static const rarch_resampler_t *resampler_drivers[] = {
#ifdef HAVE_CC_RESAMPLER
&CC_resampler,
#endif
&nearest_resampler,
NULL,
};
@ -107,4 +108,3 @@ bool rarch_resampler_realloc(void **re, const rarch_resampler_t **backend,
return true;
}

View File

@ -52,8 +52,9 @@ typedef struct rarch_resampler
const char *ident;
} rarch_resampler_t;
extern const rarch_resampler_t sinc_resampler;
extern const rarch_resampler_t CC_resampler;
extern rarch_resampler_t sinc_resampler;
extern rarch_resampler_t CC_resampler;
extern rarch_resampler_t nearest_resampler;
/* Reallocs resampler. Will free previous handle before
* allocating a new one. If ident is NULL, first resampler will be used. */

View File

@ -541,7 +541,7 @@ error:
return NULL;
}
const rarch_resampler_t sinc_resampler = {
rarch_resampler_t sinc_resampler = {
resampler_sinc_new,
resampler_sinc_process,
resampler_sinc_free,

View File

@ -363,6 +363,7 @@ AUDIO RESAMPLER
============================================================ */
#include "../audio/resamplers/resampler.c"
#include "../audio/resamplers/sinc.c"
#include "../audio/resamplers/nearest.c"
#ifdef HAVE_CC_RESAMPLER
#include "../audio/resamplers/cc_resampler.c"
#endif

View File

@ -191,6 +191,7 @@
<ClCompile Include="..\..\audio\dsp_filter.c" />
<ClCompile Include="..\..\audio\resamplers\resampler.c" />
<ClCompile Include="..\..\audio\resamplers\sinc.c" />
<ClCompile Include="..\..\audio\resamplers\nearest.c" />
<ClCompile Include="..\..\audio\thread_wrapper.c" />
<ClCompile Include="..\..\audio\utils.c">
</ClCompile>