morgan/UxPlay
1
0
Fork 0
mirror of https://github.com/morgan9e/UxPlay synced 2026-04-15 00:34:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

UxPlay 1.61 remove -t option and CMakeList.txt fixes; refactor uxplay.cpp

Browse Source
This commit is contained in:
F. Duncanh
2022-12-29 20:23:04 -05:00
parent da50d5efe0
commit 66f92b0659
5 changed files with 57 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
README.html
View File

@@ -1,6 +1,6 @@
<h1
id="uxplay-1.60-airplay-mirror-and-airplay-audio-server-for-linux-macos-and-unix-now-also-runs-on-windows.">UxPlay
1.60: AirPlay-Mirror and AirPlay-Audio server for Linux, macOS, and Unix
id="uxplay-1.61-airplay-mirror-and-airplay-audio-server-for-linux-macos-and-unix-now-also-runs-on-windows.">UxPlay
1.61: AirPlay-Mirror and AirPlay-Audio server for Linux, macOS, and Unix
(now also runs on Windows).</h1>
<h3
id="now-developed-at-the-github-site-httpsgithub.comfdh2uxplay-where-all-user-issues-should-be-posted.">Now
@@ -304,7 +304,8 @@ avahi-daemon is not running, control it with
avahi-daemon.service). If UxPlay is seen, but the client fails to
connect when it is selected, there may be a firewall on the server that
prevents UxPlay from receiving client connection requests unless some
network ports are opened. See <a
network ports are opened: if a firewall is active, also open UDP port
5353 (for mDNS queries) needed by Avahi. See <a
href="#troubleshooting">Troubleshooting</a> below for help with this or
other problems.</p>
<ul>
@@ -788,15 +789,10 @@ card, (more specifically, the MAC address used by the first active
network interface detected) a random MAC address will be used even if
option <strong>-m</strong> was not specified. (Note that a random MAC
address will be different each time UxPlay is started).</p>
<p><strong>-t <em>timeout</em></strong> will cause the server to
relaunch (without stopping uxplay) if no connections have been present
during the previous <em>timeout</em> seconds. You may wish to use this
if the Server is not visible to new Clients that were inactive when the
Server was launched, and an idle Bonjour registration eventually becomes
unavailable for new connections (this is a workaround for what may be
due to a problem with your DNS-SD or Avahi setup). <em>This option is
currently disabled in macOS, for the same reason that requires the -nc
option.</em></p>
<p><strong>-t <em>timeout</em></strong> [This option was removed in
UxPlay v.1.61.] It was a workaround for an Avahi problem that occurs
when there is a firewall and network port UDP 5353 (for mDNS queries)
was not opened.</p>
<p><strong>-vdmp</strong> Dumps h264 video to file videodump.h264. -vdmp
n dumps not more than n NAL units to videodump.x.h264; x= 1,2,…
increases each time a SPS/PPS NAL unit arrives. To change the name
@@ -1034,6 +1030,10 @@ as “SupportsLegacyPairing”) of the “features” plist code (reported to
the client by the AirPlay server) to be set. The “features” code and
other settings are set in <code>UxPlay/lib/dnssdint.h</code>.</p>
<h1 id="changelog">Changelog</h1>
<p>1.61 2022-12-30 Removed -t option (workaround for an Avahi issue,
correctly solved by opening network port UDP 5353 in firewall). Remove
-g debug flag from CMAKE_CFLAGS. Postpend (instead of prepend) build
environment CFLAGS to CMAKE_CFLAGS. Refactor parts of uxplay.cpp</p>
<p>1.60 2022-12-15 Added exit with error message if DNSServiceRegister
fails (instead of just stalling). Test for Client’s attempt to using
unsupported AirPlay 2 “REMOTE CONTROL” protocol (with no timing

17
README.md
View File

@@ -1,4 +1,4 @@
# UxPlay 1.60: AirPlay-Mirror and AirPlay-Audio server for Linux, macOS, and Unix (now also runs on Windows).
# UxPlay 1.61: AirPlay-Mirror and AirPlay-Audio server for Linux, macOS, and Unix (now also runs on Windows).
### Now developed at the GitHub site [https://github.com/FDH2/UxPlay](https://github.com/FDH2/UxPlay) (where all user issues should be posted).
@@ -251,7 +251,8 @@ with ```sudo systemctl [start,stop,enable,disable] avahi-daemon``` (or
avahi-daemon.service). If UxPlay is seen, but the client fails to connect
when it is selected, there may be a firewall on the server that prevents
UxPlay from receiving client connection requests unless some network ports
are opened. See [Troubleshooting](#troubleshooting) below for
are opened: if a firewall is active, also open UDP port 5353 (for mDNS queries)
needed by Avahi. See [Troubleshooting](#troubleshooting) below for
help with this or other problems.
* By default, UxPlay is locked to
@@ -664,12 +665,8 @@ which will not work if a firewall is running.
a random MAC address will be used even if option **-m** was not specified.
(Note that a random MAC address will be different each time UxPlay is started).
**-t _timeout_** will cause the server to relaunch (without stopping uxplay) if no connections
have been present during the previous _timeout_ seconds. You may wish to use this if the Server
is not visible to new Clients that were inactive when the Server was launched, and an idle Bonjour
registration eventually becomes unavailable for new connections (this is a workaround for what
may be due to a problem with your DNS-SD or Avahi setup). _This option is currently disabled in
macOS, for the same reason that requires the -nc option._
**-t _timeout_** [This option was removed in UxPlay v.1.61.] It was a workaround for
an Avahi problem that occurs when there is a firewall and network port UDP 5353 (for mDNS queries) was not opened.
**-vdmp** Dumps h264 video to file videodump.h264. -vdmp n dumps not more than n NAL units to
videodump.x.h264; x= 1,2,... increases each time a SPS/PPS NAL unit arrives. To change the name
@@ -864,6 +861,10 @@ tvOS 12.2.1); it seems that the use of "legacy" protocol just requires bit 27 (l
The "features" code and other settings are set in `UxPlay/lib/dnssdint.h`.
# Changelog
1.61 2022-12-30 Removed -t option (workaround for an Avahi issue, correctly solved by opening network
port UDP 5353 in firewall). Remove -g debug flag from CMAKE_CFLAGS. Postpend (instead
of prepend) build environment CFLAGS to CMAKE_CFLAGS. Refactor parts of uxplay.cpp
1.60 2022-12-15 Added exit with error message if DNSServiceRegister fails (instead of just stalling).
Test for Client's attempt to using unsupported AirPlay 2 "REMOTE CONTROL" protocol
(with no timing channel), and exit if this occurs. Reworked metadata processing

24
README.txt
View File

@@ -1,4 +1,4 @@
# UxPlay 1.60: AirPlay-Mirror and AirPlay-Audio server for Linux, macOS, and Unix (now also runs on Windows).
# UxPlay 1.61: AirPlay-Mirror and AirPlay-Audio server for Linux, macOS, and Unix (now also runs on Windows).
### Now developed at the GitHub site <https://github.com/FDH2/UxPlay> (where all user issues should be posted).
@@ -296,8 +296,10 @@ running, control it with
avahi-daemon.service). If UxPlay is seen, but the client fails to
connect when it is selected, there may be a firewall on the server that
prevents UxPlay from receiving client connection requests unless some
network ports are opened. See [Troubleshooting](#troubleshooting) below
for help with this or other problems.
network ports are opened: if a firewall is active, also open UDP port
5353 (for mDNS queries) needed by Avahi. See
[Troubleshooting](#troubleshooting) below for help with this or other
problems.
- By default, UxPlay is locked to its current client until that client
drops the connection; the option `-nohold` modifies this behavior so
@@ -804,14 +806,9 @@ network interface detected) a random MAC address will be used even if
option **-m** was not specified. (Note that a random MAC address will be
different each time UxPlay is started).
**-t *timeout*** will cause the server to relaunch (without stopping
uxplay) if no connections have been present during the previous
*timeout* seconds. You may wish to use this if the Server is not visible
to new Clients that were inactive when the Server was launched, and an
idle Bonjour registration eventually becomes unavailable for new
connections (this is a workaround for what may be due to a problem with
your DNS-SD or Avahi setup). *This option is currently disabled in
macOS, for the same reason that requires the -nc option.*
**-t *timeout*** \[This option was removed in UxPlay v.1.61.\] It was a
workaround for an Avahi problem that occurs when there is a firewall and
network port UDP 5353 (for mDNS queries) was not opened.
**-vdmp** Dumps h264 video to file videodump.h264. -vdmp n dumps not
more than n NAL units to videodump.x.h264; x= 1,2,... increases each
@@ -1063,6 +1060,11 @@ other settings are set in `UxPlay/lib/dnssdint.h`.
# Changelog
1.61 2022-12-30 Removed -t option (workaround for an Avahi issue,
correctly solved by opening network port UDP 5353 in firewall). Remove
-g debug flag from CMAKE_CFLAGS. Postpend (instead of prepend) build
environment CFLAGS to CMAKE_CFLAGS. Refactor parts of uxplay.cpp
1.60 2022-12-15 Added exit with error message if DNSServiceRegister
fails (instead of just stalling). Test for Client's attempt to using
unsupported AirPlay 2 "REMOTE CONTROL" protocol (with no timing

6
uxplay.1
View File

@@ -1,11 +1,11 @@
.TH UXPLAY "1" "December 2022" "1.60" "User Commands"
.TH UXPLAY "1" "December 2022" "1.61" "User Commands"
.SH NAME
uxplay \- start AirPlay server
.SH SYNOPSIS
.B uxplay
[\fI\,-n name\/\fR] [\fI\,-s wxh\/\fR] [\fI\,-p \/\fR[\fI\,n\/\fR]] [more \fI OPTIONS \/\fR ...]
.SH DESCRIPTION
UxPlay 1.60: An open\-source AirPlay mirroring (+ audio streaming) server.
UxPlay 1.61: An open\-source AirPlay mirroring (+ audio streaming) server.
.SH OPTIONS
.TP
.B
@@ -91,8 +91,6 @@ UxPlay 1.60: An open\-source AirPlay mirroring (+ audio streaming) server.
.TP
\fB\-m\fR Use random MAC address (use for concurrent UxPlay's)
.TP
\fB\-t\fR n Relaunch server if no connection existed in last n seconds
.TP
\fB\-vdmp\fR [n] Dump h264 video output to "fn.h264"; fn="videodump", change
.IP
with "-vdmp [n] filename". If [n] is given, file fn.x.h264

73
uxplay.cpp
View File

@@ -51,7 +51,7 @@
#include "renderers/video_renderer.h"
#include "renderers/audio_renderer.h"
#define VERSION "1.60"
#define VERSION "1.61"
#define DEFAULT_NAME "UxPlay"
#define DEFAULT_DEBUG_LOG false
@@ -66,12 +66,8 @@ static raop_t *raop = NULL;
static logger_t *render_logger = NULL;
static bool relaunch_video = false;
static bool relaunch_server = false;
static bool reset_loop = false;
static unsigned int open_connections = 0;
static bool connections_stopped = false;
static unsigned int server_timeout = 0;
static unsigned int counter;
static unsigned int open_connections= 0;
static std::string videosink = "autovideosink";
static videoflip_t videoflip[2] = { NONE , NONE };
static bool use_video = true;
@@ -195,20 +191,6 @@ static void dump_video_to_file(unsigned char *data, int datalen) {
}
}
static gboolean connection_callback (gpointer loop){
if (!connections_stopped) {
counter = 0;
} else {
if (++counter == server_timeout) {
LOGD("no connections for %d seconds: relaunch server",server_timeout);
relaunch_server = true;
relaunch_video = false;
g_main_loop_quit((GMainLoop *) loop);
}
}
return TRUE;
}
static gboolean reset_callback(gpointer loop) {
if (reset_loop) {
g_main_loop_quit((GMainLoop *) loop);
@@ -218,14 +200,12 @@ static gboolean reset_callback(gpointer loop) {
static gboolean sigint_callback(gpointer loop) {
relaunch_video = false;
relaunch_server = false;
g_main_loop_quit((GMainLoop *) loop);
return TRUE;
}
static gboolean sigterm_callback(gpointer loop) {
relaunch_video = false;
relaunch_server = false;
g_main_loop_quit((GMainLoop *) loop);
return TRUE;
}
@@ -255,11 +235,7 @@ static void main_loop() {
guint connection_watch_id = 0;
guint gst_bus_watch_id = 0;
GMainLoop *loop = g_main_loop_new(NULL,FALSE);
if (server_timeout) {
connection_watch_id = g_timeout_add_seconds(1, (GSourceFunc) connection_callback, (gpointer) loop);
}
relaunch_video = false;
relaunch_server = false;
if (use_video) {
relaunch_video = true;
gst_bus_watch_id = (guint) video_renderer_listen((void *)loop);
@@ -273,7 +249,6 @@ static void main_loop() {
if (sigint_watch_id > 0) g_source_remove(sigint_watch_id);
if (sigterm_watch_id > 0) g_source_remove(sigterm_watch_id);
if (reset_watch_id > 0) g_source_remove(reset_watch_id);
if (connection_watch_id > 0) g_source_remove(connection_watch_id);
g_main_loop_unref(loop);
}
@@ -420,7 +395,6 @@ static void print_info (char *name) {
printf("-f {H|V|I}Horizontal|Vertical flip, or both=Inversion=rotate 180 deg\n");
printf("-r {R|L} Rotate 90 degrees Right (cw) or Left (ccw)\n");
printf("-m Use random MAC address (use for concurrent UxPlay's)\n");
printf("-t n Relaunch server if no connection existed in last n seconds\n");
printf("-vdmp [n] Dump h264 video output to \"fn.h264\"; fn=\"videodump\",change\n");
printf(" with \"-vdmp [n] filename\". If [n] is given, file fn.x.h264\n");
printf(" x=1,2,.. opens whenever a new SPS/PPS NAL arrives, and <=n\n");
@@ -657,13 +631,9 @@ static void parse_arguments (int argc, char *argv[]) {
audiosink.erase();
audiosink.append(argv[++i]);
} else if (arg == "-t") {
if (!option_has_value(i, argc, argv[i], argv[i+1])) exit(1);
server_timeout = 0;
bool valid = get_value(argv[++i], &server_timeout);
if (!valid || server_timeout == 0) {
fprintf(stderr,"invalid \"-t %s\", must have -t n with n > 0\n",argv[i]);
exit(1);
}
fprintf(stderr,"The uxplay option \"-t\" has been removed: it was a workaround for an Avahi issue.\n");
fprintf(stderr,"The correct solution is to open network port UDP 5353 in the firewall for mDNS queries\n");
exit(1);
} else if (arg == "-nc") {
new_window_closing_behavior = false;
} else if (arg == "-avdec") {
@@ -958,7 +928,6 @@ static int start_dnssd(std::vector<char> hw_addr, std::string name) {
// Server callbacks
extern "C" void conn_init (void *cls) {
open_connections++;
connections_stopped = false;
//LOGD("Open connections: %i", open_connections);
//video_renderer_update_background(1);
}
@@ -967,9 +936,6 @@ extern "C" void conn_destroy (void *cls) {
//video_renderer_update_background(-1);
open_connections--;
//LOGD("Open connections: %i", open_connections);
if (!open_connections) {
connections_stopped = true;
}
}
extern "C" void conn_reset (void *cls, int timeouts, bool reset_video) {
@@ -1010,9 +976,9 @@ extern "C" void video_process (void *cls, raop_ntp_t *ntp, h264_decode_struct *d
}
extern "C" void audio_flush (void *cls) {
if (use_audio) {
audio_renderer_flush();
}
if (use_audio) {
audio_renderer_flush();
}
}
extern "C" void video_flush (void *cls) {
@@ -1206,6 +1172,8 @@ static void stop_raop_server () {
int main (int argc, char *argv[]) {
std::vector<char> server_hw_addr;
std::string mac_address;
#ifdef SUPPRESS_AVAHI_COMPAT_WARNING
// suppress avahi_compat nag message. avahi emits a "nag" warning (once)
// if getenv("AVAHI_COMPAT_NOWARN") returns null.
@@ -1246,7 +1214,6 @@ int main (int argc, char *argv[]) {
/* force use of -nc option on macOS */
LOGI("macOS detected: use -nc option as workaround for GStreamer problem");
new_window_closing_behavior = false;
server_timeout = 0;
#endif
if (videosink == "0") {
@@ -1274,7 +1241,9 @@ int main (int argc, char *argv[]) {
video_parser.append(BT709_FIX);
}
if (do_append_hostname) append_hostname(server_name);
if (do_append_hostname) {
append_hostname(server_name);
}
if (!gstreamer_init()) {
LOGE ("stopping");
@@ -1297,11 +1266,13 @@ int main (int argc, char *argv[]) {
video_renderer_start();
}
if (udp[0]) LOGI("using network ports UDP %d %d %d TCP %d %d %d",
udp[0],udp[1], udp[2], tcp[0], tcp[1], tcp[2]);
if (udp[0]) {
LOGI("using network ports UDP %d %d %d TCP %d %d %d", udp[0], udp[1], udp[2], tcp[0], tcp[1], tcp[2]);
}
std::string mac_address;
if (!use_random_hw_addr) mac_address = find_mac();
if (!use_random_hw_addr) {
mac_address = find_mac();
}
if (mac_address.empty()) {
srand(time(NULL) * getpid());
mac_address = random_mac();
@@ -1317,7 +1288,6 @@ int main (int argc, char *argv[]) {
write_coverart(coverart_filename.c_str(), (const void *) empty_image, sizeof(empty_image));
}
connections_stopped = true;
restart:
if (start_dnssd(server_hw_addr, server_name)) {
return 1;
@@ -1331,11 +1301,10 @@ int main (int argc, char *argv[]) {
return 1;
}
reconnect:
counter = 0;
compression_type = 0;
close_window = new_window_closing_behavior;
main_loop();
if (relaunch_server || relaunch_video || reset_loop) {
if (relaunch_video || reset_loop) {
if(reset_loop) {
reset_loop = false;
} else {
@@ -1365,7 +1334,7 @@ int main (int argc, char *argv[]) {
stop_dnssd();
}
if (use_audio) {
audio_renderer_destroy();
audio_renderer_destroy();
}
if (use_video) {
video_renderer_destroy();