Change "vp8" to "aom"

Change-Id: I7fce5490afdc78ac62dafc4616b617d251487979

test/encode_test_driver.h

@@ -18,7 +18,7 @@
 
 #include "./aom_config.h"
 #if CONFIG_AV1_ENCODER
-#include "aom/vp8cx.h"
+#include "aom/aomcx.h"
 #endif
 #include "aom/aom_encoder.h"
 

test/svc_test.cc

@@ -17,7 +17,7 @@
 #include "av1/decoder/decoder.h"
 
 #include "aom/svc_context.h"
-#include "aom/vp8cx.h"
+#include "aom/aomcx.h"
 #include "aom/aom_encoder.h"
 
 namespace {

test/vp8_multi_resolution_encoder.sh

-#!/bin/sh
-##
-##  Copyright (c) 2014 The WebM project authors. All Rights Reserved.
-##
-##  Use of this source code is governed by a BSD-style license
-##  that can be found in the LICENSE file in the root of the source
-##  tree. An additional intellectual property rights grant can be found
-##  in the file PATENTS.  All contributing project authors may
-##  be found in the AUTHORS file in the root of the source tree.
-##
-##  This file tests the libaom vp8_multi_resolution_encoder example. To add new
-##  tests to this file, do the following:
-##    1. Write a shell function (this is your test).
-##    2. Add the function to vp8_mre_tests (on a new line).
-##
-. $(dirname $0)/tools_common.sh
-
-# Environment check: $YUV_RAW_INPUT is required.
-vp8_multi_resolution_encoder_verify_environment() {
-  if [ "$(aom_config_option_enabled CONFIG_MULTI_RES_ENCODING)" = "yes" ]; then
-    if [ ! -e "${YUV_RAW_INPUT}" ]; then
-      elog "Libaom test data must exist in LIBAOM_TEST_DATA_PATH."
-      return 1
-    fi
-    local readonly app="vp8_multi_resolution_encoder"
-    if [ -z "$(aom_tool_path "${app}")" ]; then
-      elog "${app} not found. It must exist in LIBAOM_BIN_PATH or its parent."
-      return 1
-    fi
-  fi
-}
-
-# Runs vp8_multi_resolution_encoder. Simply forwards all arguments to
-# vp8_multi_resolution_encoder after building path to the executable.
-vp8_mre() {
-  local readonly encoder="$(aom_tool_path vp8_multi_resolution_encoder)"
-  if [ ! -x "${encoder}" ]; then
-    elog "${encoder} does not exist or is not executable."
-    return 1
-  fi
-
-  eval "${AOM_TEST_PREFIX}" "${encoder}" "$@" ${devnull}
-}
-
-vp8_multi_resolution_encoder_three_formats() {
-  local readonly output_files="${AOM_TEST_OUTPUT_DIR}/vp8_mre_0.ivf
-                               ${AOM_TEST_OUTPUT_DIR}/vp8_mre_1.ivf
-                               ${AOM_TEST_OUTPUT_DIR}/vp8_mre_2.ivf"
-
-  if [ "$(aom_config_option_enabled CONFIG_MULTI_RES_ENCODING)" = "yes" ]; then
-    if [ "$(vp8_encode_available)" = "yes" ]; then
-      # Param order:
-      #  Input width
-      #  Input height
-      #  Input file path
-      #  Output file names
-      #  Output PSNR
-      vp8_mre "${YUV_RAW_INPUT_WIDTH}" \
-        "${YUV_RAW_INPUT_HEIGHT}" \
-        "${YUV_RAW_INPUT}" \
-        ${output_files} \
-        0
-
-      for output_file in ${output_files}; do
-        if [ ! -e "${output_file}" ]; then
-          elog "Missing output file: ${output_file}"
-          return 1
-        fi
-      done
-    fi
-  fi
-}
-
-vp8_mre_tests="vp8_multi_resolution_encoder_three_formats"
-run_tests vp8_multi_resolution_encoder_verify_environment "${vp8_mre_tests}"

test/vp8cx_set_ref.sh

-#!/bin/sh
-##
-##  Copyright (c) 2014 The WebM project authors. All Rights Reserved.
-##
-##  Use of this source code is governed by a BSD-style license
-##  that can be found in the LICENSE file in the root of the source
-##  tree. An additional intellectual property rights grant can be found
-##  in the file PATENTS.  All contributing project authors may
-##  be found in the AUTHORS file in the root of the source tree.
-##
-##  This file tests the libaom vp8cx_set_ref example. To add new tests to this
-##  file, do the following:
-##    1. Write a shell function (this is your test).
-##    2. Add the function to vp8cx_set_ref_tests (on a new line).
-##
-. $(dirname $0)/tools_common.sh
-
-# Environment check: $YUV_RAW_INPUT is required.
-vp8cx_set_ref_verify_environment() {
-  if [ ! -e "${YUV_RAW_INPUT}" ]; then
-    echo "Libaom test data must exist in LIBAOM_TEST_DATA_PATH."
-    return 1
-  fi
-}
-
-# Runs vp8cx_set_ref and updates the reference frame before encoding frame 90.
-# $1 is the codec name, which vp8cx_set_ref does not support at present: It's
-# currently used only to name the output file.
-# TODO(tomfinegan): Pass the codec param once the example is updated to support
-# VP9.
-aom_set_ref() {
-  local encoder="${LIBAOM_BIN_PATH}/vp8cx_set_ref${AOM_TEST_EXE_SUFFIX}"
-  local codec="$1"
-  local output_file="${AOM_TEST_OUTPUT_DIR}/vp8cx_set_ref_${codec}.ivf"
-  local ref_frame_num=90
-
-  if [ ! -x "${encoder}" ]; then
-    elog "${encoder} does not exist or is not executable."
-    return 1
-  fi
-
-  eval "${AOM_TEST_PREFIX}" "${encoder}" "${YUV_RAW_INPUT_WIDTH}" \
-      "${YUV_RAW_INPUT_HEIGHT}" "${YUV_RAW_INPUT}" "${output_file}" \
-      "${ref_frame_num}" ${devnull}
-
-  [ -e "${output_file}" ] || return 1
-}
-
-vp8cx_set_ref_vp8() {
-  if [ "$(vp8_encode_available)" = "yes" ]; then
-    aom_set_ref vp8 || return 1
-  fi
-}
-
-vp8cx_set_ref_tests="vp8cx_set_ref_vp8"
-
-run_tests vp8cx_set_ref_verify_environment "${vp8cx_set_ref_tests}"

tools_common.c

@@ -18,11 +18,11 @@
 #include "./tools_common.h"
 
 #if CONFIG_AV1_ENCODER
-#include "aom/vp8cx.h"
+#include "aom/aomcx.h"
 #endif
 
 #if CONFIG_AV1_DECODER
-#include "aom/vp8dx.h"
+#include "aom/aomdx.h"
 #endif
 
 #if defined(_WIN32) || defined(__OS2__)