Changeset 1431 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder

Timestamp:

10 Aug 2015, 20:28:49 (10 years ago)

Author:

seregin

Message:

scaling factors 1x

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• TDecGop.cpp (modified) (1 diff)
• TDecTop.cpp (modified) (1 diff)

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

@@ -219 +219 @@
         assert( pcSlice->getPic()->getPosScalingFactor(refLayerIdc, 1) );
 
-        printf( "%d(%d, {%1.2f, %1.2f}x)", pcSlice->getRefPOC(RefPicList(iRefList), iRefIndex), refLayerId, 65536.0/pcSlice->getPic()->getPosScalingFactor(refLayerIdc, 0), 65536.0/pcSlice->getPic()->getPosScalingFactor(refLayerIdc, 1) );
+        printf( "%d(%d, {%1.2f, %1.2f}x)", pcSlice->getRefPOC(RefPicList(iRefList), iRefIndex), refLayerId, (Double)POS_SCALING_FACTOR_1X/pcSlice->getPic()->getPosScalingFactor(refLayerIdc, 0), (Double)POS_SCALING_FACTOR_1X/pcSlice->getPic()->getPosScalingFactor(refLayerIdc, 1) );
       }
       else

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

@@ -1658 +1658 @@
 
         m_pcPic->setMvScalingFactor( refLayerIdc, 
-                                     widthEL  == widthBL  ? 4096 : Clip3(-4096, 4095, ((widthEL  << 8) + (widthBL  >> 1)) / widthBL), 
-                                     heightEL == heightBL ? 4096 : Clip3(-4096, 4095, ((heightEL << 8) + (heightBL >> 1)) / heightBL) );
+                                     widthEL  == widthBL  ? MV_SCALING_FACTOR_1X : Clip3(-4096, 4095, ((widthEL  << 8) + (widthBL  >> 1)) / widthBL), 
+                                     heightEL == heightBL ? MV_SCALING_FACTOR_1X : Clip3(-4096, 4095, ((heightEL << 8) + (heightBL >> 1)) / heightBL) );
 
         m_pcPic->setPosScalingFactor( refLayerIdc,