Changeset 1024 in 3DVCSoftware for branches/HTM-11.2-dev2-Samsung

Timestamp:

29 Jul 2014, 03:58:02 (10 years ago)

Author:

samsung-htm

Message:

Integration of JCT3V-I0090: vps_extension2 clean-up

Location:

branches/HTM-11.2-dev2-Samsung

Files:

• checklist/MediaTek_JCT3V-I0072_SEC.doc (added)
• checklist/MediaTek_JCT3V-I0099_SEC.doc (added)
• codingresults/JCT3V-I0072_vs_I0099_SEC.xls (added)
• codingresults/JCT3V-I0090_vs_JCT3V-I0072.xls (added)
• codingresults/JCT3V-I0099_vs_I0104_SEC.xls (added)
• source/Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)
• source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (2 diffs)

branches/HTM-11.2-dev2-Samsung/source/Lib/TLibCommon/TypeDef.h

@@ -257 +257 @@
 #define KWU_RC_VIEWRC_E0227               0  ///< JCT3V-E0227, view-wise target bitrate allocation
 #define KWU_RC_MADPRED_E0227              0  ///< JCT3V-E0227, inter-view MAD prediction
+
+#define SEC_VPS_CLEANUP_I0090             1
 
 #endif // H_3D

branches/HTM-11.2-dev2-Samsung/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1758 +1758 @@
 {
   UInt uiCode; 
+#if SEC_VPS_CLEANUP_I0090
+  for( Int i = 1; i <= pcVPS->getMaxLayersMinus1(); i++ )
+#else
   for( Int i = 0; i <= pcVPS->getMaxLayersMinus1(); i++ )
+#endif
   {
 #if H_3D_ARP
@@ -1767 +1771 @@
     pcVPS->setSubPULog2Size(i, 0);
 #endif
+#if !SEC_VPS_CLEANUP_I0090
     if ( i != 0 )
+#endif
     {
 #if MTK_I0099_VPS_EX2
@@ -1849 +1855 @@
 
   READ_UVLC( uiCamParPrecision, "cp_precision" );
+#if SEC_VPS_CLEANUP_I0090
+  for (UInt viewIndex=1; viewIndex<pcVPS->getNumViews(); viewIndex++)
+#else
   for (UInt viewIndex=0; viewIndex<pcVPS->getNumViews(); viewIndex++)
+#endif
   {
     pcVPS->setCamParPresent         ( viewIndex, false );

branches/HTM-11.2-dev2-Samsung/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -1560 +1560 @@
 Void TEncCavlc::codeVPSExtension2( TComVPS* pcVPS )
 { 
+#if SEC_VPS_CLEANUP_I0090
+  for( Int i = 1; i <= pcVPS->getMaxLayersMinus1(); i++ )
+#else
   for( Int i = 0; i <= pcVPS->getMaxLayersMinus1(); i++ )
-  {
+#endif
+  {
+#if !SEC_VPS_CLEANUP_I0090
     if (i!= 0)
+#endif
     {
 #if MTK_I0099_VPS_EX2
@@ -1621 +1627 @@
   }
   WRITE_UVLC( pcVPS->getCamParPrecision(), "cp_precision" );
+#if SEC_VPS_CLEANUP_I0090
+  for (UInt viewIndex=1; viewIndex<pcVPS->getNumViews(); viewIndex++)
+#else
   for (UInt viewIndex=0; viewIndex<pcVPS->getNumViews(); viewIndex++)
+#endif
   {
     WRITE_FLAG( pcVPS->getCamParPresent(viewIndex) ? 1 : 0, "cp_present_flag[i]" );