Skip to content

Commit 82797a7

Browse files
author
xianing
committed
use cocoapods version sdk
1 parent 6f25f65 commit 82797a7

3 files changed

Lines changed: 96 additions & 6 deletions

File tree

iOS/APIExample.xcodeproj/project.pbxproj

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1823,6 +1823,49 @@
18231823
"$(inherited)",
18241824
"@executable_path/Frameworks",
18251825
);
1826+
OTHER_LDFLAGS = (
1827+
"$(inherited)",
1828+
"-ObjC",
1829+
"-l\"stdc++\"",
1830+
"-framework",
1831+
"\"AGEVideoLayout\"",
1832+
"-framework",
1833+
"\"AVFoundation\"",
1834+
"-framework",
1835+
"\"Accelerate\"",
1836+
"-framework",
1837+
"\"AgoraRtcCryptoLoader\"",
1838+
"-framework",
1839+
"\"AgoraRtcKit\"",
1840+
"-framework",
1841+
"\"AgoraVideoProcess\"",
1842+
"-framework",
1843+
"\"Agoraffmpeg\"",
1844+
"-framework",
1845+
"\"AssetsLibrary\"",
1846+
"-framework",
1847+
"\"CFNetwork\"",
1848+
"-framework",
1849+
"\"CocoaAsyncSocket\"",
1850+
"-framework",
1851+
"\"CoreGraphics\"",
1852+
"-framework",
1853+
"\"CoreImage\"",
1854+
"-framework",
1855+
"\"CoreMedia\"",
1856+
"-framework",
1857+
"\"CoreVideo\"",
1858+
"-framework",
1859+
"\"Floaty\"",
1860+
"-framework",
1861+
"\"Foundation\"",
1862+
"-framework",
1863+
"\"QuartzCore\"",
1864+
"-framework",
1865+
"\"Security\"",
1866+
"-framework",
1867+
"\"UIKit\"",
1868+
);
18261869
PRODUCT_BUNDLE_IDENTIFIER = io.agora.api.example.collection;
18271870
PRODUCT_NAME = "$(TARGET_NAME)";
18281871
PROVISIONING_PROFILE_SPECIFIER = rte_team_ios;
@@ -1854,6 +1897,49 @@
18541897
"$(inherited)",
18551898
"@executable_path/Frameworks",
18561899
);
1900+
OTHER_LDFLAGS = (
1901+
"$(inherited)",
1902+
"-ObjC",
1903+
"-l\"stdc++\"",
1904+
"-framework",
1905+
"\"AGEVideoLayout\"",
1906+
"-framework",
1907+
"\"AVFoundation\"",
1908+
"-framework",
1909+
"\"Accelerate\"",
1910+
"-framework",
1911+
"\"AgoraRtcCryptoLoader\"",
1912+
"-framework",
1913+
"\"AgoraRtcKit\"",
1914+
"-framework",
1915+
"\"AgoraVideoProcess\"",
1916+
"-framework",
1917+
"\"Agoraffmpeg\"",
1918+
"-framework",
1919+
"\"AssetsLibrary\"",
1920+
"-framework",
1921+
"\"CFNetwork\"",
1922+
"-framework",
1923+
"\"CocoaAsyncSocket\"",
1924+
"-framework",
1925+
"\"CoreGraphics\"",
1926+
"-framework",
1927+
"\"CoreImage\"",
1928+
"-framework",
1929+
"\"CoreMedia\"",
1930+
"-framework",
1931+
"\"CoreVideo\"",
1932+
"-framework",
1933+
"\"Floaty\"",
1934+
"-framework",
1935+
"\"Foundation\"",
1936+
"-framework",
1937+
"\"QuartzCore\"",
1938+
"-framework",
1939+
"\"Security\"",
1940+
"-framework",
1941+
"\"UIKit\"",
1942+
);
18571943
PRODUCT_BUNDLE_IDENTIFIER = io.agora.api.example.collection;
18581944
PRODUCT_NAME = "$(TARGET_NAME)";
18591945
PROVISIONING_PROFILE_SPECIFIER = rte_team_ios;

iOS/APIExample/Common/ExternalVideo/AgoraMetalRender.swift

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ extension AgoraMetalRender: AgoraVideoFrameDelegate {
9393

9494
return true
9595
}
96-
97-
func onRenderVideoFrame(_ videoFrame: AgoraOutputVideoFrame, uid: UInt, connectionId: UInt) -> Bool {
98-
96+
97+
func onRenderVideoFrame(_ videoFrame: AgoraOutputVideoFrame, uid: UInt, channelId: String) -> Bool {
98+
#if os(iOS) && (!arch(i386) && !arch(x86_64))
9999
guard let rotation = getAgoraRotation(rotation: videoFrame.rotation) else {
100100
return false
101101
}
@@ -127,6 +127,7 @@ extension AgoraMetalRender: AgoraVideoFrameDelegate {
127127
let uvTexture = texture(pixelBuffer: pixelBuffer, textureCache: textureCache, planeIndex: 1, pixelFormat: .rg8Unorm) {
128128
self.textures = [yTexture, uvTexture]
129129
}
130+
#endif
130131
return false
131132
}
132133

iOS/Podfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ target 'APIExample' do
66
pod 'Floaty', '~> 4.2.0'
77
pod 'AGEVideoLayout', '~> 1.0.2'
88
pod 'CocoaAsyncSocket', '7.6.5'
9-
pod 'AgoraNGSDK', :path => 'sdk'
9+
# pod 'AgoraNGSDK', :path => 'sdk'
10+
pod 'AgoraFFmpegPlayer_iOS_Preview', '4.0.0'
1011
end
1112

1213
target 'Agora-ScreenShare-Extension' do
13-
pod 'AgoraNGSDK', :path => 'sdk'
14+
# pod 'AgoraNGSDK', :path => 'sdk'
15+
pod 'AgoraFFmpegPlayer_iOS_Preview', '4.0.0'
1416
use_frameworks!
1517
end
1618

@@ -19,7 +21,8 @@ target 'Agora-ScreenShare-Extension(Socket)' do
1921
end
2022

2123
target 'SimpleFilter' do
22-
pod 'AgoraNGSDK', :path => 'sdk'
24+
# pod 'AgoraNGSDK', :path => 'sdk'
25+
pod 'AgoraFFmpegPlayer_iOS_Preview', '4.0.0'
2326
pod 'OpenCV', '~> 4.3.0'
2427
use_frameworks!
2528

0 commit comments

Comments
 (0)