Fix name endStreamSecondsFromContent

Author: Dan-Flores

src/torchcodec/_core/Metadata.h

@@ -38,7 +38,7 @@ struct StreamMetadata {
   std::optional<int64_t> maxPtsFromScan;
   // These presentation timestamps are in seconds.
   std::optional<double> beginStreamSecondsFromContent;
-  std::optional<double> endStreamFromContentSeconds;
+  std::optional<double> endStreamSecondsFromContent;
   // This can be useful for index-based seeking.
   std::optional<int64_t> numFramesFromContent;
 

src/torchcodec/_core/SingleStreamDecoder.cpp

@@ -270,7 +270,7 @@ void SingleStreamDecoder::scanFileAndUpdateMetadataAndIndex() {
           *streamMetadata.minPtsFromScan * av_q2d(avStream->time_base);
     }
     if (streamMetadata.maxPtsFromScan.has_value()) {
-      streamMetadata.endStreamFromContentSeconds =
+      streamMetadata.endStreamSecondsFromContent =
           *streamMetadata.maxPtsFromScan * av_q2d(avStream->time_base);
     }
   }
@@ -1489,7 +1489,7 @@ double SingleStreamDecoder::getMaxSeconds(
     const StreamMetadata& streamMetadata) {
   switch (seekMode_) {
     case SeekMode::exact:
-      return streamMetadata.endStreamFromContentSeconds.value();
+      return streamMetadata.endStreamSecondsFromContent.value();
     case SeekMode::approximate: {
       TORCH_CHECK(
           streamMetadata.durationSecondsFromHeader.has_value(),

src/torchcodec/_core/_metadata.py

@@ -240,7 +240,7 @@ def get_container_metadata(decoder: torch.Tensor) -> ContainerMetadata:
                         "beginStreamSecondsFromContent"
                     ),
                     end_stream_seconds_from_content=stream_dict.get(
-                        "endStreamFromContentSeconds"
+                        "endStreamSecondsFromContent"
                     ),
                     width=stream_dict.get("width"),
                     height=stream_dict.get("height"),

src/torchcodec/_core/custom_ops.cpp

@@ -489,9 +489,9 @@ std::string get_json_metadata(at::Tensor& decoder) {
       metadataMap["beginStreamSecondsFromContent"] =
           std::to_string(*streamMetadata.beginStreamSecondsFromContent);
     }
-    if (streamMetadata.endStreamFromContentSeconds.has_value()) {
-      metadataMap["endStreamFromContentSeconds"] =
-          std::to_string(*streamMetadata.endStreamFromContentSeconds);
+    if (streamMetadata.endStreamSecondsFromContent.has_value()) {
+      metadataMap["endStreamSecondsFromContent"] =
+          std::to_string(*streamMetadata.endStreamSecondsFromContent);
     }
     if (streamMetadata.codecName.has_value()) {
       metadataMap["codec"] = quoteValue(streamMetadata.codecName.value());
@@ -590,9 +590,9 @@ std::string get_stream_json_metadata(
     map["beginStreamSecondsFromContent"] =
         std::to_string(*streamMetadata.beginStreamSecondsFromContent);
   }
-  if (streamMetadata.endStreamFromContentSeconds.has_value()) {
-    map["endStreamFromContentSeconds"] =
-        std::to_string(*streamMetadata.endStreamFromContentSeconds);
+  if (streamMetadata.endStreamSecondsFromContent.has_value()) {
+    map["endStreamSecondsFromContent"] =
+        std::to_string(*streamMetadata.endStreamSecondsFromContent);
   }
   if (streamMetadata.codecName.has_value()) {
     map["codec"] = quoteValue(streamMetadata.codecName.value());

src/torchcodec/_samplers/video_clip_sampler.py

@@ -276,13 +276,13 @@ def _get_start_seconds(
             if metadata_json["beginStreamSecondsFromContent"]
             else 0
         )
-        endStreamFromContentSeconds = (
-            metadata_json["endStreamFromContentSeconds"]
-            if metadata_json["endStreamFromContentSeconds"] > 0
+        endStreamSecondsFromContent = (
+            metadata_json["endStreamSecondsFromContent"]
+            if metadata_json["endStreamSecondsFromContent"] > 0
             else video_duration_in_seconds
         )
         last_possible_clip_start_in_seconds = (
-            endStreamFromContentSeconds - clip_duration_in_seconds
+            endStreamSecondsFromContent - clip_duration_in_seconds
         )
         if last_possible_clip_start_in_seconds < 0:
             raise VideoTooShortException(

test/VideoDecoderTest.cpp

@@ -85,13 +85,13 @@ TEST_P(SingleStreamDecoderTest, ReturnsFpsAndDurationForVideoInMetadata) {
   EXPECT_NEAR(*videoStream.durationSeconds, 13.013, 1e-1);
   EXPECT_EQ(videoStream.numFrames, 390);
   EXPECT_FALSE(videoStream.beginStreamSecondsFromContent.has_value());
-  EXPECT_FALSE(videoStream.endStreamFromContentSeconds.has_value());
+  EXPECT_FALSE(videoStream.endStreamSecondsFromContent.has_value());
   EXPECT_FALSE(videoStream.numFramesFromContent.has_value());
   decoder->scanFileAndUpdateMetadataAndIndex();
   metadata = decoder->getContainerMetadata();
   const auto& videoStream1 = metadata.allStreamMetadata[3];
   EXPECT_EQ(*videoStream1.beginStreamSecondsFromContent, 0);
-  EXPECT_EQ(*videoStream1.endStreamFromContentSeconds, 13.013);
+  EXPECT_EQ(*videoStream1.endStreamSecondsFromContent, 13.013);
   EXPECT_EQ(*videoStream1.numFramesFromContent, 390);
 }
 

test/test_ops.py

@@ -415,7 +415,7 @@ def test_video_get_json_metadata_with_stream(self):
         assert metadata_dict["width"] == 480
         assert metadata_dict["height"] == 270
         assert metadata_dict["beginStreamSecondsFromContent"] == 0
-        assert metadata_dict["endStreamFromContentSeconds"] == 13.013
+        assert metadata_dict["endStreamSecondsFromContent"] == 13.013
 
     def test_get_ffmpeg_version(self):
         ffmpeg_dict = get_ffmpeg_library_versions()