Changeset 1321 in 3DVCSoftware for trunk/source/App/TAppEncoder

Timestamp:

7 Sep 2015, 18:16:33 (10 years ago)

Author:

tech

Message:

Merged 15.0-dev0@1320.

File:

• trunk/source/App/TAppEncoder/TAppEncTop.cpp (modified) (4 diffs)

trunk/source/App/TAppEncoder/TAppEncTop.cpp

@@ -260 +260 @@
   {
     m_cListPicYuvRec            .push_back(new TComList<TComPicYuv*>) ;
+
+#if !NH_MV
     m_ivPicLists.push_back( m_acTEncTopList[ layerIdInVps ]->getListPic()  ); 
+#endif
+
     TEncTop& m_cTEncTop = *m_acTEncTopList[ layerIdInVps ];  // It is not a member, but this name helps avoiding code duplication !!!
 
-    Int layerId = vps.getLayerIdInNuh( layerIdInVps );
+    Int layerId = vps.getLayerIdInNuh          ( layerIdInVps );
+#if NH_MV
+    m_ivPicLists.getSubDpb( layerId, true ); 
+#endif
+
     m_cTEncTop.setLayerIdInVps                 ( layerIdInVps ); 
     m_cTEncTop.setLayerId                      ( layerId );    
@@ -1216 +1224 @@
   }
 #if NH_MV
-    }
+}
   }
 #endif  
@@ -1766 +1774 @@
       // check if all inter layer reference pictures specified in the gop entry are valid reference layer pictures when allRefLayerActiveFlag is equal to 1 
       // (Should actually always be true) 
-      Bool maxTidIlRefAndSubLayerMaxVaildFlag = true; 
+      Bool maxTidIlRefAndSubLayerMaxValidFlag = true; 
       for( Int l = 0; l < ge.m_numActiveRefLayerPics; l++ )
       {   
@@ -1784 +1792 @@
           }          
         }
-       maxTidIlRefAndSubLayerMaxVaildFlag = maxTidIlRefAndSubLayerMaxVaildFlag && referenceLayerFoundFlag;  
-      }
-      assert ( maxTidIlRefAndSubLayerMaxVaildFlag ); // Something wrong with MaxTidIlRefPicsPlus1 or SubLayersVpsMaxMinus1
+       maxTidIlRefAndSubLayerMaxValidFlag = maxTidIlRefAndSubLayerMaxValidFlag && referenceLayerFoundFlag;  
+      }
+      assert ( maxTidIlRefAndSubLayerMaxValidFlag ); // Something wrong with MaxTidIlRefPicsPlus1 or SubLayersVpsMaxMinus1
     }            
   }