diff --git a/audio/hwopus-decoder/Makefile b/audio/hwopus-decoder/Makefile new file mode 100644 index 0000000..773d701 --- /dev/null +++ b/audio/hwopus-decoder/Makefile @@ -0,0 +1,199 @@ +#--------------------------------------------------------------------------------- +.SUFFIXES: +#--------------------------------------------------------------------------------- + +ifeq ($(strip $(DEVKITPRO)),) +$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=/devkitpro") +endif + +TOPDIR ?= $(CURDIR) +include $(DEVKITPRO)/libnx/switch_rules + +#--------------------------------------------------------------------------------- +# TARGET is the name of the output +# BUILD is the directory where object files & intermediate files will be placed +# SOURCES is a list of directories containing source code +# DATA is a list of directories containing data files +# INCLUDES is a list of directories containing header files +# EXEFS_SRC is the optional input directory containing data copied into exefs, if anything this normally should only contain "main.npdm". +# ROMFS is the directory containing data to be added to RomFS, relative to the Makefile (Optional) +# +# NO_ICON: if set to anything, do not use icon. +# NO_NACP: if set to anything, no .nacp file is generated. +# APP_TITLE is the name of the app stored in the .nacp file (Optional) +# APP_AUTHOR is the author of the app stored in the .nacp file (Optional) +# APP_VERSION is the version of the app stored in the .nacp file (Optional) +# APP_TITLEID is the titleID of the app stored in the .nacp file (Optional) +# ICON is the filename of the icon (.jpg), relative to the project folder. +# If not set, it attempts to use one of the following (in this order): +# - .jpg +# - icon.jpg +# - /default_icon.jpg +#--------------------------------------------------------------------------------- +TARGET := $(notdir $(CURDIR)) +BUILD := build +SOURCES := source +DATA := data +INCLUDES := include +EXEFS_SRC := exefs_src +#ROMFS := romfs + +#--------------------------------------------------------------------------------- +# options for code generation +#--------------------------------------------------------------------------------- +ARCH := -march=armv8-a -mtune=cortex-a57 -mtp=soft -fPIE + +CFLAGS := -g -Wall -O2 -ffunction-sections -save-temps \ + $(ARCH) $(DEFINES) + +CFLAGS += $(INCLUDE) -D__SWITCH__ `aarch64-none-elf-pkg-config --cflags opusfile` + +CXXFLAGS := $(CFLAGS) -fno-rtti -fno-exceptions + +ASFLAGS := -g $(ARCH) +LDFLAGS = -specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map) + +LIBS := -lnx `aarch64-none-elf-pkg-config --libs opusfile` + +#--------------------------------------------------------------------------------- +# list of directories containing libraries, this must be the top level containing +# include and lib +#--------------------------------------------------------------------------------- +LIBDIRS := $(PORTLIBS) $(LIBNX) + + +#--------------------------------------------------------------------------------- +# no real need to edit anything past this point unless you need to add additional +# rules for different file extensions +#--------------------------------------------------------------------------------- +ifneq ($(BUILD),$(notdir $(CURDIR))) +#--------------------------------------------------------------------------------- + +export OUTPUT := $(CURDIR)/$(TARGET) +export TOPDIR := $(CURDIR) + +export VPATH := $(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \ + $(foreach dir,$(DATA),$(CURDIR)/$(dir)) + +export DEPSDIR := $(CURDIR)/$(BUILD) + +CFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c))) +CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp))) +SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s))) +BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*))) + +#--------------------------------------------------------------------------------- +# use CXX for linking C++ projects, CC for standard C +#--------------------------------------------------------------------------------- +ifeq ($(strip $(CPPFILES)),) +#--------------------------------------------------------------------------------- + export LD := $(CC) +#--------------------------------------------------------------------------------- +else +#--------------------------------------------------------------------------------- + export LD := $(CXX) +#--------------------------------------------------------------------------------- +endif +#--------------------------------------------------------------------------------- + +export OFILES_BIN := $(addsuffix .o,$(BINFILES)) +export OFILES_SRC := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o) +export OFILES := $(OFILES_BIN) $(OFILES_SRC) +export HFILES_BIN := $(addsuffix .h,$(subst .,_,$(BINFILES))) + +export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \ + $(foreach dir,$(LIBDIRS),-I$(dir)/include) \ + -I$(CURDIR)/$(BUILD) + +export LIBPATHS := $(foreach dir,$(LIBDIRS),-L$(dir)/lib) + +export BUILD_EXEFS_SRC := $(TOPDIR)/$(EXEFS_SRC) + +ifeq ($(strip $(ICON)),) + icons := $(wildcard *.jpg) + ifneq (,$(findstring $(TARGET).jpg,$(icons))) + export APP_ICON := $(TOPDIR)/$(TARGET).jpg + else + ifneq (,$(findstring icon.jpg,$(icons))) + export APP_ICON := $(TOPDIR)/icon.jpg + endif + endif +else + export APP_ICON := $(TOPDIR)/$(ICON) +endif + +ifeq ($(strip $(NO_ICON)),) + export NROFLAGS += --icon=$(APP_ICON) +endif + +ifeq ($(strip $(NO_NACP)),) + export NROFLAGS += --nacp=$(CURDIR)/$(TARGET).nacp +endif + +ifneq ($(APP_TITLEID),) + export NACPFLAGS += --titleid=$(APP_TITLEID) +endif + +ifneq ($(ROMFS),) + export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS) +endif + +.PHONY: $(BUILD) clean all + +#--------------------------------------------------------------------------------- +all: $(BUILD) + +$(BUILD): + @[ -d $@ ] || mkdir -p $@ + @$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile + +#--------------------------------------------------------------------------------- +clean: + @echo clean ... + @rm -fr $(BUILD) $(TARGET).pfs0 $(TARGET).nso $(TARGET).nro $(TARGET).nacp $(TARGET).elf + + +#--------------------------------------------------------------------------------- +else +.PHONY: all + +DEPENDS := $(OFILES:.o=.d) + +#--------------------------------------------------------------------------------- +# main targets +#--------------------------------------------------------------------------------- +all : $(OUTPUT).pfs0 $(OUTPUT).nro + +$(OUTPUT).pfs0 : $(OUTPUT).nso + +$(OUTPUT).nso : $(OUTPUT).elf + +ifeq ($(strip $(NO_NACP)),) +$(OUTPUT).nro : $(OUTPUT).elf $(OUTPUT).nacp +else +$(OUTPUT).nro : $(OUTPUT).elf +endif + +$(OUTPUT).elf : $(OFILES) + +$(OFILES_SRC) : $(HFILES_BIN) + +#--------------------------------------------------------------------------------- +# you need a rule like this for each extension you use as binary data +#--------------------------------------------------------------------------------- +%.bin.o %_bin.h : %.bin +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + @$(bin2o) + +#--------------------------------------------------------------------------------- +%.opus.o %_opus.h : %.opus +#--------------------------------------------------------------------------------- + @echo $(notdir $<) + @$(bin2o) + +-include $(DEPENDS) + +#--------------------------------------------------------------------------------------- +endif +#--------------------------------------------------------------------------------------- diff --git a/audio/hwopus-decoder/data/sample.opus b/audio/hwopus-decoder/data/sample.opus new file mode 100644 index 0000000..f3e3417 Binary files /dev/null and b/audio/hwopus-decoder/data/sample.opus differ diff --git a/audio/hwopus-decoder/source/main.c b/audio/hwopus-decoder/source/main.c new file mode 100644 index 0000000..f89de68 --- /dev/null +++ b/audio/hwopus-decoder/source/main.c @@ -0,0 +1,255 @@ +#include +#include +#include +#include +#include +#include +#include + +#include "sample_opus.h" + +// Sample comes from this website: +// https://www.soundjay.com/magic-sound-effect.html + +//Example for playing audio decoded with hwopus using audren. This decodes Opus in hardware. For encoding this is not available with hwopus, hence that has to be done in software. +//Requires package switch-opusfile. +//This uses libopusfile, see also the docs for that. +//Note that actual apps should handle audio on a dedicated thread. + +static size_t opuspkt_tmpbuf_size = sizeof(HwopusHeader) + 4096*48; +static u8* opuspkt_tmpbuf; + +int hw_decode(void *_ctx, OpusMSDecoder *_decoder, void *_pcm, const ogg_packet *_op, int _nsamples, int _nchannels, int _format, int _li) { + HwopusDecoder *decoder = (HwopusDecoder*)_ctx; + HwopusHeader *hdr = NULL; + size_t pktsize, pktsize_extra; + + Result rc = 0; + s32 DecodedDataSize = 0; + s32 DecodedSampleCount = 0; + + if (_format != OP_DEC_FORMAT_SHORT) return OPUS_BAD_ARG; + + pktsize = _op->bytes;//Opus packet size. + pktsize_extra = pktsize+8;//Packet size with HwopusHeader. + + if (pktsize_extra > opuspkt_tmpbuf_size) return OPUS_INTERNAL_ERROR; + + hdr = (HwopusHeader*)opuspkt_tmpbuf; + memset(opuspkt_tmpbuf, 0, pktsize_extra); + + hdr->size = __builtin_bswap32(pktsize); + memcpy(&opuspkt_tmpbuf[sizeof(HwopusHeader)], _op->packet, pktsize); + + rc = hwopusDecodeInterleaved(decoder, &DecodedDataSize, &DecodedSampleCount, opuspkt_tmpbuf, pktsize_extra, _pcm, _nsamples * _nchannels * sizeof(opus_int16)); + + if (R_FAILED(rc)) return OPUS_INTERNAL_ERROR; + if (DecodedDataSize != pktsize_extra || DecodedSampleCount != _nsamples) return OPUS_INVALID_PACKET; + + return 0; +} + +int main(void) +{ + consoleInit(NULL); + + printf("Simple hwopus-decoder example with audren\n"); + + static const AudioRendererConfig arConfig = + { + .output_rate = AudioRendererOutputRate_48kHz, + .num_voices = 24, + .num_effects = 0, + .num_sinks = 1, + .num_mix_objs = 1, + .num_mix_buffers = 2, + }; + + size_t num_channels = 1; + size_t samplerate = 48000; + size_t max_samples = samplerate; + size_t max_samples_datasize = max_samples*num_channels*sizeof(opus_int16); + size_t mempool_size = (max_samples_datasize*2 + 0xFFF) &~ 0xFFF;//*2 for 2 wavebufs. + void* mempool_ptr = memalign(0x1000, mempool_size); + void* tmpdata_ptr = malloc(max_samples_datasize); + opuspkt_tmpbuf = (u8*)malloc(opuspkt_tmpbuf_size); + opus_int16* curbuf = NULL; + + AudioDriverWaveBuf wavebuf[2] = {0}; + int i, wavei; + + HwopusDecoder hwdecoder = {0}; + + AudioDriver drv; + Result res=0; + bool initedDriver = false; + bool initedAudren = false; + bool audio_playing = false; + + int opret=0; + int total_samples_size=0; + OggOpusFile *of = NULL; + + if (mempool_ptr) memset(mempool_ptr, 0, mempool_size); + if (tmpdata_ptr) memset(tmpdata_ptr, 0, max_samples_datasize); + if (opuspkt_tmpbuf) memset(opuspkt_tmpbuf, 0, opuspkt_tmpbuf_size); + + if (mempool_ptr==NULL || tmpdata_ptr==NULL || opuspkt_tmpbuf==NULL) { + res = 1; + printf("Failed to allocate memory.\n"); + } + + if (R_SUCCEEDED(res)) { + res = hwopusDecoderInitialize(&hwdecoder, samplerate, num_channels);//This assumes that the opus file is with . + if (R_FAILED(res)) + printf("hwopusDecoderInitialize: %08" PRIx32 "\n", res); + else + { + res = audrenInitialize(&arConfig); + initedAudren = R_SUCCEEDED(res); + if (!initedAudren) + printf("audrenInitialize: %08" PRIx32 "\n", res); + else + { + printf("audren initted!\n"); + res = audrvCreate(&drv, &arConfig, 2); + initedDriver = R_SUCCEEDED(res); + if (R_FAILED(res)) + printf("audrvCreate: %08" PRIx32 "\n", res); + else + { + int mpid = audrvMemPoolAdd(&drv, mempool_ptr, mempool_size); + audrvMemPoolAttach(&drv, mpid); + + static const u8 sink_channels[] = { 0, 1 }; + int sink = audrvDeviceSinkAdd(&drv, AUDREN_DEFAULT_DEVICE_NAME, 2, sink_channels); + + res = audrvUpdate(&drv); + printf("audrvUpdate: %" PRIx32 "\n", res); + + res = audrenStartAudioRenderer(); + printf("audrenStartAudioRenderer: %" PRIx32 "\n", res); + + audrvVoiceInit(&drv, 0, num_channels, PcmFormat_Int16, samplerate); + audrvVoiceSetDestinationMix(&drv, 0, AUDREN_FINAL_MIX_ID); + if (num_channels == 1) {//mono + audrvVoiceSetMixFactor(&drv, 0, 1.0f, 0, 0); + audrvVoiceSetMixFactor(&drv, 0, 1.0f, 0, 1); + } + else {//stereo + audrvVoiceSetMixFactor(&drv, 0, 1.0f, 0, 0); + audrvVoiceSetMixFactor(&drv, 0, 0.0f, 0, 1); + audrvVoiceSetMixFactor(&drv, 0, 0.0f, 1, 0); + audrvVoiceSetMixFactor(&drv, 0, 1.0f, 1, 1); + } + audrvVoiceStart(&drv, 0); + + for(i=0; i<2; i++) { + wavebuf[i].data_raw = mempool_ptr; + wavebuf[i].size = max_samples_datasize*2;//*2 for 2 wavebufs. + wavebuf[i].start_sample_offset = i * max_samples; + wavebuf[i].end_sample_offset = wavebuf[i].start_sample_offset + max_samples; + } + } + } + } + } + + if (initedDriver) + printf("done. Press A to play a sound.\n"); + else + printf("Init failed.\n"); + + // Main loop + while (appletMainLoop()) + { + hidScanInput(); + + u64 kDown = hidKeysDown(CONTROLLER_P1_AUTO); + + if (kDown & KEY_PLUS) + break; + + if (initedDriver) + { + if (kDown & KEY_A) + { + //Close the opus-file if needed and (re)open it, since libopusfile doesn't support seek-to-beginning. + if (of) + op_free(of); + of = op_open_memory (sample_opus, sample_opus_size, NULL); + if (of == NULL) { + printf("Failed to open OggOpusFile.\n"); + } + else { + op_set_decode_callback(of, hw_decode, &hwdecoder); + + audrvVoiceStop(&drv, 0); + audio_playing = true; + } + } + + if (audio_playing) { + wavei = -1; + for(i=0; i<2; i++) { + if (wavebuf[i].state == AudioDriverWaveBufState_Free || wavebuf[i].state == AudioDriverWaveBufState_Done) { + wavei = i; + break; + } + } + + if (wavei >= 0) { + curbuf = (opus_int16*)(mempool_ptr + wavebuf[wavei].start_sample_offset); + + opret = op_read(of, tmpdata_ptr, max_samples * num_channels, NULL);//The buffer used here has to be seperate from mempool_ptr. + if (opret < 0) + printf("op_read() failed: %d\n", opret); + else if (opret == 0) {//End of file reached (see also libopusfile docs). + audio_playing = false; + + if (of) + op_free(of); + of = NULL; + } + else { + if (opret > max_samples) opret = max_samples;//Should never happen. + total_samples_size = opret*sizeof(opus_int16);//Total samples data-size per channel. + memcpy(curbuf, tmpdata_ptr, total_samples_size); + armDCacheFlush(curbuf, total_samples_size); + + wavebuf[wavei].end_sample_offset = wavebuf[wavei].start_sample_offset + total_samples_size/sizeof(opus_int16); + + audrvVoiceAddWaveBuf(&drv, 0, &wavebuf[wavei]); + } + } + else { + if (!audrvVoiceIsPlaying(&drv, 0)) + audrvVoiceStart(&drv, 0); + } + } + + res = audrvUpdate(&drv); + if (R_FAILED(res)) + printf("audrvUpdate: %" PRIx32 "\n", res); + if (audrvVoiceIsPlaying(&drv, 0)) + printf("sample count = %" PRIu32 "\n", audrvVoiceGetPlayedSampleCount(&drv, 0)); + } + + consoleUpdate(NULL); + } + + hwopusDecoderExit(&hwdecoder); + if (of) + op_free(of); + if (initedDriver) + audrvClose(&drv); + if (initedAudren) + audrenExit(); + + free(mempool_ptr); + free(tmpdata_ptr); + free(opuspkt_tmpbuf); + + consoleExit(NULL); + return 0; +}