Skip to content

Commit b06684e

Browse files
author
zhaoyongqiang
committed
添加退到后台自动开启画中画
1 parent a15b31e commit b06684e

4 files changed

Lines changed: 10 additions & 3 deletions

File tree

iOS/APIExample.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@
131131
E789AAFA28694D8C00851463 /* LocalAccess.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E789AAF628694D8C00851463 /* LocalAccess.storyboard */; };
132132
E789AAFB28694D8C00851463 /* LocalAccess.swift in Sources */ = {isa = PBXBuildFile; fileRef = E789AAF828694D8C00851463 /* LocalAccess.swift */; };
133133
E789AAFD2869556800851463 /* Util.swift in Sources */ = {isa = PBXBuildFile; fileRef = E789AAFC2869556800851463 /* Util.swift */; };
134+
E7EEF1BE2880187C00D9D2AE /* slience.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = E7EEF1BD2880187C00D9D2AE /* slience.mp3 */; };
134135
F3184EFE27F8475600FA402D /* AgoraSampleBufferRender.m in Sources */ = {isa = PBXBuildFile; fileRef = F3184EFD27F8475600FA402D /* AgoraSampleBufferRender.m */; };
135136
F3184EFF27F85AD700FA402D /* AgoraPictureInPictureController.m in Sources */ = {isa = PBXBuildFile; fileRef = F3EA6CE827F6E5E700CAF620 /* AgoraPictureInPictureController.m */; };
136137
F3184F0027F8605700FA402D /* VideoViewSampleBufferDisplayView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F3184EFB27F8439D00FA402D /* VideoViewSampleBufferDisplayView.xib */; };
@@ -352,6 +353,7 @@
352353
E789AAF728694D8C00851463 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LocalAccess.storyboard; sourceTree = "<group>"; };
353354
E789AAF828694D8C00851463 /* LocalAccess.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LocalAccess.swift; sourceTree = "<group>"; };
354355
E789AAFC2869556800851463 /* Util.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Util.swift; sourceTree = "<group>"; };
356+
E7EEF1BD2880187C00D9D2AE /* slience.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = slience.mp3; sourceTree = "<group>"; };
355357
F3184EFB27F8439D00FA402D /* VideoViewSampleBufferDisplayView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = VideoViewSampleBufferDisplayView.xib; sourceTree = "<group>"; };
356358
F3184EFC27F8475600FA402D /* AgoraSampleBufferRender.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AgoraSampleBufferRender.h; sourceTree = "<group>"; };
357359
F3184EFD27F8475600FA402D /* AgoraSampleBufferRender.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AgoraSampleBufferRender.m; sourceTree = "<group>"; };
@@ -714,6 +716,7 @@
714716
7FBE1D502576A904005A8619 /* pvc_jnqd.bundle */,
715717
7FBE1D522576A904005A8619 /* pvc_kernels.metallib */,
716718
7FBE1D512576A904005A8619 /* srmetal.metallib */,
719+
E7EEF1BD2880187C00D9D2AE /* slience.mp3 */,
717720
03BEED0C251CAB9C005E78F4 /* audioeffect.mp3 */,
718721
03BEED0A251C4446005E78F4 /* audiomixing.mp3 */,
719722
);
@@ -1093,6 +1096,7 @@
10931096
033A9F52252D89E600BC26E1 /* CustomVideoRender.storyboard in Resources */,
10941097
57B7FC89259C599100407BE1 /* RawAudioData.storyboard in Resources */,
10951098
03B12DAA251125B700E55818 /* VideoView.xib in Resources */,
1099+
E7EEF1BE2880187C00D9D2AE /* slience.mp3 in Resources */,
10961100
67D9A15727E94FAF008C3F8E /* SpatialAudio.storyboard in Resources */,
10971101
576EA58525AED471000B3D79 /* VideoChat.storyboard in Resources */,
10981102
033A9F48252D89D000BC26E1 /* CustomAudioRender.storyboard in Resources */,

iOS/APIExample/Common/ExternalVideo/AgoraPictureInPictureController.m

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@
88

99
#import "AgoraPictureInPictureController.h"
1010

11-
@interface AgoraPictureInPictureController () <AVPictureInPictureSampleBufferPlaybackDelegate>
11+
@interface AgoraPictureInPictureController () <AVPictureInPictureSampleBufferPlaybackDelegate, AVAudioPlayerDelegate>
1212

1313
@property (nonatomic, strong) AVPictureInPictureController *pipController;
1414

1515
@property (nonatomic, strong) AgoraSampleBufferRender *displayView;
1616

17+
@property (nonatomic, strong) AVAudioPlayer *player;
18+
1719
@end
1820

1921
@implementation AgoraPictureInPictureController
@@ -27,14 +29,15 @@ - (instancetype)initWithDisplayView:(AgoraSampleBufferRender *)displayView {
2729
AVPictureInPictureControllerContentSource *pipControllerContentSource = [[AVPictureInPictureControllerContentSource alloc] initWithSampleBufferDisplayLayer:_displayView.displayLayer playbackDelegate:self];
2830

2931
_pipController = [[AVPictureInPictureController alloc] initWithContentSource:pipControllerContentSource];
32+
// 进入后台自动开启画中画
33+
_pipController.canStartPictureInPictureAutomaticallyFromInline = true;
3034
}
3135
return self;
3236
}
3337
}
3438
return nil;
3539
}
3640

37-
3841
#pragma mark - <AVPictureInPictureSampleBufferPlaybackDelegate>
3942

4043
- (void)pictureInPictureController:(nonnull AVPictureInPictureController *)pictureInPictureController didTransitionToRenderSize:(CMVideoDimensions)newRenderSize {
@@ -56,5 +59,4 @@ - (BOOL)pictureInPictureControllerIsPlaybackPaused:(nonnull AVPictureInPictureCo
5659
- (CMTimeRange)pictureInPictureControllerTimeRangeForPlayback:(nonnull AVPictureInPictureController *)pictureInPictureController {
5760
return CMTimeRangeMake(kCMTimeZero, CMTimeMake(INT64_MAX, 1000));
5861
}
59-
6062
@end

iOS/APIExample/Examples/Advanced/ScreenShare/ScreenShare.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ class ScreenShareMain: BaseViewController {
142142
screenParams.captureAudio = screenParams.captureAudio == true ? false : true
143143
screenParams.captureVideo = true
144144
agoraKit.updateScreenCapture(screenParams)
145+
agoraKit.enableLocalAudio(screenParams.captureAudio)
145146

146147
updateButtonTitle()
147148
}
79.3 KB
Binary file not shown.

0 commit comments

Comments
 (0)