Commit 2c714ac8 authored by Frank Bossen's avatar Frank Bossen

Merge branch 'tracefix-triangle' into 'master'

fix compilation when TRACE and JVET_M0883_TRIANGLE_SIGNALING are enabled

See merge request jvet/VVCSoftware_VTM!219
parents a57029fb d4558e1a
Pipeline #708 passed with stage
......@@ -273,7 +273,11 @@ void CDTrace::dtrace_polygon_vector(int k, int poc, const std::vector<Position>
void retrieveTriangularMvInfo(const PredictionUnit& pu, MotionInfo& mi0, MotionInfo& mi1)
{
#if JVET_M0883_TRIANGLE_SIGNALING
int triangleDir = pu.triangleSplitDir;
#else
int triangleDir = g_triangleCombination[pu.mergeIdx][0];
#endif
CMotionBuf mb = pu.getMotionBuf();
bool foundMv[2] = { false, false };
bool foundBi = false;
......@@ -325,7 +329,11 @@ void retrieveTriangularMvInfo(const PredictionUnit& pu, MotionInfo& mi0, MotionI
}
void retrieveTrianglePolygon(const PredictionUnit& pu, std::vector<Position>& triangle0, std::vector<Position>& triangle1, Position& S, Position& E)
{
#if JVET_M0883_TRIANGLE_SIGNALING
TriangleSplit triangleDir = TriangleSplit(pu.triangleSplitDir);
#else
TriangleSplit triangleDir = TriangleSplit(g_triangleCombination[pu.mergeIdx][0]);
#endif
Position TL = pu.Y().topLeft();
Position TR = pu.Y().topRight(); TR = TR.offset(1, 0);
Position BL = pu.Y().bottomLeft(); BL = BL.offset(0, 1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment