Sound enhancements

masterfeizz · masterfeizz · commit a8b05505dc99 · 2016-03-22T07:47:45.000+08:00
diff --git a/README.md b/README.md
@@ -15,12 +15,11 @@ To use mods: place mod folder in the same directory as ctrQuake.3dsx and create
 - [ ] Better input handling
 - [ ] Networking
 - [ ] Hardware rendering
-- [ ] Better sound processing
+- [x] Better sound processing ( Thanks to Rinnegatamante )
 
 ## Credits
 Felipe Izzo (MasterFeizz) - Main developer
-
-Rinnegatamante - Brightness fix
+Rinnegatamante - Sound enhancements
 ## Thanks to
 Id Software - Source code of Quake
 
diff --git a/banner.bnr b/banner.bnr
diff --git a/cia.rsf b/cia.rsf
@@ -0,0 +1,196 @@
+# COPIED FROM RINNEGATAMANTE
+BasicInfo:
+  Title                   : "ctrQuake"
+  CompanyCode             : "00"
+  ProductCode             : "CTR-P-QUAK"
+  ContentType             : Application
+  Logo                    : Nintendo # Nintendo / Licensed / Distributed / iQue / iQueForSystem
+
+TitleInfo:
+  UniqueId                : 0xFF123
+  Category                : Application
+  
+CardInfo:
+  MediaSize               : 128MB # 128MB / 256MB / 512MB / 1GB / 2GB / 4GB
+  MediaType               : Card1 # Card1 / Card2
+  CardDevice              : NorFlash # NorFlash(Pick this if you use savedata) / None
+  
+
+Option:
+  UseOnSD                : true # true if App is to be installed to SD
+  FreeProductCode         : true # Removes limitations on ProductCode
+  MediaFootPadding        : false # If true CCI files are created with padding
+  EnableCrypt             : false # Enables encryption for NCCH and CIA
+  EnableCompress          : true # Compresses exefs code
+  
+AccessControlInfo:
+  #UseExtSaveData : true
+  #ExtSaveDataId: 0xff3ff
+  #UseExtendedSaveDataAccessControl: true
+  #AccessibleSaveDataIds: [0x101, 0x202, 0x303, 0x404, 0x505, 0x606]
+
+SystemControlInfo:
+  SaveDataSize: 128KB
+  RemasterVersion: 0
+  StackSize: 0x40000
+  
+# DO NOT EDIT BELOW HERE OR PROGRAMS WILL NOT LAUNCH (most likely)
+
+AccessControlInfo:
+  FileSystemAccess:
+   - Debug
+   - DirectSdmc
+   - DirectSdmcWrite
+   
+  IdealProcessor                : 0
+  AffinityMask                  : 1
+  
+  Priority                      : 16
+   
+  MaxCpu                        : 0x9E # Default
+  DisableDebug                  : false
+  EnableForceDebug              : false
+  CanWriteSharedPage            : false
+  CanUsePrivilegedPriority      : false
+  CanUseNonAlphabetAndNumber    : false
+  PermitMainFunctionArgument    : false
+  CanShareDeviceMemory          : false
+  RunnableOnSleep               : false
+  SpecialMemoryArrange          : false
+  CoreVersion                   : 2
+  DescVersion                   : 2
+  
+  ReleaseKernelMajor            : "02"
+  ReleaseKernelMinor            : "33" 
+  MemoryType                    : Application
+  HandleTableSize: 512
+  
+  SystemModeExt                 : Legacy # Legacy(Default)/124MB/178MB  Legacy:Use Old3DS SystemMode
+  CpuSpeed                      : 804MHz # 268MHz(Default)/804MHz
+  EnableL2Cache                 : true # false(default)/true
+  CanAccessCore2                : true 
+  
+  IORegisterMapping: 
+   - 1ff50000-1ff57fff
+   - 1ff70000-1ff77fff
+  MemoryMapping: 
+   - 1f000000-1f5fffff:r
+  SystemCallAccess: 
+    ArbitrateAddress: 34
+    Break: 60
+    CancelTimer: 28
+    ClearEvent: 25
+    ClearTimer: 29
+    CloseHandle: 35
+    ConnectToPort: 45
+    ControlMemory: 1
+    CreateAddressArbiter: 33
+    CreateEvent: 23
+    CreateMemoryBlock: 30
+    CreateMutex: 19
+    CreateSemaphore: 21
+    CreateThread: 8
+    CreateTimer: 26
+    DuplicateHandle: 39
+    ExitProcess: 3
+    ExitThread: 9
+    GetCurrentProcessorNumber: 17
+    GetHandleInfo: 41
+    GetProcessId: 53
+    GetProcessIdOfThread: 54
+    GetProcessIdealProcessor: 6
+    GetProcessInfo: 43
+    GetResourceLimit: 56
+    GetResourceLimitCurrentValues: 58
+    GetResourceLimitLimitValues: 57
+    GetSystemInfo: 42
+    GetSystemTick: 40
+    GetThreadContext: 59
+    GetThreadId: 55
+    GetThreadIdealProcessor: 15
+    GetThreadInfo: 44
+    GetThreadPriority: 11
+    MapMemoryBlock: 31
+    OutputDebugString: 61
+    QueryMemory: 2
+    ReleaseMutex: 20
+    ReleaseSemaphore: 22
+    SendSyncRequest1: 46
+    SendSyncRequest2: 47
+    SendSyncRequest3: 48
+    SendSyncRequest4: 49
+    SendSyncRequest: 50
+    SetThreadPriority: 12
+    SetTimer: 27
+    SignalEvent: 24
+    SleepThread: 10
+    UnmapMemoryBlock: 32
+    WaitSynchronization1: 36
+    WaitSynchronizationN: 37
+  InterruptNumbers:
+  ServiceAccessControl: 
+   - APT:U
+   - $hioFIO
+   - $hostio0
+   - $hostio1
+   - ac:u
+   - boss:U
+   - cam:u
+   - cecd:u
+   - cfg:u
+   - dlp:FKCL
+   - dlp:SRVR
+   - dsp::DSP
+   - frd:u
+   - fs:USER
+   - gsp::Gpu
+   - hid:USER
+   - http:C
+   - mic:u
+   - ndm:u
+   - news:s
+   - nwm::UDS
+   - ptm:u
+   - pxi:dev
+   - soc:U
+   - gsp::Lcd
+   - y2r:u
+   - ldr:ro
+   - ir:USER
+   - ir:u
+   - csnd:SND
+   - ir:rst
+   - ns:s
+   
+SystemControlInfo:
+  Dependency: 
+    ac: 0x0004013000002402L
+    am: 0x0004013000001502L
+    boss: 0x0004013000003402L
+    camera: 0x0004013000001602L
+    cecd: 0x0004013000002602L
+    cfg: 0x0004013000001702L
+    codec: 0x0004013000001802L
+    csnd: 0x0004013000002702L
+    dlp: 0x0004013000002802L
+    dsp: 0x0004013000001a02L
+    friends: 0x0004013000003202L
+    gpio: 0x0004013000001b02L
+    gsp: 0x0004013000001c02L
+    hid: 0x0004013000001d02L
+    http: 0x0004013000002902L
+    i2c: 0x0004013000001e02L
+    ir: 0x0004013000003302L
+    mcu: 0x0004013000001f02L
+    mic: 0x0004013000002002L
+    ndm: 0x0004013000002b02L
+    news: 0x0004013000003502L
+    nim: 0x0004013000002c02L
+    nwm: 0x0004013000002d02L
+    pdn: 0x0004013000002102L
+    ps: 0x0004013000003102L
+    ptm: 0x0004013000002202L
+    ro: 0x0004013000003702L
+    socket: 0x0004013000002e02L
+    spi: 0x0004013000002302L
+    ssl: 0x0004013000002f02L
diff --git a/icon.bin b/icon.bin
diff --git a/make_cia.sh b/make_cia.sh
@@ -0,0 +1 @@
+makerom -f cia -o ctrQuake.cia -elf ctrQuake.elf -rsf cia.rsf -banner banner.bnr -icon icon.bin -exefslogo -target t
diff --git a/source/snd_ctr.c b/source/snd_ctr.c
@@ -1,66 +1,94 @@
 /*
-Copyright (C) 2015 Felipe Izzo
+Copyright (C) Rinnegatamante <rinnegatamante@gmail.com>
+Copyright (C) 2015 Felipe Izzo <masterfeizz@gmail.com>
 Copyright (C) 1996-1997 Id Software, Inc.
-
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
 as published by the Free Software Foundation; either version 2
 of the License, or (at your option) any later version.
-
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
 See the GNU General Public License for more details.
-
 You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
 */
 
 #include <stdio.h>
 #include <3ds.h>
 #include "quakedef.h"
 
 #define TICKS_PER_SEC 268111856LL
-#define SAMPLE_RATE   32730
-#define CSND_BUFSIZE 4096
-
-u8 *csnd_buf;
+#define QUAKE_SAMPLERATE 32000
+#define CSND_SAMPLERATE 32730
+#define CSND_BUFSIZE 16384
+#define DSP_BUFSIZE 16384
+qboolean isDSP = true;
+u32 SAMPLERATE = QUAKE_SAMPLERATE<<1;
+u32 *audiobuffer;
+ndspWaveBuf* waveBuf;
 u64 initial_tick;
 int snd_inited;
 
+// createDspBlock: Create a new block for DSP service
+void createDspBlock(ndspWaveBuf* waveBuf, u16 bps, u32 size, u8 loop, u32* data){
+	waveBuf->data_vaddr = (void*)data;
+	waveBuf->nsamples = size / bps;
+	waveBuf->looping = loop;
+	waveBuf->offset = 0;	
+	DSP_FlushDataCache(data, size);
+}
+
 qboolean SNDDMA_Init(void)
 {
   snd_initialized = 0;
-
-  if(csndInit() != 0){
-    Con_Printf("csndInit() failed\n");
-    return 0;
+  
+  if(ndspInit() != 0){
+    Con_Printf("dsp::DSP unavailable, trying with csnd:SND...\n");
+	isDSP = false;
+	if(csndInit() != 0){
+		Con_Printf("csnd:SND unavailable, audio off...\n");
+		return 0;
+	}
   }
-
-  csnd_buf = linearAlloc(CSND_BUFSIZE);
+  
+  if (isDSP) audiobuffer = linearAlloc(DSP_BUFSIZE);
+  else audiobuffer = linearAlloc(CSND_BUFSIZE);
 
 	/* Fill the audio DMA information block */
 	shm = &sn;
 	shm->splitbuffer = 0;
 	shm->samplebits = 16;
-	shm->speed = SAMPLE_RATE;
-	shm->channels = 1;
-	shm->samples = CSND_BUFSIZE / (shm->samplebits / 8);
+	if (isDSP){
+		shm->speed = QUAKE_SAMPLERATE;
+		shm->channels = 2;
+		shm->samples = DSP_BUFSIZE<<2;
+	}else{
+		shm->speed = QUAKE_SAMPLERATE;
+		SAMPLERATE = QUAKE_SAMPLERATE;
+		shm->channels = 1;
+		shm->samples = CSND_BUFSIZE;	
+	}
 	shm->samplepos = 0;
 	shm->submission_chunk = 1;
-	shm->buffer = csnd_buf;
-  int ret = csndPlaySound(0x10, SOUND_REPEAT | SOUND_FORMAT_16BIT, SAMPLE_RATE, 0.75f, 0.0f, (u32*)csnd_buf, (u32*)csnd_buf, CSND_BUFSIZE);
-  if(ret != 0){
-    Con_Printf("csndPlaySound() failed\n");
-    return 0;
-  }
+	shm->buffer = audiobuffer;
+	if (isDSP){
+		ndspSetOutputMode(NDSP_OUTPUT_STEREO);
+		ndspChnReset(0x08);
+		ndspChnWaveBufClear(0x08);
+		ndspChnSetInterp(0x08, NDSP_INTERP_LINEAR);
+		ndspChnSetRate(0x08, (float)QUAKE_SAMPLERATE);
+		ndspChnSetFormat(0x08, NDSP_FORMAT_STEREO_PCM16);
+		waveBuf = (ndspWaveBuf*)calloc(1, sizeof(ndspWaveBuf));
+		createDspBlock(waveBuf, 2, DSP_BUFSIZE<<2, 1, audiobuffer);
+		ndspChnWaveBufAdd(0x08, waveBuf);
+	}else csndPlaySound(0x08, SOUND_LINEAR_INTERP | SOUND_REPEAT | SOUND_FORMAT_16BIT, QUAKE_SAMPLERATE, 1.0f, 1.0f, (u32*)audiobuffer, (u32*)audiobuffer, CSND_BUFSIZE<<1);
+	
   initial_tick = svcGetSystemTick();
 
   snd_initialized = 1;
-	return 1;
+  return 1;
 }
 
 int SNDDMA_GetDMAPos(void)
@@ -69,30 +97,37 @@ int SNDDMA_GetDMAPos(void)
     return 0;
 
   u64 delta = (svcGetSystemTick() - initial_tick);
-  u64 samplepos = delta * (SAMPLE_RATE) / TICKS_PER_SEC;
+  u64 samplepos = delta * (SAMPLERATE) / TICKS_PER_SEC;
 	shm->samplepos = samplepos;
 	return samplepos;
 }
 
 void SNDDMA_Shutdown(void)
 {
   if(snd_initialized){
-    CSND_SetPlayState(0x10, 0);
-    csndExecCmds(false);
-    linearFree(csnd_buf);
-    csndExit();
+	if (isDSP){
+		ndspChnWaveBufClear(0x08);
+		ndspExit();
+		free(waveBuf);
+	}else{
+		CSND_SetPlayState(0x08, 0);
+		CSND_UpdateInfo(0);
+		csndExit();
+	}
+	linearFree(audiobuffer);
   }
 }
 
 /*
 ==============
 SNDDMA_Submit
-
 Send sound to device if buffer isn't really the dma buffer
 ===============
 */
 void SNDDMA_Submit(void)
 {
-  //if(snd_initialized)
-    //GSPGPU_FlushDataCache(NULL, csnd_buf, csnd_bufsize);
-}
+	if (snd_initialized){
+		if (isDSP) DSP_FlushDataCache(audiobuffer, DSP_BUFSIZE<<2);
+		else CSND_FlushDataCache(audiobuffer, CSND_BUFSIZE);
+	}
+}
diff --git a/source/sys_ctr.c b/source/sys_ctr.c
@@ -284,7 +284,6 @@ int main (int argc, char **argv)
 		osSetSpeedupEnable(true);
 
 	gfxInit(GSP_RGB565_OES,GSP_RGB565_OES,false);
-	hidInit();
 	gfxSetDoubleBuffering(GFX_TOP, false);
 	gfxSetDoubleBuffering(GFX_BOTTOM, false);
 	gfxSet3D(false);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+makerom -f cia -o ctrQuake.cia -elf ctrQuake.elf -rsf cia.rsf -banner banner.bnr -icon icon.bin -exefslogo -target t`