rofl0r
commented
8 months ago here's my code to trigger the bug:
/*
* PSP Software Development Kit - https://github.com/pspdev
* -----------------------------------------------------------------------
* Licensed under the BSD license, see LICENSE in PSPSDK root for details.
*
* main.c - Sample to demonstrate proper use of the mp3 library
*
* Copyright (c) 2008 Alexander Berl <raphael@fx-world.org>
*
*/
#include <pspkernel.h>
#include <pspdebug.h>
#include <pspctrl.h>
#include <pspdisplay.h>
#include <stdio.h>
#include <pspaudio.h>
#include <pspmp3.h>
#include <psputility.h>
#include <string.h>
/* Define the module info section */
PSP_MODULE_INFO("Mp3Test", 0, 0, 1);
PSP_MAIN_THREAD_ATTR(THREAD_ATTR_USER);
PSP_HEAP_SIZE_KB(-1024);
#define MP3FILE "ms0:/MUSIC/test.mp3"
// Input and Output buffers
unsigned char mp3Buf[16 * 1024] __attribute__ ((aligned(64)));
unsigned short pcmBuf[16 * (1152 / 2)] __attribute__ ((aligned(64)));
/* Define printf, just to make typing easier */
#define printf pspDebugScreenPrintf
static int isrunning = 1;
/* Exit callback */
int exit_callback(int arg1, int arg2, void *common)
{
isrunning = 0;
return 0;
}
/* Callback thread */
int CallbackThread(SceSize args, void *argp)
{
int cbid;
cbid = sceKernelCreateCallback("Exit Callback", exit_callback, NULL);
sceKernelRegisterExitCallback(cbid);
sceKernelSleepThreadCB();
return 0;
}
/* Sets up the callback thread and returns its thread id */
int SetupCallbacks(void)
{
int thid = 0;
thid =
sceKernelCreateThread("update_thread", CallbackThread, 0x11, 0xFA0,
0, 0);
if (thid >= 0)
sceKernelStartThread(thid, 0, 0);
return thid;
}
// Macro to allow formatted input without having to use stdargs.h
#define ERRORMSG(...) { char msg[128]; sprintf(msg,__VA_ARGS__); error(msg); }
// Print out an error message and quit after user input
void error(char *msg)
{
SceCtrlData pad;
pspDebugScreenClear();
pspDebugScreenSetXY(0, 0);
printf(msg);
printf("Press X to quit.\n");
while (isrunning) {
sceCtrlReadBufferPositive(&pad, 1);
if (pad.Buttons & PSP_CTRL_CROSS)
break;
sceDisplayWaitVblankStart();
}
sceKernelExitGame();
}
int fillStreamBuffer(int fd, int handle)
{
char *dst;
int towrite, nread, pos;
// Get Info on the stream (where to fill to, how much to fill, where to fill from)
int status = sceMp3GetInfoToAddStreamData(handle, &dst, &towrite, &pos);
if (status < 0) {
ERRORMSG
("ERROR: sceMp3GetInfoToAddStreamData returned 0x%08X\n",
status);
}
// Seek file to position requested
status = sceIoLseek32(fd, pos, SEEK_SET);
if (status < 0) {
ERRORMSG("ERROR: sceIoLseek32 returned 0x%08X\n", status);
}
// Read the amount of data
nread = sceIoRead(fd, dst, towrite);
if (nread < 0) {
ERRORMSG("ERROR: Could not read from file - 0x%08X\n", nread);
}
if (nread == 0) {
// End of file?
return 0;
}
// Notify mp3 library about how much we really wrote to the stream buffer
status = sceMp3NotifyAddStreamData(handle, nread);
if (status < 0) {
ERRORMSG("ERROR: sceMp3NotifyAddStreamData returned 0x%08X\n",
status);
}
return (pos > 0);
}
// skip ID3 header.
static int find_mp3_frame(int fd) {
int status, start = 0;
unsigned char buf[4096];
status = sceIoRead(fd, buf, sizeof(buf));
if(status >= 3 && buf[0] == 'I' && buf[1] == 'D' && buf[2] == '3') {
while(1) {
int i, lastff = 0;
for(i = 0; i < status; ++i) {
if(lastff) {
if(buf[i] & 0xf0) {
start += i-1;
goto frame_found;
}
lastff = 0;
}
if(buf[i] == 0xff) lastff = 1;
}
start += status;
status = sceIoRead(fd, buf, sizeof(buf));
if(status <= 0) ERRORMSG("ERROR: couldnt find mp3 header\n");
}
frame_found:;
#if 0
if(status >= 10 && buf[3] == 3 && buf[4] == 0) /* id3 v2.3 */
start = (buf[6] << 21) | (buf[7] << 14) |
(buf[8] << 7) | buf[9];
#endif
}
return start;
}
static int load_file(char *fn, int* fd, int *handle, SceMp3InitArg *arg)
{
int status, start;
unsigned char buf[4096];
// Open the input file
*fd = sceIoOpen(fn, PSP_O_RDONLY, 0777);
if (*fd < 0) {
ERRORMSG("ERROR: Could not open file '%s' - 0x%08X\n", fn, *fd);
}
start = find_mp3_frame(*fd);
// Init mp3 resources
status = sceMp3InitResource();
if (status < 0) {
ERRORMSG("ERROR: sceMp3InitResource returned 0x%08X\n", status);
}
memset(arg, 0, sizeof(*arg));
arg->mp3StreamStart = start;
arg->mp3StreamEnd = sceIoLseek32(*fd, 0, SEEK_END);
arg->mp3Buf = mp3Buf;
arg->mp3BufSize = sizeof(mp3Buf);
arg->pcmBuf = pcmBuf;
arg->pcmBufSize = sizeof(pcmBuf);
*handle = sceMp3ReserveMp3Handle(arg);
if (*handle < 0) {
ERRORMSG("ERROR: sceMp3ReserveMp3Handle returned 0x%08X\n",
*handle);
}
// Fill the stream buffer with some data so that sceMp3Init has something to work with
fillStreamBuffer(*fd, *handle);
status = sceMp3Init(*handle);
if (status < 0) {
ERRORMSG("ERROR: sceMp3Init returned 0x%08X\n", status);
}
return status;
}
#define DECODE_MAGIC 0x80671402
//#define DECODE_MAGIC 0x80671103
int main(int argc, char *argv[])
{
SceCtrlData pad;
int status, handle, fd;
SceMp3InitArg mp3Init;
//init screen and callbacks
pspDebugScreenInit();
pspDebugScreenClear();
SetupCallbacks();
// Setup Pad
sceCtrlSetSamplingCycle(0);
sceCtrlSetSamplingMode(0);
// Load modules
status = sceUtilityLoadModule(PSP_MODULE_AV_AVCODEC);
//status = sceUtilityLoadAvModule(PSP_AV_MODULE_AVCODEC);
if (status < 0) {
ERRORMSG
("ERROR: sceUtilityLoadModule(PSP_MODULE_AV_AVCODEC) returned 0x%08X\n",
status);
}
status = sceUtilityLoadModule(PSP_MODULE_AV_MP3);
//status = sceUtilityLoadAvModule(PSP_AV_MODULE_MP3);
if (status < 0) {
ERRORMSG
("ERROR: sceUtilityLoadModule(PSP_MODULE_AV_MP3) returned 0x%08X\n",
status);
}
#if 0
status = sceAudioInit();
if (status < 0) {
ERRORMSG
("ERROR: sceAudioInit() returned 0x%08X\n",
status);
}
#endif
// Reserve a mp3 handle for our playback
load_file(MP3FILE, &fd, &handle, &mp3Init);
int channel = -1;
int samplingRate = sceMp3GetSamplingRate(handle);
int numChannels = sceMp3GetMp3ChannelNum(handle);
int volume = 0x7000; //PSP_AUDIO_VOLUME_MAX;
int numPlayed = 0;
int paused = 0;
int lastButtons = 0;
int loop = 0;
while (isrunning) {
sceDisplayWaitVblankStart();
pspDebugScreenSetXY(0, 0);
printf("PSP Mp3 Sample v1.0 by Raphael\n\n");
printf("Playing '%s'...\n", MP3FILE);
printf(" %i Hz\n", samplingRate);
printf(" %i kbit/s\n", sceMp3GetBitRate(handle));
printf(" %s\n", numChannels == 2 ? "Stereo" : "Mono");
printf(" %s\n\n", loop == 0 ? "No loop" : "Loop");
int playTime = samplingRate > 0 ? numPlayed / samplingRate : 0;
printf(" Playtime: %02i:%02i\n", playTime / 60, playTime % 60);
printf
("\n\n\nPress CIRCLE to Pause/Resume playback\nPress TRIANGLE to reset playback\nPress CROSS to switch loop mode\nPress SQUARE to stop playback and quit\n");
if (!paused) {
// Check if we need to fill our stream buffer
if (sceMp3CheckStreamDataNeeded(handle) > 0) {
fillStreamBuffer(fd, handle);
}
// Decode some samples
short *buf;
int bytesDecoded;
int retries = 0;
// We retry in case it's just that we reached the end of the stream and need to loop
for (; retries < 1; retries++) {
bytesDecoded = sceMp3Decode(handle, &buf);
if (bytesDecoded > 0)
break;
if (sceMp3CheckStreamDataNeeded(handle) <= 0)
break;
if (!fillStreamBuffer(fd, handle)) {
numPlayed = 0;
}
}
if (bytesDecoded < 0 && bytesDecoded != DECODE_MAGIC) {
ERRORMSG
("ERROR: sceMp3Decode returned 0x%08X\n",
bytesDecoded);
}
// Nothing more to decode? Must have reached end of input buffer
if (bytesDecoded == 0 || bytesDecoded == DECODE_MAGIC) {
paused = 1;
sceMp3ResetPlayPosition(handle);
numPlayed = 0;
} else while(bytesDecoded > 0) {
int samples = bytesDecoded / (2 * numChannels);
/* PPSSPP limits the range of SRC channel reservation samples to 17 - 4111. */
int actualSamples = samples > 4032 ? 4032 : samples;
samples -= actualSamples;
if (samples <= 17) actualSamples += samples;
// Reserve the Audio channel for our output if not yet done
if (channel >= 0) {
while(sceAudioOutput2GetRestSample()) ;
while(0x80268002 == sceAudioSRCChRelease()); /* loop until not busy */
channel = -1;
}
if (channel < 0) {
// samplingRate,
channel = sceAudioSRCChReserve(
actualSamples,
samplingRate,
numChannels);
}
// Output the decoded samples and accumulate the number of played samples to get the playtime
numPlayed +=
sceAudioSRCOutputBlocking(volume, buf);
buf += numPlayed;
bytesDecoded -= (numPlayed*2);
}
}
sceCtrlPeekBufferPositive(&pad, 1);
if (pad.Buttons != lastButtons) {
if (pad.Buttons & PSP_CTRL_CIRCLE) {
paused ^= 1;
}
if (pad.Buttons & PSP_CTRL_TRIANGLE) {
// Reset the stream and playback status
sceMp3ResetPlayPosition(handle);
numPlayed = 0;
}
if (pad.Buttons & PSP_CTRL_CROSS) {
loop = (loop == 0 ? -1 : 0);
status = sceMp3SetLoopNum(handle, loop);
if (status < 0) {
ERRORMSG
("ERROR: sceMp3SetLoopNum returned 0x%08X\n",
status);
}
}
if (pad.Buttons & PSP_CTRL_SQUARE) {
break;
}
lastButtons = pad.Buttons;
}
}
// Cleanup time...
if (channel >= 0)
sceAudioChRelease(channel);
status = sceMp3ReleaseMp3Handle(handle);
if (status < 0) {
ERRORMSG("ERROR: sceMp3ReleaseMp3Handle returned 0x%08X\n",
status);
}
status = sceMp3TermResource();
if (status < 0) {
ERRORMSG("ERROR: sceMp3TermResource returned 0x%08X\n", status);
}
status = sceIoClose(fd);
if (status < 0) {
ERRORMSG("ERROR: sceIoClose returned 0x%08X\n", status);
}
sceKernelExitGame();
return 0;
}makefile:
TARGET = All
OBJS = main.o
CFLAGS = -O2 -G0 -Wall
CXXFLAGS = $(CFLAGS) -fno-exceptions -fno-rtti
ASFLAGS = $(CFLAGS)
LIBS = -lpsppower -lz -lm -lpspdebug -lpspgu -lpspaudiolib -lpspaudio -lpspaudiocodec -lpsprtc -lpspmp3
# -lpspaudio_driver
EXTRA_TARGETS = EBOOT.PBP
PSP_EBOOT_TITLE =
PSP_EBOOT_ICON =
PSP_EBOOT_PIC1 =
PSPSDK=$(shell psp-config --pspsdk-path)
include $(PSPSDK)/lib/build.mak
hrydgard
Nabile-Rahmani
Game or games this happens in
homebrew using mp3 api
What area of the game / PPSSPP
N/A
What should happen
according to https://ffmpeg.org/doxygen/trunk/group__lavc__decoding.html#ga58bc4bf1e0ac59e27362597e467efff3 avcodec_send_packet() has a 1:n relation to avcodec_receive_frame()
it states:
currently the code sends one packet, then receives one frame, which is wrong. i noticed this because PPSSPP kept spamming the terminal about EAGAIN received from avcodec_send_packet instead of playing music from the pspsdk mp3 sample code.
here's a patch that does the conceptually right thing: drain ffmpeg of all frames after sending a packet. however, after applying it i now get
and i'm lacking the nerve to further debug/fix the issue.
patch:
my ffmpeg version is ffmpeg-4.3.5
Logs
No response
Platform
Linux / BSD
Mobile device model or graphics card (GPU)
n/a
PPSSPP version affected
git
Last working version
n/a
Graphics backend (3D API)
OpenGL / GLES
Checklist