mirror of
https://github.com/yattee/yattee.git
synced 2024-09-19 08:51:32 +00:00
Improve resolution switching
This commit is contained in:
Arkadiusz Fal
parent
4535853ac3
commit
da22b06cc1
@ -1,5 +1,6 @@
|
||||
import AVKit
|
||||
import Foundation
|
||||
import Logging
|
||||
import SwiftUI
|
||||
|
||||
struct PlayerViewController: UIViewControllerRepresentable {
|
||||
@ -9,93 +10,107 @@ struct PlayerViewController: UIViewControllerRepresentable {
|
||||
var player = AVPlayer()
|
||||
var composition = AVMutableComposition()
|
||||
|
||||
var audioTrack: AVMutableCompositionTrack {
|
||||
composition.tracks(withMediaType: .audio).first ?? composition.addMutableTrack(withMediaType: .audio, preferredTrackID: kCMPersistentTrackID_Invalid)!
|
||||
}
|
||||
|
||||
var videoTrack: AVMutableCompositionTrack {
|
||||
composition.tracks(withMediaType: .video).first ?? composition.addMutableTrack(withMediaType: .video, preferredTrackID: kCMPersistentTrackID_Invalid)!
|
||||
}
|
||||
let logger = Logger(label: "net.arekf.Pearvidious.pvc")
|
||||
|
||||
var playerItem: AVPlayerItem {
|
||||
let playerItem = AVPlayerItem(asset: composition)
|
||||
|
||||
playerItem.externalMetadata = [makeMetadataItem(.commonIdentifierTitle, value: video.title)]
|
||||
playerItem.preferredForwardBufferDuration = 10
|
||||
|
||||
return playerItem
|
||||
}
|
||||
|
||||
init(video: Video) {
|
||||
self.video = video
|
||||
state.currentStream = video.defaultStream
|
||||
|
||||
addTracksAndLoadAssets(state.currentStream!)
|
||||
loadStream(video.defaultStream)
|
||||
}
|
||||
|
||||
func addTracksAndLoadAssets(_ stream: Stream) {
|
||||
composition.removeTrack(audioTrack)
|
||||
composition.removeTrack(videoTrack)
|
||||
func loadStream(_ stream: Stream?) {
|
||||
if stream != state.streamToLoad {
|
||||
state.loadStream(stream)
|
||||
addTracksAndLoadAssets(state.streamToLoad, loadBest: true)
|
||||
}
|
||||
}
|
||||
|
||||
let keys = ["playable"]
|
||||
|
||||
stream.audioAsset.loadValuesAsynchronously(forKeys: keys) {
|
||||
DispatchQueue.main.async {
|
||||
guard let track = stream.audioAsset.tracks(withMediaType: .audio).first else {
|
||||
return
|
||||
}
|
||||
|
||||
try? audioTrack.insertTimeRange(
|
||||
CMTimeRange(start: .zero, duration: CMTime(seconds: video.length, preferredTimescale: 1)),
|
||||
of: track,
|
||||
at: .zero
|
||||
)
|
||||
|
||||
handleAssetLoad(stream)
|
||||
}
|
||||
func loadBestStream() {
|
||||
guard state.currentStream != video.bestStream else {
|
||||
return
|
||||
}
|
||||
|
||||
stream.videoAsset.loadValuesAsynchronously(forKeys: keys) {
|
||||
DispatchQueue.main.async {
|
||||
guard let track = stream.videoAsset.tracks(withMediaType: .video).first else {
|
||||
return
|
||||
}
|
||||
loadStream(video.bestStream)
|
||||
}
|
||||
|
||||
try? videoTrack.insertTimeRange(
|
||||
CMTimeRange(start: .zero, duration: CMTime(seconds: video.length, preferredTimescale: 1)),
|
||||
of: track,
|
||||
at: .zero
|
||||
)
|
||||
func addTracksAndLoadAssets(_ stream: Stream, loadBest: Bool = false) {
|
||||
logger.info("adding tracks and loading assets for: \(stream.type), \(stream.description)")
|
||||
|
||||
handleAssetLoad(stream)
|
||||
stream.assets.forEach { asset in
|
||||
asset.loadValuesAsynchronously(forKeys: ["playable"]) {
|
||||
handleAssetLoad(stream, type: asset == stream.videoAsset ? .video : .audio, loadBest: loadBest)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func handleAssetLoad(_ stream: Stream) {
|
||||
var error: NSError?
|
||||
let status = stream.videoAsset.statusOfValue(forKey: "playable", error: &error)
|
||||
func addTrack(_ asset: AVURLAsset, type: AVMediaType) {
|
||||
guard let assetTrack = asset.tracks(withMediaType: type).first else {
|
||||
return
|
||||
}
|
||||
|
||||
switch status {
|
||||
case .loaded:
|
||||
let resumeAt = player.currentTime()
|
||||
if let track = composition.tracks(withMediaType: type).first {
|
||||
logger.info("removing \(type) track")
|
||||
composition.removeTrack(track)
|
||||
}
|
||||
|
||||
if resumeAt.seconds > 0 {
|
||||
state.seekTo = resumeAt
|
||||
let track = composition.addMutableTrack(withMediaType: type, preferredTrackID: kCMPersistentTrackID_Invalid)!
|
||||
|
||||
try! track.insertTimeRange(
|
||||
CMTimeRange(start: .zero, duration: CMTime(seconds: video.length, preferredTimescale: 1)),
|
||||
of: assetTrack,
|
||||
at: .zero
|
||||
)
|
||||
|
||||
logger.info("inserted \(type) track")
|
||||
}
|
||||
|
||||
func handleAssetLoad(_ stream: Stream, type: AVMediaType, loadBest: Bool = false) {
|
||||
logger.info("handling asset load: \(stream.type), \(stream.description)")
|
||||
guard stream != state.currentStream else {
|
||||
logger.warning("IGNORING assets loaded: \(stream.type), \(stream.description)")
|
||||
return
|
||||
}
|
||||
|
||||
let loadedAssets = stream.assets.filter { $0.statusOfValue(forKey: "playable", error: nil) == .loaded }
|
||||
|
||||
loadedAssets.forEach { asset in
|
||||
logger.info("both assets loaded: \(stream.type), \(stream.description)")
|
||||
|
||||
if stream.type == .stream {
|
||||
addTrack(asset, type: .video)
|
||||
addTrack(asset, type: .audio)
|
||||
} else {
|
||||
addTrack(asset, type: type)
|
||||
}
|
||||
|
||||
state.currentStream = stream
|
||||
if stream.assetsLoaded {
|
||||
let resumeAt = player.currentTime()
|
||||
if resumeAt.seconds > 0 {
|
||||
state.seekTo = resumeAt
|
||||
}
|
||||
|
||||
player.replaceCurrentItem(with: playerItem)
|
||||
logger.warning("replacing player item")
|
||||
player.replaceCurrentItem(with: playerItem)
|
||||
state.streamDidLoad(stream)
|
||||
|
||||
if let time = state.seekTo {
|
||||
player.seek(to: time)
|
||||
}
|
||||
if let time = state.seekTo {
|
||||
player.seek(to: time)
|
||||
}
|
||||
|
||||
player.play()
|
||||
player.play()
|
||||
|
||||
default:
|
||||
if error != nil {
|
||||
print("loading error: \(error!)")
|
||||
if loadBest {
|
||||
loadBestStream()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -116,16 +131,25 @@ struct PlayerViewController: UIViewControllerRepresentable {
|
||||
controller.transportBarCustomMenuItems = [streamingQualityMenu]
|
||||
controller.modalPresentationStyle = .fullScreen
|
||||
controller.player = player
|
||||
controller.player?.automaticallyWaitsToMinimizeStalling = true
|
||||
|
||||
return controller
|
||||
}
|
||||
|
||||
func updateUIViewController(_ controller: AVPlayerViewController, context _: Context) {
|
||||
controller.transportBarCustomMenuItems = [streamingQualityMenu]
|
||||
var items: [UIMenuElement] = []
|
||||
|
||||
if state.streamToLoad != nil {
|
||||
items.append(actionsMenu)
|
||||
}
|
||||
|
||||
items.append(streamingQualityMenu)
|
||||
|
||||
controller.transportBarCustomMenuItems = items
|
||||
}
|
||||
|
||||
var streamingQualityMenu: UIMenu {
|
||||
UIMenu(title: "Streaming quality", image: UIImage(systemName: "4k.tv"), children: streamingQualityMenuActions)
|
||||
UIMenu(title: "Streaming quality", image: UIImage(systemName: "waveform"), children: streamingQualityMenuActions)
|
||||
}
|
||||
|
||||
var streamingQualityMenuActions: [UIAction] {
|
||||
@ -134,9 +158,26 @@ struct PlayerViewController: UIViewControllerRepresentable {
|
||||
|
||||
return UIAction(title: stream.description, image: image) { _ in
|
||||
DispatchQueue.main.async {
|
||||
addTracksAndLoadAssets(stream)
|
||||
guard state.currentStream != stream else {
|
||||
return
|
||||
}
|
||||
state.streamToLoad = stream
|
||||
addTracksAndLoadAssets(state.streamToLoad)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var actionsMenu: UIMenu {
|
||||
UIMenu(title: "Actions", image: UIImage(systemName: "bolt.horizontal.fill"), children: [cancelLoadingAction])
|
||||
}
|
||||
|
||||
var cancelLoadingAction: UIAction {
|
||||
UIAction(title: "Cancel loading \(state.streamToLoad.description) stream") { _ in
|
||||
DispatchQueue.main.async {
|
||||
state.streamToLoad.cancelLoadingAssets()
|
||||
state.cancelLoadingStream(state.streamToLoad)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
21
Extensions/AVKeyValueStatus+String.swift
Normal file
21
Extensions/AVKeyValueStatus+String.swift
Normal file
@ -0,0 +1,21 @@
|
||||
import AVFoundation
|
||||
import Foundation
|
||||
|
||||
extension AVKeyValueStatus {
|
||||
var string: String {
|
||||
switch self {
|
||||
case .unknown:
|
||||
return "unknown"
|
||||
case .loading:
|
||||
return "loading"
|
||||
case .loaded:
|
||||
return "loaded"
|
||||
case .failed:
|
||||
return "failed"
|
||||
case .cancelled:
|
||||
return "cancelled"
|
||||
@unknown default:
|
||||
return "unknown default"
|
||||
}
|
||||
}
|
||||
}
|
||||
16
Model/AudioVideoStream.swift
Normal file
16
Model/AudioVideoStream.swift
Normal file
@ -0,0 +1,16 @@
|
||||
import AVFoundation
|
||||
import Foundation
|
||||
|
||||
final class AudioVideoStream: Stream {
|
||||
var avAsset: AVURLAsset
|
||||
|
||||
init(avAsset: AVURLAsset, resolution: StreamResolution, type: StreamType, encoding: String) {
|
||||
self.avAsset = avAsset
|
||||
|
||||
super.init(audioAsset: avAsset, videoAsset: avAsset, resolution: resolution, type: type, encoding: encoding)
|
||||
}
|
||||
|
||||
override var assets: [AVURLAsset] {
|
||||
[videoAsset]
|
||||
}
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
import AVFoundation
|
||||
import Foundation
|
||||
|
||||
final class MuxedStream: Stream {
|
||||
var muxedAsset: AVURLAsset
|
||||
|
||||
init(muxedAsset: AVURLAsset, resolution: StreamResolution, type: StreamType, encoding: String) {
|
||||
self.muxedAsset = muxedAsset
|
||||
|
||||
super.init(audioAsset: muxedAsset, videoAsset: muxedAsset, resolution: resolution, type: type, encoding: encoding)
|
||||
}
|
||||
}
|
||||
@ -1,7 +1,52 @@
|
||||
import AVFoundation
|
||||
import Foundation
|
||||
import Logging
|
||||
|
||||
final class PlayerState: ObservableObject {
|
||||
@Published var currentStream: Stream!
|
||||
let logger = Logger(label: "net.arekf.Pearvidious.ps")
|
||||
|
||||
@Published private(set) var currentStream: Stream!
|
||||
@Published var streamToLoad: Stream!
|
||||
|
||||
@Published var seekTo: CMTime?
|
||||
|
||||
@Published var streamLoading = false
|
||||
|
||||
func cancelLoadingStream(_ stream: Stream) {
|
||||
guard streamToLoad == stream else {
|
||||
return
|
||||
}
|
||||
|
||||
streamToLoad = nil
|
||||
streamLoading = false
|
||||
|
||||
logger.info("cancel streamToLoad: \(streamToLoad?.description ?? "nil"), streamLoading \(streamLoading)")
|
||||
}
|
||||
|
||||
func loadStream(_ stream: Stream?) {
|
||||
guard streamToLoad != stream else {
|
||||
return
|
||||
}
|
||||
|
||||
streamToLoad?.cancelLoadingAssets()
|
||||
|
||||
streamLoading = true
|
||||
streamToLoad = stream
|
||||
|
||||
logger.info("replace streamToLoad: \(streamToLoad?.description ?? "nil"), streamLoading \(streamLoading)")
|
||||
}
|
||||
|
||||
func streamDidLoad(_ stream: Stream?) {
|
||||
logger.info("didload stream: \(stream!.description)")
|
||||
logger.info("before: toLoad: \(streamToLoad?.description ?? "nil"), current \(currentStream?.description ?? "nil"), loading \(streamLoading)")
|
||||
|
||||
currentStream = stream
|
||||
streamLoading = streamToLoad != stream
|
||||
|
||||
if streamToLoad == stream {
|
||||
streamToLoad = nil
|
||||
}
|
||||
|
||||
logger.info("after: toLoad: \(streamToLoad?.description ?? "nil"), current \(currentStream?.description ?? "nil"), loading \(streamLoading)")
|
||||
}
|
||||
}
|
||||
|
||||
@ -23,6 +23,20 @@ class Stream: Equatable {
|
||||
"\(resolution.height)p"
|
||||
}
|
||||
|
||||
var assets: [AVURLAsset] {
|
||||
[audioAsset, videoAsset]
|
||||
}
|
||||
|
||||
var assetsLoaded: Bool {
|
||||
assets.allSatisfy { $0.statusOfValue(forKey: "playable", error: nil) == .loaded }
|
||||
}
|
||||
|
||||
func cancelLoadingAssets() {
|
||||
assets.forEach { $0.cancelLoading() }
|
||||
audioAsset = AVURLAsset(url: audioAsset.url)
|
||||
videoAsset = AVURLAsset(url: videoAsset.url)
|
||||
}
|
||||
|
||||
static func == (lhs: Stream, rhs: Stream) -> Bool {
|
||||
lhs.resolution == rhs.resolution && lhs.type == rhs.type
|
||||
}
|
||||
|
||||
@ -95,6 +95,10 @@ final class Video: Identifiable, ObservableObject {
|
||||
selectableStreams.first { $0.type == .stream }
|
||||
}
|
||||
|
||||
var bestStream: Stream? {
|
||||
selectableStreams.min { $0.resolution > $1.resolution }
|
||||
}
|
||||
|
||||
private func extractThumbnailURL(from details: JSON) -> URL? {
|
||||
if details["videoThumbnails"].arrayValue.isEmpty {
|
||||
return nil
|
||||
@ -106,8 +110,8 @@ final class Video: Identifiable, ObservableObject {
|
||||
|
||||
private func extractFormatStreams(from streams: [JSON]) -> [Stream] {
|
||||
streams.map {
|
||||
MuxedStream(
|
||||
muxedAsset: AVURLAsset(url: DataProvider.proxyURLForAsset($0["url"].stringValue)!),
|
||||
AudioVideoStream(
|
||||
avAsset: AVURLAsset(url: DataProvider.proxyURLForAsset($0["url"].stringValue)!),
|
||||
resolution: StreamResolution.from(resolution: $0["resolution"].stringValue)!,
|
||||
type: .stream,
|
||||
encoding: $0["encoding"].stringValue
|
||||
|
||||
@ -33,15 +33,19 @@
|
||||
37B767DB2677C3CA0098BAA8 /* PlayerState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37B767DA2677C3CA0098BAA8 /* PlayerState.swift */; };
|
||||
37B767DC2677C3CA0098BAA8 /* PlayerState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37B767DA2677C3CA0098BAA8 /* PlayerState.swift */; };
|
||||
37B767DD2677C3CA0098BAA8 /* PlayerState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37B767DA2677C3CA0098BAA8 /* PlayerState.swift */; };
|
||||
37B767E02678C5BF0098BAA8 /* Logging in Frameworks */ = {isa = PBXBuildFile; productRef = 37B767DF2678C5BF0098BAA8 /* Logging */; };
|
||||
37C7A9042679059200E721B4 /* AVKeyValueStatus+String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37C7A9032679059200E721B4 /* AVKeyValueStatus+String.swift */; };
|
||||
37C7A905267905AE00E721B4 /* AVKeyValueStatus+String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37C7A9032679059200E721B4 /* AVKeyValueStatus+String.swift */; };
|
||||
37C7A906267905AF00E721B4 /* AVKeyValueStatus+String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37C7A9032679059200E721B4 /* AVKeyValueStatus+String.swift */; };
|
||||
37CEE4B52677B628005A1EFE /* StreamType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CEE4B42677B628005A1EFE /* StreamType.swift */; };
|
||||
37CEE4B62677B628005A1EFE /* StreamType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CEE4B42677B628005A1EFE /* StreamType.swift */; };
|
||||
37CEE4B72677B628005A1EFE /* StreamType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CEE4B42677B628005A1EFE /* StreamType.swift */; };
|
||||
37CEE4B92677B63F005A1EFE /* StreamResolution.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CEE4B82677B63F005A1EFE /* StreamResolution.swift */; };
|
||||
37CEE4BA2677B63F005A1EFE /* StreamResolution.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CEE4B82677B63F005A1EFE /* StreamResolution.swift */; };
|
||||
37CEE4BB2677B63F005A1EFE /* StreamResolution.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CEE4B82677B63F005A1EFE /* StreamResolution.swift */; };
|
||||
37CEE4BD2677B670005A1EFE /* MuxedStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CEE4BC2677B670005A1EFE /* MuxedStream.swift */; };
|
||||
37CEE4BE2677B670005A1EFE /* MuxedStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CEE4BC2677B670005A1EFE /* MuxedStream.swift */; };
|
||||
37CEE4BF2677B670005A1EFE /* MuxedStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CEE4BC2677B670005A1EFE /* MuxedStream.swift */; };
|
||||
37CEE4BD2677B670005A1EFE /* AudioVideoStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CEE4BC2677B670005A1EFE /* AudioVideoStream.swift */; };
|
||||
37CEE4BE2677B670005A1EFE /* AudioVideoStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CEE4BC2677B670005A1EFE /* AudioVideoStream.swift */; };
|
||||
37CEE4BF2677B670005A1EFE /* AudioVideoStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CEE4BC2677B670005A1EFE /* AudioVideoStream.swift */; };
|
||||
37CEE4C12677B697005A1EFE /* Stream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CEE4C02677B697005A1EFE /* Stream.swift */; };
|
||||
37CEE4C22677B697005A1EFE /* Stream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CEE4C02677B697005A1EFE /* Stream.swift */; };
|
||||
37CEE4C32677B697005A1EFE /* Stream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37CEE4C02677B697005A1EFE /* Stream.swift */; };
|
||||
@ -115,9 +119,10 @@
|
||||
37AAF29B26741B5F007FC770 /* SubscriptionVideosProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionVideosProvider.swift; sourceTree = "<group>"; };
|
||||
37AAF29F26741C97007FC770 /* SubscriptionsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionsView.swift; sourceTree = "<group>"; };
|
||||
37B767DA2677C3CA0098BAA8 /* PlayerState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlayerState.swift; sourceTree = "<group>"; };
|
||||
37C7A9032679059200E721B4 /* AVKeyValueStatus+String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AVKeyValueStatus+String.swift"; sourceTree = "<group>"; };
|
||||
37CEE4B42677B628005A1EFE /* StreamType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StreamType.swift; sourceTree = "<group>"; };
|
||||
37CEE4B82677B63F005A1EFE /* StreamResolution.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StreamResolution.swift; sourceTree = "<group>"; };
|
||||
37CEE4BC2677B670005A1EFE /* MuxedStream.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MuxedStream.swift; sourceTree = "<group>"; };
|
||||
37CEE4BC2677B670005A1EFE /* AudioVideoStream.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioVideoStream.swift; sourceTree = "<group>"; };
|
||||
37CEE4C02677B697005A1EFE /* Stream.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Stream.swift; sourceTree = "<group>"; };
|
||||
37D4B0C22671614700C925CA /* PearvidiousApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PearvidiousApp.swift; sourceTree = "<group>"; };
|
||||
37D4B0C32671614700C925CA /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
|
||||
@ -178,6 +183,7 @@
|
||||
37D4B19D2671817900C925CA /* SwiftyJSON in Frameworks */,
|
||||
37D4B1AB2672580400C925CA /* URLImage in Frameworks */,
|
||||
37D4B19126717C6900C925CA /* Alamofire in Frameworks */,
|
||||
37B767E02678C5BF0098BAA8 /* Logging in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@ -191,11 +197,20 @@
|
||||
/* End PBXFrameworksBuildPhase section */
|
||||
|
||||
/* Begin PBXGroup section */
|
||||
37C7A9022679058300E721B4 /* Extensions */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
37C7A9032679059200E721B4 /* AVKeyValueStatus+String.swift */,
|
||||
);
|
||||
path = Extensions;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
37D4B0BC2671614700C925CA = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
37D4B1B72672CFE300C925CA /* Model */,
|
||||
37D4B0C12671614700C925CA /* Shared */,
|
||||
37C7A9022679058300E721B4 /* Extensions */,
|
||||
37D4B159267164AE00C925CA /* Apple TV */,
|
||||
37D4B174267164B000C925CA /* Tests Apple TV */,
|
||||
37D4B0D72671614900C925CA /* Tests iOS */,
|
||||
@ -284,7 +299,7 @@
|
||||
37CEE4C02677B697005A1EFE /* Stream.swift */,
|
||||
37CEE4B42677B628005A1EFE /* StreamType.swift */,
|
||||
37CEE4B82677B63F005A1EFE /* StreamResolution.swift */,
|
||||
37CEE4BC2677B670005A1EFE /* MuxedStream.swift */,
|
||||
37CEE4BC2677B670005A1EFE /* AudioVideoStream.swift */,
|
||||
);
|
||||
path = Model;
|
||||
sourceTree = "<group>";
|
||||
@ -380,6 +395,7 @@
|
||||
37D4B19C2671817900C925CA /* SwiftyJSON */,
|
||||
37D4B1AA2672580400C925CA /* URLImage */,
|
||||
37D4B1AC2672580400C925CA /* URLImageStore */,
|
||||
37B767DF2678C5BF0098BAA8 /* Logging */,
|
||||
);
|
||||
productName = Pearvidious;
|
||||
productReference = 37D4B158267164AE00C925CA /* Pearvidious (Apple TV).app */;
|
||||
@ -449,6 +465,7 @@
|
||||
37D4B18F26717C6900C925CA /* XCRemoteSwiftPackageReference "Alamofire" */,
|
||||
37D4B19B2671817900C925CA /* XCRemoteSwiftPackageReference "SwiftyJSON" */,
|
||||
37D4B1A92672580400C925CA /* XCRemoteSwiftPackageReference "url-image" */,
|
||||
37B767DE2678C5BF0098BAA8 /* XCRemoteSwiftPackageReference "swift-log" */,
|
||||
);
|
||||
productRefGroup = 37D4B0CA2671614900C925CA /* Products */;
|
||||
projectDirPath = "";
|
||||
@ -518,7 +535,7 @@
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
37CEE4BD2677B670005A1EFE /* MuxedStream.swift in Sources */,
|
||||
37CEE4BD2677B670005A1EFE /* AudioVideoStream.swift in Sources */,
|
||||
37D4B19326717CE100C925CA /* PopularVideosProvider.swift in Sources */,
|
||||
37AAF29C26741B5F007FC770 /* SubscriptionVideosProvider.swift in Sources */,
|
||||
37CEE4C12677B697005A1EFE /* Stream.swift in Sources */,
|
||||
@ -529,6 +546,7 @@
|
||||
37AAF2942674086B007FC770 /* TabSelection.swift in Sources */,
|
||||
37D4B1B02672A01000C925CA /* DataProvider.swift in Sources */,
|
||||
37AAF28C2673ABD3007FC770 /* ChannelVideosProvider.swift in Sources */,
|
||||
37C7A9042679059200E721B4 /* AVKeyValueStatus+String.swift in Sources */,
|
||||
37B767DB2677C3CA0098BAA8 /* PlayerState.swift in Sources */,
|
||||
37D4B1B42672A30700C925CA /* VideoDetailsProvider.swift in Sources */,
|
||||
37AAF2A026741C97007FC770 /* SubscriptionsView.swift in Sources */,
|
||||
@ -542,7 +560,7 @@
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
37CEE4BE2677B670005A1EFE /* MuxedStream.swift in Sources */,
|
||||
37CEE4BE2677B670005A1EFE /* AudioVideoStream.swift in Sources */,
|
||||
37D4B19426717CE100C925CA /* PopularVideosProvider.swift in Sources */,
|
||||
37AAF29D26741B5F007FC770 /* SubscriptionVideosProvider.swift in Sources */,
|
||||
37CEE4C22677B697005A1EFE /* Stream.swift in Sources */,
|
||||
@ -553,6 +571,7 @@
|
||||
37AAF2952674086B007FC770 /* TabSelection.swift in Sources */,
|
||||
37D4B1B12672A01000C925CA /* DataProvider.swift in Sources */,
|
||||
37AAF28D2673ABD3007FC770 /* ChannelVideosProvider.swift in Sources */,
|
||||
37C7A906267905AF00E721B4 /* AVKeyValueStatus+String.swift in Sources */,
|
||||
37B767DC2677C3CA0098BAA8 /* PlayerState.swift in Sources */,
|
||||
37D4B1B52672A30700C925CA /* VideoDetailsProvider.swift in Sources */,
|
||||
37AAF2A126741C97007FC770 /* SubscriptionsView.swift in Sources */,
|
||||
@ -583,7 +602,7 @@
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
37AAF28026737550007FC770 /* SearchView.swift in Sources */,
|
||||
37CEE4BF2677B670005A1EFE /* MuxedStream.swift in Sources */,
|
||||
37CEE4BF2677B670005A1EFE /* AudioVideoStream.swift in Sources */,
|
||||
37CEE4B72677B628005A1EFE /* StreamType.swift in Sources */,
|
||||
37D4B19526717CE100C925CA /* PopularVideosProvider.swift in Sources */,
|
||||
37AAF29E26741B5F007FC770 /* SubscriptionVideosProvider.swift in Sources */,
|
||||
@ -593,6 +612,7 @@
|
||||
37AAF29226740715007FC770 /* AppState.swift in Sources */,
|
||||
3741B5302676213400125C5E /* PlayerViewController.swift in Sources */,
|
||||
37B767DD2677C3CA0098BAA8 /* PlayerState.swift in Sources */,
|
||||
37C7A905267905AE00E721B4 /* AVKeyValueStatus+String.swift in Sources */,
|
||||
37D4B18E26717B3800C925CA /* VideoThumbnailView.swift in Sources */,
|
||||
37D4B1B62672A30700C925CA /* VideoDetailsProvider.swift in Sources */,
|
||||
37AAF27E26737323007FC770 /* PopularVideosView.swift in Sources */,
|
||||
@ -1156,6 +1176,14 @@
|
||||
/* End XCConfigurationList section */
|
||||
|
||||
/* Begin XCRemoteSwiftPackageReference section */
|
||||
37B767DE2678C5BF0098BAA8 /* XCRemoteSwiftPackageReference "swift-log" */ = {
|
||||
isa = XCRemoteSwiftPackageReference;
|
||||
repositoryURL = "https://github.com/apple/swift-log.git";
|
||||
requirement = {
|
||||
kind = upToNextMajorVersion;
|
||||
minimumVersion = 1.0.0;
|
||||
};
|
||||
};
|
||||
37D4B18F26717C6900C925CA /* XCRemoteSwiftPackageReference "Alamofire" */ = {
|
||||
isa = XCRemoteSwiftPackageReference;
|
||||
repositoryURL = "https://github.com/Alamofire/Alamofire.git";
|
||||
@ -1183,6 +1211,11 @@
|
||||
/* End XCRemoteSwiftPackageReference section */
|
||||
|
||||
/* Begin XCSwiftPackageProductDependency section */
|
||||
37B767DF2678C5BF0098BAA8 /* Logging */ = {
|
||||
isa = XCSwiftPackageProductDependency;
|
||||
package = 37B767DE2678C5BF0098BAA8 /* XCRemoteSwiftPackageReference "swift-log" */;
|
||||
productName = Logging;
|
||||
};
|
||||
37D4B19026717C6900C925CA /* Alamofire */ = {
|
||||
isa = XCSwiftPackageProductDependency;
|
||||
package = 37D4B18F26717C6900C925CA /* XCRemoteSwiftPackageReference "Alamofire" */;
|
||||
|
||||
@ -10,6 +10,15 @@
|
||||
"version": "5.4.3"
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "swift-log",
|
||||
"repositoryURL": "https://github.com/apple/swift-log.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "5d66f7ba25daf4f94100e7022febf3c75e37a6c7",
|
||||
"version": "1.4.2"
|
||||
}
|
||||
},
|
||||
{
|
||||
"package": "SwiftyJSON",
|
||||
"repositoryURL": "https://github.com/SwiftyJSON/SwiftyJSON.git",
|
||||
|
||||
Loading…
Reference in New Issue
Block a user