Removes width and height from StreamOptions

Author: scotts

src/torchcodec/_core/CpuDeviceInterface.cpp

@@ -76,10 +76,8 @@ void CpuDeviceInterface::initialize(
   // https://stackoverflow.com/questions/74351955/turn-off-sw-scale-conversion-to-planar-yuv-32-byte-alignment-requirements
   bool isWidthSwScaleCompatible = (outputDims_.width % 32) == 0;
 
-  bool userRequestedSwScale =
-      videoStreamOptions_.colorConversionLibrary.has_value() &&
-      videoStreamOptions_.colorConversionLibrary.value() ==
-          ColorConversionLibrary::SWSCALE;
+  bool userRequestedSwScale = videoStreamOptions_.colorConversionLibrary ==
+      ColorConversionLibrary::SWSCALE;
 
   // Note that we treat the transform limitation differently from the width
   // limitation. That is, we consider the transforms being compatible with

src/torchcodec/_core/Encoder.cpp

@@ -603,8 +603,8 @@ void VideoEncoder::initializeEncoder(
 
   // Use specified dimensions or input dimensions
   // TODO-VideoEncoder: Allow height and width to be set
-  outWidth_ = videoStreamOptions.width.value_or(inWidth_);
-  outHeight_ = videoStreamOptions.height.value_or(inHeight_);
+  outWidth_ = inWidth_;
+  outHeight_ = inHeight_;
 
   // Use YUV420P as default output format
   // TODO-VideoEncoder: Enable other pixel formats

src/torchcodec/_core/SingleStreamDecoder.cpp

@@ -499,10 +499,6 @@ void SingleStreamDecoder::addVideoStream(
         streamIndex, customFrameMappings.value());
   }
 
-  TORCH_CHECK(
-      !videoStreamOptions.width.has_value(), "width should have no value!");
-  TORCH_CHECK(
-      !videoStreamOptions.height.has_value(), "height should have no value!");
   outputDims_ =
       FrameDims(streamMetadata.width.value(), streamMetadata.height.value());
   for (auto& transform : transforms) {

src/torchcodec/_core/StreamOptions.h

@@ -13,7 +13,6 @@
 namespace facebook::torchcodec {
 
 enum ColorConversionLibrary {
-  // TODO: Add an AUTO option later.
   // Use the libavfilter library for color conversion.
   FILTERGRAPH,
   // Use the libswscale library for color conversion.
@@ -28,12 +27,17 @@ struct VideoStreamOptions {
   // utilize all cores. If not set, it will be the default FFMPEG behavior for
   // the given codec.
   std::optional<int> ffmpegThreadCount;
+
   // Currently the dimension order can be either NHWC or NCHW.
   // H=height, W=width, C=channel.
   std::string dimensionOrder = "NCHW";
-  std::optional<int> width;
-  std::optional<int> height;
-  std::optional<ColorConversionLibrary> colorConversionLibrary;
+
+  // By default we have to use filtergraph, as it is more general. We can only
+  // use swscale when we have met strict requirements. See
+  // CpuDeviceInterface::initialze() for the logic.
+  ColorConversionLibrary colorConversionLibrary =
+      ColorConversionLibrary::FILTERGRAPH;
+
   // By default we use CPU for decoding for both C++ and python users.
   torch::Device device = torch::kCPU;