Merge pull request bilibili#24 from befovy/feature/audiosession

feat: audio interrupt handler in ijkffmediaplayer
liuming2049 · May 3, 2020 · ca31d93 · ca31d93
2 parents 3de55d9 + 273f36a
commit ca31d93
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 5 deletions.
diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer/IJKAudioKit.h b/ios/IJKMediaPlayer/IJKMediaPlayer/IJKAudioKit.h
@@ -30,6 +30,7 @@
 
 + (IJKAudioKit *)sharedInstance;
 - (void)setupAudioSession;
+- (void)setupAudioSessionWithoutInterruptHandler;
 - (BOOL)setActive:(BOOL)active;
 
 @end
diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer/IJKAudioKit.m b/ios/IJKMediaPlayer/IJKMediaPlayer/IJKAudioKit.m
@@ -49,16 +49,20 @@ - (void)setupAudioSession
                                                    object: [AVAudioSession sharedInstance]];
         _audioSessionInitialized = YES;
     }
+    [self setupAudioSessionWithoutInterruptHandler];
+#endif
+}
 
+- (void)setupAudioSessionWithoutInterruptHandler
+{
+#if IJK_IOS
     /* Set audio session to mediaplayback */
     NSError *error = nil;
     if (NO == [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryPlayback error:&error]) {
         NSLog(@"IJKAudioKit: AVAudioSession.setCategory() failed: %@\n", error ? [error localizedDescription] : @"nil");
         return;
     }
-
     [self setActive:YES];
-    return;
 #endif
 }
 

diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMediaPlayer.h b/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMediaPlayer.h
@@ -61,6 +61,9 @@ typedef void(^OnSnapshotBlock) (UIImage* __nullable image , NSError* __nullable
 
 @interface IJKFFMediaPlayer : NSObject<IJKCVPBViewProtocol, IJKSDLGLViewProtocol>
 
+
+@property (nonatomic) BOOL ignoreAudioInterrupt;
+
 - (instancetype)init;
 - (instancetype)initWithFbo;
 - (int) setDataSource:(NSString *)url;

diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMediaPlayer.m b/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMediaPlayer.m
@@ -25,6 +25,7 @@
 #import "IJKFFMoviePlayerDef.h"
 #import "IJKAudioKit.h"
 #import "IJKFFOptions.h"
+#import "IJKNotificationManager.h"
 #import "ijkplayer/ijkplayer.h"
 
 typedef NS_ENUM(NSInteger, IJKSDLFFPlayrRenderType) {
@@ -44,6 +45,7 @@ @implementation IJKFFMediaPlayer {
     IjkMediaPlayer* _nativeMediaPlayer;
     IJKFFMoviePlayerMessagePool *_msgPool;
 
+    IJKNotificationManager *_notificationManager;
     NSMutableSet<id<IJKMPEventHandler>> *_eventHandlers;
 
     CFDictionaryRef _optionsDictionary;
@@ -54,6 +56,7 @@ @implementation IJKFFMediaPlayer {
 #endif
     id<IJKCVPBViewProtocol> _cvPBView;
     IJKSDLFFPlayrRenderType _renderType;
+    BOOL _playingBeforeInterruption;
 }
 
 
@@ -133,12 +136,16 @@ - (void) nativeSetup
     ijkmp_set_inject_opaque(_nativeMediaPlayer, (__bridge_retained void *) weakHolder);
     ijkmp_set_ijkio_inject_opaque(_nativeMediaPlayer, (__bridge_retained void *) weakHolder);
 
-    [[IJKAudioKit sharedInstance] setupAudioSession];
+    _notificationManager = [[IJKNotificationManager alloc] init];
+
+    [[IJKAudioKit sharedInstance] setupAudioSessionWithoutInterruptHandler];
     _optionsDictionary = nil;
     _isThirdGLView = true;
     _scaleFactor = 1.0f;
     _fps = 1.0f;
 
+    [self registerApplicationObservers];
+
 }
 
 - (void)postEvent: (IJKFFMoviePlayerMessage *)msg
@@ -229,7 +236,6 @@ - (int64_t) getLongProperty:(int) property default:(int64_t) value
     return ijkmp_get_property_int64(_nativeMediaPlayer, property, value);
 }
 
-
 - (void)setPlaybackVolume:(float)volume
 {
     if (!_nativeMediaPlayer)
@@ -246,7 +252,9 @@ - (float)playbackVolume
 
 - (void) shutdown
 {
+    _ignoreAudioInterrupt = YES;
     ijkmp_shutdown(_nativeMediaPlayer);
+    [self unregisterApplicationObservers];
 
     __unused id weakPlayer = (__bridge_transfer IJKFFMediaPlayer*)ijkmp_set_weak_thiz(_nativeMediaPlayer, NULL);
     __unused id weakHolder = (__bridge_transfer IJKFFWeakHolder*)ijkmp_set_inject_opaque(_nativeMediaPlayer, NULL);
@@ -257,7 +265,7 @@ - (void) shutdown
 
     [_eventHandlers removeAllObjects];
     ijkmp_dec_ref_p(&_nativeMediaPlayer);
-    
+
     _cvPBView = nil;
 #if IJK_IOS
     _fboView = nil;
@@ -411,5 +419,46 @@ - (void) takeSnapshot:(OnSnapshotBlock) block
     _onSnapshot = block;
 }
 
+- (void)registerApplicationObservers
+{
+    [_notificationManager addObserver:self
+                             selector:@selector(audioSessionInterrupt:)
+                                 name:AVAudioSessionInterruptionNotification
+                               object:nil];
+}
+
+- (void)unregisterApplicationObservers
+{
+    [_notificationManager removeAllObservers:self];
+}
+
 
+- (void)audioSessionInterrupt:(NSNotification *)notification
+{
+    if (_ignoreAudioInterrupt) {
+        return;
+    }
+    int reason = [[[notification userInfo] valueForKey:AVAudioSessionInterruptionTypeKey] intValue];
+    switch (reason) {
+        case AVAudioSessionInterruptionTypeBegan: {
+            if (_nativeMediaPlayer && ijkmp_get_state(_nativeMediaPlayer) == MP_STATE_STARTED) {
+                _playingBeforeInterruption = YES;
+            } else{
+                _playingBeforeInterruption = NO;
+            }
+            NSLog(@"IJKFFMediaPlayer:audioSessionInterrupt: begin, %d\n", _playingBeforeInterruption);
+            [self pause];
+            [[IJKAudioKit sharedInstance] setActive:NO];
+            break;
+        }
+        case AVAudioSessionInterruptionTypeEnded: {
+            NSLog(@"IJKFFMediaPlayer:audioSessionInterrupt: end\n");
+            [[IJKAudioKit sharedInstance] setActive:YES];
+            if (_playingBeforeInterruption) {
+                [self start];
+            }
+            break;
+        }
+    }
+}
 @end