Remove the vp9_ prefix from vp10 file names.
Change-Id: I513a211b286a57d6126fc1b0fbfd6405120014f1
#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);
#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;
#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;
* 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) {
#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" {
#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" {
* 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"
#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
#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);
* 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"
#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" {
#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
#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
* 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
#include "vpx_dsp/prob.h"
-#include "vp10/common/vp9_mv.h"
+#include "vp10/common/mv.h"
#ifdef __cplusplus
extern "C" {
#include <assert.h>
-#include "vp10/common/vp9_filter.h"
+#include "vp10/common/filter.h"
DECLARE_ALIGNED(256, static const InterpKernel,
bilinear_filters[SUBPEL_SHIFTS]) = {
#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) {
#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"
#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"
#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
#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" {
#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
#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"
#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"
#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"
#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,
#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,
#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,
*/
#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,
#include "vpx/vpx_integer.h"
-#include "vp10/common/vp9_common.h"
+#include "vp10/common/common.h"
#ifdef __cplusplus
extern "C" {
* 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.
#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" {
#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
#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[] = {
#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" {
* 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) {
#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" {
* 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,
#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" {
#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,
#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"
#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,
#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" {
*/
#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) {
#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
#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,
#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" {
#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 };
#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,
#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) {
#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;
* 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;
#include "vpx_scale/vpx_scale.h"
#include "vpx_util/vpx_thread.h"
-#include "vp10/common/vp9_alloccommon.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_idct.h"
-#include "vp10/common/vp9_thread_common.h"
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_seg_common.h"
-#include "vp10/common/vp9_tile_common.h"
-
-#include "vp10/decoder/vp9_decodeframe.h"
-#include "vp10/decoder/vp9_detokenize.h"
-#include "vp10/decoder/vp9_decodemv.h"
-#include "vp10/decoder/vp9_decoder.h"
-#include "vp10/decoder/vp9_dsubexp.h"
+#include "vp10/common/alloccommon.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/idct.h"
+#include "vp10/common/thread_common.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/seg_common.h"
+#include "vp10/common/tile_common.h"
+
+#include "vp10/decoder/decodeframe.h"
+#include "vp10/decoder/detokenize.h"
+#include "vp10/decoder/decodemv.h"
+#include "vp10/decoder/decoder.h"
+#include "vp10/decoder/dsubexp.h"
#define MAX_VP9_HEADER_SIZE 80
#include <assert.h>
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_entropymv.h"
-#include "vp10/common/vp9_mvref_common.h"
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_seg_common.h"
-
-#include "vp10/decoder/vp9_decodemv.h"
-#include "vp10/decoder/vp9_decodeframe.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/entropymv.h"
+#include "vp10/common/mvref_common.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/seg_common.h"
+
+#include "vp10/decoder/decodemv.h"
+#include "vp10/decoder/decodeframe.h"
static PREDICTION_MODE read_intra_mode(vpx_reader *r, const vpx_prob *p) {
return (PREDICTION_MODE)vpx_read_tree(r, vp10_intra_mode_tree, p);
#include "vpx_dsp/bitreader.h"
-#include "vp10/decoder/vp9_decoder.h"
+#include "vp10/decoder/decoder.h"
#ifdef __cplusplus
extern "C" {
#include "vpx_scale/vpx_scale.h"
#include "vpx_util/vpx_thread.h"
-#include "vp10/common/vp9_alloccommon.h"
-#include "vp10/common/vp9_loopfilter.h"
-#include "vp10/common/vp9_onyxc_int.h"
+#include "vp10/common/alloccommon.h"
+#include "vp10/common/loopfilter.h"
+#include "vp10/common/onyxc_int.h"
#if CONFIG_VP9_POSTPROC
-#include "vp10/common/vp9_postproc.h"
+#include "vp10/common/postproc.h"
#endif
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_systemdependent.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/systemdependent.h"
-#include "vp10/decoder/vp9_decodeframe.h"
-#include "vp10/decoder/vp9_decoder.h"
-#include "vp10/decoder/vp9_detokenize.h"
+#include "vp10/decoder/decodeframe.h"
+#include "vp10/decoder/decoder.h"
+#include "vp10/decoder/detokenize.h"
static void initialize_dec(void) {
static volatile int init_done = 0;
#include "vpx_scale/yv12config.h"
#include "vpx_util/vpx_thread.h"
-#include "vp10/common/vp9_thread_common.h"
-#include "vp10/common/vp9_onyxc_int.h"
-#include "vp10/common/vp9_ppflags.h"
-#include "vp10/decoder/vp9_dthread.h"
+#include "vp10/common/thread_common.h"
+#include "vp10/common/onyxc_int.h"
+#include "vp10/common/ppflags.h"
+#include "vp10/decoder/dthread.h"
#ifdef __cplusplus
extern "C" {
#include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h"
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_entropy.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropy.h"
#if CONFIG_COEFFICIENT_RANGE_CHECKING
-#include "vp10/common/vp9_idct.h"
+#include "vp10/common/idct.h"
#endif
-#include "vp10/decoder/vp9_detokenize.h"
+#include "vp10/decoder/detokenize.h"
#define EOB_CONTEXT_NODE 0
#define ZERO_CONTEXT_NODE 1
#define VP9_DECODER_VP9_DETOKENIZE_H_
#include "vpx_dsp/bitreader.h"
-#include "vp10/decoder/vp9_decoder.h"
-#include "vp10/common/vp9_scan.h"
+#include "vp10/decoder/decoder.h"
+#include "vp10/common/scan.h"
#ifdef __cplusplus
extern "C" {
#include <assert.h>
-#include "vp10/common/vp9_entropy.h"
+#include "vp10/common/entropy.h"
-#include "vp10/decoder/vp9_dsubexp.h"
+#include "vp10/decoder/dsubexp.h"
static int inv_recenter_nonneg(int v, int m) {
if (v > 2 * m)
#include "./vpx_config.h"
#include "vpx_mem/vpx_mem.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/decoder/vp9_dthread.h"
-#include "vp10/decoder/vp9_decoder.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/decoder/dthread.h"
+#include "vp10/decoder/decoder.h"
// #define DEBUG_THREAD
#include <limits.h>
#include <math.h>
-#include "vp10/encoder/vp9_aq_complexity.h"
-#include "vp10/encoder/vp9_aq_variance.h"
-#include "vp10/encoder/vp9_encodeframe.h"
-#include "vp10/common/vp9_seg_common.h"
-#include "vp10/encoder/vp9_segmentation.h"
+#include "vp10/encoder/aq_complexity.h"
+#include "vp10/encoder/aq_variance.h"
+#include "vp10/encoder/encodeframe.h"
+#include "vp10/common/seg_common.h"
+#include "vp10/encoder/segmentation.h"
#define AQ_C_SEGMENTS 5
#define DEFAULT_AQ2_SEG 3 // Neutral Q segment
extern "C" {
#endif
-#include "vp10/common/vp9_enums.h"
+#include "vp10/common/enums.h"
struct VP9_COMP;
struct macroblock;
#include <limits.h>
#include <math.h>
-#include "vp10/encoder/vp9_aq_cyclicrefresh.h"
+#include "vp10/encoder/aq_cyclicrefresh.h"
-#include "vp10/common/vp9_seg_common.h"
+#include "vp10/common/seg_common.h"
-#include "vp10/encoder/vp9_ratectrl.h"
-#include "vp10/encoder/vp9_segmentation.h"
+#include "vp10/encoder/ratectrl.h"
+#include "vp10/encoder/segmentation.h"
struct CYCLIC_REFRESH {
// Percentage of blocks per frame that are targeted as candidates
#ifndef VP9_ENCODER_VP9_AQ_CYCLICREFRESH_H_
#define VP9_ENCODER_VP9_AQ_CYCLICREFRESH_H_
-#include "vp10/common/vp9_blockd.h"
+#include "vp10/common/blockd.h"
#ifdef __cplusplus
extern "C" {
#include "vpx_ports/mem.h"
-#include "vp10/encoder/vp9_aq_variance.h"
+#include "vp10/encoder/aq_variance.h"
-#include "vp10/common/vp9_seg_common.h"
+#include "vp10/common/seg_common.h"
-#include "vp10/encoder/vp9_ratectrl.h"
-#include "vp10/encoder/vp9_rd.h"
-#include "vp10/encoder/vp9_segmentation.h"
-#include "vp10/common/vp9_systemdependent.h"
+#include "vp10/encoder/ratectrl.h"
+#include "vp10/encoder/rd.h"
+#include "vp10/encoder/segmentation.h"
+#include "vp10/common/systemdependent.h"
#define ENERGY_MIN (-4)
#define ENERGY_MAX (1)
#ifndef VP9_ENCODER_VP9_AQ_VARIANCE_H_
#define VP9_ENCODER_VP9_AQ_VARIANCE_H_
-#include "vp10/encoder/vp9_encoder.h"
+#include "vp10/encoder/encoder.h"
#ifdef __cplusplus
extern "C" {
#include "./vpx_config.h"
#include "./vpx_dsp_rtcd.h"
-#include "vp10/common/vp9_blockd.h"
+#include "vp10/common/blockd.h"
#include "vpx_dsp/txfm_common.h"
void vp10_fdct8x8_quant_neon(const int16_t *input, int stride,
#include "vpx_mem/vpx_mem.h"
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_seg_common.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/seg_common.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_quantize.h"
-#include "vp10/encoder/vp9_rd.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/quantize.h"
+#include "vp10/encoder/rd.h"
void vp10_quantize_fp_neon(const int16_t *coeff_ptr, intptr_t count,
int skip_block, const int16_t *zbin_ptr,
* be found in the AUTHORS file in the root of the source tree.
*/
#include "./vp10_rtcd.h"
-#include "vp10/common/vp9_common.h"
+#include "vp10/common/common.h"
#include "vpx_ports/mem.h"
unsigned int vp10_avg_8x8_c(const uint8_t *s, int p) {
#include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem_ops.h"
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_entropymv.h"
-#include "vp10/common/vp9_mvref_common.h"
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_seg_common.h"
-#include "vp10/common/vp9_systemdependent.h"
-#include "vp10/common/vp9_tile_common.h"
-
-#include "vp10/encoder/vp9_cost.h"
-#include "vp10/encoder/vp9_bitstream.h"
-#include "vp10/encoder/vp9_encodemv.h"
-#include "vp10/encoder/vp9_mcomp.h"
-#include "vp10/encoder/vp9_segmentation.h"
-#include "vp10/encoder/vp9_subexp.h"
-#include "vp10/encoder/vp9_tokenize.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/entropymv.h"
+#include "vp10/common/mvref_common.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/seg_common.h"
+#include "vp10/common/systemdependent.h"
+#include "vp10/common/tile_common.h"
+
+#include "vp10/encoder/cost.h"
+#include "vp10/encoder/bitstream.h"
+#include "vp10/encoder/encodemv.h"
+#include "vp10/encoder/mcomp.h"
+#include "vp10/encoder/segmentation.h"
+#include "vp10/encoder/subexp.h"
+#include "vp10/encoder/tokenize.h"
static const struct vp10_token intra_mode_encodings[INTRA_MODES] = {
{0, 1}, {6, 3}, {28, 5}, {30, 5}, {58, 6}, {59, 6}, {126, 7}, {127, 7},
extern "C" {
#endif
-#include "vp10/encoder/vp9_encoder.h"
+#include "vp10/encoder/encoder.h"
void vp10_pack_bitstream(VP9_COMP *cpi, uint8_t *dest, size_t *size);
#ifndef VP9_ENCODER_VP9_BLOCK_H_
#define VP9_ENCODER_VP9_BLOCK_H_
-#include "vp10/common/vp9_entropymv.h"
-#include "vp10/common/vp9_entropy.h"
+#include "vp10/common/entropymv.h"
+#include "vp10/common/entropy.h"
#ifdef __cplusplus
extern "C" {
#include "./vp10_rtcd.h"
#include "./vpx_config.h"
#include "./vpx_dsp_rtcd.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_filter.h"
+#include "vp10/common/common.h"
+#include "vp10/common/filter.h"
#include "vpx/vpx_integer.h"
#include "vpx_dsp/vpx_convolve.h"
#include "vpx_dsp/vpx_filter.h"
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "vp10/encoder/vp9_context_tree.h"
-#include "vp10/encoder/vp9_encoder.h"
+#include "vp10/encoder/context_tree.h"
+#include "vp10/encoder/encoder.h"
static const BLOCK_SIZE square[] = {
BLOCK_8X8,
#ifndef VP9_ENCODER_VP9_CONTEXT_TREE_H_
#define VP9_ENCODER_VP9_CONTEXT_TREE_H_
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/encoder/vp9_block.h"
+#include "vp10/common/blockd.h"
+#include "vp10/encoder/block.h"
struct VP9_COMP;
struct VP9Common;
*/
#include <assert.h>
-#include "vp10/encoder/vp9_cost.h"
+#include "vp10/encoder/cost.h"
const unsigned int vp10_prob_cost[256] = {
2047, 2047, 1791, 1641, 1535, 1452, 1385, 1328, 1279, 1235, 1196, 1161,
#include "./vpx_config.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/fwd_txfm.h"
#include "vpx_ports/mem.h"
#include "./vpx_dsp_rtcd.h"
#include "vpx_scale/yv12config.h"
#include "vpx/vpx_integer.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/encoder/vp9_context_tree.h"
-#include "vp10/encoder/vp9_denoiser.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/encoder/context_tree.h"
+#include "vp10/encoder/denoiser.h"
/* The VP9 denoiser is a work-in-progress. It currently is only designed to work
* with speed 6, though it (inexplicably) seems to also work with speed 5 (one
#ifndef VP9_ENCODER_DENOISER_H_
#define VP9_ENCODER_DENOISER_H_
-#include "vp10/encoder/vp9_block.h"
+#include "vp10/encoder/block.h"
#include "vpx_scale/yv12config.h"
#ifdef __cplusplus
#include "vpx_ports/mem.h"
#include "vpx_ports/vpx_timer.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_idct.h"
-#include "vp10/common/vp9_mvref_common.h"
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_seg_common.h"
-#include "vp10/common/vp9_systemdependent.h"
-#include "vp10/common/vp9_tile_common.h"
-
-#include "vp10/encoder/vp9_aq_complexity.h"
-#include "vp10/encoder/vp9_aq_cyclicrefresh.h"
-#include "vp10/encoder/vp9_aq_variance.h"
-#include "vp10/encoder/vp9_encodeframe.h"
-#include "vp10/encoder/vp9_encodemb.h"
-#include "vp10/encoder/vp9_encodemv.h"
-#include "vp10/encoder/vp9_ethread.h"
-#include "vp10/encoder/vp9_extend.h"
-#include "vp10/encoder/vp9_pickmode.h"
-#include "vp10/encoder/vp9_rd.h"
-#include "vp10/encoder/vp9_rdopt.h"
-#include "vp10/encoder/vp9_segmentation.h"
-#include "vp10/encoder/vp9_tokenize.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/idct.h"
+#include "vp10/common/mvref_common.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/seg_common.h"
+#include "vp10/common/systemdependent.h"
+#include "vp10/common/tile_common.h"
+
+#include "vp10/encoder/aq_complexity.h"
+#include "vp10/encoder/aq_cyclicrefresh.h"
+#include "vp10/encoder/aq_variance.h"
+#include "vp10/encoder/encodeframe.h"
+#include "vp10/encoder/encodemb.h"
+#include "vp10/encoder/encodemv.h"
+#include "vp10/encoder/ethread.h"
+#include "vp10/encoder/extend.h"
+#include "vp10/encoder/pickmode.h"
+#include "vp10/encoder/rd.h"
+#include "vp10/encoder/rdopt.h"
+#include "vp10/encoder/segmentation.h"
+#include "vp10/encoder/tokenize.h"
static void encode_superblock(VP9_COMP *cpi, ThreadData * td,
TOKENEXTRA **t, int output_enabled,
#include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h"
-#include "vp10/common/vp9_idct.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_scan.h"
-#include "vp10/common/vp9_systemdependent.h"
-
-#include "vp10/encoder/vp9_encodemb.h"
-#include "vp10/encoder/vp9_rd.h"
-#include "vp10/encoder/vp9_tokenize.h"
+#include "vp10/common/idct.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/scan.h"
+#include "vp10/common/systemdependent.h"
+
+#include "vp10/encoder/encodemb.h"
+#include "vp10/encoder/rd.h"
+#include "vp10/encoder/tokenize.h"
struct optimize_ctx {
ENTROPY_CONTEXT ta[MAX_MB_PLANE][16];
#define VP9_ENCODER_VP9_ENCODEMB_H_
#include "./vpx_config.h"
-#include "vp10/encoder/vp9_block.h"
+#include "vp10/encoder/block.h"
#ifdef __cplusplus
extern "C" {
#include <math.h>
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_systemdependent.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/systemdependent.h"
-#include "vp10/encoder/vp9_cost.h"
-#include "vp10/encoder/vp9_encodemv.h"
+#include "vp10/encoder/cost.h"
+#include "vp10/encoder/encodemv.h"
static struct vp10_token mv_joint_encodings[MV_JOINTS];
static struct vp10_token mv_class_encodings[MV_CLASSES];
#ifndef VP9_ENCODER_VP9_ENCODEMV_H_
#define VP9_ENCODER_VP9_ENCODEMV_H_
-#include "vp10/encoder/vp9_encoder.h"
+#include "vp10/encoder/encoder.h"
#ifdef __cplusplus
extern "C" {
#include "vpx_ports/vpx_timer.h"
#include "vpx_scale/vpx_scale.h"
-#include "vp10/common/vp9_alloccommon.h"
-#include "vp10/common/vp9_filter.h"
-#include "vp10/common/vp9_idct.h"
+#include "vp10/common/alloccommon.h"
+#include "vp10/common/filter.h"
+#include "vp10/common/idct.h"
#if CONFIG_VP9_POSTPROC
-#include "vp10/common/vp9_postproc.h"
+#include "vp10/common/postproc.h"
#endif
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_systemdependent.h"
-#include "vp10/common/vp9_tile_common.h"
-
-#include "vp10/encoder/vp9_aq_complexity.h"
-#include "vp10/encoder/vp9_aq_cyclicrefresh.h"
-#include "vp10/encoder/vp9_aq_variance.h"
-#include "vp10/encoder/vp9_bitstream.h"
-#include "vp10/encoder/vp9_context_tree.h"
-#include "vp10/encoder/vp9_encodeframe.h"
-#include "vp10/encoder/vp9_encodemv.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_ethread.h"
-#include "vp10/encoder/vp9_firstpass.h"
-#include "vp10/encoder/vp9_mbgraph.h"
-#include "vp10/encoder/vp9_picklpf.h"
-#include "vp10/encoder/vp9_ratectrl.h"
-#include "vp10/encoder/vp9_rd.h"
-#include "vp10/encoder/vp9_resize.h"
-#include "vp10/encoder/vp9_segmentation.h"
-#include "vp10/encoder/vp9_skin_detection.h"
-#include "vp10/encoder/vp9_speed_features.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/systemdependent.h"
+#include "vp10/common/tile_common.h"
+
+#include "vp10/encoder/aq_complexity.h"
+#include "vp10/encoder/aq_cyclicrefresh.h"
+#include "vp10/encoder/aq_variance.h"
+#include "vp10/encoder/bitstream.h"
+#include "vp10/encoder/context_tree.h"
+#include "vp10/encoder/encodeframe.h"
+#include "vp10/encoder/encodemv.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/ethread.h"
+#include "vp10/encoder/firstpass.h"
+#include "vp10/encoder/mbgraph.h"
+#include "vp10/encoder/picklpf.h"
+#include "vp10/encoder/ratectrl.h"
+#include "vp10/encoder/rd.h"
+#include "vp10/encoder/resize.h"
+#include "vp10/encoder/segmentation.h"
+#include "vp10/encoder/skin_detection.h"
+#include "vp10/encoder/speed_features.h"
#if CONFIG_INTERNAL_STATS
-#include "vp10/encoder/vp9_ssim.h"
+#include "vp10/encoder/ssim.h"
#endif
-#include "vp10/encoder/vp9_svc_layercontext.h"
-#include "vp10/encoder/vp9_temporal_filter.h"
+#include "vp10/encoder/svc_layercontext.h"
+#include "vp10/encoder/temporal_filter.h"
#define AM_SEGMENT_ID_INACTIVE 7
#define AM_SEGMENT_ID_ACTIVE 0
#include "vpx/vp8cx.h"
#include "vpx_util/vpx_thread.h"
-#include "vp10/common/vp9_alloccommon.h"
-#include "vp10/common/vp9_ppflags.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_thread_common.h"
-#include "vp10/common/vp9_onyxc_int.h"
-
-#include "vp10/encoder/vp9_aq_cyclicrefresh.h"
-#include "vp10/encoder/vp9_context_tree.h"
-#include "vp10/encoder/vp9_encodemb.h"
-#include "vp10/encoder/vp9_firstpass.h"
-#include "vp10/encoder/vp9_lookahead.h"
-#include "vp10/encoder/vp9_mbgraph.h"
-#include "vp10/encoder/vp9_mcomp.h"
-#include "vp10/encoder/vp9_quantize.h"
-#include "vp10/encoder/vp9_ratectrl.h"
-#include "vp10/encoder/vp9_rd.h"
+#include "vp10/common/alloccommon.h"
+#include "vp10/common/ppflags.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/thread_common.h"
+#include "vp10/common/onyxc_int.h"
+
+#include "vp10/encoder/aq_cyclicrefresh.h"
+#include "vp10/encoder/context_tree.h"
+#include "vp10/encoder/encodemb.h"
+#include "vp10/encoder/firstpass.h"
+#include "vp10/encoder/lookahead.h"
+#include "vp10/encoder/mbgraph.h"
+#include "vp10/encoder/mcomp.h"
+#include "vp10/encoder/quantize.h"
+#include "vp10/encoder/ratectrl.h"
+#include "vp10/encoder/rd.h"
#if CONFIG_INTERNAL_STATS
-#include "vp10/encoder/vp9_ssim.h"
+#include "vp10/encoder/ssim.h"
#endif
-#include "vp10/encoder/vp9_speed_features.h"
-#include "vp10/encoder/vp9_svc_layercontext.h"
-#include "vp10/encoder/vp9_tokenize.h"
+#include "vp10/encoder/speed_features.h"
+#include "vp10/encoder/svc_layercontext.h"
+#include "vp10/encoder/tokenize.h"
#include "vpx_dsp/variance.h"
#if CONFIG_VP9_TEMPORAL_DENOISING
-#include "vp10/encoder/vp9_denoiser.h"
+#include "vp10/encoder/denoiser.h"
#endif
#ifdef __cplusplus
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "vp10/encoder/vp9_encodeframe.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_ethread.h"
+#include "vp10/encoder/encodeframe.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/ethread.h"
static void accumulate_rd_opt(ThreadData *td, ThreadData *td_t) {
int i, j, k, l, m, n;
#include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/encoder/vp9_extend.h"
+#include "vp10/common/common.h"
+#include "vp10/encoder/extend.h"
static void copy_and_extend_plane(const uint8_t *src, int src_pitch,
uint8_t *dst, int dst_pitch,
#include <string.h>
#include "./vpx_config.h"
#include "./vp10_rtcd.h"
-#include "vp10/encoder/vp9_ssim.h"
+#include "vp10/encoder/ssim.h"
/* TODO(jbb): High bit depth version of this code needed */
typedef struct fs_level fs_level;
typedef struct fs_ctx fs_ctx;
#include "vpx_scale/vpx_scale.h"
#include "vpx_scale/yv12config.h"
-#include "vp10/common/vp9_entropymv.h"
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_reconinter.h" // vp10_setup_dst_planes()
-#include "vp10/common/vp9_systemdependent.h"
-#include "vp10/encoder/vp9_aq_variance.h"
-#include "vp10/encoder/vp9_block.h"
-#include "vp10/encoder/vp9_encodeframe.h"
-#include "vp10/encoder/vp9_encodemb.h"
-#include "vp10/encoder/vp9_encodemv.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_extend.h"
-#include "vp10/encoder/vp9_firstpass.h"
-#include "vp10/encoder/vp9_mcomp.h"
-#include "vp10/encoder/vp9_quantize.h"
-#include "vp10/encoder/vp9_rd.h"
+#include "vp10/common/entropymv.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/reconinter.h" // vp10_setup_dst_planes()
+#include "vp10/common/systemdependent.h"
+#include "vp10/encoder/aq_variance.h"
+#include "vp10/encoder/block.h"
+#include "vp10/encoder/encodeframe.h"
+#include "vp10/encoder/encodemb.h"
+#include "vp10/encoder/encodemv.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/extend.h"
+#include "vp10/encoder/firstpass.h"
+#include "vp10/encoder/mcomp.h"
+#include "vp10/encoder/quantize.h"
+#include "vp10/encoder/rd.h"
#include "vpx_dsp/variance.h"
#define OUTPUT_FPF 0
#ifndef VP9_ENCODER_VP9_FIRSTPASS_H_
#define VP9_ENCODER_VP9_FIRSTPASS_H_
-#include "vp10/encoder/vp9_lookahead.h"
-#include "vp10/encoder/vp9_ratectrl.h"
+#include "vp10/encoder/lookahead.h"
+#include "vp10/encoder/ratectrl.h"
#ifdef __cplusplus
extern "C" {
#include "./vpx_config.h"
-#include "vp10/common/vp9_common.h"
+#include "vp10/common/common.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_extend.h"
-#include "vp10/encoder/vp9_lookahead.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/extend.h"
+#include "vp10/encoder/lookahead.h"
/* Return the buffer at the given absolute index and increment the index */
static struct lookahead_entry *pop(struct lookahead_ctx *ctx,
#include "./vpx_dsp_rtcd.h"
#include "vpx_mem/vpx_mem.h"
-#include "vp10/encoder/vp9_segmentation.h"
-#include "vp10/encoder/vp9_mcomp.h"
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_systemdependent.h"
+#include "vp10/encoder/segmentation.h"
+#include "vp10/encoder/mcomp.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/systemdependent.h"
static unsigned int do_16x16_motion_iteration(VP9_COMP *cpi,
#include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_reconinter.h"
+#include "vp10/common/common.h"
+#include "vp10/common/reconinter.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_mcomp.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/mcomp.h"
// #define NEW_DIAMOND_SEARCH
#ifndef VP9_ENCODER_VP9_MCOMP_H_
#define VP9_ENCODER_VP9_MCOMP_H_
-#include "vp10/encoder/vp9_block.h"
+#include "vp10/encoder/block.h"
#include "vpx_dsp/variance.h"
#ifdef __cplusplus
#include <assert.h>
-#include "vp10/common/vp9_enums.h"
-#include "vp10/encoder/mips/msa/vp9_fdct_msa.h"
+#include "vp10/common/enums.h"
+#include "vp10/encoder/mips/msa/fdct_msa.h"
#include "vpx_dsp/mips/fwd_txfm_msa.h"
static void fadst16_cols_step1_msa(const int16_t *input, int32_t stride,
#include <assert.h>
-#include "vp10/common/vp9_enums.h"
-#include "vp10/encoder/mips/msa/vp9_fdct_msa.h"
+#include "vp10/common/enums.h"
+#include "vp10/encoder/mips/msa/fdct_msa.h"
void vp10_fwht4x4_msa(const int16_t *input, int16_t *output,
int32_t src_stride) {
#include <assert.h>
-#include "vp10/common/vp9_enums.h"
-#include "vp10/encoder/mips/msa/vp9_fdct_msa.h"
+#include "vp10/common/enums.h"
+#include "vp10/encoder/mips/msa/fdct_msa.h"
void vp10_fht8x8_msa(const int16_t *input, int16_t *output, int32_t stride,
int32_t tx_type) {
#include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h"
-#include "vp10/common/vp9_loopfilter.h"
-#include "vp10/common/vp9_onyxc_int.h"
-#include "vp10/common/vp9_quant_common.h"
+#include "vp10/common/loopfilter.h"
+#include "vp10/common/onyxc_int.h"
+#include "vp10/common/quant_common.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_picklpf.h"
-#include "vp10/encoder/vp9_quantize.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/picklpf.h"
+#include "vp10/encoder/quantize.h"
static int get_max_filter_level(const VP9_COMP *cpi) {
if (cpi->oxcf.pass == 2) {
extern "C" {
#endif
-#include "vp10/encoder/vp9_encoder.h"
+#include "vp10/encoder/encoder.h"
struct yv12_buffer_config;
struct VP9_COMP;
#include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h"
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_mvref_common.h"
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_scan.h"
-
-#include "vp10/encoder/vp9_cost.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_pickmode.h"
-#include "vp10/encoder/vp9_ratectrl.h"
-#include "vp10/encoder/vp9_rd.h"
+#include "vp10/common/blockd.h"
+#include "vp10/common/common.h"
+#include "vp10/common/mvref_common.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/scan.h"
+
+#include "vp10/encoder/cost.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/pickmode.h"
+#include "vp10/encoder/ratectrl.h"
+#include "vp10/encoder/rd.h"
typedef struct {
uint8_t *data;
#ifndef VP9_ENCODER_VP9_PICKMODE_H_
#define VP9_ENCODER_VP9_PICKMODE_H_
-#include "vp10/encoder/vp9_encoder.h"
+#include "vp10/encoder/encoder.h"
#ifdef __cplusplus
extern "C" {
#include "./vpx_config.h"
#include "./vp10_rtcd.h"
#include "./vpx_dsp_rtcd.h"
-#include "vp10/encoder/vp9_ssim.h"
+#include "vp10/encoder/ssim.h"
#if !defined(M_PI)
# define M_PI (3.141592653589793238462643)
#include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h"
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_seg_common.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/seg_common.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_quantize.h"
-#include "vp10/encoder/vp9_rd.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/quantize.h"
+#include "vp10/encoder/rd.h"
void vp10_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs,
int skip_block,
#define VP9_ENCODER_VP9_QUANTIZE_H_
#include "./vpx_config.h"
-#include "vp10/encoder/vp9_block.h"
+#include "vp10/encoder/block.h"
#ifdef __cplusplus
extern "C" {
#include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h"
-#include "vp10/common/vp9_alloccommon.h"
-#include "vp10/encoder/vp9_aq_cyclicrefresh.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_seg_common.h"
-#include "vp10/common/vp9_systemdependent.h"
-
-#include "vp10/encoder/vp9_encodemv.h"
-#include "vp10/encoder/vp9_ratectrl.h"
+#include "vp10/common/alloccommon.h"
+#include "vp10/encoder/aq_cyclicrefresh.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/seg_common.h"
+#include "vp10/common/systemdependent.h"
+
+#include "vp10/encoder/encodemv.h"
+#include "vp10/encoder/ratectrl.h"
// Max rate target for 1080P and below encodes under normal circumstances
// (1920 * 1080 / (16 * 16)) * MAX_MB_RATE bits per MB
#include "vpx/vpx_codec.h"
#include "vpx/vpx_integer.h"
-#include "vp10/common/vp9_blockd.h"
+#include "vp10/common/blockd.h"
#ifdef __cplusplus
extern "C" {
#include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_mvref_common.h"
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_seg_common.h"
-#include "vp10/common/vp9_systemdependent.h"
-
-#include "vp10/encoder/vp9_cost.h"
-#include "vp10/encoder/vp9_encodemb.h"
-#include "vp10/encoder/vp9_encodemv.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_mcomp.h"
-#include "vp10/encoder/vp9_quantize.h"
-#include "vp10/encoder/vp9_ratectrl.h"
-#include "vp10/encoder/vp9_rd.h"
-#include "vp10/encoder/vp9_tokenize.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/mvref_common.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/seg_common.h"
+#include "vp10/common/systemdependent.h"
+
+#include "vp10/encoder/cost.h"
+#include "vp10/encoder/encodemb.h"
+#include "vp10/encoder/encodemv.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/mcomp.h"
+#include "vp10/encoder/quantize.h"
+#include "vp10/encoder/ratectrl.h"
+#include "vp10/encoder/rd.h"
+#include "vp10/encoder/tokenize.h"
#define RD_THRESH_POW 1.25
#define RD_MULT_EPB_RATIO 64
#include <limits.h>
-#include "vp10/common/vp9_blockd.h"
+#include "vp10/common/blockd.h"
-#include "vp10/encoder/vp9_block.h"
-#include "vp10/encoder/vp9_context_tree.h"
+#include "vp10/encoder/block.h"
+#include "vp10/encoder/context_tree.h"
#ifdef __cplusplus
extern "C" {
#include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_entropymode.h"
-#include "vp10/common/vp9_idct.h"
-#include "vp10/common/vp9_mvref_common.h"
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_reconintra.h"
-#include "vp10/common/vp9_scan.h"
-#include "vp10/common/vp9_seg_common.h"
-#include "vp10/common/vp9_systemdependent.h"
-
-#include "vp10/encoder/vp9_cost.h"
-#include "vp10/encoder/vp9_encodemb.h"
-#include "vp10/encoder/vp9_encodemv.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_mcomp.h"
-#include "vp10/encoder/vp9_quantize.h"
-#include "vp10/encoder/vp9_ratectrl.h"
-#include "vp10/encoder/vp9_rd.h"
-#include "vp10/encoder/vp9_rdopt.h"
-#include "vp10/encoder/vp9_aq_variance.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/entropymode.h"
+#include "vp10/common/idct.h"
+#include "vp10/common/mvref_common.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/reconintra.h"
+#include "vp10/common/scan.h"
+#include "vp10/common/seg_common.h"
+#include "vp10/common/systemdependent.h"
+
+#include "vp10/encoder/cost.h"
+#include "vp10/encoder/encodemb.h"
+#include "vp10/encoder/encodemv.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/mcomp.h"
+#include "vp10/encoder/quantize.h"
+#include "vp10/encoder/ratectrl.h"
+#include "vp10/encoder/rd.h"
+#include "vp10/encoder/rdopt.h"
+#include "vp10/encoder/aq_variance.h"
#define LAST_FRAME_MODE_MASK ((1 << GOLDEN_FRAME) | (1 << ALTREF_FRAME) | \
(1 << INTRA_FRAME))
#ifndef VP9_ENCODER_VP9_RDOPT_H_
#define VP9_ENCODER_VP9_RDOPT_H_
-#include "vp10/common/vp9_blockd.h"
+#include "vp10/common/blockd.h"
-#include "vp10/encoder/vp9_block.h"
-#include "vp10/encoder/vp9_context_tree.h"
+#include "vp10/encoder/block.h"
+#include "vp10/encoder/context_tree.h"
#ifdef __cplusplus
extern "C" {
#include "vpx_dsp/vpx_dsp_common.h"
#endif // CONFIG_VP9_HIGHBITDEPTH
#include "vpx_ports/mem.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/encoder/vp9_resize.h"
+#include "vp10/common/common.h"
+#include "vp10/encoder/resize.h"
#define FILTER_BITS 7
#include "vpx_mem/vpx_mem.h"
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_tile_common.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/tile_common.h"
-#include "vp10/encoder/vp9_cost.h"
-#include "vp10/encoder/vp9_segmentation.h"
+#include "vp10/encoder/cost.h"
+#include "vp10/encoder/segmentation.h"
void vp10_enable_segmentation(struct segmentation *seg) {
seg->enabled = 1;
#ifndef VP9_ENCODER_VP9_SEGMENTATION_H_
#define VP9_ENCODER_VP9_SEGMENTATION_H_
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/encoder/vp9_encoder.h"
+#include "vp10/common/blockd.h"
+#include "vp10/encoder/encoder.h"
#ifdef __cplusplus
extern "C" {
#include <limits.h>
#include <math.h>
-#include "vp10/common/vp9_blockd.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_skin_detection.h"
+#include "vp10/common/blockd.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/skin_detection.h"
// Fixed-point skin color model parameters.
static const int skin_mean[2] = {7463, 9614}; // q6
#ifndef VP9_ENCODER_VP9_SKIN_MAP_H_
#define VP9_ENCODER_VP9_SKIN_MAP_H_
-#include "vp10/common/vp9_blockd.h"
+#include "vp10/common/blockd.h"
#ifdef __cplusplus
extern "C" {
#include <limits.h>
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_speed_features.h"
-#include "vp10/encoder/vp9_rdopt.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/speed_features.h"
+#include "vp10/encoder/rdopt.h"
// Intra only frames, golden frames (except alt ref overlays) and
#ifndef VP9_ENCODER_VP9_SPEED_FEATURES_H_
#define VP9_ENCODER_VP9_SPEED_FEATURES_H_
-#include "vp10/common/vp9_enums.h"
+#include "vp10/common/enums.h"
#ifdef __cplusplus
extern "C" {
#include <math.h>
#include "./vp10_rtcd.h"
#include "vpx_ports/mem.h"
-#include "vp10/encoder/vp9_ssim.h"
+#include "vp10/encoder/ssim.h"
void vp10_ssim_parms_16x16_c(uint8_t *s, int sp, uint8_t *r,
int rp, unsigned long *sum_s, unsigned long *sum_r,
*/
#include "vpx_dsp/bitwriter.h"
-#include "vp10/common/vp9_common.h"
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/encoder/vp9_cost.h"
-#include "vp10/encoder/vp9_subexp.h"
+#include "vp10/common/common.h"
+#include "vp10/common/entropy.h"
+#include "vp10/encoder/cost.h"
+#include "vp10/encoder/subexp.h"
#define vp10_cost_upd256 ((int)(vp10_cost_one(upd) - vp10_cost_zero(upd)))
#include <math.h>
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_svc_layercontext.h"
-#include "vp10/encoder/vp9_extend.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/svc_layercontext.h"
+#include "vp10/encoder/extend.h"
#define SMALL_FRAME_FB_IDX 7
#define SMALL_FRAME_WIDTH 16
#include "vpx/vpx_encoder.h"
-#include "vp10/encoder/vp9_ratectrl.h"
+#include "vp10/encoder/ratectrl.h"
#ifdef __cplusplus
extern "C" {
#include <math.h>
#include <limits.h>
-#include "vp10/common/vp9_alloccommon.h"
-#include "vp10/common/vp9_onyxc_int.h"
-#include "vp10/common/vp9_quant_common.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/common/vp9_systemdependent.h"
-#include "vp10/encoder/vp9_extend.h"
-#include "vp10/encoder/vp9_firstpass.h"
-#include "vp10/encoder/vp9_mcomp.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_quantize.h"
-#include "vp10/encoder/vp9_ratectrl.h"
-#include "vp10/encoder/vp9_segmentation.h"
-#include "vp10/encoder/vp9_temporal_filter.h"
+#include "vp10/common/alloccommon.h"
+#include "vp10/common/onyxc_int.h"
+#include "vp10/common/quant_common.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/common/systemdependent.h"
+#include "vp10/encoder/extend.h"
+#include "vp10/encoder/firstpass.h"
+#include "vp10/encoder/mcomp.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/quantize.h"
+#include "vp10/encoder/ratectrl.h"
+#include "vp10/encoder/segmentation.h"
+#include "vp10/encoder/temporal_filter.h"
#include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem.h"
#include "vpx_ports/vpx_timer.h"
#include "vpx_mem/vpx_mem.h"
-#include "vp10/common/vp9_entropy.h"
-#include "vp10/common/vp9_pred_common.h"
-#include "vp10/common/vp9_scan.h"
-#include "vp10/common/vp9_seg_common.h"
-
-#include "vp10/encoder/vp9_cost.h"
-#include "vp10/encoder/vp9_encoder.h"
-#include "vp10/encoder/vp9_tokenize.h"
+#include "vp10/common/entropy.h"
+#include "vp10/common/pred_common.h"
+#include "vp10/common/scan.h"
+#include "vp10/common/seg_common.h"
+
+#include "vp10/encoder/cost.h"
+#include "vp10/encoder/encoder.h"
+#include "vp10/encoder/tokenize.h"
static const TOKENVALUE dct_cat_lt_10_value_tokens[] = {
{9, 63}, {9, 61}, {9, 59}, {9, 57}, {9, 55}, {9, 53}, {9, 51}, {9, 49},
#ifndef VP9_ENCODER_VP9_TOKENIZE_H_
#define VP9_ENCODER_VP9_TOKENIZE_H_
-#include "vp10/common/vp9_entropy.h"
+#include "vp10/common/entropy.h"
-#include "vp10/encoder/vp9_block.h"
-#include "vp10/encoder/vp9_treewriter.h"
+#include "vp10/encoder/block.h"
+#include "vp10/encoder/treewriter.h"
#ifdef __cplusplus
extern "C" {
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "vp10/encoder/vp9_treewriter.h"
+#include "vp10/encoder/treewriter.h"
static void tree2tok(struct vp10_token *tokens, const vpx_tree_index *tree,
int i, int v, int l) {
#include "vpx_ports/emmintrin_compat.h"
#include "vpx/vpx_integer.h"
-#include "vp10/common/vp9_reconinter.h"
-#include "vp10/encoder/vp9_context_tree.h"
-#include "vp10/encoder/vp9_denoiser.h"
+#include "vp10/common/reconinter.h"
+#include "vp10/encoder/context_tree.h"
+#include "vp10/encoder/denoiser.h"
#include "vpx_mem/vpx_mem.h"
// Compute the sum of all pixel differences of this MB.
#include <emmintrin.h>
#include <stdio.h>
-#include "vp10/common/vp9_common.h"
+#include "vp10/common/common.h"
int64_t vp10_highbd_block_error_sse2(tran_low_t *coeff, tran_low_t *dqcoeff,
intptr_t block_size, int64_t *ssz,
VP10_COMMON_SRCS-yes += vp10_common.mk
VP10_COMMON_SRCS-yes += vp10_iface_common.h
-VP10_COMMON_SRCS-yes += common/vp9_ppflags.h
-VP10_COMMON_SRCS-yes += common/vp9_alloccommon.c
-VP10_COMMON_SRCS-yes += common/vp9_blockd.c
-VP10_COMMON_SRCS-yes += common/vp9_debugmodes.c
-VP10_COMMON_SRCS-yes += common/vp9_entropy.c
-VP10_COMMON_SRCS-yes += common/vp9_entropymode.c
-VP10_COMMON_SRCS-yes += common/vp9_entropymv.c
-VP10_COMMON_SRCS-yes += common/vp9_frame_buffers.c
-VP10_COMMON_SRCS-yes += common/vp9_frame_buffers.h
-VP10_COMMON_SRCS-yes += common/vp9_idct.c
-VP10_COMMON_SRCS-yes += common/vp9_alloccommon.h
-VP10_COMMON_SRCS-yes += common/vp9_blockd.h
-VP10_COMMON_SRCS-yes += common/vp9_common.h
-VP10_COMMON_SRCS-yes += common/vp9_entropy.h
-VP10_COMMON_SRCS-yes += common/vp9_entropymode.h
-VP10_COMMON_SRCS-yes += common/vp9_entropymv.h
-VP10_COMMON_SRCS-yes += common/vp9_enums.h
-VP10_COMMON_SRCS-yes += common/vp9_filter.h
-VP10_COMMON_SRCS-yes += common/vp9_filter.c
-VP10_COMMON_SRCS-yes += common/vp9_idct.h
-VP10_COMMON_SRCS-yes += common/vp9_loopfilter.h
-VP10_COMMON_SRCS-yes += common/vp9_thread_common.h
-VP10_COMMON_SRCS-yes += common/vp9_mv.h
-VP10_COMMON_SRCS-yes += common/vp9_onyxc_int.h
-VP10_COMMON_SRCS-yes += common/vp9_pred_common.h
-VP10_COMMON_SRCS-yes += common/vp9_pred_common.c
-VP10_COMMON_SRCS-yes += common/vp9_quant_common.h
-VP10_COMMON_SRCS-yes += common/vp9_reconinter.h
-VP10_COMMON_SRCS-yes += common/vp9_reconintra.h
+VP10_COMMON_SRCS-yes += common/ppflags.h
+VP10_COMMON_SRCS-yes += common/alloccommon.c
+VP10_COMMON_SRCS-yes += common/blockd.c
+VP10_COMMON_SRCS-yes += common/debugmodes.c
+VP10_COMMON_SRCS-yes += common/entropy.c
+VP10_COMMON_SRCS-yes += common/entropymode.c
+VP10_COMMON_SRCS-yes += common/entropymv.c
+VP10_COMMON_SRCS-yes += common/frame_buffers.c
+VP10_COMMON_SRCS-yes += common/frame_buffers.h
+VP10_COMMON_SRCS-yes += common/idct.c
+VP10_COMMON_SRCS-yes += common/alloccommon.h
+VP10_COMMON_SRCS-yes += common/blockd.h
+VP10_COMMON_SRCS-yes += common/common.h
+VP10_COMMON_SRCS-yes += common/entropy.h
+VP10_COMMON_SRCS-yes += common/entropymode.h
+VP10_COMMON_SRCS-yes += common/entropymv.h
+VP10_COMMON_SRCS-yes += common/enums.h
+VP10_COMMON_SRCS-yes += common/filter.h
+VP10_COMMON_SRCS-yes += common/filter.c
+VP10_COMMON_SRCS-yes += common/idct.h
+VP10_COMMON_SRCS-yes += common/loopfilter.h
+VP10_COMMON_SRCS-yes += common/thread_common.h
+VP10_COMMON_SRCS-yes += common/mv.h
+VP10_COMMON_SRCS-yes += common/onyxc_int.h
+VP10_COMMON_SRCS-yes += common/pred_common.h
+VP10_COMMON_SRCS-yes += common/pred_common.c
+VP10_COMMON_SRCS-yes += common/quant_common.h
+VP10_COMMON_SRCS-yes += common/reconinter.h
+VP10_COMMON_SRCS-yes += common/reconintra.h
VP10_COMMON_SRCS-yes += common/vp10_rtcd.c
VP10_COMMON_SRCS-yes += common/vp10_rtcd_defs.pl
-VP10_COMMON_SRCS-yes += common/vp9_scale.h
-VP10_COMMON_SRCS-yes += common/vp9_scale.c
-VP10_COMMON_SRCS-yes += common/vp9_seg_common.h
-VP10_COMMON_SRCS-yes += common/vp9_seg_common.c
-VP10_COMMON_SRCS-yes += common/vp9_systemdependent.h
-VP10_COMMON_SRCS-yes += common/vp9_textblit.h
-VP10_COMMON_SRCS-yes += common/vp9_tile_common.h
-VP10_COMMON_SRCS-yes += common/vp9_tile_common.c
-VP10_COMMON_SRCS-yes += common/vp9_loopfilter.c
-VP10_COMMON_SRCS-yes += common/vp9_thread_common.c
-VP10_COMMON_SRCS-yes += common/vp9_mvref_common.c
-VP10_COMMON_SRCS-yes += common/vp9_mvref_common.h
-VP10_COMMON_SRCS-yes += common/vp9_quant_common.c
-VP10_COMMON_SRCS-yes += common/vp9_reconinter.c
-VP10_COMMON_SRCS-yes += common/vp9_reconintra.c
-VP10_COMMON_SRCS-$(CONFIG_POSTPROC_VISUALIZER) += common/vp9_textblit.c
-VP10_COMMON_SRCS-yes += common/vp9_common_data.c
-VP10_COMMON_SRCS-yes += common/vp9_common_data.h
-VP10_COMMON_SRCS-yes += common/vp9_scan.c
-VP10_COMMON_SRCS-yes += common/vp9_scan.h
+VP10_COMMON_SRCS-yes += common/scale.h
+VP10_COMMON_SRCS-yes += common/scale.c
+VP10_COMMON_SRCS-yes += common/seg_common.h
+VP10_COMMON_SRCS-yes += common/seg_common.c
+VP10_COMMON_SRCS-yes += common/systemdependent.h
+VP10_COMMON_SRCS-yes += common/textblit.h
+VP10_COMMON_SRCS-yes += common/tile_common.h
+VP10_COMMON_SRCS-yes += common/tile_common.c
+VP10_COMMON_SRCS-yes += common/loopfilter.c
+VP10_COMMON_SRCS-yes += common/thread_common.c
+VP10_COMMON_SRCS-yes += common/mvref_common.c
+VP10_COMMON_SRCS-yes += common/mvref_common.h
+VP10_COMMON_SRCS-yes += common/quant_common.c
+VP10_COMMON_SRCS-yes += common/reconinter.c
+VP10_COMMON_SRCS-yes += common/reconintra.c
+VP10_COMMON_SRCS-$(CONFIG_POSTPROC_VISUALIZER) += common/textblit.c
+VP10_COMMON_SRCS-yes += common/common_data.c
+VP10_COMMON_SRCS-yes += common/common_data.h
+VP10_COMMON_SRCS-yes += common/scan.c
+VP10_COMMON_SRCS-yes += common/scan.h
-VP10_COMMON_SRCS-$(CONFIG_VP9_POSTPROC) += common/vp9_postproc.h
-VP10_COMMON_SRCS-$(CONFIG_VP9_POSTPROC) += common/vp9_postproc.c
-VP10_COMMON_SRCS-$(CONFIG_VP9_POSTPROC) += common/vp9_mfqe.h
-VP10_COMMON_SRCS-$(CONFIG_VP9_POSTPROC) += common/vp9_mfqe.c
+VP10_COMMON_SRCS-$(CONFIG_VP9_POSTPROC) += common/postproc.h
+VP10_COMMON_SRCS-$(CONFIG_VP9_POSTPROC) += common/postproc.c
+VP10_COMMON_SRCS-$(CONFIG_VP9_POSTPROC) += common/mfqe.h
+VP10_COMMON_SRCS-$(CONFIG_VP9_POSTPROC) += common/mfqe.c
ifeq ($(CONFIG_VP9_POSTPROC),yes)
-VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_mfqe_sse2.asm
-VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_postproc_sse2.asm
+VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/mfqe_sse2.asm
+VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/postproc_sse2.asm
endif
ifneq ($(CONFIG_VP9_HIGHBITDEPTH),yes)
-VP10_COMMON_SRCS-$(HAVE_DSPR2) += common/mips/dspr2/vp9_itrans4_dspr2.c
-VP10_COMMON_SRCS-$(HAVE_DSPR2) += common/mips/dspr2/vp9_itrans8_dspr2.c
-VP10_COMMON_SRCS-$(HAVE_DSPR2) += common/mips/dspr2/vp9_itrans16_dspr2.c
+VP10_COMMON_SRCS-$(HAVE_DSPR2) += common/mips/dspr2/itrans4_dspr2.c
+VP10_COMMON_SRCS-$(HAVE_DSPR2) += common/mips/dspr2/itrans8_dspr2.c
+VP10_COMMON_SRCS-$(HAVE_DSPR2) += common/mips/dspr2/itrans16_dspr2.c
endif
# common (msa)
-VP10_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/vp9_idct4x4_msa.c
-VP10_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/vp9_idct8x8_msa.c
-VP10_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/vp9_idct16x16_msa.c
+VP10_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/idct4x4_msa.c
+VP10_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/idct8x8_msa.c
+VP10_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/idct16x16_msa.c
ifeq ($(CONFIG_VP9_POSTPROC),yes)
-VP10_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/vp9_mfqe_msa.c
+VP10_COMMON_SRCS-$(HAVE_MSA) += common/mips/msa/mfqe_msa.c
endif
-VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_idct_intrin_sse2.c
+VP10_COMMON_SRCS-$(HAVE_SSE2) += common/x86/idct_intrin_sse2.c
ifneq ($(CONFIG_VP9_HIGHBITDEPTH),yes)
-VP10_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp9_iht4x4_add_neon.c
-VP10_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/vp9_iht8x8_add_neon.c
+VP10_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/iht4x4_add_neon.c
+VP10_COMMON_SRCS-$(HAVE_NEON) += common/arm/neon/iht8x8_add_neon.c
endif
$(eval $(call rtcd_h_template,vp10_rtcd,vp10/common/vp10_rtcd_defs.pl))
#include "vpx_ports/vpx_once.h"
#include "vpx/internal/vpx_codec_internal.h"
#include "./vpx_version.h"
-#include "vp10/encoder/vp9_encoder.h"
+#include "vp10/encoder/encoder.h"
#include "vpx/vp8cx.h"
-#include "vp10/encoder/vp9_firstpass.h"
+#include "vp10/encoder/firstpass.h"
#include "vp10/vp10_iface_common.h"
struct vp10_extracfg {
#include "vpx_dsp/bitreader_buffer.h"
#include "vpx_util/vpx_thread.h"
-#include "vp10/common/vp9_alloccommon.h"
-#include "vp10/common/vp9_frame_buffers.h"
+#include "vp10/common/alloccommon.h"
+#include "vp10/common/frame_buffers.h"
-#include "vp10/decoder/vp9_decoder.h"
-#include "vp10/decoder/vp9_decodeframe.h"
+#include "vp10/decoder/decoder.h"
+#include "vp10/decoder/decodeframe.h"
#include "vp10/vp10_iface_common.h"
VP10_CX_SRCS-yes += vp10_cx_iface.c
-VP10_CX_SRCS-yes += encoder/vp9_avg.c
-VP10_CX_SRCS-yes += encoder/vp9_bitstream.c
-VP10_CX_SRCS-yes += encoder/vp9_context_tree.c
-VP10_CX_SRCS-yes += encoder/vp9_context_tree.h
-VP10_CX_SRCS-yes += encoder/vp9_cost.h
-VP10_CX_SRCS-yes += encoder/vp9_cost.c
-VP10_CX_SRCS-yes += encoder/vp9_dct.c
-VP10_CX_SRCS-$(CONFIG_VP9_TEMPORAL_DENOISING) += encoder/vp9_denoiser.c
-VP10_CX_SRCS-$(CONFIG_VP9_TEMPORAL_DENOISING) += encoder/vp9_denoiser.h
-VP10_CX_SRCS-yes += encoder/vp9_encodeframe.c
-VP10_CX_SRCS-yes += encoder/vp9_encodeframe.h
-VP10_CX_SRCS-yes += encoder/vp9_encodemb.c
-VP10_CX_SRCS-yes += encoder/vp9_encodemv.c
-VP10_CX_SRCS-yes += encoder/vp9_ethread.h
-VP10_CX_SRCS-yes += encoder/vp9_ethread.c
-VP10_CX_SRCS-yes += encoder/vp9_extend.c
-VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_fastssim.c
-VP10_CX_SRCS-yes += encoder/vp9_firstpass.c
-VP10_CX_SRCS-yes += encoder/vp9_block.h
-VP10_CX_SRCS-yes += encoder/vp9_bitstream.h
-VP10_CX_SRCS-yes += encoder/vp9_encodemb.h
-VP10_CX_SRCS-yes += encoder/vp9_encodemv.h
-VP10_CX_SRCS-yes += encoder/vp9_extend.h
-VP10_CX_SRCS-yes += encoder/vp9_firstpass.h
-VP10_CX_SRCS-yes += encoder/vp9_lookahead.c
-VP10_CX_SRCS-yes += encoder/vp9_lookahead.h
-VP10_CX_SRCS-yes += encoder/vp9_mcomp.h
-VP10_CX_SRCS-yes += encoder/vp9_encoder.h
-VP10_CX_SRCS-yes += encoder/vp9_quantize.h
-VP10_CX_SRCS-yes += encoder/vp9_ratectrl.h
-VP10_CX_SRCS-yes += encoder/vp9_rd.h
-VP10_CX_SRCS-yes += encoder/vp9_rdopt.h
-VP10_CX_SRCS-yes += encoder/vp9_pickmode.h
-VP10_CX_SRCS-yes += encoder/vp9_svc_layercontext.h
-VP10_CX_SRCS-yes += encoder/vp9_tokenize.h
-VP10_CX_SRCS-yes += encoder/vp9_treewriter.h
-VP10_CX_SRCS-yes += encoder/vp9_mcomp.c
-VP10_CX_SRCS-yes += encoder/vp9_encoder.c
-VP10_CX_SRCS-yes += encoder/vp9_picklpf.c
-VP10_CX_SRCS-yes += encoder/vp9_picklpf.h
-VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_psnrhvs.c
-VP10_CX_SRCS-yes += encoder/vp9_quantize.c
-VP10_CX_SRCS-yes += encoder/vp9_ratectrl.c
-VP10_CX_SRCS-yes += encoder/vp9_rd.c
-VP10_CX_SRCS-yes += encoder/vp9_rdopt.c
-VP10_CX_SRCS-yes += encoder/vp9_pickmode.c
-VP10_CX_SRCS-yes += encoder/vp9_segmentation.c
-VP10_CX_SRCS-yes += encoder/vp9_segmentation.h
-VP10_CX_SRCS-yes += encoder/vp9_speed_features.c
-VP10_CX_SRCS-yes += encoder/vp9_speed_features.h
-VP10_CX_SRCS-yes += encoder/vp9_subexp.c
-VP10_CX_SRCS-yes += encoder/vp9_subexp.h
-VP10_CX_SRCS-yes += encoder/vp9_svc_layercontext.c
-VP10_CX_SRCS-yes += encoder/vp9_resize.c
-VP10_CX_SRCS-yes += encoder/vp9_resize.h
-VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_ssim.c
-VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_ssim.h
-VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/vp9_blockiness.c
+VP10_CX_SRCS-yes += encoder/avg.c
+VP10_CX_SRCS-yes += encoder/bitstream.c
+VP10_CX_SRCS-yes += encoder/context_tree.c
+VP10_CX_SRCS-yes += encoder/context_tree.h
+VP10_CX_SRCS-yes += encoder/cost.h
+VP10_CX_SRCS-yes += encoder/cost.c
+VP10_CX_SRCS-yes += encoder/dct.c
+VP10_CX_SRCS-$(CONFIG_VP9_TEMPORAL_DENOISING) += encoder/denoiser.c
+VP10_CX_SRCS-$(CONFIG_VP9_TEMPORAL_DENOISING) += encoder/denoiser.h
+VP10_CX_SRCS-yes += encoder/encodeframe.c
+VP10_CX_SRCS-yes += encoder/encodeframe.h
+VP10_CX_SRCS-yes += encoder/encodemb.c
+VP10_CX_SRCS-yes += encoder/encodemv.c
+VP10_CX_SRCS-yes += encoder/ethread.h
+VP10_CX_SRCS-yes += encoder/ethread.c
+VP10_CX_SRCS-yes += encoder/extend.c
+VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/fastssim.c
+VP10_CX_SRCS-yes += encoder/firstpass.c
+VP10_CX_SRCS-yes += encoder/block.h
+VP10_CX_SRCS-yes += encoder/bitstream.h
+VP10_CX_SRCS-yes += encoder/encodemb.h
+VP10_CX_SRCS-yes += encoder/encodemv.h
+VP10_CX_SRCS-yes += encoder/extend.h
+VP10_CX_SRCS-yes += encoder/firstpass.h
+VP10_CX_SRCS-yes += encoder/lookahead.c
+VP10_CX_SRCS-yes += encoder/lookahead.h
+VP10_CX_SRCS-yes += encoder/mcomp.h
+VP10_CX_SRCS-yes += encoder/encoder.h
+VP10_CX_SRCS-yes += encoder/quantize.h
+VP10_CX_SRCS-yes += encoder/ratectrl.h
+VP10_CX_SRCS-yes += encoder/rd.h
+VP10_CX_SRCS-yes += encoder/rdopt.h
+VP10_CX_SRCS-yes += encoder/pickmode.h
+VP10_CX_SRCS-yes += encoder/svc_layercontext.h
+VP10_CX_SRCS-yes += encoder/tokenize.h
+VP10_CX_SRCS-yes += encoder/treewriter.h
+VP10_CX_SRCS-yes += encoder/mcomp.c
+VP10_CX_SRCS-yes += encoder/encoder.c
+VP10_CX_SRCS-yes += encoder/picklpf.c
+VP10_CX_SRCS-yes += encoder/picklpf.h
+VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/psnrhvs.c
+VP10_CX_SRCS-yes += encoder/quantize.c
+VP10_CX_SRCS-yes += encoder/ratectrl.c
+VP10_CX_SRCS-yes += encoder/rd.c
+VP10_CX_SRCS-yes += encoder/rdopt.c
+VP10_CX_SRCS-yes += encoder/pickmode.c
+VP10_CX_SRCS-yes += encoder/segmentation.c
+VP10_CX_SRCS-yes += encoder/segmentation.h
+VP10_CX_SRCS-yes += encoder/speed_features.c
+VP10_CX_SRCS-yes += encoder/speed_features.h
+VP10_CX_SRCS-yes += encoder/subexp.c
+VP10_CX_SRCS-yes += encoder/subexp.h
+VP10_CX_SRCS-yes += encoder/svc_layercontext.c
+VP10_CX_SRCS-yes += encoder/resize.c
+VP10_CX_SRCS-yes += encoder/resize.h
+VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/ssim.c
+VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/ssim.h
+VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += encoder/blockiness.c
-VP10_CX_SRCS-yes += encoder/vp9_tokenize.c
-VP10_CX_SRCS-yes += encoder/vp9_treewriter.c
-VP10_CX_SRCS-yes += encoder/vp9_aq_variance.c
-VP10_CX_SRCS-yes += encoder/vp9_aq_variance.h
-VP10_CX_SRCS-yes += encoder/vp9_aq_cyclicrefresh.c
-VP10_CX_SRCS-yes += encoder/vp9_aq_cyclicrefresh.h
-VP10_CX_SRCS-yes += encoder/vp9_aq_complexity.c
-VP10_CX_SRCS-yes += encoder/vp9_aq_complexity.h
-VP10_CX_SRCS-yes += encoder/vp9_skin_detection.c
-VP10_CX_SRCS-yes += encoder/vp9_skin_detection.h
+VP10_CX_SRCS-yes += encoder/tokenize.c
+VP10_CX_SRCS-yes += encoder/treewriter.c
+VP10_CX_SRCS-yes += encoder/aq_variance.c
+VP10_CX_SRCS-yes += encoder/aq_variance.h
+VP10_CX_SRCS-yes += encoder/aq_cyclicrefresh.c
+VP10_CX_SRCS-yes += encoder/aq_cyclicrefresh.h
+VP10_CX_SRCS-yes += encoder/aq_complexity.c
+VP10_CX_SRCS-yes += encoder/aq_complexity.h
+VP10_CX_SRCS-yes += encoder/skin_detection.c
+VP10_CX_SRCS-yes += encoder/skin_detection.h
ifeq ($(CONFIG_VP9_POSTPROC),yes)
-VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/vp9_postproc.h
-VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/vp9_postproc.c
+VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.h
+VP10_CX_SRCS-$(CONFIG_INTERNAL_STATS) += common/postproc.c
endif
-VP10_CX_SRCS-yes += encoder/vp9_temporal_filter.c
-VP10_CX_SRCS-yes += encoder/vp9_temporal_filter.h
-VP10_CX_SRCS-yes += encoder/vp9_mbgraph.c
-VP10_CX_SRCS-yes += encoder/vp9_mbgraph.h
+VP10_CX_SRCS-yes += encoder/temporal_filter.c
+VP10_CX_SRCS-yes += encoder/temporal_filter.h
+VP10_CX_SRCS-yes += encoder/mbgraph.c
+VP10_CX_SRCS-yes += encoder/mbgraph.h
-VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_avg_intrin_sse2.c
-VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_temporal_filter_apply_sse2.asm
-VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_quantize_sse2.c
+VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/avg_intrin_sse2.c
+VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/temporal_filter_apply_sse2.asm
+VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/quantize_sse2.c
ifeq ($(CONFIG_VP9_HIGHBITDEPTH),yes)
-VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_highbd_block_error_intrin_sse2.c
+VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/highbd_block_error_intrin_sse2.c
endif
ifeq ($(CONFIG_USE_X86INC),yes)
-VP10_CX_SRCS-$(HAVE_MMX) += encoder/x86/vp9_dct_mmx.asm
-VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_error_sse2.asm
+VP10_CX_SRCS-$(HAVE_MMX) += encoder/x86/dct_mmx.asm
+VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/error_sse2.asm
endif
ifeq ($(ARCH_X86_64),yes)
ifeq ($(CONFIG_USE_X86INC),yes)
-VP10_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_quantize_ssse3_x86_64.asm
-VP10_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_dct_ssse3_x86_64.asm
+VP10_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/quantize_ssse3_x86_64.asm
+VP10_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/dct_ssse3_x86_64.asm
endif
endif
-VP10_CX_SRCS-$(ARCH_X86_64) += encoder/x86/vp9_ssim_opt_x86_64.asm
+VP10_CX_SRCS-$(ARCH_X86_64) += encoder/x86/ssim_opt_x86_64.asm
-VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct_sse2.c
-VP10_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/vp9_dct_ssse3.c
+VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/dct_sse2.c
+VP10_CX_SRCS-$(HAVE_SSSE3) += encoder/x86/dct_ssse3.c
ifeq ($(CONFIG_VP9_TEMPORAL_DENOISING),yes)
-VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_denoiser_sse2.c
+VP10_CX_SRCS-$(HAVE_SSE2) += encoder/x86/denoiser_sse2.c
endif
-VP10_CX_SRCS-$(HAVE_AVX2) += encoder/x86/vp9_error_intrin_avx2.c
+VP10_CX_SRCS-$(HAVE_AVX2) += encoder/x86/error_intrin_avx2.c
ifneq ($(CONFIG_VP9_HIGHBITDEPTH),yes)
-VP10_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp9_dct_neon.c
-VP10_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp9_error_neon.c
+VP10_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/dct_neon.c
+VP10_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/error_neon.c
endif
-VP10_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp9_avg_neon.c
-VP10_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/vp9_quantize_neon.c
+VP10_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/avg_neon.c
+VP10_CX_SRCS-$(HAVE_NEON) += encoder/arm/neon/quantize_neon.c
-VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_avg_msa.c
-VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_error_msa.c
-VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_fdct4x4_msa.c
-VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_fdct8x8_msa.c
-VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_fdct16x16_msa.c
-VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_fdct_msa.h
-VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/vp9_temporal_filter_msa.c
+VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/avg_msa.c
+VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/error_msa.c
+VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/fdct4x4_msa.c
+VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/fdct8x8_msa.c
+VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/fdct16x16_msa.c
+VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/fdct_msa.h
+VP10_CX_SRCS-$(HAVE_MSA) += encoder/mips/msa/temporal_filter_msa.c
VP10_CX_SRCS-yes := $(filter-out $(VP10_CX_SRCS_REMOVE-yes),$(VP10_CX_SRCS-yes))
VP10_DX_SRCS-yes += vp10_dx_iface.c
-VP10_DX_SRCS-yes += decoder/vp9_decodemv.c
-VP10_DX_SRCS-yes += decoder/vp9_decodeframe.c
-VP10_DX_SRCS-yes += decoder/vp9_decodeframe.h
-VP10_DX_SRCS-yes += decoder/vp9_detokenize.c
-VP10_DX_SRCS-yes += decoder/vp9_decodemv.h
-VP10_DX_SRCS-yes += decoder/vp9_detokenize.h
-VP10_DX_SRCS-yes += decoder/vp9_dthread.c
-VP10_DX_SRCS-yes += decoder/vp9_dthread.h
-VP10_DX_SRCS-yes += decoder/vp9_decoder.c
-VP10_DX_SRCS-yes += decoder/vp9_decoder.h
-VP10_DX_SRCS-yes += decoder/vp9_dsubexp.c
-VP10_DX_SRCS-yes += decoder/vp9_dsubexp.h
+VP10_DX_SRCS-yes += decoder/decodemv.c
+VP10_DX_SRCS-yes += decoder/decodeframe.c
+VP10_DX_SRCS-yes += decoder/decodeframe.h
+VP10_DX_SRCS-yes += decoder/detokenize.c
+VP10_DX_SRCS-yes += decoder/decodemv.h
+VP10_DX_SRCS-yes += decoder/detokenize.h
+VP10_DX_SRCS-yes += decoder/dthread.c
+VP10_DX_SRCS-yes += decoder/dthread.h
+VP10_DX_SRCS-yes += decoder/decoder.c
+VP10_DX_SRCS-yes += decoder/decoder.h
+VP10_DX_SRCS-yes += decoder/dsubexp.c
+VP10_DX_SRCS-yes += decoder/dsubexp.h
VP10_DX_SRCS-yes := $(filter-out $(VP10_DX_SRCS_REMOVE-yes),$(VP10_DX_SRCS-yes))