diff options
Diffstat (limited to 'third_party/aom/test/util.h')
| -rw-r--r-- | third_party/aom/test/util.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/third_party/aom/test/util.h b/third_party/aom/test/util.h index d1587b6ea..db00875ef 100644 --- a/third_party/aom/test/util.h +++ b/third_party/aom/test/util.h @@ -17,9 +17,10 @@ #include "third_party/googletest/src/googletest/include/gtest/gtest.h" #include "aom/aom_integer.h" #include "aom/aom_image.h" +#include "aom_ports/aom_timer.h" // Macros -#define GET_PARAM(k) std::tr1::get<k>(GetParam()) +#define GET_PARAM(k) ::testing::get<k>(GetParam()) inline double compute_psnr(const aom_image_t *img1, const aom_image_t *img2) { assert((img1->fmt == img2->fmt) && (img1->d_w == img2->d_w) && @@ -44,4 +45,9 @@ inline double compute_psnr(const aom_image_t *img1, const aom_image_t *img2) { return psnr; } +static INLINE double get_time_mark(aom_usec_timer *t) { + aom_usec_timer_mark(t); + return static_cast<double>(aom_usec_timer_elapsed(t)); +} + #endif // TEST_UTIL_H_ |