diff --git a/Source/Project64-audio/Driver/OpenSLES.cpp b/Source/Project64-audio/Driver/OpenSLES.cpp index ed22a33f1..67454ba6e 100644 --- a/Source/Project64-audio/Driver/OpenSLES.cpp +++ b/Source/Project64-audio/Driver/OpenSLES.cpp @@ -7,6 +7,7 @@ // Copyright(C) 2003 JttL // Copyright(C) 2002 Hacktarux // GNU/GPLv2 licensed: https://gnu.org/licenses/gpl-2.0.html + #include "OpenSLES.h" #include #include @@ -27,76 +28,80 @@ typedef struct threadLock_ } threadLock; #endif -/* Default start-time size of primary buffer (in equivalent output samples). -This is the buffer where audio is loaded after it's extracted from n64's memory. */ +// Default start-time size of primary buffer (in equivalent output samples) +// This is the buffer where audio is loaded after it's extracted from N64's memory + enum { PRIMARY_BUFFER_SIZE = 16384 }; -/* Size of a single secondary buffer, in output samples. This is the requested size of OpenSLES's -hardware buffer, this should be a power of two. */ +// Size of a single secondary buffer, in output samples. This is the requested size of OpenSLES's +// hardware buffer, this should be a power of two. + enum { SECONDARY_BUFFER_SIZE = 1024 }; -/* This is the requested number of OpenSLES's hardware buffers */ +// This is the requested number of OpenSLES's hardware buffers + enum { SECONDARY_BUFFER_NBR = 2 }; -/* This sets default frequency what is used if rom doesn't want to change it. -Probably only game that needs this is Zelda: Ocarina Of Time Master Quest -*NOTICE* We should try to find out why Demos' frequencies are always wrong -They tend to rely on a default frequency, apparently, never the same one ;) */ +// This sets default frequency what is used if ROM doesn't want to change it. +// Probably only game that needs this is Zelda: Ocarina Of Time Master Quest +// TODO: We should try to find out why Demos' frequencies are always wrong +// They tend to rely on a default frequency, but apparently never the same one ;) + enum { DEFAULT_FREQUENCY = 33600 }; -/* number of bytes per sample */ +// Number of bytes per sample enum { N64_SAMPLE_BYTES = 4, SLES_SAMPLE_BYTES = 4, }; -/* Pointer to the primary audio buffer */ +// Pointer to the primary audio buffer uint8_t * g_primaryBuffer = nullptr; -/* Size of the primary buffer */ +// Size of the primary buffer uint32_t g_primaryBufferBytes = 0; -/* Pointer to secondary buffers */ +// Pointer to secondary buffers uint8_t ** g_secondaryBuffers = nullptr; -/* Size of a single secondary buffer */ +// Size of a single secondary buffer uint32_t g_secondaryBufferBytes = 0; -/* Position in the primary buffer where next audio chunk should be placed */ +// Position in the primary buffer where next audio chunk should be placed uint32_t g_primaryBufferPos = 0; -/* Index of the next secondary buffer available */ +// Index of the next secondary buffer available uint32_t g_secondaryBufferIndex = 0; -/* Audio frequency, this is usually obtained from the game, but for compatibility we set default value */ +// Audio frequency, this is usually obtained from the game, but for compatibility we set default value uint32_t g_GameFreq = DEFAULT_FREQUENCY; -/* SpeedFactor is used to increase/decrease game playback speed */ +// SpeedFactor is used to increase/decrease game playback speed uint32_t g_speed_factor = 100; -/* Output Audio frequency */ +// Output audio frequency int g_OutputFreq = 44100; -/* Indicate that the audio plugin failed to initialize, so the emulator can keep running without sound */ +// Indicate that the audio plugin failed to initialize, so the emulator can keep running without sound bool g_critical_failure = false; #ifdef ANDROID -/* Thread Lock */ +// Thread Lock threadLock g_lock; -/* Engine interfaces */ +// Engine interfaces SLObjectItf g_engineObject = nullptr; SLEngineItf g_engineEngine = nullptr; -/* Output mix interfaces */ +// Output mix interfaces SLObjectItf g_outputMixObject = nullptr; -/* Player interfaces */ +// Player interfaces SLObjectItf g_playerObject = nullptr; SLPlayItf g_playerPlay = nullptr; -/* Buffer queue interfaces */ +// Buffer queue interfaces SLAndroidSimpleBufferQueueItf g_bufferQueue = nullptr; #endif @@ -128,7 +133,7 @@ static void CloseAudio(void) g_primaryBufferPos = 0; g_secondaryBufferIndex = 0; - /* Delete Primary buffer */ + // Delete primary buffer if (g_primaryBuffer != nullptr) { WriteTrace(TraceAudioInitShutdown, TraceDebug, "Delete g_primaryBuffer (%p)", g_primaryBuffer); @@ -137,7 +142,7 @@ static void CloseAudio(void) g_primaryBuffer = nullptr; } - /* Delete Secondary buffers */ + // Delete secondary buffers if (g_secondaryBuffers != nullptr) { for (uint32_t i = 0; i < SECONDARY_BUFFER_NBR; i++) @@ -155,7 +160,7 @@ static void CloseAudio(void) g_secondaryBuffers = nullptr; } #ifdef ANDROID - /* Destroy buffer queue audio player object, and invalidate all associated interfaces */ + // Destroy buffer queue audio player object, and invalidate all associated interfaces if (g_playerObject != nullptr) { SLuint32 state = SL_PLAYSTATE_PLAYING; @@ -172,14 +177,14 @@ static void CloseAudio(void) g_bufferQueue = nullptr; } - /* Destroy output mix object, and invalidate all associated interfaces */ + // Destroy output mix object, and invalidate all associated interfaces if (g_outputMixObject != nullptr) { (*g_outputMixObject)->Destroy(g_outputMixObject); g_outputMixObject = nullptr; } - /* Destroy engine object, and invalidate all associated interfaces */ + // Destroy engine object, and invalidate all associated interfaces if (g_engineObject != nullptr) { (*g_engineObject)->Destroy(g_engineObject); @@ -187,7 +192,7 @@ static void CloseAudio(void) g_engineEngine = nullptr; } - /* Destroy thread Locks */ + // Destroy thread Locks pthread_cond_signal(&(g_lock.cond)); pthread_mutex_unlock(&(g_lock.mutex)); pthread_cond_destroy(&(g_lock.cond)); @@ -204,7 +209,7 @@ static bool CreateSecondaryBuffers(void) WriteTrace(TraceAudioInitShutdown, TraceDebug, "Allocating memory for %d secondary audio buffers: %i bytes.", SECONDARY_BUFFER_NBR, secondaryBytes); - /* Allocate number of secondary buffers */ + // Allocate number of secondary buffers g_secondaryBuffers = new uint8_t *[SECONDARY_BUFFER_NBR]; if (g_secondaryBuffers == nullptr) @@ -214,7 +219,7 @@ static bool CreateSecondaryBuffers(void) return false; } - /* Allocate size of each secondary buffers */ + // Allocate size of each secondary buffers for (uint32_t i = 0; i < SECONDARY_BUFFER_NBR; i++) { g_secondaryBuffers[i] = new uint8_t[secondaryBytes]; @@ -259,7 +264,7 @@ static int resample(unsigned char *input, int /*input_avail*/, int oldsamplerate if ((error = speex_resampler_process_interleaved_int(spx_state, (const spx_int16_t *)input, &in_len, (spx_int16_t *)output, &out_len))) { memset(output, 0, output_needed); - return input_avail; // number of bytes consumed + return input_avail; // Number of bytes consumed } return in_len * 4; } @@ -267,9 +272,9 @@ static int resample(unsigned char *input, int /*input_avail*/, int oldsamplerate #ifdef USE_SRC if (Resample == RESAMPLER_SRC) { - // the high quality resampler needs more input than the samplerate ratio would indicate to work properly + // The high quality resampler needs more input than the sample rate ratio would indicate to work properly if (input_avail > output_needed * 3 / 2) - input_avail = output_needed * 3 / 2; // just to avoid too much short-float-short conversion time + input_avail = output_needed * 3 / 2; // Just to avoid too much short-float-short conversion time if (_src_len < input_avail * 2 && input_avail > 0) { if (_src) free(_src); @@ -303,7 +308,7 @@ static int resample(unsigned char *input, int /*input_avail*/, int oldsamplerate if ((error = src_process(src_state, &src_data))) { memset(output, 0, output_needed); - return input_avail; // number of bytes consumed + return input_avail; // Number of bytes consumed } src_float_to_short_array(_dest, (short *)output, output_needed / 2); return src_data.input_frames_used * 4; @@ -327,7 +332,7 @@ static int resample(unsigned char *input, int /*input_avail*/, int oldsamplerate } else criteria += const2; } - return j * 4; //number of bytes consumed + return j * 4; // Number of bytes consumed } // newsamplerate < oldsamplerate, this only happens when speed_factor > 1 for (i = 0; i < output_needed / 4; i++) @@ -335,10 +340,10 @@ static int resample(unsigned char *input, int /*input_avail*/, int oldsamplerate j = i * oldsamplerate / newsamplerate; pdest[i] = psrc[j]; } - return j * 4; //number of bytes consumed + return j * 4; // Number of bytes consumed } -/* This callback handler is called every time a buffer finishes playing */ +// This callback handler is called every time a buffer finishes playing #ifdef ANDROID void queueCallback(SLAndroidSimpleBufferQueueItf caller, void *context) { @@ -367,19 +372,19 @@ void OpenSLESDriver::AI_SetFrequency(uint32_t freq, uint32_t BufferSize) if (g_GameFreq == freq && g_primaryBuffer != nullptr) { - WriteTrace(TraceAudioInitShutdown, TraceInfo, "we are already using this frequency, so ignore it (freq: %d)", freq); + WriteTrace(TraceAudioInitShutdown, TraceInfo, "We are already using this frequency, so ignore it (freq: %d)", freq); WriteTrace(TraceAudioInitShutdown, TraceDebug, "Done"); return; } if (g_critical_failure) { - WriteTrace(TraceAudioInitShutdown, TraceInfo, "had a critical failure in setting up plugin, so ignore init"); + WriteTrace(TraceAudioInitShutdown, TraceInfo, "Critical failure in setting up plugin, ignoring init..."); WriteTrace(TraceAudioInitShutdown, TraceDebug, "Done"); return; } - /* This is important for the sync */ + // This is important for the sync g_GameFreq = freq; #ifdef ANDROID @@ -408,10 +413,10 @@ void OpenSLESDriver::AI_SetFrequency(uint32_t freq, uint32_t BufferSize) WriteTrace(TraceAudioInitShutdown, TraceInfo, "Requesting frequency: %iHz.", g_OutputFreq); - /* Close everything because InitializeAudio can be called more than once */ + // Close everything because InitializeAudio can be called more than once CloseAudio(); - /* Create primary buffer */ + // Create primary buffer if (!CreatePrimaryBuffer()) { WriteTrace(TraceAudioInitShutdown, TraceError, "CreatePrimaryBuffer failed"); @@ -421,7 +426,7 @@ void OpenSLESDriver::AI_SetFrequency(uint32_t freq, uint32_t BufferSize) return; } - /* Create secondary buffers */ + // Create secondary buffers if (!CreateSecondaryBuffers()) { WriteTrace(TraceAudioInitShutdown, TraceError, "CreateSecondaryBuffers failed"); @@ -432,7 +437,7 @@ void OpenSLESDriver::AI_SetFrequency(uint32_t freq, uint32_t BufferSize) } #ifdef ANDROID - /* Create thread Locks to ensure synchronization between callback and processing code */ + // Create thread Locks to ensure synchronization between callback and processing code if (pthread_mutex_init(&(g_lock.mutex), (pthread_mutexattr_t*)nullptr) != 0) { WriteTrace(TraceAudioInitShutdown, TraceError, "pthread_mutex_init failed"); @@ -453,7 +458,7 @@ void OpenSLESDriver::AI_SetFrequency(uint32_t freq, uint32_t BufferSize) g_lock.value = g_lock.limit = SECONDARY_BUFFER_NBR; pthread_mutex_unlock(&(g_lock.mutex)); - /* Engine object */ + // Engine object SLresult result = slCreateEngine(&g_engineObject, 0, nullptr, 0, nullptr, nullptr); if (result != SL_RESULT_SUCCESS) { @@ -480,7 +485,7 @@ void OpenSLESDriver::AI_SetFrequency(uint32_t freq, uint32_t BufferSize) if (result == SL_RESULT_SUCCESS) { - /* Output mix object */ + // Output mix object result = (*g_engineEngine)->CreateOutputMix(g_engineEngine, &g_outputMixObject, 0, nullptr, nullptr); if (result != SL_RESULT_SUCCESS) { @@ -506,11 +511,11 @@ void OpenSLESDriver::AI_SetFrequency(uint32_t freq, uint32_t BufferSize) SLDataSource audioSrc = { &loc_bufq, &format_pcm }; - /* Configure audio sink */ + // Configure audio sink SLDataLocator_OutputMix loc_outmix = { SL_DATALOCATOR_OUTPUTMIX, g_outputMixObject }; SLDataSink audioSnk = { &loc_outmix, nullptr }; - /* Create audio player */ + // Create audio player const SLInterfaceID ids1[] = { SL_IID_ANDROIDSIMPLEBUFFERQUEUE }; const SLboolean req1[] = { SL_BOOLEAN_TRUE }; result = (*g_engineEngine)->CreateAudioPlayer(g_engineEngine, &(g_playerObject), &audioSrc, &audioSnk, 1, ids1, req1); @@ -520,7 +525,7 @@ void OpenSLESDriver::AI_SetFrequency(uint32_t freq, uint32_t BufferSize) } } - /* Realize the player */ + // Realize the player if (result == SL_RESULT_SUCCESS) { result = (*g_playerObject)->Realize(g_playerObject, SL_BOOLEAN_FALSE); @@ -530,7 +535,7 @@ void OpenSLESDriver::AI_SetFrequency(uint32_t freq, uint32_t BufferSize) } } - /* Get the play interface */ + // Get the play interface if (result == SL_RESULT_SUCCESS) { result = (*g_playerObject)->GetInterface(g_playerObject, SL_IID_PLAY, &(g_playerPlay)); @@ -540,7 +545,7 @@ void OpenSLESDriver::AI_SetFrequency(uint32_t freq, uint32_t BufferSize) } } - /* Get the buffer queue interface */ + // Get the buffer queue interface if (result == SL_RESULT_SUCCESS) { result = (*g_playerObject)->GetInterface(g_playerObject, SL_IID_ANDROIDSIMPLEBUFFERQUEUE, &(g_bufferQueue)); @@ -550,7 +555,7 @@ void OpenSLESDriver::AI_SetFrequency(uint32_t freq, uint32_t BufferSize) } } - /* register callback on the buffer queue */ + // Register callback on the buffer queue if (result == SL_RESULT_SUCCESS) { result = (*g_bufferQueue)->RegisterCallback(g_bufferQueue, queueCallback, &g_lock); @@ -560,7 +565,7 @@ void OpenSLESDriver::AI_SetFrequency(uint32_t freq, uint32_t BufferSize) } } - /* set the player's state to playing */ + // Set the player's state to playing if (result == SL_RESULT_SUCCESS) { result = (*g_playerPlay)->SetPlayState(g_playerPlay, SL_PLAYSTATE_PLAYING); @@ -600,11 +605,11 @@ void OpenSLESDriver::AI_LenChanged(uint8_t *start, uint32_t length) for (i = 0; i < length; i += 4) { - /* Left channel */ + // Left channel g_primaryBuffer[g_primaryBufferPos + i] = start[i + 2]; g_primaryBuffer[g_primaryBufferPos + i + 1] = start[i + 3]; - /* Right channel */ + // Right channel g_primaryBuffer[g_primaryBufferPos + i + 2] = start[i]; g_primaryBuffer[g_primaryBufferPos + i + 3] = start[i + 1]; } @@ -628,7 +633,7 @@ void OpenSLESDriver::AI_LenChanged(uint8_t *start, uint32_t length) #ifdef ANDROID pthread_mutex_lock(&(g_lock.mutex)); - /* Wait for the next callback if no more output buffers available */ + // Wait for the next callback if no more output buffers available while (g_lock.value == 0) { pthread_cond_wait(&(g_lock.cond), &(g_lock.mutex)); @@ -640,7 +645,7 @@ void OpenSLESDriver::AI_LenChanged(uint8_t *start, uint32_t length) #endif WriteTrace(TraceAudioInterface, TraceDebug, "Finished with lock"); - // TODO: don't resample if speed_factor = 100 and newsamplerate ~= oldsamplerate + // TODO: Don't resample if speed_factor = 100 and newsamplerate ~= oldsamplerate int input_used = resample(g_primaryBuffer, g_primaryBufferPos, oldsamplerate, g_secondaryBuffers[g_secondaryBufferIndex], g_secondaryBufferBytes, newsamplerate); #ifdef ANDROID diff --git a/Source/Project64-core/3rdParty/7zip.cpp b/Source/Project64-core/3rdParty/7zip.cpp index c34e767d9..c89c2bccf 100644 --- a/Source/Project64-core/3rdParty/7zip.cpp +++ b/Source/Project64-core/3rdParty/7zip.cpp @@ -36,7 +36,7 @@ m_Opened(false) InFile_Open(&m_archiveStream.file, FileName); if (m_archiveStream.file.handle == INVALID_HANDLE_VALUE) { - //PrintError("can not open input file"); + //PrintError("Can not open input file"); return; } m_FileSize = GetFileSize(m_archiveStream.file.handle, nullptr); @@ -58,7 +58,7 @@ m_Opened(false) } else { - //SzArEx_Open will delete the passed db if it fails + // SzArEx_Open will delete the passed database if it fails m_db = nullptr; } } @@ -227,13 +227,13 @@ std::wstring C7zip::FileNameIndex(int index) std::wstring filename; if (m_db == nullptr || m_db->FileNameOffsets == 0) { - /* no filename */ + // No filename return filename; } int namelen = SzArEx_GetFileNameUtf16(m_db, index, nullptr); if (namelen <= 0) { - /* no filename */ + // No filename return filename; } filename.resize(namelen);