Changeset 1308 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder

Timestamp:

21 Jul 2015, 01:22:32 (9 years ago)

Author:

seregin

Message:

port rev 4379

File:

• branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp (modified) (2 diffs)

branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -3211 +3211 @@
   {
     const ComponentID ch=ComponentID(chan);
-    const Pel*  pOrg    = (conversion!=IPCOLOURSPACE_UNCHANGED) ? pcPic ->getPicYuvTrueOrg()->getAddr(ch) : pcPic ->getPicYuvOrg()->getAddr(ch);
-    Pel*  pRec    = picd.getAddr(ch);
-    const Int   iStride = pcPicD->getStride(ch);
-
+    const TComPicYuv *pOrgPicYuv =(conversion!=IPCOLOURSPACE_UNCHANGED) ? pcPic ->getPicYuvTrueOrg() : pcPic ->getPicYuvOrg();
+    const Pel*  pOrg       = pOrgPicYuv->getAddr(ch);
+    const Int   iOrgStride = pOrgPicYuv->getStride(ch);
+    Pel*  pRec             = picd.getAddr(ch);
+    const Int   iRecStride = picd.getStride(ch);
     const Int   iWidth  = pcPicD->getWidth (ch) - (m_pcEncTop->getPad(0) >> pcPic->getComponentScaleX(ch));
     const Int   iHeight = pcPicD->getHeight(ch) - ((m_pcEncTop->getPad(1) >> (pcPic->isField()?1:0)) >> pcPic->getComponentScaleY(ch));
@@ -3228 +3229 @@
         uiSSDtemp   += iDiff * iDiff;
       }
-      pOrg += iStride;
-      pRec += iStride;
+      pOrg += iOrgStride;
+      pRec += iRecStride;
     }
 #if SVC_EXTENSION