ffmpegdecoder: read pixel format from frame instead of stream

2022-05-22 13:41:44 -07:00
parent 3de9251cf5
commit cab62ba5d1
5 changed files with 54 additions and 37 deletions
@@ -117,15 +117,15 @@ FootageDescription OIIODecoder::Probe(const QString &filename, const QAtomicInt*
  return desc;
 }

-VideoParams OIIODecoder::GetParamsForTexture(const RetrieveVideoParams &p) const
+VideoParams OIIODecoder::GetParamsForTexture(const RetrieveVideoParams &p)
 {
  return VideoParams(buffer_->spec().width,
-                 buffer_->spec().height,
-                 pix_fmt_,
-                 channel_count_,
-                 OIIOUtils::GetPixelAspectRatioFromOIIO(buffer_->spec()),
-                 VideoParams::kInterlaceNone, // FIXME: Does OIIO deinterlace for us?
-                 p.divider);
+                     buffer_->spec().height,
+                     pix_fmt_,
+                     channel_count_,
+                     OIIOUtils::GetPixelAspectRatioFromOIIO(buffer_->spec()),
+                     VideoParams::kInterlaceNone, // FIXME: Does OIIO deinterlace for us?
+                     p.divider);
 }

 bool OIIODecoder::OpenInternal()