Unverified Commit 211d14be authored by Hampton Maxwell's avatar Hampton Maxwell Committed by GitHub
Browse files

Merge pull request #1131 from react-native-community/feature/ios-becoming-noisy 

Document onAudioBecomingNoisy & add iOS support
parents 5178601e de68244b

README.md

+8 −0
Changes for README.md: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ var styles = StyleSheet.create({ 
* [volume](#volume)



### Event props

* [onAudioBecomingNoisy](#onaudiobecomingnoisy)

* [onLoad](#onload)

* [onLoadStart](#onloadstart)

* [onProgress](#onprogress)
@@ -452,6 +453,13 @@ Platforms: all 


### Event props



#### onAudioBecomingNoisy

Callback function that is called when the audio is about to become 'noisy' due to a change in audio outputs. Typically this is called when audio output is being switched from an external source like headphones back to the internal speaker. It's a good idea to pause the media when this happens so the speaker doesn't start blasting sound.



Payload: none



Platforms: Android ExoPlayer, iOS



#### onLoad

Callback function that is called when the media is loaded and ready to play.

Video.js

+2 −0
Changes for Video.js: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -235,6 +235,7 @@ export default class Video extends Component { 
      onVideoEnd: this._onEnd,

      onVideoBuffer: this._onBuffer,

      onTimedMetadata: this._onTimedMetadata,

      onVideoAudioBecomingNoisy: this._onAudioBecomingNoisy,

      onVideoFullscreenPlayerWillPresent: this._onFullscreenPlayerWillPresent,

      onVideoFullscreenPlayerDidPresent: this._onFullscreenPlayerDidPresent,

      onVideoFullscreenPlayerWillDismiss: this._onFullscreenPlayerWillDismiss,
@@ -296,6 +297,7 @@ Video.propTypes = { 
  onVideoSeek: PropTypes.func,

  onVideoEnd: PropTypes.func,

  onTimedMetadata: PropTypes.func,

  onVideoAudioBecomingNoisy: PropTypes.func,

  onVideoFullscreenPlayerWillPresent: PropTypes.func,

  onVideoFullscreenPlayerDidPresent: PropTypes.func,

  onVideoFullscreenPlayerWillDismiss: PropTypes.func,

android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java

+1 −1
Changes for android-exoplayer/src/main/java/com/brentvatne/exoplayer/VideoEventEmitter.java: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ class VideoEventEmitter { 
    private static final String EVENT_BUFFER = "onVideoBuffer";

    private static final String EVENT_IDLE = "onVideoIdle";

    private static final String EVENT_TIMED_METADATA = "onTimedMetadata";

    private static final String EVENT_AUDIO_BECOMING_NOISY = "onAudioBecomingNoisy";

    private static final String EVENT_AUDIO_BECOMING_NOISY = "onVideoAudioBecomingNoisy";

    private static final String EVENT_AUDIO_FOCUS_CHANGE = "onAudioFocusChanged";

    private static final String EVENT_PLAYBACK_RATE_CHANGE = "onPlaybackRateChange";

ios/RCTVideo.h

+1 −0
Changes for ios/RCTVideo.h: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
@property (nonatomic, copy) RCTBubblingEventBlock onVideoSeek;

@property (nonatomic, copy) RCTBubblingEventBlock onVideoEnd;

@property (nonatomic, copy) RCTBubblingEventBlock onTimedMetadata;

@property (nonatomic, copy) RCTBubblingEventBlock onVideoAudioBecomingNoisy;

@property (nonatomic, copy) RCTBubblingEventBlock onVideoFullscreenPlayerWillPresent;

@property (nonatomic, copy) RCTBubblingEventBlock onVideoFullscreenPlayerDidPresent;

@property (nonatomic, copy) RCTBubblingEventBlock onVideoFullscreenPlayerWillDismiss;

ios/RCTVideo.m

+16 −0
Changes for ios/RCTVideo.m: 16 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -91,6 +91,11 @@ static NSString *const timedMetadata = @"timedMetadata"; 
                                             selector:@selector(applicationWillEnterForeground:)

                                                 name:UIApplicationWillEnterForegroundNotification

                                               object:nil];



    [[NSNotificationCenter defaultCenter] addObserver:self

                                             selector:@selector(audioRouteChanged:)

                                                 name:AVAudioSessionRouteChangeNotification

                                               object:nil];

  }



  return self;
@@ -190,6 +195,17 @@ static NSString *const timedMetadata = @"timedMetadata"; 
  }

}



#pragma mark - Audio events



- (void)audioRouteChanged:(NSNotification *)notification

{

    NSNumber *reason = [[notification userInfo] objectForKey:AVAudioSessionRouteChangeReasonKey];

    NSNumber *previousRoute = [[notification userInfo] objectForKey:AVAudioSessionRouteChangePreviousRouteKey];

    if (reason.unsignedIntValue == AVAudioSessionRouteChangeReasonOldDeviceUnavailable) {

        self.onVideoAudioBecomingNoisy(@{@"target": self.reactTag});

    }

}



#pragma mark - Progress



- (void)sendProgressUpdate