Skip to content

Commit

Permalink
feat(ios): update timed metadata handler (#3449)
Browse files Browse the repository at this point in the history 
* feat(ios): update timedmetadata handler

* chore: move metadata output delegate to main queue

* code clean

* apply code review nit
  • Loading branch information
@KrzysztofMoch
KrzysztofMoch committed Jan 4, 2024
1 parent 51828f3 commit 481cc71
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 19 deletions.
38 changes: 25 additions & 13 deletions ios/Video/Features/RCTPlayerObserver.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ protocol RCTPlayerObserverHandlerObjc {
protocol RCTPlayerObserverHandler: RCTPlayerObserverHandlerObjc {
func handleTimeUpdate(time: CMTime)
func handleReadyForDisplay(changeObject: Any, change: NSKeyValueObservedChange<Bool>)
func handleTimeMetadataChange(playerItem: AVPlayerItem, change: NSKeyValueObservedChange<[AVMetadataItem]?>)
func handleTimeMetadataChange(timedMetadata: [AVMetadataItem])
func handlePlayerItemStatusChange(playerItem: AVPlayerItem, change: NSKeyValueObservedChange<AVPlayerItem.Status>)
func handlePlaybackBufferKeyEmpty(playerItem: AVPlayerItem, change: NSKeyValueObservedChange<Bool>)
func handlePlaybackLikelyToKeepUp(playerItem: AVPlayerItem, change: NSKeyValueObservedChange<Bool>)
Expand All @@ -29,7 +29,7 @@ protocol RCTPlayerObserverHandler: RCTPlayerObserverHandlerObjc {

// MARK: - RCTPlayerObserver

class RCTPlayerObserver: NSObject {
class RCTPlayerObserver: NSObject, AVPlayerItemMetadataOutputPushDelegate {
weak var _handlers: RCTPlayerObserverHandler?

var player: AVPlayer? {
Expand All @@ -50,9 +50,14 @@ class RCTPlayerObserver: NSObject {
removePlayerItemObservers()
}
didSet {
if playerItem != nil {
addPlayerItemObservers()
}
guard let playerItem else { return }

addPlayerItemObservers()

// handle timedMetadata
let metadataOutput = AVPlayerItemMetadataOutput()
playerItem.add(metadataOutput)
metadataOutput.setDelegate(self, queue: .main)
}
}

Expand Down Expand Up @@ -98,8 +103,16 @@ class RCTPlayerObserver: NSObject {
}
}

func metadataOutput(_: AVPlayerItemMetadataOutput, didOutputTimedMetadataGroups groups: [AVTimedMetadataGroup], from _: AVPlayerItemTrack?) {
guard let _handlers else { return }

for metadataGroup in groups {
_handlers.handleTimeMetadataChange(timedMetadata: metadataGroup.items)
}
}

func addPlayerObservers() {
guard let player = player, let _handlers = _handlers else {
guard let player, let _handlers else {
return
}

Expand All @@ -114,7 +127,7 @@ class RCTPlayerObserver: NSObject {
}

func addPlayerItemObservers() {
guard let playerItem = playerItem, let _handlers = _handlers else { return }
guard let playerItem, let _handlers else { return }
_playerItemStatusObserver = playerItem.observe(\.status, options: [.new, .old], changeHandler: _handlers.handlePlayerItemStatusChange)
_playerPlaybackBufferEmptyObserver = playerItem.observe(
\.isPlaybackBufferEmpty,
Expand All @@ -126,7 +139,6 @@ class RCTPlayerObserver: NSObject {
options: [.new, .old],
changeHandler: _handlers.handlePlaybackLikelyToKeepUp
)
_playerTimedMetadataObserver = playerItem.observe(\.timedMetadata, options: [.new], changeHandler: _handlers.handleTimeMetadataChange)
}

func removePlayerItemObservers() {
Expand All @@ -137,7 +149,7 @@ class RCTPlayerObserver: NSObject {
}

func addPlayerViewControllerObservers() {
guard let playerViewController = playerViewController, let _handlers = _handlers else { return }
guard let playerViewController, let _handlers else { return }

_playerViewControllerReadyForDisplayObserver = playerViewController.observe(
\.isReadyForDisplay,
Expand All @@ -158,7 +170,7 @@ class RCTPlayerObserver: NSObject {
}

func addPlayerLayerObserver() {
guard let _handlers = _handlers else { return }
guard let _handlers else { return }
_playerLayerReadyForDisplayObserver = playerLayer?.observe(\.isReadyForDisplay, options: [.new], changeHandler: _handlers.handleReadyForDisplay)
}

Expand All @@ -167,7 +179,7 @@ class RCTPlayerObserver: NSObject {
}

func addPlayerTimeObserver() {
guard let _handlers = _handlers else { return }
guard let _handlers else { return }
removePlayerTimeObserver()
let progressUpdateIntervalMS: Float64 = _progressUpdateInterval / 1000
// @see endScrubbing in AVPlayerDemoPlaybackViewController.m
Expand Down Expand Up @@ -203,7 +215,7 @@ class RCTPlayerObserver: NSObject {
}

func attachPlayerEventListeners() {
guard let _handlers = _handlers else { return }
guard let _handlers else { return }
NotificationCenter.default.removeObserver(_handlers,
name: NSNotification.Name.AVPlayerItemDidPlayToEndTime,
object: player?.currentItem)
Expand Down Expand Up @@ -242,7 +254,7 @@ class RCTPlayerObserver: NSObject {
func clearPlayer() {
player = nil
playerItem = nil
if let _handlers = _handlers {
if let _handlers {
NotificationCenter.default.removeObserver(_handlers)
}
}
Expand Down
8 changes: 2 additions & 6 deletions ios/Video/RCTVideo.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1114,13 +1114,9 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
}

// When timeMetadata is read the event onTimedMetadata is triggered
func handleTimeMetadataChange(playerItem _: AVPlayerItem, change: NSKeyValueObservedChange<[AVMetadataItem]?>) {
guard let newValue = change.newValue, let _items = newValue, !_items.isEmpty else {
return
}

func handleTimeMetadataChange(timedMetadata: [AVMetadataItem]) {
var metadata: [[String: String?]?] = []
for item in _items {
for item in timedMetadata {
let value = item.value as? String
let identifier = item.identifier?.rawValue

Expand Down

0 comments on commit 481cc71

Please sign in to comment.