Make the type name even uglier

Author: scotts

src/torchcodec/decoders/_core/FFMPEGCommon.cpp

@@ -10,7 +10,8 @@
 
 namespace facebook::torchcodec {
 
-AVCodecPtrBestStream makeAVCodecPtrBestStream(const AVCodec* codec) {
+AVCodecOnlyUseForCallingAVFindBestStream
+makeAVCodecOnlyUseForCallingAVFindBestStream(const AVCodec* codec) {
 #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(59, 18, 100)
   return const_cast<AVCodec*>(codec);
 #else

src/torchcodec/decoders/_core/FFMPEGCommon.h

@@ -78,12 +78,13 @@ using UniqueSwsContext =
 // 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 AVCodecPtrBestStream = AVCodec*;
+using AVCodecOnlyUseForCallingAVFindBestStream = AVCodec*;
 #else
-using AVCodecPtrBestStream = const AVCodec*;
+using AVCodecOnlyUseForCallingAVFindBestStream = const AVCodec*;
 #endif
 
-AVCodecPtrBestStream makeAVCodecPtrBestStream(const AVCodec* codec);
+AVCodecOnlyUseForCallingAVFindBestStream
+makeAVCodecOnlyUseForCallingAVFindBestStream(const AVCodec* codec);
 
 // Success code from FFMPEG is just a 0. We define it to make the code more
 // readable.

src/torchcodec/decoders/_core/VideoDecoder.cpp

@@ -426,7 +426,7 @@ void VideoDecoder::createFilterGraph(
 }
 
 int VideoDecoder::getBestStreamIndex(AVMediaType mediaType) {
-  AVCodecPtrBestStream codec = nullptr;
+  AVCodecOnlyUseForCallingAVFindBestStream codec = nullptr;
   int streamNumber =
       av_find_best_stream(formatContext_.get(), mediaType, -1, -1, &codec, 0);
   return streamNumber;
@@ -441,7 +441,7 @@ void VideoDecoder::addVideoStreamDecoder(
         " is already active.");
   }
   TORCH_CHECK(formatContext_.get() != nullptr);
-  AVCodecPtrBestStream codec = nullptr;
+  AVCodecOnlyUseForCallingAVFindBestStream codec = nullptr;
   int streamNumber = av_find_best_stream(
       formatContext_.get(),
       AVMEDIA_TYPE_VIDEO,
@@ -464,7 +464,7 @@ void VideoDecoder::addVideoStreamDecoder(
   }
 
   if (options.device.type() == torch::kCUDA) {
-    codec = makeAVCodecPtrBestStream(
+    codec = makeAVCodecOnlyUseForCallingAVFindBestStream(
         findCudaCodec(options.device, streamInfo.stream->codecpar->codec_id)
             .value_or(codec));
   }