Reorganize folder structure

This commit is contained in:
Tiago Jacobs 2022-03-24 11:06:12 -03:00
parent 8169f37a7b
commit 15ba546dfb
9 changed files with 22 additions and 21 deletions

View File

@ -4,8 +4,8 @@ require_relative '../node_modules/@react-native-community/cli-platform-ios/nativ
platform :ios, '14.7' platform :ios, '14.7'
target 'BigBlueButtonMobileSdkBroadcastExample' do target 'BigBlueButtonMobileSdkBroadcastExample' do
pod 'bigbluebutton-mobile-sdk-common', :path => '../../common' pod 'bigbluebutton-mobile-sdk-common', :path => '../../ios-common'
pod 'bigbluebutton-mobile-sdk-broadcast-upload-extension', :path => '../../broadcast-upload-extension' pod 'bigbluebutton-mobile-sdk-broadcast-upload-extension', :path => '../../ios-broadcast-upload-extension'
end end
target 'BigbluebuttonMobileSdkExample' do target 'BigbluebuttonMobileSdkExample' do
@ -14,7 +14,7 @@ target 'BigbluebuttonMobileSdkExample' do
use_react_native!(:path => config["reactNativePath"]) use_react_native!(:path => config["reactNativePath"])
pod 'bigbluebutton-mobile-sdk', :path => '../..' pod 'bigbluebutton-mobile-sdk', :path => '../..'
pod 'bigbluebutton-mobile-sdk-common', :path => '../../common' pod 'bigbluebutton-mobile-sdk-common', :path => '../../ios-common'
# Enables Flipper. # Enables Flipper.
# #

View File

@ -261,8 +261,8 @@ PODS:
DEPENDENCIES: DEPENDENCIES:
- bigbluebutton-mobile-sdk (from `../..`) - bigbluebutton-mobile-sdk (from `../..`)
- bigbluebutton-mobile-sdk-broadcast-upload-extension (from `../../broadcast-upload-extension`) - bigbluebutton-mobile-sdk-broadcast-upload-extension (from `../../ios-broadcast-upload-extension`)
- bigbluebutton-mobile-sdk-common (from `../../common`) - bigbluebutton-mobile-sdk-common (from `../../ios-common`)
- DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
- FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
- FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`) - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`)
@ -302,9 +302,9 @@ EXTERNAL SOURCES:
bigbluebutton-mobile-sdk: bigbluebutton-mobile-sdk:
:path: "../.." :path: "../.."
bigbluebutton-mobile-sdk-broadcast-upload-extension: bigbluebutton-mobile-sdk-broadcast-upload-extension:
:path: "../../broadcast-upload-extension" :path: "../../ios-broadcast-upload-extension"
bigbluebutton-mobile-sdk-common: bigbluebutton-mobile-sdk-common:
:path: "../../common" :path: "../../ios-common"
DoubleConversion: DoubleConversion:
:podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec" :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec"
FBLazyVector: FBLazyVector:
@ -394,6 +394,6 @@ SPEC CHECKSUMS:
WebRTC-lib: 508fe02efa0c1a3a8867082a77d24c9be5d29aeb WebRTC-lib: 508fe02efa0c1a3a8867082a77d24c9be5d29aeb
Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6 Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6
PODFILE CHECKSUM: f1ee5698b5774661de3a42d8c9f39f10a1cfd1b3 PODFILE CHECKSUM: 1cef60f4fb4cef93dc6de3cb3b53463e5f48a9bc
COCOAPODS: 1.11.2 COCOAPODS: 1.11.2

View File

@ -48,7 +48,8 @@ final class WebRTCClient: NSObject {
config.sdpSemantics = .unifiedPlan config.sdpSemantics = .unifiedPlan
// gatherContinually will let WebRTC to listen to any network changes and send any new candidates to the other client // gatherContinually will let WebRTC to listen to any network changes and send any new candidates to the other client
config.continualGatheringPolicy = .gatherContinually // gatherOnce will get candidates only on beginning (this is how BBB expect to have it for now, so we use this one)
config.continualGatheringPolicy = .gatherOnce
// Define media constraints. DtlsSrtpKeyAgreement is required to be true to be able to connect with web browsers. // Define media constraints. DtlsSrtpKeyAgreement is required to be true to be able to connect with web browsers.
let constraints = RTCMediaConstraints(mandatoryConstraints: nil, let constraints = RTCMediaConstraints(mandatoryConstraints: nil,
@ -61,8 +62,8 @@ final class WebRTCClient: NSObject {
self.peerConnection = peerConnection self.peerConnection = peerConnection
super.init() super.init()
createMediaSenders() // createMediaSenders()
configureAudioSession() // configureAudioSession()
self.peerConnection.delegate = self self.peerConnection.delegate = self
} }
@ -88,13 +89,13 @@ final class WebRTCClient: NSObject {
// MARK: Media // MARK: Media
func push(videoFrame: RTCVideoFrame) { /*func push(videoFrame: RTCVideoFrame) {
guard videoCapturer != nil, videoSource != nil else { return } guard videoCapturer != nil, videoSource != nil else { return }
videoSource!.capturer(videoCapturer!, didCapture: videoFrame) videoSource!.capturer(videoCapturer!, didCapture: videoFrame)
print("RTCVideoFrame pushed to server.") print("RTCVideoFrame pushed to server.")
} }*/
private func configureAudioSession() { /*private func configureAudioSession() {
self.rtcAudioSession.lockForConfiguration() self.rtcAudioSession.lockForConfiguration()
do { do {
try self.rtcAudioSession.setCategory(AVAudioSession.Category.playAndRecord.rawValue) try self.rtcAudioSession.setCategory(AVAudioSession.Category.playAndRecord.rawValue)
@ -103,9 +104,9 @@ final class WebRTCClient: NSObject {
debugPrint("Error changing AVAudioSession category: \(error)") debugPrint("Error changing AVAudioSession category: \(error)")
} }
self.rtcAudioSession.unlockForConfiguration() self.rtcAudioSession.unlockForConfiguration()
} }*/
private func createMediaSenders() { /*private func createMediaSenders() {
let streamId = "stream" let streamId = "stream"
// Audio // Audio
@ -116,23 +117,23 @@ final class WebRTCClient: NSObject {
let videoTrack = self.createVideoTrack() let videoTrack = self.createVideoTrack()
self.localVideoTrack = videoTrack self.localVideoTrack = videoTrack
self.peerConnection.add(videoTrack, streamIds: [streamId]) self.peerConnection.add(videoTrack, streamIds: [streamId])
} }*/
private func createAudioTrack() -> RTCAudioTrack { /*private func createAudioTrack() -> RTCAudioTrack {
let audioConstrains = RTCMediaConstraints(mandatoryConstraints: nil, optionalConstraints: nil) let audioConstrains = RTCMediaConstraints(mandatoryConstraints: nil, optionalConstraints: nil)
let audioSource = WebRTCClient.factory.audioSource(with: audioConstrains) let audioSource = WebRTCClient.factory.audioSource(with: audioConstrains)
let audioTrack = WebRTCClient.factory.audioTrack(with: audioSource, trackId: "audio0") let audioTrack = WebRTCClient.factory.audioTrack(with: audioSource, trackId: "audio0")
return audioTrack return audioTrack
} }*/
private func createVideoTrack() -> RTCVideoTrack { /*private func createVideoTrack() -> RTCVideoTrack {
videoSource = WebRTCClient.factory.videoSource(forScreenCast: true) videoSource = WebRTCClient.factory.videoSource(forScreenCast: true)
videoCapturer = RTCVideoCapturer(delegate: videoSource!) videoCapturer = RTCVideoCapturer(delegate: videoSource!)
videoSource!.adaptOutputFormat(toWidth: 600, height: 800, fps: 15) videoSource!.adaptOutputFormat(toWidth: 600, height: 800, fps: 15)
let videoTrack = WebRTCClient.factory.videoTrack(with: videoSource!, trackId: "video0") let videoTrack = WebRTCClient.factory.videoTrack(with: videoSource!, trackId: "video0")
videoTrack.isEnabled = true videoTrack.isEnabled = true
return videoTrack return videoTrack
} }*/
} }
// MARK: RTCPeerConnectionDelegate Methods // MARK: RTCPeerConnectionDelegate Methods