Changeset 922 in 3DVCSoftware for branches/HTM-10.2-dev1-Sharp/source/Lib/TLibCommon/TComDataCU.cpp

Timestamp:

17 Apr 2014, 10:49:54 (10 years ago)

Author:

sharpjp-htm

Message:

Integration of H0062

File:

• branches/HTM-10.2-dev1-Sharp/source/Lib/TLibCommon/TComDataCU.cpp (modified) (3 diffs)

branches/HTM-10.2-dev1-Sharp/source/Lib/TLibCommon/TComDataCU.cpp

@@ -4352 +4352 @@
   /////////////////////////////////////////////
 
+#if SHARP_SIMPLE_MERGE_H0062
+  bMPIFlag &= (nPSW + nPSH > 12);
+#endif
   if( bMPIFlag)
   {
@@ -4761 +4764 @@
   Bool ivMvPredFlag   = getSlice()->getVPS()->getIvMvPredFlag( getSlice()->getLayerIdInVps() );
 
+#if SHARP_SIMPLE_MERGE_H0062
+  ivMvPredFlag &= (nPSW + nPSH > 12);
+#endif
   if ( ivMvPredFlag && cDisInfo.m_aVIdxCan!=-1)
   {
@@ -5168 +5174 @@
 #if H_3D_ARP
       !bARPFlag &&
+#endif
+#if SHARP_SIMPLE_MERGE_H0062
+      (nPSW + nPSH > 12) &&
 #endif
 #if ETRIKHU_CLEANUP_H0083