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

Author: NicolasHug

src/torchcodec/decoders/_core/VideoDecoder.cpp

@@ -39,7 +39,7 @@ double ptsToSeconds(int64_t pts, const AVRational& timeBase) {
 // or 4D.
 // Calling permute() is guaranteed to return a view as per the docs:
 // https://pytorch.org/docs/stable/generated/torch.permute.html
-torch::Tensor MaybeHWC2CHW(
+torch::Tensor MaybePermuteHWC2CHW(
     const VideoDecoder::VideoStreamDecoderOptions& options,
     torch::Tensor& hwcTensor) {
   if (options.dimensionOrder == "NHWC") {
@@ -937,7 +937,7 @@ void VideoDecoder::convertAVFrameToDecodedOutputOnCPU(
       // batch API) to do the conversion. This is more efficient as it allows
       // batch NHWC tensors to be permuted only once, instead of permuting HWC
       // tensors N times.
-      output.frame = MaybeHWC2CHW(streamInfo.options, output.frame);
+      output.frame = MaybePermuteHWC2CHW(streamInfo.options, output.frame);
     }
 
   } else if (output.streamType == AVMEDIA_TYPE_AUDIO) {
@@ -1053,7 +1053,7 @@ VideoDecoder::BatchDecodedOutput VideoDecoder::getFramesAtIndices(
     // Note that for now we ignore the pts and duration parts of the output,
     // because they're never used in any caller.
   }
-  output.frames = MaybeHWC2CHW(options, output.frames);
+  output.frames = MaybePermuteHWC2CHW(options, output.frames);
   return output;
 }
 
@@ -1089,7 +1089,7 @@ VideoDecoder::BatchDecodedOutput VideoDecoder::getFramesInRange(
     output.ptsSeconds[f] = singleOut.ptsSeconds;
     output.durationSeconds[f] = singleOut.durationSeconds;
   }
-  output.frames = MaybeHWC2CHW(options, output.frames);
+  output.frames = MaybePermuteHWC2CHW(options, output.frames);
   return output;
 }
 
@@ -1142,7 +1142,7 @@ VideoDecoder::getFramesDisplayedByTimestampInRange(
   // need this special case below.
   if (startSeconds == stopSeconds) {
     BatchDecodedOutput output(0, options, streamMetadata);
-    output.frames = MaybeHWC2CHW(options, output.frames);
+    output.frames = MaybePermuteHWC2CHW(options, output.frames);
     return output;
   }
 
@@ -1185,7 +1185,7 @@ VideoDecoder::getFramesDisplayedByTimestampInRange(
     output.ptsSeconds[f] = singleOut.ptsSeconds;
     output.durationSeconds[f] = singleOut.durationSeconds;
   }
-  output.frames = MaybeHWC2CHW(options, output.frames);
+  output.frames = MaybePermuteHWC2CHW(options, output.frames);
 
   return output;
 }