@@ -478,6 +478,7 @@ extension GalleryVideoItemViewController {
478478 playerDidReachEnd = false
479479 player. seek ( to: . zero)
480480 }
481+ Logger . general. info ( category: " GalleryVideoItemViewController " , message: " Playing video " )
481482 player. play ( )
482483 } else if let url = item. url {
483484 controlView. style. insert ( . loading)
@@ -570,13 +571,13 @@ extension GalleryVideoItemViewController {
570571 updateControlView ( playControlsHidden: false , otherControlsHidden: false , animated: true )
571572 removeTimeObservers ( )
572573 AudioSession . shared. deactivateAsynchronously ( client: self , notifyOthersOnDeactivation: false )
573- let message : String
574+ let errorDescription : String
574575 if let error = notification. userInfo ? [ AVPlayerItemFailedToPlayToEndTimeErrorKey] as? Error {
575- message = error. localizedDescription
576+ errorDescription = error. localizedDescription
576577 } else {
577- message = " "
578+ errorDescription = " (null) "
578579 }
579- Logger . general. error ( category: " GalleryVideoItemViewController " , message: " Player item failed to play to end time: \( message ) " )
580+ Logger . general. error ( category: " GalleryVideoItemViewController " , message: " Player item failed to play to end time: \( errorDescription ) " )
580581 }
581582
582583 @objc private func playerItemNewErrorLogEntry( _ notification: Notification ) {
@@ -657,6 +658,7 @@ extension GalleryVideoItemViewController {
657658 func showReloadAndReport( error: Error ? ) {
658659 if let error = error {
659660 reporter. report ( error: error)
661+ Logger . general. error ( category: " GalleryVideoItemViewController " , message: " Failed to load asset: \( error) " )
660662 }
661663 controlView. style. remove ( . loading)
662664 controlView. playControlStyle = . reload
@@ -688,30 +690,41 @@ extension GalleryVideoItemViewController {
688690 private func load( playableAsset asset: AVURLAsset , playAfterLoaded: Bool ) {
689691 guard asset. isPlayable else {
690692 // TODO: UI Update
693+ Logger . general. error ( category: " GalleryVideoItemViewController " , message: " Asset is not playable " )
691694 return
692695 }
693696 removeAllObservers ( )
694697
695698 let item = AVPlayerItem ( asset: asset)
696699 itemStatusObserver = item. observe ( \. status, options: [ . initial, . new] ) { [ weak self] ( item, change) in
697700 // Known issue: https://bugs.swift.org/browse/SR-5872
698- // 'change' are always nil here
701+ // 'change' is always nil here
699702 self ? . updateControlView ( )
700- if case . failed = item. status, let error = item. error {
701- Logger . general. error ( category: " GalleryVideoItemViewController " , message: " Player item can no longer be played because of an error: \( error) " )
702- } else if case . unknown = item. status {
703- Logger . general. error ( category: " GalleryVideoItemViewController " , message: " Player item has not tried to load new media resources for playback " )
703+ switch item. status {
704+ case . readyToPlay:
705+ break
706+ case . failed:
707+ Logger . general. error ( category: " GalleryVideoItemViewController " , message: " Player item failed: \( item. error? . localizedDescription ?? " (null) " ) " )
708+ case . unknown:
709+ Logger . general. info ( category: " GalleryVideoItemViewController " , message: " Player item becomes unknown " )
710+ @unknown default :
711+ Logger . general. info ( category: " GalleryVideoItemViewController " , message: " Player item status: \( item. status. rawValue) " )
704712 }
705713 }
706714 itemPresentationSizeObserver = item. observe ( \. presentationSize) { [ weak self] ( item, _) in
707715 self ? . updateVideoViewSize ( with: item)
708716 }
709-
717+
710718 playerStatusObserver = player. observe ( \. status, options: [ . initial, . new] ) { player, _ in
711- if case . failed = player. status, let error = player. error {
712- Logger . general. error ( category: " GalleryVideoItemViewController " , message: " Player can no longer play AVPlayerItem instances because of an error: \( error) " )
713- } else if case . unknown = player. status {
714- Logger . general. error ( category: " GalleryVideoItemViewController " , message: " Player has not tried to load new media resources for playback " )
719+ switch player. status {
720+ case . readyToPlay:
721+ break
722+ case . failed:
723+ Logger . general. error ( category: " GalleryVideoItemViewController " , message: " Player failed: \( player. error? . localizedDescription ?? " (null) " ) " )
724+ case . unknown:
725+ Logger . general. info ( category: " GalleryVideoItemViewController " , message: " Player becomes unknown " )
726+ @unknown default :
727+ Logger . general. info ( category: " GalleryVideoItemViewController " , message: " Player status: \( player. status. rawValue) " )
715728 }
716729 }
717730
@@ -750,6 +763,7 @@ extension GalleryVideoItemViewController {
750763 Logger . general. error ( category: " GalleryVideoItemViewController " , message: " AudioSession activate error: \( error) " )
751764 }
752765 player. isMuted = mute
766+ Logger . general. info ( category: " GalleryVideoItemViewController " , message: " Playing video " )
753767 player. play ( )
754768 }
755769 }
0 commit comments