# HG changeset patch
# User Steve Borho <[email protected]>
# Date 1425065260 21600
# Fri Feb 27 13:27:40 2015 -0600
# Node ID 4c25a661122b0df50bcf6fb3996bf0cc0bc213b9
# Parent b2eba4f626683e4064d2cb3de380b3b64fb8eaa2
predict: move intra functions together in predict.cpp (no change)
diff -r b2eba4f62668 -r 4c25a661122b source/common/predict.cpp
--- a/source/common/predict.cpp Fri Feb 27 13:11:19 2015 -0600
+++ b/source/common/predict.cpp Fri Feb 27 13:27:40 2015 -0600
@@ -79,35 +79,6 @@
return false;
}
-void Predict::predIntraLumaAng(uint32_t dirMode, pixel* dst, intptr_t stride,
uint32_t log2TrSize)
-{
- int sizeIdx = log2TrSize - 2;
- int tuSize = 1 << log2TrSize;
- int filter = !!(g_intraFilterFlags[dirMode] & tuSize);
- X265_CHECK(sizeIdx >= 0 && sizeIdx < 4, "intra block size is out of
range\n");
-
- bool bFilter = log2TrSize <= 4;
- primitives.cu[sizeIdx].intra_pred[dirMode](dst, stride,
intraNeighbourBuf[filter], dirMode, bFilter);
-}
-
-void Predict::predIntraChromaAng(uint32_t dirMode, pixel* dst, intptr_t
stride, uint32_t log2TrSizeC, int chFmt)
-{
- int tuSize = 1 << log2TrSizeC;
- int sizeIdx = log2TrSizeC - 2;
- X265_CHECK(sizeIdx >= 0 && sizeIdx < 4, "intra block size is out of
range\n");
-
- pixel* srcBuf = intraNeighbourBuf[0];
-
- if (chFmt == X265_CSP_I444 && (g_intraFilterFlags[dirMode] & tuSize))
- {
- primitives.cu[sizeIdx].intra_filter(intraNeighbourBuf[0],
intraNeighbourBuf[1]);
- srcBuf = intraNeighbourBuf[1];
- }
-
- primitives.cu[sizeIdx].intra_pred[dirMode](dst, stride, srcBuf, dirMode,
0);
-}
-
-
void Predict::motionCompensation(const CUData& cu, const PredictionUnit& pu,
Yuv& predYuv, bool bLuma, bool bChroma)
{
int refIdx0 = cu.m_refIdx[0][pu.puAbsPartIdx];
@@ -609,6 +580,34 @@
}
}
+void Predict::predIntraLumaAng(uint32_t dirMode, pixel* dst, intptr_t stride,
uint32_t log2TrSize)
+{
+ int sizeIdx = log2TrSize - 2;
+ int tuSize = 1 << log2TrSize;
+ int filter = !!(g_intraFilterFlags[dirMode] & tuSize);
+ X265_CHECK(sizeIdx >= 0 && sizeIdx < 4, "intra block size is out of
range\n");
+
+ bool bFilter = log2TrSize <= 4;
+ primitives.cu[sizeIdx].intra_pred[dirMode](dst, stride,
intraNeighbourBuf[filter], dirMode, bFilter);
+}
+
+void Predict::predIntraChromaAng(uint32_t dirMode, pixel* dst, intptr_t
stride, uint32_t log2TrSizeC, int chFmt)
+{
+ int tuSize = 1 << log2TrSizeC;
+ int sizeIdx = log2TrSizeC - 2;
+ X265_CHECK(sizeIdx >= 0 && sizeIdx < 4, "intra block size is out of
range\n");
+
+ pixel* srcBuf = intraNeighbourBuf[0];
+
+ if (chFmt == X265_CSP_I444 && (g_intraFilterFlags[dirMode] & tuSize))
+ {
+ primitives.cu[sizeIdx].intra_filter(intraNeighbourBuf[0],
intraNeighbourBuf[1]);
+ srcBuf = intraNeighbourBuf[1];
+ }
+
+ primitives.cu[sizeIdx].intra_pred[dirMode](dst, stride, srcBuf, dirMode,
0);
+}
+
void Predict::initAdiPattern(const CUData& cu, const CUGeom& cuGeom, uint32_t
puAbsPartIdx, const IntraNeighbors& intraNeighbors, int dirMode)
{
int tuSize = 1 << intraNeighbors.log2TrSize;
_______________________________________________
x265-devel mailing list
[email protected]
https://mailman.videolan.org/listinfo/x265-devel
