Changeset 806 in SHVCSoftware for branches/SHM-6-dev/source/Lib/TLibEncoder

Timestamp:

20 Jun 2014, 21:17:30 (11 years ago)

Author:

seregin

Message:

code formatting

File:

• branches/SHM-6-dev/source/Lib/TLibEncoder/TEncGOP.cpp (modified) (8 diffs)

branches/SHM-6-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -610 +610 @@
   TComOutputBitstream* pcSubstreamsOut = NULL;
 #if Q0108_TSA_STSA
-  Int b_TSTA_flag = 0;
+  Int flagTSTA = 0;
 #endif
 
@@ -1559 +1559 @@
       }
     }
-#if    Q0108_TSA_STSA
+#if Q0108_TSA_STSA
     else if( ( pcSlice->getTLayer() == 0 && pcSlice->getLayerId() > 0)    // only for enhancement layer and with temporal layer 0
        && !( pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_RADL_N     
@@ -1572 +1572 @@
     {
         Bool isSTSA=true;
-        for(Int ii=iGOPid+1;(ii<m_pcCfg->getGOPSize() && isSTSA==true);ii++)
+        for(Int ii=iGOPid+1; ii < m_pcCfg->getGOPSize() && isSTSA; ii++)
         {
           Int lTid= m_pcCfg->getGOPEntry(ii).m_temporalId;
@@ -1578 +1578 @@
           {
             TComReferencePictureSet* nRPS = pcSlice->getSPS()->getRPSList()->getReferencePictureSet(ii);
-            for(Int jj=0;jj<nRPS->getNumberOfPictures();jj++)
+            for(Int jj=0; jj<nRPS->getNumberOfPictures(); jj++)
             {
               if(nRPS->getUsed(jj)) 
@@ -1584 +1584 @@
                 Int tPoc=m_pcCfg->getGOPEntry(ii).m_POC+nRPS->getDeltaPOC(jj);
                 Int kk=0;
-                for(kk=0;kk<m_pcCfg->getGOPSize();kk++)
+                for(kk=0; kk<m_pcCfg->getGOPSize(); kk++)
                 {
                   if(m_pcCfg->getGOPEntry(kk).m_POC==tPoc)
+                  {
                     break;
+                  }
                 }
                 Int tTid=m_pcCfg->getGOPEntry(kk).m_temporalId;
                 if(tTid >= pcSlice->getTLayer())
                 {
-                  isSTSA=false;
+                  isSTSA = false;
                   break;
                 }
@@ -1661 +1663 @@
           {
             pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_STSA_N);
-            b_TSTA_flag = 1;
+            flagTSTA = 1;
           }
           else
           {
             pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_STSA_R);
-            b_TSTA_flag = 1;
+            flagTSTA = 1;
           }
 #endif
@@ -1684 +1686 @@
     {
 #if POC_RESET_FLAG || POC_RESET_IDC_ENCODER
-      if ( pocCurr > 0          && pcSlice->isRADL() && pcPic->getSlice(0)->getBaseColPic(pcPic->getSlice(0)->getInterLayerPredLayerIdc(0))->getSlice(0)->isRASL())
+      if ( pocCurr > 0 && pcSlice->isRADL() && pcPic->getSlice(0)->getBaseColPic(pcPic->getSlice(0)->getInterLayerPredLayerIdc(0))->getSlice(0)->isRASL())
 #else
       if (pcSlice->getPOC()>0  && pcSlice->isRADL() && pcPic->getSlice(0)->getBaseColPic(pcPic->getSlice(0)->getInterLayerPredLayerIdc(0))->getSlice(0)->isRASL())
@@ -1692 +1694 @@
         pcSlice->setInterLayerPredEnabledFlag(0);
       }
-#if   Q0108_TSA_STSA
-     if( (pcSlice->getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP && pcSlice->getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA ) || b_TSTA_flag == 1)
+#if Q0108_TSA_STSA
+     if( ( pcSlice->getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP && pcSlice->getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA ) || flagTSTA == 1 )
 #else
      if( pcSlice->getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP && pcSlice->getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA )