From 8bafd6ff7d8907ab60e3f11c59f860829b0e10c8 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 13 Dec 2019 20:29:54 +0000
Subject: [PATCH] Fix FLAC seeking when the last seek point is a placeholder

PiperOrigin-RevId: 285449865
---
 extensions/flac/src/main/jni/flac_parser.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/extensions/flac/src/main/jni/flac_parser.cc b/extensions/flac/src/main/jni/flac_parser.cc
index b920560f3a..f39e4bd1f7 100644
--- a/extensions/flac/src/main/jni/flac_parser.cc
+++ b/extensions/flac/src/main/jni/flac_parser.cc
@@ -462,8 +462,9 @@ bool FLACParser::getSeekPositions(int64_t timeUs,
     if (sampleNumber <= targetSampleNumber) {
       result[0] = (sampleNumber * 1000000LL) / sampleRate;
       result[1] = firstFrameOffset + points[i - 1].stream_offset;
-      if (sampleNumber == targetSampleNumber || i >= length) {
-        // exact seek, or no following seek point.
+      if (sampleNumber == targetSampleNumber || i >= length ||
+          points[i].sample_number == -1) {  // placeholder
+        // exact seek, or no following non-placeholder seek point
         result[2] = result[0];
         result[3] = result[1];
       } else {