From 754ad3700f776c86a58ed405ea776073f7853d86 Mon Sep 17 00:00:00 2001 From: David Madl Date: Fri, 6 Mar 2026 00:53:04 +0100 Subject: [PATCH] docs: cleanup excessive logging --- app/src/main/cpp/PlaybackEngine.cpp | 42 ----------------------------- 1 file changed, 42 deletions(-) diff --git a/app/src/main/cpp/PlaybackEngine.cpp b/app/src/main/cpp/PlaybackEngine.cpp index e84d304..f3e5299 100644 --- a/app/src/main/cpp/PlaybackEngine.cpp +++ b/app/src/main/cpp/PlaybackEngine.cpp @@ -10,35 +10,14 @@ #include "mp3file.h" #include -/* -allocated 2304 bytes buffer -blanking the buffer ... -filling 24543 num_samples - -readBuffer2() k=0 -in readBuffer2() on mp3 != null: 1 -in readBuffer2() remaining_samples=24543 offset=0 -in readBuffer2() handle != null: 1 -in readBuffer2() done=2304 -copying 1152 samples, k=0 - - -err=-12 done=702 -*/ - /** * Read samples from the next mp3-frame into the struct MP3File's buffer. * @return number of samples read (uses buffer_size which is much smaller than total length) */ static inline int readBuffer2(MP3File* mp3) { - //LOGI("in readBuffer2() on mp3 != null: %d", mp3 != nullptr); - //if(mp3 == nullptr) return 0; - //LOGI("in readBuffer2() remaining_samples=%d offset=%d", mp3->remaining_samples, mp3->offset); size_t done = 0; - //LOGI("in readBuffer2() handle != null: %d", mp3->handle != nullptr); int err = mpg123_read(mp3->handle, mp3->buffer, mp3->buffer_size, &done); - //LOGI("in readBuffer2() done=%d", done); mp3->remaining_samples -= done / sizeof(int16_t); mp3->offset = 0; if (err != MPG123_OK && err != MPG123_DONE) LOGE("mpg123_read() err=%d done=%d", err, done); @@ -49,28 +28,20 @@ static inline int readBuffer2(MP3File* mp3) static bool read_mp3(std::string filename, std::vector& samples) { // TODO: assumes 48000 Hz sampling rate of the file // note: our resource file is mono (1 channel = 1 samples_per_frame)! - MP3File *mFile = mp3file_open(filename.c_str(), 0); // MPG123_ENC_FLOAT_32 (but does not seem to work) - //LOGI("allocated %d bytes buffer", mFile->buffer_size); - //LOGI("blanking the buffer ..."); memset(mFile->buffer, 0, mFile->buffer_size); - //LOGI("filling %d num_samples", mFile->num_samples); bool ok1 = mFile != nullptr; int ok2 = true; int i = 0; - //int k = 0; if(ok1) { samples.resize(mFile->num_samples); while (ok2 && mFile->remaining_samples > 0) { - //LOGI("readBuffer2() k=%d", k); ok2 = readBuffer2(mFile); if (!ok2) break; - //LOGI("copying %d samples, k=%d", mFile->samples_per_frame, k); for (int j = 0; j < ok2 && i < mFile->num_samples; j++, i++) { int16_t *src = ((int16_t *) mFile->buffer) + j; samples[i] = (*src) / 32768.0f; } - //k++; // debug only } } if(!ok2) { @@ -86,21 +57,8 @@ PlaybackEngine::PlaybackEngine(std::string filesDir, int resid): mFilesDir(files LOGI("NDK LOG_LEVEL=%d", LOG_LEVEL); // NDK LOG_LEVEL=3 (DEBUG) std::vector samples; - // BUG! bool is_ok = read_mp3(mFilesDir + "/" + std::to_string(resid) + ".mp3", samples); LOGI("read_mp3() is_ok=%d", is_ok); - // begin debug only - /* - // make sine wave (it works) - int fps = 48000; - float dur = 0.3; - float f = 440; - int N = (int) (dur * (float) fps); - samples.resize(N); - for(int n = 0; n < N; n++) - samples[n] = (float) sin(2*M_PI * f * n / N); - */ - // end debug only mPlayer = new MixingPlayer(samples); int32_t res = mPlayer->startAudio(); LOGI("startAudio() = %d", res);