Changeset 922 in 3DVCSoftware

Timestamp:

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

Author:

sharpjp-htm

Message:

Integration of H0062

Location:

branches/HTM-10.2-dev1-Sharp

Files:

• checklist/SEC_H0070.doc (modified) (previous)
• checklist/Sharp_H0062.doc (added)
• codingresults/SEC_H0070_vs_ETRIKHU_H0083_by_Sharp.xls (added)
• codingresults/Sharp_H0062_vs_SEC_H0070.xlsm (added)
• source/Lib/TLibCommon/TComDataCU.cpp (modified) (3 diffs)
• source/Lib/TLibCommon/TypeDef.h (modified) (1 diff)

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

branches/HTM-10.2-dev1-Sharp/source/Lib/TLibCommon/TypeDef.h

@@ -229 +229 @@
 #define ETRIKHU_BUGFIX_H0083              1   // bug-fix for DV candidate pruning
 #define ETRIKHU_CLEANUP_H0083             1   // cleaned-up source code for constructing merging candidate list
+#define SHARP_SIMPLE_MERGE_H0062          1   // Restrict 3D-HEVC merge cand in small PUs
 
 // Rate Control