Version 0.8.1

Updated Moonlight icon

.gitignore

@@ -2,4 +2,6 @@
 
 
 **/.vs/
-build/
+build/
+config.tests/*/.qmake.stash
+config.tests/*/Makefile

README.md

@@ -34,8 +34,8 @@ You can follow development on our [Discord server](https://discord.gg/6ERtzFY).
 * WiX Toolset v3.11 or later (only if building installers for non-development PCs)
 
 ### Mac-specific Requirements
-* macOS El Capitan (10.11) or later
-* Xcode with High Sierra (10.13) SDK (Mojave SDK not yet supported until Qt 5.12 later this year)
+* macOS Sierra (10.12) or later
+* Xcode 10
 * [create-dmg](https://github.com/sindresorhus/create-dmg) (only if building DMGs for use on non-development Macs)
 
 ### Linux-specific Requirements
@@ -45,12 +45,14 @@ You can follow development on our [Discord server](https://discord.gg/6ERtzFY).
 
 ### Build Setup Steps
 1. Install the latest Qt SDK (and optionally, the Qt Creator IDE) from https://www.qt.io/download
-    * You may also use Homebrew on macOS or your Linux distro's package manager for the Qt SDK as long as the packages are Qt 5.9 or later.
+    * You can install Qt via Homebrew on macOS, but you will need to use `brew install qt --with-debug` to be able to create debug builds of Moonlight.
+    * You may also use your Linux distro's package manager for the Qt SDK as long as the packages are Qt 5.9 or later.
 2. Run `git submodule update --init --recursive` from within `moonlight-qt/`
 3. Open the project in Qt Creator or build from qmake on the command line.
     * To build a binary for use on non-development machines, use the scripts in the `scripts` folder.
         * For Windows builds, use `scripts\generate-installers.bat`. Execute this script from the root of the repository within a Qt command prompt. Ensure WiX and 7-Zip binary directories are in your `%PATH%`.
         * For macOS builds, use `scripts/generate-dmg.sh`. Execute this script from the root of the repository and ensure Qt's `bin` folder is in your `$PATH`.
+    * To build from the command line for development use, run `qmake moonlight-qt.pro` then `make debug` or `make release`
 
 ## Contribute
 1. Fork us

app/Info.plist

@@ -23,9 +23,9 @@
 	<key>NSSupportsAutomaticGraphicsSwitching</key>
 	<true/>
 	<key>CFBundleVersion</key>
-	<string>0.8.0</string>
+	<string>VERSION</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.8.0</string>
+	<string>VERSION</string>
 	<key>CFBundleDisplayName</key>
 	<string>Moonlight</string>
 </dict>

app/app.pro

@@ -314,7 +314,11 @@ win32 {
     QMAKE_LFLAGS += /MANIFEST:embed /MANIFESTINPUT:$${PWD}/Moonlight.exe.manifest
 }
 macx {
-    QMAKE_INFO_PLIST = $$PWD/Info.plist
+    # Create Info.plist in object dir with the correct version string
+    system(cp $$PWD/Info.plist $$OUT_PWD/Info.plist)
+    system(sed -i -e 's/VERSION/$$cat(version.txt)/g' $$OUT_PWD/Info.plist)
+
+    QMAKE_INFO_PLIST = $$OUT_PWD/Info.plist
 
     APP_BUNDLE_RESOURCES.files = moonlight.icns SDL_GameControllerDB/gamecontrollerdb.txt
     APP_BUNDLE_RESOURCES.path = Contents/Resources
@@ -327,5 +331,5 @@ macx {
     QMAKE_RPATHDIR += @executable_path/../Frameworks
 }
 
-VERSION = 0.8.0
-DEFINES += VERSION_STR=\\\"0.8.0\\\"
+VERSION = "$$cat(version.txt)"
+DEFINES += VERSION_STR=\\\"$$cat(version.txt)\\\"

app/backend/autoupdatechecker.cpp

@@ -116,7 +116,8 @@ void AutoUpdateChecker::handleUpdateCheckRequestFinished(QNetworkReply* reply)
                         if (currentVer < latestVer) {
                             qDebug() << "Update available";
 
-                            emit onUpdateAvailable(updateObj["browser_url"].toString());
+                            emit onUpdateAvailable(updateObj["version"].toString(),
+                                                   updateObj["browser_url"].toString());
                             return;
                         }
                         else if (currentVer > latestVer) {

app/backend/autoupdatechecker.h

@@ -12,7 +12,7 @@ public:
     Q_INVOKABLE void start();
 
 signals:
-    void onUpdateAvailable(QString url);
+    void onUpdateAvailable(QString newVersion, QString url);
 
 private slots:
     void handleUpdateCheckRequestFinished(QNetworkReply* reply);

app/backend/computermanager.cpp

@@ -611,7 +611,7 @@ private:
 
             // Get the WAN IP address using STUN if we're on mDNS
             quint32 addr;
-            int err = LiFindExternalAddressIP4("stun.stunprotocol.org", 3478, &addr);
+            int err = LiFindExternalAddressIP4("stun.moonlight-stream.org", 3478, &addr);
             if (err == 0) {
                 newComputer->remoteAddress = QHostAddress(qFromBigEndian(addr)).toString();
             }

app/backend/nvcomputer.cpp

@@ -2,6 +2,7 @@
 
 #include <QUdpSocket>
 #include <QHostInfo>
+#include <QNetworkInterface>
 
 #define SER_NAME "hostname"
 #define SER_UUID "uuid"
@@ -172,6 +173,32 @@ bool NvComputer::wake()
     QVector<QString> addressList = uniqueAddresses();
     addressList.append("255.255.255.255");
 
+    // Try to broadcast on all available NICs
+    for (const QNetworkInterface& nic : QNetworkInterface::allInterfaces()) {
+        // Ensure the interface is up and skip the loopback adapter
+        if ((nic.flags() & QNetworkInterface::IsUp) == 0 ||
+                (nic.flags() & QNetworkInterface::IsLoopBack) != 0) {
+            continue;
+        }
+
+        QHostAddress allNodesMulticast("FF02::1");
+        for (const QNetworkAddressEntry& addr : nic.addressEntries()) {
+            // Store the scope ID for this NIC if IPv6 is enabled
+            if (!addr.ip().scopeId().isEmpty()) {
+                allNodesMulticast.setScopeId(addr.ip().scopeId());
+            }
+
+            // Skip IPv6 which doesn't support broadcast
+            if (!addr.broadcast().isNull()) {
+                addressList.append(addr.broadcast().toString());
+            }
+        }
+
+        if (!allNodesMulticast.scopeId().isEmpty()) {
+            addressList.append(allNodesMulticast.toString());
+        }
+    }
+
     // Try all unique address strings or host names
     bool success = false;
     for (QString& addressString : addressList) {
@@ -186,16 +213,14 @@ bool NvComputer::wake()
         for (QHostAddress& address : hostInfo.addresses()) {
             QUdpSocket sock;
 
-            // Bind to any address on the correct protocol
-            if (sock.bind(address.protocol() == QUdpSocket::IPv4Protocol ?
-                          QHostAddress::AnyIPv4 : QHostAddress::AnyIPv6)) {
-
-                // Send to all ports
-                for (quint16 port : WOL_PORTS) {
-                    if (sock.writeDatagram(wolPayload, address, port)) {
-                        qInfo().nospace().noquote() << "Send WoL packet to " << name << " via " << address.toString() << ":" << port;
-                        success = true;
-                    }
+            // Send to all ports
+            for (quint16 port : WOL_PORTS) {
+                if (sock.writeDatagram(wolPayload, address, port)) {
+                    qInfo().nospace().noquote() << "Sent WoL packet to " << name << " via " << address.toString() << ":" << port;
+                    success = true;
+                }
+                else {
+                    qWarning() << "Send failed:" << sock.error();
                 }
             }
         }

app/backend/nvhttp.cpp

@@ -13,6 +13,9 @@
 #include <QNetworkProxy>
 
 #define REQUEST_TIMEOUT_MS 5000
+#define LAUNCH_TIMEOUT_MS 120000
+#define RESUME_TIMEOUT_MS 30000
+#define QUIT_TIMEOUT_MS 30000
 
 NvHTTP::NvHTTP(QString address, QSslCertificate serverCert) :
     m_Address(address),
@@ -89,7 +92,7 @@ NvHTTP::getServerInfo(NvLogLevel logLevel)
             serverInfo = openConnectionToString(m_BaseUrlHttps,
                                                 "serverinfo",
                                                 nullptr,
-                                                true,
+                                                REQUEST_TIMEOUT_MS,
                                                 logLevel);
             // Throws if the request failed
             verifyResponseStatus(serverInfo);
@@ -102,7 +105,7 @@ NvHTTP::getServerInfo(NvLogLevel logLevel)
                 serverInfo = openConnectionToString(m_BaseUrlHttp,
                                                     "serverinfo",
                                                     nullptr,
-                                                    true,
+                                                    REQUEST_TIMEOUT_MS,
                                                     logLevel);
                 verifyResponseStatus(serverInfo);
             }
@@ -119,7 +122,7 @@ NvHTTP::getServerInfo(NvLogLevel logLevel)
         serverInfo = openConnectionToString(m_BaseUrlHttp,
                                             "serverinfo",
                                             nullptr,
-                                            true,
+                                            REQUEST_TIMEOUT_MS,
                                             logLevel);
         verifyResponseStatus(serverInfo);
     }
@@ -180,7 +183,7 @@ NvHTTP::launchApp(int appId,
                                    "&surroundAudioInfo="+getSurroundAudioInfoString(streamConfig->audioConfiguration)+
                                    "&remoteControllersBitmap="+QString::number(gamepadMask)+
                                    "&gcmap="+QString::number(gamepadMask),
-                                   false);
+                                   LAUNCH_TIMEOUT_MS);
 
     // Throws if the request failed
     verifyResponseStatus(response);
@@ -200,7 +203,7 @@ NvHTTP::resumeApp(PSTREAM_CONFIGURATION streamConfig)
                                    "rikey="+QString(QByteArray(streamConfig->remoteInputAesKey, sizeof(streamConfig->remoteInputAesKey)).toHex())+
                                    "&rikeyid="+QString::number(riKeyId)+
                                    "&surroundAudioInfo="+getSurroundAudioInfoString(streamConfig->audioConfiguration),
-                                   false);
+                                   RESUME_TIMEOUT_MS);
 
     // Throws if the request failed
     verifyResponseStatus(response);
@@ -213,7 +216,7 @@ NvHTTP::quitApp()
             openConnectionToString(m_BaseUrlHttps,
                                    "cancel",
                                    nullptr,
-                                   false);
+                                   QUIT_TIMEOUT_MS);
 
     // Throws if the request failed
     verifyResponseStatus(response);
@@ -260,7 +263,7 @@ NvHTTP::getAppList()
     QString appxml = openConnectionToString(m_BaseUrlHttps,
                                             "applist",
                                             nullptr,
-                                            true,
+                                            REQUEST_TIMEOUT_MS,
                                             NvLogLevel::ERROR);
     verifyResponseStatus(appxml);
 
@@ -328,7 +331,7 @@ NvHTTP::getBoxArt(int appId)
                                           "appasset",
                                           "appid="+QString::number(appId)+
                                           "&AssetType=2&AssetIdx=0",
-                                          true,
+                                          REQUEST_TIMEOUT_MS,
                                           NvLogLevel::VERBOSE);
     QImage image = QImageReader(reply).read();
     delete reply;
@@ -375,10 +378,10 @@ QString
 NvHTTP::openConnectionToString(QUrl baseUrl,
                                QString command,
                                QString arguments,
-                               bool enableTimeout,
+                               int timeoutMs,
                                NvLogLevel logLevel)
 {
-    QNetworkReply* reply = openConnection(baseUrl, command, arguments, enableTimeout, logLevel);
+    QNetworkReply* reply = openConnection(baseUrl, command, arguments, timeoutMs, logLevel);
     QString ret;
 
     QTextStream stream(reply);
@@ -393,7 +396,7 @@ QNetworkReply*
 NvHTTP::openConnection(QUrl baseUrl,
                        QString command,
                        QString arguments,
-                       bool enableTimeout,
+                       int timeoutMs,
                        NvLogLevel logLevel)
 {
     // Build a URL for the request
@@ -434,9 +437,8 @@ NvHTTP::openConnection(QUrl baseUrl,
     // Run the request with a timeout if requested
     QEventLoop loop;
     QObject::connect(reply, SIGNAL(finished()), &loop, SLOT(quit()));
-    if (enableTimeout)
-    {
-        QTimer::singleShot(REQUEST_TIMEOUT_MS, &loop, SLOT(quit()));
+    if (timeoutMs) {
+        QTimer::singleShot(timeoutMs, &loop, SLOT(quit()));
     }
     if (logLevel >= NvLogLevel::VERBOSE) {
         qInfo() << "Executing request:" << url.toString();
@@ -470,6 +472,11 @@ NvHTTP::openConnection(QUrl baseUrl,
             delete reply;
             throw exception;
         }
+        else if (reply->error() == QNetworkReply::OperationCanceledError) {
+            QtNetworkReplyException exception(QNetworkReply::TimeoutError, "Request timed out");
+            delete reply;
+            throw exception;
+        }
         else {
             QtNetworkReplyException exception(reply->error(), reply->errorString());
             delete reply;

app/backend/nvhttp.h

@@ -149,7 +149,7 @@ public:
     openConnectionToString(QUrl baseUrl,
                            QString command,
                            QString arguments,
-                           bool enableTimeout,
+                           int timeoutMs,
                            NvLogLevel logLevel = NvLogLevel::VERBOSE);
 
     void setServerCert(QSslCertificate serverCert);
@@ -188,7 +188,7 @@ private:
     openConnection(QUrl baseUrl,
                    QString command,
                    QString arguments,
-                   bool enableTimeout,
+                   int timeoutMs,
                    NvLogLevel logLevel);
 
     QString m_Address;

app/backend/nvpairingmanager.cpp

@@ -8,6 +8,8 @@
 #include <openssl/x509.h>
 #include <openssl/evp.h>
 
+#define REQUEST_TIMEOUT_MS 5000
+
 NvPairingManager::NvPairingManager(QString address) :
     m_Http(address, QSslCertificate())
 {
@@ -192,7 +194,7 @@ NvPairingManager::pair(QString appVersion, QString pin, QSslCertificate& serverC
                                                     "pair",
                                                     "devicename=roth&updateState=1&phrase=getservercert&salt=" +
                                                     salt.toHex() + "&clientcert=" + IdentityManager::get()->getCertificate().toHex(),
-                                                    false);
+                                                    0);
     NvHTTP::verifyResponseStatus(getCert);
     if (NvHTTP::getXmlString(getCert, "paired") != "1")
     {
@@ -204,7 +206,7 @@ NvPairingManager::pair(QString appVersion, QString pin, QSslCertificate& serverC
     if (serverCertStr == nullptr)
     {
         qCritical() << "Server likely already pairing";
-        m_Http.openConnectionToString(m_Http.m_BaseUrlHttp, "unpair", nullptr, true);
+        m_Http.openConnectionToString(m_Http.m_BaseUrlHttp, "unpair", nullptr, REQUEST_TIMEOUT_MS);
         return PairState::ALREADY_IN_PROGRESS;
     }
 
@@ -213,7 +215,7 @@ NvPairingManager::pair(QString appVersion, QString pin, QSslCertificate& serverC
         Q_ASSERT(!serverCert.isNull());
 
         qCritical() << "Failed to parse plaincert";
-        m_Http.openConnectionToString(m_Http.m_BaseUrlHttp, "unpair", nullptr, true);
+        m_Http.openConnectionToString(m_Http.m_BaseUrlHttp, "unpair", nullptr, REQUEST_TIMEOUT_MS);
         return PairState::FAILED;
     }
 
@@ -226,12 +228,12 @@ NvPairingManager::pair(QString appVersion, QString pin, QSslCertificate& serverC
                                                          "pair",
                                                          "devicename=roth&updateState=1&clientchallenge=" +
                                                          encryptedChallenge.toHex(),
-                                                         true);
+                                                         REQUEST_TIMEOUT_MS);
     NvHTTP::verifyResponseStatus(challengeXml);
     if (NvHTTP::getXmlString(challengeXml, "paired") != "1")
     {
         qCritical() << "Failed pairing at stage #2";
-        m_Http.openConnectionToString(m_Http.m_BaseUrlHttp, "unpair", nullptr, true);
+        m_Http.openConnectionToString(m_Http.m_BaseUrlHttp, "unpair", nullptr, REQUEST_TIMEOUT_MS);
         return PairState::FAILED;
     }
 
@@ -259,12 +261,12 @@ NvPairingManager::pair(QString appVersion, QString pin, QSslCertificate& serverC
                                                     "pair",
                                                     "devicename=roth&updateState=1&serverchallengeresp=" +
                                                     encryptedChallengeResponseHash.toHex(),
-                                                    true);
+                                                    REQUEST_TIMEOUT_MS);
     NvHTTP::verifyResponseStatus(respXml);
     if (NvHTTP::getXmlString(respXml, "paired") != "1")
     {
         qCritical() << "Failed pairing at stage #3";
-        m_Http.openConnectionToString(m_Http.m_BaseUrlHttp, "unpair", nullptr, true);
+        m_Http.openConnectionToString(m_Http.m_BaseUrlHttp, "unpair", nullptr, REQUEST_TIMEOUT_MS);
         return PairState::FAILED;
     }
 
@@ -277,7 +279,7 @@ NvPairingManager::pair(QString appVersion, QString pin, QSslCertificate& serverC
                          serverCertStr))
     {
         qCritical() << "MITM detected";
-        m_Http.openConnectionToString(m_Http.m_BaseUrlHttp, "unpair", nullptr, true);
+        m_Http.openConnectionToString(m_Http.m_BaseUrlHttp, "unpair", nullptr, REQUEST_TIMEOUT_MS);
         return PairState::FAILED;
     }
 
@@ -288,7 +290,7 @@ NvPairingManager::pair(QString appVersion, QString pin, QSslCertificate& serverC
     if (QCryptographicHash::hash(expectedResponseData, hashAlgo) != serverResponse)
     {
         qCritical() << "Incorrect PIN";
-        m_Http.openConnectionToString(m_Http.m_BaseUrlHttp, "unpair", nullptr, true);
+        m_Http.openConnectionToString(m_Http.m_BaseUrlHttp, "unpair", nullptr, REQUEST_TIMEOUT_MS);
         return PairState::PIN_WRONG;
     }
 
@@ -300,24 +302,24 @@ NvPairingManager::pair(QString appVersion, QString pin, QSslCertificate& serverC
                                                           "pair",
                                                           "devicename=roth&updateState=1&clientpairingsecret=" +
                                                           clientPairingSecret.toHex(),
-                                                          true);
+                                                          REQUEST_TIMEOUT_MS);
     NvHTTP::verifyResponseStatus(secretRespXml);
     if (NvHTTP::getXmlString(secretRespXml, "paired") != "1")
     {
         qCritical() << "Failed pairing at stage #4";
-        m_Http.openConnectionToString(m_Http.m_BaseUrlHttp, "unpair", nullptr, true);
+        m_Http.openConnectionToString(m_Http.m_BaseUrlHttp, "unpair", nullptr, REQUEST_TIMEOUT_MS);
         return PairState::FAILED;
     }
 
     QString pairChallengeXml = m_Http.openConnectionToString(m_Http.m_BaseUrlHttps,
                                                              "pair",
                                                              "devicename=roth&updateState=1&phrase=pairchallenge",
-                                                             true);
+                                                             REQUEST_TIMEOUT_MS);
     NvHTTP::verifyResponseStatus(pairChallengeXml);
     if (NvHTTP::getXmlString(pairChallengeXml, "paired") != "1")
     {
         qCritical() << "Failed pairing at stage #5";
-        m_Http.openConnectionToString(m_Http.m_BaseUrlHttp, "unpair", nullptr, true);
+        m_Http.openConnectionToString(m_Http.m_BaseUrlHttp, "unpair", nullptr, REQUEST_TIMEOUT_MS);
         return PairState::FAILED;
     }
 

app/deploy/linux/com.moonlight_stream.Moonlight.appdata.xml

@@ -33,6 +33,24 @@
 	</screenshots>
 
 	<releases>
+		<release version="0.8.1" date="2018-01-08">
+			<description>
+				<p>New features:</p>
+				<ul>
+					<li>Stricter adherence to the specified bitrate when streaming over the Internet</li>
+				</ul>
+				<p>Bugfixes:</p>
+				<ul>
+					<li>Fixed audio crackling that impacted certain systems</li>
+					<li>Fixed Wake-on-LAN packets failing to send on some systems</li>
+					<li>Reduced audio latency when resuming a session where audio is already playing</li>
+					<li>Added option to enable the old SDL audio renderer by setting ML_AUDIO=SDL</li>
+					<li>Updated to use the new Qt 5.12 Flatpak runtime</li>
+					<li>Updated to FFmpeg 4.1</li>
+					<li>Minor UI tweaks</li>
+				</ul>
+			</description>
+		</release>
 		<release version="0.8.0" date="2018-12-25">
 			<description>
 				<p>New features:</p>

app/gui/AppView.qml

@@ -134,7 +134,13 @@ GridView {
             acceptedButtons: Qt.RightButton
             onClicked: {
                 // popup() ensures the menu appears under the mouse cursor
-                appContextMenu.popup()
+                if (appContextMenu.popup) {
+                    appContextMenu.popup()
+                }
+                else {
+                    // Qt 5.9 doesn't have popup()
+                    appContextMenu.open()
+                }
             }
         }
 

app/gui/PcView.qml

@@ -192,7 +192,13 @@ GridView {
             onClicked: {
                 if (!model.addPc) {
                     // popup() ensures the menu appears under the mouse cursor
-                    pcContextMenu.popup()
+                    if (pcContextMenu.popup) {
+                        pcContextMenu.popup()
+                    }
+                    else {
+                        // Qt 5.9 doesn't have popup()
+                        pcContextMenu.open()
+                    }
                 }
             }
         }

app/gui/SettingsView.qml

@@ -307,7 +307,6 @@ Flickable {
 
                 Slider {
                     id: slider
-                    wheelEnabled: true
 
                     value: prefs.bitrateKbps
 
@@ -322,11 +321,6 @@ Flickable {
                         bitrateTitle.text = "Video bitrate: " + (value / 1000.0) + " Mbps"
                         prefs.bitrateKbps = value
                     }
-
-                    ToolTip.delay: 1000
-                    ToolTip.timeout: 5000
-                    ToolTip.visible: hovered
-                    ToolTip.text: "This slider controls video bitrate only. Audio data will add an additional 1-2 Mbps on top of this."
                 }
 
                 Label {

app/gui/main.qml

@@ -235,7 +235,6 @@ ApplicationWindow {
                 ToolTip.delay: 1000
                 ToolTip.timeout: 3000
                 ToolTip.visible: hovered
-                ToolTip.text: "Update available for Moonlight"
 
                 // Invisible until we get a callback notifying us that
                 // an update is available
@@ -243,8 +242,9 @@ ApplicationWindow {
 
                 onClicked: Qt.openUrlExternally(browserUrl);
 
-                function updateAvailable(url)
+                function updateAvailable(version, url)
                 {
+                    ToolTip.text = "Update available for Moonlight: Version " + version
                     updateButton.browserUrl = url
                     updateButton.visible = true
                 }

app/res/moonlight.svg

@@ -1,69 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg3761"
-   viewBox="0 0 680 680"
-   height="680"
-   width="680"
-   version="1.0">
-  <metadata
-     id="metadata3767">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3765" />
-  <g
-     id="g3759"
-     transform="translate(-135,491) scale(0.100000,-0.100000)">
-    <circle
-       id="circle3741"
-       fill="#565C64"
-       r="3400"
-       cy="1505"
-       cx="4755" />
-    <path
-       id="path3743"
-       style="fill:#ffffff"
-       d="M4550 4230 c-582 -48 -1123 -271 -1568 -646 l-84 -70 869 -869 c477 -477 871 -868 876 -868 4 0 6 552 5 1228 l-3 1227 -25 1 c-14 0 -45 -1 -70 -3z" />
-    <path
-       id="path3745"
-       style="fill:#ffffff"
-       d="M4867 4230 c-10 -9 -9 -2453 1 -2453 4 0 398 391 875 868 l869 869 -84 70 c-344 290 -749 492 -1178 587 -166 36 -469 74 -483 59z" />
-    <path
-       id="path3747"
-       style="fill:#ffffff"
-       d="M2673 3275 c-241 -285 -412 -595 -526 -953 -63 -196 -111 -458 -119 -640 l-3 -70 1228 -3 c675 -1 1227 1 1227 5 0 5 -391 399 -868 876 l-869 869 -70 -84z" />
-    <path
-       id="path3749"
-       style="fill:#ffffff"
-       d="M5898 2490 c-478 -477 -868 -871 -868 -876 0 -4 552 -6 1228 -5 l1227 3 -3 70 c-14 326 -124 729 -287 1055 -91 182 -259 430 -387 573 l-43 48 -867 -868z" />
-    <path
-       id="path3751"
-       style="fill:#ffffff"
-       d="M2026 1388 c-7 -11 10 -198 30 -321 76 -486 291 -952 617 -1338 l70 -84 869 869 c477 477 868 871 868 875 0 11 -2448 10 -2454 -1z" />
-    <path
-       id="path3753"
-       style="fill:#ffffff"
-       d="M5030 1390 c0 -5 391 -399 868 -876 l869 -869 70 84 c241 285 412 595 526 953 63 196 111 458 119 640 l3 70 -1227 3 c-676 1 -1228 -1 -1228 -5z" />
-    <path
-       id="path3755"
-       style="fill:#ffffff"
-       d="M3767 359 l-869 -869 84 -70 c285 -241 595 -412 953 -526 196 -63 458 -111 640 -119 l70 -3 3 1228 c1 675 -1 1227 -5 1227 -5 0 -399 -391 -876 -868z" />
-    <path
-       id="path3757"
-       style="fill:#ffffff"
-       d="M4862 0 l3 -1228 70 3 c182 8 444 56 640 119 358 114 668 285 953 526 l84 70 -869 869 c-477 477 -871 868 -876 868 -4 0 -6 -552 -5 -1227z" />
-  </g>
-</svg>
+<?xml version="1.0" standalone="no"?><!-- Generator: Gravit.io --><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="isolation:isolate" viewBox="0 0 256 256" width="256" height="256"><g><circle vector-effect="non-scaling-stroke" cx="128" cy="128" r="128" fill="rgb(86,92,100)"/><circle vector-effect="non-scaling-stroke" cx="128.00000000000003" cy="128.00000000000003" r="96" fill="rgb(255,255,255)"/><path d=" M 137.66 132 L 224 132 L 224 124 L 137.66 124 L 198.71 62.95 L 193.05 57.29 L 132 118.34 L 132 32 L 124 32 L 124 118.34 L 62.95 57.29 L 57.29 62.95 L 118.34 124 L 32 124 L 32 132 L 118.34 132 L 57.29 193.05 L 62.95 198.71 L 124 137.66 L 124 224 L 132 224 L 132 137.66 L 193.05 198.71 L 198.71 193.05 L 137.66 132 Z " fill-rule="evenodd" fill="rgb(86,92,100)"/></g></svg>

app/streaming/audio/audio.cpp

@@ -3,15 +3,19 @@
 
 #ifdef HAVE_SOUNDIO
 #include "renderers/soundioaudiorenderer.h"
-#else
-#include "renderers/sdl.h"
 #endif
 
+#include "renderers/sdl.h"
+
 #include <Limelight.h>
 
 IAudioRenderer* Session::createAudioRenderer()
 {
 #ifdef HAVE_SOUNDIO
+    if (qgetenv("ML_AUDIO") == "SDL") {
+        return new SdlAudioRenderer();
+    }
+
     return new SoundIoAudioRenderer();
 #else
     return new SdlAudioRenderer();

app/streaming/audio/renderers/sdl.h

@@ -16,9 +16,4 @@ public:
 
 private:
     SDL_AudioDeviceID m_AudioDevice;
-    Uint32 m_ChannelCount;
-    Uint32 m_PendingDrops;
-    Uint32 m_PendingHardDrops;
-    Uint32 m_SampleIndex;
-    Uint32 m_BaselinePendingData;
 };

app/streaming/audio/renderers/sdlaud.cpp

@@ -5,18 +5,8 @@
 
 #include <QtGlobal>
 
-#define MIN_QUEUED_FRAMES 2
-#define MAX_QUEUED_FRAMES 4
-#define STOP_THE_WORLD_LIMIT 20
-#define DROP_RATIO_DENOM 32
-
 SdlAudioRenderer::SdlAudioRenderer()
-    : m_AudioDevice(0),
-      m_ChannelCount(0),
-      m_PendingDrops(0),
-      m_PendingHardDrops(0),
-      m_SampleIndex(0),
-      m_BaselinePendingData(0)
+    : m_AudioDevice(0)
 {
     SDL_assert(!SDL_WasInit(SDL_INIT_AUDIO));
     if (SDL_InitSubSystem(SDL_INIT_AUDIO) != 0) {
@@ -61,27 +51,6 @@ bool SdlAudioRenderer::prepareForPlayback(const OPUS_MULTISTREAM_CONFIGURATION*
                 have.samples,
                 have.size);
 
-    // SDL counts pending samples in the queued
-    // audio size using the WASAPI backend. This
-    // includes silence, which can throw off our
-    // pending data count. Get a baseline so we
-    // can exclude that data.
-    m_BaselinePendingData = 0;
-#ifdef Q_OS_WIN32
-    for (int i = 0; i < 100; i++) {
-        m_BaselinePendingData = qMax(m_BaselinePendingData, SDL_GetQueuedAudioSize(m_AudioDevice));
-        SDL_Delay(10);
-    }
-#endif
-    m_BaselinePendingData *= 2;
-    SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
-                "Baseline pending audio data: %d bytes",
-                m_BaselinePendingData);
-
-    m_ChannelCount = opusConfig->channelCount;
-    m_SampleIndex = 0;
-    m_PendingDrops = m_PendingHardDrops = 0;
-
     // Start playback
     SDL_PauseAudioDevice(m_AudioDevice, 0);
 
@@ -102,53 +71,6 @@ SdlAudioRenderer::~SdlAudioRenderer()
 
 bool SdlAudioRenderer::submitAudio(short* audioBuffer, int audioSize)
 {
-    m_SampleIndex++;
-
-    Uint32 queuedAudio = SDL_GetQueuedAudioSize(m_AudioDevice);
-    if (queuedAudio > m_BaselinePendingData) {
-        queuedAudio -= m_BaselinePendingData;
-    }
-    else {
-        queuedAudio = 0;
-    }
-
-    Uint32 framesQueued = queuedAudio / (SAMPLES_PER_FRAME * m_ChannelCount * sizeof(short));
-
-    // We must check this prior to the below checks to ensure we don't
-    // underflow if framesQueued - m_PendingHardDrops < 0.
-    if (framesQueued <= MIN_QUEUED_FRAMES) {
-        m_PendingDrops = m_PendingHardDrops = 0;
-    }
-    // Pend enough drops to get us back to MIN_QUEUED_FRAMES, checking first
-    // to ensure we don't underflow.
-    else if (framesQueued > m_PendingHardDrops &&
-             framesQueued - m_PendingHardDrops > STOP_THE_WORLD_LIMIT) {
-        m_PendingHardDrops = framesQueued - MIN_QUEUED_FRAMES;
-        SDL_LogInfo(SDL_LOG_CATEGORY_APPLICATION,
-                    "Pending hard drop of %u audio frames",
-                    m_PendingHardDrops);
-    }
-    // If we're under the stop the world limit, we can drop samples
-    // gracefully over the next little while.
-    else if (framesQueued > m_PendingHardDrops + m_PendingDrops &&
-             framesQueued - m_PendingHardDrops - m_PendingDrops > MAX_QUEUED_FRAMES) {
-        m_PendingDrops = framesQueued - MIN_QUEUED_FRAMES;
-    }
-
-    // Determine if this frame should be dropped
-    if (m_PendingHardDrops != 0) {
-        // Hard drops happen all at once to forcefully
-        // resync with the source.
-        m_PendingHardDrops--;
-        return true;
-    }
-    else if (m_PendingDrops != 0 && m_SampleIndex % DROP_RATIO_DENOM == 0) {
-        // Normal drops are interspersed with the audio data
-        // to hide the glitches.
-        m_PendingDrops--;
-        return true;
-    }
-
     if (SDL_QueueAudio(m_AudioDevice, audioBuffer, audioSize) < 0) {
         SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
                      "Failed to queue audio sample: %s",

app/streaming/audio/renderers/soundioaudiorenderer.cpp

@@ -9,9 +9,11 @@ const double SoundIoAudioRenderer::k_RawSampleLengthSec = 0.005;
 
 #ifdef Q_OS_LINUX
 // PulseAudio and ALSA require more than just 5 ms samples
-// for some reason, so write a minimum of 20 ms each time to
+// for some reason, so write a minimum of 25 ms each time to
 // prevent underruns on Bluetooth.
-const double SoundIoAudioRenderer::k_MinSampleLengthSec = 0.020;
+// https://github.com/moonlight-stream/moonlight-qt/issues/147
+// https://github.com/moonlight-stream/moonlight-qt/issues/157
+const double SoundIoAudioRenderer::k_MinSampleLengthSec = 0.025;
 #else
 // This determines the size of the buffers we'll
 // get from CoreAudio. It is also the minimum
@@ -369,16 +371,15 @@ void SoundIoAudioRenderer::sioWriteCallback(SoundIoOutStream* stream, int frameC
             (me->m_OpusChannelCount * stream->bytes_per_sample);
     int bytesRead = 0;
 
+    // Clamp framesLeft to frameCountMax
+    framesLeft = qMin(framesLeft, frameCountMax);
+
     // Ensure we always write at least a buffer, even if it's silence, to avoid
     // busy looping when no audio data is available while libsoundio tries to keep
     // us from starving the output device.
     frameCountMin = qMax(frameCountMin, (int)(stream->sample_rate * k_MinSampleLengthSec));
     frameCountMin = qMin(frameCountMin, frameCountMax);
 
-    // Clamp framesLeft to frameCountMin to ensure that we never write more than one sample.
-    // This makes sure that we never increase our latency beyond what the sink is consuming.
-    framesLeft = qMin(framesLeft, frameCountMin);
-
     // Track latency on queueing-based backends
     if (me->m_SoundIo->current_backend != SoundIoBackendCoreAudio && me->m_SoundIo->current_backend != SoundIoBackendJack) {
         soundio_outstream_get_latency(stream, &me->m_Latency);

app/version.txt

@@ -0,0 +1 @@
+0.8.1

libs/mac/include/libavcodec/avcodec.h

@@ -409,6 +409,7 @@ enum AVCodecID {
     AV_CODEC_ID_DXV,
     AV_CODEC_ID_SCREENPRESSO,
     AV_CODEC_ID_RSCC,
+    AV_CODEC_ID_AVS2,
 
     AV_CODEC_ID_Y41P = 0x8000,
     AV_CODEC_ID_AVRP,
@@ -446,6 +447,11 @@ enum AVCodecID {
     AV_CODEC_ID_SVG,
     AV_CODEC_ID_GDV,
     AV_CODEC_ID_FITS,
+    AV_CODEC_ID_IMM4,
+    AV_CODEC_ID_PROSUMER,
+    AV_CODEC_ID_MWSC,
+    AV_CODEC_ID_WCMV,
+    AV_CODEC_ID_RASC,
 
     /* various PCM "codecs" */
     AV_CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs
@@ -485,6 +491,7 @@ enum AVCodecID {
     AV_CODEC_ID_PCM_S64BE,
     AV_CODEC_ID_PCM_F16LE,
     AV_CODEC_ID_PCM_F24LE,
+    AV_CODEC_ID_PCM_VIDC,
 
     /* various ADPCM codecs */
     AV_CODEC_ID_ADPCM_IMA_QT = 0x11000,
@@ -1359,6 +1366,12 @@ enum AVPacketSideDataType {
      */
     AV_PKT_DATA_ENCRYPTION_INFO,
 
+    /**
+     * Active Format Description data consisting of a single byte as specified
+     * in ETSI TS 101 154 using AVActiveFormatDescription enum.
+     */
+    AV_PKT_DATA_AFD,
+
     /**
      * The number of side data types.
      * This is not part of the public API/ABI in the sense that it may
@@ -1614,6 +1627,7 @@ typedef struct AVCodecContext {
      * The allocated memory should be AV_INPUT_BUFFER_PADDING_SIZE bytes larger
      * than extradata_size to avoid problems if it is read with the bitstream reader.
      * The bytewise contents of extradata must not depend on the architecture or CPU endianness.
+     * Must be allocated with the av_malloc() family of functions.
      * - encoding: Set/allocated/freed by libavcodec.
      * - decoding: Set/allocated/freed by user.
      */
@@ -5768,6 +5782,7 @@ typedef struct AVBitStreamFilter {
     int (*init)(AVBSFContext *ctx);
     int (*filter)(AVBSFContext *ctx, AVPacket *pkt);
     void (*close)(AVBSFContext *ctx);
+    void (*flush)(AVBSFContext *ctx);
 } AVBitStreamFilter;
 
 #if FF_API_OLD_BSF
@@ -5894,6 +5909,11 @@ int av_bsf_send_packet(AVBSFContext *ctx, AVPacket *pkt);
  */
 int av_bsf_receive_packet(AVBSFContext *ctx, AVPacket *pkt);
 
+/**
+ * Reset the internal bitstream filter state / flush internal buffers.
+ */
+void av_bsf_flush(AVBSFContext *ctx);
+
 /**
  * Free a bitstream filter context and everything associated with it; write NULL
  * into the supplied pointer.

libs/mac/include/libavcodec/mediacodec.h

@@ -85,4 +85,17 @@ typedef struct MediaCodecBuffer AVMediaCodecBuffer;
  */
 int av_mediacodec_release_buffer(AVMediaCodecBuffer *buffer, int render);
 
+/**
+ * Release a MediaCodec buffer and render it at the given time to the surface
+ * that is associated with the decoder. The timestamp must be within one second
+ * of the current java/lang/System#nanoTime() (which is implemented using
+ * CLOCK_MONOTONIC on Android). See the Android MediaCodec documentation
+ * of android/media/MediaCodec#releaseOutputBuffer(int,long) for more details.
+ *
+ * @param buffer the buffer to render
+ * @param time timestamp in nanoseconds of when to render the buffer
+ * @return 0 on success, < 0 otherwise
+ */
+int av_mediacodec_render_buffer_at_time(AVMediaCodecBuffer *buffer, int64_t time);
+
 #endif /* AVCODEC_MEDIACODEC_H */

libs/mac/include/libavcodec/version.h

@@ -28,8 +28,8 @@
 #include "libavutil/version.h"
 
 #define LIBAVCODEC_VERSION_MAJOR  58
-#define LIBAVCODEC_VERSION_MINOR  21
-#define LIBAVCODEC_VERSION_MICRO 104
+#define LIBAVCODEC_VERSION_MINOR  35
+#define LIBAVCODEC_VERSION_MICRO 100
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \

libs/mac/include/libavutil/avassert.h

@@ -66,7 +66,7 @@
 #endif
 
 /**
- * Assert that floating point opperations can be executed.
+ * Assert that floating point operations can be executed.
  *
  * This will av_assert0() that the cpu is not in MMX state on X86
  */

libs/mac/include/libavutil/ffversion.h

@@ -1,5 +1,5 @@
 /* Automatically generated by version.sh, do not manually edit! */
 #ifndef AVUTIL_FFVERSION_H
 #define AVUTIL_FFVERSION_H
-#define FFMPEG_VERSION "N-91434-gcced03dd66"
+#define FFMPEG_VERSION "4.1"
 #endif /* AVUTIL_FFVERSION_H */

libs/mac/include/libavutil/file.h

@@ -33,6 +33,8 @@
  * allocated buffer or map it with mmap() when available.
  * In case of success set *bufptr to the read or mmapped buffer, and
  * *size to the size in bytes of the buffer in *bufptr.
+ * Unlike mmap this function succeeds with zero sized files, in this
+ * case *bufptr will be set to NULL and *size will be set to 0.
  * The returned buffer must be released with av_file_unmap().
  *
  * @param log_offset loglevel offset used for logging

libs/mac/include/libavutil/frame.h

@@ -158,6 +158,14 @@ enum AVFrameSideDataType {
      */
     AV_FRAME_DATA_QP_TABLE_DATA,
 #endif
+
+    /**
+     * Timecode which conforms to SMPTE ST 12-1. The data is an array of 4 uint32_t
+     * where the first uint32_t describes how many (1-3) of the other timecodes are used.
+     * The timecode format is described in the av_timecode_get_smpte_from_framenum()
+     * function in libavutil/timecode.c.
+     */
+    AV_FRAME_DATA_S12M_TIMECODE,
 };
 
 enum AVActiveFormatDescription {

libs/mac/include/libavutil/pixdesc.h

@@ -343,7 +343,13 @@ char *av_get_pix_fmt_string(char *buf, int buf_size,
  * format writes the values corresponding to the palette
  * component c in data[1] to dst, rather than the palette indexes in
  * data[0]. The behavior is undefined if the format is not paletted.
+ * @param dst_element_size size of elements in dst array (2 or 4 byte)
  */
+void av_read_image_line2(void *dst, const uint8_t *data[4],
+                        const int linesize[4], const AVPixFmtDescriptor *desc,
+                        int x, int y, int c, int w, int read_pal_component,
+                        int dst_element_size);
+
 void av_read_image_line(uint16_t *dst, const uint8_t *data[4],
                         const int linesize[4], const AVPixFmtDescriptor *desc,
                         int x, int y, int c, int w, int read_pal_component);
@@ -361,7 +367,12 @@ void av_read_image_line(uint16_t *dst, const uint8_t *data[4],
  * @param y the vertical coordinate of the first pixel to write
  * @param w the width of the line to write, that is the number of
  * values to write to the image line
+ * @param src_element_size size of elements in src array (2 or 4 byte)
  */
+void av_write_image_line2(const void *src, uint8_t *data[4],
+                         const int linesize[4], const AVPixFmtDescriptor *desc,
+                         int x, int y, int c, int w, int src_element_size);
+
 void av_write_image_line(const uint16_t *src, uint8_t *data[4],
                          const int linesize[4], const AVPixFmtDescriptor *desc,
                          int x, int y, int c, int w);

libs/mac/include/libavutil/pixfmt.h

@@ -42,6 +42,10 @@
  * This is stored as BGRA on little-endian CPU architectures and ARGB on
  * big-endian CPUs.
  *
+ * @note
+ * If the resolution is not a multiple of the chroma subsampling factor
+ * then the chroma plane resolution must be rounded up.
+ *
  * @par
  * When the pixel format is palettized RGB32 (AV_PIX_FMT_PAL8), the palettized
  * image data is stored in AVFrame.data[0]. The palette is transported in
@@ -333,6 +337,9 @@ enum AVPixelFormat {
     AV_PIX_FMT_GRAY14BE,   ///<        Y        , 14bpp, big-endian
     AV_PIX_FMT_GRAY14LE,   ///<        Y        , 14bpp, little-endian
 
+    AV_PIX_FMT_GRAYF32BE,  ///< IEEE-754 single precision Y, 32bpp, big-endian
+    AV_PIX_FMT_GRAYF32LE,  ///< IEEE-754 single precision Y, 32bpp, little-endian
+
     AV_PIX_FMT_NB         ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
 };
 
@@ -401,6 +408,8 @@ enum AVPixelFormat {
 #define AV_PIX_FMT_GBRPF32    AV_PIX_FMT_NE(GBRPF32BE,  GBRPF32LE)
 #define AV_PIX_FMT_GBRAPF32   AV_PIX_FMT_NE(GBRAPF32BE, GBRAPF32LE)
 
+#define AV_PIX_FMT_GRAYF32    AV_PIX_FMT_NE(GRAYF32BE, GRAYF32LE)
+
 #define AV_PIX_FMT_YUVA420P9  AV_PIX_FMT_NE(YUVA420P9BE , YUVA420P9LE)
 #define AV_PIX_FMT_YUVA422P9  AV_PIX_FMT_NE(YUVA422P9BE , YUVA422P9LE)
 #define AV_PIX_FMT_YUVA444P9  AV_PIX_FMT_NE(YUVA444P9BE , YUVA444P9LE)

libs/mac/include/libavutil/version.h

@@ -79,8 +79,8 @@
  */
 
 #define LIBAVUTIL_VERSION_MAJOR  56
-#define LIBAVUTIL_VERSION_MINOR  18
-#define LIBAVUTIL_VERSION_MICRO 102
+#define LIBAVUTIL_VERSION_MINOR  22
+#define LIBAVUTIL_VERSION_MICRO 100
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                LIBAVUTIL_VERSION_MINOR, \

libs/windows/include/libavcodec/avcodec.h

@@ -409,6 +409,7 @@ enum AVCodecID {
     AV_CODEC_ID_DXV,
     AV_CODEC_ID_SCREENPRESSO,
     AV_CODEC_ID_RSCC,
+    AV_CODEC_ID_AVS2,
 
     AV_CODEC_ID_Y41P = 0x8000,
     AV_CODEC_ID_AVRP,
@@ -446,6 +447,11 @@ enum AVCodecID {
     AV_CODEC_ID_SVG,
     AV_CODEC_ID_GDV,
     AV_CODEC_ID_FITS,
+    AV_CODEC_ID_IMM4,
+    AV_CODEC_ID_PROSUMER,
+    AV_CODEC_ID_MWSC,
+    AV_CODEC_ID_WCMV,
+    AV_CODEC_ID_RASC,
 
     /* various PCM "codecs" */
     AV_CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs
@@ -485,6 +491,7 @@ enum AVCodecID {
     AV_CODEC_ID_PCM_S64BE,
     AV_CODEC_ID_PCM_F16LE,
     AV_CODEC_ID_PCM_F24LE,
+    AV_CODEC_ID_PCM_VIDC,
 
     /* various ADPCM codecs */
     AV_CODEC_ID_ADPCM_IMA_QT = 0x11000,
@@ -1359,6 +1366,12 @@ enum AVPacketSideDataType {
      */
     AV_PKT_DATA_ENCRYPTION_INFO,
 
+    /**
+     * Active Format Description data consisting of a single byte as specified
+     * in ETSI TS 101 154 using AVActiveFormatDescription enum.
+     */
+    AV_PKT_DATA_AFD,
+
     /**
      * The number of side data types.
      * This is not part of the public API/ABI in the sense that it may
@@ -1614,6 +1627,7 @@ typedef struct AVCodecContext {
      * The allocated memory should be AV_INPUT_BUFFER_PADDING_SIZE bytes larger
      * than extradata_size to avoid problems if it is read with the bitstream reader.
      * The bytewise contents of extradata must not depend on the architecture or CPU endianness.
+     * Must be allocated with the av_malloc() family of functions.
      * - encoding: Set/allocated/freed by libavcodec.
      * - decoding: Set/allocated/freed by user.
      */
@@ -5768,6 +5782,7 @@ typedef struct AVBitStreamFilter {
     int (*init)(AVBSFContext *ctx);
     int (*filter)(AVBSFContext *ctx, AVPacket *pkt);
     void (*close)(AVBSFContext *ctx);
+    void (*flush)(AVBSFContext *ctx);
 } AVBitStreamFilter;
 
 #if FF_API_OLD_BSF
@@ -5894,6 +5909,11 @@ int av_bsf_send_packet(AVBSFContext *ctx, AVPacket *pkt);
  */
 int av_bsf_receive_packet(AVBSFContext *ctx, AVPacket *pkt);
 
+/**
+ * Reset the internal bitstream filter state / flush internal buffers.
+ */
+void av_bsf_flush(AVBSFContext *ctx);
+
 /**
  * Free a bitstream filter context and everything associated with it; write NULL
  * into the supplied pointer.

libs/windows/include/libavcodec/mediacodec.h

@@ -85,4 +85,17 @@ typedef struct MediaCodecBuffer AVMediaCodecBuffer;
  */
 int av_mediacodec_release_buffer(AVMediaCodecBuffer *buffer, int render);
 
+/**
+ * Release a MediaCodec buffer and render it at the given time to the surface
+ * that is associated with the decoder. The timestamp must be within one second
+ * of the current java/lang/System#nanoTime() (which is implemented using
+ * CLOCK_MONOTONIC on Android). See the Android MediaCodec documentation
+ * of android/media/MediaCodec#releaseOutputBuffer(int,long) for more details.
+ *
+ * @param buffer the buffer to render
+ * @param time timestamp in nanoseconds of when to render the buffer
+ * @return 0 on success, < 0 otherwise
+ */
+int av_mediacodec_render_buffer_at_time(AVMediaCodecBuffer *buffer, int64_t time);
+
 #endif /* AVCODEC_MEDIACODEC_H */

libs/windows/include/libavcodec/version.h

@@ -28,8 +28,8 @@
 #include "libavutil/version.h"
 
 #define LIBAVCODEC_VERSION_MAJOR  58
-#define LIBAVCODEC_VERSION_MINOR  21
-#define LIBAVCODEC_VERSION_MICRO 104
+#define LIBAVCODEC_VERSION_MINOR  35
+#define LIBAVCODEC_VERSION_MICRO 100
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \

libs/windows/include/libavutil/avassert.h

@@ -66,7 +66,7 @@
 #endif
 
 /**
- * Assert that floating point opperations can be executed.
+ * Assert that floating point operations can be executed.
  *
  * This will av_assert0() that the cpu is not in MMX state on X86
  */

libs/windows/include/libavutil/ffversion.h

@@ -1,5 +1,5 @@
 /* Automatically generated by version.sh, do not manually edit! */
 #ifndef AVUTIL_FFVERSION_H
 #define AVUTIL_FFVERSION_H
-#define FFMPEG_VERSION "N-91434-gcced03dd66"
+#define FFMPEG_VERSION "4.1"
 #endif /* AVUTIL_FFVERSION_H */

libs/windows/include/libavutil/file.h

@@ -33,6 +33,8 @@
  * allocated buffer or map it with mmap() when available.
  * In case of success set *bufptr to the read or mmapped buffer, and
  * *size to the size in bytes of the buffer in *bufptr.
+ * Unlike mmap this function succeeds with zero sized files, in this
+ * case *bufptr will be set to NULL and *size will be set to 0.
  * The returned buffer must be released with av_file_unmap().
  *
  * @param log_offset loglevel offset used for logging

libs/windows/include/libavutil/frame.h

@@ -158,6 +158,14 @@ enum AVFrameSideDataType {
      */
     AV_FRAME_DATA_QP_TABLE_DATA,
 #endif
+
+    /**
+     * Timecode which conforms to SMPTE ST 12-1. The data is an array of 4 uint32_t
+     * where the first uint32_t describes how many (1-3) of the other timecodes are used.
+     * The timecode format is described in the av_timecode_get_smpte_from_framenum()
+     * function in libavutil/timecode.c.
+     */
+    AV_FRAME_DATA_S12M_TIMECODE,
 };
 
 enum AVActiveFormatDescription {

libs/windows/include/libavutil/pixdesc.h

@@ -343,7 +343,13 @@ char *av_get_pix_fmt_string(char *buf, int buf_size,
  * format writes the values corresponding to the palette
  * component c in data[1] to dst, rather than the palette indexes in
  * data[0]. The behavior is undefined if the format is not paletted.
+ * @param dst_element_size size of elements in dst array (2 or 4 byte)
  */
+void av_read_image_line2(void *dst, const uint8_t *data[4],
+                        const int linesize[4], const AVPixFmtDescriptor *desc,
+                        int x, int y, int c, int w, int read_pal_component,
+                        int dst_element_size);
+
 void av_read_image_line(uint16_t *dst, const uint8_t *data[4],
                         const int linesize[4], const AVPixFmtDescriptor *desc,
                         int x, int y, int c, int w, int read_pal_component);
@@ -361,7 +367,12 @@ void av_read_image_line(uint16_t *dst, const uint8_t *data[4],
  * @param y the vertical coordinate of the first pixel to write
  * @param w the width of the line to write, that is the number of
  * values to write to the image line
+ * @param src_element_size size of elements in src array (2 or 4 byte)
  */
+void av_write_image_line2(const void *src, uint8_t *data[4],
+                         const int linesize[4], const AVPixFmtDescriptor *desc,
+                         int x, int y, int c, int w, int src_element_size);
+
 void av_write_image_line(const uint16_t *src, uint8_t *data[4],
                          const int linesize[4], const AVPixFmtDescriptor *desc,
                          int x, int y, int c, int w);

libs/windows/include/libavutil/pixfmt.h

@@ -42,6 +42,10 @@
  * This is stored as BGRA on little-endian CPU architectures and ARGB on
  * big-endian CPUs.
  *
+ * @note
+ * If the resolution is not a multiple of the chroma subsampling factor
+ * then the chroma plane resolution must be rounded up.
+ *
  * @par
  * When the pixel format is palettized RGB32 (AV_PIX_FMT_PAL8), the palettized
  * image data is stored in AVFrame.data[0]. The palette is transported in
@@ -333,6 +337,9 @@ enum AVPixelFormat {
     AV_PIX_FMT_GRAY14BE,   ///<        Y        , 14bpp, big-endian
     AV_PIX_FMT_GRAY14LE,   ///<        Y        , 14bpp, little-endian
 
+    AV_PIX_FMT_GRAYF32BE,  ///< IEEE-754 single precision Y, 32bpp, big-endian
+    AV_PIX_FMT_GRAYF32LE,  ///< IEEE-754 single precision Y, 32bpp, little-endian
+
     AV_PIX_FMT_NB         ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
 };
 
@@ -401,6 +408,8 @@ enum AVPixelFormat {
 #define AV_PIX_FMT_GBRPF32    AV_PIX_FMT_NE(GBRPF32BE,  GBRPF32LE)
 #define AV_PIX_FMT_GBRAPF32   AV_PIX_FMT_NE(GBRAPF32BE, GBRAPF32LE)
 
+#define AV_PIX_FMT_GRAYF32    AV_PIX_FMT_NE(GRAYF32BE, GRAYF32LE)
+
 #define AV_PIX_FMT_YUVA420P9  AV_PIX_FMT_NE(YUVA420P9BE , YUVA420P9LE)
 #define AV_PIX_FMT_YUVA422P9  AV_PIX_FMT_NE(YUVA422P9BE , YUVA422P9LE)
 #define AV_PIX_FMT_YUVA444P9  AV_PIX_FMT_NE(YUVA444P9BE , YUVA444P9LE)

libs/windows/include/libavutil/version.h

@@ -79,8 +79,8 @@
  */
 
 #define LIBAVUTIL_VERSION_MAJOR  56
-#define LIBAVUTIL_VERSION_MINOR  18
-#define LIBAVUTIL_VERSION_MICRO 102
+#define LIBAVUTIL_VERSION_MINOR  22
+#define LIBAVUTIL_VERSION_MICRO 100
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
                                                LIBAVUTIL_VERSION_MINOR, \

scripts/build-ffmpeg-mac.sh

@@ -1,3 +1,7 @@
-./configure --extra-cflags="-mmacosx-version-min=10.10" --enable-pic --enable-shared --disable-static --disable-all --enable-avcodec --enable-decoder=h264 --enable-decoder=hevc --enable-hwaccel=h264_videotoolbox --enable-hwaccel=hevc_videotoolbox
+./configure --extra-cflags="-mmacosx-version-min=10.11" --install-name-dir=@loader_path/../lib --enable-pic --enable-shared --disable-static --disable-all --enable-avcodec --enable-decoder=h264 --enable-decoder=hevc --enable-hwaccel=h264_videotoolbox --enable-hwaccel=hevc_videotoolbox
 make clean
-make -j4
+make -j4
+codesign -s 45U78722YL libavcodec/libavcodec.dylib
+codesign -s 45U78722YL libavutil/libavutil.dylib
+codesign -vv libavcodec/libavcodec.dylib
+codesign -vv libavutil/libavutil.dylib

scripts/generate-dmg.sh

@@ -11,10 +11,13 @@ if [ "$BUILD_CONFIG" != "Debug" ] && [ "$BUILD_CONFIG" != "Release" ]; then
   fail "Invalid build configuration"
 fi
 
+[ "$SIGNING_KEY" == "" ] || git diff-index --quiet HEAD -- || fail "Signed release builds must not have unstaged changes!"
+
 BUILD_ROOT=$PWD/build
 SOURCE_ROOT=$PWD
 BUILD_FOLDER=$BUILD_ROOT/build-$BUILD_CONFIG
 INSTALLER_FOLDER=$BUILD_ROOT/installer-$BUILD_CONFIG
+VERSION=`cat $SOURCE_ROOT/app/version.txt`
 
 echo Cleaning output directories
 rm -rf $BUILD_FOLDER
@@ -35,8 +38,8 @@ popd
 
 echo Saving dSYM file
 pushd $BUILD_FOLDER
-dsymutil app/Moonlight.app/Contents/MacOS/Moonlight -o Moonlight.dsym || fail "dSYM creation failed!"
-cp -R Moonlight.dsym $INSTALLER_FOLDER || fail "dSYM copy failed!"
+dsymutil app/Moonlight.app/Contents/MacOS/Moonlight -o Moonlight-$VERSION.dsym || fail "dSYM creation failed!"
+cp -R Moonlight-$VERSION.dsym $INSTALLER_FOLDER || fail "dSYM copy failed!"
 popd
 
 echo Copying dylib dependencies
@@ -52,3 +55,4 @@ macdeployqt $BUILD_FOLDER/app/Moonlight.app $EXTRA_ARGS -qmldir=$SOURCE_ROOT/app
 
 echo Creating DMG
 create-dmg $BUILD_FOLDER/app/Moonlight.app $INSTALLER_FOLDER || fail "create-dmg failed!"
+mv $INSTALLER_FOLDER/Moonlight\ $VERSION.dmg $INSTALLER_FOLDER/Moonlight-$VERSION.dmg

scripts/generate-installers.bat

@@ -17,6 +17,13 @@ if /I "%BUILD_CONFIG%"=="debug" (
             set BUILD_CONFIG=release
             set SIGN=1
             set MUST_DEPLOY_SYMBOLS=1
+
+            rem Fail if there are unstaged changes
+            git diff-index --quiet HEAD --
+            if !ERRORLEVEL! NEQ 0 (
+                echo Signed release builds must not have unstaged changes!
+                exit /b 1
+            )
         ) else (
             echo Invalid build configuration
             exit /b 1
@@ -43,6 +50,7 @@ set BUILD_FOLDER=%BUILD_ROOT%\build-%ARCH%-%BUILD_CONFIG%
 set DEPLOY_FOLDER=%BUILD_ROOT%\deploy-%ARCH%-%BUILD_CONFIG%
 set INSTALLER_FOLDER=%BUILD_ROOT%\installer-%ARCH%-%BUILD_CONFIG%
 set SYMBOLS_FOLDER=%BUILD_ROOT%\symbols-%ARCH%-%BUILD_CONFIG%
+set /p VERSION=<%SOURCE_ROOT%\app\version.txt
 
 echo Cleaning output directories
 rmdir /s /q %DEPLOY_FOLDER%
@@ -74,7 +82,7 @@ for /r "%BUILD_FOLDER%" %%f in (*.pdb) do (
 )
 copy %SOURCE_ROOT%\libs\windows\lib\%ARCH%\*.pdb %SYMBOLS_FOLDER%
 if !ERRORLEVEL! NEQ 0 goto Error
-7z a %SYMBOLS_FOLDER%\MoonlightDebuggingSymbols.zip %SYMBOLS_FOLDER%\*.pdb
+7z a %SYMBOLS_FOLDER%\MoonlightDebuggingSymbols-%ARCH%-%VERSION%.zip %SYMBOLS_FOLDER%\*.pdb
 if !ERRORLEVEL! NEQ 0 goto Error
 
 if "%ML_SYMBOL_STORE%" NEQ "" (
@@ -88,6 +96,17 @@ if "%ML_SYMBOL_STORE%" NEQ "" (
     )
 )
 
+if "%ML_SYMBOL_ARCHIVE%" NEQ "" (
+    echo Copying PDB ZIP to symbol archive: %ML_SYMBOL_ARCHIVE%
+    copy %SYMBOLS_FOLDER%\MoonlightDebuggingSymbols-%ARCH%-%VERSION%.zip %ML_SYMBOL_ARCHIVE%
+    if !ERRORLEVEL! NEQ 0 goto Error
+) else (
+    if "%MUST_DEPLOY_SYMBOLS%"=="1" (
+        echo "A symbol archive directory must be specified in ML_SYMBOL_ARCHIVE for signed release builds"
+        exit /b 1
+    )
+)
+
 echo Copying DLL dependencies
 copy %SOURCE_ROOT%\libs\windows\lib\%ARCH%\*.dll %DEPLOY_FOLDER%
 if !ERRORLEVEL! NEQ 0 goto Error
@@ -150,6 +169,9 @@ if "%SIGN%"=="1" (
     if !ERRORLEVEL! NEQ 0 goto Error
 )
 
+rem Rename the installer to match the publishing convention
+ren %INSTALLER_FOLDER%\MoonlightSetup.exe MoonlightSetup-%ARCH%-%VERSION%.exe
+
 echo Building portable package
 rem This must be done after WiX harvesting and signing, since the VCRT dlls are MS signed
 rem and should not be harvested for inclusion in the full installer
@@ -157,19 +179,19 @@ copy "%VCToolsRedistDir%%ARCH%\Microsoft.VC141.CRT\*.dll" %DEPLOY_FOLDER%
 rem This file tells Moonlight that it's a portable installation
 echo. > %DEPLOY_FOLDER%\portable.dat
 if !ERRORLEVEL! NEQ 0 goto Error
-7z a %INSTALLER_FOLDER%\MoonlightPortable.zip %DEPLOY_FOLDER%\*
+7z a %INSTALLER_FOLDER%\MoonlightPortable-%ARCH%-%VERSION%.zip %DEPLOY_FOLDER%\*
 if !ERRORLEVEL! NEQ 0 goto Error
 
 if /i "%APPVEYOR%"=="true" (
     echo Pushing artifacts
-    appveyor PushArtifact %INSTALLER_FOLDER%\MoonlightSetup.exe -FileName MoonlightSetup-%ARCH%-%BUILD_CONFIG%.exe
+    appveyor PushArtifact %INSTALLER_FOLDER%\MoonlightSetup-%ARCH%-%VERSION%.exe -FileName MoonlightSetup-%ARCH%-%BUILD_CONFIG%.exe
     if !ERRORLEVEL! NEQ 0 goto Error
-    appveyor PushArtifact %INSTALLER_FOLDER%\MoonlightPortable.zip -FileName MoonlightPortable-%ARCH%-%BUILD_CONFIG%.zip
+    appveyor PushArtifact %INSTALLER_FOLDER%\MoonlightPortable-%ARCH%-%VERSION%.zip -FileName MoonlightPortable-%ARCH%-%BUILD_CONFIG%.zip
     if !ERRORLEVEL! NEQ 0 goto Error
-    appveyor PushArtifact %SYMBOLS_FOLDER%\MoonlightDebuggingSymbols.zip -FileName MoonlightDebuggingSymbols-%ARCH%-%BUILD_CONFIG%.zip
+    appveyor PushArtifact %SYMBOLS_FOLDER%\MoonlightDebuggingSymbols-%ARCH%-%VERSION%.zip -FileName MoonlightDebuggingSymbols-%ARCH%-%BUILD_CONFIG%.zip
 )
 
-echo Build successful!
+echo Build successful for Moonlight v%VERSION%!
 exit /b 0
 
 :Error