Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #787 from lrusak/moonlight
moonlight-embedded: add patch to revert upstream commit
- Loading branch information
Showing
1 changed file
with
55 additions
and
0 deletions.
There are no files selected for viewing
55 changes: 55 additions & 0 deletions
55
.../moonlight-embedded/patches/moonlight-embedded-0002-revert-upstreamm-commit-6fcc63e.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
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) { |