Changeset 1311 in 3DVCSoftware

Timestamp:

11 Aug 2015, 17:07:56 (9 years ago)

Author:

tech

Message:

NH_3D_FIX_TICKET_101 Camera parameters for depth layers.

Location:

branches/HTM-14.1-update-dev1/source/Lib

Files:

• TLibCommon/TComRom.cpp (modified) (6 diffs)
• TLibCommon/TComSlice.cpp (modified) (1 diff)
• TLibCommon/TComSlice.h (modified) (1 diff)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (5 diffs)
• TLibDecoder/TDecTop.h (modified) (1 diff)
• TLibEncoder/TEncCavlc.cpp (modified) (1 diff)

branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComRom.cpp

@@ -551 +551 @@
 Bool g_decTraceMvFromMerge     = false; 
 Bool g_decTracePicOutput       = false; 
-Bool g_startStopTrace          = true; 
-Bool g_outputPos               = false;   
+Bool g_startStopTrace          = false; 
+Bool g_outputPos               = false;
 Bool g_traceCameraParameters   = false; 
 Bool g_encNumberOfWrittenBits  = false; 
@@ -691 +691 @@
               << std::endl; 
   }
-
   Bool startTrace = false; 
   if ( g_startStopTrace && poc == 0 && layerId == 0 )
@@ -707 +706 @@
     g_traceCopyBack          = false; 
   }  
-
   Bool stopTrace = false; 
   if ( g_startStopTrace && poc == 0 && layerId == 0 )
@@ -767 +765 @@
   }
 }
-
 Void prinStrIncIndent( Bool b,  std::string strStr )
 {
@@ -779 +776 @@
   }  
 }
-
 Void decIndent( Bool b )
 {
@@ -787 +783 @@
   }  
 }
-
 #endif
 #endif

branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComSlice.cpp

@@ -3905 +3905 @@
     if ( g_traceCameraParameters )
     {
-      std::cout << std::endl << "Cp: " << codScale   [ iInVoi ] << " " <<    codOffset[ iInVoi ] << " "
-                << invCodScale[ iInVoi ] << " " << invCodOffset[ iInVoi ] << " " << log2Div; 
+      std::cout << "Cp: " << codScale   [ iInVoi ] << " " <<    codOffset[ iInVoi ] << " "
+                << invCodScale[ iInVoi ] << " " << invCodOffset[ iInVoi ] << " " << log2Div << std::endl ; 
     }
 #endif

branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComSlice.h

@@ -2948 +2948 @@
   Void                        setCamparaSlice       ( Int** aaiScale = 0, Int** aaiOffset = 0 );      
 
-  IntAry1d                    getCodedScale         ()                               { return m_aaiCodedScale [0];                                   }
-  IntAry1d                    getCodedOffset        ()                               { return m_aaiCodedOffset[0];                                   }
-  IntAry1d                    getInvCodedScale      ()                               { return m_aaiCodedScale [1];                                   }
-  IntAry1d                    getInvCodedOffset     ()                               { return m_aaiCodedOffset[1];                                   }
+  IntAry1d                    getCodedScale         () const                         { return m_aaiCodedScale [0];                                   }
+  IntAry1d                    getCodedOffset        () const                         { return m_aaiCodedOffset[0];                                   }
+  IntAry1d                    getInvCodedScale      () const                         { return m_aaiCodedScale [1];                                   }
+  IntAry1d                    getInvCodedOffset     () const                         { return m_aaiCodedOffset[1];                                   }
                                                                                                                                                      
   Void                        setCpScale( Int j, Int  val )                          { m_aaiCodedScale[0][j] = val;                                  }

branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TypeDef.h

@@ -67 +67 @@
 #if NH_MV
 
+#define NH_3D_FIX_TICKET_101              ( 1 && NH_3D_VER141_DEC_COMP_FLAG )  // Camera parameters for depth
 #define NH_MV_FIX_TICKET_105              1 // layer_set_idx_for_ols_minus1 length
 #define NH_3D_FIX_TICKET_98               1 // Writing of depth intra skip flag

branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -2898 +2898 @@
     {
       Int voiInVps = vps->getVoiInVps( pcSlice->getViewIndex() ); 
+#if NH_3D_FIX_TICKET_101
+      if( vps->getCpInSliceSegmentHeaderFlag( voiInVps ) )
+#else
       if( vps->getCpInSliceSegmentHeaderFlag( voiInVps ) && !pcSlice->getIsDepth() )
+#endif
       {
         for( Int m = 0; m < vps->getNumCp( voiInVps ); m++ )

branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecTop.cpp

@@ -220 +220 @@
 }
 
-Void
-CamParsCollector::setSlice( TComSlice* pcSlice )
+Void CamParsCollector::setSlice( const TComSlice* pcSlice )
 {
   if( pcSlice == 0 )
@@ -292 +291 @@
 
 
+#if !NH_3D_FIX_TICKET_101
 #if NH_3D_IV_MERGE
 Void
@@ -301 +301 @@
   }
 }
+#endif
 #endif
 
@@ -1258 +1259 @@
   }
 
+#if !NH_3D_FIX_TICKET_101
 #if NH_3D_IV_MERGE
 #if H_3D_FCO
@@ -1267 +1269 @@
     m_pcCamParsCollector->copyCamParamForSlice( pcSlice );
   }
+#endif
 #endif
   //  Decode a picture

branches/HTM-14.1-update-dev1/source/Lib/TLibDecoder/TDecTop.h

@@ -76 +76 @@
 
   Void  uninit      ();
-  Void  setSlice    ( TComSlice* pcSlice );
+  Void setSlice ( const TComSlice* pcSlice );
 
   Bool  isInitialized() const     { return m_bInitialized; }
   Int**** getBaseViewShiftLUTI()  { return m_aiBaseViewShiftLUT;   }
 
+#if !NH_3D_FIX_TICKET_101
 #if NH_3D_IV_MERGE
   Void  copyCamParamForSlice( TComSlice* pcSlice );
 #endif
-
+#endif
 
 private:

branches/HTM-14.1-update-dev1/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -2204 +2204 @@
     {
       Int voiInVps = vps->getVoiInVps( pcSlice->getViewIndex() ); 
+#if NH_3D_FIX_TICKET_101
+      if( vps->getCpInSliceSegmentHeaderFlag( voiInVps ) )
+#else
       if( vps->getCpInSliceSegmentHeaderFlag( voiInVps ) && !pcSlice->getIsDepth() )
+#endif
       {
         for( Int m = 0; m < vps->getNumCp( voiInVps ); m++ )