Changeset 1417 in 3DVCSoftware for branches/HTM-16.3-fixes

Timestamp:

14 Dec 2018, 12:34:18 (6 years ago)

Author:

tech

Message:

Fix NH_MV_FIX_CONF_WINDOW.

Location:

branches/HTM-16.3-fixes/source/Lib/TLibCommon

Files:

• TComSlice.cpp (modified) (2 diffs)
• TypeDef.h (modified) (1 diff)

branches/HTM-16.3-fixes/source/Lib/TLibCommon/TComSlice.cpp

@@ -3178 +3178 @@
       assert( getQpBDOffset            ( CHANNEL_TYPE_CHROMA ) == (Int) (6* ( getBitDepth( CHANNEL_TYPE_CHROMA ) -8 ) ) );
 
+#if NH_MV_FIX_CONF_WINDOW
+      assert( spsConf.getScaledFlag() );
       
-      assert( spsConf.getWindowLeftOffset  () == repFormat->getConfWinVpsLeftOffset()    );
-      assert( spsConf.getWindowRightOffset () == repFormat->getConfWinVpsRightOffset()   );
-      assert( spsConf.getWindowTopOffset   () == repFormat->getConfWinVpsTopOffset()     );
-      assert( spsConf.getWindowBottomOffset() == repFormat->getConfWinVpsBottomOffset()  );            
+      Int scal = TComSPS::getWinUnitX( getChromaFormatIdc() ) ;
+      assert(  spsConf.getWindowLeftOffset  () == repFormat->getConfWinVpsLeftOffset()   * scal );
+      assert(  spsConf.getWindowRightOffset () == repFormat->getConfWinVpsRightOffset()  * scal );
+      assert(  spsConf.getWindowTopOffset   () == repFormat->getConfWinVpsTopOffset()    * scal );
+      assert(  spsConf.getWindowBottomOffset() == repFormat->getConfWinVpsBottomOffset() * scal );            
+#endif
 
     }
@@ -3206 +3210 @@
       spsConf.setWindowTopOffset   ( repFormat->getConfWinVpsTopOffset()     );
       spsConf.setWindowBottomOffset( repFormat->getConfWinVpsBottomOffset()  );            
+#if NH_MV_FIX_CONF_WINDOW
+      // Set conformance window
+      Int scal = TComSPS::getWinUnitX( getChromaFormatIdc() ) ;
+      getConformanceWindow().scaleOffsets( scal );      
+      getVuiParameters()->getDefaultDisplayWindow().scaleOffsets( scal );
+#endif
     }
   }
   
 
+#if !NH_MV_FIX_CONF_WINDOW
   // Set conformance window
   Int scal = TComSPS::getWinUnitX( getChromaFormatIdc() ) ;
   getConformanceWindow().scaleOffsets( scal );
   getVuiParameters()->getDefaultDisplayWindow().scaleOffsets( scal );
+#endif
 }
 

branches/HTM-16.3-fixes/source/Lib/TLibCommon/TypeDef.h

@@ -68 +68 @@
 /////////////////////////////////////////////////////////////////////////////////////////
 #if NH_MV
+#define NH_MV_FIX_CONF_WINDOW                     1
 // Things that needs to be fixed also in the Specification ... CHECK if this has been done
 #define NH_MV_FIX_NO_REF_PICS_CHECK               1 // !!SPEC!!