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

Author: NicolasHug

.clang-format

@@ -83,6 +83,7 @@ PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 200
 PointerAlignment: Left
 ReflowComments: true
+SeparateDefinitionBlocks: Always
 SortIncludes: true
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: false

benchmarks/decoders/BenchmarkDecodersMain.cpp

@@ -17,8 +17,7 @@ namespace facebook::torchcodec {
 void convertAVFrameToFrameOutputOnCuda(
     const torch::Device& device,
     [[maybe_unused]] const VideoDecoder::VideoStreamOptions& videoStreamOptions,
-    [[maybe_unused]] VideoDecoder::AVFrameWithStreamIndex&
-        avFrameWithStreamIndex,
+    [[maybe_unused]] VideoDecoder::AVFrameStream& avFrameStream,
     [[maybe_unused]] VideoDecoder::FrameOutput& frameOutput,
     [[maybe_unused]] std::optional<torch::Tensor> preAllocatedOutputTensor) {
   throwUnsupportedDeviceError(device);

src/torchcodec/decoders/_core/CPUOnlyDevice.cpp

@@ -186,10 +186,10 @@ void initializeContextOnCuda(
 void convertAVFrameToFrameOutputOnCuda(
     const torch::Device& device,
     const VideoDecoder::VideoStreamOptions& videoStreamOptions,
-    VideoDecoder::AVFrameWithStreamIndex& avFrameWithStreamIndex,
+    VideoDecoder::AVFrameStream& avFrameStream,
     VideoDecoder::FrameOutput& frameOutput,
     std::optional<torch::Tensor> preAllocatedOutputTensor) {
-  AVFrame* avFrame = avFrameWithStreamIndex.avFrame.get();
+  AVFrame* avFrame = avFrameStream.avFrame.get();
 
   TORCH_CHECK(
       avFrame->format == AV_PIX_FMT_CUDA,

src/torchcodec/decoders/_core/CudaDevice.cpp

@@ -32,7 +32,7 @@ void initializeContextOnCuda(
 void convertAVFrameToFrameOutputOnCuda(
     const torch::Device& device,
     const VideoDecoder::VideoStreamOptions& videoStreamOptions,
-    VideoDecoder::AVFrameWithStreamIndex& avFrameWithStreamIndex,
+    VideoDecoder::AVFrameStream& avFrameStream,
     VideoDecoder::FrameOutput& frameOutput,
     std::optional<torch::Tensor> preAllocatedOutputTensor = std::nullopt);
 

src/torchcodec/decoders/_core/DeviceInterface.h

@@ -13,18 +13,22 @@ namespace facebook::torchcodec {
 AutoAVPacket::AutoAVPacket() : avPacket_(av_packet_alloc()) {
   TORCH_CHECK(avPacket_ != nullptr, "Couldn't allocate avPacket.");
 }
+
 AutoAVPacket::~AutoAVPacket() {
   av_packet_free(&avPacket_);
 }
 
 ReferenceAVPacket::ReferenceAVPacket(AutoAVPacket& shared)
     : avPacket_(shared.avPacket_) {}
+
 ReferenceAVPacket::~ReferenceAVPacket() {
   av_packet_unref(avPacket_);
 }
+
 AVPacket* ReferenceAVPacket::get() {
   return avPacket_;
 }
+
 AVPacket* ReferenceAVPacket::operator->() {
   return avPacket_;
 }