Skip to content

Move to a shared buffer to decrease alloc #2787

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
fire-light43 wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −4
Open

Move to a shared buffer to decrease alloc #2787

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 8 additions & 4 deletions app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,6 +804,7 @@ object VideoDownloadManager {
private suspend fun resolve(
startByte: Long,
endByte: Long?,
buffer: ByteArray,
callback: (suspend CoroutineScope.(LazyStreamDownloadResponse) -> Unit)
): Long = withContext(Dispatchers.IO) {
var currentByte: Long = startByte
Expand All @@ -822,7 +823,6 @@ object VideoDownloadManager {
)
val requestStream = request.body.byteStream()

val buffer = ByteArray(bufferSize)
var read: Int

try {
Expand Down Expand Up @@ -853,6 +853,7 @@ object VideoDownloadManager {
suspend fun resolveSafe(
index: Int,
retries: Int = 3,
buffer: ByteArray,
callback: (suspend CoroutineScope.(LazyStreamDownloadResponse) -> Unit)
): Boolean {
var start = chuckStartByte.getOrNull(index) ?: return false
Expand All @@ -861,7 +862,7 @@ object VideoDownloadManager {
for (i in 0 until retries) {
try {
// in case
start = resolve(start, end, callback)
start = resolve(start, end, buffer, callback)
// no end defined, so we don't care exactly where it ended
if (end == null) return true
// we have download more or exactly what we needed
Expand Down Expand Up @@ -1158,7 +1159,10 @@ object VideoDownloadManager {
}
}

// this will take up the first available job and resolve
// Reuse a download buffer to decrease unnecessary alloc
val buffer = ByteArray(items.bufferSize)

// This will take up the first available job and resolve
while (true) {
if (!isActive) return@launch

Expand Down Expand Up @@ -1188,7 +1192,7 @@ object VideoDownloadManager {

// in case something has gone wrong set to failed if the fail is not caused by
// user cancellation
if (!items.resolveSafe(index, callback = callback)) {
if (!items.resolveSafe(index, buffer = buffer, callback = callback)) {
fileMutex.withLock {
if (metadata.type != DownloadType.IsStopped) {
metadata.type = DownloadType.IsFailed
Expand Down