Merge branch 'aeaenjfjanef' into nvdec-rework-frame-ordering

Author: NicolasHug

.github/workflows/build_ffmpeg.yaml

@@ -35,7 +35,7 @@ jobs:
     with:
       job-name: Build
       upload-artifact: ffmpeg-lgpl-linux_x86_64-${{ matrix.ffmpeg-version }}
-      repository: pytorch/torchcodec
+      repository: meta-pytorch/torchcodec
       script: |
         export FFMPEG_VERSION="${{ matrix.ffmpeg-version }}"
         export FFMPEG_ROOT="${PWD}/ffmpeg"
@@ -57,7 +57,7 @@ jobs:
     with:
       job-name: Build
       upload-artifact: ffmpeg-lgpl-macos-${{ matrix.ffmpeg-version }}
-      repository: pytorch/torchcodec
+      repository: meta-pytorch/torchcodec
       runner: macos-14-xlarge
       script: |
         export FFMPEG_VERSION="${{ matrix.ffmpeg-version }}"
@@ -80,7 +80,7 @@ jobs:
     with:
       job-name: Build
       upload-artifact: ffmpeg-lgpl-windows_x86_64-${{ matrix.ffmpeg-version }}
-      repository: pytorch/torchcodec
+      repository: meta-pytorch/torchcodec
       script: |
         export FFMPEG_VERSION="${{ matrix.ffmpeg-version }}"
         export FFMPEG_ROOT="${PWD}/ffmpeg"

.github/workflows/docs.yaml

@@ -33,7 +33,7 @@ jobs:
     name: Build and Upload wheel
     uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@main
     with:
-      repository: pytorch/torchcodec
+      repository: meta-pytorch/torchcodec
       ref: ""
       test-infra-repository: pytorch/test-infra
       test-infra-ref: main
@@ -70,7 +70,7 @@ jobs:
           echo python_version_without_periods=${python_version_without_periods} >> $GITHUB_ENV
       - uses: actions/download-artifact@v4
         with:
-          name: pytorch_torchcodec__${{ matrix.python-version }}_cu${{ env.cuda_version_without_periods }}_x86_64
+          name: meta-pytorch_torchcodec__${{ matrix.python-version }}_cu${{ env.cuda_version_without_periods }}_x86_64
           path: pytorch/torchcodec/dist/
       - name: Setup miniconda using test-infra
         uses: pytorch/test-infra/.github/actions/setup-miniconda@main

.github/workflows/linux_cuda_wheel.yaml

@@ -43,7 +43,7 @@ jobs:
     name: Build and Upload wheel
     uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@main
     with:
-      repository: pytorch/torchcodec
+      repository: meta-pytorch/torchcodec
       ref: ""
       test-infra-repository: pytorch/test-infra
       test-infra-ref: main
@@ -86,7 +86,7 @@ jobs:
           echo python_version_without_periods=${python_version_without_periods} >> $GITHUB_ENV
       - uses: actions/download-artifact@v4
         with:
-          name: pytorch_torchcodec__${{ matrix.python-version }}_cu${{ env.cuda_version_without_periods }}_x86_64
+          name: meta-pytorch_torchcodec__${{ matrix.python-version }}_cu${{ env.cuda_version_without_periods }}_x86_64
           path: pytorch/torchcodec/dist/
       - name: Setup miniconda using test-infra
         uses: pytorch/test-infra/.github/actions/setup-miniconda@main

.github/workflows/linux_wheel.yaml

@@ -44,7 +44,7 @@ jobs:
     name: Build and Upload Linux wheel
     uses: pytorch/test-infra/.github/workflows/build_wheels_linux.yml@main
     with:
-      repository: pytorch/torchcodec
+      repository: meta-pytorch/torchcodec
       ref: ""
       test-infra-repository: pytorch/test-infra
       test-infra-ref: main
@@ -68,7 +68,7 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: pytorch_torchcodec__${{ matrix.python-version }}_cpu_x86_64
+          name: meta-pytorch_torchcodec__${{ matrix.python-version }}_cpu_x86_64
           path: pytorch/torchcodec/dist/
       - name: Setup conda env
         uses: conda-incubator/setup-miniconda@v2

.github/workflows/macos_wheel.yaml

@@ -44,7 +44,7 @@ jobs:
     name: Build and Upload Mac wheel
     uses: pytorch/test-infra/.github/workflows/build_wheels_macos.yml@main
     with:
-      repository: pytorch/torchcodec
+      repository: meta-pytorch/torchcodec
       ref: ""
       test-infra-repository: pytorch/test-infra
       test-infra-ref: main
@@ -71,7 +71,7 @@ jobs:
       - name: Download wheel
         uses: actions/download-artifact@v4
         with:
-          name: pytorch_torchcodec__${{ matrix.python-version }}_cpu_
+          name: meta-pytorch_torchcodec__${{ matrix.python-version }}_cpu_
           path: pytorch/torchcodec/dist/
 
       - name: Setup conda env

.github/workflows/windows_wheel.yaml

@@ -46,7 +46,7 @@ jobs:
     name: Build and Upload Windows wheel
     uses: pytorch/test-infra/.github/workflows/build_wheels_windows.yml@main
     with:
-      repository: pytorch/torchcodec
+      repository: meta-pytorch/torchcodec
       ref: ""
       test-infra-repository: pytorch/test-infra
       test-infra-ref: main
@@ -76,7 +76,7 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: pytorch_torchcodec__${{ matrix.python-version }}_cpu_x64
+          name: meta-pytorch_torchcodec__${{ matrix.python-version }}_cpu_x64
           path: pytorch/torchcodec/dist/
       - name: Setup conda env
         uses: conda-incubator/setup-miniconda@v2

src/torchcodec/_samplers/video_clip_sampler.py

@@ -105,25 +105,12 @@ class IndexBasedSamplerArgs(SamplerArgs):
     sample_step: int = 1
 
 
-class VideoClipSampler(nn.Module):
+class DEPRECATED_VideoClipSampler(nn.Module):
     """
-    VideoClipSampler will do video clip sampling with given video args and sampler args.
-    The video args contains video related information, frames_per_clip, dimensions etc.
-    The sampler args can be either time-based or index-based, it will be used to decide clip start time pts or index.
-    ClipSampling support, random, uniform, periodic, target, keyframe sampling etc.
+    DEPRECATED: Do not use. The supported samplers are in `torchcodec.samplers`. See:
 
-    Args:
-        video_args (`VideoArgs`): The video args
-        sampler_args (`SamplerArgs`): The sampler args. Can be TimeBasedSamplerArgs or IndexBasedSamplerArgs
-        decoder_args (`DecoderArgs`): Decoder args contain value needs for decoder, for example, thread count
-
-    Example:
-        >>> video_args = VideoArgs(desired_width=224, desired_height=224)
-        >>> time_based_sampler_args = TimeBasedSamplerArgs(sampler_type="random", clips_per_video=1, frames_per_clip=4)
-        >>> video_decoder_args = DecoderArgs(num_threads=1)
-        >>> video_clip_sampler = VideoClipSampler(video_args, time_based_sampler_args, decoder_args)
-        >>> clips = video_clip_sampler(video_data)
-        clips now contains a list of clip, where clip is a list of frame tensors, each tensor represents a frame image.
+      * https://docs.pytorch.org/torchcodec/stable/api_ref_torchcodec.html
+      * https://docs.pytorch.org/torchcodec/stable/generated_examples/decoding/sampling.html
     """
 
     def __init__(

test/test_decoders.py

@@ -1402,6 +1402,16 @@ def test_get_frames_at_tensor_indices(self):
         decoder.get_frames_played_at(torch.tensor([0, 1], dtype=torch.int))
         decoder.get_frames_played_at(torch.tensor([0, 1], dtype=torch.float))
 
+    # TODONVDEC P1 unskip equality assertion checks on FFMpeg4. The comparison
+    # checks are failing on very few pixels, e.g.:
+    #
+    # E   Mismatched elements: 648586 / 82944000 (0.8%)
+    # E   Greatest absolute difference: 164 at index (20, 2, 27, 96)
+    # E   Greatest relative difference: inf at index (5, 1, 112, 186)
+    #
+    # So we're skipping them to unblock for now, but we should call
+    # assert_tensor_close_on_at_least or something like that.
+
     @needs_cuda
     @pytest.mark.parametrize("asset", (NASA_VIDEO, TEST_SRC_2_720P, BT709_FULL_RANGE))
     @pytest.mark.parametrize("contiguous_indices", (True, False))
@@ -1424,7 +1434,10 @@ def test_beta_cuda_interface_get_frame_at(
         for frame_index in indices:
             ref_frame = ref_decoder.get_frame_at(frame_index)
             beta_frame = beta_decoder.get_frame_at(frame_index)
-            torch.testing.assert_close(beta_frame.data, ref_frame.data, rtol=0, atol=0)
+            if get_ffmpeg_major_version() > 4:  # TODONVDEC P1 see above
+                torch.testing.assert_close(
+                    beta_frame.data, ref_frame.data, rtol=0, atol=0
+                )
 
             assert beta_frame.pts_seconds == ref_frame.pts_seconds
             assert beta_frame.duration_seconds == ref_frame.duration_seconds
@@ -1451,7 +1464,10 @@ def test_beta_cuda_interface_get_frames_at(
 
         ref_frames = ref_decoder.get_frames_at(indices)
         beta_frames = beta_decoder.get_frames_at(indices)
-        torch.testing.assert_close(beta_frames.data, ref_frames.data, rtol=0, atol=0)
+        if get_ffmpeg_major_version() > 4:  # TODONVDEC P1 see above
+            torch.testing.assert_close(
+                beta_frames.data, ref_frames.data, rtol=0, atol=0
+            )
         torch.testing.assert_close(beta_frames.pts_seconds, ref_frames.pts_seconds)
         torch.testing.assert_close(
             beta_frames.duration_seconds, ref_frames.duration_seconds

test/test_video_clip_sampler.py

@@ -4,10 +4,10 @@
 import pytest
 import torch
 from torchcodec._samplers import (
+    DEPRECATED_VideoClipSampler,
     IndexBasedSamplerArgs,
     TimeBasedSamplerArgs,
     VideoArgs,
-    VideoClipSampler,
 )
 
 from .utils import NASA_VIDEO
@@ -34,7 +34,7 @@ def test_sampler(sampler_args):
     torch.manual_seed(0)
     desired_width, desired_height = 320, 240
     video_args = VideoArgs(desired_width=desired_width, desired_height=desired_height)
-    sampler = VideoClipSampler(video_args, sampler_args)
+    sampler = DEPRECATED_VideoClipSampler(video_args, sampler_args)
     clips = sampler(NASA_VIDEO.to_tensor())
     assert len(clips) == sampler_args.clips_per_video
     clip = clips[0]