From 87a69934f633c1b4fa19af1f8680e395d6ee4daa Mon Sep 17 00:00:00 2001 From: yellows8 Date: Tue, 6 Nov 2018 18:31:23 -0500 Subject: [PATCH] Added hwopus example. --- audio/hwopus-decoder/Makefile | 199 ++++++++++++++++++++ audio/hwopus-decoder/data/sample.opus | Bin 0 -> 16562 bytes audio/hwopus-decoder/source/main.c | 255 ++++++++++++++++++++++++++ 3 files changed, 454 insertions(+) create mode 100644 audio/hwopus-decoder/Makefile create mode 100644 audio/hwopus-decoder/data/sample.opus create mode 100644 audio/hwopus-decoder/source/main.c 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 0000000000000000000000000000000000000000..f3e341795d945157d9b95f929505d30b8180e263 GIT binary patch literal 16562 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 literal 0 HcmV?d00001 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; +}