Changeset 266 in 3DVCSoftware for branches/HTM-5.1-dev1-Samsung/source

Timestamp:

8 Feb 2013, 13:49:13 (12 years ago)

Author:

samsung-htm

Message:

Integration of C0096, Removal of DMM2.
Commit carried out by Gerhard on behalf of Ilsoon using the Samsung account.

Location:

branches/HTM-5.1-dev1-Samsung/source/Lib/TLibCommon

Files:

• TComRom.cpp (modified) (1 diff)
• TComRom.h (modified) (1 diff)
• TypeDef.h (modified) (1 diff)

branches/HTM-5.1-dev1-Samsung/source/Lib/TLibCommon/TComRom.cpp

@@ -306 +306 @@
 
 #if RWTH_SDC_DLT_B0036
+#if SAIT_SDC_C0096
+UInt g_auiSDCPredModes[RWTH_SDC_NUM_PRED_MODES] = { DC_IDX, DMM_WEDGE_FULL_IDX, PLANAR_IDX };
+#else
 UInt g_auiSDCPredModes[RWTH_SDC_NUM_PRED_MODES] = { DC_IDX, DMM_WEDGE_FULL_IDX, DMM_WEDGE_PREDDIR_IDX, PLANAR_IDX };
+#endif
 #endif
 

branches/HTM-5.1-dev1-Samsung/source/Lib/TLibCommon/TComRom.h

@@ -202 +202 @@
 
 #if RWTH_SDC_DLT_B0036
+#if SAIT_SDC_C0096
+#define RWTH_SDC_NUM_PRED_MODES 3
+#else
 #define RWTH_SDC_NUM_PRED_MODES 4
+#endif
 extern      UInt g_auiSDCPredModes[RWTH_SDC_NUM_PRED_MODES];
 #endif

branches/HTM-5.1-dev1-Samsung/source/Lib/TLibCommon/TypeDef.h

@@ -86 +86 @@
 #endif
 
+#if RWTH_SDC_DLT_B0036
+#define SAIT_SDC_C0096                    1   // JCT3V-C0096: Improved Simple Depth Coding(removal of DMM2 among four SDC modes(DC, Planar, DMM1 and DMM2))
+#endif
+
 ///// ***** INTERVIEW MOTION VECTOR PREDICTION *********
 #define HHI_INTER_VIEW_MOTION_PRED        1   // inter-view motion parameter prediction