Skip to content

pidan / FuSiLive

Go to a project
Commit e7091848 by ludi
Options

重新提交一下snapkit

parent f1d5a6db
Expand all
Inline Side-by-side
Showing with 254 additions and 48 deletions
Podfile.lock
......@@ -14,7 +14,7 @@ PODS:
- AFNetworking/Serialization (4.0.1)
- AFNetworking/UIKit (4.0.1):
- AFNetworking/NSURLSession
- AgoraRtcEngine_iOS/RtcBasic (4.3.1)
- AgoraRtcEngine_iOS/RtcBasic (4.3.2)
- AliyunOSSiOS (2.10.21)
- AppAuth (1.7.5):
- AppAuth/Core (= 1.7.5)
......@@ -148,7 +148,7 @@ PODS:
- AppAuth/Core (~> 1.6)
- GTMSessionFetcher/Core (< 3.0, >= 1.5)
- GTMSessionFetcher/Core (1.7.2)
- HWPanModal (0.9.8)
- HWPanModal (0.9.9)
- HyphenateChat (3.8.3.1)
- libPhoneNumber-iOS (0.9.15)
- LineSDK (4.0.3)
......@@ -191,6 +191,7 @@ PODS:
- RMStore/Core (= 0.7.1)
- RMStore/Core (0.7.1)
- SharetraceSDK (2.3.4)
- SnapKit (5.7.1)
- TalkingData/Full (5.0.5)
- TenjinSDK (1.14.3)
- TTSDK/ByteAudio (1.37.2.6-premium-sft)
......@@ -254,6 +255,7 @@ DEPENDENCIES:
- MGSwipeTableCell
- MMDrawerController
- SharetraceSDK
- SnapKit
- TenjinSDK
- TTSDK/LivePull (= 1.37.2.6-premium-sft)
- TTSDK/LivePush (= 1.37.2.6-premium-sft)
......@@ -298,6 +300,7 @@ SPEC REPOS:
- PromisesObjC
- RMStore
- SharetraceSDK
- SnapKit
- TalkingData
- TenjinSDK
- TTTAttributedLabel
......@@ -320,7 +323,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58
AgoraRtcEngine_iOS: f64be00fdda786bb7edd84ab461c31b7b4c93534
AgoraRtcEngine_iOS: eaa97751fcfe1b50d9b067e0df92752a6a5f899f
AliyunOSSiOS: 1f091b3aeec9f7a5fd722cb511704116f2ca468d
AppAuth: 501c04eda8a8d11f179dbe8637b7a91bb7e5d2fa
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
......@@ -338,7 +341,7 @@ SPEC CHECKSUMS:
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
GTMAppAuth: 0ff230db599948a9ad7470ca667337803b3fc4dd
GTMSessionFetcher: 5595ec75acf5be50814f81e9189490412bad82ba
HWPanModal: 6951685ca7bdf147ff8a68e7d93d61f08a06dead
HWPanModal: b57a6717d3cdcd666bff44f9dd2a5be9f4d6f5d2
HyphenateChat: dc9bedc84c610b9031c86a36b3231604d01026b4
libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
LineSDK: 01a0e7206b2c459f20a2bee888553ae5dc74a709
......@@ -355,6 +358,7 @@ SPEC CHECKSUMS:
RangersAppLog: 4f23c696b728f0d1cf252ebff5e3886281e164c8
RMStore: 64ba13a9c040e3b7572765d169f77175cd3243e5
SharetraceSDK: 6371cd201f679a585f6a5ecf5bf713124d12b4f6
SnapKit: d612e99e678a2d3b95bf60b0705ed0a35c03484a
TalkingData: aee0d72497b921a9648213d65ba9939a1114d88d
TenjinSDK: ece2612ebe7c02f3ca39712f0977c942f6f604ab
TTSDK: 62840afeaafc0d7b2797267597c96bd6d0bfddf0
......@@ -369,6 +373,6 @@ SPEC CHECKSUMS:
YYKit: 7cda43304a8dc3696c449041e2cb3107b4e236e7
ZipArchive: e25a4373192673e3229ac8d6e9f64a3e5713c966
PODFILE CHECKSUM: c036b7cd0aa09ac73105bbef5687e0be587314b1
PODFILE CHECKSUM: e3abedea167e1f6e7751e561aec04ee5b1bcac0c
COCOAPODS: 1.15.2
COCOAPODS: 1.12.1
Pods/AgoraRtcEngine_iOS/AgoraRtcKit.xcframework/Info.plist
......@@ -6,31 +6,31 @@
<array>
<dict>
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-simulator</string>
<string>ios-arm64_armv7</string>
<key>LibraryPath</key>
<string>AgoraRtcKit.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
<string>armv7</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>LibraryIdentifier</key>
<string>ios-arm64_armv7</string>
<string>ios-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>AgoraRtcKit.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>armv7</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
</array>
<key>CFBundlePackageType</key>
......
Pods/AgoraRtcEngine_iOS/AgoraRtcKit.xcframework/ios-arm64_armv7/AgoraRtcKit.framework/Headers/AgoraBase.h
......@@ -3124,7 +3124,7 @@ enum REMOTE_USER_STATE {
struct VideoTrackInfo {
VideoTrackInfo()
: isLocal(false), ownerUid(0), trackId(0), channelId(OPTIONAL_NULLPTR)
, streamType(VIDEO_STREAM_HIGH), codecType(VIDEO_CODEC_H265)
, codecType(VIDEO_CODEC_H265)
, encodedFrameOnly(false), sourceType(VIDEO_SOURCE_CAMERA_PRIMARY)
, observationPosition(agora::media::base::POSITION_POST_CAPTURER) {}
/**
......@@ -3146,10 +3146,6 @@ struct VideoTrackInfo {
*/
const char* channelId;
/**
* The video stream type: #VIDEO_STREAM_TYPE.
*/
VIDEO_STREAM_TYPE streamType;
/**
* The video codec type: #VIDEO_CODEC_TYPE.
*/
VIDEO_CODEC_TYPE codecType;
......
Pods/AgoraRtcEngine_iOS/AgoraRtcKit.xcframework/ios-arm64_armv7/AgoraRtcKit.framework/Headers/AgoraMusicContentCenter.h
......@@ -12,6 +12,25 @@
@protocol AgoraRtcMediaPlayerDelegate;
/**
* Modes for playing songs.
*/
typedef NS_ENUM(NSUInteger, AgoraMusicPlayMode) {
/**
* 0: The music player is in the origin mode, which means playing the original song.
*/
AgoraMusicPlayModeOriginal = 0,
/**
* The music player is in the accompany mode, which means playing the accompaniment only.
*/
AgoraMusicPlayModeAccompany = 1,
/**
* 2: The music player is in the lead sing mode, which means playing the lead vocals.
*/
AgoraMusicPlayModeLeadsing = 2,
};
/**
* The status of preload request
*/
typedef NS_ENUM(NSUInteger, AgoraMusicContentCenterPreloadState) {
......@@ -308,6 +327,10 @@ __attribute__((visibility("default"))) @interface AgoraMusicContentCenterConfig
* @technical preview
*/
@property(nonatomic, copy) NSString* mccDomain;
/**
* Event handler to get callback result.
*/
@property(nonatomic, weak) id<AgoraMusicContentCenterEventDelegate> eventDelegate;
@end
@protocol AgoraMusicPlayerProtocol <AgoraRtcMediaPlayerProtocol>
......@@ -321,6 +344,19 @@ __attribute__((visibility("default"))) @interface AgoraMusicContentCenterConfig
* - < 0: Failure.
*/
- (NSInteger)openMediaWithSongCode:(NSInteger)songCode startPos:(NSInteger)startPos NS_SWIFT_NAME(openMedia(songCode:startPos:));
/**
* Set the mode for playing songs.
* You can call this method to switch from original to accompaniment or lead vocals.
* If you do not call this method to set the mode, the SDK plays the accompaniment by default.
*
* @param model The playing mode.
* @return
* - 0: Success.
* - < 0: Failure.
*/
- (NSInteger)setPlayMode:(AgoraMusicPlayMode)mode NS_SWIFT_NAME(setPlayMode(mode:));
@end
......@@ -365,7 +401,17 @@ __attribute__((visibility("default"))) @interface AgoraMusicContentCenter : NSOb
- (id<AgoraMusicPlayerProtocol> _Nullable)createMusicPlayerWithDelegate:(id<AgoraRtcMediaPlayerDelegate> _Nullable)delegate NS_SWIFT_NAME(createMusicPlayer(delegate:));
/**
* Get music chart collection of music.If the method call success, get result from the AgoraMusicContentCenterEventDelegate - (void)onMusicChartsResult:(NSString *)requestId status:(AgoraMusicContentCenterStateReason)status result:(NSArray<AgoraMusicChartInfo*> *)result; match the callback "requestId" parameter to get the request result.
* Destroy a music player source object and return result.
*
* @param musicPlayer The music player.
* @return
* - 0: Success.
* - < 0: Failure.
*/
- (NSInteger)destroyMusicPlayer:(id<AgoraMusicPlayerProtocol>)musicPlayer;
/**
* Get music chart collection of music.If the method call success, get result from the AgoraMusicContentCenterEventDelegate - (void)onMusicChartsResult:(NSString *)requestId status:(AgoraMusicContentCenterStatusCode)status result:(NSArray<AgoraMusicChartInfo*> *)result; match the callback "requestId" parameter to get the request result.
*
* @return The request identification
*/
......
Pods/AgoraRtcEngine_iOS/AgoraRtcKit.xcframework/ios-arm64_armv7/AgoraRtcKit.framework/Headers/AgoraRtcEngineKit.h
......@@ -5277,10 +5277,6 @@ description:(NSString * _Nullable)description NS_SWIFT_NAME(rate(_:rating:descri
*/
- (int)updateDirectCdnStreamingMediaOptions:(AgoraDirectCdnStreamingMediaOptions * _Nonnull)options NS_SWIFT_NAME(updateDirectCdnStreamingMediaOptions(_:));
- (int)setAudioOptionParams:(NSString * _Nonnull)params NS_SWIFT_NAME(setAudioOptionParams(_:));
- (NSString * _Nullable)getAudioOptionParams NS_SWIFT_NAME(getAudioOptionParams());
/** set advanced audio options. use this method before join channel / enableAudio / enableLocalAudio.
@param options The AgoraAdvancedAudioOptions class, See the definition of AgoraAdvancedAudioOptions for details.
......
Pods/AgoraRtcEngine_iOS/AgoraRtcKit.xcframework/ios-arm64_armv7/AgoraRtcKit.framework/Headers/IAgoraMusicContentCenter.h
......@@ -13,6 +13,28 @@
namespace agora {
namespace rtc {
/**
* Modes for playing songs.
*/
typedef enum
{
/**
* 0: The music player is in the origin mode, which means playing the original song.
*/
kMusicPlayModeOriginal = 0,
/**
* 1: The music player is in the accompany mode, which means playing the accompaniment only.
*/
kMusicPlayModeAccompany = 1,
/**
* 2: The music player is in the lead sing mode, which means playing the lead vocals.
*/
kMusicPlayModeLeadSing = 2,
} MusicPlayMode;
typedef enum
{
/**
......@@ -329,6 +351,18 @@ public:
* - < 0: Failure.
*/
virtual int open(int64_t songCode, int64_t startPos = 0) = 0;
/**
* Set the mode for playing songs.
* You can call this method to switch from original to accompaniment or lead vocals.
* If you do not call this method to set the mode, the SDK plays the accompaniment by default.
*
* @param model The playing mode.
* @return
* - 0: Success.
* - < 0: Failure.
*/
virtual int setPlayMode(MusicPlayMode mode) = 0;
};
class IMusicContentCenter
......@@ -383,6 +417,15 @@ public:
* - The empty pointer NULL, if the method call fails.
*/
virtual agora_refptr<IMusicPlayer> createMusicPlayer() = 0;
/**
* Destroy a music player source object and return result.
* @param music_player The pointer to \ref rtc::IMusicPlayer "IMusicPlayer".
* @return
* - 0: Success.
* - < 0: Failure.
*/
virtual int destroyMusicPlayer(agora_refptr<IMusicPlayer> music_player) = 0;
/**
* Get music chart collection of music.
......@@ -501,12 +544,12 @@ public:
*
* @param requestId The request id you will get of this query, format is uuid.
* @param songCode The identifier of the media file that you want to play.
* @param LyricType The type of the lyric file. 0:xml or 1:lrc.
* @param lyricType The type of the lyric file. 0:xml or 1:lrc.
* @return
* - 0: Success.
* - < 0: Failure.
*/
virtual int getLyric(agora::util::AString& requestId, int64_t songCode, int32_t LyricType = 0) = 0;
virtual int getLyric(agora::util::AString& requestId, int64_t songCode, int32_t lyricType = 0) = 0;
/**
* Gets the metadata of a specific music. Once this method is called, the SDK triggers the onSongSimpleInfoResult callback to report the metadata of the music.
......
Pods/AgoraRtcEngine_iOS/AgoraRtcKit.xcframework/ios-arm64_armv7/AgoraRtcKit.framework/Headers/IAgoraService.h
......@@ -286,6 +286,13 @@ struct AudioSessionConfiguration {
*/
Optional<int> outputNumberOfChannels;
#if defined(WEBRTC_IOS)
/**
* Initialize the AudioSession with the value for category. (iOS only)
*/
Optional<int> category;
#endif
void SetAll(const AudioSessionConfiguration& change) {
SetFrom(&playbackAndRecord, change.playbackAndRecord);
SetFrom(&chatMode, change.chatMode);
......@@ -299,6 +306,9 @@ struct AudioSessionConfiguration {
SetFrom(&ioBufferDuration, change.ioBufferDuration);
SetFrom(&inputNumberOfChannels, change.inputNumberOfChannels);
SetFrom(&outputNumberOfChannels, change.outputNumberOfChannels);
#if defined(WEBRTC_IOS)
SetFrom(&category, change.category);
#endif
}
bool operator==(const AudioSessionConfiguration& o) const {
......@@ -308,7 +318,12 @@ struct AudioSessionConfiguration {
allowBluetooth == o.allowBluetooth && allowBluetoothA2DP == o.allowBluetoothA2DP && sampleRate == o.sampleRate &&
ioBufferDuration == o.ioBufferDuration &&
inputNumberOfChannels == o.inputNumberOfChannels &&
#if defined(WEBRTC_IOS)
outputNumberOfChannels == o.outputNumberOfChannels &&
category == o.category;
#else
outputNumberOfChannels == o.outputNumberOfChannels;
#endif
}
bool operator!=(const AudioSessionConfiguration& o) const { return !(*this == o); }
......
Pods/AgoraRtcEngine_iOS/AgoraRtcKit.xcframework/ios-arm64_armv7/AgoraRtcKit.framework/Headers/NGIAgoraLocalUser.h
......@@ -41,6 +41,7 @@ struct LocalVideoTrackStats;
struct RemoteVideoTrackStats;
class IMediaPacketReceiver;
class IVideoSinkBase;
/**
* The ILocalUser class defines the behavior and state of a local user.
*
......@@ -811,6 +812,8 @@ class ILocalUser {
virtual int getHighPriorityUserList(std::vector<uid_t>& vipList, int& option) = 0;
virtual int setRemoteSubscribeFallbackOption(int option, aosl_ref_t ares = AOSL_REF_INVALID) = 0;
/**
* Sets the blocklist of subscribe remote stream audio.
*
......
Pods/AgoraRtcEngine_iOS/AgoraRtcKit.xcframework/ios-arm64_x86_64-simulator/AgoraRtcKit.framework/Headers/AgoraBase.h
......@@ -3124,7 +3124,7 @@ enum REMOTE_USER_STATE {
struct VideoTrackInfo {
VideoTrackInfo()
: isLocal(false), ownerUid(0), trackId(0), channelId(OPTIONAL_NULLPTR)
, streamType(VIDEO_STREAM_HIGH), codecType(VIDEO_CODEC_H265)
, codecType(VIDEO_CODEC_H265)
, encodedFrameOnly(false), sourceType(VIDEO_SOURCE_CAMERA_PRIMARY)
, observationPosition(agora::media::base::POSITION_POST_CAPTURER) {}
/**
......@@ -3146,10 +3146,6 @@ struct VideoTrackInfo {
*/
const char* channelId;
/**
* The video stream type: #VIDEO_STREAM_TYPE.
*/
VIDEO_STREAM_TYPE streamType;
/**
* The video codec type: #VIDEO_CODEC_TYPE.
*/
VIDEO_CODEC_TYPE codecType;
......
Pods/AgoraRtcEngine_iOS/AgoraRtcKit.xcframework/ios-arm64_x86_64-simulator/AgoraRtcKit.framework/Headers/AgoraMusicContentCenter.h
......@@ -12,6 +12,25 @@
@protocol AgoraRtcMediaPlayerDelegate;
/**
* Modes for playing songs.
*/
typedef NS_ENUM(NSUInteger, AgoraMusicPlayMode) {
/**
* 0: The music player is in the origin mode, which means playing the original song.
*/
AgoraMusicPlayModeOriginal = 0,
/**
* The music player is in the accompany mode, which means playing the accompaniment only.
*/
AgoraMusicPlayModeAccompany = 1,
/**
* 2: The music player is in the lead sing mode, which means playing the lead vocals.
*/
AgoraMusicPlayModeLeadsing = 2,
};
/**
* The status of preload request
*/
typedef NS_ENUM(NSUInteger, AgoraMusicContentCenterPreloadState) {
......@@ -308,6 +327,10 @@ __attribute__((visibility("default"))) @interface AgoraMusicContentCenterConfig
* @technical preview
*/
@property(nonatomic, copy) NSString* mccDomain;
/**
* Event handler to get callback result.
*/
@property(nonatomic, weak) id<AgoraMusicContentCenterEventDelegate> eventDelegate;
@end
@protocol AgoraMusicPlayerProtocol <AgoraRtcMediaPlayerProtocol>
......@@ -321,6 +344,19 @@ __attribute__((visibility("default"))) @interface AgoraMusicContentCenterConfig
* - < 0: Failure.
*/
- (NSInteger)openMediaWithSongCode:(NSInteger)songCode startPos:(NSInteger)startPos NS_SWIFT_NAME(openMedia(songCode:startPos:));
/**
* Set the mode for playing songs.
* You can call this method to switch from original to accompaniment or lead vocals.
* If you do not call this method to set the mode, the SDK plays the accompaniment by default.
*
* @param model The playing mode.
* @return
* - 0: Success.
* - < 0: Failure.
*/
- (NSInteger)setPlayMode:(AgoraMusicPlayMode)mode NS_SWIFT_NAME(setPlayMode(mode:));
@end
......@@ -365,7 +401,17 @@ __attribute__((visibility("default"))) @interface AgoraMusicContentCenter : NSOb
- (id<AgoraMusicPlayerProtocol> _Nullable)createMusicPlayerWithDelegate:(id<AgoraRtcMediaPlayerDelegate> _Nullable)delegate NS_SWIFT_NAME(createMusicPlayer(delegate:));
/**
* Get music chart collection of music.If the method call success, get result from the AgoraMusicContentCenterEventDelegate - (void)onMusicChartsResult:(NSString *)requestId status:(AgoraMusicContentCenterStateReason)status result:(NSArray<AgoraMusicChartInfo*> *)result; match the callback "requestId" parameter to get the request result.
* Destroy a music player source object and return result.
*
* @param musicPlayer The music player.
* @return
* - 0: Success.
* - < 0: Failure.
*/
- (NSInteger)destroyMusicPlayer:(id<AgoraMusicPlayerProtocol>)musicPlayer;
/**
* Get music chart collection of music.If the method call success, get result from the AgoraMusicContentCenterEventDelegate - (void)onMusicChartsResult:(NSString *)requestId status:(AgoraMusicContentCenterStatusCode)status result:(NSArray<AgoraMusicChartInfo*> *)result; match the callback "requestId" parameter to get the request result.
*
* @return The request identification
*/
......
Pods/AgoraRtcEngine_iOS/AgoraRtcKit.xcframework/ios-arm64_x86_64-simulator/AgoraRtcKit.framework/Headers/AgoraRtcEngineKit.h
......@@ -5277,10 +5277,6 @@ description:(NSString * _Nullable)description NS_SWIFT_NAME(rate(_:rating:descri
*/
- (int)updateDirectCdnStreamingMediaOptions:(AgoraDirectCdnStreamingMediaOptions * _Nonnull)options NS_SWIFT_NAME(updateDirectCdnStreamingMediaOptions(_:));
- (int)setAudioOptionParams:(NSString * _Nonnull)params NS_SWIFT_NAME(setAudioOptionParams(_:));
- (NSString * _Nullable)getAudioOptionParams NS_SWIFT_NAME(getAudioOptionParams());
/** set advanced audio options. use this method before join channel / enableAudio / enableLocalAudio.
@param options The AgoraAdvancedAudioOptions class, See the definition of AgoraAdvancedAudioOptions for details.
......
Pods/AgoraRtcEngine_iOS/AgoraRtcKit.xcframework/ios-arm64_x86_64-simulator/AgoraRtcKit.framework/Headers/IAgoraMusicContentCenter.h
......@@ -13,6 +13,28 @@
namespace agora {
namespace rtc {
/**
* Modes for playing songs.
*/
typedef enum
{
/**
* 0: The music player is in the origin mode, which means playing the original song.
*/
kMusicPlayModeOriginal = 0,
/**
* 1: The music player is in the accompany mode, which means playing the accompaniment only.
*/
kMusicPlayModeAccompany = 1,
/**
* 2: The music player is in the lead sing mode, which means playing the lead vocals.
*/
kMusicPlayModeLeadSing = 2,
} MusicPlayMode;
typedef enum
{
/**
......@@ -329,6 +351,18 @@ public:
* - < 0: Failure.
*/
virtual int open(int64_t songCode, int64_t startPos = 0) = 0;
/**
* Set the mode for playing songs.
* You can call this method to switch from original to accompaniment or lead vocals.
* If you do not call this method to set the mode, the SDK plays the accompaniment by default.
*
* @param model The playing mode.
* @return
* - 0: Success.
* - < 0: Failure.
*/
virtual int setPlayMode(MusicPlayMode mode) = 0;
};
class IMusicContentCenter
......@@ -383,6 +417,15 @@ public:
* - The empty pointer NULL, if the method call fails.
*/
virtual agora_refptr<IMusicPlayer> createMusicPlayer() = 0;
/**
* Destroy a music player source object and return result.
* @param music_player The pointer to \ref rtc::IMusicPlayer "IMusicPlayer".
* @return
* - 0: Success.
* - < 0: Failure.
*/
virtual int destroyMusicPlayer(agora_refptr<IMusicPlayer> music_player) = 0;
/**
* Get music chart collection of music.
......@@ -501,12 +544,12 @@ public:
*
* @param requestId The request id you will get of this query, format is uuid.
* @param songCode The identifier of the media file that you want to play.
* @param LyricType The type of the lyric file. 0:xml or 1:lrc.
* @param lyricType The type of the lyric file. 0:xml or 1:lrc.
* @return
* - 0: Success.
* - < 0: Failure.
*/
virtual int getLyric(agora::util::AString& requestId, int64_t songCode, int32_t LyricType = 0) = 0;
virtual int getLyric(agora::util::AString& requestId, int64_t songCode, int32_t lyricType = 0) = 0;
/**
* Gets the metadata of a specific music. Once this method is called, the SDK triggers the onSongSimpleInfoResult callback to report the metadata of the music.
......
Pods/AgoraRtcEngine_iOS/AgoraRtcKit.xcframework/ios-arm64_x86_64-simulator/AgoraRtcKit.framework/Headers/IAgoraService.h
......@@ -286,6 +286,13 @@ struct AudioSessionConfiguration {
*/
Optional<int> outputNumberOfChannels;
#if defined(WEBRTC_IOS)
/**
* Initialize the AudioSession with the value for category. (iOS only)
*/
Optional<int> category;
#endif
void SetAll(const AudioSessionConfiguration& change) {
SetFrom(&playbackAndRecord, change.playbackAndRecord);
SetFrom(&chatMode, change.chatMode);
......@@ -299,6 +306,9 @@ struct AudioSessionConfiguration {
SetFrom(&ioBufferDuration, change.ioBufferDuration);
SetFrom(&inputNumberOfChannels, change.inputNumberOfChannels);
SetFrom(&outputNumberOfChannels, change.outputNumberOfChannels);
#if defined(WEBRTC_IOS)
SetFrom(&category, change.category);
#endif
}
bool operator==(const AudioSessionConfiguration& o) const {
......@@ -308,7 +318,12 @@ struct AudioSessionConfiguration {
allowBluetooth == o.allowBluetooth && allowBluetoothA2DP == o.allowBluetoothA2DP && sampleRate == o.sampleRate &&
ioBufferDuration == o.ioBufferDuration &&
inputNumberOfChannels == o.inputNumberOfChannels &&
#if defined(WEBRTC_IOS)
outputNumberOfChannels == o.outputNumberOfChannels &&
category == o.category;
#else
outputNumberOfChannels == o.outputNumberOfChannels;
#endif
}
bool operator!=(const AudioSessionConfiguration& o) const { return !(*this == o); }
......
Pods/AgoraRtcEngine_iOS/AgoraRtcKit.xcframework/ios-arm64_x86_64-simulator/AgoraRtcKit.framework/Headers/NGIAgoraLocalUser.h
......@@ -41,6 +41,7 @@ struct LocalVideoTrackStats;
struct RemoteVideoTrackStats;
class IMediaPacketReceiver;
class IVideoSinkBase;
/**
* The ILocalUser class defines the behavior and state of a local user.
*
......@@ -811,6 +812,8 @@ class ILocalUser {
virtual int getHighPriorityUserList(std::vector<uid_t>& vipList, int& option) = 0;
virtual int setRemoteSubscribeFallbackOption(int option, aosl_ref_t ares = AOSL_REF_INVALID) = 0;
/**
* Sets the blocklist of subscribe remote stream audio.
*
......
Pods/AgoraRtcEngine_iOS/Agoraffmpeg.xcframework/Info.plist
......@@ -6,31 +6,31 @@
<array>
<dict>
<key>LibraryIdentifier</key>
<string>ios-arm64_armv7</string>
<string>ios-arm64_x86_64-simulator</string>
<key>LibraryPath</key>
<string>Agoraffmpeg.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>armv7</string>
<string>x86_64</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
<dict>
<key>LibraryIdentifier</key>
<string>ios-arm64_x86_64-simulator</string>
<string>ios-arm64_armv7</string>
<key>LibraryPath</key>
<string>Agoraffmpeg.framework</string>
<key>SupportedArchitectures</key>
<array>
<string>arm64</string>
<string>x86_64</string>
<string>armv7</string>
</array>
<key>SupportedPlatform</key>
<string>ios</string>
<key>SupportedPlatformVariant</key>
<string>simulator</string>
</dict>
</array>
<key>CFBundlePackageType</key>
......
Pods/Manifest.lock
......@@ -14,7 +14,7 @@ PODS:
- AFNetworking/Serialization (4.0.1)
- AFNetworking/UIKit (4.0.1):
- AFNetworking/NSURLSession
- AgoraRtcEngine_iOS/RtcBasic (4.3.1)
- AgoraRtcEngine_iOS/RtcBasic (4.3.2)
- AliyunOSSiOS (2.10.21)
- AppAuth (1.7.5):
- AppAuth/Core (= 1.7.5)
......@@ -148,7 +148,7 @@ PODS:
- AppAuth/Core (~> 1.6)
- GTMSessionFetcher/Core (< 3.0, >= 1.5)
- GTMSessionFetcher/Core (1.7.2)
- HWPanModal (0.9.8)
- HWPanModal (0.9.9)
- HyphenateChat (3.8.3.1)
- libPhoneNumber-iOS (0.9.15)
- LineSDK (4.0.3)
......@@ -191,6 +191,7 @@ PODS:
- RMStore/Core (= 0.7.1)
- RMStore/Core (0.7.1)
- SharetraceSDK (2.3.4)
- SnapKit (5.7.1)
- TalkingData/Full (5.0.5)
- TenjinSDK (1.14.3)
- TTSDK/ByteAudio (1.37.2.6-premium-sft)
......@@ -254,6 +255,7 @@ DEPENDENCIES:
- MGSwipeTableCell
- MMDrawerController
- SharetraceSDK
- SnapKit
- TenjinSDK
- TTSDK/LivePull (= 1.37.2.6-premium-sft)
- TTSDK/LivePush (= 1.37.2.6-premium-sft)
......@@ -298,6 +300,7 @@ SPEC REPOS:
- PromisesObjC
- RMStore
- SharetraceSDK
- SnapKit
- TalkingData
- TenjinSDK
- TTTAttributedLabel
......@@ -320,7 +323,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
AFNetworking: 3bd23d814e976cd148d7d44c3ab78017b744cd58
AgoraRtcEngine_iOS: f64be00fdda786bb7edd84ab461c31b7b4c93534
AgoraRtcEngine_iOS: eaa97751fcfe1b50d9b067e0df92752a6a5f899f
AliyunOSSiOS: 1f091b3aeec9f7a5fd722cb511704116f2ca468d
AppAuth: 501c04eda8a8d11f179dbe8637b7a91bb7e5d2fa
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
......@@ -338,7 +341,7 @@ SPEC CHECKSUMS:
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
GTMAppAuth: 0ff230db599948a9ad7470ca667337803b3fc4dd
GTMSessionFetcher: 5595ec75acf5be50814f81e9189490412bad82ba
HWPanModal: 6951685ca7bdf147ff8a68e7d93d61f08a06dead
HWPanModal: b57a6717d3cdcd666bff44f9dd2a5be9f4d6f5d2
HyphenateChat: dc9bedc84c610b9031c86a36b3231604d01026b4
libPhoneNumber-iOS: 0a32a9525cf8744fe02c5206eb30d571e38f7d75
LineSDK: 01a0e7206b2c459f20a2bee888553ae5dc74a709
......@@ -355,6 +358,7 @@ SPEC CHECKSUMS:
RangersAppLog: 4f23c696b728f0d1cf252ebff5e3886281e164c8
RMStore: 64ba13a9c040e3b7572765d169f77175cd3243e5
SharetraceSDK: 6371cd201f679a585f6a5ecf5bf713124d12b4f6
SnapKit: d612e99e678a2d3b95bf60b0705ed0a35c03484a
TalkingData: aee0d72497b921a9648213d65ba9939a1114d88d
TenjinSDK: ece2612ebe7c02f3ca39712f0977c942f6f604ab
TTSDK: 62840afeaafc0d7b2797267597c96bd6d0bfddf0
......@@ -369,6 +373,6 @@ SPEC CHECKSUMS:
YYKit: 7cda43304a8dc3696c449041e2cb3107b4e236e7
ZipArchive: e25a4373192673e3229ac8d6e9f64a3e5713c966
PODFILE CHECKSUM: c036b7cd0aa09ac73105bbef5687e0be587314b1
PODFILE CHECKSUM: e3abedea167e1f6e7751e561aec04ee5b1bcac0c
COCOAPODS: 1.15.2
COCOAPODS: 1.12.1
Pods/Pods.xcodeproj/project.pbxproj
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment