Added support for adaptive episode streams

4np · Mar 21, 2017 · 570bf43 · 570bf43
1 parent c1b94ba
commit 570bf43
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 27 deletions.
diff --git a/NPOKit/NPOKit/NPOManager+Stream.swift b/NPOKit/NPOKit/NPOManager+Stream.swift
@@ -82,13 +82,28 @@ extension NPOManager {
                 return
             }
 
+            // https://ida.omroep.nl/app.php/BNN_101382709?adaptive=yes&token=62i5nn3ci2vphfb8or665jqgv6
             let url = "http://ida.omroep.nl/app.php/\(mid)?adaptive=yes&token=\(token)"
             //DDLogDebug("episode url -> \(url)")
 
             self?.getVideoStream(forURL: url, andLiveChannel: nil, withCompletion: completed)
         }
     }
 
+    public func getVideoStream(forLiveChannel channel: NPOLive, withCompletion completed: @escaping (_ url: URL?, _ error: NPOError?) -> Void = { url, error in }) {
+        self.getToken { [weak self] token, error in
+            guard let token = token else {
+                completed(nil, error)
+                return
+            }
+
+            let channelMID = channel.rawValue
+            let url = "http://ida.omroep.nl/app.php/\(channelMID)?adaptive=yes&token=\(token)"
+            //DDLogDebug("live url: \(url)")
+            self?.getVideoStream(forURL: url, andLiveChannel: channel, withCompletion: completed)
+        }
+    }
+
     private func getVideoStream(forURL url: String, andLiveChannel liveChannel: NPOLive?, withCompletion completed: @escaping (_ url: URL?, _ error: NPOError?) -> Void = { url, error in }) {
         let _ = self.fetchModel(ofType: NPOVideo.self, fromURL: url) { video, error in
             guard let video = video else {
@@ -106,26 +121,15 @@ extension NPOManager {
             // set live channel, if we know it
             video.channel = liveChannel
 
-            guard let stream = video.highestQualityStream else {
+            guard let stream = video.preferredQualityStream else {
                 let error = error ?? NPOError.networkError("Could not fetch stream for video model (url: \(url))")
                 completed(nil, error)
                 return
             }
 
-            stream.getVideoStreamURL(withCompletion: completed)
-        }
-    }
-
-    public func getVideoStream(forLiveChannel channel: NPOLive, withCompletion completed: @escaping (_ url: URL?, _ error: NPOError?) -> Void = { url, error in }) {
-        self.getToken { [weak self] token, error in
-            guard let token = token else {
-                completed(nil, error)
-                return
-            }
+            //DDLogDebug("Stream quality \(stream.type)")
 
-            let url = "http://ida.omroep.nl/app.php/\(channel.rawValue)?adaptive=yes&token=\(token)"
-            //DDLogDebug("live url: \(url)")
-            self?.getVideoStream(forURL: url, andLiveChannel: channel, withCompletion: completed)
+            stream.getVideoStreamURL(withCompletion: completed)
         }
     }
 }
diff --git a/NPOKit/NPOKit/NPOStream.swift b/NPOKit/NPOKit/NPOStream.swift
@@ -14,12 +14,13 @@ import ObjectMapper
 import CocoaLumberjack
 
 public enum NPOStreamType: String {
-    case live = "Live"
+    case adaptive = "Adaptive"
     case high = "Hoog"
     case normal = "Normaal"
     case low = "Laag"
+    case live = "Live"
 
-    internal static let preferredOrder: [NPOStreamType] = [.high, .normal, .low]
+    internal static let preferredOrder: [NPOStreamType] = [.adaptive, .high, .normal, .low]
 }
 
 open class NPOStream: Mappable, CustomDebugStringConvertible {
@@ -65,7 +66,7 @@ open class NPOStream: Mappable, CustomDebugStringConvertible {
         }
 
         switch type {
-            case .high, .normal, .low:
+            case .adaptive, .high, .normal, .low:
                 self.getVideoStreamURL(forURL: url, withCompletion: completed)
             case .live:
                 completed(url, nil)

diff --git a/NPOKit/NPOKit/NPOVideo.swift b/NPOKit/NPOKit/NPOVideo.swift
@@ -86,7 +86,7 @@ open class NPOVideo: Mappable, CustomDebugStringConvertible {
 
     // MARK: Convenience
 
-    public var highestQualityStream: NPOStream? {
+    public var preferredQualityStream: NPOStream? {
         var preferredEpisodeQualityOrder = NPOManager.sharedInstance.preferredEpisodeQualityOrder
 
         // not really a quality, but the same back end returns live streams as well

diff --git a/README.md b/README.md
@@ -123,14 +123,6 @@ If you have set up a firewall to filter _outbound_ network requests, make sure t
 
 _Note: as the video and image content URLs come from the APIs, although unlikely, these URLs *might* change_
 
-# Limited bandwidth
-
-While the live streams are adaptive (and hence will optimise for the available bandwidth), the episode streams are actually based on order of quality which defaults to _Hoog_ (high), _Normaal_ (normal), _Laag_ (low) (in Dutch as the NPO uses these values as well). This basically means that when an episode has a high quality stream available, that is what will get played. Falling back to normal quality or lastly to low quality.
-
-If your internet connection is limited and you experience issues playing episodes you can change this order to (for example) _Laag,Normaal,Hoog_ and see if the episode stream perform more reliably:
-
-![videoqualityorderofpreference](https://cloud.githubusercontent.com/assets/1049693/24160516/5d113fe4-0e62-11e7-801f-885021617333.jpg)
-
 # Donate
 
 ![donations-banner](https://cloud.githubusercontent.com/assets/1049693/23892645/c292896c-089b-11e7-9c9a-2c8f60d64c0a.jpg)

diff --git a/UitzendingGemist/Settings.plist b/UitzendingGemist/Settings.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>UGPreferedEpisodeQualityOrder</key>
-	<string>Hoog,Normaal,Laag</string>
+	<string>Adaptive,Hoog,Normaal,Laag</string>
 	<key>UGEnablePlayerDebugging</key>
 	<string>NO</string>
 </dict>