Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Remy Foray
VVCSoftware_VTM
Commits
6d501d38
Commit
6d501d38
authored
Aug 02, 2019
by
Philipp Merkle
Browse files
- removed type prefixes
- fixed build error
parent
e582c46f
Changes
1
Hide whitespace changes
Inline
Side-by-side
source/Lib/EncoderLib/IntraSearch.cpp
View file @
6d501d38
...
...
@@ -1064,12 +1064,12 @@ bool IntraSearch::estIntraPredLumaQT( CodingUnit &cu, Partitioner &partitioner,
static_vector
<
int
,
FAST_UDI_MAX_RDMODE_NUM
>
rdModeIdxList
;
if
(
testMip
)
{
static_vector
<
ModeInfo
,
FAST_UDI_MAX_RDMODE_NUM
>
uiR
dModeListTemp
;
static_vector
<
ModeInfo
,
FAST_UDI_MAX_RDMODE_NUM
>
r
dModeListTemp
;
for
(
int
i
=
0
;
i
<
uiRdModeList
.
size
();
i
++
)
{
if
(
!
uiRdModeList
[
i
].
mipFlg
&&
uiRdModeList
[
i
].
ispMod
==
NOT_INTRA_SUBPARTITIONS
)
{
uiR
dModeListTemp
.
push_back
(
uiRdModeList
[
i
]
);
r
dModeListTemp
.
push_back
(
uiRdModeList
[
i
]
);
rdModeIdxList
.
push_back
(
i
);
}
}
...
...
@@ -1077,33 +1077,33 @@ bool IntraSearch::estIntraPredLumaQT( CodingUnit &cu, Partitioner &partitioner,
{
if
(
uiRdModeList
[
i
].
mipFlg
||
uiRdModeList
[
i
].
ispMod
!=
NOT_INTRA_SUBPARTITIONS
)
{
uiR
dModeListTemp
.
push_back
(
uiRdModeList
[
i
]
);
r
dModeListTemp
.
push_back
(
uiRdModeList
[
i
]
);
rdModeIdxList
.
push_back
(
i
);
}
}
#if JVET_O0925_MIP_SIMPLIFICATIONS
uiRdModeList
.
resize
(
uiR
dModeListTemp
.
size
());
uiRdModeList
.
resize
(
r
dModeListTemp
.
size
());
#endif
for
(
int
i
=
0
;
i
<
uiRdModeList
.
size
();
i
++
)
{
uiRdModeList
[
i
]
=
uiR
dModeListTemp
[
i
];
uiRdModeList
[
i
]
=
r
dModeListTemp
[
i
];
}
}
#if JVET_O0925_MIP_SIMPLIFICATIONS
else
{
static_vector
<
ModeInfo
,
FAST_UDI_MAX_RDMODE_NUM
>
uiR
dModeListTemp
;
static_vector
<
ModeInfo
,
FAST_UDI_MAX_RDMODE_NUM
>
r
dModeListTemp
;
for
(
int
i
=
0
;
i
<
uiRdModeList
.
size
();
i
++
)
{
if
(
!
uiRdModeList
[
i
].
mipFlg
)
{
uiR
dModeListTemp
.
push_back
(
uiRdModeList
[
i
]
);
r
dModeListTemp
.
push_back
(
uiRdModeList
[
i
]
);
}
}
uiRdModeList
.
resize
(
uiR
dModeListTemp
.
size
());
for
(
int
i
=
0
;
i
<
uiR
dModeListTemp
.
size
();
i
++
)
uiRdModeList
.
resize
(
r
dModeListTemp
.
size
());
for
(
int
i
=
0
;
i
<
r
dModeListTemp
.
size
();
i
++
)
{
uiRdModeList
[
i
]
=
uiR
dModeListTemp
[
i
];
uiRdModeList
[
i
]
=
r
dModeListTemp
[
i
];
}
}
#endif
...
...
@@ -4238,9 +4238,9 @@ void IntraSearch::reduceHadCandList(static_vector<T, N>& candModeList, static_ve
for
(
int
idx
=
0
;
idx
<
candModeList
.
size
()
-
(
keepOneMip
?
0
:
1
);
idx
++
)
{
bool
addMode
=
false
;
const
ModeInfo
&
uiO
rgMode
=
candModeList
[
idx
];
const
ModeInfo
&
o
rgMode
=
candModeList
[
idx
];
if
(
!
uiO
rgMode
.
mipFlg
)
if
(
!
o
rgMode
.
mipFlg
)
{
addMode
=
(
numConv
<
3
);
numConv
+=
addMode
?
1
:
0
;
...
...
@@ -4253,7 +4253,7 @@ void IntraSearch::reduceHadCandList(static_vector<T, N>& candModeList, static_ve
}
if
(
addMode
)
{
tempRdModeList
.
push_back
(
uiO
rgMode
);
tempRdModeList
.
push_back
(
o
rgMode
);
tempCandCostList
.
push_back
(
candCostList
[
idx
]);
}
}
...
...
@@ -4262,8 +4262,8 @@ void IntraSearch::reduceHadCandList(static_vector<T, N>& candModeList, static_ve
{
// Sort MIP candidates by Hadamard cost
const
int
transpOff
=
getNumModesMip
(
pu
.
Y
())
/
2
;
static_vector
<
uint8_t
,
3
>
sortedMipModes
(
0
);
static_vector
<
double
,
3
>
sortedMipCost
(
0
);
static_vector
<
uint8_t
,
FAST_UDI_MAX_RDMODE_NUM
>
sortedMipModes
(
0
);
static_vector
<
double
,
FAST_UDI_MAX_RDMODE_NUM
>
sortedMipCost
(
0
);
for
(
uint8_t
mode
:
{
3
,
4
,
5
})
{
uint8_t
candMode
=
mode
+
uint8_t
((
mipHadCost
[
mode
+
transpOff
]
<
mipHadCost
[
mode
])
?
transpOff
:
0
);
...
...
@@ -4275,7 +4275,7 @@ void IntraSearch::reduceHadCandList(static_vector<T, N>& candModeList, static_ve
{
const
ModeInfo
mipMode
(
true
,
0
,
NOT_INTRA_SUBPARTITIONS
,
sortedMipModes
[
idx
]);
bool
alreadyIncluded
=
false
;
for
(
int
modeListIdx
=
0
;
modeListIdx
<
numModesForFullRD
;
modeListIdx
++
)
for
(
int
modeListIdx
=
0
;
modeListIdx
<
tempRdModeList
.
size
()
;
modeListIdx
++
)
{
if
(
tempRdModeList
[
modeListIdx
]
==
mipMode
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment