Ticket #1643: fix.patch

source/Lib/Utilities/VideoIOYuv.cpp

@@ -1237 +1237 @@
   return retval;
 }
 
+bool VideoIOYuv::write(uint32_t orgWidth, uint32_t orgHeight, const CPelUnitBuf &pic,
+                       const InputColourSpaceConversion ipCSC, const bool packedYuvOutputMode, int SPSconfLeft,
+                       int SPSconfRight, int SPSconfTop, int SPSconfBottom, int PPSconfLeft,
+                       int PPSconfRight, int PPSconfTop, int PPSconfBottom, ChromaFormat format, const bool clipToRec709,
+                       const bool subtractConfWindowOffsets)
+{
+  PelStorage interm;
+
+  if (ipCSC!=IPCOLOURSPACE_UNCHANGED)
+  {
+    interm.create( pic.chromaFormat, Area( Position(), pic.Y()) );
+    colourSpaceConvert(pic, interm, ipCSC, false);
+  }
+
+  const CPelUnitBuf& picC = (ipCSC==IPCOLOURSPACE_UNCHANGED) ? pic : interm;
+
+  // compute actual YUV frame size excluding padding size
+  bool is16bit = false;
+  for (const auto bd: m_fileBitdepth)
+  {
+    if (bd > 8)
+    {
+      is16bit=true;
+    }
+  }
+
+  bool nonZeroBitDepthShift = false;
+  for (const auto bdShift: m_bitdepthShift)
+  {
+    if (bdShift != 0)
+    {
+      nonZeroBitDepthShift=true;
+    }
+  }
+
+  bool retval = true;
+  if (format == ChromaFormat::UNDEFINED)
+  {
+    format= picC.chromaFormat;
+  }
+
+  PelStorage picZ;
+  if (nonZeroBitDepthShift)
+  {
+    picZ.create( picC.chromaFormat, Area( Position(), picC.Y() ) );
+    picZ.copyFrom( picC );
+
+    for(uint32_t comp=0; comp < ::getNumberValidComponents( picZ.chromaFormat ); comp++)
+    {
+      const ComponentID compID=ComponentID(comp);
+      const ChannelType ch=toChannelType(compID);
+      const bool        rec709Compliance =
+        clipToRec709
+        && (-m_bitdepthShift[ch] < 0
+            && m_msbExtendedBitDepth[ch] >= 8); /* ITU-R BT.709 compliant clipping for converting say 10b to 8b */
+      const Pel minval = rec709Compliance ? ((1 << (m_msbExtendedBitDepth[ch] - 8))) : 0;
+      const Pel maxval =
+        rec709Compliance ? ((0xff << (m_msbExtendedBitDepth[ch] - 8)) - 1) : (1 << m_msbExtendedBitDepth[ch]) - 1;
+
+      scalePlane(picZ.get(compID), -m_bitdepthShift[ch], minval, maxval);
+    }
+  }
+
+  const CPelUnitBuf& picO = nonZeroBitDepthShift ? picZ : picC;
+
+  const CPelBuf areaY     = picO.get(COMPONENT_Y);
+  const uint32_t    width444  = areaY.width - PPSconfLeft - PPSconfRight;
+  const uint32_t    height444 = areaY.height -  PPSconfTop  - PPSconfBottom;
+
+  if( subtractConfWindowOffsets )
+  {
+    orgWidth -= SPSconfLeft + SPSconfRight;
+    orgHeight -= SPSconfTop + SPSconfBottom;
+  }
+
+  if ((width444 == 0) || (height444 == 0))
+  {
+    msg( WARNING, "\nWarning: writing %d x %d luma sample output picture!", width444, height444);
+  }
+
+  if (m_outY4m)
+  {
+    m_fileStream.write(Y4M::FRAME_HEADER, Y4M::FRAME_HEADER_LENGTH);
+  }
+
+  for(uint32_t comp=0; retval && comp < ::getNumberValidComponents(format); comp++)
+  {
+    const ComponentID compID      = ComponentID(comp);
+    const ChannelType ch          = toChannelType(compID);
+    const uint32_t    csx         = ::getComponentScaleX(compID, format);
+    const uint32_t    csy         = ::getComponentScaleY(compID, format);
+    const CPelBuf     area        = picO.get(compID);
+    const ptrdiff_t   planeOffset = (PPSconfLeft >> csx) + (PPSconfTop >> csy) * area.stride;
+    if (!writePlane(orgWidth, orgHeight, m_fileStream, area.bufAt(0, 0) + planeOffset, is16bit, area.stride, width444,
+                    height444, compID, picO.chromaFormat, format, m_fileBitdepth[ch], packedYuvOutputMode ? 1 : 0))
+    {
+      retval = false;
+    }
+  }
+
+  return retval;
+}
+
 bool VideoIOYuv::write(const CPelUnitBuf &picTop, const CPelUnitBuf &picBottom, const InputColourSpaceConversion ipCSC,
                        const bool packedYuvOutputMode, int confLeft, int confRight, int confTop, int confBottom,
                        ChromaFormat format, const bool isTff, const bool clipToRec709)
@@ -1466 +1569 @@
     else
     {
       const Window &conf = pps.getConformanceWindow();
-
+      const Window &spsconf = sps.getConformanceWindow();
       ret = write(sps.getMaxPicWidthInLumaSamples(), sps.getMaxPicHeightInLumaSamples(), pic, ipCSC,
-                  packedYuvOutputMode, conf.getWindowLeftOffset() * SPS::getWinUnitX(chromaFormatIdc),
+                  packedYuvOutputMode, spsconf.getWindowLeftOffset() * SPS::getWinUnitX(chromaFormatIdc),
+                  spsconf.getWindowRightOffset() * SPS::getWinUnitX(chromaFormatIdc),
+                  spsconf.getWindowTopOffset() * SPS::getWinUnitY(chromaFormatIdc),
+                  spsconf.getWindowBottomOffset() * SPS::getWinUnitY(chromaFormatIdc), conf.getWindowLeftOffset() * SPS::getWinUnitX(chromaFormatIdc),
                   conf.getWindowRightOffset() * SPS::getWinUnitX(chromaFormatIdc),
                   conf.getWindowTopOffset() * SPS::getWinUnitY(chromaFormatIdc),
                   conf.getWindowBottomOffset() * SPS::getWinUnitY(chromaFormatIdc), ChromaFormat::UNDEFINED,
-                  clipToRec709, false);
+                  clipToRec709, true);
     }
   }
   else

source/Lib/Utilities/VideoIOYuv.h

@@ -95 +95 @@
   bool read(PelUnitBuf& pic, PelUnitBuf& picOrg, const InputColourSpaceConversion ipcsc, int pad[2],
             ChromaFormat fileFormat   = ChromaFormat::UNDEFINED,
             const bool   clipToRec709 = false);   ///< read one frame with padding parameter
-
   // If fileFormat=NUM_CHROMA_FORMAT, use the format defined by pPicYuv
   bool write(uint32_t orgWidth, uint32_t orgHeight, const CPelUnitBuf& pic, const InputColourSpaceConversion ipCSC,
              const bool packedYuvOutputMode, int confLeft = 0, int confRight = 0, int confTop = 0, int confBottom = 0,
              ChromaFormat format = ChromaFormat::UNDEFINED, const bool clipToRec709 = false,
              const bool subtractConfWindowOffsets = true);   ///< write one YUV frame with padding parameter
 
+  bool write(uint32_t orgWidth, uint32_t orgHeight, const CPelUnitBuf &pic,
+                       const InputColourSpaceConversion ipCSC, const bool packedYuvOutputMode, int SPSconfLeft,
+                       int SPSconfRight, int SPSconfTop, int SPSconfBottom, int PPSconfLeft,
+                       int PPSconfRight, int PPSconfTop, int PPSconfBottom, ChromaFormat format, const bool clipToRec709,
+                       const bool subtractConfWindowOffsets); ///< write one YUV frame with padding parameter
   // If fileFormat=NUM_CHROMA_FORMAT, use the format defined by pPicYuvTop and pPicYuvBottom
   bool write(const CPelUnitBuf& picTop, const CPelUnitBuf& picBot, const InputColourSpaceConversion ipCSC,
              const bool packedYuvOutputMode, int confLeft = 0, int confRight = 0, int confTop = 0, int confBottom = 0,