Changeset 349 in SHVCSoftware for trunk

Timestamp:

19 Aug 2013, 16:09:42 (11 years ago)

Author:

seregin

Message:

merge SHM-3.0-dev branch

Location:

trunk

Files:

• . (modified) (1 prop)
• build/linux/makefile (modified) (1 diff)
• source (modified) (1 prop)
• source/Lib/TLibCommon/TComSlice.cpp (modified) (1 diff)

trunk/build/linux/makefile

@@ -36 +36 @@
         $(MAKE) -C app/TAppDecoder      release MM32=$(M32)
         $(MAKE) -C app/TAppEncoder      release MM32=$(M32)
-        $(MAKE) -C app/DownConvert      release MM32=$(M32)
+        $(MAKE) -C app/TAppDownConvert      release MM32=$(M32)
         $(MAKE) -C utils/annexBbytecount       release MM32=$(M32)
         $(MAKE) -C utils/convert_NtoMbit_YCbCr release MM32=$(M32)

trunk/source/Lib/TLibCommon/TComSlice.cpp

@@ -679 +679 @@
     assert(cIdx >= 0 && cIdx < numPocTotalCurr);
     m_apcRefPicList[0][rIdx] = rpsCurrList0[ cIdx ];
+#if RPL_INIT_N0316_N0082
+    m_bIsUsedAsLongTerm[0][rIdx] = ( cIdx >= NumPocStCurr0 && cIdx < NumPocStCurr0 + m_activeNumILRRefIdx );
+#else
     m_bIsUsedAsLongTerm[0][rIdx] = ( cIdx >= NumPocStCurr0 + NumPocStCurr1 );
+#endif
   }
   if ( m_eSliceType != B_SLICE )