merge fixes

Author: NicolasHug

src/torchcodec/decoders/_core/VideoDecoder.cpp

@@ -1119,16 +1119,15 @@ VideoDecoder::BatchDecodedOutput VideoDecoder::getFramesDisplayedByTimestamps(
 
     auto it = std::lower_bound(
         stream.allFrames.begin(),
-        // See https://github.com/pytorch/torchcodec/pull/286 for why the `- 1`
-        // is needed.
-        stream.allFrames.end() - 1,
+        stream.allFrames.end(),
         framePts,
         [&stream](const FrameInfo& info, double framePts) {
           return ptsToSeconds(info.nextPts, stream.timeBase) <= framePts;
         });
     int64_t frameIndex = it - stream.allFrames.begin();
     frameIndices[i] = frameIndex;
   }
+
   return getFramesAtIndices(streamIndex, frameIndices);
 }
 

test/samplers/test_samplers.py

@@ -383,7 +383,6 @@ def test_random_sampler_randomness(sampler):
     # Assert the clip starts aren't sorted, to make sure we haven't messed up
     # the implementation. (This may fail if we're unlucky, but we hard-coded a
     # seed, so it will always pass.)
-    # clip_starts = [clip.pts_seconds.item() for clip in clips_1]
     clip_starts = clips_1.pts_seconds[:, 0].tolist()
     assert sorted(clip_starts) != clip_starts