mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-12-27 21:14:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Detect and discard invalid packets in FfmpegDecoder. This seems to fix issues when playing WAV files that have embedded artwork.

Browse Source
This commit is contained in:
casey langen 2021-04-11 20:04:40 -07:00
parent bdb624a187
commit 1230315a4e
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/ffmpegdecoder/FfmpegDecoder.cpp
View File

@ -489,13 +489,24 @@ bool FfmpegDecoder::RefillFifoQueue() {
packet.dts = AV_NOPTS_VALUE;
packet.pos = -1;
int error = av_read_frame(this->formatContext, &packet);
if (error >= 0) {
sentAtLeastOnePacket = this->ReadSendAndReceivePacket(&packet);
/* note that sometimes decoders seem to return packets that are
invalid. this can be observed when playing wav files that have
album art metadata, but may happen in other cases. if we detect
an invalid packet, simply discard it and get the next one */
if (packet.pts == AV_NOPTS_VALUE && packet.dts == AV_NOPTS_VALUE) {
logError("invalid packet detected, discarding.");
}
else {
sentAtLeastOnePacket = this->ReadSendAndReceivePacket(&packet);
}
}
else {
logAvError("av_read_frame", error);
readFailed = true;
}
av_packet_unref(&packet);
fifoSize = av_audio_fifo_size(this->outputFifo);
}