fixe merge

cmake/modules.cmake

@@ -84,7 +84,7 @@ set(MODULES
   wincons
   winwave
   x11
-  x11_grab
+  x11grab
 
   CACHE STRING "List of modules like 'turn;pipewire;alsa'"
 )

include/baresip.h

@@ -1462,7 +1462,6 @@ const char *video_get_disp_dev(const struct video *v);
 int   video_debug(struct re_printf *pf, const struct video *v);
 struct stream *video_strm(const struct video *v);
 const struct vidcodec *video_codec(const struct video *vid, bool tx);
-void video_encode_refresh(struct video *v);
 void video_sdp_attr_decode(struct video *v);
 void video_req_keyframe(struct video *vid);
 

src/call.c

@@ -2074,7 +2074,7 @@ static void call_handle_info_req(struct call *call, const struct sip_msg *req)
 	/* Poor-mans XML parsing */
 	if (0 == re_regex(body.p, body.l, "picture_fast_update")) {
 		debug("call: receive media control: fast_update=%d\n");
-		video_encode_refresh(call->video);
+		video_req_keyframe(call->video);
 	}
 }
 

src/config.c

@@ -793,7 +793,7 @@ int config_print(struct re_printf *pf, const struct config *cfg)
 			 rtp_receive_mode_str(cfg->avt.rxmode),
 
 			 cfg->net.ifname,
-			 net_af_str(cfg->net.af)
+			 net_af_str(cfg->net.af),
 
 			 cfg->bfcp.proto,
 			 cfg->bfcp.floorctrl

src/stream.c

@@ -284,9 +284,6 @@ static void stream_close(struct stream *strm, int err)
 	strm->terminated = true;
 	stream_enable(strm, false);
 	strm->errorh = NULL;
-	strm->rx.rtp_estab = false;
-
-	jbuf_flush(strm->rx.jbuf);
 
 	strm->rx = mem_deref(strm->rx);
 	if (errorh)
@@ -1562,12 +1559,7 @@ const struct sa *stream_raddr(const struct stream *strm)
 
 uint64_t stream_rx_ts_last(const struct stream *strm)
 {
-	if (!strm)
-		return 0;
-	if (!strm->rx.ts_last)
-		return 0;
-
-	return strm->rx.ts_last;
+	return rtprecv_ts_last(strm->rx);
 }