Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
8e9c9f11
Commit
8e9c9f11
authored
Mar 20, 2014
by
Tom Finegan
Committed by
Gerrit Code Review
Mar 20, 2014
Browse files
Merge "intrapred_test: fix inheritance"
parents
03d75182
9d7080e9
Changes
1
Hide whitespace changes
Inline
Side-by-side
test/intrapred_test.cc
View file @
8e9c9f11
...
...
@@ -26,11 +26,7 @@ using libvpx_test::ACMRandom;
class
IntraPredBase
{
public:
virtual
~
IntraPredBase
()
{}
virtual
void
TearDown
()
{
libvpx_test
::
ClearSystemState
();
}
virtual
~
IntraPredBase
()
{
libvpx_test
::
ClearSystemState
();
}
protected:
void
SetupMacroblock
(
MACROBLOCKD
*
mbptr
,
...
...
@@ -227,8 +223,9 @@ typedef void (*intra_pred_y_fn_t)(MACROBLOCKD *x,
uint8_t
*
ypred_ptr
,
int
y_stride
);
class
IntraPredYTest
:
public
::
testing
::
TestWithParam
<
intra_pred_y_fn_t
>
,
protected
IntraPredBase
{
class
IntraPredYTest
:
public
IntraPredBase
,
public
::
testing
::
TestWithParam
<
intra_pred_y_fn_t
>
{
public:
static
void
SetUpTestCase
()
{
mb_
=
reinterpret_cast
<
MACROBLOCKD
*>
(
...
...
@@ -308,8 +305,9 @@ typedef void (*intra_pred_uv_fn_t)(MACROBLOCKD *x,
uint8_t
*
vpred_ptr
,
int
pred_stride
);
class
IntraPredUVTest
:
public
::
testing
::
TestWithParam
<
intra_pred_uv_fn_t
>
,
protected
IntraPredBase
{
class
IntraPredUVTest
:
public
IntraPredBase
,
public
::
testing
::
TestWithParam
<
intra_pred_uv_fn_t
>
{
public:
static
void
SetUpTestCase
()
{
mb_
=
reinterpret_cast
<
MACROBLOCKD
*>
(
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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