Merge pull request #213 from red5pro/develop

Develop
red5pro · Oct 10, 2022 · c41c4df · c41c4df
2 parents acb7353 + 7bc85f0
commit c41c4df
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 23 deletions.
diff --git a/R5ProObjectiveCExamples/R5Streaming.framework/Headers/FileWriter.h b/R5ProObjectiveCExamples/R5Streaming.framework/Headers/FileWriter.h
@@ -24,6 +24,7 @@
 -(void)writeAudio:(CMSampleBufferRef)sampleBuffer;
 -(void)writeAudio:(NSData*)data withTime:(double)pts andRate:(int)rate;
 -(void)writeAudioBuffer:(AudioBufferList*)data withTime:(double)pts andRate:(int)rate;
+-(void)writeEmptyAudioBuffer:(AudioBufferList*)data withTime:(double)pts andRate:(int)rate;
 
 -(void)finish:(BOOL)saveRecording;
 

diff --git a/R5ProObjectiveCExamples/R5Streaming.framework/Headers/R5Stream.h b/R5ProObjectiveCExamples/R5Streaming.framework/Headers/R5Stream.h
@@ -35,6 +35,7 @@ enum R5StreamMode{
 extern NSString *const R5RecordVideoBitRateKey;
 extern NSString *const R5RecordAudioBitRateKey;
 extern NSString *const R5RecordAlbumName;
+extern NSString *const R5RecordToCameraRoll;
 
 /**
  *  @brief The main stream class of Red5Pro.  Utilizes the #R5Connection to connect and communicate with a server instance.

diff --git a/R5ProObjectiveCExamples/R5Streaming.framework/Headers/global.h b/R5ProObjectiveCExamples/R5Streaming.framework/Headers/global.h
@@ -21,8 +21,8 @@ extern "C" {
 #define STRINGIFY_(s) #s
 #define STRINGIFY(s) STRINGIFY_(s)
 
-#define R5PRO_MAJOR_VERSION         8
-#define R5PRO_MINOR_VERSION         0
+#define R5PRO_MAJOR_VERSION         10
+#define R5PRO_MINOR_VERSION         7
 #define R5PRO_REVISION              0
 #define R5PRO_BUILD                 0
 

diff --git a/R5ProObjectiveCExamples/R5Streaming.framework/Info.plist b/R5ProObjectiveCExamples/R5Streaming.framework/Info.plist
diff --git a/R5ProObjectiveCExamples/R5Streaming.framework/R5Streaming b/R5ProObjectiveCExamples/R5Streaming.framework/R5Streaming
diff --git a/R5ProTestbed.xcodeproj/project.pbxproj b/R5ProTestbed.xcodeproj/project.pbxproj
@@ -616,7 +616,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -655,7 +655,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -669,18 +669,20 @@
 				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CURRENT_PROJECT_VERSION = 1070;
 				DEVELOPMENT_TEAM = E964K44BWW;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/R5ProTestbed",
 				);
 				INFOPLIST_FILE = R5ProTestbed/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 10.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.infrared5.R5ProTestbed;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "R5ProTestbed/R5ProTestbed-Bridging-Header.h";
@@ -696,18 +698,20 @@
 				ARCHS = "$(ARCHS_STANDARD)";
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CURRENT_PROJECT_VERSION = 1070;
 				DEVELOPMENT_TEAM = E964K44BWW;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/R5ProTestbed",
 				);
 				INFOPLIST_FILE = R5ProTestbed/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 10.7.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.infrared5.R5ProTestbed;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "R5ProTestbed/R5ProTestbed-Bridging-Header.h";

diff --git a/R5ProTestbed.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/R5ProTestbed.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,16 +1,14 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "Starscream",
-        "repositoryURL": "https://github.com/daltoniam/Starscream",
-        "state": {
-          "branch": null,
-          "revision": "df8d82047f6654d8e4b655d1b1525c64e1059d21",
-          "version": "4.0.4"
-        }
+  "pins" : [
+    {
+      "identity" : "starscream",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/daltoniam/Starscream",
+      "state" : {
+        "revision" : "df8d82047f6654d8e4b655d1b1525c64e1059d21",
+        "version" : "4.0.4"
       }
-    ]
-  },
-  "version": 1
+    }
+  ],
+  "version" : 2
 }
diff --git a/R5ProTestbed/Info.plist b/R5ProTestbed/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.0.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>600</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

diff --git a/R5ProTestbed/R5Streaming.framework/Headers/global.h b/R5ProTestbed/R5Streaming.framework/Headers/global.h
@@ -22,9 +22,9 @@ extern "C" {
 #define STRINGIFY(s) STRINGIFY_(s)
 
 #define R5PRO_MAJOR_VERSION         10
-#define R5PRO_MINOR_VERSION         1
+#define R5PRO_MINOR_VERSION         7
 #define R5PRO_REVISION              0
-#define R5PRO_BUILD                 b162
+#define R5PRO_BUILD                 0
 
 
 #define R5PRO_VERSION               STRINGIFY(R5PRO_MAJOR_VERSION.R5PRO_MINOR_VERSION.R5PRO_REVISION.R5PRO_BUILD)