moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-19 02:53:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update dependency versions

Browse Source
This commit is contained in:
Cameron Gutman 2018-02-05 18:38:23 -08:00
parent 3bcd2ee068
commit ef3b28295b
4 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/build.gradle
View File

@ -99,9 +99,9 @@ android {
} }
dependencies { dependencies {
implementation 'org.bouncycastle:bcprov-jdk15on:1.57' implementation 'org.bouncycastle:bcprov-jdk15on:1.59'
implementation 'org.bouncycastle:bcpkix-jdk15on:1.57' implementation 'org.bouncycastle:bcpkix-jdk15on:1.59'
implementation files('libs/jcodec-0.1.9-patched.jar') implementation 'org.jcodec:jcodec:0.2.3'
implementation project(':moonlight-common') implementation project(':moonlight-common')
} }

BIN
app/libs/jcodec-0.1.9-patched.jar
View File

Binary file not shown.

42
app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java
View File

@ -633,15 +633,15 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
// High Profile which allows the decoder to assume there will be no B-frames and // High Profile which allows the decoder to assume there will be no B-frames and
// reduce delay and buffering accordingly. Some devices (Marvell, Exynos 4) don't // reduce delay and buffering accordingly. Some devices (Marvell, Exynos 4) don't
// like it so we only set them on devices that are confirmed to benefit from it. // like it so we only set them on devices that are confirmed to benefit from it.
if (sps.profile_idc == 100 && constrainedHighProfile) { if (sps.profileIdc == 100 && constrainedHighProfile) {
LimeLog.info("Setting constraint set flags for constrained high profile"); LimeLog.info("Setting constraint set flags for constrained high profile");
sps.constraint_set_4_flag = true; sps.constraintSet4Flag = true;
sps.constraint_set_5_flag = true; sps.constraintSet5Flag = true;
} }
else { else {
// Force the constraints unset otherwise (some may be set by default) // Force the constraints unset otherwise (some may be set by default)
sps.constraint_set_4_flag = false; sps.constraintSet4Flag = false;
sps.constraint_set_5_flag = false; sps.constraintSet5Flag = false;
} }
} }
@ -706,12 +706,12 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
if (initialWidth == 1280 && initialHeight == 720) { if (initialWidth == 1280 && initialHeight == 720) {
// Max 5 buffered frames at 1280x720x60 // Max 5 buffered frames at 1280x720x60
LimeLog.info("Patching level_idc to 32"); LimeLog.info("Patching level_idc to 32");
sps.level_idc = 32; sps.levelIdc = 32;
} }
else if (initialWidth == 1920 && initialHeight == 1080) { else if (initialWidth == 1920 && initialHeight == 1080) {
// Max 4 buffered frames at 1920x1080x64 // Max 4 buffered frames at 1920x1080x64
LimeLog.info("Patching level_idc to 42"); LimeLog.info("Patching level_idc to 42");
sps.level_idc = 42; sps.levelIdc = 42;
} }
else { else {
// Leave the profile alone (currently 5.0) // Leave the profile alone (currently 5.0)
@ -729,14 +729,14 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
// where we've enabled reference frame invalidation. // where we've enabled reference frame invalidation.
if (!refFrameInvalidationActive) { if (!refFrameInvalidationActive) {
LimeLog.info("Patching num_ref_frames in SPS"); LimeLog.info("Patching num_ref_frames in SPS");
sps.num_ref_frames = 1; sps.numRefFrames = 1;
} }
// GFE 2.5.11 changed the SPS to add additional extensions // GFE 2.5.11 changed the SPS to add additional extensions
// Some devices don't like these so we remove them here. // Some devices don't like these so we remove them here.
sps.vuiParams.video_signal_type_present_flag = false; sps.vuiParams.videoSignalTypePresentFlag = false;
sps.vuiParams.colour_description_present_flag = false; sps.vuiParams.colourDescriptionPresentFlag = false;
sps.vuiParams.chroma_loc_info_present_flag = false; sps.vuiParams.chromaLocInfoPresentFlag = false;
if ((needsSpsBitstreamFixup || isExynos4) && !refFrameInvalidationActive) { if ((needsSpsBitstreamFixup || isExynos4) && !refFrameInvalidationActive) {
// The SPS that comes in the current H264 bytestream doesn't set bitstream_restriction_flag // The SPS that comes in the current H264 bytestream doesn't set bitstream_restriction_flag
@ -746,22 +746,22 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
if (sps.vuiParams.bitstreamRestriction == null) { if (sps.vuiParams.bitstreamRestriction == null) {
LimeLog.info("Adding bitstream restrictions"); LimeLog.info("Adding bitstream restrictions");
sps.vuiParams.bitstreamRestriction = new VUIParameters.BitstreamRestriction(); sps.vuiParams.bitstreamRestriction = new VUIParameters.BitstreamRestriction();
sps.vuiParams.bitstreamRestriction.motion_vectors_over_pic_boundaries_flag = true; sps.vuiParams.bitstreamRestriction.motionVectorsOverPicBoundariesFlag = true;
sps.vuiParams.bitstreamRestriction.log2_max_mv_length_horizontal = 16; sps.vuiParams.bitstreamRestriction.log2MaxMvLengthHorizontal = 16;
sps.vuiParams.bitstreamRestriction.log2_max_mv_length_vertical = 16; sps.vuiParams.bitstreamRestriction.log2MaxMvLengthVertical = 16;
sps.vuiParams.bitstreamRestriction.num_reorder_frames = 0; sps.vuiParams.bitstreamRestriction.numReorderFrames = 0;
} }
else { else {
LimeLog.info("Patching bitstream restrictions"); LimeLog.info("Patching bitstream restrictions");
} }
// Some devices throw errors if max_dec_frame_buffering < num_ref_frames // Some devices throw errors if maxDecFrameBuffering < numRefFrames
sps.vuiParams.bitstreamRestriction.max_dec_frame_buffering = sps.num_ref_frames; sps.vuiParams.bitstreamRestriction.maxDecFrameBuffering = sps.numRefFrames;
// These values are the defaults for the fields, but they are more aggressive // These values are the defaults for the fields, but they are more aggressive
// than what GFE sends in 2.5.11, but it doesn't seem to cause picture problems. // than what GFE sends in 2.5.11, but it doesn't seem to cause picture problems.
sps.vuiParams.bitstreamRestriction.max_bytes_per_pic_denom = 2; sps.vuiParams.bitstreamRestriction.maxBytesPerPicDenom = 2;
sps.vuiParams.bitstreamRestriction.max_bits_per_mb_denom = 1; sps.vuiParams.bitstreamRestriction.maxBitsPerMbDenom = 1;
// log2_max_mv_length_horizontal and log2_max_mv_length_vertical are set to more // log2_max_mv_length_horizontal and log2_max_mv_length_vertical are set to more
// conservative values by GFE 2.5.11. We'll let those values stand. // conservative values by GFE 2.5.11. We'll let those values stand.
@ -775,7 +775,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
// If we need to hack this SPS to say we're baseline, do so now // If we need to hack this SPS to say we're baseline, do so now
if (needsBaselineSpsHack) { if (needsBaselineSpsHack) {
LimeLog.info("Hacking SPS to baseline"); LimeLog.info("Hacking SPS to baseline");
sps.profile_idc = 66; sps.profileIdc = 66;
savedSps = sps; savedSps = sps;
} }
@ -930,7 +930,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
inputBuffer.put(new byte[]{0x00, 0x00, 0x00, 0x01, 0x67}); inputBuffer.put(new byte[]{0x00, 0x00, 0x00, 0x01, 0x67});
// Switch the H264 profile back to high // Switch the H264 profile back to high
savedSps.profile_idc = 100; savedSps.profileIdc = 100;
// Patch the SPS constraint flags // Patch the SPS constraint flags
doProfileSpecificSpsPatching(savedSps); doProfileSpecificSpsPatching(savedSps);

2
moonlight-common

@ -1 +1 @@
Subproject commit 8a89f2ff821737d3eaa520e9c1b38fa344297f1a Subproject commit 21e1bc8c35aeb7e740662f91df9b239a36064da2