diff --git a/Moonlight.xcodeproj/project.pbxproj b/Moonlight.xcodeproj/project.pbxproj index 35513c9..add045d 100644 --- a/Moonlight.xcodeproj/project.pbxproj +++ b/Moonlight.xcodeproj/project.pbxproj @@ -1179,12 +1179,18 @@ "$(inherited)", "@executable_path/Frameworks", ); - LIBRARY_SEARCH_PATHS = ( + "LIBRARY_SEARCH_PATHS[sdk=appletvos*]" = ( "$(inherited)", "$(PROJECT_DIR)/libs/opus/lib/tvOS", "$(PROJECT_DIR)/libs/SDL2/lib/tvOS", "$(PROJECT_DIR)/libs/FFmpeg/lib/tvOS", ); + "LIBRARY_SEARCH_PATHS[sdk=appletvsimulator*]" = ( + "$(inherited)", + "$(PROJECT_DIR)/libs/opus/lib/tvOS-Sim", + "$(PROJECT_DIR)/libs/SDL2/lib/tvOS-Sim", + "$(PROJECT_DIR)/libs/FFmpeg/lib/tvOS-Sim", + ); MARKETING_VERSION = 8.5.0; MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.moonlight-stream.Moonlight"; @@ -1228,12 +1234,18 @@ "$(inherited)", "@executable_path/Frameworks", ); - LIBRARY_SEARCH_PATHS = ( + "LIBRARY_SEARCH_PATHS[sdk=appletvos*]" = ( "$(inherited)", "$(PROJECT_DIR)/libs/opus/lib/tvOS", "$(PROJECT_DIR)/libs/SDL2/lib/tvOS", "$(PROJECT_DIR)/libs/FFmpeg/lib/tvOS", ); + "LIBRARY_SEARCH_PATHS[sdk=appletvsimulator*]" = ( + "$(inherited)", + "$(PROJECT_DIR)/libs/opus/lib/tvOS-Sim", + "$(PROJECT_DIR)/libs/SDL2/lib/tvOS-Sim", + "$(PROJECT_DIR)/libs/FFmpeg/lib/tvOS-Sim", + ); MARKETING_VERSION = 8.5.0; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.moonlight-stream.Moonlight"; @@ -1378,12 +1390,18 @@ "$(inherited)", "@executable_path/Frameworks", ); - LIBRARY_SEARCH_PATHS = ( + "LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = ( "$(inherited)", "$(PROJECT_DIR)/libs/opus/lib/iOS", "$(PROJECT_DIR)/libs/SDL2/lib/iOS", "$(PROJECT_DIR)/libs/FFmpeg/lib/iOS", ); + "LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = ( + "$(inherited)", + "$(PROJECT_DIR)/libs/opus/lib/iOS-Sim", + "$(PROJECT_DIR)/libs/SDL2/lib/iOS-Sim", + "$(PROJECT_DIR)/libs/FFmpeg/lib/iOS-Sim", + ); MARKETING_VERSION = 8.5.0; PRODUCT_BUNDLE_IDENTIFIER = "com.moonlight-stream.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1420,12 +1438,18 @@ "$(inherited)", "@executable_path/Frameworks", ); - LIBRARY_SEARCH_PATHS = ( + "LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = ( "$(inherited)", "$(PROJECT_DIR)/libs/opus/lib/iOS", "$(PROJECT_DIR)/libs/SDL2/lib/iOS", "$(PROJECT_DIR)/libs/FFmpeg/lib/iOS", ); + "LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = ( + "$(inherited)", + "$(PROJECT_DIR)/libs/opus/lib/iOS-Sim", + "$(PROJECT_DIR)/libs/SDL2/lib/iOS-Sim", + "$(PROJECT_DIR)/libs/FFmpeg/lib/iOS-Sim", + ); MARKETING_VERSION = 8.5.0; PRODUCT_BUNDLE_IDENTIFIER = "com.moonlight-stream.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/libs/Build.txt b/libs/Build.txt new file mode 100644 index 0000000..651ca76 --- /dev/null +++ b/libs/Build.txt @@ -0,0 +1 @@ +Static libraries were built from https://github.com/cgutman/moonlight-mobile-deps using AppVeyor CI \ No newline at end of file diff --git a/libs/SDL2/lib/iOS-Sim/libSDL2.a b/libs/SDL2/lib/iOS-Sim/libSDL2.a index cbf3f73..934786b 100644 Binary files a/libs/SDL2/lib/iOS-Sim/libSDL2.a and b/libs/SDL2/lib/iOS-Sim/libSDL2.a differ diff --git a/libs/SDL2/lib/tvOS-Sim/libSDL2.a b/libs/SDL2/lib/tvOS-Sim/libSDL2.a index 4642371..1f59667 100644 Binary files a/libs/SDL2/lib/tvOS-Sim/libSDL2.a and b/libs/SDL2/lib/tvOS-Sim/libSDL2.a differ diff --git a/libs/opus/include/opus/opus.h b/libs/opus/include/opus/opus.h index d282f21..0c69c62 100644 --- a/libs/opus/include/opus/opus.h +++ b/libs/opus/include/opus/opus.h @@ -198,7 +198,7 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_encoder_get_size(int channels); * This must be one of 8000, 12000, 16000, * 24000, or 48000. * @param [in] channels int: Number of channels (1 or 2) in input signal - * @param [in] application int: Coding mode (@ref OPUS_APPLICATION_VOIP/@ref OPUS_APPLICATION_AUDIO/@ref OPUS_APPLICATION_RESTRICTED_LOWDELAY) + * @param [in] application int: Coding mode (one of @ref OPUS_APPLICATION_VOIP, @ref OPUS_APPLICATION_AUDIO, or @ref OPUS_APPLICATION_RESTRICTED_LOWDELAY) * @param [out] error int*: @ref opus_errorcodes * @note Regardless of the sampling rate and number channels selected, the Opus encoder * can switch to a lower audio bandwidth or number of channels if the bitrate @@ -222,7 +222,7 @@ OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusEncoder *opus_encoder_create( * This must be one of 8000, 12000, 16000, * 24000, or 48000. * @param [in] channels int: Number of channels (1 or 2) in input signal - * @param [in] application int: Coding mode (OPUS_APPLICATION_VOIP/OPUS_APPLICATION_AUDIO/OPUS_APPLICATION_RESTRICTED_LOWDELAY) + * @param [in] application int: Coding mode (one of OPUS_APPLICATION_VOIP, OPUS_APPLICATION_AUDIO, or OPUS_APPLICATION_RESTRICTED_LOWDELAY) * @retval #OPUS_OK Success or @ref opus_errorcodes */ OPUS_EXPORT int opus_encoder_init( diff --git a/libs/opus/include/opus/opus_defines.h b/libs/opus/include/opus/opus_defines.h index d141418..94b9e0d 100644 --- a/libs/opus/include/opus/opus_defines.h +++ b/libs/opus/include/opus/opus_defines.h @@ -64,7 +64,7 @@ extern "C" { /**Export control for opus functions */ #ifndef OPUS_EXPORT -# if defined(WIN32) +# if defined(_WIN32) # if defined(OPUS_BUILD) && defined(DLL_EXPORT) # define OPUS_EXPORT __declspec(dllexport) # else @@ -482,7 +482,8 @@ extern "C" { * @param[in] x opus_int32: Allowed values: *
*
0
Disable inband FEC (default).
- *
1
Enable inband FEC.
+ *
1
Inband FEC enabled. If the packet loss rate is sufficiently high, Opus will automatically switch to SILK even at high rates to enable use of that FEC.
+ *
2
Inband FEC enabled, but does not necessarily switch to SILK if we have music.
*
* @hideinitializer */ #define OPUS_SET_INBAND_FEC(x) OPUS_SET_INBAND_FEC_REQUEST, __opus_check_int(x) @@ -491,7 +492,8 @@ extern "C" { * @param[out] x opus_int32 *: Returns one of the following values: *
*
0
Inband FEC disabled (default).
- *
1
Inband FEC enabled.
+ *
1
Inband FEC enabled. If the packet loss rate is sufficiently high, Opus will automatically switch to SILK even at high rates to enable use of that FEC.
+ *
2
Inband FEC enabled, but does not necessarily switch to SILK if we have music.
*
* @hideinitializer */ #define OPUS_GET_INBAND_FEC(x) OPUS_GET_INBAND_FEC_REQUEST, __opus_check_int_ptr(x) diff --git a/libs/opus/lib/iOS-Sim/libopus.a b/libs/opus/lib/iOS-Sim/libopus.a new file mode 100644 index 0000000..0e16025 Binary files /dev/null and b/libs/opus/lib/iOS-Sim/libopus.a differ diff --git a/libs/opus/lib/iOS/libopus.a b/libs/opus/lib/iOS/libopus.a index 1015b71..e67caa0 100644 Binary files a/libs/opus/lib/iOS/libopus.a and b/libs/opus/lib/iOS/libopus.a differ diff --git a/libs/opus/lib/tvOS-Sim/libopus.a b/libs/opus/lib/tvOS-Sim/libopus.a new file mode 100644 index 0000000..ed292d6 Binary files /dev/null and b/libs/opus/lib/tvOS-Sim/libopus.a differ diff --git a/libs/opus/lib/tvOS/libopus.a b/libs/opus/lib/tvOS/libopus.a index 89c408a..5903140 100644 Binary files a/libs/opus/lib/tvOS/libopus.a and b/libs/opus/lib/tvOS/libopus.a differ