Commit 9c05172d authored by James Zern's avatar James Zern
Browse files

intrapred_test: drop '_t' from local typenames

_t is reserved by posix

+ switch to camelcase
  http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml#Type_Names

Change-Id: I74d7489ea35f988fcfec3651bd16f02e688e406a
parent 75d56b34
...@@ -216,16 +216,16 @@ class IntraPredBase { ...@@ -216,16 +216,16 @@ class IntraPredBase {
int num_planes_; int num_planes_;
}; };
typedef void (*intra_pred_y_fn_t)(MACROBLOCKD *x, typedef void (*IntraPredYFunc)(MACROBLOCKD *x,
uint8_t *yabove_row, uint8_t *yabove_row,
uint8_t *yleft, uint8_t *yleft,
int left_stride, int left_stride,
uint8_t *ypred_ptr, uint8_t *ypred_ptr,
int y_stride); int y_stride);
class IntraPredYTest class IntraPredYTest
: public IntraPredBase, : public IntraPredBase,
public ::testing::TestWithParam<intra_pred_y_fn_t> { public ::testing::TestWithParam<IntraPredYFunc> {
public: public:
static void SetUpTestCase() { static void SetUpTestCase() {
mb_ = reinterpret_cast<MACROBLOCKD*>( mb_ = reinterpret_cast<MACROBLOCKD*>(
...@@ -267,7 +267,7 @@ class IntraPredYTest ...@@ -267,7 +267,7 @@ class IntraPredYTest
data_ptr_[0], kStride)); data_ptr_[0], kStride));
} }
intra_pred_y_fn_t pred_fn_; IntraPredYFunc pred_fn_;
static uint8_t* data_array_; static uint8_t* data_array_;
static MACROBLOCKD * mb_; static MACROBLOCKD * mb_;
static MODE_INFO *mi_; static MODE_INFO *mi_;
...@@ -295,19 +295,19 @@ INSTANTIATE_TEST_CASE_P(SSSE3, IntraPredYTest, ...@@ -295,19 +295,19 @@ INSTANTIATE_TEST_CASE_P(SSSE3, IntraPredYTest,
vp8_build_intra_predictors_mby_s_ssse3)); vp8_build_intra_predictors_mby_s_ssse3));
#endif #endif
typedef void (*intra_pred_uv_fn_t)(MACROBLOCKD *x, typedef void (*IntraPredUvFunc)(MACROBLOCKD *x,
uint8_t *uabove_row, uint8_t *uabove_row,
uint8_t *vabove_row, uint8_t *vabove_row,
uint8_t *uleft, uint8_t *uleft,
uint8_t *vleft, uint8_t *vleft,
int left_stride, int left_stride,
uint8_t *upred_ptr, uint8_t *upred_ptr,
uint8_t *vpred_ptr, uint8_t *vpred_ptr,
int pred_stride); int pred_stride);
class IntraPredUVTest class IntraPredUVTest
: public IntraPredBase, : public IntraPredBase,
public ::testing::TestWithParam<intra_pred_uv_fn_t> { public ::testing::TestWithParam<IntraPredUvFunc> {
public: public:
static void SetUpTestCase() { static void SetUpTestCase() {
mb_ = reinterpret_cast<MACROBLOCKD*>( mb_ = reinterpret_cast<MACROBLOCKD*>(
...@@ -349,7 +349,7 @@ class IntraPredUVTest ...@@ -349,7 +349,7 @@ class IntraPredUVTest
data_ptr_[0], data_ptr_[1], kStride); data_ptr_[0], data_ptr_[1], kStride);
} }
intra_pred_uv_fn_t pred_fn_; IntraPredUvFunc pred_fn_;
// We use 24 so that the data pointer of the first pixel in each row of // We use 24 so that the data pointer of the first pixel in each row of
// each macroblock is 8-byte aligned, and this gives us access to the // each macroblock is 8-byte aligned, and this gives us access to the
// top-left and top-right corner pixels belonging to the top-left/right // top-left and top-right corner pixels belonging to the top-left/right
......
Supports Markdown
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