Merge pull request #832 from dead/master_moon

Update moonlight
This commit is contained in:
Christian Hewitt 2016-10-13 19:04:59 +04:00 committed by GitHub
commit 2193bd8a03
5 changed files with 11 additions and 63 deletions

View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="moonlight-common-c"
PKG_VERSION="6659e28"
PKG_VERSION="6455381"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPLv3"

View File

@ -17,7 +17,7 @@
################################################################################
PKG_NAME="moonlight-embedded"
PKG_VERSION="2.2.1"
PKG_VERSION="2.2.2"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPLv3"

View File

@ -1,55 +0,0 @@
diff -Naur a/src/video/aml.c b/src/video/aml.c
--- a/src/video/aml.c 2016-05-17 10:58:48.000000000 -0700
+++ b/src/video/aml.c 2016-09-30 11:42:19.480094296 -0700
@@ -20,7 +20,6 @@
#include <Limelight.h>
-#include <sys/utsname.h>
#include <stdio.h>
#include <stdbool.h>
#include <stdlib.h>
@@ -29,10 +28,8 @@
#include <unistd.h>
#include <amcodec/codec.h>
-#define SYNC_OUTSIDE 0x02
-#define UCODE_IP_ONLY_PARAM 0x08
-
static codec_para_t codecParam = { 0 };
+static const size_t SYNC_OUTSIDE = (2);
static int osd_blank(char *path,int cmd) {
int fd;
@@ -60,7 +57,6 @@
codecParam.stream_type = STREAM_TYPE_ES_VIDEO;
codecParam.has_video = 1;
codecParam.noblock = 0;
- codecParam.am_sysinfo.param = 0;
switch (videoFormat) {
case VIDEO_FORMAT_H264:
@@ -70,14 +66,6 @@
} else {
codecParam.video_type = VFORMAT_H264;
codecParam.am_sysinfo.format = VIDEO_DEC_FORMAT_H264;
-
- // Workaround for decoding special case of C1, 1080p, H264
- int major, minor;
- struct utsname name;
- uname(&name);
- int ret = sscanf(name.release, "%d.%d", &major, &minor);
- if (!(major > 3 || (major == 3 && minor >= 14)) && width == 1920 && height == 1080)
- codecParam.am_sysinfo.param = UCODE_IP_ONLY_PARAM;
}
break;
case VIDEO_FORMAT_H265:
@@ -92,7 +80,7 @@
codecParam.am_sysinfo.width = width;
codecParam.am_sysinfo.height = height;
codecParam.am_sysinfo.rate = 96000 / redrawRate;
- codecParam.am_sysinfo.param |= SYNC_OUTSIDE;
+ codecParam.am_sysinfo.param = (void *)(SYNC_OUTSIDE);
int api = codec_init(&codecParam);
if (api != 0) {

View File

@ -1,3 +1,6 @@
8.0.103
- update Moonlight to 2.2.2
8.0.102
- update Moonlight to 2.2.1

View File

@ -17,14 +17,14 @@
################################################################################
PKG_NAME="moonlight"
PKG_VERSION="c371ff8"
PKG_VERSION_NUMBER="2.2.1"
PKG_REV="102"
PKG_VERSION="391de3f"
PKG_VERSION_NUMBER="2.2.2"
PKG_REV="103"
PKG_ARCH="any"
PKG_LICENSE="GPLv2"
PKG_SITE="https://github.com/dead/moonlight-openelec-rpi2"
PKG_URL="https://github.com/dead/moonlight-openelec-rpi2/archive/$PKG_VERSION.tar.gz"
PKG_SOURCE_DIR="moonlight-openelec-rpi2-$PKG_VERSION*"
PKG_SITE="https://github.com/dead/script.moonlight"
PKG_URL="https://github.com/dead/script.moonlight/archive/$PKG_VERSION.tar.gz"
PKG_SOURCE_DIR="script.moonlight-$PKG_VERSION*"
PKG_DEPENDS_TARGET="toolchain moonlight-embedded"
PKG_SECTION="script"
PKG_SHORTDESC="Moonlight: implementation of NVIDIA's GameStream protocol"