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);
 

modules/avcodec/sdp.c

@@ -47,7 +47,7 @@ int avcodec_h264_fmtp_enc(struct mbuf *mb, const struct sdp_format *fmt,
 
 	conf_get_str(conf_cur(), "avcodec_profile_level_id",
 		     profile_level_id, sizeof(profile_level_id));
-	conf_get_str(conf_cur(), "video_fmtp_append",
+	conf_get_str(conf_cur(), "avcodec_fmtp_append",
 		     append, sizeof(append));
 
 	if (str_isset(profile_level_id)) {

modules/ice/ice.c

@@ -239,7 +239,7 @@ static int cand_gather_relayed(struct mnat_media *m, struct comp *comp,
 	err = turnc_alloc(&turnc, stun_conf(icem_stun(m->icem)),
 			  IPPROTO_UDP, comp->sock, layer, &m->sess->srv,
 			  username, password,
-			  60, NULL, turnc_handler, comp);
+			  60, turnc_handler, comp);
 	if (err)
 		return err;
 

modules/turn/turn.c

@@ -215,7 +215,7 @@ static void turn_handler(int err, uint16_t scode, const char *reason,
 		    err = turnc_alloc(&other->turnc, NULL,
 		          IPPROTO_UDP, other->sock, LAYER,
 		          &m->sess->srv, m->sess->user, m->sess->pass,
-		          TURN_DEFAULT_LIFETIME, &token,
+		          TURN_DEFAULT_LIFETIME,
 		          turn_handler, other);
 		}
 		else
@@ -250,7 +250,7 @@ static void tcp_estab_handler(void *arg)
 	err = turnc_alloc(&comp->turnc, NULL, IPPROTO_TCP, comp->tc, 0,
 			  &m->sess->srv,
 			  m->sess->user, m->sess->pass,
-			  TURN_DEFAULT_LIFETIME, NULL, turn_handler, comp);
+			  TURN_DEFAULT_LIFETIME, turn_handler, comp);
 	if (err) {
 		m->sess->estabh(err, 0, NULL, m->sess->arg);
 	}
@@ -284,7 +284,7 @@ static int media_start(struct mnat_sess *sess, struct mnat_media *m)
 			err |= turnc_alloc(&comp->turnc, NULL,
 					   IPPROTO_UDP, comp->sock, LAYER,
 					   &sess->srv, sess->user, sess->pass,
-					   TURN_DEFAULT_LIFETIME, NULL,
+					   TURN_DEFAULT_LIFETIME,
 					   turn_handler, comp);
 			break;
 

src/bfcp.c

@@ -329,12 +329,7 @@ int bfcp_start(struct bfcp *bfcp)
 		return 0;
 	}
 
-	floorctrl = sdp_media_rattr(bfcp->sdpm, "floorctrl");
-
-	if (floorctrl )
-		if (str_str(floorctrl, "s")) {
-			bfcp_send_hello(bfcp);
-		}
+	err = bfcp_send_hello(bfcp);
 
 	return err;
 }

src/call.c

@@ -318,8 +318,10 @@ static int update_streams(struct call *call)
 	else
 		video_stop(call->video);
 
-	if (stream_is_ready(video_strm(call->slides)))
+	if (stream_is_ready(video_strm(call->slides))){
+		err |= bfcp_start(call->bfcp);
 		err |= video_update(call->slides, call->peer_uri);
+	}
 	else
 		video_stop(call->slides);
 
@@ -856,6 +858,12 @@ int call_streams_alloc(struct call *call)
 			return err;
 
 		if (str_isset(call->cfg->bfcp.proto)) {
+			err = bfcp_alloc(&call->bfcp, call->sdp,
+					 &call->cfg->bfcp, !call->got_offer,
+					 acc->mnat, call->mnats);
+			if (err)
+				return err;
+
 			err = video_alloc(&call->slides, &call->streaml,
 					  &strm_prm,
 					  call->cfg, call->sdp,
@@ -869,12 +877,6 @@ int call_streams_alloc(struct call *call)
 
 			if (err)
 				return err;
-
-			err = bfcp_alloc(&call->bfcp, call->sdp,
-					 &call->cfg->bfcp, !call->got_offer,
-					 acc->mnat, call->mnats);
-			if (err)
-				return err;
 		}
 	}
 
@@ -2074,7 +2076,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

@@ -77,6 +77,8 @@ static struct config core_config = {
 		"", "",
 		640, 480,
 		1000000,
+		0,
+		0,
 		30,
 		true,
 		VID_FMT_YUV420P,
@@ -793,7 +795,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/core.h

@@ -527,6 +527,7 @@ void rtprecv_set_socket(struct rtp_receiver *rx, struct rtp_sock *rtp);
 void rtprecv_set_ssrc(struct rtp_receiver *rx, uint32_t ssrc);
 uint64_t rtprecv_ts_last(struct rtp_receiver *rx);
 void rtprecv_set_ts_last(struct rtp_receiver *rx, uint64_t ts_last);
+void rtprecv_set_estab(struct rtp_receiver *rx, bool estab);
 void rtprecv_flush(struct rtp_receiver *rx);
 void rtprecv_enable(struct rtp_receiver *rx, bool enable);
 int  rtprecv_get_ssrc(struct rtp_receiver *rx, uint32_t *ssrc);

src/rtprecv.c

@@ -478,7 +478,7 @@ void rtprecv_handle_rtcp(const struct sa *src, struct rtcp_msg *msg,
 		return;
 	}
 
-	rx->ts_last = tmr_jiffies();
+	//rx->ts_last = tmr_jiffies();
 	mtx_unlock(rx->mtx);
 
 	pass_rtcp_work(rx, msg);
@@ -578,6 +578,16 @@ void rtprecv_set_ts_last(struct rtp_receiver *rx, uint64_t ts_last)
 	mtx_unlock(rx->mtx);
 }
 
+void rtprecv_set_estab(struct rtp_receiver *rx, bool estab)
+{
+	if (!rx)
+		return;
+
+	mtx_lock(rx->mtx);
+	rx->rtp_estab = estab;
+	mtx_unlock(rx->mtx);
+}
+
 
 void rtprecv_flush(struct rtp_receiver *rx)
 {

src/stream.c

@@ -284,9 +284,9 @@ 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);
+	rtprecv_set_estab(strm->rx, false);
+	rtprecv_flush(strm->rx);
 
 	strm->rx = mem_deref(strm->rx);
 	if (errorh)
@@ -1562,12 +1562,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);
 }