Skip to content

Add MediaTimeRangesType for playback skip or other function #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
martinoneutrino wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add MediaTimeRangesType for playback skip or other function #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c123829
Add MediaTimeRangesType for playback skip or other function
Mar 14, 2018
ddc2f2d
Merge branch 'master' into master
martinoneutrino Mar 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions TVMediaPlayer.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
5BFF05C52058B4EB00A21C94 /* MediaTimeRangesType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BFF05C42058B4EB00A21C94 /* MediaTimeRangesType.swift */; };
711F134E1C40F7ED0096DBAD /* TVMediaPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 711F134D1C40F7ED0096DBAD /* TVMediaPlayer.h */; settings = {ATTRIBUTES = (Public, ); }; };
711F135A1C40F9560096DBAD /* ControlsOverlay.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 711F13551C40F9560096DBAD /* ControlsOverlay.storyboard */; };
711F135B1C40F9560096DBAD /* ControlsOverlayViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 711F13561C40F9560096DBAD /* ControlsOverlayViewController.swift */; };
Expand Down Expand Up @@ -53,6 +54,7 @@

/* Begin PBXFileReference section */
7119348F2058EB1C00479DFB /* Carthage.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Carthage.xcconfig; sourceTree = "<group>"; };
5BFF05C42058B4EB00A21C94 /* MediaTimeRangesType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MediaTimeRangesType.swift; sourceTree = "<group>"; };
711F134A1C40F7ED0096DBAD /* TVMediaPlayer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TVMediaPlayer.framework; sourceTree = BUILT_PRODUCTS_DIR; };
711F134D1C40F7ED0096DBAD /* TVMediaPlayer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TVMediaPlayer.h; sourceTree = "<group>"; };
711F134F1C40F7ED0096DBAD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand Down Expand Up @@ -124,6 +126,7 @@
711F13571C40F9560096DBAD /* MediaPlayerViewController.swift */,
711F13581C40F9560096DBAD /* MediaItemType.swift */,
711F13591C40F9560096DBAD /* MediaPlayerType.swift */,
5BFF05C42058B4EB00A21C94 /* MediaTimeRangesType.swift */,
711F134D1C40F7ED0096DBAD /* TVMediaPlayer.h */,
711F134F1C40F7ED0096DBAD /* Info.plist */,
711F13651C41C2900096DBAD /* Images.xcassets */,
Expand Down Expand Up @@ -265,6 +268,7 @@
711F135D1C40F9560096DBAD /* MediaItemType.swift in Sources */,
711F135C1C40F9560096DBAD /* MediaPlayerViewController.swift in Sources */,
711F135B1C40F9560096DBAD /* ControlsOverlayViewController.swift in Sources */,
5BFF05C52058B4EB00A21C94 /* MediaTimeRangesType.swift in Sources */,
711F135E1C40F9560096DBAD /* MediaPlayerType.swift in Sources */,
711F136A1C41C64D0096DBAD /* PlayerState.swift in Sources */,
711F13691C41C64D0096DBAD /* DPadState.swift in Sources */,
Expand Down
26 changes: 26 additions & 0 deletions TVMediaPlayer/MediaTimeRangesType.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import Foundation
import CoreMedia

public protocol MediaTimeRangesType {

func containsTime(_ time: CMTime) -> CMTimeRange?

/// The list of ranges
var ranges:[CMTimeRange] { get }
}

public extension MediaTimeRangesType {
func containsTime(_ time: CMTime) -> CMTimeRange? {
for range in ranges {
if (range.containsTime(time)) {
return range
}
}
return nil
}
}

//
// Created by Martin Glass on 13-Mar-18.
// Copyright © 2018 SwiftBit. All rights reserved.
//
16 changes: 15 additions & 1 deletion TVMediaPlayerTestApp/TestMediaPlayer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Foundation
import TVMediaPlayer
import AVFoundation

class TestMediaPlayer: MediaPlayerType, MediaItemType {
class TestMediaPlayer: MediaPlayerType, MediaItemType, MediaTimeRangesType {

lazy var playerItem:AVPlayerItem = {
let url = URL(string: "https://download.blender.org/durian/trailer/sintel_trailer-1080p.mp4")!
Expand All @@ -16,6 +16,14 @@ class TestMediaPlayer: MediaPlayerType, MediaItemType {
let position = time.seconds / sself.length
sself.positionChanged?(Float(position))
}
// skip
player.addPeriodicTimeObserver(forInterval: CMTime(value: 1, timescale: 1), queue: nil) { [weak self] time in
guard let sself = self else { return }
guard let timeRange = sself.containsTime(time) else { return }
player.seek(to: timeRange.end)
let position = timeRange.end.seconds / sself.length
sself.positionChanged?(Float(position))
}
return player
}()

Expand Down Expand Up @@ -61,6 +69,12 @@ class TestMediaPlayer: MediaPlayerType, MediaItemType {
var subtitle:String? { return "Subtitle" }

var length:Double { return playerItem.duration.seconds }

//test range
var ranges:[CMTimeRange] {
return [CMTimeRange(start:CMTime(seconds:5.000, preferredTimescale:1000),
end:CMTime(seconds:9.000, preferredTimescale:1000))]
}
}

//
Expand Down