Changeset 1063 in 3DVCSoftware for branches/HTM-12.0-dev1/source/App

Timestamp:

9 Oct 2014, 12:35:18 (11 years ago)

Author:

tech

Message:

Cleanups:

• Moved several functions form .h to .cpp files.

Location:

branches/HTM-12.0-dev1/source/App

Files:

• TAppDecoder/TAppDecTop.cpp (modified) (1 diff)
• TAppEncoder/TAppEncTop.cpp (modified) (2 diffs)
• TAppEncoder/TAppEncTop.h (modified) (2 diffs)

branches/HTM-12.0-dev1/source/App/TAppDecoder/TAppDecTop.cpp

@@ -1155 +1155 @@
     Int curLayerId = m_tDecTop[dIdx]->getLayerId();
     Int curLayerIdxInVps = m_vps->getLayerIdInNuh( curLayerId  ); 
+#if H_MV_HLS10_REF_PRED_LAYERS
+    if ( m_vps->getDependencyFlag(optLayerIdxInVps, curLayerIdxInVps ) )
+#else
     if ( m_vps->getInDirectDependencyFlag(optLayerIdxInVps, curLayerIdxInVps ) )
+#endif
     {
       TComPic* curPic = m_ivPicLists.getPic( curLayerId, pocLastPic ); 

branches/HTM-12.0-dev1/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1591 +1591 @@
 }
 
+#if H_MV_HLS10_PTL
+Void TAppEncTop::xSetProfileTierLevel(TComVPS& vps, Int profileTierLevelIdx, Int subLayer, Profile::Name profile, Level::Name level, Level::Tier tier, Bool progressiveSourceFlag, Bool interlacedSourceFlag, Bool nonPackedConstraintFlag, Bool frameOnlyConstraintFlag, Bool inbldFlag)
+{
+  TComPTL* ptlStruct = vps.getPTL( profileTierLevelIdx );    
+  assert( ptlStruct != NULL ); 
+
+  ProfileTierLevel* ptl; 
+  if ( subLayer == -1 )
+  {
+    ptl = ptlStruct->getGeneralPTL();
+  }
+  else
+  {
+    ptl = ptlStruct->getSubLayerPTL(  subLayer );
+  }
+
+  assert( ptl != NULL );
+
+
+  ptl->setProfileIdc( profile );
+  ptl->setTierFlag  ( tier    );
+  ptl->setLevelIdc  ( level   );
+  ptl->setProfileCompatibilityFlag( profile, true );
+
+  switch ( profile )
+  {
+  case Profile::MAIN:
+    break; 
+  case Profile::MULTIVIEWMAIN:
+#if H_3D
+  case Profile::MAIN3D:
+#endif
+    ptl->setMax12bitConstraintFlag      ( true  ); 
+    ptl->setMax12bitConstraintFlag      ( true  );
+    ptl->setMax10bitConstraintFlag      ( true  );
+    ptl->setMax8bitConstraintFlag       ( true  );
+    ptl->setMax422chromaConstraintFlag  ( true  );
+    ptl->setMax420chromaConstraintFlag  ( true  );
+    ptl->setMaxMonochromeConstraintFlag ( false );
+    ptl->setIntraConstraintFlag         ( false ); 
+    ptl->setOnePictureOnlyConstraintFlag( false );
+    ptl->setLowerBitRateConstraintFlag  ( true  );        
+    break; 
+  default:
+    assert( 0 ); // other profiles currently not supported
+    break; 
+  }
+}
+#endif
 
 Void TAppEncTop::xSetRepFormat( TComVPS& vps )
@@ -2072 +2121 @@
   }
 }
-#endif
+#if H_MV_HLS10_GEN_FIX
+Bool TAppEncTop::xLayerIdInTargetEncLayerIdList(Int nuhLayerId)
+{
+  return  ( std::find(m_targetEncLayerIdList.begin(), m_targetEncLayerIdList.end(), nuhLayerId) != m_targetEncLayerIdList.end()) ;
+}
+#endif
+
+
+#endif
+
+
 #if H_3D
 Void TAppEncTop::xSetVPSExtension2( TComVPS& vps )

branches/HTM-12.0-dev1/source/App/TAppEncoder/TAppEncTop.h

@@ -138 +138 @@
                              Bool progressiveSourceFlag, Bool interlacedSourceFlag, 
                              Bool nonPackedConstraintFlag, Bool frameOnlyConstraintFlag, 
-                             Bool inbldFlag )
-  { 
-    TComPTL* ptlStruct = vps.getPTL( profileTierLevelIdx );    
-    assert( ptlStruct != NULL ); 
-
-    ProfileTierLevel* ptl; 
-    if ( subLayer == -1 )
-    {
-      ptl = ptlStruct->getGeneralPTL();
-    }
-    else
-    {
-      ptl = ptlStruct->getSubLayerPTL(  subLayer );
-    }
-
-    assert( ptl != NULL );
-
-
-    ptl->setProfileIdc( profile );
-    ptl->setTierFlag  ( tier    );
-    ptl->setLevelIdc  ( level   );
-    ptl->setProfileCompatibilityFlag( profile, true );
-
-    switch ( profile )
-    {
-    case Profile::MAIN:
-      break; 
-    case Profile::MULTIVIEWMAIN:
-#if H_3D
-    case Profile::MAIN3D:
-#endif
-      ptl->setMax12bitConstraintFlag      ( true  ); 
-      ptl->setMax12bitConstraintFlag      ( true  );
-      ptl->setMax10bitConstraintFlag      ( true  );
-      ptl->setMax8bitConstraintFlag       ( true  );
-      ptl->setMax422chromaConstraintFlag  ( true  );
-      ptl->setMax420chromaConstraintFlag  ( true  );
-      ptl->setMaxMonochromeConstraintFlag ( false );
-      ptl->setIntraConstraintFlag         ( false ); 
-      ptl->setOnePictureOnlyConstraintFlag( false );
-      ptl->setLowerBitRateConstraintFlag  ( true  );        
-      break; 
-    default:
-      assert( 0 ); // other profiles currently not supported
-      break; 
-    }
-  }
-
-
+                             Bool inbldFlag );
 #endif
   Void xSetRepFormat              ( TComVPS& vps );
@@ -194 +146 @@
   Int  xGetMax( std::vector<Int>& vec);
 #if H_MV_HLS10_GEN_FIX
-  Bool xLayerIdInTargetEncLayerIdList( Int nuhLayerId ) 
-  {
-    return  ( std::find(m_targetEncLayerIdList.begin(), m_targetEncLayerIdList.end(), nuhLayerId) != m_targetEncLayerIdList.end()) ;
-  }
+  Bool xLayerIdInTargetEncLayerIdList( Int nuhLayerId );
 #endif
 #endif