Changeset 1453 in SHVCSoftware for branches/SHM-dev/source

Timestamp:

19 Aug 2015, 03:06:47 (9 years ago)

Author:

seregin

Message:

add a check for scalability id in zero motion constraint

File:

• branches/SHM-dev/source/Lib/TLibCommon/TComPrediction.cpp (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibCommon/TComPrediction.cpp

@@ -584 +584 @@
 
 #if REF_IDX_ME_ZEROMV
-      // It is a requirement of bitstream conformance that the variables mvLX[ 0 ] and mvLX[ 1 ] shall be equal to 0 if the value of refIdxLX corresponds to an inter-layer reference picture. 
-      assert( cMv.getHor() == 0 && cMv.getVer() == 0 );
+      // It is a requirement of bitstream conformance that the variables mvLX[ 0 ] and mvLX[ 1 ] shall be equal to 0 if the value of refIdxLX corresponds to an inter-layer reference picture.
+      if( pcCU->getSlice()->getVPS()->getScalabilityMask( SCALABILITY_ID ) )
+      {
+        assert( cMv.getHor() == 0 && cMv.getVer() == 0 );
+      }
 #endif
     }