external/miraclecast
1
0
Fork 0
mirror of https://github.com/albfan/miraclecast.git synced 2025-03-09 23:38:56 +00:00
Code Issues Releases Wiki Activity

miracle-wfdctl: delay for 100ms before start sending stream to sink

Browse source
This commit is contained in:
Derek Dai 2017-02-23 15:43:20 +08:00
parent 155060919e
commit dd6fbf70e2
No known key found for this signature in database
GPG key ID: E109CC97553EF009
1 changed files with 52 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

66
src/ctl/wfd-out-session.c
View file

@ -21,6 +21,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <time.h>
#include "wfd-session.h" #include "wfd-session.h"
#include "shl_log.h" #include "shl_log.h"
#include "rtsp.h" #include "rtsp.h"
@ -30,6 +31,7 @@ struct wfd_out_session
struct wfd_session parent; struct wfd_session parent;
struct wfd_sink *sink; struct wfd_sink *sink;
int fd; int fd;
sd_event_source *gst_launch_source;
sd_event_source *gst_term_source; sd_event_source *gst_term_source;
}; };
@ -169,6 +171,7 @@ static void wfd_out_session_kill_gst(struct wfd_session *s)
{ {
pid_t pid; pid_t pid;
struct wfd_out_session *os = wfd_out_session(s); struct wfd_out_session *os = wfd_out_session(s);
if(os->gst_term_source) { if(os->gst_term_source) {
sd_event_source_get_child_pid(os->gst_term_source, &pid); sd_event_source_get_child_pid(os->gst_term_source, &pid);
kill(pid, SIGTERM); kill(pid, SIGTERM);
@ -207,6 +210,11 @@ void wfd_out_session_destroy(struct wfd_session *s)
os->fd = -1; os->fd = -1;
} }
if(os->gst_launch_source) {
sd_event_source_unref(os->gst_launch_source);
os->gst_launch_source = NULL;
}
wfd_out_session_kill_gst(s); wfd_out_session_kill_gst(s);
} }
@ -457,6 +465,10 @@ static int wfd_out_session_launch_gst(struct wfd_session *s, pid_t *out)
return p; return p;
} }
else if(0 < p) { else if(0 < p) {
log_info("gstreamer (%d) is launched for session %" PRId64,
p,
s->id);
*out = p; *out = p;
return 0; return 0;
} }
@ -465,7 +477,7 @@ static int wfd_out_session_launch_gst(struct wfd_session *s, pid_t *out)
sigaddset(&sigset, SIGTERM); sigaddset(&sigset, SIGTERM);
sigprocmask(SIG_UNBLOCK, &sigset, NULL); sigprocmask(SIG_UNBLOCK, &sigset, NULL);
execvp(args[0], args ); execvp(args[0], args);
exit(1); exit(1);
} }
@ -539,14 +551,44 @@ static int wfd_out_session_handle_teardown_request(struct wfd_session *s,
return 0; return 0;
} }
static int wfd_out_session_post_handle_play(sd_event_source *source,
uint64_t t,
void *userdata)
{
struct wfd_session *s = userdata;
int r, status;
pid_t gst;
sd_event_source_unref(source);
wfd_out_session(s)->gst_launch_source = NULL;
r = wfd_out_session_launch_gst(s, &gst);
if(0 > r) {
return r;
}
r = sd_event_add_child(ctl_wfd_get_loop(),
&wfd_out_session(s)->gst_term_source,
gst, WEXITED,
wfd_out_session_handle_gst_term,
s);
if(0 > r) {
kill(gst, SIGKILL);
waitpid(gst, &status, WNOHANG);
wfd_session_teardown(s);
}
return r;
}
static int wfd_out_session_handle_play_request(struct wfd_session *s, static int wfd_out_session_handle_play_request(struct wfd_session *s,
struct rtsp_message *req, struct rtsp_message *req,
struct rtsp_message **out_rep) struct rtsp_message **out_rep)
{ {
_shl_free_ char *v = NULL; _shl_free_ char *v = NULL;
_rtsp_message_unref_ struct rtsp_message *m = NULL; _rtsp_message_unref_ struct rtsp_message *m = NULL;
pid_t gst; uint64_t now;
int r, status; int r;
r = rtsp_message_new_reply_for(req, r = rtsp_message_new_reply_for(req,
&m, &m,
@ -571,22 +613,18 @@ static int wfd_out_session_handle_play_request(struct wfd_session *s,
return r; return r;
} }
r = wfd_out_session_launch_gst(s, &gst); r = sd_event_now(ctl_wfd_get_loop(), CLOCK_MONOTONIC, &now);
if(0 > r) { if(0 > r) {
return r; return r;
} }
r = sd_event_add_child(ctl_wfd_get_loop(), r = sd_event_add_time(ctl_wfd_get_loop(),
&wfd_out_session(s)->gst_term_source, &wfd_out_session(s)->gst_launch_source,
gst, WEXITED, CLOCK_MONOTONIC,
wfd_out_session_handle_gst_term, 100 * 1000 + now, 0,
wfd_out_session_post_handle_play,
s); s);
if(0 > r) { if(0 <= r) {
kill(gst, SIGKILL);
waitpid(gst, &status, WNOHANG);
wfd_session_teardown(s);
}
else {
*out_rep = m; *out_rep = m;
m = NULL; m = NULL;
} }