Changeset 1143 in SHVCSoftware

Timestamp:

7 Jul 2015, 23:33:29 (9 years ago)

Author:

seregin

Message:

macro cleanup: P0079_DERIVE_NUMACTIVE_REF_PICS

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (2 diffs)

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

@@ -150 +150 @@
 #define MOTION_RESAMPLING_CONSTRAINT     1      ///< JCTVC-N0108: Allow maximum of one motion resampling process for direct reference layers, and use motion inter-layer prediction from the same layer as texture inter-layer prediction.
 #define VPS_TSLAYERS                     1      ///< JCTVC-O0120 signal max temporal sub-layers for each layer
-#define P0079_DERIVE_NUMACTIVE_REF_PICS  1      ///< JCTVC-P0079 Modification of derivation of variable NumActiveRefLayerPics
 
 #define VIEW_ID_RELATED_SIGNALING        1      ///< Introduce syntax elements view_id and view_id_val

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

@@ -1533 +1533 @@
           else
           {
-#if P0079_DERIVE_NUMACTIVE_REF_PICS
             for( Int i = 0; i < pcSlice->getNumILRRefIdx(); i++ ) 
             {
@@ -1543 +1542 @@
               }
             }
-#else
-            pcSlice->setActiveNumILRRefIdx(1);
-#endif 
           }