Commit 54d66ef1 authored by Jingning Han's avatar Jingning Han

Remove vp9_ prefix from vp10 files

Remove the vp9_ prefix from vp10 file names.

Change-Id: I513a211b286a57d6126fc1b0fbfd6405120014f1
parent b522d1cd
......@@ -11,12 +11,12 @@
#include "./vpx_config.h"
#include "vpx_mem/vpx_mem.h"
#include "vp10/common/vp9_alloccommon.h"
#include "vp10/common/vp9_blockd.h"
#include "vp10/common/vp9_entropymode.h"
#include "vp10/common/vp9_entropymv.h"
#include "vp10/common/vp9_onyxc_int.h"
#include "vp10/common/vp9_systemdependent.h"
#include "vp10/common/alloccommon.h"
#include "vp10/common/blockd.h"
#include "vp10/common/entropymode.h"
#include "vp10/common/entropymv.h"
#include "vp10/common/onyxc_int.h"
#include "vp10/common/systemdependent.h"
void vp10_set_mb_mi(VP9_COMMON *cm, int width, int height) {
const int aligned_width = ALIGN_POWER_OF_TWO(width, MI_SIZE_LOG2);
......
......@@ -13,7 +13,7 @@
#include "./vp10_rtcd.h"
#include "./vpx_config.h"
#include "vp10/common/vp9_common.h"
#include "vp10/common/common.h"
static int16_t sinpi_1_9 = 0x14a3;
static int16_t sinpi_2_9 = 0x26c9;
......
......@@ -13,7 +13,7 @@
#include "./vp10_rtcd.h"
#include "./vpx_config.h"
#include "vp10/common/vp9_common.h"
#include "vp10/common/common.h"
static int16_t cospi_2_64 = 16305;
static int16_t cospi_4_64 = 16069;
......
......@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "vp10/common/vp9_blockd.h"
#include "vp10/common/blockd.h"
PREDICTION_MODE vp10_left_block_mode(const MODE_INFO *cur_mi,
const MODE_INFO *left_mi, int b) {
......
......@@ -17,13 +17,13 @@
#include "vpx_ports/mem.h"
#include "vpx_scale/yv12config.h"
#include "vp10/common/vp9_common_data.h"
#include "vp10/common/vp9_entropy.h"
#include "vp10/common/vp9_entropymode.h"
#include "vp10/common/vp9_mv.h"
#include "vp10/common/vp9_scale.h"
#include "vp10/common/vp9_seg_common.h"
#include "vp10/common/vp9_tile_common.h"
#include "vp10/common/common_data.h"
#include "vp10/common/entropy.h"
#include "vp10/common/entropymode.h"
#include "vp10/common/mv.h"
#include "vp10/common/scale.h"
#include "vp10/common/seg_common.h"
#include "vp10/common/tile_common.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -19,7 +19,7 @@
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_mem/vpx_mem.h"
#include "vpx/vpx_integer.h"
#include "vp10/common/vp9_systemdependent.h"
#include "vp10/common/systemdependent.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -8,6 +8,6 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "vp10/common/vp9_common_data.h"
#include "vp10/common/common_data.h"
......@@ -11,7 +11,7 @@
#ifndef VP9_COMMON_VP9_COMMON_DATA_H_
#define VP9_COMMON_VP9_COMMON_DATA_H_
#include "vp10/common/vp9_enums.h"
#include "vp10/common/enums.h"
#include "vpx/vpx_integer.h"
#ifdef __cplusplus
......
......@@ -10,8 +10,8 @@
#include <stdio.h>
#include "vp10/common/vp9_blockd.h"
#include "vp10/common/vp9_onyxc_int.h"
#include "vp10/common/blockd.h"
#include "vp10/common/onyxc_int.h"
static void log_frame_info(VP9_COMMON *cm, const char *str, FILE *f) {
fprintf(f, "%s", str);
......
......@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "vp10/common/vp9_entropy.h"
#include "vp10/common/vp9_blockd.h"
#include "vp10/common/vp9_onyxc_int.h"
#include "vp10/common/vp9_entropymode.h"
#include "vp10/common/entropy.h"
#include "vp10/common/blockd.h"
#include "vp10/common/onyxc_int.h"
#include "vp10/common/entropymode.h"
#include "vpx_mem/vpx_mem.h"
#include "vpx/vpx_integer.h"
......
......@@ -14,8 +14,8 @@
#include "vpx/vpx_integer.h"
#include "vpx_dsp/prob.h"
#include "vp10/common/vp9_common.h"
#include "vp10/common/vp9_enums.h"
#include "vp10/common/common.h"
#include "vp10/common/enums.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -10,8 +10,8 @@
#include "vpx_mem/vpx_mem.h"
#include "vp10/common/vp9_onyxc_int.h"
#include "vp10/common/vp9_seg_common.h"
#include "vp10/common/onyxc_int.h"
#include "vp10/common/seg_common.h"
const vpx_prob vp10_kf_y_mode_prob[INTRA_MODES][INTRA_MODES][INTRA_MODES - 1] = {
{ // above = dc
......
......@@ -11,9 +11,9 @@
#ifndef VP9_COMMON_VP9_ENTROPYMODE_H_
#define VP9_COMMON_VP9_ENTROPYMODE_H_
#include "vp10/common/vp9_entropy.h"
#include "vp10/common/vp9_entropymv.h"
#include "vp10/common/vp9_filter.h"
#include "vp10/common/entropy.h"
#include "vp10/common/entropymv.h"
#include "vp10/common/filter.h"
#include "vpx_dsp/vpx_filter.h"
#ifdef __cplusplus
......
......@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "vp10/common/vp9_onyxc_int.h"
#include "vp10/common/vp9_entropymv.h"
#include "vp10/common/onyxc_int.h"
#include "vp10/common/entropymv.h"
// Integer pel reference mv threshold for use of high-precision 1/8 mv
#define COMPANDED_MVREF_THRESH 8
......
......@@ -16,7 +16,7 @@
#include "vpx_dsp/prob.h"
#include "vp10/common/vp9_mv.h"
#include "vp10/common/mv.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -10,7 +10,7 @@
#include <assert.h>
#include "vp10/common/vp9_filter.h"
#include "vp10/common/filter.h"
DECLARE_ALIGNED(256, static const InterpKernel,
bilinear_filters[SUBPEL_SHIFTS]) = {
......
......@@ -10,7 +10,7 @@
#include <assert.h>
#include "vp10/common/vp9_frame_buffers.h"
#include "vp10/common/frame_buffers.h"
#include "vpx_mem/vpx_mem.h"
int vp10_alloc_internal_frame_buffers(InternalFrameBufferList *list) {
......
......@@ -12,9 +12,9 @@
#include "./vp10_rtcd.h"
#include "./vpx_dsp_rtcd.h"
#include "vp10/common/vp9_blockd.h"
#include "vp10/common/vp9_idct.h"
#include "vp10/common/vp9_systemdependent.h"
#include "vp10/common/blockd.h"
#include "vp10/common/idct.h"
#include "vp10/common/systemdependent.h"
#include "vpx_dsp/inv_txfm.h"
#include "vpx_ports/mem.h"
......
......@@ -14,8 +14,8 @@
#include <assert.h>
#include "./vpx_config.h"
#include "vp10/common/vp9_common.h"
#include "vp10/common/vp9_enums.h"
#include "vp10/common/common.h"
#include "vp10/common/enums.h"
#include "vpx_dsp/inv_txfm.h"
#include "vpx_dsp/txfm_common.h"
#include "vpx_ports/mem.h"
......
......@@ -10,13 +10,13 @@
#include "./vpx_config.h"
#include "./vpx_dsp_rtcd.h"
#include "vp10/common/vp9_loopfilter.h"
#include "vp10/common/vp9_onyxc_int.h"
#include "vp10/common/vp9_reconinter.h"
#include "vp10/common/loopfilter.h"
#include "vp10/common/onyxc_int.h"
#include "vp10/common/reconinter.h"
#include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h"
#include "vp10/common/vp9_seg_common.h"
#include "vp10/common/seg_common.h"
// 64 bit masks for left transform size. Each 1 represents a position where
// we should apply a loop filter across the left border of an 8x8 block
......
......@@ -14,8 +14,8 @@
#include "vpx_ports/mem.h"
#include "./vpx_config.h"
#include "vp10/common/vp9_blockd.h"
#include "vp10/common/vp9_seg_common.h"
#include "vp10/common/blockd.h"
#include "vp10/common/seg_common.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -13,8 +13,8 @@
#include "./vpx_dsp_rtcd.h"
#include "./vpx_scale_rtcd.h"
#include "vp10/common/vp9_onyxc_int.h"
#include "vp10/common/vp9_postproc.h"
#include "vp10/common/onyxc_int.h"
#include "vp10/common/postproc.h"
// TODO(jackychen): Replace this function with SSE2 code. There is
// one SSE2 implementation in vp8, so will consider how to share it
......
......@@ -13,9 +13,9 @@
#include "./vpx_config.h"
#include "./vp10_rtcd.h"
#include "vp10/common/vp9_common.h"
#include "vp10/common/vp9_blockd.h"
#include "vp10/common/vp9_idct.h"
#include "vp10/common/common.h"
#include "vp10/common/blockd.h"
#include "vp10/common/idct.h"
#include "vpx_dsp/mips/inv_txfm_dspr2.h"
#include "vpx_dsp/txfm_common.h"
#include "vpx_ports/mem.h"
......
......@@ -13,9 +13,9 @@
#include "./vpx_config.h"
#include "./vp10_rtcd.h"
#include "vp10/common/vp9_common.h"
#include "vp10/common/vp9_blockd.h"
#include "vp10/common/vp9_idct.h"
#include "vp10/common/common.h"
#include "vp10/common/blockd.h"
#include "vp10/common/idct.h"
#include "vpx_dsp/mips/inv_txfm_dspr2.h"
#include "vpx_dsp/txfm_common.h"
#include "vpx_ports/mem.h"
......
......@@ -13,8 +13,8 @@
#include "./vpx_config.h"
#include "./vp10_rtcd.h"
#include "vp10/common/vp9_common.h"
#include "vp10/common/vp9_blockd.h"
#include "vp10/common/common.h"
#include "vp10/common/blockd.h"
#include "vpx_dsp/mips/inv_txfm_dspr2.h"
#include "vpx_dsp/txfm_common.h"
#include "vpx_ports/mem.h"
......
......@@ -10,7 +10,7 @@
#include <assert.h>
#include "vp10/common/vp9_enums.h"
#include "vp10/common/enums.h"
#include "vpx_dsp/mips/inv_txfm_msa.h"
void vp10_iht16x16_256_add_msa(const int16_t *input, uint8_t *dst,
......
......@@ -10,7 +10,7 @@
#include <assert.h>
#include "vp10/common/vp9_enums.h"
#include "vp10/common/enums.h"
#include "vpx_dsp/mips/inv_txfm_msa.h"
void vp10_iht4x4_16_add_msa(const int16_t *input, uint8_t *dst,
......
......@@ -10,7 +10,7 @@
#include <assert.h>
#include "vp10/common/vp9_enums.h"
#include "vp10/common/enums.h"
#include "vpx_dsp/mips/inv_txfm_msa.h"
void vp10_iht8x8_64_add_msa(const int16_t *input, uint8_t *dst,
......
......@@ -9,7 +9,7 @@
*/
#include "./vp10_rtcd.h"
#include "vp10/common/vp9_onyxc_int.h"
#include "vp10/common/onyxc_int.h"
#include "vpx_dsp/mips/macros_msa.h"
static void filter_by_weight8x8_msa(const uint8_t *src_ptr, int32_t src_stride,
......
......@@ -13,7 +13,7 @@
#include "vpx/vpx_integer.h"
#include "vp10/common/vp9_common.h"
#include "vp10/common/common.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -9,7 +9,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "vp10/common/vp9_mvref_common.h"
#include "vp10/common/mvref_common.h"
// This function searches the neighbourhood of a given MB/SB
// to try and find candidate reference vectors.
......
......@@ -10,8 +10,8 @@
#ifndef VP9_COMMON_VP9_MVREF_COMMON_H_
#define VP9_COMMON_VP9_MVREF_COMMON_H_
#include "vp10/common/vp9_onyxc_int.h"
#include "vp10/common/vp9_blockd.h"
#include "vp10/common/onyxc_int.h"
#include "vp10/common/blockd.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -15,17 +15,17 @@
#include "vpx/internal/vpx_codec_internal.h"
#include "vpx_util/vpx_thread.h"
#include "./vp10_rtcd.h"
#include "vp10/common/vp9_alloccommon.h"
#include "vp10/common/vp9_loopfilter.h"
#include "vp10/common/vp9_entropymv.h"
#include "vp10/common/vp9_entropy.h"
#include "vp10/common/vp9_entropymode.h"
#include "vp10/common/vp9_frame_buffers.h"
#include "vp10/common/vp9_quant_common.h"
#include "vp10/common/vp9_tile_common.h"
#include "vp10/common/alloccommon.h"
#include "vp10/common/loopfilter.h"
#include "vp10/common/entropymv.h"
#include "vp10/common/entropy.h"
#include "vp10/common/entropymode.h"
#include "vp10/common/frame_buffers.h"
#include "vp10/common/quant_common.h"
#include "vp10/common/tile_common.h"
#if CONFIG_VP9_POSTPROC
#include "vp10/common/vp9_postproc.h"
#include "vp10/common/postproc.h"
#endif
#ifdef __cplusplus
......
......@@ -20,10 +20,10 @@
#include "vpx_scale/vpx_scale.h"
#include "vpx_scale/yv12config.h"
#include "vp10/common/vp9_onyxc_int.h"
#include "vp10/common/vp9_postproc.h"
#include "vp10/common/vp9_systemdependent.h"
#include "vp10/common/vp9_textblit.h"
#include "vp10/common/onyxc_int.h"
#include "vp10/common/postproc.h"
#include "vp10/common/systemdependent.h"
#include "vp10/common/textblit.h"
#if CONFIG_VP9_POSTPROC
static const short kernel5[] = {
......
......@@ -14,9 +14,9 @@
#include "vpx_ports/mem.h"
#include "vpx_scale/yv12config.h"
#include "vp10/common/vp9_blockd.h"
#include "vp10/common/vp9_mfqe.h"
#include "vp10/common/vp9_ppflags.h"
#include "vp10/common/blockd.h"
#include "vp10/common/mfqe.h"
#include "vp10/common/ppflags.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -9,9 +9,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "vp10/common/vp9_common.h"
#include "vp10/common/vp9_pred_common.h"
#include "vp10/common/vp9_seg_common.h"
#include "vp10/common/common.h"
#include "vp10/common/pred_common.h"
#include "vp10/common/seg_common.h"
// Returns a context number for the given MB prediction signal
int vp10_get_pred_context_switchable_interp(const MACROBLOCKD *xd) {
......
......@@ -11,8 +11,8 @@
#ifndef VP9_COMMON_VP9_PRED_COMMON_H_
#define VP9_COMMON_VP9_PRED_COMMON_H_
#include "vp10/common/vp9_blockd.h"
#include "vp10/common/vp9_onyxc_int.h"
#include "vp10/common/blockd.h"
#include "vp10/common/onyxc_int.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "vp10/common/vp9_common.h"
#include "vp10/common/vp9_quant_common.h"
#include "vp10/common/vp9_seg_common.h"
#include "vp10/common/common.h"
#include "vp10/common/quant_common.h"
#include "vp10/common/seg_common.h"
static const int16_t dc_qlookup[QINDEX_RANGE] = {
4, 8, 8, 9, 10, 11, 12, 12,
......
......@@ -12,7 +12,7 @@
#define VP9_COMMON_VP9_QUANT_COMMON_H_
#include "vpx/vpx_codec.h"
#include "vp10/common/vp9_seg_common.h"
#include "vp10/common/seg_common.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -15,9 +15,9 @@
#include "vpx/vpx_integer.h"
#include "vp10/common/vp9_blockd.h"
#include "vp10/common/vp9_reconinter.h"
#include "vp10/common/vp9_reconintra.h"
#include "vp10/common/blockd.h"
#include "vp10/common/reconinter.h"
#include "vp10/common/reconintra.h"
#if CONFIG_VP9_HIGHBITDEPTH
void vp10_highbd_build_inter_predictor(const uint8_t *src, int src_stride,
......
......@@ -11,8 +11,8 @@
#ifndef VP9_COMMON_VP9_RECONINTER_H_
#define VP9_COMMON_VP9_RECONINTER_H_
#include "vp10/common/vp9_filter.h"
#include "vp10/common/vp9_onyxc_int.h"
#include "vp10/common/filter.h"
#include "vp10/common/onyxc_int.h"
#include "vpx/vpx_integer.h"
#include "vpx_dsp/vpx_filter.h"
......
......@@ -18,8 +18,8 @@
#include "vpx_ports/mem.h"
#include "vpx_ports/vpx_once.h"
#include "vp10/common/vp9_reconintra.h"
#include "vp10/common/vp9_onyxc_int.h"
#include "vp10/common/reconintra.h"
#include "vp10/common/onyxc_int.h"
enum {
NEED_LEFT = 1 << 1,
......
......@@ -12,7 +12,7 @@
#define VP9_COMMON_VP9_RECONINTRA_H_
#include "vpx/vpx_integer.h"
#include "vp10/common/vp9_blockd.h"
#include "vp10/common/blockd.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -9,8 +9,8 @@
*/
#include "./vpx_dsp_rtcd.h"
#include "vp10/common/vp9_filter.h"
#include "vp10/common/vp9_scale.h"
#include "vp10/common/filter.h"
#include "vp10/common/scale.h"
#include "vpx_dsp/vpx_filter.h"
static INLINE int scaled_x(int val, const struct scale_factors *sf) {
......
......@@ -11,7 +11,7 @@
#ifndef VP9_COMMON_VP9_SCALE_H_
#define VP9_COMMON_VP9_SCALE_H_
#include "vp10/common/vp9_mv.h"
#include "vp10/common/mv.h"
#include "vpx_dsp/vpx_convolve.h"
#ifdef __cplusplus
......
......@@ -10,7 +10,7 @@
#include <assert.h>
#include "vp10/common/vp9_scan.h"
#include "vp10/common/scan.h"
DECLARE_ALIGNED(16, static const int16_t, default_scan_4x4[16]) = {
0, 4, 1, 5,
......
......@@ -14,8 +14,8 @@
#include "vpx/vpx_integer.h"
#include "vpx_ports/mem.h"
#include "vp10/common/vp9_enums.h"
#include "vp10/common/vp9_blockd.h"
#include "vp10/common/enums.h"
#include "vp10/common/blockd.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -10,10 +10,10 @@
#include <assert.h>
#include "vp10/common/vp9_blockd.h"
#include "vp10/common/vp9_loopfilter.h"
#include "vp10/common/vp9_seg_common.h"
#include "vp10/common/vp9_quant_common.h"
#include "vp10/common/blockd.h"
#include "vp10/common/loopfilter.h"
#include "vp10/common/seg_common.h"
#include "vp10/common/quant_common.h"
static const int seg_feature_data_signed[SEG_LVL_MAX] = { 1, 1, 0, 0 };
......
......@@ -10,7 +10,7 @@
#include <stdlib.h>
#include "vp10/common/vp9_textblit.h"
#include "vp10/common/textblit.h"
static const int font[] = {
0x0, 0x5C00, 0x8020, 0xAFABEA, 0xD7EC0, 0x1111111, 0x1855740, 0x18000,
......
......@@ -10,10 +10,10 @@
#include "./vpx_config.h"
#include "vpx_mem/vpx_mem.h"
#include "vp10/common/vp9_entropymode.h"
#include "vp10/common/vp9_thread_common.h"
#include "vp10/common/vp9_reconinter.h"
#include "vp10/common/vp9_loopfilter.h"
#include "vp10/common/entropymode.h"
#include "vp10/common/thread_common.h"
#include "vp10/common/reconinter.h"
#include "vp10/common/loopfilter.h"
#if CONFIG_MULTITHREAD
static INLINE void mutex_lock(pthread_mutex_t *const mutex) {
......
......@@ -11,7 +11,7 @@
#ifndef VP9_COMMON_VP9_LOOPFILTER_THREAD_H_
#define VP9_COMMON_VP9_LOOPFILTER_THREAD_H_
#include "./vpx_config.h"
#include "vp10/common/vp9_loopfilter.h"
#include "vp10/common/loopfilter.h"
#include "vpx_util/vpx_thread.h"
struct VP9Common;
......
......@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "vp10/common/vp9_tile_common.h"
#include "vp10/common/tile_common.h"
#include "vp10/common/vp9_onyxc_int.h"
#include "vp10/common/onyxc_int.h"
#define MIN_TILE_WIDTH_B64 4
#define MAX_TILE_WIDTH_B64 64
......
sub vp10_common_forward_decls() {
print <<EOF
/*
* VP9
* VP10
*/
#include "vpx/vpx_integer.h"
#include "vp10/common/vp9_common.h"
#include "vp10/common/vp9_enums.h"
#include "vp10/common/common.h"
#include "vp10/common/enums.h"
struct macroblockd;
......