expose media id in datasource (#14)

dhruv2295 · web-flow · commit ca1916a4083c · 2022-05-08T01:04:15.000+05:30
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
@@ -75,7 +75,7 @@ class DefaultThumbnailsEngine(
     ) {
         var actualLocalizedUs: Long = localizedUs
         override fun toString(): String {
-            return positionUs.toString()
+            return request.sourceId() + ":" + positionUs.toString()
         }
     }
 
@@ -91,6 +91,8 @@ class DefaultThumbnailsEngine(
 
         override fun getSeekThreshold() = source.seekThreshold
 
+        override fun mediaId() = source.mediaId()
+
         override fun isDrained(): Boolean {
             if (source.isDrained) {
                 source.seekTo(stubs.firstOrNull()?.positionUs ?: -1)
diff --git a/lib/src/main/java/com/otaliastudios/transcoder/source/UriDataSource.java b/lib/src/main/java/com/otaliastudios/transcoder/source/UriDataSource.java
@@ -32,4 +32,9 @@ protected void initializeExtractor(@NonNull MediaExtractor extractor) throws IOE
     protected void initializeRetriever(@NonNull MediaMetadataRetriever retriever) {
         retriever.setDataSource(context, uri);
     }
+
+    @Override
+    public String mediaId() {
+        return uri.toString();
+    }
 }
diff --git a/lib/src/main/java/com/otaliastudios/transcoder/thumbnail/ThumbnailRequest.kt b/lib/src/main/java/com/otaliastudios/transcoder/thumbnail/ThumbnailRequest.kt
@@ -4,6 +4,8 @@ interface ThumbnailRequest {
     fun locate(durationUs: Long): List<Long>
 
     fun threshold(): Long = 0
+
+    fun sourceId() : String = ""
     // Could make it so that if locate() is empty, accept is called for each frame (no seeking).
     // But this only makes sense if accept signature has more information (segment, ...), and
     // it should also have a way to say - we're done, stop transcoding.

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ class DefaultThumbnailsEngine(`
`75`	`75`	`) {`
`76`	`76`	`var actualLocalizedUs: Long = localizedUs`
`77`	`77`	`override fun toString(): String {`
`78`		`- return positionUs.toString()`
	`78`	`+ return request.sourceId() + ":" + positionUs.toString()`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
`@@ -91,6 +91,8 @@ class DefaultThumbnailsEngine(`
`91`	`91`
`92`	`92`	`override fun getSeekThreshold() = source.seekThreshold`
`93`	`93`
	`94`	`+ override fun mediaId() = source.mediaId()`
	`95`	`+`
`94`	`96`	`override fun isDrained(): Boolean {`
`95`	`97`	`if (source.isDrained) {`
`96`	`98`	`source.seekTo(stubs.firstOrNull()?.positionUs ?: -1)`
Original file line number	Diff line number	Diff line change
`@@ -32,4 +32,9 @@ protected void initializeExtractor(@NonNull MediaExtractor extractor) throws IOE`
`32`	`32`	`protected void initializeRetriever(@NonNull MediaMetadataRetriever retriever) {`
`33`	`33`	`retriever.setDataSource(context, uri);`
`34`	`34`	`}`
	`35`	`+`
	`36`	`+ @Override`
	`37`	`+ public String mediaId() {`
	`38`	`+ return uri.toString();`
	`39`	`+ }`
`35`	`40`	`}`