Changeset 45 in SHVCSoftware for branches/SHM-1.1-dev/source/Lib/TLibCommon/TComPic.cpp

Timestamp:

22 Feb 2013, 02:13:37 (12 years ago)

Author:

seregin

Message:

reusing base MV scaling function in motion mapping

File:

• branches/SHM-1.1-dev/source/Lib/TLibCommon/TComPic.cpp (modified) (2 diffs)

branches/SHM-1.1-dev/source/Lib/TLibCommon/TComPic.cpp

@@ -645 +645 @@
 #endif
       {
-        for(UInt list = 0; list < 2; list++)  //each list
-        { 
-          TComMv cMv = pcPicBase->getCU(uiBaseCUAddr)->getCUMvField((RefPicList)list)->getMv(uiBaseAbsPartIdx);
-          Int refIdx = pcPicBase->getCU(uiBaseCUAddr)->getCUMvField((RefPicList)list)->getRefIdx(uiBaseAbsPartIdx);
+        for(UInt refPicList = 0; refPicList < 2; refPicList++)  //for each reference list
+        {
+#if REUSE_MVSCALE
+          TComMvField sMvFieldBase, sMvField;
+          pcPicBase->getCU(uiBaseCUAddr)->getMvField( pcPicBase->getCU(uiBaseCUAddr), uiBaseAbsPartIdx, (RefPicList)refPicList, sMvFieldBase);
+          pcCUDes->scaleBaseMV( sMvField, sMvFieldBase );
+#else
+          TComMv cMv = pcPicBase->getCU(uiBaseCUAddr)->getCUMvField((RefPicList)refPicList)->getMv(uiBaseAbsPartIdx);
+          Int refIdx = pcPicBase->getCU(uiBaseCUAddr)->getCUMvField((RefPicList)refPicList)->getRefIdx(uiBaseAbsPartIdx);
 
           Int Hor =  ((Int)upSampleRatio * cMv.getHor())/2 ;
@@ -656 +661 @@
           TComMvField sMvField;
           sMvField.setMvField(cScaledMv, refIdx);
-
-          pcCUDes->getCUMvField((RefPicList)list)->setMvField(sMvField, uiAbsPartIdx);
+#endif
+
+          pcCUDes->getCUMvField((RefPicList)refPicList)->setMvField(sMvField, uiAbsPartIdx);
           pcCUDes->setPredictionMode(uiAbsPartIdx, MODE_INTER);
         }