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

Timestamp:

26 Sep 2013, 10:32:02 (11 years ago)

Author:

ericsson

Message:

Scalability mask modification JCT3V-E0104 (Ericsson, A. Norkin)

Location:

branches/SHM-3.1-dev/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (1 diff)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (1 diff)
• TLibEncoder/TEncTop.cpp (modified) (2 diffs)

branches/SHM-3.1-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -496 +496 @@
     }
 #if MAX_ONE_RESAMPLING_DIRECT_LAYERS
+#if SCALABILITY_MASK_E0104
+    if( m_pcVPS->getScalabilityMask(2) )
+#else
     if( m_pcVPS->getScalabilityMask(1) )
+#endif
     {
       Int numResampler = 0;

branches/SHM-3.1-dev/source/Lib/TLibCommon/TypeDef.h

@@ -40 +40 @@
 
 #define SVC_EXTENSION                    1
+
+#define SCALABILITY_MASK_E0104           1
 
 #define SYNTAX_BYTES                     10      ///< number of bytes taken by syntaxes per 4x4 block [RefIdxL0(1byte), RefIdxL1(1byte), MVxL0(2bytes), MVyL0(2bytes), MVxL1(2bytes), MVyL1(2bytes)]

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

@@ -306 +306 @@
 
           //only for scalable extension
+#if SCALABILITY_MASK_E0104
+          assert( pcSlice->getVPS()->getScalabilityMask(2) == true );
+#else
           assert( pcSlice->getVPS()->getScalabilityMask(1) == true );
+#endif
         }
 #if MAX_ONE_RESAMPLING_DIRECT_LAYERS
+#if SCALABILITY_MASK_E0104
+        if(pcSlice->getVPS()->getScalabilityMask(2))
+#else
         if(pcSlice->getVPS()->getScalabilityMask(1))
+#endif
         {
           pcSlice->setPic(rpcPic);

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

@@ -520 +520 @@
 
             //only for scalable extension
+#if SCALABILITY_MASK_E0104
+            assert( m_cVPS.getScalabilityMask(2) == true );
+#else
             assert( m_cVPS.getScalabilityMask(1) == true );
+#endif
           }
         }
@@ -557 +561 @@
 
             //only for scalable extension
+#if SCALABILITY_MASK_E0104
+            assert( m_cVPS.getScalabilityMask(2) == true );
+#else
             assert( m_cVPS.getScalabilityMask(1) == true );
+#endif
           }
         }