jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-07 22:02:12 +08:00
Code Issues Projects Releases Wiki Activity

media_decoder: handle invalid data in AVPacket

Browse Source 
This fixes a crash when receiving invalid data in an AVPacket.

Gitlab: #1116
Change-Id: Ie5e102413d94f05b3c8935501b57839b31b98569
This commit is contained in:
Andreas Traczyk
2025-03-18 15:28:27 -04:00
parent 52fc02f036
commit f20373cda2
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/media/media_decoder.cpp
View File

@ -641,17 +641,28 @@ MediaDecoder::decode(AVPacket& packet)
{
int frameFinished = 0;
auto ret = avcodec_send_packet(decoderCtx_, &packet);
if (ret < 0 && ret != AVERROR(EAGAIN)) {
#ifdef RING_ACCEL
if (accel_) {
JAMI_WARN("Decoding error falling back to software");
fallback_ = true;
accel_.reset();
avcodec_flush_buffers(decoderCtx_);
setupStream();
return DecodeStatus::FallBack;
if (ret < 0) {
// In a case caught on Windows, avcodec_send_packet returns AVERROR_INVALIDDATA when
// the size information in the packet is incorrect. This is a workaround to handle this
// case which was observed with Logitech C920 camera, and presented similar symptoms when
// the camera was opened with other applications like Chrome, Windows Camera app, etc.
// Experimentally, every second packet was affected.
if (ret == AVERROR_INVALIDDATA) {
JAMI_DEBUG("Invalid data in packet");
return DecodeStatus::DecodeError;
}
if (ret != AVERROR(EAGAIN)) {
#ifdef RING_ACCEL
if (accel_) {
JAMI_WARN("Decoding error falling back to software");
fallback_ = true;
accel_.reset();
avcodec_flush_buffers(decoderCtx_);
setupStream();
return DecodeStatus::FallBack;
}
#endif
}
avcodec_flush_buffers(decoderCtx_);
return ret == AVERROR_EOF ? DecodeStatus::Success : DecodeStatus::DecodeError;
}