Changeset 427 in SHVCSoftware for branches/SHM-3.1-dev/source/Lib/TLibEncoder

Timestamp:

10 Oct 2013, 08:21:30 (11 years ago)

Author:

qualcomm

Message:

N0147 : setting based on intraPeriod of dependent layers

Location:

branches/SHM-3.1-dev/source/Lib/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (2 diffs)
• TEncGOP.cpp (modified) (1 diff)

branches/SHM-3.1-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -880 +880 @@
   }
 
-  for( Int i = 0; i < vps->getNumViews(); i++ )
+  for(  i = 0; i < vps->getNumViews(); i++ )
   {
     WRITE_CODE( vps->getViewIdVal( i ), vps->getViewIdLenMinus1( ) + 1, "view_id_val[i]" );
@@ -1220 +1220 @@
 
 #if POC_RESET_FLAG
-    Int i = 0;
-    if( pcSlice->getPPS()->getNumExtraSliceHeaderBits() > i )
+    Int iBits = 0;
+    if( pcSlice->getPPS()->getNumExtraSliceHeaderBits() > iBits )
     {
       WRITE_FLAG( pcSlice->getPocResetFlag(), "poc_reset_flag" );
-      i++;
-    }
-    if( pcSlice->getPPS()->getNumExtraSliceHeaderBits() > i )
+      iBits++;
+    }
+    if( pcSlice->getPPS()->getNumExtraSliceHeaderBits() > iBits )
     {
       assert(!!"discardable_flag");
       WRITE_FLAG(pcSlice->getDiscardableFlag(), "discardable_flag");
-      i++;
-    }
-    for ( ; i < pcSlice->getPPS()->getNumExtraSliceHeaderBits(); i++)
+      iBits++;
+    }
+    for ( ; iBits < pcSlice->getPPS()->getNumExtraSliceHeaderBits(); iBits++)
     {
       assert(!!"slice_reserved_undetermined_flag[]");

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

@@ -777 +777 @@
           TComList<TComPic*> *cListPic = m_ppcTEncTop[m_layerId]->getRefLayerEnc(0)->getListPic();
           TComPic* picLayer0 = pcSlice->getRefPic(*cListPic, pcSlice->getPOC() );
-          if( picLayer0->getSlice(0)->isIRAP() && picLayer0)
+          if(picLayer0)
           {
             pcSlice->setNalUnitType(picLayer0->getSlice(0)->getNalUnitType());