mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-21 09:39:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move resampler drivers to audio/resamplers

Browse Source
This commit is contained in:
twinaphex 2014-09-09 21:54:41 +02:00
parent 07ee234d5d
commit 598421e7d7
15 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -40,10 +40,10 @@ OBJ = frontend/frontend.o \
gfx/scaler/scaler_filter.o \ gfx/scaler/scaler_filter.o \
gfx/image/image_rpng.o \ gfx/image/image_rpng.o \
gfx/fonts/fonts.o \ gfx/fonts/fonts.o \
audio/resampler.o \ audio/resamplers/resampler.o \
audio/dsp_filter.o \ audio/dsp_filter.o \
audio/sinc.o \ audio/resamplers/sinc.o \
audio/cc_resampler.o \ audio/resamplers/cc_resampler.o \
location/nulllocation.o \ location/nulllocation.o \
camera/nullcamera.o \ camera/nullcamera.o \
gfx/nullgfx.o \ gfx/nullgfx.o \
@ -452,7 +452,7 @@ ifeq ($(HAVE_XKBCOMMON), 1)
endif endif
ifeq ($(HAVE_NEON),1) ifeq ($(HAVE_NEON),1)
OBJ += audio/sinc_neon.o OBJ += audio/resamplers/sinc_neon.o
# When compiled without this, tries to attempt to compile sinc lerp, # When compiled without this, tries to attempt to compile sinc lerp,
# which will error out # which will error out
DEFINES += -DSINC_LOWER_QUALITY DEFINES += -DSINC_LOWER_QUALITY

6
Makefile.emscripten
View File

@ -45,9 +45,9 @@ OBJ = frontend/platform/platform_emscripten.o \
gfx/fonts/bitmapfont.o \ gfx/fonts/bitmapfont.o \
gfx/image/image_rpng.o \ gfx/image/image_rpng.o \
gfx/filter.o \ gfx/filter.o \
audio/resampler.o \ audio/resamplers/resampler.o \
audio/sinc.o \ audio/resamplers/sinc.o \
audio/cc_resampler.o \ audio/resamplers/cc_resampler.o \
audio/nullaudio.o \ audio/nullaudio.o \
performance.o \ performance.o \
core_info.o \ core_info.o \

2
Makefile.openpandora
View File

@ -10,7 +10,7 @@ TARGET := retroarch-pandora
LDDIRS = -L. -L$(PNDSDK)/usr/lib LDDIRS = -L. -L$(PNDSDK)/usr/lib
INCDIRS = -I. -I$(PNDSDK)/usr/include INCDIRS = -I. -I$(PNDSDK)/usr/include
OBJ = griffin/griffin.o audio/sinc_neon.o audio/utils_neon.o OBJ = griffin/griffin.o audio/resamplers/sinc_neon.o audio/utils_neon.o
LDFLAGS = -L$(PNDSDK)/usr/lib -Wl,-rpath,$(PNDSDK)/usr/lib LDFLAGS = -L$(PNDSDK)/usr/lib -Wl,-rpath,$(PNDSDK)/usr/lib
LIBS = -lGLESv2 -lEGL -ldl -lm -lpthread -lrt -lasound LIBS = -lGLESv2 -lEGL -ldl -lm -lpthread -lrt -lasound

6
Makefile.win
View File

@ -45,10 +45,10 @@ OBJ = frontend/frontend.o \
gfx/fonts/fonts.o \ gfx/fonts/fonts.o \
gfx/fonts/bitmapfont.o \ gfx/fonts/bitmapfont.o \
gfx/image/image_rpng.o \ gfx/image/image_rpng.o \
audio/resampler.o \ audio/resamplers/resampler.o \
audio/dsp_filter.o \ audio/dsp_filter.o \
audio/sinc.o \ audio/resamplers/sinc.o \
audio/cc_resampler.o \ audio/resamplers/cc_resampler.o \
location/nulllocation.o \ location/nulllocation.o \
camera/nullcamera.o \ camera/nullcamera.o \
gfx/nullgfx.o \ gfx/nullgfx.o \

2
audio/cc_resampler.c → audio/resamplers/cc_resampler.c
View File

@ -23,7 +23,7 @@
#include <stdio.h> #include <stdio.h>
#if !defined(RESAMPLER_TEST) && defined(RARCH_INTERNAL) #if !defined(RESAMPLER_TEST) && defined(RARCH_INTERNAL)
#include "../general.h" #include "../../general.h"
#else #else
#define RARCH_LOG(...) fprintf(stderr, __VA_ARGS__) #define RARCH_LOG(...) fprintf(stderr, __VA_ARGS__)
#endif #endif

4
audio/resampler.c → audio/resamplers/resampler.c
View File

@ -17,10 +17,10 @@
#include <string.h> #include <string.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "../config.h" #include "../../config.h"
#endif #endif
#include "../general.h" #include "../../general.h"
static const rarch_resampler_t *resampler_drivers[] = { static const rarch_resampler_t *resampler_drivers[] = {
&sinc_resampler, &sinc_resampler,

4
audio/resampler.h → audio/resamplers/resampler.h
View File

@ -18,13 +18,13 @@
#define __RARCH_RESAMPLER_H #define __RARCH_RESAMPLER_H
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "../config.h" #include "../../config.h"
#endif #endif
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include <math.h> #include <math.h>
#include "../boolean.h" #include "../../boolean.h"
#ifndef M_PI #ifndef M_PI
/* M_PI is left out of ISO C99 :( */ /* M_PI is left out of ISO C99 :( */

8
audio/sinc.c → audio/resamplers/sinc.c
View File

@ -16,17 +16,17 @@
// Bog-standard windowed SINC implementation. // Bog-standard windowed SINC implementation.
#include "resampler.h" #include "resampler.h"
#include "../libretro.h" #include "../../libretro.h"
#include "../performance.h" #include "../../performance.h"
#include <math.h> #include <math.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include "../msvc/msvc_compat.h" #include "../../msvc/msvc_compat.h"
#ifndef RESAMPLER_TEST #ifndef RESAMPLER_TEST
#include "../general.h" #include "../../general.h"
#else #else
#define RARCH_LOG(...) fprintf(stderr, __VA_ARGS__) #define RARCH_LOG(...) fprintf(stderr, __VA_ARGS__)
#endif #endif

0
audio/sinc_neon.S → audio/resamplers/sinc_neon.S
View File

1
driver.c
View File

@ -24,7 +24,6 @@
#include <math.h> #include <math.h>
#include "compat/posix_string.h" #include "compat/posix_string.h"
#include "audio/utils.h" #include "audio/utils.h"
#include "audio/resampler.h"
#include "gfx/thread_wrapper.h" #include "gfx/thread_wrapper.h"
#include "audio/thread_wrapper.h" #include "audio/thread_wrapper.h"
#include "gfx/gfx_common.h" #include "gfx/gfx_common.h"

2
general.h
View File

@ -82,7 +82,7 @@
#include "command.h" #include "command.h"
#endif #endif
#include "audio/resampler.h" #include "audio/resamplers/resampler.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

6
griffin/griffin.c
View File

@ -355,10 +355,10 @@ FIFO BUFFER
/*============================================================ /*============================================================
AUDIO RESAMPLER AUDIO RESAMPLER
============================================================ */ ============================================================ */
#include "../audio/resampler.c" #include "../audio/resamplers/resampler.c"
#include "../audio/sinc.c" #include "../audio/resamplers/sinc.c"
#ifdef HAVE_CC_RESAMPLER #ifdef HAVE_CC_RESAMPLER
#include "../audio/cc_resampler.c" #include "../audio/resamplers/cc_resampler.c"
#endif #endif
/*============================================================ /*============================================================

6
msvc/msvc-2010/RetroArch-msvc2010.vcxproj
View File

@ -185,12 +185,12 @@
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\audio\cc_resampler.c" /> <ClCompile Include="..\..\audio\resamplers\cc_resampler.c" />
<ClCompile Include="..\..\audio\dsound.c"> <ClCompile Include="..\..\audio\dsound.c">
</ClCompile> </ClCompile>
<ClCompile Include="..\..\audio\dsp_filter.c" /> <ClCompile Include="..\..\audio\dsp_filter.c" />
<ClCompile Include="..\..\audio\resampler.c" /> <ClCompile Include="..\..\audio\resamplers\resampler.c" />
<ClCompile Include="..\..\audio\sinc.c" /> <ClCompile Include="..\..\audio\resamplers\sinc.c" />
<ClCompile Include="..\..\audio\thread_wrapper.c" /> <ClCompile Include="..\..\audio\thread_wrapper.c" />
<ClCompile Include="..\..\audio\utils.c"> <ClCompile Include="..\..\audio\utils.c">
</ClCompile> </ClCompile>

6
msvc/msvc-2010/RetroArch-msvc2010.vcxproj.filters
View File

@ -48,13 +48,13 @@
<ClCompile Include="..\..\gfx\glsym\glsym_gl.c"> <ClCompile Include="..\..\gfx\glsym\glsym_gl.c">
<Filter>gfx\glsym</Filter> <Filter>gfx\glsym</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\audio\sinc.c"> <ClCompile Include="..\..\audio\resamplers\sinc.c">
<Filter>audio</Filter> <Filter>audio</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\audio\utils.c"> <ClCompile Include="..\..\audio\utils.c">
<Filter>audio</Filter> <Filter>audio</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\audio\resampler.c"> <ClCompile Include="..\..\audio\resamplers\resampler.c">
<Filter>audio</Filter> <Filter>audio</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\gfx\math\matrix.c"> <ClCompile Include="..\..\gfx\math\matrix.c">
@ -231,7 +231,7 @@
<ClCompile Include="..\..\gfx\filter.c"> <ClCompile Include="..\..\gfx\filter.c">
<Filter>gfx</Filter> <Filter>gfx</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\audio\cc_resampler.c"> <ClCompile Include="..\..\audio\resamplers\cc_resampler.c">
<Filter>audio</Filter> <Filter>audio</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\frontend\menu\backend\menu_common_backend.c"> <ClCompile Include="..\..\frontend\menu\backend\menu_common_backend.c">

1
record/ffmpeg.c
View File

@ -49,7 +49,6 @@ extern "C" {
#include "../gfx/scaler/scaler.h" #include "../gfx/scaler/scaler.h"
#include "../conf/config_file.h" #include "../conf/config_file.h"
#include "../audio/utils.h" #include "../audio/utils.h"
#include "../audio/resampler.h"
#include "ffemu.h" #include "ffemu.h"
#include <assert.h> #include <assert.h>