Changeset 245 in SHVCSoftware for branches/SHM-2.1-dev/source/Lib

Timestamp:

30 May 2013, 02:09:16 (12 years ago)

Author:

seregin

Message:

add config parameter for scalability_mask update

Location:

branches/SHM-2.1-dev/source/Lib

Files:

• TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (1 diff)
• TLibEncoder/TEncTop.cpp (modified) (2 diffs)

branches/SHM-2.1-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -913 +913 @@
     READ_FLAG( uiCode, "scalability_mask[i]" ); vps->setScalabilityMask(i, uiCode ? true : false);
     numScalabilityTypes += uiCode;
-    if( i != 1 )
-    {
-      // Multiview and reserved masks are not used in this version of software
-      assert( uiCode == 0 );
-    }
   }
   vps->setNumScalabilityTypes(numScalabilityTypes);

branches/SHM-2.1-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -258 +258 @@
       {
         rpcPic->setSpatialEnhLayerFlag( true );
+
+        //only for scalable extension
+        assert( pcSlice->getVPS()->getScalabilityMask(1) == true );
       }
     }

branches/SHM-2.1-dev/source/Lib/TLibEncoder/TEncTop.cpp

@@ -515 +515 @@
         {
           pcEPic->setSpatialEnhLayerFlag( true );
+
+          //only for scalable extension
+          assert( m_cVPS.getScalabilityMask(1) == true );
         }
       }
@@ -543 +546 @@
         {
           rpcPic->setSpatialEnhLayerFlag( true );
+
+          //only for scalable extension
+          assert( m_cVPS.getScalabilityMask(1) == true );
         }
       }