x/grayjay
1
0
Fork 0
mirror of https://gitlab.futo.org/videostreaming/grayjay.git synced 2026-05-16 04:52:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Request modifier download fixes.

Browse Source
This commit is contained in:
Kelvin
2025-11-18 15:23:35 +01:00
parent 9ffbe6dd03
commit ee2af411aa
1 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/futo/platformplayer/downloads/VideoDownload.kt
+36 -16
View File
@@ -483,7 +483,7 @@ class VideoDownload {
if(actualVideoSource is IVideoUrlSource) if(actualVideoSource is IVideoUrlSource)
videoFileSize = when (videoSource!!.container) { videoFileSize = when (videoSource!!.container) {
"application/vnd.apple.mpegurl" -> downloadHlsSource(context, "Video", client, videoSource!!.getVideoUrl(), File(downloadDir, videoFileName!!), progressCallback) "application/vnd.apple.mpegurl" -> downloadHlsSource(context, "Video", client, if (actualVideoSource is JSSource) actualVideoSource else null, videoSource!!.getVideoUrl(), File(downloadDir, videoFileName!!), progressCallback)
else -> downloadFileSource("Video", client, if (actualVideoSource is JSSource) actualVideoSource else null, videoSource!!.getVideoUrl(), File(downloadDir, videoFileName!!), progressCallback) else -> downloadFileSource("Video", client, if (actualVideoSource is JSSource) actualVideoSource else null, videoSource!!.getVideoUrl(), File(downloadDir, videoFileName!!), progressCallback)
} }
else if(actualVideoSource is JSDashManifestRawSource) { else if(actualVideoSource is JSDashManifestRawSource) {
@@ -523,7 +523,7 @@ class VideoDownload {
if(actualAudioSource is IAudioUrlSource) if(actualAudioSource is IAudioUrlSource)
audioFileSize = when (audioSource!!.container) { audioFileSize = when (audioSource!!.container) {
"application/vnd.apple.mpegurl" -> downloadHlsSource(context, "Audio", client, audioSource!!.getAudioUrl(), File(downloadDir, audioFileName!!), progressCallback) "application/vnd.apple.mpegurl" -> downloadHlsSource(context, "Audio", client, if (actualAudioSource is JSSource) actualAudioSource else null, audioSource!!.getAudioUrl(), File(downloadDir, audioFileName!!), progressCallback)
else -> downloadFileSource("Audio", client, if (actualAudioSource is JSSource) actualAudioSource else null, audioSource!!.getAudioUrl(), File(downloadDir, audioFileName!!), progressCallback) else -> downloadFileSource("Audio", client, if (actualAudioSource is JSSource) actualAudioSource else null, audioSource!!.getAudioUrl(), File(downloadDir, audioFileName!!), progressCallback)
} }
else if(actualAudioSource is JSDashManifestRawAudioSource) { else if(actualAudioSource is JSDashManifestRawAudioSource) {
@@ -585,15 +585,23 @@ class VideoDownload {
return cipher.doFinal(encryptedSegment) return cipher.doFinal(encryptedSegment)
} }
private suspend fun downloadHlsSource(context: Context, name: String, client: ManagedHttpClient, hlsUrl: String, targetFile: File, onProgress: (Long, Long, Long) -> Unit): Long { private suspend fun downloadHlsSource(context: Context, name: String, client: ManagedHttpClient, source: JSSource?, hlsUrl: String, targetFile: File, onProgress: (Long, Long, Long) -> Unit): Long {
if(targetFile.exists()) if(targetFile.exists())
targetFile.delete(); targetFile.delete();
var downloadedTotalLength = 0L var downloadedTotalLength = 0L
val modifier = if (source is JSSource && source.hasRequestModifier)
source.getRequestModifier();
else
null;
val segmentFiles = arrayListOf<File>() val segmentFiles = arrayListOf<File>()
try { try {
val response = client.get(hlsUrl) val modified = modifier?.modifyRequest(hlsUrl, mapOf());
val response = client.get(modified?.url ?: hlsUrl, modified?.headers?.toMutableMap() ?: mutableMapOf())
check(response.isOk) { "Failed to get variant playlist: ${response.code}" } check(response.isOk) { "Failed to get variant playlist: ${response.code}" }
val vpContent = response.body?.string() val vpContent = response.body?.string()
@@ -601,7 +609,8 @@ class VideoDownload {
val variantPlaylist = HLS.parseVariantPlaylist(vpContent, hlsUrl) val variantPlaylist = HLS.parseVariantPlaylist(vpContent, hlsUrl)
val decryptionInfo: DecryptionInfo? = if (variantPlaylist.decryptionInfo != null) { val decryptionInfo: DecryptionInfo? = if (variantPlaylist.decryptionInfo != null) {
val keyResponse = client.get(variantPlaylist.decryptionInfo.keyUrl) val modifiedDecryptionRequest = modifier?.modifyRequest(variantPlaylist.decryptionInfo.keyUrl, mapOf());
val keyResponse = client.get(modifiedDecryptionRequest?.url ?: variantPlaylist.decryptionInfo.keyUrl, modifiedDecryptionRequest?.headers?.toMutableMap() ?: mutableMapOf())
check(keyResponse.isOk) { "HLS request failed for decryption key: ${keyResponse.code}" } check(keyResponse.isOk) { "HLS request failed for decryption key: ${keyResponse.code}" }
DecryptionInfo(keyResponse.body!!.bytes(), variantPlaylist.decryptionInfo.iv?.hexStringToByteArray()) DecryptionInfo(keyResponse.body!!.bytes(), variantPlaylist.decryptionInfo.iv?.hexStringToByteArray())
} else { } else {
@@ -619,7 +628,7 @@ class VideoDownload {
try { try {
segmentFiles.add(segmentFile) segmentFiles.add(segmentFile)
val segmentLength = downloadSource_Sequential(client, null, outputStream, segment.uri, if (index == 0) null else decryptionInfo, index) { segmentLength, totalRead, lastSpeed -> val segmentLength = downloadSource_Sequential(client, modifier, outputStream, segment.uri, if (index == 0) null else decryptionInfo, index) { segmentLength, totalRead, lastSpeed ->
val averageSegmentLength = if (index == 0) segmentLength else downloadedTotalLength / index val averageSegmentLength = if (index == 0) segmentLength else downloadedTotalLength / index
val expectedTotalLength = averageSegmentLength * (variantPlaylist.segments.size - 1) + segmentLength val expectedTotalLength = averageSegmentLength * (variantPlaylist.segments.size - 1) + segmentLength
onProgress(expectedTotalLength, downloadedTotalLength + totalRead, lastSpeed) onProgress(expectedTotalLength, downloadedTotalLength + totalRead, lastSpeed)
@@ -720,6 +729,11 @@ class VideoDownload {
source.getRequestExecutor(); source.getRequestExecutor();
else else
null; null;
val modifier = if (source is JSSource && source.hasRequestModifier)
source.getRequestModifier();
else
null;
val speedTracker = SpeedTracker(1000); val speedTracker = SpeedTracker(1000);
Logger.i(TAG, "Download $name Dash, CueCount: " + foundCues.count().toString()); Logger.i(TAG, "Download $name Dash, CueCount: " + foundCues.count().toString());
@@ -731,12 +745,14 @@ class VideoDownload {
val t = cue.groupValues[1]; val t = cue.groupValues[1];
val d = cue.groupValues[2]; val d = cue.groupValues[2];
val url = foundTemplateUrl.replace("\$Number\$", (indexCounter).toString()); val url = foundTemplateUrl.replace("\$Number\$", (indexCounter).toString());
val modified = modifier?.modifyRequest(url, mapOf());
val data = if(executor != null) val data = if(executor != null)
executor.executeRequest("GET", url, null, mapOf()); executor.executeRequest("GET", modified?.url ?: url, null, modified?.headers ?: mapOf());
else { else {
val resp = client.get(url, mutableMapOf()); val resp = client.get(modified?.url ?: url, modified?.headers?.toMutableMap() ?: mutableMapOf());
if(!resp.isOk) if(!resp.isOk)
throw IllegalStateException("Dash request failed for index " + indexCounter.toString() + ", with code: " + resp.code.toString()); throw IllegalStateException("Dash request failed for index " + indexCounter.toString() + ", with code: " + resp.code.toString());
resp.body!!.bytes() resp.body!!.bytes()
@@ -796,7 +812,7 @@ class VideoDownload {
Logger.i(TAG, "Download $name ByteRange Parallel (${concurrency}): " + videoUrl); Logger.i(TAG, "Download $name ByteRange Parallel (${concurrency}): " + videoUrl);
sourceLength = head["content-length"]!!.toLong(); sourceLength = head["content-length"]!!.toLong();
onProgress(sourceLength, 0, 0); onProgress(sourceLength, 0, 0);
downloadSource_Ranges(name, client, fileStream, videoUrl, sourceLength, 1024*512, concurrency, onProgress); downloadSource_Ranges(name, client, modifier, fileStream, videoUrl, sourceLength, 1024*512, concurrency, onProgress);
} }
else { else {
Logger.i(TAG, "Download $name Sequential"); Logger.i(TAG, "Download $name Sequential");
@@ -1003,7 +1019,7 @@ class VideoDownload {
onProgress(sourceLength, totalRead, 0) onProgress(sourceLength, totalRead, 0)
return sourceLength return sourceLength
}*/ }*/
private fun downloadSource_Ranges(name: String, client: ManagedHttpClient, fileStream: FileOutputStream, url: String, sourceLength: Long, rangeSize: Int, concurrency: Int = 1, onProgress: (Long, Long, Long) -> Unit) { private fun downloadSource_Ranges(name: String, client: ManagedHttpClient, modifier: IRequestModifier?, fileStream: FileOutputStream, url: String, sourceLength: Long, rangeSize: Int, concurrency: Int = 1, onProgress: (Long, Long, Long) -> Unit) {
val progressRate: Int = 4096 * 5; val progressRate: Int = 4096 * 5;
var lastProgressCount: Int = 0; var lastProgressCount: Int = 0;
val speedRate: Int = 4096 * 5; val speedRate: Int = 4096 * 5;
@@ -1022,7 +1038,7 @@ class VideoDownload {
Logger.i(TAG, "Download ${name} Batch #${reqCount} [${concurrency}] (${lastSpeed.toHumanBytesSpeed()})"); Logger.i(TAG, "Download ${name} Batch #${reqCount} [${concurrency}] (${lastSpeed.toHumanBytesSpeed()})");
val byteRangeResults = requestByteRangeParallel(client, pool, url, sourceLength, concurrency, totalRead, val byteRangeResults = requestByteRangeParallel(client, pool, modifier, url, sourceLength, concurrency, totalRead,
rangeSize, 1024 * 64); rangeSize, 1024 * 64);
for(byteRange in byteRangeResults) { for(byteRange in byteRangeResults) {
@@ -1053,7 +1069,7 @@ class VideoDownload {
onProgress(sourceLength, totalRead, 0); onProgress(sourceLength, totalRead, 0);
} }
private fun requestByteRangeParallel(client: ManagedHttpClient, pool: ForkJoinPool, url: String, totalLength: Long, concurrency: Int, rangePosition: Long, rangeSize: Int, rangeVariance: Int = -1): List<Triple<ByteArray, Long, Long>> { private fun requestByteRangeParallel(client: ManagedHttpClient, pool: ForkJoinPool, modifier: IRequestModifier?, url: String, totalLength: Long, concurrency: Int, rangePosition: Long, rangeSize: Int, rangeVariance: Int = -1): List<Triple<ByteArray, Long, Long>> {
val tasks = mutableListOf<ForkJoinTask<Triple<ByteArray, Long, Long>>>(); val tasks = mutableListOf<ForkJoinTask<Triple<ByteArray, Long, Long>>>();
var readPosition = rangePosition; var readPosition = rangePosition;
for(i in 0 until concurrency) { for(i in 0 until concurrency) {
@@ -1067,21 +1083,25 @@ class VideoDownload {
else readPosition + toRead; else readPosition + toRead;
tasks.add(pool.submit<Triple<ByteArray, Long, Long>> { tasks.add(pool.submit<Triple<ByteArray, Long, Long>> {
return@submit requestByteRange(client, url, rangeStart, rangeEnd); return@submit requestByteRange(client, modifier, url, rangeStart, rangeEnd);
}); });
readPosition = rangeEnd + 1; readPosition = rangeEnd + 1;
} }
return tasks.map { it.get() }; return tasks.map { it.get() };
} }
private fun requestByteRange(client: ManagedHttpClient, url: String, rangeStart: Long, rangeEnd: Long): Triple<ByteArray, Long, Long> { private fun requestByteRange(client: ManagedHttpClient, modifier: IRequestModifier?, url: String, rangeStart: Long, rangeEnd: Long): Triple<ByteArray, Long, Long> {
var retryCount = 0 var retryCount = 0
var lastException: Throwable? = null var lastException: Throwable? = null;
val headers = mutableMapOf(Pair("Range", "bytes=${rangeStart}-${rangeEnd}"));
val modified = modifier?.modifyRequest(url, headers);
while (retryCount <= 3) { while (retryCount <= 3) {
try { try {
val toRead = rangeEnd - rangeStart; val toRead = rangeEnd - rangeStart;
val req = client.get(url, mutableMapOf(Pair("Range", "bytes=${rangeStart}-${rangeEnd}")));
val req = client.get(modified?.url ?: url, modified?.headers?.toMutableMap() ?: headers);
if (!req.isOk) { if (!req.isOk) {
val bodyString = req.body?.string() val bodyString = req.body?.string()
req.body?.close() req.body?.close()