更新支持ipv6的librtmp库

WildWofe · Jul 5, 2016 · 5ee3b53 · 5ee3b53
1 parent 0b67cb4
commit 5ee3b53
Show file tree

Hide file tree

Showing 95 changed files with 383 additions and 2 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/...ideoCoreDemo.xcodeproj/xcuserdata/shiwei.xcuserdatad/xcschemes/LiveVideoCoreDemo.xcscheme b/...ideoCoreDemo.xcodeproj/xcuserdata/shiwei.xcuserdatad/xcschemes/LiveVideoCoreDemo.xcscheme
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0730"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "B782800E1C86C95E0057E507"
+               BuildableName = "LiveVideoCoreDemo.app"
+               BlueprintName = "LiveVideoCoreDemo"
+               ReferencedContainer = "container:LiveVideoCoreDemo.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "B78280271C86C95E0057E507"
+               BuildableName = "LiveVideoCoreDemoTests.xctest"
+               BlueprintName = "LiveVideoCoreDemoTests"
+               ReferencedContainer = "container:LiveVideoCoreDemo.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "B78280321C86C95E0057E507"
+               BuildableName = "LiveVideoCoreDemoUITests.xctest"
+               BlueprintName = "LiveVideoCoreDemoUITests"
+               ReferencedContainer = "container:LiveVideoCoreDemo.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B782800E1C86C95E0057E507"
+            BuildableName = "LiveVideoCoreDemo.app"
+            BlueprintName = "LiveVideoCoreDemo"
+            ReferencedContainer = "container:LiveVideoCoreDemo.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B782800E1C86C95E0057E507"
+            BuildableName = "LiveVideoCoreDemo.app"
+            BlueprintName = "LiveVideoCoreDemo"
+            ReferencedContainer = "container:LiveVideoCoreDemo.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B782800E1C86C95E0057E507"
+            BuildableName = "LiveVideoCoreDemo.app"
+            BlueprintName = "LiveVideoCoreDemo"
+            ReferencedContainer = "container:LiveVideoCoreDemo.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/...eVideoCoreDemo.xcodeproj/xcuserdata/shiwei.xcuserdatad/xcschemes/xcschememanagement.plist b/...eVideoCoreDemo.xcodeproj/xcuserdata/shiwei.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>LiveVideoCoreDemo.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>1</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>B782800E1C86C95E0057E507</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>B78280271C86C95E0057E507</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>B78280321C86C95E0057E507</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/LiveVideoCoreDemo/LiveVideoCoreDemo/ViewController.m b/LiveVideoCoreDemo/LiveVideoCoreDemo/ViewController.m
@@ -90,7 +90,7 @@ - (void)viewDidLoad {
 
     [self UIInit];
 
-    _RtmpUrlTextField.text = @"rtmp://192.168.100.100/live/123456";
+    _RtmpUrlTextField.text = @"rtmp://192.168.1.100/live/123456";
 }
 
 - (void)didReceiveMemoryWarning {

diff --git a/LiveVideoCoreSDK.xcodeproj/xcuserdata/shiwei.xcuserdatad/xcschemes/LiveVideoCoreSDK.xcscheme b/LiveVideoCoreSDK.xcodeproj/xcuserdata/shiwei.xcuserdatad/xcschemes/LiveVideoCoreSDK.xcscheme
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0730"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "B7CE543C1C867E0E00437FF2"
+               BuildableName = "libLiveVideoCoreSDK.a"
+               BlueprintName = "LiveVideoCoreSDK"
+               ReferencedContainer = "container:LiveVideoCoreSDK.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B7CE543C1C867E0E00437FF2"
+            BuildableName = "libLiveVideoCoreSDK.a"
+            BlueprintName = "LiveVideoCoreSDK"
+            ReferencedContainer = "container:LiveVideoCoreSDK.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B7CE543C1C867E0E00437FF2"
+            BuildableName = "libLiveVideoCoreSDK.a"
+            BlueprintName = "LiveVideoCoreSDK"
+            ReferencedContainer = "container:LiveVideoCoreSDK.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/LiveVideoCoreSDK.xcodeproj/xcuserdata/shiwei.xcuserdatad/xcschemes/xcschememanagement.plist b/LiveVideoCoreSDK.xcodeproj/xcuserdata/shiwei.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>LiveVideoCoreSDK.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>2</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>B7CE543C1C867E0E00437FF2</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/LiveVideoCoreSDK.xcworkspace/xcshareddata/LiveVideoCoreSDK.xcscmblueprint b/LiveVideoCoreSDK.xcworkspace/xcshareddata/LiveVideoCoreSDK.xcscmblueprint
@@ -0,0 +1,30 @@
+{
+  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "D1710B4522FBD399346846A17EF5567A1BB1B736",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
+
+  },
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "D1710B4522FBD399346846A17EF5567A1BB1B736" : 0,
+    "0CE6276335B519201392AE507EA12B2DF9FF0EAC" : 0
+  },
+  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "11CFA609-AC5C-4221-85FA-04D2960C9527",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+    "D1710B4522FBD399346846A17EF5567A1BB1B736" : "LiveVideoCoreSDK\/",
+    "0CE6276335B519201392AE507EA12B2DF9FF0EAC" : ".."
+  },
+  "DVTSourceControlWorkspaceBlueprintNameKey" : "LiveVideoCoreSDK",
+  "DVTSourceControlWorkspaceBlueprintVersion" : 204,
+  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "LiveVideoCoreSDK.xcworkspace",
+  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/runner365\/AudioMix.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "0CE6276335B519201392AE507EA12B2DF9FF0EAC"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/runner365\/LiveVideoCoreSDK.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "D1710B4522FBD399346846A17EF5567A1BB1B736"
+    }
+  ]
+}
diff --git a/LiveVideoCoreSDK.xcworkspace/xcuserdata/shiwei.xcuserdatad/UserInterfaceState.xcuserstate b/LiveVideoCoreSDK.xcworkspace/xcuserdata/shiwei.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...tmpLivePushSDK.xcodeproj/xcuserdata/shiwei.xcuserdatad/xcschemes/RtmpLivePushSDK.xcscheme b/...tmpLivePushSDK.xcodeproj/xcuserdata/shiwei.xcuserdatad/xcschemes/RtmpLivePushSDK.xcscheme
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0730"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "B7BB88041CA3BA7D00D05AEF"
+               BuildableName = "libRtmpLivePushSDK.a"
+               BlueprintName = "RtmpLivePushSDK"
+               ReferencedContainer = "container:RtmpLivePushSDK.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B7BB88041CA3BA7D00D05AEF"
+            BuildableName = "libRtmpLivePushSDK.a"
+            BlueprintName = "RtmpLivePushSDK"
+            ReferencedContainer = "container:RtmpLivePushSDK.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "B7BB88041CA3BA7D00D05AEF"
+            BuildableName = "libRtmpLivePushSDK.a"
+            BlueprintName = "RtmpLivePushSDK"
+            ReferencedContainer = "container:RtmpLivePushSDK.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/...tmpLivePushSDK.xcodeproj/xcuserdata/shiwei.xcuserdatad/xcschemes/xcschememanagement.plist b/...tmpLivePushSDK.xcodeproj/xcuserdata/shiwei.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>RtmpLivePushSDK.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>B7BB88041CA3BA7D00D05AEF</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>
diff --git a/RtmpLivePushSDK/VideoCore/RtmpManager/.DS_Store b/RtmpLivePushSDK/VideoCore/RtmpManager/.DS_Store
diff --git a/RtmpLivePushSDK/VideoCore/RtmpManager/include/.DS_Store b/RtmpLivePushSDK/VideoCore/RtmpManager/include/.DS_Store
diff --git a/RtmpLivePushSDK/VideoCore/RtmpManager/include/librtmp/amf.h b/RtmpLivePushSDK/VideoCore/RtmpManager/include/librtmp/amf.h
diff --git a/RtmpLivePushSDK/VideoCore/RtmpManager/include/librtmp/http.h b/RtmpLivePushSDK/VideoCore/RtmpManager/include/librtmp/http.h
diff --git a/RtmpLivePushSDK/VideoCore/RtmpManager/include/librtmp/log.h b/RtmpLivePushSDK/VideoCore/RtmpManager/include/librtmp/log.h