Merge branch 'main' of github.com:pytorch/torchcodec into renamingzzzz

Author: NicolasHug

src/torchcodec/decoders/_core/CPUOnlyDevice.cpp

@@ -35,7 +35,7 @@ void releaseContextOnCuda(
   throwUnsupportedDeviceError(device);
 }
 
-std::optional<AVCodecPtr> findCudaCodec(
+std::optional<const AVCodec*> findCudaCodec(
     const torch::Device& device,
     [[maybe_unused]] const AVCodecID& codecId) {
   throwUnsupportedDeviceError(device);

src/torchcodec/decoders/_core/DeviceInterface.h

@@ -40,7 +40,7 @@ void releaseContextOnCuda(
     const torch::Device& device,
     AVCodecContext* codecContext);
 
-std::optional<AVCodecPtr> findCudaCodec(
+std::optional<const AVCodec*> findCudaCodec(
     const torch::Device& device,
     const AVCodecID& codecId);
 

src/torchcodec/decoders/_core/FFMPEGCommon.cpp

@@ -10,6 +10,15 @@
 
 namespace facebook::torchcodec {
 
+AVCodecOnlyUseForCallingAVFindBestStream
+makeAVCodecOnlyUseForCallingAVFindBestStream(const AVCodec* codec) {
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 18, 100)
+  return const_cast<AVCodec*>(codec);
+#else
+  return codec;
+#endif
+}
+
 std::string getFFMPEGErrorStringFromErrorCode(int errorCode) {
   char errorBuffer[AV_ERROR_MAX_STRING_SIZE] = {0};
   av_strerror(errorCode, errorBuffer, AV_ERROR_MAX_STRING_SIZE);

src/torchcodec/decoders/_core/FFMPEGCommon.h

@@ -75,12 +75,17 @@ using UniqueSwsContext =
 // which was released in FFMPEG version=5.0.3
 // with libavcodec's version=59.18.100
 // (https://www.ffmpeg.org/olddownload.html).
+// Note that the alias is so-named so that it is only used when interacting with
+// av_find_best_stream(). It is not needed elsewhere.
 #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 18, 100)
-using AVCodecPtr = AVCodec*;
+using AVCodecOnlyUseForCallingAVFindBestStream = AVCodec*;
 #else
-using AVCodecPtr = const AVCodec*;
+using AVCodecOnlyUseForCallingAVFindBestStream = const AVCodec*;
 #endif
 
+AVCodecOnlyUseForCallingAVFindBestStream
+makeAVCodecOnlyUseForCallingAVFindBestStream(const AVCodec* codec);
+
 // Success code from FFMPEG is just a 0. We define it to make the code more
 // readable.
 const int AVSUCCESS = 0;

src/torchcodec/decoders/_core/VideoDecoder.cpp

@@ -439,9 +439,9 @@ void VideoDecoder::createFilterGraph(
 }
 
 int VideoDecoder::getBestStreamIndex(AVMediaType mediaType) {
-  AVCodecPtr codec = nullptr;
+  AVCodecOnlyUseForCallingAVFindBestStream avCodec = nullptr;
   int streamIndex =
-      av_find_best_stream(formatContext_.get(), mediaType, -1, -1, &codec, 0);
+      av_find_best_stream(formatContext_.get(), mediaType, -1, -1, &avCodec, 0);
   return streamIndex;
 }
 
@@ -455,18 +455,18 @@ void VideoDecoder::addVideoStreamDecoder(
   }
   TORCH_CHECK(formatContext_.get() != nullptr);
 
-  AVCodecPtr codec = nullptr;
+  AVCodecOnlyUseForCallingAVFindBestStream avCodec = nullptr;
   int streamIndex = av_find_best_stream(
       formatContext_.get(),
       AVMEDIA_TYPE_VIDEO,
       preferredStreamIndex,
       -1,
-      &codec,
+      &avCodec,
       0);
   if (streamIndex < 0) {
     throw std::invalid_argument("No valid stream found in input file.");
   }
-  TORCH_CHECK(codec != nullptr);
+  TORCH_CHECK(avCodec != nullptr);
 
   StreamMetadata& streamMetadata =
       containerMetadata_.streamMetadatas[streamIndex];
@@ -489,13 +489,13 @@ void VideoDecoder::addVideoStreamDecoder(
   }
 
   if (videoStreamOptions.device.type() == torch::kCUDA) {
-    codec =
+    avCodec = makeAVCodecOnlyUseForCallingAVFindBestStream(
         findCudaCodec(
             videoStreamOptions.device, streamInfo.stream->codecpar->codec_id)
-            .value_or(codec);
+            .value_or(avCodec));
   }
 
-  AVCodecContext* codecContext = avcodec_alloc_context3(codec);
+  AVCodecContext* codecContext = avcodec_alloc_context3(avCodec);
   TORCH_CHECK(codecContext != nullptr);
   codecContext->thread_count = videoStreamOptions.ffmpegThreadCount.value_or(0);
   streamInfo.codecContext.reset(codecContext);
@@ -513,7 +513,7 @@ void VideoDecoder::addVideoStreamDecoder(
         false, "Invalid device type: " + videoStreamOptions.device.str());
   }
 
-  retVal = avcodec_open2(streamInfo.codecContext.get(), codec, nullptr);
+  retVal = avcodec_open2(streamInfo.codecContext.get(), avCodec, nullptr);
   if (retVal < AVSUCCESS) {
     throw std::invalid_argument(getFFMPEGErrorStringFromErrorCode(retVal));
   }

test/decoders/test_video_decoder.py

@@ -428,6 +428,9 @@ def test_get_frames_at_fails(self, device, seek_mode):
 
     @pytest.mark.parametrize("device", cpu_and_cuda())
     def test_get_frame_at_av1(self, device):
+        if in_fbcode() and device == "cuda":
+            return
+
         decoder = VideoDecoder(AV1_VIDEO.path, device=device)
         ref_frame10 = AV1_VIDEO.get_frame_data_by_index(10)
         ref_frame_info10 = AV1_VIDEO.get_frame_info(10)