Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Attempt to ensure we don't decode partial frames.

Browse source
This commit is contained in:
Unknown W. Brackets 2014-10-03 22:11:45 -07:00
parent f421453bf9
commit cf7e280185
1 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
Core/HLE/sceAtrac.cpp
View file

@ -330,8 +330,33 @@ struct Atrac {
}
AtracDecodeResult DecodePacket() {
AVPacket tempPacket;
AVPacket *decodePacket = packet;
if (packet->size < (int)atracBytesPerFrame) {
// Whoops, we have a packet that is smaller than a frame. Let's meld a new one.
u32 initialSize = packet->size;
u32 needed = atracBytesPerFrame - initialSize;
av_init_packet(&tempPacket);
av_copy_packet(&tempPacket, packet);
av_grow_packet(&tempPacket, needed);
// Okay, we're "out of data", let's get more.
packet->size = 0;
if (FillPacket()) {
if (packet->size >= needed) {
memcpy(tempPacket.data + initialSize, packet->data, needed);
packet->size -= needed;
packet->data += needed;
}
}
}
int got_frame = 0;
int bytes_read = avcodec_decode_audio4(pCodecCtx, pFrame, &got_frame, packet);
int bytes_read = avcodec_decode_audio4(pCodecCtx, pFrame, &got_frame, decodePacket);
if (packet != decodePacket) {
av_free_packet(&tempPacket);
}
if (bytes_read == AVERROR_PATCHWELCOME) {
ERROR_LOG(ME, "Unsupported feature in ATRAC audio.");
// Let's try the next packet.