Refactor

testpress · Jan 2, 2023 · 259fd0a · 259fd0a
1 parent a897aff
commit 259fd0a
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 7 deletions.
diff --git a/app/src/main/java/com/tpstream/app/MainActivity.kt b/app/src/main/java/com/tpstream/app/MainActivity.kt
@@ -4,6 +4,7 @@ import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
+import com.tpstream.player.OfflineDownloadResolution
 import com.tpstream.player.TpInitParams
 import com.tpstream.player.TpStreamDownloadManager
 
@@ -55,7 +56,7 @@ class MainActivity : AppCompatActivity() {
             .setOrgCode("demoveranda")
             .build()
 
-        TpStreamDownloadManager(this).startDownloads(listOf(drmVideo,aesEncryptedVideo,clearVideo),2)
+        TpStreamDownloadManager(this).startDownloads(listOf(drmVideo,aesEncryptedVideo,clearVideo),OfflineDownloadResolution.HIGH)
     }
 
 }
diff --git a/player/src/main/java/com/tpstream/player/TpStreamDownloadManager.kt b/player/src/main/java/com/tpstream/player/TpStreamDownloadManager.kt
@@ -39,7 +39,7 @@ class TpStreamDownloadManager(val context: Context) {
         return offlineVideoInfo.url
     }
 
-    fun startDownloads(paramsList: List<TpInitParams>,videoResolution:Int){
+    fun startDownloads(paramsList: List<TpInitParams>,resolution:OfflineDownloadResolution = OfflineDownloadResolution.VERY_LOW){
         CoroutineScope(Dispatchers.IO).launch {
             val downloadedList = offlineVideoInfoRepository.getAllDownloads()
             val paramsList1 = if (downloadedList != null){
@@ -48,7 +48,7 @@ class TpStreamDownloadManager(val context: Context) {
                 paramsList.toMutableList()
             }
             for (params in paramsList1){
-                val videoDownloadRequestCreationHandler = VideoDownloadRequestCreationHandler(context,null,params,videoResolution).init()
+                val videoDownloadRequestCreationHandler = VideoDownloadRequestCreationHandler(context,null,params,resolution.height).init()
                 videoDownloadRequestCreationHandler.setOnDownloadRequestCreation { downloadRequest, videoInfo ->
                     DownloadTask(context).start(downloadRequest)
                     saveOfflineVideoInfo(params,videoInfo)
@@ -65,4 +65,11 @@ class TpStreamDownloadManager(val context: Context) {
             OfflineVideoInfoRepository(context).insert(offlineVideoInfo)
         }
     }
+}
+
+enum class OfflineDownloadResolution(val height:Int){
+    VERY_LOW(240),
+    LOW(360),
+    MEDIUM(480),
+    HIGH(720),
 }
diff --git a/player/src/main/java/com/tpstream/player/VideoDownloadRequestCreationHandler.kt b/player/src/main/java/com/tpstream/player/VideoDownloadRequestCreationHandler.kt
@@ -25,7 +25,7 @@ class VideoDownloadRequestCreationHandler(
     val context: Context,
     private val player: TpStreamPlayer? = null,
     private var params: TpInitParams? = null,
-    private val downloadResolution: Int = 0
+    private val downloadResolutionHeight: Int = 240
 ) :
     DownloadHelper.Callback, DRMLicenseFetchCallback {
     private lateinit var downloadHelper: DownloadHelper
@@ -117,7 +117,7 @@ class VideoDownloadRequestCreationHandler(
                 }
                 return
             }
-            createDownloadOverrides(downloadResolution)
+            createDownloadOverrides(downloadResolutionHeight)
         } else {
             val videoOrAudioData = VideoPlayerUtil.getAudioOrVideoInfoWithDrmInitData(helper)
             val isDRMProtectedVideo = videoOrAudioData != null
@@ -155,7 +155,7 @@ class VideoDownloadRequestCreationHandler(
         val trackGroup = downloadHelper.getTracks(0).groups
         val overrides = trackSelectionParameters.overrides.toMutableMap()
         val trackInfos = getTrackInfos(trackGroup)
-        val resolution = trackInfos[int]
+        val resolution = trackInfos[getResolutionIndex(int,trackGroup)]
         val mediaTrackGroup: TrackGroup = resolution.trackGroup.mediaTrackGroup
         overrides.clear()
         overrides[mediaTrackGroup] =
@@ -176,6 +176,23 @@ class VideoDownloadRequestCreationHandler(
         return trackInfos
     }
 
+    private fun getResolutionIndex(resolutionHeight:Int,trackGroups: List<Tracks.Group>):Int{
+        val track = trackGroups[0]
+        for (index in 0 until  track.mediaTrackGroup.length){
+            if (resolutionHeight == track.mediaTrackGroup.getFormat(index).height){
+                val format = track.mediaTrackGroup.getFormat(index)
+                return track.mediaTrackGroup.indexOf(format)
+            }
+        }
+        for (index in 0 until  track.mediaTrackGroup.length){
+            if (240 == track.mediaTrackGroup.getFormat(index).height){
+                val format = track.mediaTrackGroup.getFormat(index)
+                return track.mediaTrackGroup.indexOf(format)
+            }
+        }
+        return 0
+    }
+
     fun buildDownloadRequest(overrides: MutableMap<TrackGroup, TrackSelectionOverride>): DownloadRequest {
         setSelectedTracks(overrides)
         val name = videoInfo.title!!
@@ -195,7 +212,7 @@ class VideoDownloadRequestCreationHandler(
 
     override fun onLicenseFetchSuccess(keySetId: ByteArray) {
         this.keySetId = keySetId
-        createDownloadOverrides(downloadResolution)
+        createDownloadOverrides(downloadResolutionHeight)
         CoroutineScope(Dispatchers.Main).launch {
             Log.d("TAG", "onLicenseFetchSuccess: Success")
             listener?.onDownloadRequestHandlerPrepared(true, downloadHelper)