Changeset 1416 in SHVCSoftware for branches/SHM-dev

Timestamp:

4 Aug 2015, 19:32:56 (9 years ago)

Author:

seregin

Message:

fix the bitdepth for writing picture out in the conformance mode

Location:

branches/SHM-dev/source

Files:

• App/TAppDecoder/TAppDecTop.cpp (modified) (2 diffs)
• Lib/TLibCommon/TComPicYuv.cpp (modified) (1 diff)

branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp

@@ -1540 +1540 @@
         Int bitDepth[] = {bitDpeths.recon[CHANNEL_TYPE_LUMA], bitDpeths.recon[CHANNEL_TYPE_CHROMA]};
 
-        m_confReconFile[layerId].open(tempFileName, true, m_outputBitDepth, m_outputBitDepth, bitDepth ); // write mode
+        m_confReconFile[layerId].open(tempFileName, true, bitDepth, bitDepth, bitDepth ); // write mode
         this->setDecodedYuvLayerRefresh( layerId, false );
       }
@@ -1563 +1563 @@
             conf.getWindowRightOffset() * xScal + defDisp.getWindowRightOffset(),
             conf.getWindowTopOffset()   * yScal + defDisp.getWindowTopOffset(),
-            conf.getWindowBottomOffset()* yScal + defDisp.getWindowBottomOffset() );
+            conf.getWindowBottomOffset()* yScal + defDisp.getWindowBottomOffset(),
+            NUM_CHROMA_FORMAT, m_bClipOutputVideoToRec709Range );
+
           layerBuffer->erase(itPic);
           itPic = layerBuffer->begin();  // Ensure doesn't go to infinite loop

branches/SHM-dev/source/Lib/TLibCommon/TComPicYuv.cpp

@@ -86 +86 @@
                           const UInt uiMaxCUDepth,            ///< used for generating offsets to CUs. Can use 0 if no offsets are required
 #if SVC_EXTENSION
-                          const Bool bUseMargin,     ///< if true, then a margin of uiMaxCUWidth+16 and uiMaxCUHeight+16 is created around the image.
+                          const Bool bUseMargin,              ///< if true, then a margin of uiMaxCUWidth+16 and uiMaxCUHeight+16 is created around the image.
                           const Window* conformanceWindow)
 #else