This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit ddf3e5651455a80bea86480c6c2e3911753251e3 Author: Jack Lau <[email protected]> AuthorDate: Mon Oct 27 16:50:30 2025 +0800 Commit: Jack Lau <[email protected]> CommitDate: Wed Jan 21 08:52:28 2026 +0000 avformat/whip: correct the ice time log The ICE handshake actually finished after recieve and handle binding request from peer when the peer is not ice lite mode. Log the ice status when it really done. Signed-off-by: Jack Lau <[email protected]> --- libavformat/whip.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/whip.c b/libavformat/whip.c index 5200aca4fd..81acb6f560 100644 --- a/libavformat/whip.c +++ b/libavformat/whip.c @@ -1299,10 +1299,6 @@ next_packet: if (whip->state < WHIP_STATE_ICE_CONNECTED) { if (whip->is_peer_ice_lite) whip->state = WHIP_STATE_ICE_CONNECTED; - whip->whip_ice_time = av_gettime_relative(); - av_log(whip, AV_LOG_VERBOSE, "ICE STUN ok, state=%d, url=udp://%s:%d, location=%s, username=%s:%s, res=%dB, elapsed=%.2fms\n", - whip->state, whip->ice_host, whip->ice_port, whip->whip_resource_url ? whip->whip_resource_url : "", - whip->ice_ufrag_remote, whip->ice_ufrag_local, ret, ELAPSED(whip->whip_starttime, av_gettime_relative())); ff_url_join(buf, sizeof(buf), "dtls", NULL, whip->ice_host, whip->ice_port, NULL); av_dict_set_int(&opts, "mtu", whip->pkt_size, 0); @@ -1338,9 +1334,13 @@ next_packet: /* Handle DTLS handshake */ if (is_dtls_packet(whip->buf, ret) || is_dtls_active) { + whip->whip_ice_time = av_gettime_relative(); /* Start consent timer when ICE selected */ - whip->whip_last_consent_tx_time = whip->whip_last_consent_rx_time = av_gettime_relative(); + whip->whip_last_consent_tx_time = whip->whip_last_consent_rx_time = whip->whip_ice_time; whip->state = WHIP_STATE_ICE_CONNECTED; + av_log(whip, AV_LOG_VERBOSE, "ICE STUN ok, state=%d, url=udp://%s:%d, location=%s, username=%s:%s, res=%dB, elapsed=%.2fms\n", + whip->state, whip->ice_host, whip->ice_port, whip->whip_resource_url ? whip->whip_resource_url : "", + whip->ice_ufrag_remote, whip->ice_ufrag_local, ret, ELAPSED(whip->whip_starttime, whip->whip_ice_time)); ret = ffurl_handshake(whip->dtls_uc); if (ret < 0) { whip->state = WHIP_STATE_FAILED; _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
