Skip to content

Feature/remove queued fix and destroy segment #19

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

Merged
merged 2 commits into from
May 23, 2022
Merged

Feature/remove queued fix and destroy segment #19

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
7284044
fixes removing all queued ts logic, adds destroy segment with id
May 20, 2022
eee17b4
clear stubs on cleanup
dhruv2295 May 23, 2022
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: 12 additions & 0 deletions lib/src/main/java/com/otaliastudios/transcoder/internal/CustomSegments.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,18 @@ class CustomSegments(
}
}

fun releaseSegment(id: String) {
val segment = segmentMap[id]
segment?.let {
it.release()
val source = sources[it.type][it.index]
if (tracks.active.has(it.type)) {
source.releaseTrack(it.type)
}
segmentMap[id] = null
}
}

fun release() = destroySegment(true)

private fun tryCreateSegment(id: String): Segment? {
Expand Down
7 changes: 7 additions & 0 deletions ...src/main/java/com/otaliastudios/transcoder/internal/thumbnails/DefaultThumbnailsEngine.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ class DefaultThumbnailsEngine(
}

override fun removeDataSource(dataSourceId: String) {
segments.releaseSegment(dataSourceId)
dataSources.removeVideoDataSource(dataSourceId)
tracks.updateTracksInfo()
}
Expand Down Expand Up @@ -285,6 +286,11 @@ class DefaultThumbnailsEngine(
}

override suspend fun removePosition(source: String, positionUs: Long) {
if (positionUs < 0) {
stubs.removeAll{
it.request.sourceId() == source
}
}
if (stubs.firstOrNull()?.request?.sourceId() == source && positionUs == stubs.firstOrNull()?.positionUs) {
return
}
Expand Down Expand Up @@ -320,6 +326,7 @@ class DefaultThumbnailsEngine(
}

override fun cleanup() {
runCatching { stubs.clear() }
runCatching { segments.release() }
runCatching { dataSources.release() }
}
Expand Down