From 83aee1fd077355f22af2d735661cb81506c18c9b Mon Sep 17 00:00:00 2001
From: fduncanh <fduncanh@gmail.com>
Date: Mon, 2 May 2022 22:12:05 -0400
Subject: [PATCH] cosmetic changes

---
 README.html                          |  3 ++-
 README.md                            |  5 ++++-
 README.txt                           |  6 +++++-
 lib/raop_rtp.c                       |  5 +++--
 renderers/video_renderer_gstreamer.c | 11 ++++++++++-
 uxplay.1                             |  4 ++--
 uxplay.cpp                           |  2 +-
 7 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/README.html b/README.html
index 0e1034c..0b0dd7e 100644
--- a/README.html
+++ b/README.html
@@ -1,4 +1,4 @@
-<h1 id="uxplay-1.51-airplayairplay-mirror-server-for-linux-macos-and-unix.">UxPlay 1.51: AirPlay/AirPlay-Mirror server for Linux, macOS, and Unix.</h1>
+<h1 id="uxplay-1.52-airplayairplay-mirror-server-for-linux-macos-and-unix.">UxPlay 1.52: AirPlay/AirPlay-Mirror server for Linux, macOS, and Unix.</h1>
 <h3 id="now-developed-at-github-site-httpsgithub.comfdh2uxplay-where-user-issues-should-be-posted.">Now developed at GitHub site <a href="https://github.com/FDH2/UxPlay">https://github.com/FDH2/UxPlay</a> (where user issues should be posted).</h3>
 <p>Highlights:</p>
 <ul>
@@ -139,6 +139,7 @@
 <p>This triggers an unending stream of error messages, and means that the audio decryption key (also used in video decryption) was not correctly extracted from data sent by the client. This should not happen for iOS 9.3 or later clients. However, if a client uses the same older version of the protocol that is used by the Windows-based AirPlay client emulator <em>AirMyPC</em>, the protocol can be switched to the older version by the setting <code>OLD_PROTOCOL_CLIENT_USER_AGENT_LIST</code> in lib/global.h. UxPlay reports the client’s “User Agent” string when it connects. If some other client also fails to decrypt all audio and video, try adding its “User Agent” string in place of “xxx” in the entry “AirMyPC/2.0;xxx” in global.h and rebuild uxplay.</p>
 <p>Note that Uxplay declares itself to be an AppleTV3,2 with a sourceVersion 220.68; this can also be changed in global.h. It had been thought that it was necessary for UxPlay to claim to be an older 32 bit AppleTV model that cannot run modern 64bit tvOS, in order for the client to use a “legacy” protocol for pairing with the server (see the <em>“Notes on AirPlay protocol versions”</em> at the end of this README). However, UxPlay still works if it declares itself as an AppleTV6,2 with sourceVersion 380.20.1 (an AppleTV 4K 1st gen, introduced 2017, running tvOS 12.2.1), so it is unclear what setting prompts the client to use the “legacy” protocol needed by UxPlay.</p>
 <h1 id="changelog">ChangeLog</h1>
+<p>1.52 2022-05-02 Cleaned up initial audio sync code, and reformatted streaming debug output (readable aligned timestamps with decimal points in seconds).</p>
 <p>1.51 2022-04-24 Reworked options forVideo4Linux2 support (new option -v4l2) and short options -rpi, -rpifb, -rpiwl as synonyms for -v4l2, -v4l2 -vs kmssink, and -v4l2 -vs waylandsink. Reverted a change from 1.48 that broke reconnection after “Stop Mirroring” is sent by client.</p>
 <p>1.50 2022-04-22 Added -fs fullscreen option (for Wayland or VAAPI plugins only), Changed -rpi to be for framebuffer (“lite”) RPi systems and added -rpigl (OpenGL) and -rpiwl (Wayland) options for RPi Desktop systems. Also modified timestamps from “DTS” to “PTS” for latency improvement, plus internal cleanups.</p>
 <p>1.49 2022-03-28 Addded options for dumping video and/or audio to file, for debugging, etc. h264 PPS/SPS NALU’s are shown with -d. Fixed video-not-working for M1 Mac clients.</p>
diff --git a/README.md b/README.md
index 504f692..ea52980 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# UxPlay 1.51:  AirPlay/AirPlay-Mirror server for Linux, macOS, and Unix.
+# UxPlay 1.52:  AirPlay/AirPlay-Mirror server for Linux, macOS, and Unix.
 
 ### Now developed at GitHub site [https://github.com/FDH2/UxPlay](https://github.com/FDH2/UxPlay) (where user issues should be posted).
 
@@ -595,6 +595,9 @@ tvOS 12.2.1), so it is unclear what setting prompts the client
 to use the "legacy" protocol needed by UxPlay.
 
 # ChangeLog
+1.52 2022-05-02   Cleaned up initial audio sync code, and reformatted streaming debug output (readable aligned timestamps with
+                  decimal points in seconds).
+
 1.51 2022-04-24   Reworked options forVideo4Linux2 support (new option -v4l2) and short options -rpi, -rpifb, -rpiwl as
                   synonyms for -v4l2,  -v4l2 -vs kmssink, and -v4l2 -vs waylandsink.  Reverted a change from 1.48 that broke
 		  reconnection after "Stop Mirroring" is sent by client.
diff --git a/README.txt b/README.txt
index 41bf19b..8800c52 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-UxPlay 1.51: AirPlay/AirPlay-Mirror server for Linux, macOS, and Unix.
+UxPlay 1.52: AirPlay/AirPlay-Mirror server for Linux, macOS, and Unix.
 ======================================================================
 
 ### Now developed at GitHub site <https://github.com/FDH2/UxPlay> (where user issues should be posted).
@@ -777,6 +777,10 @@ the "legacy" protocol needed by UxPlay.
 ChangeLog
 =========
 
+1.52 2022-05-02 Cleaned up initial audio sync code, and reformatted
+streaming debug output (readable aligned timestamps with decimal points
+in seconds).
+
 1.51 2022-04-24 Reworked options forVideo4Linux2 support (new option
 -v4l2) and short options -rpi, -rpifb, -rpiwl as synonyms for -v4l2,
 -v4l2 -vs kmssink, and -v4l2 -vs waylandsink. Reverted a change from
diff --git a/lib/raop_rtp.c b/lib/raop_rtp.c
index 2ee8911..3ba7f78 100644
--- a/lib/raop_rtp.c
+++ b/lib/raop_rtp.c
@@ -579,8 +579,9 @@ raop_rtp_thread_udp(void *arg)
                             ntp_timestamp += (int64_t) ((double) rtp_timestamp) / raop_rtp->rtp_sync_scale;
                             latency =  ntp_now - ntp_timestamp;
                             unsigned short seqnum = byteutils_get_short_be(packet, 2);
-                            logger_log(raop_rtp->logger, LOGGER_DEBUG, "initial  audio: now = %8.6f, npt = %8.6f, latency = %8.6f, rtp_time=%u seqnum = %u (not from sync)",
-                                      ((double) ntp_now ) / SEC, ((double) ntp_timestamp) / SEC, ((double) latency) / SEC, rtp_timestamp, seqnum);
+                            logger_log(raop_rtp->logger, LOGGER_DEBUG,
+                                       "initial  audio: now = %8.6f, npt = %8.6f, latency = %8.6f, rtp_time=%u seqnum = %u (not from sync)",
+                                       ((double) ntp_now ) / SEC, ((double) ntp_timestamp) / SEC, ((double) latency) / SEC, rtp_timestamp, seqnum);
                         }  else {
                             logger_log(raop_rtp->logger, LOGGER_DEBUG, "First audio packet received, have_synced = true");
                         }
diff --git a/renderers/video_renderer_gstreamer.c b/renderers/video_renderer_gstreamer.c
index 462b876..b581d8e 100644
--- a/renderers/video_renderer_gstreamer.c
+++ b/renderers/video_renderer_gstreamer.c
@@ -264,7 +264,16 @@ gboolean gstreamer_pipeline_bus_callback(GstBus *bus, GstMessage *message, gpoin
         gboolean flushing;
         gst_message_parse_error (message, &err, &debug);
         logger_log(logger, LOGGER_INFO, "GStreamer error: %s", err->message);
-        g_error_free (err);
+        if (strstr(err->message,"Internal data stream error")) {
+            logger_log(logger, LOGGER_INFO,
+                     "*** This is a generic GStreamer error that usually means that GStreamer\n"
+                     "*** was unable to construct a working video pipeline.  If you are using\n"
+                     "*** the default autovideosink for automated selection of the videosink,\n "
+                     "*** GStreamer may be trying to use non-functional hardware h264 video decoding.\n"
+                     "*** Try using option -avdec to force software decoding or use -vs <videosink>\n"
+                     "*** to select a videosink of your choice (see \"man uxplay\")");
+        }
+	g_error_free (err);
         g_free (debug);
         gst_app_src_end_of_stream (GST_APP_SRC(renderer->appsrc));
 	flushing = TRUE;
diff --git a/uxplay.1 b/uxplay.1
index 48b4f8e..7006a94 100644
--- a/uxplay.1
+++ b/uxplay.1
@@ -1,11 +1,11 @@
-.TH UXPLAY "1" "April 2022" "1.51" "User Commands"
+\41;330;0c.TH UXPLAY "1" "May 2022" "1.52" "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.51: An open\-source AirPlay mirroring server based on RPiPlay
+UxPlay 1.52: An open\-source AirPlay mirroring server based on RPiPlay
 .SH OPTIONS
 .TP
 .B
diff --git a/uxplay.cpp b/uxplay.cpp
index 7f9b022..037cb81 100644
--- a/uxplay.cpp
+++ b/uxplay.cpp
@@ -44,7 +44,7 @@
 #include "renderers/video_renderer.h"
 #include "renderers/audio_renderer.h"
 
-#define VERSION "1.51"
+#define VERSION "1.52"
 
 #define DEFAULT_NAME "UxPlay"
 #define DEFAULT_DEBUG_LOG false