Feature/remove queued fix and destroy segment (#19)

dhruv2295 · Akshar Bhatnagar · web-flow · commit 92f72f64c316 · 2022-05-23T15:38:36.000+05:30
* fixes removing all queued ts logic, adds destroy segment with id

* clear stubs on cleanup

Co-authored-by: Akshar Bhatnagar &lt;akshar@Akshars-MacBook-Pro.local&gt;
diff --git a/lib/src/main/java/com/otaliastudios/transcoder/internal/CustomSegments.kt b/lib/src/main/java/com/otaliastudios/transcoder/internal/CustomSegments.kt
@@ -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? {
diff --git a/lib/src/main/java/com/otaliastudios/transcoder/internal/thumbnails/DefaultThumbnailsEngine.kt b/lib/src/main/java/com/otaliastudios/transcoder/internal/thumbnails/DefaultThumbnailsEngine.kt
@@ -233,6 +233,7 @@ class DefaultThumbnailsEngine(
     }
 
     override fun removeDataSource(dataSourceId: String) {
+        segments.releaseSegment(dataSourceId)
         dataSources.removeVideoDataSource(dataSourceId)
         tracks.updateTracksInfo()
     }
@@ -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
         }
@@ -320,6 +326,7 @@ class DefaultThumbnailsEngine(
     }
 
     override fun cleanup() {
+        runCatching { stubs.clear() }
         runCatching { segments.release() }
         runCatching { dataSources.release() }
     }

Original file line number	Diff line number	Diff line change
`@@ -233,6 +233,7 @@ class DefaultThumbnailsEngine(`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`override fun removeDataSource(dataSourceId: String) {`
	`236`	`+ segments.releaseSegment(dataSourceId)`
`236`	`237`	`dataSources.removeVideoDataSource(dataSourceId)`
`237`	`238`	`tracks.updateTracksInfo()`
`238`	`239`	`}`
`@@ -285,6 +286,11 @@ class DefaultThumbnailsEngine(`
`285`	`286`	`}`
`286`	`287`
`287`	`288`	`override suspend fun removePosition(source: String, positionUs: Long) {`
	`289`	`+ if (positionUs < 0) {`
	`290`	`+ stubs.removeAll{`
	`291`	`+ it.request.sourceId() == source`
	`292`	`+ }`
	`293`	`+ }`
`288`	`294`	`if (stubs.firstOrNull()?.request?.sourceId() == source && positionUs == stubs.firstOrNull()?.positionUs) {`
`289`	`295`	`return`
`290`	`296`	`}`
`@@ -320,6 +326,7 @@ class DefaultThumbnailsEngine(`
`320`	`326`	`}`
`321`	`327`
`322`	`328`	`override fun cleanup() {`
	`329`	`+ runCatching { stubs.clear() }`
`323`	`330`	`runCatching { segments.release() }`
`324`	`331`	`runCatching { dataSources.release() }`
`325`	`332`	`}`