Commit 123e8a60 authored by Johann's avatar Johann Committed by Johann Koenig

adopt some clang 5.0.0 formatting

At least the changes that don't conflict with 4.0.1

Change-Id: Iaa2fda027b8ab2b023d608cf5ec7b377a72b851e
parent e2994a5c
...@@ -26,8 +26,8 @@ double aom_sse_to_psnr(double samples, double peak, double sse) { ...@@ -26,8 +26,8 @@ double aom_sse_to_psnr(double samples, double peak, double sse) {
} }
/* TODO(yaowu): The block_variance calls the unoptimized versions of variance() /* TODO(yaowu): The block_variance calls the unoptimized versions of variance()
* and highbd_8_variance(). It should not. * and highbd_8_variance(). It should not.
*/ */
static void encoder_variance(const uint8_t *a, int a_stride, const uint8_t *b, static void encoder_variance(const uint8_t *a, int a_stride, const uint8_t *b,
int b_stride, int w, int h, unsigned int *sse, int b_stride, int w, int h, unsigned int *sse,
int *sum) { int *sum) {
......
...@@ -27,13 +27,13 @@ typedef struct { ...@@ -27,13 +27,13 @@ typedef struct {
} PSNR_STATS; } PSNR_STATS;
/*!\brief Converts SSE to PSNR /*!\brief Converts SSE to PSNR
* *
* Converts sum of squared errros (SSE) to peak signal-to-noise ratio (PNSR). * Converts sum of squared errros (SSE) to peak signal-to-noise ratio (PNSR).
* *
* \param[in] samples Number of samples * \param[in] samples Number of samples
* \param[in] peak Max sample value * \param[in] peak Max sample value
* \param[in] sse Sum of squared errors * \param[in] sse Sum of squared errors
*/ */
double aom_sse_to_psnr(double samples, double peak, double sse); double aom_sse_to_psnr(double samples, double peak, double sse);
int64_t aom_get_y_sse_part(const YV12_BUFFER_CONFIG *a, int64_t aom_get_y_sse_part(const YV12_BUFFER_CONFIG *a,
const YV12_BUFFER_CONFIG *b, int hstart, int width, const YV12_BUFFER_CONFIG *b, int hstart, int width,
......
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
***************************************************************************/ ***************************************************************************/
/**************************************************************************** /****************************************************************************
* Header Files * Header Files
****************************************************************************/ ****************************************************************************/
#include "./aom_scale_rtcd.h" #include "./aom_scale_rtcd.h"
#include "aom_mem/aom_mem.h" #include "aom_mem/aom_mem.h"
#include "aom_scale/aom_scale.h" #include "aom_scale/aom_scale.h"
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
#include "aom_scale/aom_scale.h" #include "aom_scale/aom_scale.h"
#include "aom_mem/aom_mem.h" #include "aom_mem/aom_mem.h"
/**************************************************************************** /****************************************************************************
* Imports * Imports
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* *
......
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
#include "aom_scale/yv12config.h" #include "aom_scale/yv12config.h"
/**************************************************************************** /****************************************************************************
* Exports * Exports
****************************************************************************/ ****************************************************************************/
/**************************************************************************** /****************************************************************************
* *
......
...@@ -15,10 +15,11 @@ ...@@ -15,10 +15,11 @@
static void yuvconfig2image(aom_image_t *img, const YV12_BUFFER_CONFIG *yv12, static void yuvconfig2image(aom_image_t *img, const YV12_BUFFER_CONFIG *yv12,
void *user_priv) { void *user_priv) {
/** aom_img_wrap() doesn't allow specifying independent strides for /* aom_img_wrap() doesn't allow specifying independent strides for
* the Y, U, and V planes, nor other alignment adjustments that * the Y, U, and V planes, nor other alignment adjustments that
* might be representable by a YV12_BUFFER_CONFIG, so we just * might be representable by a YV12_BUFFER_CONFIG, so we just
* initialize all the fields.*/ * initialize all the fields.
*/
int bps; int bps;
if (!yv12->subsampling_y) { if (!yv12->subsampling_y) {
if (!yv12->subsampling_x) { if (!yv12->subsampling_x) {
......
...@@ -314,13 +314,14 @@ static void loop_filter_rows_mt(YV12_BUFFER_CONFIG *frame, AV1_COMMON *cm, ...@@ -314,13 +314,14 @@ static void loop_filter_rows_mt(YV12_BUFFER_CONFIG *frame, AV1_COMMON *cm,
} }
// Set up loopfilter thread data. // Set up loopfilter thread data.
// The decoder is capping num_workers because it has been observed that using // The decoder is capping num_workers because it has been observed that
// more threads on the loopfilter than there are cores will hurt performance // using more threads on the loopfilter than there are cores will hurt
// on Android. This is because the system will only schedule the tile decode // performance on Android. This is because the system will only schedule the
// workers on cores equal to the number of tile columns. Then if the decoder // tile decode workers on cores equal to the number of tile columns. Then if
// tries to use more threads for the loopfilter, it will hurt performance // the decoder tries to use more threads for the loopfilter, it will hurt
// because of contention. If the multithreading code changes in the future // performance because of contention. If the multithreading code changes in
// then the number of workers used by the loopfilter should be revisited. // the future then the number of workers used by the loopfilter should be
// revisited.
#if CONFIG_PARALLEL_DEBLOCKING #if CONFIG_PARALLEL_DEBLOCKING
// Initialize cur_sb_col to -1 for all SB rows. // Initialize cur_sb_col to -1 for all SB rows.
......
...@@ -6071,7 +6071,7 @@ static void encode_frame_to_data_rate(AV1_COMP *cpi, size_t *size, ...@@ -6071,7 +6071,7 @@ static void encode_frame_to_data_rate(AV1_COMP *cpi, size_t *size,
#if CONFIG_REFERENCE_BUFFER #if CONFIG_REFERENCE_BUFFER
if (cm->seq_params.frame_id_numbers_present_flag) { if (cm->seq_params.frame_id_numbers_present_flag) {
/* Non-normative definition of current_frame_id ("frame counter" with /* Non-normative definition of current_frame_id ("frame counter" with
* wraparound) */ * wraparound) */
const int frame_id_length = FRAME_ID_LENGTH; const int frame_id_length = FRAME_ID_LENGTH;
if (cm->current_frame_id == -1) { if (cm->current_frame_id == -1) {
int lsb, msb; int lsb, msb;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* obtain it at www.aomedia.org/license/software. If the Alliance for Open * obtain it at www.aomedia.org/license/software. If the Alliance for Open
* Media Patent License 1.0 was not distributed with this source code in the * Media Patent License 1.0 was not distributed with this source code in the
* PATENTS file, you can obtain it at www.aomedia.org/license/patent. * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/ */
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* obtain it at www.aomedia.org/license/software. If the Alliance for Open * obtain it at www.aomedia.org/license/software. If the Alliance for Open
* Media Patent License 1.0 was not distributed with this source code in the * Media Patent License 1.0 was not distributed with this source code in the
* PATENTS file, you can obtain it at www.aomedia.org/license/patent. * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/ */
#include <algorithm> #include <algorithm>
#include "third_party/googletest/src/googletest/include/gtest/gtest.h" #include "third_party/googletest/src/googletest/include/gtest/gtest.h"
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* obtain it at www.aomedia.org/license/software. If the Alliance for Open * obtain it at www.aomedia.org/license/software. If the Alliance for Open
* Media Patent License 1.0 was not distributed with this source code in the * Media Patent License 1.0 was not distributed with this source code in the
* PATENTS file, you can obtain it at www.aomedia.org/license/patent. * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/ */
#include <climits> #include <climits>
#include <vector> #include <vector>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* obtain it at www.aomedia.org/license/software. If the Alliance for Open * obtain it at www.aomedia.org/license/software. If the Alliance for Open
* Media Patent License 1.0 was not distributed with this source code in the * Media Patent License 1.0 was not distributed with this source code in the
* PATENTS file, you can obtain it at www.aomedia.org/license/patent. * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/ */
#include "third_party/googletest/src/googletest/include/gtest/gtest.h" #include "third_party/googletest/src/googletest/include/gtest/gtest.h"
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* obtain it at www.aomedia.org/license/software. If the Alliance for Open * obtain it at www.aomedia.org/license/software. If the Alliance for Open
* Media Patent License 1.0 was not distributed with this source code in the * Media Patent License 1.0 was not distributed with this source code in the
* PATENTS file, you can obtain it at www.aomedia.org/license/patent. * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/ */
#include "./aom_config.h" #include "./aom_config.h"
#include "third_party/googletest/src/googletest/include/gtest/gtest.h" #include "third_party/googletest/src/googletest/include/gtest/gtest.h"
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* obtain it at www.aomedia.org/license/software. If the Alliance for Open * obtain it at www.aomedia.org/license/software. If the Alliance for Open
* Media Patent License 1.0 was not distributed with this source code in the * Media Patent License 1.0 was not distributed with this source code in the
* PATENTS file, you can obtain it at www.aomedia.org/license/patent. * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/ */
#include "third_party/googletest/src/googletest/include/gtest/gtest.h" #include "third_party/googletest/src/googletest/include/gtest/gtest.h"
......
...@@ -12,11 +12,11 @@ ...@@ -12,11 +12,11 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h" #include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/av1_convolve_2d_test_util.h" #include "test/av1_convolve_2d_test_util.h"
using std::tr1::tuple;
using std::tr1::make_tuple;
using libaom_test::ACMRandom; using libaom_test::ACMRandom;
using libaom_test::AV1Convolve2D::AV1Convolve2DTest; using libaom_test::AV1Convolve2D::AV1Convolve2DTest;
using libaom_test::AV1Convolve2D::AV1Convolve2DSrTest; using libaom_test::AV1Convolve2D::AV1Convolve2DSrTest;
using std::tr1::make_tuple;
using std::tr1::tuple;
#if CONFIG_JNT_COMP #if CONFIG_JNT_COMP
using libaom_test::AV1Convolve2D::AV1JntConvolve2DTest; using libaom_test::AV1Convolve2D::AV1JntConvolve2DTest;
#endif #endif
......
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
#include "av1/common/common_data.h" #include "av1/common/common_data.h"
#include "av1/common/convolve.h" #include "av1/common/convolve.h"
using std::tr1::tuple;
using std::tr1::make_tuple; using std::tr1::make_tuple;
using std::tr1::tuple;
namespace libaom_test { namespace libaom_test {
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
namespace { namespace {
using std::tr1::tuple;
using libaom_test::ACMRandom; using libaom_test::ACMRandom;
using std::tr1::tuple;
typedef void (*conv_filter_t)(const uint8_t *, int, uint8_t *, int, int, int, typedef void (*conv_filter_t)(const uint8_t *, int, uint8_t *, int, int, int,
const InterpFilterParams, int, int, const InterpFilterParams, int, int,
......
...@@ -33,9 +33,9 @@ const int kHPad = 32; ...@@ -33,9 +33,9 @@ const int kHPad = 32;
const int kXStepQn = 16; const int kXStepQn = 16;
const int kYStepQn = 20; const int kYStepQn = 20;
using std::tr1::tuple;
using std::tr1::make_tuple;
using libaom_test::ACMRandom; using libaom_test::ACMRandom;
using std::tr1::make_tuple;
using std::tr1::tuple;
enum NTaps { EIGHT_TAP, TEN_TAP, TWELVE_TAP }; enum NTaps { EIGHT_TAP, TEN_TAP, TWELVE_TAP };
int NTapsToInt(NTaps ntaps) { return 8 + static_cast<int>(ntaps) * 2; } int NTapsToInt(NTaps ntaps) { return 8 + static_cast<int>(ntaps) * 2; }
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* obtain it at www.aomedia.org/license/software. If the Alliance for Open * obtain it at www.aomedia.org/license/software. If the Alliance for Open
* Media Patent License 1.0 was not distributed with this source code in the * Media Patent License 1.0 was not distributed with this source code in the
* PATENTS file, you can obtain it at www.aomedia.org/license/patent. * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/ */
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>
......
...@@ -27,8 +27,8 @@ using libaom_test::ACMRandom; ...@@ -27,8 +27,8 @@ using libaom_test::ACMRandom;
namespace { namespace {
typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride, typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride,
const TxfmParam *txfm_param); const TxfmParam *txfm_param);
using std::tr1::tuple;
using libaom_test::FhtFunc; using libaom_test::FhtFunc;
using std::tr1::tuple;
typedef tuple<FhtFunc, IhtFunc, TX_TYPE, aom_bit_depth_t, int> Ht16x16Param; typedef tuple<FhtFunc, IhtFunc, TX_TYPE, aom_bit_depth_t, int> Ht16x16Param;
void fht16x16_ref(const int16_t *in, tran_low_t *out, int stride, void fht16x16_ref(const int16_t *in, tran_low_t *out, int stride,
......
...@@ -28,8 +28,8 @@ using libaom_test::ACMRandom; ...@@ -28,8 +28,8 @@ using libaom_test::ACMRandom;
namespace { namespace {
typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride, typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride,
const TxfmParam *txfm_param); const TxfmParam *txfm_param);
using std::tr1::tuple;
using libaom_test::FhtFunc; using libaom_test::FhtFunc;
using std::tr1::tuple;
typedef tuple<FhtFunc, IhtFunc, TX_TYPE, aom_bit_depth_t, int> Ht16x32Param; typedef tuple<FhtFunc, IhtFunc, TX_TYPE, aom_bit_depth_t, int> Ht16x32Param;
void fht16x32_ref(const int16_t *in, tran_low_t *out, int stride, void fht16x32_ref(const int16_t *in, tran_low_t *out, int stride,
......
...@@ -27,8 +27,8 @@ using libaom_test::ACMRandom; ...@@ -27,8 +27,8 @@ using libaom_test::ACMRandom;
namespace { namespace {
typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride, typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride,
const TxfmParam *txfm_param); const TxfmParam *txfm_param);
using std::tr1::tuple;
using libaom_test::FhtFunc; using libaom_test::FhtFunc;
using std::tr1::tuple;
typedef tuple<FhtFunc, IhtFunc, TX_TYPE, aom_bit_depth_t, int> Ht16x8Param; typedef tuple<FhtFunc, IhtFunc, TX_TYPE, aom_bit_depth_t, int> Ht16x8Param;
void fht16x8_ref(const int16_t *in, tran_low_t *out, int stride, void fht16x8_ref(const int16_t *in, tran_low_t *out, int stride,
......
...@@ -28,8 +28,8 @@ using libaom_test::ACMRandom; ...@@ -28,8 +28,8 @@ using libaom_test::ACMRandom;
namespace { namespace {
typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride, typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride,
const TxfmParam *txfm_param); const TxfmParam *txfm_param);
using std::tr1::tuple;
using libaom_test::FhtFunc; using libaom_test::FhtFunc;
using std::tr1::tuple;
typedef tuple<FhtFunc, IhtFunc, TX_TYPE, aom_bit_depth_t, int> Ht32x16Param; typedef tuple<FhtFunc, IhtFunc, TX_TYPE, aom_bit_depth_t, int> Ht32x16Param;
void fht32x16_ref(const int16_t *in, tran_low_t *out, int stride, void fht32x16_ref(const int16_t *in, tran_low_t *out, int stride,
......
...@@ -26,8 +26,8 @@ using libaom_test::ACMRandom; ...@@ -26,8 +26,8 @@ using libaom_test::ACMRandom;
namespace { namespace {
typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride, typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride,
const TxfmParam *txfm_param); const TxfmParam *txfm_param);
using std::tr1::tuple;
using libaom_test::FhtFunc; using libaom_test::FhtFunc;
using std::tr1::tuple;
typedef tuple<FhtFunc, IhtFunc, TX_TYPE, aom_bit_depth_t, int> Ht32x32Param; typedef tuple<FhtFunc, IhtFunc, TX_TYPE, aom_bit_depth_t, int> Ht32x32Param;
void fht32x32_ref(const int16_t *in, tran_low_t *out, int stride, void fht32x32_ref(const int16_t *in, tran_low_t *out, int stride,
......
...@@ -27,8 +27,8 @@ using libaom_test::ACMRandom; ...@@ -27,8 +27,8 @@ using libaom_test::ACMRandom;
namespace { namespace {
typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride, typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride,
const TxfmParam *txfm_param); const TxfmParam *txfm_param);
using std::tr1::tuple;
using libaom_test::FhtFunc; using libaom_test::FhtFunc;
using std::tr1::tuple;
typedef tuple<FhtFunc, IhtFunc, TX_TYPE, aom_bit_depth_t, int> Ht4x4Param; typedef tuple<FhtFunc, IhtFunc, TX_TYPE, aom_bit_depth_t, int> Ht4x4Param;
void fht4x4_ref(const int16_t *in, tran_low_t *out, int stride, void fht4x4_ref(const int16_t *in, tran_low_t *out, int stride,
......
...@@ -27,8 +27,8 @@ using libaom_test::ACMRandom; ...@@ -27,8 +27,8 @@ using libaom_test::ACMRandom;
namespace { namespace {
typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride, typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride,
const TxfmParam *txfm_param); const TxfmParam *txfm_param);
using std::tr1::tuple;
using libaom_test::FhtFunc; using libaom_test::FhtFunc;
using std::tr1::tuple;
typedef tuple<FhtFunc, IhtFunc, TX_TYPE, aom_bit_depth_t, int> Ht4x8Param; typedef tuple<FhtFunc, IhtFunc, TX_TYPE, aom_bit_depth_t, int> Ht4x8Param;
void fht4x8_ref(const int16_t *in, tran_low_t *out, int stride, void fht4x8_ref(const int16_t *in, tran_low_t *out, int stride,
......
...@@ -27,8 +27,8 @@ using libaom_test::ACMRandom; ...@@ -27,8 +27,8 @@ using libaom_test::ACMRandom;
namespace { namespace {
typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride, typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride,
const TxfmParam *txfm_param); const TxfmParam *txfm_param);
using std::tr1::tuple;
using libaom_test::FhtFunc; using libaom_test::FhtFunc;
using std::tr1::tuple;
typedef tuple<FhtFunc, IhtFunc, TX_TYPE, aom_bit_depth_t, int> Ht64x64Param; typedef tuple<FhtFunc, IhtFunc, TX_TYPE, aom_bit_depth_t, int> Ht64x64Param;
void fht64x64_ref(const int16_t *in, tran_low_t *out, int stride, void fht64x64_ref(const int16_t *in, tran_low_t *out, int stride,
......
...@@ -26,8 +26,8 @@ using libaom_test::ACMRandom; ...@@ -26,8 +26,8 @@ using libaom_test::ACMRandom;
namespace { namespace {
typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride, typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride,
const TxfmParam *txfm_param); const TxfmParam *txfm_param);
using std::tr1::tuple;
using libaom_test::FhtFunc; using libaom_test::FhtFunc;
using std::tr1::tuple;
typedef tuple<FhtFunc, IhtFunc, TX_TYPE, aom_bit_depth_t, int> Ht8x16Param; typedef tuple<FhtFunc, IhtFunc, TX_TYPE, aom_bit_depth_t, int> Ht8x16Param;
void fht8x16_ref(const int16_t *in, tran_low_t *out, int stride, void fht8x16_ref(const int16_t *in, tran_low_t *out, int stride,
......
...@@ -26,8 +26,8 @@ using libaom_test::ACMRandom; ...@@ -26,8 +26,8 @@ using libaom_test::ACMRandom;
namespace { namespace {
typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride, typedef void (*IhtFunc)(const tran_low_t *in, uint8_t *out, int stride,
const TxfmParam *txfm_param); const TxfmParam *txfm_param);
using std::tr1::tuple;
using libaom_test::FhtFunc; using libaom_test::FhtFunc;
using std::tr1::tuple;
typedef tuple<FhtFunc, IhtFunc, TX_TYPE, aom_bit_depth_t, int> Ht8x4Param; typedef tuple<FhtFunc, IhtFunc, TX_TYPE, aom_bit_depth_t, int> Ht8x4Param;
void fht8x4_ref(const int16_t *in, tran_low_t *out, int stride, void fht8x4_ref(const int16_t *in, tran_low_t *out, int stride,
......
...@@ -13,12 +13,12 @@ ...@@ -13,12 +13,12 @@
#include "test/av1_txfm_test.h" #include "test/av1_txfm_test.h"
using libaom_test::ACMRandom; using libaom_test::ACMRandom;
using libaom_test::input_base;
using libaom_test::reference_hybrid_1d;
using libaom_test::TYPE_TXFM;
using libaom_test::TYPE_DCT;
using libaom_test::TYPE_ADST; using libaom_test::TYPE_ADST;
using libaom_test::TYPE_DCT;
using libaom_test::TYPE_IDTX; using libaom_test::TYPE_IDTX;
using libaom_test::TYPE_TXFM;
using libaom_test::input_base;
using libaom_test::reference_hybrid_1d;
namespace { namespace {
const int txfm_type_num = 3; const int txfm_type_num = 3;
......
...@@ -21,11 +21,11 @@ ...@@ -21,11 +21,11 @@
#include "./av1_rtcd.h" #include "./av1_rtcd.h"
using libaom_test::ACMRandom; using libaom_test::ACMRandom;
using libaom_test::input_base;
using libaom_test::bd;
using libaom_test::compute_avg_abs_error;
using libaom_test::Fwd_Txfm2d_Func; using libaom_test::Fwd_Txfm2d_Func;
using libaom_test::TYPE_TXFM; using libaom_test::TYPE_TXFM;
using libaom_test::bd;
using libaom_test::compute_avg_abs_error;
using libaom_test::input_base;
using std::vector; using std::vector;
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
namespace { namespace {
using std::tr1::tuple;
using libaom_test::ACMRandom; using libaom_test::ACMRandom;
using std::tr1::tuple;
typedef void (*HbdHtFunc)(const int16_t *input, int32_t *output, int stride, typedef void (*HbdHtFunc)(const int16_t *input, int32_t *output, int stride,
TX_TYPE tx_type, int bd); TX_TYPE tx_type, int bd);
......
...@@ -21,11 +21,11 @@ ...@@ -21,11 +21,11 @@
#include "av1/common/av1_inv_txfm1d_cfg.h" #include "av1/common/av1_inv_txfm1d_cfg.h"
using libaom_test::ACMRandom; using libaom_test::ACMRandom;
using libaom_test::input_base;
using libaom_test::bd;
using libaom_test::compute_avg_abs_error;
using libaom_test::Fwd_Txfm2d_Func; using libaom_test::Fwd_Txfm2d_Func;
using libaom_test::Inv_Txfm2d_Func; using libaom_test::Inv_Txfm2d_Func;
using libaom_test::bd;
using libaom_test::compute_avg_abs_error;
using libaom_test::input_base;
using std::vector; using std::vector;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* obtain it at www.aomedia.org/license/software. If the Alliance for Open * obtain it at www.aomedia.org/license/software. If the Alliance for Open
* Media Patent License 1.0 was not distributed with this source code in the * Media Patent License 1.0 was not distributed with this source code in the
* PATENTS file, you can obtain it at www.aomedia.org/license/patent. * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/ */
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* obtain it at www.aomedia.org/license/software. If the Alliance for Open * obtain it at www.aomedia.org/license/software. If the Alliance for Open
* Media Patent License 1.0 was not distributed with this source code in the * Media Patent License 1.0 was not distributed with this source code in the
* PATENTS file, you can obtain it at www.aomedia.org/license/patent. * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/ */
#include <limits.h> #include <limits.h>
#include <stdio.h> #include <stdio.h>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* obtain it at www.aomedia.org/license/software. If the Alliance for Open * obtain it at www.aomedia.org/license/software. If the Alliance for Open
* Media Patent License 1.0 was not distributed with this source code in the <