annotate udp_sync.c @ 33156:9ac31195a5e0

Use strtod instead of sscanf, it is both much faster and allows for easier error checking. Also do that error checking and print a message if what we received is not a proper number and ignore the message.
author reimar
date Sat, 09 Apr 2011 15:09:06 +0000
parents 16e5b7f9ddb8
children 2f8dc5fbec77
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
1 /*
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
2 * Network playback synchronization
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
3 * Copyright (C) 2009 Google Inc.
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
4 *
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
5 * This file is part of MPlayer.
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
6 *
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
7 * MPlayer is free software; you can redistribute it and/or modify
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
8 * it under the terms of the GNU General Public License as published by
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
9 * the Free Software Foundation; either version 2 of the License, or
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
10 * (at your option) any later version.
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
11 *
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
12 * MPlayer is distributed in the hope that it will be useful,
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
15 * GNU General Public License for more details.
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
16 *
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
17 * You should have received a copy of the GNU General Public License along
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
18 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
19 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
20 */
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
21
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
22 #include "config.h"
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
23
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
24 #if !HAVE_WINSOCK2_H
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
25 #include <errno.h>
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
26 #include <sys/types.h>
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
27 #include <sys/socket.h>
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
28 #include <netinet/in.h>
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
29 #include <stdlib.h>
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
30 #include <sys/ioctl.h>
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
31 #include <fcntl.h>
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
32 #include <string.h>
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
33 #include <strings.h>
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
34 #include <netdb.h>
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
35 #include <signal.h>
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
36 #else
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
37 #include <winsock2.h>
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
38 #include <ws2tcpip.h>
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
39 #endif /* HAVE_WINSOCK2_H */
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
40
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
41 #include "mplayer.h"
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
42 #include "mp_core.h"
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
43 #include "mp_msg.h"
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
44 #include "help_mp.h"
31985
09cd33b66ceb whitespace cosmetics
diego
parents: 31982
diff changeset
45 #include "udp_sync.h"
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
46
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
47
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
48 // config options for UDP sync
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
49 int udp_master = 0;
31985
09cd33b66ceb whitespace cosmetics
diego
parents: 31982
diff changeset
50 int udp_slave = 0;
09cd33b66ceb whitespace cosmetics
diego
parents: 31982
diff changeset
51 int udp_port = 23867;
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
52 const char *udp_ip = "127.0.0.1"; // where the master sends datagrams
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
53 // (can be a broadcast address)
31985
09cd33b66ceb whitespace cosmetics
diego
parents: 31982
diff changeset
54 float udp_seek_threshold = 1.0; // how far off before we seek
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
55
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
56 // how far off is still considered equal
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
57 #define UDP_TIMING_TOLERANCE 0.02
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
58
32001
44c3f5637b8f Avoid duplicating the #if HAVE_WINSOCK2_H mess.
reimar
parents: 31999
diff changeset
59 static void set_blocking(int fd, int blocking)
44c3f5637b8f Avoid duplicating the #if HAVE_WINSOCK2_H mess.
reimar
parents: 31999
diff changeset
60 {
44c3f5637b8f Avoid duplicating the #if HAVE_WINSOCK2_H mess.
reimar
parents: 31999
diff changeset
61 long sock_flags;
44c3f5637b8f Avoid duplicating the #if HAVE_WINSOCK2_H mess.
reimar
parents: 31999
diff changeset
62 #if HAVE_WINSOCK2_H
44c3f5637b8f Avoid duplicating the #if HAVE_WINSOCK2_H mess.
reimar
parents: 31999
diff changeset
63 sock_flags = blocking;
44c3f5637b8f Avoid duplicating the #if HAVE_WINSOCK2_H mess.
reimar
parents: 31999
diff changeset
64 ioctlsocket(fd, FIONBIO, &sock_flags);
44c3f5637b8f Avoid duplicating the #if HAVE_WINSOCK2_H mess.
reimar
parents: 31999
diff changeset
65 #else
44c3f5637b8f Avoid duplicating the #if HAVE_WINSOCK2_H mess.
reimar
parents: 31999
diff changeset
66 sock_flags = fcntl(fd, F_GETFL, 0);
44c3f5637b8f Avoid duplicating the #if HAVE_WINSOCK2_H mess.
reimar
parents: 31999
diff changeset
67 sock_flags = blocking ? sock_flags & ~O_NONBLOCK : sock_flags | O_NONBLOCK;
44c3f5637b8f Avoid duplicating the #if HAVE_WINSOCK2_H mess.
reimar
parents: 31999
diff changeset
68 fcntl(fd, F_SETFL, sock_flags);
44c3f5637b8f Avoid duplicating the #if HAVE_WINSOCK2_H mess.
reimar
parents: 31999
diff changeset
69 #endif /* HAVE_WINSOCK2_H */
44c3f5637b8f Avoid duplicating the #if HAVE_WINSOCK2_H mess.
reimar
parents: 31999
diff changeset
70 }
44c3f5637b8f Avoid duplicating the #if HAVE_WINSOCK2_H mess.
reimar
parents: 31999
diff changeset
71
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
72 // gets a datagram from the master with or without blocking. updates
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
73 // master_position if successful. if the master has exited, returns 1.
32007
b8514776c9ec Handle failures to create a socket.
reimar
parents: 32006
diff changeset
74 // returns -1 on error.
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
75 // otherwise, returns 0.
33153
5dcbfb18ad58 Prefer double type for timing values.
reimar
parents: 32011
diff changeset
76 static int get_udp(int blocking, double *master_position)
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
77 {
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
78 char mesg[100];
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
79
31998
28fb4ef194f9 Avoid duplicating the recvfrom/"bye"-handling code.
reimar
parents: 31996
diff changeset
80 int chars_received = -1;
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
81 int n;
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
82
32008
221819bef85e Use sockfd value to detect if we initialized already instead of a
reimar
parents: 32007
diff changeset
83 static int sockfd = -1;
33155
16e5b7f9ddb8 Send udp master updates also when paused and let slave use normal timing
reimar
parents: 33153
diff changeset
84
16e5b7f9ddb8 Send udp master updates also when paused and let slave use normal timing
reimar
parents: 33153
diff changeset
85 *master_position = MP_NOPTS_VALUE;
16e5b7f9ddb8 Send udp master updates also when paused and let slave use normal timing
reimar
parents: 33153
diff changeset
86
32008
221819bef85e Use sockfd value to detect if we initialized already instead of a
reimar
parents: 32007
diff changeset
87 if (sockfd == -1) {
32002
86d37b0e4dbc Use initializer to avoid leaving struct timeval half-uninitialized.
reimar
parents: 32001
diff changeset
88 struct timeval tv = { .tv_sec = 30 };
31990
4111548d28f9 Use initializer instead of memset, the memset in addition never
reimar
parents: 31985
diff changeset
89 struct sockaddr_in servaddr = { 0 };
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
90
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
91 sockfd = socket(AF_INET, SOCK_DGRAM, 0);
32007
b8514776c9ec Handle failures to create a socket.
reimar
parents: 32006
diff changeset
92 if (sockfd == -1)
b8514776c9ec Handle failures to create a socket.
reimar
parents: 32006
diff changeset
93 return -1;
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
94
31985
09cd33b66ceb whitespace cosmetics
diego
parents: 31982
diff changeset
95 servaddr.sin_family = AF_INET;
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
96 servaddr.sin_addr.s_addr = htonl(INADDR_ANY);
31985
09cd33b66ceb whitespace cosmetics
diego
parents: 31982
diff changeset
97 servaddr.sin_port = htons(udp_port);
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
98 bind(sockfd, (struct sockaddr *)&servaddr, sizeof(servaddr));
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
99
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
100 setsockopt(sockfd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
101
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
102 }
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
103
32001
44c3f5637b8f Avoid duplicating the #if HAVE_WINSOCK2_H mess.
reimar
parents: 31999
diff changeset
104 set_blocking(sockfd, blocking);
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
105
31998
28fb4ef194f9 Avoid duplicating the recvfrom/"bye"-handling code.
reimar
parents: 31996
diff changeset
106 while (-1 != (n = recvfrom(sockfd, mesg, sizeof(mesg)-1, 0,
32010
120953a1fc50 Use NULL for recvfrom return arguments we don't care about (source address).
reimar
parents: 32009
diff changeset
107 NULL, NULL))) {
33156
9ac31195a5e0 Use strtod instead of sscanf, it is both much faster and allows for
reimar
parents: 33155
diff changeset
108 char *end;
31998
28fb4ef194f9 Avoid duplicating the recvfrom/"bye"-handling code.
reimar
parents: 31996
diff changeset
109 // flush out any further messages so we don't get behind
32001
44c3f5637b8f Avoid duplicating the #if HAVE_WINSOCK2_H mess.
reimar
parents: 31999
diff changeset
110 if (chars_received == -1)
44c3f5637b8f Avoid duplicating the #if HAVE_WINSOCK2_H mess.
reimar
parents: 31999
diff changeset
111 set_blocking(sockfd, 0);
44c3f5637b8f Avoid duplicating the #if HAVE_WINSOCK2_H mess.
reimar
parents: 31999
diff changeset
112
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
113 chars_received = n;
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
114 mesg[chars_received] = 0;
31991
52a0d770adee Cosmetics: remove some useless {}
reimar
parents: 31990
diff changeset
115 if (strcmp(mesg, "bye") == 0)
31985
09cd33b66ceb whitespace cosmetics
diego
parents: 31982
diff changeset
116 return 1;
33156
9ac31195a5e0 Use strtod instead of sscanf, it is both much faster and allows for
reimar
parents: 33155
diff changeset
117 *master_position = strtod(mesg, &end);
9ac31195a5e0 Use strtod instead of sscanf, it is both much faster and allows for
reimar
parents: 33155
diff changeset
118 if (*end) {
9ac31195a5e0 Use strtod instead of sscanf, it is both much faster and allows for
reimar
parents: 33155
diff changeset
119 mp_msg(MSGT_CPLAYER, MSGL_WARN, "Could not parse udp string!\n");
9ac31195a5e0 Use strtod instead of sscanf, it is both much faster and allows for
reimar
parents: 33155
diff changeset
120 *master_position = MP_NOPTS_VALUE;
9ac31195a5e0 Use strtod instead of sscanf, it is both much faster and allows for
reimar
parents: 33155
diff changeset
121 }
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
122 }
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
123
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
124 return 0;
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
125 }
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
126
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
127 void send_udp(const char *send_to_ip, int port, char *mesg)
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
128 {
32008
221819bef85e Use sockfd value to detect if we initialized already instead of a
reimar
parents: 32007
diff changeset
129 static int sockfd = -1;
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
130 static struct sockaddr_in socketinfo;
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
131
32008
221819bef85e Use sockfd value to detect if we initialized already instead of a
reimar
parents: 32007
diff changeset
132 if (sockfd == -1) {
32003
30a84c65efa4 Mark a constant as such and move it into the block where it is used.
reimar
parents: 32002
diff changeset
133 static const int one = 1;
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
134 int ip_valid = 0;
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
135
31985
09cd33b66ceb whitespace cosmetics
diego
parents: 31982
diff changeset
136 sockfd = socket(AF_INET, SOCK_DGRAM, 0);
32007
b8514776c9ec Handle failures to create a socket.
reimar
parents: 32006
diff changeset
137 if (sockfd == -1)
b8514776c9ec Handle failures to create a socket.
reimar
parents: 32006
diff changeset
138 exit_player(EXIT_ERROR);
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
139
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
140 // Enable broadcast
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
141 setsockopt(sockfd, SOL_SOCKET, SO_BROADCAST, &one, sizeof(one));
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
142
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
143 #if HAVE_WINSOCK2_H
32006
3133252ce3fa Actually set the destination address in the sockaddr_in struct for Windows as well...
reimar
parents: 32003
diff changeset
144 socketinfo.sin_addr.s_addr = inet_addr(send_to_ip);
3133252ce3fa Actually set the destination address in the sockaddr_in struct for Windows as well...
reimar
parents: 32003
diff changeset
145 ip_valid = socketinfo.sin_addr.s_addr != INADDR_NONE;
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
146 #else
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
147 ip_valid = inet_aton(send_to_ip, &socketinfo.sin_addr);
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
148 #endif
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
149
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
150 if (!ip_valid) {
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
151 mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_InvalidIP);
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
152 exit_player(EXIT_ERROR);
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
153 }
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
154
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
155 socketinfo.sin_family = AF_INET;
31985
09cd33b66ceb whitespace cosmetics
diego
parents: 31982
diff changeset
156 socketinfo.sin_port = htons(port);
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
157 }
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
158
31985
09cd33b66ceb whitespace cosmetics
diego
parents: 31982
diff changeset
159 sendto(sockfd, mesg, strlen(mesg), 0, (struct sockaddr *) &socketinfo,
09cd33b66ceb whitespace cosmetics
diego
parents: 31982
diff changeset
160 sizeof(socketinfo));
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
161 }
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
162
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
163 // this function makes sure we stay as close as possible to the master's
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
164 // position. returns 1 if the master tells us to exit, 0 otherwise.
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
165 int udp_slave_sync(MPContext *mpctx)
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
166 {
33155
16e5b7f9ddb8 Send udp master updates also when paused and let slave use normal timing
reimar
parents: 33153
diff changeset
167 double udp_master_position;
16e5b7f9ddb8 Send udp master updates also when paused and let slave use normal timing
reimar
parents: 33153
diff changeset
168
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
169 // grab any waiting datagrams without blocking
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
170 int master_exited = get_udp(0, &udp_master_position);
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
171
33155
16e5b7f9ddb8 Send udp master updates also when paused and let slave use normal timing
reimar
parents: 33153
diff changeset
172 while (udp_master_position != MP_NOPTS_VALUE && !master_exited) {
33153
5dcbfb18ad58 Prefer double type for timing values.
reimar
parents: 32011
diff changeset
173 double my_position = mpctx->sh_video->pts;
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
174
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
175 // if we're way off, seek to catch up
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
176 if (FFABS(my_position - udp_master_position) > udp_seek_threshold) {
31985
09cd33b66ceb whitespace cosmetics
diego
parents: 31982
diff changeset
177 abs_seek_pos = SEEK_ABSOLUTE;
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
178 rel_seek_secs = udp_master_position;
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
179 break;
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
180 }
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
181
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
182 // normally we expect that the master will have just played the
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
183 // frame we're ready to play. break out and play it, and we'll be
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
184 // right in sync.
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
185 // or, the master might be up to a few seconds ahead of us, in
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
186 // which case we also want to play the current frame immediately,
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
187 // without waiting.
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
188 // UDP_TIMING_TOLERANCE is a small value that lets us consider
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
189 // the master equal to us even if it's very slightly ahead.
31991
52a0d770adee Cosmetics: remove some useless {}
reimar
parents: 31990
diff changeset
190 if (udp_master_position + UDP_TIMING_TOLERANCE > my_position)
31992
4229b325910e Fix indentation.
reimar
parents: 31991
diff changeset
191 break;
31982
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
192
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
193 // the remaining case is that we're slightly ahead of the master.
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
194 // usually, it just means we called get_udp() before the datagram
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
195 // arrived. call get_udp again, but this time block until we receive
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
196 // a datagram.
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
197 master_exited = get_udp(1, &udp_master_position);
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
198 }
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
199
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
200 return master_exited;
184969a3a437 Add synchronization of multiple MPlayer instances over UDP.
reimar
parents:
diff changeset
201 }