From af4888d697dba56ced5da721ee8a1198a7f1bdba Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Tue, 23 Nov 2021 11:40:09 +0100 Subject: [PATCH] Fixed handling of newly reserved PT 95 --- src/rtp/audio_decoders.cpp | 9 +++++---- src/rtp/video_decoders.cpp | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/rtp/audio_decoders.cpp b/src/rtp/audio_decoders.cpp index 6c786ca04..129998a2d 100644 --- a/src/rtp/audio_decoders.cpp +++ b/src/rtp/audio_decoders.cpp @@ -493,7 +493,11 @@ int decode_audio_frame(struct coded_data *cdata, void *pbuf_data, struct pbuf_st return FALSE; } } else { - log_msg(LOG_LEVEL_WARNING, "Unknown audio packet type: %d\n", pt); + if (pt == PT_Unassign_Type95) { + LOG_ONCE(LOG_LEVEL_WARNING, to_fourcc('U', 'V', 'P', 'T'), MOD_NAME "Unassigned PT 95 received, ignoring.\n"); + } else { + log_msg(LOG_LEVEL_WARNING, "Unknown audio packet type: %d\n", pt); + } return FALSE; } @@ -527,9 +531,6 @@ int decode_audio_frame(struct coded_data *cdata, void *pbuf_data, struct pbuf_st data = plaintext; break; } - case PT_Unassign_Type95: - LOG_ONCE(LOG_LEVEL_WARNING, to_fourcc('U', 'V', 'P', 'T'), MOD_NAME "Unassigned PT 95 received, ignoring.\n"); - return FALSE; default: LOG(LOG_LEVEL_WARNING) << MOD_NAME "Unknown packet type: " << pt << ".\n"; return FALSE; diff --git a/src/rtp/video_decoders.cpp b/src/rtp/video_decoders.cpp index 8b64f5c9e..362320617 100644 --- a/src/rtp/video_decoders.cpp +++ b/src/rtp/video_decoders.cpp @@ -1622,11 +1622,12 @@ int decode_video_frame(struct coded_data *cdata, void *decoder_data, struct pbuf } } break; - case PT_Unassign_Type95: - LOG_ONCE(LOG_LEVEL_WARNING, to_fourcc('U', 'V', 'P', 'T'), MOD_NAME "Unassigned PT 95 received, ignoring.\n"); - break; default: - LOG(LOG_LEVEL_WARNING) << MOD_NAME "Unknown packet type: " << pckt->pt << ".\n"; + if (pt == PT_Unassign_Type95) { + LOG_ONCE(LOG_LEVEL_WARNING, to_fourcc('U', 'V', 'P', 'T'), MOD_NAME "Unassigned PT 95 received, ignoring.\n"); + } else { + LOG(LOG_LEVEL_WARNING) << MOD_NAME "Unknown packet type: " << pckt->pt << ".\n"; + } ret = FALSE; goto cleanup; }