From 7b41b1158ecebeeaa226a0f27ade574d689f9eea Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sat, 25 Nov 2017 12:15:21 -0800 Subject: [PATCH] Separate H.265 video format for SDR and HDR formats --- .../main/java/com/limelight/nvstream/jni/MoonBridge.java | 8 ++++++-- .../src/main/jni/moonlight-core/moonlight-common-c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/moonlight-common/src/main/java/com/limelight/nvstream/jni/MoonBridge.java b/moonlight-common/src/main/java/com/limelight/nvstream/jni/MoonBridge.java index eec501fa..3d0a37fd 100644 --- a/moonlight-common/src/main/java/com/limelight/nvstream/jni/MoonBridge.java +++ b/moonlight-common/src/main/java/com/limelight/nvstream/jni/MoonBridge.java @@ -10,8 +10,12 @@ public class MoonBridge { public static final int AUDIO_CONFIGURATION_STEREO = 0; public static final int AUDIO_CONFIGURATION_51_SURROUND = 1; - public static final int VIDEO_FORMAT_H264 = 1; - public static final int VIDEO_FORMAT_H265 = 2; + public static final int VIDEO_FORMAT_H264 = 0x0001; + public static final int VIDEO_FORMAT_H265 = 0x0100; + public static final int VIDEO_FORMAT_H265_MAIN10 = 0x0200; + + public static final int VIDEO_FORMAT_MASK_H264 = 0x00FF; + public static final int VIDEO_FORMAT_MASK_H265 = 0xFF00; public static final int BUFFER_TYPE_PICDATA = 0; public static final int BUFFER_TYPE_SPS = 1; diff --git a/moonlight-common/src/main/jni/moonlight-core/moonlight-common-c b/moonlight-common/src/main/jni/moonlight-core/moonlight-common-c index 1c386a89..26fe1cb2 160000 --- a/moonlight-common/src/main/jni/moonlight-core/moonlight-common-c +++ b/moonlight-common/src/main/jni/moonlight-core/moonlight-common-c @@ -1 +1 @@ -Subproject commit 1c386a898731ae07168d52c835657409b54f7790 +Subproject commit 26fe1cb22c298d66d864f9e62bf0889ef6a80487