Changeset 844 in SHVCSoftware for branches/SHM-dev

Timestamp:

28 Jul 2014, 20:30:39 (10 years ago)

Author:

qualcomm

Message:

Revision to the implementation of conformance checking such that representation format of a particular layer shall not be greater than the one defined in VPS for that layer

Update is in the implementation in function TDecCavlc::parseSliceHeader such that the checking is done only if VPS Extension is present.

Adoption of JCTVC-R0227. (Macro: R0227_REP_FORMAT_CONSTRAINT)

From: Hendry <fhendry@…>

File:

• branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (2 diffs)

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

@@ -2530 +2530 @@
   TComVPS* vps = NULL;
   vps = parameterSetManager->getPrefetchedVPS(sps->getVPSId());
-  if ( rpcSlice->getLayerId() == 0 )
+  if ( rpcSlice->getLayerId() == 0 && vps->getVpsExtensionFlag() == 1 )
   {
     assert( sps->getPicWidthInLumaSamples() <= vps->getVpsRepFormat( vps->getVpsRepFormatIdx(0) )->getPicWidthVpsInLumaSamples() );
@@ -2538 +2538 @@
     assert( sps->getBitDepthC() <= vps->getVpsRepFormat( vps->getVpsRepFormatIdx(0) )->getBitDepthVpsChroma() );
   }
-  else 
+  else if ( vps->getVpsExtensionFlag() == 1 )
   {
     assert(vps->getVpsRepFormat( vps->getVpsRepFormatIdx(sps->getUpdateRepFormatFlag() ? sps->getUpdateRepFormatIndex() : rpcSlice->getLayerId()))->getPicWidthVpsInLumaSamples() <= vps->getVpsRepFormat( vps->getVpsRepFormatIdx(rpcSlice->getLayerId()))->getPicWidthVpsInLumaSamples());