Changeset 229 in 3DVCSoftware for branches/HTM-5.1-dev1-HHI

Timestamp:

25 Jan 2013, 14:45:24 (12 years ago)

Author:

hhi-htm

Message:

bug fix

Location:

branches/HTM-5.1-dev1-HHI/source/Lib

Files:

• TLibDecoder/TDecSbac.cpp (modified) (2 diffs)
• TLibEncoder/TEncCu.cpp (modified) (4 diffs)
• TLibEncoder/TEncSbac.cpp (modified) (2 diffs)

branches/HTM-5.1-dev1-HHI/source/Lib/TLibDecoder/TDecSbac.cpp

@@ -763 +763 @@
 
 #if HHI_QTLPC_RAU_OFF_C0160
-  Bool rapPic     = (pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR);
+  Bool rapPic     = (pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR || pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA);
   if(bDepthMapDetect && !bIntraSliceDetect && !rapPic && sps->getUseQTLPC())
 #else
@@ -810 +810 @@
 
 #if HHI_QTLPC_RAU_OFF_C0160
-  Bool rapPic     = (pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR);
+  Bool rapPic     = (pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR || pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA);
   if(bDepthMapDetect && !bIntraSliceDetect && !rapPic && sps->getUseQTLPC())
 #else

branches/HTM-5.1-dev1-HHI/source/Lib/TLibEncoder/TEncCu.cpp

@@ -459 +459 @@
 
 #if HHI_QTLPC_RAU_OFF_C0160
-  Bool rapPic     = (rpcBestCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR);
+  Bool rapPic     = (rpcBestCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR || rpcBestCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA);
 #endif
 
@@ -1119 +1119 @@
       if ( !bEarlySkip 
 #if HHI_DEPTH_INTRA_SEARCH_RAU_C0160
-        || ((rpcBestCU->getSlice()->getIsDepth() == true) && (rpcBestCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR))
+        || ((rpcBestCU->getSlice()->getIsDepth() == true) && (rpcBestCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR || rpcBestCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA))
 #endif
         )
@@ -1130 +1130 @@
           rpcBestCU->getCbf( 0, TEXT_CHROMA_V ) != 0 
 #if HHI_DEPTH_INTRA_SEARCH_RAU_C0160
-          || ((rpcBestCU->getSlice()->getIsDepth() == true) && (rpcBestCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR))
+          || ((rpcBestCU->getSlice()->getIsDepth() == true) && (rpcBestCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR || rpcBestCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA))
 #endif            
           ) && !bFullyRenderedSec ) // avoid very complex intra if it is unlikely
@@ -1139 +1139 @@
           rpcBestCU->getCbf( 0, TEXT_CHROMA_V ) != 0     
 #if HHI_DEPTH_INTRA_SEARCH_RAU_C0160
-          || ((rpcBestCU->getSlice()->getIsDepth() == true) && (rpcBestCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR))
+          || ((rpcBestCU->getSlice()->getIsDepth() == true) && (rpcBestCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR || rpcBestCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA))
 #endif     
           ) // avoid very complex intra if it is unlikely

branches/HTM-5.1-dev1-HHI/source/Lib/TLibEncoder/TEncSbac.cpp

@@ -626 +626 @@
  
 #if HHI_QTLPC_RAU_OFF_C0160
-  Bool rapPic     = (pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR);
+  Bool rapPic     = (pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR || pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA);
   if(bDepthMapDetect && !bIntraSliceDetect && !rapPic && sps->getUseQTLPC() && pcCU->getPic()->getReduceBitsFlag())
 #else
@@ -930 +930 @@
 
 #if HHI_QTLPC_RAU_OFF_C0160
-  Bool rapPic     = (pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR);
+  Bool rapPic     = (pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR || pcCU->getSlice()->getNalUnitType() == NAL_UNIT_CODED_SLICE_CRA);
   if(bDepthMapDetect && !bIntraSliceDetect && !rapPic && sps->getUseQTLPC() && pcCU->getPic()->getReduceBitsFlag())
 #else