sipwise
/
rtpengine
mirror of https://github.com/sipwise/rtpengine.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "MT#55283 drop NULL allowance"

Browse Source 
This reverts commit 7d942feb39.

Reason for revert: incorrect

Change-Id: Id49048991ae62c0cb6177c183b0583c3d33fddce
pull/2118/head
Richard Fuchs 5 months ago
parent d86f51ac54
commit 4103df7cf8
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File

5
daemon/codec.c
Unescape View File

@ -335,7 +335,6 @@ static int packet_decoded_audio_player(decoder_t *decoder, AVFrame *frame, void
static void codec_touched(struct codec_store *cs, rtp_payload_type *pt); static void codec_touched(struct codec_store *cs, rtp_payload_type *pt);
__attribute__((nonnull(4, 5, 6)))
static bool __buffer_dtx(struct dtx_buffer *dtxb, struct codec_ssrc_handler *ch, static bool __buffer_dtx(struct dtx_buffer *dtxb, struct codec_ssrc_handler *ch,
struct codec_ssrc_handler *input_handler, struct codec_ssrc_handler *input_handler,
struct transcode_packet *packet, struct media_packet *mp, struct transcode_packet *packet, struct media_packet *mp,
@ -3428,7 +3427,7 @@ static bool __buffer_dtx(struct dtx_buffer *dtxb, struct codec_ssrc_handler *dec
return true; return true;
} }
unsigned long ts = packet->ts; unsigned long ts = packet ? packet->ts : 0;
if (!mp->ssrc_out->seq_set) { if (!mp->ssrc_out->seq_set) {
mp->ssrc_out->seq_set = true; mp->ssrc_out->seq_set = true;
@ -3464,7 +3463,7 @@ static bool __buffer_dtx(struct dtx_buffer *dtxb, struct codec_ssrc_handler *dec
} }
// packet now consumed if there was one // packet now consumed if there was one
bool ret = true; bool ret = packet ? true : false;
packet = NULL; packet = NULL;
mutex_unlock(&dtxb->lock); mutex_unlock(&dtxb->lock);

Write Preview
Loading…
Cancel
Save