Fixes a potential issue for videos that don't have an actual audio / …

…image stream. Signed-off-by: Ralph Gasser <[email protected]>
vitrivr · Jun 12, 2024 · 8f5d577 · 8f5d577
1 parent 7ff2253
commit 8f5d577
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/vitrivr-engine-index/src/main/kotlin/org/vitrivr/engine/index/decode/VideoDecoder.kt b/vitrivr-engine-index/src/main/kotlin/org/vitrivr/engine/index/decode/VideoDecoder.kt
@@ -132,23 +132,27 @@ class VideoDecoder : DecoderFactory {
                 val audioBuffer = LinkedList<Pair<ShortBuffer, Long>>()
 
                 /* Flags indicating that video / audio is ready to be emitted. */
-                var videoReady = !this@Instance.video
-                var audioReady = !this@Instance.audio
+                var videoReady = !(grabber.hasVideo() && this@Instance.video)
+                var audioReady = !(grabber.hasAudio() && this@Instance.audio)
 
                 do {
                     val frame = grabber.grabFrame(this@Instance.audio, this@Instance.video, true, this@Instance.keyFrames, true) ?: break
                     when (frame.type) {
                         Frame.Type.VIDEO -> {
                             imageBuffer.add(Java2DFrameConverter().use { it.convert(frame) to frame.timestamp })
-                            if (frame.timestamp > windowEnd) videoReady = true
+                            if (frame.timestamp > windowEnd) {
+                                videoReady = true
+                            }
                         }
 
                         Frame.Type.AUDIO -> {
                             val samples = frame.samples.firstOrNull() as? ShortBuffer
                             if (samples != null) {
                                 audioBuffer.add(ShortBuffer.allocate(samples.limit()).put(samples) to frame.timestamp)
                             }
-                            if (frame.timestamp > windowEnd) audioReady = true
+                            if (frame.timestamp > windowEnd) {
+                                audioReady = true
+                            }
                         }
 
                         else -> { /* No op. */
@@ -160,8 +164,8 @@ class VideoDecoder : DecoderFactory {
                         emit(imageBuffer, audioBuffer, grabber, windowEnd, sourceRetrievable, channel)
 
                         /* Reset counters and flags. */
-                        videoReady = !this@Instance.video
-                        audioReady = !this@Instance.audio
+                        videoReady = !(grabber.hasVideo() && this@Instance.video)
+                        audioReady = !(grabber.hasAudio() && this@Instance.audio)
 
                         /* Update window end. */
                         windowEnd += TimeUnit.MILLISECONDS.toMicros(this@Instance.timeWindowMs)