Changeset 58 in 3DVCSoftware for trunk/source

Timestamp:

14 May 2012, 20:52:00 (13 years ago)

Author:

hschwarz

Message:

updated configuration files

Location:

trunk/source

Files:

• App/TAppEncoder/TAppEncCfg.cpp (modified) (1 diff)
• Lib/TLibEncoder/TEncSbac.cpp (modified) (1 diff)

trunk/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -859 +859 @@
       xConfirmPara( m_pchBaseViewCameraNumbers  == 0                             ,   "BaseViewCameraNumbers must be given" );
       xConfirmPara( m_iNumberOfViews != m_cCameraData.getBaseViewNumbers().size(),   "Number of Views in BaseViewCameraNumbers must be equal to NumberOfViews" );
-      xConfirmPara( m_uiVSOMode < 0 || m_uiVSOMode > 4 ,                             "VSO Mode must be greater than or equal to 0 and less than 5");
+      xConfirmPara( m_uiVSOMode > 4 ,                                                "VSO Mode must be less than 5");
     }
 #endif

trunk/source/Lib/TLibEncoder/TEncSbac.cpp

@@ -746 +746 @@
     if( bUseMVI )
     {
-      uiUnaryIdx = HHI_MPI_MERGE_POS;
-    }
-    else if( uiUnaryIdx >= HHI_MPI_MERGE_POS )
+      uiUnaryIdx = (UInt)HHI_MPI_MERGE_POS;
+    }
+    else if( (Int)uiUnaryIdx >= (Int)HHI_MPI_MERGE_POS )
     {
       uiUnaryIdx++;