Merge pull request #847 from orgads/srtp-dead

lemenkov · web-flow · commit 0e010131aba9 · 2026-01-31T13:22:13.000+01:00
RTPStream: Remove dead code
diff --git a/src/rtpstream.cpp b/src/rtpstream.cpp
@@ -3136,8 +3136,6 @@ int rtpstream_rtpecho_startaudio(rtpstream_callinfo_t* callinfo, JLSRTP& rxUASAu
     {
         fprintf(debugrefileaudio, "rtpstream_rtpecho_startaudio reached...\n");
     }
-    printLocalAudioSrtpStuff(taskinfo->local_srtp_audio_params);
-    printRemoteAudioSrtpStuff(taskinfo->remote_srtp_audio_params);
     pthread_mutex_unlock(&debugremutexaudio);
 
     /* Create first RTP echo thread for audio */
@@ -3176,8 +3174,6 @@ int rtpstream_rtpecho_updateaudio(rtpstream_callinfo_t* callinfo, JLSRTP& rxUASA
     {
         fprintf(debugrefileaudio, "rtpstream_rtpecho_updateaudio reached...\n");
     }
-    printLocalAudioSrtpStuff(taskinfo->local_srtp_audio_params);
-    printRemoteAudioSrtpStuff(taskinfo->remote_srtp_audio_params);
     pthread_mutex_unlock(&debugremutexaudio);
 
     pthread_mutex_lock(&uasAudioMutex);
@@ -3226,8 +3222,6 @@ int rtpstream_rtpecho_stopaudio(rtpstream_callinfo_t* callinfo)
     {
         fprintf(debugrefileaudio, "rtpstream_rtpecho_stopaudio reached...\n");
     }
-    printLocalAudioSrtpStuff(taskinfo->local_srtp_audio_params);
-    printRemoteAudioSrtpStuff(taskinfo->remote_srtp_audio_params);
     pthread_mutex_unlock(&debugremutexaudio);
 
     if (pthread_join(pthread_audioecho_id, &r.p) == 0)
@@ -3301,8 +3295,6 @@ int rtpstream_rtpecho_startvideo(rtpstream_callinfo_t* callinfo, JLSRTP& rxUASVi
     {
         fprintf(debugrefilevideo, "rtpstream_rtpecho_startvideo reached...\n");
     }
-    printLocalVideoSrtpStuff(taskinfo->local_srtp_video_params);
-    printRemoteVideoSrtpStuff(taskinfo->remote_srtp_video_params);
     pthread_mutex_unlock(&debugremutexvideo);
 
     /* Create second RTP echo thread for video */
@@ -3341,8 +3333,6 @@ int rtpstream_rtpecho_updatevideo(rtpstream_callinfo_t* callinfo, JLSRTP& rxUASV
     {
         fprintf(debugrefilevideo, "rtpstream_rtpecho_updatevideo reached...\n");
     }
-    printLocalVideoSrtpStuff(taskinfo->local_srtp_video_params);
-    printRemoteVideoSrtpStuff(taskinfo->remote_srtp_video_params);
     pthread_mutex_unlock(&debugremutexvideo);
 
     pthread_mutex_lock(&uasVideoMutex);
@@ -3391,8 +3381,6 @@ int rtpstream_rtpecho_stopvideo(rtpstream_callinfo_t* callinfo)
     {
         fprintf(debugrefilevideo, "rtpstream_rtpecho_stopvideo reached...\n");
     }
-    printLocalVideoSrtpStuff(taskinfo->local_srtp_video_params);
-    printRemoteVideoSrtpStuff(taskinfo->remote_srtp_video_params);
     pthread_mutex_unlock(&debugremutexvideo);
 
     if (pthread_join(pthread_videoecho_id, &r.p) == 0)

Original file line number	Diff line number	Diff line change
`@@ -3136,8 +3136,6 @@ int rtpstream_rtpecho_startaudio(rtpstream_callinfo_t* callinfo, JLSRTP& rxUASAu`
`3136`	`3136`	`{`
`3137`	`3137`	`fprintf(debugrefileaudio, "rtpstream_rtpecho_startaudio reached...\n");`
`3138`	`3138`	`}`
`3139`		`- printLocalAudioSrtpStuff(taskinfo->local_srtp_audio_params);`
`3140`		`- printRemoteAudioSrtpStuff(taskinfo->remote_srtp_audio_params);`
`3141`	`3139`	`pthread_mutex_unlock(&debugremutexaudio);`
`3142`	`3140`
`3143`	`3141`	`/* Create first RTP echo thread for audio */`
`@@ -3176,8 +3174,6 @@ int rtpstream_rtpecho_updateaudio(rtpstream_callinfo_t* callinfo, JLSRTP& rxUASA`
`3176`	`3174`	`{`
`3177`	`3175`	`fprintf(debugrefileaudio, "rtpstream_rtpecho_updateaudio reached...\n");`
`3178`	`3176`	`}`
`3179`		`- printLocalAudioSrtpStuff(taskinfo->local_srtp_audio_params);`
`3180`		`- printRemoteAudioSrtpStuff(taskinfo->remote_srtp_audio_params);`
`3181`	`3177`	`pthread_mutex_unlock(&debugremutexaudio);`
`3182`	`3178`
`3183`	`3179`	`pthread_mutex_lock(&uasAudioMutex);`
`@@ -3226,8 +3222,6 @@ int rtpstream_rtpecho_stopaudio(rtpstream_callinfo_t* callinfo)`
`3226`	`3222`	`{`
`3227`	`3223`	`fprintf(debugrefileaudio, "rtpstream_rtpecho_stopaudio reached...\n");`
`3228`	`3224`	`}`
`3229`		`- printLocalAudioSrtpStuff(taskinfo->local_srtp_audio_params);`
`3230`		`- printRemoteAudioSrtpStuff(taskinfo->remote_srtp_audio_params);`
`3231`	`3225`	`pthread_mutex_unlock(&debugremutexaudio);`
`3232`	`3226`
`3233`	`3227`	`if (pthread_join(pthread_audioecho_id, &r.p) == 0)`
`@@ -3301,8 +3295,6 @@ int rtpstream_rtpecho_startvideo(rtpstream_callinfo_t* callinfo, JLSRTP& rxUASVi`
`3301`	`3295`	`{`
`3302`	`3296`	`fprintf(debugrefilevideo, "rtpstream_rtpecho_startvideo reached...\n");`
`3303`	`3297`	`}`
`3304`		`- printLocalVideoSrtpStuff(taskinfo->local_srtp_video_params);`
`3305`		`- printRemoteVideoSrtpStuff(taskinfo->remote_srtp_video_params);`
`3306`	`3298`	`pthread_mutex_unlock(&debugremutexvideo);`
`3307`	`3299`
`3308`	`3300`	`/* Create second RTP echo thread for video */`
`@@ -3341,8 +3333,6 @@ int rtpstream_rtpecho_updatevideo(rtpstream_callinfo_t* callinfo, JLSRTP& rxUASV`
`3341`	`3333`	`{`
`3342`	`3334`	`fprintf(debugrefilevideo, "rtpstream_rtpecho_updatevideo reached...\n");`
`3343`	`3335`	`}`
`3344`		`- printLocalVideoSrtpStuff(taskinfo->local_srtp_video_params);`
`3345`		`- printRemoteVideoSrtpStuff(taskinfo->remote_srtp_video_params);`
`3346`	`3336`	`pthread_mutex_unlock(&debugremutexvideo);`
`3347`	`3337`
`3348`	`3338`	`pthread_mutex_lock(&uasVideoMutex);`
`@@ -3391,8 +3381,6 @@ int rtpstream_rtpecho_stopvideo(rtpstream_callinfo_t* callinfo)`
`3391`	`3381`	`{`
`3392`	`3382`	`fprintf(debugrefilevideo, "rtpstream_rtpecho_stopvideo reached...\n");`
`3393`	`3383`	`}`
`3394`		`- printLocalVideoSrtpStuff(taskinfo->local_srtp_video_params);`
`3395`		`- printRemoteVideoSrtpStuff(taskinfo->remote_srtp_video_params);`
`3396`	`3384`	`pthread_mutex_unlock(&debugremutexvideo);`
`3397`	`3385`
`3398`	`3386`	`if (pthread_join(pthread_videoecho_id, &r.p) == 0)`