diff --git a/Makefile.common b/Makefile.common index bf69258fe6..ec18336cb2 100644 --- a/Makefile.common +++ b/Makefile.common @@ -140,11 +140,11 @@ OBJ += frontend/frontend.o \ gfx/image/image_rpng.o \ gfx/fonts/fonts.o \ gfx/video_filter.o \ - audio/resamplers/resampler.o \ + audio/audio_resampler_driver.o \ audio/dsp_filter.o \ - audio/resamplers/sinc.o \ - audio/resamplers/nearest.o \ - audio/resamplers/cc_resampler.o \ + audio/drivers_resampler/sinc.o \ + audio/drivers_resampler/nearest.o \ + audio/drivers_resampler/cc_resampler.o \ location/drivers/nulllocation.o \ camera/drivers/nullcamera.o \ gfx/drivers/nullgfx.o \ @@ -257,8 +257,8 @@ endif # Audio Resamplers ifeq ($(HAVE_NEON),1) - OBJ += audio/resamplers/sinc_neon.o - OBJ += audio/resamplers/cc_resampler_neon.o + OBJ += audio/drivers_resampler/sinc_neon.o + OBJ += audio/drivers_resampler/cc_resampler_neon.o # When compiled without this, tries to attempt to compile sinc lerp, # which will error out # diff --git a/android/phoenix/jni/Android.mk b/android/phoenix/jni/Android.mk index c6a2607c8d..17a9fdb258 100644 --- a/android/phoenix/jni/Android.mk +++ b/android/phoenix/jni/Android.mk @@ -29,8 +29,8 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) ifeq ($(HAVE_NEON),1) LOCAL_CFLAGS += -D__ARM_NEON__ LOCAL_SRC_FILES += $(RARCH_DIR)/audio/utils_neon.S.neon - LOCAL_SRC_FILES += $(RARCH_DIR)/audio/resamplers/sinc_neon.S.neon - LOCAL_SRC_FILES += $(RARCH_DIR)/audio/resamplers/cc_resampler_neon.S.neon + LOCAL_SRC_FILES += $(RARCH_DIR)/audio/drivers_resampler/sinc_neon.S.neon + LOCAL_SRC_FILES += $(RARCH_DIR)/audio/drivers_resampler/cc_resampler_neon.S.neon endif LOCAL_CFLAGS += -DSINC_LOWER_QUALITY diff --git a/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj b/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj index bbf1d7f6f7..59a40adb8f 100644 --- a/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj +++ b/apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj @@ -42,7 +42,7 @@ /* Begin PBXFileReference section */ 501232C7192E5FB00063A359 /* apple_gamecontroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = apple_gamecontroller.m; path = ../common/apple_gamecontroller.m; sourceTree = ""; }; 501232C9192E5FC40063A359 /* griffin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = griffin.c; path = ../../griffin/griffin.c; sourceTree = ""; }; - 501232CB192E5FDC0063A359 /* sinc_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = sinc_neon.S; path = ../../audio/resamplers/sinc_neon.S; sourceTree = ""; }; + 501232CB192E5FDC0063A359 /* sinc_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = sinc_neon.S; path = ../../audio/drivers_resampler/sinc_neon.S; sourceTree = ""; }; 501232CD192E5FE30063A359 /* utils_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; name = utils_neon.S; path = ../../audio/utils_neon.S; sourceTree = ""; }; 501232D5192E60580063A359 /* platform.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = platform.m; sourceTree = ""; }; 501232D7192E605F0063A359 /* browser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = browser.m; sourceTree = ""; }; @@ -52,7 +52,7 @@ 5073C587196C0BA40026E146 /* RAGameView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAGameView.m; path = ../common/RAGameView.m; sourceTree = SOURCE_ROOT; }; 5073C588196C0BA40026E146 /* utility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = utility.m; path = ../common/utility.m; sourceTree = SOURCE_ROOT; }; 50CCC827185E0E7D001F5BC8 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; - 50D00E8D19D117C400EBA71E /* cc_resampler_neon.S */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; name = cc_resampler_neon.S; path = ../../audio/resamplers/cc_resampler_neon.S; sourceTree = ""; }; + 50D00E8D19D117C400EBA71E /* cc_resampler_neon.S */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; name = cc_resampler_neon.S; path = ../../audio/drivers_resampler/cc_resampler_neon.S; sourceTree = ""; }; 50E7189E184B88AA001956CE /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; }; 6949E72219FABADC00CC7F42 /* CFExtensions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = CFExtensions.m; path = ../common/CFExtensions.m; sourceTree = ""; }; 696012F119F3389A006A1088 /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; }; diff --git a/audio/resamplers/resampler.c b/audio/audio_resampler_driver.c similarity index 98% rename from audio/resamplers/resampler.c rename to audio/audio_resampler_driver.c index 7118a70b44..22ecd00687 100644 --- a/audio/resamplers/resampler.c +++ b/audio/audio_resampler_driver.c @@ -14,9 +14,9 @@ * If not, see . */ -#include "resampler.h" +#include "audio_resampler_driver.h" #ifdef RARCH_INTERNAL -#include "../../performance.h" +#include "../performance.h" #endif #include #include diff --git a/audio/resamplers/resampler.h b/audio/audio_resampler_driver.h similarity index 98% rename from audio/resamplers/resampler.h rename to audio/audio_resampler_driver.h index 8d376a4cb8..ad88d9a372 100644 --- a/audio/resamplers/resampler.h +++ b/audio/audio_resampler_driver.h @@ -15,8 +15,8 @@ */ -#ifndef __RARCH_RESAMPLER_H -#define __RARCH_RESAMPLER_H +#ifndef __AUDIO_RESAMPLER_DRIVER_H +#define __AUDIO_RESAMPLER_DRIVER_H #ifdef __cplusplus extern "C" { diff --git a/audio/resamplers/cc_resampler.c b/audio/drivers_resampler/cc_resampler.c similarity index 99% rename from audio/resamplers/cc_resampler.c rename to audio/drivers_resampler/cc_resampler.c index 65d71f042d..bc1eb991a2 100644 --- a/audio/resamplers/cc_resampler.c +++ b/audio/drivers_resampler/cc_resampler.c @@ -15,10 +15,13 @@ /* Convoluted Cosine Resampler */ -#include "resampler.h" +#include "../audio_resampler_driver.h" #include #include #include +#ifdef __SSE__ +#include +#endif #if !defined(RESAMPLER_TEST) && defined(RARCH_INTERNAL) #include "../../general.h" @@ -212,9 +215,6 @@ static void *resampler_CC_init(const struct resampler_config *config, #if defined(__SSE__) - -#include - #define CC_RESAMPLER_IDENT "SSE" static void resampler_CC_downsample(void *re_, struct resampler_data *data) diff --git a/audio/resamplers/cc_resampler_neon.S b/audio/drivers_resampler/cc_resampler_neon.S similarity index 100% rename from audio/resamplers/cc_resampler_neon.S rename to audio/drivers_resampler/cc_resampler_neon.S diff --git a/audio/resamplers/nearest.c b/audio/drivers_resampler/nearest.c similarity index 98% rename from audio/resamplers/nearest.c rename to audio/drivers_resampler/nearest.c index 8664518302..2166d2374a 100644 --- a/audio/resamplers/nearest.c +++ b/audio/drivers_resampler/nearest.c @@ -13,7 +13,7 @@ * If not, see . */ -#include "resampler.h" +#include "../audio_resampler_driver.h" #include #include #include diff --git a/audio/resamplers/sinc.c b/audio/drivers_resampler/sinc.c similarity index 99% rename from audio/resamplers/sinc.c rename to audio/drivers_resampler/sinc.c index faac11b66e..456478b238 100644 --- a/audio/resamplers/sinc.c +++ b/audio/drivers_resampler/sinc.c @@ -15,7 +15,7 @@ /* Bog-standard windowed SINC implementation. */ -#include "resampler.h" +#include "../audio_resampler_driver.h" #include #include #include diff --git a/audio/resamplers/sinc_neon.S b/audio/drivers_resampler/sinc_neon.S similarity index 100% rename from audio/resamplers/sinc_neon.S rename to audio/drivers_resampler/sinc_neon.S diff --git a/driver.h b/driver.h index 3574a65666..9e88866a3e 100644 --- a/driver.h +++ b/driver.h @@ -34,7 +34,7 @@ #include "osk/osk_driver.h" #include "camera/camera_driver.h" #include "location/location_driver.h" -#include "audio/resamplers/resampler.h" +#include "audio/audio_resampler_driver.h" #include "record/record_driver.h" #include "retro.h" diff --git a/griffin/griffin.c b/griffin/griffin.c index fe1e54a951..961e31ce6a 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -409,10 +409,10 @@ FIFO BUFFER /*============================================================ AUDIO RESAMPLER ============================================================ */ -#include "../audio/resamplers/resampler.c" -#include "../audio/resamplers/sinc.c" -#include "../audio/resamplers/nearest.c" -#include "../audio/resamplers/cc_resampler.c" +#include "../audio/audio_resampler_driver.c" +#include "../audio/drivers_resampler/sinc.c" +#include "../audio/drivers_resampler/nearest.c" +#include "../audio/drivers_resampler/cc_resampler.c" /*============================================================ CAMERA