Changeset 532 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder

Timestamp:

12 Jul 2013, 17:57:35 (11 years ago)

Author:

tech

Message:

• Fixed cfg files.
• Fixed several memory leaks.
• Fixed encoder/decoder mismatch and aligned order of vps syntax elements with draft text.
• Added missing iv_mv_scaling flag.

Location:

branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (2 diffs)
• TEncCfg.h (modified) (2 diffs)
• TEncGOP.cpp (modified) (1 diff)
• TEncSearch.cpp (modified) (1 diff)
• TEncTop.cpp (modified) (2 diffs)

branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -762 +762 @@
 #endif
 #if H_3D_ARP
-        WRITE_FLAG( pcVPS->getUseAdvRP             ( i ) ? 1 : 0,  "advanced_residual_pred_flag"  );
+        WRITE_FLAG( pcVPS->getUseAdvRP             ( i ) ? 1 : 0,  "iv_res_pred_flag[i]"  );
 #endif
 #if H_3D_NBDV_REF
@@ -771 +771 @@
 #endif
       }          
-    }        
-    if( pcVPS->getDepthId( i ) )
-    {
-      WRITE_FLAG( pcVPS->getVpsDepthModesFlag( i ),          "vps_depth_modes_flag[i]" );
-      
+      else
+      {
+        WRITE_FLAG( pcVPS->getVpsDepthModesFlag( i ) ? 1 : 0 ,          "vps_depth_modes_flag[i]" );
+        //WRITE_FLAG( pcVPS->getLimQtPredFlag    ( i ) ? 1 : 0 ,          "lim_qt_pred_flag[i]"     ); 
 #if H_3D_DIM_DLT
-      if( pcVPS->getVpsDepthModesFlag( i ) )
-      {
-        WRITE_FLAG( pcVPS->getUseDLTFlag( i ) ? 1 : 0, "use_dlt_flag[i]" );
+        if( pcVPS->getVpsDepthModesFlag( i ) )
+        {
+          WRITE_FLAG( pcVPS->getUseDLTFlag( i ) ? 1 : 0, "dlt_flag[i]" );
+        }
         if( pcVPS->getUseDLTFlag( i ) )
         {
           // code mapping
-          WRITE_UVLC(pcVPS->getNumDepthValues(i), "num_dlt_depth_values[i]");
+          WRITE_UVLC(pcVPS->getNumDepthValues(i), "num_depth_values_in_dlt[i]");
           for(Int d=0; d<pcVPS->getNumDepthValues(i); d++)
           {
             WRITE_UVLC( pcVPS->idx2DepthValue(i, d), "dlt_depth_value[i][d]" );
           }
-        }
-      }
-#endif
-    }
-
-  }  
+        }        
+#endif
+      }
+    }  
+  }
+#if H_3D_TMVP
+  WRITE_FLAG( pcVPS->getIvMvScalingFlag( ) ? 1 : 0 ,          "iv_mv_scaling_flag" );
+#endif
 #else
   WRITE_FLAG( 0,                                             "vps_extension2_flag" );

branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncCfg.h

@@ -322 +322 @@
   Bool      m_TransquantBypassEnableFlag;                     ///< transquant_bypass_enable_flag setting in PPS.
   Bool      m_CUTransquantBypassFlagValue;                    ///< if transquant_bypass_enable_flag, the fixed value to use for the per-CU cu_transquant_bypass_flag.
+#if H_MV_FIX_VPS_POINTER
+  TComVPS*  m_cVPS;                                           ///< pointer to VPS, same for all layers
+#else
   TComVPS                    m_cVPS;
+#endif
   Bool      m_recalculateQPAccordingToLambda;                 ///< recalculate QP value according to the lambda value
   Int       m_activeParameterSetsSEIEnabled;                  ///< enable active parameter set SEI message 
@@ -833 +837 @@
   Bool      getCUTransquantBypassFlagValue()          { return m_CUTransquantBypassFlagValue; }
   Void      setCUTransquantBypassFlagValue(Bool flag) { m_CUTransquantBypassFlagValue = flag; }
+#if H_MV_FIX_VPS_POINTER
+  Void      setVPS           ( TComVPS *p ) { m_cVPS = p;    }
+  TComVPS*  getVPS           ()             { return m_cVPS; }
+#else
   Void setVPS(TComVPS *p) { m_cVPS = *p; }
   TComVPS *getVPS() { return &m_cVPS; }
+#endif
   Void      setUseRecalculateQPAccordingToLambda ( Bool b ) { m_recalculateQPAccordingToLambda = b;    }
   Bool      getUseRecalculateQPAccordingToLambda ()         { return m_recalculateQPAccordingToLambda; }

branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -706 +706 @@
 #if H_3D
     pcSlice->setIvPicLists( m_ivPicLists );         
-#if H_3D
-    pcSlice->setPicLists( m_ivPicLists );
-#endif
 #if H_3D_IV_MERGE    
     assert( !m_pcEncTop->getIsDepth() || ( pcSlice->getTexturePic() != 0 ) );

branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -7277 +7277 @@
   Pel refDC1 = 0; Pel refDC2 = 0;
 
-  TComPic*      pcPicTex = pcCU->getSlice()->getPicLists()->getPic( pcCU->getSlice()->getViewIndex(), false, pcCU->getSlice()->getPOC() );
+  TComPic*      pcPicTex = pcCU->getSlice()->getTexturePic();
   assert( pcPicTex != NULL );
   TComDataCU* pcColTexCU = pcPicTex->getCU(pcCU->getAddr());

branches/HTM-DEV-0.3-dev2/source/Lib/TLibEncoder/TEncTop.cpp

@@ -290 +290 @@
   
   /* set the VPS profile information */
+#if H_MV_FIX_VPS_POINTER
+  // This seems to be incorrect, but irrelevant for the MV-HEVC
+  *(m_cVPS->getPTL()) = *m_cSPS.getPTL();
+#if L0043_TIMING_INFO
+  m_cVPS->getTimingInfo()->setTimingInfoPresentFlag       ( false );
+#endif
+#else
   *m_cVPS.getPTL() = *m_cSPS.getPTL();
+
 #if L0043_TIMING_INFO
   m_cVPS.getTimingInfo()->setTimingInfoPresentFlag       ( false );
+#endif
 #endif
   // initialize PPS
@@ -668 +677 @@
 {
 #if H_MV
+#if H_MV_FIX_VPS_POINTER
+  if( getVPS()->getNumDirectRefLayers( getLayerIdInVps() ) > 0 )
+#else
   if( m_cVPS.getNumDirectRefLayers( getLayerIdInVps() ) > 0 )
+#endif
   {
     m_cPPS.setListsModificationPresentFlag( true );