Skip to content

Commit 7111150

Browse files
committed
update: rename id to item to prevent issues with overriden BtachProcessor parameter item in onProcess method
1 parent 01b6c59 commit 7111150

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

extensions/src/main/java/com/fpf/smartscansdk/extensions/indexers/ImageIndexer.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ class ImageIndexer(
3636
store.add(batch)
3737
}
3838

39-
override suspend fun onProcess(context: Context, id: Long): Embedding {
39+
override suspend fun onProcess(context: Context, item: Long): Embedding {
4040
val contentUri = ContentUris.withAppendedId(
41-
MediaStore.Images.Media.EXTERNAL_CONTENT_URI, id
41+
MediaStore.Images.Media.EXTERNAL_CONTENT_URI, item
4242
)
4343
val bitmap = getBitmapFromUri(context, contentUri, ClipConfig.IMAGE_SIZE_X)
4444
val embedding = withContext(NonCancellable) {
4545
embedder.embed(bitmap)
4646
}
4747
return Embedding(
48-
id = id,
48+
id = item,
4949
date = System.currentTimeMillis(),
5050
embeddings = embedding
5151
)

extensions/src/main/java/com/fpf/smartscansdk/extensions/indexers/VideoIndexer.kt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import android.content.Context
66
import android.provider.MediaStore
77
import com.fpf.smartscansdk.core.ml.embeddings.Embedding
88
import com.fpf.smartscansdk.core.ml.embeddings.IEmbeddingStore
9-
import com.fpf.smartscansdk.core.ml.embeddings.clip.ClipConfig.CLIP_EMBEDDING_LENGTH
109
import com.fpf.smartscansdk.core.ml.embeddings.clip.ClipConfig.IMAGE_SIZE_X
1110
import com.fpf.smartscansdk.core.ml.embeddings.clip.ClipConfig.IMAGE_SIZE_Y
1211
import com.fpf.smartscansdk.core.ml.embeddings.clip.ClipImageEmbedder
@@ -15,7 +14,6 @@ import com.fpf.smartscansdk.core.processors.BatchProcessor
1514
import com.fpf.smartscansdk.core.processors.IProcessorListener
1615
import com.fpf.smartscansdk.core.processors.ProcessOptions
1716
import com.fpf.smartscansdk.core.utils.extractFramesFromVideo
18-
import com.fpf.smartscansdk.extensions.embeddings.FileEmbeddingStore
1917

2018
// ** Design Constraint**: For on-device vector search, the full index needs to be loaded in-memory (or make an Android native VectorDB)
2119
// File-based EmbeddingStore is used over a Room version due to significant faster index loading
@@ -42,9 +40,9 @@ class VideoIndexer(
4240
store.add(batch)
4341
}
4442

45-
override suspend fun onProcess(context: Context, id: Long): Embedding {
43+
override suspend fun onProcess(context: Context, item: Long): Embedding {
4644
val contentUri = ContentUris.withAppendedId(
47-
MediaStore.Video.Media.EXTERNAL_CONTENT_URI, id
45+
MediaStore.Video.Media.EXTERNAL_CONTENT_URI, item
4846
)
4947
val frameBitmaps = extractFramesFromVideo(context, contentUri, width = width, height = height, frameCount = frameCount)
5048

@@ -54,7 +52,7 @@ class VideoIndexer(
5452
val embedding: FloatArray = generatePrototypeEmbedding(rawEmbeddings)
5553

5654
return Embedding(
57-
id = id,
55+
id = item,
5856
date = System.currentTimeMillis(),
5957
embeddings = embedding
6058
)

0 commit comments

Comments
 (0)